feat: --entry should override config.entry (#155) (#358)

Author: bitpshr

bin/convert-argv.js

@@ -313,8 +313,8 @@ module.exports = function(...args) {
 			}
 		}
 
-		function ensureObject(parent, name) {
-			if (typeof parent[name] !== "object" || parent[name] === null) {
+		function ensureObject(parent, name, force) {
+			if (force || typeof parent[name] !== "object" || parent[name] === null) {
 				parent[name] = {};
 			}
 		}
@@ -347,7 +347,7 @@ module.exports = function(...args) {
 				}
 			},
 			function() {
-				ensureObject(options, "entry");
+				ensureObject(options, "entry", true);
 			}
 		);
 
@@ -567,12 +567,7 @@ module.exports = function(...args) {
 		mapArgToBoolean("profile");
 
 		if (argv._.length > 0) {
-			if (Array.isArray(options.entry) || typeof options.entry === "string") {
-				options.entry = {
-					main: options.entry
-				};
-			}
-			ensureObject(options, "entry");
+			ensureObject(options, "entry", true);
 
 			const addTo = function addTo(name, entry) {
 				if (options.entry[name]) {

bin/webpack.js

@@ -47,14 +47,13 @@
 		return;
 	}
 
-	const yargs = require("yargs").usage(
-		"webpack-cli " +
-			require("../package.json").version +
-			"\n" +
-			"Usage: https://webpack.js.org/api/cli/\n" +
-			"Usage without config file: webpack <entry> [<entry>] --output [-o] <output>\n" +
-			"Usage with config file: webpack"
-	);
+	const yargs = require("yargs").usage(`webpack-cli ${require("../package.json").version}
+
+Usage: webpack-cli [options]
+       webpack-cli [options] --entry <entry> --output <output>
+       webpack-cli [options] <entries...> --output <output>
+
+For more information, see https://webpack.js.org/api/cli/.`);
 
 	require("./config-yargs")(yargs);
 

test/binCases/entry/non-hyphenated-args/index.js renamed to test/binCases/entry/cli-override/index.js

@@ -0,0 +1,9 @@
+"use strict";
+
+module.exports = function testAssertions(code, stdout, stderr) {
+	expect(code).toBe(0);
+	expect(stdout).toEqual(expect.anything());
+	expect(stdout[5]).toContain("cliEntry.js");
+	expect(stdout[7]).toContain("index.js");
+	expect(stderr).toHaveLength(0);
+};

test/binCases/entry/cli-override/stdin.js

@@ -0,0 +1,4 @@
+--entry cliEntry=./index.js
+--config ./webpack.config.js
+--output-filename [name].js
+--output-chunk-filename [id].chunk.js

test/binCases/entry/cli-override/test.opts

@@ -0,0 +1,7 @@
+const path = require("path");
+
+module.exports = {
+	entry: {
+		configEntry: path.resolve(__dirname, "./index")
+	}
+};

test/binCases/entry/cli-override/webpack.config.js

@@ -4,8 +4,6 @@ module.exports = function testAssertions(code, stdout, stderr) {
 	expect(code).toBe(0);
 	expect(stdout).toEqual(expect.anything());
 	expect(stdout[5]).toContain("main.js"); // non-hyphenated arg ./a.js should create chunk "main"
-	expect(stdout[7]).toContain("null.js");
-	expect(stdout[9]).toMatch(/a\.js.*\{0\}/); // a.js should be in chunk 0
-	expect(stdout[10]).toMatch(/index\.js.*\{1\}/); // index.js should be in chunk 1
+	expect(stdout[7]).toMatch(/a\.js.*\{0\}/); // a.js should be in chunk 0
 	expect(stderr).toHaveLength(0);
 };

test/binCases/entry/non-hyphenated-args/stdin.js

@@ -1,5 +1,4 @@
 ./a.js
---entry ./index.js
 --config ./webpack.config.js
 --output-filename [name].js
 --output-chunk-filename [id].chunk.js