webpack 5.97.1 → 5.104.1

package/lib/dependencies/CommonJsSelfReferenceDependency.js

@@ -13,10 +13,10 @@ const NullDependency = require("./NullDependency");
 
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
 /** @typedef {import("../Dependency")} Dependency */
-/** @typedef {import("../Dependency").ExportsSpec} ExportsSpec */
-/** @typedef {import("../Dependency").ReferencedExport} ReferencedExport */
+/** @typedef {import("../Dependency").ReferencedExports} ReferencedExports */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
+/** @typedef {import("../ExportsInfo").ExportInfoName} ExportInfoName */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
@@ -27,7 +27,7 @@ class CommonJsSelfReferenceDependency extends NullDependency {
 	/**
 	 * @param {Range} range range
 	 * @param {CommonJSDependencyBaseKeywords} base base
-	 * @param {string[]} names names
+	 * @param {ExportInfoName[]} names names
 	 * @param {boolean} call is a call
 	 */
 	constructor(range, base, names, call) {
@@ -57,7 +57,7 @@ class CommonJsSelfReferenceDependency extends NullDependency {
 	 * Returns list of exports referenced by this dependency
 	 * @param {ModuleGraph} moduleGraph module graph
 	 * @param {RuntimeSpec} runtime the runtime for which the module is analysed
-	 * @returns {(string[] | ReferencedExport)[]} referenced exports
+	 * @returns {ReferencedExports} referenced exports
 	 */
 	getReferencedExports(moduleGraph, runtime) {
 		return [this.call ? this.names.slice(0, -1) : this.names];

package/lib/dependencies/ConstDependency.js

@@ -9,7 +9,7 @@ const makeSerializable = require("../util/makeSerializable");
 const NullDependency = require("./NullDependency");
 
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
-/** @typedef {import("../ChunkGraph")} ChunkGraph */
+/** @typedef {import("./NullDependency").RawRuntimeRequirements} RawRuntimeRequirements */
 /** @typedef {import("../Dependency")} Dependency */
 /** @typedef {import("../Dependency").UpdateHashContext} UpdateHashContext */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
@@ -24,7 +24,7 @@ class ConstDependency extends NullDependency {
 	/**
 	 * @param {string} expression the expression
 	 * @param {number | Range} range the source range
-	 * @param {(string[] | null)=} runtimeRequirements runtime requirements
+	 * @param {RawRuntimeRequirements | null=} runtimeRequirements runtime requirements
 	 */
 	constructor(expression, range, runtimeRequirements) {
 		super();

package/lib/dependencies/ContextDependency.js

@@ -10,6 +10,7 @@ const DependencyTemplate = require("../DependencyTemplate");
 const makeSerializable = require("../util/makeSerializable");
 const memoize = require("../util/memoize");
 
+/** @typedef {import("../javascript/JavascriptParser").Range} Range */
 /** @typedef {import("../ContextModule").ContextOptions} ContextOptions */
 /** @typedef {import("../Dependency").TRANSITIVE} TRANSITIVE */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
@@ -23,11 +24,13 @@ const getCriticalDependencyWarning = memoize(() =>
 
 /** @typedef {ContextOptions & { request: string }} ContextDependencyOptions */
 
+/** @typedef {{ value: string, range: Range }[]} Replaces */
+
 /**
- * @param {RegExp | null | undefined} r regexp
+ * @param {RegExp | false | null | undefined} r regexp
  * @returns {string} stringified regexp
  */
-const regExpToString = r => (r ? String(r) : "");
+const regExpToString = (r) => (r ? String(r) : "");
 
 class ContextDependency extends Dependency {
 	/**
@@ -45,18 +48,22 @@ class ContextDependency extends Dependency {
 
 		if (
 			this.options &&
+			this.options.regExp &&
 			(this.options.regExp.global || this.options.regExp.sticky)
 		) {
 			this.options = { ...this.options, regExp: null };
 			this.hadGlobalOrStickyRegExp = true;
 		}
 
+		/** @type {string | undefined} */
 		this.request = undefined;
+		/** @type {Range | undefined} */
 		this.range = undefined;
+		/** @type {Range | undefined} */
 		this.valueRange = undefined;
 		/** @type {boolean | string | undefined} */
 		this.inShorthand = undefined;
-		// TODO refactor this
+		/** @type {Replaces | undefined} */
 		this.replaces = undefined;
 		this._requestContext = context;
 	}
@@ -141,7 +148,6 @@ class ContextDependency extends Dependency {
 		write(this._requestContext);
 		write(this.range);
 		write(this.valueRange);
-		write(this.prepend);
 		write(this.replaces);
 
 		super.serialize(context);
@@ -161,7 +167,6 @@ class ContextDependency extends Dependency {
 		this._requestContext = read();
 		this.range = read();
 		this.valueRange = read();
-		this.prepend = read();
 		this.replaces = read();
 
 		super.deserialize(context);

package/lib/dependencies/ContextDependencyHelpers.js

@@ -7,28 +7,28 @@
 
 const { parseResource } = require("../util/identifier");
 
-/** @typedef {import("estree").Node} EsTreeNode */
+/** @typedef {import("estree").Expression} Expression */
 /** @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 */
+/** @typedef {import("./ContextDependency").Replaces} Replaces */
 
 /**
  * Escapes regular expression metacharacters
  * @param {string} str String to quote
  * @returns {string} Escaped string
  */
-const quoteMeta = str => str.replace(/[-[\]\\/{}()*+?.^$|]/g, "\\$&");
+const quoteMeta = (str) => str.replace(/[-[\]\\/{}()*+?.^$|]/g, "\\$&");
 
 /**
  * @param {string} prefix prefix
  * @returns {{prefix: string, context: string}} result
  */
-const splitContextFromPrefix = prefix => {
+const splitContextFromPrefix = (prefix) => {
 	const idx = prefix.lastIndexOf("/");
 	let context = ".";
 	if (idx >= 0) {
@@ -42,17 +42,17 @@ const splitContextFromPrefix = prefix => {
 };
 
 /** @typedef {Partial<Omit<ContextDependencyOptions, "resource">>} PartialContextDependencyOptions */
-/** @typedef {{ new(options: ContextDependencyOptions, range: Range, valueRange: [number, number], ...args: any[]): ContextDependency }} ContextDependencyConstructor */
+/** @typedef {{ new(options: ContextDependencyOptions, range: Range, valueRange: Range, ...args: EXPECTED_ANY[]): ContextDependency }} ContextDependencyConstructor */
 
 /**
  * @param {ContextDependencyConstructor} Dep the Dependency class
  * @param {Range} range source range
  * @param {BasicEvaluatedExpression} param context param
- * @param {EsTreeNode} expr expr
- * @param {Pick<JavascriptParserOptions, `${"expr"|"wrapped"}Context${"Critical"|"Recursive"|"RegExp"}` | "exprContextRequest">} options options for context creation
+ * @param {Expression} expr expr
+ * @param {Pick<JavascriptParserOptions, `${"expr" | "wrapped"}Context${"Critical" | "Recursive" | "RegExp"}` | "exprContextRequest">} options options for context creation
  * @param {PartialContextDependencyOptions} contextOptions options for the ContextModule
  * @param {JavascriptParser} parser the parser
- * @param {...any} depArgs depArgs
+ * @param {...EXPECTED_ANY} depArgs depArgs
  * @returns {ContextDependency} the created Dependency
  */
 module.exports.create = (
@@ -87,7 +87,7 @@ module.exports.create = (
 			/** @type {RegExp} */ (options.wrappedContextRegExp).source +
 			innerQuasis
 				.map(
-					q =>
+					(q) =>
 						quoteMeta(/** @type {string} */ (q.string)) +
 						/** @type {RegExp} */ (options.wrappedContextRegExp).source
 				)
@@ -119,7 +119,7 @@ module.exports.create = (
 		);
 		dep.loc = /** @type {DependencyLocation} */ (expr.loc);
 
-		/** @type {{ value: string, range: Range }[]} */
+		/** @type {Replaces} */
 		const replaces = [];
 		const parts = /** @type {BasicEvaluatedExpression[]} */ (param.parts);
 
@@ -164,7 +164,10 @@ module.exports.create = (
 				});
 			} else {
 				// Expression
-				parser.walkExpression(part.expression);
+				parser.walkExpression(
+					/** @type {Expression} */
+					(part.expression)
+				);
 			}
 		}
 
@@ -233,7 +236,12 @@ module.exports.create = (
 
 		if (parser && param.wrappedInnerExpressions) {
 			for (const part of param.wrappedInnerExpressions) {
-				if (part.expression) parser.walkExpression(part.expression);
+				if (part.expression) {
+					parser.walkExpression(
+						/** @type {Expression} */
+						(part.expression)
+					);
+				}
 			}
 		}
 
@@ -256,7 +264,7 @@ module.exports.create = (
 		options.exprContextCritical &&
 		"the request of a dependency is an expression";
 
-	parser.walkExpression(param.expression);
+	parser.walkExpression(/** @type {Expression} */ (param.expression));
 
 	return dep;
 };

package/lib/dependencies/ContextDependencyTemplateAsId.js

@@ -8,6 +8,7 @@
 const ContextDependency = require("./ContextDependency");
 
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
+/** @typedef {import("../javascript/JavascriptParser").Range} Range */
 /** @typedef {import("../Dependency")} Dependency */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
 
@@ -28,11 +29,13 @@ class ContextDependencyTemplateAsId extends ContextDependency.Template {
 		const moduleExports = runtimeTemplate.moduleExports({
 			module,
 			chunkGraph,
-			request: dep.request,
+			request: /** @type {string} */ (dep.request),
 			weak: dep.weak,
 			runtimeRequirements
 		});
 
+		const range = /** @type {Range} */ (dep.range);
+
 		if (module) {
 			if (dep.valueRange) {
 				if (Array.isArray(dep.replaces)) {
@@ -41,22 +44,20 @@ class ContextDependencyTemplateAsId extends ContextDependency.Template {
 						source.replace(rep.range[0], rep.range[1] - 1, rep.value);
 					}
 				}
-				source.replace(dep.valueRange[1], dep.range[1] - 1, ")");
+
+				source.replace(dep.valueRange[1], range[1] - 1, ")");
 				source.replace(
-					dep.range[0],
+					range[0],
 					dep.valueRange[0] - 1,
 					`${moduleExports}.resolve(`
 				);
 			} else {
-				source.replace(
-					dep.range[0],
-					dep.range[1] - 1,
-					`${moduleExports}.resolve`
-				);
+				source.replace(range[0], range[1] - 1, `${moduleExports}.resolve`);
 			}
 		} else {
-			source.replace(dep.range[0], dep.range[1] - 1, moduleExports);
+			source.replace(range[0], range[1] - 1, moduleExports);
 		}
 	}
 }
+
 module.exports = ContextDependencyTemplateAsId;

package/lib/dependencies/ContextDependencyTemplateAsRequireCall.js

@@ -8,10 +8,13 @@
 const ContextDependency = require("./ContextDependency");
 
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
+/** @typedef {import("../javascript/JavascriptParser").Range} Range */
 /** @typedef {import("../Dependency")} Dependency */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
 
-class ContextDependencyTemplateAsRequireCall extends ContextDependency.Template {
+class ContextDependencyTemplateAsRequireCall
+	extends ContextDependency.Template
+{
 	/**
 	 * @param {Dependency} dependency the dependency for which the template should be applied
 	 * @param {ReplaceSource} source the current replace source which can be modified
@@ -27,13 +30,16 @@ class ContextDependencyTemplateAsRequireCall extends ContextDependency.Template
 		let moduleExports = runtimeTemplate.moduleExports({
 			module: moduleGraph.getModule(dep),
 			chunkGraph,
-			request: dep.request,
+			request: /** @type {string} */ (dep.request),
 			runtimeRequirements
 		});
 
 		if (dep.inShorthand) {
 			moduleExports = `${dep.inShorthand}: ${moduleExports}`;
 		}
+
+		const range = /** @type {Range} */ (dep.range);
+
 		if (moduleGraph.getModule(dep)) {
 			if (dep.valueRange) {
 				if (Array.isArray(dep.replaces)) {
@@ -42,18 +48,15 @@ class ContextDependencyTemplateAsRequireCall extends ContextDependency.Template
 						source.replace(rep.range[0], rep.range[1] - 1, rep.value);
 					}
 				}
-				source.replace(dep.valueRange[1], dep.range[1] - 1, ")");
-				source.replace(
-					dep.range[0],
-					dep.valueRange[0] - 1,
-					`${moduleExports}(`
-				);
+				source.replace(dep.valueRange[1], range[1] - 1, ")");
+				source.replace(range[0], dep.valueRange[0] - 1, `${moduleExports}(`);
 			} else {
-				source.replace(dep.range[0], dep.range[1] - 1, moduleExports);
+				source.replace(range[0], range[1] - 1, moduleExports);
 			}
 		} else {
-			source.replace(dep.range[0], dep.range[1] - 1, moduleExports);
+			source.replace(range[0], range[1] - 1, moduleExports);
 		}
 	}
 }
+
 module.exports = ContextDependencyTemplateAsRequireCall;

package/lib/dependencies/ContextElementDependency.js

@@ -10,9 +10,9 @@ const makeSerializable = require("../util/makeSerializable");
 const ModuleDependency = require("./ModuleDependency");
 
 /** @typedef {import("../ContextModule")} ContextModule */
-/** @typedef {import("../Dependency").ReferencedExport} ReferencedExport */
+/** @typedef {import("../Dependency").RawReferencedExports} RawReferencedExports */
+/** @typedef {import("../Dependency").ReferencedExports} ReferencedExports */
 /** @typedef {import("../Module")} Module */
-/** @typedef {import("../Module").BuildMeta} BuildMeta */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../javascript/JavascriptParser").ImportAttributes} ImportAttributes */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
@@ -22,10 +22,10 @@ const ModuleDependency = require("./ModuleDependency");
 class ContextElementDependency extends ModuleDependency {
 	/**
 	 * @param {string} request request
-	 * @param {string|undefined} userRequest user request
+	 * @param {string | undefined} userRequest user request
 	 * @param {string | undefined} typePrefix type prefix
 	 * @param {string} category category
-	 * @param {(string[][] | null)=} referencedExports referenced exports
+	 * @param {RawReferencedExports | null=} referencedExports referenced exports
 	 * @param {string=} context context
 	 * @param {ImportAttributes=} attributes import assertions
 	 */
@@ -39,16 +39,16 @@ class ContextElementDependency extends ModuleDependency {
 		attributes
 	) {
 		super(request);
-		this.referencedExports = referencedExports;
-		this._typePrefix = typePrefix;
-		this._category = category;
-		this._context = context || undefined;
 
 		if (userRequest) {
 			this.userRequest = userRequest;
 		}
 
-		this.assertions = attributes;
+		this._typePrefix = typePrefix;
+		this._category = category;
+		this.referencedExports = referencedExports;
+		this._context = context || undefined;
+		this.attributes = attributes;
 	}
 
 	get type() {
@@ -63,11 +63,22 @@ class ContextElementDependency extends ModuleDependency {
 		return this._category;
 	}
 
+	/**
+	 * @returns {string | null} an identifier to merge equal requests
+	 */
+	getResourceIdentifier() {
+		let str = super.getResourceIdentifier();
+		if (this.attributes) {
+			str += `|importAttributes${JSON.stringify(this.attributes)}`;
+		}
+		return str;
+	}
+
 	/**
 	 * Returns list of exports referenced by this dependency
 	 * @param {ModuleGraph} moduleGraph module graph
 	 * @param {RuntimeSpec} runtime the runtime for which the module is analysed
-	 * @returns {(string[] | ReferencedExport)[]} referenced exports
+	 * @returns {ReferencedExports} referenced exports
 	 */
 	getReferencedExports(moduleGraph, runtime) {
 		if (!this.referencedExports) return Dependency.EXPORTS_OBJECT_REFERENCED;
@@ -110,7 +121,7 @@ class ContextElementDependency extends ModuleDependency {
 		write(this._typePrefix);
 		write(this._category);
 		write(this.referencedExports);
-		write(this.assertions);
+		write(this.attributes);
 		super.serialize(context);
 	}
 
@@ -122,7 +133,7 @@ class ContextElementDependency extends ModuleDependency {
 		this._typePrefix = read();
 		this._category = read();
 		this.referencedExports = read();
-		this.assertions = read();
+		this.attributes = read();
 		super.deserialize(context);
 	}
 }