webpack 5.101.3 → 5.102.0

package/lib/dependencies/HarmonyImportSpecifierDependency.js

@@ -13,29 +13,29 @@ const {
 const { getTrimmedIdsAndRange } = require("../util/chainedImports");
 const makeSerializable = require("../util/makeSerializable");
 const propertyAccess = require("../util/propertyAccess");
+const traverseDestructuringAssignmentProperties = require("../util/traverseDestructuringAssignmentProperties");
 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("../Dependency").RawReferencedExports} RawReferencedExports */
+/** @typedef {import("../Dependency").ReferencedExports} ReferencedExports */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../Module")} Module */
 /** @typedef {import("../Module").BuildMeta} BuildMeta */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
-/** @typedef {import("../ModuleGraphConnection")} ModuleGraphConnection */
 /** @typedef {import("../ModuleGraphConnection").ConnectionState} ConnectionState */
 /** @typedef {import("../WebpackError")} WebpackError */
-/** @typedef {import("../javascript/JavascriptParser").DestructuringAssignmentProperty} DestructuringAssignmentProperty */
+/** @typedef {import("../javascript/JavascriptParser").DestructuringAssignmentProperties} DestructuringAssignmentProperties */
 /** @typedef {import("../javascript/JavascriptParser").ImportAttributes} ImportAttributes */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
+/** @typedef {import("../optimize/InnerGraph").UsedByExports} UsedByExports */
 /** @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("../util/chainedImports").IdRanges} IdRanges */
 /** @typedef {import("./HarmonyImportDependency").ExportPresenceMode} ExportPresenceMode */
+/** @typedef {HarmonyImportDependency.Ids} Ids */
 
 const idsSymbol = Symbol("HarmonyImportSpecifierDependency.ids");
 
@@ -45,12 +45,12 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 	/**
 	 * @param {string} request request
 	 * @param {number} sourceOrder source order
-	 * @param {string[]} ids ids
+	 * @param {Ids} ids ids
 	 * @param {string} name name
 	 * @param {Range} range range
 	 * @param {ExportPresenceMode} exportPresenceMode export presence mode
 	 * @param {ImportAttributes | undefined} attributes import attributes
-	 * @param {Range[] | undefined} idRanges ranges for members of ids; the two arrays are right-aligned
+	 * @param {IdRanges | undefined} idRanges ranges for members of ids; the two arrays are right-aligned
 	 * @param {boolean=} defer is defer phase
 	 */
 	constructor(
@@ -75,9 +75,9 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 		this.directImport = undefined;
 		this.shorthand = undefined;
 		this.asiSafe = undefined;
-		/** @type {Set<string> | boolean | undefined} */
+		/** @type {UsedByExports | undefined} */
 		this.usedByExports = undefined;
-		/** @type {Set<DestructuringAssignmentProperty> | undefined} */
+		/** @type {DestructuringAssignmentProperties | undefined} */
 		this.referencedPropertiesInDestructuring = undefined;
 	}
 
