webpack · alexander-akait · Mar 18, 2021 · Mar 18, 2021 · Mar 18, 2021
diff --git a/lib/ExternalModule.js b/lib/ExternalModule.js
@@ -354,7 +354,7 @@ class ExternalModule extends Module {
 			case "global":
 				return getSourceForGlobalVariableExternal(
 					request,
-					runtimeTemplate.outputOptions.globalObject
+					`(${runtimeTemplate.outputOptions.globalObject})`
 				);
 			case "commonjs":
 			case "commonjs2":

diff --git a/lib/javascript/ArrayPushCallbackChunkFormatPlugin.js b/lib/javascript/ArrayPushCallbackChunkFormatPlugin.js
@@ -51,7 +51,7 @@ class ArrayPushCallbackChunkFormatPlugin {
 							const hotUpdateGlobal =
 								runtimeTemplate.outputOptions.hotUpdateGlobal;
 							source.add(
-								`${globalObject}[${JSON.stringify(hotUpdateGlobal)}](`
+								`(${globalObject})[${JSON.stringify(hotUpdateGlobal)}](`
 							);
 							source.add(`${JSON.stringify(chunk.id)},`);
 							source.add(modules);
@@ -68,9 +68,9 @@ class ArrayPushCallbackChunkFormatPlugin {
 							const chunkLoadingGlobal =
 								runtimeTemplate.outputOptions.chunkLoadingGlobal;
 							source.add(
-								`(${globalObject}[${JSON.stringify(
+								`((${globalObject})[${JSON.stringify(
 									chunkLoadingGlobal
-								)}] = ${globalObject}[${JSON.stringify(
+								)}] = (${globalObject})[${JSON.stringify(
 									chunkLoadingGlobal
 								)}] || []).push([`
 							);

diff --git a/lib/web/JsonpChunkLoadingRuntimeModule.js b/lib/web/JsonpChunkLoadingRuntimeModule.js
@@ -94,7 +94,7 @@ class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
 		const withPreload = this._runtimeRequirements.has(
 			RuntimeGlobals.preloadChunkHandlers
 		);
-		const chunkLoadingGlobalExpr = `${globalObject}[${JSON.stringify(
+		const chunkLoadingGlobalExpr = `(${globalObject})[${JSON.stringify(
 			chunkLoadingGlobal
 		)}]`;
 		const conditionMap = chunkGraph.getChunkConditionMap(chunk, chunkHasJs);
@@ -303,7 +303,7 @@ class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
 						]),
 						"}",
 						"",
-						`${globalObject}[${JSON.stringify(
+						`(${globalObject})[${JSON.stringify(
 							hotUpdateGlobal
 						)}] = ${runtimeTemplate.basicFunction(
 							"chunkId, moreModules, runtime",

diff --git a/lib/webworker/ImportScriptsChunkLoadingRuntimeModule.js b/lib/webworker/ImportScriptsChunkLoadingRuntimeModule.js
@@ -44,7 +44,7 @@ class ImportScriptsChunkLoadingRuntimeModule extends RuntimeModule {
 		const withHmrManifest = this.runtimeRequirements.has(
 			RuntimeGlobals.hmrDownloadManifest
 		);
-		const chunkLoadingGlobalExpr = `${globalObject}[${JSON.stringify(
+		const chunkLoadingGlobalExpr = `(${globalObject})[${JSON.stringify(
 			chunkLoadingGlobal
 		)}]`;
 		const hasJsMatcher = compileBooleanMatcher(
@@ -141,7 +141,7 @@ class ImportScriptsChunkLoadingRuntimeModule extends RuntimeModule {
 						"function loadUpdateChunk(chunkId, updatedModulesList) {",
 						Template.indent([
 							"var success = false;",
-							`${globalObject}[${JSON.stringify(
+							`(${globalObject})[${JSON.stringify(
 								hotUpdateGlobal
 							)}] = ${runtimeTemplate.basicFunction("_, moreModules, runtime", [
 								"for(var moduleId in moreModules) {",

diff --git a/test/Compiler.test.js b/test/Compiler.test.js
@@ -166,7 +166,7 @@ describe("Compiler", () => {
 			expect(bundle).not.toMatch("fixtures");
 			expect(chunk).not.toMatch("fixtures");
 			expect(bundle).toMatch("webpackChunk");
-			expect(chunk).toMatch('self["webpackChunk"] || []).push');
+			expect(chunk).toMatch('(self)["webpackChunk"] || []).push');
 			done();
 		});
 	});

diff --git a/test/__snapshots__/StatsTestCases.test.js.snap b/test/__snapshots__/StatsTestCases.test.js.snap
diff --git a/test/configCases/externals/global-globalObject-expression/index.js b/test/configCases/externals/global-globalObject-expression/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-globalObject-expression/webpack.config.js b/test/configCases/externals/global-globalObject-expression/webpack.config.js
@@ -0,0 +1,9 @@
+/** @type {import("../../../../").Configuration} */
+module.exports = {
+	output: {
+		globalObject: "typeof self !== 'undefined' ? self : global || false"
+	},
+	externals: {
+		external: "global EXTERNAL_TEST_GLOBAL"
+	}
+};
diff --git a/test/configCases/web/globalObject-expression/chunk.js b/test/configCases/web/globalObject-expression/chunk.js
@@ -0,0 +1 @@
+export default "ok";
diff --git a/test/configCases/web/globalObject-expression/index.js b/test/configCases/web/globalObject-expression/index.js
@@ -0,0 +1,4 @@
+it("should work", async () => {
+	const module = await import(/* webpackChunkName: "the-chunk" */ "./chunk");
+	expect(module.default).toBe("ok");
+});
diff --git a/test/configCases/web/globalObject-expression/test.config.js b/test/configCases/web/globalObject-expression/test.config.js
@@ -0,0 +1,5 @@
+module.exports = {
+	findBundle: function (i, options) {
+		return ["the-chunk.js", "bundle0.js"];
+	}
+};
diff --git a/test/configCases/web/globalObject-expression/webpack.config.js b/test/configCases/web/globalObject-expression/webpack.config.js
@@ -0,0 +1,8 @@
+/** @type {import("../../../../").Configuration} */
+module.exports = {
+	target: "web",
+	output: {
+		chunkFilename: "[name].js",
+		globalObject: "typeof self !== 'undefined' ? self : this"
+	}
+};
diff --git a/test/configCases/web/unique-jsonp/index.js b/test/configCases/web/unique-jsonp/index.js
@@ -1,7 +1,7 @@
 it("should do something", () => {
 	const fs = require("fs");
 	const source = fs.readFileSync(__dirname + "/module.js", "utf-8");
-	expect(source).toMatch(/^\(self\[\"webpackChunksomething\"\]/);
+	expect(source).toMatch(/^\(\(self\)\[\"webpackChunksomething\"\]/);
 });
 
 if (Math.random() < 0) import(/* webpackChunkName: "module" */ "./module");
diff --git a/test/configCases/worker/globalObject-expression/index.js b/test/configCases/worker/globalObject-expression/index.js
@@ -0,0 +1,13 @@
+it("should work", async () => {
+	const worker = new Worker(new URL("./worker.js", import.meta.url), {
+		type: "module"
+	});
+	worker.postMessage("ok");
+	const result = await new Promise(resolve => {
+		worker.onmessage = event => {
+			resolve(event.data);
+		};
+	});
+	expect(result).toBe("data: OK, thanks");
+	await worker.terminate();
+});
diff --git a/test/configCases/worker/globalObject-expression/module.js b/test/configCases/worker/globalObject-expression/module.js
@@ -0,0 +1,3 @@
+export function upper(str) {
+	return str.toUpperCase();
+}
diff --git a/test/configCases/worker/globalObject-expression/test.config.js b/test/configCases/worker/globalObject-expression/test.config.js
@@ -0,0 +1,5 @@
+module.exports = {
+	findBundle: function(i, options) {
+		return ["main.js"];
+	}
+};
diff --git a/test/configCases/worker/globalObject-expression/test.filter.js b/test/configCases/worker/globalObject-expression/test.filter.js
@@ -0,0 +1,5 @@
+var supportsWorker = require("../../../helpers/supportsWorker");
+
+module.exports = function (config) {
+	return supportsWorker();
+};
diff --git a/test/configCases/worker/globalObject-expression/webpack.config.js b/test/configCases/worker/globalObject-expression/webpack.config.js
@@ -0,0 +1,7 @@
+module.exports = {
+	output: {
+		filename: "[name].js",
+		globalObject: "typeof self !== 'undefined' ? self : this"
+	},
+	target: "web"
+};
diff --git a/test/configCases/worker/globalObject-expression/worker.js b/test/configCases/worker/globalObject-expression/worker.js
@@ -0,0 +1,4 @@
+onmessage = async event => {
+	const { upper } = await import("./module");
+	postMessage(`data: ${upper(event.data)}, thanks`);
+};