webpack 5.111.0 → 5.112.0

package/lib/dependencies/{URLContextDependency.js → url/URLContextDependency.js}

@@ -5,14 +5,14 @@
 
 "use strict";
 
-const makeSerializable = require("../util/makeSerializable");
-const ContextDependency = require("./ContextDependency");
-const ContextDependencyTemplateAsRequireCall = require("./ContextDependencyTemplateAsRequireCall");
+const makeSerializable = require("../../util/makeSerializable");
+const ContextDependency = require("../context/ContextDependency");
+const ContextDependencyTemplateAsRequireCall = require("../context/ContextDependencyTemplateAsRequireCall");
 
-/** @import { ContextOptions } from "../ContextModule" */
-/** @import { Range } from "../javascript/JavascriptParser" */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range]>} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Range]>} ObjectSerializerContext */
+/** @import { ContextOptions } from "../../context/ContextModule" */
+/** @import { Range } from "../../javascript/JavascriptParser" */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range]>} ObjectDeserializerContext */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectSerializerContext<[Range]>} ObjectSerializerContext */
 
 /** @typedef {ContextOptions & { request: string }} ContextDependencyOptions */
 
@@ -56,10 +56,11 @@ class URLContextDependency extends ContextDependency {
 	}
 }
 
-makeSerializable(
-	URLContextDependency,
+makeSerializable(URLContextDependency, [
+	"webpack/lib/dependencies/url/URLContextDependency",
+	// TODO in the next major release: remove, they restore pre-move cache packs
 	"webpack/lib/dependencies/URLContextDependency"
-);
+]);
 
 URLContextDependency.Template = ContextDependencyTemplateAsRequireCall;
 

package/lib/dependencies/{URLDependency.js → url/URLDependency.js}

@@ -5,39 +5,40 @@
 
 "use strict";
 
+const RawDataUrlModule = require("../../asset/RawDataUrlModule");
 const {
 	ASSET_URL_TYPE,
 	JAVASCRIPT_TYPE
-} = require("../ModuleSourceTypeConstants");
-const RuntimeGlobals = require("../RuntimeGlobals");
-const RawDataUrlModule = require("../asset/RawDataUrlModule");
+} = require("../../module/ModuleSourceTypeConstants");
 const {
 	getDependencyUsedByExportsCondition
-} = require("../optimize/InnerGraph");
-const { toJsStringLiteral } = require("../util/identifier");
-const makeSerializable = require("../util/makeSerializable");
-const memoize = require("../util/memoize");
+} = require("../../optimize/InnerGraph");
+const RuntimeGlobals = require("../../runtime/RuntimeGlobals");
+const { toJsStringLiteral } = require("../../util/identifier");
+const makeSerializable = require("../../util/makeSerializable");
+const memoize = require("../../util/memoize");
 const {
 	PUBLIC_PATH_AUTO,
 	PUBLIC_PATH_FULL_HASH
-} = require("../util/publicPathPlaceholder");
-const ModuleDependency = require("./ModuleDependency");
+} = require("../../util/publicPathPlaceholder");
+const ModuleDependency = require("../core/ModuleDependency");
 
 /** @import { ReplaceSource } from "webpack-sources" */
 /**
  * @import Dependency, {
  * 	GetConditionFn,
- * 	UpdateHashContext
- * } from "../Dependency"
+ * 	UpdateHashContext,
+ * 	DependencyKinds
+ * } from "../../graph/Dependency"
  */
