Move plugins to common configuration.

Author: RubenVerborgh

webpack/webpack.common.config.js

@@ -1,4 +1,5 @@
 const { resolve } = require('path');
+const CleanWebpackPlugin = require('clean-webpack-plugin');
 
 module.exports = ({ outputDir }) => ({
   mode: 'development',
@@ -21,6 +22,9 @@ module.exports = ({ outputDir }) => ({
       },
     ],
   },
+  plugins: [
+    new CleanWebpackPlugin([outputDir]),
+  ],
   externals: {
     'solid-auth-client': ['solid', 'auth'],
   },

webpack/webpack.demo.config.js

@@ -1,26 +1,26 @@
-const common = require('./webpack.common.config');
-const CleanWebpackPlugin = require('clean-webpack-plugin');
-const CopyWebpackPlugin = require('copy-webpack-plugin');
-
 const outputDir = './dist/demo/';
+const common = require('./webpack.common.config')({ outputDir });
+
+const CopyWebpackPlugin = require('copy-webpack-plugin');
 
 const localAssets = [
   'user.html',
 ];
+
 const externalAssets = [
   'solid-auth-client/dist-popup/popup.html',
   'solid-auth-client/dist-lib/solid-auth-client.bundle.js',
   'solid-auth-client/dist-lib/solid-auth-client.bundle.js.map',
 ];
 
-module.exports = Object.assign({
+module.exports = Object.assign({}, common, {
   plugins: [
-    new CleanWebpackPlugin([outputDir]),
+    ...common.plugins,
     new CopyWebpackPlugin(localAssets, { context: 'demo' }),
     new CopyWebpackPlugin(externalAssets.map(a => require.resolve(a))),
   ],
   devServer: {
     index: 'user.html',
     contentBase: outputDir,
   },
-}, common({ outputDir }));
+});

webpack/webpack.lib.config.js

@@ -1,10 +1,4 @@
-const common = require('./webpack.common.config');
-const CleanWebpackPlugin = require('clean-webpack-plugin');
-
 const outputDir = './dist/';
+const common = require('./webpack.common.config')({ outputDir });
 
-module.exports = Object.assign({
-  plugins: [
-    new CleanWebpackPlugin([outputDir]),
-  ],
-}, common({ outputDir }));
+module.exports = Object.assign({}, common);