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

package/lib/stats/DefaultStatsPresetPlugin.js

@@ -7,14 +7,21 @@
 
 const RequestShortener = require("../RequestShortener");
 
-/** @typedef {import("../../declarations/WebpackOptions").StatsOptions} StatsOptions */
-/** @typedef {import("../../declarations/WebpackOptions").StatsValue} StatsValue */
-/** @typedef {import("../Compilation")} Compilation */
-/** @typedef {import("../Compilation").CreateStatsOptionsContext} CreateStatsOptionsContext */
-/** @typedef {import("../Compilation").KnownNormalizedStatsOptions} KnownNormalizedStatsOptions */
-/** @typedef {import("../Compilation").NormalizedStatsOptions} NormalizedStatsOptions */
-/** @typedef {import("../Compiler")} Compiler */
-/** @typedef {import("./DefaultStatsFactoryPlugin").StatsError} StatsError */
+/**
+ * @import {
+ * 	StatsOptions,
+ * 	StatsValue
+ * } from "../../declarations/WebpackOptions"
+ */
+/**
+ * @import Compilation, {
+ * 	CreateStatsOptionsContext,
+ * 	KnownNormalizedStatsOptions,
+ * 	NormalizedStatsOptions
+ * } from "../Compilation"
+ */
+/** @import Compiler from "../Compiler" */
+/** @import { StatsError } from "./DefaultStatsFactoryPlugin" */
 
 /**
  * Processes the provided normalized stats option.
@@ -276,6 +283,8 @@ const DEFAULTS = {
 	errorErrors: AUTO_FOR_TO_STRING,
 	warnings: NORMAL_ON,
 	warningsCount: NORMAL_ON,
+	hints: NORMAL_ON,
+	hintsCount: NORMAL_ON,
 	publicPath: OFF_FOR_TO_STRING,
 	logging: ({ all }, { forToString }) =>
 		forToString && all !== false ? "info" : false,

package/lib/stats/DefaultStatsPrinterPlugin.js

@@ -5,32 +5,37 @@
 
 "use strict";
 
-/** @typedef {import("../Compiler")} Compiler */
-/** @typedef {import("../logging/Logger").LogTypeEnum} LogTypeEnum */
-/** @typedef {import("./DefaultStatsFactoryPlugin").ChunkId} ChunkId */
-/** @typedef {import("./DefaultStatsFactoryPlugin").ChunkName} ChunkName */
-/** @typedef {import("./DefaultStatsFactoryPlugin").KnownStatsAsset} KnownStatsAsset */
-/** @typedef {import("./DefaultStatsFactoryPlugin").KnownStatsChunk} KnownStatsChunk */
-/** @typedef {import("./DefaultStatsFactoryPlugin").KnownStatsChunkGroup} KnownStatsChunkGroup */
-/** @typedef {import("./DefaultStatsFactoryPlugin").KnownStatsChunkOrigin} KnownStatsChunkOrigin */
-/** @typedef {import("./DefaultStatsFactoryPlugin").KnownStatsCompilation} KnownStatsCompilation */
-/** @typedef {import("./DefaultStatsFactoryPlugin").KnownStatsError} KnownStatsError */
-/** @typedef {import("./DefaultStatsFactoryPlugin").KnownStatsLogging} KnownStatsLogging */
-/** @typedef {import("./DefaultStatsFactoryPlugin").KnownStatsLoggingEntry} KnownStatsLoggingEntry */
-/** @typedef {import("./DefaultStatsFactoryPlugin").KnownStatsModule} KnownStatsModule */
-/** @typedef {import("./DefaultStatsFactoryPlugin").KnownStatsModuleIssuer} KnownStatsModuleIssuer */
-/** @typedef {import("./DefaultStatsFactoryPlugin").KnownStatsModuleReason} KnownStatsModuleReason */
-/** @typedef {import("./DefaultStatsFactoryPlugin").KnownStatsModuleTraceDependency} KnownStatsModuleTraceDependency */
-/** @typedef {import("./DefaultStatsFactoryPlugin").KnownStatsModuleTraceItem} KnownStatsModuleTraceItem */
-/** @typedef {import("./DefaultStatsFactoryPlugin").KnownStatsProfile} KnownStatsProfile */
-/** @typedef {import("./DefaultStatsFactoryPlugin").StatsCompilation} StatsCompilation */
-/** @typedef {import("./StatsPrinter")} StatsPrinter */
-/** @typedef {import("./StatsPrinter").ColorFunction} ColorFunction */
-/** @typedef {import("./StatsPrinter").KnownStatsPrinterColorFunctions} KnownStatsPrinterColorFunctions */
-/** @typedef {import("./StatsPrinter").KnownStatsPrinterContext} KnownStatsPrinterContext */
-/** @typedef {import("./StatsPrinter").KnownStatsPrinterFormatters} KnownStatsPrinterFormatters */
-/** @typedef {import("./StatsPrinter").StatsPrinterContext} StatsPrinterContext */
-/** @typedef {import("./StatsPrinter").StatsPrinterContextWithExtra} StatsPrinterContextWithExtra */
+/** @import { ChunkId, ChunkName } from "../Chunk" */
+/** @import Compiler from "../Compiler" */
+/** @import { LogTypeEnum } from "../logging/Logger" */
+/**
+ * @import {
+ * 	KnownStatsAsset,
+ * 	KnownStatsChunk,
+ * 	KnownStatsChunkGroup,
+ * 	KnownStatsChunkOrigin,
+ * 	KnownStatsCompilation,
+ * 	KnownStatsError,
+ * 	KnownStatsLogging,
+ * 	KnownStatsLoggingEntry,
+ * 	KnownStatsModule,
+ * 	KnownStatsModuleIssuer,
+ * 	KnownStatsModuleReason,
+ * 	KnownStatsModuleTraceDependency,
+ * 	KnownStatsModuleTraceItem,
+ * 	KnownStatsProfile
+ * } from "./DefaultStatsFactoryPlugin"
+ */
+/**
+ * @import StatsPrinter, {
+ * 	ColorFunction,
+ * 	KnownStatsPrinterColorFunctions,
+ * 	KnownStatsPrinterContext,
+ * 	KnownStatsPrinterFormatters,
+ * 	StatsPrinterContext,
+ * 	StatsPrinterContextWithExtra
+ * } from "./StatsPrinter"
+ */
 
 const DATA_URI_CONTENT_LENGTH = 16;
 const MAX_MODULE_IDENTIFIER_LENGTH = 80;
