fix: defer setting default entry to core

webpack · Oct 3, 2020 · fdaf30d · fdaf30d
1 parent 6f49e96
commit fdaf30d
Show file tree

Hide file tree

Showing 21 changed files with 11 additions and 29 deletions.
diff --git a/...ages/webpack-cli/__tests__/serve/index.js → .../webpack-cli/__tests__/serve/src/index.js b/...ages/webpack-cli/__tests__/serve/index.js → .../webpack-cli/__tests__/serve/src/index.js
diff --git a/packages/webpack-cli/lib/webpack-cli.js b/packages/webpack-cli/lib/webpack-cli.js
@@ -1,18 +1,18 @@
-const path = require('path');
-const { existsSync } = require('fs');
-const { options } = require('colorette');
 const webpackMerge = require('webpack-merge');
+const { options } = require('colorette');
 const GroupHelper = require('./utils/GroupHelper');
+const { Compiler } = require('./utils/Compiler');
+const { groups, core } = require('./utils/cli-flags');
+const argParser = require('./utils/arg-parser');
+const { outputStrategy } = require('./utils/merge-strategies');
+const { toKebabCase } = require('./utils/helpers');
+
+// CLI arg resolvers
 const handleConfigResolution = require('./groups/ConfigGroup');
 const resolveMode = require('./groups/resolveMode');
 const resolveStats = require('./groups/resolveStats');
 const resolveOutput = require('./groups/resolveOutput');
-const { Compiler } = require('./utils/Compiler');
-const { groups, core } = require('./utils/cli-flags');
 const basicResolver = require('./groups/basicResolver');
-const { toKebabCase } = require('./utils/helpers');
-const argParser = require('./utils/arg-parser');
-const { outputStrategy } = require('./utils/merge-strategies');
 
 class WebpackCLI extends GroupHelper {
     constructor() {
@@ -199,23 +199,6 @@ class WebpackCLI extends GroupHelper {
         }
     }
 
-    /**
-     * Get the defaultEntry for merge with config rightly
-     * @private
-     * @returns {void}
-     */
-    _handleDefaultEntry() {
-        let defaultEntry;
-        const rootIndexPath = path.resolve('index.js');
-        if (existsSync(rootIndexPath)) {
-            defaultEntry = './index.js';
-        } else {
-            defaultEntry = './src/index.js';
-        }
-        const options = { entry: defaultEntry };
-        this._mergeOptionsToConfiguration(options);
-    }
-
     /**
      * It runs in a fancy order all the expected groups.
      * Zero config and configuration goes first.
@@ -225,7 +208,6 @@ class WebpackCLI extends GroupHelper {
      */
     async runOptionGroups(parsedArgs) {
         await Promise.resolve()
-            .then(() => this._handleDefaultEntry())
             .then(() => this._handleConfig(parsedArgs))
             .then(() => this._baseResolver(resolveMode, parsedArgs, this.compilerConfiguration))
             .then(() => this._baseResolver(resolveOutput, parsedArgs, {}, outputStrategy))

diff --git a/test/config/defaults/basic-config/default-js-config.test.js b/test/config/defaults/basic-config/default-js-config.test.js
@@ -6,7 +6,7 @@ describe('Zero Config', () => {
     it('runs when config is present but not supplied via flag', () => {
         const { stdout, stderr, exitCode } = run(__dirname, [], false);
         // default entry should be used
-        expect(stdout).toContain('./index.js');
+        expect(stdout).toContain('./src/index.js');
         // should pick up the output path from config
         expect(stdout).toContain('test-output');
         if (!isWebpack5) {

diff --git a/test/config/defaults/basic-config/index.js → ...config/defaults/basic-config/src/index.js b/test/config/defaults/basic-config/index.js → ...config/defaults/basic-config/src/index.js
diff --git a/test/config/defaults/cjs-config/default-cjs-config.test.js b/test/config/defaults/cjs-config/default-cjs-config.test.js
@@ -6,7 +6,7 @@ describe('Default Config:', () => {
     it('Should be able to pick cjs config by default', () => {
         const { stdout, stderr, exitCode } = run(__dirname, [], false);
         // default entry should be used
-        expect(stdout).toContain('./index.js');
+        expect(stdout).toContain('./src/index.js');
         // should pick up the output path from config
         expect(stdout).toContain('test-output');
         if (!isWebpack5) {

diff --git a/test/config/defaults/cjs-config/index.js → test/config/defaults/cjs-config/src/index.js b/test/config/defaults/cjs-config/index.js → test/config/defaults/cjs-config/src/index.js
diff --git a/test/defaults/index.js → test/defaults/src/index.js b/test/defaults/index.js → test/defaults/src/index.js
diff --git a/test/entry/defaults-index/index.js → test/entry/defaults-index/src/index.js b/test/entry/defaults-index/index.js → test/entry/defaults-index/src/index.js
diff --git a/test/env/array/index.js → test/env/array/src/index.js b/test/env/array/index.js → test/env/array/src/index.js
diff --git a/test/env/object/index.js → test/env/object/src/index.js b/test/env/object/index.js → test/env/object/src/index.js
diff --git a/test/hot/index.js → test/hot/src/index.js b/test/hot/index.js → test/hot/src/index.js
diff --git a/test/json/index.js → test/json/src/index.js b/test/json/index.js → test/json/src/index.js
diff --git a/test/mode/mode-with-config/index.js → test/mode/mode-with-config/src/index.js b/test/mode/mode-with-config/index.js → test/mode/mode-with-config/src/index.js
diff --git a/test/name/index.js → test/name/src/index.js b/test/name/index.js → test/name/src/index.js
diff --git a/test/optimization/index.js → test/optimization/src/index.js b/test/optimization/index.js → test/optimization/src/index.js
diff --git a/test/progress/index.js → test/progress/src/index.js b/test/progress/index.js → test/progress/src/index.js
diff --git a/test/serve/basic/index.js → test/serve/basic/src/index.js b/test/serve/basic/index.js → test/serve/basic/src/index.js
diff --git a/test/serve/with-custom-port/index.js → test/serve/with-custom-port/src/index.js b/test/serve/with-custom-port/index.js → test/serve/with-custom-port/src/index.js
diff --git a/test/target/flag-test/index.js → test/target/flag-test/src/index.js b/test/target/flag-test/index.js → test/target/flag-test/src/index.js
diff --git a/test/utils/index.js → test/utils/src/index.js b/test/utils/index.js → test/utils/src/index.js
diff --git a/test/zero-config/entry-absent/zero-config.test.js b/test/zero-config/entry-absent/zero-config.test.js
@@ -4,7 +4,7 @@ describe('Zero Config tests', () => {
     it('runs when config and entry are both absent', () => {
         const { stdout, stderr } = run(__dirname, [], false);
         // Entry file is absent, should log the Error from the compiler
-        expect(stdout).toContain("Error: Can't resolve './src/index.js'");
+        expect(stdout).toContain("Error: Can't resolve './src'");
         expect(stderr).toBeFalsy();
     });
 });