Merge pull request webpack#6101 from webpack/feature/tapable-upgrade-json-export-main-template-plugin

TheLarkInn · web-flow · commit 30ac70083d50 · 2017-12-22T21:38:05.000-08:00
feat(tapable): upgrade other template plugins
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -47,7 +47,8 @@ module.exports = {
 				"case": { "after": true },
 				"return": { "after": true },
 				"finally": { "after": true },
-				"do": { "after": true }
+				"do": { "after": true },
+				"of": { "after": true }
 			}
 		}],
 		"no-console": "off",
diff --git a/lib/AmdMainTemplatePlugin.js b/lib/AmdMainTemplatePlugin.js
@@ -14,9 +14,12 @@ class AmdMainTemplatePlugin {
 	}
 
 	apply(compilation) {
-		const mainTemplate = compilation.mainTemplate;
+		const {
+			mainTemplate,
+			chunkTemplate
+		} = compilation;
 
-		compilation.templatesPlugin("render-with-entry", (source, chunk, hash) => {
+		const onRenderWithEntry = (source, chunk, hash) => {
 			const externals = chunk.getModules().filter((m) => m.external);
 			const externalsDepsArray = JSON.stringify(externals.map((m) =>
 				typeof m.request === "object" ? m.request.amd : m.request
@@ -39,14 +42,18 @@ class AmdMainTemplatePlugin {
 			} else {
 				return new ConcatSource("define(function() { return ", source, "});");
 			}
-		});
+		};
+
+		for(const template of [mainTemplate, chunkTemplate]) {
+			template.hooks.renderWithEntry.tap("AmdMainTemplatePlugin", onRenderWithEntry);
+		}
 
-		mainTemplate.plugin("global-hash-paths", (paths) => {
+		mainTemplate.hooks.globalHashPaths.tap("AmdMainTemplatePlugin", paths => {
 			if(this.name) paths.push(this.name);
 			return paths;
 		});
 
-		mainTemplate.plugin("hash", (hash) => {
+		mainTemplate.hooks.hash.tap("AmdMainTemplatePlugin", hash => {
 			hash.update("exports amd");
 			hash.update(this.name);
 		});
diff --git a/lib/Compilation.js b/lib/Compilation.js
@@ -220,11 +220,6 @@ class Compilation extends Tapable {
 		return new Stats(this);
 	}
 
-	templatesPlugin(name, fn) {
-		this.mainTemplate.plugin(name, fn);
-		this.chunkTemplate.plugin(name, fn);
-	}
-
 	addModule(module, cacheGroup) {
 		const identifier = module.identifier();
 		const alreadyAddedModule = this._modules.get(identifier);
diff --git a/lib/ExportPropertyMainTemplatePlugin.js b/lib/ExportPropertyMainTemplatePlugin.js
@@ -16,11 +16,20 @@ class ExportPropertyMainTemplatePlugin {
 	}
 
 	apply(compilation) {
-		const mainTemplate = compilation.mainTemplate;
-		compilation.templatesPlugin("render-with-entry", (source, chunk, hash) => {
+		const {
+			mainTemplate,
+			chunkTemplate
+		} = compilation;
+
+		const onRenderWithEntry = (source, chunk, hash) => {
 			const postfix = `${accessorToObjectAccess([].concat(this.property))}`;
 			return new ConcatSource(source, postfix);
-		});
+		};
+
+		for(const template of [mainTemplate, chunkTemplate]) {
+			template.hooks.renderWithEntry.tap("ExportPropertyMainTemplatePlugin", onRenderWithEntry);
+		}
+
 		mainTemplate.hooks.hash.tap("ExportPropertyMainTemplatePlugin", hash => {
 			hash.update("export property");
 			hash.update(`${this.property}`);
diff --git a/lib/SetVarMainTemplatePlugin.js b/lib/SetVarMainTemplatePlugin.js
@@ -13,8 +13,12 @@ class SetVarMainTemplatePlugin {
 	}
 
 	apply(compilation) {
-		const mainTemplate = compilation.mainTemplate;
-		compilation.templatesPlugin("render-with-entry", (source, chunk, hash) => {
+		const {
+			mainTemplate,
+			chunkTemplate
+		} = compilation;
+
+		const onRenderWithEntry = (source, chunk, hash) => {
 			const varExpression = mainTemplate.getAssetPath(this.varExpression, {
 				hash,
 				chunk
@@ -25,12 +29,17 @@ class SetVarMainTemplatePlugin {
 				const prefix = `${varExpression} =\n`;
 				return new ConcatSource(prefix, source);
 			}
-		});
-		mainTemplate.plugin("global-hash-paths", (paths) => {
+		};
+
+		for(const template of [mainTemplate, chunkTemplate]) {
+			template.hooks.renderWithEntry.tap("SetVarMainTemplatePlugin", onRenderWithEntry);
+		}
+
+		mainTemplate.hooks.globalHashPaths.tap("SetVarMainTemplatePlugin", paths => {
 			if(this.varExpression) paths.push(this.varExpression);
 			return paths;
 		});
-		mainTemplate.plugin("hash", hash => {
+		mainTemplate.hooks.hash.tap("SetVarMainTemplatePlugin", hash => {
 			hash.update("set var");
 			hash.update(`${this.varExpression}`);
 			hash.update(`${this.copyObject}`);
diff --git a/lib/UmdMainTemplatePlugin.js b/lib/UmdMainTemplatePlugin.js
@@ -40,8 +40,12 @@ class UmdMainTemplatePlugin {
 	}
 
 	apply(compilation) {
-		const mainTemplate = compilation.mainTemplate;
-		compilation.templatesPlugin("render-with-entry", (source, chunk, hash) => {
+		const {
+			mainTemplate,
+			chunkTemplate
+		} = compilation;
+
+		const onRenderWithEntry = (source, chunk, hash) => {
 			let externals = chunk.getModules().filter(m => m.external && (m.externalType === "umd" || m.externalType === "umd2"));
 			const optionalExternals = [];
 			let requiredExternals = [];
@@ -172,14 +176,20 @@ class UmdMainTemplatePlugin {
 					"	}\n"
 				) +
 				"})(typeof self !== 'undefined' ? self : this, function(" + externalsArguments(externals) + ") {\nreturn ", "webpack/universalModuleDefinition"), source, ";\n})");
-		});
-		mainTemplate.plugin("global-hash-paths", (paths) => {
+		};
+
+		for(const template of [mainTemplate, chunkTemplate]) {
+			template.hooks.renderWithEntry.tap("UmdMainTemplatePlugin", onRenderWithEntry);
+		}
+
+		mainTemplate.hooks.globalHashPaths.tap("UmdMainTemplatePlugin", (paths) => {
 			if(this.names.root) paths = paths.concat(this.names.root);
 			if(this.names.amd) paths = paths.concat(this.names.amd);
 			if(this.names.commonjs) paths = paths.concat(this.names.commonjs);
 			return paths;
 		});
-		mainTemplate.plugin("hash", (hash) => {
+
+		mainTemplate.hooks.hash.tap("UmdMainTemplatePlugin", (hash) => {
 			hash.update("umd");
 			hash.update(`${this.names.root}`);
 			hash.update(`${this.names.amd}`);
diff --git a/lib/web/JsonpExportMainTemplatePlugin.js b/lib/web/JsonpExportMainTemplatePlugin.js
@@ -12,22 +12,29 @@ class JsonpExportMainTemplatePlugin {
 	}
 
 	apply(compilation) {
-		const mainTemplate = compilation.mainTemplate;
+		const {
+			mainTemplate,
+			chunkTemplate
+		} = compilation;
 
-		compilation.templatesPlugin("render-with-entry", (source, chunk, hash) => {
+		const onRenderWithEntry = (source, chunk, hash) => {
 			const name = mainTemplate.getAssetPath(this.name || "", {
-				hash: hash,
-				chunk: chunk
+				hash,
+				chunk
 			});
 			return new ConcatSource(`${name}(`, source, ");");
-		});
+		};
+
+		for(const template of [mainTemplate, chunkTemplate]) {
+			template.hooks.renderWithEntry.tap("JsonpExportMainTemplatePlugin", onRenderWithEntry);
+		}
 
-		mainTemplate.plugin("global-hash-paths", paths => {
+		mainTemplate.hooks.globalHashPaths.tap("JsonpExportMainTemplatePlugin", paths => {
 			if(this.name) paths.push(this.name);
 			return paths;
 		});
 
-		mainTemplate.plugin("hash", hash => {
+		mainTemplate.hooks.hash.tap("JsonpExportMainTemplatePlugin", hash => {
 			hash.update("jsonp export");
 			hash.update(`${this.name}`);
 		});
diff --git a/test/UmdMainTemplatePlugin.unittest.js b/test/UmdMainTemplatePlugin.unittest.js
