webpack 5.111.1 → 5.112.1

package/lib/optimize/MergeDuplicateChunksPlugin.js

@@ -5,16 +5,17 @@
 
 "use strict";
 
-const { STAGE_BASIC } = require("../OptimizationStages");
 const { runtimeEqual } = require("../util/runtime");
+const { STAGE_BASIC } = require("./OptimizationStages");
+
+/** @import Compiler from "../Compiler" */
+/** @import Chunk from "../graph/Chunk" */
 
 /**
- * @import {
- * 	MergeDuplicateChunksPluginOptions
- * } from "../../declarations/plugins/optimize/MergeDuplicateChunksPlugin"
+ * @schema plugins/optimize/MergeDuplicateChunksPlugin
+ * @typedef {object} MergeDuplicateChunksPluginOptions
+ * @property {number=} stage Specifies the stage for merging duplicate chunks.
  */
-/** @import Compiler from "../Compiler" */
-/** @import Chunk from "../Chunk" */
 
 const PLUGIN_NAME = "MergeDuplicateChunksPlugin";
 

package/lib/optimize/MinChunkSizePlugin.js

@@ -5,15 +5,18 @@
 
 "use strict";
 
-const { STAGE_ADVANCED } = require("../OptimizationStages");
+const { STAGE_ADVANCED } = require("./OptimizationStages");
+
+/** @import Chunk from "../graph/Chunk" */
+/** @import Compiler from "../Compiler" */
 
 /**
- * @import {
- * 	MinChunkSizePluginOptions
- * } from "../../declarations/plugins/optimize/MinChunkSizePlugin"
+ * @schema plugins/optimize/MinChunkSizePlugin
+ * @typedef {object} MinChunkSizePluginOptions
+ * @property {number=} chunkOverhead Constant overhead for a chunk.
+ * @property {number=} entryChunkMultiplicator Multiplicator for initial chunks.
+ * @property {number} minChunkSize Minimum number of characters.
  */
-/** @import Chunk from "../Chunk" */
-/** @import Compiler from "../Compiler" */
 
 const PLUGIN_NAME = "MinChunkSizePlugin";
 

package/lib/optimize/ModuleConcatenationPlugin.js

@@ -5,14 +5,13 @@
 
 "use strict";
 
-const ChunkGraph = require("../ChunkGraph");
-const Dependency = require("../Dependency");
-const Module = require("../Module");
-const ModuleGraph = require("../ModuleGraph");
-const { JAVASCRIPT_TYPE } = require("../ModuleSourceTypeConstants");
-const { STAGE_DEFAULT } = require("../OptimizationStages");
-const HarmonyImportDependency = require("../dependencies/HarmonyImportDependency");
-const { ImportPhaseUtils } = require("../dependencies/ImportPhase");
+const { ImportPhaseUtils } = require("../dependencies/core/ImportPhase");
+const ChunkGraph = require("../graph/ChunkGraph");
+const Dependency = require("../graph/Dependency");
+const ModuleGraph = require("../graph/ModuleGraph");
+const isDependencyKind = require("../graph/isDependencyKind");
+const Module = require("../module/Module");
+const { JAVASCRIPT_TYPE } = require("../module/ModuleSourceTypeConstants");
 const asyncLib = require("../util/async");
 const { compareModulesByIdentifier } = require("../util/comparators");
 const { isCommonJsConcatenationEnabled } = require("../util/concatenate");
@@ -24,14 +23,17 @@ const {
 	runtimeToString
 } = require("../util/runtime");
 const ConcatenatedModule = require("./ConcatenatedModule");
+const { STAGE_DEFAULT } = require("./OptimizationStages");
 
-/** @import Chunk from "../Chunk" */
+/** @import Chunk from "../graph/Chunk" */
 /** @import Compilation from "../Compilation" */
 /** @import Compiler from "../Compiler" */
 /** @import { JavascriptModuleBuildInfo } from "../javascript/JavascriptModule" */
-/** @import { BuildInfo, BuildMeta } from "../Module" */
-/** @import RequestShortener from "../RequestShortener" */
+/** @import { BuildInfo, BuildMeta } from "../module/Module" */
+/** @import RequestShortener from "../util/RequestShortener" */
 /** @import { RuntimeSpec } from "../util/runtime" */
+/** @import { ResolverWithOptions } from "../resolve/ResolverFactory" */
+/** @import { InputFileSystem } from "../fs/fs" */
 
 /** @typedef {Module | ((requestShortener: RequestShortener) => string)} Problem */
 
