feat: support array-configs

evenstensberg · evenstensberg · commit fa9d5c22b414 · 2019-09-28T08:04:08.000+02:00
diff --git a/.eslintignore b/.eslintignore
@@ -11,10 +11,14 @@ test/**/cliEntry.js
 test/**/foo.js
 test/**/**/**/bin/
 test/**/**/**/binary/
+test/**/dist/
+test/**/**/dist/
+test/**/**/**/dist/
 test/binCases/config-location/webpack-babel-config/bin/es6.js
 packages/**/*.js
 packages/utils/validate-identifier.ts
 
 # TODO removeme
 
-lib
+lib
+testy
diff --git a/.gitignore b/.gitignore
@@ -28,6 +28,9 @@ test/**/bin/
 test/**/**/bin/
 test/**/**/**/bin/
 test/config/**/binary/**
+test/**/dist
+test/**/**/dist
+test/**/**/**/dist
 # lerna log
 lerna-debug.log
 
diff --git a/lib/bootstrap.js b/lib/bootstrap.js
@@ -68,10 +68,9 @@ async function runCLI(cli, commandIsUsed) {
                 const newArgKeys = Object.keys(argsMap).filter(arg => !keysToDelete.includes(argsMap[arg].pos));
                 process.argv = newArgKeys;
                 args = cmdArgs(core, { stopAtFirstUnknown: false, partial: true });
-                const result = await cli.run(args, core);
-                if (!result) {
-                    return;
-                }
+                
+                await cli.run(args, core);
+                console.log('\n')
                 process.cliLogger.warn(`duplicate flags found, defaulting to last set value`);
             }
             else {
diff --git a/lib/groups/config.js b/lib/groups/config.js
@@ -101,10 +101,7 @@ class ConfigGroup extends GroupHelper {
             configOptions = resolvedConfigurationFiles;
         }
         if (configOptions.length > 0) {
-            const merge = require('webpack-merge');
-            this.opts['options'] = configOptions.reduce( (prev, curr) => {
-                return merge(prev, curr);
-            }, {});
+            this.opts['options'] = configOptions;
         } 
         else if(typeof configOptions === 'function') {
             const newOptions = await configOptions();
diff --git a/lib/utils/compiler.js b/lib/utils/compiler.js
@@ -3,12 +3,72 @@ const fs = require('fs');
 const chalk = require('chalk');
 const Table = require('cli-table3');
 
+
+function setUpHookForCompiler(compiler, outputOptions, options) {
+    compiler.hooks.beforeRun.tap('webpackProgress', compilation => {
+        if (outputOptions.progress) {
+            let tmp_msg;
+            const defaultProgressPluginHandler = (percent, msg, addInfo) => {
+                percent = Math.floor(percent * 100);
+                if (percent === 100) {
+                    msg = 'Compilation completed';
+                }
+
+                if (msg && tmp_msg != msg) {
+                    process.cliLogger.info(percent + '% ' + msg);
+                }
+                tmp_msg = msg;
+            };
+            if (!progressPluginExists) {
+                new ProgressPlugin(defaultProgressPluginHandler).apply(compiler);
+            } else {
+                if (!progressPluginExists.handler) {
+                    options.plugins = options.plugins.filter(e => e !== progressPluginExists);
+                    Object.keys(progressPluginExists).map(opt => {
+                        ProgressPlugin.defaultOptions[opt] = progressPluginExists[opt];
+                    });
+                    new ProgressPlugin(defaultProgressPluginHandler).apply(compiler);
+                } else {
+                    progressPluginExists.apply(compiler);
+                }
+            }
+        }
+    });
+
+    if (outputOptions.infoVerbosity === 'verbose') {
+        if (outputOptions.watch) {
+            compiler.hooks.watchRun.tap('WebpackInfo', compilation => {
+                const compilationName = compilation.name ? compilation.name : '';
+                process.cliLogger.info('Compilation ' + compilationName + ' starting…');
+            });
+        } else {
+            compiler.hooks.beforeRun.tap('WebpackInfo', compilation => {
+                const compilationName = compilation.name ? compilation.name : '';
+                process.cliLogger.info('Compilation ' + compilationName + ' starting…');
+            });
+        }
+        compiler.hooks.done.tap('WebpackInfo', compilation => {
+            const compilationName = compilation.name ? compilation.name : '';
+            process.cliLogger.info('Compilation ' + compilationName + ' finished');
+        });
+    }
+}
+
 function showEmojiConditionally() {
     return (process.stdout.isTTY && process.platform === 'darwin')
 }
 
 function generateOutput(outputOptions, stats, statsErrors) {
     const statsObj = stats.toJson(outputOptions);
+    if(statsObj.children && statsObj.children.length) {
+        statsObj.children.forEach(child => {
+            generateOutputForSingleCompilation(child, statsErrors);
+        });
+        return;
+    }
+    generateOutputForSingleCompilation(statsObj, statsErrors);
+}
+function generateOutputForSingleCompilation(statsObj, statsErrors) {
     const { assets, entrypoints, time, builtAt, warnings, outputPath } = statsObj;
 
     const visibleEmojies = showEmojiConditionally() ? ['✅', '🌏', '⚒️ ', '⏱ ', '📂']: new Array(5).fill('');
@@ -140,54 +200,14 @@ async function webpackInstance(opts, shouldUseMem) {
         const interactive = require('./interactive');
         return interactive(options, outputOptions, processingErrors, shouldUseMem);
     }
-
-    compiler.hooks.beforeRun.tap('webpackProgress', compilation => {
-        if (outputOptions.progress) {
-            let tmp_msg;
-            const defaultProgressPluginHandler = (percent, msg, addInfo) => {
-                percent = Math.floor(percent * 100);
-                if (percent === 100) {
-                    msg = 'Compilation completed';
-                }
-
-                if (msg && tmp_msg != msg) {
-                    process.cliLogger.info(percent + '% ' + msg);
-                }
-                tmp_msg = msg;
-            };
-            if (!progressPluginExists) {
-                new ProgressPlugin(defaultProgressPluginHandler).apply(compiler);
-            } else {
-                if (!progressPluginExists.handler) {
-                    options.plugins = options.plugins.filter(e => e !== progressPluginExists);
-                    Object.keys(progressPluginExists).map(opt => {
-                        ProgressPlugin.defaultOptions[opt] = progressPluginExists[opt];
-                    });
-                    new ProgressPlugin(defaultProgressPluginHandler).apply(compiler);
-                } else {
-                    progressPluginExists.apply(compiler);
-                }
-            }
-        }
-    });
-
-    if (outputOptions.infoVerbosity === 'verbose') {
-        if (outputOptions.watch) {
-            compiler.hooks.watchRun.tap('WebpackInfo', compilation => {
-                const compilationName = compilation.name ? compilation.name : '';
-                process.cliLogger.info('Compilation ' + compilationName + ' starting…');
-            });
-        } else {
-            compiler.hooks.beforeRun.tap('WebpackInfo', compilation => {
-                const compilationName = compilation.name ? compilation.name : '';
-                process.cliLogger.info('Compilation ' + compilationName + ' starting…');
-            });
-        }
-        compiler.hooks.done.tap('WebpackInfo', compilation => {
-            const compilationName = compilation.name ? compilation.name : '';
-            process.cliLogger.info('Compilation ' + compilationName + ' finished');
-        });
+    if(compiler.compilers) {
+        compiler.compilers.forEach((comp, idx) => {
+            setUpHookForCompiler(comp, outputOptions, options[idx]);
+        })
+    } else {
+        setUpHookForCompiler(compiler, outputOptions, options);
     }
+
     if (outputOptions.watch) {
         const watchOptions = outputOptions.watchOptions || {};
         if (watchOptions.stdin) {
diff --git a/lib/utils/zero-config.js b/lib/utils/zero-config.js
@@ -1,10 +1,18 @@
-module.exports = function(groupResult, isDevMode) {
+function mergeObjectOrArrayConfig(defaults, config) {
+    const merge = require('webpack-merge');
+    if(Array.isArray(config)) {
+        return config.map(arrayObject => merge(defaults, arrayObject));
+    }
+    return merge(defaults, config);
+}
+
+module.exports = function(webpackObject, isDevMode) {
     if (!isDevMode) {
         const prodConfig = require('./prod-config');
-        groupResult.options = require('webpack-merge')(prodConfig, groupResult.options);
+        webpackObject.options = mergeObjectOrArrayConfig(prodConfig, webpackObject.options);
     } else {
         const devConfig = require('./dev-config');
-        groupResult.options = require('webpack-merge')(devConfig, groupResult.options);
+        webpackObject.options = mergeObjectOrArrayConfig(devConfig, webpackObject.options);
     }
-    return groupResult;
+    return webpackObject;
 };
diff --git a/lib/webpack-cli.js b/lib/webpack-cli.js
@@ -33,6 +33,7 @@ class WebpackCLI extends GroupHelper {
 
     checkDefaults(groupResult) {
         const { options } = groupResult;
+        // TODO: check defaults for array configs as well
         if (options.entry && options.entry === './index.js') {
             const normalizedEntry = resolve(options.entry);
             if (!existsSync(normalizedEntry)) {
@@ -97,9 +98,23 @@ class WebpackCLI extends GroupHelper {
             }
 
             groupResult.outputOptions = Object.assign(groupObject.outputOptions, e.outputOptions);
-
+            if(Array.isArray(e.options)) {
+                const defaultArrayOptions = e.options.map(arrayConfigObject => {
+                    return webpackMerge(groupResult.options, arrayConfigObject);
+                })
+                groupResult.options = defaultArrayOptions;
+                return;
+            }
+            if(Array.isArray(groupResult.options)) {
+                const defaultArrayOptions = groupResult.options.map(arrayConfigObject => {
+                    return webpackMerge(e.options, arrayConfigObject);
+                })
+                groupResult.options = defaultArrayOptions;
+                return;
+            }
             groupResult.options = webpackMerge(groupResult.options, e.options);
         });
+        // TODO: Arrays needs to be searched for this first then default back to cli
         const isDevMode = groupResult.outputOptions['dev'];
         const wrappedConfig = require('./utils/zero-config')(groupResult, isDevMode);
         return wrappedConfig;
diff --git a/test/config/type/array/array-config.test.js b/test/config/type/array/array-config.test.js
@@ -7,11 +7,15 @@ describe('array configuration', () => {
     it('is able to understand a configuration file in array format', done => {
         const { stdout } = run(__dirname, ['-c', resolve(__dirname, 'webpack.config.js')], false);
         const summary = extractSummary(stdout);
-        const outputDir = 'type/array/binary';
+        const outputDir = 'type/array/dist';
         const outDirectoryFromCompiler = summary['Output Directory'].split(sep);
         const outDirToMatch = outDirectoryFromCompiler.slice(outDirectoryFromCompiler.length - 3, outDirectoryFromCompiler.length).join('/');
         expect(outDirToMatch).toContain(outputDir);
-        stat(resolve(__dirname, './binary/chunk_norris.js'), (err, stats) => {
+        stat(resolve(__dirname, './dist/dist-commonjs.js'), (err, stats) => {
+            expect(err).toBe(null);
+            expect(stats.isFile()).toBe(true);
+        });
+        stat(resolve(__dirname, './dist/dist-amd.js'), (err, stats) => {
             expect(err).toBe(null);
             expect(stats.isFile()).toBe(true);
             done();
diff --git a/test/config/type/array/webpack.config.js b/test/config/type/array/webpack.config.js
@@ -1,17 +1,22 @@
 module.exports = [
     {
-        entry: './a',
         output: {
-            path: __dirname + '/binary',
-            filename: 'coconut.js',
+            filename: './dist-amd.js',
+            libraryTarget: 'amd',
         },
+        name: 'amd',
+        entry: './a.js',
+        mode: 'production',
+        devtool: 'eval-module',
     },
     {
         output: {
-            chunkFilename: 'chunk_norris.js',
-        },
-        optimization: {
-            runtimeChunk: true,
+            filename: './dist-commonjs.js',
+            libraryTarget: 'commonjs',
         },
+        name: 'commonjs',
+        entry: './a.js',
+        mode: 'production',
+        target: 'node',
     },
 ];

Original file line number	Diff line number	Diff line change
`@@ -101,10 +101,7 @@ class ConfigGroup extends GroupHelper {`
`101`	`101`	`configOptions = resolvedConfigurationFiles;`
`102`	`102`	`}`
`103`	`103`	`if (configOptions.length > 0) {`
`104`		`- const merge = require('webpack-merge');`
`105`		`- this.opts['options'] = configOptions.reduce( (prev, curr) => {`
`106`		`- return merge(prev, curr);`
`107`		`- }, {});`
	`104`	`+ this.opts['options'] = configOptions;`
`108`	`105`	`}`
`109`	`106`	`else if(typeof configOptions === 'function') {`
`110`	`107`	`const newOptions = await configOptions();`