feat(tapable): convert JsonpMainTemplatePlugin to use .tap

TheLarkInn · TheLarkInn · commit ad10141c381d · 2017-12-22T22:13:13.000-08:00
diff --git a/lib/web/JsonpMainTemplatePlugin.js b/lib/web/JsonpMainTemplatePlugin.js
@@ -16,9 +16,11 @@ class JsonpMainTemplatePlugin {
 			return otherChunksInEntry || onDemandChunks;
 		};
 		// TODO refactor this
-		if(!mainTemplate.hooks.jsonpScript)
+		if(!mainTemplate.hooks.jsonpScript) {
 			mainTemplate.hooks.jsonpScript = new SyncWaterfallHook(["source", "chunk", "hash"]);
-		mainTemplate.plugin("local-vars", (source, chunk) => {
+		}
+
+		mainTemplate.hooks.localVar.tap("JsonpMainTemplatePlugin", (source, chunk) => {
 			if(needChunkLoadingCode(chunk)) {
 				return Template.asString([
 					source,
@@ -35,7 +37,7 @@ class JsonpMainTemplatePlugin {
 			}
 			return source;
 		});
-		mainTemplate.plugin("jsonp-script", (_, chunk, hash) => {
+		mainTemplate.hooks.jsonpScript.tap("JsonpMainTemplatePlugin", (_, chunk, hash) => {
 			const chunkFilename = mainTemplate.outputOptions.chunkFilename;
 			const chunkMaps = chunk.getChunkMaps();
 			const crossOriginLoading = mainTemplate.outputOptions.crossOriginLoading;
@@ -97,7 +99,7 @@ class JsonpMainTemplatePlugin {
 				"};",
 			]);
 		});
-		mainTemplate.plugin("require-ensure", (source, chunk, hash) => {
+		mainTemplate.hooks.requireEnsure.tap("JsonpMainTemplatePlugin", (source, chunk, hash) => {
 			return Template.asString([
 				source,
 				"",
@@ -132,7 +134,7 @@ class JsonpMainTemplatePlugin {
 				"}",
 			]);
 		});
-		mainTemplate.plugin("require-extensions", (source, chunk) => {
+		mainTemplate.hooks.requireExtensions.tap("JsonpMainTemplatePlugin", (source, chunk) => {
 			if(chunk.getNumberOfChunks() === 0) return source;
 
 			return Template.asString([
@@ -142,7 +144,7 @@ class JsonpMainTemplatePlugin {
 				`${mainTemplate.requireFn}.oe = function(err) { console.error(err); throw err; };`
 			]);
 		});
-		mainTemplate.plugin("bootstrap", (source, chunk, hash) => {
+		mainTemplate.hooks.bootstrap.tap("JsonpMainTemplatePlugin", (source, chunk, hash) => {
 			if(needChunkLoadingCode(chunk)) {
 				return Template.asString([
 					source,
@@ -203,7 +205,7 @@ class JsonpMainTemplatePlugin {
 			}
 			return source;
 		});
-		mainTemplate.plugin("startup", (source, chunk, hash) => {
+		mainTemplate.hooks.startup.tap("JsonpMainTemplatePlugin", (source, chunk, hash) => {
 			if(needChunkLoadingCode(chunk)) {
 				var jsonpFunction = mainTemplate.outputOptions.jsonpFunction;
 				return Template.asString([
@@ -218,7 +220,7 @@ class JsonpMainTemplatePlugin {
 			}
 			return source;
 		});
-		mainTemplate.plugin("hot-bootstrap", (source, chunk, hash) => {
+		mainTemplate.hooks.hotBootstrap.tap("JsonpMainTemplatePlugin", (source, chunk, hash) => {
 			const hotUpdateChunkFilename = mainTemplate.outputOptions.hotUpdateChunkFilename;
 			const hotUpdateMainFilename = mainTemplate.outputOptions.hotUpdateMainFilename;
 			const crossOriginLoading = mainTemplate.outputOptions.crossOriginLoading;
@@ -248,7 +250,7 @@ function hotDisposeChunk(chunkId) {
 var parentHotUpdateCallback = window[${JSON.stringify(hotUpdateFunction)}];
 window[${JSON.stringify(hotUpdateFunction)}] = ${runtimeSource}`;
 		});
-		mainTemplate.plugin("hash", hash => {
+		mainTemplate.hooks.hash.tap("JsonpMainTemplatePlugin", hash => {
 			hash.update("jsonp");
 			hash.update("5");
 			hash.update(`${mainTemplate.outputOptions.filename}`);
