Merge pull request #7038 from marcusdarmstrong/marcusdarmstrong-exter…

…nal-module-fix Correct ExternalModule's global option (#6933)
webpack · Oct 17, 2018 · 0fb6c60 · 0fb6c60
2 parents 2228daf + 15b6f8b
commit 0fb6c60
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/lib/ExternalModule.js b/lib/ExternalModule.js
@@ -127,8 +127,8 @@ class ExternalModule extends Module {
 				);
 			case "global":
 				return this.getSourceForGlobalVariableExternal(
-					runtime.outputOptions.globalObject,
-					this.externalType
+					request,
+					runtime.outputOptions.globalObject
 				);
 			case "commonjs":
 			case "commonjs2":

diff --git a/test/configCases/externals/global/index.js b/test/configCases/externals/global/index.js
@@ -0,0 +1,11 @@
+afterEach(done => {
+	delete global.EXTERNAL_TEST_GLOBAL;
+	done();
+});
+
+it("should move externals in chunks into entry chunk", function() {
+	global.EXTERNAL_TEST_GLOBAL = 42;
+	// eslint-disable-next-line node/no-missing-require
+	const result = require("external");
+	expect(result).toBe(42);
+});
diff --git a/test/configCases/externals/global/webpack.config.js b/test/configCases/externals/global/webpack.config.js
@@ -0,0 +1,5 @@
+module.exports = {
+	externals: {
+		external: "global EXTERNAL_TEST_GLOBAL"
+	}
+};