webpack 5.90.3 → 5.92.0

package/lib/dependencies/CommonJsDependencyHelpers.js

@@ -8,12 +8,13 @@
 const RuntimeGlobals = require("../RuntimeGlobals");
 
 /** @typedef {import("../Module")} Module */
+/** @typedef {import("../Module").RuntimeRequirements} RuntimeRequirements */
 /** @typedef {"exports" | "module.exports" | "this" | "Object.defineProperty(exports)" | "Object.defineProperty(module.exports)" | "Object.defineProperty(this)"} CommonJSDependencyBaseKeywords */
 
 /**
  * @param {CommonJSDependencyBaseKeywords} depBase commonjs dependency base
  * @param {Module} module module
- * @param {Set<string>} runtimeRequirements runtime requirements
+ * @param {RuntimeRequirements} runtimeRequirements runtime requirements
  * @returns {[string, string]} type and base
  */
 exports.handleDependencyBase = (depBase, module, runtimeRequirements) => {

package/lib/dependencies/CommonJsExportRequireDependency.js

@@ -20,6 +20,8 @@ const processExportInfo = require("./processExportInfo");
 /** @typedef {import("../Dependency").ReferencedExport} ReferencedExport */
 /** @typedef {import("../Dependency").TRANSITIVE} TRANSITIVE */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
+/** @typedef {import("../ExportsInfo")} ExportsInfo */
+/** @typedef {import("../ExportsInfo").ExportInfo} ExportInfo */
 /** @typedef {import("../Module")} Module */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
@@ -35,7 +37,7 @@ const EMPTY_OBJECT = {};
 class CommonJsExportRequireDependency extends ModuleDependency {
 	/**
 	 * @param {Range} range range
-	 * @param {Range} valueRange value range
+	 * @param {Range | null} valueRange value range
 	 * @param {CommonJSDependencyBaseKeywords} base base
 	 * @param {string[]} names names
 	 * @param {string} request request
@@ -69,7 +71,9 @@ class CommonJsExportRequireDependency extends ModuleDependency {
 	 * @returns {string[]} the imported id
 	 */
 	getIds(moduleGraph) {
-		return moduleGraph.getMeta(this)[idsSymbol] || this.ids;
+		return (
+			/** @type {TODO} */ (moduleGraph.getMeta(this))[idsSymbol] || this.ids
+		);
 	}
 
 	/**
@@ -78,7 +82,7 @@ class CommonJsExportRequireDependency extends ModuleDependency {
 	 * @returns {void}
 	 */
 	setIds(moduleGraph, ids) {
-		moduleGraph.getMeta(this)[idsSymbol] = ids;
+		/** @type {TODO} */ (moduleGraph.getMeta(this))[idsSymbol] = ids;
 	}
 
 	/**
@@ -102,11 +106,14 @@ class CommonJsExportRequireDependency extends ModuleDependency {
 			}
 		};
 		if (this.resultUsed) return getFullResult();
+		/** @type {ExportsInfo | undefined} */
 		let exportsInfo = moduleGraph.getExportsInfo(
-			moduleGraph.getParentModule(this)
+			/** @type {Module} */ (moduleGraph.getParentModule(this))
 		);
 		for (const name of this.names) {
-			const exportInfo = exportsInfo.getReadOnlyExportInfo(name);
+			const exportInfo = /** @type {ExportInfo} */ (
+				exportsInfo.getReadOnlyExportInfo(name)
+			);
 			const used = exportInfo.getUsed(runtime);
 			if (used === UsageState.Unused) return Dependency.NO_EXPORTS_REFERENCED;
 			if (used !== UsageState.OnlyPropertiesUsed) return getFullResult();
@@ -182,14 +189,17 @@ class CommonJsExportRequireDependency extends ModuleDependency {
 			);
 			if (reexportInfo) {
 				return {
-					exports: Array.from(reexportInfo.exports, name => {
-						return {
-							name,
-							from,
-							export: ids.concat(name),
-							canMangle: !(name in EMPTY_OBJECT) && false
-						};
-					}),
+					exports: Array.from(
+						/** @type {TODO} */ (reexportInfo).exports,
+						name => {
+							return {
+								name,
+								from,
+								export: ids.concat(name),
+								canMangle: !(name in EMPTY_OBJECT) && false
+							};
+						}
+					),
 					// TODO handle deep reexports
 					dependencies: [from.module]
 				};
@@ -208,19 +218,21 @@ class CommonJsExportRequireDependency extends ModuleDependency {
 	 * @param {ModuleGraph} moduleGraph the module graph
 	 * @param {RuntimeSpec} runtime the runtime
 	 * @param {Module} importedModule the imported module (optional)
-	 * @returns {{exports?: Set<string>, checked?: Set<string>}} information
+	 * @returns {{exports?: Set<string>, checked?: Set<string>} | undefined} information
 	 */
 	getStarReexports(
 		moduleGraph,
 		runtime,
-		importedModule = moduleGraph.getModule(this)
+		importedModule = /** @type {Module} */ (moduleGraph.getModule(this))
 	) {
+		/** @type {ExportsInfo | undefined} */
 		let importedExportsInfo = moduleGraph.getExportsInfo(importedModule);
 		const ids = this.getIds(moduleGraph);
 		if (ids.length > 0)
 			importedExportsInfo = importedExportsInfo.getNestedExportsInfo(ids);
+		/** @type {ExportsInfo | undefined} */
 		let exportsInfo = moduleGraph.getExportsInfo(
-			moduleGraph.getParentModule(this)
+			/** @type {Module} */ (moduleGraph.getParentModule(this))
 		);
 		if (this.names.length > 0)
 			exportsInfo = exportsInfo.getNestedExportsInfo(this.names);
@@ -245,7 +257,8 @@ class CommonJsExportRequireDependency extends ModuleDependency {
 		const checked = new Set();
 
 		if (noExtraImports) {
-			for (const exportInfo of exportsInfo.orderedExports) {
+			for (const exportInfo of /** @type {ExportsInfo} */ (exportsInfo)
+				.orderedExports) {
 				const name = exportInfo.name;
 				if (exportInfo.getUsed(runtime) === UsageState.Unused) continue;
 				if (name === "__esModule" && isNamespaceImport) {
@@ -263,7 +276,9 @@ class CommonJsExportRequireDependency extends ModuleDependency {
 				}
 			}
 		} else if (noExtraExports) {
-			for (const importedExportInfo of importedExportsInfo.orderedExports) {
+			for (const importedExportInfo of /** @type {ExportsInfo} */ (
+				importedExportsInfo
+			).orderedExports) {
 				const name = importedExportInfo.name;
 				if (importedExportInfo.provided === false) continue;
 				if (exportsInfo) {

package/lib/dependencies/CommonJsExportsDependency.js

@@ -26,7 +26,7 @@ const EMPTY_OBJECT = {};
 class CommonJsExportsDependency extends NullDependency {
 	/**
 	 * @param {Range} range range
-	 * @param {Range} valueRange value range
+	 * @param {Range | null} valueRange value range
 	 * @param {CommonJSDependencyBaseKeywords} base base
 	 * @param {string[]} names names
 	 */
@@ -154,20 +154,28 @@ CommonJsExportsDependency.Template = class CommonJsExportsDependencyTemplate ext
 					);
 					source.replace(
 						dep.range[0],
-						dep.valueRange[0] - 1,
+						/** @type {Range} */ (dep.valueRange)[0] - 1,
 						"__webpack_unused_export__ = ("
 					);
-					source.replace(dep.valueRange[1], dep.range[1] - 1, ")");
+					source.replace(
+						/** @type {Range} */ (dep.valueRange)[1],
+						dep.range[1] - 1,
+						")"
+					);
 					return;
 				}
 				source.replace(
 					dep.range[0],
-					dep.valueRange[0] - 1,
+					/** @type {Range} */ (dep.valueRange)[0] - 1,
 					`Object.defineProperty(${base}${propertyAccess(
 						used.slice(0, -1)
 					)}, ${JSON.stringify(used[used.length - 1])}, (`
 				);
-				source.replace(dep.valueRange[1], dep.range[1] - 1, "))");
+				source.replace(
+					/** @type {Range} */ (dep.valueRange)[1],
+					dep.range[1] - 1,
+					"))"
+				);
 				return;
 		}
 	}

package/lib/dependencies/CommonJsExportsParserPlugin.js

@@ -20,11 +20,12 @@ const ModuleDecoratorDependency = require("./ModuleDecoratorDependency");
 /** @typedef {import("estree").CallExpression} CallExpression */
 /** @typedef {import("estree").Expression} Expression */
 /** @typedef {import("estree").Super} Super */
-
+/** @typedef {import("../Dependency").DependencyLocation} DependencyLocation */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../NormalModule")} NormalModule */
 /** @typedef {import("../javascript/BasicEvaluatedExpression")} BasicEvaluatedExpression */
 /** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
+/** @typedef {import("../javascript/JavascriptParser").Range} Range */
 /** @typedef {import("./CommonJsDependencyHelpers").CommonJSDependencyBaseKeywords} CommonJSDependencyBaseKeywords */
 
 /**
@@ -190,7 +191,7 @@ class CommonJsExportsParserPlugin {
 		 * @param {AssignmentExpression} expr expression
 		 * @param {CommonJSDependencyBaseKeywords} base commonjs base keywords
 		 * @param {string[]} members members of the export
-		 * @returns {boolean} true, when the expression was handled
+		 * @returns {boolean | undefined} true, when the expression was handled
 		 */
 		const handleAssignExport = (expr, base, members) => {
 			if (HarmonyExports.isEnabled(parser.state)) return;
@@ -205,15 +206,15 @@ class CommonJsExportsParserPlugin {
 				// It's possible to reexport __esModule, so we must convert to a dynamic module
 				if (members.length === 0) DynamicExports.setDynamic(parser.state);
 				const dep = new CommonJsExportRequireDependency(
-					expr.range,
+					/** @type {Range} */ (expr.range),
 					null,
 					base,
 					members,
-					requireCall.argument.string,
+					/** @type {string} */ (requireCall.argument.string),
 					requireCall.ids,
 					!parser.isStatementLevelExpression(expr)
 				);
-				dep.loc = expr.loc;
+				dep.loc = /** @type {DependencyLocation} */ (expr.loc);
 				dep.optional = !!parser.scope.inTry;
 				parser.state.module.addDependency(dep);
 				return true;
@@ -228,12 +229,12 @@ class CommonJsExportsParserPlugin {
 				expr.right
 			);
 			const dep = new CommonJsExportsDependency(
-				expr.left.range,
+				/** @type {Range} */ (expr.left.range),
 				null,
 				base,
 				remainingMembers
 			);
-			dep.loc = expr.loc;
+			dep.loc = /** @type {DependencyLocation} */ (expr.loc);
 			parser.state.module.addDependency(dep);
 			parser.walkExpression(expr.right);
 			return true;
@@ -284,12 +285,12 @@ class CommonJsExportsParserPlugin {
 					getValueOfPropertyDescription(descArg)
 				);
 				const dep = new CommonJsExportsDependency(
-					expr.range,
-					expr.arguments[2].range,
+					/** @type {Range} */ (expr.range),
+					/** @type {Range} */ (expr.arguments[2].range),
 					`Object.defineProperty(${exportsArg.identifier})`,
 					[property]
 				);
-				dep.loc = expr.loc;
+				dep.loc = /** @type {DependencyLocation} */ (expr.loc);
 				parser.state.module.addDependency(dep);
 
 				parser.walkExpression(expr.arguments[2]);
@@ -308,24 +309,28 @@ class CommonJsExportsParserPlugin {
 		const handleAccessExport = (expr, base, members, call = undefined) => {
 			if (HarmonyExports.isEnabled(parser.state)) return;
 			if (members.length === 0) {
-				bailout(`${base} is used directly at ${formatLocation(expr.loc)}`);
+				bailout(
+					`${base} is used directly at ${formatLocation(
+						/** @type {DependencyLocation} */ (expr.loc)
+					)}`
+				);
 			}
 			if (call && members.length === 1) {
 				bailoutHint(
 					`${base}${propertyAccess(
 						members
 					)}(...) prevents optimization as ${base} is passed as call context at ${formatLocation(
-						expr.loc
+						/** @type {DependencyLocation} */ (expr.loc)
 					)}`
 				);
 			}
 			const dep = new CommonJsSelfReferenceDependency(
-				expr.range,
+				/** @type {Range} */ (expr.range),
 				base,
 				members,
 				!!call
 			);
-			dep.loc = expr.loc;
+			dep.loc = /** @type {DependencyLocation} */ (expr.loc);
 			parser.state.module.addDependency(dep);
 			if (call) {
 				parser.walkExpressions(call.arguments);
@@ -398,7 +403,7 @@ class CommonJsExportsParserPlugin {
 					: RuntimeGlobals.nodeModuleDecorator,
 				!isHarmony
 			);
-			dep.loc = expr.loc;
+			dep.loc = /** @type {DependencyLocation} */ (expr.loc);
 			parser.state.module.addDependency(dep);
 			return true;
 		});

package/lib/dependencies/CommonJsImportsParserPlugin.js

@@ -344,7 +344,6 @@ class CommonJsImportsParserPlugin {
 				);
 				dep.loc = /** @type {DependencyLocation} */ (expr.loc);
 				parser.state.module.addPresentationalDependency(dep);
-				return true;
 			} else {
 				const result = processRequireItem(expr, param);
 				if (result === undefined) {
@@ -356,8 +355,8 @@ class CommonJsImportsParserPlugin {
 					dep.loc = /** @type {DependencyLocation} */ (expr.loc);
 					parser.state.module.addPresentationalDependency(dep);
 				}
-				return true;
 			}
+			return true;
 		};
 		parser.hooks.call
 			.for("require")

package/lib/dependencies/ContextDependencyHelpers.js

@@ -10,8 +10,10 @@ const { parseResource } = require("../util/identifier");
 /** @typedef {import("estree").Node} EsTreeNode */
 /** @typedef {import("../../declarations/WebpackOptions").JavascriptParserOptions} JavascriptParserOptions */
 /** @typedef {import("../../declarations/WebpackOptions").ModuleOptionsNormalized} ModuleOptions */
+/** @typedef {import("../Dependency").DependencyLocation} DependencyLocation */
 /** @typedef {import("../javascript/BasicEvaluatedExpression")} BasicEvaluatedExpression */
 /** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
+/** @typedef {import("../javascript/JavascriptParser").Range} Range */
 /** @typedef {import("./ContextDependency")} ContextDependency */
 /** @typedef {import("./ContextDependency").ContextDependencyOptions} ContextDependencyOptions */
 
@@ -24,6 +26,10 @@ const quoteMeta = str => {
 	return str.replace(/[-[\]\\/{}()*+?.^$|]/g, "\\$&");
 };
 
+/**
+ * @param {string} prefix prefix
+ * @returns {{prefix: string, context: string}} result
+ */
 const splitContextFromPrefix = prefix => {
 	const idx = prefix.lastIndexOf("/");
 	let context = ".";
@@ -38,7 +44,6 @@ const splitContextFromPrefix = prefix => {
 };
 
 /** @typedef {Partial<Omit<ContextDependencyOptions, "resource">>} PartialContextDependencyOptions */
-/** @typedef {import("../javascript/JavascriptParser").Range} Range */
 /** @typedef {{ new(options: ContextDependencyOptions, range: Range, valueRange: [number, number], ...args: any[]): ContextDependency }} ContextDependencyConstructor */
 
 /**
@@ -63,13 +68,13 @@ exports.create = (
 	...depArgs
 ) => {
 	if (param.isTemplateString()) {
-		let prefixRaw = param.quasis[0].string;
+		const quasis = /** @type {BasicEvaluatedExpression[]} */ (param.quasis);
+		let prefixRaw = /** @type {string} */ (quasis[0].string);
 		let postfixRaw =
-			param.quasis.length > 1
-				? param.quasis[param.quasis.length - 1].string
-				: "";
+			/** @type {string} */
+			(quasis.length > 1 ? quasis[quasis.length - 1].string : "");
 
-		const valueRange = param.range;
+		const valueRange = /** @type {Range} */ (param.range);
 		const { context, prefix } = splitContextFromPrefix(prefixRaw);
 		const {
 			path: postfix,
@@ -79,11 +84,15 @@ exports.create = (
 
 		// When there are more than two quasis, the generated RegExp can be more precise
 		// We join the quasis with the expression regexp
-		const innerQuasis = param.quasis.slice(1, param.quasis.length - 1);
+		const innerQuasis = quasis.slice(1, quasis.length - 1);
 		const innerRegExp =
-			options.wrappedContextRegExp.source +
+			/** @type {RegExp} */ (options.wrappedContextRegExp).source +
 			innerQuasis
-				.map(q => quoteMeta(q.string) + options.wrappedContextRegExp.source)
+				.map(
+					q =>
+						quoteMeta(/** @type {string} */ (q.string)) +
+						/** @type {RegExp} */ (options.wrappedContextRegExp).source
+				)
 				.join("");
 
 		// Example: `./context/pre${e}inner${e}inner2${e}post?query#frag`
@@ -101,7 +110,7 @@ exports.create = (
 		const dep = new Dep(
 			{
 				request: context + query + fragment,
-				recursive: options.wrappedContextRecursive,
+				recursive: /** @type {boolean} */ (options.wrappedContextRecursive),
 				regExp,
 				mode: "sync",
 				...contextOptions
@@ -110,14 +119,17 @@ exports.create = (
 			valueRange,
 			...depArgs
 		);
-		dep.loc = expr.loc;
+		dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+
+		/** @type {{ value: string, range: Range }[]} */
 		const replaces = [];
+		const parts = /** @type {BasicEvaluatedExpression[]} */ (param.parts);
 
-		param.parts.forEach((part, i) => {
+		parts.forEach((part, i) => {
 			if (i % 2 === 0) {
 				// Quasis or merged quasi
-				let range = part.range;
-				let value = part.string;
+				let range = /** @type {Range} */ (part.range);
+				let value = /** @type {string} */ (part.string);
 				if (param.templateStringKind === "cooked") {
 					value = JSON.stringify(value);
 					value = value.slice(1, value.length - 1);
@@ -125,14 +137,20 @@ exports.create = (
 				if (i === 0) {
 					// prefix
 					value = prefix;
-					range = [param.range[0], part.range[1]];
+					range = [
+						/** @type {Range} */ (param.range)[0],
+						/** @type {Range} */ (part.range)[1]
+					];
 					value =
 						(param.templateStringKind === "cooked" ? "`" : "String.raw`") +
 						value;
-				} else if (i === param.parts.length - 1) {
+				} else if (i === parts.length - 1) {
 					// postfix
 					value = postfix;
-					range = [part.range[0], param.range[1]];
+					range = [
+						/** @type {Range} */ (part.range)[0],
+						/** @type {Range} */ (param.range)[1]
+					];
 					value = value + "`";
 				} else if (
 					part.expression &&
@@ -163,14 +181,16 @@ exports.create = (
 			(param.postfix && param.postfix.isString()))
 	) {
 		let prefixRaw =
-			param.prefix && param.prefix.isString() ? param.prefix.string : "";
+			/** @type {string} */
+			(param.prefix && param.prefix.isString() ? param.prefix.string : "");
 		let postfixRaw =
-			param.postfix && param.postfix.isString() ? param.postfix.string : "";
+			/** @type {string} */
+			(param.postfix && param.postfix.isString() ? param.postfix.string : "");
 		const prefixRange =
 			param.prefix && param.prefix.isString() ? param.prefix.range : null;
 		const postfixRange =
 			param.postfix && param.postfix.isString() ? param.postfix.range : null;
-		const valueRange = param.range;
+		const valueRange = /** @type {Range} */ (param.range);
 		const { context, prefix } = splitContextFromPrefix(prefixRaw);
 		const {
 			path: postfix,
@@ -178,14 +198,14 @@ exports.create = (
 			fragment
 		} = parseResource(postfixRaw, parser);
 		const regExp = new RegExp(
-			`^${quoteMeta(prefix)}${options.wrappedContextRegExp.source}${quoteMeta(
-				postfix
-			)}$`
+			`^${quoteMeta(prefix)}${
+				/** @type {RegExp} */ (options.wrappedContextRegExp).source
+			}${quoteMeta(postfix)}$`
 		);
 		const dep = new Dep(
 			{
 				request: context + query + fragment,
-				recursive: options.wrappedContextRecursive,
+				recursive: /** @type {boolean} */ (options.wrappedContextRecursive),
 				regExp,
 				mode: "sync",
 				...contextOptions
@@ -194,7 +214,7 @@ exports.create = (
 			valueRange,
 			...depArgs
 		);
-		dep.loc = expr.loc;
+		dep.loc = /** @type {DependencyLocation} */ (expr.loc);
 		const replaces = [];
 		if (prefixRange) {
 			replaces.push({
@@ -223,17 +243,17 @@ exports.create = (
 	} else {
 		const dep = new Dep(
 			{
-				request: options.exprContextRequest,
-				recursive: options.exprContextRecursive,
+				request: /** @type {string} */ (options.exprContextRequest),
+				recursive: /** @type {boolean} */ (options.exprContextRecursive),
 				regExp: /** @type {RegExp} */ (options.exprContextRegExp),
 				mode: "sync",
 				...contextOptions
 			},
 			range,
-			param.range,
+			/** @type {Range} */ (param.range),
 			...depArgs
 		);
-		dep.loc = expr.loc;
+		dep.loc = /** @type {DependencyLocation} */ (expr.loc);
 		dep.critical =
 			options.exprContextCritical &&
 			"the request of a dependency is an expression";

package/lib/dependencies/ContextElementDependency.js

@@ -11,6 +11,7 @@ const ModuleDependency = require("./ModuleDependency");
 
 /** @typedef {import("../Dependency").ReferencedExport} ReferencedExport */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
+/** @typedef {import("../javascript/JavascriptParser").ImportAttributes} ImportAttributes */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
@@ -23,6 +24,7 @@ class ContextElementDependency extends ModuleDependency {
 	 * @param {string} category category
 	 * @param {string[][]=} referencedExports referenced exports
 	 * @param {string=} context context
+	 * @param {ImportAttributes=} attributes import assertions
 	 */
 	constructor(
 		request,
@@ -30,7 +32,8 @@ class ContextElementDependency extends ModuleDependency {
 		typePrefix,
 		category,
 		referencedExports,
-		context
+		context,
+		attributes
 	) {
 		super(request);
 		this.referencedExports = referencedExports;
@@ -41,6 +44,8 @@ class ContextElementDependency extends ModuleDependency {
 		if (userRequest) {
 			this.userRequest = userRequest;
 		}
+
+		this.assertions = attributes;
 	}
 
 	get type() {
@@ -78,6 +83,7 @@ class ContextElementDependency extends ModuleDependency {
 		write(this._typePrefix);
 		write(this._category);
 		write(this.referencedExports);
+		write(this.assertions);
 		super.serialize(context);
 	}
 
@@ -89,6 +95,7 @@ class ContextElementDependency extends ModuleDependency {
 		this._typePrefix = read();
 		this._category = read();
 		this.referencedExports = read();
+		this.assertions = read();
 		super.deserialize(context);
 	}
 }

package/lib/dependencies/CssExportDependency.js

@@ -79,9 +79,9 @@ CssExportDependency.Template = class CssExportDependencyTemplate extends (
 	 * @param {DependencyTemplateContext} templateContext the context object
 	 * @returns {void}
 	 */
-	apply(dependency, source, { cssExports }) {
+	apply(dependency, source, { cssExportsData }) {
 		const dep = /** @type {CssExportDependency} */ (dependency);
-		cssExports.set(dep.name, dep.value);
+		cssExportsData.exports.set(dep.name, dep.value);
 	}
 };