webpack 5.112.0 → 5.112.2

package/lib/debug/ProfilingPlugin.js

@@ -34,23 +34,7 @@ const { fileUrlToPath } = require("../util/identifier");
  * @property {AbsolutePath=} outputPath Path to the output file e.g. `path.resolve(__dirname, 'profiling/events.json')`. Defaults to `events.json`.
  */
 
-/**
- * Defines the hook type used by this module.
- * @template T, R
- * @typedef {import("tapable").Hook<T, R>} Hook
- */
-
-/**
- * Defines the fake hook type used by this module.
- * @template T
- * @typedef {import("../util/deprecation").FakeHook<T>} FakeHook
- */
-
-/**
- * Defines the hook map type used by this module.
- * @template T
- * @typedef {import("tapable").HookMap<T>} HookMap
- */
+/** @import { FakeHookMarker } from "../util/deprecation" */
 
 /**
  * Defines the hook interceptor type used by this module.
@@ -96,8 +80,7 @@ class Profiler {
 
 		try {
 			this.session = new /** @type {Inspector} */ (inspector).Session();
-			/** @type {Session} */
-			(this.session).connect();
+			this.session.connect();
 		} catch (_) {
 			this.session = undefined;
 			return Promise.resolve();
@@ -119,7 +102,7 @@ class Profiler {
 	 * Returns promise for the result.
 	 * @param {string} method method name
 	 * @param {import("inspector").Profiler.SetSamplingIntervalParameterType=} params params
-	 * @returns {Promise<EXPECTED_ANY | void>} Promise for the result
+	 * @returns {Promise<Partial<import("inspector").Profiler.StopReturnType> | void>} Promise for the result, `{}` for commands without one
 	 */
 	sendCommand(method, params) {
 		if (this.hasSession()) {
@@ -151,7 +134,9 @@ class Profiler {
 	 * @returns {Promise<{ profile: { startTime: number, endTime: number } }>} profile result
 	 */
 	stopProfiling() {
-		return this.sendCommand("Profiler.stop").then(({ profile }) => {
+		return /** @type {Promise<import("inspector").Profiler.StopReturnType>} */ (
+			this.sendCommand("Profiler.stop")
+		).then(({ profile }) => {
 			const hrtime = process.hrtime();
 			const endTime = hrtime[0] * 1000000 + Math.round(hrtime[1] / 1000);
 			// Avoid coverage problems due indirect changes
@@ -406,18 +391,34 @@ class ProfilingPlugin {
 	}
 }
 
-/** @typedef {Record<string, Hook<EXPECTED_ANY, EXPECTED_ANY> | FakeHook<EXPECTED_ANY> | HookMap<EXPECTED_ANY>>} Hooks */
+/**
+ * The part of a tapable `HookInterceptor` this plugin sets: it rewraps each tap.
+ * @typedef {{ register?(tap: FullTap): FullTap }} TapInterceptor
+ */
+
+/**
+ * What intercepting a tapable `Hook` needs of it. Methods, so every hook fits
+ * whatever its arguments, result and additional tap options.
+ * @typedef {{ intercept(interceptor: TapInterceptor): void, _fakeHook?: undefined }} HookWithInterceptor
+ */
+
+/**
+ * What intercepting a tapable `HookMap` needs of it, whatever hook it holds.
+ * @typedef {{ for(key: string): HookWithInterceptor, intercept(interceptor: { factory?(key: string, hook: HookWithInterceptor): HookWithInterceptor }): void, _fakeHook?: undefined }} HookMapWithInterceptor
+ */
+
+/** @typedef {Record<string, HookWithInterceptor | HookMapWithInterceptor | FakeHookMarker>} Hooks */
 
 /**
  * Intercepts the taps of a hook or every cached and future hook in a hook map.
- * @param {Hooks[string]} hook the hook or hook map
- * @param {HookInterceptor<EXPECTED_ANY, EXPECTED_ANY>} interceptor what intercepts each tap
+ * @param {HookWithInterceptor | HookMapWithInterceptor} hook the hook or hook map
+ * @param {TapInterceptor} interceptor what intercepts each tap
  * @returns {void}
  */
 const interceptTaps = (hook, interceptor) => {
 	if ("for" in hook) {
 		const { _map } =
-			/** @type {HookMap<Hook<EXPECTED_ANY, EXPECTED_ANY>> & { _map: Map<unknown, Hook<EXPECTED_ANY, EXPECTED_ANY>> }} */
+			/** @type {HookMapWithInterceptor & { _map: Map<string, HookWithInterceptor> }} */
 			(hook);
 		for (const cached of _map.values()) {
 			cached.intercept(interceptor);
@@ -425,8 +426,8 @@ const interceptTaps = (hook, interceptor) => {
 		hook.intercept({
 			/**
 			 * @param {string} key the key the hook is created for
-			 * @param {Hook<EXPECTED_ANY, EXPECTED_ANY>} created the hook created
-			 * @returns {Hook<EXPECTED_ANY, EXPECTED_ANY>} the same hook, intercepted
+			 * @param {HookWithInterceptor} created the hook created
+			 * @returns {HookWithInterceptor} the same hook, intercepted
 			 */
 			factory: (key, created) => {
 				created.intercept(interceptor);
@@ -533,7 +534,25 @@ const interceptAllCssModulesPluginHooks = (compilation, tracer) => {
 	);
 };
 
-/** @typedef {(...args: EXPECTED_ANY[]) => EXPECTED_ANY | Promise<(...args: EXPECTED_ANY[]) => EXPECTED_ANY>} PluginFunction */
+/**
+ * A `sync` tap's function, or a `promise` tap's when `R` is a promise.
+ * @template {unknown[]} A the hook's arguments
+ * @template R what the tap returns
+ * @typedef {(...args: A) => R} PluginFunction
+ */
+
+/**
+ * The callback an `async` tap reports its error or result through.
+ * @template R the hook's result
+ * @typedef {(error?: Error | null, result?: R) => void} TapCallback
+ */
+
+/**
+ * An `async` tap's function, the hook's callback after its arguments.
+ * @template {unknown[]} A the hook's arguments
+ * @template R the hook's result
+ * @typedef {(...args: [...A, TapCallback<R>]) => void} AsyncPluginFunction
+ */
 
 /**
  * Creates interceptor for.
@@ -556,7 +575,7 @@ const makeInterceptorFor = (instance, tracer) => (hookName) => ({
 				: makeNewProfiledTapFn(hookName, tracer, {
 						name,
 						type,
-						fn: /** @type {PluginFunction} */ (internalFn)
+						fn: internalFn
 					});
 		return { ...tapInfo, fn: newFn };
 	}
@@ -564,20 +583,22 @@ const makeInterceptorFor = (instance, tracer) => (hookName) => ({
 
 /**
  * Creates new profiled tap fn.
+ * @template {unknown[]} A the hook's arguments
+ * @template R the hook's result
  * @param {string} hookName Name of the hook to profile.
  * @param {Trace} tracer The trace object.
  * @param {object} options Options for the profiled fn.
  * @param {string} options.name Plugin name
  * @param {"sync" | "async" | "promise"} options.type Plugin type (sync | async | promise)
- * @param {PluginFunction} options.fn Plugin function
- * @returns {PluginFunction} Chainable hooked function.
+ * @param {FullTap["fn"]} options.fn Plugin function, its shape set by `options.type`
+ * @returns {FullTap["fn"]} Chainable hooked function.
  */
 const makeNewProfiledTapFn = (hookName, tracer, { name, type, fn }) => {
 	const defaultCategory = ["blink.user_timing"];
 
 	switch (type) {
 		case "promise":
-			return (...args) => {
+			return /** @type {PluginFunction<A, Promise<R>>} */ (...args) => {
 				const id = ++tracer.counter;
 				tracer.trace.begin({
 					name,
@@ -585,8 +606,8 @@ const makeNewProfiledTapFn = (hookName, tracer, { name, type, fn }) => {
 					cat: defaultCategory
 				});
 				const promise =
-					/** @type {Promise<(...args: EXPECTED_ANY[]) => EXPECTED_ANY>} */
-					(fn(...args));
+					/** @type {PluginFunction<A, Promise<R>>} */
+					(fn)(...args);
 				return promise.then((r) => {
 					tracer.trace.end({
 						name,
@@ -597,19 +618,20 @@ const makeNewProfiledTapFn = (hookName, tracer, { name, type, fn }) => {
 				});
 			};
 		case "async":
-			return (...args) => {
+			return /** @type {AsyncPluginFunction<A, R>} */ (...args) => {
 				const id = ++tracer.counter;
 				tracer.trace.begin({
 					name,
 					id,
 					cat: defaultCategory
 				});
-				const callback = args.pop();
-				fn(
-					...args,
+				const callback = /** @type {TapCallback<R>} */ (args.pop());
+				/** @type {AsyncPluginFunction<A, R>} */ (fn)(
+					// `pop()` took the callback off, which the tuple type cannot follow.
+					.../** @type {A} */ (/** @type {unknown[]} */ (args)),
 					/**
 					 * Handles the cat callback for this hook.
-					 * @param {...EXPECTED_ANY[]} r result
+					 * @param {Parameters<TapCallback<R>>} r result
 					 */
 					(...r) => {
 						tracer.trace.end({
@@ -622,12 +644,12 @@ const makeNewProfiledTapFn = (hookName, tracer, { name, type, fn }) => {
 				);
 			};
 		case "sync":
-			return (...args) => {
+			return /** @type {PluginFunction<A, R>} */ (...args) => {
 				const id = ++tracer.counter;
 				// Do not instrument ourself due to the CPU
 				// profile needing to be the last event in the trace.
 				if (name === PLUGIN_NAME) {
-					return fn(...args);
+					return /** @type {PluginFunction<A, R>} */ (fn)(...args);
 				}
 
 				tracer.trace.begin({
@@ -635,10 +657,10 @@ const makeNewProfiledTapFn = (hookName, tracer, { name, type, fn }) => {
 					id,
 					cat: defaultCategory
 				});
-				/** @type {PluginFunction} */
+				/** @type {R} */
 				let r;
 				try {
-					r = fn(...args);
+					r = /** @type {PluginFunction<A, R>} */ (fn)(...args);
 				} catch (err) {
 					tracer.trace.end({
 						name,

package/lib/define/DefinePlugin.js

@@ -255,7 +255,7 @@ const dropTrailingMembers = (node, count) => {
 
 /**
  * Returns code converted to string that evaluates.
- * @param {EXPECTED_ANY[] | { [k: string]: EXPECTED_ANY }} obj obj
+ * @param {CodeValue[] | Record<string, CodeValue>} obj obj
  * @param {JavascriptParser} parser Parser
  * @param {ValueCacheVersions} valueCacheVersions valueCacheVersions
  * @param {string} key the defined key
@@ -376,7 +376,7 @@ const toCode = (
 		}
 		if (typeof code === "object") {
 			return stringifyObj(
-				code,
+				/** @type {CodeValue[] | Record<string, CodeValue>} */ (code),
 				parser,
 				valueCacheVersions,
 				key,
@@ -675,7 +675,7 @@ const stringifyMergedNode = (merged, node, parser, key, objKeys) => {
 	}
 	const code = `{${keys
 		.map((k) => {
-			const value = /** @type {MergedDefinitionNode} */ (node.get(k));
+			const value = node.get(k);
 			return `${toPropertyKey(k)}:${
 				value instanceof Map
 					? stringifyMergedNode(merged, value, parser, k)
@@ -1115,7 +1115,9 @@ class DefinePlugin {
 									// so scanning that text cannot find every reference.
 									const hasPreparsedAst =
 										/** @type {{ _ast: PreparsedAst | null }} */ (
-											/** @type {unknown} */ (module)
+											/** @type {NormalModule | { _ast: PreparsedAst | null }} */ (
+												module
+											)
 										)._ast !== null;
 									await resolveAsyncRuntimeValues(
 										compilation,
@@ -1139,9 +1141,7 @@ class DefinePlugin {
 						/** @type {ValueCacheVersion} */
 						(compilation.valueCacheVersions.get(VALUE_DEP_MAIN));
 					parser.hooks.program.tap(PLUGIN_NAME, () => {
-						const buildInfo = /** @type {NormalModuleBuildInfo} */ (
-							parser.state.module.buildInfo
-						);
+						const buildInfo = parser.state.module.buildInfo;
 						if (!buildInfo.valueDependencies) {
 							buildInfo.valueDependencies = new Map();
 						}
@@ -1153,9 +1153,7 @@ class DefinePlugin {
 					 * @param {string} key key
 					 */
 					const addValueDependency = (key) => {
-						const buildInfo =
-							/** @type {NormalModuleBuildInfo} */
-							(parser.state.module.buildInfo);
+						const buildInfo = parser.state.module.buildInfo;
 						/** @type {NonNullable<NormalModuleBuildInfo["valueDependencies"]>} */
 						(buildInfo.valueDependencies).set(
 							VALUE_DEP_PREFIX + key,
@@ -1229,7 +1227,7 @@ class DefinePlugin {
 							// several DefinePlugins can still be destructured together
 							const nestedSet = mergedDefinitions.nestedByFinalKey.get(final);
 							if (!nestedSet || nestedSet.size <= 0) return;
-							for (const nested of /** @type {Set<string>} */ (nestedSet)) {
+							for (const nested of nestedSet) {
 								if (nested && !hooked.has(nested)) {
 									// only detect the same nested key once
 									hooked.add(nested);
@@ -1475,10 +1473,7 @@ class DefinePlugin {
 						parser.hooks.expression.for(key).tap(PLUGIN_NAME, (expr) => {
 							const valueDependencies =
 								/** @type {NonNullable<NormalModuleBuildInfo["valueDependencies"]>} */
-								(
-									/** @type {NormalModuleBuildInfo} */
-									(parser.state.module.buildInfo).valueDependencies
-								);
+								(parser.state.module.buildInfo.valueDependencies);
 							for (const [name, version] of objectValueDependencies) {
 								valueDependencies.set(name, version);
 							}

package/lib/define/DotenvPlugin.js

@@ -281,7 +281,11 @@ class DotenvPlugin {
 				{
 					name: "Dotenv Plugin",
 					baseDataPath: "options"
-				}
+				},
+				(options) =>
+					require("../../schemas/plugins/define/DotenvPluginOptions.check")(
+						options
+					)
 			);
 		});
 		const definePlugin = new compiler.webpack.DefinePlugin({});
@@ -491,6 +495,8 @@ class DotenvPlugin {
 	 * @returns {Env} env variables
 	 */
 	_getEnv(prefixes, parsed) {
+		// Expansion mutates its input, but the cache must retain the raw file values.
+		parsed = Object.assign(/** @type {Env} */ (Object.create(null)), parsed);
 		// Always expand environment variables (like Vite does)
 		// Make a copy of process.env so that dotenv-expand doesn't modify global process.env
 		const processEnv = { ...process.env };
@@ -503,11 +509,9 @@ class DotenvPlugin {
 		// Prioritize actual env variables from `process.env`, fallback to parsed
 		for (const key of keys) {
 			if (prefixes.some((prefix) => key.startsWith(prefix))) {
-				env[key] =
-					Object.prototype.hasOwnProperty.call(process.env, key) &&
-					process.env[key]
-						? process.env[key]
-						: parsed[key];
+				env[key] = Object.prototype.hasOwnProperty.call(process.env, key)
+					? /** @type {string} */ (process.env[key])
+					: parsed[key];
 			}
 		}
 

package/lib/define/EnvironmentPlugin.js

@@ -10,23 +10,25 @@ const DefinePlugin = require("./DefinePlugin");
 
 /** @import Compiler from "../Compiler" */
 /** @import { CodeValue } from "./DefinePlugin" */
+/** @import { JsonObject } from "../fs/fs" */
 
 const PLUGIN_NAME = "EnvironmentPlugin";
 
 class EnvironmentPlugin {
 	/**
 	 * Creates an instance of EnvironmentPlugin.
-	 * @param {(string | string[] | Record<string, EXPECTED_ANY>)[]} keys keys
+	 * @param {(string | string[] | JsonObject)[]} keys keys
 	 */
 	constructor(...keys) {
 		if (keys.length === 1 && Array.isArray(keys[0])) {
 			/** @type {string[]} */
 			this.keys = keys[0];
+			/** @type {JsonObject} */
 			this.defaultValues = {};
 		} else if (keys.length === 1 && keys[0] && typeof keys[0] === "object") {
 			this.keys = Object.keys(keys[0]);
 			this.defaultValues =
-				/** @type {Record<string, EXPECTED_ANY>} */
+				/** @type {JsonObject} */
 				(keys[0]);
 		} else {
 			this.keys = /** @type {string[]} */ (keys);

package/lib/dependencies/amd/AMDDefineDependencyParserPlugin.js

@@ -36,7 +36,6 @@ const { addLocalModule, getLocalModule } = require("./LocalModulesHelpers");
  * } from "../../../declarations/WebpackOptions"
  */
 /** @import Dependency from "../../graph/Dependency" */
-/** @import { BuildInfo } from "../../module/Module" */
 /** @import BasicEvaluatedExpression from "../../javascript/BasicEvaluatedExpression" */
 /**
  * @import JavascriptParser, {
@@ -356,7 +355,7 @@ class AMDDefineDependencyParserPlugin {
 		}
 		DynamicExports.bailout(parser.state);
 		recordOptimizationBailout(
-			/** @type {BuildInfo} */ (parser.state.module.buildInfo),
+			parser.state.module.buildInfo,
 			"AMD bailout: define() prevents static exports analysis"
 		);
 		/** @type {Identifier[] | null} */

package/lib/dependencies/amd/AMDRequireDependenciesBlockParserPlugin.js

@@ -39,6 +39,7 @@ const getUnsupportedFeatureWarning = memoize(() =>
  * } from "../../../declarations/WebpackOptions"
  */
 /** @import Dependency, { DependencyLocation } from "../../graph/Dependency" */
+/** @import DependenciesBlock from "../../graph/DependenciesBlock" */
 /** @import BasicEvaluatedExpression from "../../javascript/BasicEvaluatedExpression" */
 /** @import JavascriptParser, { Range } from "../../javascript/JavascriptParser" */
 /** @import LocalModule from "./LocalModule" */
@@ -323,7 +324,9 @@ class AMDRequireDependenciesBlockParserPlugin {
 			dep.loc = parser.getLocation(expr);
 			depBlock.addDependency(dep);
 
-			parser.state.current = /** @type {EXPECTED_ANY} */ (depBlock);
+			parser.state.current = /** @type {typeof parser.state.current} */ (
+				/** @type {DependenciesBlock} */ (depBlock)
+			);
 		}
 
 		if (expr.arguments.length === 1) {

package/lib/dependencies/commonjs/CommonJsExportRequireDependency.js

@@ -36,7 +36,6 @@ const {
 /** @import ExportsInfo, { ExportInfo } from "../../graph/ExportsInfo" */
 /** @import Module from "../../module/Module" */
 /** @import ModuleGraph from "../../graph/ModuleGraph" */
-/** @import ModuleGraphConnection from "../../graph/ModuleGraphConnection" */
 /** @import { Range } from "../../javascript/JavascriptParser" */
 /** @import { RuntimeSpec } from "../../util/runtime" */
 /** @import CommonJsRequireDependency from "./CommonJsRequireDependency" */
@@ -576,9 +575,7 @@ CommonJsExportRequireDependency.Template = class CommonJsExportRequireDependency
 			moduleGraph.getExportsInfo(module).getUsedName(dep.names, runtime)
 		);
 
-		const connection = /** @type {ModuleGraphConnection | undefined} */ (
-			moduleGraph.getConnection(dep)
-		);
+		const connection = moduleGraph.getConnection(dep);
 		// Inactive unused reexport: no module id; drop to a no-op.
 		// Missing connection (e.g. IgnorePlugin) must keep the require so it throws.
 		if (!used && connection && !connection.isTargetActive(runtime)) {

package/lib/dependencies/commonjs/CommonJsExportsParserPlugin.js

@@ -52,7 +52,6 @@ const FUNCTION_PROPERTY_DROP_HEAD =
  */
 /** @import CommonJsRequireDependency from "./CommonJsRequireDependency" */
 /** @import { ExportInfoName } from "../../graph/Dependency" */
-/** @import { BuildInfo } from "../../module/Module" */
 
 /**
  * @import JavascriptParser, {
@@ -72,11 +71,6 @@ const FUNCTION_PROPERTY_DROP_HEAD =
  * } from "./CommonJsObjectExportDependency"
  */
 /** @import { RequireBindingData } from "./CommonJsImportsParserPlugin" */
-/**
- * @import {
- * 	JavascriptModuleBuildMeta
- * } from "../../javascript/JavascriptModule"
- */
 
 /**
  * This function takes a generic expression and detects whether it is an ObjectExpression.
@@ -165,7 +159,7 @@ const getReexportOfPropertyDescriptor = (expr) => {
 		if (getFn.async || getFn.generator) return;
 		// Arrow with expression body: `() => require("./x")`.
 		if (getFn.body.type !== "BlockStatement") {
-			return { expr: /** @type {Expression} */ (getFn.body), getter: true };
+			return { expr: getFn.body, getter: true };
 		}
 		// Function body must be exactly `return <expr>;`.
 		if (
@@ -264,15 +258,18 @@ const parseRequireCall = (parser, expr) => {
 	};
 };
 
+/** @typedef {Node extends infer N ? (N extends Node ? N[keyof N] : never) : never} NodeFieldValue */
+
 /**
  * Checks if a value is an AST node.
- * @param {unknown} value candidate
- * @returns {value is Node} true when the value is an AST node
+ * @template V
+ * @param {V} value candidate
+ * @returns {value is Extract<V, Node>} true when the value is an AST node
  */
 const isNode = (value) =>
 	typeof value === "object" &&
 	value !== null &&
-	typeof (/** @type {{ type?: unknown }} */ (value).type) === "string";
+	typeof (/** @type {Partial<Node>} */ (value).type) === "string";
 
 /** Positional/metadata keys that never hold child AST nodes. */
 const NON_CHILD_KEYS = new Set([
@@ -337,8 +334,8 @@ const findOwnThisExpression = (body, params) => {
 				break;
 			default: {
 				const children =
-					/** @type {Record<string, unknown>} */
-					(/** @type {unknown} */ (node));
+					/** @type {Node & Record<string, NodeFieldValue>} */
+					(node);
 				const keys = getChildKeys(node);
 				for (let i = 0; i < keys.length; i++) {
 					const value = children[keys[i]];
@@ -462,11 +459,11 @@ class CommonJsExportsParserPlugin {
 		 */
 		const bailoutHint = (reason) => {
 			recordOptimizationBailout(
-				/** @type {BuildInfo} */ (parser.state.module.buildInfo),
+				parser.state.module.buildInfo,
 				`CommonJS bailout: ${reason}`
 			);
 		};
-		/** @type {unknown} */
+		/** @type {JavascriptParser["state"] | undefined} */
 		let keptAllExportsForState;
 		/**
 		 * An exported function accessing its own `this` may reach any export
@@ -547,9 +544,7 @@ class CommonJsExportsParserPlugin {
 				dep.loc = parser.getLocation(expr);
 				dep.optional = Boolean(parser.scope.inTry);
 				parser.state.module.addDependency(dep);
-				/** @type {JavascriptModuleBuildMeta} */ (
-					parser.state.module.buildMeta
-				).treatAsCommonJs = true;
+				parser.state.module.buildMeta.treatAsCommonJs = true;
 
 				return true;
 			}
@@ -574,9 +569,7 @@ class CommonJsExportsParserPlugin {
 			);
 			dep.loc = parser.getLocation(expr);
 			parser.state.module.addDependency(dep);
-			/** @type {JavascriptModuleBuildMeta} */ (
-				parser.state.module.buildMeta
-			).treatAsCommonJs = true;
+			parser.state.module.buildMeta.treatAsCommonJs = true;
 			keepAllExportsOnThisAccess(expr.right, base);
 			parser.walkExpression(expr.right);
 			return true;
@@ -600,9 +593,7 @@ class CommonJsExportsParserPlugin {
 			if (object.type !== "ObjectExpression") return;
 
 			const module = parser.state.module;
-			/** @type {JavascriptModuleBuildMeta} */ (
-				module.buildMeta
-			).treatAsCommonJs = true;
+			module.buildMeta.treatAsCommonJs = true;
 			// LHS stays as the text `module.exports` (moduleArgument is "module"
 			// unless a top-level `module` binding shadows it, which prevents this hook).
 			module.addPresentationalDependency(
@@ -697,7 +688,7 @@ class CommonJsExportsParserPlugin {
 		parser.hooks.call
 			.for("Object.defineProperty")
 			.tap(PLUGIN_NAME, (expression) => {
-				const expr = /** @type {CallExpression} */ (expression);
+				const expr = expression;
 				if (!parser.isStatementLevelExpression(expr)) return;
 				if (expr.arguments.length !== 3) return;
 				if (expr.arguments[0].type === "SpreadElement") return;
@@ -747,9 +738,7 @@ class CommonJsExportsParserPlugin {
 						dep.loc = parser.getLocation(expr);
 						dep.optional = Boolean(parser.scope.inTry);
 						parser.state.module.addDependency(dep);
-						/** @type {JavascriptModuleBuildMeta} */ (
-							parser.state.module.buildMeta
-						).treatAsCommonJs = true;
+						parser.state.module.buildMeta.treatAsCommonJs = true;
 
 						return true;
 					}
@@ -768,9 +757,7 @@ class CommonJsExportsParserPlugin {
 				);
 				dep.loc = parser.getLocation(expr);
 				parser.state.module.addDependency(dep);
-				/** @type {JavascriptModuleBuildMeta} */ (
-					parser.state.module.buildMeta
-				).treatAsCommonJs = true;
+				parser.state.module.buildMeta.treatAsCommonJs = true;
 
 				if (descArg.type === "ObjectExpression") {
 					// `value`, `get` and `set` descriptor functions are all called
@@ -824,9 +811,7 @@ class CommonJsExportsParserPlugin {
 			);
 			dep.loc = parser.getLocation(expr);
 			parser.state.module.addDependency(dep);
-			/** @type {JavascriptModuleBuildMeta} */ (
-				parser.state.module.buildMeta
-			).treatAsCommonJs = true;
+			parser.state.module.buildMeta.treatAsCommonJs = true;
 
 			if (call) {
 				parser.walkExpressions(call.arguments);

package/lib/dependencies/commonjs/CommonJsImportsParserPlugin.js

@@ -189,9 +189,7 @@ const createRequireCallHandler = (
 				parser,
 				expr
 			);
-			const binding =
-				requireBindingData &&
-				requireBindingData.get(/** @type {CallExpression} */ (expr));
+			const binding = requireBindingData && requireBindingData.get(expr);
 			if (binding && !referencedExports) {
 				// `const NAME = require(LITERAL)` — let later member-access walks
 				// on `NAME` populate the dependency's referenced exports.

package/lib/dependencies/commonjs/CommonJsObjectExportDependency.js

@@ -136,10 +136,10 @@ CommonJsObjectExportDependency.Template = class CommonJsObjectExportDependencyTe
 		if (!used) {
 			// Object spread rewrite needs environment.spread.
 			if (!runtimeTemplate.supportsSpread()) return;
-			const range = /** @type {Range} */ (dep.range);
+			const range = dep.range;
 			if (FUNCTION_PROPERTY_DROP_HEAD.has(dep.kind)) {
 				// Keep the function body so nested dependency replaces stay valid.
-				const valueRange = /** @type {Range} */ (dep.valueRange);
+				const valueRange = dep.valueRange;
 				source.replace(
 					range[0],
 					valueRange[0] - 1,
@@ -153,7 +153,7 @@ CommonJsObjectExportDependency.Template = class CommonJsObjectExportDependencyTe
 				return;
 			}
 			// keyValue: keep the value's side effects in place.
-			const valueRange = /** @type {Range} */ (dep.valueRange);
+			const valueRange = dep.valueRange;
 			if (dep.pure) {
 				// spreading null adds nothing; the text stays so nested replaces hold
 				source.replace(
@@ -170,7 +170,7 @@ CommonJsObjectExportDependency.Template = class CommonJsObjectExportDependencyTe
 		}
 		if (used === dep.name) return;
 		// Rename the key to the mangled export name.
-		const keyRange = /** @type {Range} */ (dep.keyRange);
+		const keyRange = dep.keyRange;
 		if (dep.kind === "shorthand") {
 			source.replace(
 				keyRange[0],

package/lib/dependencies/commonjs/CommonJsPlugin.js

@@ -42,7 +42,6 @@ const TopLevelThisParserPlugin = require("./TopLevelThisParserPlugin");
  */
 /** @import Compilation from "../../Compilation" */
 /** @import Compiler from "../../Compiler" */
-/** @import { BuildInfo } from "../../module/Module" */
 /** @import Parser from "../../javascript/JavascriptParser" */
 
 const PLUGIN_NAME = "CommonJsPlugin";
@@ -232,8 +231,7 @@ class CommonJsPlugin {
 					parser.hooks.expression
 						.for(RuntimeGlobals.moduleLoaded)
 						.tap(PLUGIN_NAME, (expr) => {
-							/** @type {BuildInfo} */
-							(parser.state.module.buildInfo).moduleConcatenationBailout =
+							parser.state.module.buildInfo.moduleConcatenationBailout =
 								RuntimeGlobals.moduleLoaded;
 							const dep = new RuntimeRequirementsDependency([
 								RuntimeGlobals.moduleLoaded
@@ -246,8 +244,7 @@ class CommonJsPlugin {
 					parser.hooks.expression
 						.for(RuntimeGlobals.moduleId)
 						.tap(PLUGIN_NAME, (expr) => {
-							/** @type {BuildInfo} */
-							(parser.state.module.buildInfo).moduleConcatenationBailout =
+							parser.state.module.buildInfo.moduleConcatenationBailout =
 								RuntimeGlobals.moduleId;
 							const dep = new RuntimeRequirementsDependency([
 								RuntimeGlobals.moduleId

package/lib/dependencies/commonjs/RequireEnsureDependenciesBlockParserPlugin.js

@@ -12,6 +12,7 @@ const RequireEnsureItemDependency = require("./RequireEnsureItemDependency");
 
 /** @import { Expression, SpreadElement } from "estree" */
 /** @import { GroupOptions } from "../../graph/AsyncDependenciesBlock" */
+/** @import DependenciesBlock from "../../graph/DependenciesBlock" */
 /** @import BasicEvaluatedExpression from "../../javascript/BasicEvaluatedExpression" */
 /** @import JavascriptParser, { Range } from "../../javascript/JavascriptParser" */
 /** @import { FunctionExpressionResult } from "../helpers/getFunctionExpression" */
@@ -87,7 +88,9 @@ module.exports = class RequireEnsureDependenciesBlockParserPlugin {
 					dep.loc = parser.getLocation(expr);
 					depBlock.addDependency(dep);
 					const old = parser.state.current;
-					parser.state.current = /** @type {EXPECTED_ANY} */ (depBlock);
+					parser.state.current = /** @type {typeof parser.state.current} */ (
+						/** @type {DependenciesBlock} */ (depBlock)
+					);
 					try {
 						let failed = false;
 						parser.inFunctionScope(true, [], () => {