From 75b4242c69e3802fbe17cbb70537bf180ebcb545 Mon Sep 17 00:00:00 2001
From: Nitin Kumar <snitin315@gmail.com>
Date: Sat, 31 Oct 2020 11:08:31 +0530
Subject: [PATCH 1/9] fix: --config-name behaviour for fuctional configs

---
 ...figGroup.test.js => resolveConfig.test.js} | 14 +++---
 .../{ConfigGroup.js => resolveConfig.js}      |  8 +++-
 packages/webpack-cli/lib/webpack-cli.js       |  2 +-
 test/config-name/config-name.test.js          | 47 +++++++++++++++++++
 test/config-name/function-config.js           | 29 ++++++++++++
 5 files changed, 90 insertions(+), 10 deletions(-)
 rename packages/webpack-cli/__tests__/ConfigGroup/{ConfigGroup.test.js => resolveConfig.test.js} (84%)
 rename packages/webpack-cli/lib/groups/{ConfigGroup.js => resolveConfig.js} (95%)
 create mode 100644 test/config-name/function-config.js

diff --git a/packages/webpack-cli/__tests__/ConfigGroup/ConfigGroup.test.js b/packages/webpack-cli/__tests__/ConfigGroup/resolveConfig.test.js
similarity index 84%
rename from packages/webpack-cli/__tests__/ConfigGroup/ConfigGroup.test.js
rename to packages/webpack-cli/__tests__/ConfigGroup/resolveConfig.test.js
index f82ba382478..bee64cc0aec 100644
--- a/packages/webpack-cli/__tests__/ConfigGroup/ConfigGroup.test.js
+++ b/packages/webpack-cli/__tests__/ConfigGroup/resolveConfig.test.js
@@ -1,13 +1,13 @@
-const ConfigGroup = require('../../lib/groups/ConfigGroup');
+const resolveConfig = require('../../lib/groups/resolveConfig.js');
 const { resolve } = require('path');
 const config1 = require('./webpack.config1.cjs');
 const config2 = require('./webpack.config2.cjs');
 const arrayConfig = require('./webpack.config.cjs');
 const promiseConfig = require('./webpack.promise.config.cjs');
 
