Merge pull request #5300 from pierreneter/patch-1

Fix #5213, set boolean options in config file.
webpack · Jul 23, 2017 · 4874584 · 4874584
2 parents 4c6eb6f + 7c8ad6e
commit 4874584
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 2 deletions.
diff --git a/bin/config-yargs.js b/bin/config-yargs.js
@@ -251,12 +251,14 @@ module.exports = function(yargs) {
 			"bail": {
 				type: "boolean",
 				describe: "Abort the compilation on first error",
-				group: ADVANCED_GROUP
+				group: ADVANCED_GROUP,
+				default: null
 			},
 			"profile": {
 				type: "boolean",
 				describe: "Profile the compilation and include information in stats",
-				group: ADVANCED_GROUP
+				group: ADVANCED_GROUP,
+				default: null
 			},
 			"d": {
 				type: "boolean",

diff --git a/test/binCases/configFile/profile/bar.js b/test/binCases/configFile/profile/bar.js
@@ -0,0 +1 @@
+console.log('bar');
diff --git a/test/binCases/configFile/profile/foo.js b/test/binCases/configFile/profile/foo.js
@@ -0,0 +1,3 @@
+require('./bar');
+
+console.log('foo');
diff --git a/test/binCases/configFile/profile/index.js b/test/binCases/configFile/profile/index.js
@@ -0,0 +1 @@
+const foo = require('./foo');
diff --git a/test/binCases/configFile/profile/test.js b/test/binCases/configFile/profile/test.js
@@ -0,0 +1,12 @@
+"use strict";
+
+module.exports = function testAssertions(code, stdout, stderr) {
+	code.should.be.exactly(0);
+
+	stdout.should.be.ok();
+	stdout[6].should.containEql("factory:");
+	stdout[8].should.containEql("factory:");
+	stdout[10].should.containEql("factory:");
+
+	stderr.should.be.empty();
+};
diff --git a/test/binCases/configFile/profile/webpack.config.js b/test/binCases/configFile/profile/webpack.config.js
@@ -0,0 +1,6 @@
+var path = require("path");
+
+module.exports = {
+	entry: path.resolve(__dirname, "./index"),
+	profile: true
+};