Fix webpack build

Author: kirjs

package.json

@@ -7,7 +7,7 @@
     "test": "webpack && mocha test/unit",
     "e2e": "nightwatch test/e2e/e2e-launcher.js -e local --config nightwatch.js ",
     "e2e-sc": "nightwatch test/e2e/e2e-launcher.js -e saucelabs --config nightwatch.js ",
-    "build": "webpack && webpack -p && webpack -b && webpack -p -b",
+    "build": "webpack && webpack --env.p && webpack --env.b && webpack --env.p --env.b",
     "demo": "cd demo && webpack &&  sh generate-contents.sh && ../node_modules/.bin/webpack-dev-server --content-base dist/",
     "prepublish": "npm run build && npm run copy-bundles",
     "copy-bundles": "sh ./src/copy-bundles.sh",

webpack.config.js

@@ -1,95 +1,101 @@
 const path = require('path');
 
-/**
- * If -p flag is set, minify the files
- * @type {boolean}
- */
-const src = (process.argv.indexOf('-p') === -1);
-const filenamePostfix = src ? '.src' : '';
 
-/**
- * If -b flag is set, build bundles, and not exclude highcharts from the build
- * @type {boolean}
- */
-const bundles = (process.argv.indexOf('-b') !== -1);
-const bundlePrefix = (bundles ? 'bundle/' : '');
+module.exports = function (env) {
+    env = env || {};
 
 
-const highchartsExternals = {
-    'highcharts/highmaps': {
-        root: 'Highcharts',
-        commonjs2: 'highcharts/highmaps',
-        commonjs: 'highcharts/highmaps',
-        amd: 'highcharts/highmaps'
-    },
-    'highcharts/highstock': {
-        root: 'Highcharts',
-        commonjs2: 'highcharts/highstock',
-        commonjs: 'highcharts/highstock',
-        amd: 'highcharts/highstock'
-    },
-    'highcharts': {
-        root: 'Highcharts',
-        commonjs2: 'highcharts',
-        commonjs: 'highcharts',
-        amd: 'highcharts'
-    }
-};
+    /**
+     * If -p flag is set, minify the files
+     * @type {boolean}
+     */
+    const src = !env.p;
+    const filenamePostfix = src ? '.src' : '';
 
-const reactExternals = {
-    react: {
-        root: 'React',
-        commonjs2: 'react',
-        commonjs: 'react',
-        amd: 'react'
-    },
-    'react-dom': {
-        root: 'ReactDOM',
-        commonjs2: 'react-dom',
-        commonjs: 'react-dom',
-        amd: 'react-dom'
-    }
-};
+    /**
+     * If -b flag is set, build bundles, and not exclude highcharts from the build
+     * @type {boolean}
+     */
+    const bundles = env.b;
+    const bundlePrefix = (bundles ? 'bundle/' : '');
+
+
+    const highchartsExternals = {
+        'highcharts/highmaps': {
+            root: 'Highcharts',
+            commonjs2: 'highcharts/highmaps',
+            commonjs: 'highcharts/highmaps',
+            amd: 'highcharts/highmaps'
+        },
+        'highcharts/highstock': {
+            root: 'Highcharts',
+            commonjs2: 'highcharts/highstock',
+            commonjs: 'highcharts/highstock',
+            amd: 'highcharts/highstock'
+        },
+        'highcharts': {
+            root: 'Highcharts',
+            commonjs2: 'highcharts',
+            commonjs: 'highcharts',
+            amd: 'highcharts'
+        }
+    };
+
+    const reactExternals = {
+        react: {
+            root: 'React',
+            commonjs2: 'react',
+            commonjs: 'react',
+            amd: 'react'
+        },
+        'react-dom': {
+            root: 'ReactDOM',
+            commonjs2: 'react-dom',
+            commonjs: 'react-dom',
+            amd: 'react-dom'
+        }
+    };
 
-const externals = [reactExternals];
+    const externals = [reactExternals];
 
-externals.push(highchartsExternals);
+    externals.push(highchartsExternals);
 
 
-module.exports = {
-    entry: {
-        // Array syntax to workaround https://github.com/webpack/webpack/issues/300
-        'index': ['./src/ReactHighcharts.jsx'],
-        'ReactHighcharts': ['./src/ReactHighcharts.jsx'],
-        'ReactHighstock': ['./src/Highstock.jsx'],
-        'ReactHighmaps': ['./src/Highmaps.jsx'],
-        'RedrawOnPrint': ['./src/RedrawOnPrint.jsx']
-    },
-    module: {
-        rules: [
-            {
-                test: /\.jsx$/,
-                use: [{
-                    loader: 'babel-loader',
-                    query: {
-                        cacheDirectory: true,
-                        presets: ['react', 'es2015', 'stage-2']
-                    }
-                }],
+    return {
+        entry: {
+            // Array syntax to workaround https://github.com/webpack/webpack/issues/300
+            'index': ['./src/ReactHighcharts.jsx'],
+            'ReactHighcharts': ['./src/ReactHighcharts.jsx'],
+            'ReactHighstock': ['./src/Highstock.jsx'],
+            'ReactHighmaps': ['./src/Highmaps.jsx'],
+            'RedrawOnPrint': ['./src/RedrawOnPrint.jsx']
+        },
+        module: {
+            rules: [
+                {
+                    test: /\.jsx$/,
+                    use: [{
+                        loader: 'babel-loader',
+                        query: {
+                            cacheDirectory: true,
+                            presets: ['react', 'es2015', 'stage-2']
+                        }
+                    }],
 
 
-            }
-        ]
-    },
-    externals: externals,
-    resolve: {
-        modules: [
-            "node_modules"
-        ]
-    },
-    output: {
-        filename: 'dist/' + bundlePrefix + '[name]' + filenamePostfix + '.js',
-        libraryTarget: 'umd',
-        library: '[name]'
+                }
+            ]
+        },
+        externals: externals,
+        resolve: {
+            modules: [
+                "node_modules"
+            ]
+        },
+        output: {
+            filename: 'dist/' + bundlePrefix + '[name]' + filenamePostfix + '.js',
+            libraryTarget: 'umd',
+            library: '[name]'
+        }
     }
 };