fix: confliclts

webpack · Nov 2, 2020 · a09b338 · a09b338
1 parent 255de67
commit a09b338
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 1 deletion.
diff --git a/...ests__/ConfigGroup/env.webpack.config.cjs → ...ts__/resolveConfig/env.webpack.config.cjs b/...ests__/ConfigGroup/env.webpack.config.cjs → ...ts__/resolveConfig/env.webpack.config.cjs
diff --git a/...tests__/ConfigGroup/resolveConfig.test.js → ...sts__/resolveConfig/resolveConfig.test.js b/...tests__/ConfigGroup/resolveConfig.test.js → ...sts__/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/.../__tests__/ConfigGroup/webpack.config.cjs → ..._tests__/resolveConfig/webpack.config.cjs b/.../__tests__/ConfigGroup/webpack.config.cjs → ..._tests__/resolveConfig/webpack.config.cjs
diff --git a/...__tests__/ConfigGroup/webpack.config1.cjs → ...tests__/resolveConfig/webpack.config1.cjs b/...__tests__/ConfigGroup/webpack.config1.cjs → ...tests__/resolveConfig/webpack.config1.cjs
diff --git a/...__tests__/ConfigGroup/webpack.config2.cjs → ...tests__/resolveConfig/webpack.config2.cjs b/...__tests__/ConfigGroup/webpack.config2.cjs → ...tests__/resolveConfig/webpack.config2.cjs
diff --git a/...__/ConfigGroup/webpack.promise.config.cjs → .../resolveConfig/webpack.promise.config.cjs b/...__/ConfigGroup/webpack.promise.config.cjs → .../resolveConfig/webpack.promise.config.cjs