fix(tapable): refactored calls to iterator and add some destructuring

TheLarkInn · TheLarkInn · commit 5eee030caece · 2017-12-15T16:14:19.000-08:00
diff --git a/lib/AmdMainTemplatePlugin.js b/lib/AmdMainTemplatePlugin.js
@@ -14,9 +14,13 @@ class AmdMainTemplatePlugin {
 	}
 
 	apply(compilation) {
-		const mainTemplate = compilation.mainTemplate;
+		const { mainTemplate, chunkTemplate } = compilation;
 
-		compilation.tapMainAndChunkTemplates("AmdMainTemplatePlugin", "renderWithEntry", (source, chunk, hash) => {
+		for(const template of[mainTemplate, chunkTemplate]) {
+			template.hooks.renderWithEntry("AmdMainTemplatePlugin", onRenderWithEntry);
+		}
+
+		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,7 +43,7 @@ class AmdMainTemplatePlugin {
 			} else {
 				return new ConcatSource("define(function() { return ", source, "});");
 			}
-		});
+		};
 
 		mainTemplate.hooks.globalHashPaths.tap("AmdMainTemplatePlugin", paths => {
 			if(this.name) paths.push(this.name);
diff --git a/lib/Compilation.js b/lib/Compilation.js
@@ -217,16 +217,6 @@ class Compilation extends Tapable {
 		return new Stats(this);
 	}
 
-	templatesPlugin(name, fn) {
-		this.mainTemplate.plugin(name, fn);
-		this.chunkTemplate.plugin(name, fn);
-	}
-
-	tapMainAndChunkTemplates(pluginName, hookName, fn) {
-		this.mainTemplate.hooks[hookName].tap(pluginName, fn);
-		this.chunkTemplate.hooks[hookName].tap(pluginName, fn);
-	}
-
 	addModule(module, cacheGroup) {
 		const identifier = module.identifier();
 		if(this._modules.get(identifier)) {
diff --git a/lib/ExportPropertyMainTemplatePlugin.js b/lib/ExportPropertyMainTemplatePlugin.js
@@ -16,11 +16,17 @@ class ExportPropertyMainTemplatePlugin {
 	}
 
 	apply(compilation) {
-		const mainTemplate = compilation.mainTemplate;
-		compilation.tapMainAndChunkTemplates("ExportPropertyMainTemplatePlugin", "renderWithEntry", (source, chunk, hash) => {
+		const { mainTemplate, chunkTemplate } = compilation;
+
+		for(const template of[mainTemplate, chunkTemplate]) {
+			template.hooks.renderWithEntry("AmdMainTemplatePlugin", onRenderWithEntry);
+		}
+
+		const onRenderWithEntry = (source, chunk, hash) => {
 			const postfix = `${accessorToObjectAccess([].concat(this.property))}`;
 			return new ConcatSource(source, postfix);
-		});
+		};
+
 		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,13 @@ class SetVarMainTemplatePlugin {
 	}
 
 	apply(compilation) {
-		const mainTemplate = compilation.mainTemplate;
-		compilation.tapMainAndChunkTemplates("SetVarMainTemplatePlugin", "renderWithEntry", (source, chunk, hash) => {
+		const { mainTemplate, chunkTemplate } = compilation;
+
+		for(const template of[mainTemplate, chunkTemplate]) {
+			template.hooks.renderWithEntry("AmdMainTemplatePlugin", onRenderWithEntry);
+		}
+
+		const onRenderWithEntry = (source, chunk, hash) => {
 			const varExpression = mainTemplate.getAssetPath(this.varExpression, {
 				hash,
 				chunk
@@ -25,7 +30,7 @@ class SetVarMainTemplatePlugin {
 				const prefix = `${varExpression} =\n`;
 				return new ConcatSource(prefix, source);
 			}
-		});
+		};
 		mainTemplate.hooks.globalHashPaths.tap("SetVarMainTemplatePlugin", paths => {
 			if(this.varExpression) paths.push(this.varExpression);
 			return paths;
diff --git a/lib/UmdMainTemplatePlugin.js b/lib/UmdMainTemplatePlugin.js
@@ -40,8 +40,13 @@ class UmdMainTemplatePlugin {
 	}
 
 	apply(compilation) {
-		const mainTemplate = compilation.mainTemplate;
-		compilation.tapMainAndChunkTemplates("UmdMainTemplatePlugin", "renderWithEntry", (source, chunk, hash) => {
+		const { mainTemplate, chunkTemplate } = compilation;
+
+		for(const template of[mainTemplate, chunkTemplate]) {
+			template.hooks.renderWithEntry("AmdMainTemplatePlugin", onRenderWithEntry);
+		}
+
+		const onRenderWithEntry = (source, chunk, hash) => {
 			let externals = chunk.getModules().filter(m => m.external && (m.externalType === "umd" || m.externalType === "umd2"));
 			const optionalExternals = [];
 			let requiredExternals = [];
@@ -172,7 +177,7 @@ class UmdMainTemplatePlugin {
 					"	}\n"
 				) +
 				"})(typeof self !== 'undefined' ? self : this, function(" + externalsArguments(externals) + ") {\nreturn ", "webpack/universalModuleDefinition"), source, ";\n})");
-		});
+		};
 		mainTemplate.hooks.globalHasPaths.tap("UmdMainTemplatePlugin", (paths) => {
 			if(this.names.root) paths = paths.concat(this.names.root);
 			if(this.names.amd) paths = paths.concat(this.names.amd);
diff --git a/lib/web/JsonpExportMainTemplatePlugin.js b/lib/web/JsonpExportMainTemplatePlugin.js
@@ -12,15 +12,19 @@ class JsonpExportMainTemplatePlugin {
 	}
 
 	apply(compilation) {
-		const mainTemplate = compilation.mainTemplate;
+		const { mainTemplate, chunkTemplate } = compilation;
 
-		compilation.tapMainAndChunkTemplates("JsonpExportMainTemplatePlugin", "renderWithEntry", (source, chunk, hash) => {
+		for(const template of[mainTemplate, chunkTemplate]) {
+			template.hooks.renderWithEntry("AmdMainTemplatePlugin", onRenderWithEntry);
+		}
+
+		const onRenderWithEntry = (source, chunk, hash) => {
 			const name = mainTemplate.getAssetPath(this.name || "", {
 				hash,
 				chunk
 			});
 			return new ConcatSource(`${name}(`, source, ");");
-		});
+		};
 
 		mainTemplate.hooks.globalHashPaths.tap("JsonpExportMainTemplatePlugin", paths => {
 			if(this.name) paths.push(this.name);
