From a09b338b5ffe103277c3a1f141f7fd1fd819d3f6 Mon Sep 17 00:00:00 2001
From: Nitin Kumar <snitin315@gmail.com>
Date: Mon, 2 Nov 2020 12:50:51 +0530
Subject: [PATCH] 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