@@ -930,6 +935,7 @@ const ITEM_NAMES = {
 	"compilation.namedChunkGroups[]": "chunkGroup",
 	"compilation.errors[]": "error",
 	"compilation.warnings[]": "error",
+	"compilation.hints[]": "error",
 	"compilation.logging[]": "loggingGroup",
 	"compilation.children[]": "compilation",
 	"asset.related[]": "asset",
@@ -1006,6 +1012,7 @@ const PREFERRED_ORDERS = {
 		"filteredModules",
 		"children",
 		"logging",
+		"hints",
 		"warnings",
 		"warningsInChildren!",
 		"filteredWarningDetailsCount",
@@ -1204,6 +1211,7 @@ const SIMPLE_ITEMS_JOINER = {
 			.join(" "),
 	"compilation.errors": itemsJoinMoreSpacing,
 	"compilation.warnings": itemsJoinMoreSpacing,
+	"compilation.hints": itemsJoinMoreSpacing,
 	"compilation.logging": itemsJoinMoreSpacing,
 	"compilation.children": (items) =>
 		indent(/** @type {string} */ (itemsJoinMoreSpacing(items)), "  "),
@@ -1469,6 +1477,8 @@ const SIMPLE_ELEMENT_JOINERS = {
 	chunkOrigin: (items) => `> ${joinOneLine(items)}`,
 	"errors[].error": joinError(true),
 	"warnings[].error": joinError(false),
+	"hints[].error": (items, { cyan }) =>
+		`${cyan("HINT")} in ${joinExplicitNewLine(items, "")}`,
 	error: (items) => joinExplicitNewLine(items, ""),
 	"error.errors[].error": (items) =>
 		indent(`[errors]: ${joinExplicitNewLine(items, "")}`, "  "),
@@ -1695,172 +1705,30 @@ class DefaultStatsPrinterPlugin {
 						context.timeReference = compilation.time;
 					});
 
-				for (const key of /** @type {(keyof CompilationSimplePrinters)[]} */ (
-					Object.keys(COMPILATION_SIMPLE_PRINTERS)
-				)) {
-					stats.hooks.print.for(key).tap(PLUGIN_NAME, (obj, ctx) =>
-						/** @type {NonNullable<CompilationSimplePrinters[keyof CompilationSimplePrinters]>} */
-						(COMPILATION_SIMPLE_PRINTERS[key])(
-							obj,
-							/** @type {DefineStatsPrinterContext<"compilation">} */
-							(ctx),
-							stats
-						)
-					);
-				}
-
-				for (const key of /** @type {(keyof AssetSimplePrinters)[]} */ (
-					Object.keys(ASSET_SIMPLE_PRINTERS)
-				)) {
-					stats.hooks.print.for(key).tap(PLUGIN_NAME, (obj, ctx) =>
-						/** @type {NonNullable<AssetSimplePrinters[keyof AssetSimplePrinters]>} */
-						(ASSET_SIMPLE_PRINTERS[key])(
-							obj,
-							/** @type {DefineStatsPrinterContext<"asset" | "asset.info">} */
-							(ctx),
-							stats
-						)
-					);
-				}
-
-				for (const key of /** @type {(keyof ModuleSimplePrinters)[]} */ (
-					Object.keys(MODULE_SIMPLE_PRINTERS)
-				)) {
-					stats.hooks.print.for(key).tap(PLUGIN_NAME, (obj, ctx) =>
-						/** @type {SimplePrinter<EXPECTED_ANY, "module">} */
-						(MODULE_SIMPLE_PRINTERS[key])(
-							obj,
-							/** @type {DefineStatsPrinterContext<"module">} */
-							(ctx),
-							stats
-						)
-					);
-				}
-
-				for (const key of /** @type {(keyof ModuleIssuerPrinters)[]} */ (
-					Object.keys(MODULE_ISSUER_PRINTERS)
-				)) {
-					stats.hooks.print.for(key).tap(PLUGIN_NAME, (obj, ctx) =>
-						/** @type {NonNullable<ModuleIssuerPrinters[keyof ModuleIssuerPrinters]>} */
-						(MODULE_ISSUER_PRINTERS[key])(
-							obj,
-							/** @type {DefineStatsPrinterContext<"moduleIssuer">} */
-							(ctx),
-							stats
-						)
-					);
-				}
-
-				for (const key of /** @type {(keyof ModuleReasonsPrinters)[]} */ (
-					Object.keys(MODULE_REASON_PRINTERS)
-				)) {
-					stats.hooks.print.for(key).tap(PLUGIN_NAME, (obj, ctx) =>
-						/** @type {SimplePrinter<EXPECTED_ANY, "moduleReason">} */
-						(MODULE_REASON_PRINTERS[key])(
-							obj,
-							/** @type {DefineStatsPrinterContext<"moduleReason">} */
-							(ctx),
-							stats
-						)
-					);
-				}
-
-				for (const key of /** @type {(keyof ModuleProfilePrinters)[]} */ (
-					Object.keys(MODULE_PROFILE_PRINTERS)
-				)) {
-					stats.hooks.print.for(key).tap(PLUGIN_NAME, (obj, ctx) =>
-						/** @type {NonNullable<ModuleProfilePrinters[keyof ModuleProfilePrinters]>} */
-						(MODULE_PROFILE_PRINTERS[key])(
-							obj,
-							/** @type {DefineStatsPrinterContext<"profile">} */
-							(ctx),
-							stats
-						)
-					);
-				}
-
-				for (const key of /** @type {(keyof ChunkGroupPrinters)[]} */ (
-					Object.keys(CHUNK_GROUP_PRINTERS)
-				)) {
-					stats.hooks.print.for(key).tap(PLUGIN_NAME, (obj, ctx) =>
-						/** @type {SimplePrinter<EXPECTED_ANY, "chunkGroupKind" | "chunkGroup">} */
-						(CHUNK_GROUP_PRINTERS[key])(
-							obj,
-							/** @type {DefineStatsPrinterContext<"chunkGroupKind" | "chunkGroup">} */
-							(ctx),
-							stats
-						)
-					);
-				}
-
-				for (const key of /** @type {(keyof ChunkPrinters)[]} */ (
-					Object.keys(CHUNK_PRINTERS)
-				)) {
-					stats.hooks.print.for(key).tap(PLUGIN_NAME, (obj, ctx) =>
-						/** @type {SimplePrinter<EXPECTED_ANY, "chunk">} */
-						(CHUNK_PRINTERS[key])(
-							obj,
-							/** @type {DefineStatsPrinterContext<"chunk">} */
-							(ctx),
-							stats
-						)
-					);
-				}
-
-				for (const key of /** @type {(keyof ErrorPrinters)[]} */ (
-					Object.keys(ERROR_PRINTERS)
-				)) {
-					stats.hooks.print.for(key).tap(PLUGIN_NAME, (obj, ctx) =>
-						/** @type {SimplePrinter<EXPECTED_ANY, "error">} */
-						(ERROR_PRINTERS[key])(
-							obj,
-							/** @type {DefineStatsPrinterContext<"error">} */
-							(ctx),
-							stats
-						)
-					);
-				}
-
-				for (const key of /** @type {(keyof LogEntryPrinters)[]} */ (
-					Object.keys(LOG_ENTRY_PRINTERS)
-				)) {
-					stats.hooks.print.for(key).tap(PLUGIN_NAME, (obj, ctx) =>
-						/** @type {SimplePrinter<EXPECTED_ANY, "logging">} */
-						(LOG_ENTRY_PRINTERS[key])(
-							obj,
-							/** @type {DefineStatsPrinterContext<"logging">} */
-							(ctx),
-							stats
-						)
-					);
-				}
-
-				for (const key of /** @type {(keyof ModuleTraceDependencyPrinters)[]} */ (
-					Object.keys(MODULE_TRACE_DEPENDENCY_PRINTERS)
-				)) {
-					stats.hooks.print.for(key).tap(PLUGIN_NAME, (obj, ctx) =>
-						/** @type {NonNullable<ModuleTraceDependencyPrinters[keyof ModuleTraceDependencyPrinters]>} */
-						(MODULE_TRACE_DEPENDENCY_PRINTERS[key])(
-							obj,
-							/** @type {DefineStatsPrinterContext<"moduleTraceDependency">} */
-							(ctx),
-							stats
-						)
-					);
-				}
-
-				for (const key of /** @type {(keyof ModuleTraceItemPrinters)[]} */ (
-					Object.keys(MODULE_TRACE_ITEM_PRINTERS)
-				)) {
-					stats.hooks.print.for(key).tap(PLUGIN_NAME, (obj, ctx) =>
-						/** @type {NonNullable<ModuleTraceItemPrinters[keyof ModuleTraceItemPrinters]>} */
-						(MODULE_TRACE_ITEM_PRINTERS[key])(
-							obj,
-							/** @type {DefineStatsPrinterContext<"moduleTraceItem">} */
-							(ctx),
-							stats
-						)
-					);
+				// Every `*_SIMPLE_PRINTERS` map registers identically: tap
+				// `print.for(key)` with a formatter called as `(obj, ctx, stats)`.
+				// One loop over all maps replaces a dozen near-identical blocks.
+				for (const simplePrinters of /** @type {Record<string, EXPECTED_ANY>[]} */ ([
+					COMPILATION_SIMPLE_PRINTERS,
+					ASSET_SIMPLE_PRINTERS,
+					MODULE_SIMPLE_PRINTERS,
+					MODULE_ISSUER_PRINTERS,
+					MODULE_REASON_PRINTERS,
+					MODULE_PROFILE_PRINTERS,
+					CHUNK_GROUP_PRINTERS,
+					CHUNK_PRINTERS,
+					ERROR_PRINTERS,
+					LOG_ENTRY_PRINTERS,
+					MODULE_TRACE_DEPENDENCY_PRINTERS,
+					MODULE_TRACE_ITEM_PRINTERS
+				])) {
+					for (const key of Object.keys(simplePrinters)) {
+						stats.hooks.print
+							.for(key)
+							.tap(PLUGIN_NAME, (obj, ctx) =>
+								simplePrinters[key](obj, ctx, stats)
+							);
+					}
 				}
 
 				for (const key of Object.keys(PREFERRED_ORDERS)) {

package/lib/stats/StatsFactory.js

@@ -6,41 +6,39 @@
 "use strict";
 
 const { HookMap, SyncBailHook, SyncWaterfallHook } = require("tapable");
-const { concatComparators, keepOriginalOrder } = require("../util/comparators");
 const smartGrouping = require("../util/smartGrouping");
 
-/** @typedef {import("../Chunk")} Chunk */
-/** @typedef {import("../ChunkGroup").OriginRecord} OriginRecord */
-/** @typedef {import("../Compilation")} Compilation */
-/** @typedef {import("../Compilation").Asset} Asset */
-/** @typedef {import("../Compilation").NormalizedStatsOptions} NormalizedStatsOptions */
-/** @typedef {import("../Dependency")} Dependency */
-/** @typedef {import("../Module")} Module */
-/** @typedef {import("../ModuleGraph").ModuleProfile} ModuleProfile */
-/** @typedef {import("../ModuleGraphConnection")} ModuleGraphConnection */
-/** @typedef {import("../errors/WebpackError")} WebpackError */
+/** @import Chunk from "../Chunk" */
+/** @import { OriginRecord } from "../ChunkGroup" */
+/** @import Compilation, { Asset } from "../Compilation" */
+/** @import Dependency from "../Dependency" */
+/** @import Module from "../Module" */
+/** @import ModuleGraphConnection from "../ModuleGraphConnection" */
 /** @typedef {import("../util/comparators").Comparator<EXPECTED_ANY>} Comparator */
-/** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
+/** @import ModuleProfile from "../ModuleProfile" */
+/** @import { RuntimeSpec } from "../util/runtime" */
 /**
  * Defines the group config type used by this module.
  * @template T, R
  * @typedef {import("../util/smartGrouping").GroupConfig<T, R>} GroupConfig
  */
-/** @typedef {import("./DefaultStatsFactoryPlugin").ChunkGroupInfoWithName} ChunkGroupInfoWithName */
-/** @typedef {import("./DefaultStatsFactoryPlugin").ModuleIssuerPath} ModuleIssuerPath */
-/** @typedef {import("./DefaultStatsFactoryPlugin").ModuleTrace} ModuleTrace */
-/** @typedef {import("./DefaultStatsFactoryPlugin").StatsAsset} StatsAsset */
-/** @typedef {import("./DefaultStatsFactoryPlugin").StatsChunk} StatsChunk */
-/** @typedef {import("./DefaultStatsFactoryPlugin").StatsChunkGroup} StatsChunkGroup */
-/** @typedef {import("./DefaultStatsFactoryPlugin").StatsChunkOrigin} StatsChunkOrigin */
-/** @typedef {import("./DefaultStatsFactoryPlugin").StatsCompilation} StatsCompilation */
-/** @typedef {import("./DefaultStatsFactoryPlugin").StatsError} StatsError */
-/** @typedef {import("./DefaultStatsFactoryPlugin").StatsModule} StatsModule */
-/** @typedef {import("./DefaultStatsFactoryPlugin").StatsModuleIssuer} StatsModuleIssuer */
-/** @typedef {import("./DefaultStatsFactoryPlugin").StatsModuleReason} StatsModuleReason */
-/** @typedef {import("./DefaultStatsFactoryPlugin").StatsModuleTraceDependency} StatsModuleTraceDependency */
-/** @typedef {import("./DefaultStatsFactoryPlugin").StatsModuleTraceItem} StatsModuleTraceItem */
-/** @typedef {import("./DefaultStatsFactoryPlugin").StatsProfile} StatsProfile */
+/**
+ * @import {
+ * 	ChunkGroupInfoWithName,
+ * 	ModuleTrace,
+ * 	StatsAsset,
+ * 	StatsChunk,
+ * 	StatsChunkGroup,
+ * 	StatsChunkOrigin,
+ * 	StatsCompilation,
+ * 	StatsError,
+ * 	StatsModule,
+ * 	StatsModuleReason,
+ * 	StatsModuleTraceDependency,
+ * 	StatsModuleTraceItem,
+ * 	StatsProfile
+ * } from "./DefaultStatsFactoryPlugin"
+ */
 
 /**
  * Defines the known stats factory context type used by this module.
@@ -294,10 +292,7 @@ class StatsFactory {
 				h.call(comparators, context)
 			);
 			if (comparators.length > 0) {
-				items.sort(
-					// @ts-expect-error number of arguments is correct
-					concatComparators(...comparators, keepOriginalOrder(items))
-				);
+				sortWithOriginalOrder(items, comparators);
 			}
 
 			// run filter on sorted items
@@ -358,10 +353,7 @@ class StatsFactory {
 				(h) => h.call(comparators2, context)
 			);
 			if (comparators2.length > 0) {
-				resultItems.sort(
-					// @ts-expect-error number of arguments is correct
-					concatComparators(...comparators2, keepOriginalOrder(resultItems))
-				);
+				sortWithOriginalOrder(resultItems, comparators2);
 			}
 
 			// group result items
@@ -424,4 +416,33 @@ class StatsFactory {
 	}
 }
 
+/**
+ * Stable in-place sort applying comparators in order, keeping the original order
+ * for equal items. Inlined instead of `concatComparators(...c, keepOriginalOrder())`
+ * because that combination is single-use per sort and only thrashes the comparator
+ * caches (a fresh tiebreaker closure every call allocates a new cache entry).
+ * @param {EXPECTED_ANY[]} items items to sort in place
+ * @param {Comparator[]} comparators comparators applied in order
+ * @returns {void}
+ */
+const sortWithOriginalOrder = (items, comparators) => {
+	// original-index tiebreaker keeps the sort stable on engines without a stable Array.sort
+	/** @type {Map<EXPECTED_ANY, number>} */
+	const originalOrder = new Map();
+	for (let i = 0; i < items.length; i++) {
+		originalOrder.set(items[i], i);
+	}
+	const count = comparators.length;
+	items.sort((a, b) => {
+		for (let i = 0; i < count; i++) {
+			const res = comparators[i](a, b);
+			if (res !== 0) return res;
+		}
+		return (
+			/** @type {number} */ (originalOrder.get(a)) -
+			/** @type {number} */ (originalOrder.get(b))
+		);
+	});
+};
+
 module.exports = StatsFactory;

package/lib/stats/StatsPrinter.js

@@ -7,18 +7,22 @@
 
 const { HookMap, SyncBailHook, SyncWaterfallHook } = require("tapable");
 
-/** @typedef {import("./DefaultStatsFactoryPlugin").StatsAsset} StatsAsset */
-/** @typedef {import("./DefaultStatsFactoryPlugin").StatsChunk} StatsChunk */
-/** @typedef {import("./DefaultStatsFactoryPlugin").StatsChunkGroup} StatsChunkGroup */
-/** @typedef {import("./DefaultStatsFactoryPlugin").StatsCompilation} StatsCompilation */
-/** @typedef {import("./DefaultStatsFactoryPlugin").StatsError} StatsError */
-/** @typedef {import("./DefaultStatsFactoryPlugin").StatsLogging} StatsLogging */
-/** @typedef {import("./DefaultStatsFactoryPlugin").StatsModule} StatsModule */
-/** @typedef {import("./DefaultStatsFactoryPlugin").StatsModuleIssuer} StatsModuleIssuer */
-/** @typedef {import("./DefaultStatsFactoryPlugin").StatsModuleReason} StatsModuleReason */
-/** @typedef {import("./DefaultStatsFactoryPlugin").StatsModuleTraceDependency} StatsModuleTraceDependency */
-/** @typedef {import("./DefaultStatsFactoryPlugin").StatsModuleTraceItem} StatsModuleTraceItem */
-/** @typedef {import("./DefaultStatsFactoryPlugin").StatsProfile} StatsProfile */
+/**
+ * @import {
+ * 	StatsAsset,
+ * 	StatsChunk,
+ * 	StatsChunkGroup,
+ * 	StatsCompilation,
+ * 	StatsError,
+ * 	StatsLogging,
+ * 	StatsModule,
+ * 	StatsModuleIssuer,
+ * 	StatsModuleReason,
+ * 	StatsModuleTraceDependency,
+ * 	StatsModuleTraceItem,
+ * 	StatsProfile
+ * } from "./DefaultStatsFactoryPlugin"
+ */
 
 /**
  * Defines the printed element type used by this module.

package/lib/typescript/TypeScriptPlugin.js

@@ -6,26 +6,25 @@
 "use strict";
 
 const mod = require("module");
+const { SourceMapSource } = require("webpack-sources");
 const {
 	JAVASCRIPT_MODULE_TYPE_AUTO,
 	JAVASCRIPT_MODULE_TYPE_DYNAMIC,
 	JAVASCRIPT_MODULE_TYPE_ESM
 } = require("../ModuleTypeConstants");
 const NormalModule = require("../NormalModule");
-const ModuleBuildError = require("../errors/ModuleBuildError");
 const memoize = require("../util/memoize");
 const removeBOM = require("../util/removeBOM");
 
-/** @typedef {import("webpack-sources").RawSourceMap} RawSourceMap */
-/** @typedef {import("../Compiler")} Compiler */
-/** @typedef {import("../NormalModule")} NormalModuleType */
-/** @typedef {import("../NormalModule").Result} Result */
-/** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
-
-const getSourceMapSource = memoize(
-	() => require("webpack-sources").SourceMapSource
+const getModuleBuildError = memoize(() =>
+	require("../errors/ModuleBuildError")
 );
 
+/** @import { RawSourceMap } from "webpack-sources" */
+/** @import Compiler from "../Compiler" */
+/** @import NormalModuleType, { Result } from "../NormalModule" */
+/** @import JavascriptParser from "../javascript/JavascriptParser" */
+
 const PLUGIN_NAME = "TypeScriptPlugin";
 
 /** @type {Set<string>} */
@@ -103,7 +102,6 @@ const composeWithLoaderSourceMap = (
 	preStripSource,
 	loaderSourceMap
 ) => {
-	const SourceMapSource = getSourceMapSource();
 	const composed = new SourceMapSource(
 		strippedSource,
 		resource,
@@ -117,7 +115,7 @@ const composeWithLoaderSourceMap = (
 
 /**
  * Run `module.stripTypeScriptTypes` on the input, wrapping any thrown
- * `TypeScript ...` errors as `ModuleBuildError` so they surface as
+ * `TypeScript ...` errors as `getModuleBuildError()` so they surface as
  * per-module build errors instead of uncaught exceptions.
  * @param {string} input pre-strip TS source (BOM-free string)
  * @returns {string} stripped JS
@@ -130,7 +128,7 @@ const stripTypes = (input) => {
 		// eslint-disable-next-line n/no-unsupported-features/node-builtins
 		return mod.stripTypeScriptTypes(input, { mode: "strip" });
 	} catch (err) {
-		throw new ModuleBuildError(/** @type {Error} */ (err));
+		throw new (getModuleBuildError())(/** @type {Error} */ (err));
 	}
 };
 
@@ -176,11 +174,11 @@ class TypeScriptPlugin {
 		if (!resource || !isTypeScriptResource(resource)) return result;
 
 		if (TSX_RESOURCE_RE.test(resource)) {
-			throw new ModuleBuildError(new Error(TSX_NOT_SUPPORTED));
+			throw new (getModuleBuildError())(new Error(TSX_NOT_SUPPORTED));
 		}
 
 		if (!("stripTypeScriptTypes" in mod)) {
-			throw new ModuleBuildError(new Error(NODE_API_MISSING));
+			throw new (getModuleBuildError())(new Error(NODE_API_MISSING));
 		}
 
 		const [rawSource, loaderSourceMap, ...rest] = result;

package/lib/url/URLParserPlugin.js

@@ -14,20 +14,33 @@ const {
 } = require("../dependencies/ImportMetaPlugin");
 const URLContextDependency = require("../dependencies/URLContextDependency");
 const URLDependency = require("../dependencies/URLDependency");
-const CommentCompilationWarning = require("../errors/CommentCompilationWarning");
-const UnsupportedFeatureWarning = require("../errors/UnsupportedFeatureWarning");
 const BasicEvaluatedExpression = require("../javascript/BasicEvaluatedExpression");
 const { approve } = require("../javascript/JavascriptParserHelpers");
 const { getInnerGraphUtils } = require("../optimize/InnerGraph");
 const ResourceHintPlugin = require("../prefetch/ResourceHintPlugin");
+const memoize = require("../util/memoize");
 
-/** @typedef {import("estree").MemberExpression} MemberExpression */
-/** @typedef {import("estree").NewExpression} NewExpressionNode */
-/** @typedef {import("../../declarations/WebpackOptions").JavascriptParserOptions} JavascriptParserOptions */
-/** @typedef {import("../Dependency").DependencyLocation} DependencyLocation */
-/** @typedef {import("../NormalModule")} NormalModule */
-/** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
-/** @typedef {import("../javascript/JavascriptParser").Range} Range */
+const getUnsupportedFeatureWarning = memoize(() =>
+	require("../errors/UnsupportedFeatureWarning")
+);
+
+const getCommentCompilationWarning = memoize(() =>
+	require("../errors/CommentCompilationWarning")
+);
+
+/**
+ * @import {
+ * 	MemberExpression,
+ * 	NewExpression as NewExpressionNode
+ * } from "estree"
+ */
+/**
+ * @import {
+ * 	JavascriptParserOptions
+ * } from "../../declarations/WebpackOptions"
+ */
+/** @import NormalModule from "../NormalModule" */
+/** @import JavascriptParser, { Range } from "../javascript/JavascriptParser" */
 
 const PLUGIN_NAME = "URLParserPlugin";
 
@@ -179,7 +192,7 @@ class URLParserPlugin {
 				for (const e of commentErrors) {
 					const { comment } = e;
 					parser.state.module.addWarning(
-						new CommentCompilationWarning(
+						new (getCommentCompilationWarning())(
 							`Compilation error while processing magic comment(-s): /*${comment.value}*/: ${e.message}`,
 							parser.getLocation(comment)
 						)
@@ -190,7 +203,7 @@ class URLParserPlugin {
 			if (importOptions && importOptions.webpackIgnore !== undefined) {
 				if (typeof importOptions.webpackIgnore !== "boolean") {
 					parser.state.module.addWarning(
-						new UnsupportedFeatureWarning(
+						new (getUnsupportedFeatureWarning())(
 							`\`webpackIgnore\` expected a boolean, but received: ${importOptions.webpackIgnore}.`,
 							parser.getLocation(expr)
 						)
@@ -286,7 +299,7 @@ class URLParserPlugin {
 						!(importOptions.webpackInclude instanceof RegExp)
 					) {
 						parser.state.module.addWarning(
-							new UnsupportedFeatureWarning(
+							new (getUnsupportedFeatureWarning())(
 								`\`webpackInclude\` expected a regular expression, but received: ${importOptions.webpackInclude}.`,
 								parser.getLocation(expr)
 							)
@@ -301,7 +314,7 @@ class URLParserPlugin {
 						!(importOptions.webpackExclude instanceof RegExp)
 					) {
 						parser.state.module.addWarning(
-							new UnsupportedFeatureWarning(
+							new (getUnsupportedFeatureWarning())(
 								`\`webpackExclude\` expected a regular expression, but received: ${importOptions.webpackExclude}.`,
 								parser.getLocation(expr)
 							)

package/lib/util/AsyncQueue.js

@@ -226,9 +226,10 @@ class AsyncQueue {
 	 */
 	invalidate(item) {
 		const key = this._getKey(item);
-		const entry =
-			/** @type {AsyncQueueEntry<T, K, R>} */
-			(this._entries.get(key));
+		const entry = this._entries.get(key);
+		// nothing queued for this item in the current run (e.g. incremental rebuild
+		// against a persisted graph) — nothing to invalidate
+		if (entry === undefined) return;
 		this._entries.delete(key);
 		if (entry.state === QUEUED_STATE) {
 			this._queued.delete(entry);