@@ -102,7 +102,7 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 
 	/**
 	 * @param {ModuleGraph} moduleGraph the module graph
-	 * @returns {string[]} the imported ids
+	 * @returns {Ids} the imported ids
 	 */
 	getIds(moduleGraph) {
 		const meta = moduleGraph.getMetaIfExisting(this);
@@ -113,7 +113,7 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 
 	/**
 	 * @param {ModuleGraph} moduleGraph the module graph
-	 * @param {string[]} ids the imported ids
+	 * @param {Ids} ids the imported ids
 	 * @returns {void}
 	 */
 	setIds(moduleGraph, ids) {
@@ -144,7 +144,7 @@ class HarmonyImportSpecifierDependency 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) {
 		let ids = this.getIds(moduleGraph);
@@ -190,15 +190,21 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 	}
 
 	/**
-	 * @param {string[]=} ids ids
-	 * @returns {string[][]} referenced exports
+	 * @param {Ids=} ids ids
+	 * @returns {RawReferencedExports} referenced exports
 	 */
 	_getReferencedExportsInDestructuring(ids) {
 		if (this.referencedPropertiesInDestructuring) {
-			/** @type {string[][]} */
+			/** @type {RawReferencedExports} */
+			const refsInDestructuring = [];
+			traverseDestructuringAssignmentProperties(
+				this.referencedPropertiesInDestructuring,
+				(stack) => refsInDestructuring.push(stack.map((p) => p.id))
+			);
+			/** @type {RawReferencedExports} */
 			const refs = [];
-			for (const { id } of this.referencedPropertiesInDestructuring) {
-				refs.push(ids ? [...ids, id] : [id]);
+			for (const idsInDestructuring of refsInDestructuring) {
+				refs.push(ids ? [...ids, ...idsInDestructuring] : idsInDestructuring);
 			}
 			return refs;
 		}
@@ -375,13 +381,23 @@ HarmonyImportSpecifierDependency.Template = class HarmonyImportSpecifierDependen
 				}
 			}
 
-			for (const {
-				id,
-				shorthand,
-				range
-			} of dep.referencedPropertiesInDestructuring) {
-				/** @type {string[]} */
-				const concatedIds = [...prefixedIds, id];
+			/** @type {{ ids: Ids, range: Range, shorthand: boolean | string }[]} */
+			const replacementsInDestructuring = [];
+			traverseDestructuringAssignmentProperties(
+				dep.referencedPropertiesInDestructuring,
+				undefined,
+				(stack) => {
+					const property = stack[stack.length - 1];
+					replacementsInDestructuring.push({
+						ids: stack.map((p) => p.id),
+						range: property.range,
+						shorthand: property.shorthand
+					});
+				}
+			);
+			for (const { ids, shorthand, range } of replacementsInDestructuring) {
+				/** @type {Ids} */
+				const concatedIds = [...prefixedIds, ...ids];
 				const module = /** @type {Module} */ (moduleGraph.getModule(dep));
 				const used = moduleGraph
 					.getExportsInfo(module)
@@ -394,10 +410,8 @@ HarmonyImportSpecifierDependency.Template = class HarmonyImportSpecifierDependen
 				const comment = `${Template.toNormalComment(name)} `;
 				const key = comment + JSON.stringify(newName);
 				source.replace(
-					/** @type {Range} */
-					(range)[0],
-					/** @type {Range} */
-					(range)[1] - 1,
+					range[0],
+					range[1] - 1,
 					shorthand ? `${key}: ${name}` : `${key}`
 				);
 			}
@@ -408,7 +422,7 @@ HarmonyImportSpecifierDependency.Template = class HarmonyImportSpecifierDependen
 	 * @param {HarmonyImportSpecifierDependency} dep dependency
 	 * @param {ReplaceSource} source source
 	 * @param {DependencyTemplateContext} templateContext context
-	 * @param {string[]} ids ids
+	 * @param {Ids} ids ids
 	 * @returns {string} generated code
 	 */
 	_getCodeForIds(dep, source, templateContext, ids) {
@@ -476,3 +490,4 @@ HarmonyImportSpecifierDependency.Template = class HarmonyImportSpecifierDependen
 };
 
 module.exports = HarmonyImportSpecifierDependency;
+module.exports.idsSymbol = idsSymbol;

package/lib/dependencies/HarmonyModulesPlugin.js

@@ -28,9 +28,9 @@ const HarmonyTopLevelThisParserPlugin = require("./HarmonyTopLevelThisParserPlug
 /** @typedef {import("../../declarations/WebpackOptions").JavascriptParserOptions} JavascriptParserOptions */
 /** @typedef {import("../Compiler")} Compiler */
 /** @typedef {import("../javascript/JavascriptParser")} Parser */
+
 /**
- * @typedef HarmonyModulesPluginOptions
- * @property {boolean=} topLevelAwait
+ * @typedef {object} HarmonyModulesPluginOptions
  * @property {boolean=} deferImport
  */
 
@@ -134,7 +134,7 @@ class HarmonyModulesPlugin {
 						return;
 					}
 
-					new HarmonyDetectionParserPlugin(this.options).apply(parser);
+					new HarmonyDetectionParserPlugin().apply(parser);
 					new HarmonyImportDependencyParserPlugin(parserOptions).apply(parser);
 					new HarmonyExportDependencyParserPlugin(parserOptions).apply(parser);
 					new HarmonyTopLevelThisParserPlugin().apply(parser);

package/lib/dependencies/ImportDependency.js

@@ -11,7 +11,8 @@ const ModuleDependency = require("./ModuleDependency");
 
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
 /** @typedef {import("../AsyncDependenciesBlock")} AsyncDependenciesBlock */
-/** @typedef {import("../Dependency").ReferencedExport} ReferencedExport */
+/** @typedef {import("../Dependency").RawReferencedExports} RawReferencedExports */
+/** @typedef {import("../Dependency").ReferencedExports} ReferencedExports */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../Module")} Module */
 /** @typedef {import("../Module").BuildMeta} BuildMeta */
@@ -26,14 +27,14 @@ class ImportDependency extends ModuleDependency {
 	/**
 	 * @param {string} request the request
 	 * @param {Range} range expression range
-	 * @param {(string[][] | null)=} referencedExports list of referenced exports
+	 * @param {RawReferencedExports | null=} referencedExports list of referenced exports
 	 * @param {ImportAttributes=} attributes import attributes
 	 */
 	constructor(request, range, referencedExports, attributes) {
 		super(request);
 		this.range = range;
 		this.referencedExports = referencedExports;
-		this.assertions = attributes;
+		this.attributes = attributes;
 	}
 
 	get type() {
@@ -44,11 +45,22 @@ class ImportDependency 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) {
 		if (!this.referencedExports) return Dependency.EXPORTS_OBJECT_REFERENCED;
@@ -87,7 +99,7 @@ class ImportDependency extends ModuleDependency {
 	serialize(context) {
 		context.write(this.range);
 		context.write(this.referencedExports);
-		context.write(this.assertions);
+		context.write(this.attributes);
 		super.serialize(context);
 	}
 
@@ -97,7 +109,7 @@ class ImportDependency extends ModuleDependency {
 	deserialize(context) {
 		this.range = context.read();
 		this.referencedExports = context.read();
-		this.assertions = context.read();
+		this.attributes = context.read();
 		super.deserialize(context);
 	}
 }

package/lib/dependencies/ImportEagerDependency.js

@@ -10,19 +10,18 @@ const ImportDependency = require("./ImportDependency");
 
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
 /** @typedef {import("../Dependency")} Dependency */
-/** @typedef {import("../Dependency").ReferencedExport} ReferencedExport */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../Module")} Module */
 /** @typedef {import("../Module").BuildMeta} BuildMeta */
-/** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../javascript/JavascriptParser").ImportAttributes} ImportAttributes */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
+/** @typedef {ImportDependency.RawReferencedExports} RawReferencedExports */
 
 class ImportEagerDependency extends ImportDependency {
 	/**
 	 * @param {string} request the request
 	 * @param {Range} range expression range
-	 * @param {(string[][] | null)=} referencedExports list of referenced exports
+	 * @param {RawReferencedExports | null=} referencedExports list of referenced exports
 	 * @param {ImportAttributes=} attributes import attributes
 	 */
 	constructor(request, range, referencedExports, attributes) {

package/lib/dependencies/ImportMetaContextDependencyParserPlugin.js

@@ -15,14 +15,17 @@ const ImportMetaContextDependency = require("./ImportMetaContextDependency");
 /** @typedef {import("estree").ObjectExpression} ObjectExpression */
 /** @typedef {import("estree").Property} Property */
 /** @typedef {import("estree").Identifier} Identifier */
-/** @typedef {import("estree").SourceLocation} SourceLocation */
 /** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
 /** @typedef {import("../ContextModule").ContextModuleOptions} ContextModuleOptions */
+/** @typedef {import("../ContextModule").ContextMode} ContextMode */
+/** @typedef {import("../Chunk").ChunkName} ChunkName */
 /** @typedef {import("../ChunkGroup").RawChunkGroupOptions} RawChunkGroupOptions */
+/** @typedef {import("../Dependency").RawReferencedExports} RawReferencedExports */
 /** @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 */
+
+/** @typedef {Pick<ContextModuleOptions, 'mode' | 'recursive' | 'regExp' | 'include' | 'exclude' | 'chunkName'> & { groupOptions: RawChunkGroupOptions, exports?: RawReferencedExports }} ImportMetaContextOptions */
 
 /**
  * @param {Property} prop property
@@ -84,7 +87,7 @@ module.exports = class ImportMetaContextDependencyParserPlugin {
 				const errors = [];
 				let regExp = /^\.\/.*$/;
 				let recursive = true;
-				/** @type {ContextModuleOptions["mode"]} */
+				/** @type {ContextMode} */
 				let mode = "sync";
 				/** @type {ContextModuleOptions["include"]} */
 				let include;
@@ -92,9 +95,9 @@ module.exports = class ImportMetaContextDependencyParserPlugin {
 				let exclude;
 				/** @type {RawChunkGroupOptions} */
 				const groupOptions = {};
-				/** @type {ContextModuleOptions["chunkName"]} */
+				/** @type {ChunkName | undefined} */
 				let chunkName;
-				/** @type {ContextModuleOptions["referencedExports"]} */
+				/** @type {RawReferencedExports | undefined} */
 				let exports;
 				if (optionsNode) {
 					for (const prop of /** @type {ObjectExpression} */ (optionsNode)

package/lib/dependencies/ImportMetaContextPlugin.js

@@ -14,7 +14,6 @@ const ImportMetaContextDependency = require("./ImportMetaContextDependency");
 const ImportMetaContextDependencyParserPlugin = require("./ImportMetaContextDependencyParserPlugin");
 
 /** @typedef {import("../../declarations/WebpackOptions").JavascriptParserOptions} JavascriptParserOptions */
-/** @typedef {import("../../declarations/WebpackOptions").ResolveOptions} ResolveOptions */
 /** @typedef {import("../Compiler")} Compiler */
 /** @typedef {import("../javascript/JavascriptParser")} Parser */
 

package/lib/dependencies/ImportMetaPlugin.js

@@ -30,6 +30,7 @@ const ConstDependency = require("./ConstDependency");
 /** @typedef {import("../NormalModule")} NormalModule */
 /** @typedef {import("../javascript/JavascriptParser")} Parser */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
+/** @typedef {import("../javascript/JavascriptParser").Members} Members */
 
 const getCriticalDependencyWarning = memoize(() =>
 	require("./CriticalDependencyWarning")
@@ -83,7 +84,7 @@ class ImportMetaPlugin {
 						JSON.stringify(getUrl(parser.state.module));
 					const importMetaWebpackVersion = () => JSON.stringify(webpackVersion);
 					/**
-					 * @param {string[]} members members
+					 * @param {Members} members members
 					 * @returns {string} error message
 					 */
 					const importMetaUnknownProperty = (members) =>