Merge pull request webpack#5066 from webpack/deprecation/webpack-3

sokra · web-flow · commit f39e19a2e3b8 · 2017-09-22T19:47:23.000+02:00
remove deprecated stuff
diff --git a/examples/code-splitted-css-bundle/webpack.config.js b/examples/code-splitted-css-bundle/webpack.config.js
@@ -1,7 +1,7 @@
 var ExtractTextPlugin = require("extract-text-webpack-plugin");
 module.exports = {
 	module: {
-		loaders: [
+		rules: [
 			{
 				test: /\.css$/,
 				use: ExtractTextPlugin.extract({
diff --git a/examples/coffee-script/webpack.config.js b/examples/coffee-script/webpack.config.js
@@ -1,6 +1,6 @@
 module.exports = {
 	module: {
-		loaders: [
+		rules: [
 			{ test: /\.coffee$/, loader: "coffee-loader" }
 		]
 	},
diff --git a/examples/css-bundle/webpack.config.js b/examples/css-bundle/webpack.config.js
@@ -1,7 +1,7 @@
 var ExtractTextPlugin = require("extract-text-webpack-plugin");
 module.exports = {
 	module: {
-		loaders: [
+		rules: [
 			{
 				test: /\.css$/,
 				use: ExtractTextPlugin.extract({
diff --git a/examples/loader/webpack.config.js b/examples/loader/webpack.config.js
@@ -1,6 +1,6 @@
 module.exports = {
 	module: {
-		loaders: [
+		rules: [
 			{ test: /\.css$/, loader: "css-loader" }
 		]
 	}
diff --git a/examples/multiple-entry-points-commons-chunk-css-bundle/webpack.config.js b/examples/multiple-entry-points-commons-chunk-css-bundle/webpack.config.js
@@ -12,7 +12,7 @@ module.exports = {
 		filename: "[name].js"
 	},
 	module: {
-		loaders: [
+		rules: [
 			{
 				test: /\.css$/,
 				use: ExtractTextPlugin.extract({
diff --git a/lib/CachePlugin.js b/lib/CachePlugin.js
@@ -20,26 +20,19 @@ class CachePlugin {
 		} else {
 			const registerCacheToCompiler = (compiler, cache) => {
 				compiler.plugin("this-compilation", compilation => {
-					// TODO remove notCacheable for webpack 4
-					if(!compilation.notCacheable) {
-						compilation.cache = cache;
-						compilation.plugin("child-compiler", (childCompiler, compilerName, compilerIndex) => {
-							if(cache) {
-								let childCache;
-								if(!cache.children) cache.children = {};
-								if(!cache.children[compilerName]) cache.children[compilerName] = [];
-								if(cache.children[compilerName][compilerIndex])
-									childCache = cache.children[compilerName][compilerIndex];
-								else
-									cache.children[compilerName].push(childCache = {});
-								registerCacheToCompiler(childCompiler, childCache);
-							}
-						});
-					} else if(this.watching) {
-						compilation.warnings.push(
-							new Error(`CachePlugin - Cache cannot be used because of: ${compilation.notCacheable}`)
-						);
-					}
+					compilation.cache = cache;
+					compilation.plugin("child-compiler", (childCompiler, compilerName, compilerIndex) => {
+						if(cache) {
+							let childCache;
+							if(!cache.children) cache.children = {};
+							if(!cache.children[compilerName]) cache.children[compilerName] = [];
+							if(cache.children[compilerName][compilerIndex])
+								childCache = cache.children[compilerName][compilerIndex];
+							else
+								cache.children[compilerName].push(childCache = {});
+							registerCacheToCompiler(childCompiler, childCache);
+						}
+					});
 				});
 			};
 			registerCacheToCompiler(compiler, this.cache);
diff --git a/lib/Dependency.js b/lib/Dependency.js
@@ -45,11 +45,6 @@ class Dependency {
 	disconnect() {
 		this.module = null;
 	}
-
-	// TODO: remove in webpack 3
-	compare(a, b) {
-		return compareLocations(a.loc, b.loc);
-	}
 }
 Dependency.compare = (a, b) => compareLocations(a.loc, b.loc);
 
diff --git a/lib/HotModuleReplacement.runtime.js b/lib/HotModuleReplacement.runtime.js
@@ -561,7 +561,6 @@ module.exports = function() {
 								type: "self-accept-error-handler-errored",
 								moduleId: moduleId,
 								error: err2,
-								orginalError: err, // TODO remove in webpack 4
 								originalError: err
 							});
 						}
diff --git a/lib/NormalModule.js b/lib/NormalModule.js
@@ -132,13 +132,10 @@ class NormalModule extends Module {
 			resolve(context, request, callback) {
 				resolver.resolve({}, context, request, callback);
 			},
-			resolveSync(context, request) {
-				return resolver.resolveSync({}, context, request);
-			},
 			emitFile: (name, content, sourceMap) => {
 				this.assets[name] = this.createSourceForAsset(name, content, sourceMap);
 			},
-			options: options,
+			rootContext: options.context,
 			webpack: true,
 			sourceMap: !!this.useSourceMap,
 			_module: this,
diff --git a/lib/NormalModuleFactory.js b/lib/NormalModuleFactory.js
@@ -46,7 +46,7 @@ class NormalModuleFactory extends Tapable {
 	constructor(context, resolvers, options) {
 		super();
 		this.resolvers = resolvers;
-		this.ruleSet = new RuleSet(options.rules || options.loaders);
+		this.ruleSet = new RuleSet(options.rules);
 		this.cachePredicate = typeof options.unsafeCache === "function" ? options.unsafeCache : Boolean.bind(null, options.unsafeCache);
 		this.context = context || "";
 		this.parserCache = {};
diff --git a/lib/OptionsDefaulter.js b/lib/OptionsDefaulter.js
@@ -30,7 +30,7 @@ class OptionsDefaulter {
 	}
 
 	process(options) {
-		// TODO: change this for webpack 4: options = Object.assign({}, options);
+		options = Object.assign({}, options);
 		for(let name in this.defaults) {
 			switch(this.config[name]) {
 				case undefined:
@@ -56,7 +56,7 @@ class OptionsDefaulter {
 					throw new Error("OptionsDefaulter cannot process " + this.config[name]);
 			}
 		}
-		// TODO: change this for webpack 4: return options;
+		return options;
 	}
 
 	set(name, config, def) {
diff --git a/lib/SourceMapDevToolPlugin.js b/lib/SourceMapDevToolPlugin.js
@@ -53,12 +53,8 @@ class SourceMapDevToolPlugin {
 	constructor(options) {
 		if(arguments.length > 1)
 			throw new Error("SourceMapDevToolPlugin only takes one argument (pass an options object)");
-		// TODO: remove in webpack 3
-		if(typeof options === "string") {
-			options = {
-				sourceMapFilename: options
-			};
-		}
+		if(!options || typeof options !== "object")
+			throw new Error("SourceMapDevToolPlugin takes an options argument");
 		if(!options) options = {};
 		this.sourceMapFilename = options.filename;
 		this.sourceMappingURLComment = options.append === false ? false : options.append || "\n//# sourceMappingURL=[url]";
diff --git a/lib/TemplatedPathPlugin.js b/lib/TemplatedPathPlugin.js
@@ -18,17 +18,6 @@ const REGEXP_HASH_FOR_TEST = new RegExp(REGEXP_HASH.source, "i"),
 	REGEXP_CHUNKHASH_FOR_TEST = new RegExp(REGEXP_CHUNKHASH.source, "i"),
 	REGEXP_NAME_FOR_TEST = new RegExp(REGEXP_NAME.source, "i");
 
-// TODO: remove in webpack 3
-// Backwards compatibility; expose regexes on Template object
-const Template = require("./Template");
-Template.REGEXP_HASH = REGEXP_HASH;
-Template.REGEXP_CHUNKHASH = REGEXP_CHUNKHASH;
-Template.REGEXP_NAME = REGEXP_NAME;
-Template.REGEXP_ID = REGEXP_ID;
-Template.REGEXP_FILE = REGEXP_FILE;
-Template.REGEXP_QUERY = REGEXP_QUERY;
-Template.REGEXP_FILEBASE = REGEXP_FILEBASE;
-
 const withHashLength = (replacer, handlerFn) => {
 	return function(_, hashLength) {
 		const length = hashLength && parseInt(hashLength, 10);
diff --git a/lib/optimize/AggressiveMergingPlugin.js b/lib/optimize/AggressiveMergingPlugin.js
@@ -77,14 +77,14 @@ class AggressiveMergingPlugin {
 				if(pair.improvement < minSizeReduce) return;
 
 				if(options.moveToParents) {
-					const commonModules = pair.b.modules.filter((m) => {
-						return pair.a.modules.indexOf(m) >= 0;
+					const commonModules = new Set(pair.b.getModules().filter((m) => {
+						return pair.a.containsModule(m);
+					}));
+					const aOnlyModules = pair.b.getModules().filter((m) => {
+						return !commonModules.has(m);
 					});
-					const aOnlyModules = pair.b.modules.filter((m) => {
-						return commonModules.indexOf(m) < 0;
-					});
-					const bOnlyModules = pair.a.modules.filter((m) => {
-						return commonModules.indexOf(m) < 0;
+					const bOnlyModules = pair.a.getModules().filter((m) => {
+						return !commonModules.has(m);
 					});
 					aOnlyModules.forEach((m) => {
 						pair.b.removeModule(m);
diff --git a/lib/webpack.js b/lib/webpack.js
@@ -22,8 +22,7 @@ function webpack(options, callback) {
 	if(Array.isArray(options)) {
 		compiler = new MultiCompiler(options.map(options => webpack(options)));
 	} else if(typeof options === "object") {
-		// TODO webpack 4: process returns options
-		new WebpackOptionsDefaulter().process(options);
+		options = new WebpackOptionsDefaulter().process(options);
 
 		compiler = new Compiler();
 		compiler.context = options.context;
diff --git a/schemas/webpackOptionsSchema.json b/schemas/webpackOptionsSchema.json
@@ -138,14 +138,6 @@
         "exprContextRequest": {
           "type": "string"
         },
-        "loaders": {
-          "allOf": [
-            {
-              "$ref": "#/definitions/ruleSet-rules"
-            }
-          ],
-          "description": "An array of automatically applied loaders."
-        },
         "noParse": {
           "description": "Don't parse files matching. It's matched against the full resolved request.",
           "anyOf": [
diff --git a/test/Compiler-caching.test.js b/test/Compiler-caching.test.js
@@ -12,7 +12,7 @@ describe("Compiler (caching)", function() {
 	this.timeout(15000);
 
 	function compile(entry, options, callback) {
-		new WebpackOptionsDefaulter().process(options);
+		options = new WebpackOptionsDefaulter().process(options);
 		options.entry = entry;
 		options.context = path.join(__dirname, "fixtures");
 		options.output.path = "/";
diff --git a/test/Compiler.test.js b/test/Compiler.test.js
@@ -12,7 +12,7 @@ const Compiler = require("../lib/Compiler");
 describe("Compiler", () => {
 	function compile(entry, options, callback) {
 		const noOutputPath = !options.output || !options.output.path;
-		new WebpackOptionsDefaulter().process(options);
+		options = new WebpackOptionsDefaulter().process(options);
 		options.entry = entry;
 		options.context = path.join(__dirname, "fixtures");
 		if(noOutputPath) options.output.path = "/";
diff --git a/test/Examples.test.js b/test/Examples.test.js
@@ -33,6 +33,13 @@ describe("Examples", () => {
 					options.output.filename = "output.js";
 				if(!options.entry)
 					options.entry = "./example.js";
+				if(!options.plugins)
+					options.plugins = [];
+				// To support deprecated loaders
+				// TODO remove in webpack 5
+				options.plugins.push(new webpack.LoaderOptionsPlugin({
+					options: {}
+				}));
 			}
 			webpack(options, (err, stats) => {
 				if(err) return done(err);
diff --git a/test/HotTestCases.test.js b/test/HotTestCases.test.js
@@ -33,9 +33,7 @@ describe("HotTestCases", () => {
 					if(fs.existsSync(recordsPath))
 						fs.unlinkSync(recordsPath);
 					const fakeUpdateLoaderOptions = {
-						options: {
-							updateIndex: 0
-						}
+						updateIndex: 0
 					};
 					const configPath = path.join(testDirectory, "webpack.config.js");
 					let options = {};
@@ -87,14 +85,14 @@ describe("HotTestCases", () => {
 						}
 
 						function _next(callback) {
-							fakeUpdateLoaderOptions.options.updateIndex++;
+							fakeUpdateLoaderOptions.updateIndex++;
 							compiler.run((err, stats) => {
 								if(err) return done(err);
 								const jsonStats = stats.toJson({
 									errorDetails: true
 								});
-								if(checkArrayExpectation(testDirectory, jsonStats, "error", "errors" + fakeUpdateLoaderOptions.options.updateIndex, "Error", done)) return;
-								if(checkArrayExpectation(testDirectory, jsonStats, "warning", "warnings" + fakeUpdateLoaderOptions.options.updateIndex, "Warning", done)) return;
+								if(checkArrayExpectation(testDirectory, jsonStats, "error", "errors" + fakeUpdateLoaderOptions.updateIndex, "Error", done)) return;
+								if(checkArrayExpectation(testDirectory, jsonStats, "warning", "warnings" + fakeUpdateLoaderOptions.updateIndex, "Warning", done)) return;
 								if(callback) callback(jsonStats);
 							});
 						}
diff --git a/test/Stats.test.js b/test/Stats.test.js
@@ -31,6 +31,12 @@ describe("Stats", () => {
 				if(!options.context) options.context = path.join(base, testName);
 				if(!options.output) options.output = options.output || {};
 				if(!options.output.path) options.output.path = path.join(outputBase, testName);
+				if(!options.plugins) options.plugins = [];
+				// To support deprecated loaders
+				// TODO remove in webpack 5
+				options.plugins.push(new webpack.LoaderOptionsPlugin({
+					options: {}
+				}));
 			});
 			const c = webpack(options);
 			const compilers = c.compilers ? c.compilers : [c];
diff --git a/test/TestCases.test.js b/test/TestCases.test.js
@@ -141,7 +141,7 @@ describe("TestCases", () => {
 									extensions: [".webpack-loader.js", ".web-loader.js", ".loader.js", ".js"]
 								},
 								module: {
-									loaders: [{
+									rules: [{
 										test: /\.coffee$/,
 										loader: "coffee-loader"
 									}, {
diff --git a/test/configCases/extract-text/issue-14/webpack.config.js b/test/configCases/extract-text/issue-14/webpack.config.js
@@ -5,7 +5,7 @@ module.exports = {
 		__filename: false
 	},
 	module: {
-		loaders: [
+		rules: [
 			{
 				test: /\.css$/,
 				loader: ETP.extract("css-loader")
diff --git a/test/configCases/target/webworker/webpack.config.js b/test/configCases/target/webworker/webpack.config.js
@@ -4,7 +4,7 @@ module.exports = {
 		hints: false
 	},
 	module: {
-		loaders: [
+		rules: [
 			{ test: /\.json$/, loader: "json-loader" }
 		]
 	},
diff --git a/test/hotCases/fake-update-loader.js b/test/hotCases/fake-update-loader.js
@@ -1,6 +1,6 @@
 module.exports = function(source) {
 	this.cacheable(false);
-	var idx = this.options.updateIndex;
+	var idx = this.updateIndex;
 	var items = source.split(/---+\r?\n/g);
 	return items[idx] || items[items.length - 1];
-}
+}
diff --git a/test/statsCases/exclude-with-loader/webpack.config.js b/test/statsCases/exclude-with-loader/webpack.config.js
@@ -13,7 +13,7 @@ module.exports = {
 		]
 	},
 	module: {
-		loaders: [{
+		rules: [{
 			test: /\.txt/,
 			loader: "raw-loader"
 		}, {
diff --git a/test/statsCases/separate-css-bundle/webpack.config.js b/test/statsCases/separate-css-bundle/webpack.config.js
@@ -2,7 +2,7 @@ var path = require("path");
 var ExtractTextPlugin = require("extract-text-webpack-plugin");
 
 var moduleConfig = {
-	loaders: [
+	rules: [
 		{
 			test: /\.css$/,
 			use: ExtractTextPlugin.extract({
diff --git a/test/watchCases/cache/warning-on-not-cacheable/0/index.js b/test/watchCases/cache/warning-on-not-cacheable/0/index.js
diff --git a/test/watchCases/cache/warning-on-not-cacheable/0/warnings.js b/test/watchCases/cache/warning-on-not-cacheable/0/warnings.js
diff --git a/test/watchCases/cache/warning-on-not-cacheable/webpack.config.js b/test/watchCases/cache/warning-on-not-cacheable/webpack.config.js
diff --git a/test/watchCases/plugins/extract-text-plugin/webpack.config.js b/test/watchCases/plugins/extract-text-plugin/webpack.config.js
@@ -2,7 +2,7 @@ var ExtractTextPlugin = require("extract-text-webpack-plugin");
 
 module.exports = {
 	module: {
-		loaders: [
+		rules: [
 			{
 				test: /\.css$/,
 				loader: ExtractTextPlugin.extract({

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`var ExtractTextPlugin = require("extract-text-webpack-plugin");`
`2`	`2`	`module.exports = {`
`3`	`3`	`module: {`
`4`		`- loaders: [`
	`4`	`+ rules: [`
`5`	`5`	`{`
`6`	`6`	`test: /\.css$/,`
`7`	`7`	`use: ExtractTextPlugin.extract({`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`module.exports = {`
`2`	`2`	`module: {`
`3`		`- loaders: [`
	`3`	`+ rules: [`
`4`	`4`	`{ test: /\.coffee$/, loader: "coffee-loader" }`
`5`	`5`	`]`
`6`	`6`	`},`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ module.exports = {`
`12`	`12`	`filename: "[name].js"`
`13`	`13`	`},`
`14`	`14`	`module: {`
`15`		`- loaders: [`
	`15`	`+ rules: [`
`16`	`16`	`{`
`17`	`17`	`test: /\.css$/,`
`18`	`18`	`use: ExtractTextPlugin.extract({`
Original file line number	Diff line number	Diff line change
`@@ -45,11 +45,6 @@ class Dependency {`
`45`	`45`	`disconnect() {`
`46`	`46`	`this.module = null;`
`47`	`47`	`}`
`48`		`-`
`49`		`- // TODO: remove in webpack 3`
`50`		`- compare(a, b) {`
`51`		`- return compareLocations(a.loc, b.loc);`
`52`		`- }`
`53`	`48`	`}`
`54`	`49`	`Dependency.compare = (a, b) => compareLocations(a.loc, b.loc);`
`55`	`50`
Original file line number	Diff line number	Diff line change
`@@ -561,7 +561,6 @@ module.exports = function() {`
`561`	`561`	`type: "self-accept-error-handler-errored",`
`562`	`562`	`moduleId: moduleId,`
`563`	`563`	`error: err2,`
`564`		`- orginalError: err, // TODO remove in webpack 4`
`565`	`564`	`originalError: err`
`566`	`565`	`});`
`567`	`566`	`}`