webpack 5.83.0 → 5.84.0

package/lib/css/CssParser.js

@@ -19,6 +19,8 @@ const walkCssTokens = require("./walkCssTokens");
 
 /** @typedef {import("../Parser").ParserState} ParserState */
 /** @typedef {import("../Parser").PreparsedAst} PreparsedAst */
+/** @typedef {[number, number]} Range */
+
 const CC_LEFT_CURLY = "{".charCodeAt(0);
 const CC_RIGHT_CURLY = "}".charCodeAt(0);
 const CC_COLON = ":".charCodeAt(0);
@@ -121,10 +123,9 @@ class LocConverter {
 
 const CSS_MODE_TOP_LEVEL = 0;
 const CSS_MODE_IN_BLOCK = 1;
-const CSS_MODE_AT_IMPORT_EXPECT_URL = 2;
-const CSS_MODE_AT_IMPORT_EXPECT_LAYER_OR_SUPPORTS_OR_MEDIA = 3;
-const CSS_MODE_AT_IMPORT_INVALID = 4;
-const CSS_MODE_AT_NAMESPACE_INVALID = 5;
+const CSS_MODE_IN_AT_IMPORT = 2;
+const CSS_MODE_AT_IMPORT_INVALID = 3;
+const CSS_MODE_AT_NAMESPACE_INVALID = 4;
 
 class CssParser extends Parser {
 	constructor({ allowModeSwitch = true, defaultMode = "global" } = {}) {
@@ -183,7 +184,7 @@ class CssParser extends Parser {
 		let lastIdentifier = undefined;
 		/** @type [string, number, number][] */
 		let balanced = [];
-		/** @type {undefined | { start: number, end: number, url?: string, media?: string, supports?: string, layer?: string  }} */
+		/** @type {undefined | { start: number, url?: string, urlStart?: number, urlEnd?: number, layer?: string, layerStart?: number, layerEnd?: number, supports?: string, supportsStart?: number, supportsEnd?: number, inSupports?:boolean, media?: string  }} */
 		let importData = undefined;
 		/** @type {boolean} */
 		let inAnimationProperty = false;
@@ -405,15 +406,32 @@ class CssParser extends Parser {
 			},
 			url: (input, start, end, contentStart, contentEnd) => {
 				let value = normalizeUrl(input.slice(contentStart, contentEnd), false);
+
 				switch (scope) {
-					case CSS_MODE_AT_IMPORT_EXPECT_URL: {
+					case CSS_MODE_IN_AT_IMPORT: {
+						// Do not parse URLs in `supports(...)`
+						if (importData.inSupports) {
+							break;
+						}
+
+						if (importData.url) {
+							this._emitWarning(
+								state,
+								`Duplicate of 'url(...)' in '${input.slice(
+									importData.start,
+									end
+								)}'`,
+								locConverter,
+								start,
+								end
+							);
+
+							break;
+						}
+
 						importData.url = value;
-						importData.end = end;
-						scope = CSS_MODE_AT_IMPORT_EXPECT_LAYER_OR_SUPPORTS_OR_MEDIA;
-						break;
-					}
-					// Do not parse URLs in `supports(...)`
-					case CSS_MODE_AT_IMPORT_EXPECT_LAYER_OR_SUPPORTS_OR_MEDIA: {
+						importData.urlStart = start;
+						importData.urlEnd = end;
 						break;
 					}
 					// Do not parse URLs in import between rules
@@ -440,23 +458,44 @@ class CssParser extends Parser {
 			},
 			string: (input, start, end) => {
 				switch (scope) {
-					case CSS_MODE_AT_IMPORT_EXPECT_URL: {
+					case CSS_MODE_IN_AT_IMPORT: {
+						const insideURLFunction =
+							balanced[balanced.length - 1] &&
+							balanced[balanced.length - 1][0] === "url";
+
+						// Do not parse URLs in `supports(...)` and other strings if we already have a URL
+						if (
+							importData.inSupports ||
+							(!insideURLFunction && importData.url)
+						) {
+							break;
+						}
+
+						if (insideURLFunction && importData.url) {
+							this._emitWarning(
+								state,
+								`Duplicate of 'url(...)' in '${input.slice(
+									importData.start,
+									end
+								)}'`,
+								locConverter,
+								start,
+								end
+							);
+
+							break;
+						}
+
 						importData.url = normalizeUrl(
 							input.slice(start + 1, end - 1),
 							true
 						);
-						importData.end = end;
-						const insideURLFunction =
-							balanced[balanced.length - 1] &&
-							balanced[balanced.length - 1][0] === "url";
 
 						if (!insideURLFunction) {
-							scope = CSS_MODE_AT_IMPORT_EXPECT_LAYER_OR_SUPPORTS_OR_MEDIA;
+							importData.urlStart = start;
+							importData.urlEnd = end;
 						}
-						break;
-					}
-					// Do not parse URLs in `supports(...)`
-					case CSS_MODE_AT_IMPORT_EXPECT_LAYER_OR_SUPPORTS_OR_MEDIA: {
+
 						break;
 					}
 					case CSS_MODE_IN_BLOCK: {
@@ -497,7 +536,7 @@ class CssParser extends Parser {
 					scope = CSS_MODE_AT_NAMESPACE_INVALID;
 					this._emitWarning(
 						state,
-						"@namespace is not supported in bundled CSS",
+						"'@namespace' is not supported in bundled CSS",
 						locConverter,
 						start,
 						end
@@ -508,7 +547,7 @@ class CssParser extends Parser {
 						scope = CSS_MODE_AT_IMPORT_INVALID;
 						this._emitWarning(
 							state,
-							"Any @import rules must precede all other rules",
+							"Any '@import' rules must precede all other rules",
 							locConverter,
 							start,
 							end
@@ -516,8 +555,8 @@ class CssParser extends Parser {
 						return end;
 					}
 
-					scope = CSS_MODE_AT_IMPORT_EXPECT_URL;
-					importData = { start, end };
+					scope = CSS_MODE_IN_AT_IMPORT;
+					importData = { start };
 				} else if (
 					this.allowModeSwitch &&
 					OPTIONALLY_VENDOR_PREFIXED_KEYFRAMES_AT_RULE.test(name)
@@ -598,54 +637,99 @@ class CssParser extends Parser {
 			},
 			semicolon: (input, start, end) => {
 				switch (scope) {
-					case CSS_MODE_AT_IMPORT_EXPECT_URL: {
-						this._emitWarning(
-							state,
-							`Expected URL for @import at ${start}`,
-							locConverter,
-							start,
-							end
-						);
-						return end;
-					}
-					case CSS_MODE_AT_IMPORT_EXPECT_LAYER_OR_SUPPORTS_OR_MEDIA: {
-						if (!importData.url === undefined) {
+					case CSS_MODE_IN_AT_IMPORT: {
+						const { start } = importData;
+
+						if (importData.url === undefined) {
 							this._emitWarning(
 								state,
-								`Expected URL for @import at ${importData.start}`,
+								`Expected URL in '${input.slice(start, end)}'`,
 								locConverter,
-								importData.start,
-								importData.end
+								start,
+								end
 							);
+							importData = undefined;
+							scope = CSS_MODE_TOP_LEVEL;
+							return end;
+						}
+						if (
+							importData.urlStart > importData.layerStart ||
+							importData.urlStart > importData.supportsStart
+						) {
+							this._emitWarning(
+								state,
+								`An URL in '${input.slice(
+									start,
+									end
+								)}' should be before 'layer(...)' or 'supports(...)'`,
+								locConverter,
+								start,
+								end
+							);
+							importData = undefined;
+							scope = CSS_MODE_TOP_LEVEL;
 							return end;
 						}
+						if (importData.layerStart > importData.supportsStart) {
+							this._emitWarning(
+								state,
+								`The 'layer(...)' in '${input.slice(
+									start,
+									end
+								)}' should be before 'supports(...)'`,
+								locConverter,
+								start,
+								end
+							);
+							importData = undefined;
+							scope = CSS_MODE_TOP_LEVEL;
+							return end;
+						}
+
 						const semicolonPos = end;
 						end = walkCssTokens.eatWhiteLine(input, end + 1);
-						const { line: sl, column: sc } = locConverter.get(importData.start);
+						const { line: sl, column: sc } = locConverter.get(start);
 						const { line: el, column: ec } = locConverter.get(end);
-						const pos = walkCssTokens.eatWhitespaceAndComments(
-							input,
-							importData.end
-						);
+						const lastEnd =
+							importData.supportsEnd ||
+							importData.layerEnd ||
+							importData.urlEnd ||
+							start;
+						const pos = walkCssTokens.eatWhitespaceAndComments(input, lastEnd);
 						// Prevent to consider comments as a part of media query
 						if (pos !== semicolonPos - 1) {
-							importData.media = input
-								.slice(importData.end, semicolonPos - 1)
-								.trim();
+							importData.media = input.slice(lastEnd, semicolonPos - 1).trim();
 						}
-						const dep = new CssImportDependency(
-							importData.url.trim(),
-							[importData.start, end],
-							importData.layer,
-							importData.supports,
-							importData.media && importData.media.length > 0
-								? importData.media
-								: undefined
-						);
-						dep.setLoc(sl, sc, el, ec);
-						module.addDependency(dep);
+
+						const url = importData.url.trim();
+
+						if (url.length === 0) {
+							const dep = new ConstDependency("", [start, end]);
+							module.addPresentationalDependency(dep);
+							dep.setLoc(sl, sc, el, ec);
+						} else {
+							const dep = new CssImportDependency(
+								url,
+								[start, end],
+								importData.layer,
+								importData.supports,
+								importData.media && importData.media.length > 0
+									? importData.media
+									: undefined
+							);
+							dep.setLoc(sl, sc, el, ec);
+							module.addDependency(dep);
+						}
+
 						importData = undefined;
 						scope = CSS_MODE_TOP_LEVEL;
+
+						break;
+					}
+					case CSS_MODE_AT_IMPORT_INVALID:
+					case CSS_MODE_AT_NAMESPACE_INVALID: {
+						scope = CSS_MODE_TOP_LEVEL;
+
 						break;
 					}
 					case CSS_MODE_IN_BLOCK: {
@@ -718,10 +802,11 @@ class CssParser extends Parser {
 						}
 						break;
 					}
-					case CSS_MODE_AT_IMPORT_EXPECT_LAYER_OR_SUPPORTS_OR_MEDIA: {
+					case CSS_MODE_IN_AT_IMPORT: {
 						if (input.slice(start, end).toLowerCase() === "layer") {
 							importData.layer = "";
-							importData.end = end;
+							importData.layerStart = start;
+							importData.layerEnd = end;
 						}
 						break;
 					}
@@ -756,6 +841,13 @@ class CssParser extends Parser {
 
 				balanced.push([name, start, end]);
 
+				if (
+					scope === CSS_MODE_IN_AT_IMPORT &&
+					name.toLowerCase() === "supports"
+				) {
+					importData.inSupports = true;
+				}
+
 				if (isLocalMode()) {
 					name = name.toLowerCase();
 
@@ -810,20 +902,23 @@ class CssParser extends Parser {
 				}
 
 				switch (scope) {
-					case CSS_MODE_AT_IMPORT_EXPECT_URL: {
-						if (last && last[0] === "url") {
-							importData.end = end;
-							scope = CSS_MODE_AT_IMPORT_EXPECT_LAYER_OR_SUPPORTS_OR_MEDIA;
-						}
-						break;
-					}
-					case CSS_MODE_AT_IMPORT_EXPECT_LAYER_OR_SUPPORTS_OR_MEDIA: {
-						if (last && last[0].toLowerCase() === "layer") {
+					case CSS_MODE_IN_AT_IMPORT: {
+						if (last && last[0] === "url" && !importData.inSupports) {
+							importData.urlStart = last[1];
+							importData.urlEnd = end;
+						} else if (
+							last &&
+							last[0].toLowerCase() === "layer" &&
+							!importData.inSupports
+						) {
 							importData.layer = input.slice(last[2], end - 1).trim();
-							importData.end = end;
+							importData.layerStart = last[1];
+							importData.layerEnd = end;
 						} else if (last && last[0].toLowerCase() === "supports") {
 							importData.supports = input.slice(last[2], end - 1).trim();
-							importData.end = end;
+							importData.supportsStart = last[1];
+							importData.supportsEnd = end;
+							importData.inSupports = false;
 						}
 						break;
 					}

package/lib/debug/ProfilingPlugin.js

@@ -17,6 +17,7 @@ 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(
@@ -72,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) => {
@@ -203,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,

package/lib/dependencies/AMDDefineDependency.js

@@ -12,6 +12,7 @@ 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 */
 
@@ -19,7 +20,7 @@ const NullDependency = require("./NullDependency");
 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,
@@ -37,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: [
@@ -69,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: {
@@ -80,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: {
@@ -107,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;

package/lib/dependencies/AMDDefineDependencyParserPlugin.js

@@ -16,6 +16,8 @@ const DynamicExports = require("./DynamicExports");
 const LocalModuleDependency = require("./LocalModuleDependency");
 const { addLocalModule, getLocalModule } = require("./LocalModulesHelpers");
 
+/** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
+
 const isBoundFunctionExpression = expr => {
 	if (expr.type !== "CallExpression") return false;
 	if (expr.callee.type !== "MemberExpression") return false;
@@ -43,6 +45,10 @@ class AMDDefineDependencyParserPlugin {
 		this.options = options;
 	}
 
+	/**
+	 * @param {JavascriptParser} parser the parser
+	 * @returns {void}
+	 */
 	apply(parser) {
 		parser.hooks.call
 			.for("define")
@@ -73,7 +79,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 +115,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

@@ -32,8 +32,10 @@ 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";
 
@@ -125,6 +127,11 @@ class AMDPlugin {
 						);
 					});
 
+				/**
+				 * @param {Parser} parser parser parser
+				 * @param {JavascriptParserOptions} parserOptions parserOptions
+				 * @returns {void}
+				 */
 				const handler = (parser, parserOptions) => {
 					if (parserOptions.amd !== undefined && !parserOptions.amd) return;
 

package/lib/dependencies/AMDRequireArrayDependency.js

@@ -12,10 +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();
 

package/lib/dependencies/AMDRequireContextDependency.js

@@ -8,10 +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);
 

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,10 +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();
 
@@ -111,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/CachedConstDependency.js

@@ -18,11 +18,17 @@ const NullDependency = require("./NullDependency");
 /** @typedef {import("../DependencyTemplates")} DependencyTemplates */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
+/** @typedef {import("../javascript/JavascriptParser").Range} Range */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 /** @typedef {import("../util/Hash")} Hash */
 
 class CachedConstDependency extends NullDependency {
+	/**
+	 * @param {string} expression expression
+	 * @param {Range} range range
+	 * @param {string} identifier identifier
+	 */
 	constructor(expression, range, identifier) {
 		super();