Merge pull request webpack#13754 from StyleT/feature/custom_externals_for_systemjs_target

fix: fixed work of the non-system type externals for "system" library target

Author: sokra

lib/library/SystemLibraryPlugin.js

@@ -72,7 +72,7 @@ class SystemLibraryPlugin extends AbstractLibraryPlugin {
 	render(source, { chunkGraph, moduleGraph, chunk }, { options, compilation }) {
 		const modules = chunkGraph
 			.getChunkModules(chunk)
-			.filter(m => m instanceof ExternalModule);
+			.filter(m => m instanceof ExternalModule && m.externalType === "system");
 		const externals = /** @type {ExternalModule[]} */ (modules);
 
 		// The name this bundle should be registered as with System

test/configCases/externals/externals-system-custom/index.js

@@ -0,0 +1,7 @@
+// This test verifies that the System.register context is made available to webpack bundles
+
+it("should correctly handle externals of different type", function() {
+	expect(require("rootExt")).toEqual("works");
+	expect(require("varExt")).toEqual("works");
+	expect(require("windowExt")).toEqual("works");
+});

test/configCases/externals/externals-system-custom/test.config.js

@@ -0,0 +1,17 @@
+const System = require("../../../helpers/fakeSystem");
+
+module.exports = {
+	target: 'web',
+	beforeExecute: () => {
+		System.init();
+	},
+	moduleScope(scope) {
+		scope.window.windowExt = 'works';
+		scope.rootExt = 'works';
+		scope.varExt = 'works';
+		scope.System = System;
+	},
+	afterExecute: () => {
+		System.execute("(anonym)");
+	}
+};

test/configCases/externals/externals-system-custom/webpack.config.js

@@ -0,0 +1,16 @@
+/** @type {import("../../../../types").Configuration} */
+module.exports = {
+	output: {
+		libraryTarget: "system"
+	},
+	target: "web",
+	node: {
+		__dirname: false,
+		__filename: false
+	},
+	externals: {
+		rootExt: "root rootExt",
+		varExt: "var varExt",
+		windowExt: "window windowExt"
+	}
+};