Merge branch 'greenkeeper/webpack-4.0.0'

chrisguttandin · Feb 25, 2018 · d01998f · d01998f
2 parents 6ee9d24 + 4e5ced4
commit d01998f
Show file tree

Hide file tree

Showing 5 changed files with 949 additions and 640 deletions.
diff --git a/config/grunt/webpack.js b/config/grunt/webpack.js
@@ -1,11 +1,11 @@
 const { resolve } = require('path');
-const { optimize: { UglifyJsPlugin } } = require('webpack');
 
 module.exports = {
     default: {
         entry: {
             worker: './build/es2015/module.js'
         },
+        mode: 'production',
         module: {
             rules: [ {
                 exclude: /node_modules\/(?!dashify)/,
@@ -37,13 +37,6 @@ module.exports = {
             filename: '[name].min.js',
             path: resolve('build/es5')
         },
-        plugins: [
-            new UglifyJsPlugin({
-                output: {
-                    comments: false
-                }
-            })
-        ],
         target: 'webworker'
     }
 };
diff --git a/config/karma/config-integration.js b/config/karma/config-integration.js
@@ -33,13 +33,14 @@ module.exports = (config) => {
         },
 
         webpack: {
+            mode: 'development',
             module: {
-                loaders: [
-                    {
-                        loader: 'ts-loader',
-                        test: /\.ts?$/
+                rules: [ {
+                    test: /\.ts?$/,
+                    use: {
+                        loader: 'ts-loader'
                     }
-                ]
+                } ]
             },
             resolve: {
                 extensions: [ '.js', '.ts' ]

diff --git a/config/karma/config-unit.js b/config/karma/config-unit.js
@@ -59,13 +59,14 @@ module.exports = (config) => {
         },
 
         webpack: {
+            mode: 'development',
             module: {
-                loaders: [
-                    {
-                        loader: 'ts-loader',
-                        test: /\.ts?$/
+                rules: [ {
+                    test: /\.ts?$/,
+                    use: {
+                        loader: 'ts-loader'
                     }
-                ]
+                } ]
             },
             resolve: {
                 extensions: [ '.js', '.ts' ]