refactor: remove redundant arg computation in config resolver (#1821)

* refactor: remove redundant computation in config resolver

Author: anshumanv

packages/webpack-cli/__tests__/ConfigGroup/ConfigGroup.test.js

@@ -7,14 +7,10 @@ const promiseConfig = require('./webpack.promise.config.cjs');
 
 describe('ConfigGroup', function () {
     it('should handle merge properly', async () => {
-        const result = await ConfigGroup([
-            {
-                merge: true,
-            },
-            {
-                config: [resolve(__dirname, './webpack.config.cjs')],
-            },
-        ]);
+        const result = await ConfigGroup({
+            merge: true,
+            config: [resolve(__dirname, './webpack.config.cjs')],
+        });
 
         const expectedOptions = {
             output: { filename: './dist-commonjs.js', libraryTarget: 'commonjs' },
@@ -29,31 +25,31 @@ describe('ConfigGroup', function () {
     });
 
     it('should return array for multiple config', async () => {
-        const result = await ConfigGroup([
-            { config: [resolve(__dirname, './webpack.config1.cjs'), resolve(__dirname, './webpack.config2.cjs')] },
-        ]);
+        const result = await ConfigGroup({
+            config: [resolve(__dirname, './webpack.config1.cjs'), resolve(__dirname, './webpack.config2.cjs')],
+        });
         const expectedOptions = [config1, config2];
         expect(result.options).toEqual(expectedOptions);
         expect(result.outputOptions).toEqual({});
     });
 
     it('should return config object for single config', async () => {
-        const result = await ConfigGroup([{ config: [resolve(__dirname, './webpack.config1.cjs')] }]);
+        const result = await ConfigGroup({ 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 ConfigGroup({ 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([
-            { config: [resolve(__dirname, './webpack.promise.config.cjs'), resolve(__dirname, './webpack.config.cjs')] },
-        ]);
+        const result = await ConfigGroup({
+            config: [resolve(__dirname, './webpack.promise.config.cjs'), resolve(__dirname, './webpack.config.cjs')],
+        });
         const resolvedPromiseConfig = await promiseConfig();
         const expectedOptions = [resolvedPromiseConfig, ...arrayConfig];
         expect(result.options).toEqual(expectedOptions);

packages/webpack-cli/lib/groups/ConfigGroup.js

@@ -3,7 +3,6 @@ const { resolve, sep, dirname, extname } = require('path');
 const webpackMerge = require('webpack-merge');
 const { extensions, jsVariants } = require('interpret');
 const rechoir = require('rechoir');
-const { arrayToObject } = require('../utils/arg-utils');
 const ConfigError = require('../utils/errors/ConfigError');
 const logger = require('../utils/logger');
 
@@ -141,7 +140,7 @@ const resolveConfigFiles = async (args) => {
 // Given config data, determines the type of config and
 // returns final config
 const finalize = async (moduleObj, args) => {
-    const { argv, env, configName } = args;
+    const { env, configName } = args;
     const newOptionsObject = {
         outputOptions: {},
         options: {},
@@ -161,7 +160,7 @@ const finalize = async (moduleObj, args) => {
                 return envObject;
             }, {});
         }
-        const newOptions = configOptions(formattedEnv, argv);
+        const newOptions = configOptions(formattedEnv, args);
         // When config function returns a promise, resolve it, if not it's resolved by default
         newOptionsObject['options'] = await Promise.resolve(newOptions);
     } else if (Array.isArray(configOptions) && configName) {
@@ -217,9 +216,8 @@ const resolveConfigMerging = async (args) => {
 };
 
 const handleConfigResolution = async (args) => {
-    const parsedArgs = arrayToObject(args);
-    await resolveConfigFiles(parsedArgs);
-    await resolveConfigMerging(parsedArgs);
+    await resolveConfigFiles(args);
+    await resolveConfigMerging(args);
     return opts;
 };
 

packages/webpack-cli/lib/webpack-cli.js

@@ -71,10 +71,7 @@ class WebpackCLI extends GroupHelper {
      * @returns {void}
      */
     async _handleConfig(parsedArgs) {
-        const { mode } = parsedArgs;
-        // get config group values from the map
-        const value = this.groupMap.get(groups.CONFIG_GROUP) || [];
-        const resolvedConfig = await handleConfigResolution([...value, { mode }, { argv: parsedArgs }]);
+        const resolvedConfig = await handleConfigResolution(parsedArgs);
         this._mergeOptionsToConfiguration(resolvedConfig.options);
         this._mergeOptionsToOutputConfiguration(resolvedConfig.outputOptions);
     }