webpack 5.107.2 → 5.108.0

package/lib/NormalModule.js

@@ -20,6 +20,7 @@ const {
 	SourceMapSource
 } = require("webpack-sources");
 const Compilation = require("./Compilation");
+const Dependency = require("./Dependency");
 const Module = require("./Module");
 const ModuleGraphConnection = require("./ModuleGraphConnection");
 const { JAVASCRIPT_MODULE_TYPE_AUTO } = require("./ModuleTypeConstants");
@@ -35,8 +36,6 @@ const LazySet = require("./util/LazySet");
 const { isSubset } = require("./util/SetHelpers");
 const { getScheme } = require("./util/URLAbsoluteSpecifier");
 const {
-	compareLocations,
-	compareSelect,
 	concatComparators,
 	keepOriginalOrder,
 	sortWithSourceOrder
@@ -46,6 +45,7 @@ const { createFakeHook } = require("./util/deprecation");
 const formatLocation = require("./util/formatLocation");
 const { join } = require("./util/fs");
 const {
+	ABSOLUTE_PATH_REGEXP,
 	absolutify,
 	contextify,
 	makePathsRelative
@@ -61,12 +61,13 @@ const parseJson = require("./util/parseJson");
 /** @typedef {import("../declarations/WebpackOptions").ResolveOptions} ResolveOptions */
 /** @typedef {import("../declarations/WebpackOptions").NoParse} NoParse */
 /** @typedef {import("./config/defaults").WebpackOptionsNormalizedWithDefaults} WebpackOptions */
-/** @typedef {import("./Dependency")} Dependency */
 /** @typedef {import("./Dependency").UpdateHashContext} UpdateHashContext */
 /** @typedef {import("./Generator")} Generator */
 /** @typedef {import("./Generator").GenerateErrorFn} GenerateErrorFn */
+/** @typedef {import("./FileSystemInfo").Snapshot} Snapshot */
 /** @typedef {import("./Module").BuildInfo} BuildInfo */
 /** @typedef {import("./Module").FileSystemDependencies} FileSystemDependencies */
+/** @typedef {import("./Module").ValueCacheVersions} ValueCacheVersions */
 /** @typedef {import("./Module").BuildMeta} BuildMeta */
 /** @typedef {import("./Module").CodeGenerationContext} CodeGenerationContext */
 /** @typedef {import("./Module").CodeGenerationResult} CodeGenerationResult */
@@ -174,9 +175,10 @@ const SIDE_EFFECTS_RECURSION_LIMIT = 2000;
  * behavior.
  * @param {NormalModule} rootMod the module to walk
  * @param {ModuleGraph} moduleGraph the module graph
+ * @param {SideEffectsWalkContext} ctx per-walk cycle-tracking context
  * @returns {ConnectionState} the side-effects connection state
  */
-const walkSideEffectsIterative = (rootMod, moduleGraph) => {
+const walkSideEffectsIterative = (rootMod, moduleGraph, ctx) => {
 	const SideEffectDep = getHarmonyImportSideEffectDependency();
 
 	/** @type {NormalModule[]} */
@@ -259,7 +261,7 @@ const walkSideEffectsIterative = (rootMod, moduleGraph) => {
 						) {
 							state = true;
 						} else if (refModule._isEvaluatingSideEffects) {
-							_sideEffectsCircularSeen = true;
+							ctx.circular = true;
 							state = ModuleGraphConnection.CIRCULAR_CONNECTION;
 						} else {
 							// Descend
@@ -281,7 +283,7 @@ const walkSideEffectsIterative = (rootMod, moduleGraph) => {
 					) {
 						state = true;
 					} else if (refModule._isEvaluatingSideEffects) {
-						_sideEffectsCircularSeen = true;
+						ctx.circular = true;
 						state = ModuleGraphConnection.CIRCULAR_CONNECTION;
 					} else {
 						// Descend
@@ -296,7 +298,7 @@ const walkSideEffectsIterative = (rootMod, moduleGraph) => {
 						break;
 					}
 				} else {
-					_sideEffectsCircularSeen = true;
+					ctx.circular = true;
 					state = refModule.getSideEffectsConnectionState(moduleGraph);
 				}
 			} else {
@@ -325,7 +327,7 @@ const walkSideEffectsIterative = (rootMod, moduleGraph) => {
 		if (descended) continue;
 
 		topMod._isEvaluatingSideEffects = false;
-		if (!_sideEffectsCircularSeen) {
+		if (!ctx.circular) {
 			topMod._sideEffectsStateGraph = moduleGraph;
 			topMod._sideEffectsStateValue = current;
 		}
@@ -340,15 +342,9 @@ const walkSideEffectsIterative = (rootMod, moduleGraph) => {
 };
 
 /**
- * Tracks whether a cycle (CIRCULAR_CONNECTION) was encountered anywhere
- * in the currently-executing walk. The walker uses this to decide whether
- * an intermediate result is safe to memoize on the module: a result
- * computed in the presence of a cycle can differ from the result computed
- * fresh, because cycle short-circuiting hides the contribution of the
- * back-edge target. Reset to `false` at the top-level entry; read and
- * propagated by each recursive frame.
+ * @typedef {object} SideEffectsWalkContext
+ * @property {boolean} circular whether a cycle was seen anywhere in this walk
  */
-let _sideEffectsCircularSeen = false;
 
 /**
  * Walks back up a stack of linear-chain ancestors, applying the result
@@ -359,9 +355,10 @@ let _sideEffectsCircularSeen = false;
  * @param {(NormalModule | Dependency)[] | null} ancestors interleaved stack of `[mod, sideEffectDep, mod, sideEffectDep, …]` in descent order; `null` if there were none
  * @param {ConnectionState} state result from the chain's tail
  * @param {ModuleGraph} moduleGraph the module graph
+ * @param {SideEffectsWalkContext} ctx per-walk cycle-tracking context
  * @returns {ConnectionState} the root ancestor's result
  */
-const propagateLinearResult = (ancestors, state, moduleGraph) => {
+const propagateLinearResult = (ancestors, state, moduleGraph, ctx) => {
 	if (ancestors === null) return state;
 	while (ancestors.length > 0) {
 		const dep = /** @type {Dependency} */ (ancestors.pop());
@@ -378,9 +375,9 @@ const propagateLinearResult = (ancestors, state, moduleGraph) => {
 			// so the ancestor's `current` stays at its initial `false`. From
 			// this point upward the propagated state is `false`, and the
 			// cycle taint prevents memoization further up (handled by
-			// `_sideEffectsCircularSeen`).
+			// `ctx.circular`).
 			state = false;
-		} else if (!_sideEffectsCircularSeen) {
+		} else if (!ctx.circular) {
 			ancestor._sideEffectsStateGraph = moduleGraph;
 			ancestor._sideEffectsStateValue = state;
 		}
@@ -415,9 +412,16 @@ const propagateLinearResult = (ancestors, state, moduleGraph) => {
  * @param {ModuleGraph} moduleGraph the module graph
  * @param {number} depth current recursion depth (only counts true V8 frames)
  * @param {EXPECTED_ANY} SideEffectDep `HarmonyImportSideEffectDependency` constructor, resolved once at the public entry to avoid repeated `require` lookups in the recursive call
+ * @param {SideEffectsWalkContext} ctx per-walk cycle-tracking context
  * @returns {ConnectionState} the side-effects connection state
  */
-const walkSideEffectsRecursive = (mod, moduleGraph, depth, SideEffectDep) => {
+const walkSideEffectsRecursive = (
+	mod,
+	moduleGraph,
+	depth,
+	SideEffectDep,
+	ctx
+) => {
 	// Interleaved `[mod, linearDep, mod, linearDep, …]` for the linear
 	// chain head; `null` until the first descent.
 	/** @type {(NormalModule | Dependency)[] | null} */
@@ -430,27 +434,29 @@ const walkSideEffectsRecursive = (mod, moduleGraph, depth, SideEffectDep) => {
 			return propagateLinearResult(
 				linearAncestors,
 				/** @type {ConnectionState} */ (mod._sideEffectsStateValue),
-				moduleGraph
+				moduleGraph,
+				ctx
 			);
 		}
 
 		if (mod.factoryMeta !== undefined) {
 			if (mod.factoryMeta.sideEffectFree) {
-				return propagateLinearResult(linearAncestors, false, moduleGraph);
+				return propagateLinearResult(linearAncestors, false, moduleGraph, ctx);
 			}
 			if (mod.factoryMeta.sideEffectFree === false) {
-				return propagateLinearResult(linearAncestors, true, moduleGraph);
+				return propagateLinearResult(linearAncestors, true, moduleGraph, ctx);
 			}
 		}
 		if (!(mod.buildMeta !== undefined && mod.buildMeta.sideEffectFree)) {
-			return propagateLinearResult(linearAncestors, true, moduleGraph);
+			return propagateLinearResult(linearAncestors, true, moduleGraph, ctx);
 		}
 		if (mod._isEvaluatingSideEffects) {
-			_sideEffectsCircularSeen = true;
+			ctx.circular = true;
 			return propagateLinearResult(
 				linearAncestors,
 				ModuleGraphConnection.CIRCULAR_CONNECTION,
-				moduleGraph
+				moduleGraph,
+				ctx
 			);
 		}
 
@@ -487,7 +493,7 @@ const walkSideEffectsRecursive = (mod, moduleGraph, depth, SideEffectDep) => {
 					recordSideEffectsBailout(mod, moduleGraph, dep);
 					mod._sideEffectsStateGraph = moduleGraph;
 					mod._sideEffectsStateValue = true;
-					return propagateLinearResult(linearAncestors, true, moduleGraph);
+					return propagateLinearResult(linearAncestors, true, moduleGraph, ctx);
 				}
 				if (state !== ModuleGraphConnection.CIRCULAR_CONNECTION) {
 					nonRecursiveCurrent = ModuleGraphConnection.addConnectionStates(
@@ -509,11 +515,11 @@ const walkSideEffectsRecursive = (mod, moduleGraph, depth, SideEffectDep) => {
 		if (linearDep === null) {
 			// No `SideEffectDep` — the module is a leaf as far as the
 			// side-effects graph is concerned. Cache and propagate `false`.
-			if (!_sideEffectsCircularSeen) {
+			if (!ctx.circular) {
 				mod._sideEffectsStateGraph = moduleGraph;
 				mod._sideEffectsStateValue = false;
 			}
-			return propagateLinearResult(linearAncestors, false, moduleGraph);
+			return propagateLinearResult(linearAncestors, false, moduleGraph, ctx);
 		}
 
 		const refModule = moduleGraph.getModule(linearDep);
@@ -521,7 +527,7 @@ const walkSideEffectsRecursive = (mod, moduleGraph, depth, SideEffectDep) => {
 			recordSideEffectsBailout(mod, moduleGraph, linearDep);
 			mod._sideEffectsStateGraph = moduleGraph;
 			mod._sideEffectsStateValue = true;
-			return propagateLinearResult(linearAncestors, true, moduleGraph);
+			return propagateLinearResult(linearAncestors, true, moduleGraph, ctx);
 		}
 		if (!(refModule instanceof NormalModule)) {
 			// Non-NormalModule's `getSideEffectsConnectionState` re-enters
@@ -545,8 +551,9 @@ const walkSideEffectsRecursive = (mod, moduleGraph, depth, SideEffectDep) => {
 	if (depth >= SIDE_EFFECTS_RECURSION_LIMIT) {
 		return propagateLinearResult(
 			linearAncestors,
-			walkSideEffectsIterative(mod, moduleGraph),
-			moduleGraph
+			walkSideEffectsIterative(mod, moduleGraph, ctx),
+			moduleGraph,
+			ctx
 		);
 	}
 
@@ -566,7 +573,8 @@ const walkSideEffectsRecursive = (mod, moduleGraph, depth, SideEffectDep) => {
 					refModule,
 					moduleGraph,
 					depth + 1,
-					SideEffectDep
+					SideEffectDep,
+					ctx
 				);
 			} else {
 				// Non-NormalModule's `getSideEffectsConnectionState` (notably
@@ -576,7 +584,7 @@ const walkSideEffectsRecursive = (mod, moduleGraph, depth, SideEffectDep) => {
 				// the inner walk hit a cycle that reflected the outer's
 				// state, so treat the walk as cycle-tainted and skip the
 				// cache for safety.
-				_sideEffectsCircularSeen = true;
+				ctx.circular = true;
 				state = refModule.getSideEffectsConnectionState(moduleGraph);
 			}
 		} else {
@@ -591,7 +599,7 @@ const walkSideEffectsRecursive = (mod, moduleGraph, depth, SideEffectDep) => {
 			// always safe to memoize.
 			mod._sideEffectsStateGraph = moduleGraph;
 			mod._sideEffectsStateValue = true;
-			return propagateLinearResult(linearAncestors, true, moduleGraph);
+			return propagateLinearResult(linearAncestors, true, moduleGraph, ctx);
 		}
 		if (state !== ModuleGraphConnection.CIRCULAR_CONNECTION) {
 			current = ModuleGraphConnection.addConnectionStates(current, state);
@@ -606,15 +614,13 @@ const walkSideEffectsRecursive = (mod, moduleGraph, depth, SideEffectDep) => {
 	// CIRCULAR_CONNECTION short-circuiting), so this single flag is the
 	// conservative-but-cheap approximation of "this subtree's result is
 	// independent of cycle context". The public entry resets the flag.
-	if (!_sideEffectsCircularSeen) {
+	if (!ctx.circular) {
 		mod._sideEffectsStateGraph = moduleGraph;
 		mod._sideEffectsStateValue = current;
 	}
-	return propagateLinearResult(linearAncestors, current, moduleGraph);
+	return propagateLinearResult(linearAncestors, current, moduleGraph, ctx);
 };
 
-const ABSOLUTE_PATH_REGEX = /^(?:[a-z]:\\|\\\\|\/)/i;
-
 /**
  * @typedef {object} LoaderItem
  * @property {string} loader
@@ -740,6 +746,22 @@ const asBuffer = (input) => {
  * @typedef {(resourcePath: string, getLoaderContext: (resourcePath: string) => AnyLoaderContext) => Promise<string | Buffer<ArrayBufferLike>>} ReadResource
  */
 
+/**
+ * Defines the build info properties of normal modules (filesystem-backed, loader-processed).
+ * @typedef {object} KnownNormalModuleBuildInfo
+ * @property {boolean=} parsed
+ * @property {string=} hash
+ * @property {FileSystemDependencies=} fileDependencies
+ * @property {FileSystemDependencies=} contextDependencies
+ * @property {FileSystemDependencies=} missingDependencies
+ * @property {FileSystemDependencies=} buildDependencies
+ * @property {ValueCacheVersions=} valueDependencies
+ * @property {(Snapshot | null)=} snapshot
+ * @property {string=} resourceIntegrity using in HttpUriPlugin
+ */
+
+/** @typedef {BuildInfo & KnownNormalModuleBuildInfo} NormalModuleBuildInfo */
+
 /** @type {WeakMap<Compilation, NormalModuleCompilationHooks>} */
 const compilationHooksMap = new WeakMap();
 
@@ -863,7 +885,14 @@ class NormalModule extends Module {
 		/** @type {NormalModuleCreateData['extractSourceMap']} */
 		this.extractSourceMap = extractSourceMap;
 
+		// Set by HotModuleReplacementPlugin via NormalModuleFactory's `module` hook
+		/** @type {boolean} */
+		this.hot = false;
+
 		// Info from Build
+		// Redeclared with the normal module specific shape (see KnownNormalModuleBuildInfo)
+		/** @type {NormalModuleBuildInfo | undefined} */
+		this.buildInfo = undefined;
 		/** @type {Error | null} */
 		this.error = null;
 		/**
@@ -1314,7 +1343,7 @@ class NormalModule extends Module {
 			},
 			/** @type {LoaderContext<EXPECTED_ANY>["emitFile"]} */
 			emitFile: (name, content, sourceMap, assetInfo) => {
-				const buildInfo = /** @type {BuildInfo} */ (this.buildInfo);
+				const buildInfo = /** @type {NormalModuleBuildInfo} */ (this.buildInfo);
 
 				if (!buildInfo.assets) {
 					buildInfo.assets = Object.create(null);
@@ -1338,7 +1367,7 @@ class NormalModule extends Module {
 				assetsInfo.set(name, assetInfo);
 			},
 			addBuildDependency: (dep) => {
-				const buildInfo = /** @type {BuildInfo} */ (this.buildInfo);
+				const buildInfo = /** @type {NormalModuleBuildInfo} */ (this.buildInfo);
 
 				if (buildInfo.buildDependencies === undefined) {
 					buildInfo.buildDependencies = new LazySet();
@@ -1511,7 +1540,7 @@ class NormalModule extends Module {
 			return callback();
 		};
 
-		const buildInfo = /** @type {BuildInfo} */ (this.buildInfo);
+		const buildInfo = /** @type {NormalModuleBuildInfo} */ (this.buildInfo);
 
 		buildInfo.fileDependencies = new LazySet();
 		buildInfo.contextDependencies = new LazySet();
@@ -1531,7 +1560,7 @@ class NormalModule extends Module {
 		}
 
 		if (this.loaders.length > 0) {
-			/** @type {BuildInfo} */
+			/** @type {NormalModuleBuildInfo} */
 			(this.buildInfo).buildDependencies = new LazySet();
 		}
 
@@ -1627,7 +1656,7 @@ class NormalModule extends Module {
 						(undefined);
 
 				if (!result) {
-					/** @type {BuildInfo} */
+					/** @type {NormalModuleBuildInfo} */
 					(this.buildInfo).cacheable = false;
 					return processResult(
 						err || new Error("No result from loader-runner processing"),
@@ -1635,16 +1664,16 @@ class NormalModule extends Module {
 					);
 				}
 
-				const buildInfo = /** @type {BuildInfo} */ (this.buildInfo);
+				const buildInfo = /** @type {NormalModuleBuildInfo} */ (this.buildInfo);
 
 				const fileDependencies =
-					/** @type {NonNullable<KnownBuildInfo["fileDependencies"]>} */
+					/** @type {NonNullable<KnownNormalModuleBuildInfo["fileDependencies"]>} */
 					(buildInfo.fileDependencies);
 				const contextDependencies =
-					/** @type {NonNullable<KnownBuildInfo["contextDependencies"]>} */
+					/** @type {NonNullable<KnownNormalModuleBuildInfo["contextDependencies"]>} */
 					(buildInfo.contextDependencies);
 				const missingDependencies =
-					/** @type {NonNullable<KnownBuildInfo["missingDependencies"]>} */
+					/** @type {NonNullable<KnownNormalModuleBuildInfo["missingDependencies"]>} */
 					(buildInfo.missingDependencies);
 
 				fileDependencies.addAll(result.fileDependencies);
@@ -1652,7 +1681,7 @@ class NormalModule extends Module {
 				missingDependencies.addAll(result.missingDependencies);
 				for (const loader of this.loaders) {
 					const buildDependencies =
-						/** @type {NonNullable<KnownBuildInfo["buildDependencies"]>} */
+						/** @type {NonNullable<KnownNormalModuleBuildInfo["buildDependencies"]>} */
 						(buildInfo.buildDependencies);
 
 					buildDependencies.add(loader.loader);
@@ -1734,7 +1763,7 @@ class NormalModule extends Module {
 		}
 		hash.update("meta");
 		hash.update(JSON.stringify(this.buildMeta));
-		/** @type {BuildInfo} */
+		/** @type {NormalModuleBuildInfo} */
 		(this.buildInfo).hash = hash.digest("hex");
 	}
 
@@ -1756,7 +1785,12 @@ class NormalModule extends Module {
 		this.error = null;
 		this.clearWarningsAndErrors();
 		this.clearDependenciesAndBlocks();
-		this.buildMeta = {};
+		this.buildMeta = {
+			exportsType: undefined,
+			defaultObject: undefined,
+			strictHarmonyModule: undefined,
+			async: undefined
+		};
 		this.buildInfo = {
 			cacheable: false,
 			parsed: true,
@@ -1767,7 +1801,16 @@ class NormalModule extends Module {
 			valueDependencies: undefined,
 			hash: undefined,
 			assets: undefined,
-			assetsInfo: undefined
+			assetsInfo: undefined,
+			snapshot: undefined,
+			strict: undefined,
+			exportsArgument: undefined,
+			moduleArgument: undefined,
+			topLevelDeclarations: undefined,
+			pureFunctions: undefined,
+			inlineExports: undefined,
+			moduleConcatenationBailout: undefined,
+			needCreateRequire: undefined
 		};
 
 		const startTime = compilation.compiler.fsStartTime || Date.now();
@@ -1800,7 +1843,7 @@ class NormalModule extends Module {
 			const handleParseResult = () => {
 				this.dependencies.sort(
 					concatComparators(
-						compareSelect((a) => a.loc, compareLocations),
+						Dependency.compareLocations,
 						keepOriginalOrder(this.dependencies)
 					)
 				);
@@ -1821,7 +1864,9 @@ class NormalModule extends Module {
 				}
 
 				const snapshotOptions = compilation.options.snapshot.module;
-				const { cacheable } = /** @type {BuildInfo} */ (this.buildInfo);
+				const { cacheable } = /** @type {NormalModuleBuildInfo} */ (
+					this.buildInfo
+				);
 				if (!cacheable || !snapshotOptions) {
 					return callback();
 				}
@@ -1834,7 +1879,7 @@ class NormalModule extends Module {
 				 */
 				const checkDependencies = (deps) => {
 					for (const dep of deps) {
-						if (!ABSOLUTE_PATH_REGEX.test(dep)) {
+						if (!ABSOLUTE_PATH_REGEXP.test(dep)) {
 							if (nonAbsoluteDependencies === undefined) {
 								nonAbsoluteDependencies = new Set();
 							}
@@ -1848,11 +1893,11 @@ class NormalModule extends Module {
 									(this.context),
 									depWithoutGlob
 								);
-								if (absolute !== dep && ABSOLUTE_PATH_REGEX.test(absolute)) {
+								if (absolute !== dep && ABSOLUTE_PATH_REGEXP.test(absolute)) {
 									(depWithoutGlob !== dep
-										? /** @type {NonNullable<KnownBuildInfo["contextDependencies"]>} */
+										? /** @type {NonNullable<KnownNormalModuleBuildInfo["contextDependencies"]>} */
 											(
-												/** @type {BuildInfo} */
+												/** @type {NormalModuleBuildInfo} */
 												(this.buildInfo).contextDependencies
 											)
 										: deps
@@ -1864,15 +1909,15 @@ class NormalModule extends Module {
 						}
 					}
 				};
-				const buildInfo = /** @type {BuildInfo} */ (this.buildInfo);
+				const buildInfo = /** @type {NormalModuleBuildInfo} */ (this.buildInfo);
 				const fileDependencies =
-					/** @type {NonNullable<KnownBuildInfo["fileDependencies"]>} */
+					/** @type {NonNullable<KnownNormalModuleBuildInfo["fileDependencies"]>} */
 					(buildInfo.fileDependencies);
 				const contextDependencies =
-					/** @type {NonNullable<KnownBuildInfo["contextDependencies"]>} */
+					/** @type {NonNullable<KnownNormalModuleBuildInfo["contextDependencies"]>} */
 					(buildInfo.contextDependencies);
 				const missingDependencies =
-					/** @type {NonNullable<KnownBuildInfo["missingDependencies"]>} */
+					/** @type {NonNullable<KnownNormalModuleBuildInfo["missingDependencies"]>} */
 					(buildInfo.missingDependencies);
 				checkDependencies(fileDependencies);
 				checkDependencies(missingDependencies);
@@ -1918,7 +1963,7 @@ class NormalModule extends Module {
 			const noParseRule = options.module && options.module.noParse;
 			if (this.shouldPreventParsing(noParseRule, this.request)) {
 				// We assume that we need module and exports
-				/** @type {BuildInfo} */
+				/** @type {NormalModuleBuildInfo} */
 				(this.buildInfo).parsed = false;
 				this._initBuildHash(compilation);
 				return handleBuildDone();
@@ -1932,7 +1977,11 @@ class NormalModule extends Module {
 					current: this,
 					module: this,
 					compilation,
-					options
+					options,
+					harmonyNamedExports: undefined,
+					harmonyStarExports: undefined,
+					lastHarmonyImportOrder: undefined,
+					localModules: undefined
 				});
 			} catch (parseErr) {
 				handleParseError(/** @type {Error} */ (parseErr));
@@ -1959,19 +2008,16 @@ class NormalModule extends Module {
 	 * @returns {ConnectionState} how this module should be connected to referencing modules when consumed for side-effects only
 	 */
 	getSideEffectsConnectionState(moduleGraph) {
-		// Save and restore the cycle-tracking flag so that re-entrant calls
-		// (e.g. `ConcatenatedModule.getSideEffectsConnectionState` delegating
-		// back through here) don't clobber the outer walk's state.
-		const savedCircular = _sideEffectsCircularSeen;
-		_sideEffectsCircularSeen = false;
-		const result = walkSideEffectsRecursive(
+		// Fresh per-walk context; re-entrant calls (e.g.
+		// `ConcatenatedModule.getSideEffectsConnectionState` delegating back
+		// through here) get their own and can't clobber the outer walk.
+		return walkSideEffectsRecursive(
 			this,
 			moduleGraph,
 			0,
-			getHarmonyImportSideEffectDependency()
+			getHarmonyImportSideEffectDependency(),
+			{ circular: false }
 		);
-		_sideEffectsCircularSeen = savedCircular;
-		return result;
 	}
 
 	/**
@@ -1987,6 +2033,18 @@ class NormalModule extends Module {
 		return this._sourceTypes;
 	}
 
+	/**
+	 * Freshly recomputed source types when they depend on incoming connections, for chunk-graph cache invalidation; undefined otherwise. #20800
+	 * @returns {SourceTypes | undefined} source types or undefined
+	 */
+	getReferencedSourceTypes() {
+		const generator = /** @type {Generator} */ (this.generator);
+		// Bypass the _sourceTypes cache: it may be stale when the module is not rebuilt.
+		return generator.getTypesDependOnIncomingConnections()
+			? generator.getTypes(this)
+			: undefined;
+	}
+
 	/**
 	 * Generates code and runtime requirements for this module.
 	 * @param {CodeGenerationContext} context context for code generation
@@ -2005,7 +2063,7 @@ class NormalModule extends Module {
 		/** @type {RuntimeRequirements} */
 		const runtimeRequirements = new Set();
 
-		const { parsed } = /** @type {BuildInfo} */ (this.buildInfo);
+		const { parsed } = /** @type {NormalModuleBuildInfo} */ (this.buildInfo);
 
 		if (!parsed) {
 			runtimeRequirements.add(RuntimeGlobals.module);
@@ -2061,7 +2119,8 @@ class NormalModule extends Module {
 		const resultEntry = {
 			sources,
 			runtimeRequirements,
-			data: this._codeGeneratorData
+			data: this._codeGeneratorData,
+			hash: undefined
 		};
 		return resultEntry;
 	}
@@ -2097,7 +2156,7 @@ class NormalModule extends Module {
 		if (this.error) return callback(null, true);
 
 		const { cacheable, snapshot, valueDependencies } =
-			/** @type {BuildInfo} */ (this.buildInfo);
+			/** @type {NormalModuleBuildInfo} */ (this.buildInfo);
 
 		// always build when module is not cacheable
 		if (!cacheable) return callback(null, true);
@@ -2178,7 +2237,7 @@ class NormalModule extends Module {
 		buildDependencies
 	) {
 		const { snapshot, buildDependencies: buildDeps } =
-			/** @type {BuildInfo} */ (this.buildInfo);
+			/** @type {NormalModuleBuildInfo} */ (this.buildInfo);
 		if (snapshot) {
 			fileDependencies.addAll(snapshot.getFileIterable());
 			contextDependencies.addAll(snapshot.getContextIterable());
@@ -2188,7 +2247,7 @@ class NormalModule extends Module {
 				fileDependencies: fileDeps,
 				contextDependencies: contextDeps,
 				missingDependencies: missingDeps
-			} = /** @type {BuildInfo} */ (this.buildInfo);
+			} = /** @type {NormalModuleBuildInfo} */ (this.buildInfo);
 			if (fileDeps !== undefined) fileDependencies.addAll(fileDeps);
 			if (contextDeps !== undefined) contextDependencies.addAll(contextDeps);
 			if (missingDeps !== undefined) missingDependencies.addAll(missingDeps);
@@ -2205,7 +2264,7 @@ class NormalModule extends Module {
 	 * @returns {void}
 	 */
 	updateHash(hash, context) {
-		const buildInfo = /** @type {BuildInfo} */ (this.buildInfo);
+		const buildInfo = /** @type {NormalModuleBuildInfo} */ (this.buildInfo);
 		hash.update(
 			/** @type {string} */
 			(buildInfo.hash)
@@ -2239,6 +2298,7 @@ class NormalModule extends Module {
 		write(this._lastSuccessfulBuildMeta);
 		write(this._forceBuild);
 		write(this._codeGeneratorData);
+		write(this.hot);
 		super.serialize(context);
 	}
 
@@ -2247,7 +2307,8 @@ class NormalModule extends Module {
 	 * @returns {NormalModule} module
 	 */
 	static deserialize(context) {
-		const obj = new NormalModule({
+		// `new this` so subclasses without extra constructor options inherit this method
+		const obj = new this({
 			// will be deserialized by Module
 			layer: /** @type {EXPECTED_ANY} */ (null),
 			type: "",
@@ -2281,6 +2342,7 @@ class NormalModule extends Module {
 		this._lastSuccessfulBuildMeta = read();
 		this._forceBuild = read();
 		this._codeGeneratorData = read();
+		this.hot = read();
 		super.deserialize(context);
 	}
 }

package/lib/NormalModuleReplacementPlugin.js

@@ -22,7 +22,9 @@ class NormalModuleReplacementPlugin {
 	 * @param {string | ModuleReplacer} newResource the resource replacement
 	 */
 	constructor(resourceRegExp, newResource) {
+		/** @type {RegExp} */
 		this.resourceRegExp = resourceRegExp;
+		/** @type {string | ModuleReplacer} */
 		this.newResource = newResource;
 	}
 

package/lib/PrefetchPlugin.js

@@ -19,7 +19,9 @@ class PrefetchPlugin {
 	 */
 	constructor(context, request) {
 		if (request) {
+			/** @type {string | null} */
 			this.context = context;
+			/** @type {string} */
 			this.request = request;
 		} else {
 			this.context = null;

package/lib/ProgressPlugin.js

@@ -242,13 +242,21 @@ class ProgressPlugin {
 		this.options = options;
 
 		const merged = { ...DEFAULT_OPTIONS, ...options };
+		/** @type {boolean | null} */
 		this.profile = merged.profile;
+		/** @type {HandlerFn | undefined} */
 		this.handler = merged.handler;
+		/** @type {number} */
 		this.modulesCount = merged.modulesCount;
+		/** @type {number} */
 		this.dependenciesCount = merged.dependenciesCount;
+		/** @type {boolean} */
 		this.showEntries = merged.entries;
+		/** @type {boolean} */
 		this.showModules = merged.modules;
+		/** @type {boolean} */
 		this.showDependencies = merged.dependencies;
+		/** @type {boolean} */
 		this.showActiveModules = merged.activeModules;
 		this.percentBy = merged.percentBy;
 

package/lib/ProvidePlugin.js

@@ -28,6 +28,7 @@ class ProvidePlugin {
 	 * @param {Record<string, string | string[]>} definitions the provided identifiers
 	 */
 	constructor(definitions) {
+		/** @type {Record<string, string | string[]>} */
 		this.definitions = definitions;
 	}