-describe('ConfigGroup', function () {
+describe('resolveConfig', function () {
     it('should handle merge properly', async () => {
-        const result = await ConfigGroup({
+        const result = await resolveConfig({
             merge: true,
             config: [resolve(__dirname, './webpack.config.cjs')],
         });
@@ -25,7 +25,7 @@ describe('ConfigGroup', function () {
     });
 
     it('should return array for multiple config', async () => {
-        const result = await ConfigGroup({
+        const result = await resolveConfig({
             config: [resolve(__dirname, './webpack.config1.cjs'), resolve(__dirname, './webpack.config2.cjs')],
         });
         const expectedOptions = [config1, config2];
@@ -34,20 +34,20 @@ describe('ConfigGroup', function () {
     });
 
     it('should return config object for single config', async () => {
-        const result = await ConfigGroup({ config: [resolve(__dirname, './webpack.config1.cjs')] });
+        const result = await resolveConfig({ config: [resolve(__dirname, './webpack.config1.cjs')] });
         expect(result.options).toEqual(config1);
         expect(result.outputOptions).toEqual({});
     });
 
     it('should return resolved config object for promise config', async () => {
-        const result = await ConfigGroup({ config: [resolve(__dirname, './webpack.promise.config.cjs')] });
+        const result = await resolveConfig({ config: [resolve(__dirname, './webpack.promise.config.cjs')] });
         const expectedOptions = await promiseConfig();
         expect(result.options).toEqual(expectedOptions);
         expect(result.outputOptions).toEqual({});
     });
 
     it('should handle configs returning different types', async () => {
-        const result = await ConfigGroup({
+        const result = await resolveConfig({
             config: [resolve(__dirname, './webpack.promise.config.cjs'), resolve(__dirname, './webpack.config.cjs')],
         });
         const resolvedPromiseConfig = await promiseConfig();
diff --git a/packages/webpack-cli/lib/groups/ConfigGroup.js b/packages/webpack-cli/lib/groups/resolveConfig.js
similarity index 95%
rename from packages/webpack-cli/lib/groups/ConfigGroup.js
rename to packages/webpack-cli/lib/groups/resolveConfig.js
index beac89662e8..65689645775 100644
--- a/packages/webpack-cli/lib/groups/ConfigGroup.js
+++ b/packages/webpack-cli/lib/groups/resolveConfig.js
@@ -156,6 +156,8 @@ const finalize = async (moduleObj, args) => {
     const isMultiCompilerMode = Array.isArray(config);
     const rawConfigs = isMultiCompilerMode ? config : [config];
 
+    let isFunctionalConfig = false;
+
     let configs = await Promise.all(
         rawConfigs.map(async (rawConfig) => {
             const isPromise = typeof rawConfig.then === 'function';
@@ -166,6 +168,7 @@ const finalize = async (moduleObj, args) => {
 
             // `Promise` may return `Function`
             if (typeof rawConfig === 'function') {
+                isFunctionalConfig = true;
                 // when config is a function, pass the env from args to the config function
                 rawConfig = await rawConfig(env, args);
             }
@@ -176,8 +179,9 @@ const finalize = async (moduleObj, args) => {
 
     if (configName) {
         const foundConfigNames = [];
+        const configsToFilter = isFunctionalConfig ? configs[0] : configs;
 
-        configs = configs.filter((options) => {
+        configs = configsToFilter.filter((options) => {
             const found = configName.includes(options.name);
 
             if (found) {
@@ -204,7 +208,7 @@ const finalize = async (moduleObj, args) => {
         process.exit(2);
     }
 
-    newOptionsObject['options'] = isMultiCompilerMode ? configs : configs[0];
+    newOptionsObject['options'] = isMultiCompilerMode || isFunctionalConfig ? configs : configs[0];
 
     return newOptionsObject;
 };
diff --git a/packages/webpack-cli/lib/webpack-cli.js b/packages/webpack-cli/lib/webpack-cli.js
index 7ea5eef84ce..918af585ebf 100644
--- a/packages/webpack-cli/lib/webpack-cli.js
+++ b/packages/webpack-cli/lib/webpack-cli.js
@@ -11,7 +11,7 @@ const { options: coloretteOptions } = require('colorette');
 const WebpackCLIPlugin = require('./plugins/WebpackCLIPlugin');
 
 // CLI arg resolvers
-const handleConfigResolution = require('./groups/ConfigGroup');
+const handleConfigResolution = require('./groups/resolveConfig');
 const resolveMode = require('./groups/resolveMode');
 const resolveStats = require('./groups/resolveStats');
 const resolveOutput = require('./groups/resolveOutput');
diff --git a/test/config-name/config-name.test.js b/test/config-name/config-name.test.js
index de2fe509af4..deee81523b7 100644
--- a/test/config-name/config-name.test.js
+++ b/test/config-name/config-name.test.js
@@ -81,4 +81,51 @@ describe('--config-name flag', () => {
         expect(stdout).toBeFalsy();
         expect(exitCode).toBe(2);
     });
+
+    it('should work with config as a function', (done) => {
+        const { stderr, stdout, exitCode } = run(__dirname, ['--config', 'function-config.js', '--config-name', 'first'], false);
+        expect(stderr).toBeFalsy();
+        expect(stdout).toContain('first');
+        expect(stdout).not.toContain('second');
+        expect(stdout).not.toContain('third');
+        expect(exitCode).toBe(0);
+
+        stat(resolve(__dirname, './dist/dist-first.js'), (err, stats) => {
+            expect(err).toBe(null);
+            expect(stats.isFile()).toBe(true);
+            done();
+        });
+    });
+
+    it('should work with multiple values for --config-name when the config is a function', (done) => {
+        const { stderr, stdout, exitCode } = run(
+            __dirname,
+            ['--config', 'function-config.js', '--config-name', 'first', '--config-name', 'third'],
+            false,
+        );
+        expect(stderr).toBeFalsy();
+        expect(stdout).toContain('first');
+        expect(stdout).not.toContain('second');
+        expect(stdout).toContain('third');
+        expect(exitCode).toBe(0);
+
+        stat(resolve(__dirname, './dist/dist-third.js'), (err, stats) => {
+            expect(err).toBe(null);
+            expect(stats.isFile()).toBe(true);
+
+            stat(resolve(__dirname, './dist/dist-first.js'), (err, stats) => {
+                expect(err).toBe(null);
+                expect(stats.isFile()).toBe(true);
+                done();
+            });
+        });
+    });
+
+    it('should log error if invalid config name is provided ', () => {
+        const { stderr, stdout, exitCode } = run(__dirname, ['--config', 'function-config.js', '--config-name', 'test'], false);
+
+        expect(stderr).toContain('Configuration with name "test" was not found.');
+        expect(stdout).toBeFalsy();
+        expect(exitCode).toBe(2);
+    });
 });
diff --git a/test/config-name/function-config.js b/test/config-name/function-config.js
new file mode 100644
index 00000000000..eeefbbf66bd
--- /dev/null
+++ b/test/config-name/function-config.js
@@ -0,0 +1,29 @@
+module.exports = () => [
+    {
+        output: {
+            filename: './dist-first.js',
+        },
+        name: 'first',
+        entry: './src/first.js',
+        mode: 'development',
+        stats: 'minimal',
+    },
+    {
+        output: {
+            filename: './dist-second.js',
+        },
+        name: 'second',
+        entry: './src/second.js',
+        mode: 'production',
+        stats: 'minimal',
+    },
+    {
+        output: {
+            filename: './dist-third.js',
+        },
+        name: 'third',
+        entry: './src/third.js',
+        mode: 'none',
+        stats: 'minimal',
+    },
+];

From ed5ff3d40ac2b14214db4602f57c7e904fe65105 Mon Sep 17 00:00:00 2001
From: Nitin Kumar <snitin315@gmail.com>
Date: Mon, 2 Nov 2020 12:50:51 +0530
Subject: [PATCH 2/9] fix: confliclts

---
 .../{ConfigGroup => resolveConfig}/env.webpack.config.cjs       | 0
 .../{ConfigGroup => resolveConfig}/resolveConfig.test.js        | 2 +-
 .../__tests__/{ConfigGroup => resolveConfig}/webpack.config.cjs | 0
 .../{ConfigGroup => resolveConfig}/webpack.config1.cjs          | 0
 .../{ConfigGroup => resolveConfig}/webpack.config2.cjs          | 0
 .../{ConfigGroup => resolveConfig}/webpack.promise.config.cjs   | 0
 6 files changed, 1 insertion(+), 1 deletion(-)
 rename packages/webpack-cli/__tests__/{ConfigGroup => resolveConfig}/env.webpack.config.cjs (100%)
 rename packages/webpack-cli/__tests__/{ConfigGroup => resolveConfig}/resolveConfig.test.js (98%)
 rename packages/webpack-cli/__tests__/{ConfigGroup => resolveConfig}/webpack.config.cjs (100%)
 rename packages/webpack-cli/__tests__/{ConfigGroup => resolveConfig}/webpack.config1.cjs (100%)
 rename packages/webpack-cli/__tests__/{ConfigGroup => resolveConfig}/webpack.config2.cjs (100%)
 rename packages/webpack-cli/__tests__/{ConfigGroup => resolveConfig}/webpack.promise.config.cjs (100%)

diff --git a/packages/webpack-cli/__tests__/ConfigGroup/env.webpack.config.cjs b/packages/webpack-cli/__tests__/resolveConfig/env.webpack.config.cjs
similarity index 100%
rename from packages/webpack-cli/__tests__/ConfigGroup/env.webpack.config.cjs
rename to packages/webpack-cli/__tests__/resolveConfig/env.webpack.config.cjs
diff --git a/packages/webpack-cli/__tests__/ConfigGroup/resolveConfig.test.js b/packages/webpack-cli/__tests__/resolveConfig/resolveConfig.test.js
similarity index 98%
rename from packages/webpack-cli/__tests__/ConfigGroup/resolveConfig.test.js
rename to packages/webpack-cli/__tests__/resolveConfig/resolveConfig.test.js
index bee64cc0aec..4ad49dfab67 100644
--- a/packages/webpack-cli/__tests__/ConfigGroup/resolveConfig.test.js
+++ b/packages/webpack-cli/__tests__/resolveConfig/resolveConfig.test.js
@@ -57,7 +57,7 @@ describe('resolveConfig', function () {
     });
 
     it('should handle different env formats', async () => {
-        const result = await ConfigGroup({
+        const result = await resolveConfig({
             env: { test: true, name: 'Hisoka' },
             config: [resolve(__dirname, './env.webpack.config.cjs')],
         });
diff --git a/packages/webpack-cli/__tests__/ConfigGroup/webpack.config.cjs b/packages/webpack-cli/__tests__/resolveConfig/webpack.config.cjs
similarity index 100%
rename from packages/webpack-cli/__tests__/ConfigGroup/webpack.config.cjs
rename to packages/webpack-cli/__tests__/resolveConfig/webpack.config.cjs
diff --git a/packages/webpack-cli/__tests__/ConfigGroup/webpack.config1.cjs b/packages/webpack-cli/__tests__/resolveConfig/webpack.config1.cjs
similarity index 100%
rename from packages/webpack-cli/__tests__/ConfigGroup/webpack.config1.cjs
rename to packages/webpack-cli/__tests__/resolveConfig/webpack.config1.cjs
diff --git a/packages/webpack-cli/__tests__/ConfigGroup/webpack.config2.cjs b/packages/webpack-cli/__tests__/resolveConfig/webpack.config2.cjs
similarity index 100%
rename from packages/webpack-cli/__tests__/ConfigGroup/webpack.config2.cjs
rename to packages/webpack-cli/__tests__/resolveConfig/webpack.config2.cjs
diff --git a/packages/webpack-cli/__tests__/ConfigGroup/webpack.promise.config.cjs b/packages/webpack-cli/__tests__/resolveConfig/webpack.promise.config.cjs
similarity index 100%
rename from packages/webpack-cli/__tests__/ConfigGroup/webpack.promise.config.cjs
rename to packages/webpack-cli/__tests__/resolveConfig/webpack.promise.config.cjs

From b47a90537835807e666ddcd874a3eb8319ee8b90 Mon Sep 17 00:00:00 2001
From: Nitin Kumar <snitin315@gmail.com>
Date: Mon, 2 Nov 2020 17:25:05 +0530
Subject: [PATCH 3/9] tests: add tests for function config

---
 .../config/function/functional-config.test.js | 40 +++++++++++++++++++
 test/config/function/multi-webpack.config.js  | 20 ++++++++++
 test/config/function/single-webpack.config.js |  9 +++++
 test/config/function/src/first.js             |  1 +
 test/config/function/src/index.js             |  1 +
 test/config/function/src/second.js            |  1 +
 6 files changed, 72 insertions(+)
 create mode 100644 test/config/function/functional-config.test.js
 create mode 100644 test/config/function/multi-webpack.config.js
 create mode 100644 test/config/function/single-webpack.config.js
 create mode 100644 test/config/function/src/first.js
 create mode 100644 test/config/function/src/index.js
 create mode 100644 test/config/function/src/second.js

diff --git a/test/config/function/functional-config.test.js b/test/config/function/functional-config.test.js
new file mode 100644
index 00000000000..ccc79d6aec1
--- /dev/null
+++ b/test/config/function/functional-config.test.js
@@ -0,0 +1,40 @@
+'use strict';
+const { resolve } = require('path');
+const { stat } = require('fs');
+const { run } = require('../../utils/test-utils');
+
+describe('functional config', () => {
+    it('should work as expected in case of single config', (done) => {
+        const { stderr, stdout, exitCode } = run(__dirname, ['--config', resolve(__dirname, 'single-webpack.config.js')]);
+
+        expect(stderr).toBeFalsy();
+        expect(stdout).toContain('./src/index.js');
+        expect(exitCode).toBe(0);
+
+        stat(resolve(__dirname, './bin/dist-single.js'), (err, stats) => {
+            expect(err).toBe(null);
+            expect(stats.isFile()).toBe(true);
+            done();
+        });
+    });
+
+    it('should work as expected in case of multiple config', (done) => {
+        const { stderr, stdout, exitCode } = run(__dirname, ['--config', resolve(__dirname, 'multi-webpack.config.js')]);
+
+        expect(stderr).toBeFalsy();
+        expect(stdout).toContain('first');
+        expect(stdout).toContain('second');
+        expect(exitCode).toBe(0);
+
+        stat(resolve(__dirname, './bin/dist-first.js'), (err, stats) => {
+            expect(err).toBe(null);
+            expect(stats.isFile()).toBe(true);
+            done();
+        });
+        stat(resolve(__dirname, './bin/dist-second.js'), (err, stats) => {
+            expect(err).toBe(null);
+            expect(stats.isFile()).toBe(true);
+            done();
+        });
+    });
+});
diff --git a/test/config/function/multi-webpack.config.js b/test/config/function/multi-webpack.config.js
new file mode 100644
index 00000000000..1ea167bf529
--- /dev/null
+++ b/test/config/function/multi-webpack.config.js
@@ -0,0 +1,20 @@
+module.exports = () => [
+    {
+        output: {
+            filename: './dist-first.js',
+        },
+        name: 'first',
+        entry: './src/first.js',
+        mode: 'development',
+        stats: 'minimal',
+    },
+    {
+        output: {
+            filename: './dist-second.js',
+        },
+        name: 'second',
+        entry: './src/second.js',
+        mode: 'production',
+        stats: 'minimal',
+    },
+];
diff --git a/test/config/function/single-webpack.config.js b/test/config/function/single-webpack.config.js
new file mode 100644
index 00000000000..dbf14dc44c9
--- /dev/null
+++ b/test/config/function/single-webpack.config.js
@@ -0,0 +1,9 @@
+module.exports = () => {
+    return {
+        output: {
+            filename: './dist-single.js',
+        },
+        name: 'single',
+        mode: 'development',
+    };
+};
diff --git a/test/config/function/src/first.js b/test/config/function/src/first.js
new file mode 100644
index 00000000000..5a33e8ffd02
--- /dev/null
+++ b/test/config/function/src/first.js
@@ -0,0 +1 @@
+console.log('first entry');
diff --git a/test/config/function/src/index.js b/test/config/function/src/index.js
new file mode 100644
index 00000000000..398f16d07ee
--- /dev/null
+++ b/test/config/function/src/index.js
@@ -0,0 +1 @@
+console.log('default index');
diff --git a/test/config/function/src/second.js b/test/config/function/src/second.js
new file mode 100644
index 00000000000..3ce234df055
--- /dev/null
+++ b/test/config/function/src/second.js
@@ -0,0 +1 @@
+console.log('second entry');

From 5b7e0633e66088cc8304c6d7d44dd58ab04e4867 Mon Sep 17 00:00:00 2001
From: Nitin Kumar <snitin315@gmail.com>
Date: Mon, 2 Nov 2020 19:00:01 +0530
Subject: [PATCH 4/9] chore: improve logic

---
 packages/webpack-cli/lib/groups/resolveConfig.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/webpack-cli/lib/groups/resolveConfig.js b/packages/webpack-cli/lib/groups/resolveConfig.js
index 65689645775..18d3a5cbca4 100644
--- a/packages/webpack-cli/lib/groups/resolveConfig.js
+++ b/packages/webpack-cli/lib/groups/resolveConfig.js
@@ -179,7 +179,7 @@ const finalize = async (moduleObj, args) => {
 
     if (configName) {
         const foundConfigNames = [];
-        const configsToFilter = isFunctionalConfig ? configs[0] : configs;
+        const configsToFilter = Array.isArray[configs[0]] ? configs[0] : configs;
 
         configs = configsToFilter.filter((options) => {
             const found = configName.includes(options.name);

From 7bc69cffd68653374a9b808a187a55b2795d83e8 Mon Sep 17 00:00:00 2001
From: Nitin Kumar <snitin315@gmail.com>
Date: Tue, 3 Nov 2020 07:35:19 +0530
Subject: [PATCH 5/9] refactor: code

---
 .../webpack-cli/lib/groups/resolveConfig.js   | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/packages/webpack-cli/lib/groups/resolveConfig.js b/packages/webpack-cli/lib/groups/resolveConfig.js
index 18d3a5cbca4..d115b067b2c 100644
--- a/packages/webpack-cli/lib/groups/resolveConfig.js
+++ b/packages/webpack-cli/lib/groups/resolveConfig.js
@@ -156,9 +156,9 @@ const finalize = async (moduleObj, args) => {
     const isMultiCompilerMode = Array.isArray(config);
     const rawConfigs = isMultiCompilerMode ? config : [config];
 
-    let isFunctionalConfig = false;
+    let configs = [];
 
-    let configs = await Promise.all(
+    await Promise.all(
         rawConfigs.map(async (rawConfig) => {
             const isPromise = typeof rawConfig.then === 'function';
 
@@ -168,20 +168,26 @@ const finalize = async (moduleObj, args) => {
 
             // `Promise` may return `Function`
             if (typeof rawConfig === 'function') {
-                isFunctionalConfig = true;
                 // when config is a function, pass the env from args to the config function
                 rawConfig = await rawConfig(env, args);
             }
 
             return rawConfig;
         }),
-    );
+    ).then((allConfigs) => {
+        allConfigs.map((singleConfig) => {
+            if (Array.isArray(singleConfig)) {
+                singleConfig.map((conf) => configs.push(conf));
+            } else {
+                configs.push(singleConfig);
+            }
+        });
+    });
 
     if (configName) {
         const foundConfigNames = [];
-        const configsToFilter = Array.isArray[configs[0]] ? configs[0] : configs;
 
-        configs = configsToFilter.filter((options) => {
+        configs = configs.filter((options) => {
             const found = configName.includes(options.name);
 
             if (found) {
@@ -208,7 +214,7 @@ const finalize = async (moduleObj, args) => {
         process.exit(2);
     }
 
-    newOptionsObject['options'] = isMultiCompilerMode || isFunctionalConfig ? configs : configs[0];
+    newOptionsObject['options'] = isMultiCompilerMode || Array.isArray(configs) ? configs : configs[0];
 
     return newOptionsObject;
 };

From 163972f41a8afbbb7380e8818d0a2f52de71fa3e Mon Sep 17 00:00:00 2001
From: Nitin Kumar <snitin315@gmail.com>
Date: Tue, 3 Nov 2020 08:10:52 +0530
Subject: [PATCH 6/9] refactor: code

---
 packages/webpack-cli/lib/groups/resolveConfig.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/webpack-cli/lib/groups/resolveConfig.js b/packages/webpack-cli/lib/groups/resolveConfig.js
index d115b067b2c..75b72c6809d 100644
--- a/packages/webpack-cli/lib/groups/resolveConfig.js
+++ b/packages/webpack-cli/lib/groups/resolveConfig.js
@@ -214,7 +214,7 @@ const finalize = async (moduleObj, args) => {
         process.exit(2);
     }
 
-    newOptionsObject['options'] = isMultiCompilerMode || Array.isArray(configs) ? configs : configs[0];
+    newOptionsObject['options'] = Array.isArray(configs) && configs.length > 1 ? configs : configs[0];
 
     return newOptionsObject;
 };

From b804b340f5c9f37d9e0fdd51f62f15f8e506f4ae Mon Sep 17 00:00:00 2001
From: Nitin Kumar <snitin315@gmail.com>
Date: Tue, 3 Nov 2020 08:19:40 +0530
Subject: [PATCH 7/9] refactor: code

---
 packages/webpack-cli/lib/groups/resolveConfig.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/webpack-cli/lib/groups/resolveConfig.js b/packages/webpack-cli/lib/groups/resolveConfig.js
index 75b72c6809d..392ab39393d 100644
--- a/packages/webpack-cli/lib/groups/resolveConfig.js
+++ b/packages/webpack-cli/lib/groups/resolveConfig.js
@@ -214,7 +214,7 @@ const finalize = async (moduleObj, args) => {
         process.exit(2);
     }
 
-    newOptionsObject['options'] = Array.isArray(configs) && configs.length > 1 ? configs : configs[0];
+    newOptionsObject['options'] = configs.length > 1 ? configs : configs[0];
 
     return newOptionsObject;
 };

From e175cb331bc16415b180b3f4ec078d76a4490ce3 Mon Sep 17 00:00:00 2001
From: Nitin Kumar <snitin315@gmail.com>
Date: Tue, 3 Nov 2020 17:20:38 +0530
Subject: [PATCH 8/9] refactor: code

---
 .../webpack-cli/lib/groups/resolveConfig.js   | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/webpack-cli/lib/groups/resolveConfig.js b/packages/webpack-cli/lib/groups/resolveConfig.js
index 392ab39393d..ed66ebcca1c 100644
--- a/packages/webpack-cli/lib/groups/resolveConfig.js
+++ b/packages/webpack-cli/lib/groups/resolveConfig.js
@@ -158,7 +158,7 @@ const finalize = async (moduleObj, args) => {
 
     let configs = [];
 
-    await Promise.all(
+    const allConfigs = await Promise.all(
         rawConfigs.map(async (rawConfig) => {
             const isPromise = typeof rawConfig.then === 'function';
 
@@ -174,15 +174,15 @@ const finalize = async (moduleObj, args) => {
 
             return rawConfig;
         }),
-    ).then((allConfigs) => {
-        allConfigs.map((singleConfig) => {
-            if (Array.isArray(singleConfig)) {
-                singleConfig.map((conf) => configs.push(conf));
-            } else {
-                configs.push(singleConfig);
-            }
-        });
-    });
+    );
+
+    for (const singleConfig of allConfigs) {
+        if (Array.isArray(singleConfig)) {
+            configs.push(...singleConfig);
+        } else {
+            configs.push(singleConfig);
+        }
+    }
 
     if (configName) {
         const foundConfigNames = [];

From 60fda0231a39cb2de270f66896ffc235dc3d3cbf Mon Sep 17 00:00:00 2001
From: Nitin Kumar <snitin315@gmail.com>
Date: Tue, 3 Nov 2020 17:46:16 +0530
Subject: [PATCH 9/9] fix: ci

---
 test/config-name/function-config.js | 3 ---
 test/config-name/webpack.config.js  | 2 --
 2 files changed, 5 deletions(-)

diff --git a/test/config-name/function-config.js b/test/config-name/function-config.js
index eeefbbf66bd..ff198656a45 100644
--- a/test/config-name/function-config.js
+++ b/test/config-name/function-config.js
@@ -6,7 +6,6 @@ module.exports = () => [
         name: 'first',
         entry: './src/first.js',
         mode: 'development',
-        stats: 'minimal',
     },
     {
         output: {
@@ -15,7 +14,6 @@ module.exports = () => [
         name: 'second',
         entry: './src/second.js',
         mode: 'production',
-        stats: 'minimal',
     },
     {
         output: {
@@ -24,6 +22,5 @@ module.exports = () => [
         name: 'third',
         entry: './src/third.js',
         mode: 'none',
-        stats: 'minimal',
     },
 ];
diff --git a/test/config-name/webpack.config.js b/test/config-name/webpack.config.js
index 4580e6062d0..3504fa3ae9b 100644
--- a/test/config-name/webpack.config.js
+++ b/test/config-name/webpack.config.js
@@ -6,7 +6,6 @@ module.exports = [
         name: 'first',
         entry: './src/first.js',
         mode: 'development',
-        stats: 'minimal',
     },
     {
         output: {
@@ -15,7 +14,6 @@ module.exports = [
         name: 'second',
         entry: './src/second.js',
         mode: 'production',
-        stats: 'minimal',
     },
     {
         output: {