@depup/webpack 5.109.0-depup.0 → 5.110.1-depup.0

package/lib/ExternalModuleFactoryPlugin.js

@@ -16,20 +16,28 @@ const ImportDependency = require("./dependencies/ImportDependency");
 const { coreModules } = require("./node/nodeBuiltins");
 const { cachedSetProperty, resolveByProperty } = require("./util/cleverMerge");
 
-/** @typedef {import("enhanced-resolve").ResolveContext} ResolveContext */
-/** @typedef {import("../declarations/WebpackOptions").ResolveOptions} ResolveOptions */
-/** @typedef {import("../declarations/WebpackOptions").ExternalsType} ExternalsType */
-/** @typedef {import("../declarations/WebpackOptions").ExternalItem} ExternalItem */
-/** @typedef {import("../declarations/WebpackOptions").ExternalItemValue} ExternalItemValue */
-/** @typedef {import("../declarations/WebpackOptions").ExternalItemObjectKnown} ExternalItemObjectKnown */
-/** @typedef {import("../declarations/WebpackOptions").ExternalItemObjectUnknown} ExternalItemObjectUnknown */
-/** @typedef {import("../declarations/WebpackOptions").ExternalItemInterop} ExternalItemInterop */
-/** @typedef {import("../declarations/WebpackOptions").Externals} Externals */
-/** @typedef {import("./Dependency")} Dependency */
-/** @typedef {import("./ExternalModule").DependencyMeta} DependencyMeta */
-/** @typedef {import("./ModuleFactory").IssuerLayer} IssuerLayer */
-/** @typedef {import("./ModuleFactory").ModuleFactoryCreateDataContextInfo} ModuleFactoryCreateDataContextInfo */
-/** @typedef {import("./NormalModuleFactory")} NormalModuleFactory */
+/** @import { ResolveContext } from "enhanced-resolve" */
+/**
+ * @import {
+ * 	ResolveOptions,
+ * 	ExternalsType,
+ * 	ExternalItem,
+ * 	ExternalItemValue,
+ * 	ExternalItemObjectKnown,
+ * 	ExternalItemObjectUnknown,
+ * 	ExternalItemInterop,
+ * 	Externals
+ * } from "../declarations/WebpackOptions"
+ */
+/** @import Dependency from "./Dependency" */
+/** @import { DependencyMeta, ExternalModuleRequest } from "./ExternalModule" */
+/**
+ * @import {
+ * 	IssuerLayer,
+ * 	ModuleFactoryCreateDataContextInfo
+ * } from "./ModuleFactory"
+ */
+/** @import NormalModuleFactory from "./NormalModuleFactory" */
 
 /** @typedef {((context: string, request: string, callback: (err?: Error | null, result?: string | false, resolveRequest?: import("enhanced-resolve").ResolveRequest) => void) => void)} ExternalItemFunctionDataGetResolveCallbackResult */
 /** @typedef {((context: string, request: string) => Promise<string>)} ExternalItemFunctionDataGetResolveResult */
@@ -43,6 +51,7 @@ const { cachedSetProperty, resolveByProperty } = require("./util/cleverMerge");
  * @property {string} dependencyType the category of the referencing dependency
  * @property {ExternalItemFunctionDataGetResolve} getResolve get a resolve function with the current resolver options
  * @property {string} request the request as written by the user in the require/import expression/statement
+ * @property {string} originalRequest same as `request`, except for an element of a context module (a request containing an expression), where it is the request as written by the user instead of the one relative to the resolved context directory
  */
 
 /** @typedef {((data: ExternalItemFunctionData, callback: (err?: (Error | null), result?: ExternalItemValue) => void) => void)} ExternalItemFunctionCallback */
@@ -115,7 +124,12 @@ const resolveLayer = (obj, layer) => {
 	return result;
 };
 
