webpack 5.95.0 → 5.96.1

package/lib/debug/ProfilingPlugin.js

@@ -390,6 +390,11 @@ const interceptAllJavascriptModulesPluginHooks = (compilation, tracer) => {
 	);
 };
 
+/**
+ * @param {string} instance instance
+ * @param {Trace} tracer tracer
+ * @returns {TODO} interceptor
+ */
 const makeInterceptorFor = (instance, tracer) => hookName => ({
 	register: tapInfo => {
 		const { name, type, fn } = tapInfo;

package/lib/dependencies/CommonJsExportsParserPlugin.js

@@ -26,6 +26,7 @@ const ModuleDecoratorDependency = require("./ModuleDecoratorDependency");
 /** @typedef {import("../javascript/BasicEvaluatedExpression")} BasicEvaluatedExpression */
 /** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
+/** @typedef {import("../javascript/JavascriptParser").StatementPath} StatementPath */
 /** @typedef {import("./CommonJsDependencyHelpers").CommonJSDependencyBaseKeywords} CommonJSDependencyBaseKeywords */
 
 /**
@@ -219,7 +220,8 @@ class CommonJsExportsParserPlugin {
 			enableStructuredExports();
 			const remainingMembers = members;
 			checkNamespace(
-				parser.statementPath.length === 1 &&
+				/** @type {StatementPath} */
+				(parser.statementPath).length === 1 &&
 					parser.isStatementLevelExpression(expr),
 				remainingMembers,
 				expr.right
@@ -276,7 +278,8 @@ class CommonJsExportsParserPlugin {
 				enableStructuredExports();
 				const descArg = expr.arguments[2];
 				checkNamespace(
-					parser.statementPath.length === 1,
+					/** @type {StatementPath} */
+					(parser.statementPath).length === 1,
 					[property],
 					getValueOfPropertyDescription(descArg)
 				);

package/lib/dependencies/CommonJsImportsParserPlugin.js

@@ -283,7 +283,7 @@ class CommonJsImportsParserPlugin {
 						parser.state.module.addWarning(
 							new CommentCompilationWarning(
 								`Compilation error while processing magic comment(-s): /*${comment.value}*/: ${e.message}`,
-								comment.loc
+								/** @type {DependencyLocation} */ (comment.loc)
 							)
 						);
 					}
@@ -590,12 +590,9 @@ class CommonJsImportsParserPlugin {
 					data: { context },
 					next: undefined
 				});
+
 				return new BasicEvaluatedExpression()
-					.setIdentifier(
-						/** @type {TODO} */ (ident),
-						/** @type {TODO} */ (ident),
-						() => []
-					)
+					.setIdentifier(ident, ident, () => [])
 					.setSideEffects(false)
 					.setRange(/** @type {Range} */ (expr.range));
 			});

package/lib/dependencies/CssExportDependency.js

@@ -129,9 +129,9 @@ CssExportDependency.Template = class CssExportDependencyTemplate extends (
 	) {
 		const dep = /** @type {CssExportDependency} */ (dependency);
 		const module = /** @type {CssModule} */ (m);
-		const convention = /** @type {CssGenerator | CssExportsGenerator} */ (
-			module.generator
-		).convention;
+		const convention =
+			/** @type {CssGenerator | CssExportsGenerator} */
+			(module.generator).convention;
 		const names = dep.getExportsConventionNames(dep.name, convention);
 		const usedNames = /** @type {string[]} */ (
 			names

package/lib/dependencies/CssLocalIdentifierDependency.js

@@ -21,6 +21,7 @@ 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/CssExportsGenerator")} CssExportsGenerator */
 /** @typedef {import("../css/CssGenerator")} CssGenerator */
@@ -28,6 +29,7 @@ const NullDependency = require("./NullDependency");
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 /** @typedef {import("../util/Hash")} Hash */
+/** @typedef {import("../util/createHash").Algorithm} Algorithm */
 
 /**
  * @param {string} local css local
@@ -41,12 +43,16 @@ const getLocalIdent = (local, module, chunkGraph, runtimeTemplate) => {
 		/** @type {CssGenerator | CssExportsGenerator} */
 		(module.generator).localIdentName;
 	const relativeResourcePath = makePathsRelative(
-		/** @type {string} */ (module.context),
-		module.resourceResolveData.path
+		/** @type {string} */
+		(module.context),
+		/** @type {string} */ (
+			/** @type {ResourceDataWithData} */
+			(module.resourceResolveData).path
+		)
 	);
 	const { hashFunction, hashDigest, hashDigestLength, hashSalt, uniqueName } =
 		runtimeTemplate.outputOptions;
-	const hash = createHash(hashFunction);
+	const hash = createHash(/** @type {Algorithm} */ (hashFunction));
 	if (hashSalt) {
 		hash.update(hashSalt);
 	}
@@ -71,7 +77,7 @@ const getLocalIdent = (local, module, chunkGraph, runtimeTemplate) => {
 			module
 		})
 		.replace(/\[local\]/g, local)
-		.replace(/\[uniqueName\]/g, uniqueName);
+		.replace(/\[uniqueName\]/g, /** @type {string} */ (uniqueName));
 };
 
 class CssLocalIdentifierDependency extends NullDependency {
@@ -209,28 +215,31 @@ CssLocalIdentifierDependency.Template = class CssLocalIdentifierDependencyTempla
 	) {
 		const dep = /** @type {CssLocalIdentifierDependency} */ (dependency);
 		const module = /** @type {CssModule} */ (m);
-		const convention = /** @type {CssGenerator | CssExportsGenerator} */ (
-			module.generator
-		).convention;
+		const convention =
+			/** @type {CssGenerator | CssExportsGenerator} */
+			(module.generator).convention;
 		const names = dep.getExportsConventionNames(dep.name, convention);
-		const usedNames = /** @type {string[]} */ (
-			names
-				.map(name =>
-					moduleGraph.getExportInfo(module, name).getUsedName(name, runtime)
-				)
-				.filter(Boolean)
-		);
-		if (usedNames.length === 0) return;
+		const usedNames =
+			/** @type {(string)[]} */
+			(
+				names
+					.map(name =>
+						moduleGraph.getExportInfo(module, name).getUsedName(name, runtime)
+					)
+					.filter(Boolean)
+			);
+		const used = usedNames.length === 0 ? names[0] : usedNames[0];
 
 		// use the first usedName to generate localIdent, it's shorter when mangle exports enabled
 		const localIdent =
-			dep.prefix +
-			getLocalIdent(usedNames[0], module, chunkGraph, runtimeTemplate);
+			dep.prefix + getLocalIdent(used, module, chunkGraph, runtimeTemplate);
+
 		source.replace(
 			dep.range[0],
 			dep.range[1] - 1,
 			escapeCssIdentifier(localIdent, dep.prefix)
 		);
+
 		for (const used of usedNames) {
 			cssExportsData.exports.set(used, localIdent);
 		}

package/lib/dependencies/CssUrlDependency.js

@@ -12,10 +12,12 @@ 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 */
@@ -33,7 +35,7 @@ class CssUrlDependency extends ModuleDependency {
 	/**
 	 * @param {string} request request
 	 * @param {Range} range range of the argument
-	 * @param {"string" | "url"} urlType dependency type e.g. url() or string
+	 * @param {"string" | "url" | "src"} urlType dependency type e.g. url() or string
 	 */
 	constructor(request, range, urlType) {
 		super(request);
@@ -133,7 +135,7 @@ CssUrlDependency.Template = class CssUrlDependencyTemplate extends (
 		switch (dep.urlType) {
 			case "string":
 				newValue = cssEscapeString(
-					runtimeTemplate.assetUrl({
+					this.assetUrl({
 						module,
 						codeGenerationResults
 					})
@@ -141,7 +143,15 @@ CssUrlDependency.Template = class CssUrlDependencyTemplate extends (
 				break;
 			case "url":
 				newValue = `url(${cssEscapeString(
-					runtimeTemplate.assetUrl({
+					this.assetUrl({
+						module,
+						codeGenerationResults
+					})
+				)})`;
+				break;
+			case "src":
+				newValue = `src(${cssEscapeString(
+					this.assetUrl({
 						module,
 						codeGenerationResults
 					})
@@ -155,6 +165,26 @@ CssUrlDependency.Template = class CssUrlDependencyTemplate extends (
 			/** @type {string} */ (newValue)
 		);
 	}
+
+	/**
+	 * @param {object} options options object
+	 * @param {Module} options.module the module
+	 * @param {RuntimeSpec=} options.runtime runtime
+	 * @param {CodeGenerationResults} options.codeGenerationResults the code generation results
+	 * @returns {string} the url of the asset
+	 */
+	assetUrl({ runtime, module, codeGenerationResults }) {
+		if (!module) {
+			return "data:,";
+		}
+		const codeGen = codeGenerationResults.get(module, runtime);
+		const data =
+			/** @type {NonNullable<CodeGenerationResult["data"]>} */
+			(codeGen.data);
+		const url = data.get("url");
+		if (!url || !url["css-url"]) return "data:,";
+		return url["css-url"];
+	}
 };
 
 makeSerializable(CssUrlDependency, "webpack/lib/dependencies/CssUrlDependency");

package/lib/dependencies/HarmonyExportDependencyParserPlugin.js

@@ -5,6 +5,7 @@
 
 "use strict";
 
+const { getImportAttributes } = require("../javascript/JavascriptParser");
 const InnerGraph = require("../optimize/InnerGraph");
 const ConstDependency = require("./ConstDependency");
 const HarmonyExportExpressionDependency = require("./HarmonyExportExpressionDependency");
@@ -13,8 +14,7 @@ const HarmonyExportImportedSpecifierDependency = require("./HarmonyExportImporte
 const HarmonyExportSpecifierDependency = require("./HarmonyExportSpecifierDependency");
 const { ExportPresenceModes } = require("./HarmonyImportDependency");
 const {
-	harmonySpecifierTag,
-	getAttributes
+	harmonySpecifierTag
 } = require("./HarmonyImportDependencyParserPlugin");
 const HarmonyImportSideEffectDependency = require("./HarmonyImportSideEffectDependency");
 
@@ -78,7 +78,7 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 				const sideEffectDep = new HarmonyImportSideEffectDependency(
 					/** @type {string} */ (source),
 					parser.state.lastHarmonyImportOrder,
-					getAttributes(statement)
+					getImportAttributes(statement)
 				);
 				sideEffectDep.loc = Object.create(
 					/** @type {DependencyLocation} */ (statement.loc)

package/lib/dependencies/HarmonyExportImportedSpecifierDependency.js

@@ -102,7 +102,7 @@ class ExportMode {
 		this.ignored = null;
 
 		// for "dynamic-reexport" | "empty-star":
-		/** @type {ExportModeHidden | null} */
+		/** @type {ExportModeHidden | undefined | null} */
 		this.hidden = null;
 
 		// for "missing":
@@ -115,12 +115,19 @@ class ExportMode {
 	}
 }
 
+/**
+ * @param {ModuleGraph} moduleGraph module graph
+ * @param {TODO} dependencies dependencies
+ * @param {TODO=} additionalDependency additional dependency
+ * @returns {TODO} result
+ */
 const determineExportAssignments = (
 	moduleGraph,
 	dependencies,
 	additionalDependency
 ) => {
 	const names = new Set();
+	/** @type {number[]} */
 	const dependencyIndices = [];
 
 	if (additionalDependency) {
@@ -417,7 +424,8 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 	 * @returns {void}
 	 */
 	setIds(moduleGraph, ids) {
-		moduleGraph.getMeta(this)[idsSymbol] = ids;
+		/** @type {TODO} */
+		(moduleGraph.getMeta(this))[idsSymbol] = ids;
 	}
 
 	/**
@@ -593,7 +601,11 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 			case "normal-reexport": {
 				/** @type {ReferencedExports} */
 				const referencedExports = [];
-				for (const { ids, exportInfo, hidden } of mode.items) {
+				for (const {
+					ids,
+					exportInfo,
+					hidden
+				} of /** @type {NormalReexportItem[]} */ (mode.items)) {
 					if (hidden) continue;
 					processExportInfo(runtime, referencedExports, ids, exportInfo, false);
 				}
@@ -687,12 +699,15 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 					/** @type {ModuleGraphConnection} */
 					(moduleGraph.getConnection(this));
 				return {
-					exports: Array.from(mode.items, item => ({
-						name: item.name,
-						from,
-						export: item.ids,
-						hidden: item.hidden
-					})),
+					exports: Array.from(
+						/** @type {NormalReexportItem[]} */ (mode.items),
+						item => ({
+							name: item.name,
+							from,
+							export: item.ids,
+							hidden: item.hidden
+						})
+					),
 					priority: 1,
 					dependencies: [from.module]
 				};
@@ -1040,7 +1055,9 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 					this.getReexportFragment(
 						module,
 						"reexport default from dynamic",
-						moduleGraph.getExportsInfo(module).getUsedName(mode.name, runtime),
+						moduleGraph
+							.getExportsInfo(module)
+							.getUsedName(/** @type {string} */ (mode.name), runtime),
 						importVar,
 						null,
 						runtimeRequirements
@@ -1052,7 +1069,9 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 				initFragments.push(
 					...this.getReexportFakeNamespaceObjectFragments(
 						module,
-						moduleGraph.getExportsInfo(module).getUsedName(mode.name, runtime),
+						moduleGraph
+							.getExportsInfo(module)
+							.getUsedName(/** @type {string} */ (mode.name), runtime),
 						importVar,
 						mode.fakeType,
 						runtimeRequirements
@@ -1065,7 +1084,9 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 					this.getReexportFragment(
 						module,
 						"reexport non-default export from non-harmony",
-						moduleGraph.getExportsInfo(module).getUsedName(mode.name, runtime),
+						moduleGraph
+							.getExportsInfo(module)
+							.getUsedName(/** @type {string} */ (mode.name), runtime),
 						"undefined",
 						"",
 						runtimeRequirements
@@ -1078,7 +1099,9 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 					this.getReexportFragment(
 						module,
 						"reexport default export from named module",
-						moduleGraph.getExportsInfo(module).getUsedName(mode.name, runtime),
+						moduleGraph
+							.getExportsInfo(module)
+							.getUsedName(/** @type {string} */ (mode.name), runtime),
 						importVar,
 						"",
 						runtimeRequirements
@@ -1091,7 +1114,9 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 					this.getReexportFragment(
 						module,
 						"reexport module object",
-						moduleGraph.getExportsInfo(module).getUsedName(mode.name, runtime),
+						moduleGraph
+							.getExportsInfo(module)
+							.getUsedName(/** @type {string} */ (mode.name), runtime),
 						importVar,
 						"",
 						runtimeRequirements

package/lib/dependencies/HarmonyImportDependencyParserPlugin.js

@@ -6,6 +6,7 @@
 "use strict";
 
 const HotModuleReplacementPlugin = require("../HotModuleReplacementPlugin");
+const { getImportAttributes } = require("../javascript/JavascriptParser");
 const InnerGraph = require("../optimize/InnerGraph");
 const ConstDependency = require("./ConstDependency");
 const HarmonyAcceptDependency = require("./HarmonyAcceptDependency");
@@ -16,11 +17,7 @@ const { ExportPresenceModes } = require("./HarmonyImportDependency");
 const HarmonyImportSideEffectDependency = require("./HarmonyImportSideEffectDependency");
 const HarmonyImportSpecifierDependency = require("./HarmonyImportSpecifierDependency");
 
-/** @typedef {import("estree").ExportAllDeclaration} ExportAllDeclaration */
-/** @typedef {import("estree").ExportNamedDeclaration} ExportNamedDeclaration */
 /** @typedef {import("estree").Identifier} Identifier */
-/** @typedef {import("estree").ImportDeclaration} ImportDeclaration */
-/** @typedef {import("estree").ImportExpression} ImportExpression */
 /** @typedef {import("estree").Literal} Literal */
 /** @typedef {import("estree").MemberExpression} MemberExpression */
 /** @typedef {import("estree").ObjectExpression} ObjectExpression */
@@ -30,7 +27,11 @@ const HarmonyImportSpecifierDependency = require("./HarmonyImportSpecifierDepend
 /** @typedef {import("../javascript/BasicEvaluatedExpression")} BasicEvaluatedExpression */
 /** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
 /** @typedef {import("../javascript/JavascriptParser").DestructuringAssignmentProperty} DestructuringAssignmentProperty */
+/** @typedef {import("../javascript/JavascriptParser").ExportAllDeclaration} ExportAllDeclaration */
+/** @typedef {import("../javascript/JavascriptParser").ExportNamedDeclaration} ExportNamedDeclaration */
 /** @typedef {import("../javascript/JavascriptParser").ImportAttributes} ImportAttributes */
+/** @typedef {import("../javascript/JavascriptParser").ImportDeclaration} ImportDeclaration */
+/** @typedef {import("../javascript/JavascriptParser").ImportExpression} ImportExpression */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
 /** @typedef {import("../optimize/InnerGraph").InnerGraph} InnerGraph */
 /** @typedef {import("../optimize/InnerGraph").TopLevelSymbol} TopLevelSymbol */
@@ -48,73 +49,6 @@ const harmonySpecifierTag = Symbol("harmony import");
  * @property {Record<string, any> | undefined} assertions
  */
 
-/**
- * @param {ImportDeclaration | ExportNamedDeclaration | ExportAllDeclaration | (ImportExpression & { arguments?: ObjectExpression[] })} node node with assertions
- * @returns {ImportAttributes | undefined} import attributes
- */
-function getAttributes(node) {
-	if (
-		node.type === "ImportExpression" &&
-		node.arguments &&
-		node.arguments[0] &&
-		node.arguments[0].type === "ObjectExpression" &&
-		node.arguments[0].properties[0] &&
-		node.arguments[0].properties[0].type === "Property" &&
-		node.arguments[0].properties[0].value.type === "ObjectExpression" &&
-		node.arguments[0].properties[0].value.properties
-	) {
-		const properties =
-			/** @type {Property[]} */
-			(node.arguments[0].properties[0].value.properties);
-		const result = /** @type {ImportAttributes} */ ({});
-		for (const property of properties) {
-			const key =
-				/** @type {string} */
-				(
-					property.key.type === "Identifier"
-						? property.key.name
-						: /** @type {Literal} */ (property.key).value
-				);
-			result[key] =
-				/** @type {string} */
-				(/** @type {Literal} */ (property.value).value);
-		}
-		const key =
-			node.arguments[0].properties[0].key.type === "Identifier"
-				? node.arguments[0].properties[0].key.name
-				: /** @type {Literal} */ (node.arguments[0].properties[0].key).value;
-		if (key === "assert") {
-			result._isLegacyAssert = true;
-		}
-		return result;
-	}
-	// TODO remove cast when @types/estree has been updated to import assertions
-	const isImportAssertion =
-		/** @type {{ assertions?: ImportAttributeNode[] }} */ (node).assertions !==
-		undefined;
-	const attributes = isImportAssertion
-		? /** @type {{ assertions?: ImportAttributeNode[] }} */ (node).assertions
-		: /** @type {{ attributes?: ImportAttributeNode[] }} */ (node).attributes;
-	if (attributes === undefined) {
-		return;
-	}
-	const result = /** @type {ImportAttributes} */ ({});
-	for (const attribute of attributes) {
-		const key =
-			/** @type {string} */
-			(
-				attribute.key.type === "Identifier"
-					? attribute.key.name
-					: attribute.key.value
-			);
-		result[key] = /** @type {string} */ (attribute.value.value);
-	}
-	if (isImportAssertion) {
-		result._isLegacyAssert = true;
-	}
-	return result;
-}
-
 module.exports = class HarmonyImportDependencyParserPlugin {
 	/**
 	 * @param {JavascriptParserOptions} options options
@@ -184,7 +118,7 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 				clearDep.loc = /** @type {DependencyLocation} */ (statement.loc);
 				parser.state.module.addPresentationalDependency(clearDep);
 				parser.unsetAsiPosition(/** @type {Range} */ (statement.range)[1]);
-				const attributes = getAttributes(statement);
+				const attributes = getImportAttributes(statement);
 				const sideEffectDep = new HarmonyImportSideEffectDependency(
 					/** @type {string} */ (source),
 					parser.state.lastHarmonyImportOrder,
@@ -204,7 +138,7 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 					source,
 					ids,
 					sourceOrder: parser.state.lastHarmonyImportOrder,
-					assertions: getAttributes(statement)
+					assertions: getImportAttributes(statement)
 				});
 				return true;
 			}
@@ -389,17 +323,18 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 				}
 				const dependencies = requests.map(request => {
 					const dep = new HarmonyAcceptImportDependency(request);
-					dep.loc = expr.loc;
+					dep.loc = /** @type {DependencyLocation} */ (expr.loc);
 					parser.state.module.addDependency(dep);
 					return dep;
 				});
 				if (dependencies.length > 0) {
 					const dep = new HarmonyAcceptDependency(
-						expr.range,
+						/** @type {Range} */
+						(expr.range),
 						dependencies,
 						true
 					);
-					dep.loc = expr.loc;
+					dep.loc = /** @type {DependencyLocation} */ (expr.loc);
 					parser.state.module.addDependency(dep);
 				}
 			}
@@ -413,17 +348,18 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 				}
 				const dependencies = requests.map(request => {
 					const dep = new HarmonyAcceptImportDependency(request);
-					dep.loc = expr.loc;
+					dep.loc = /** @type {DependencyLocation} */ (expr.loc);
 					parser.state.module.addDependency(dep);
 					return dep;
 				});
 				if (dependencies.length > 0) {
 					const dep = new HarmonyAcceptDependency(
-						expr.range,
+						/** @type {Range} */
+						(expr.range),
 						dependencies,
 						false
 					);
-					dep.loc = expr.loc;
+					dep.loc = /** @type {DependencyLocation} */ (expr.loc);
 					parser.state.module.addDependency(dep);
 				}
 			}
@@ -432,6 +368,3 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 };
 
 module.exports.harmonySpecifierTag = harmonySpecifierTag;
-// TODO remove it in webpack@6 in favor getAttributes
-module.exports.getAssertions = getAttributes;
-module.exports.getAttributes = getAttributes;

package/lib/dependencies/HarmonyImportSpecifierDependency.js

@@ -114,7 +114,8 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 	 * @returns {void}
 	 */
 	setIds(moduleGraph, ids) {
-		moduleGraph.getMeta(this)[idsSymbol] = ids;
+		/** @type {TODO} */
+		(moduleGraph.getMeta(this))[idsSymbol] = ids;
 	}
 
 	/**
@@ -350,7 +351,9 @@ HarmonyImportSpecifierDependency.Template = class HarmonyImportSpecifierDependen
 			let prefixedIds = ids;
 
 			if (ids[0] === "default") {
-				const selfModule = moduleGraph.getParentModule(dep);
+				const selfModule =
+					/** @type {Module} */
+					(moduleGraph.getParentModule(dep));
 				const importedModule =
 					/** @type {Module} */
 					(moduleGraph.getModule(dep));

package/lib/dependencies/ImportParserPlugin.js

@@ -8,20 +8,20 @@
 const AsyncDependenciesBlock = require("../AsyncDependenciesBlock");
 const CommentCompilationWarning = require("../CommentCompilationWarning");
 const UnsupportedFeatureWarning = require("../UnsupportedFeatureWarning");
+const { getImportAttributes } = require("../javascript/JavascriptParser");
 const ContextDependencyHelpers = require("./ContextDependencyHelpers");
-const { getAttributes } = require("./HarmonyImportDependencyParserPlugin");
 const ImportContextDependency = require("./ImportContextDependency");
 const ImportDependency = require("./ImportDependency");
 const ImportEagerDependency = require("./ImportEagerDependency");
 const ImportWeakDependency = require("./ImportWeakDependency");
 
-/** @typedef {import("estree").ImportExpression} ImportExpression */
 /** @typedef {import("../../declarations/WebpackOptions").JavascriptParserOptions} JavascriptParserOptions */
 /** @typedef {import("../ChunkGroup").RawChunkGroupOptions} RawChunkGroupOptions */
 /** @typedef {import("../ContextModule").ContextMode} ContextMode */
 /** @typedef {import("../Dependency").DependencyLocation} DependencyLocation */
 /** @typedef {import("../Module").BuildMeta} BuildMeta */
 /** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
+/** @typedef {import("../javascript/JavascriptParser").ImportExpression} ImportExpression */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
 
 class ImportParserPlugin {
@@ -85,7 +85,7 @@ class ImportParserPlugin {
 					parser.state.module.addWarning(
 						new CommentCompilationWarning(
 							`Compilation error while processing magic comment(-s): /*${comment.value}*/: ${e.message}`,
-							comment.loc
+							/** @type {DependencyLocation} */ (comment.loc)
 						)
 					);
 				}
@@ -126,7 +126,7 @@ class ImportParserPlugin {
 							)
 						);
 					} else {
-						mode = importOptions.webpackMode;
+						mode = /** @type {ContextMode} */ (importOptions.webpackMode);
 					}
 				}
 				if (importOptions.webpackPrefetch !== undefined) {
@@ -162,7 +162,9 @@ class ImportParserPlugin {
 						typeof importOptions.webpackFetchPriority === "string" &&
 						["high", "low", "auto"].includes(importOptions.webpackFetchPriority)
 					) {
-						groupOptions.fetchPriority = importOptions.webpackFetchPriority;
+						groupOptions.fetchPriority =
+							/** @type {"low" | "high" | "auto"} */
+							(importOptions.webpackFetchPriority);
 					} else {
 						parser.state.module.addWarning(
 							new UnsupportedFeatureWarning(
@@ -258,7 +260,7 @@ class ImportParserPlugin {
 			}
 
 			if (param.isString()) {
-				const attributes = getAttributes(expr);
+				const attributes = getImportAttributes(expr);
 
 				if (mode === "eager") {
 					const dep = new ImportEagerDependency(
@@ -321,7 +323,7 @@ class ImportParserPlugin {
 					typePrefix: "import()",
 					category: "esm",
 					referencedExports: exports,
-					attributes: getAttributes(expr)
+					attributes: getImportAttributes(expr)
 				},
 				parser
 			);