From 2f6ee3518362f8732b4f1f4e178b90efb6e87ef6 Mon Sep 17 00:00:00 2001 From: Michael Lancaster Date: Wed, 19 Jul 2017 16:32:50 -0700 Subject: [PATCH 1/2] upgrade to Webpack 3 --- package.json | 4 ++-- webpack.dev.js | 15 +++++++-------- webpack.prod.js | 17 ++++++++--------- 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index 6b6218c6..b186b1f5 100644 --- a/package.json +++ b/package.json @@ -31,14 +31,14 @@ "babel-preset-react": "^6.23.0", "babel-preset-stage-0": "^6.22.0", "babel-register": "^6.23.0", - "electron-packager": "^8.5.1", "electron": "^1.6.11", + "electron-packager": "^8.5.1", "eslint": "^4.0.0", "eslint-plugin-react": "^7.1.0", "install": "^0.10.1", "node-sass": "^4.5.0", "rimraf": "^2.5.4", - "webpack": "^1.12.2" + "webpack": "^3.3.0" }, "dependencies": { "angular": "^1.6.2", diff --git a/webpack.dev.js b/webpack.dev.js index cc5c0932..46c67e67 100644 --- a/webpack.dev.js +++ b/webpack.dev.js @@ -13,24 +13,23 @@ module.exports = { publicPath: '/' }, module: { - loaders: [ + rules: [ { test: /\.(js|jsx)$/, - exclude: /node_modules/, - loader: 'babel-loader' + use: [ + 'babel-loader' + ] } ] }, resolve: { - extensions: ['', '.js', '.jsx'] + extensions: ['.js', '.jsx'] }, plugins: [ - new webpack.optimize.DedupePlugin(), - new webpack.optimize.OccurenceOrderPlugin(), - new webpack.NoErrorsPlugin(), new webpack.DefinePlugin({ 'process.env.NODE_ENV': '"development"' - }) + }), + new webpack.NoEmitOnErrorsPlugin() ], externals: [ (function () { diff --git a/webpack.prod.js b/webpack.prod.js index 8fa9f79e..e01cebbc 100644 --- a/webpack.prod.js +++ b/webpack.prod.js @@ -13,25 +13,24 @@ module.exports = { publicPath: '/' }, module: { - loaders: [ + rules: [ { test: /\.(js|jsx)$/, - exclude: /node_modules/, - loader: 'babel-loader' + use: [ + 'babel-loader' + ] } ] }, resolve: { - extensions: ['', '.js', '.jsx'] + extensions: ['.js', '.jsx'] }, plugins: [ - new webpack.optimize.DedupePlugin(), - new webpack.optimize.OccurenceOrderPlugin(), - new webpack.optimize.UglifyJsPlugin({ compress: { warnings: false } }), - new webpack.NoErrorsPlugin(), new webpack.DefinePlugin({ 'process.env.NODE_ENV': '"production"' - }) + }), + new webpack.optimize.AggressiveMergingPlugin(), + new webpack.NoEmitOnErrorsPlugin() ], externals: [ (function () { From 30ad8593c5296beab6f5aca083094817f8aef235 Mon Sep 17 00:00:00 2001 From: Michael Lancaster Date: Wed, 19 Jul 2017 16:33:38 -0700 Subject: [PATCH 2/2] remove log --- npm-debug.log.2198688145 | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 npm-debug.log.2198688145 diff --git a/npm-debug.log.2198688145 b/npm-debug.log.2198688145 deleted file mode 100644 index e69de29b..00000000