webpack 5.83.1 → 5.84.0

package/lib/dependencies/RequireHeaderDependency.js

@@ -12,10 +12,14 @@ 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 RequireHeaderDependency extends NullDependency {
+	/**
+	 * @param {Range} range range
+	 */
 	constructor(range) {
 		super();
 		if (!Array.isArray(range)) throw new Error("range must be valid");
@@ -55,7 +59,7 @@ RequireHeaderDependency.Template = class RequireHeaderDependencyTemplate extends
 	apply(dependency, source, { runtimeRequirements }) {
 		const dep = /** @type {RequireHeaderDependency} */ (dependency);
 		runtimeRequirements.add(RuntimeGlobals.require);
-		source.replace(dep.range[0], dep.range[1] - 1, "__webpack_require__");
+		source.replace(dep.range[0], dep.range[1] - 1, RuntimeGlobals.require);
 	}
 };
 

package/lib/dependencies/RequireIncludeDependency.js

@@ -14,9 +14,14 @@ const ModuleDependency = require("./ModuleDependency");
 /** @typedef {import("../Dependency").ReferencedExport} ReferencedExport */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
+/** @typedef {import("../javascript/JavascriptParser").Range} Range */
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
 
 class RequireIncludeDependency extends ModuleDependency {
+	/**
+	 * @param {string} request the request string
+	 * @param {Range} range location in source code
+	 */
 	constructor(request, range) {
 		super(request);
 

package/lib/dependencies/RequireIncludeDependencyParserPlugin.js

@@ -14,6 +14,9 @@ const makeSerializable = require("../util/makeSerializable");
 const RequireIncludeDependency = require("./RequireIncludeDependency");
 
 module.exports = class RequireIncludeDependencyParserPlugin {
+	/**
+	 * @param {boolean} warn true: warn about deprecation, false: don't warn
+	 */
 	constructor(warn) {
 		this.warn = warn;
 	}

package/lib/dependencies/RequireIncludePlugin.js

@@ -12,9 +12,18 @@ const {
 const RequireIncludeDependency = require("./RequireIncludeDependency");
 const RequireIncludeDependencyParserPlugin = require("./RequireIncludeDependencyParserPlugin");
 
+/** @typedef {import("../../declarations/WebpackOptions").JavascriptParserOptions} JavascriptParserOptions */
+/** @typedef {import("../Compiler")} Compiler */
+/** @typedef {import("../javascript/JavascriptParser")} Parser */
+
 const PLUGIN_NAME = "RequireIncludePlugin";
 
 class RequireIncludePlugin {
+	/**
+	 * Apply the plugin
+	 * @param {Compiler} compiler the compiler instance
+	 * @returns {void}
+	 */
 	apply(compiler) {
 		compiler.hooks.compilation.tap(
 			PLUGIN_NAME,
@@ -28,6 +37,11 @@ class RequireIncludePlugin {
 					new RequireIncludeDependency.Template()
 				);
 
+				/**
+				 * @param {Parser} parser parser parser
+				 * @param {JavascriptParserOptions} parserOptions parserOptions
+				 * @returns {void}
+				 */
 				const handler = (parser, parserOptions) => {
 					if (parserOptions.requireInclude === false) return;
 					const warn = parserOptions.requireInclude === undefined;

package/lib/dependencies/RequireResolveContextDependency.js

@@ -9,10 +9,18 @@ const makeSerializable = require("../util/makeSerializable");
 const ContextDependency = require("./ContextDependency");
 const ContextDependencyTemplateAsId = require("./ContextDependencyTemplateAsId");
 
+/** @typedef {import("../javascript/JavascriptParser").Range} Range */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @typedef {import("./ContextDependency").ContextDependencyOptions} ContextDependencyOptions */
 
 class RequireResolveContextDependency extends ContextDependency {
+	/**
+	 * @param {ContextDependencyOptions} options options
+	 * @param {Range} range range
+	 * @param {Range} valueRange value range
+	 * @param {TODO} context context
+	 */
 	constructor(options, range, valueRange, context) {
 		super(options, context);
 

package/lib/dependencies/RequireResolveDependency.js

@@ -12,9 +12,15 @@ const ModuleDependencyAsId = require("./ModuleDependencyTemplateAsId");
 
 /** @typedef {import("../Dependency").ReferencedExport} ReferencedExport */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
+/** @typedef {import("../javascript/JavascriptParser").Range} Range */
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
 
 class RequireResolveDependency extends ModuleDependency {
+	/**
+	 * @param {string} request the request string
+	 * @param {Range} range location in source code
+	 * @param {string} [context] context
+	 */
 	constructor(request, range, context) {
 		super(request);
 

package/lib/dependencies/RequireResolveHeaderDependency.js

@@ -11,10 +11,14 @@ 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 RequireResolveHeaderDependency extends NullDependency {
+	/**
+	 * @param {Range} range range
+	 */
 	constructor(range) {
 		super();
 

package/lib/dependencies/SystemPlugin.js

@@ -20,7 +20,9 @@ const makeSerializable = require("../util/makeSerializable");
 const ConstDependency = require("./ConstDependency");
 const SystemRuntimeModule = require("./SystemRuntimeModule");
 
+/** @typedef {import("../../declarations/WebpackOptions").JavascriptParserOptions} JavascriptParserOptions */
 /** @typedef {import("../Compiler")} Compiler */
+/** @typedef {import("../javascript/JavascriptParser")} Parser */
 
 const PLUGIN_NAME = "SystemPlugin";
 
@@ -46,6 +48,11 @@ class SystemPlugin {
 						compilation.addRuntimeModule(chunk, new SystemRuntimeModule());
 					});
 
+				/**
+				 * @param {Parser} parser parser parser
+				 * @param {JavascriptParserOptions} parserOptions parserOptions
+				 * @returns {void}
+				 */
 				const handler = (parser, parserOptions) => {
 					if (parserOptions.system === undefined || !parserOptions.system) {
 						return;
@@ -105,7 +112,9 @@ class SystemPlugin {
 
 						return parser.hooks.importCall.call({
 							type: "ImportExpression",
-							source: expr.arguments[0],
+							source:
+								/** @type {import("estree").Literal} */
+								(expr.arguments[0]),
 							loc: expr.loc,
 							range: expr.range
 						});

package/lib/dependencies/URLDependency.js

@@ -22,6 +22,7 @@ const ModuleDependency = require("./ModuleDependency");
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../ModuleGraphConnection")} ModuleGraphConnection */
 /** @typedef {import("../ModuleGraphConnection").ConnectionState} ConnectionState */
+/** @typedef {import("../javascript/JavascriptParser").Range} Range */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 /** @typedef {import("../util/Hash")} Hash */
@@ -32,8 +33,8 @@ const getRawDataUrlModule = memoize(() => require("../asset/RawDataUrlModule"));
 class URLDependency extends ModuleDependency {
 	/**
 	 * @param {string} request request
-	 * @param {[number, number]} range range of the arguments of new URL( |> ... <| )
-	 * @param {[number, number]} outerRange range of the full |> new URL(...) <|
+	 * @param {Range} range range of the arguments of new URL( |> ... <| )
+	 * @param {Range} outerRange range of the full |> new URL(...) <|
 	 * @param {boolean=} relative use relative urls instead of absolute with base uri
 	 */
 	constructor(request, range, outerRange, relative) {

package/lib/dependencies/URLPlugin.js

@@ -16,9 +16,11 @@ const InnerGraph = require("../optimize/InnerGraph");
 const URLDependency = require("./URLDependency");
 
 /** @typedef {import("estree").NewExpression} NewExpressionNode */
+/** @typedef {import("../../declarations/WebpackOptions").JavascriptParserOptions} JavascriptParserOptions */
 /** @typedef {import("../Compiler")} Compiler */
 /** @typedef {import("../NormalModule")} NormalModule */
 /** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
+/** @typedef {import("../javascript/JavascriptParser")} Parser */
 
 const PLUGIN_NAME = "URLPlugin";
 
@@ -43,9 +45,11 @@ class URLPlugin {
 				const getUrl = module => {
 					return pathToFileURL(module.resource);
 				};
+
 				/**
-				 * @param {JavascriptParser} parser parser
-				 * @param {object} parserOptions options
+				 * @param {Parser} parser parser parser
+				 * @param {JavascriptParserOptions} parserOptions parserOptions
+				 * @returns {void}
 				 */
 				const parserCallback = (parser, parserOptions) => {
 					if (parserOptions.url === false) return;
@@ -77,9 +81,7 @@ class URLPlugin {
 						)
 							return;
 
-						const request = parser.evaluateExpression(arg1).asString();
-
-						return request;
+						return parser.evaluateExpression(arg1).asString();
 					};
 
 					parser.hooks.canRename.for("URL").tap(PLUGIN_NAME, approve);

package/lib/dependencies/UnsupportedDependency.js

@@ -11,10 +11,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 UnsupportedDependency extends NullDependency {
+	/**
+	 * @param {string} request the request string
+	 * @param {Range} range location in source code
+	 */
 	constructor(request, range) {
 		super();
 

package/lib/dependencies/WebAssemblyExportImportedDependency.js

@@ -17,6 +17,12 @@ const ModuleDependency = require("./ModuleDependency");
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
 
 class WebAssemblyExportImportedDependency extends ModuleDependency {
+	/**
+	 * @param {string} exportName export name
+	 * @param {string} request request
+	 * @param {string} name name
+	 * @param {TODO} valueType value type
+	 */
 	constructor(exportName, request, name, valueType) {
 		super(request);
 		/** @type {string} */

package/lib/dependencies/WebpackIsIncludedDependency.js

@@ -15,9 +15,14 @@ const ModuleDependency = require("./ModuleDependency");
 /** @typedef {import("../Dependency").ReferencedExport} ReferencedExport */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
+/** @typedef {import("../javascript/JavascriptParser").Range} Range */
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
 
 class WebpackIsIncludedDependency extends ModuleDependency {
+	/**
+	 * @param {string} request the request string
+	 * @param {Range} range location in source code
+	 */
 	constructor(request, range) {
 		super(request);
 

package/lib/dependencies/WorkerDependency.js

@@ -18,6 +18,7 @@ const ModuleDependency = require("./ModuleDependency");
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../Entrypoint")} Entrypoint */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
+/** @typedef {import("../javascript/JavascriptParser").Range} Range */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 /** @typedef {import("../util/Hash")} Hash */
@@ -26,7 +27,7 @@ const ModuleDependency = require("./ModuleDependency");
 class WorkerDependency extends ModuleDependency {
 	/**
 	 * @param {string} request request
-	 * @param {[number, number]} range range
+	 * @param {Range} range range
 	 * @param {Object} workerDependencyOptions options
 	 * @param {string} workerDependencyOptions.publicPath public path for the worker
 	 */

package/lib/dependencies/WorkerPlugin.js

@@ -30,11 +30,13 @@ const WorkerDependency = require("./WorkerDependency");
 /** @typedef {import("estree").Pattern} Pattern */
 /** @typedef {import("estree").Property} Property */
 /** @typedef {import("estree").SpreadElement} SpreadElement */
+/** @typedef {import("../../declarations/WebpackOptions").JavascriptParserOptions} JavascriptParserOptions */
 /** @typedef {import("../Compiler")} Compiler */
 /** @typedef {import("../Entrypoint").EntryOptions} EntryOptions */
 /** @typedef {import("../Parser").ParserState} ParserState */
 /** @typedef {import("../javascript/BasicEvaluatedExpression")} BasicEvaluatedExpression */
 /** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
+/** @typedef {import("../javascript/JavascriptParser")} Parser */
 /** @typedef {import("./HarmonyImportDependencyParserPlugin").HarmonySettings} HarmonySettings */
 
 const getUrl = module => {
@@ -169,8 +171,9 @@ class WorkerPlugin {
 				};
 
 				/**
-				 * @param {JavascriptParser} parser the parser
-				 * @param {object} parserOptions options
+				 * @param {Parser} parser parser parser
+				 * @param {JavascriptParserOptions} parserOptions parserOptions
+				 * @returns {void}
 				 */
 				const parserPlugin = (parser, parserOptions) => {
 					if (parserOptions.worker === false) return;

package/lib/dependencies/getFunctionExpression.js

@@ -5,6 +5,13 @@
 
 "use strict";
 
+/** @typedef {import("estree").Expression} Expression */
+/** @typedef {import("estree").SpreadElement} SpreadElement */
+
+/**
+ * @param {Expression} expr expressions
+ * @returns {{fn: TODO, expressions: (Expression | SpreadElement)[], needThis: boolean | undefined }} function expression with additional information
+ */
 module.exports = expr => {
 	// <FunctionExpression>
 	if (

package/lib/esm/ExportWebpackRequireRuntimeModule.js

@@ -4,6 +4,7 @@
 
 "use strict";
 
+const RuntimeGlobals = require("../RuntimeGlobals");
 const RuntimeModule = require("../RuntimeModule");
 
 class ExportWebpackRequireRuntimeModule extends RuntimeModule {
@@ -22,7 +23,7 @@ class ExportWebpackRequireRuntimeModule extends RuntimeModule {
 	 * @returns {string} runtime code
 	 */
 	generate() {
-		return "export default __webpack_require__;";
+		return `export default ${RuntimeGlobals.require};`;
 	}
 }
 

package/lib/esm/ModuleChunkFormatPlugin.js

@@ -123,7 +123,7 @@ class ModuleChunkFormatPlugin {
 								entrySource.add(source);
 								entrySource.add(";\n\n// load runtime\n");
 								entrySource.add(
-									`import __webpack_require__ from ${JSON.stringify(
+									`import ${RuntimeGlobals.require} from ${JSON.stringify(
 										getRelativePath(runtimeChunk)
 									)};\n`
 								);
@@ -131,7 +131,7 @@ class ModuleChunkFormatPlugin {
 								const startupSource = new ConcatSource();
 								startupSource.add(
 									`var __webpack_exec__ = ${runtimeTemplate.returningFunction(
-										`__webpack_require__(${RuntimeGlobals.entryModuleId} = moduleId)`,
+										`${RuntimeGlobals.require}(${RuntimeGlobals.entryModuleId} = moduleId)`,
 										"moduleId"
 									)}\n`
 								);

package/lib/esm/ModuleChunkLoadingRuntimeModule.js

@@ -50,6 +50,9 @@ class ModuleChunkLoadingRuntimeModule extends RuntimeModule {
 		return hooks;
 	}
 
+	/**
+	 * @param {ReadonlySet<string>} runtimeRequirements runtime requirements
+	 */
 	constructor(runtimeRequirements) {
 		super("import chunk loading", RuntimeModule.STAGE_ATTACH);
 		this._runtimeRequirements = runtimeRequirements;
@@ -112,7 +115,7 @@ class ModuleChunkLoadingRuntimeModule extends RuntimeModule {
 		);
 		const rootOutputDir = getUndoPath(
 			outputName,
-			this.compilation.outputOptions.path,
+			/** @type {string} */ (this.compilation.outputOptions.path),
 			true
 		);
 
@@ -156,7 +159,7 @@ class ModuleChunkLoadingRuntimeModule extends RuntimeModule {
 							"}"
 						]),
 						"}",
-						"if(runtime) runtime(__webpack_require__);",
+						`if(runtime) runtime(${RuntimeGlobals.require});`,
 						"for(;i < ids.length; i++) {",
 						Template.indent([
 							"chunkId = ids[i];",

package/lib/javascript/ArrayPushCallbackChunkFormatPlugin.js

@@ -84,8 +84,8 @@ class ArrayPushCallbackChunkFormatPlugin {
 							if (runtimeModules.length > 0 || entries.length > 0) {
 								const runtime = new ConcatSource(
 									(runtimeTemplate.supportsArrowFunction()
-										? "__webpack_require__ =>"
-										: "function(__webpack_require__)") +
+										? `${RuntimeGlobals.require} =>`
+										: `function(${RuntimeGlobals.require})`) +
 										" { // webpackRuntimeModules\n"
 								);
 								if (runtimeModules.length > 0) {

package/lib/javascript/CommonJsChunkFormatPlugin.js

@@ -120,7 +120,7 @@ class CommonJsChunkFormatPlugin {
 							entrySource.add(source);
 							entrySource.add(";\n\n// load runtime\n");
 							entrySource.add(
-								`var __webpack_require__ = require(${JSON.stringify(
+								`var ${RuntimeGlobals.require} = require(${JSON.stringify(
 									runtimePath
 								)});\n`
 							);

package/lib/javascript/JavascriptModulesPlugin.js

@@ -429,7 +429,7 @@ class JavascriptModulesPlugin {
 					const code = source.source();
 
 					const fn = vm.runInThisContext(
-						`(function(${module.moduleArgument}, ${module.exportsArgument}, __webpack_require__) {\n${code}\n/**/})`,
+						`(function(${module.moduleArgument}, ${module.exportsArgument}, ${RuntimeGlobals.require}) {\n${code}\n/**/})`,
 						{
 							filename: module.identifier(),
 							lineOffset: -1
@@ -454,7 +454,7 @@ class JavascriptModulesPlugin {
 					if (typeof code !== "string") code = code.toString();
 
 					const fn = vm.runInThisContext(
-						`(function(__webpack_require__) {\n${code}\n/**/})`,
+						`(function(${RuntimeGlobals.require}) {\n${code}\n/**/})`,
 						{
 							filename: options.module.identifier(),
 							lineOffset: -1
@@ -557,7 +557,7 @@ class JavascriptModulesPlugin {
 								? module.exportsArgument
 								: "__unused_webpack_" + module.exportsArgument
 						);
-					if (needRequire) args.push("__webpack_require__");
+					if (needRequire) args.push(RuntimeGlobals.require);
 					if (!needThisAsExports && runtimeTemplate.supportsArrowFunction()) {
 						factorySource.add("/***/ ((" + args.join(", ") + ") => {\n\n");
 					} else {
@@ -1038,13 +1038,13 @@ class JavascriptModulesPlugin {
 
 		if (useRequire) {
 			buf.push("// The require function");
-			buf.push(`function __webpack_require__(moduleId) {`);
+			buf.push(`function ${RuntimeGlobals.require}(moduleId) {`);
 			buf.push(Template.indent(this.renderRequire(renderContext, hooks)));
 			buf.push("}");
 			buf.push("");
 		} else if (runtimeRequirements.has(RuntimeGlobals.requireScope)) {
 			buf.push("// The require scope");
-			buf.push("var __webpack_require__ = {};");
+			buf.push(`var ${RuntimeGlobals.require} = {};`);
 			buf.push("");
 		}
 
@@ -1163,14 +1163,14 @@ class JavascriptModulesPlugin {
 							}(undefined, ${JSON.stringify(
 								chunks.map(c => c.id)
 							)}, ${runtimeTemplate.returningFunction(
-								`__webpack_require__(${moduleIdExpr})`
+								`${RuntimeGlobals.require}(${moduleIdExpr})`
 							)})`
 						);
 					} else if (useRequire) {
 						buf2.push(
-							`${
-								i === 0 ? "var __webpack_exports__ = " : ""
-							}__webpack_require__(${moduleIdExpr});`
+							`${i === 0 ? "var __webpack_exports__ = " : ""}${
+								RuntimeGlobals.require
+							}(${moduleIdExpr});`
 						);
 					} else {
 						if (i === 0) buf2.push("var __webpack_exports__ = {};");
@@ -1178,7 +1178,7 @@ class JavascriptModulesPlugin {
 							buf2.push(
 								`__webpack_modules__[${moduleIdExpr}](0, ${
 									i === 0 ? "__webpack_exports__" : "{}"
-								}, __webpack_require__);`
+								}, ${RuntimeGlobals.require});`
 							);
 						} else if (entryRuntimeRequirements.has(RuntimeGlobals.exports)) {
 							buf2.push(
@@ -1281,17 +1281,17 @@ class JavascriptModulesPlugin {
 			RuntimeGlobals.interceptModuleExecution
 		)
 			? Template.asString([
-					"var execOptions = { id: moduleId, module: module, factory: __webpack_modules__[moduleId], require: __webpack_require__ };",
+					`var execOptions = { id: moduleId, module: module, factory: __webpack_modules__[moduleId], require: ${RuntimeGlobals.require} };`,
 					`${RuntimeGlobals.interceptModuleExecution}.forEach(function(handler) { handler(execOptions); });`,
 					"module = execOptions.module;",
 					"execOptions.factory.call(module.exports, module, module.exports, execOptions.require);"
 			  ])
 			: runtimeRequirements.has(RuntimeGlobals.thisAsExports)
 			? Template.asString([
-					"__webpack_modules__[moduleId].call(module.exports, module, module.exports, __webpack_require__);"
+					`__webpack_modules__[moduleId].call(module.exports, module, module.exports, ${RuntimeGlobals.require});`
 			  ])
 			: Template.asString([
-					"__webpack_modules__[moduleId](module, module.exports, __webpack_require__);"
+					`__webpack_modules__[moduleId](module, module.exports, ${RuntimeGlobals.require});`
 			  ]);
 		const needModuleId = runtimeRequirements.has(RuntimeGlobals.moduleId);
 		const needModuleLoaded = runtimeRequirements.has(