webpack 5.111.0 → 5.112.0

package/lib/asset/AssetSourceParser.js

@@ -5,10 +5,10 @@
 
 "use strict";
 
-const Parser = require("../Parser");
+const Parser = require("../module/Parser");
 
-/** @import { BuildInfo, BuildMeta } from "../Module" */
-/** @import { ParserState, PreparsedAst } from "../Parser" */
+/** @import { BuildInfo, BuildMeta } from "../module/Module" */
+/** @import { ParserState, PreparsedAst } from "../module/Parser" */
 
 class AssetSourceParser extends Parser {
 	/**

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 NormalModule from "../module/NormalModule" */
 
 const WEBMANIFEST_TYPE = "webmanifest";
 const WEBMANIFEST_TYPES = new Set([WEBMANIFEST_TYPE]);

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 */

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,7 @@ 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")) continue;
 					const referenced = moduleGraph.getModule(dependency);
 					if (!referenced || seen.has(referenced)) continue;
 					const connections = outgoingConnectionMap.get(referenced);
@@ -43,7 +43,8 @@ const getOutgoingAsyncModules = (moduleGraph, module) => {
 						connections &&
 						connections.some(
 							(c) =>
-								c.dependency instanceof HarmonyImportDependency &&
+								c.dependency !== null &&
+								isDependencyKind(c.dependency, "esm-import") &&
 								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 from "../module/Module" */
 
 const PLUGIN_NAME = "InferAsyncModulesPlugin";
 
@@ -38,7 +38,8 @@ class InferAsyncModulesPlugin {
 						if (
 							connections.some(
 								(c) =>
-									c.dependency instanceof HarmonyImportDependency &&
+									c.dependency !== null &&
+									isDependencyKind(c.dependency, "esm-import") &&
 									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.

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 {
@@ -31,13 +31,13 @@ class MemoryCachePlugin {
 				const cacheEntry = cache.get(identifier);
 				// A recorded miss: the whole chain was asked for this identifier already.
 				if (cacheEntry === null) return null;
-				// Etags are compared by identity — a lazy one is interned per source
-				// object, so equal content reached through a second object is a
+				// WHY: etags are compared by identity, and a lazy one is interned per
+				// source object, so equal content reached through a second object is a
 				// different etag. Hashing to tell those apart would cost every hit what
 				// laziness saves, so a mismatch falls through to the next stage instead:
 				// the file cache compares etags by value and can still answer. Returning
-				// `null` here would bail the hook and lose that (`Cache.get` maps it to
-				// `undefined` regardless, so it buys the caller nothing).
+				// `null` here would bail the hook and lose that, and `Cache.get` maps it
+				// to `undefined` regardless, so it buys the caller nothing.
 				if (cacheEntry !== undefined && cacheEntry.etag === etag) {
 					return cacheEntry.data;
 				}

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" */
 
 /**
@@ -79,10 +79,9 @@ class MemoryWithGcCachePlugin {
 					continue;
 				}
 				if (entry !== undefined) {
-					// We don't delete the cache entry, but set it to undefined instead
-					// This reserves the location in the data table and avoids rehashing
-					// when constantly adding and removing entries.
-					// It will be deleted when removed from oldCache.
+					// Set to undefined rather than deleted, reserving the slot and sparing
+					// a rehash as entries come and go. It goes for good once `oldCache`
+					// drops it.
 					cache.set(identifier, undefined);
 					oldCache.delete(identifier);
 					oldCache.set(identifier, {
@@ -105,13 +104,13 @@ class MemoryWithGcCachePlugin {
 				const cacheEntry = cache.get(identifier);
 				// A recorded miss: the whole chain was asked for this identifier already.
 				if (cacheEntry === null) return null;
-				// Etags are compared by identity — a lazy one is interned per source
-				// object, so equal content reached through a second object is a
+				// WHY: etags are compared by identity, and a lazy one is interned per
+				// source object, so equal content reached through a second object is a
 				// different etag. Hashing to tell those apart would cost every hit what
 				// laziness saves, so a mismatch falls through to the next stage instead:
 				// the file cache compares etags by value and can still answer. Returning
-				// `null` here would bail the hook and lose that (`Cache.get` maps it to
-				// `undefined` regardless, so it buys the caller nothing).
+				// `null` here would bail the hook and lose that, and `Cache.get` maps it
+				// to `undefined` regardless, so it buys the caller nothing.
 				let known = cacheEntry !== undefined;
 				if (cacheEntry !== undefined) {
 					if (cacheEntry.etag === etag) return cacheEntry.data;

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 */
@@ -901,24 +901,9 @@ makeSerializable(
 /** @typedef {(() => Promise<PackContentItems> | PackContentItems) & Partial<{ options: { size?: number } }>} LazyFunction */
 
 class PackContent {
-	/*
-		This class can be in these states:
-		   |   this.lazy    | this.content | this.outdated | state
-		A1 |   undefined    |     Map      |     false     | fresh content
-		A2 |   undefined    |     Map      |     true      | (will not happen)
-		B1 | lazy () => {}  |  undefined   |     false     | not deserialized
-		B2 | lazy () => {}  |  undefined   |     true      | not deserialized, but some items has been removed
-		C1 | lazy* () => {} |     Map      |     false     | deserialized
-		C2 | lazy* () => {} |     Map      |     true      | deserialized, and some items has been removed
-
-		this.used is a subset of this.items.
-		this.items is a subset of this.content.keys() resp. this.lazy().map.keys()
-		When this.outdated === false, this.items === this.content.keys() resp. this.lazy().map.keys()
-		When this.outdated === true, this.items should be used to recreated this.lazy/this.content.
-		When this.lazy and this.content is set, they contain the same data.
-		this.get must only be called with a valid item from this.items.
-		In state C this.lazy is unMemoized
-	*/
+	// `used` is a subset of `items`, itself a subset of the content's keys, and the
+	// two coincide while `outdated` is false. `lazy` and `content` hold the same
+	// data whenever both are set, and `get` takes only an item of `items`.
 
 	/**
 	 * Creates an instance of PackContent.
@@ -1205,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} */
@@ -1806,7 +1791,7 @@ class PackFileCacheStrategy {
 						if (err) return reject(err);
 						resolve(
 							/** @type {number} */ (
-								/** @type {import("../util/fs").IStats} */ (stats).mtimeMs
+								/** @type {import("../fs/fs").IStats} */ (stats).mtimeMs
 							)
 						);
 					});
@@ -1841,9 +1826,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,15 @@ 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 { ResolveOptionsWithDependencyType } from "../resolve/ResolverFactory" */
 /**
  * @import {
  * 	ObjectDeserializerContext,
@@ -296,7 +297,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

package/lib/cache/getLazyHashedEtag.js

@@ -42,11 +42,9 @@ class LazyHashedEtag {
 			/** @type {HashableObject} */
 			(this._obj).updateHash(hash);
 			this._hash = hash.digest("base64");
-			// Drop the captured object once the hash is memoized. The hash is
-			// never reset, so we never need `_obj` again — and many callers
-			// (e.g. `SourceMapDevToolPlugin`, `RealContentHashPlugin`) capture
-			// a heavy `CachedSource` here that would otherwise stay reachable
-			// through this etag for the lifetime of the compilation cache.
+			// Drop the captured object once the hash is memoized: the hash never
+			// resets, and callers often capture a heavy `CachedSource` that would
+			// otherwise stay reachable for the compilation cache's lifetime.
 			this._obj = undefined;
 		}
 		return this._hash;

package/lib/cache/mergeEtags.js

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

package/lib/{OptionsApply.js → config/OptionsApply.js}

@@ -8,10 +8,10 @@
 /**
  * @import {
  * 	WebpackOptionsNormalizedWithDefaults as WebpackOptions
- * } from "./config/defaults"
+ * } from "./defaults"
  */
-/** @import { WebpackOptionsInterception } from "./config/normalization" */
-/** @import Compiler from "./Compiler" */
+/** @import { WebpackOptionsInterception } from "./normalization" */
+/** @import Compiler from "../Compiler" */
 
 class OptionsApply {
 	/**

package/lib/{PlatformPlugin.js → config/PlatformPlugin.js}

@@ -5,8 +5,8 @@
 
 "use strict";
 
-/** @import Compiler from "./Compiler" */
-/** @import { PlatformTargetProperties } from "./config/target" */
+/** @import Compiler from "../Compiler" */
+/** @import { PlatformTargetProperties } from "./target" */
 
 const PLUGIN_NAME = "PlatformPlugin";