webpack 5.23.0 → 5.24.3

package/lib/dependencies/HarmonyExportImportedSpecifierDependency.js

@@ -11,7 +11,7 @@ const HarmonyLinkingError = require("../HarmonyLinkingError");
 const InitFragment = require("../InitFragment");
 const RuntimeGlobals = require("../RuntimeGlobals");
 const Template = require("../Template");
-const { first } = require("../util/SetHelpers");
+const { first, combine } = require("../util/SetHelpers");
 const makeSerializable = require("../util/makeSerializable");
 const propertyAccess = require("../util/propertyAccess");
 const HarmonyExportInitFragment = require("./HarmonyExportInitFragment");
@@ -43,14 +43,16 @@ class NormalReexportItem {
 	/**
 	 * @param {string} name export name
 	 * @param {string[]} 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 {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
 	 */
-	constructor(name, ids, exportInfo, checked) {
+	constructor(name, ids, exportInfo, checked, hidden) {
 		this.name = name;
 		this.ids = ids;
 		this.exportInfo = exportInfo;
 		this.checked = checked;
+		this.hidden = hidden;
 	}
 }
 
@@ -76,6 +78,10 @@ class ExportMode {
 		/** @type {Set<string> | null} */
 		this.ignored = null;
 
+		// for "dynamic-reexport" | "empty-star":
+		/** @type {Set<string> | null} */
+		this.hidden = null;
+
 		// for "missing":
 		/** @type {string | null} */
 		this.userRequest = null;
@@ -225,7 +231,9 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 						break;
 					default:
 						mode = new ExportMode("normal-reexport");
-						mode.items = [new NormalReexportItem(name, ids, exportInfo, false)];
+						mode.items = [
+							new NormalReexportItem(name, ids, exportInfo, false, false)
+						];
 						break;
 				}
 			} else {
@@ -256,7 +264,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 
 		// Star reexporting
 
-		const { ignoredExports, exports, checked } = this.getStarReexports(
+		const { ignoredExports, exports, checked, hidden } = this.getStarReexports(
 			moduleGraph,
 			runtime,
 			exportsInfo,
@@ -268,12 +276,14 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 
 			const mode = new ExportMode("dynamic-reexport");
 			mode.ignored = ignoredExports;
+			mode.hidden = hidden;
 
 			return mode;
 		}
 
 		if (exports.size === 0) {
 			const mode = new ExportMode("empty-star");
+			mode.hidden = hidden;
 
 			return mode;
 		}
@@ -287,8 +297,21 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 					exportName,
 					[exportName],
 					exportsInfo.getReadOnlyExportInfo(exportName),
-					checked.has(exportName)
+					checked.has(exportName),
+					false
 				)
+		).concat(
+			Array.from(
+				hidden,
+				exportName =>
+					new NormalReexportItem(
+						exportName,
+						[exportName],
+						exportsInfo.getReadOnlyExportInfo(exportName),
+						false,
+						true
+					)
+			)
 		);
 
 		return mode;
@@ -299,7 +322,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 	 * @param {RuntimeSpec} runtime the runtime
 	 * @param {ExportsInfo} exportsInfo exports info about the current module (optional)
 	 * @param {Module} importedModule the imported module (optional)
-	 * @returns {{exports?: Set<string>, checked?: Set<string>, ignoredExports: Set<string>}} information
+	 * @returns {{exports?: Set<string>, checked?: Set<string>, ignoredExports: Set<string>, hidden: Set<string>}} information
 	 */
 	getStarReexports(
 		moduleGraph,
@@ -314,15 +337,16 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 		const noExtraImports =
 			exportsInfo.otherExportsInfo.getUsed(runtime) === UsageState.Unused;
 
-		const ignoredExports = new Set([
-			"default",
-			...this.activeExports,
-			...this._discoverActiveExportsFromOtherStarExports(moduleGraph).keys()
-		]);
+		const ignoredExports = new Set(["default", ...this.activeExports]);
+		const hiddenExports = new Set(
+			this._discoverActiveExportsFromOtherStarExports(moduleGraph).keys()
+		);
+		for (const e of ignoredExports) hiddenExports.delete(e);
 
 		if (!noExtraExports && !noExtraImports) {
 			return {
-				ignoredExports
+				ignoredExports,
+				hidden: hiddenExports
 			};
 		}
 
@@ -330,6 +354,8 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 		const exports = new Set();
 		/** @type {Set<string>} */
 		const checked = new Set();
+		/** @type {Set<string>} */
+		const hidden = new Set();
 
 		if (noExtraImports) {
 			for (const exportInfo of exportsInfo.orderedExports) {
@@ -340,6 +366,10 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 					name
 				);
 				if (importedExportInfo.provided === false) continue;
+				if (hiddenExports.has(name)) {
+					hidden.add(name);
+					continue;
+				}
 				exports.add(name);
 				if (importedExportInfo.provided === true) continue;
 				checked.add(name);
@@ -351,13 +381,17 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 				if (importedExportInfo.provided === false) continue;
 				const exportInfo = exportsInfo.getReadOnlyExportInfo(name);
 				if (exportInfo.getUsed(runtime) === UsageState.Unused) continue;
+				if (hiddenExports.has(name)) {
+					hidden.add(name);
+					continue;
+				}
 				exports.add(name);
 				if (importedExportInfo.provided === true) continue;
 				checked.add(name);
 			}
 		}
 