@@ -112,11 +114,6 @@ class ModuleConcatenationPlugin {
 	apply(compiler) {
 		const { _backCompat: backCompat } = compiler;
 		compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
-			if (compilation.moduleMemCaches) {
-				throw new Error(
-					"optimization.concatenateModules can't be used with cacheUnaffected as module concatenation is a global effect"
-				);
-			}
 			const moduleGraph = compilation.moduleGraph;
 			/** @type {Map<Module, string | ((requestShortener: RequestShortener) => string)>} */
 			const bailoutReasonMap = new Map();
@@ -196,6 +193,7 @@ class ModuleConcatenationPlugin {
 					stage: STAGE_DEFAULT
 				},
 				(allChunks, modules, callback) => {
+					// set once the modules are built, so not yet when the compilation starts
 					const logger = compilation.getLogger(
 						"webpack.ModuleConcatenationPlugin"
 					);
@@ -257,6 +255,14 @@ class ModuleConcatenationPlugin {
 
 						// Exports must be known (and not dynamic)
 						const exportsInfo = moduleGraph.getExportsInfo(module);
+						if (exportsInfo.otherExportsInfo.provided === undefined) {
+							setBailoutReason(
+								module,
+								"Module has no provided exports info (optimization.providedExports is disabled)"
+							);
+							continue;
+						}
+
 						const relevantExports = exportsInfo.getRelevantExports(undefined);
 						const unknownReexports = relevantExports.filter(
 							(exportInfo) =>
@@ -515,10 +521,10 @@ class ModuleConcatenationPlugin {
 								newModule.build(
 									compilation.options,
 									compilation,
-									/** @type {EXPECTED_ANY} */
-									(null),
-									/** @type {EXPECTED_ANY} */
-									(null),
+									/** @type {ResolverWithOptions} */
+									(/** @type {ResolverWithOptions | null} */ (null)),
+									/** @type {InputFileSystem} */
+									(/** @type {InputFileSystem | null} */ (null)),
 									(err) => {
 										if (err) {
 											if (!err.module) {
@@ -640,7 +646,7 @@ class ModuleConcatenationPlugin {
 	_defersModuleIn(moduleGraph, module, config) {
 		for (const dep of module.dependencies) {
 			if (
-				dep instanceof HarmonyImportDependency &&
+				isDependencyKind(dep, "esm-import") &&
 				ImportPhaseUtils.isDefer(dep.phase)
 			) {
 				const target = moduleGraph.getModule(dep);
@@ -1019,7 +1025,7 @@ class ModuleConcatenationPlugin {
 							)} (expected runtime ${runtimeToString(
 								runtime
 							)}, module is only referenced in ${runtimeToString(
-								/** @type {RuntimeSpec} */ (runtimeCondition)
+								runtimeCondition
 							)})`
 					).join(", ")}`;
 				return cacheFailure(

package/lib/{dependencies → optimize}/PureExpressionDependency.js

@@ -5,17 +5,17 @@
 
 "use strict";
 
-const { UsageState } = require("../ExportsInfo");
+const NullDependency = require("../dependencies/core/NullDependency");
+const { UsageState } = require("../graph/ExportsInfo");
 const makeSerializable = require("../util/makeSerializable");
 const { filterRuntime, runtimeToString } = require("../util/runtime");
-const NullDependency = require("./NullDependency");
 
 /** @import { ReplaceSource } from "webpack-sources" */
-/** @import Dependency, { UpdateHashContext } from "../Dependency" */
-/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
-/** @import Module from "../Module" */
-/** @import ModuleGraph from "../ModuleGraph" */
-/** @import { ConnectionState } from "../ModuleGraphConnection" */
+/** @import Dependency, { UpdateHashContext } from "../graph/Dependency" */
+/** @import { DependencyTemplateContext } from "../template/DependencyTemplate" */
+/** @import Module from "../module/Module" */
+/** @import ModuleGraph from "../graph/ModuleGraph" */
+/** @import { ConnectionState } from "../graph/ModuleGraphConnection" */
 /** @import { Range } from "../javascript/JavascriptParser" */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range, Set<string> | false]>} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Range, Set<string> | false]>} ObjectSerializerContext */
@@ -115,10 +115,11 @@ class PureExpressionDependency extends NullDependency {
 	}
 }
 
-makeSerializable(
-	PureExpressionDependency,
+makeSerializable(PureExpressionDependency, [
+	"webpack/lib/optimize/PureExpressionDependency",
+	// TODO in the next major release: remove, they restore pre-move cache packs
 	"webpack/lib/dependencies/PureExpressionDependency"
-);
+]);
 
 PureExpressionDependency.Template = class PureExpressionDependencyTemplate extends (
 	NullDependency.Template

package/lib/optimize/RealContentHashPlugin.js

@@ -20,7 +20,7 @@ const createHooksRegistry = require("../util/createHooksRegistry");
  * } from "../../declarations/WebpackOptions"
  */
 /** @import { Source } from "webpack-sources" */
-/** @import { Etag } from "../Cache" */
+/** @import { Etag } from "../cache/Cache" */
 /** @import { AssetInfo } from "../Compilation" */
 /** @import Compiler from "../Compiler" */
 /** @typedef {typeof import("../util/Hash")} Hash */
@@ -98,10 +98,10 @@ const mapAndDeduplicateSourceBuffers = (input, fn) => {
 	const result = [];
 	for (const value of input) {
 		const source = fn(value);
-		// TODO webpack 6: drop the `buffers` check, require webpack-sources >= 3.4
+		// TODO in the next major release: drop the `buffers` check, require webpack-sources >= 3.4
 		// and call `source.buffers()` unconditionally.
 		const chunks =
-			// TODO remove in webpack 6, this is protection against authors who directly use `webpack-sources` outdated version
+			// TODO in the next major release: remove, this is protection against authors who directly use `webpack-sources` outdated version
 			typeof source.buffers === "function"
 				? source.buffers()
 				: [source.buffer()];
@@ -243,18 +243,28 @@ class RealContentHashPlugin {
 					// real hash is re-encoded in it instead of `output.hashDigest`.
 					/** @type {Map<string, string>} */
 					const hashToDigest = new Map();
+					// Which hashes each asset carries, from its info alone: a build
+					// naming no content hash has nothing to do here, and materializing
+					// every asset to find that out is the whole cost.
+					/** @type {{ source: Source, info: AssetInfo, name: string, hashes: Hashes }[]} */
+					const candidates = [];
+					let anyHashes = false;
 					for (const { source, info, name } of assets) {
-						const cachedSource = toCachedSource(source);
-						const content = /** @type {string} */ (cachedSource.source());
 						/** @type {Hashes} */
 						const hashes = new Set();
 						addToList(info.contenthash, hashes);
 						if (repairing) addToList(info.chunkhash, hashes);
+						if (hashes.size !== 0) anyHashes = true;
 						if (info.contenthashDigest) {
 							for (const hash of Object.keys(info.contenthashDigest)) {
 								hashToDigest.set(hash, info.contenthashDigest[hash]);
 							}
 						}
+						candidates.push({ source, info, name, hashes });
+					}
+					if (!anyHashes) return;
+					for (const { source, info, name, hashes } of candidates) {
+						const cachedSource = toCachedSource(source);
 						/** @type {AssetInfoForRealContentHash} */
 						const data = {
 							name,
@@ -262,7 +272,7 @@ class RealContentHashPlugin {
 							source: cachedSource,
 							newSource: undefined,
 							newSourceWithoutOwn: undefined,
-							content,
+							content: /** @type {string} */ (cachedSource.source()),
 							ownHashes: undefined,
 							contentComputePromise: undefined,
 							contentComputeWithoutOwnPromise: undefined,
@@ -279,7 +289,6 @@ class RealContentHashPlugin {
 							}
 						}
 					}
-					if (hashToAssets.size === 0) return;
 					const hashRegExp = new RegExp(
 						Array.from(hashToAssets.keys(), quoteMeta).join("|"),
 						"g"
@@ -591,9 +600,7 @@ ${referencingAssets
 									);
 								}
 								const digest = hash.digest(
-									/** @type {HashDigest} */ (
-										hashToDigest.get(oldHash) || this._hashDigest
-									)
+									hashToDigest.get(oldHash) || this._hashDigest
 								);
 								hashToNewHash.set(oldHash, digest.slice(0, oldHash.length));
 							}
@@ -641,9 +648,7 @@ ${referencingAssets
 								for (const c of chunks) hash.update(c);
 							}
 							const digest = hash.digest(
-								/** @type {HashDigest} */ (
-									hashToDigest.get(oldHash) || this._hashDigest
-								)
+								hashToDigest.get(oldHash) || this._hashDigest
 							);
 							newHash = digest.slice(0, oldHash.length);
 						}

package/lib/optimize/RemoveEmptyChunksPlugin.js

@@ -5,9 +5,9 @@
 
 "use strict";
 
-const { STAGE_ADVANCED, STAGE_BASIC } = require("../OptimizationStages");
+const { STAGE_ADVANCED, STAGE_BASIC } = require("./OptimizationStages");
 
-/** @import Chunk from "../Chunk" */
+/** @import Chunk from "../graph/Chunk" */
 /** @import Compiler from "../Compiler" */
 
 const PLUGIN_NAME = "RemoveEmptyChunksPlugin";

package/lib/optimize/RemoveParentModulesPlugin.js

@@ -5,12 +5,12 @@
 
 "use strict";
 
-const { STAGE_BASIC } = require("../OptimizationStages");
+const { STAGE_BASIC } = require("./OptimizationStages");
 
-/** @import Chunk from "../Chunk" */
-/** @import ChunkGroup from "../ChunkGroup" */
+/** @import Chunk from "../graph/Chunk" */
+/** @import ChunkGroup from "../graph/ChunkGroup" */
 /** @import Compiler from "../Compiler" */
-/** @import Module from "../Module" */
+/** @import Module from "../module/Module" */
 
 /**
  * Intersects multiple masks represented as bigints

package/lib/optimize/SideEffectsFlagPlugin.js

@@ -5,22 +5,19 @@
 
 "use strict";
 
+const { ImportPhaseUtils } = require("../dependencies/core/ImportPhase");
+const { dirname, join, readJson, relative } = require("../fs/fs");
+const isDependencyKind = require("../graph/isDependencyKind");
 const {
 	JAVASCRIPT_MODULE_TYPE_AUTO,
 	JAVASCRIPT_MODULE_TYPE_DYNAMIC,
 	JAVASCRIPT_MODULE_TYPE_ESM
-} = require("../ModuleTypeConstants");
-const { STAGE_DEFAULT } = require("../OptimizationStages");
-const HarmonyExportImportedSpecifierDependency = require("../dependencies/HarmonyExportImportedSpecifierDependency");
-const HarmonyImportDependency = require("../dependencies/HarmonyImportDependency");
-const HarmonyImportSpecifierDependency = require("../dependencies/HarmonyImportSpecifierDependency");
-const { ImportPhaseUtils } = require("../dependencies/ImportPhase");
+} = require("../module/ModuleTypeConstants");
 const {
 	getBuildDiagnostics,
 	recordOptimizationBailout
 } = require("../util/buildDiagnostics");
 const formatLocation = require("../util/formatLocation");
-const { dirname, join, readJson, relative } = require("../util/fs");
 const { getGlobToRegExpSource } = require("../util/globUtils");
 const {
 	NODE_MODULES_REGEXP,
@@ -28,6 +25,7 @@ const {
 	relativePathToRequest
 } = require("../util/identifier");
 const { CompilerHintNotationRegExp } = require("../util/magicComment");
+const { STAGE_DEFAULT } = require("./OptimizationStages");
 
 /**
  * @import {
@@ -38,18 +36,14 @@ const { CompilerHintNotationRegExp } = require("../util/magicComment");
  * 	CallExpression
  * } from "estree"
  */
+/** @import ESMExportImportedSpecifierDependency from "../dependencies/esm/ESMExportImportedSpecifierDependency" */
 /** @import Compiler from "../Compiler" */
-/** @import Module, { BuildMeta, BuildInfo } from "../Module" */
-/**
- * @import {
- * 	JavascriptModuleBuildInfo
- * } from "../javascript/JavascriptModule"
- */
-/** @import ModuleGraphConnection from "../ModuleGraphConnection" */
-/** @import { ExportInfo, TargetItemWithConnection } from "../ExportsInfo" */
+/** @import Module from "../module/Module" */
+/** @import ModuleGraphConnection from "../graph/ModuleGraphConnection" */
+/** @import { ExportInfo, TargetItemWithConnection } from "../graph/ExportsInfo" */
 /** @import JavascriptParser, { Range } from "../javascript/JavascriptParser" */
-/** @import { InputFileSystem } from "../util/fs" */
-/** @import { CreateData, ResolveData } from "../NormalModuleFactory" */
+/** @import { InputFileSystem } from "../fs/fs" */
+/** @import { CreateData, ResolveData } from "../module/NormalModuleFactory" */
 /**
  * @import {
  * 	JavascriptParserOptions
@@ -104,7 +98,8 @@ const { CompilerHintNotationRegExp } = require("../util/magicComment");
  */
 const isDeferredTargetConnection = (connection) =>
 	connection !== undefined &&
-	connection.dependency instanceof HarmonyImportDependency &&
+	connection.dependency !== null &&
+	isDependencyKind(connection.dependency, "esm-import") &&
 	ImportPhaseUtils.isDefer(connection.dependency.phase);
 
 /** @type {WeakMap<Compiler, CacheItem>} */
@@ -315,10 +310,10 @@ const resolveSideEffectsFlag = (
  * @returns {boolean} true when the module is a pure single-star passthrough
  */
 const moduleHasSingleStarReexport = (module) => {
-	/** @type {HarmonyExportImportedSpecifierDependency | undefined} */
+	/** @type {ESMExportImportedSpecifierDependency | undefined} */
 	let starReexportDep;
 	for (const dep of module.dependencies) {
-		if (!(dep instanceof HarmonyExportImportedSpecifierDependency)) continue;
+		if (!isDependencyKind(dep, "esm-reexport")) continue;
 		// a named re-export (`export { x } from` / `export * as ns from`) means
 		// the module owns names a star into its source wouldn't reproduce
 		if (dep.name !== null) return false;
@@ -407,7 +402,7 @@ class SideEffectsFlagPlugin {
 						const hasSideEffects = SideEffectsFlagPlugin.moduleHasSideEffects(
 							resolved.relativePath,
 							resolved.sideEffects,
-							/** @type {CacheItem} */ (cache)
+							cache
 						);
 						module.factoryMeta.sideEffectFree = !hasSideEffects;
 					}
@@ -545,16 +540,13 @@ class SideEffectsFlagPlugin {
 						);
 						parser.hooks.finish.tap(PLUGIN_NAME, () => {
 							if (sideEffectsStatement === undefined) {
-								/** @type {BuildMeta} */
-								(parser.state.module.buildMeta).sideEffectFree = true;
+								parser.state.module.buildMeta.sideEffectFree = true;
 							} else {
 								const type = sideEffectsStatement.type;
 								const loc = parser.getLocation(sideEffectsStatement);
 								const at = formatLocation(loc);
 
-								const buildInfo = /** @type {BuildInfo} */ (
-									parser.state.module.buildInfo
-								);
+								const buildInfo = parser.state.module.buildInfo;
 								recordOptimizationBailout(
 									buildInfo,
 									`Statement (${type}) with side effects in source code at ${at}`
@@ -701,9 +693,7 @@ class SideEffectsFlagPlugin {
 							if (pureFunctions === undefined || pureFunctions.size === 0) {
 								return;
 							}
-							const buildInfo = /** @type {JavascriptModuleBuildInfo} */ (
-								parser.state.module.buildInfo
-							);
+							const buildInfo = parser.state.module.buildInfo;
 							if (buildInfo.pureFunctions) {
 								for (const fn of pureFunctions) {
 									buildInfo.pureFunctions.add(fn);
@@ -789,9 +779,9 @@ class SideEffectsFlagPlugin {
 									let isReexport;
 									if (
 										(isReexport =
-											dep instanceof
-											HarmonyExportImportedSpecifierDependency) ||
-										(dep instanceof HarmonyImportSpecifierDependency &&
+											dep !== null && isDependencyKind(dep, "esm-reexport")) ||
+										(dep !== null &&
+											isDependencyKind(dep, "esm-import-specifier") &&
 											!dep.namespaceObjectAsContext)
 									) {
 										if (connection.originModule !== null) {
@@ -838,9 +828,7 @@ class SideEffectsFlagPlugin {
 																candidate.connection
 															)) &&
 														(Boolean(dep.name) ||
-															hasSingleStarReexport(
-																/** @type {Module} */ (candidate.module)
-															)),
+															hasSingleStarReexport(candidate.module)),
 													({
 														module: newModule,
 														export: exportName,
@@ -904,9 +892,7 @@ class SideEffectsFlagPlugin {
 											moduleGraph.updateModule(dep, target.module);
 											moduleGraph.updateParent(
 												dep,
-												/** @type {ModuleGraphConnection} */ (
-													target.connection
-												),
+												target.connection,
 												/** @type {Module} */ (connection.originModule)
 											);
 											moduleGraph.addExplanation(