webpack 5.111.1 → 5.112.1

package/lib/asset/RawDataUrlModule.js

@@ -6,13 +6,15 @@
 "use strict";
 
 const { RawSource } = require("webpack-sources");
-const Module = require("../Module");
+const Module = require("../module/Module");
 const {
 	JAVASCRIPT_TYPE,
 	JAVASCRIPT_TYPES
-} = require("../ModuleSourceTypeConstants");
-const { ASSET_MODULE_TYPE_RAW_DATA_URL } = require("../ModuleTypeConstants");
-const RuntimeGlobals = require("../RuntimeGlobals");
+} = require("../module/ModuleSourceTypeConstants");
+const {
+	ASSET_MODULE_TYPE_RAW_DATA_URL
+} = require("../module/ModuleTypeConstants");
+const RuntimeGlobals = require("../runtime/RuntimeGlobals");
 const makeSerializable = require("../util/makeSerializable");
 
 /**
@@ -21,7 +23,7 @@ const makeSerializable = require("../util/makeSerializable");
  * } from "../config/defaults"
  */
 /** @import Compilation from "../Compilation" */
-/** @import { UpdateHashContext } from "../Dependency" */
+/** @import { UpdateHashContext } from "../graph/Dependency" */
 /**
  * @import {
  * 	BuildCallback,
@@ -33,14 +35,14 @@ const makeSerializable = require("../util/makeSerializable");
  * 	NeedBuildContext,
  * 	Sources,
  * 	SourceTypes
- * } from "../Module"
+ * } from "../module/Module"
  */
-/** @import RequestShortener from "../RequestShortener" */
-/** @import { ResolverWithOptions } from "../ResolverFactory" */
+/** @import RequestShortener from "../util/RequestShortener" */
+/** @import { ResolverWithOptions } from "../resolve/ResolverFactory" */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Buffer | undefined, string, string]>} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Buffer | undefined, string, string]>} ObjectSerializerContext */
 /** @import Hash from "../util/Hash" */
