Merge pull request webpack#4305 from rrharvey/feature/multi-entry-cli

sokra · web-flow · commit 57825153e531 · 2017-02-22T15:03:52.000+01:00
allow mutli-file entry via CLI
diff --git a/bin/convert-argv.js b/bin/convert-argv.js
@@ -275,7 +275,11 @@ module.exports = function(yargs, argv, convertOptions) {
 		}
 
 		ifArgPair("entry", function(name, entry) {
-			options.entry[name] = entry;
+			if(typeof options.entry[name] !== "undefined" && options.entry[name] !== null) {
+				options.entry[name] = [].concat(options.entry[name]).concat(entry);
+			} else {
+				options.entry[name] = entry;
+			}
 		}, function() {
 			ensureObject(options, "entry");
 		});
diff --git a/test/binCases/entry/multi-file/a.js b/test/binCases/entry/multi-file/a.js
@@ -0,0 +1 @@
+module.exports = "fileA";
diff --git a/test/binCases/entry/multi-file/index.js b/test/binCases/entry/multi-file/index.js
@@ -0,0 +1 @@
+module.exports = "index";
diff --git a/test/binCases/entry/multi-file/test.js b/test/binCases/entry/multi-file/test.js
@@ -0,0 +1,13 @@
+"use strict";
+
+module.exports = function testAssertions(code, stdout, stderr) {
+	code.should.be.exactly(0);
+
+	stdout.should.be.ok();
+	stdout[4].should.containEql("null.js");
+	stdout[5].should.match(/a\.js.*\{0\}/);
+	stdout[6].should.match(/index\.js.*\{0\}/);
+	stdout[7].should.match(/multi.*index\.js.*a\.js/); // should have multi-file entry
+	stderr.should.be.empty();
+};
+
diff --git a/test/binCases/entry/multi-file/test.opts b/test/binCases/entry/multi-file/test.opts
@@ -0,0 +1 @@
+--entry ./a.js
diff --git a/test/binCases/entry/multi-file/webpack.config.js b/test/binCases/entry/multi-file/webpack.config.js
@@ -0,0 +1 @@
+module.exports = {};
diff --git a/test/binCases/entry/named-entry/a.js b/test/binCases/entry/named-entry/a.js
@@ -0,0 +1 @@
+module.exports = "fileA";
diff --git a/test/binCases/entry/named-entry/index.js b/test/binCases/entry/named-entry/index.js
@@ -0,0 +1 @@
+module.exports = "index";
diff --git a/test/binCases/entry/named-entry/test.js b/test/binCases/entry/named-entry/test.js
@@ -0,0 +1,13 @@
+"use strict";
+
+module.exports = function testAssertions(code, stdout, stderr) {
+	code.should.be.exactly(0);
+
+	stdout.should.be.ok();
+	stdout[4].should.containEql("null.js");
+	stdout[5].should.containEql("foo.js"); // named entry from --entry foo=./a.js
+	stdout[6].should.match(/a\.js.*\{1\}/);
+	stdout[7].should.match(/index\.js.*\{0\}/);
+	stderr.should.be.empty();
+};
+
diff --git a/test/binCases/entry/named-entry/test.opts b/test/binCases/entry/named-entry/test.opts
@@ -0,0 +1 @@
+--entry foo=./a.js
diff --git a/test/binCases/entry/named-entry/webpack.config.js b/test/binCases/entry/named-entry/webpack.config.js
@@ -0,0 +1 @@
+module.exports = {};
diff --git a/test/binCases/entry/non-hyphenated-args/a.js b/test/binCases/entry/non-hyphenated-args/a.js
@@ -0,0 +1 @@
+module.exports = "fileA";
diff --git a/test/binCases/entry/non-hyphenated-args/index.js b/test/binCases/entry/non-hyphenated-args/index.js
@@ -0,0 +1 @@
+module.exports = "index";
diff --git a/test/binCases/entry/non-hyphenated-args/test.js b/test/binCases/entry/non-hyphenated-args/test.js
@@ -0,0 +1,13 @@
+"use strict";
+
+module.exports = function testAssertions(code, stdout, stderr) {
+	code.should.be.exactly(0);
+
+	stdout.should.be.ok();
+	stdout[4].should.containEql("null.js");
+	stdout[5].should.containEql("main.js"); // non-hyphenated arg ./a.js should create chunk "main"
+	stdout[6].should.match(/a\.js.*\{1\}/); // a.js should be in chunk 1
+	stdout[7].should.match(/index\.js.*\{0\}/); // index.js should be in chunk 0
+	stderr.should.be.empty();
+};
+
diff --git a/test/binCases/entry/non-hyphenated-args/test.opts b/test/binCases/entry/non-hyphenated-args/test.opts
@@ -0,0 +1 @@
+./a.js
diff --git a/test/binCases/entry/non-hyphenated-args/webpack.config.js b/test/binCases/entry/non-hyphenated-args/webpack.config.js
@@ -0,0 +1 @@
+module.exports = {};
