webpack 5.101.2 → 5.102.0

package/lib/dependencies/HarmonyDetectionParserPlugin.js

@@ -13,19 +13,10 @@ const HarmonyExports = require("./HarmonyExports");
 
 /** @typedef {import("../Module").BuildMeta} BuildMeta */
 /** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
-/** @typedef {import("./HarmonyModulesPlugin").HarmonyModulesPluginOptions} HarmonyModulesPluginOptions */
 
 const PLUGIN_NAME = "HarmonyDetectionParserPlugin";
 
 module.exports = class HarmonyDetectionParserPlugin {
-	/**
-	 * @param {HarmonyModulesPluginOptions} options options
-	 */
-	constructor(options) {
-		const { topLevelAwait = false } = options || {};
-		this.topLevelAwait = topLevelAwait;
-	}
-
 	/**
 	 * @param {JavascriptParser} parser the parser
 	 * @returns {void}
@@ -66,11 +57,6 @@ module.exports = class HarmonyDetectionParserPlugin {
 
 		parser.hooks.topLevelAwait.tap(PLUGIN_NAME, () => {
 			const module = parser.state.module;
-			if (!this.topLevelAwait) {
-				throw new Error(
-					"The top-level-await experiment is not enabled (set experiments.topLevelAwait: true to enable it)"
-				);
-			}
 			if (!HarmonyExports.isEnabled(parser.state)) {
 				throw new Error(
 					"Top-level-await is only supported in EcmaScript Modules"

package/lib/dependencies/HarmonyEvaluatedImportSpecifierDependency.js

@@ -9,7 +9,6 @@ const makeSerializable = require("../util/makeSerializable");
 const HarmonyImportSpecifierDependency = require("./HarmonyImportSpecifierDependency");
 
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
-/** @typedef {import("../ChunkGraph")} ChunkGraph */
 /** @typedef {import("../Dependency")} Dependency */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../Module").BuildMeta} BuildMeta */
@@ -18,6 +17,7 @@ const HarmonyImportSpecifierDependency = require("./HarmonyImportSpecifierDepend
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @typedef {import("./HarmonyImportDependency").Ids} Ids */
 
 /**
  * Dependency for static evaluating import specifier. e.g.
@@ -30,10 +30,10 @@ class HarmonyEvaluatedImportSpecifierDependency extends HarmonyImportSpecifierDe
 	/**
 	 * @param {string} request the request string
 	 * @param {number} sourceOrder source order
-	 * @param {string[]} ids ids
+	 * @param {Ids} ids ids
 	 * @param {string} name name
 	 * @param {Range} range location in source code
-	 * @param {ImportAttributes} attributes import assertions
+	 * @param {ImportAttributes | undefined} attributes import assertions
 	 * @param {string} operator operator
 	 */
 	constructor(request, sourceOrder, ids, name, range, attributes, operator) {

package/lib/dependencies/HarmonyExportDependencyParserPlugin.js

@@ -25,6 +25,7 @@ const HarmonyImportSideEffectDependency = require("./HarmonyImportSideEffectDepe
 /** @typedef {import("../javascript/JavascriptParser").ClassDeclaration} ClassDeclaration */
 /** @typedef {import("../javascript/JavascriptParser").FunctionDeclaration} FunctionDeclaration */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
+/** @typedef {import("./HarmonyImportDependencyParserPlugin").HarmonySettings} HarmonySettings */
 
 const { HarmonyStarExportsList } = HarmonyExportImportedSpecifierDependency;
 
@@ -156,7 +157,9 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 		parser.hooks.exportSpecifier.tap(
 			PLUGIN_NAME,
 			(statement, id, name, idx) => {
-				const settings = parser.getTagData(id, harmonySpecifierTag);
+				const settings =
+					/** @type {HarmonySettings} */
+					(parser.getTagData(id, harmonySpecifierTag));
 				const harmonyNamedExports = (parser.state.harmonyNamedExports =
 					parser.state.harmonyNamedExports || new Set());
 				harmonyNamedExports.add(name);

package/lib/dependencies/HarmonyExportImportedSpecifierDependency.js

@@ -33,17 +33,19 @@ const processExportInfo = require("./processExportInfo");
 /** @typedef {import("../ChunkGraph")} ChunkGraph */
 /** @typedef {import("../Dependency").ExportsSpec} ExportsSpec */
 /** @typedef {import("../Dependency").GetConditionFn} GetConditionFn */
-/** @typedef {import("../Dependency").ReferencedExport} ReferencedExport */
+/** @typedef {import("../Dependency").RawReferencedExports} RawReferencedExports */
+/** @typedef {import("../Dependency").ReferencedExports} ReferencedExports */
 /** @typedef {import("../Dependency").TRANSITIVE} TRANSITIVE */
-/** @typedef {import("../Dependency").UpdateHashContext} UpdateHashContext */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../ExportsInfo")} ExportsInfo */
 /** @typedef {import("../ExportsInfo").ExportInfo} ExportInfo */
+/** @typedef {import("../ExportsInfo").ExportInfoName} ExportInfoName */
 /** @typedef {import("../ExportsInfo").UsedName} UsedName */
 /** @typedef {import("../Generator").GenerateContext} GenerateContext */
 /** @typedef {import("../Module")} Module */
 /** @typedef {import("../Module").BuildMeta} BuildMeta */
 /** @typedef {import("../Module").RuntimeRequirements} RuntimeRequirements */
+/** @typedef {import("../Module").ExportsType} ExportsType */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../ModuleGraphConnection")} ModuleGraphConnection */
 /** @typedef {import("../ModuleGraphConnection").ConnectionState} ConnectionState */
@@ -52,10 +54,9 @@ const processExportInfo = require("./processExportInfo");
 /** @typedef {import("../javascript/JavascriptParser").ImportAttributes} ImportAttributes */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
-/** @typedef {import("../util/Hash")} Hash */
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
+/** @typedef {import("./HarmonyImportDependency").Ids} Ids */
 /** @typedef {import("./HarmonyImportDependency").ExportPresenceMode} ExportPresenceMode */
-/** @typedef {import("./processExportInfo").ReferencedExports} ReferencedExports */
 
 /** @typedef {"missing"|"unused"|"empty-star"|"reexport-dynamic-default"|"reexport-named-default"|"reexport-namespace-object"|"reexport-fake-namespace-object"|"reexport-undefined"|"normal-reexport"|"dynamic-reexport"} ExportModeType */
 
@@ -66,7 +67,7 @@ const idsSymbol = Symbol("HarmonyExportImportedSpecifierDependency.ids");
 class NormalReexportItem {
 	/**
 	 * @param {string} name export name
-	 * @param {string[]} ids reexported ids from other module
+	 * @param {Ids} ids reexported ids from other module
 	 * @param {ExportInfo} exportInfo export info from other module
 	 * @param {boolean} checked true, if it should be checked at runtime if this export exists
 	 * @param {boolean} hidden true, if it is hidden behind another active export in the same module
@@ -119,23 +120,22 @@ class ExportMode {
 	}
 }
 
-/** @typedef {string[]} Names */
 /** @typedef {number[]} DependencyIndices */
 
 /**
  * @param {ModuleGraph} moduleGraph module graph
- * @param {ReadonlyArray<HarmonyExportImportedSpecifierDependency>} dependencies dependencies
- * @param {TODO=} additionalDependency additional dependency
- * @returns {{ names: Names, dependencyIndices: DependencyIndices }} result
+ * @param {HarmonyExportImportedSpecifierDependency[]} dependencies dependencies
+ * @param {HarmonyExportImportedSpecifierDependency=} additionalDependency additional dependency
+ * @returns {{ names: ExportInfoName[], dependencyIndices: DependencyIndices }} result
  */
 const determineExportAssignments = (
 	moduleGraph,
 	dependencies,
 	additionalDependency
 ) => {
-	/** @type {Set<string>} */
+	/** @type {Set<ExportInfoName>} */
 	const names = new Set();
-	/** @type {number[]} */
+	/** @type {DependencyIndices} */
 	const dependencyIndices = [];
 
 	if (additionalDependency) {
@@ -167,7 +167,7 @@ const determineExportAssignments = (
 
 /**
  * @param {object} options options
- * @param {Names} options.names names
+ * @param {ExportInfoName[]} options.names names
  * @param {DependencyIndices} options.dependencyIndices dependency indices
  * @param {string} name name
  * @param {ReadonlyArray<HarmonyExportImportedSpecifierDependency>} dependencies dependencies
@@ -339,7 +339,7 @@ const getMode = (moduleGraph, dep, runtimeKey) => {
 				exportName,
 				[exportName],
 				exportsInfo.getReadOnlyExportInfo(exportName),
-				/** @type {Set<string>} */
+				/** @type {Checked} */
 				(checked).has(exportName),
 				false
 			)
@@ -361,7 +361,6 @@ const getMode = (moduleGraph, dep, runtimeKey) => {
 	return mode;
 };
 
-/** @typedef {string[]} Ids */
 /** @typedef {Set<string>} Exports */
 /** @typedef {Set<string>} Checked */
 /** @typedef {Set<string>} Hidden */
@@ -515,7 +514,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 					importedExportsInfo.getReadOnlyExportInfo(name);
 				if (importedExportInfo.provided === false) continue;
 				if (hiddenExports !== undefined && hiddenExports.has(name)) {
-					/** @type {Set<string>} */
+					/** @type {Hidden} */
 					(hidden).add(name);
 					continue;
 				}
@@ -567,7 +566,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 	 * 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) {
 		const mode = this.getMode(moduleGraph, runtime);
@@ -586,7 +585,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 				if (!mode.partialNamespaceExportInfo) {
 					return Dependency.EXPORTS_OBJECT_REFERENCED;
 				}
-				/** @type {ReferencedExports} */
+				/** @type {RawReferencedExports} */
 				const referencedExports = [];
 				processExportInfo(
 					runtime,
@@ -602,7 +601,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 				if (!mode.partialNamespaceExportInfo) {
 					return Dependency.EXPORTS_OBJECT_REFERENCED;
 				}
-				/** @type {ReferencedExports} */
+				/** @type {RawReferencedExports} */
 				const referencedExports = [];
 				processExportInfo(
 					runtime,
@@ -618,7 +617,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 				return Dependency.EXPORTS_OBJECT_REFERENCED;
 
 			case "normal-reexport": {
-				/** @type {ReferencedExports} */
+				/** @type {RawReferencedExports} */
 				const referencedExports = [];
 				for (const {
 					ids,
@@ -638,7 +637,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 
 	/**
 	 * @param {ModuleGraph} moduleGraph the module graph
-	 * @returns {{ names: Names, namesSlice: number, dependencyIndices: DependencyIndices, dependencyIndex: number } | undefined} exported names and their origin dependency
+	 * @returns {{ names: ExportInfoName[], namesSlice: number, dependencyIndices: DependencyIndices, dependencyIndex: number } | undefined} exported names and their origin dependency
 	 */
 	_discoverActiveExportsFromOtherStarExports(moduleGraph) {
 		if (!this.otherStarExports) return;
@@ -880,7 +879,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 				const importedModule = moduleGraph.getModule(this);
 				if (importedModule) {
 					const exportsInfo = moduleGraph.getExportsInfo(importedModule);
-					/** @type {Map<string, string[]>} */
+					/** @type {Map<string, ExportInfoName[]>} */
 					const conflicts = new Map();
 					for (const exportInfo of exportsInfo.orderedExports) {
 						if (exportInfo.provided !== true) continue;
@@ -980,8 +979,6 @@ makeSerializable(
 	"webpack/lib/dependencies/HarmonyExportImportedSpecifierDependency"
 );
 
-module.exports = HarmonyExportImportedSpecifierDependency;
-
 HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedSpecifierDependencyTemplate extends (
 	HarmonyImportDependency.Template
 ) {
@@ -1233,14 +1230,9 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 							mode.hidden
 						)
 					: /** @type {ExportModeIgnored} */ (mode.ignored);
-				const modern =
-					runtimeTemplate.supportsConst() &&
-					runtimeTemplate.supportsArrowFunction();
 				let content =
 					"/* harmony reexport (unknown) */ var __WEBPACK_REEXPORT_OBJECT__ = {};\n" +
-					`/* harmony reexport (unknown) */ for(${
-						modern ? "const" : "var"
-					} __WEBPACK_IMPORT_KEY__ in ${importVar}) `;
+					`/* harmony reexport (unknown) */ for(${runtimeTemplate.renderConst()} __WEBPACK_IMPORT_KEY__ in ${importVar}) `;
 
 				// Filter out exports which are defined by other exports
 				// and filter out default export because it cannot be reexported with *
@@ -1255,7 +1247,7 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 				}
 
 				content += "__WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = ";
-				content += modern
+				content += runtimeTemplate.supportsArrowFunction()
 					? `() => ${importVar}[__WEBPACK_IMPORT_KEY__]`
 					: `function(key) { return ${importVar}[key]; }.bind(0, __WEBPACK_IMPORT_KEY__)`;
 
@@ -1285,7 +1277,7 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 	 * @param {string} comment comment
 	 * @param {UsedName} key key
 	 * @param {string} name name
-	 * @param {string | string[] | null | false} valueKey value key
+	 * @param {UsedName | null} valueKey value key
 	 * @param {RuntimeRequirements} runtimeRequirements runtime requirements
 	 * @returns {HarmonyExportInitFragment} harmony export init fragment
 	 */
@@ -1310,7 +1302,7 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 
 	/**
 	 * @param {Module} module module
-	 * @param {string | string[] | false} key key
+	 * @param {UsedName} key key
 	 * @param {string} name name
 	 * @param {number} fakeType fake type
 	 * @param {RuntimeRequirements} runtimeRequirements runtime requirements
@@ -1349,10 +1341,10 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 	/**
 	 * @param {Module} module module
 	 * @param {ChunkGraph} chunkGraph chunkGraph
-	 * @param {string | false | string[]} key key
+	 * @param {UsedName} key key
 	 * @param {string} name name
-	 * @param {import("../Module").ExportsType} exportsType exportsType
-	 * @param {Set<string>} runtimeRequirements runtimeRequirements
+	 * @param {ExportsType} exportsType exportsType
+	 * @param {RuntimeRequirements} runtimeRequirements runtimeRequirements
 	 * @returns {InitFragment<GenerateContext>[]} fragments
 	 */
 	getReexportDeferredNamespaceObjectFragments(
@@ -1484,4 +1476,6 @@ makeSerializable(
 	"HarmonyStarExportsList"
 );
 
+module.exports = HarmonyExportImportedSpecifierDependency;
 module.exports.HarmonyStarExportsList = HarmonyStarExportsList;
+module.exports.idsSymbol = idsSymbol;

package/lib/dependencies/HarmonyImportDependency.js

@@ -15,21 +15,16 @@ const { filterRuntime, mergeRuntime } = require("../util/runtime");
 const ModuleDependency = require("./ModuleDependency");
 
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
-/** @typedef {import("webpack-sources").Source} Source */
-/** @typedef {import("../ChunkGraph")} ChunkGraph */
-/** @typedef {import("../Dependency").ReferencedExport} ReferencedExport */
-/** @typedef {import("../Dependency").UpdateHashContext} UpdateHashContext */
+/** @typedef {import("../Dependency").ReferencedExports} ReferencedExports */
 /** @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").ImportAttributes} ImportAttributes */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
-/** @typedef {import("../util/Hash")} Hash */
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
 
 /** @typedef {0 | 1 | 2 | 3 | false} ExportPresenceMode */
@@ -59,6 +54,8 @@ const ExportPresenceModes = {
 	}
 };
 
+/** @typedef {string[]} Ids */
+
 class HarmonyImportDependency extends ModuleDependency {
 	/**
 	 * @param {string} request request string
@@ -69,7 +66,7 @@ class HarmonyImportDependency extends ModuleDependency {
 	constructor(request, sourceOrder, attributes, defer) {
 		super(request);
 		this.sourceOrder = sourceOrder;
-		this.assertions = attributes;
+		this.attributes = attributes;
 		this.defer = defer;
 	}
 
@@ -77,11 +74,22 @@ class HarmonyImportDependency extends ModuleDependency {
 		return "esm";
 	}
 
+	/**
+	 * @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) {
 		return Dependency.NO_EXPORTS_REFERENCED;
@@ -98,17 +106,23 @@ class HarmonyImportDependency extends ModuleDependency {
 
 		const metaKey = defer ? "deferredImportVarMap" : "importVarMap";
 		let importVarMap = meta[metaKey];
-		if (!importVarMap) meta[metaKey] = importVarMap = new Map();
+		if (!importVarMap) {
+			meta[metaKey] = importVarMap =
+				/** @type {Map<Module, string>} */
+				(new Map());
+		}
 
 		let importVar = importVarMap.get(
-			/** @type {Module} */ (moduleGraph.getModule(this))
+			/** @type {Module} */
+			(moduleGraph.getModule(this))
 		);
 		if (importVar) return importVar;
 		importVar = `${Template.toIdentifier(
 			`${this.userRequest}`
 		)}__WEBPACK_${this.defer ? "DEFERRED_" : ""}IMPORTED_MODULE_${importVarMap.size}__`;
 		importVarMap.set(
-			/** @type {Module} */ (moduleGraph.getModule(this)),
+			/** @type {Module} */
+			(moduleGraph.getModule(this)),
 			importVar
 		);
 		return importVar;
@@ -156,7 +170,7 @@ class HarmonyImportDependency extends ModuleDependency {
 
 	/**
 	 * @param {ModuleGraph} moduleGraph module graph
-	 * @param {string[]} ids imported ids
+	 * @param {Ids} ids imported ids
 	 * @param {string} additionalMessage extra info included in the error message
 	 * @returns {WebpackError[] | undefined} errors
 	 */
@@ -273,7 +287,8 @@ class HarmonyImportDependency extends ModuleDependency {
 	serialize(context) {
 		const { write } = context;
 		write(this.sourceOrder);
-		write(this.assertions);
+		write(this.attributes);
+		write(this.defer);
 		super.serialize(context);
 	}
 
@@ -283,7 +298,8 @@ class HarmonyImportDependency extends ModuleDependency {
 	deserialize(context) {
 		const { read } = context;
 		this.sourceOrder = read();
-		this.assertions = read();
+		this.attributes = read();
+		this.defer = read();
 		super.deserialize(context);
 	}
 }

package/lib/dependencies/HarmonyImportDependencyParserPlugin.js

@@ -8,7 +8,10 @@
 const CommentCompilationWarning = require("../CommentCompilationWarning");
 const HotModuleReplacementPlugin = require("../HotModuleReplacementPlugin");
 const WebpackError = require("../WebpackError");
-const { getImportAttributes } = require("../javascript/JavascriptParser");
+const {
+	VariableInfo,
+	getImportAttributes
+} = require("../javascript/JavascriptParser");
 const InnerGraph = require("../optimize/InnerGraph");
 const ConstDependency = require("./ConstDependency");
 const HarmonyAcceptDependency = require("./HarmonyAcceptDependency");
@@ -21,31 +24,24 @@ const HarmonyImportSpecifierDependency = require("./HarmonyImportSpecifierDepend
 
 /** @typedef {import("estree").Expression} Expression */
 /** @typedef {import("estree").Identifier} Identifier */
-/** @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 */
 /** @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("../javascript/JavascriptParser").TagData} TagData */
-/** @typedef {import("../optimize/InnerGraph").InnerGraph} InnerGraph */
-/** @typedef {import("../optimize/InnerGraph").TopLevelSymbol} TopLevelSymbol */
-/** @typedef {import("./HarmonyImportDependency")} HarmonyImportDependency */
+/** @typedef {import("../javascript/JavascriptParser").Members} Members */
+/** @typedef {import("../javascript/JavascriptParser").MembersOptionals} MembersOptionals */
+/** @typedef {import("./HarmonyImportDependency").Ids} Ids */
 
 const harmonySpecifierTag = Symbol("harmony import");
 
 /**
  * @typedef {object} HarmonySettings
- * @property {string[]} ids
+ * @property {Ids} ids
  * @property {string} source
  * @property {number} sourceOrder
  * @property {string} name
@@ -81,9 +77,9 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 		const { exportPresenceMode } = this;
 
 		/**
-		 * @param {string[]} members members
-		 * @param {boolean[]} membersOptionals members Optionals
-		 * @returns {string[]} a non optional part
+		 * @param {Members} members members
+		 * @param {MembersOptionals} membersOptionals members Optionals
+		 * @returns {Ids} a non optional part
 		 */
 		function getNonOptionalPart(members, membersOptionals) {
 			let i = 0;
@@ -155,14 +151,18 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 				const defer = this.deferImport
 					? getImportMode(parser, statement).defer
 					: false;
-				parser.tagVariable(name, harmonySpecifierTag, {
+				parser.tagVariable(
 					name,
-					source,
-					ids,
-					sourceOrder: parser.state.lastHarmonyImportOrder,
-					attributes: getImportAttributes(statement),
-					defer
-				});
+					harmonySpecifierTag,
+					/** @type {HarmonySettings} */ ({
+						name,
+						source,
+						ids,
+						sourceOrder: parser.state.lastHarmonyImportOrder,
+						attributes: getImportAttributes(statement),
+						defer
+					})
+				);
 				return true;
 			}
 		);
@@ -188,10 +188,10 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 				return;
 			}
 			const settings =
-				/** @type {TagData} */
+				/** @type {HarmonySettings} */
 				(rootInfo.tagInfo.data);
 			const members =
-				/** @type {(() => string[])} */
+				/** @type {(() => Members)} */
 				(rightPart.getMembers)();
 			const dep = new HarmonyEvaluatedImportSpecifierDependency(
 				settings.source,
@@ -211,6 +211,20 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 			InnerGraph.onUsage(parser.state, (e) => (dep.usedByExports = e));
 			return true;
 		});
+		parser.hooks.collectDestructuringAssignmentProperties.tap(
+			PLUGIN_NAME,
+			(expr) => {
+				const nameInfo = parser.getNameForExpression(expr);
+				if (
+					nameInfo &&
+					nameInfo.rootInfo instanceof VariableInfo &&
+					nameInfo.rootInfo.name &&
+					parser.getTagData(nameInfo.rootInfo.name, harmonySpecifierTag)
+				) {
+					return true;
+				}
+			}
+		);
 		parser.hooks.expression
 			.for(harmonySpecifierTag)
 			.tap(PLUGIN_NAME, (expr) => {

package/lib/dependencies/HarmonyImportSideEffectDependency.js

@@ -14,12 +14,8 @@ const HarmonyImportDependency = require("./HarmonyImportDependency");
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../Module")} Module */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
-/** @typedef {import("../ModuleGraphConnection")} ModuleGraphConnection */
 /** @typedef {import("../ModuleGraphConnection").ConnectionState} ConnectionState */
-/** @typedef {import("../WebpackError")} WebpackError */
 /** @typedef {import("../javascript/JavascriptParser").ImportAttributes} ImportAttributes */
-/** @typedef {import("../util/Hash")} Hash */
-/** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
 
 class HarmonyImportSideEffectDependency extends HarmonyImportDependency {
 	/**