-/** @import { InputFileSystem } from "../util/fs" */
+/** @import { InputFileSystem } from "../fs/fs" */
 
 class RawDataUrlModule extends Module {
 	/**
@@ -192,6 +194,11 @@ class RawDataUrlModule extends Module {
 	}
 }
 
-makeSerializable(RawDataUrlModule, "webpack/lib/asset/RawDataUrlModule");
+makeSerializable(RawDataUrlModule, [
+	"webpack/lib/asset/RawDataUrlModule",
+	// TODO in the next major release: remove, it restores caches written
+	// before this moved into lib/asset/
+	"webpack/lib/RawDataUrlModule"
+]);
 
 module.exports = RawDataUrlModule;

package/lib/asset/WebManifestGenerator.js

@@ -6,20 +6,20 @@
 "use strict";
 
 const { RawSource, ReplaceSource } = require("webpack-sources");
-const { ASSET_URL_TYPE } = require("../ModuleSourceTypeConstants");
+const { ASSET_URL_TYPE } = require("../module/ModuleSourceTypeConstants");
 const createHash = require("../util/createHash");
 const nonNumericOnlyHash = require("../util/nonNumericOnlyHash");
 const { PUBLIC_PATH_AUTO } = require("../util/publicPathPlaceholder");
 const AssetGenerator = require("./AssetGenerator");
 
 /** @import { Source } from "webpack-sources" */
-/** @import CodeGenerationResults from "../CodeGenerationResults" */
+/** @import CodeGenerationResults from "../module/CodeGenerationResults" */
 /** @import { DependencyConstructor } from "../Compilation" */
-/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
-/** @import { GenerateContext } from "../Generator" */
-/** @import { SourceType, SourceTypes } from "../Module" */
-/** @import ModuleGraph from "../ModuleGraph" */
-/** @import NormalModule from "../NormalModule" */
+/** @import { DependencyTemplateContext } from "../template/DependencyTemplate" */
+/** @import { GenerateContext } from "../module/Generator" */
+/** @import { SourceType, SourceTypes } from "../module/Module" */
+/** @import ModuleGraph from "../graph/ModuleGraph" */
+/** @import { AssetNormalModule } from "./AssetModule" */
 
 const WEBMANIFEST_TYPE = "webmanifest";
 const WEBMANIFEST_TYPES = new Set([WEBMANIFEST_TYPE]);
@@ -28,6 +28,11 @@ const WEBMANIFEST_AND_ASSET_URL_TYPES = new Set([
 	ASSET_URL_TYPE
 ]);
 
+/**
+ * The module type the JSDoc inherited from `Generator` names.
+ * @typedef {AssetNormalModule} TModule
+ */
+
 /**
  * A Web App Manifest is a "typed asset": a variant of `AssetGenerator` (reusing
  * its filename/hash and `ASSET_URL_TYPE` machinery) whose emitted content is the
@@ -46,7 +51,7 @@ class WebManifestGenerator extends AssetGenerator {
 
 	/**
 	 * Returns the source types available for this module.
-	 * @param {NormalModule} module fresh module
+	 * @param {TModule} module fresh module
 	 * @returns {SourceTypes} available types (do not mutate)
 	 */
 	getTypes(module) {
@@ -58,7 +63,7 @@ class WebManifestGenerator extends AssetGenerator {
 
 	/**
 	 * Returns the estimated size for the requested source type.
-	 * @param {NormalModule} module the module
+	 * @param {TModule} module the module
 	 * @param {SourceType=} type source type
 	 * @returns {number} estimate size of the module
 	 */
@@ -69,7 +74,7 @@ class WebManifestGenerator extends AssetGenerator {
 
 	/**
 	 * Rewrites each icon `src` in the raw manifest to its emitted asset URL.
-	 * @param {NormalModule} module the manifest module
+	 * @param {TModule} module the manifest module
 	 * @param {GenerateContext} generateContext context for generate
 	 * @returns {string} the rewritten manifest content
 	 */
@@ -111,7 +116,7 @@ class WebManifestGenerator extends AssetGenerator {
 
 	/**
 	 * Generates generated code for this runtime module.
-	 * @param {NormalModule} module module for which the code should be generated
+	 * @param {TModule} module module for which the code should be generated
 	 * @param {GenerateContext} generateContext context for generate
 	 * @returns {Source | null} generated code
 	 */
@@ -133,7 +138,7 @@ class WebManifestGenerator extends AssetGenerator {
 		);
 		const contentHash = nonNumericOnlyHash(
 			fullContentHash,
-			/** @type {number} */ (outputOptions.hashDigestLength)
+			outputOptions.hashDigestLength
 		);
 		const { filename, assetInfo } = AssetGenerator.getFilenameWithInfo(
 			module,

package/lib/asset/WebManifestParser.js

@@ -5,13 +5,13 @@
 
 "use strict";
 
-const Parser = require("../Parser");
-const HtmlSourceDependency = require("../dependencies/HtmlSourceDependency");
-const { parse } = require("../javascript/syntax");
+const HtmlSourceDependency = require("../dependencies/html/HtmlSourceDependency");
+const { parse } = require("../javascript/syntax-parser");
+const Parser = require("../module/Parser");
 
 /** @import { Expression, ObjectExpression, Program, Property } from "estree" */
-/** @import { BuildInfo } from "../Module" */
-/** @import { ParserState, PreparsedAst } from "../Parser" */
+/** @import { BuildInfo } from "../module/Module" */
+/** @import { ParserState, PreparsedAst } from "../module/Parser" */
 
 // the parser decorates every node with numeric source offsets (absent from the estree types).
 /** @typedef {{ start: number, end: number }} Positioned */
@@ -51,7 +51,7 @@ class WebManifestParser extends Parser {
 			source = source.slice(1);
 			leadingBytes = binary ? BOM_BYTE_LENGTH : 1;
 		}
-		const text = /** @type {string} */ (source);
+		const text = source;
 		const asciiOnly = !binary || Buffer.byteLength(text) === text.length;
 		/**
 		 * @param {number} offset offset in UTF-16 code units into `text`
@@ -121,8 +121,8 @@ class WebManifestParser extends Parser {
 						if (!buildHttp && ABSOLUTE_URL_SCHEME_REGEXP.test(url)) continue;
 						// acorn offsets are into `(${source})`; the leading `(` and the
 						// opening quote cancel, so the inner span is [start, end - 2].
-						const { start, end } = /** @type {Positioned} */ (
-							/** @type {unknown} */ (value)
+						const { start, end } = /** @type {Expression & Positioned} */ (
+							value
 						);
 						const dep = new HtmlSourceDependency(url, [
 							toSourceOffset(start),

package/lib/async-modules/AsyncModuleHelpers.js

@@ -5,10 +5,10 @@
 
 "use strict";
 
-const HarmonyImportDependency = require("../dependencies/HarmonyImportDependency");
+const isDependencyKind = require("../graph/isDependencyKind");
 
-/** @import ModuleGraph from "../ModuleGraph" */
-/** @import Module from "../Module" */
+/** @import ModuleGraph from "../graph/ModuleGraph" */
+/** @import Module from "../module/Module" */
 
 /** @typedef {Set<Module>} Modules */
 
@@ -35,7 +35,12 @@ const getOutgoingAsyncModules = (moduleGraph, module) => {
 				// Walk the imports in source order: the spec gathers these from
 				// `[[RequestedModules]]`, and their evaluation order is observable.
 				for (const dependency of module.dependencies) {
-					if (!(dependency instanceof HarmonyImportDependency)) continue;
+					if (
+						!isDependencyKind(dependency, "esm-import") &&
+						!isDependencyKind(dependency, "provided")
+					) {
+						continue;
+					}
 					const referenced = moduleGraph.getModule(dependency);
 					if (!referenced || seen.has(referenced)) continue;
 					const connections = outgoingConnectionMap.get(referenced);
@@ -43,7 +48,9 @@ const getOutgoingAsyncModules = (moduleGraph, module) => {
 						connections &&
 						connections.some(
 							(c) =>
-								c.dependency instanceof HarmonyImportDependency &&
+								c.dependency !== null &&
+								(isDependencyKind(c.dependency, "esm-import") ||
+									isDependencyKind(c.dependency, "provided")) &&
 								c.isTargetActive(undefined)
 						)
 					) {

package/lib/async-modules/AwaitDependenciesInitFragment.js

@@ -5,12 +5,12 @@
 
 "use strict";
 
-const InitFragment = require("../InitFragment");
-const RuntimeGlobals = require("../RuntimeGlobals");
-const Template = require("../Template");
+const RuntimeGlobals = require("../runtime/RuntimeGlobals");
+const InitFragment = require("../template/InitFragment");
+const Template = require("../template/Template");
 
 /** @import { Source } from "webpack-sources" */
-/** @import { GenerateContext } from "../Generator" */
+/** @import { GenerateContext } from "../module/Generator" */
 
 /** @typedef {Map<string, string>} Dependencies */
 

package/lib/async-modules/InferAsyncModulesPlugin.js

@@ -5,10 +5,10 @@
 
 "use strict";
 
-const HarmonyImportDependency = require("../dependencies/HarmonyImportDependency");
+const isDependencyKind = require("../graph/isDependencyKind");
 
 /** @import Compiler from "../Compiler" */
-/** @import Module from "../Module" */
+/** @import Module, { BuildMeta } from "../module/Module" */
 
 const PLUGIN_NAME = "InferAsyncModulesPlugin";
 
@@ -38,7 +38,13 @@ class InferAsyncModulesPlugin {
 						if (
 							connections.some(
 								(c) =>
-									c.dependency instanceof HarmonyImportDependency &&
+									c.dependency !== null &&
+									(isDependencyKind(c.dependency, "esm-import") ||
+										// only an ESM module has the async wrapper to await it in
+										(isDependencyKind(c.dependency, "provided") &&
+											/** @type {BuildMeta} */
+											(/** @type {Module} */ (originModule).buildMeta)
+												.exportsType === "namespace")) &&
 									c.isTargetActive(undefined)
 							)
 						) {

package/lib/async-modules/isGeneratorLowered.js

@@ -4,9 +4,9 @@
 
 "use strict";
 
-/** @import Module from "../Module" */
-/** @import ModuleGraph from "../ModuleGraph" */
-/** @import RuntimeTemplate from "../RuntimeTemplate" */
+/** @import Module from "../module/Module" */
+/** @import ModuleGraph from "../graph/ModuleGraph" */
+/** @import RuntimeTemplate from "../template/RuntimeTemplate" */
 
 /**
  * Whether an async module is lowered to a generator: the target has no

package/lib/bun/BunTargetPlugin.js

@@ -5,7 +5,7 @@
 
 "use strict";
 
-const ExternalsPlugin = require("../ExternalsPlugin");
+const ExternalsPlugin = require("../externals/ExternalsPlugin");
 const { coreModules } = require("../node/nodeBuiltins");
 
 /** @import Compiler from "../Compiler" */

package/lib/cache/AddBuildDependenciesPlugin.js

@@ -15,30 +15,13 @@ const PLUGIN_NAME = "AddBuildDependenciesPlugin";
  * @property {boolean} optional when true the dependency may be missing
  */
 
-/**
- * @param {string | { dependency: string, optional?: boolean }} item build dependency
- * @returns {NormalizedBuildDependencyItem} normalized build dependency
- */
-const normalizeBuildDependencyItem = (item) => {
-	if (typeof item === "string") {
-		return { dependency: item, optional: false };
-	}
-	return {
-		dependency: item.dependency,
-		optional: Boolean(item.optional)
-	};
-};
-
 class AddBuildDependenciesPlugin {
 	/**
 	 * Creates an instance of AddBuildDependenciesPlugin.
-	 * @param {Iterable<string | { dependency: string, optional?: boolean }>} buildDependencies list of build dependencies
+	 * @param {NormalizedBuildDependencyItem[]} buildDependencies normalized build dependencies
 	 */
 	constructor(buildDependencies) {
-		/** @type {NormalizedBuildDependencyItem[]} */
-		this.buildDependencies = [...buildDependencies].map(
-			normalizeBuildDependencyItem
-		);
+		this.buildDependencies = [...buildDependencies];
 	}
 
 	/**

package/lib/{Cache.js → cache/Cache.js}

@@ -9,7 +9,7 @@ const { AsyncParallelHook, AsyncSeriesBailHook, SyncHook } = require("tapable");
 const {
 	makeWebpackError,
 	makeWebpackErrorCallback
-} = require("./errors/HookWebpackError");
+} = require("../errors/HookWebpackError");
 
 /**
  * Cache validation token whose string representation identifies the build

package/lib/{CacheFacade.js → cache/CacheFacade.js}

@@ -6,13 +6,13 @@
 "use strict";
 
 const { forEachBail } = require("enhanced-resolve");
-const getLazyHashedEtag = require("./cache/getLazyHashedEtag");
-const mergeEtags = require("./cache/mergeEtags");
-const asyncLib = require("./util/async");
+const asyncLib = require("../util/async");
+const getLazyHashedEtag = require("./getLazyHashedEtag");
+const mergeEtags = require("./mergeEtags");
 
 /** @import Cache, { Etag } from "./Cache" */
-/** @import { HashableObject } from "./cache/getLazyHashedEtag" */
-/** @import { HashFunction } from "./util/Hash" */
+/** @import { HashableObject } from "./getLazyHashedEtag" */
+/** @import { HashFunction } from "../util/Hash" */
 
 /**
  * Defines the callback cache callback.
@@ -42,7 +42,7 @@ class MultiItemCache {
 		this._items = items;
 		// @ts-expect-error expected - returns the single ItemCacheFacade when passed an array of length 1
 		// eslint-disable-next-line no-constructor-return
-		if (items.length === 1) return /** @type {ItemCacheFacade} */ (items[0]);
+		if (items.length === 1) return items[0];
 	}
 
 	/**

package/lib/cache/IdleFileCachePlugin.js

@@ -5,8 +5,8 @@
 
 "use strict";
 
-const Cache = require("../Cache");
-const ProgressPlugin = require("../ProgressPlugin");
+const ProgressPlugin = require("../logging/ProgressPlugin");
+const Cache = require("./Cache");
 
 /** @import Compiler from "../Compiler" */
 /** @import PackFileCacheStrategy from "./PackFileCacheStrategy" */

package/lib/cache/MemoryCachePlugin.js

@@ -5,9 +5,9 @@
 
 "use strict";
 
-const Cache = require("../Cache");
+const Cache = require("./Cache");
 
-/** @import { Data, Etag } from "../Cache" */
+/** @import { Data, Etag } from "./Cache" */
 /** @import Compiler from "../Compiler" */
 
 class MemoryCachePlugin {

package/lib/cache/MemoryWithGcCachePlugin.js

@@ -5,9 +5,9 @@
 
 "use strict";
 
-const Cache = require("../Cache");
+const Cache = require("./Cache");
 
-/** @import { Data, Etag } from "../Cache" */
+/** @import { Data, Etag } from "./Cache" */
 /** @import Compiler from "../Compiler" */
 
 /**

package/lib/cache/PackFileCacheStrategy.js

@@ -5,8 +5,8 @@
 
 "use strict";
 
-const FileSystemInfo = require("../FileSystemInfo");
-const ProgressPlugin = require("../ProgressPlugin");
+const FileSystemInfo = require("../fs/FileSystemInfo");
+const ProgressPlugin = require("../logging/ProgressPlugin");
 const { getReferencedFilenames } = require("../serialization/FileMiddleware");
 const SerializerMiddleware = require("../serialization/SerializerMiddleware");
 const LazySet = require("../util/LazySet");
@@ -20,14 +20,14 @@ const {
 
 /** @import { SnapshotOptions } from "../../declarations/WebpackOptions" */
 /** @import { FileSystemDependencies } from "../Compilation" */
-/** @import { Data, Etag } from "../Cache" */
+/** @import { Data, Etag } from "./Cache" */
 /** @import Compiler from "../Compiler" */
 /**
  * @import {
  * 	ResolveBuildDependenciesResult,
  * 	ResolveResults,
  * 	Snapshot
- * } from "../FileSystemInfo"
+ * } from "../fs/FileSystemInfo"
  */
 /** @import { Logger } from "../logging/Logger" */
 /**
@@ -37,7 +37,7 @@ const {
  * } from "../serialization/ObjectMiddleware"
  */
 /** @import { HashFunction } from "../util/Hash" */
-/** @import { IntermediateFileSystem } from "../util/fs" */
+/** @import { IntermediateFileSystem } from "../fs/fs" */
 
 /** @typedef {Set<string>} Items */
 /** @typedef {Set<string>} BuildDependencies */
@@ -215,7 +215,7 @@ class Pack {
 		if (!this.content[loc]) {
 			return;
 		}
-		return /** @type {PackContent} */ (this.content[loc]).get(identifier);
+		return this.content[loc].get(identifier);
 	}
 
 	/**
@@ -328,7 +328,9 @@ class Pack {
 			let ignoreNextTimeTick = false;
 			const createNextPack = () => {
 				const loc = this._findLocation();
-				this.content[loc] = /** @type {EXPECTED_ANY} */ (null); // reserve
+				this.content[loc] = /** @type {PackContent} */ (
+					/** @type {PackContent | null} */ (null)
+				); // reserve
 				/** @type {PackItem} */
 				const pack = {
 					items: new Set(),
@@ -1010,9 +1012,7 @@ class PackContent {
 				);
 				logger.time(timeMessage);
 			}
-			const value =
-				/** @type {PackContentItems | Promise<PackContentItems>} */
-				(this.lazy());
+			const value = this.lazy();
 			if ("then" in value) {
 				return value.then((data) => {
 					if (timeMessage) {
@@ -1190,7 +1190,7 @@ class PackFileCacheStrategy {
 		compression,
 		readonly
 	}) {
-		/** @type {import("../serialization/Serializer")<PackContainer, null, EXPECTED_OBJECT>} */
+		/** @type {import("../serialization/Serializer")<PackContainer, null, import("../serialization/FileMiddleware").Context>} */
 		this.fileSerializer = createFileSerializer(
 			fs,
 			/** @type {HashFunction} */
@@ -1789,11 +1789,7 @@ class PackFileCacheStrategy {
 				const mtimeMs = await new Promise((resolve, reject) => {
 					fs.stat(file, (err, stats) => {
 						if (err) return reject(err);
-						resolve(
-							/** @type {number} */ (
-								/** @type {import("../util/fs").IStats} */ (stats).mtimeMs
-							)
-						);
+						resolve(/** @type {import("../fs/fs").IStats} */ (stats).mtimeMs);
 					});
 				});
 				const entry = referencedFilesCache.get(name);
@@ -1826,9 +1822,7 @@ class PackFileCacheStrategy {
 				const stats = await new Promise((resolve) => {
 					fs.stat(path, (err, stats) => {
 						resolve(
-							err
-								? undefined
-								: /** @type {import("../util/fs").IStats} */ (stats)
+							err ? undefined : /** @type {import("../fs/fs").IStats} */ (stats)
 						);
 					});
 				});

package/lib/cache/ResolverCachePlugin.js

@@ -5,6 +5,7 @@
 
 "use strict";
 
+const getResolveOptionsKey = require("../resolve/getResolveOptionsKey");
 const LazySet = require("../util/LazySet");
 const makeSerializable = require("../util/makeSerializable");
 
@@ -16,15 +17,14 @@ const makeSerializable = require("../util/makeSerializable");
  * 	Resolver
  * } from "enhanced-resolve"
  */
-/** @import { ItemCacheFacade } from "../CacheFacade" */
+/** @import { ItemCacheFacade } from "./CacheFacade" */
 /** @import Compiler from "../Compiler" */
 /**
  * @import FileSystemInfo, {
  * 	Snapshot,
  * 	SnapshotOptions
- * } from "../FileSystemInfo"
+ * } from "../fs/FileSystemInfo"
  */
-/** @import { ResolveOptionsWithDependencyType } from "../ResolverFactory" */
 /**
  * @import {
  * 	ObjectDeserializerContext,
@@ -127,6 +127,10 @@ class ResolverCachePlugin {
 		let fileSystemInfo;
 		/** @type {SnapshotOptions | undefined} */
 		let snapshotOptions;
+		// paths the watcher reported for this build; a snapshot can miss them when
+		// the resolve read a cached file system state, e.g. inside a managed path
+		/** @type {Set<string> | undefined} */
+		let changedPaths;
 		let realResolves = 0;
 		let cachedResolves = 0;
 		let cacheInvalidResolves = 0;
@@ -136,10 +140,17 @@ class ResolverCachePlugin {
 		compiler.hooks.shutdown.tap(PLUGIN_NAME, () => {
 			fileSystemInfo = undefined;
 			snapshotOptions = undefined;
+			changedPaths = undefined;
 		});
 		compiler.hooks.thisCompilation.tap(PLUGIN_NAME, (compilation) => {
 			snapshotOptions = compilation.options.snapshot.resolve;
 			fileSystemInfo = compilation.fileSystemInfo;
+			const { modifiedFiles, removedFiles } = compiler;
+			changedPaths =
+				(modifiedFiles && modifiedFiles.size > 0) ||
+				(removedFiles && removedFiles.size > 0)
+					? new Set([...(modifiedFiles || []), ...(removedFiles || [])])
+					: undefined;
 			compilation.hooks.finishModules.tap(PLUGIN_NAME, () => {
 				if (realResolves + cachedResolves > 0) {
 					const logger = compilation.getLogger(`webpack.${PLUGIN_NAME}`);
@@ -156,6 +167,24 @@ class ResolverCachePlugin {
 			});
 		});
 
+		/**
+		 * @param {InstanceType<Snapshot>} snapshot snapshot of a cached resolve
+		 * @returns {boolean} true, when the watcher reported one of its paths
+		 */
+		const dependsOnChangedPath = (snapshot) => {
+			if (changedPaths === undefined) return false;
+			for (const iterable of [
+				snapshot.getMissingIterable(),
+				snapshot.getFileIterable(),
+				snapshot.getContextIterable()
+			]) {
+				for (const item of iterable) {
+					if (changedPaths.has(item)) return true;
+				}
+			}
+			return false;
+		};
+
 		/** @typedef {(err?: Error | null, resolveRequest?: ResolveRequest | null) => void} Callback */
 		/** @typedef {ResolveRequest & { _ResolverCachePluginCacheMiss: true }} ResolveRequestWithCacheMiss */
 
@@ -226,9 +255,20 @@ class ResolverCachePlugin {
 					const fileDependencies = newResolveContext.fileDependencies;
 					const contextDependencies = newResolveContext.contextDependencies;
 					const missingDependencies = newResolveContext.missingDependencies;
-					// Only reachable past the `!fileSystemInfo` guard on the resolve tap.
-					const fsInfo = /** @type {FileSystemInfo} */ (fileSystemInfo);
-					fsInfo.createSnapshot(
+					const resolveResult = withYield ? yieldResult : result;
+					// the compiler was closed while resolving, e.g. after a bailed build
+					if (!fileSystemInfo) {
+						if (withYield && result) {
+							/** @type {ResolveRequest[]} */
+							(yieldResult).push(result);
+						}
+						return callback(
+							null,
+							/** @type {ResolveRequest} */
+							(resolveResult)
+						);
+					}
+					fileSystemInfo.createSnapshot(
 						resolveTime,
 						/** @type {Dependencies} */
 						(fileDependencies),
@@ -239,7 +279,6 @@ class ResolverCachePlugin {
 						snapshotOptions,
 						(err, snapshot) => {
 							if (err) return callback(err);
-							const resolveResult = withYield ? yieldResult : result;
 							// since we intercept resolve hook
 							// we still can get result in callback
 							if (withYield && result) {
@@ -286,9 +325,7 @@ class ResolverCachePlugin {
 				const activeRequests = new Map();
 				/** @type {Map<string, [ActiveRequest[], Yield[]]>} */
 				const activeRequestsWithYield = new Map();
-				const hook =
-					/** @type {SyncHook<[Resolver, ResolveOptions, ResolveOptionsWithDependencyType]>} */
-					(_hook);
+				const hook = _hook;
 				hook.tap(PLUGIN_NAME, (resolver, options, userOptions) => {
 					if (
 						/** @type {ResolveOptions & { cache: boolean }} */
@@ -296,7 +333,10 @@ class ResolverCachePlugin {
 					) {
 						return;
 					}
-					const optionsIdent = objectToString(userOptions, false);
+					const { key: optionsIdent, persistent } =
+						getResolveOptionsKey(userOptions);
+					// an identity key could name another plugin in the next process
+					if (!persistent) return;
 					const cacheWithContext =
 						options.cacheWithContext !== undefined
 							? options.cacheWithContext
@@ -412,6 +452,20 @@ class ResolverCachePlugin {
 							const processCacheResult = (err, cacheEntry) => {
 								if (err) return done(err);
 
+								// the compiler was closed while reading the cache
+								if (
+									cacheEntry &&
+									(!fileSystemInfo || dependsOnChangedPath(cacheEntry.snapshot))
+								) {
+									cacheInvalidResolves++;
+									return doRealResolve(
+										itemCache,
+										resolver,
+										resolveContext,
+										request,
+										done
+									);
+								}
 								if (cacheEntry) {
 									const { snapshot, result } = cacheEntry;
 									const fsInfo = /** @type {FileSystemInfo} */ (fileSystemInfo);

package/lib/cache/mergeEtags.js

@@ -5,7 +5,7 @@
 
 "use strict";
 
-/** @import { Etag } from "../Cache" */
+/** @import { Etag } from "./Cache" */
 
 class MergedEtag {
 	/**