Merge pull request #109 from nextcloud/dependabot/npm_and_yarn/webpack-4.1.0

Bump webpack from 3.11.0 to 4.1.0

js/webpack.base.config.js

@@ -18,16 +18,12 @@ module.exports = {
 	},
 	module: {
 		rules: [
-			{test: /davclient/, use: 'exports-loader?dav'},
 			{
 				test: /\.html$/, loader: "handlebars-loader", query: {
 					extensions: '.html',
 					helperDirs: __dirname + '/templatehelpers'
 				}
 			}
-		],
-		loaders: [
-			{test: /ical/, loader: 'exports-loader?ICAL'}
 		]
 	}
 };

js/webpack.prod.config.js

@@ -9,7 +9,9 @@ module.exports = merge(baseConfig, {
 				'NODE_ENV': JSON.stringify('production')
 			}
 		}),
-		new webpack.optimize.UglifyJsPlugin(), // Minify everything
-		new webpack.optimize.AggressiveMergingPlugin()// Merge chunks
+		new webpack.optimize.AggressiveMergingPlugin(), // Merge chunks
+		new webpack.LoaderOptionsPlugin({
+			minimize: true
+		})
 	]
 });

package.json

@@ -26,12 +26,13 @@
     "karma-sourcemap-loader": "^0.3.7",
     "karma-webpack": "^2.0.13",
     "underscore": "^1.8.3",
-    "webpack": "^3.11.0",
+    "webpack": "^4.1.0",
+    "webpack-cli": "^2.0.10",
     "webpack-merge": "^4.1.2"
   },
   "scripts": {
-    "build": "./node_modules/webpack/bin/webpack.js --config js/webpack.prod.config.js",
-    "dev": "./node_modules/webpack/bin/webpack.js --config js/webpack.dev.config.js --watch",
+    "build": "./node_modules/webpack-cli/bin/webpack.js --mode production --config js/webpack.prod.config.js",
+    "dev": "./node_modules/webpack-cli/bin/webpack.js --mode development --config js/webpack.dev.config.js --watch",
     "test": "./node_modules/karma/bin/karma start karma.conf.js --single-run"
   },
   "repository": {