Merge pull request webpack#7407 from prplx/master

sokra · web-flow · commit 60e107676915 · 2018-06-07T23:40:39.000+02:00
Refactor JsonpMainTemplatePlugin
diff --git a/lib/web/JsonpMainTemplatePlugin.js b/lib/web/JsonpMainTemplatePlugin.js
@@ -32,28 +32,17 @@ class JsonpMainTemplatePlugin {
 			const allPrefetchChunks = chunk.getChildIdsByOrdersMap(true).prefetch;
 			return allPrefetchChunks && Object.keys(allPrefetchChunks).length;
 		};
-		// TODO refactor this
-		if (!mainTemplate.hooks.jsonpScript) {
-			mainTemplate.hooks.jsonpScript = new SyncWaterfallHook([
-				"source",
-				"chunk",
-				"hash"
-			]);
-		}
-		if (!mainTemplate.hooks.linkPreload) {
-			mainTemplate.hooks.linkPreload = new SyncWaterfallHook([
-				"source",
-				"chunk",
-				"hash"
-			]);
-		}
-		if (!mainTemplate.hooks.linkPrefetch) {
-			mainTemplate.hooks.linkPrefetch = new SyncWaterfallHook([
-				"source",
-				"chunk",
-				"hash"
-			]);
-		}
+
+		// TODO webpack 5, no adding to .hooks, use WeakMap and static methods
+		["jsonpScript", "linkPreload", "linkPrefetch"].forEach(hook => {
+			if (!mainTemplate.hooks[hook]) {
+				mainTemplate.hooks[hook] = new SyncWaterfallHook([
+					"source",
+					"chunk",
+					"hash"
+				]);
+			}
+		});
 
 		const getScriptSrcPath = (hash, chunk, chunkIdExpression) => {
 			const chunkFilename = mainTemplate.outputOptions.chunkFilename;
