Merge pull request webpack#5520 from civalin/bugfix/cli-watch-poll

sokra · web-flow · commit 1c6637b3868f · 2017-08-21T12:17:19.000+02:00
fix: cli --watch-poll not accept number correctly
diff --git a/bin/config-yargs.js b/bin/config-yargs.js
@@ -172,7 +172,7 @@ module.exports = function(yargs) {
 				requiresArg: true
 			},
 			"watch-poll": {
-				type: "boolean",
+				type: "string",
 				describe: "The polling interval for watching (also enable polling)",
 				group: ADVANCED_GROUP
 			},
diff --git a/bin/convert-argv.js b/bin/convert-argv.js
@@ -166,12 +166,12 @@ module.exports = function(yargs, argv, convertOptions) {
 			options.watchOptions.aggregateTimeout = +argv["watch-aggregate-timeout"];
 		}
 
-		if(argv["watch-poll"]) {
+		if(typeof argv["watch-poll"] !== undefined) {
 			options.watchOptions = options.watchOptions || {};
-			if(typeof argv["watch-poll"] !== "boolean")
-				options.watchOptions.poll = +argv["watch-poll"];
-			else
+			if(argv["watch-poll"] === "true" || argv["watch-poll"] === "")
 				options.watchOptions.poll = true;
+			else if(!isNaN(argv["watch-poll"]))
+				options.watchOptions.poll = +argv["watch-poll"];
 		}
 
 		if(argv["watch-stdin"]) {