-/** @typedef {string | string[] | boolean | Record<string, string | string[]>} ExternalValue */
+// the keys `ExternalItemValueWithOptions` allows, mirroring the schema
+const OPTIONS_FORM_KEYS = new Set(["external", "sideEffects"]);
+
+/** @typedef {string | string[] | boolean | Record<string, string | string[]>} ExternalTargetValue */
+/** @typedef {{ external: ExternalTargetValue, sideEffects?: boolean }} ExternalValueWithOptions */
+/** @typedef {ExternalTargetValue | ExternalValueWithOptions} ExternalValue */
 
 const PLUGIN_NAME = "ExternalModuleFactoryPlugin";
 
@@ -145,6 +159,14 @@ class ExternalModuleFactoryPlugin {
 				const contextInfo = data.contextInfo;
 				const dependency = data.dependencies[0];
 				const dependencyType = data.dependencyType;
+				const request = dependency.request;
+				// a context element's request is relative to the resolved directory
+				// (`./file.mjs`), externals are written against what the user wrote
+				const originalRequest =
+					dependency instanceof ContextElementDependency
+						? dependency.originalRequest
+						: request;
+				const hasOriginalRequest = originalRequest !== request;
 
 				/** @typedef {(err?: Error | null, externalModule?: ExternalModule) => void} HandleExternalCallback */
 
@@ -156,12 +178,33 @@ class ExternalModuleFactoryPlugin {
 				 * @returns {void}
 				 */
 				const handleExternal = (value, type, callback) => {
-					if (value === false) {
+					/** @type {boolean | undefined} */
+					let sideEffects;
+					/** @type {ExternalTargetValue} */
+					let target;
+					// the options form carries the target under `external`; a target
+					// map holding an `external` type key keeps its own meaning
+					if (
+						typeof value === "object" &&
+						value !== null &&
+						!Array.isArray(value) &&
+						Object.prototype.hasOwnProperty.call(value, "external") &&
+						Object.keys(value).every((key) => OPTIONS_FORM_KEYS.has(key))
+					) {
+						const withOptions =
+							/** @type {ExternalValueWithOptions} */
+							(value);
+						sideEffects = withOptions.sideEffects;
+						target = withOptions.external;
+					} else {
+						target = /** @type {ExternalTargetValue} */ (value);
+					}
+					if (target === false) {
 						// Not externals, fallback to original factory
 						return callback();
 					}
-					/** @type {ExternalValue} */
-					let externalConfig = value === true ? dependency.request : value;
+					/** @type {ExternalModuleRequest} */
+					let externalConfig = target === true ? originalRequest : target;
 					// `interop` is a reserved key on the object form, not a target;
 					// pull it out so the rest stays a pure externalsType->request map.
 					/** @type {ExternalItemInterop | undefined} */
@@ -244,8 +287,12 @@ class ExternalModuleFactoryPlugin {
 						};
 					}
 
+					// a css `url()` reads the url out of the external: no js wrapper
+					// TODO webpack 6 drop "css-url" once the alias is removed
 					if (
-						resolvedType === "asset" &&
+						(resolvedType === "asset" ||
+							resolvedType === ASSET_URL_TYPE ||
+							resolvedType === "css-url") &&
 						dependency instanceof CssUrlDependency
 					) {
 						dependencyMeta = { sourceType: ASSET_URL_TYPE };
@@ -256,9 +303,10 @@ class ExternalModuleFactoryPlugin {
 						new ExternalModule(
 							externalConfig,
 							resolvedType,
-							dependency.request,
+							originalRequest,
 							dependencyMeta,
-							interop
+							interop,
+							sideEffects
 						)
 					);
 				};
@@ -272,10 +320,11 @@ class ExternalModuleFactoryPlugin {
 				const handleExternals = (externals, callback) => {
 					if (typeof externals === "string") {
 						if (
-							externals === dependency.request ||
-							externals === getAlternateCoreModuleRequest(dependency.request)
+							externals === request ||
+							(hasOriginalRequest && externals === originalRequest) ||
+							externals === getAlternateCoreModuleRequest(request)
 						) {
-							return handleExternal(dependency.request, undefined, callback);
+							return handleExternal(originalRequest, undefined, callback);
 						}
 					} else if (Array.isArray(externals)) {
 						let i = 0;
@@ -311,8 +360,11 @@ class ExternalModuleFactoryPlugin {
 						next();
 						return;
 					} else if (externals instanceof RegExp) {
-						if (externals.test(dependency.request)) {
-							return handleExternal(dependency.request, undefined, callback);
+						if (
+							externals.test(request) ||
+							(hasOriginalRequest && externals.test(originalRequest))
+						) {
+							return handleExternal(originalRequest, undefined, callback);
 						}
 					} else if (typeof externals === "function") {
 						/**
@@ -332,17 +384,13 @@ class ExternalModuleFactoryPlugin {
 						};
 						if (externals.length === 3) {
 							// TODO webpack 6 remove this
-							callDeprecatedExternals(
-								externals,
-								context,
-								dependency.request,
-								cb
-							);
+							callDeprecatedExternals(externals, context, request, cb);
 						} else {
 							const promise = externals(
 								{
 									context,
-									request: dependency.request,
+									request,
+									originalRequest,
 									dependencyType,
 									contextInfo,
 									getResolve: (options) => (context, request, callback) => {
@@ -401,21 +449,29 @@ class ExternalModuleFactoryPlugin {
 							(contextInfo.issuerLayer)
 						);
 						if (
+							Object.prototype.hasOwnProperty.call(resolvedExternals, request)
+						) {
+							return handleExternal(
+								resolvedExternals[request],
+								undefined,
+								callback
+							);
+						}
+						if (
+							hasOriginalRequest &&
 							Object.prototype.hasOwnProperty.call(
 								resolvedExternals,
-								dependency.request
+								originalRequest
 							)
 						) {
 							return handleExternal(
-								resolvedExternals[dependency.request],
+								resolvedExternals[originalRequest],
 								undefined,
 								callback
 							);
 						}
 						// Fall back to the `node:`-prefixed/unprefixed core module form.
-						const alternateRequest = getAlternateCoreModuleRequest(
-							dependency.request
-						);
+						const alternateRequest = getAlternateCoreModuleRequest(request);
 						if (
 							alternateRequest !== undefined &&
 							Object.prototype.hasOwnProperty.call(
@@ -439,4 +495,7 @@ class ExternalModuleFactoryPlugin {
 	}
 }
 
+ExternalModuleFactoryPlugin.getAlternateCoreModuleRequest =
+	getAlternateCoreModuleRequest;
+
 module.exports = ExternalModuleFactoryPlugin;

package/lib/ExternalsPlugin.js

@@ -9,11 +9,15 @@ const { ModuleExternalInitFragment } = require("./ExternalModule");
 const ExternalModuleFactoryPlugin = require("./ExternalModuleFactoryPlugin");
 const ConcatenatedModule = require("./optimize/ConcatenatedModule");
 
-/** @typedef {import("../declarations/WebpackOptions").ExternalsType} ExternalsType */
-/** @typedef {import("../declarations/WebpackOptions").Externals} Externals */
-/** @typedef {import("./Compiler")} Compiler */
-/** @typedef {import("./ExternalModule").Imported} Imported */
-/** @typedef {import("./Dependency")} Dependency */
+/**
+ * @import {
+ * 	ExternalsType,
+ * 	Externals
+ * } from "../declarations/WebpackOptions"
+ */
+/** @import Compiler from "./Compiler" */
+/** @import { Imported } from "./ExternalModule" */
+/** @import Dependency from "./Dependency" */
 
 const PLUGIN_NAME = "ExternalsPlugin";
 
@@ -53,7 +57,7 @@ class ExternalsPlugin {
 
 				const chunkInitFragments = moduleInfo.chunkInitFragments;
 				const moduleExternalInitFragments =
-					/** @type {ModuleExternalInitFragment[]} */
+					/** @type {InstanceType<ModuleExternalInitFragment>[]} */
 					(
 						chunkInitFragments
 							? /** @type {unknown[]} */

package/lib/FileSystemInfo.js

@@ -10,6 +10,7 @@ const { isAbsolute } = require("path");
 const { create: createResolver } = require("enhanced-resolve");
 const asyncLib = require("neo-async");
 const { DEFAULTS } = require("./config/defaults");
+const { collectCjsRequireSpecifiers } = require("./javascript/syntax");
 const AsyncQueue = require("./util/AsyncQueue");
 const StackedCacheMap = require("./util/StackedCacheMap");
 const createHash = require("./util/createHash");
@@ -18,16 +19,20 @@ const makeSerializable = require("./util/makeSerializable");
 const memoize = require("./util/memoize");
 const processAsyncTree = require("./util/processAsyncTree");
 
-/** @typedef {import("enhanced-resolve").ResolveRequest} ResolveRequest */
-/** @typedef {import("enhanced-resolve").ResolveFunctionAsync} ResolveFunctionAsync */
-/** @typedef {import("../declarations/WebpackOptions").HashFunction} HashFunction */
-/** @typedef {import("./logging/Logger").Logger} Logger */
-/** @typedef {import("./errors/WebpackError")} WebpackError */
-/** @typedef {import("./util/fs").JsonObject} JsonObject */
-/** @typedef {import("./util/fs").IStats} IStats */
-/** @typedef {import("./util/fs").InputFileSystem} InputFileSystem */
-/** @typedef {import("./serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("./serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+// only the mjs build-dependency walk needs it
+const getEsModuleLexer = memoize(() => require("es-module-lexer"));
+
+/** @import { ResolveRequest, ResolveFunctionAsync } from "enhanced-resolve" */
+/** @import { HashFunction } from "../declarations/WebpackOptions" */
+/** @import { Logger } from "./logging/Logger" */
+/** @import WebpackError from "./errors/WebpackError" */
+/** @import { JsonObject, IStats, InputFileSystem } from "./util/fs" */
+/**
+ * @import {
+ * 	ObjectDeserializerContext,
+ * 	ObjectSerializerContext
+ * } from "./serialization/ObjectMiddleware"
+ */
 /**
  * Defines the processor callback type used by this module.
  * @template T
@@ -297,6 +302,22 @@ class SnapshotIterable {
 /** @typedef {Set<string>} ManagedMissing */
 /** @typedef {Set<Snapshot>} Children */
 
+// `Snapshot._flags` bit for each optional field. Serialized as a whole integer,
+// so these values are a persisted-cache format contract — never renumber them.
+const SNAPSHOT_FLAG_START_TIME = 1;
+const SNAPSHOT_FLAG_FILE_TIMESTAMPS = 2;
+const SNAPSHOT_FLAG_FILE_HASHES = 4;
+const SNAPSHOT_FLAG_FILE_TSHS = 8;
+const SNAPSHOT_FLAG_CONTEXT_TIMESTAMPS = 0x10;
+const SNAPSHOT_FLAG_CONTEXT_HASHES = 0x20;
+const SNAPSHOT_FLAG_CONTEXT_TSHS = 0x40;
+const SNAPSHOT_FLAG_MISSING_EXISTENCE = 0x80;
+const SNAPSHOT_FLAG_MANAGED_ITEM_INFO = 0x100;
+const SNAPSHOT_FLAG_MANAGED_FILES = 0x200;
+const SNAPSHOT_FLAG_MANAGED_CONTEXTS = 0x400;
+const SNAPSHOT_FLAG_MANAGED_MISSING = 0x800;
+const SNAPSHOT_FLAG_CHILDREN = 0x1000;
+
 class Snapshot {
 	constructor() {
 		/** @type {number} */
@@ -336,7 +357,7 @@ class Snapshot {
 	}
 
 	hasStartTime() {
-		return (this._flags & 1) !== 0;
+		return (this._flags & SNAPSHOT_FLAG_START_TIME) !== 0;
 	}
 
 	/**
@@ -344,7 +365,7 @@ class Snapshot {
 	 * @param {number} value start value
 	 */
 	setStartTime(value) {
-		this._flags |= 1;
+		this._flags |= SNAPSHOT_FLAG_START_TIME;
 		this.startTime = value;
 	}
 
@@ -375,7 +396,7 @@ class Snapshot {
 	}
 
 	hasFileTimestamps() {
-		return (this._flags & 2) !== 0;
+		return (this._flags & SNAPSHOT_FLAG_FILE_TIMESTAMPS) !== 0;
 	}
 
 	/**
@@ -383,12 +404,12 @@ class Snapshot {
 	 * @param {FileTimestamps} value file timestamps
 	 */
 	setFileTimestamps(value) {
-		this._flags |= 2;
+		this._flags |= SNAPSHOT_FLAG_FILE_TIMESTAMPS;
 		this.fileTimestamps = value;
 	}
 
 	hasFileHashes() {
-		return (this._flags & 4) !== 0;
+		return (this._flags & SNAPSHOT_FLAG_FILE_HASHES) !== 0;
 	}
 
 	/**
@@ -396,12 +417,12 @@ class Snapshot {
 	 * @param {FileHashes} value file hashes
 	 */
 	setFileHashes(value) {
-		this._flags |= 4;
+		this._flags |= SNAPSHOT_FLAG_FILE_HASHES;
 		this.fileHashes = value;
 	}
 
 	hasFileTshs() {
-		return (this._flags & 8) !== 0;
+		return (this._flags & SNAPSHOT_FLAG_FILE_TSHS) !== 0;
 	}
 
 	/**
@@ -409,12 +430,12 @@ class Snapshot {
 	 * @param {FileTshs} value file tshs
 	 */
 	setFileTshs(value) {
-		this._flags |= 8;
+		this._flags |= SNAPSHOT_FLAG_FILE_TSHS;
 		this.fileTshs = value;
 	}
 
 	hasContextTimestamps() {
-		return (this._flags & 0x10) !== 0;
+		return (this._flags & SNAPSHOT_FLAG_CONTEXT_TIMESTAMPS) !== 0;
 	}
 
 	/**
@@ -422,12 +443,12 @@ class Snapshot {
 	 * @param {ContextTimestamps} value context timestamps
 	 */
 	setContextTimestamps(value) {
-		this._flags |= 0x10;
+		this._flags |= SNAPSHOT_FLAG_CONTEXT_TIMESTAMPS;
 		this.contextTimestamps = value;
 	}
 
 	hasContextHashes() {
-		return (this._flags & 0x20) !== 0;
+		return (this._flags & SNAPSHOT_FLAG_CONTEXT_HASHES) !== 0;
 	}
 
 	/**
@@ -435,12 +456,12 @@ class Snapshot {
 	 * @param {ContextHashes} value context hashes
 	 */
 	setContextHashes(value) {
-		this._flags |= 0x20;
+		this._flags |= SNAPSHOT_FLAG_CONTEXT_HASHES;
 		this.contextHashes = value;
 	}
 
 	hasContextTshs() {
-		return (this._flags & 0x40) !== 0;
+		return (this._flags & SNAPSHOT_FLAG_CONTEXT_TSHS) !== 0;
 	}
 
 	/**
@@ -448,12 +469,12 @@ class Snapshot {
 	 * @param {ContextTshs} value context tshs
 	 */
 	setContextTshs(value) {
-		this._flags |= 0x40;
+		this._flags |= SNAPSHOT_FLAG_CONTEXT_TSHS;
 		this.contextTshs = value;
 	}
 
 	hasMissingExistence() {
-		return (this._flags & 0x80) !== 0;
+		return (this._flags & SNAPSHOT_FLAG_MISSING_EXISTENCE) !== 0;
 	}
 
 	/**
@@ -461,12 +482,12 @@ class Snapshot {
 	 * @param {MissingExistence} value context tshs
 	 */
 	setMissingExistence(value) {
-		this._flags |= 0x80;
+		this._flags |= SNAPSHOT_FLAG_MISSING_EXISTENCE;
 		this.missingExistence = value;
 	}
 
 	hasManagedItemInfo() {
-		return (this._flags & 0x100) !== 0;
+		return (this._flags & SNAPSHOT_FLAG_MANAGED_ITEM_INFO) !== 0;
 	}
 
 	/**
@@ -474,12 +495,12 @@ class Snapshot {
 	 * @param {ManagedItemInfo} value managed item info
 	 */
 	setManagedItemInfo(value) {
-		this._flags |= 0x100;
+		this._flags |= SNAPSHOT_FLAG_MANAGED_ITEM_INFO;
 		this.managedItemInfo = value;
 	}
 
 	hasManagedFiles() {
-		return (this._flags & 0x200) !== 0;
+		return (this._flags & SNAPSHOT_FLAG_MANAGED_FILES) !== 0;
 	}
 
 	/**
@@ -487,12 +508,12 @@ class Snapshot {
 	 * @param {ManagedFiles} value managed files
 	 */
 	setManagedFiles(value) {
-		this._flags |= 0x200;
+		this._flags |= SNAPSHOT_FLAG_MANAGED_FILES;
 		this.managedFiles = value;
 	}
 
 	hasManagedContexts() {
-		return (this._flags & 0x400) !== 0;
+		return (this._flags & SNAPSHOT_FLAG_MANAGED_CONTEXTS) !== 0;
 	}
 
 	/**
@@ -500,12 +521,12 @@ class Snapshot {
 	 * @param {ManagedContexts} value managed contexts
 	 */
 	setManagedContexts(value) {
-		this._flags |= 0x400;
+		this._flags |= SNAPSHOT_FLAG_MANAGED_CONTEXTS;
 		this.managedContexts = value;
 	}
 
 	hasManagedMissing() {
-		return (this._flags & 0x800) !== 0;
+		return (this._flags & SNAPSHOT_FLAG_MANAGED_MISSING) !== 0;
 	}
 
 	/**
@@ -513,12 +534,12 @@ class Snapshot {
 	 * @param {ManagedMissing} value managed missing
 	 */
 	setManagedMissing(value) {
-		this._flags |= 0x800;
+		this._flags |= SNAPSHOT_FLAG_MANAGED_MISSING;
 		this.managedMissing = value;
 	}
 
 	hasChildren() {
-		return (this._flags & 0x1000) !== 0;
+		return (this._flags & SNAPSHOT_FLAG_CHILDREN) !== 0;
 	}
 
 	/**
@@ -526,7 +547,7 @@ class Snapshot {
 	 * @param {Children} value children
 	 */
 	setChildren(value) {
-		this._flags |= 0x1000;
+		this._flags |= SNAPSHOT_FLAG_CHILDREN;
 		this.children = value;
 	}
 
@@ -1186,6 +1207,15 @@ const getManagedItem = (managedPath, path) => {
 	return path.slice(0, i);
 };
 
+/**
+ * The managed directory a `snapshot.managedPaths` RegExp matched. The schema
+ * documents it as matching that directory, so a capture-less pattern is it.
+ * @param {RegExpExecArray} match a match of a managed path RegExp
+ * @returns {string} the managed directory
+ */
+const getManagedPathFromMatch = (match) =>
+	match[1] === undefined ? match[0] : match[1];
+
 /**
  * Gets resolved timestamp.
  * @template {ContextFileSystemInfoEntry | ContextTimestampAndHash} T
@@ -1219,7 +1249,9 @@ const addAll = (source, target) => {
 	for (const key of source) target.add(key);
 };
 
-const getEsModuleLexer = memoize(() => require("es-module-lexer"));
+// Bun doesn't populate `require.cache` `module.children`, so the CJS build-dependency
+// walk needs a source-parsing fallback there. Node/Deno populate it — never pay for it.
+const IS_BUN = Boolean(process.versions.bun);
 
 /** @typedef {Set<string>} LoggedPaths */
 
@@ -2213,6 +2245,36 @@ class FileSystemInfo {
 									});
 								}
 							}
+							// On Bun the children array is empty (unpopulated), so recover the
+							// static require() specifiers by parsing the source; Node/Deno don't.
+							/* istanbul ignore next */
+							if (IS_BUN && module.children.length === 0) {
+								this.fs.readFile(path, (err, content) => {
+									if (err) return callback(err);
+									try {
+										const context = dirname(this.fs, path);
+										const source = /** @type {Buffer} */ (content).toString();
+										for (const dependency of collectCjsRequireSpecifiers(
+											source
+										)) {
+											if (dependency.startsWith("node:")) continue;
+											if (builtinModules.has(dependency)) continue;
+											push({
+												type: RBDT_RESOLVE_CJS_FILE,
+												context,
+												path: dependency,
+												// Best effort: tolerate specifiers that don't resolve.
+												expected: false,
+												issuer: job
+											});
+										}
+									} catch (_err) {
+										// Source we can't parse as CommonJS — ignore its dependencies.
+									}
+									process.nextTick(callback);
+								});
+								break;
+							}
 						} else if (supportsEsm && /\.m?js$/.test(path)) {
 							if (!this._warnAboutExperimentalEsmTracking) {
 								logger.log(
@@ -2610,7 +2672,10 @@ class FileSystemInfo {
 			for (const managedPath of this.managedPathsRegExps) {
 				const match = managedPath.exec(path);
 				if (match) {
-					const managedItem = getManagedItem(match[1], path);
+					const managedItem = getManagedItem(
+						getManagedPathFromMatch(match),
+						path
+					);
 					if (managedItem) {
 						classificationCache.set(path, managedItem);
 						managedItems.add(managedItem);
@@ -3868,7 +3933,10 @@ class FileSystemInfo {
 					for (const managedPath of this.managedPathsRegExps) {
 						const match = managedPath.exec(path);
 						if (match) {
-							const managedItem = getManagedItem(match[1], path);
+							const managedItem = getManagedItem(
+								getManagedPathFromMatch(match),
+								path
+							);
 							if (managedItem) {
 								// construct timestampHash from managed info
 								return this.managedItemQueue.add(managedItem, (err, info) => {
@@ -4232,12 +4300,17 @@ class FileSystemInfo {
 		/**
 		 * Processes the provided timestamp.
 		 * @param {ContextTimestamp} timestamp timestamp
-		 * @param {ContextHash} hash hash
+		 * @param {ContextHash | null} hash hash
 		 */
 		const finalize = (timestamp, hash) => {
+			// Merging two `null` reads yields `{}`, which reads as "exists, no hash" (#21636)
 			const result =
 				/** @type {ContextTimestampAndHash} */
-				(timestamp === "ignore" ? hash : { ...timestamp, ...hash });
+				(
+					hash === null || timestamp === "ignore"
+						? hash
+						: { ...timestamp, ...hash }
+				);
 			this._contextTshs.set(path, result);
 			callback(null, result);
 		};
@@ -4555,5 +4628,6 @@ class FileSystemInfo {
 	}
 }
 
+FileSystemInfo.Snapshot = Snapshot;
+
 module.exports = FileSystemInfo;
-module.exports.Snapshot = Snapshot;

package/lib/FlagAllModulesAsUsedPlugin.js

@@ -7,9 +7,8 @@
 
 const { getEntryRuntime, mergeRuntimeOwned } = require("./util/runtime");
 
-/** @typedef {import("./Compiler")} Compiler */
-/** @typedef {import("./Module").FactoryMeta} FactoryMeta */
-/** @typedef {import("./util/runtime").RuntimeSpec} RuntimeSpec */
+/** @import Compiler from "./Compiler" */
+/** @import { RuntimeSpec } from "./util/runtime" */
 
 const PLUGIN_NAME = "FlagAllModulesAsUsedPlugin";
 class FlagAllModulesAsUsedPlugin {