-		return { ignoredExports, exports, checked };
+		return { ignoredExports, exports, checked, hidden };
 	}
 
 	/**
@@ -433,7 +467,8 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 
 			case "normal-reexport": {
 				const referencedExports = [];
-				for (const { ids, exportInfo } of mode.items) {
+				for (const { ids, exportInfo, hidden } of mode.items) {
+					if (hidden) continue;
 					processExportInfo(runtime, referencedExports, ids, exportInfo, false);
 				}
 				return referencedExports;
@@ -487,22 +522,26 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 					exports: true,
 					from,
 					canMangle: false,
-					excludeExports: mode.ignored,
+					excludeExports: combine(mode.ignored, mode.hidden),
+					hideExports: mode.hidden,
 					dependencies: [from.module]
 				};
 			}
 			case "empty-star":
 				return {
 					exports: [],
+					hideExports: mode.hidden,
 					dependencies: [moduleGraph.getModule(this)]
 				};
+			// falls through
 			case "normal-reexport": {
 				const from = moduleGraph.getConnection(this);
 				return {
 					exports: Array.from(mode.items, item => ({
 						name: item.name,
 						from,
-						export: item.ids
+						export: item.ids,
+						hidden: item.hidden
 					})),
 					dependencies: [from.module]
 				};
@@ -869,7 +908,8 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 				break;
 
 			case "normal-reexport":
-				for (const { name, ids, checked } of mode.items) {
+				for (const { name, ids, checked, hidden } of mode.items) {
+					if (hidden) continue;
 					if (checked) {
 						initFragments.push(
 							new InitFragment(
@@ -903,7 +943,7 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 				break;
 
 			case "dynamic-reexport": {
-				const ignored = mode.ignored;
+				const ignored = combine(mode.ignored, mode.hidden);
 				const modern =
 					runtimeTemplate.supportsConst() &&
 					runtimeTemplate.supportsArrowFunction();

package/lib/ids/OccurrenceModuleIdsPlugin.js

@@ -66,32 +66,43 @@ class OccurrenceModuleIdsPlugin {
 				}
 
 				/**
-				 * @param {Iterable<ModuleGraphConnection>} connections connections
+				 * @param {Module} module module
 				 * @returns {number} count of occurs
 				 */
