remove deprecated stuff

pateatlau · Nov 20, 2015 · 37e9515 · 37e9515
1 parent 96d3b13
commit 37e9515
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 29 deletions.
diff --git a/bin/convert-argv.js b/bin/convert-argv.js
@@ -128,26 +128,9 @@ module.exports = function(optimist, argv, convertOptions) {
 		}
 
 		if(argv.watch) {
-			// TODO remove this in next major version
-			if(options.watch && typeof options.watch === "object") {
-				console.warn("options.watch is deprecated: Use 'options.watchOptions' instead");
-				options.watchOptions = options.watch;
-			}
-			// TODO remove this in next major version
-			if(options.watchDelay) {
-				console.warn("options.watchDelay is deprecated: Use 'options.watchOptions.aggregateTimeout' instead");
-				options.watchOptions = options.watchOptions || {};
-				options.watchOptions.aggregateTimeout = options.watchDelay;
-			}
 			options.watch = true;
 		}
 
-		if(argv["watch-delay"]) {
-			console.warn("--watch-delay is deprecated: Use '--watch-aggregate-timeout' instead");
-			options.watchOptions = options.watchOptions || {};
-			options.watchOptions.aggregateTimeout = +argv["watch-delay"];
-		}
-
 		if(argv["watch-aggregate-timeout"]) {
 			options.watchOptions = options.watchOptions || {};
 			options.watchOptions.aggregateTimeout = +argv["watch-aggregate-timeout"];
@@ -322,12 +305,6 @@ module.exports = function(optimist, argv, convertOptions) {
 			options.output.path = value;
 		});
 
-		ifArg("output-file", function(value) {
-			console.warn("output.file will be deprecated: Use 'output.filename' instead");
-			ensureObject(options, "output");
-			options.output.filename = value;
-		});
-
 		ifArg("output-filename", function(value) {
 			ensureObject(options, "output");
 			options.output.filename = value;

diff --git a/lib/webpack.js b/lib/webpack.js
@@ -30,12 +30,6 @@ function webpack(options, callback) {
 		if(typeof callback !== "function") throw new Error("Invalid argument: callback");
 		if(options.watch === true) {
 			var watchOptions = (!Array.isArray(options) ? options : options[0]).watchOptions || {};
-			// TODO remove this in next major version
-			var watchDelay = (!Array.isArray(options) ? options : options[0]).watchDelay;
-			if(watchDelay) {
-				console.warn("options.watchDelay is deprecated: Use 'options.watchOptions.aggregateTimeout' instead");
-				watchOptions.aggregateTimeout = watchDelay;
-			}
 			return compiler.watch(watchOptions, callback);
 		}
 		compiler.run(callback);