Properly handle config function return promise of config array

Author: chenesan

index.js

@@ -21,34 +21,36 @@ function notSilent(options) {
 }
 
 function startFarm(config, configPath, options, runWorker, callback) {
-    config = Array.isArray(config) ? config : [config];
-    options = options || {};
-
-    // When in watch mode and a callback is provided start IPC server to invoke callback
-    // once all webpack configurations have been compiled
-    if (options.watch) {
-        startWatchIPCServer(callback, Object.keys(config));
-    }
+    return Promise.resolve(config).then(function(config) {
+        config = Array.isArray(config) ? config : [config];
+        options = options || {};
+
+        // When in watch mode and a callback is provided start IPC server to invoke callback
+        // once all webpack configurations have been compiled
+        if (options.watch) {
+            startWatchIPCServer(callback, Object.keys(config));
+        }
 
-    if(notSilent(options)) {
-        console.log(chalk.blue('[WEBPACK]') + ' Building ' + chalk.yellow(config.length) + ' ' + pluralize('target', config.length));
-    }
+        if(notSilent(options)) {
+            console.log(chalk.blue('[WEBPACK]') + ' Building ' + chalk.yellow(config.length) + ' ' + pluralize('target', config.length));
+        }
 
-    var builds = config.map(function (c, i) {
-        return runWorker(configPath, options, i, config.length);
-    });
-    if(options.bail) {
-        return Promise.all(builds);
-    } else {
-        return Promise.settle(builds).then(function(results) {
-            return Promise.all(results.map(function (result) {
-                if(result.isFulfilled()) {
-                    return result.value();
-                }
-                return Promise.reject(result.reason());
-            }));
+        var builds = config.map(function (c, i) {
+            return runWorker(configPath, options, i, config.length);
         });
-    }
+        if(options.bail) {
+            return Promise.all(builds);
+        } else {
+            return Promise.settle(builds).then(function(results) {
+                return Promise.all(results.map(function (result) {
+                    if(result.isFulfilled()) {
+                        return result.value();
+                    }
+                    return Promise.reject(result.reason());
+                }));
+            });
+        }
+    })
 }
 
 /**

src/__tests__/webpackWorker.spec.js

@@ -162,7 +162,7 @@ describe('webpackWorker', () => {
                     jest.fn()
                 );
                 if (options.multi && options.expectedConfigs < 3) {
-                    const config = promiseMock.resolve.mock.calls[0][0];
+                    const config = promiseMock.resolve.mock.calls[0][0][options.configIndex];
                     expect(config).toEqual({ webpack: 'config'});
                 } else {
                     expect(promiseMock.reject).toHaveBeenLastCalledWith(errorMessage);
@@ -181,6 +181,21 @@ describe('webpackWorker', () => {
             it('should fail if expectedConfigLength dont match with config.length', () => {
                 multiConfigTest({ multi: true, configIndex: 1, expectedConfigs: 3 });
             });
+
+            it('should be able to handle config function return promise of array of config object', () => {
+                jest.doMock('promiseReturnConfigArray', () => Promise.resolve( [{ webpack: 'config'}, { webpack: 'config2'}]), { virtual: true });
+                const configIndex = 1
+                const expectedConfigLength = 2
+                 webpackWorker(
+                    'promiseReturnConfigArray',
+                    { json: true },
+                    configIndex,
+                    expectedConfigLength,
+                    jest.fn()
+                )
+                const config = promiseMock.resolve.mock.calls[1][0];
+                expect(config).toEqual([{ webpack: 'config'}, { webpack: 'config2'}]);
+            })
         })
     });
 

src/webpackWorker.js

@@ -70,24 +70,28 @@ module.exports = function(configuratorFileName, options, index, expectedConfigLe
         process.argv = options.argv;
     }
     chalk.enabled = options.colors;
-    var config = loadConfigurationFile(configuratorFileName),
-        watch = !!options.watch,
-        silent = !!options.json;
-    if(expectedConfigLength !== 1 && !Array.isArray(config)
-            || Array.isArray(config) && config.length !== expectedConfigLength) {
-        if(config.length !== expectedConfigLength) {
-            var errorMessage = '[WEBPACK] There is a difference between the amount of the'
-                + ' provided configs. Maybe you where expecting command line'
-                + ' arguments to be passed to your webpack.config.js. If so,'
-                + " you'll need to separate them with a -- from the parallel-webpack options.";
-            console.error(errorMessage);
-            return Promise.reject(errorMessage);
+    var config = loadConfigurationFile(configuratorFileName)
+
+    Promise.resolve(config).then(function(config) {
+        var watch = !!options.watch,
+            silent = !!options.json;
+        if(expectedConfigLength !== 1 && !Array.isArray(config)
+                || Array.isArray(config) && config.length !== expectedConfigLength) {
+            if(config.length !== expectedConfigLength) {
+                var errorMessage = '[WEBPACK] There is a difference between the amount of the'
+                    + ' provided configs. Maybe you where expecting command line'
+                    + ' arguments to be passed to your webpack.config.js. If so,'
+                    + " you'll need to separate them with a -- from the parallel-webpack options.";
+                console.error(errorMessage);
+                return Promise.reject(errorMessage);
+            }
+        }
+        var webpackConfig;
+        if(Array.isArray(config)) {
+            webpackConfig = config[index];
+        } else {
+            webpackConfig = config
         }
-    }
-    if(Array.isArray(config)) {
-        config = config[index];
-    }
-    Promise.resolve(config).then(function(webpackConfig) {
         var watcher,
             webpack = getWebpack(),
             hasCompletedOneCompile = false,