-/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
-/** @import Module from "../Module" */
-/** @import ModuleGraph from "../ModuleGraph" */
-/** @import Hash from "../util/Hash" */
-/** @import { Range } from "../javascript/JavascriptParser" */
-/** @import { UsedByExports } from "../optimize/InnerGraph" */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range, boolean, UsedByExports | undefined, true | undefined, true | undefined, ("high" | "low" | "auto" | undefined), string | undefined, string | undefined, string | undefined]>} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Range, boolean, UsedByExports | undefined, true | undefined, true | undefined, ("high" | "low" | "auto" | undefined), string | undefined, string | undefined, string | undefined]>} ObjectSerializerContext */
+/** @import { DependencyTemplateContext } from "../../template/DependencyTemplate" */
+/** @import Module from "../../module/Module" */
+/** @import ModuleGraph from "../../graph/ModuleGraph" */
+/** @import Hash from "../../util/Hash" */
+/** @import { Range } from "../../javascript/JavascriptParser" */
+/** @import { UsedByExports } from "../../optimize/InnerGraph" */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range, boolean, UsedByExports | undefined, true | undefined, true | undefined, ("high" | "low" | "auto" | undefined), string | undefined, string | undefined, string | undefined]>} ObjectDeserializerContext */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectSerializerContext<[Range, boolean, UsedByExports | undefined, true | undefined, true | undefined, ("high" | "low" | "auto" | undefined), string | undefined, string | undefined, string | undefined]>} ObjectSerializerContext */
 
 const getIgnoredRawDataUrlModule = memoize(
 	() => new RawDataUrlModule("data:,", "ignored-asset", "(ignored asset)")
@@ -263,11 +264,12 @@ URLDependency.Template = class URLDependencyTemplate extends (
 			return;
 		}
 
-		// For ESM module output, emit the analyzable `new URL("./asset", import.meta.url)`
-		// form (literal specifier, no runtime helpers) so other bundlers and webpack itself
-		// can statically follow the asset. `url: "relative"` keeps the runtime form.
-		// A prefetch/preload hint doesn't force it: the `<link>` is emitted separately at
-		// chunk startup (`StartupAssetHintRuntimeModule`), independent of the call site.
+		// WHY: ESM module output emits the analyzable
+		// `new URL("./asset", import.meta.url)` form — a literal specifier, no runtime
+		// helpers — so other bundlers and webpack itself can statically follow the
+		// asset, while `url: "relative"` keeps the runtime form. A prefetch or preload
+		// hint does not force it: the `<link>` is emitted separately at chunk startup
+		// (`StartupAssetHintRuntimeModule`), independent of the call site.
 		if (
 			!dep.relative &&
 			runtimeTemplate.supportsAnalyzable(
@@ -330,6 +332,13 @@ URLDependency.Template = class URLDependencyTemplate extends (
 	}
 };
 
-makeSerializable(URLDependency, "webpack/lib/dependencies/URLDependency");
+makeSerializable(URLDependency, [
+	"webpack/lib/dependencies/url/URLDependency",
+	// TODO in the next major release: remove, they restore pre-move cache packs
+	"webpack/lib/dependencies/URLDependency"
+]);
+
+/** @type {Set<keyof DependencyKinds>} */
+URLDependency.KINDS = new Set([...ModuleDependency.KINDS, "url"]);
 
 module.exports = URLDependency;

package/lib/{url → dependencies/url}/URLParserPlugin.js

@@ -6,26 +6,24 @@
 "use strict";
 
 const { pathToFileURL } = require("url");
-const RuntimeGlobals = require("../RuntimeGlobals");
-const ConstDependency = require("../dependencies/ConstDependency");
-const ContextDependencyHelpers = require("../dependencies/ContextDependencyHelpers");
-const {
-	isImportMetaFieldEnabled
-} = require("../dependencies/ImportMetaPlugin");
-const URLContextDependency = require("../dependencies/URLContextDependency");
-const URLDependency = require("../dependencies/URLDependency");
-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");
+const BasicEvaluatedExpression = require("../../javascript/BasicEvaluatedExpression");
+const { approve } = require("../../javascript/JavascriptParserHelpers");
+const { getInnerGraphUtils } = require("../../optimize/InnerGraph");
+const ResourceHintPlugin = require("../../prefetch/ResourceHintPlugin");
+const RuntimeGlobals = require("../../runtime/RuntimeGlobals");
+const memoize = require("../../util/memoize");
+const ContextDependencyHelpers = require("../context/ContextDependencyHelpers");
+const ConstDependency = require("../core/ConstDependency");
+const { isImportMetaFieldEnabled } = require("../import-meta/ImportMetaPlugin");
+const URLContextDependency = require("./URLContextDependency");
+const URLDependency = require("./URLDependency");
 
 const getUnsupportedFeatureWarning = memoize(() =>
-	require("../errors/UnsupportedFeatureWarning")
+	require("../../errors/UnsupportedFeatureWarning")
 );
 
 const getCommentCompilationWarning = memoize(() =>
-	require("../errors/CommentCompilationWarning")
+	require("../../errors/CommentCompilationWarning")
 );
 
 /**
@@ -37,10 +35,10 @@ const getCommentCompilationWarning = memoize(() =>
 /**
  * @import {
  * 	JavascriptParserOptions
- * } from "../../declarations/WebpackOptions"
+ * } from "../../../declarations/WebpackOptions"
  */
-/** @import NormalModule from "../NormalModule" */
-/** @import JavascriptParser, { Range } from "../javascript/JavascriptParser" */
+/** @import NormalModule from "../../module/NormalModule" */
+/** @import JavascriptParser, { Range } from "../../javascript/JavascriptParser" */
 
 const PLUGIN_NAME = "URLParserPlugin";
 
@@ -257,10 +255,9 @@ class URLParserPlugin {
 					relative
 				);
 				dep.loc = parser.getLocation(expr);
-				// `parser.javascript.urlHints` provides project-wide defaults
-				// (resolved per-request, with `test` / `include` / `exclude`
-				// matching); a per-URL magic comment for the same hint wins
-				// when both are set.
+				// `parser.javascript.urlHints` gives the project-wide defaults,
+				// resolved per request; a per-URL magic comment for the same hint
+				// wins where both are set.
 				ResourceHintPlugin.applyResourceHints(
 					dep,
 					this.options.urlHints,
@@ -270,10 +267,9 @@ class URLParserPlugin {
 					parser.getLocation(expr)
 				);
 				parser.state.current.addDependency(dep);
-				// For ESM module output the template embeds the asset's resolved
-				// filename, so the asset must be code-generated first. Only added in
-				// that mode — a code-gen dependency on an asset that a later watch
-				// rebuild leaves unaffected can otherwise deadlock the scheduler.
+				// The ESM template embeds the asset's resolved filename, so the asset
+				// must be code-generated first. Added in that mode only: elsewhere the
+				// extra code-gen dependency can deadlock a watch rebuild.
 				if (parser.state.compilation.options.output.module) {
 					parser.state.module.addCodeGenerationDependency(dep);
 				}

package/lib/dependencies/{URLPlugin.js → url/URLPlugin.js}

@@ -8,19 +8,18 @@
 const {
 	JAVASCRIPT_MODULE_TYPE_AUTO,
 	JAVASCRIPT_MODULE_TYPE_ESM
-} = require("../ModuleTypeConstants");
-
-const URLContextDependency = require("../dependencies/URLContextDependency");
-const URLDependency = require("../dependencies/URLDependency");
+} = require("../../module/ModuleTypeConstants");
 const URLParserPlugin = require("../url/URLParserPlugin");
+const URLContextDependency = require("./URLContextDependency");
+const URLDependency = require("./URLDependency");
 
 /**
  * @import {
  * 	JavascriptParserOptions
- * } from "../../declarations/WebpackOptions"
+ * } from "../../../declarations/WebpackOptions"
  */
-/** @import Compiler from "../Compiler" */
-/** @import JavascriptParser from "../javascript/JavascriptParser" */
+/** @import Compiler from "../../Compiler" */
+/** @import JavascriptParser from "../../javascript/JavascriptParser" */
 
 const PLUGIN_NAME = "URLPlugin";
 

package/lib/dependencies/{WebAssemblyExportImportedDependency.js → wasm/WebAssemblyExportImportedDependency.js}

@@ -5,15 +5,15 @@
 
 "use strict";
 
-const Dependency = require("../Dependency");
-const makeSerializable = require("../util/makeSerializable");
-const ModuleDependency = require("./ModuleDependency");
+const Dependency = require("../../graph/Dependency");
+const makeSerializable = require("../../util/makeSerializable");
+const ModuleDependency = require("../core/ModuleDependency");
 
-/** @import { ReferencedExports, TRANSITIVE } from "../Dependency" */
-/** @import ModuleGraph from "../ModuleGraph" */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[string, string, string]>} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[string, string, string]>} ObjectSerializerContext */
-/** @import { RuntimeSpec } from "../util/runtime" */
+/** @import { ReferencedExports, TRANSITIVE, DependencyKinds } from "../../graph/Dependency" */
+/** @import ModuleGraph from "../../graph/ModuleGraph" */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectDeserializerContext<[string, string, string]>} ObjectDeserializerContext */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectSerializerContext<[string, string, string]>} ObjectSerializerContext */
+/** @import { RuntimeSpec } from "../../util/runtime" */
 
 class WebAssemblyExportImportedDependency extends ModuleDependency {
 	/**
@@ -83,9 +83,16 @@ class WebAssemblyExportImportedDependency extends ModuleDependency {
 	}
 }
 
-makeSerializable(
-	WebAssemblyExportImportedDependency,
+makeSerializable(WebAssemblyExportImportedDependency, [
+	"webpack/lib/dependencies/wasm/WebAssemblyExportImportedDependency",
+	// TODO in the next major release: remove, they restore pre-move cache packs
 	"webpack/lib/dependencies/WebAssemblyExportImportedDependency"
-);
+]);
+
+/** @type {Set<keyof DependencyKinds>} */
+WebAssemblyExportImportedDependency.KINDS = new Set([
+	...ModuleDependency.KINDS,
+	"webassembly-export-imported"
+]);
 
 module.exports = WebAssemblyExportImportedDependency;

package/lib/dependencies/{WebAssemblyImportDependency.js → wasm/WebAssemblyImportDependency.js}

@@ -5,17 +5,17 @@
 
 "use strict";
 
-const makeSerializable = require("../util/makeSerializable");
-const UnsupportedWebAssemblyFeatureError = require("../wasm-sync/UnsupportedWebAssemblyFeatureError");
-const ModuleDependency = require("./ModuleDependency");
+const UnsupportedWebAssemblyFeatureError = require("../../errors/UnsupportedWebAssemblyFeatureError");
+const makeSerializable = require("../../util/makeSerializable");
+const ModuleDependency = require("../core/ModuleDependency");
 
 /** @import { ModuleImportDescription } from "@webassemblyjs/ast" */
-/** @import { ReferencedExports } from "../Dependency" */
-/** @import ModuleGraph from "../ModuleGraph" */
-/** @import WebpackError from "../errors/WebpackError" */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[string, ModuleImportDescription, false | string]>} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[string, ModuleImportDescription, false | string]>} ObjectSerializerContext */
-/** @import { RuntimeSpec } from "../util/runtime" */
+/** @import { ReferencedExports, DependencyKinds } from "../../graph/Dependency" */
+/** @import ModuleGraph from "../../graph/ModuleGraph" */
+/** @import WebpackError from "../../errors/WebpackError" */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectDeserializerContext<[string, ModuleImportDescription, false | string]>} ObjectDeserializerContext */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectSerializerContext<[string, ModuleImportDescription, false | string]>} ObjectSerializerContext */
+/** @import { RuntimeSpec } from "../../util/runtime" */
 
 class WebAssemblyImportDependency extends ModuleDependency {
 	/**
@@ -101,9 +101,16 @@ class WebAssemblyImportDependency extends ModuleDependency {
 	}
 }
 
-makeSerializable(
-	WebAssemblyImportDependency,
+makeSerializable(WebAssemblyImportDependency, [
+	"webpack/lib/dependencies/wasm/WebAssemblyImportDependency",
+	// TODO in the next major release: remove, they restore pre-move cache packs
 	"webpack/lib/dependencies/WebAssemblyImportDependency"
-);
+]);
+
+/** @type {Set<keyof DependencyKinds>} */
+WebAssemblyImportDependency.KINDS = new Set([
+	...ModuleDependency.KINDS,
+	"webassembly-import"
+]);
 
 module.exports = WebAssemblyImportDependency;

package/lib/dependencies/{CreateScriptUrlDependency.js → worker/CreateScriptUrlDependency.js}

@@ -5,16 +5,16 @@
 
 "use strict";
 
-const RuntimeGlobals = require("../RuntimeGlobals");
-const makeSerializable = require("../util/makeSerializable");
-const NullDependency = require("./NullDependency");
+const RuntimeGlobals = require("../../runtime/RuntimeGlobals");
+const makeSerializable = require("../../util/makeSerializable");
+const NullDependency = require("../core/NullDependency");
 
 /** @import { ReplaceSource } from "webpack-sources" */
-/** @import Dependency from "../Dependency" */
-/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
-/** @import { Range } from "../javascript/JavascriptParser" */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range]>} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Range]>} ObjectSerializerContext */
+/** @import Dependency from "../../graph/Dependency" */
+/** @import { DependencyTemplateContext } from "../../template/DependencyTemplate" */
+/** @import { Range } from "../../javascript/JavascriptParser" */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range]>} ObjectDeserializerContext */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectSerializerContext<[Range]>} ObjectSerializerContext */
 
 class CreateScriptUrlDependency extends NullDependency {
 	/**
@@ -69,9 +69,10 @@ CreateScriptUrlDependency.Template = class CreateScriptUrlDependencyTemplate ext
 	}
 };
 
-makeSerializable(
-	CreateScriptUrlDependency,
+makeSerializable(CreateScriptUrlDependency, [
+	"webpack/lib/dependencies/worker/CreateScriptUrlDependency",
+	// TODO in the next major release: remove, they restore pre-move cache packs
 	"webpack/lib/dependencies/CreateScriptUrlDependency"
-);
+]);
 
 module.exports = CreateScriptUrlDependency;

package/lib/dependencies/{WorkerAndWorkletPlugin.js → worker/WorkerAndWorkletPlugin.js}

@@ -6,33 +6,33 @@
 "use strict";
 
 const { pathToFileURL } = require("url");
-const AsyncDependenciesBlock = require("../AsyncDependenciesBlock");
+const AsyncDependenciesBlock = require("../../graph/AsyncDependenciesBlock");
+const EnableChunkLoadingPlugin = require("../../javascript/EnableChunkLoadingPlugin");
 const {
 	JAVASCRIPT_MODULE_TYPE_AUTO,
 	JAVASCRIPT_MODULE_TYPE_ESM
-} = require("../ModuleTypeConstants");
-const EnableChunkLoadingPlugin = require("../javascript/EnableChunkLoadingPlugin");
-const parseResourceHintOptions = require("../prefetch/parseResourceHintOptions");
-const { equals } = require("../util/ArrayHelpers");
-const createHash = require("../util/createHash");
-const { contextify } = require("../util/identifier");
-const memoize = require("../util/memoize");
-const EnableWasmLoadingPlugin = require("../wasm/EnableWasmLoadingPlugin");
-const ConstDependency = require("./ConstDependency");
-const CreateScriptUrlDependency = require("./CreateScriptUrlDependency");
+} = require("../../module/ModuleTypeConstants");
+const parseResourceHintOptions = require("../../prefetch/parseResourceHintOptions");
+const { equals } = require("../../util/ArrayHelpers");
+const createHash = require("../../util/createHash");
+const { contextify } = require("../../util/identifier");
+const memoize = require("../../util/memoize");
+const EnableWasmLoadingPlugin = require("../../wasm/EnableWasmLoadingPlugin");
+const ConstDependency = require("../core/ConstDependency");
 const {
 	harmonySpecifierTag
-} = require("./HarmonyImportDependencyParserPlugin");
-const { isImportMetaFieldEnabled } = require("./ImportMetaPlugin");
+} = require("../esm/ESMImportDependencyParserPlugin");
+const { isImportMetaFieldEnabled } = require("../import-meta/ImportMetaPlugin");
+const CreateScriptUrlDependency = require("./CreateScriptUrlDependency");
 const WorkerDependency = require("./WorkerDependency");
 const WorkletDependency = require("./WorkletDependency");
 
 const getUnsupportedFeatureWarning = memoize(() =>
-	require("../errors/UnsupportedFeatureWarning")
+	require("../../errors/UnsupportedFeatureWarning")
 );
 
 const getCommentCompilationWarning = memoize(() =>
-	require("../errors/CommentCompilationWarning")
+	require("../../errors/CommentCompilationWarning")
 );
 
 /**
@@ -53,20 +53,21 @@ const getCommentCompilationWarning = memoize(() =>
  * 	OutputModule,
  * 	WasmLoading,
  * 	WorkerPublicPath
- * } from "../../declarations/WebpackOptions"
+ * } from "../../../declarations/WebpackOptions"
  */
-/** @import Compiler from "../Compiler" */
-/** @import { DependencyLocation } from "../Dependency" */
-/** @import { EntryOptions } from "../Entrypoint" */
-/** @import NormalModule from "../NormalModule" */
+/** @import Compiler from "../../Compiler" */
+/** @import { DependencyLocation } from "../../graph/Dependency" */
+/** @import { EntryOptions } from "../../graph/Entrypoint" */
+/** @import NormalModule from "../../module/NormalModule" */
 /**
  * @import JavascriptParser, {
  * 	JavascriptParserState,
  * 	Range
- * } from "../javascript/JavascriptParser"
+ * } from "../../javascript/JavascriptParser"
  */
-/** @import Parser from "../javascript/JavascriptParser" */
-/** @import { HarmonySettings } from "./HarmonyImportDependencyParserPlugin" */
+/** @import Parser from "../../javascript/JavascriptParser" */
+/** @import BasicEvaluatedExpression from "../../javascript/BasicEvaluatedExpression" */
+/** @import { ESMSettings } from "../esm/ESMImportDependencyParserPlugin" */
 /** @import { ResourceHint } from "./WorkerDependency" */
 
 /**
@@ -86,10 +87,9 @@ const WORKER_DEFAULT_SYNTAX = [
 	"Worker from worker_threads"
 ];
 
-// Worklets are always module scripts loaded through `addModule` and — unlike Web
-// Workers — cannot load additional chunks at runtime (no `importScripts`, no
-// dynamic `import()`). The WorkletDependency wraps the call so every chunk is
-// pre-added via `addModule` from the calling scope (see WorkletDependency).
+// A worklet is always a module script loaded through `addModule`, and unlike a
+// Web Worker cannot load further chunks at runtime, so WorkletDependency wraps
+// the call and pre-adds every chunk from the calling scope.
 const WORKLET_DEFAULT_SYNTAX = [
 	"*context.audioWorklet.addModule()",
 	"*audioWorklet.addModule()",
@@ -246,13 +246,13 @@ class WorkerAndWorkletPlugin {
 					}
 				};
 
-				/** @typedef {Record<string, EXPECTED_ANY>} Values */
+				/** @typedef {Record<string, ReturnType<BasicEvaluatedExpression["asCompileTimeValue"]>>} Values */
 
 				/**
 				 * Parses object expression.
 				 * @param {JavascriptParser} parser the parser
 				 * @param {ObjectExpression} expr expression
-				 * @returns {{ expressions: Record<string, Expression | Pattern>, otherElements: (Property | SpreadElement)[], values: Values, spread: boolean, insertType: "comma" | "single", insertLocation: number }} parsed object
+				 * @returns {{ expressions: Record<string, Expression | Pattern | undefined>, otherElements: (Property | SpreadElement)[], values: Values, spread: boolean, insertType: "comma" | "single", insertLocation: number }} parsed object
 				 */
 				const parseObjectExpression = (parser, expr) => {
 					/** @type {Values} */
@@ -406,10 +406,9 @@ class WorkerAndWorkletPlugin {
 										)
 									);
 								} else {
-									// `webpackEntryOptions` is user input from a magic
-									// comment, so copy only safe own keys to avoid
-									// prototype pollution via `__proto__`/`constructor`/
-									// `prototype`.
+									// `webpackEntryOptions` is user input from a magic comment, so
+									// only safe own keys are copied, against prototype pollution
+									// through `__proto__` or `constructor`.
 									const userEntryOptions = importOptions.webpackEntryOptions;
 									for (const key of Object.keys(userEntryOptions)) {
 										if (
@@ -419,10 +418,8 @@ class WorkerAndWorkletPlugin {
 										) {
 											continue;
 										}
-										/** @type {EXPECTED_ANY} */
-										(entryOptions)[key] = /** @type {EXPECTED_ANY} */ (
-											userEntryOptions
-										)[key];
+										/** @type {Record<string, EntryOptions[keyof EntryOptions]>} */
+										(entryOptions)[key] = userEntryOptions[key];
 									}
 								}
 							}
