fix(webpack-cli): to void defaultEntry override the webpack config entry

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

@@ -15,6 +15,7 @@ class BasicGroup extends GroupHelper {
                 }
                 return result;
             }, []);
+        this._excuted = false;
     }
     resolveFlags() {
         const { args } = this;
@@ -33,12 +34,21 @@ class BasicGroup extends GroupHelper {
                 outputOptions.devtool = args[arg];
             }
             if (arg === 'entry') {
-                options[arg] = this.resolveFilePath(args[arg], 'index.js');
+                // first excute, get the default entry to void defaultEntry override config entry
+                if (this._excuted === false) {
+                    if (args[arg] === null)
+                        options[arg] = this.resolveFilePath(args[arg], 'index.js');
+                } else if (this._excuted === true) {
+                    options[arg] = undefined;
+                    if (args[arg] !== null)
+                        options[arg] = this.resolveFilePath(args[arg], 'index.js');
+                }
             }
         });
         if (outputOptions['dev']) {
             outputOptions['prod'] = undefined;
         }
+        this._excuted = true;
     }
 
     run() {

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

@@ -248,6 +248,7 @@ class WebpackCLI extends GroupHelper {
     async runOptionGroups() {
         await Promise.resolve()
             .then(() => this._handleGroupHelper(this.zeroConfigGroup))
+            .then(() => this._handleGroupHelper(this.basicGroup))
             .then(() => this._handleGroupHelper(this.configGroup))
             .then(() => this._handleGroupHelper(this.outputGroup))
             .then(() => this._handleGroupHelper(this.basicGroup))

test/entry/config-entry/1.js

@@ -0,0 +1,11 @@
+const { resolve } = require('path');
+
+module.exports = {
+    entry: {
+        index: '../a.js',
+    },
+    output: {
+        path: resolve(process.cwd(), 'binary'),
+        filename: '[name].bundle.js',
+    },
+};

test/entry/config-entry/entry-with-config/entry-with-config.test.js

@@ -0,0 +1,23 @@
+'use strict';
+const { stat } = require('fs');
+const { resolve } = require('path');
+const { run, extractSummary } = require('../../../utils/test-utils');
+
+describe('single entry with entry in config', () => {
+    it('should use config entry if config entry existed', done => {
+        const { stdout, stderr } = run(__dirname, ['-c', '../1.js'], false);
+        const summary = extractSummary(stdout);
+        const outputDir = 'entry-with-config/binary';
+        // eslint-disable-next-line quotes
+        expect(summary['Output Directory']).toContain(outputDir);
+
+        // eslint-disable-next-line quotes
+        console.log(stderr);
+        expect(stdout).toContain('./a.js');
+        stat(resolve(__dirname, './binary/index.bundle.js'), (err, stats) => {
+            expect(err).toBeFalsy();
+            expect(stats.isFile()).toBe(true);
+            done();
+        });
+    });
+});

test/entry/config-entry/entry-without-config/entry-without-config.test.js

@@ -0,0 +1,22 @@
+'use strict';
+const { stat } = require('fs');
+const { resolve } = require('path');
+const { run, extractSummary } = require('../../../utils/test-utils');
+
+describe('single entry with entry in config', () => {
+    it('should use config entry if config entry existed', done => {
+        const { stdout } = run(__dirname, ['-c', '../1.js', '../index.js'], false);
+        const summary = extractSummary(stdout);
+        const outputDir = 'entry-without-config/binary';
+        // eslint-disable-next-line quotes
+        expect(summary['Output Directory']).toContain(outputDir);
+
+        // eslint-disable-next-line quotes
+        expect(stdout).toContain('./index.js');
+        stat(resolve(__dirname, './binary/main.bundle.js'), (err, stats) => {
+            expect(err).toBeFalsy();
+            expect(stats.isFile()).toBe(true);
+            done();
+        });
+    });
+});