From 2dad1070a50e4b0990672d55cd1d891b434ac6d8 Mon Sep 17 00:00:00 2001
From: surunzi <surunzi@foxmail.com>
Date: Wed, 8 Mar 2017 11:19:58 +0800
Subject: [PATCH] Dev: Update dev dependencies

---
 package.json              | 10 +++++-----
 script/cpTestLib.sh       |  0
 script/webpack.dev.js     | 25 +++++++++++++++----------
 script/webpack.release.js |  3 +--
 4 files changed, 21 insertions(+), 17 deletions(-)
 mode change 100644 => 100755 script/cpTestLib.sh

diff --git a/package.json b/package.json
index f7c6e45..fa4e363 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
     "babel-loader": "^6.2.4",
     "babel-plugin-transform-runtime": "^6.8.0",
     "babel-preset-es2015": "^6.6.0",
-    "css-loader": "^0.23.1",
+    "css-loader": "^0.26.2",
     "draggabilly": "^2.1.0",
     "handlebars": "^4.0.5",
     "handlebars-loader": "^1.1.4",
@@ -41,10 +41,10 @@
     "js-beautify": "^1.6.2",
     "json-loader": "^0.5.4",
     "modernizr": "^3.3.1",
-    "node-sass": "^3.4.2",
+    "node-sass": "^4.5.0",
     "postcss-class-prefix": "^0.3.0",
-    "postcss-loader": "^0.8.1",
-    "sass-loader": "^3.1.2",
-    "webpack": "^1.12.14"
+    "postcss-loader": "^1.3.3",
+    "sass-loader": "^6.0.3",
+    "webpack": "^2.2.1"
   }
 }
diff --git a/script/cpTestLib.sh b/script/cpTestLib.sh
old mode 100644
new mode 100755
diff --git a/script/webpack.dev.js b/script/webpack.dev.js
index 5c4773c..6b47c4e 100644
--- a/script/webpack.dev.js
+++ b/script/webpack.dev.js
@@ -4,9 +4,18 @@ var autoprefixer = require('autoprefixer'),
     pkg = require('../package.json'),
     path = require('path');
 
+process.traceDeprecation = true; 
+
 var nodeModDir = path.resolve('./node_modules/') + '/',
     banner = pkg.name + ' v' + pkg.version + ' ' + pkg.homepage;
 
+var postcssLoader = {
+    loader: 'postcss-loader',
+    options: {
+        plugins:  [classPrefix('eruda-'), autoprefixer]
+    }
+};   
+
 module.exports = {
     devtool: false,
     entry: './src/index.es6',
@@ -25,25 +34,25 @@ module.exports = {
         loaders: [
             {
                 test: /\.es6$/,
-                loader: 'babel',
-                query: {
+                loader: 'babel-loader',
+                options: {
                     presets: ['es2015'],
                     plugins: ['transform-runtime']
                 }
             },
             {
                 test: /\.scss$/,
-                loaders: ['css', 'postcss', 'sass']
+                loaders: ['css-loader', postcssLoader, 'sass-loader']
             },
             {
                 test: /\.css$/,
-                loaders: ['css', 'postcss']
+                loaders: ['css-loader', postcssLoader]
             },
             // https://github.com/wycats/handlebars.js/issues/1134
             {
                 test: /\.hbs$/,
                 loader: nodeModDir + 'handlebars-loader/index.js',
-                query: {
+                options: {
                     runtime: nodeModDir + 'handlebars/dist/handlebars.runtime.js'
                 }
             },
@@ -55,9 +64,5 @@ module.exports = {
     },
     plugins: [
         new webpack.BannerPlugin(banner)
-    ],
-    postcss: function ()
-    {
-        return [classPrefix('eruda-'), autoprefixer];
-    }
+    ]
 };
\ No newline at end of file
diff --git a/script/webpack.release.js b/script/webpack.release.js
index dd8828f..7235870 100644
--- a/script/webpack.release.js
+++ b/script/webpack.release.js
@@ -10,8 +10,7 @@ exports.plugins = exports.plugins.concat([
             warnings: false
         },
         comments: /eruda/
-    }),
-    new webpack.optimize.DedupePlugin()
+    })
 ]);
 
 module.exports = exports;
\ No newline at end of file