Merge pull request webpack#6078 from webpack/feature/tapable-upgrade-entry-option-plugin

sokra · web-flow · commit 699a392cee4e · 2017-12-08T08:47:06.000+01:00
feat(tapable): upgrade Single|Multi|DynamicEntryPlugin to tapable v1
diff --git a/lib/DynamicEntryPlugin.js b/lib/DynamicEntryPlugin.js
@@ -17,15 +17,16 @@ class DynamicEntryPlugin {
 	}
 
 	apply(compiler) {
-		compiler.plugin("compilation", (compilation, params) => {
+		compiler.hooks.compilation.tap("DynamicEntryPlugin", (compilation, {
+			normalModuleFactory
+		}) => {
 			const multiModuleFactory = new MultiModuleFactory();
-			const normalModuleFactory = params.normalModuleFactory;
 
 			compilation.dependencyFactories.set(MultiEntryDependency, multiModuleFactory);
 			compilation.dependencyFactories.set(SingleEntryDependency, normalModuleFactory);
 		});
 
-		compiler.plugin("make", (compilation, callback) => {
+		compiler.hooks.make.tapAsync("DynamicEntryPlugin", (compilation, callback) => {
 			const addEntry = (entry, name) => {
 				const dep = DynamicEntryPlugin.createDependency(entry, name);
 				return new Promise((resolve, reject) => {
diff --git a/lib/EntryOptionPlugin.js b/lib/EntryOptionPlugin.js
@@ -17,7 +17,7 @@ const itemToPlugin = (context, item, name) => {
 
 module.exports = class EntryOptionPlugin {
 	apply(compiler) {
-		compiler.plugin("entry-option", (context, entry) => {
+		compiler.hooks.entryOption.tap("EntryOptionPlugin", (context, entry) => {
 			if(typeof entry === "string" || Array.isArray(entry)) {
 				compiler.apply(itemToPlugin(context, entry, "main"));
 			} else if(typeof entry === "object") {
diff --git a/lib/MultiEntryPlugin.js b/lib/MultiEntryPlugin.js
@@ -16,23 +16,33 @@ module.exports = class MultiEntryPlugin {
 	}
 
 	apply(compiler) {
-		compiler.plugin("compilation", (compilation, params) => {
+		compiler.hooks.compilation.tap("MultiEntryPlugin", (compilation, {
+			normalModuleFactory
+		}) => {
 			const multiModuleFactory = new MultiModuleFactory();
-			const normalModuleFactory = params.normalModuleFactory;
 
 			compilation.dependencyFactories.set(MultiEntryDependency, multiModuleFactory);
 			compilation.dependencyFactories.set(SingleEntryDependency, normalModuleFactory);
 		});
-		compiler.plugin("make", (compilation, callback) => {
-			const dep = MultiEntryPlugin.createDependency(this.entries, this.name);
-			compilation.addEntry(this.context, dep, this.name, callback);
+
+		compiler.hooks.make.tapAsync("MultiEntryPlugin", (compilation, callback) => {
+			const {
+				context,
+				entries,
+				name
+			} = this;
+
+			const dep = MultiEntryPlugin.createDependency(entries, name);
+			compilation.addEntry(context, dep, name, callback);
 		});
 	}
 
 	static createDependency(entries, name) {
 		return new MultiEntryDependency(entries.map((e, idx) => {
 			const dep = new SingleEntryDependency(e);
-			dep.loc = name + ":" + (100000 + idx);
+			// Because entrypoints are not dependencies found in an
+			// existing module, we give it a synthetic id
+			dep.loc = `${name}:${100000 + idx}`;
 			return dep;
 		}), name);
 	}
diff --git a/lib/SingleEntryPlugin.js b/lib/SingleEntryPlugin.js
@@ -13,15 +13,21 @@ class SingleEntryPlugin {
 	}
 
 	apply(compiler) {
-		compiler.plugin("compilation", (compilation, params) => {
-			const normalModuleFactory = params.normalModuleFactory;
-
+		compiler.hooks.compilation.tap("SingleEntryPlugin", (compilation, {
+			normalModuleFactory
+		}) => {
 			compilation.dependencyFactories.set(SingleEntryDependency, normalModuleFactory);
 		});
 
-		compiler.plugin("make", (compilation, callback) => {
-			const dep = SingleEntryPlugin.createDependency(this.entry, this.name);
-			compilation.addEntry(this.context, dep, this.name, callback);
+		compiler.hooks.make.tapAsync("SingleEntryPlugin", (compilation, callback) => {
+			const {
+				entry,
+				name,
+				context
+			} = this;
+
+			const dep = SingleEntryPlugin.createDependency(entry, name);
+			compilation.addEntry(context, dep, name, callback);
 		});
 	}
 