-				const countOccursInEntry = connections => {
+				const countOccursInEntry = module => {
 					let sum = 0;
-					for (const c of connections) {
-						if (!c.isTargetActive(undefined)) continue;
-						if (!c.originModule) continue;
-						sum += initialChunkChunkMap.get(c.originModule);
+					for (const [
+						originModule,
+						connections
+					] of moduleGraph.getIncomingConnectionsByOriginModule(module)) {
+						if (!originModule) continue;
+						if (!connections.some(c => c.isTargetActive(undefined))) continue;
+						sum += initialChunkChunkMap.get(originModule);
 					}
 					return sum;
 				};
 
 				/**
-				 * @param {Iterable<ModuleGraphConnection>} connections connections
+				 * @param {Module} module module
 				 * @returns {number} count of occurs
 				 */
-				const countOccurs = connections => {
+				const countOccurs = module => {
 					let sum = 0;
-					for (const c of connections) {
-						if (!c.isTargetActive(undefined)) continue;
-						if (!c.originModule) continue;
-						if (!c.dependency) continue;
-						const factor = c.dependency.getNumberOfIdOccurrences();
-						if (factor === 0) continue;
-						sum += factor * chunkGraph.getNumberOfModuleChunks(c.originModule);
+					for (const [
+						originModule,
+						connections
+					] of moduleGraph.getIncomingConnectionsByOriginModule(module)) {
+						if (!originModule) continue;
+						const chunkModules = chunkGraph.getNumberOfModuleChunks(
+							originModule
+						);
+						for (const c of connections) {
+							if (!c.isTargetActive(undefined)) continue;
+							if (!c.dependency) continue;
+							const factor = c.dependency.getNumberOfIdOccurrences();
+							if (factor === 0) continue;
+							sum += factor * chunkModules;
+						}
 					}
 					return sum;
 				};
@@ -99,7 +110,7 @@ class OccurrenceModuleIdsPlugin {
 				if (prioritiseInitial) {
 					for (const m of modulesInOccurrenceOrder) {
 						const result =
-							countOccursInEntry(moduleGraph.getIncomingConnections(m)) +
+							countOccursInEntry(m) +
 							initialChunkChunkMap.get(m) +
 							entryCountMap.get(m);
 						occursInInitialChunksMap.set(m, result);
@@ -108,7 +119,7 @@ class OccurrenceModuleIdsPlugin {
 
 				for (const m of modules) {
 					const result =
-						countOccurs(moduleGraph.getIncomingConnections(m)) +
+						countOccurs(m) +
 						chunkGraph.getNumberOfModuleChunks(m) +
 						entryCountMap.get(m);
 					occursInAllChunksMap.set(m, result);

package/lib/index.js

@@ -27,6 +27,7 @@ const memoize = require("./util/memoize");
 /** @typedef {import("./Compilation").AssetInfo} AssetInfo */
 /** @typedef {import("./MultiStats")} MultiStats */
 /** @typedef {import("./Parser").ParserState} ParserState */
+/** @typedef {import("./Watching")} Watching */
 /** @typedef {import("./stats/DefaultStatsFactoryPlugin").StatsCompilation} StatsCompilation */
 
 /**

package/lib/javascript/JavascriptModulesPlugin.js

@@ -901,12 +901,12 @@ class JavascriptModulesPlugin {
 					if (
 						result.allowInlineStartup &&
 						someInIterable(
-							moduleGraph.getIncomingConnections(entryModule),
-							c =>
-								c.originModule &&
-								c.isTargetActive(chunk.runtime) &&
+							moduleGraph.getIncomingConnectionsByOriginModule(entryModule),
+							([originModule, connections]) =>
+								originModule &&
+								connections.some(c => c.isTargetActive(chunk.runtime)) &&
 								someInIterable(
-									chunkGraph.getModuleRuntimes(c.originModule),
+									chunkGraph.getModuleRuntimes(originModule),
 									runtime =>
 										intersectRuntime(runtime, chunk.runtime) !== undefined
 								)

package/lib/node/NodeWatchFileSystem.js

@@ -98,6 +98,12 @@ class NodeWatchFileSystem {
 					this.watcher.pause();
 				}
 			},
+			getAggregatedRemovals: () => {
+				return this.watcher && this.watcher.aggregatedRemovals;
+			},
+			getAggregatedChanges: () => {
+				return this.watcher && this.watcher.aggregatedChanges;
+			},
 			getFileTimeInfoEntries: () => {
 				if (this.watcher) {
 					return this.watcher.getTimeInfoEntries();

package/lib/optimize/ConcatenatedModule.js

@@ -1239,16 +1239,21 @@ class ConcatenatedModule extends Module {
 							for (const identifier of allIdentifiers) {
 								const r = identifier.range;
 								const path = getPathInAst(info.ast, identifier);
-								if (
-									path &&
-									path.length > 1 &&
-									path[1].type === "Property" &&
-									path[1].shorthand
-								) {
-									source.insert(r[1], `: ${newName}`);
-								} else {
-									source.replace(r[0], r[1] - 1, newName);
+								if (path && path.length > 1) {
+									const maybeProperty =
+										path[1].type === "AssignmentPattern" &&
+										path[1].left === path[0]
+											? path[2]
+											: path[1];
+									if (
+										maybeProperty.type === "Property" &&
+										maybeProperty.shorthand
+									) {
+										source.insert(r[1], `: ${newName}`);
+										continue;
+									}
 								}
+								source.replace(r[0], r[1] - 1, newName);
 							}
 						} else {
 							allUsedNames.add(name);