switch to webpack2

dfilatov · Apr 5, 2017 · 2dd71f6 · 2dd71f6
1 parent 5805139
commit 2dd71f6
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 20 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,4 +1,4 @@
 {
   "plugins": ["transform-object-rest-spread"],
-  "presets": ["es2015-minimal"]
+  "presets": [["es2015", { "loose": true }]]
 }
diff --git a/debug/webpack.debug.config.js b/debug/webpack.debug.config.js
@@ -1,5 +1,3 @@
-var jsLoaders = ['babel'];
-
 module.exports = {
     entry : __dirname + '/vidom.js',
     output : {
@@ -9,7 +7,7 @@ module.exports = {
     },
     module : {
         loaders: [
-            { test : /\.js$/, loaders : jsLoaders }
+            { test : /\.js$/, loader : 'babel-loader' }
         ]
     }
 };
diff --git a/demo/.babelrc b/demo/.babelrc
@@ -1,4 +1,4 @@
 {
   "plugins": ["transform-object-rest-spread", "vidom-jsx"],
-  "presets": ["es2015-minimal"]
+  "presets": [["es2015", { "loose": true }]]
 }
diff --git a/demo/webpack.demo.config.js b/demo/webpack.demo.config.js
@@ -1,5 +1,3 @@
-var jsLoaders = ['babel'];
-
 module.exports = {
     entry : __dirname + '/demo.js',
     output : {
@@ -9,7 +7,7 @@ module.exports = {
     },
     module : {
         loaders: [
-            { test : /\.js$/, loaders : jsLoaders }
+            { test : /\.js$/, loader : 'babel-loader' }
         ]
     },
     resolve : {

diff --git a/package.json b/package.json
@@ -30,7 +30,6 @@
     "babel-plugin-vidom-jsx": "0.5.0",
     "babel-preset-es2015": "6.24.0",
     "babel-preset-es2015-loose-rollup": "7.0.0",
-    "babel-preset-es2015-minimal": "2.1.0",
     "babelify": "7.3.0",
     "browserify": "14.1.0",
     "codemirror": "5.23.0",
@@ -47,11 +46,13 @@
     "rollup-plugin-uglify": "1.0.1",
     "simulate": "git://github.com/dfilatov/simulate.js",
     "sinon": "1.17.4",
-    "style-loader": "0.13.1",
+    "style-loader": "0.16.1",
+    "uglify-js": "2.8.21",
+    "uglifyjs-webpack-plugin": "0.4.0",
     "vow": "0.4.13",
     "vow-node": "0.3.0",
-    "webpack": "1.14.0",
-    "webpack-dev-server": "1.16.2",
+    "webpack": "2.3.3",
+    "webpack-dev-server": "2.4.2",
     "zuul": "3.11.1"
   },
   "license": "MIT",

diff --git a/playground/.babelrc b/playground/.babelrc
@@ -1,4 +1,4 @@
 {
   "plugins": ["transform-object-rest-spread", "vidom-jsx"],
-  "presets": ["es2015-minimal"]
+  "presets": [["es2015", { "loose": true }]]
 }
diff --git a/playground/index.js b/playground/index.js
@@ -5,7 +5,7 @@ import 'codemirror/mode/jsx/jsx';
 import 'codemirror/lib/codemirror.css';
 import 'codemirror/theme/night.css';
 import vidomJsx from 'babel-plugin-vidom-jsx';
-import code from '!raw!./code.js';
+import code from '!raw-loader!./code.js';
 
 const ERROR_TIMEOUT = 300;
 

diff --git a/playground/webpack.config.js b/playground/webpack.config.js
@@ -1,4 +1,4 @@
-var webpack = require('webpack');
+var UglifyJSPlugin = require('uglifyjs-webpack-plugin');
 
 module.exports = {
     entry : __dirname + '/index.js',
@@ -9,8 +9,8 @@ module.exports = {
     },
     module : {
         loaders: [
-            { test : /\.js$/, loader : 'babel' },
-            { test: /\.css$/, loaders : ['style', 'css'] }
+            { test : /\.js$/, loader : 'babel-loader' },
+            { test: /\.css$/, loaders : ['style-loader', 'css-loader'] }
         ]
     },
     resolve : {
@@ -19,8 +19,6 @@ module.exports = {
         }
     },
     plugins : [
-        new webpack.DefinePlugin({
-            'process.env.NODE_ENV': `"${process.env.NODE_ENV || 'development'}"`
-        })
+        new UglifyJSPlugin()
     ]
 };