webpack 5.101.3 → 5.102.0

package/lib/dependencies/CommonJsImportsParserPlugin.js

@@ -38,6 +38,14 @@ const RequireResolveHeaderDependency = require("./RequireResolveHeaderDependency
 /** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
 /** @typedef {import("../javascript/JavascriptParser").ImportSource} ImportSource */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
+/** @typedef {import("../javascript/JavascriptParser").Members} Members */
+/** @typedef {import("../javascript/JavascriptParser").CalleeMembers} CalleeMembers */
+
+/**
+ * @typedef {object} CommonJsImportSettings
+ * @property {string=} name
+ * @property {string} context
+ */
 
 const createRequireSpecifierTag = Symbol("createRequire");
 const createdRequireIdentifierTag = Symbol("createRequire()");
@@ -58,10 +66,11 @@ class CommonJsImportsParserPlugin {
 	 */
 	apply(parser) {
 		const options = this.options;
-
 		const getContext = () => {
 			if (parser.currentTagData) {
-				const { context } = parser.currentTagData;
+				const { context } =
+					/** @type {CommonJsImportSettings} */
+					(parser.currentTagData);
 				return context;
 			}
 		};
@@ -69,7 +78,7 @@ class CommonJsImportsParserPlugin {
 		// #region metadata
 		/**
 		 * @param {string} expression expression
-		 * @param {() => string[]} getMembers get members
+		 * @param {() => Members} getMembers get members
 		 */
 		const tapRequireExpression = (expression, getMembers) => {
 			parser.hooks.typeof
@@ -366,9 +375,9 @@ class CommonJsImportsParserPlugin {
 		// #region Require with property access
 		/**
 		 * @param {Expression} expr expression
-		 * @param {string[]} calleeMembers callee members
+		 * @param {CalleeMembers} calleeMembers callee members
 		 * @param {CallExpression} callExpr call expression
-		 * @param {string[]} members members
+		 * @param {Members} members members
 		 * @param {Range[]} memberRanges member ranges
 		 * @returns {boolean | void} true when handled
 		 */
@@ -402,9 +411,9 @@ class CommonJsImportsParserPlugin {
 		};
 		/**
 		 * @param {CallExpression} expr expression
-		 * @param {string[]} calleeMembers callee members
+		 * @param {CalleeMembers} calleeMembers callee members
 		 * @param {CallExpression} callExpr call expression
-		 * @param {string[]} members members
+		 * @param {Members} members members
 		 * @param {Range[]} memberRanges member ranges
 		 * @returns {boolean | void} true when handled
 		 */

package/lib/dependencies/CommonJsRequireContextDependency.js

@@ -20,7 +20,7 @@ class CommonJsRequireContextDependency extends ContextDependency {
 	 * @param {Range} range location in source code
 	 * @param {Range | undefined} valueRange location of the require call
 	 * @param {boolean | string } inShorthand true or name
-	 * @param {string} context context
+	 * @param {string=} context context
 	 */
 	constructor(options, range, valueRange, inShorthand, context) {
 		super(options, context);

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

@@ -9,13 +9,13 @@ const { parseResource } = require("../util/identifier");
 
 /** @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
@@ -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);
 

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,21 +44,18 @@ 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);
 		}
 	}
 }

package/lib/dependencies/ContextDependencyTemplateAsRequireCall.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 */
 
@@ -27,13 +28,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,17 +46,13 @@ 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);
 		}
 	}
 }

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 */
@@ -25,7 +25,7 @@ class ContextElementDependency extends ModuleDependency {
 	 * @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 !== undefined) {
+			str += 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);
 	}
 }

package/lib/dependencies/CssIcssImportDependency.js

@@ -12,10 +12,8 @@ const ModuleDependency = require("./ModuleDependency");
 
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
 /** @typedef {import("../Dependency")} Dependency */
-/** @typedef {import("../Dependency").ExportsSpec} ExportsSpec */
 /** @typedef {import("../DependencyTemplate").CssDependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../Module")} Module */
-/** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */

package/lib/dependencies/CssIcssSymbolDependency.js

@@ -11,7 +11,7 @@ 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("../Dependency").UpdateHashContext} UpdateHashContext */
 /** @typedef {import("../DependencyTemplate").CssDependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
@@ -77,7 +77,7 @@ class CssIcssSymbolDependency 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.name]];

package/lib/dependencies/CssImportDependency.js

@@ -9,19 +9,11 @@ const makeSerializable = require("../util/makeSerializable");
 const ModuleDependency = require("./ModuleDependency");
 
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
-/** @typedef {import("../ChunkGraph")} ChunkGraph */
 /** @typedef {import("../Dependency")} Dependency */
-/** @typedef {import("../Dependency").UpdateHashContext} UpdateHashContext */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
-/** @typedef {import("../Module")} Module */
-/** @typedef {import("../ModuleGraph")} ModuleGraph */
-/** @typedef {import("../ModuleGraphConnection")} ModuleGraphConnection */
-/** @typedef {import("../ModuleGraphConnection").ConnectionState} ConnectionState */
 /** @typedef {import("../css/CssParser").Range} Range */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
-/** @typedef {import("../util/Hash")} Hash */
-/** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
 
 class CssImportDependency extends ModuleDependency {
 	/**

package/lib/dependencies/CssLocalIdentifierDependency.js

@@ -15,7 +15,6 @@ const NullDependency = require("./NullDependency");
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
 /** @typedef {import("../../declarations/WebpackOptions").CssGeneratorExportsConvention} CssGeneratorExportsConvention */
 /** @typedef {import("../../declarations/WebpackOptions").CssGeneratorLocalIdentName} CssGeneratorLocalIdentName */
-/** @typedef {import("../../declarations/WebpackOptions").HashFunction} HashFunction */
 /** @typedef {import("../ChunkGraph")} ChunkGraph */
 /** @typedef {import("../CssModule")} CssModule */
 /** @typedef {import("../Dependency")} Dependency */
@@ -23,7 +22,6 @@ const NullDependency = require("./NullDependency");
 /** @typedef {import("../Dependency").UpdateHashContext} UpdateHashContext */
 /** @typedef {import("../DependencyTemplate").CssDependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
-/** @typedef {import("../NormalModuleFactory").ResourceDataWithData} ResourceDataWithData */
 /** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
 /** @typedef {import("../css/CssGenerator")} CssGenerator */
 /** @typedef {import("../css/CssParser").Range} Range */
@@ -48,12 +46,13 @@ const getLocalIdent = (local, module, chunkGraph, runtimeTemplate) => {
 	const relativeResourcePath = makePathsRelative(
 		/** @type {string} */
 		(module.context),
-		module.matchResource || module.resource,
+		/** @type {string} */
+		(module.getResource()),
 		runtimeTemplate.compilation.compiler.root
 	);
 	const { hashFunction, hashDigest, hashDigestLength, hashSalt, uniqueName } =
 		runtimeTemplate.outputOptions;
-	const hash = createHash(/** @type {HashFunction} */ (hashFunction));
+	const hash = createHash(hashFunction);
 
 	if (hashSalt) {
 		hash.update(hashSalt);

package/lib/dependencies/CssSelfLocalIdentifierDependency.js

@@ -11,7 +11,7 @@ const CssLocalIdentifierDependency = require("./CssLocalIdentifierDependency");
 
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
 /** @typedef {import("../Dependency").ExportsSpec} ExportsSpec */
-/** @typedef {import("../Dependency").ReferencedExport} ReferencedExport */
+/** @typedef {import("../Dependency").ReferencedExports} ReferencedExports */
 /** @typedef {import("../DependencyTemplate").CssDependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../css/CssParser").Range} Range */
@@ -60,7 +60,7 @@ class CssSelfLocalIdentifierDependency extends CssLocalIdentifierDependency {
 	 * 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.declaredSet && !this.declaredSet.has(this.name)) {

package/lib/dependencies/CssUrlDependency.js

@@ -11,20 +11,14 @@ const memoize = require("../util/memoize");
 const ModuleDependency = require("./ModuleDependency");
 
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
-/** @typedef {import("../ChunkGraph")} ChunkGraph */
 /** @typedef {import("../CodeGenerationResults")} CodeGenerationResults */
 /** @typedef {import("../Dependency")} Dependency */
-/** @typedef {import("../Dependency").UpdateHashContext} UpdateHashContext */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../Module")} Module */
 /** @typedef {import("../Module").CodeGenerationResult} CodeGenerationResult */
-/** @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 */
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
 
 const getIgnoredRawDataUrlModule = memoize(

package/lib/dependencies/ExportsInfoDependency.js

@@ -10,16 +10,14 @@ const makeSerializable = require("../util/makeSerializable");
 const NullDependency = require("./NullDependency");
 
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
-/** @typedef {import("../ChunkGraph")} ChunkGraph */
 /** @typedef {import("../Dependency")} Dependency */
-/** @typedef {import("../Dependency").UpdateHashContext} UpdateHashContext */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../Module")} Module */
 /** @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 */
-/** @typedef {import("../util/Hash")} Hash */
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
 
 /**
@@ -30,13 +28,13 @@ const NullDependency = require("./NullDependency");
 /**
  * @param {ModuleGraph} moduleGraph the module graph
  * @param {Module} module the module
- * @param {string[] | null} _exportName name of the export if any
+ * @param {ExportInfoName[] | null} exportName_ name of the export if any
  * @param {string | null} property name of the requested property
  * @param {RuntimeSpec} runtime for which runtime
- * @returns {undefined | null | number | boolean | string[] | SortableSet<string>} value of the property
+ * @returns {undefined | null | boolean | ExportInfoName[]} value of the property
  */
-const getProperty = (moduleGraph, module, _exportName, property, runtime) => {
-	if (!_exportName) {
+const getProperty = (moduleGraph, module, exportName_, property, runtime) => {
+	if (!exportName_) {
 		switch (property) {
 			case "usedExports": {
 				const usedExports = moduleGraph
@@ -53,7 +51,7 @@ const getProperty = (moduleGraph, module, _exportName, property, runtime) => {
 			}
 		}
 	}
-	const exportName = /** @type {string[]} */ (_exportName);
+	const exportName = /** @type {ExportInfoName[]} */ (exportName_);
 	switch (property) {
 		case "canMangle": {
 			const exportsInfo = moduleGraph.getExportsInfo(module);
@@ -92,7 +90,7 @@ const getProperty = (moduleGraph, module, _exportName, property, runtime) => {
 class ExportsInfoDependency extends NullDependency {
 	/**
 	 * @param {Range} range range
-	 * @param {string[] | null} exportName export name
+	 * @param {ExportInfoName[] | null} exportName export name
 	 * @param {string | null} property property
 	 */
 	constructor(range, exportName, property) {

package/lib/dependencies/ExternalModuleDependency.js

@@ -11,13 +11,10 @@ const ExternalModuleInitFragment = require("./ExternalModuleInitFragment");
 
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
 /** @typedef {import("../Dependency")} Dependency */
-/** @typedef {import("../Dependency").UpdateHashContext} UpdateHashContext */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
-/** @typedef {import("../javascript/JavascriptModulesPlugin").ChunkRenderContext} ChunkRenderContext */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
-/** @typedef {import("../util/Hash")} Hash */
 
 class ExternalModuleDependency extends CachedConstDependency {
 	/**

package/lib/dependencies/ExternalModuleInitFragment.js

@@ -20,7 +20,7 @@ const makeSerializable = require("../util/makeSerializable");
 class ExternalModuleInitFragment extends InitFragment {
 	/**
 	 * @param {string} importedModule imported module
-	 * @param {Array<{ name: string, value?: string }> | ImportSpecifiers} specifiers import specifiers
+	 * @param {{ name: string, value?: string }[] | ImportSpecifiers} specifiers import specifiers
 	 * @param {string=} defaultImport default import
 	 */
 	constructor(importedModule, specifiers, defaultImport) {

package/lib/dependencies/HarmonyAcceptDependency.js

@@ -120,7 +120,7 @@ HarmonyAcceptDependency.Template = class HarmonyAcceptDependencyTemplate extends
 			for (const d of module.dependencies) {
 				if (deferDependency && noDeferredDependency) break;
 				if (isRelatedHarmonyImportDependency(dependency, d)) {
-					if (d.defer) {
+					if (/** @type {HarmonyImportDependency} */ (d).defer) {
 						deferDependency = /** @type {HarmonyImportDependency} */ (d);
 					} else {
 						noDeferredDependency = /** @type {HarmonyImportDependency} */ (d);

package/lib/dependencies/HarmonyAcceptImportDependency.js

@@ -9,10 +9,6 @@ const makeSerializable = require("../util/makeSerializable");
 const HarmonyImportDependency = require("./HarmonyImportDependency");
 const NullDependency = require("./NullDependency");
 
-/** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
-/** @typedef {import("../Dependency")} Dependency */
-/** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
-
 class HarmonyAcceptImportDependency extends HarmonyImportDependency {
 	/**
 	 * @param {string} request the request string

package/lib/dependencies/HarmonyCompatibilityDependency.js

@@ -14,7 +14,6 @@ const NullDependency = require("./NullDependency");
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
 /** @typedef {import("../Dependency")} Dependency */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
-/** @typedef {import("../Module")} Module */
 /** @typedef {import("../Module").BuildMeta} BuildMeta */
 
 class HarmonyCompatibilityDependency extends NullDependency {