use new style of passing watch options

sokra · sokra · commit fd4c0042ed0a · 2015-05-10T14:18:12.000+02:00
diff --git a/bin/convert-argv.js b/bin/convert-argv.js
@@ -2,7 +2,7 @@ var path = require("path");
 var fs = require("fs");
 fs.existsSync = fs.existsSync || path.existsSync;
 var resolve = require("enhanced-resolve");
-var interpret = require('interpret');
+var interpret = require("interpret");
 
 module.exports = function(optimist, argv, convertOptions) {
 
@@ -68,18 +68,19 @@ module.exports = function(optimist, argv, convertOptions) {
 	}
 
 	if(argv.context) {
-		options.context = path.resolve(argv.context)
+		options.context = path.resolve(argv.context);
 	}
 	if(!options.context) {
 		options.context = process.cwd();
 	}
 
 	if(argv["watch"]) {
-		options.watch = true;
+		options.doWatch = true;
 	}
 
 	if(argv["watch-delay"]) {
-		options.watchDelay = +argv["watch-delay"];
+		options.watch = options.watch || {};
+		options.watch.aggregateTimeout = +argv["watch-delay"];
 	}
 
 	function processOptions(options) {
@@ -92,7 +93,7 @@ module.exports = function(optimist, argv, convertOptions) {
 				if(finalize) {
 					finalize();
 				}
-			} else if(typeof argv[name] != "undefined") {
+			} else if(typeof argv[name] !== "undefined") {
 				if(init) {
 					init();
 				}
@@ -109,7 +110,7 @@ module.exports = function(optimist, argv, convertOptions) {
 				if(i < 0) {
 					return fn(null, content, idx);
 				} else {
-					return fn(content.substr(0, i), content.substr(i+1), idx);
+					return fn(content.substr(0, i), content.substr(i + 1), idx);
 				}
 			}, init, finalize);
 		}
@@ -468,7 +469,7 @@ module.exports = function(optimist, argv, convertOptions) {
 						addTo("main", content);
 					}
 				} else {
-					addTo(content.substr(0, i), content.substr(i+1));
+					addTo(content.substr(0, i), content.substr(i + 1));
 				}
 			});
 		}
diff --git a/bin/webpack.js b/bin/webpack.js
@@ -12,11 +12,9 @@ try {
 		return require(localWebpack);
 	}
 } catch(e) {}
-var fs = require("fs");
-var util = require("util");
 var optimist = require("optimist")
 	.usage("webpack " + require("../package.json").version + "\n" +
-		"Usage: http://webpack.github.io/docs/cli.html")
+		"Usage: http://webpack.github.io/docs/cli.html");
 
 require("./config-optimist")(optimist);
 
@@ -59,7 +57,7 @@ function ifArg(name, fn, init) {
 	if(Array.isArray(argv[name])) {
 		if(init) init();
 		argv[name].forEach(fn);
-	} else if(typeof argv[name] != "undefined") {
+	} else if(typeof argv[name] !== "undefined") {
 		if(init) init();
 		fn(argv[name], -1);
 	}
@@ -145,16 +143,17 @@ var webpack = require("../lib/webpack.js");
 
 Error.stackTrackLimit = 30;
 var lastHash = null;
-var compiler = webpack(options, function(err, stats) {
-	if(!options.watch) {
+var compiler = webpack(options);
+function compilerCallback(err, stats) {
+	if(!options.doWatch) {
 		// Do not keep cache anymore
 		compiler.purgeInputFileSystem();
 	}
 	if(err) {
 		lastHash = null;
 		console.error(err.stack || err);
 		if(err.details) console.error(err.details);
-		if(!options.watch) {
+		if(!options.doWatch) {
 			process.on("exit", function() {
 				process.exit(1);
 			});
@@ -167,4 +166,8 @@ var compiler = webpack(options, function(err, stats) {
 		lastHash = stats.hash;
 		process.stdout.write(stats.toString(outputOptions) + "\n");
 	}
-});
+}
+if(options.doWatch)
+	compiler.watch(options.watch, compilerCallback);
+else
+	compiler.run(compilerCallback);

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ var path = require("path");`
`2`	`2`	`var fs = require("fs");`
`3`	`3`	`fs.existsSync = fs.existsSync \|\| path.existsSync;`
`4`	`4`	`var resolve = require("enhanced-resolve");`
`5`		`-var interpret = require('interpret');`
	`5`	`+var interpret = require("interpret");`
`6`	`6`
`7`	`7`	`module.exports = function(optimist, argv, convertOptions) {`
`8`	`8`
`@@ -68,18 +68,19 @@ module.exports = function(optimist, argv, convertOptions) {`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`if(argv.context) {`
`71`		`- options.context = path.resolve(argv.context)`
	`71`	`+ options.context = path.resolve(argv.context);`
`72`	`72`	`}`
`73`	`73`	`if(!options.context) {`
`74`	`74`	`options.context = process.cwd();`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`if(argv["watch"]) {`
`78`		`- options.watch = true;`
	`78`	`+ options.doWatch = true;`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`if(argv["watch-delay"]) {`
`82`		`- options.watchDelay = +argv["watch-delay"];`
	`82`	`+ options.watch = options.watch \|\| {};`
	`83`	`+ options.watch.aggregateTimeout = +argv["watch-delay"];`
`83`	`84`	`}`
`84`	`85`
`85`	`86`	`function processOptions(options) {`
`@@ -92,7 +93,7 @@ module.exports = function(optimist, argv, convertOptions) {`
`92`	`93`	`if(finalize) {`
`93`	`94`	`finalize();`
`94`	`95`	`}`
`95`		`- } else if(typeof argv[name] != "undefined") {`
	`96`	`+ } else if(typeof argv[name] !== "undefined") {`
`96`	`97`	`if(init) {`
`97`	`98`	`init();`
`98`	`99`	`}`
`@@ -109,7 +110,7 @@ module.exports = function(optimist, argv, convertOptions) {`
`109`	`110`	`if(i < 0) {`
`110`	`111`	`return fn(null, content, idx);`
`111`	`112`	`} else {`
`112`		`- return fn(content.substr(0, i), content.substr(i+1), idx);`
	`113`	`+ return fn(content.substr(0, i), content.substr(i + 1), idx);`
`113`	`114`	`}`
`114`	`115`	`}, init, finalize);`
`115`	`116`	`}`
`@@ -468,7 +469,7 @@ module.exports = function(optimist, argv, convertOptions) {`
`468`	`469`	`addTo("main", content);`
`469`	`470`	`}`
`470`	`471`	`} else {`
`471`		`- addTo(content.substr(0, i), content.substr(i+1));`
	`472`	`+ addTo(content.substr(0, i), content.substr(i + 1));`
`472`	`473`	`}`
`473`	`474`	`});`
`474`	`475`	`}`