Use same signature for webpack.dev.js and webpack.prod.js

camptocamp · Dec 12, 2018 · 8531beb · 8531beb
1 parent c4e92a7
commit 8531beb
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 13 deletions.
diff --git a/buildtools/webpack.dev.js b/buildtools/webpack.dev.js
@@ -15,15 +15,17 @@ const loaderOptionsPlugin = new webpack.LoaderOptionsPlugin({
   debug: false
 });
 
-
-module.exports = {
-  mode: 'development',
-  output: {
-    filename: '[name].js'
-  },
-  module: {
-    rules: [
-      resourcesRule,
-    ]
-  },
-};
+// Same signature as for webpack.prod.js
+module.exports = function(_) {
+  return {
+    mode: 'development',
+    output: {
+      filename: '[name].js'
+    },
+    module: {
+      rules: [
+        resourcesRule,
+      ]
+    },
+  };
+}
diff --git a/buildtools/webpack.prod.js b/buildtools/webpack.prod.js
@@ -24,6 +24,7 @@ const fontRule = {
   }
 };
 
+// Same signature as for webpack.dev.js
 module.exports = function(UglifyJsPluginCache) {
   return {
     mode: 'production',

diff --git a/karma-conf.js b/karma-conf.js
@@ -6,7 +6,8 @@ var isDebug = process.argv.some(function(argument) {
 
 const webpackMerge = require('webpack-merge');
 const commons = require('./buildtools/webpack.commons');
-let webpackConfig = commons.config();
+let webpackConfig = commons.config({}, false);
+
 webpackConfig = webpackMerge(webpackConfig, require('./buildtools/webpack.dev'));
 webpackConfig = webpackMerge(webpackConfig, {
   devtool: 'inline-source-map',