move parser creation into separate plugins

sokra · sokra · commit 0ae5fede3dc0 · 2017-11-10T11:36:46.000+01:00
diff --git a/lib/JavascriptModulesPlugin.js b/lib/JavascriptModulesPlugin.js
@@ -0,0 +1,19 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const Parser = require("./Parser");
+
+class JavascriptModulesPlugin {
+	apply(compiler) {
+		compiler.plugin("compilation", (compilation, { normalModuleFactory }) => {
+			normalModuleFactory.plugin(["create-parser javascript/auto", "create-parser javascript/esm"], () => {
+				return new Parser();
+			});
+		});
+	}
+}
+
+module.exports = JavascriptModulesPlugin;
diff --git a/lib/NormalModuleFactory.js b/lib/NormalModuleFactory.js
@@ -8,8 +8,6 @@ const asyncLib = require("async");
 const Tapable = require("tapable");
 const NormalModule = require("./NormalModule");
 const RawModule = require("./RawModule");
-const Parser = require("./Parser");
-const WebAssemblyParser = require("./WebAssemblyParser");
 const RuleSet = require("./RuleSet");
 
 const loaderToIdent = data => {
@@ -287,24 +285,16 @@ class NormalModuleFactory extends Tapable {
 	}
 
 	createParser(type, parserOptions) {
-		// TODO move to plugin
-		// const parser = this.applyPluginsBailResult1(`create-parser ${type}`);
-		let parser;
-		switch(type) {
-			case "javascript/auto":
-				parser = new Parser();
-				break;
-			case "webassembly/experimental":
-				parser = new WebAssemblyParser();
-				break;
-			default:
-				throw new Error("Unknown module type");
+		parserOptions = parserOptions || {};
+		const parser = this.applyPluginsBailResult1(`create-parser ${type}`, parserOptions);
+		if(!parser) {
+			throw new Error(`No parser registered for ${type}`);
 		}
 		if(type === "javascript/auto") {
 			// TODO: remove backward compat in webpack 5
-			this.applyPlugins2("parser", parser, parserOptions || {});
+			this.applyPlugins2("parser", parser, parserOptions);
 		}
-		this.applyPlugins2(`parser ${type}`, parser, parserOptions || {});
+		this.applyPlugins2(`parser ${type}`, parser, parserOptions);
 		return parser;
 	}
 }
diff --git a/lib/WebAssemblyModulesPlugin.js b/lib/WebAssemblyModulesPlugin.js
@@ -0,0 +1,19 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const WebAssemblyParser = require("./WebAssemblyParser");
+
+class WebAssemblyModulesPlugin {
+	apply(compiler) {
+		compiler.plugin("compilation", (compilation, { normalModuleFactory }) => {
+			normalModuleFactory.plugin("create-parser webassembly/experimental", () => {
+				return new WebAssemblyParser();
+			});
+		});
+	}
+}
+
+module.exports = WebAssemblyModulesPlugin;
diff --git a/lib/WebpackOptionsApply.js b/lib/WebpackOptionsApply.js
@@ -6,6 +6,9 @@
 
 const OptionsApply = require("./OptionsApply");
 
+const JavascriptModulesPlugin = require("./JavascriptModulesPlugin");
+const WebAssemblyModulesPlugin = require("./WebAssemblyModulesPlugin");
+
 const LoaderTargetPlugin = require("./LoaderTargetPlugin");
 const FunctionModulePlugin = require("./FunctionModulePlugin");
 const EvalDevToolModulePlugin = require("./EvalDevToolModulePlugin");
@@ -234,6 +237,10 @@ class WebpackOptionsApply extends OptionsApply {
 				null;
 			compiler.apply(new EvalDevToolModulePlugin(comment, options.output.devtoolModuleFilenameTemplate));
 		}
+		compiler.apply(
+			new JavascriptModulesPlugin(),
+			new WebAssemblyModulesPlugin()
+		);
 
 		compiler.apply(new EntryOptionPlugin());
 		compiler.applyPluginsBailResult("entry-option", options.context, options.entry);
