fix: defer setting default entry to core (#1856)

* fix: defer setting default entry to core

Author: anshumanv

packages/webpack-cli/README.md

@@ -46,7 +46,7 @@ yarn add webpack-cli --dev
   --env string                  Environment passed to the configuration when it is a function
   --name string                 Name of the configuration. Used when loading multiple configurations
   --help                        Outputs list of supported flags
-  -o, --output string           Output location of the file generated by webpack
+  -o, --output-path string      Output location of the generated bundle
   -t, --target string           Sets the build target
   -w, --watch                   Watch for files changes
   -h, --hot                     Enables Hot Module Replacement

packages/webpack-cli/__tests__/serve/index.js renamed to packages/webpack-cli/__tests__/serve/src/index.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() {
@@ -186,23 +186,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.
@@ -212,7 +195,6 @@ class WebpackCLI extends GroupHelper {
      */
     async runOptionGroups(parsedArgs) {
         await Promise.resolve()
-            .then(() => this._handleDefaultEntry())
             .then(() => this._baseResolver(handleConfigResolution, parsedArgs))
             .then(() => this._baseResolver(resolveMode, parsedArgs))
             .then(() => this._baseResolver(resolveOutput, parsedArgs, outputStrategy))

packages/webpack-cli/lib/webpack-cli.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) {

test/config/defaults/basic-config/default-js-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) {