webpack 5.99.9 → 5.100.1

package/lib/css/walkCssTokens.js

@@ -320,6 +320,7 @@ const consumeAStringToken = (input, pos, callbacks) => {
 const isNonASCIICodePoint = (cc, q) =>
 	// Simplify
 	cc > 0x80;
+
 /**
  * @param {number} cc char code
  * @returns {boolean} is letter
@@ -716,12 +717,12 @@ const consumeRightParenthesis = (input, pos, callbacks) => {
 };
 
 /** @type {CharHandler} */
-const consumeLeftSquareBracket = (input, pos, callbacks) =>
+const consumeLeftSquareBracket = (input, pos, _callbacks) =>
 	// Return a <]-token>.
 	pos;
 
 /** @type {CharHandler} */
-const consumeRightSquareBracket = (input, pos, callbacks) =>
+const consumeRightSquareBracket = (input, pos, _callbacks) =>
 	// Return a <]-token>.
 	pos;
 
@@ -1196,14 +1197,12 @@ module.exports = (input, pos = 0, callbacks = {}) => {
 	return pos;
 };
 
-module.exports.isIdentStartCodePoint = isIdentStartCodePoint;
-
 /**
  * @param {string} input input
  * @param {number} pos position
  * @returns {number} position after comments
  */
-module.exports.eatComments = (input, pos) => {
+const eatComments = (input, pos) => {
 	for (;;) {
 		const originalPos = pos;
 		pos = consumeComments(input, pos, {});
@@ -1220,7 +1219,7 @@ module.exports.eatComments = (input, pos) => {
  * @param {number} pos position
  * @returns {number} position after whitespace
  */
-module.exports.eatWhitespace = (input, pos) => {
+const eatWhitespace = (input, pos) => {
 	while (_isWhiteSpace(input.charCodeAt(pos))) {
 		pos++;
 	}
@@ -1233,7 +1232,7 @@ module.exports.eatWhitespace = (input, pos) => {
  * @param {number} pos position
  * @returns {number} position after whitespace and comments
  */
-module.exports.eatWhitespaceAndComments = (input, pos) => {
+const eatWhitespaceAndComments = (input, pos) => {
 	for (;;) {
 		const originalPos = pos;
 		pos = consumeComments(input, pos, {});
@@ -1248,29 +1247,12 @@ module.exports.eatWhitespaceAndComments = (input, pos) => {
 	return pos;
 };
 
-/**
- * @param {string} input input
- * @param {number} pos position
- * @returns {number} position after whitespace and comments
- */
-module.exports.eatComments = (input, pos) => {
-	for (;;) {
-		const originalPos = pos;
-		pos = consumeComments(input, pos, {});
-		if (originalPos === pos) {
-			break;
-		}
-	}
-
-	return pos;
-};
-
 /**
  * @param {string} input input
  * @param {number} pos position
  * @returns {number} position after whitespace
  */
-module.exports.eatWhiteLine = (input, pos) => {
+const eatWhiteLine = (input, pos) => {
 	for (;;) {
 		const cc = input.charCodeAt(pos);
 		if (_isSpace(cc)) {
@@ -1290,8 +1272,8 @@ module.exports.eatWhiteLine = (input, pos) => {
  * @param {number} pos position
  * @returns {[number, number] | undefined} positions of ident sequence
  */
-module.exports.skipCommentsAndEatIdentSequence = (input, pos) => {
-	pos = module.exports.eatComments(input, pos);
+const skipCommentsAndEatIdentSequence = (input, pos) => {
+	pos = eatComments(input, pos);
 
 	const start = pos;
 
@@ -1315,8 +1297,8 @@ module.exports.skipCommentsAndEatIdentSequence = (input, pos) => {
  * @param {number} pos position
  * @returns {[number, number] | undefined} positions of ident sequence
  */
-module.exports.eatString = (input, pos) => {
-	pos = module.exports.eatWhitespaceAndComments(input, pos);
+const eatString = (input, pos) => {
+	pos = eatWhitespaceAndComments(input, pos);
 
 	const start = pos;
 
@@ -1336,7 +1318,7 @@ module.exports.eatString = (input, pos) => {
  * @param {CssTokenCallbacks} cbs callbacks
  * @returns {[number, number][]} positions of ident sequence
  */
-module.exports.eatImageSetStrings = (input, pos, cbs) => {
+const eatImageSetStrings = (input, pos, cbs) => {
 	/** @type {[number, number][]} */
 	const result = [];
 
@@ -1406,10 +1388,10 @@ module.exports.eatImageSetStrings = (input, pos, cbs) => {
  * @param {CssTokenCallbacks} cbs callbacks
  * @returns {[[number, number, number, number] | undefined, [number, number] | undefined, [number, number] | undefined, [number, number] | undefined]} positions of top level tokens
  */
-module.exports.eatImportTokens = (input, pos, cbs) => {
+const eatImportTokens = (input, pos, cbs) => {
 	const result =
 		/** @type {[[number, number, number, number] | undefined, [number, number] | undefined, [number, number] | undefined, [number, number] | undefined]} */
-		(new Array(4));
+		(Array.from({ length: 4 }));
 
 	/** @type {0 | 1 | 2 | undefined} */
 	let scope;
@@ -1548,8 +1530,8 @@ module.exports.eatImportTokens = (input, pos, cbs) => {
  * @param {number} pos position
  * @returns {[number, number] | undefined} positions of ident sequence
  */
-module.exports.eatIdentSequence = (input, pos) => {
-	pos = module.exports.eatWhitespaceAndComments(input, pos);
+const eatIdentSequence = (input, pos) => {
+	pos = eatWhitespaceAndComments(input, pos);
 
 	const start = pos;
 
@@ -1573,8 +1555,8 @@ module.exports.eatIdentSequence = (input, pos) => {
  * @param {number} pos position
  * @returns {[number, number, boolean] | undefined} positions of ident sequence or string
  */
-module.exports.eatIdentSequenceOrString = (input, pos) => {
-	pos = module.exports.eatWhitespaceAndComments(input, pos);
+const eatIdentSequenceOrString = (input, pos) => {
+	pos = eatWhitespaceAndComments(input, pos);
 
 	const start = pos;
 
@@ -1602,7 +1584,7 @@ module.exports.eatIdentSequenceOrString = (input, pos) => {
  * @param {string} chars characters
  * @returns {(input: string, pos: number) => number} function to eat characters
  */
-module.exports.eatUntil = chars => {
+const eatUntil = chars => {
 	const charCodes = Array.from({ length: chars.length }, (_, i) =>
 		chars.charCodeAt(i)
 	);
@@ -1625,3 +1607,17 @@ module.exports.eatUntil = chars => {
 		}
 	};
 };
+
+module.exports.eatComments = eatComments;
+module.exports.eatIdentSequence = eatIdentSequence;
+module.exports.eatIdentSequenceOrString = eatIdentSequenceOrString;
+module.exports.eatImageSetStrings = eatImageSetStrings;
+module.exports.eatImportTokens = eatImportTokens;
+module.exports.eatString = eatString;
+module.exports.eatUntil = eatUntil;
+module.exports.eatWhiteLine = eatWhiteLine;
+module.exports.eatWhitespace = eatWhitespace;
+module.exports.eatWhitespaceAndComments = eatWhitespaceAndComments;
+module.exports.isIdentStartCodePoint = isIdentStartCodePoint;
+module.exports.skipCommentsAndEatIdentSequence =
+	skipCommentsAndEatIdentSequence;

package/lib/debug/ProfilingPlugin.js

@@ -6,10 +6,10 @@
 
 const { Tracer } = require("chrome-trace-event");
 const {
-	JAVASCRIPT_MODULES,
 	CSS_MODULES,
-	WEBASSEMBLY_MODULES,
-	JSON_MODULE_TYPE
+	JAVASCRIPT_MODULES,
+	JSON_MODULE_TYPE,
+	WEBASSEMBLY_MODULES
 } = require("../ModuleTypeConstants");
 const createSchemaValidation = require("../util/create-schema-validation");
 const { dirname, mkdirpSync } = require("../util/fs");
@@ -27,7 +27,7 @@ const { dirname, mkdirpSync } = require("../util/fs");
 /** @typedef {import("../util/fs").IntermediateFileSystem} IntermediateFileSystem */
 
 const validate = createSchemaValidation(
-	require("../../schemas/plugins/debug/ProfilingPlugin.check.js"),
+	require("../../schemas/plugins/debug/ProfilingPlugin.check"),
 	() => require("../../schemas/plugins/debug/ProfilingPlugin.json"),
 	{
 		name: "Profiling Plugin",
@@ -378,7 +378,7 @@ const interceptAllParserHooks = (moduleFactory, tracer) => {
 	for (const moduleType of moduleTypes) {
 		moduleFactory.hooks.parser
 			.for(moduleType)
-			.tap(PLUGIN_NAME, (parser, parserOpts) => {
+			.tap(PLUGIN_NAME, (parser, _parserOpts) => {
 				interceptAllHooksFor(parser, tracer, "Parser");
 			});
 	}
@@ -399,7 +399,7 @@ const interceptAllGeneratorHooks = (moduleFactory, tracer) => {
 	for (const moduleType of moduleTypes) {
 		moduleFactory.hooks.generator
 			.for(moduleType)
-			.tap(PLUGIN_NAME, (parser, parserOpts) => {
+			.tap(PLUGIN_NAME, (parser, _parserOpts) => {
 				interceptAllHooksFor(parser, tracer, "Generator");
 			});
 	}

package/lib/dependencies/AMDDefineDependencyParserPlugin.js

@@ -68,6 +68,8 @@ const isCallable = expr => {
 	return false;
 };
 
+const PLUGIN_NAME = "AMDDefineDependencyParserPlugin";
+
 class AMDDefineDependencyParserPlugin {
 	/**
 	 * @param {JavascriptParserOptions} options parserOptions
@@ -83,10 +85,7 @@ class AMDDefineDependencyParserPlugin {
 	apply(parser) {
 		parser.hooks.call
 			.for("define")
-			.tap(
-				"AMDDefineDependencyParserPlugin",
-				this.processCallDefine.bind(this, parser)
-			);
+			.tap(PLUGIN_NAME, this.processCallDefine.bind(this, parser));
 	}
 
 	/**
@@ -106,10 +105,11 @@ class AMDDefineDependencyParserPlugin {
 					["require", "module", "exports"].includes(
 						/** @type {string} */ (item.string)
 					)
-				)
-					identifiers[/** @type {number} */ (idx)] = /** @type {string} */ (
-						item.string
-					);
+				) {
+					identifiers[/** @type {number} */ (idx)] =
+						/** @type {string} */
+						(item.string);
+				}
 				const result = this.processItem(parser, expr, item, namedModule);
 				if (result === undefined) {
 					this.processContext(parser, expr, item);

package/lib/dependencies/AMDPlugin.js

@@ -42,7 +42,7 @@ const UnsupportedDependency = require("./UnsupportedDependency");
 
 const PLUGIN_NAME = "AMDPlugin";
 
-/** @typedef {Record<string, TODO>} AmdOptions */
+/** @typedef {Exclude<Amd, false>} AmdOptions */
 
 class AMDPlugin {
 	/**
@@ -119,13 +119,13 @@ class AMDPlugin {
 
 				compilation.hooks.runtimeRequirementInTree
 					.for(RuntimeGlobals.amdDefine)
-					.tap(PLUGIN_NAME, (chunk, set) => {
+					.tap(PLUGIN_NAME, (chunk, _set) => {
 						compilation.addRuntimeModule(chunk, new AMDDefineRuntimeModule());
 					});
 
 				compilation.hooks.runtimeRequirementInTree
 					.for(RuntimeGlobals.amdOptions)
-					.tap(PLUGIN_NAME, (chunk, set) => {
+					.tap(PLUGIN_NAME, (chunk, _set) => {
 						compilation.addRuntimeModule(
 							chunk,
 							new AMDOptionsRuntimeModule(amdOptions)
@@ -143,7 +143,7 @@ class AMDPlugin {
 					/**
 					 * @param {string} optionExpr option expression
 					 * @param {string} rootName root name
-					 * @param {() => TODO} getMembers callback
+					 * @param {() => string[]} getMembers callback
 					 */
 					const tapOptionsHooks = (optionExpr, rootName, getMembers) => {
 						parser.hooks.expression
@@ -156,9 +156,13 @@ class AMDPlugin {
 							);
 						parser.hooks.evaluateIdentifier
 							.for(optionExpr)
-							.tap(
-								PLUGIN_NAME,
-								evaluateToIdentifier(optionExpr, rootName, getMembers, true)
+							.tap(PLUGIN_NAME, expr =>
+								evaluateToIdentifier(
+									optionExpr,
+									rootName,
+									getMembers,
+									true
+								)(expr)
 							);
 						parser.hooks.evaluateTypeof
 							.for(optionExpr)
@@ -176,7 +180,7 @@ class AMDPlugin {
 					);
 					new AMDDefineDependencyParserPlugin(parserOptions).apply(parser);
 
-					tapOptionsHooks("define.amd", "define", () => "amd");
+					tapOptionsHooks("define.amd", "define", () => ["amd"]);
 					tapOptionsHooks("require.amd", "require", () => ["amd"]);
 					tapOptionsHooks(
 						"__webpack_amd_options__",

package/lib/dependencies/AMDRequireDependenciesBlockParserPlugin.js

@@ -31,6 +31,8 @@ const getFunctionExpression = require("./getFunctionExpression");
 /** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
 
+const PLUGIN_NAME = "AMDRequireDependenciesBlockParserPlugin";
+
 class AMDRequireDependenciesBlockParserPlugin {
 	/**
 	 * @param {JavascriptParserOptions} options parserOptions
@@ -80,10 +82,7 @@ class AMDRequireDependenciesBlockParserPlugin {
 	apply(parser) {
 		parser.hooks.call
 			.for("require")
-			.tap(
-				"AMDRequireDependenciesBlockParserPlugin",
-				this.processCallRequire.bind(this, parser)
-			);
+			.tap(PLUGIN_NAME, this.processCallRequire.bind(this, parser));
 	}
 
 	/**
@@ -126,7 +125,8 @@ class AMDRequireDependenciesBlockParserPlugin {
 			}
 			const dep = this.newRequireArrayDependency(
 				deps,
-				/** @type {Range} */ (param.range)
+				/** @type {Range} */
+				(param.range)
 			);
 			dep.loc = /** @type {DependencyLocation} */ (expr.loc);
 			dep.optional = Boolean(parser.scope.inTry);
@@ -158,41 +158,37 @@ class AMDRequireDependenciesBlockParserPlugin {
 			if (param.string === "require") {
 				dep = new ConstDependency(
 					RuntimeGlobals.require,
-					/** @type {TODO} */
-					(param.string),
+					/** @type {Range} */
+					(param.range),
 					[RuntimeGlobals.require]
 				);
 			} else if (param.string === "module") {
 				dep = new ConstDependency(
-					/** @type {string} */
-					(
-						/** @type {BuildInfo} */
-						(parser.state.module.buildInfo).moduleArgument
-					),
-					/** @type {Range} */ (param.range),
+					parser.state.module.moduleArgument,
+					/** @type {Range} */
+					(param.range),
 					[RuntimeGlobals.module]
 				);
 			} else if (param.string === "exports") {
 				dep = new ConstDependency(
-					/** @type {string} */
-					(
-						/** @type {BuildInfo} */
-						(parser.state.module.buildInfo).exportsArgument
-					),
-					/** @type {Range} */ (param.range),
+					parser.state.module.exportsArgument,
+					/** @type {Range} */
+					(param.range),
 					[RuntimeGlobals.exports]
 				);
 			} else if (
 				(localModule = getLocalModule(
 					parser.state,
-					/** @type {string} */ (param.string)
+					/** @type {string} */
+					(param.string)
 				))
 			) {
 				localModule.flagUsed();
 				dep = new LocalModuleDependency(localModule, param.range, false);
 			} else {
 				dep = this.newRequireItemDependency(
-					/** @type {string} */ (param.string),
+					/** @type {string} */
+					(param.string),
 					param.range
 				);
 				dep.loc = /** @type {DependencyLocation} */ (expr.loc);
@@ -308,13 +304,15 @@ class AMDRequireDependenciesBlockParserPlugin {
 				result = this.processArray(
 					parser,
 					expr,
-					/** @type {BasicEvaluatedExpression} */ (param)
+					/** @type {BasicEvaluatedExpression} */
+					(param)
 				);
 			});
 			parser.state.current = old;
 			if (!result) return;
 			parser.state.current.addBlock(
-				/** @type {AMDRequireDependenciesBlock} */ (depBlock)
+				/** @type {AMDRequireDependenciesBlock} */
+				(depBlock)
 			);
 			return true;
 		}
@@ -325,13 +323,15 @@ class AMDRequireDependenciesBlockParserPlugin {
 					result = this.processArray(
 						parser,
 						expr,
-						/** @type {BasicEvaluatedExpression} */ (param)
+						/** @type {BasicEvaluatedExpression} */
+						(param)
 					);
 				});
 				if (!result) {
 					const dep = new UnsupportedDependency(
 						"unsupported",
-						/** @type {Range} */ (expr.range)
+						/** @type {Range} */
+						(expr.range)
 					);
 					old.addPresentationalDependency(dep);
 					if (parser.state.module) {
@@ -340,7 +340,8 @@ class AMDRequireDependenciesBlockParserPlugin {
 								`Cannot statically analyse 'require(…, …)' in line ${
 									/** @type {SourceLocation} */ (expr.loc).start.line
 								}`,
-								/** @type {DependencyLocation} */ (expr.loc)
+								/** @type {DependencyLocation} */
+								(expr.loc)
 							)
 						);
 					}
@@ -415,4 +416,5 @@ class AMDRequireDependenciesBlockParserPlugin {
 		return new AMDRequireArrayDependency(depsArray, range);
 	}
 }
+
 module.exports = AMDRequireDependenciesBlockParserPlugin;

package/lib/dependencies/CachedConstDependency.js

@@ -99,11 +99,7 @@ CachedConstDependency.Template = class CachedConstDependencyTemplate extends (
 	 * @param {DependencyTemplateContext} templateContext the context object
 	 * @returns {void}
 	 */
-	apply(
-		dependency,
-		source,
-		{ runtimeTemplate, dependencyTemplates, initFragments }
-	) {
+	apply(dependency, source, { initFragments }) {
 		const dep = /** @type {CachedConstDependency} */ (dependency);
 
 		initFragments.push(

package/lib/dependencies/CommonJsExportRequireDependency.js

@@ -126,7 +126,7 @@ class CommonJsExportRequireDependency extends ModuleDependency {
 			processExportInfo(
 				runtime,
 				referencedExports,
-				ids.concat(exportInfo.name),
+				[...ids, exportInfo.name],
 				exportInfo,
 				false
 			);
@@ -193,7 +193,7 @@ class CommonJsExportRequireDependency extends ModuleDependency {
 					name => ({
 						name,
 						from,
-						export: ids.concat(name),
+						export: [...ids, name],
 						canMangle: !(name in EMPTY_OBJECT) && false
 					})
 				),
@@ -223,14 +223,16 @@ class CommonJsExportRequireDependency extends ModuleDependency {
 		/** @type {ExportsInfo | undefined} */
 		let importedExportsInfo = moduleGraph.getExportsInfo(importedModule);
 		const ids = this.getIds(moduleGraph);
-		if (ids.length > 0)
+		if (ids.length > 0) {
 			importedExportsInfo = importedExportsInfo.getNestedExportsInfo(ids);
+		}
 		/** @type {ExportsInfo | undefined} */
 		let exportsInfo = moduleGraph.getExportsInfo(
 			/** @type {Module} */ (moduleGraph.getParentModule(this))
 		);
-		if (this.names.length > 0)
+		if (this.names.length > 0) {
 			exportsInfo = exportsInfo.getNestedExportsInfo(this.names);
+		}
 
 		const noExtraExports =
 			importedExportsInfo &&

package/lib/dependencies/CommonJsExportsParserPlugin.js

@@ -125,6 +125,8 @@ const parseRequireCall = (parser, expr) => {
 	return { argument: argValue, ids: ids.reverse() };
 };
 
+const PLUGIN_NAME = "CommonJsExportsParserPlugin";
+
 class CommonJsExportsParserPlugin {
 	/**
 	 * @param {ModuleGraph} moduleGraph module graph
@@ -177,10 +179,10 @@ class CommonJsExportsParserPlugin {
 		// metadata //
 		parser.hooks.evaluateTypeof
 			.for("module")
-			.tap("CommonJsExportsParserPlugin", evaluateToString("object"));
+			.tap(PLUGIN_NAME, evaluateToString("object"));
 		parser.hooks.evaluateTypeof
 			.for("exports")
-			.tap("CommonJsPlugin", evaluateToString("object"));
+			.tap(PLUGIN_NAME, evaluateToString("object"));
 
 		// exporting //
 
@@ -239,24 +241,24 @@ class CommonJsExportsParserPlugin {
 		};
 		parser.hooks.assignMemberChain
 			.for("exports")
-			.tap("CommonJsExportsParserPlugin", (expr, members) =>
+			.tap(PLUGIN_NAME, (expr, members) =>
 				handleAssignExport(expr, "exports", members)
 			);
 		parser.hooks.assignMemberChain
 			.for("this")
-			.tap("CommonJsExportsParserPlugin", (expr, members) => {
+			.tap(PLUGIN_NAME, (expr, members) => {
 				if (!parser.scope.topLevelScope) return;
 				return handleAssignExport(expr, "this", members);
 			});
 		parser.hooks.assignMemberChain
 			.for("module")
-			.tap("CommonJsExportsParserPlugin", (expr, members) => {
+			.tap(PLUGIN_NAME, (expr, members) => {
 				if (members[0] !== "exports") return;
 				return handleAssignExport(expr, "module.exports", members.slice(1));
 			});
 		parser.hooks.call
 			.for("Object.defineProperty")
-			.tap("CommonJsExportsParserPlugin", expression => {
+			.tap(PLUGIN_NAME, expression => {
 				const expr = /** @type {CallExpression} */ (expression);
 				if (!parser.isStatementLevelExpression(expr)) return;
 				if (expr.arguments.length !== 3) return;
@@ -338,22 +340,20 @@ class CommonJsExportsParserPlugin {
 		};
 		parser.hooks.callMemberChain
 			.for("exports")
-			.tap("CommonJsExportsParserPlugin", (expr, members) =>
+			.tap(PLUGIN_NAME, (expr, members) =>
 				handleAccessExport(expr.callee, "exports", members, expr)
 			);
 		parser.hooks.expressionMemberChain
 			.for("exports")
-			.tap("CommonJsExportsParserPlugin", (expr, members) =>
+			.tap(PLUGIN_NAME, (expr, members) =>
 				handleAccessExport(expr, "exports", members)
 			);
 		parser.hooks.expression
 			.for("exports")
-			.tap("CommonJsExportsParserPlugin", expr =>
-				handleAccessExport(expr, "exports", [])
-			);
+			.tap(PLUGIN_NAME, expr => handleAccessExport(expr, "exports", []));
 		parser.hooks.callMemberChain
 			.for("module")
-			.tap("CommonJsExportsParserPlugin", (expr, members) => {
+			.tap(PLUGIN_NAME, (expr, members) => {
 				if (members[0] !== "exports") return;
 				return handleAccessExport(
 					expr.callee,
@@ -364,36 +364,32 @@ class CommonJsExportsParserPlugin {
 			});
 		parser.hooks.expressionMemberChain
 			.for("module")
-			.tap("CommonJsExportsParserPlugin", (expr, members) => {
+			.tap(PLUGIN_NAME, (expr, members) => {
 				if (members[0] !== "exports") return;
 				return handleAccessExport(expr, "module.exports", members.slice(1));
 			});
 		parser.hooks.expression
 			.for("module.exports")
-			.tap("CommonJsExportsParserPlugin", expr =>
-				handleAccessExport(expr, "module.exports", [])
-			);
+			.tap(PLUGIN_NAME, expr => handleAccessExport(expr, "module.exports", []));
 		parser.hooks.callMemberChain
 			.for("this")
-			.tap("CommonJsExportsParserPlugin", (expr, members) => {
+			.tap(PLUGIN_NAME, (expr, members) => {
 				if (!parser.scope.topLevelScope) return;
 				return handleAccessExport(expr.callee, "this", members, expr);
 			});
 		parser.hooks.expressionMemberChain
 			.for("this")
-			.tap("CommonJsExportsParserPlugin", (expr, members) => {
+			.tap(PLUGIN_NAME, (expr, members) => {
 				if (!parser.scope.topLevelScope) return;
 				return handleAccessExport(expr, "this", members);
 			});
-		parser.hooks.expression
-			.for("this")
-			.tap("CommonJsExportsParserPlugin", expr => {
-				if (!parser.scope.topLevelScope) return;
-				return handleAccessExport(expr, "this", []);
-			});
+		parser.hooks.expression.for("this").tap(PLUGIN_NAME, expr => {
+			if (!parser.scope.topLevelScope) return;
+			return handleAccessExport(expr, "this", []);
+		});
 
 		// Bailouts //
-		parser.hooks.expression.for("module").tap("CommonJsPlugin", expr => {
+		parser.hooks.expression.for("module").tap(PLUGIN_NAME, expr => {
 			bailout();
 			const isHarmony = HarmonyExports.isEnabled(parser.state);
 			const dep = new ModuleDecoratorDependency(
@@ -408,4 +404,5 @@ class CommonJsExportsParserPlugin {
 		});
 	}
 }
+
 module.exports = CommonJsExportsParserPlugin;

package/lib/dependencies/CommonJsFullRequireDependency.js

@@ -107,15 +107,7 @@ CommonJsFullRequireDependency.Template = class CommonJsFullRequireDependencyTemp
 	apply(
 		dependency,
 		source,
-		{
-			module,
-			runtimeTemplate,
-			moduleGraph,
-			chunkGraph,
-			runtimeRequirements,
-			runtime,
-			initFragments
-		}
+		{ runtimeTemplate, moduleGraph, chunkGraph, runtimeRequirements, runtime }
 	) {
 		const dep = /** @type {CommonJsFullRequireDependency} */ (dependency);
 		if (!dep.range) return;