webpack 5.90.3 → 5.91.0

package/lib/dependencies/HarmonyImportDependency.js

@@ -20,11 +20,13 @@ const ModuleDependency = require("./ModuleDependency");
 /** @typedef {import("../Dependency").ReferencedExport} ReferencedExport */
 /** @typedef {import("../Dependency").UpdateHashContext} UpdateHashContext */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
+/** @typedef {import("../ExportsInfo")} ExportsInfo */
 /** @typedef {import("../Module")} Module */
+/** @typedef {import("../Module").BuildMeta} BuildMeta */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
 /** @typedef {import("../WebpackError")} WebpackError */
-/** @typedef {import("../javascript/JavascriptParser").Assertions} Assertions */
+/** @typedef {import("../javascript/JavascriptParser").Attributes} Attributes */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 /** @typedef {import("../util/Hash")} Hash */
@@ -35,6 +37,10 @@ const ExportPresenceModes = {
 	WARN: /** @type {1} */ (1),
 	AUTO: /** @type {2} */ (2),
 	ERROR: /** @type {3} */ (3),
+	/**
+	 * @param {string | false} str param
+	 * @returns {0 | 1 | 2 | 3} result
+	 */
 	fromUserOption(str) {
 		switch (str) {
 			case "error":
@@ -56,12 +62,12 @@ class HarmonyImportDependency extends ModuleDependency {
 	 *
 	 * @param {string} request request string
 	 * @param {number} sourceOrder source order
-	 * @param {Assertions=} assertions import assertions
+	 * @param {Attributes=} attributes import assertions
 	 */
-	constructor(request, sourceOrder, assertions) {
+	constructor(request, sourceOrder, attributes) {
 		super(request);
 		this.sourceOrder = sourceOrder;
-		this.assertions = assertions;
+		this.assertions = attributes;
 	}
 
 	get category() {
@@ -84,15 +90,20 @@ class HarmonyImportDependency extends ModuleDependency {
 	 */
 	getImportVar(moduleGraph) {
 		const module = moduleGraph.getParentModule(this);
-		const meta = moduleGraph.getMeta(module);
+		const meta = /** @type {TODO} */ (moduleGraph.getMeta(module));
 		let importVarMap = meta.importVarMap;
 		if (!importVarMap) meta.importVarMap = importVarMap = new Map();
-		let importVar = importVarMap.get(moduleGraph.getModule(this));
+		let importVar = importVarMap.get(
+			/** @type {Module} */ (moduleGraph.getModule(this))
+		);
 		if (importVar) return importVar;
 		importVar = `${Template.toIdentifier(
 			`${this.userRequest}`
 		)}__WEBPACK_IMPORTED_MODULE_${importVarMap.size}__`;
-		importVarMap.set(moduleGraph.getModule(this), importVar);
+		importVarMap.set(
+			/** @type {Module} */ (moduleGraph.getModule(this)),
+			importVar
+		);
 		return importVar;
 	}
 
@@ -107,7 +118,7 @@ class HarmonyImportDependency extends ModuleDependency {
 	) {
 		return runtimeTemplate.importStatement({
 			update,
-			module: moduleGraph.getModule(this),
+			module: /** @type {Module} */ (moduleGraph.getModule(this)),
 			chunkGraph,
 			importVar: this.getImportVar(moduleGraph),
 			request: this.request,
@@ -129,10 +140,12 @@ class HarmonyImportDependency extends ModuleDependency {
 			return;
 		}
 
-		const parentModule = moduleGraph.getParentModule(this);
+		const parentModule =
+			/** @type {Module} */
+			(moduleGraph.getParentModule(this));
 		const exportsType = importedModule.getExportsType(
 			moduleGraph,
-			parentModule.buildMeta.strictHarmonyModule
+			/** @type {BuildMeta} */ (parentModule.buildMeta).strictHarmonyModule
 		);
 		if (exportsType === "namespace" || exportsType === "default-with-named") {
 			if (ids.length === 0) {
@@ -170,7 +183,9 @@ class HarmonyImportDependency extends ModuleDependency {
 							)
 						];
 					}
-					exportsInfo = exportInfo.getNestedExportsInfo();
+					exportsInfo =
+						/** @type {ExportsInfo} */
+						(exportInfo.getNestedExportsInfo());
 				}
 
 				// General error message
@@ -207,7 +222,8 @@ class HarmonyImportDependency extends ModuleDependency {
 				if (
 					ids.length > 0 &&
 					ids[0] !== "default" &&
-					importedModule.buildMeta.defaultObject === "redirect-warn"
+					/** @type {BuildMeta} */
+					(importedModule.buildMeta).defaultObject === "redirect-warn"
 				) {
 					// For these modules only the default export is supported
 					return [

package/lib/dependencies/HarmonyImportDependencyParserPlugin.js

@@ -21,7 +21,10 @@ const HarmonyImportSpecifierDependency = require("./HarmonyImportSpecifierDepend
 /** @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 */
+/** @typedef {import("estree").Property} Property */
 /** @typedef {import("../../declarations/WebpackOptions").JavascriptParserOptions} JavascriptParserOptions */
 /** @typedef {import("../Dependency").DependencyLocation} DependencyLocation */
 /** @typedef {import("../javascript/BasicEvaluatedExpression")} BasicEvaluatedExpression */
@@ -44,24 +47,47 @@ const harmonySpecifierTag = Symbol("harmony import");
  */
 
 /**
- * @param {ImportDeclaration | ExportNamedDeclaration | ExportAllDeclaration | ImportExpression} node node with assertions
+ * @param {ImportDeclaration | ExportNamedDeclaration | ExportAllDeclaration | (ImportExpression & { arguments?: ObjectExpression[] })} node node with assertions
  * @returns {Record<string, any> | undefined} assertions
  */
-function getAssertions(node) {
+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 = {};
+		for (const property of properties) {
+			const key =
+				property.key.type === "Identifier"
+					? property.key.name
+					: /** @type {Literal} */ (property.key).value;
+			result[key] = /** @type {Literal} */ (property.value).value;
+		}
+		return result;
+	}
 	// TODO remove cast when @types/estree has been updated to import assertions
-	const assertions = /** @type {{ assertions?: ImportAttributeNode[] }} */ (
-		node
-	).assertions;
-	if (assertions === undefined) {
+	const attributes =
+		/** @type {{ assertions?: ImportAttributeNode[] }} */
+		(node).assertions;
+	if (attributes === undefined) {
 		return undefined;
 	}
 	const result = {};
-	for (const assertion of assertions) {
+	for (const attribute of attributes) {
 		const key =
-			assertion.key.type === "Identifier"
-				? assertion.key.name
-				: assertion.key.value;
-		result[key] = assertion.value.value;
+			attribute.key.type === "Identifier"
+				? attribute.key.name
+				: attribute.key.value;
+		result[key] = attribute.value.value;
 	}
 	return result;
 }
@@ -125,11 +151,11 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 				clearDep.loc = /** @type {DependencyLocation} */ (statement.loc);
 				parser.state.module.addPresentationalDependency(clearDep);
 				parser.unsetAsiPosition(/** @type {Range} */ (statement.range)[1]);
-				const assertions = getAssertions(statement);
+				const attributes = getAttributes(statement);
 				const sideEffectDep = new HarmonyImportSideEffectDependency(
-					source,
+					/** @type {string} */ (source),
 					parser.state.lastHarmonyImportOrder,
-					assertions
+					attributes
 				);
 				sideEffectDep.loc = /** @type {DependencyLocation} */ (statement.loc);
 				parser.state.module.addDependency(sideEffectDep);
@@ -145,7 +171,7 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 					source,
 					ids,
 					sourceOrder: parser.state.lastHarmonyImportOrder,
-					assertions: getAssertions(statement)
+					assertions: getAttributes(statement)
 				});
 				return true;
 			}
@@ -368,4 +394,6 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 };
 
 module.exports.harmonySpecifierTag = harmonySpecifierTag;
-module.exports.getAssertions = getAssertions;
+// TODO remove it in webpack@6 in favor getAttributes
+module.exports.getAssertions = getAttributes;
+module.exports.getAttributes = getAttributes;

package/lib/dependencies/HarmonyImportSideEffectDependency.js

@@ -10,23 +10,24 @@ const HarmonyImportDependency = require("./HarmonyImportDependency");
 
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
 /** @typedef {import("../Dependency")} Dependency */
+/** @typedef {import("../Dependency").GetConditionFn} GetConditionFn */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../Module")} Module */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../ModuleGraphConnection")} ModuleGraphConnection */
 /** @typedef {import("../ModuleGraphConnection").ConnectionState} ConnectionState */
-/** @typedef {import("../javascript/JavascriptParser").Assertions} Assertions */
+/** @typedef {import("../javascript/JavascriptParser").Attributes} Attributes */
 /** @typedef {import("../util/Hash")} Hash */
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
 
 class HarmonyImportSideEffectDependency extends HarmonyImportDependency {
 	/**
-	 * @param {TODO} request the request string
+	 * @param {string} request the request string
 	 * @param {number} sourceOrder source order
-	 * @param {Assertions=} assertions assertions
+	 * @param {Attributes=} attributes assertions
 	 */
-	constructor(request, sourceOrder, assertions) {
-		super(request, sourceOrder, assertions);
+	constructor(request, sourceOrder, attributes) {
+		super(request, sourceOrder, attributes);
 	}
 
 	get type() {
@@ -35,7 +36,7 @@ class HarmonyImportSideEffectDependency extends HarmonyImportDependency {
 
 	/**
 	 * @param {ModuleGraph} moduleGraph module graph
-	 * @returns {null | false | function(ModuleGraphConnection, RuntimeSpec): ConnectionState} function to determine if the connection is active
+	 * @returns {null | false | GetConditionFn} function to determine if the connection is active
 	 */
 	getCondition(moduleGraph) {
 		return connection => {

package/lib/dependencies/HarmonyImportSpecifierDependency.js

@@ -17,6 +17,7 @@ const HarmonyImportDependency = require("./HarmonyImportDependency");
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
 /** @typedef {import("../ChunkGraph")} ChunkGraph */
 /** @typedef {import("../Dependency").ExportsSpec} ExportsSpec */
+/** @typedef {import("../Dependency").GetConditionFn} GetConditionFn */
 /** @typedef {import("../Dependency").ReferencedExport} ReferencedExport */
 /** @typedef {import("../Dependency").UpdateHashContext} UpdateHashContext */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
@@ -26,7 +27,7 @@ const HarmonyImportDependency = require("./HarmonyImportDependency");
 /** @typedef {import("../ModuleGraphConnection")} ModuleGraphConnection */
 /** @typedef {import("../ModuleGraphConnection").ConnectionState} ConnectionState */
 /** @typedef {import("../WebpackError")} WebpackError */
-/** @typedef {import("../javascript/JavascriptParser").Assertions} Assertions */
+/** @typedef {import("../javascript/JavascriptParser").Attributes} Attributes */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
@@ -45,7 +46,7 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 	 * @param {string} name name
 	 * @param {Range} range range
 	 * @param {TODO} exportPresenceMode export presence mode
-	 * @param {Assertions=} assertions assertions
+	 * @param {Attributes=} attributes assertions
 	 * @param {Range[]=} idRanges ranges for members of ids; the two arrays are right-aligned
 	 */
 	constructor(
@@ -55,10 +56,10 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 		name,
 		range,
 		exportPresenceMode,
-		assertions,
+		attributes,
 		idRanges // TODO webpack 6 make this non-optional. It must always be set to properly trim ids.
 	) {
-		super(request, sourceOrder, assertions);
+		super(request, sourceOrder, attributes);
 		this.ids = ids;
 		this.name = name;
 		this.range = range;
@@ -117,7 +118,7 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 
 	/**
 	 * @param {ModuleGraph} moduleGraph module graph
-	 * @returns {null | false | function(ModuleGraphConnection, RuntimeSpec): ConnectionState} function to determine if the connection is active
+	 * @returns {null | false | GetConditionFn} function to determine if the connection is active
 	 */
 	getCondition(moduleGraph) {
 		return getDependencyUsedByExportsCondition(

package/lib/dependencies/ImportDependency.js

@@ -16,6 +16,7 @@ const ModuleDependency = require("./ModuleDependency");
 /** @typedef {import("../Module")} Module */
 /** @typedef {import("../Module").BuildMeta} BuildMeta */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
+/** @typedef {import("../javascript/JavascriptParser").Attributes} Attributes */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
@@ -26,11 +27,13 @@ class ImportDependency extends ModuleDependency {
 	 * @param {string} request the request
 	 * @param {Range} range expression range
 	 * @param {(string[][] | null)=} referencedExports list of referenced exports
+	 * @param {Attributes=} attributes assertions
 	 */
-	constructor(request, range, referencedExports) {
+	constructor(request, range, referencedExports, attributes) {
 		super(request);
 		this.range = range;
 		this.referencedExports = referencedExports;
+		this.assertions = attributes;
 	}
 
 	get type() {
@@ -52,7 +55,9 @@ class ImportDependency extends ModuleDependency {
 		const refs = [];
 		for (const referencedExport of this.referencedExports) {
 			if (referencedExport[0] === "default") {
-				const selfModule = moduleGraph.getParentModule(this);
+				const selfModule =
+					/** @type {Module} */
+					(moduleGraph.getParentModule(this));
 				const importedModule =
 					/** @type {Module} */
 					(moduleGraph.getModule(this));
@@ -82,6 +87,7 @@ class ImportDependency extends ModuleDependency {
 	serialize(context) {
 		context.write(this.range);
 		context.write(this.referencedExports);
+		context.write(this.assertions);
 		super.serialize(context);
 	}
 
@@ -91,6 +97,7 @@ class ImportDependency extends ModuleDependency {
 	deserialize(context) {
 		this.range = context.read();
 		this.referencedExports = context.read();
+		this.assertions = context.read();
 		super.deserialize(context);
 	}
 }

package/lib/dependencies/ImportEagerDependency.js

@@ -15,6 +15,7 @@ const ImportDependency = require("./ImportDependency");
 /** @typedef {import("../Module")} Module */
 /** @typedef {import("../Module").BuildMeta} BuildMeta */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
+/** @typedef {import("../javascript/JavascriptParser").Attributes} Attributes */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
 
 class ImportEagerDependency extends ImportDependency {
@@ -22,9 +23,10 @@ class ImportEagerDependency extends ImportDependency {
 	 * @param {string} request the request
 	 * @param {Range} range expression range
 	 * @param {(string[][] | null)=} referencedExports list of referenced exports
+	 * @param {Attributes=} attributes assertions
 	 */
-	constructor(request, range, referencedExports) {
-		super(request, range, referencedExports);
+	constructor(request, range, referencedExports, attributes) {
+		super(request, range, referencedExports, attributes);
 	}
 
 	get type() {

package/lib/dependencies/ImportMetaContextDependency.js

@@ -9,7 +9,14 @@ const makeSerializable = require("../util/makeSerializable");
 const ContextDependency = require("./ContextDependency");
 const ModuleDependencyTemplateAsRequireId = require("./ModuleDependencyTemplateAsRequireId");
 
+/** @typedef {import("../javascript/JavascriptParser").Range} Range */
+/** @typedef {import("./ContextDependency").ContextDependencyOptions} ContextDependencyOptions */
+
 class ImportMetaContextDependency extends ContextDependency {
+	/**
+	 * @param {ContextDependencyOptions} options options
+	 * @param {Range} range range
+	 */
 	constructor(options, range) {
 		super(options);
 

package/lib/dependencies/ImportMetaContextDependencyParserPlugin.js

@@ -16,8 +16,11 @@ const ImportMetaContextDependency = require("./ImportMetaContextDependency");
 /** @typedef {import("estree").Property} Property */
 /** @typedef {import("estree").SourceLocation} SourceLocation */
 /** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
+/** @typedef {import("../javascript/JavascriptParser").Range} Range */
 /** @typedef {import("../ContextModule").ContextModuleOptions} ContextModuleOptions */
 /** @typedef {import("../ChunkGroup").RawChunkGroupOptions} RawChunkGroupOptions */
+/** @typedef {import("../Dependency").DependencyLocation} DependencyLocation */
+/** @typedef {import("../javascript/BasicEvaluatedExpression")} BasicEvaluatedExpression */
 /** @typedef {Pick<ContextModuleOptions, 'mode'|'recursive'|'regExp'|'include'|'exclude'|'chunkName'>&{groupOptions: RawChunkGroupOptions, exports?: ContextModuleOptions["referencedExports"]}} ImportMetaContextOptions */
 
 /**
@@ -36,7 +39,7 @@ function createPropertyParseError(prop, expect) {
 
 /**
  * @param {string} msg message
- * @param {SourceLocation} loc location
+ * @param {DependencyLocation} loc location
  * @returns {WebpackError} error
  */
 function createError(msg, loc) {
@@ -72,7 +75,7 @@ module.exports = class ImportMetaContextDependencyParserPlugin {
 					/** @type {Expression} */ (directoryNode)
 				);
 				if (!requestExpr.isString()) return;
-				const request = requestExpr.string;
+				const request = /** @type {string} */ (requestExpr.string);
 				const errors = [];
 				let regExp = /^\.\/.*$/;
 				let recursive = true;
@@ -95,7 +98,7 @@ module.exports = class ImportMetaContextDependencyParserPlugin {
 							errors.push(
 								createError(
 									"Parsing import.meta.webpackContext options failed.",
-									optionsNode.loc
+									/** @type {DependencyLocation} */ (optionsNode.loc)
 								)
 							);
 							break;
@@ -108,7 +111,7 @@ module.exports = class ImportMetaContextDependencyParserPlugin {
 								if (!regExpExpr.isRegExp()) {
 									errors.push(createPropertyParseError(prop, "RegExp"));
 								} else {
-									regExp = regExpExpr.regExp;
+									regExp = /** @type {RegExp} */ (regExpExpr.regExp);
 								}
 								break;
 							}
@@ -163,21 +166,27 @@ module.exports = class ImportMetaContextDependencyParserPlugin {
 									/** @type {Expression} */ (prop.value)
 								);
 								if (expr.isString()) {
-									exports = [[expr.string]];
+									exports = [[/** @type {string} */ (expr.string)]];
 								} else if (expr.isArray()) {
-									const items = expr.items;
+									const items =
+										/** @type {BasicEvaluatedExpression[]} */
+										(expr.items);
 									if (
 										items.every(i => {
 											if (!i.isArray()) return false;
-											const innerItems = i.items;
+											const innerItems =
+												/** @type {BasicEvaluatedExpression[]} */ (i.items);
 											return innerItems.every(i => i.isString());
 										})
 									) {
 										exports = [];
 										for (const i1 of items) {
+											/** @type {string[]} */
 											const export_ = [];
-											for (const i2 of i1.items) {
-												export_.push(i2.string);
+											for (const i2 of /** @type {BasicEvaluatedExpression[]} */ (
+												i1.items
+											)) {
+												export_.push(/** @type {string} */ (i2.string));
 											}
 											exports.push(export_);
 										}
@@ -225,7 +234,9 @@ module.exports = class ImportMetaContextDependencyParserPlugin {
 								);
 								if (
 									expr.isString() &&
-									["high", "low", "auto"].includes(expr.string)
+									["high", "low", "auto"].includes(
+										/** @type {string} */ (expr.string)
+									)
 								) {
 									groupOptions.fetchPriority =
 										/** @type {RawChunkGroupOptions["fetchPriority"]} */ (
@@ -245,7 +256,7 @@ module.exports = class ImportMetaContextDependencyParserPlugin {
 								if (!recursiveExpr.isBoolean()) {
 									errors.push(createPropertyParseError(prop, "boolean"));
 								} else {
-									recursive = recursiveExpr.bool;
+									recursive = /** @type {boolean} */ (recursiveExpr.bool);
 								}
 								break;
 							}
@@ -255,7 +266,7 @@ module.exports = class ImportMetaContextDependencyParserPlugin {
 										`Parsing import.meta.webpackContext options failed. Unknown property ${JSON.stringify(
 											prop.key.name
 										)}.`,
-										optionsNode.loc
+										/** @type {DependencyLocation} */ (optionsNode.loc)
 									)
 								);
 						}
@@ -279,9 +290,9 @@ module.exports = class ImportMetaContextDependencyParserPlugin {
 						mode,
 						category: "esm"
 					},
-					expr.range
+					/** @type {Range} */ (expr.range)
 				);
-				dep.loc = expr.loc;
+				dep.loc = /** @type {DependencyLocation} */ (expr.loc);
 				dep.optional = !!parser.scope.inTry;
 				parser.state.current.addDependency(dep);
 				return true;

package/lib/dependencies/ImportParserPlugin.js

@@ -9,11 +9,13 @@ const AsyncDependenciesBlock = require("../AsyncDependenciesBlock");
 const CommentCompilationWarning = require("../CommentCompilationWarning");
 const UnsupportedFeatureWarning = require("../UnsupportedFeatureWarning");
 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 */
@@ -258,18 +260,22 @@ class ImportParserPlugin {
 			}
 
 			if (param.isString()) {
+				const attributes = getAttributes(expr);
+
 				if (mode === "eager") {
 					const dep = new ImportEagerDependency(
 						/** @type {string} */ (param.string),
 						/** @type {Range} */ (expr.range),
-						exports
+						exports,
+						attributes
 					);
 					parser.state.current.addDependency(dep);
 				} else if (mode === "weak") {
 					const dep = new ImportWeakDependency(
 						/** @type {string} */ (param.string),
 						/** @type {Range} */ (expr.range),
-						exports
+						exports,
+						attributes
 					);
 					parser.state.current.addDependency(dep);
 				} else {
@@ -284,7 +290,8 @@ class ImportParserPlugin {
 					const dep = new ImportDependency(
 						/** @type {string} */ (param.string),
 						/** @type {Range} */ (expr.range),
-						exports
+						exports,
+						attributes
 					);
 					dep.loc = /** @type {DependencyLocation} */ (expr.loc);
 					dep.optional = !!parser.scope.inTry;
@@ -315,7 +322,8 @@ class ImportParserPlugin {
 							: true,
 						typePrefix: "import()",
 						category: "esm",
-						referencedExports: exports
+						referencedExports: exports,
+						attributes: getAttributes(expr)
 					},
 					parser
 				);

package/lib/dependencies/ImportWeakDependency.js

@@ -15,6 +15,7 @@ const ImportDependency = require("./ImportDependency");
 /** @typedef {import("../Module")} Module */
 /** @typedef {import("../Module").BuildMeta} BuildMeta */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
+/** @typedef {import("../javascript/JavascriptParser").Attributes} Attributes */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
 
 class ImportWeakDependency extends ImportDependency {
@@ -22,9 +23,10 @@ class ImportWeakDependency extends ImportDependency {
 	 * @param {string} request the request
 	 * @param {Range} range expression range
 	 * @param {(string[][] | null)=} referencedExports list of referenced exports
+	 * @param {Attributes=} attributes assertions
 	 */
-	constructor(request, range, referencedExports) {
-		super(request, range, referencedExports);
+	constructor(request, range, referencedExports, attributes) {
+		super(request, range, referencedExports, attributes);
 		this.weak = true;
 	}
 

package/lib/dependencies/LoaderDependency.js

@@ -7,6 +7,7 @@
 
 const ModuleDependency = require("./ModuleDependency");
 
+/** @typedef {import("../Dependency").GetConditionFn} GetConditionFn */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../ModuleGraphConnection")} ModuleGraphConnection */
 /** @typedef {import("../ModuleGraphConnection").ConnectionState} ConnectionState */
@@ -30,7 +31,7 @@ class LoaderDependency extends ModuleDependency {
 
 	/**
 	 * @param {ModuleGraph} moduleGraph module graph
-	 * @returns {null | false | function(ModuleGraphConnection, RuntimeSpec): ConnectionState} function to determine if the connection is active
+	 * @returns {null | false | GetConditionFn} function to determine if the connection is active
 	 */
 	getCondition(moduleGraph) {
 		return false;

package/lib/dependencies/LoaderImportDependency.js

@@ -7,6 +7,7 @@
 
 const ModuleDependency = require("./ModuleDependency");
 
+/** @typedef {import("../Dependency").GetConditionFn} GetConditionFn */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../ModuleGraphConnection")} ModuleGraphConnection */
 /** @typedef {import("../ModuleGraphConnection").ConnectionState} ConnectionState */
@@ -31,7 +32,7 @@ class LoaderImportDependency extends ModuleDependency {
 
 	/**
 	 * @param {ModuleGraph} moduleGraph module graph
-	 * @returns {null | false | function(ModuleGraphConnection, RuntimeSpec): ConnectionState} function to determine if the connection is active
+	 * @returns {null | false | GetConditionFn} function to determine if the connection is active
 	 */
 	getCondition(moduleGraph) {
 		return false;

package/lib/dependencies/ModuleDependency.js

@@ -7,15 +7,14 @@
 
 const Dependency = require("../Dependency");
 const DependencyTemplate = require("../DependencyTemplate");
-const memoize = require("../util/memoize");
+const RawModule = require("../RawModule");
 
 /** @typedef {import("../Dependency").TRANSITIVE} TRANSITIVE */
 /** @typedef {import("../Module")} Module */
+/** @typedef {import("../javascript/JavascriptParser").Attributes} Attributes */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 
-const getRawModule = memoize(() => require("../RawModule"));
-
 class ModuleDependency extends Dependency {
 	/**
 	 * @param {string} request request path which needs resolving
@@ -25,8 +24,9 @@ class ModuleDependency extends Dependency {
 		this.request = request;
 		this.userRequest = request;
 		this.range = undefined;
+		// TODO move it to subclasses and rename
 		// assertions must be serialized by subclasses that use it
-		/** @type {Record<string, any> | undefined} */
+		/** @type {Attributes | undefined} */
 		this.assertions = undefined;
 		this._context = undefined;
 	}
@@ -61,7 +61,6 @@ class ModuleDependency extends Dependency {
 	 * @returns {Module | null} a module
 	 */
 	createIgnoredModule(context) {
-		const RawModule = getRawModule();
 		return new RawModule(
 			"/* (ignored) */",
 			`ignored|${context}|${this.request}`,