cache is on by default

sokra · sokra · commit 11ebc2159312 · 2014-03-21T16:08:35.000+01:00
disable it with cache: false resp. --no-cache @petehunt
diff --git a/bin/config-optimist.js b/bin/config-optimist.js
@@ -45,7 +45,7 @@ module.exports = function(optimist) {
 
 	.string("target").describe("target")
 
-	.boolean("cache").describe("cache")
+	.boolean("cache").describe("cache").default("cache", true)
 
 	.boolean("watch").alias("watch", "w").describe("watch")
 
diff --git a/bin/convert-argv.js b/bin/convert-argv.js
@@ -52,13 +52,19 @@ module.exports = function(optimist, argv, convertOptions) {
 
 	function mapArgToBoolean(name, optionName) {
 		ifBooleanArg(name, function() {
-			options[optionName] = true;
+			options[optionName || name] = true;
+		});
+	}
+
+	function mapArgToBooleanInverse(name, optionName) {
+		ifArg(name, function(bool) {
+			if(!bool) options[optionName || name] = false;
 		});
 	}
 
 	function mapArgToPath(name, optionName) {
 		ifArg(name, function(str) {
-			options[optionName] = path.resolve(str);
+			options[optionName || name] = path.resolve(str);
 		});
 	}
 
@@ -228,8 +234,8 @@ module.exports = function(optimist, argv, convertOptions) {
 		options.target = value;
 	});
 
-	mapArgToBoolean("cache", "cache");
-	mapArgToBoolean("watch", "watch");
+	mapArgToBooleanInverse("cache");
+	mapArgToBoolean("watch");
 
 	ifArg("watch-delay", function(value) {
 		options.watchDelay = value;
@@ -241,7 +247,7 @@ module.exports = function(optimist, argv, convertOptions) {
 		options.plugins.push(new HotModuleReplacementPlugin());
 	});
 
-	mapArgToBoolean("debug", "debug");
+	mapArgToBoolean("debug");
 
 	ifBooleanArg("progress", function() {
 		var ProgressPlugin = require("../lib/ProgressPlugin");
@@ -358,9 +364,9 @@ module.exports = function(optimist, argv, convertOptions) {
 		options.plugins.push(loadPlugin(value));
 	});
 
-	mapArgToBoolean("bail", "bail");
+	mapArgToBoolean("bail");
 
-	mapArgToBoolean("profile", "profile");
+	mapArgToBoolean("profile");
 
 	if(!options.output || !options.output.filename) {
 		ensureObject(options, "output");
diff --git a/lib/WebpackOptionsDefaulter.js b/lib/WebpackOptionsDefaulter.js
@@ -8,6 +8,7 @@ function WebpackOptionsDefaulter() {
 	OptionsDefaulter.call(this);
 	this.set("debug", false);
 	this.set("devtool", false);
+	this.set("cache", true);
 
 	this.set("context", process.cwd());
 	this.set("target", "web");
