webpack 5.107.0 → 5.107.2

package/lib/index.js

@@ -41,6 +41,8 @@ const memoize = require("./util/memoize");
 /** @typedef {import("./Compilation").AssetInfo} AssetInfo */
 /** @typedef {import("./Compilation").EntryOptions} EntryOptions */
 /** @typedef {import("./Compilation").PathData} PathData */
+/** @typedef {import("./Compilation").PathDataChunk} PathDataChunk */
+/** @typedef {import("./Compilation").PathDataModule} PathDataModule */
 /** @typedef {import("./CodeGenerationResults")} CodeGenerationResults */
 /** @typedef {import("./Entrypoint")} Entrypoint */
 /** @typedef {import("./ExternalModuleFactoryPlugin").ExternalItemFunctionCallback} ExternalItemFunctionCallback */

package/lib/javascript/JavascriptModulesPlugin.js

@@ -83,7 +83,7 @@ const JavascriptParser = require("./JavascriptParser");
 /** @typedef {import("../Module").CodeGenerationResultData} CodeGenerationResultData */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
-/** @typedef {import("../TemplatedPathPlugin").TemplatePath} TemplatePath */
+/** @typedef {import("../Chunk").ChunkFilenameTemplate} ChunkFilenameTemplate */
 /** @typedef {import("../errors/WebpackError")} WebpackError */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
 /** @typedef {import("../util/Hash")} Hash */
