upgraded webpack

build/config/webpack.config.js

@@ -7,8 +7,10 @@ var path = require('path'),
 var debug = process.argv.indexOf('--debug') > 0;
 
 var StatsPlugin = require('stats-webpack-plugin');
+var UglifyJsPlugin = require('uglifyjs-webpack-plugin');
 
 module.exports = {
+    mode: 'production',
     context: path.join(__dirname, '../../lib'),
     entry: './index.js',
     output: {
@@ -18,24 +20,15 @@ module.exports = {
         libraryTarget: 'umd'
     },
     module: {
-        loaders: debug ? null : [{
+        rules: debug ? [] : [{
             test: /\.js$/,
-            loader: 'uglify'
+            loader: 'uglify-loader'
         }]
     },
     resolve: {
-        root: [path.join(__dirname, '../../lib')]
+        modules: [path.join(__dirname, '../../lib'), path.join(__dirname, '../../node_modules')]
     },
-    resolveLoader: {
-        root: [path.join(__dirname, '../../node_modules')]
-    },
-    plugins: debug ? null : [
-        new webpack.optimize.OccurenceOrderPlugin(),
-        new webpack.optimize.UglifyJsPlugin({
-            mangle: { keep_fnames: true },
-            compress: false,
-            output: { ascii_only: true }
-        }),
+    plugins: [
         new webpack.BannerPlugin('kdbxweb v' + pkg.version + ', (c) ' + new Date().getFullYear() + ' ' + pkg.author +
             ', opensource.org/licenses/' + pkg.license),
         new StatsPlugin('stats.json', { chunkModules: true })
@@ -49,16 +42,27 @@ module.exports = {
         crypto: false,
         zlib: false
     },
-    'uglify-loader': {
-        mangle: {},
-        compress: {},
-        output: { ascii_only: true }
+    optimization: {
+        minimizer: debug ? [] : [
+            new UglifyJsPlugin({
+                cache: true,
+                parallel: true,
+                uglifyOptions: {
+                    mangle: {},
+                    compress: {},
+                    output: { ascii_only: true }
+                }
+            })
+        ]
     },
     externals: {
         fs: true,
         path: true,
         xmldom: true,
         crypto: true,
         zlib: true
+    },
+    performance: {
+        hints: false
     }
 };

build/config/webpack.tests.config.js

@@ -12,6 +12,7 @@ walk.walkSync('test', function(basedir, filename, stat) {
 });
 
 module.exports = {
+    mode: 'production',
     context: path.join(__dirname, '../../test'),
     entry: entry,
     output: {
@@ -20,16 +21,13 @@ module.exports = {
         libraryTarget: 'umd'
     },
     module: {
-        loaders: [{
-            test: /argon2\-asm/,
+        rules: [{
+            test: /argon2-asm/,
             loader: 'exports-loader?Module'
         }]
     },
     resolve: {
-        root: [path.join(__dirname, '../../lib')]
-    },
-    resolveLoader: {
-        root: [path.join(__dirname, '../../node_modules')]
+        modules: [path.join(__dirname, '../../lib'), path.join(__dirname, '../../node_modules')]
     },
     node: {
         console: false,
@@ -46,5 +44,8 @@ module.exports = {
         xmldom: true,
         crypto: true,
         zlib: true
+    },
+    performance: {
+        hints: false
     }
 };