webpack 5.76.1 → 5.88.2

package/lib/debug/ProfilingPlugin.js

@@ -5,10 +5,19 @@
 "use strict";
 
 const { Tracer } = require("chrome-trace-event");
+const {
+	JAVASCRIPT_MODULE_TYPE_AUTO,
+	JAVASCRIPT_MODULE_TYPE_DYNAMIC,
+	JAVASCRIPT_MODULE_TYPE_ESM,
+	WEBASSEMBLY_MODULE_TYPE_ASYNC,
+	WEBASSEMBLY_MODULE_TYPE_SYNC,
+	JSON_MODULE_TYPE
+} = require("../ModuleTypeConstants");
 const createSchemaValidation = require("../util/create-schema-validation");
 const { dirname, mkdirpSync } = require("../util/fs");
 
 /** @typedef {import("../../declarations/plugins/debug/ProfilingPlugin").ProfilingPluginOptions} ProfilingPluginOptions */
+/** @typedef {import("../Compiler")} Compiler */
 /** @typedef {import("../util/fs").IntermediateFileSystem} IntermediateFileSystem */
 
 const validate = createSchemaValidation(
@@ -64,6 +73,11 @@ class Profiler {
 		]);
 	}
 
+	/**
+	 * @param {string} method method name
+	 * @param {object} [params] params
+	 * @returns {Promise<TODO>} Promise for the result
+	 */
 	sendCommand(method, params) {
 		if (this.hasSession()) {
 			return new Promise((res, rej) => {
@@ -92,6 +106,8 @@ class Profiler {
 		return this.sendCommand("Profiler.stop").then(({ profile }) => {
 			const hrtime = process.hrtime();
 			const endTime = hrtime[0] * 1000000 + Math.round(hrtime[1] / 1000);
+			// Avoid coverage problems due indirect changes
+			/* istanbul ignore next */
 			if (profile.startTime < this._startTime || profile.endTime > endTime) {
 				// In some cases timestamps mismatch and we need to adjust them
 				// Both process.hrtime and the inspector timestamps claim to be relative
@@ -182,7 +198,7 @@ const createTrace = (fs, outputPath) => {
 	};
 };
 
-const pluginName = "ProfilingPlugin";
+const PLUGIN_NAME = "ProfilingPlugin";
 
 class ProfilingPlugin {
 	/**
@@ -193,6 +209,11 @@ class ProfilingPlugin {
 		this.outputPath = options.outputPath || "events.json";
 	}
 
+	/**
+	 * Apply the plugin
+	 * @param {Compiler} compiler the compiler instance
+	 * @returns {void}
+	 */
 	apply(compiler) {
 		const tracer = createTrace(
 			compiler.intermediateFileSystem,
@@ -216,7 +237,7 @@ class ProfilingPlugin {
 		});
 
 		compiler.hooks.compilation.tap(
-			pluginName,
+			PLUGIN_NAME,
 			(compilation, { normalModuleFactory, contextModuleFactory }) => {
 				interceptAllHooksFor(compilation, tracer, "Compilation");
 				interceptAllHooksFor(
@@ -237,7 +258,7 @@ class ProfilingPlugin {
 		// We need to write out the CPU profile when we are all done.
 		compiler.hooks.done.tapAsync(
 			{
-				name: pluginName,
+				name: PLUGIN_NAME,
 				stage: Infinity
 			},
 			(stats, callback) => {
@@ -312,18 +333,18 @@ const interceptAllHooksFor = (instance, tracer, logLabel) => {
 
 const interceptAllParserHooks = (moduleFactory, tracer) => {
 	const moduleTypes = [
-		"javascript/auto",
-		"javascript/dynamic",
-		"javascript/esm",
-		"json",
-		"webassembly/async",
-		"webassembly/sync"
+		JAVASCRIPT_MODULE_TYPE_AUTO,
+		JAVASCRIPT_MODULE_TYPE_DYNAMIC,
+		JAVASCRIPT_MODULE_TYPE_ESM,
+		JSON_MODULE_TYPE,
+		WEBASSEMBLY_MODULE_TYPE_ASYNC,
+		WEBASSEMBLY_MODULE_TYPE_SYNC
 	];
 
 	moduleTypes.forEach(moduleType => {
 		moduleFactory.hooks.parser
 			.for(moduleType)
-			.tap("ProfilingPlugin", (parser, parserOpts) => {
+			.tap(PLUGIN_NAME, (parser, parserOpts) => {
 				interceptAllHooksFor(parser, tracer, "Parser");
 			});
 	});
@@ -347,7 +368,7 @@ const makeInterceptorFor = (instance, tracer) => hookName => ({
 		const { name, type, fn } = tapInfo;
 		const newFn =
 			// Don't tap our own hooks to ensure stream can close cleanly
-			name === pluginName
+			name === PLUGIN_NAME
 				? fn
 				: makeNewProfiledTapFn(hookName, tracer, {
 						name,
@@ -418,7 +439,7 @@ const makeNewProfiledTapFn = (hookName, tracer, { name, type, fn }) => {
 				const id = ++tracer.counter;
 				// Do not instrument ourself due to the CPU
 				// profile needing to be the last event in the trace.
-				if (name === pluginName) {
+				if (name === PLUGIN_NAME) {
 					return fn(...args);
 				}
 

package/lib/dependencies/AMDDefineDependency.js

@@ -12,12 +12,15 @@ const NullDependency = require("./NullDependency");
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
 /** @typedef {import("../Dependency")} Dependency */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
+/** @typedef {import("../javascript/JavascriptParser").Range} Range */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 
 /** @type {Record<string, { definition: string, content: string, requests: string[] }>} */
 const DEFINITIONS = {
 	f: {
 		definition: "var __WEBPACK_AMD_DEFINE_RESULT__;",
-		content: `!(__WEBPACK_AMD_DEFINE_RESULT__ = (#).call(exports, __webpack_require__, exports, module),
+		content: `!(__WEBPACK_AMD_DEFINE_RESULT__ = (#).call(exports, ${RuntimeGlobals.require}, exports, module),
 		__WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__))`,
 		requests: [
 			RuntimeGlobals.require,
@@ -35,7 +38,7 @@ const DEFINITIONS = {
 			"var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__;",
 		content: `!(__WEBPACK_AMD_DEFINE_FACTORY__ = (#),
 		__WEBPACK_AMD_DEFINE_RESULT__ = (typeof __WEBPACK_AMD_DEFINE_FACTORY__ === 'function' ?
-		(__WEBPACK_AMD_DEFINE_FACTORY__.call(exports, __webpack_require__, exports, module)) :
+		(__WEBPACK_AMD_DEFINE_FACTORY__.call(exports, ${RuntimeGlobals.require}, exports, module)) :
 		__WEBPACK_AMD_DEFINE_FACTORY__),
 		__WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__))`,
 		requests: [
@@ -67,8 +70,7 @@ const DEFINITIONS = {
 	},
 	lf: {
 		definition: "var XXX, XXXmodule;",
-		content:
-			"!(XXXmodule = { id: YYY, exports: {}, loaded: false }, XXX = (#).call(XXXmodule.exports, __webpack_require__, XXXmodule.exports, XXXmodule), XXXmodule.loaded = true, XXX === undefined && (XXX = XXXmodule.exports))",
+		content: `!(XXXmodule = { id: YYY, exports: {}, loaded: false }, XXX = (#).call(XXXmodule.exports, ${RuntimeGlobals.require}, XXXmodule.exports, XXXmodule), XXXmodule.loaded = true, XXX === undefined && (XXX = XXXmodule.exports))`,
 		requests: [RuntimeGlobals.require, RuntimeGlobals.module]
 	},
 	lo: {
@@ -78,8 +80,7 @@ const DEFINITIONS = {
 	},
 	lof: {
 		definition: "var XXX, XXXfactory, XXXmodule;",
-		content:
-			"!(XXXfactory = (#), (typeof XXXfactory === 'function' ? ((XXXmodule = { id: YYY, exports: {}, loaded: false }), (XXX = XXXfactory.call(XXXmodule.exports, __webpack_require__, XXXmodule.exports, XXXmodule)), (XXXmodule.loaded = true), XXX === undefined && (XXX = XXXmodule.exports)) : XXX = XXXfactory))",
+		content: `!(XXXfactory = (#), (typeof XXXfactory === 'function' ? ((XXXmodule = { id: YYY, exports: {}, loaded: false }), (XXX = XXXfactory.call(XXXmodule.exports, ${RuntimeGlobals.require}, XXXmodule.exports, XXXmodule)), (XXXmodule.loaded = true), XXX === undefined && (XXX = XXXmodule.exports)) : XXX = XXXfactory))`,
 		requests: [RuntimeGlobals.require, RuntimeGlobals.module]
 	},
 	laf: {
@@ -105,6 +106,13 @@ const DEFINITIONS = {
 };
 
 class AMDDefineDependency extends NullDependency {
+	/**
+	 * @param {Range} range range
+	 * @param {Range} arrayRange array range
+	 * @param {Range} functionRange function range
+	 * @param {Range} objectRange object range
+	 * @param {boolean} namedModule true, when define is called with a name
+	 */
 	constructor(range, arrayRange, functionRange, objectRange, namedModule) {
 		super();
 		this.range = range;
@@ -119,6 +127,9 @@ class AMDDefineDependency extends NullDependency {
 		return "amd define";
 	}
 
+	/**
+	 * @param {ObjectSerializerContext} context context
+	 */
 	serialize(context) {
 		const { write } = context;
 		write(this.range);
@@ -130,6 +141,9 @@ class AMDDefineDependency extends NullDependency {
 		super.serialize(context);
 	}
 
+	/**
+	 * @param {ObjectDeserializerContext} context context
+	 */
 	deserialize(context) {
 		const { read } = context;
 		this.range = read();
@@ -166,6 +180,10 @@ AMDDefineDependency.Template = class AMDDefineDependencyTemplate extends (
 		this.replace(dep, source, definition, content);
 	}
 
+	/**
+	 * @param {AMDDefineDependency} dependency dependency
+	 * @returns {string} variable name
+	 */
 	localModuleVar(dependency) {
 		return (
 			dependency.localModule &&
@@ -174,6 +192,10 @@ AMDDefineDependency.Template = class AMDDefineDependencyTemplate extends (
 		);
 	}
 
+	/**
+	 * @param {AMDDefineDependency} dependency dependency
+	 * @returns {string} branch
+	 */
 	branch(dependency) {
 		const localModuleVar = this.localModuleVar(dependency) ? "l" : "";
 		const arrayRange = dependency.arrayRange ? "a" : "";
@@ -182,6 +204,12 @@ AMDDefineDependency.Template = class AMDDefineDependencyTemplate extends (
 		return localModuleVar + arrayRange + objectRange + functionRange;
 	}
 
+	/**
+	 * @param {AMDDefineDependency} dependency dependency
+	 * @param {ReplaceSource} source source
+	 * @param {string} definition definition
+	 * @param {string} text text
+	 */
 	replace(dependency, source, definition, text) {
 		const localModuleVar = this.localModuleVar(dependency);
 		if (localModuleVar) {
@@ -202,18 +230,34 @@ AMDDefineDependency.Template = class AMDDefineDependencyTemplate extends (
 
 		let current = dependency.range[0];
 		if (dependency.arrayRange) {
-			source.replace(current, dependency.arrayRange[0] - 1, texts.shift());
+			source.replace(
+				current,
+				dependency.arrayRange[0] - 1,
+				/** @type {string} */ (texts.shift())
+			);
 			current = dependency.arrayRange[1];
 		}
 
 		if (dependency.objectRange) {
-			source.replace(current, dependency.objectRange[0] - 1, texts.shift());
+			source.replace(
+				current,
+				dependency.objectRange[0] - 1,
+				/** @type {string} */ (texts.shift())
+			);
 			current = dependency.objectRange[1];
 		} else if (dependency.functionRange) {
-			source.replace(current, dependency.functionRange[0] - 1, texts.shift());
+			source.replace(
+				current,
+				dependency.functionRange[0] - 1,
+				/** @type {string} */ (texts.shift())
+			);
 			current = dependency.functionRange[1];
 		}
-		source.replace(current, dependency.range[1] - 1, texts.shift());
+		source.replace(
+			current,
+			dependency.range[1] - 1,
+			/** @type {string} */ (texts.shift())
+		);
 		if (texts.length > 0) throw new Error("Implementation error");
 	}
 };

package/lib/dependencies/AMDDefineDependencyParserPlugin.js

@@ -16,6 +16,13 @@ const DynamicExports = require("./DynamicExports");
 const LocalModuleDependency = require("./LocalModuleDependency");
 const { addLocalModule, getLocalModule } = require("./LocalModulesHelpers");
 
+/** @typedef {import("estree").CallExpression} CallExpression */
+/** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
+
+/**
+ * @param {CallExpression} expr expression
+ * @returns {boolean} true if it's a bound function expression
+ */
 const isBoundFunctionExpression = expr => {
 	if (expr.type !== "CallExpression") return false;
 	if (expr.callee.type !== "MemberExpression") return false;
@@ -43,6 +50,10 @@ class AMDDefineDependencyParserPlugin {
 		this.options = options;
 	}
 
+	/**
+	 * @param {JavascriptParser} parser the parser
+	 * @returns {void}
+	 */
 	apply(parser) {
 		parser.hooks.call
 			.for("define")
@@ -73,7 +84,7 @@ class AMDDefineDependencyParserPlugin {
 				let localModule;
 				if (request === "require") {
 					identifiers[idx] = request;
-					dep = "__webpack_require__";
+					dep = RuntimeGlobals.require;
 				} else if (["exports", "module"].includes(request)) {
 					identifiers[idx] = request;
 					dep = request;
@@ -109,7 +120,7 @@ class AMDDefineDependencyParserPlugin {
 		} else if (param.isString()) {
 			let dep, localModule;
 			if (param.string === "require") {
-				dep = new ConstDependency("__webpack_require__", param.range, [
+				dep = new ConstDependency(RuntimeGlobals.require, param.range, [
 					RuntimeGlobals.require
 				]);
 			} else if (param.string === "exports") {

package/lib/dependencies/AMDPlugin.js

@@ -5,6 +5,10 @@
 
 "use strict";
 
+const {
+	JAVASCRIPT_MODULE_TYPE_AUTO,
+	JAVASCRIPT_MODULE_TYPE_DYNAMIC
+} = require("../ModuleTypeConstants");
 const RuntimeGlobals = require("../RuntimeGlobals");
 const {
 	approve,
@@ -28,8 +32,12 @@ const ConstDependency = require("./ConstDependency");
 const LocalModuleDependency = require("./LocalModuleDependency");
 const UnsupportedDependency = require("./UnsupportedDependency");
 
+/** @typedef {import("../../declarations/WebpackOptions").JavascriptParserOptions} JavascriptParserOptions */
 /** @typedef {import("../../declarations/WebpackOptions").ModuleOptionsNormalized} ModuleOptions */
 /** @typedef {import("../Compiler")} Compiler */
+/** @typedef {import("../javascript/JavascriptParser")} Parser */
+
+const PLUGIN_NAME = "AMDPlugin";
 
 class AMDPlugin {
 	/**
@@ -47,7 +55,7 @@ class AMDPlugin {
 	apply(compiler) {
 		const amdOptions = this.amdOptions;
 		compiler.hooks.compilation.tap(
-			"AMDPlugin",
+			PLUGIN_NAME,
 			(compilation, { contextModuleFactory, normalModuleFactory }) => {
 				compilation.dependencyTemplates.set(
 					AMDRequireDependency,
@@ -94,31 +102,36 @@ class AMDPlugin {
 
 				compilation.hooks.runtimeRequirementInModule
 					.for(RuntimeGlobals.amdDefine)
-					.tap("AMDPlugin", (module, set) => {
+					.tap(PLUGIN_NAME, (module, set) => {
 						set.add(RuntimeGlobals.require);
 					});
 
 				compilation.hooks.runtimeRequirementInModule
 					.for(RuntimeGlobals.amdOptions)
-					.tap("AMDPlugin", (module, set) => {
+					.tap(PLUGIN_NAME, (module, set) => {
 						set.add(RuntimeGlobals.requireScope);
 					});
 
 				compilation.hooks.runtimeRequirementInTree
 					.for(RuntimeGlobals.amdDefine)
-					.tap("AMDPlugin", (chunk, set) => {
+					.tap(PLUGIN_NAME, (chunk, set) => {
 						compilation.addRuntimeModule(chunk, new AMDDefineRuntimeModule());
 					});
 
 				compilation.hooks.runtimeRequirementInTree
 					.for(RuntimeGlobals.amdOptions)
-					.tap("AMDPlugin", (chunk, set) => {
+					.tap(PLUGIN_NAME, (chunk, set) => {
 						compilation.addRuntimeModule(
 							chunk,
 							new AMDOptionsRuntimeModule(amdOptions)
 						);
 					});
 
+				/**
+				 * @param {Parser} parser parser parser
+				 * @param {JavascriptParserOptions} parserOptions parserOptions
+				 * @returns {void}
+				 */
 				const handler = (parser, parserOptions) => {
 					if (parserOptions.amd !== undefined && !parserOptions.amd) return;
 
@@ -126,7 +139,7 @@ class AMDPlugin {
 						parser.hooks.expression
 							.for(optionExpr)
 							.tap(
-								"AMDPlugin",
+								PLUGIN_NAME,
 								toConstantDependency(parser, RuntimeGlobals.amdOptions, [
 									RuntimeGlobals.amdOptions
 								])
@@ -134,16 +147,16 @@ class AMDPlugin {
 						parser.hooks.evaluateIdentifier
 							.for(optionExpr)
 							.tap(
-								"AMDPlugin",
+								PLUGIN_NAME,
 								evaluateToIdentifier(optionExpr, rootName, getMembers, true)
 							);
 						parser.hooks.evaluateTypeof
 							.for(optionExpr)
-							.tap("AMDPlugin", evaluateToString("object"));
+							.tap(PLUGIN_NAME, evaluateToString("object"));
 						parser.hooks.typeof
 							.for(optionExpr)
 							.tap(
-								"AMDPlugin",
+								PLUGIN_NAME,
 								toConstantDependency(parser, JSON.stringify("object"))
 							);
 					};
@@ -161,7 +174,7 @@ class AMDPlugin {
 						() => []
 					);
 
-					parser.hooks.expression.for("define").tap("AMDPlugin", expr => {
+					parser.hooks.expression.for("define").tap(PLUGIN_NAME, expr => {
 						const dep = new ConstDependency(
 							RuntimeGlobals.amdDefine,
 							expr.range,
@@ -174,14 +187,14 @@ class AMDPlugin {
 					parser.hooks.typeof
 						.for("define")
 						.tap(
-							"AMDPlugin",
+							PLUGIN_NAME,
 							toConstantDependency(parser, JSON.stringify("function"))
 						);
 					parser.hooks.evaluateTypeof
 						.for("define")
-						.tap("AMDPlugin", evaluateToString("function"));
-					parser.hooks.canRename.for("define").tap("AMDPlugin", approve);
-					parser.hooks.rename.for("define").tap("AMDPlugin", expr => {
+						.tap(PLUGIN_NAME, evaluateToString("function"));
+					parser.hooks.canRename.for("define").tap(PLUGIN_NAME, approve);
+					parser.hooks.rename.for("define").tap(PLUGIN_NAME, expr => {
 						const dep = new ConstDependency(
 							RuntimeGlobals.amdDefine,
 							expr.range,
@@ -194,20 +207,20 @@ class AMDPlugin {
 					parser.hooks.typeof
 						.for("require")
 						.tap(
-							"AMDPlugin",
+							PLUGIN_NAME,
 							toConstantDependency(parser, JSON.stringify("function"))
 						);
 					parser.hooks.evaluateTypeof
 						.for("require")
-						.tap("AMDPlugin", evaluateToString("function"));
+						.tap(PLUGIN_NAME, evaluateToString("function"));
 				};
 
 				normalModuleFactory.hooks.parser
-					.for("javascript/auto")
-					.tap("AMDPlugin", handler);
+					.for(JAVASCRIPT_MODULE_TYPE_AUTO)
+					.tap(PLUGIN_NAME, handler);
 				normalModuleFactory.hooks.parser
-					.for("javascript/dynamic")
-					.tap("AMDPlugin", handler);
+					.for(JAVASCRIPT_MODULE_TYPE_DYNAMIC)
+					.tap(PLUGIN_NAME, handler);
 			}
 		);
 	}

package/lib/dependencies/AMDRequireArrayDependency.js

@@ -12,8 +12,15 @@ const NullDependency = require("./NullDependency");
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
 /** @typedef {import("../Dependency")} Dependency */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
+/** @typedef {import("../javascript/JavascriptParser").Range} Range */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 
 class AMDRequireArrayDependency extends NullDependency {
+	/**
+	 * @param {TODO} depsArray deps array
+	 * @param {Range} range range
+	 */
 	constructor(depsArray, range) {
 		super();
 
@@ -29,6 +36,9 @@ class AMDRequireArrayDependency extends NullDependency {
 		return "amd";
 	}
 
+	/**
+	 * @param {ObjectSerializerContext} context context
+	 */
 	serialize(context) {
 		const { write } = context;
 
@@ -38,6 +48,9 @@ class AMDRequireArrayDependency extends NullDependency {
 		super.serialize(context);
 	}
 
+	/**
+	 * @param {ObjectDeserializerContext} context context
+	 */
 	deserialize(context) {
 		const { read } = context;
 

package/lib/dependencies/AMDRequireContextDependency.js

@@ -8,7 +8,16 @@
 const makeSerializable = require("../util/makeSerializable");
 const ContextDependency = require("./ContextDependency");
 
+/** @typedef {import("../javascript/JavascriptParser").Range} Range */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+
 class AMDRequireContextDependency extends ContextDependency {
+	/**
+	 * @param {TODO} options options
+	 * @param {Range} range range
+	 * @param {Range} valueRange value range
+	 */
 	constructor(options, range, valueRange) {
 		super(options);
 
@@ -24,6 +33,9 @@ class AMDRequireContextDependency extends ContextDependency {
 		return "amd";
 	}
 
+	/**
+	 * @param {ObjectSerializerContext} context context
+	 */
 	serialize(context) {
 		const { write } = context;
 
@@ -33,6 +45,9 @@ class AMDRequireContextDependency extends ContextDependency {
 		super.serialize(context);
 	}
 
+	/**
+	 * @param {ObjectDeserializerContext} context context
+	 */
 	deserialize(context) {
 		const { read } = context;
 

package/lib/dependencies/AMDRequireDependenciesBlock.js

@@ -8,7 +8,13 @@
 const AsyncDependenciesBlock = require("../AsyncDependenciesBlock");
 const makeSerializable = require("../util/makeSerializable");
 
+/** @typedef {import("../Dependency").DependencyLocation} DependencyLocation */
+
 class AMDRequireDependenciesBlock extends AsyncDependenciesBlock {
+	/**
+	 * @param {DependencyLocation} loc location info
+	 * @param {string=} request request
+	 */
 	constructor(loc, request) {
 		super(null, loc, request);
 	}

package/lib/dependencies/AMDRequireDependenciesBlockParserPlugin.js

@@ -19,6 +19,8 @@ const { getLocalModule } = require("./LocalModulesHelpers");
 const UnsupportedDependency = require("./UnsupportedDependency");
 const getFunctionExpression = require("./getFunctionExpression");
 
+/** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
+
 class AMDRequireDependenciesBlockParserPlugin {
 	constructor(options) {
 		this.options = options;
@@ -50,6 +52,10 @@ class AMDRequireDependenciesBlockParserPlugin {
 		return bindThis;
 	}
 
+	/**
+	 * @param {JavascriptParser} parser the parser
+	 * @returns {void}
+	 */
 	apply(parser) {
 		parser.hooks.call
 			.for("require")
@@ -73,7 +79,7 @@ class AMDRequireDependenciesBlockParserPlugin {
 			for (const request of param.array) {
 				let dep, localModule;
 				if (request === "require") {
-					dep = "__webpack_require__";
+					dep = RuntimeGlobals.require;
 				} else if (["exports", "module"].includes(request)) {
 					dep = request;
 				} else if ((localModule = getLocalModule(parser.state, request))) {
@@ -108,7 +114,7 @@ class AMDRequireDependenciesBlockParserPlugin {
 		} else if (param.isString()) {
 			let dep, localModule;
 			if (param.string === "require") {
-				dep = new ConstDependency("__webpack_require__", param.string, [
+				dep = new ConstDependency(RuntimeGlobals.require, param.string, [
 					RuntimeGlobals.require
 				]);
 			} else if (param.string === "module") {

package/lib/dependencies/AMDRequireDependency.js

@@ -13,8 +13,17 @@ const NullDependency = require("./NullDependency");
 /** @typedef {import("../AsyncDependenciesBlock")} AsyncDependenciesBlock */
 /** @typedef {import("../Dependency")} Dependency */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
+/** @typedef {import("../javascript/JavascriptParser").Range} Range */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 
 class AMDRequireDependency extends NullDependency {
+	/**
+	 * @param {Range} outerRange outer range
+	 * @param {Range} arrayRange array range
+	 * @param {Range} functionRange function range
+	 * @param {Range} errorCallbackRange error callback range
+	 */
 	constructor(outerRange, arrayRange, functionRange, errorCallbackRange) {
 		super();
 
@@ -30,6 +39,9 @@ class AMDRequireDependency extends NullDependency {
 		return "amd";
 	}
 
+	/**
+	 * @param {ObjectSerializerContext} context context
+	 */
 	serialize(context) {
 		const { write } = context;
 
@@ -43,6 +55,9 @@ class AMDRequireDependency extends NullDependency {
 		super.serialize(context);
 	}
 
+	/**
+	 * @param {ObjectDeserializerContext} context context
+	 */
 	deserialize(context) {
 		const { read } = context;
 
@@ -103,7 +118,7 @@ AMDRequireDependency.Template = class AMDRequireDependencyTemplate extends (
 		// has function range but no array range
 		if (dep.functionRange && !dep.arrayRange) {
 			const startBlock = `${promise}.then((`;
-			const endBlock = `).bind(exports, __webpack_require__, exports, module))['catch'](${RuntimeGlobals.uncaughtErrorHandler})`;
+			const endBlock = `).bind(exports, ${RuntimeGlobals.require}, exports, module))['catch'](${RuntimeGlobals.uncaughtErrorHandler})`;
 			runtimeRequirements.add(RuntimeGlobals.uncaughtErrorHandler);
 
 			source.replace(dep.outerRange[0], dep.functionRange[0] - 1, startBlock);

package/lib/dependencies/AMDRequireItemDependency.js

@@ -9,7 +9,13 @@ const makeSerializable = require("../util/makeSerializable");
 const ModuleDependency = require("./ModuleDependency");
 const ModuleDependencyTemplateAsRequireId = require("./ModuleDependencyTemplateAsRequireId");
 
+/** @typedef {import("../javascript/JavascriptParser").Range} Range */
+
 class AMDRequireItemDependency extends ModuleDependency {
+	/**
+	 * @param {string} request the request string
+	 * @param {Range} range location in source code
+	 */
 	constructor(request, range) {
 		super(request);
 

package/lib/dependencies/AMDRuntimeModules.js

@@ -14,7 +14,7 @@ class AMDDefineRuntimeModule extends RuntimeModule {
 	}
 
 	/**
-	 * @returns {string} runtime code
+	 * @returns {string | null} runtime code
 	 */
 	generate() {
 		return Template.asString([
@@ -35,7 +35,7 @@ class AMDOptionsRuntimeModule extends RuntimeModule {
 	}
 
 	/**
-	 * @returns {string} runtime code
+	 * @returns {string | null} runtime code
 	 */
 	generate() {
 		return Template.asString([