cli: allow array value for --ouput-library (#559)

* cli: allow array value for --ouput-library. Fixes #557 * tests(bin): add test case for regression
webpack · Aug 2, 2018 · 6014ec8 · 6014ec8
1 parent 0c3d2b4
commit 6014ec8
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 2 deletions.
diff --git a/bin/config-yargs.js b/bin/config-yargs.js
@@ -137,7 +137,7 @@ module.exports = function(yargs) {
 				group: OUTPUT_GROUP
 			},
 			"output-library": {
-				type: "string",
+				type: "array",
 				describe: "Expose the exports of the entry point as library",
 				group: OUTPUT_GROUP,
 				requiresArg: true

diff --git a/bin/convert-argv.js b/bin/convert-argv.js
@@ -441,7 +441,10 @@ module.exports = function(...args) {
 
 		ifArg("output-library", function(value) {
 			ensureObject(options, "output");
-			options.output.library = value;
+			if (!options.output.library) {
+				options.output.library = [];
+			}
+			options.output.library.push(value);
 		});
 
 		ifArg("output-library-target", function(value) {

diff --git a/test/binCases/output/output-library-many/index.js b/test/binCases/output/output-library-many/index.js
@@ -0,0 +1 @@
+module.exports = "index";
diff --git a/test/binCases/output/output-library-many/stdin.js b/test/binCases/output/output-library-many/stdin.js
@@ -0,0 +1,12 @@
+"use strict";
+
+module.exports = function testAssertions(code, stdout, stderr) {
+	expect(code).toBe(0);
+	expect(stdout).toEqual(expect.anything());
+	expect(stdout[5]).toContain("bundle.js");
+	expect(stdout[7]).toMatch(/index\.js.*\{0\}/);
+	expect(stderr).toHaveLength(0);
+
+	const output = require("fs").readFileSync(require("path").join(__dirname, "../../../js/bin/output/output-library-many/bundle.js"), "utf-8");
+	expect(output).toContain("window.key1=window.key1||{},window.key1.key2=function");
+};
diff --git a/test/binCases/output/output-library-many/test.opts b/test/binCases/output/output-library-many/test.opts
@@ -0,0 +1,5 @@
+./index.js
+-o ../../../js/bin/output/output-library-many/bundle.js
+--target async-node
+--output-library-target window
+--output-library key1 --output-library key2
diff --git a/test/binCases/output/output-library-single/index.js b/test/binCases/output/output-library-single/index.js
@@ -0,0 +1 @@
+module.exports = "index";
diff --git a/test/binCases/output/output-library-single/stdin.js b/test/binCases/output/output-library-single/stdin.js
@@ -0,0 +1,12 @@
+"use strict";
+
+module.exports = function testAssertions(code, stdout, stderr) {
+	expect(code).toBe(0);
+	expect(stdout).toEqual(expect.anything());
+	expect(stdout[5]).toContain("bundle.js");
+	expect(stdout[7]).toMatch(/index\.js.*\{0\}/);
+	expect(stderr).toHaveLength(0);
+
+	const output = require("fs").readFileSync(require("path").join(__dirname, "../../../js/bin/output/output-library-single/bundle.js"), "utf-8");
+	expect(output).toContain("window.key1=function");
+};
diff --git a/test/binCases/output/output-library-single/test.opts b/test/binCases/output/output-library-single/test.opts
@@ -0,0 +1,5 @@
+./index.js
+-o ../../../js/bin/output/output-library-single/bundle.js
+--target async-node
+--output-library-target window
+--output-library key1