@@ -732,7 +732,7 @@ class JavascriptModulesPlugin {
 	 * Gets chunk filename template.
 	 * @param {Chunk} chunk chunk
 	 * @param {OutputOptions} outputOptions output options
-	 * @returns {TemplatePath} used filename template
+	 * @returns {ChunkFilenameTemplate} used filename template
 	 */
 	static getChunkFilenameTemplate(chunk, outputOptions) {
 		if (chunk.filenameTemplate) {

package/lib/javascript/JavascriptParser.js

@@ -127,7 +127,7 @@ const BasicEvaluatedExpression = require("./BasicEvaluatedExpression");
 
 /** @typedef {Set<DestructuringAssignmentProperty>} DestructuringAssignmentProperties */
 
-// TODO remove cast when @types/estree has been updated to import assertions
+// TODO remove cast when @types/estree has been updated to import phases
 /** @typedef {import("estree").ImportExpression & { phase?: "defer" | "source" }} ImportExpression */
 
 /** @type {string[]} */

package/lib/library/ModuleLibraryPlugin.js

@@ -111,24 +111,15 @@ class ModuleLibraryPlugin extends AbstractLibraryPlugin {
 
 			// `ModuleLibraryPlugin` stashes the on-demand exports source via
 			// `onDemandExportsGeneration` and only re-emits it when the
-			// module is wrapped in an IIFE/factory. When a single concatenated
-			// entry is inlined directly, the stashed source — and the
+			// module is wrapped in an IIFE/factory. When the entry is
+			// inlined directly, the stashed source — and the
 			// `definePropertyGetters` / `requireScope` runtime helpers it
 			// pulled in — never make it into the output. Drop those helpers
-			// from the chunk's set in that simple shape so the bundle stays
-			// clean.
+			// from the chunk's set so the bundle stays clean.
 			compilation.hooks.additionalChunkRuntimeRequirements.tap(
 				PLUGIN_NAME,
 				(chunk, set, { chunkGraph, codeGenerationResults }) => {
 					if (!set.has(RuntimeGlobals.definePropertyGetters)) return;
-
-					// Only handle the simple "single concatenated entry"
-					// shape. Anything else (additional modules, multiple
-					// entries, sibling runtime chunks, or chunk-level
-					// requirements that disable inline startup) forces the
-					// module through factory/IIFE rendering, which re-emits
-					// the source.
-					if (chunkGraph.getNumberOfChunkModules(chunk) !== 1) return;
 					if (chunkGraph.getNumberOfEntryModules(chunk) !== 1) return;
 					if (chunkGraph.hasChunkEntryDependentChunks(chunk)) return;
 					if (
@@ -140,8 +131,6 @@ class ModuleLibraryPlugin extends AbstractLibraryPlugin {
 					) {
 						return;
 					}
-					// Anyone tapping `inlineInRuntimeBailout` may force factory
-					// rendering at render time, so conservatively bail out.
 					if (javascriptHooks.inlineInRuntimeBailout.isUsed()) return;
 
 					const [module] = chunkGraph.getChunkEntryModulesIterable(chunk);
@@ -153,14 +142,6 @@ class ModuleLibraryPlugin extends AbstractLibraryPlugin {
 					) {
 						return;
 					}
-					// If the generated source references any
-					// `__webpack_require__.<helper>` (the on-demand `.d(...)`
-					// is stashed, but `.r(__webpack_exports__)` from the ESM
-					// compat flag, namespace objects, deferred externals, ...
-					// stay in the result) the helpers and the require scope
-					// they live in are still needed. The dot in the substring
-					// avoids matching the bare `"__webpack_require__"` string
-					// literals that some test fixtures include.
 					const codeGenResult = codeGenerationResults.get(
 						module,
 						chunk.runtime
@@ -174,9 +155,34 @@ class ModuleLibraryPlugin extends AbstractLibraryPlugin {
 						return;
 					}
 
+					// Check whether any other module in the chunk still needs
+					// the helpers we want to remove.
+					let otherNeedsDefine = false;
+					let otherNeedsExports = false;
+					let otherNeedsRequireScope = false;
+					for (const m of chunkGraph.getChunkModulesIterable(chunk)) {
+						if (m === module) continue;
+						const requirements = chunkGraph.getModuleRuntimeRequirements(
+							m,
+							chunk.runtime
+						);
+						if (!requirements) continue;
+						if (requirements.has(RuntimeGlobals.definePropertyGetters)) {
+							otherNeedsDefine = true;
+						}
+						if (requirements.has(RuntimeGlobals.exports)) {
+							otherNeedsExports = true;
+						}
+						if (requirements.has(RuntimeGlobals.requireScope)) {
+							otherNeedsRequireScope = true;
+						}
+						if (otherNeedsDefine) break;
+					}
+
+					if (otherNeedsDefine) return;
 					set.delete(RuntimeGlobals.definePropertyGetters);
-					set.delete(RuntimeGlobals.exports);
-					set.delete(RuntimeGlobals.requireScope);
+					if (!otherNeedsExports) set.delete(RuntimeGlobals.exports);
+					if (!otherNeedsRequireScope) set.delete(RuntimeGlobals.requireScope);
 				}
 			);
 		});

package/lib/node/NodeWatchFileSystem.js

@@ -82,6 +82,41 @@ class NodeWatchFileSystem {
 			}
 			return { fileTimeInfoEntries, contextTimeInfoEntries };
 		};
+		const directoriesSet =
+			directories instanceof Set ? directories : new Set(directories);
+
+		// Watchpack reports a watched directory (a context dependency) in
+		// `changes` whenever its contents change, alongside the individual
+		// file events. The default `fs.purge(dir)` matches cache keys by
+		// prefix, so it would wipe the stat cache of every file inside the
+		// directory even though only file-level events actually invalidate
+		// file stats. For directories we explicitly watch, purge only the
+		// directory's own entry (`{ exact: true }`, enhanced-resolve >=
+		// 5.22.0); file-level events in the same aggregated batch still
+		// handle file stats and the parent readdir invalidation.
+		/**
+		 * @param {Changes | null | undefined} changes changes set
+		 * @param {Removals | null | undefined} removals removals set
+		 */
+		const purgeChanges = (changes, removals) => {
+			const fs = this.inputFileSystem;
+			if (!fs || !fs.purge) return;
+			if (changes) {
+				for (const item of changes) {
+					if (directoriesSet.has(item)) {
+						fs.purge(item, { exact: true });
+					} else {
+						fs.purge(item);
+					}
+				}
+			}
+			if (removals) {
+				for (const item of removals) {
+					fs.purge(item);
+				}
+			}
+		};
+
 		this.watcher.once(
 			"aggregated",
 			/**
@@ -94,15 +129,7 @@ class NodeWatchFileSystem {
 				/** @type {Watchpack} */
 				(this.watcher).pause();
 
-				const fs = this.inputFileSystem;
-				if (fs && fs.purge) {
-					for (const item of changes) {
-						fs.purge(item);
-					}
-					for (const item of removals) {
-						fs.purge(item);
-					}
-				}
+				purgeChanges(changes, removals);
 				const { fileTimeInfoEntries, contextTimeInfoEntries } = fetchTimeInfo();
 				callback(
 					null,
@@ -172,19 +199,7 @@ class NodeWatchFileSystem {
 			getInfo: () => {
 				const removals = this.watcher && this.watcher.aggregatedRemovals;
 				const changes = this.watcher && this.watcher.aggregatedChanges;
-				const fs = this.inputFileSystem;
-				if (fs && fs.purge) {
-					if (removals) {
-						for (const item of removals) {
-							fs.purge(item);
-						}
-					}
-					if (changes) {
-						for (const item of changes) {
-							fs.purge(item);
-						}
-					}
-				}
+				purgeChanges(changes, removals);
 				const { fileTimeInfoEntries, contextTimeInfoEntries } = fetchTimeInfo();
 				return {
 					changes,

package/lib/optimize/ConcatenatedModule.js

@@ -2317,8 +2317,9 @@ ${defineGetters}`
 					info.module.updateHash(hash, context);
 					break;
 				case "external":
-					hash.update(`${chunkGraph.getModuleId(info.module)}`);
-					// TODO runtimeCondition
+					hash.update(
+						`${chunkGraph.getModuleId(info.module)}|${runtimeConditionToString(info.runtimeCondition)}|${info.nonDeferAccess ? "1" : "0"}|${chunkGraph.moduleGraph.isDeferred(info.module) ? "1" : "0"}`
+					);
 					break;
 			}
 		}

package/lib/optimize/SideEffectsFlagPlugin.js

@@ -27,7 +27,6 @@ const { CompilerHintNotationRegExp } = require("../util/magicComment");
 /** @typedef {import("../Module")} Module */
 /** @typedef {import("../Module").BuildMeta} BuildMeta */
 /** @typedef {import("../ModuleGraphConnection")} ModuleGraphConnection */
-/** @typedef {import("../NormalModuleFactory").ModuleSettings} ModuleSettings */
 /** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
 
@@ -134,7 +133,7 @@ class SideEffectsFlagPlugin {
 					return module;
 				});
 				normalModuleFactory.hooks.module.tap(PLUGIN_NAME, (module, data) => {
-					const settings = /** @type {ModuleSettings} */ (data.settings);
+					const settings = data.settings;
 					if (typeof settings.sideEffects === "boolean") {
 						if (module.factoryMeta === undefined) {
 							module.factoryMeta = {};

package/lib/optimize/SplitChunksPlugin.js

@@ -32,7 +32,7 @@ const MinMaxSizeWarning = require("./MinMaxSizeWarning");
 /** @typedef {import("../Module")} Module */
 /** @typedef {import("../Module").SourceType} SourceType */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
-/** @typedef {import("../TemplatedPathPlugin").TemplatePath} TemplatePath */
+/** @typedef {import("../Chunk").ChunkFilenameTemplate} ChunkFilenameTemplate */
 /** @typedef {import("../util/deterministicGrouping").GroupedItems<Module>} DeterministicGroupingGroupedItemsForModule */
 /** @typedef {import("../util/deterministicGrouping").Options<Module>} DeterministicGroupingOptionsForModule */
 /** @typedef {import("../util/deterministicGrouping").Sizes} Sizes */
@@ -78,7 +78,7 @@ const MinMaxSizeWarning = require("./MinMaxSizeWarning");
  * @property {CountOfChunk=} minChunks
  * @property {CountOfRequest=} maxAsyncRequests
  * @property {CountOfRequest=} maxInitialRequests
- * @property {TemplatePath=} filename
+ * @property {ChunkFilenameTemplate=} filename
  * @property {string=} idHint
  * @property {string=} automaticNameDelimiter
  * @property {boolean=} reuseExistingChunk
@@ -101,7 +101,7 @@ const MinMaxSizeWarning = require("./MinMaxSizeWarning");
  * @property {CountOfChunk} minChunks
  * @property {CountOfRequest} maxAsyncRequests
  * @property {CountOfRequest} maxInitialRequests
- * @property {TemplatePath=} filename
+ * @property {ChunkFilenameTemplate=} filename
  * @property {string} idHint
  * @property {string} automaticNameDelimiter
  * @property {boolean} reuseExistingChunk
@@ -163,7 +163,7 @@ const MinMaxSizeWarning = require("./MinMaxSizeWarning");
  * @property {CountOfRequest} maxAsyncRequests
  * @property {CountOfRequest} maxInitialRequests
  * @property {boolean} hidePathInfo
- * @property {TemplatePath=} filename
+ * @property {ChunkFilenameTemplate=} filename
  * @property {string} automaticNameDelimiter
  * @property {GetCacheGroups} getCacheGroups
  * @property {GetNameFn} getName

package/lib/runtime/AutoPublicPathRuntimeModule.js

@@ -26,14 +26,14 @@ class AutoPublicPathRuntimeModule extends RuntimeModule {
 		const compilation = /** @type {Compilation} */ (this.compilation);
 		const { scriptType, importMetaName, path, environment } =
 			compilation.outputOptions;
+		const chunk = /** @type {Chunk} */ (this.chunk);
 		const chunkName = compilation.getPath(
 			JavascriptModulesPlugin.getChunkFilenameTemplate(
-				/** @type {Chunk} */
-				(this.chunk),
+				chunk,
 				compilation.outputOptions
 			),
 			{
-				chunk: this.chunk,
+				chunk,
 				contentHashType: "javascript"
 			}
 		);

package/lib/runtime/GetChunkFilenameRuntimeModule.js

@@ -14,14 +14,14 @@ const { first } = require("../util/SetHelpers");
 /** @typedef {import("../ChunkGraph")} ChunkGraph */
 /** @typedef {import("../Compilation")} Compilation */
 /** @typedef {import("../Compilation").HashWithLengthFunction} HashWithLengthFunction */
-/** @typedef {import("../TemplatedPathPlugin").TemplatePath} TemplatePath */
+/** @typedef {import("../Chunk").ChunkFilenameTemplate} ChunkFilenameTemplate */
 
 class GetChunkFilenameRuntimeModule extends RuntimeModule {
 	/**
 	 * @param {string} contentType the contentType to use the content hash for
 	 * @param {string} name kind of filename
 	 * @param {string} global function name to be assigned
-	 * @param {(chunk: Chunk) => TemplatePath | false} getFilenameForChunk functor to get the filename or function
+	 * @param {(chunk: Chunk) => ChunkFilenameTemplate | false} getFilenameForChunk functor to get the filename or function
 	 * @param {boolean} allChunks when false, only async chunks are included
 	 */
 	constructor(contentType, name, global, getFilenameForChunk, allChunks) {
@@ -30,7 +30,7 @@ class GetChunkFilenameRuntimeModule extends RuntimeModule {
 		this.contentType = contentType;
 		/** @type {string} */
 		this.global = global;
-		/** @type {(chunk: Chunk) => TemplatePath | false} */
+		/** @type {(chunk: Chunk) => ChunkFilenameTemplate | false} */
 		this.getFilenameForChunk = getFilenameForChunk;
 		/** @type {boolean} */
 		this.allChunks = allChunks;
@@ -49,7 +49,7 @@ class GetChunkFilenameRuntimeModule extends RuntimeModule {
 		const chunk = /** @type {Chunk} */ (this.chunk);
 		const { runtimeTemplate } = compilation;
 
-		/** @type {Map<string | TemplatePath, Set<Chunk>>} */
+		/** @type {Map<ChunkFilenameTemplate, Set<Chunk>>} */
 		const chunkFilenames = new Map();
 		let maxChunks = 0;
 		/** @type {string | undefined} */
@@ -126,7 +126,7 @@ class GetChunkFilenameRuntimeModule extends RuntimeModule {
 
 		/**
 		 * @param {Chunk} c the chunk
-		 * @param {string | TemplatePath} chunkFilename the filename template for the chunk
+		 * @param {ChunkFilenameTemplate} chunkFilename the filename template for the chunk
 		 * @returns {void}
 		 */
 		const addStaticUrl = (c, chunkFilename) => {

package/lib/sharing/ConsumeSharedPlugin.js

@@ -356,15 +356,9 @@ class ConsumeSharedPlugin {
 						) {
 							return Promise.resolve();
 						}
-						const options = resolvedConsumes.get(
-							/** @type {string} */ (resource)
-						);
+						const options = resolvedConsumes.get(resource);
 						if (options !== undefined) {
-							return createConsumeSharedModule(
-								context,
-								/** @type {string} */ (resource),
-								options
-							);
+							return createConsumeSharedModule(context, resource, options);
 						}
 						return Promise.resolve();
 					}

package/lib/sharing/ProvideSharedPlugin.js

@@ -169,7 +169,7 @@ class ProvideSharedPlugin {
 				normalModuleFactory.hooks.module.tap(
 					PLUGIN_NAME,
 					(module, { resource, resourceResolveData }, resolveData) => {
-						if (resolvedProvideMap.has(/** @type {string} */ (resource))) {
+						if (resolvedProvideMap.has(resource)) {
 							return module;
 						}
 						const { request } = resolveData;
@@ -179,7 +179,7 @@ class ProvideSharedPlugin {
 								provideSharedModule(
 									request,
 									config,
-									/** @type {string} */ (resource),
+									resource,
 									resourceResolveData
 								);
 								resolveData.cacheable = false;
@@ -189,12 +189,12 @@ class ProvideSharedPlugin {
 							if (request.startsWith(prefix)) {
 								const remainder = request.slice(prefix.length);
 								provideSharedModule(
-									/** @type {string} */ (resource),
+									resource,
 									{
 										...config,
 										shareKey: config.shareKey + remainder
 									},
-									/** @type {string} */ (resource),
+									resource,
 									resourceResolveData
 								);
 								resolveData.cacheable = false;

package/lib/util/fs.js

@@ -308,7 +308,12 @@ const path = require("path");
 
 /**
  * Defines the purge type used by this module.
- * @typedef {(value?: string | string[] | Set<string>) => void} Purge
+ *
+ * `options.exact` (supported by enhanced-resolve's `CachedInputFileSystem`
+ * from v5.22.0): when true, only entries whose key exactly matches `value`
+ * are invalidated; cached entries for descendants are preserved. Default
+ * is false (legacy prefix-match behavior).
+ * @typedef {(value?: string | string[] | Set<string>, options?: { exact?: boolean }) => void} Purge
  */
 
 /**

package/lib/wasm-async/AsyncWebAssemblyModulesPlugin.js

@@ -216,8 +216,7 @@ class AsyncWebAssemblyModulesPlugin {
 						PLUGIN_NAME,
 						(createData, resolveData) =>
 							new AsyncWasmModule({
-								.../** @type {NormalModuleCreateData & { type: string }} */
-								(createData),
+								...createData,
 								phase: resolveData.phase
 							})
 					);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "5.107.0",
+  "version": "5.107.2",
   "description": "Packs ECMAScript/CommonJs/AMD modules for the browser. Allows you to split your codebase into multiple bundles, which can be loaded on demand. Supports loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff.",
   "homepage": "https://github.com/webpack/webpack",
   "bugs": "https://github.com/webpack/webpack/issues",
@@ -34,7 +34,7 @@
     "prelint": "yarn setup",
     "lint": "yarn lint:code && yarn lint:special && yarn lint:types && yarn lint:types-test && yarn lint:types-benchmark && yarn lint:types-module-test && yarn lint:types-hot && yarn fmt:check && yarn lint:spellcheck",
     "lint:code": "node node_modules/eslint/bin/eslint.js --cache .",
-    "lint:special": "node node_modules/tooling/lockfile-lint && node node_modules/tooling/schemas-lint && node node_modules/tooling/inherit-types && node node_modules/tooling/format-schemas && node tooling/generate-runtime-code.js && node tooling/generate-wasm-code.js && node node_modules/tooling/compile-to-definitions && node node_modules/tooling/precompile-schemas && node node_modules/tooling/generate-types --no-template-literals",
+    "lint:special": "node node_modules/tooling/lockfile-lint && node node_modules/tooling/schemas-lint && node node_modules/tooling/inherit-types && node node_modules/tooling/format-schemas && node tooling/generate-runtime-code.js && node tooling/generate-wasm-code.js && node tooling/generate-html-entities.js && node node_modules/tooling/compile-to-definitions && node node_modules/tooling/precompile-schemas && node node_modules/tooling/generate-types --no-template-literals",
     "lint:types": "tsc",
     "lint:types-test": "tsc -p tsconfig.types.test.json",
     "lint:types-benchmark": "tsc -p tsconfig.types.benchmark.json",
@@ -48,7 +48,7 @@
     "fmt:base": "node node_modules/prettier/bin/prettier.cjs --cache --ignore-unknown .",
     "fix": "yarn fix:code && yarn fix:special && yarn fmt",
     "fix:code": "yarn lint:code --fix",
-    "fix:special": "node node_modules/tooling/inherit-types --write && node node_modules/tooling/format-schemas --write && node tooling/generate-runtime-code.js --write && node tooling/generate-wasm-code.js --write && node node_modules/tooling/compile-to-definitions --write && node node_modules/tooling/precompile-schemas --write && node node_modules/tooling/generate-types --no-template-literals --write",
+    "fix:special": "node node_modules/tooling/inherit-types --write && node node_modules/tooling/format-schemas --write && node tooling/generate-runtime-code.js --write && node tooling/generate-wasm-code.js --write && node tooling/generate-html-entities.js --write && node node_modules/tooling/compile-to-definitions --write && node node_modules/tooling/precompile-schemas --write && node node_modules/tooling/generate-types --no-template-literals --write",
     "build:examples": "cd examples && node buildAll.js",
     "benchmark": "node --max-old-space-size=6144 --experimental-vm-modules --trace-deprecation --hash-seed=1 --random-seed=1 --no-opt --predictable --predictable-gc-schedule --interpreted-frames-native-stack --allow-natives-syntax --expose-gc --no-concurrent-sweeping ./test/BenchmarkTestCases.benchmark.mjs",
     "pretest": "yarn lint",
@@ -97,7 +97,7 @@
     "acorn-import-phases": "^1.0.3",
     "browserslist": "^4.28.1",
     "chrome-trace-event": "^1.0.2",
-    "enhanced-resolve": "^5.21.4",
+    "enhanced-resolve": "^5.22.0",
     "es-module-lexer": "^2.1.0",
     "eslint-scope": "5.1.1",
     "events": "^3.2.0",
@@ -110,7 +110,7 @@
     "tapable": "^2.3.0",
     "terser-webpack-plugin": "^5.5.0",
     "watchpack": "^2.5.1",
-    "webpack-sources": "^3.4.1"
+    "webpack-sources": "^3.5.0"
   },
   "devDependencies": {
     "@babel/core": "^7.27.1",