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

package/lib/InitFragment.js

@@ -8,10 +8,14 @@
 const { ConcatSource } = require("webpack-sources");
 const makeSerializable = require("./util/makeSerializable");
 
-/** @typedef {import("webpack-sources").Source} Source */
-/** @typedef {import("./Generator").GenerateContext} GenerateContext */
-/** @typedef {import("./serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("./serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @import { Source } from "webpack-sources" */
+/** @import { GenerateContext } from "./Generator" */
+/**
+ * @import {
+ * 	ObjectDeserializerContext,
+ * 	ObjectSerializerContext
+ * } from "./serialization/ObjectMiddleware"
+ */
 
 /** @typedef {string} InitFragmentKey */
 
@@ -28,30 +32,6 @@ const makeSerializable = require("./util/makeSerializable");
  * @property {(fragments: MaybeMergeableInitFragment<GenerateContext>[]) => MaybeMergeableInitFragment<GenerateContext>[]=} mergeAll
  */
 
-/**
- * Extract fragment index.
- * @template T
- * @param {T} fragment the init fragment
- * @param {number} index index
- * @returns {[T, number]} tuple with both
- */
-const extractFragmentIndex = (fragment, index) => [fragment, index];
-
-/**
- * Sorts fragment with index.
- * @template T
- * @param {[MaybeMergeableInitFragment<T>, number]} a first pair
- * @param {[MaybeMergeableInitFragment<T>, number]} b second pair
- * @returns {number} sort value
- */
-const sortFragmentWithIndex = ([a, i], [b, j]) => {
-	const stageCmp = a.stage - b.stage;
-	if (stageCmp !== 0) return stageCmp;
-	const positionCmp = a.position - b.position;
-	if (positionCmp !== 0) return positionCmp;
-	return i - j;
-};
-
 /**
  * Represents InitFragment.
  * @template GenerateContext
@@ -107,16 +87,28 @@ class InitFragment {
 	 */
 	static addToSource(source, initFragments, context) {
 		if (initFragments.length > 0) {
-			// Sort fragments by position. If 2 fragments have the same position,
-			// use their index.
-			const sortedFragments = initFragments
-				.map(extractFragmentIndex)
-				.sort(sortFragmentWithIndex);
+			// Sort fragment indices by (stage, position), falling back to the
+			// original index — one flat number array instead of N [fragment, index]
+			// tuples for a stable-by-index order.
+			const sortedIndices = initFragments.map((_, index) => index);
+			sortedIndices.sort((a, b) => {
+				const fragmentA = initFragments[a];
+				const fragmentB = initFragments[b];
+				const stageCmp = fragmentA.stage - fragmentB.stage;
+				if (stageCmp !== 0) return stageCmp;
+				const positionCmp = fragmentA.position - fragmentB.position;
+				if (positionCmp !== 0) return positionCmp;
+				return a - b;
+			});
 
 			// Deduplicate fragments. If a fragment has no key, it is always included.
-			/** @type {Map<InitFragmentKey | symbol, MaybeMergeableInitFragment<Context> | MaybeMergeableInitFragment<Context>[]>} */
+			// Keyless fragments get a unique numeric key; number keys never collide
+			// with the string `InitFragmentKey`s used for keyed fragments.
+			/** @type {Map<InitFragmentKey | number, MaybeMergeableInitFragment<Context> | MaybeMergeableInitFragment<Context>[]>} */
 			const keyedFragments = new Map();
-			for (const [fragment] of sortedFragments) {
+			let keylessKey = 0;
+			for (const index of sortedIndices) {
+				const fragment = initFragments[index];
 				if (typeof fragment.mergeAll === "function") {
 					if (!fragment.key) {
 						throw new Error(
@@ -142,7 +134,7 @@ class InitFragment {
 						continue;
 					}
 				}
-				keyedFragments.set(fragment.key || Symbol("fragment key"), fragment);
+				keyedFragments.set(fragment.key || keylessKey++, fragment);
 			}
 
 			const concatSource = new ConcatSource();

package/lib/JavascriptMetaInfoPlugin.js

@@ -12,10 +12,14 @@ const {
 } = require("./ModuleTypeConstants");
 const { getInnerGraphUtils } = require("./optimize/InnerGraph");
 
-/** @typedef {import("./Compiler")} Compiler */
-/** @typedef {import("./Module").BuildInfo} BuildInfo */
-/** @typedef {import("./javascript/JavascriptModule").JavascriptModuleBuildInfo} JavascriptModuleBuildInfo */
-/** @typedef {import("./javascript/JavascriptParser")} JavascriptParser */
+/** @import Compiler from "./Compiler" */
+/** @import { BuildInfo } from "./Module" */
+/**
+ * @import {
+ * 	JavascriptModuleBuildInfo
+ * } from "./javascript/JavascriptModule"
+ */
+/** @import JavascriptParser from "./javascript/JavascriptParser" */
 
 const PLUGIN_NAME = "JavascriptMetaInfoPlugin";
 
@@ -36,6 +40,26 @@ class JavascriptMetaInfoPlugin {
 				 * @returns {void}
 				 */
 				const handler = (parser) => {
+					parser.hooks.program.tap(PLUGIN_NAME, (ast) => {
+						// Nested blocks keep their own disposal scope, only a module-scope
+						// declaration ties disposal to the end of module evaluation.
+						if (
+							ast.body.some(
+								(statement) =>
+									statement.type === "VariableDeclaration" &&
+									(statement.kind === "using" ||
+										statement.kind === "await using")
+							)
+						) {
+							const buildInfo =
+								/** @type {JavascriptModuleBuildInfo} */
+								(parser.state.module.buildInfo);
+							buildInfo.usesTopLevelUsingDeclaration = true;
+							// Concatenation would defer disposal to the enclosing scope.
+							buildInfo.moduleConcatenationBailout =
+								"a top-level using declaration";
+						}
+					});
 					parser.hooks.call.for("eval").tap(PLUGIN_NAME, () => {
 						const buildInfo =
 							/** @type {JavascriptModuleBuildInfo} */
@@ -45,7 +69,14 @@ class JavascriptMetaInfoPlugin {
 						if (currentSymbol) {
 							innerGraph.addUsage(parser.state, null, currentSymbol);
 						} else {
+							// Only worth reporting when the analysis was actually running
+							const wasEnabled = innerGraph.isEnabled(parser.state);
 							innerGraph.bailout(parser.state);
+							if (wasEnabled) {
+								compilation.moduleGraph
+									.getOptimizationBailout(parser.state.module)
+									.push("Inner graph bailout: eval()");
+							}
 						}
 					});
 					parser.hooks.finish.tap(PLUGIN_NAME, () => {

package/lib/LazyBarrel.js

@@ -7,10 +7,9 @@
 
 const Dependency = require("./Dependency");
 
-/** @typedef {import("./Compilation")} Compilation */
-/** @typedef {import("./Compilation").DependencyConstructor} DependencyConstructor */
-/** @typedef {import("./Module")} Module */
-/** @typedef {import("./ModuleFactory")} ModuleFactory */
+/** @import Compilation, { DependencyConstructor } from "./Compilation" */
+/** @import Module from "./Module" */
+/** @import ModuleFactory from "./ModuleFactory" */
 
 /**
  * Defines the deferred request group type used by this module.

package/lib/LibraryTemplatePlugin.js

@@ -7,12 +7,16 @@
 
 const EnableLibraryPlugin = require("./library/EnableLibraryPlugin");
 
-/** @typedef {import("../declarations/WebpackOptions").AuxiliaryComment} AuxiliaryComment */
-/** @typedef {import("../declarations/WebpackOptions").LibraryExport} LibraryExport */
-/** @typedef {import("../declarations/WebpackOptions").LibraryName} LibraryName */
-/** @typedef {import("../declarations/WebpackOptions").LibraryType} LibraryType */
-/** @typedef {import("../declarations/WebpackOptions").UmdNamedDefine} UmdNamedDefine */
-/** @typedef {import("./Compiler")} Compiler */
+/**
+ * @import {
+ * 	AuxiliaryComment,
+ * 	LibraryExport,
+ * 	LibraryName,
+ * 	LibraryType,
+ * 	UmdNamedDefine
+ * } from "../declarations/WebpackOptions"
+ */
+/** @import Compiler from "./Compiler" */
 
 // TODO webpack 6 remove
 class LibraryTemplatePlugin {

package/lib/LoaderOptionsPlugin.js

@@ -8,9 +8,13 @@
 const ModuleFilenameHelpers = require("./ModuleFilenameHelpers");
 const NormalModule = require("./NormalModule");
 
-/** @typedef {import("../declarations/plugins/LoaderOptionsPlugin").LoaderOptionsPluginOptions} LoaderOptionsPluginOptions */
-/** @typedef {import("./Compiler")} Compiler */
-/** @typedef {import("./ModuleFilenameHelpers").MatchObject} MatchObject  */
+/**
+ * @import {
+ * 	LoaderOptionsPluginOptions
+ * } from "../declarations/plugins/LoaderOptionsPlugin"
+ */
+/** @import Compiler from "./Compiler" */
+/** @import { MatchObject } from "./ModuleFilenameHelpers" */
 
 /**
  * Defines the loader context type used by this module.

package/lib/LoaderTargetPlugin.js

@@ -7,7 +7,7 @@
 
 const NormalModule = require("./NormalModule");
 
-/** @typedef {import("./Compiler")} Compiler */
+/** @import Compiler from "./Compiler" */
 
 const PLUGIN_NAME = "LoaderTargetPlugin";
 

package/lib/MainTemplate.js

@@ -8,39 +8,44 @@
 const util = require("util");
 const { SyncWaterfallHook } = require("tapable");
 const RuntimeGlobals = require("./RuntimeGlobals");
+const JavascriptModulesPlugin = require("./javascript/JavascriptModulesPlugin");
 const memoize = require("./util/memoize");
 
-/** @typedef {import("tapable").Tap} Tap */
-/** @typedef {import("webpack-sources").Source} Source */
-/** @typedef {import("../declarations/WebpackOptions").Output} OutputOptions */
-/** @typedef {import("./ModuleTemplate")} ModuleTemplate */
-/** @typedef {import("./Chunk")} Chunk */
-/** @typedef {import("./Compilation")} Compilation */
-/** @typedef {import("./Compilation").AssetInfo} AssetInfo */
-/** @typedef {import("./Compilation").InterpolatedPathAndAssetInfo} InterpolatedPathAndAssetInfo */
-/** @typedef {import("./util/Hash")} Hash */
-/** @typedef {import("./DependencyTemplates")} DependencyTemplates */
-/** @typedef {import("./javascript/JavascriptModulesPlugin").RenderBootstrapContext} RenderBootstrapContext */
-/** @typedef {import("./Template").RenderManifestOptions} RenderManifestOptions */
-/** @typedef {import("./Template").RenderManifestEntry} RenderManifestEntry */
-/** @typedef {import("./TemplatedPathPlugin").TemplatePath} TemplatePath */
-/** @typedef {import("./TemplatedPathPlugin").PathData} PathData */
+const getLoadScriptRuntimeModule = memoize(() =>
+	require("./runtime/LoadScriptRuntimeModule")
+);
+
+const getJsonpTemplatePlugin = memoize(() =>
+	require("./web/JsonpTemplatePlugin")
+);
+
+/** @import { Tap } from "tapable" */
+/** @import { Source } from "webpack-sources" */
+/** @import { Output as OutputOptions } from "../declarations/WebpackOptions" */
+/** @import ModuleTemplate from "./ModuleTemplate" */
+/** @import Chunk from "./Chunk" */
+/**
+ * @import Compilation, {
+ * 	AssetInfo,
+ * 	InterpolatedPathAndAssetInfo,
+ * 	PathData
+ * } from "./Compilation"
+ */
+/** @import Hash from "./util/Hash" */
+/** @import DependencyTemplates from "./DependencyTemplates" */
+/**
+ * @import {
+ * 	RenderBootstrapContext
+ * } from "./javascript/JavascriptModulesPlugin"
+ */
+/** @import { RenderManifestOptions, RenderManifestEntry } from "./Template" */
+/** @import { TemplatePath } from "./TemplatedPathPlugin" */
 /**
  * Defines the if set type used by this module.
  * @template T
  * @typedef {import("tapable").IfSet<T>} IfSet
  */
 
-const getJavascriptModulesPlugin = memoize(() =>
-	require("./javascript/JavascriptModulesPlugin")
-);
-const getJsonpTemplatePlugin = memoize(() =>
-	require("./web/JsonpTemplatePlugin")
-);
-const getLoadScriptRuntimeModule = memoize(() =>
-	require("./runtime/LoadScriptRuntimeModule")
-);
-
 // TODO webpack 6 remove this class
 class MainTemplate {
 	/**
@@ -96,9 +101,9 @@ class MainTemplate {
 					 * @param {(value: string, renderBootstrapContext: RenderBootstrapContext) => string} fn fn
 					 */
 					(options, fn) => {
-						getJavascriptModulesPlugin()
-							.getCompilationHooks(compilation)
-							.renderRequire.tap(options, fn);
+						JavascriptModulesPlugin.getCompilationHooks(
+							compilation
+						).renderRequire.tap(options, fn);
 					},
 					"MainTemplate.hooks.require is deprecated (use JavascriptModulesPlugin.getCompilationHooks().renderRequire instead)",
 					"DEP_WEBPACK_MAIN_TEMPLATE_REQUIRE"
@@ -134,9 +139,9 @@ class MainTemplate {
 					 * @param {(source: Source, chunk: Chunk, hash: string | undefined, moduleTemplate: ModuleTemplate, dependencyTemplates: DependencyTemplates) => Source} fn fn
 					 */
 					(options, fn) => {
-						getJavascriptModulesPlugin()
-							.getCompilationHooks(compilation)
-							.render.tap(options, (source, renderContext) => {
+						JavascriptModulesPlugin.getCompilationHooks(compilation).render.tap(
+							options,
+							(source, renderContext) => {
 								if (
 									renderContext.chunkGraph.getNumberOfEntryModules(
 										renderContext.chunk
@@ -152,7 +157,8 @@ class MainTemplate {
 									compilation.moduleTemplates.javascript,
 									compilation.dependencyTemplates
 								);
-							});
+							}
+						);
 					},
 					"MainTemplate.hooks.render is deprecated (use JavascriptModulesPlugin.getCompilationHooks().render instead)",
 					"DEP_WEBPACK_MAIN_TEMPLATE_RENDER"
@@ -167,9 +173,9 @@ class MainTemplate {
 					 * @param {(source: Source, chunk: Chunk, hash: string | undefined) => Source} fn fn
 					 */
 					(options, fn) => {
-						getJavascriptModulesPlugin()
-							.getCompilationHooks(compilation)
-							.render.tap(options, (source, renderContext) => {
+						JavascriptModulesPlugin.getCompilationHooks(compilation).render.tap(
+							options,
+							(source, renderContext) => {
 								if (
 									renderContext.chunkGraph.getNumberOfEntryModules(
 										renderContext.chunk
@@ -179,7 +185,8 @@ class MainTemplate {
 									return source;
 								}
 								return fn(source, renderContext.chunk, compilation.hash);
-							});
+							}
+						);
 					},
 					"MainTemplate.hooks.renderWithEntry is deprecated (use JavascriptModulesPlugin.getCompilationHooks().render instead)",
 					"DEP_WEBPACK_MAIN_TEMPLATE_RENDER_WITH_ENTRY"
@@ -235,12 +242,12 @@ class MainTemplate {
 					 * @param {(hash: Hash, chunk: Chunk) => void} fn fn
 					 */
 					(options, fn) => {
-						getJavascriptModulesPlugin()
-							.getCompilationHooks(compilation)
-							.chunkHash.tap(options, (chunk, hash) => {
-								if (!chunk.hasRuntime()) return;
-								return fn(hash, chunk);
-							});
+						JavascriptModulesPlugin.getCompilationHooks(
+							compilation
+						).chunkHash.tap(options, (chunk, hash) => {
+							if (!chunk.hasRuntime()) return;
+							return fn(hash, chunk);
+						});
 					},
 					"MainTemplate.hooks.hashForChunk is deprecated (use JavascriptModulesPlugin.getCompilationHooks().chunkHash instead)",
 					"DEP_WEBPACK_MAIN_TEMPLATE_HASH_FOR_CHUNK"

package/lib/ManifestPlugin.js

@@ -9,17 +9,18 @@ const { RawSource } = require("webpack-sources");
 const Compilation = require("./Compilation");
 const HotUpdateChunk = require("./HotUpdateChunk");
 
-/** @typedef {import("./Compiler")} Compiler */
-/** @typedef {import("./Chunk")} Chunk */
-/** @typedef {import("./Chunk").ChunkName} ChunkName */
-/** @typedef {import("./Chunk").ChunkId} ChunkId */
-/** @typedef {import("./Compilation").Asset} Asset */
-/** @typedef {import("./Compilation").AssetInfo} AssetInfo */
-
-/** @typedef {import("../declarations/plugins/ManifestPlugin").ManifestPluginOptions} ManifestPluginOptions */
-/** @typedef {import("../declarations/plugins/ManifestPlugin").ManifestObject} ManifestObject */
-/** @typedef {import("../declarations/plugins/ManifestPlugin").ManifestEntrypoint} ManifestEntrypoint */
-/** @typedef {import("../declarations/plugins/ManifestPlugin").ManifestItem} ManifestItem */
+/** @import Compiler from "./Compiler" */
+/** @import Chunk, { ChunkName, ChunkId } from "./Chunk" */
+/** @import { AssetInfo } from "./Compilation" */
+
+/**
+ * @import {
+ * 	ManifestPluginOptions,
+ * 	ManifestObject,
+ * 	ManifestEntrypoint,
+ * 	ManifestItem
+ * } from "../declarations/plugins/ManifestPlugin"
+ */
 
 /** @typedef {(item: ManifestItem) => boolean} Filter */
 /** @typedef {(manifest: ManifestObject) => ManifestObject} Generate */

package/lib/Module.js

@@ -19,43 +19,53 @@ const { first } = require("./util/SetHelpers");
 const { compareChunksById } = require("./util/comparators");
 const makeSerializable = require("./util/makeSerializable");
 
-/** @typedef {import("webpack-sources").Source} Source */
-/** @typedef {import("../declarations/WebpackOptions").ResolveOptions} ResolveOptions */
-/** @typedef {import("./config/defaults").WebpackOptionsNormalizedWithDefaults} WebpackOptions */
-/** @typedef {import("./Chunk")} Chunk */
-/** @typedef {import("./ChunkGraph").ModuleId} ModuleId */
-/** @typedef {import("./ChunkGroup")} ChunkGroup */
-/** @typedef {import("./CodeGenerationResults")} CodeGenerationResults */
-/** @typedef {import("./Compilation")} Compilation */
-/** @typedef {import("./Compilation").AssetInfo} AssetInfo */
-/** @typedef {import("./Compilation").FileSystemDependencies} FileSystemDependencies */
-/** @typedef {import("./Compilation").UnsafeCacheData} UnsafeCacheData */
-/** @typedef {import("./ConcatenationScope")} ConcatenationScope */
-/** @typedef {import("./Dependency")} Dependency */
-/** @typedef {import("./Dependency").UpdateHashContext} UpdateHashContext */
-/** @typedef {import("./DependencyTemplates")} DependencyTemplates */
-/** @typedef {import("./ModuleSourceTypeConstants").AllTypes} AllTypes */
-/** @typedef {import("./FileSystemInfo")} FileSystemInfo */
-/** @typedef {import("./ModuleGraphConnection").ConnectionState} ConnectionState */
-/** @typedef {import("./ModuleTypeConstants").ModuleTypes} ModuleTypes */
-/** @typedef {import("./ModuleGraph").OptimizationBailouts} OptimizationBailouts */
-/** @typedef {import("./ModuleProfile")} ModuleProfile */
-/** @typedef {import("./NormalModuleFactory")} NormalModuleFactory */
-/** @typedef {import("./RequestShortener")} RequestShortener */
-/** @typedef {import("./ResolverFactory").ResolverWithOptions} ResolverWithOptions */
-/** @typedef {import("./RuntimeTemplate")} RuntimeTemplate */
+/** @import { Source } from "webpack-sources" */
+/** @import { ResolveOptions } from "../declarations/WebpackOptions" */
+/**
+ * @import {
+ * 	WebpackOptionsNormalizedWithDefaults as WebpackOptions
+ * } from "./config/defaults"
+ */
+/** @import Chunk from "./Chunk" */
+/** @import { ModuleId } from "./ChunkGraph" */
+/** @import ChunkGroup from "./ChunkGroup" */
+/** @import CodeGenerationResults from "./CodeGenerationResults" */
+/**
+ * @import Compilation, {
+ * 	AssetInfo,
+ * 	FileSystemDependencies,
+ * 	UnsafeCacheData
+ * } from "./Compilation"
+ */
+/** @import ConcatenationScope from "./ConcatenationScope" */
+/** @import Dependency, { UpdateHashContext } from "./Dependency" */
+/** @import DependencyTemplates from "./DependencyTemplates" */
+/** @import { AllTypes } from "./ModuleSourceTypeConstants" */
+/** @import FileSystemInfo from "./FileSystemInfo" */
+/** @import { ConnectionState } from "./ModuleGraphConnection" */
+/** @import { ModuleTypes } from "./ModuleTypeConstants" */
+/** @import { OptimizationBailouts } from "./ModuleGraph" */
+/** @import ModuleProfile from "./ModuleProfile" */
+/** @import NormalModuleFactory from "./NormalModuleFactory" */
+/** @import RequestShortener from "./RequestShortener" */
+/** @import { ResolverWithOptions } from "./ResolverFactory" */
+/** @import RuntimeTemplate from "./RuntimeTemplate" */
 /**
  * Defines the init fragment type used by this module.
  * @template T
  * @typedef {import("./InitFragment")<T>} InitFragment
  */
-/** @typedef {import("./errors/WebpackError")} WebpackError */
-/** @typedef {import("./serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("./serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
-/** @typedef {import("./util/Hash")} Hash */
-/** @typedef {import("./util/fs").InputFileSystem} InputFileSystem */
-/** @typedef {import("./util/identifier").AssociatedObjectForCache} AssociatedObjectForCache */
-/** @typedef {import("./util/runtime").RuntimeSpec} RuntimeSpec */
+/** @import WebpackError from "./errors/WebpackError" */
+/**
+ * @import {
+ * 	ObjectDeserializerContext,
+ * 	ObjectSerializerContext
+ * } from "./serialization/ObjectMiddleware"
+ */
+/** @import Hash from "./util/Hash" */
+/** @import { InputFileSystem } from "./util/fs" */
+/** @import { AssociatedObjectForCache } from "./util/identifier" */
+/** @import { RuntimeSpec } from "./util/runtime" */
 /**
  * @template T
  * @typedef {import("./util/SortableSet")<T>} SortableSet
@@ -173,6 +183,7 @@ const makeSerializable = require("./util/makeSerializable");
  * @property {boolean=} sideEffectFree
  * @property {Map<string, Record<string, string>>=} exportsFinalNameByRuntime using in ModuleLibraryPlugin
  * @property {Map<string, string>=} exportsSourceByRuntime using in ModuleLibraryPlugin
+ * @property {Map<string, string>=} exportsBindingSourceByRuntime export definitions `ModuleLibraryPlugin` took over, re-emitted only where the module is wrapped
  */
 
 /**
@@ -188,7 +199,10 @@ const makeSerializable = require("./util/makeSerializable");
  * @property {Map<string, AssetInfo | undefined>=} assetsInfo
  * @property {Set<string>=} topLevelDeclarations top level declaration names
  * @property {boolean=} isCircular true when the module is part of a circular dependency chain
- * @property {boolean=} usesTopLevelAwaitForOf module uses top-level `for await…of`, which can't be lowered to a generator
+ * @property {boolean=} usesEval true when the module calls `eval` directly
+ * @property {number=} ineffectivePureAnnotations how many `#__PURE__` annotations sit where the parser does not read them
+ * @property {number=} topLevelThis how many times the module reads `this` at its top level
+ * @property {boolean=} usesTopLevelAwaitForOf module uses top-level `for await…of` or `await using`, which can't be lowered to a generator
  */
 
 /** @typedef {string | Set<string>} ValueCacheVersion */
@@ -1250,6 +1264,21 @@ class Module extends DependenciesBlock {
 		this.resolveOptions = undefined;
 	}
 
+	/**
+	 * Re-acquire factory-derived helpers (parser/generator) for an incremental
+	 * rebuild so this compilation's plugin hooks apply.
+	 * @param {NormalModuleFactory} normalModuleFactory the normal module factory
+	 * @returns {void}
+	 */
+	_restoreParserAndGenerator(normalModuleFactory) {}
+
+	/**
+	 * Releases the cached parser between incremental rebuilds so it doesn't keep
+	 * the previous compilation alive.
+	 * @returns {void}
+	 */
+	_cleanupParserForCache() {}
+
 	/**
 	 * Gets the original source.
 	 * @returns {Source | null} the original source for the module before webpack transformation

package/lib/ModuleFactory.js

@@ -5,9 +5,9 @@
 
 "use strict";
 
-/** @typedef {import("../declarations/WebpackOptions").ResolveOptions} ResolveOptions */
-/** @typedef {import("./Dependency")} Dependency */
-/** @typedef {import("./Module")} Module */
+/** @import { ResolveOptions } from "../declarations/WebpackOptions" */
+/** @import Dependency from "./Dependency" */
+/** @import Module from "./Module" */
 
 /**
  * Defines the module factory result type used by this module.

package/lib/ModuleFilenameHelpers.js

@@ -10,10 +10,10 @@ const { DEFAULTS } = require("./config/defaults");
 const createHash = require("./util/createHash");
 const memoize = require("./util/memoize");
 
-/** @typedef {import("../declarations/WebpackOptions").HashFunction} HashFunction */
-/** @typedef {import("./ChunkGraph")} ChunkGraph */
-/** @typedef {import("./Module")} Module */
-/** @typedef {import("./RequestShortener")} RequestShortener */
+/** @import { HashFunction } from "../declarations/WebpackOptions" */
+/** @import ChunkGraph from "./ChunkGraph" */
+/** @import Module from "./Module" */
+/** @import RequestShortener from "./RequestShortener" */
 
 /** @typedef {(str: string) => boolean} MatcherFn */
 /** @typedef {string | RegExp | MatcherFn | (string | RegExp | MatcherFn)[]} Matcher */
@@ -21,6 +21,11 @@ const memoize = require("./util/memoize");
 
 const ModuleFilenameHelpers = module.exports;
 
+ModuleFilenameHelpers.DEFAULT_MODULE_FILENAME_TEMPLATE =
+	"webpack://[namespace]/[resourcePath]";
+ModuleFilenameHelpers.DEFAULT_FALLBACK_MODULE_FILENAME_TEMPLATE =
+	"webpack://[namespace]/[resourcePath]?[hash]";
+
 // TODO webpack 6: consider removing these
 ModuleFilenameHelpers.ALL_LOADERS_RESOURCE = "[all-loaders][resource]";
 ModuleFilenameHelpers.REGEXP_ALL_LOADERS_RESOURCE =
@@ -169,11 +174,14 @@ ModuleFilenameHelpers.createFilename = (
 	let moduleId;
 	/** @type {ReturnStringCallback} */
 	let shortIdentifier;
+	/** @type {ReturnStringCallback} */
+	let resourceIdentifier;
 	if (typeof module === "string") {
 		shortIdentifier =
 			/** @type {ReturnStringCallback} */
 			(memoize(() => requestShortener.shorten(module)));
 		identifier = shortIdentifier;
+		resourceIdentifier = shortIdentifier;
 		moduleId = () => "";
 		absoluteResourcePath = () =>
 			/** @type {string} */ (module.split("!").pop());
@@ -182,6 +190,14 @@ ModuleFilenameHelpers.createFilename = (
 		shortIdentifier = memoize(() =>
 			module.readableIdentifier(requestShortener)
 		);
+		// `[resource]` and `[loaders]` must stay request paths: a subclass's
+		// readable identifier may carry display-only decorations (e.g. CssModule's
+		// `css ` prefix)
+		resourceIdentifier = memoize(() =>
+			module instanceof NormalModule
+				? /** @type {string} */ (requestShortener.shorten(module.userRequest))
+				: module.readableIdentifier(requestShortener)
+		);
 		identifier =
 			/** @type {ReturnStringCallback} */
 			(memoize(() => requestShortener.shorten(module.identifier())));
@@ -196,9 +212,9 @@ ModuleFilenameHelpers.createFilename = (
 	}
 	const resource =
 		/** @type {ReturnStringCallback} */
-		(memoize(() => shortIdentifier().split("!").pop()));
+		(memoize(() => resourceIdentifier().split("!").pop()));
 
-	const loaders = getBefore(shortIdentifier, "!");
+	const loaders = getBefore(resourceIdentifier, "!");
 	const allLoaders = getBefore(identifier, "!");
 	const query = getAfter(resource, "?");
 	const resourcePath = () => {