@@ -486,7 +483,7 @@ class WorkerAndWorkletPlugin {
 							? parseObjectExpression(parser, arg2)
 							: {
 									expressions:
-										/** @type {Record<string, Expression | Pattern>} */ ({}),
+										/** @type {Record<string, Expression | Pattern | undefined>} */ ({}),
 									otherElements: [],
 									/** @type {Values} */
 									values: {},
@@ -502,11 +499,9 @@ class WorkerAndWorkletPlugin {
 
 						/** @type {ResourceHint | undefined} */
 						let resourceHint;
-						// Resource-hint comments belong to the asset expression — read
-						// them from the inner `new URL(...)` range only, never from
-						// elsewhere inside `new Worker(...)`. When `arg1` is bare
-						// `import.meta.url` there is no `new URL` and no place for
-						// the comments to go, so resource hints are skipped.
+						// Resource-hint comments belong to the asset expression, so they are
+						// read from the inner `new URL(...)` range alone. A bare
+						// `import.meta.url` has none, so its hints are skipped.
 						if (arg1.type === "NewExpression") {
 							const { options: urlImportOptions } = parser.parseCommentOptions(
 								/** @type {Range} */ (arg1.range)
@@ -578,8 +573,7 @@ class WorkerAndWorkletPlugin {
 								);
 								dep.loc = parser.getLocation(expr);
 								parser.state.module.addPresentationalDependency(dep);
-								/** @type {EXPECTED_ANY} */
-								(expressions).type = undefined;
+								expressions.type = undefined;
 							}
 						} else if (insertType === "comma") {
 							if (this._module || hasSpreadInOptions) {
@@ -652,10 +646,9 @@ class WorkerAndWorkletPlugin {
 							name: entryOptions.name,
 							circular: false,
 							entryOptions: {
-								// A module worklet links its split chunks via native `import`
-								// (resolved by `addModule`), so it keeps the module chunk
-								// loading. A script worklet can't load chunks at runtime, so its
-								// chunks use import-scripts and are pre-added from the calling scope.
+								// A module worklet links its split chunks through native `import`
+								// and keeps module chunk loading. A script worklet loads none at
+								// runtime, so its chunks are pre-added from the calling scope.
 								chunkLoading: this._module
 									? this._chunkLoading
 									: "import-scripts",
@@ -743,7 +736,7 @@ class WorkerAndWorkletPlugin {
 								(call ? parser.hooks.call : parser.hooks.new)
 									.for(harmonySpecifierTag)
 									.tap(PLUGIN_NAME, (expr) => {
-										const settings = /** @type {HarmonySettings} */ (
+										const settings = /** @type {ESMSettings} */ (
 											parser.currentTagData
 										);
 										if (
@@ -800,10 +793,9 @@ class WorkerAndWorkletPlugin {
 						);
 					}
 
-					// Worklet parsing is opt-in: unset falls back to the `futureDefaults`
-					// default, `false` disables it. It is not defaulted in
-					// `config/defaults.js` because that would splice into the `"..."`
-					// merge sentinel of a user-provided list.
+					// Worklet parsing is opt-in: unset falls back to `futureDefaults` and
+					// `false` disables it. Not defaulted in `config/defaults.js`, which
+					// would splice into a user list's `"..."` sentinel.
 					const workletOption =
 						parserOptions.worklet === undefined
 							? this._workletDefault