Tweak SystemPlugin

Author: ooflorent

lib/dependencies/SystemPlugin.js

@@ -13,7 +13,6 @@ const {
 const RuntimeGlobals = require("../RuntimeGlobals");
 const WebpackError = require("../WebpackError");
 const ConstDependency = require("./ConstDependency");
-const ProvidedDependency = require("./ProvidedDependency");
 const SystemRuntimeModule = require("./SystemRuntimeModule");
 
 class SystemPlugin {
@@ -25,15 +24,6 @@ class SystemPlugin {
 		compiler.hooks.compilation.tap(
 			"SystemPlugin",
 			(compilation, { normalModuleFactory }) => {
-				compilation.dependencyFactories.set(
-					ProvidedDependency,
-					normalModuleFactory
-				);
-				compilation.dependencyTemplates.set(
-					ProvidedDependency,
-					new ProvidedDependency.Template()
-				);
-
 				compilation.hooks.runtimeRequirementInModule
 					.for(RuntimeGlobals.system)
 					.tap("SystemPlugin", (module, set) => {

lib/dependencies/SystemRuntimeModule.js

@@ -9,18 +9,6 @@ const RuntimeGlobals = require("../RuntimeGlobals");
 const RuntimeModule = require("../RuntimeModule");
 const Template = require("../Template");
 
-const SystemPolyfill = Template.asString([
-	`${RuntimeGlobals.system} = {`,
-	Template.indent([
-		"import: function () {",
-		Template.indent([
-			"throw new Error('System.import cannot be used indirectly');"
-		]),
-		"}"
-	]),
-	"}"
-]);
-
 class SystemRuntimeModule extends RuntimeModule {
 	constructor() {
 		super("system");
@@ -30,7 +18,17 @@ class SystemRuntimeModule extends RuntimeModule {
 	 * @returns {string} runtime code
 	 */
 	generate() {
-		return SystemPolyfill;
+		return Template.asString([
+			`${RuntimeGlobals.system} = {`,
+			Template.indent([
+				"import: function () {",
+				Template.indent(
+					"throw new Error('System.import cannot be used indirectly');"
+				),
+				"}"
+			]),
+			"};"
+		]);
 	}
 }