Merge d5b4b50c10 into e1afcd4cc2

cspell.json

@@ -314,7 +314,8 @@
     "Kumar",
     "spacek",
     "thelarkinn",
-    "behaviour"
+    "behaviour",
+    "WHATWG"
   ],
   "ignoreRegExpList": [
     "/Author.+/",

lib/Compilation.js

@@ -1988,6 +1988,7 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
 						? /** @type {NameForCondition} */ (originModule.nameForCondition())
 						: "",
 					issuerLayer: originModule ? originModule.layer : null,
+					issuerDependency: originModule ? originModule.issuerDependencyType : null,
 					compiler: this.compiler.name,
 					...contextInfo
 				},

lib/NormalModule.js

@@ -335,6 +335,7 @@ class NormalModule extends Module {
 	constructor({
 		layer,
 		type,
+		issuerDependencyType,
 		request,
 		userRequest,
 		rawRequest,
@@ -352,6 +353,7 @@ class NormalModule extends Module {
 	}) {
 		super(type, context || getContext(resource), layer);
 
+		this.issuerDependencyType = issuerDependencyType;
 		// Info from Factory
 		/** @type {string} */
 		this.request = request;

lib/NormalModuleFactory.js

@@ -114,6 +114,7 @@ const {
 /** @typedef {import("./ModuleTypeConstants").ASSET_MODULE_TYPE_INLINE} ASSET_MODULE_TYPE_INLINE */
 /** @typedef {import("./ModuleTypeConstants").ASSET_MODULE_TYPE_RESOURCE} ASSET_MODULE_TYPE_RESOURCE */
 /** @typedef {import("./ModuleTypeConstants").ASSET_MODULE_TYPE_SOURCE} ASSET_MODULE_TYPE_SOURCE */
+/** @typedef {import("./ModuleTypeConstants").ASSET_MODULE_TYPE_BYTES} ASSET_MODULE_TYPE_BYTES */
 /** @typedef {import("./ModuleTypeConstants").WEBASSEMBLY_MODULE_TYPE_ASYNC} WEBASSEMBLY_MODULE_TYPE_ASYNC */
 /** @typedef {import("./ModuleTypeConstants").WEBASSEMBLY_MODULE_TYPE_SYNC} WEBASSEMBLY_MODULE_TYPE_SYNC */
 /** @typedef {import("./ModuleTypeConstants").CSS_MODULE_TYPE} CSS_MODULE_TYPE */
@@ -268,6 +269,76 @@ const ruleSetCompiler = new RuleSetCompiler([
 	new UseEffectRulePlugin()
 ]);
 
+/** @typedef {import("./javascript/JavascriptParser")} JavascriptParser */
+/** @typedef {import("../declarations/WebpackOptions").JavascriptParserOptions} JavascriptParserOptions */
+/** @typedef {import("./javascript/JavascriptGenerator")} JavascriptGenerator */
+/** @typedef {import("../declarations/WebpackOptions").EmptyGeneratorOptions} EmptyGeneratorOptions */
+
+/** @typedef {import("./json/JsonParser")} JsonParser */
+/** @typedef {import("../declarations/WebpackOptions").JsonParserOptions} JsonParserOptions */
+/** @typedef {import("./json/JsonGenerator")} JsonGenerator */
+/** @typedef {import("../declarations/WebpackOptions").JsonGeneratorOptions} JsonGeneratorOptions */
+
+/** @typedef {import("./asset/AssetParser")} AssetParser */
+/** @typedef {import("./asset/AssetSourceParser")} AssetSourceParser */
+/** @typedef {import("./asset/AssetBytesParser")} AssetBytesParser */
+/** @typedef {import("../declarations/WebpackOptions").AssetParserOptions} AssetParserOptions */
+/** @typedef {import("../declarations/WebpackOptions").EmptyParserOptions} EmptyParserOptions */
+/** @typedef {import("./asset/AssetGenerator")} AssetGenerator */
+/** @typedef {import("../declarations/WebpackOptions").AssetGeneratorOptions} AssetGeneratorOptions */
+/** @typedef {import("../declarations/WebpackOptions").AssetInlineGeneratorOptions} AssetInlineGeneratorOptions */
+/** @typedef {import("../declarations/WebpackOptions").AssetResourceGeneratorOptions} AssetResourceGeneratorOptions */
+/** @typedef {import("./asset/AssetSourceGenerator")} AssetSourceGenerator */
+/** @typedef {import("./asset/AssetBytesGenerator")} AssetBytesGenerator */
+
+/** @typedef {import("./wasm-async/AsyncWebAssemblyParser")} AsyncWebAssemblyParser */
+/** @typedef {import("./wasm-sync/WebAssemblyParser")} WebAssemblyParser */
+
+/** @typedef {import("./css/CssParser")} CssParser */
+/** @typedef {import("../declarations/WebpackOptions").CssParserOptions} CssParserOptions */
+/** @typedef {import("../declarations/WebpackOptions").CssAutoParserOptions} CssAutoParserOptions */
+/** @typedef {import("../declarations/WebpackOptions").CssGlobalParserOptions} CssGlobalParserOptions */
+/** @typedef {import("../declarations/WebpackOptions").CssModuleParserOptions} CssModuleParserOptions */
+/** @typedef {import("./css/CssGenerator")} CssGenerator */
+/** @typedef {import("../declarations/WebpackOptions").CssGeneratorOptions} CssGeneratorOptions */
+/** @typedef {import("../declarations/WebpackOptions").CssGlobalGeneratorOptions} CssGlobalGeneratorOptions */
+/** @typedef {import("../declarations/WebpackOptions").CssModuleGeneratorOptions} CssModuleGeneratorOptions */
+/** @typedef {import("../declarations/WebpackOptions").CssAutoGeneratorOptions} CssAutoGeneratorOptions */
+
+/**
+ * @typedef {[
+ * [JAVASCRIPT_MODULE_TYPE_AUTO, JavascriptParser, JavascriptParserOptions, JavascriptGenerator, EmptyGeneratorOptions],
+ * [JAVASCRIPT_MODULE_TYPE_DYNAMIC, JavascriptParser, JavascriptParserOptions, JavascriptGenerator, EmptyGeneratorOptions],
+ * [JAVASCRIPT_MODULE_TYPE_ESM, JavascriptParser, JavascriptParserOptions, JavascriptGenerator, EmptyGeneratorOptions],
+ * [JSON_MODULE_TYPE, JsonParser, JsonParserOptions, JsonGenerator, JsonGeneratorOptions],
+ * [ASSET_MODULE_TYPE, AssetParser, AssetParserOptions, AssetGenerator, AssetGeneratorOptions],
+ * [ASSET_MODULE_TYPE_INLINE, AssetParser, EmptyParserOptions, AssetGenerator, AssetGeneratorOptions],
+ * [ASSET_MODULE_TYPE_RESOURCE, AssetParser, EmptyParserOptions, AssetGenerator, AssetGeneratorOptions],
+ * [ASSET_MODULE_TYPE_SOURCE, AssetSourceParser, EmptyParserOptions, AssetSourceGenerator, EmptyGeneratorOptions],
+ * [ASSET_MODULE_TYPE_BYTES, AssetBytesParser, EmptyParserOptions, AssetBytesGenerator, EmptyGeneratorOptions],
+ * [WEBASSEMBLY_MODULE_TYPE_ASYNC, AsyncWebAssemblyParser, EmptyParserOptions, Generator, EmptyParserOptions],
+ * [WEBASSEMBLY_MODULE_TYPE_SYNC, WebAssemblyParser, EmptyParserOptions, Generator, EmptyParserOptions],
+ * [CSS_MODULE_TYPE, CssParser, CssParserOptions, CssGenerator, CssGeneratorOptions],
+ * [CSS_MODULE_TYPE_AUTO, CssParser, CssAutoParserOptions, CssGenerator, CssAutoGeneratorOptions],
+ * [CSS_MODULE_TYPE_MODULE, CssParser, CssModuleParserOptions, CssGenerator, CssModuleGeneratorOptions],
+ * [CSS_MODULE_TYPE_GLOBAL, CssParser, CssGlobalParserOptions, CssGenerator, CssGlobalGeneratorOptions],
+ * [string, Parser, ParserOptions, Generator, GeneratorOptions],
+ * ]} ParsersAndGeneratorsByTypes
+ */
+
+/**
+ * @template {unknown[]} T
+ * @template {number[]} I
+ * @typedef {{ [K in keyof I]: K extends keyof I ? I[K] extends keyof T ? T[I[K]] : never : never }} ExtractTupleElements
+ */
+
+/**
+ * @template {unknown[]} T
+ * @template {number[]} A
+ * @template [R=void]
+ * @typedef {T extends [infer Head extends [string, ...unknown[]], ...infer Tail extends [string, ...unknown[]][]] ? Record<Head[0], SyncBailHook<ExtractTupleElements<Head, A>, R extends number ? Head[R] : R>> & RecordFactoryFromTuple<Tail, A, R> : unknown } RecordFactoryFromTuple
+ */
+
 class NormalModuleFactory extends ModuleFactory {
 	/**
 	 * @param {object} param params
@@ -306,15 +377,15 @@ class NormalModuleFactory extends ModuleFactory {
 			createModule: new AsyncSeriesBailHook(["createData", "resolveData"]),
 			/** @type {SyncWaterfallHook<[Module, CreateData, ResolveData]>} */
 			module: new SyncWaterfallHook(["module", "createData", "resolveData"]),
-			/** @type {HookMap<SyncBailHook<[ParserOptions], Parser | void>>} */
+			/** @type {import("tapable").TypedHookMap<RecordFactoryFromTuple<ParsersAndGeneratorsByTypes, [2], 1>>} */
 			createParser: new HookMap(() => new SyncBailHook(["parserOptions"])),
-			/** @type {HookMap<SyncBailHook<[EXPECTED_ANY, ParserOptions], void>>} */
+			/** @type {import("tapable").TypedHookMap<RecordFactoryFromTuple<ParsersAndGeneratorsByTypes, [1, 2]>>} */
 			parser: new HookMap(() => new SyncHook(["parser", "parserOptions"])),
-			/** @type {HookMap<SyncBailHook<[GeneratorOptions], Generator | void>>} */
+			/** @type {import("tapable").TypedHookMap<RecordFactoryFromTuple<ParsersAndGeneratorsByTypes, [4], 3>>} */
 			createGenerator: new HookMap(
 				() => new SyncBailHook(["generatorOptions"])
 			),
-			/** @type {HookMap<SyncBailHook<[EXPECTED_ANY, GeneratorOptions], void>>} */
+			/** @type {import("tapable").TypedHookMap<RecordFactoryFromTuple<ParsersAndGeneratorsByTypes, [3, 4]>>} */
 			generator: new HookMap(
 				() => new SyncHook(["generator", "generatorOptions"])
 			),
@@ -443,6 +514,7 @@ class NormalModuleFactory extends ModuleFactory {
 					context,
 					dependencies,
 					dependencyType,
+					issuerDependencyType,
 					request,
 					attributes,
 					resolveOptions,
@@ -705,6 +777,7 @@ class NormalModuleFactory extends ModuleFactory {
 							Object.assign(data.createData, {
 								layer:
 									layer === undefined ? contextInfo.issuerLayer || null : layer,
+								issuerDependencyType: issuerDependencyType,
 								request: stringifyLoadersAndResource(
 									allLoaders,
 									resourceData.resource
@@ -793,7 +866,6 @@ class NormalModuleFactory extends ModuleFactory {
 						};
 						continueCallback();
 					}
-
 					// resource without scheme and with path
 					else {
 						const normalResolver = this.getResolver(
@@ -804,6 +876,13 @@ class NormalModuleFactory extends ModuleFactory {
 										"dependencyType",
 										dependencyType
 									)
+								: resolveOptions,
+							issuerDependencyType
+								? cachedSetProperty(
+										resolveOptions || EMPTY_RESOLVE_OPTIONS,
+										"issuerDependency",
+										issuerDependencyType
+									)
 								: resolveOptions
 						);
 						this.resolveResource(
@@ -901,6 +980,7 @@ class NormalModuleFactory extends ModuleFactory {
 			(dependency).attributes;
 		const dependencyType = dependency.category || "";
 		const contextInfo = data.contextInfo;
+		const issuerDependencyType = dependency.issuerCategory || contextInfo.issuerDependency || null;
 		const fileDependencies = new LazySet();
 		const missingDependencies = new LazySet();
 		const contextDependencies = new LazySet();
@@ -913,6 +993,7 @@ class NormalModuleFactory extends ModuleFactory {
 			attributes,
 			dependencies,
 			dependencyType,
+			issuerDependencyType,
 			fileDependencies,
 			missingDependencies,
 			contextDependencies,
@@ -1361,10 +1442,11 @@ If changing the source code is not an option there is also a resolve options cal
 	/**
 	 * @param {Parameters<ResolverFactory["get"]>[0]} type type of resolver
 	 * @param {Parameters<ResolverFactory["get"]>[1]=} resolveOptions options
+	 * @param {Parameters<ResolverFactory["get"]>[1]=} issuerResolveOptions options
 	 * @returns {ReturnType<ResolverFactory["get"]>} the resolver
 	 */
-	getResolver(type, resolveOptions) {
-		return this.resolverFactory.get(type, resolveOptions);
+	getResolver(type, resolveOptions, issuerResolveOptions) {
+		return this.resolverFactory.get(type, resolveOptions, issuerResolveOptions);
 	}
 }
 

lib/ResolverFactory.js

@@ -32,9 +32,13 @@ const EMPTY_RESOLVE_OPTIONS = {};
 
 /**
  * @param {ResolveOptionsWithDependencyType} resolveOptionsWithDepType enhanced options
+ * @param {ResolveOptionsWithDependencyType} issuerResolveOptions enhanced options
  * @returns {ResolveOptions} merged options
  */
-const convertToResolveOptions = (resolveOptionsWithDepType) => {
+const convertToResolveOptions = (
+	resolveOptionsWithDepType,
+	issuerResolveOptions
+) => {
 	const { dependencyType, plugins, ...remaining } = resolveOptionsWithDepType;
 
 	// check type compat
@@ -58,10 +62,24 @@ const convertToResolveOptions = (resolveOptionsWithDepType) => {
 		/** @type {Partial<ResolveOptionsWithDependencyType> & Pick<ResolveOptionsWithDependencyType, "fileSystem">} */ (
 			partialOptions
 		);
+	const { issuerDependency } = issuerResolveOptions;
+
+	const resolvedByDependency = resolveByProperty(
+		options,
+		"byDependency",
+		dependencyType
+	);
 
 	return /** @type {ResolveOptions} */ (
+		// byIssuerDependencyType
 		removeOperations(
-			resolveByProperty(options, "byDependency", dependencyType),
+			issuerDependency
+				? resolveByProperty(
+						resolvedByDependency,
+						"byIssuerDependency",
+						issuerDependency
+					)
+				: resolvedByDependency,
 			// Keep the `unsafeCache` because it can be a `Proxy`
 			["unsafeCache"]
 		)
@@ -93,44 +111,55 @@ module.exports = class ResolverFactory {
 	/**
 	 * @param {string} type type of resolver
 	 * @param {ResolveOptionsWithDependencyType=} resolveOptions options
+	 * @param {ResolveOptionsWithDependencyType=} issuerResolveOptions options
 	 * @returns {ResolverWithOptions} the resolver
 	 */
-	get(type, resolveOptions = EMPTY_RESOLVE_OPTIONS) {
-		let typedCaches = this.cache.get(type);
-		if (!typedCaches) {
-			typedCaches = {
-				direct: new WeakMap(),
-				stringified: new Map()
-			};
-			this.cache.set(type, typedCaches);
-		}
-		const cachedResolver = typedCaches.direct.get(resolveOptions);
-		if (cachedResolver) {
-			return cachedResolver;
-		}
-		const ident = JSON.stringify(resolveOptions);
-		const resolver = typedCaches.stringified.get(ident);
-		if (resolver) {
-			typedCaches.direct.set(resolveOptions, resolver);
-			return resolver;
-		}
-		const newResolver = this._create(type, resolveOptions);
-		typedCaches.direct.set(resolveOptions, newResolver);
-		typedCaches.stringified.set(ident, newResolver);
+	get(
+		type,
+		resolveOptions = EMPTY_RESOLVE_OPTIONS,
+		issuerResolveOptions = EMPTY_RESOLVE_OPTIONS
+	) {
+		// let typedCaches = this.cache.get(type);
+		// if (!typedCaches) {
+		// 	typedCaches = {
+		// 		direct: new WeakMap(),
+		// 		stringified: new Map()
+		// 	};
+		// 	this.cache.set(type, typedCaches);
+		// }
+		// const cachedResolver = typedCaches.direct.get(resolveOptions);
+		// if (cachedResolver) {
+		// 	return cachedResolver;
+		// }
+		// const ident = JSON.stringify(resolveOptions);
+		// const resolver = typedCaches.stringified.get(ident);
+		// if (resolver) {
+		// 	typedCaches.direct.set(resolveOptions, resolver);
+		// 	return resolver;
+		// }
+		const newResolver = this._create(
+			type,
+			resolveOptions,
+			issuerResolveOptions
+		);
+		// typedCaches.direct.set(resolveOptions, newResolver);
+		// typedCaches.stringified.set(ident, newResolver);
 		return newResolver;
 	}
 
 	/**
 	 * @param {string} type type of resolver
 	 * @param {ResolveOptionsWithDependencyType} resolveOptionsWithDepType options
+	 * @param {ResolveOptionsWithIssuerDependencyType} issuerResolveOptions options
 	 * @returns {ResolverWithOptions} the resolver
 	 */
-	_create(type, resolveOptionsWithDepType) {
+	_create(type, resolveOptionsWithDepType, issuerResolveOptions) {
 		/** @type {ResolveOptionsWithDependencyType} */
 		const originalResolveOptions = { ...resolveOptionsWithDepType };
 
 		const resolveOptions = convertToResolveOptions(
-			this.hooks.resolveOptions.for(type).call(resolveOptionsWithDepType)
+			this.hooks.resolveOptions.for(type).call(resolveOptionsWithDepType),
+			issuerResolveOptions
 		);
 		const resolver = /** @type {ResolverWithOptions} */ (
 			Factory.createResolver(resolveOptions)

lib/config/browserslistTargetHandler.js

@@ -91,28 +91,6 @@ const resolve = (browsers) => {
 	const anyBrowser = browsers.some((b) => /^(?!node)/.test(b));
 	const browserProperty = !anyBrowser ? false : anyNode ? null : true;
 	const nodeProperty = !anyNode ? false : anyBrowser ? null : true;
-	// Internet Explorer Mobile, Blackberry browser and Opera Mini are very old browsers, they do not support new features
-	const es6DynamicImport = rawChecker({
-		/* eslint-disable camelcase */
-		chrome: 63,
-		and_chr: 63,
-		edge: 79,
-		firefox: 67,
-		and_ff: 67,
-		// ie: Not supported
-		opera: 50,
-		op_mob: 46,
-		safari: [11, 1],
-		ios_saf: [11, 3],
-		samsung: [8, 2],
-		android: 63,
-		and_qq: [10, 4],
-		baidu: [13, 18],
-		and_uc: [15, 5],
-		kaios: [3, 0],
-		node: [12, 17]
-		/* eslint-enable camelcase */
-	});
 
 	return {
 		/* eslint-disable camelcase */
@@ -175,9 +153,9 @@ const resolve = (browsers) => {
 			ios_saf: 7,
 			samsung: [3, 0],
 			android: 38,
-			// and_qq: Unknown support
+			and_qq: [10, 4],
 			// baidu: Unknown support
-			// and_uc: Unknown support
+			and_uc: [12, 12],
 			kaios: [3, 0],
 			node: [0, 12]
 		}),
@@ -194,9 +172,9 @@ const resolve = (browsers) => {
 			ios_saf: 8,
 			samsung: [5, 0],
 			android: 49,
-			// and_qq: Unknown support
+			and_qq: [10, 4],
 			// baidu: Unknown support
-			// and_uc: Unknown support
+			and_uc: [12, 12],
 			kaios: [2, 5],
 			node: [6, 0]
 		}),
@@ -240,8 +218,44 @@ const resolve = (browsers) => {
 			kaios: [3, 0],
 			node: [12, 17]
 		}),
-		dynamicImport: es6DynamicImport,
-		dynamicImportInWorker: es6DynamicImport && !anyNode,
+		dynamicImport: rawChecker({
+			chrome: 63,
+			and_chr: 63,
+			edge: 79,
+			firefox: 67,
+			and_ff: 67,
+			// ie: Not supported
+			opera: 50,
+			op_mob: 46,
+			safari: [11, 1],
+			ios_saf: [11, 3],
+			samsung: [8, 2],
+			android: 63,
+			and_qq: [10, 4],
+			baidu: [13, 18],
+			and_uc: [15, 5],
+			kaios: [3, 0],
+			node: [12, 17]
+		}),
+		dynamicImportInWorker: rawChecker({
+			chrome: 80,
+			and_chr: 80,
+			edge: 80,
+			firefox: 114,
+			and_ff: 114,
+			// ie: Not supported
+			opera: 67,
+			op_mob: 57,
+			safari: [15, 0],
+			ios_saf: [15, 0],
+			samsung: [13, 0],
+			android: 80,
+			and_qq: [10, 4],
+			baidu: [13, 18],
+			and_uc: [15, 5],
+			kaios: [3, 0],
+			node: [12, 17]
+		}),
 		// browserslist does not have info about globalThis
 		// so this is based on mdn-browser-compat-data
 		globalThis: rawChecker({
@@ -257,9 +271,9 @@ const resolve = (browsers) => {
 			ios_saf: [12, 2],
 			samsung: [10, 1],
 			android: 71,
-			// and_qq: Unknown support
+			and_qq: [13, 1],
 			// baidu: Unknown support
-			// and_uc: Unknown support
+			and_uc: [15, 5],
 			kaios: [3, 0],
 			node: 12
 		}),
@@ -276,9 +290,9 @@ const resolve = (browsers) => {
 			ios_saf: [13, 4],
 			samsung: 13,
 			android: 80,
-			// and_qq: Not supported
+			and_qq: [13, 1],
 			// baidu: Not supported
-			// and_uc: Not supported
+			and_uc: [15, 5],
 			kaios: [3, 0],
 			node: 14
 		}),
@@ -314,9 +328,9 @@ const resolve = (browsers) => {
 			ios_saf: 11,
 			samsung: [6, 2],
 			android: 55,
-			and_qq: [13, 1],
+			and_qq: [10, 4],
 			baidu: [13, 18],
-			and_uc: [15, 5],
+			and_uc: [12, 12],
 			kaios: 3,
 			node: [7, 6]
 		}),
@@ -332,7 +346,7 @@ const resolve = (browsers) => {
 		fetchWasm: browserProperty,
 		global: nodeProperty,
 		importScripts: false,
-		importScriptsInWorker: true,
+		importScriptsInWorker: Boolean(browserProperty),
 		nodeBuiltins: nodeProperty,
 		nodePrefixForCoreModules:
 			nodeProperty &&

lib/config/defaults.js

@@ -1795,12 +1795,17 @@ const getResolveDefaults = ({
 		conditionNames: ["require", "module", "..."],
 		extensions: [...jsExtensions]
 	});
-	/** @type {() => ResolveOptions} */
-	const esmDeps = () => ({
+	/** @type {(options?: { worker?: boolean }) => ResolveOptions} */
+	const esmDeps = ({ worker } = {}) => ({
 		aliasFields: browserField ? ["browser"] : [],
 		mainFields: browserField ? ["browser", "module", "..."] : ["module", "..."],
-		conditionNames: ["import", "module", "..."],
-		extensions: [...jsExtensions]
+		conditionNames: [...(worker ? ["worker"] : []), "import", "module", "..."],
+		extensions: [...jsExtensions],
+		byIssuerDependency: {
+			worker: {
+				conditionNames: ["worker", "import", "module", "..."]
+			}
+		}
 	});
 
 	/** @type {ResolveOptions} */
@@ -1823,7 +1828,7 @@ const getResolveDefaults = ({
 				preferRelative: true
 			},
 			worker: {
-				...esmDeps(),
+				...esmDeps({ worker: true }),
 				preferRelative: true
 			},
 			commonjs: cjsDeps(),

lib/dependencies/WorkerDependency.js

@@ -58,6 +58,10 @@ class WorkerDependency extends ModuleDependency {
 		return "worker";
 	}
 
+	get issuerCategory() {
+		return "worker";
+	}
+
 	/**
 	 * Update the hash
 	 * @param {Hash} hash hash to be updated

lib/javascript/JavascriptParser.js

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

lib/util/create-schema-validation.js

@@ -8,7 +8,7 @@
 const memoize = require("./memoize");
 
 /** @typedef {import("schema-utils").Schema} Schema */
-/** @typedef {import("schema-utils/declarations/validate").ValidationErrorConfiguration} ValidationErrorConfiguration */
+/** @typedef {import("schema-utils").ValidationErrorConfiguration} ValidationErrorConfiguration */
 
 const getValidate = memoize(() => require("schema-utils").validate);
 

lib/wasm-async/AsyncWebAssemblyParser.js

@@ -26,15 +26,6 @@ const decoderOpts = {
 };
 
 class WebAssemblyParser extends Parser {
-	/**
-	 * @param {{}=} options parser options
-	 */
-	constructor(options) {
-		super();
-		this.hooks = Object.freeze({});
-		this.options = options;
-	}
-
 	/**
 	 * @param {string | Buffer | PreparsedAst} source the source to parse
 	 * @param {ParserState} state the parser state

lib/wasm-sync/WebAssemblyParser.js

@@ -63,15 +63,6 @@ const decoderOpts = {
 };
 
 class WebAssemblyParser extends Parser {
-	/**
-	 * @param {{}=} options parser options
-	 */
-	constructor(options) {
-		super();
-		this.hooks = Object.freeze({});
-		this.options = options;
-	}
-
 	/**
 	 * @param {string | Buffer | PreparsedAst} source the source to parse
 	 * @param {ParserState} state the parser state

lib/web/JsonpChunkLoadingRuntimeModule.js

@@ -69,7 +69,7 @@ class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
 		if (options && options.baseUri) {
 			return `${RuntimeGlobals.baseURI} = ${JSON.stringify(options.baseUri)};`;
 		}
-		return `${RuntimeGlobals.baseURI} = (document && document.baseURI) || self.location.href;`;
+		return `${RuntimeGlobals.baseURI} = (typeof document !== 'undefined' && document.baseURI) || self.location.href;`;
 	}
 
 	/**

package.json

@@ -101,8 +101,8 @@
     "loader-runner": "^4.2.0",
     "mime-types": "^2.1.27",
     "neo-async": "^2.6.2",
-    "schema-utils": "^4.3.2",
-    "tapable": "^2.2.3",
+    "schema-utils": "^4.3.3",
+    "tapable": "^2.3.0",
     "terser-webpack-plugin": "^5.3.11",
     "watchpack": "^2.4.4",
     "webpack-sources": "^3.3.3"
@@ -184,7 +184,7 @@
     "toml": "^3.0.0",
     "tooling": "webpack/tooling#v1.24.3",
     "ts-loader": "^9.5.1",
-    "typescript": "^5.9.2",
+    "typescript": "^5.9.3",
     "url-loader": "^4.1.0",
     "wast-loader": "^1.12.1",
     "webassembly-feature": "1.3.0",

test/Defaults.unittest.js

@@ -2909,12 +2909,6 @@ describe("Targets", () => {
 		- Expected
 		+ Received
 
-		@@ ... @@
-		-       "dynamicImportInWorker": true,
-		+       "dynamicImportInWorker": false,
-		@@ ... @@
-		-       "dynamicImportInWorker": true,
-		+       "dynamicImportInWorker": false,
 		@@ ... @@
 		-   "target": "node12.17",
 		+   "target": "browserslist: node 12.17",

test/__snapshots__/target-browserslist.unittest.js.snap

@@ -31,6 +31,37 @@ Object {
 }
 `;
 
+exports[`browserslist target ["and_chr 140","and_ff 142","and_qq 14.9","and_uc 15.5","android 140","chrome 140","chrome 139","chrome 138","chrome 137","chrome 112","chrome 109","chrome 105","edge 140","edge 139","edge 138","firefox 143","firefox 142","firefox 141","firefox 140","ios_saf 26.0","ios_saf 18.5-18.6","kaios 3.0-3.1","node 24.8.0","node 22.19.0","node 20.19.0","op_mob 80","opera 122","opera 121","opera 120","safari 26.0","safari 18.5-18.6","samsung 28","samsung 27"] 1`] = `
+Object {
+  "arrowFunction": true,
+  "asyncFunction": true,
+  "bigIntLiteral": true,
+  "browser": null,
+  "const": true,
+  "destructuring": true,
+  "document": null,
+  "dynamicImport": true,
+  "dynamicImportInWorker": true,
+  "electron": false,
+  "fetchWasm": null,
+  "forOf": true,
+  "global": null,
+  "globalThis": true,
+  "importScripts": false,
+  "importScriptsInWorker": false,
+  "module": true,
+  "node": null,
+  "nodeBuiltins": null,
+  "nodePrefixForCoreModules": null,
+  "nwjs": false,
+  "optionalChaining": true,
+  "require": null,
+  "templateLiteral": true,
+  "web": null,
+  "webworker": false,
+}
+`;
+
 exports[`browserslist target ["and_ff 68"] 1`] = `
 Object {
   "arrowFunction": true,
@@ -41,7 +72,7 @@ Object {
   "destructuring": true,
   "document": true,
   "dynamicImport": true,
-  "dynamicImportInWorker": true,
+  "dynamicImportInWorker": false,
   "electron": false,
   "fetchWasm": true,
   "forOf": true,
@@ -65,17 +96,17 @@ Object {
 exports[`browserslist target ["and_qq 10.4"] 1`] = `
 Object {
   "arrowFunction": true,
-  "asyncFunction": false,
+  "asyncFunction": true,
   "bigIntLiteral": false,
   "browser": true,
   "const": true,
-  "destructuring": false,
+  "destructuring": true,
   "document": true,
   "dynamicImport": true,
   "dynamicImportInWorker": true,
   "electron": false,
   "fetchWasm": true,
-  "forOf": false,
+  "forOf": true,
   "global": false,
   "globalThis": false,
   "importScripts": false,
@@ -93,37 +124,6 @@ Object {
 }
 `;
 
-exports[`browserslist target ["and_uc 12.12"] 1`] = `
-Object {
-  "arrowFunction": true,
-  "asyncFunction": false,
-  "bigIntLiteral": false,
-  "browser": true,
-  "const": true,
-  "destructuring": false,
-  "document": true,
-  "dynamicImport": false,
-  "dynamicImportInWorker": false,
-  "electron": false,
-  "fetchWasm": true,
-  "forOf": false,
-  "global": false,
-  "globalThis": false,
-  "importScripts": false,
-  "importScriptsInWorker": true,
-  "module": false,
-  "node": false,
-  "nodeBuiltins": false,
-  "nodePrefixForCoreModules": false,
-  "nwjs": false,
-  "optionalChaining": false,
-  "require": false,
-  "templateLiteral": true,
-  "web": true,
-  "webworker": false,
-}
-`;
-
 exports[`browserslist target ["android 4"] 1`] = `
 Object {
   "arrowFunction": false,
@@ -320,14 +320,45 @@ Object {
   "destructuring": true,
   "document": null,
   "dynamicImport": true,
-  "dynamicImportInWorker": false,
+  "dynamicImportInWorker": true,
   "electron": false,
   "fetchWasm": null,
   "forOf": true,
   "global": null,
   "globalThis": true,
   "importScripts": false,
-  "importScriptsInWorker": true,
+  "importScriptsInWorker": false,
+  "module": true,
+  "node": null,
+  "nodeBuiltins": null,
+  "nodePrefixForCoreModules": null,
+  "nwjs": false,
+  "optionalChaining": false,
+  "require": null,
+  "templateLiteral": true,
+  "web": null,
+  "webworker": false,
+}
+`;
+
+exports[`browserslist target ["chrome 80","node 13.12.0"] 1`] = `
+Object {
+  "arrowFunction": true,
+  "asyncFunction": true,
+  "bigIntLiteral": true,
+  "browser": null,
+  "const": true,
+  "destructuring": true,
+  "document": null,
+  "dynamicImport": true,
+  "dynamicImportInWorker": true,
+  "electron": false,
+  "fetchWasm": null,
+  "forOf": true,
+  "global": null,
+  "globalThis": true,
+  "importScripts": false,
+  "importScriptsInWorker": false,
   "module": true,
   "node": null,
   "nodeBuiltins": null,
@@ -382,7 +413,7 @@ Object {
   "destructuring": true,
   "document": true,
   "dynamicImport": true,
-  "dynamicImportInWorker": true,
+  "dynamicImportInWorker": false,
   "electron": false,
   "fetchWasm": true,
   "forOf": true,
@@ -413,7 +444,7 @@ Object {
   "destructuring": true,
   "document": true,
   "dynamicImport": true,
-  "dynamicImportInWorker": true,
+  "dynamicImportInWorker": false,
   "electron": false,
   "fetchWasm": true,
   "forOf": true,
@@ -444,7 +475,7 @@ Object {
   "destructuring": true,
   "document": true,
   "dynamicImport": true,
-  "dynamicImportInWorker": true,
+  "dynamicImportInWorker": false,
   "electron": false,
   "fetchWasm": true,
   "forOf": true,
@@ -537,7 +568,7 @@ Object {
   "destructuring": true,
   "document": true,
   "dynamicImport": true,
-  "dynamicImportInWorker": true,
+  "dynamicImportInWorker": false,
   "electron": false,
   "fetchWasm": true,
   "forOf": true,
@@ -606,7 +637,7 @@ Object {
   "global": true,
   "globalThis": false,
   "importScripts": false,
-  "importScriptsInWorker": true,
+  "importScriptsInWorker": false,
   "module": false,
   "node": true,
   "nodeBuiltins": true,
@@ -637,7 +668,7 @@ Object {
   "global": true,
   "globalThis": false,
   "importScripts": false,
-  "importScriptsInWorker": true,
+  "importScriptsInWorker": false,
   "module": false,
   "node": true,
   "nodeBuiltins": true,
@@ -668,7 +699,7 @@ Object {
   "global": true,
   "globalThis": false,
   "importScripts": false,
-  "importScriptsInWorker": true,
+  "importScriptsInWorker": false,
   "module": false,
   "node": true,
   "nodeBuiltins": true,
@@ -699,7 +730,7 @@ Object {
   "global": true,
   "globalThis": false,
   "importScripts": false,
-  "importScriptsInWorker": true,
+  "importScriptsInWorker": false,
   "module": false,
   "node": true,
   "nodeBuiltins": true,
@@ -723,14 +754,45 @@ Object {
   "destructuring": true,
   "document": false,
   "dynamicImport": true,
-  "dynamicImportInWorker": false,
+  "dynamicImportInWorker": true,
   "electron": false,
   "fetchWasm": false,
   "forOf": true,
   "global": true,
   "globalThis": true,
   "importScripts": false,
-  "importScriptsInWorker": true,
+  "importScriptsInWorker": false,
+  "module": true,
+  "node": true,
+  "nodeBuiltins": true,
+  "nodePrefixForCoreModules": false,
+  "nwjs": false,
+  "optionalChaining": false,
+  "require": true,
+  "templateLiteral": true,
+  "web": false,
+  "webworker": false,
+}
+`;
+
+exports[`browserslist target ["node 13.12.0"] 1`] = `
+Object {
+  "arrowFunction": true,
+  "asyncFunction": true,
+  "bigIntLiteral": true,
+  "browser": false,
+  "const": true,
+  "destructuring": true,
+  "document": false,
+  "dynamicImport": true,
+  "dynamicImportInWorker": true,
+  "electron": false,
+  "fetchWasm": false,
+  "forOf": true,
+  "global": true,
+  "globalThis": true,
+  "importScripts": false,
+  "importScriptsInWorker": false,
   "module": true,
   "node": true,
   "nodeBuiltins": true,
@@ -785,7 +847,7 @@ Object {
   "destructuring": true,
   "document": true,
   "dynamicImport": true,
-  "dynamicImportInWorker": true,
+  "dynamicImportInWorker": false,
   "electron": false,
   "fetchWasm": true,
   "forOf": true,
@@ -816,7 +878,7 @@ Object {
   "destructuring": true,
   "document": true,
   "dynamicImport": true,
-  "dynamicImportInWorker": true,
+  "dynamicImportInWorker": false,
   "electron": false,
   "fetchWasm": true,
   "forOf": true,
@@ -909,7 +971,7 @@ Object {
   "destructuring": true,
   "document": true,
   "dynamicImport": true,
-  "dynamicImportInWorker": true,
+  "dynamicImportInWorker": false,
   "electron": false,
   "fetchWasm": true,
   "forOf": true,
@@ -940,7 +1002,7 @@ Object {
   "destructuring": true,
   "document": true,
   "dynamicImport": true,
-  "dynamicImportInWorker": true,
+  "dynamicImportInWorker": false,
   "electron": false,
   "fetchWasm": true,
   "forOf": true,
@@ -971,7 +1033,7 @@ Object {
   "destructuring": true,
   "document": true,
   "dynamicImport": true,
-  "dynamicImportInWorker": true,
+  "dynamicImportInWorker": false,
   "electron": false,
   "fetchWasm": true,
   "forOf": true,
@@ -1064,7 +1126,7 @@ Object {
   "destructuring": true,
   "document": true,
   "dynamicImport": true,
-  "dynamicImportInWorker": true,
+  "dynamicImportInWorker": false,
   "electron": false,
   "fetchWasm": true,
   "forOf": true,
@@ -1095,7 +1157,7 @@ Object {
   "destructuring": true,
   "document": true,
   "dynamicImport": true,
-  "dynamicImportInWorker": true,
+  "dynamicImportInWorker": false,
   "electron": false,
   "fetchWasm": true,
   "forOf": true,

test/configCases/ecmaVersion/browserslist-query-with-config-file/webpack.config.js

@@ -15,7 +15,7 @@ module.exports = {
 			  "destructuring": true,
 			  "document": false,
 			  "dynamicImport": true,
-			  "dynamicImportInWorker": false,
+			  "dynamicImportInWorker": true,
 			  "forOf": true,
 			  "globalThis": true,
 			  "module": true,

test/configCases/ecmaVersion/browserslist/webpack.config.js

@@ -15,7 +15,7 @@ module.exports = {
 			  "destructuring": true,
 			  "document": false,
 			  "dynamicImport": true,
-			  "dynamicImportInWorker": false,
+			  "dynamicImportInWorker": true,
 			  "forOf": true,
 			  "globalThis": true,
 			  "module": true,

test/configCases/parsing/bom/index.js

@@ -3,7 +3,7 @@ import * as style from "./style.css";
 import * as text1 from "./text-with-bom.txt";
 import * as text2 from "./test-without-bom.text";
 
-it("should remove BOM", function() {
+it("should remove BOM", async function() {
 	const url = new URL("./resource-with-bom.ext", import.meta.url);
 
 	expect(mod).toBeDefined();
@@ -13,7 +13,7 @@ it("should remove BOM", function() {
 	expect(url).toBeDefined();
 
 	const module = "module.js"
-	const modules = import("./dir/" + module);
+	const modules = await import("./dir/" + module);
 
 	expect(modules).toBeDefined();
 });

test/configCases/parsing/bom/test.config.js

@@ -4,6 +4,9 @@ const fs = require("fs");
 const path = require("path");
 
 module.exports = {
+	findBundle() {
+		return ["dir_module_js.bundle0.js", "bundle0.js"];
+	},
 	afterExecute(options) {
 		const outputPath = options.output.path;
 		const files = fs.readdirSync(outputPath);

test/configCases/parsing/bom/webpack.config.js

@@ -6,6 +6,9 @@ module.exports = {
 	output: {
 		assetModuleFilename: "[name][ext]"
 	},
+	optimization: {
+		chunkIds: "named"
+	},
 	module: {
 		rules: [
 			{

test/configCases/web/fetch-priority-2/index.js

@@ -1,27 +1,39 @@
-it("should set fetchPriority", () => {
-	import(/* webpackFetchPriority: "high" */ "./a");
+function abortable(fn) {
+	return new Promise((resolve) => {
+		const timeoutId = setTimeout(() => {
+			fn = undefined;
+			resolve('Promise resolved after delay');
+			clearTimeout(timeoutId);
+		}, 1000);
+
+		return fn();
+	});
+}
+
+it("should set fetchPriority", async () => {
+	abortable(() => import(/* webpackFetchPriority: "high" */ "./a"));
 	expect(document.head._children).toHaveLength(4);
 	const script1 = document.head._children[2];
 	expect(script1._attributes.fetchpriority).toBe("high");
 
-	import(/* webpackFetchPriority: "low" */ "./b");
+	abortable(() => import(/* webpackFetchPriority: "low" */ "./b"));
 	expect(document.head._children).toHaveLength(5);
 	const script2 = document.head._children[4];
 	expect(script2._attributes.fetchpriority).toBe("low");
 
-	import(/* webpackFetchPriority: "low" */ "./c");
+	abortable(() => import(/* webpackFetchPriority: "low" */ "./c"));
 	expect(document.head._children).toHaveLength(6);
 	const script3 = document.head._children[5];
 	expect(script3._attributes.fetchpriority).toBe("low");
 
-	import(/* webpackPrefetch: 20, webpackFetchPriority: "auto" */ "./c");
+	abortable(() => import(/* webpackPrefetch: 20, webpackFetchPriority: "auto" */ "./c"));
 
-	import("./d")
+	abortable(() => import("./d"))
 	expect(document.head._children).toHaveLength(7);
 	const script4 = document.head._children[6];
 	expect(script4._attributes.fetchpriority).toBeUndefined();
 
-	import(/* webpackPrefetch: -20 */ "./d3");
+	abortable(() => import(/* webpackPrefetch: -20 */ "./d3"));
 	expect(document.head._children).toHaveLength(8);
 	const script5 = document.head._children[7];
 	expect(script5._attributes.fetchpriority).toBeUndefined();
@@ -29,12 +41,12 @@ it("should set fetchPriority", () => {
 	const condition = true;
 
 	if (!condition) {
-		import(/* webpackFetchPriority: "high", webpackChunkName: "one" */ "./e");
+		abortable( () => import(/* webpackFetchPriority: "high", webpackChunkName: "one" */ "./e"));
 		expect(document.head._children).toHaveLength(9);
 		const script6 = document.head._children[8];
 		expect(script6._attributes.fetchpriority).toBe("high");
 	} else {
-		import(/* webpackFetchPriority: "low", webpackChunkName: "two" */ "./e");
+		abortable(() => import(/* webpackFetchPriority: "low", webpackChunkName: "two" */ "./e"));
 		expect(document.head._children).toHaveLength(9);
 		const script6 = document.head._children[8];
 		expect(script6._attributes.fetchpriority).toBe("low");

test/configCases/web/fetch-priority/index.js

@@ -1,13 +1,25 @@
+function abortable(fn) {
+	return new Promise((resolve) => {
+		const timeoutId = setTimeout(() => {
+			fn = undefined;
+			resolve('Promise resolved after delay');
+			clearTimeout(timeoutId);
+		}, 1000);
+
+		return fn();
+	});
+}
+
 it("should set fetchPriority", () => {
 	// Single Chunk
-	import(/* webpackFetchPriority: "high" */ "./a");
+	abortable(() => import(/* webpackFetchPriority: "high" */ "./a"));
 	expect(document.head._children).toHaveLength(1);
 	const script1 = document.head._children[0];
 	expect(script1._attributes.fetchpriority).toBe("high");
 
 	// Multiple Chunks
-	import(/* webpackFetchPriority: "high" */ "./b");
-	import(/* webpackFetchPriority: "high" */ "./b2");
+	abortable(() => import(/* webpackFetchPriority: "high" */ "./b"));
+	abortable(() => import(/* webpackFetchPriority: "high" */ "./b2"));
 	expect(document.head._children).toHaveLength(4);
 	const script2 = document.head._children[1];
 	const script3 = document.head._children[2];
@@ -17,19 +29,19 @@ it("should set fetchPriority", () => {
 	expect(script4._attributes.fetchpriority).toBe("high");
 
 	// Single Chunk, low
-	import(/* webpackFetchPriority: "low" */ "./c");
+	abortable(() => import(/* webpackFetchPriority: "low" */ "./c"));
 	expect(document.head._children).toHaveLength(5);
 	const script5 = document.head._children[4];
 	expect(script5._attributes.fetchpriority).toBe("low");
 
 	// Single Chunk, auto
-	import(/* webpackFetchPriority: "auto" */ "./d");
+	abortable(() => import(/* webpackFetchPriority: "auto" */ "./d"));
 	expect(document.head._children).toHaveLength(6);
 	const script6 = document.head._children[5];
 	expect(script6._attributes.fetchpriority).toBe("auto");
 
 	// No fetch priority
-	import("./e");
+	abortable(() => import("./e"));
 	expect(document.head._children).toHaveLength(7);
 	const script7 = document.head._children[6];
 	expect(script7._attributes.fetchpriority).toBeUndefined();
@@ -44,49 +56,49 @@ it("should set fetchPriority", () => {
 	const script8 = document.head._children[7];
 	expect(script8._attributes.fetchpriority).toBeUndefined();
 
-	import(/* webpackFetchPriority: "auto" */ "./g");
+	abortable(() => import(/* webpackFetchPriority: "auto" */ "./g"));
 	expect(document.head._children).toHaveLength(9);
 	const script9 = document.head._children[8];
 	expect(script9._attributes.fetchpriority).toBe("auto");
 
-	import(/* webpackFetchPriority: "unknown" */ "./h.js");
+	abortable(() => import(/* webpackFetchPriority: "unknown" */ "./h.js"));
 	expect(document.head._children).toHaveLength(10);
 	const script10 = document.head._children[9];
 	expect(script10._attributes.fetchpriority).toBeUndefined();
 
-	import(/* webpackFetchPriority: "high" */ "./i");
-	import(/* webpackFetchPriority: "low" */ "./i");
+	abortable(() => import(/* webpackFetchPriority: "high" */ "./i"));
+	abortable(() => import(/* webpackFetchPriority: "low" */ "./i"));
 	expect(document.head._children).toHaveLength(11);
 	const script11 = document.head._children[10];
 	expect(script11._attributes.fetchpriority).toBe("high");
 
-	import(/* webpackFetchPriority: "low" */ "./j");
-	import(/* webpackFetchPriority: "high" */ "./j");
+	abortable(() => import(/* webpackFetchPriority: "low" */ "./j"));
+	abortable(() => import(/* webpackFetchPriority: "high" */ "./j"));
 	expect(document.head._children).toHaveLength(12);
 	const script12 = document.head._children[11];
 
 	expect(script12._attributes.fetchpriority).toBe("low");
-	import(/* webpackFetchPriority: "low" */ "./k");
-	import("./e");
-	import(/* webpackFetchPriority: "high" */ "./k");
-	expect(document.head._children).toHaveLength(13);
+	abortable(() => import(/* webpackFetchPriority: "low" */ "./k"));
+	abortable(() => import("./e"));
+	abortable(() => import(/* webpackFetchPriority: "high" */ "./k"));
+	abortable(() => expect(document.head._children).toHaveLength(13));
 	const script13 = document.head._children[12];
 	expect(script13._attributes.fetchpriority).toBe("low");
 
 	__non_webpack_require__("./125.js");
-	import(/* webpackFetchPriority: "high" */ "./style.css");
+	abortable(() => import(/* webpackFetchPriority: "high" */ "./style.css"));
 	expect(document.head._children).toHaveLength(14);
 	const link1 = document.head._children[13];
 	expect(link1._attributes.fetchpriority).toBe("high");
 
 	__non_webpack_require__("./499.js");
-	import("./style-1.css");
+	abortable(() => import("./style-1.css"));
 	expect(document.head._children).toHaveLength(15);
 	const link2 = document.head._children[14];
 	expect(link2._attributes.fetchpriority).toBeUndefined();
 
 	__non_webpack_require__("./616.js");
-	import(/* webpackFetchPriority: "low" */ "./style-2.css");
+	abortable(() => import(/* webpackFetchPriority: "low" */ "./style-2.css"));
 	expect(document.head._children).toHaveLength(16);
 	const link3 = document.head._children[15];
 	expect(link3._attributes.fetchpriority).toBe("low");

test/target-browserslist.unittest.js

@@ -57,9 +57,7 @@ describe("browserslist target", () => {
 		["node 10.0.0"],
 		["node 10.17.0"],
 		["node 12.19.0"],
-
-		// UC browsers for Android
-		["and_uc 12.12"],
+		["node 13.12.0"],
 
 		// QQ browser
 		["and_qq 10.4"],
@@ -73,6 +71,45 @@ describe("browserslist target", () => {
 		// Multiple
 		["firefox 80", "chrome 80"],
 		["chrome 80", "node 12.19.0"],
+		["chrome 80", "node 13.12.0"],
+
+		// defaults and fully supports es6-module
+		// maintained node versions
+		[
+			"and_chr 140",
+			"and_ff 142",
+			"and_qq 14.9",
+			"and_uc 15.5",
+			"android 140",
+			"chrome 140",
+			"chrome 139",
+			"chrome 138",
+			"chrome 137",
+			"chrome 112",
+			"chrome 109",
+			"chrome 105",
+			"edge 140",
+			"edge 139",
+			"edge 138",
+			"firefox 143",
+			"firefox 142",
+			"firefox 141",
+			"firefox 140",
+			"ios_saf 26.0",
+			"ios_saf 18.5-18.6",
+			"kaios 3.0-3.1",
+			"node 24.8.0",
+			"node 22.19.0",
+			"node 20.19.0",
+			"op_mob 80",
+			"opera 122",
+			"opera 121",
+			"opera 120",
+			"safari 26.0",
+			"safari 18.5-18.6",
+			"samsung 28",
+			"samsung 27"
+		],
 
 		// Unknown
 		["unknown 50"]

test/watchCases/cache/loader-import-module-progress/webpack.config.js

@@ -17,7 +17,7 @@ module.exports = {
 		]
 	},
 	plugins: [
-		new webpack.ProgressPlugin(),
+		new webpack.ProgressPlugin(() => {}),
 		{
 			apply(compiler) {
 				compiler.hooks.done.tapPromise("CacheTest", async () => {

test/watchCases/cache/loader-load-module-progress/webpack.config.js

@@ -16,7 +16,7 @@ module.exports = {
 		]
 	},
 	plugins: [
-		new webpack.ProgressPlugin(),
+		new webpack.ProgressPlugin(() => {}),
 		{
 			apply(compiler) {
 				compiler.hooks.done.tapPromise("CacheTest", async () => {

types.d.ts

@@ -24,7 +24,7 @@ import {
 	ClassBody,
 	ClassDeclaration,
 	ClassExpression,
-	Comment,
+	Comment as CommentImport,
 	ConditionalExpression,
 	ContinueStatement,
 	DebuggerStatement,
@@ -99,9 +99,11 @@ import {
 } from "inspector";
 import { JSONSchema4, JSONSchema6, JSONSchema7 } from "json-schema";
 import { ListenOptions } from "net";
-import { validate as validateFunction } from "schema-utils";
+import {
+	ValidationErrorConfiguration,
+	validate as validateFunction
+} from "schema-utils";
 import { default as ValidationError } from "schema-utils/declarations/ValidationError";
-import { ValidationErrorConfiguration } from "schema-utils/declarations/validate";
 import {
 	AsArray,
 	AsyncParallelHook,
@@ -114,7 +116,8 @@ import {
 	SyncBailHook,
 	SyncHook,
 	SyncWaterfallHook,
-	TapOptions
+	TapOptions,
+	TypedHookMap
 } from "tapable";
 import { SecureContextOptions, TlsOptions } from "tls";
 import { URL } from "url";
@@ -297,6 +300,14 @@ declare interface Asset {
 	 */
 	info: AssetInfo;
 }
+declare abstract class AssetBytesGenerator extends Generator {
+	generateError(
+		error: Error,
+		module: NormalModule,
+		generateContext: GenerateContext
+	): null | Source;
+}
+declare abstract class AssetBytesParser extends ParserClass {}
 declare interface AssetDependencyMeta {
 	sourceType: "css-url";
 }
@@ -311,6 +322,25 @@ type AssetFilterItemTypes =
 	| string
 	| RegExp
 	| ((name: string, asset: StatsAsset) => boolean);
+declare abstract class AssetGenerator extends Generator {
+	dataUrlOptions?:
+		| AssetGeneratorDataUrlOptions
+		| ((
+				source: string | Buffer,
+				context: { filename: string; module: Module }
+		  ) => string);
+	filename?: string | ((pathData: PathData, assetInfo?: AssetInfo) => string);
+	publicPath?: string | ((pathData: PathData, assetInfo?: AssetInfo) => string);
+	outputPath?: string | ((pathData: PathData, assetInfo?: AssetInfo) => string);
+	emit?: boolean;
+	getMimeType(module: NormalModule): string;
+	generateDataUri(module: NormalModule): string;
+	generateError(
+		error: Error,
+		module: NormalModule,
+		generateContext: GenerateContext
+	): null | Source;
+}
 
 /**
  * Options object for data url generation.
@@ -349,6 +379,15 @@ declare interface AssetInlineGeneratorOptions {
 				context: { filename: string; module: Module }
 		  ) => string);
 }
+declare abstract class AssetParser extends ParserClass {
+	dataUrlCondition?:
+		| boolean
+		| AssetParserDataUrlOptions
+		| ((
+				source: string | Buffer,
+				context: { filename: string; module: Module }
+		  ) => boolean);
+}
 
 /**
  * Options object for DataUrl condition.
@@ -404,6 +443,14 @@ declare interface AssetResourceGeneratorOptions {
 	 */
 	publicPath?: string | ((pathData: PathData, assetInfo?: AssetInfo) => string);
 }
+declare abstract class AssetSourceGenerator extends Generator {
+	generateError(
+		error: Error,
+		module: NormalModule,
+		generateContext: GenerateContext
+	): null | Source;
+}
+declare abstract class AssetSourceParser extends ParserClass {}
 declare class AsyncDependenciesBlock extends DependenciesBlock {
 	constructor(
 		groupOptions:
@@ -473,6 +520,7 @@ declare interface AsyncWebAssemblyModulesPluginOptions {
 	 */
 	mangleImports?: boolean;
 }
+declare abstract class AsyncWebAssemblyParser extends ParserClass {}
 declare class AutomaticPrefetchPlugin {
 	constructor();
 
@@ -2044,6 +2092,11 @@ declare interface ColorsOptions {
 	 */
 	useColor?: boolean;
 }
+declare interface CommentCssParser {
+	value: string;
+	range: [number, number];
+	loc: { start: Position; end: Position };
+}
 declare interface CommonJsImportSettings {
 	name?: string;
 	context: string;
@@ -3558,6 +3611,23 @@ declare interface CssData {
 	 */
 	exports: Map<string, string>;
 }
+declare abstract class CssGenerator extends Generator {
+	convention?:
+		| "as-is"
+		| "camel-case"
+		| "camel-case-only"
+		| "dashes"
+		| "dashes-only"
+		| ((name: string) => string);
+	localIdentName?: string;
+	exportsOnly?: boolean;
+	esModule?: boolean;
+	generateError(
+		error: Error,
+		module: NormalModule,
+		generateContext: GenerateContext
+	): null | Source;
+}
 
 /**
  * Generator options for css modules.
@@ -3753,6 +3823,19 @@ declare class CssModulesPlugin {
 	): TemplatePath;
 	static chunkHasCss(chunk: Chunk, chunkGraph: ChunkGraph): boolean;
 }
+declare abstract class CssParser extends ParserClass {
+	defaultMode: "global" | "auto" | "pure" | "local";
+	import: boolean;
+	url: boolean;
+	namedExports: boolean;
+	comments?: CommentCssParser[];
+	magicCommentContext: Context;
+	getComments(range: [number, number]): CommentCssParser[];
+	parseCommentOptions(range: [number, number]): {
+		options: null | Record<string, any>;
+		errors: null | (Error & { comment: CommentCssParser })[];
+	};
+}
 
 /**
  * Parser options for css modules.
@@ -6380,35 +6463,6 @@ declare interface ImportDependencyMeta {
 	externalType?: "import" | "module";
 }
 type ImportExpressionJavascriptParser = ImportExpressionImport & {
-	options?:
-		| null
-		| ImportExpressionImport
-		| UnaryExpression
-		| ArrayExpression
-		| ArrowFunctionExpression
-		| AssignmentExpression
-		| AwaitExpression
-		| BinaryExpression
-		| SimpleCallExpression
-		| NewExpression
-		| ChainExpression
-		| ClassExpression
-		| ConditionalExpression
-		| FunctionExpression
-		| Identifier
-		| SimpleLiteral
-		| RegExpLiteral
-		| BigIntLiteral
-		| LogicalExpression
-		| MemberExpression
-		| MetaProperty
-		| ObjectExpression
-		| SequenceExpression
-		| TaggedTemplateExpression
-		| TemplateLiteral
-		| ThisExpression
-		| UpdateExpression
-		| YieldExpression;
 	phase?: "defer";
 };
 declare interface ImportModuleOptions {
@@ -6623,6 +6677,33 @@ declare interface IteratorObject<T, TReturn = unknown, TNext = unknown>
 	[Symbol.iterator](): IteratorObject<T, TReturn, TNext>;
 	[Symbol.dispose](): void;
 }
+declare abstract class JavascriptGenerator extends Generator {
+	generateError(
+		error: Error,
+		module: NormalModule,
+		generateContext: GenerateContext
+	): null | Source;
+	sourceModule(
+		module: Module,
+		initFragments: InitFragment<GenerateContext>[],
+		source: ReplaceSource,
+		generateContext: GenerateContext
+	): void;
+	sourceBlock(
+		module: Module,
+		block: DependenciesBlock,
+		initFragments: InitFragment<GenerateContext>[],
+		source: ReplaceSource,
+		generateContext: GenerateContext
+	): void;
+	sourceDependency(
+		module: Module,
+		dependency: Dependency,
+		initFragments: InitFragment<GenerateContext>[],
+		source: ReplaceSource,
+		generateContext: GenerateContext
+	): void;
+}
 declare class JavascriptModulesPlugin {
 	constructor(options?: object);
 	options: object;
@@ -7107,15 +7188,15 @@ declare class JavascriptParser extends ParserClass {
 			[LogicalExpression],
 			boolean | void
 		>;
-		program: SyncBailHook<[Program, Comment[]], boolean | void>;
+		program: SyncBailHook<[Program, CommentImport[]], boolean | void>;
 		terminate: SyncBailHook<[ReturnStatement | ThrowStatement], boolean | void>;
-		finish: SyncBailHook<[Program, Comment[]], boolean | void>;
+		finish: SyncBailHook<[Program, CommentImport[]], boolean | void>;
 		unusedStatement: SyncBailHook<[Statement], boolean | void>;
 	}>;
 	sourceType: "module" | "auto" | "script";
 	scope: ScopeInfo;
 	state: ParserState;
-	comments?: Comment[];
+	comments?: CommentImport[];
 	semicolons?: Set<number>;
 	statementPath?: StatementPathItem[];
 	prevStatement?:
@@ -7939,7 +8020,7 @@ declare class JavascriptParser extends ParserClass {
 			| MaybeNamedClassDeclaration,
 		commentsStartPos: number
 	): boolean;
-	getComments(range: [number, number]): Comment[];
+	getComments(range: [number, number]): CommentImport[];
 	isAsiPosition(pos: number): boolean;
 	setAsiPosition(pos: number): void;
 	unsetAsiPosition(pos: number): void;
@@ -7975,7 +8056,7 @@ declare class JavascriptParser extends ParserClass {
 	evaluatedVariable(tagInfo: TagInfo): VariableInfo;
 	parseCommentOptions(range: [number, number]): {
 		options: null | Record<string, any>;
-		errors: null | (Error & { comment: Comment })[];
+		errors: null | (Error & { comment: CommentImport })[];
 	};
 	extractMemberExpressionChain(
 		expression:
@@ -8327,6 +8408,14 @@ declare abstract class JsonData {
 		| JsonValueFs[];
 	updateHash(hash: Hash): void;
 }
+declare abstract class JsonGenerator extends Generator {
+	options: JsonGeneratorOptions;
+	generateError(
+		error: Error,
+		module: NormalModule,
+		generateContext: GenerateContext
+	): null | Source;
+}
 
 /**
  * Generator options for json modules.
@@ -8337,6 +8426,17 @@ declare interface JsonGeneratorOptions {
 	 */
 	JSONParse?: boolean;
 }
+declare interface JsonModulesPluginParserOptions {
+	/**
+	 * The depth of json dependency flagged as `exportInfo`.
+	 */
+	exportsDepth?: number;
+
+	/**
+	 * Function that executes for a module source string and should return json-compatible data.
+	 */
+	parse?: (input: string) => any;
+}
 declare interface JsonObjectFs {
 	[index: string]:
 		| undefined
@@ -8357,6 +8457,9 @@ declare interface JsonObjectTypes {
 		| JsonObjectTypes
 		| JsonValueTypes[];
 }
+declare abstract class JsonParser extends ParserClass {
+	options: JsonModulesPluginParserOptions;
+}
 
 /**
  * Parser options for JSON modules.
@@ -11288,12 +11391,225 @@ declare abstract class NormalModuleFactory extends ModuleFactory {
 			],
 			Module
 		>;
-		createParser: HookMap<SyncBailHook<[ParserOptions], void | ParserClass>>;
-		parser: HookMap<SyncBailHook<[any, ParserOptions], void>>;
-		createGenerator: HookMap<
-			SyncBailHook<[GeneratorOptions], void | Generator>
+		createParser: TypedHookMap<
+			Record<
+				"javascript/auto",
+				SyncBailHook<[JavascriptParserOptions], JavascriptParser>
+			> &
+				Record<
+					"javascript/dynamic",
+					SyncBailHook<[JavascriptParserOptions], JavascriptParser>
+				> &
+				Record<
+					"javascript/esm",
+					SyncBailHook<[JavascriptParserOptions], JavascriptParser>
+				> &
+				Record<"json", SyncBailHook<[JsonParserOptions], JsonParser>> &
+				Record<"asset", SyncBailHook<[AssetParserOptions], AssetParser>> &
+				Record<
+					"asset/inline",
+					SyncBailHook<[EmptyParserOptions], AssetParser>
+				> &
+				Record<
+					"asset/resource",
+					SyncBailHook<[EmptyParserOptions], AssetParser>
+				> &
+				Record<
+					"asset/source",
+					SyncBailHook<[EmptyParserOptions], AssetSourceParser>
+				> &
+				Record<
+					"asset/bytes",
+					SyncBailHook<[EmptyParserOptions], AssetBytesParser>
+				> &
+				Record<
+					"webassembly/async",
+					SyncBailHook<[EmptyParserOptions], AsyncWebAssemblyParser>
+				> &
+				Record<
+					"webassembly/sync",
+					SyncBailHook<[EmptyParserOptions], WebAssemblyParser>
+				> &
+				Record<"css", SyncBailHook<[CssParserOptions], CssParser>> &
+				Record<"css/auto", SyncBailHook<[CssAutoParserOptions], CssParser>> &
+				Record<
+					"css/module",
+					SyncBailHook<[CssModuleParserOptions], CssParser>
+				> &
+				Record<
+					"css/global",
+					SyncBailHook<[CssGlobalParserOptions], CssParser>
+				> &
+				Record<string, SyncBailHook<[ParserOptions], ParserClass>>
+		>;
+		parser: TypedHookMap<
+			Record<
+				"javascript/auto",
+				SyncBailHook<[JavascriptParser, JavascriptParserOptions], void>
+			> &
+				Record<
+					"javascript/dynamic",
+					SyncBailHook<[JavascriptParser, JavascriptParserOptions], void>
+				> &
+				Record<
+					"javascript/esm",
+					SyncBailHook<[JavascriptParser, JavascriptParserOptions], void>
+				> &
+				Record<"json", SyncBailHook<[JsonParser, JsonParserOptions], void>> &
+				Record<"asset", SyncBailHook<[AssetParser, AssetParserOptions], void>> &
+				Record<
+					"asset/inline",
+					SyncBailHook<[AssetParser, EmptyParserOptions], void>
+				> &
+				Record<
+					"asset/resource",
+					SyncBailHook<[AssetParser, EmptyParserOptions], void>
+				> &
+				Record<
+					"asset/source",
+					SyncBailHook<[AssetSourceParser, EmptyParserOptions], void>
+				> &
+				Record<
+					"asset/bytes",
+					SyncBailHook<[AssetBytesParser, EmptyParserOptions], void>
+				> &
+				Record<
+					"webassembly/async",
+					SyncBailHook<[AsyncWebAssemblyParser, EmptyParserOptions], void>
+				> &
+				Record<
+					"webassembly/sync",
+					SyncBailHook<[WebAssemblyParser, EmptyParserOptions], void>
+				> &
+				Record<"css", SyncBailHook<[CssParser, CssParserOptions], void>> &
+				Record<
+					"css/auto",
+					SyncBailHook<[CssParser, CssAutoParserOptions], void>
+				> &
+				Record<
+					"css/module",
+					SyncBailHook<[CssParser, CssModuleParserOptions], void>
+				> &
+				Record<
+					"css/global",
+					SyncBailHook<[CssParser, CssGlobalParserOptions], void>
+				> &
+				Record<string, SyncBailHook<[ParserClass, ParserOptions], void>>
+		>;
+		createGenerator: TypedHookMap<
+			Record<
+				"javascript/auto",
+				SyncBailHook<[EmptyGeneratorOptions], JavascriptGenerator>
+			> &
+				Record<
+					"javascript/dynamic",
+					SyncBailHook<[EmptyGeneratorOptions], JavascriptGenerator>
+				> &
+				Record<
+					"javascript/esm",
+					SyncBailHook<[EmptyGeneratorOptions], JavascriptGenerator>
+				> &
+				Record<"json", SyncBailHook<[JsonGeneratorOptions], JsonGenerator>> &
+				Record<"asset", SyncBailHook<[AssetGeneratorOptions], AssetGenerator>> &
+				Record<
+					"asset/inline",
+					SyncBailHook<[AssetGeneratorOptions], AssetGenerator>
+				> &
+				Record<
+					"asset/resource",
+					SyncBailHook<[AssetGeneratorOptions], AssetGenerator>
+				> &
+				Record<
+					"asset/source",
+					SyncBailHook<[EmptyGeneratorOptions], AssetSourceGenerator>
+				> &
+				Record<
+					"asset/bytes",
+					SyncBailHook<[EmptyGeneratorOptions], AssetBytesGenerator>
+				> &
+				Record<
+					"webassembly/async",
+					SyncBailHook<[EmptyParserOptions], Generator>
+				> &
+				Record<
+					"webassembly/sync",
+					SyncBailHook<[EmptyParserOptions], Generator>
+				> &
+				Record<"css", SyncBailHook<[CssGeneratorOptions], CssGenerator>> &
+				Record<
+					"css/auto",
+					SyncBailHook<[CssAutoGeneratorOptions], CssGenerator>
+				> &
+				Record<
+					"css/module",
+					SyncBailHook<[CssModuleGeneratorOptions], CssGenerator>
+				> &
+				Record<
+					"css/global",
+					SyncBailHook<[CssGlobalGeneratorOptions], CssGenerator>
+				> &
+				Record<string, SyncBailHook<[GeneratorOptions], Generator>>
+		>;
+		generator: TypedHookMap<
+			Record<
+				"javascript/auto",
+				SyncBailHook<[JavascriptGenerator, EmptyGeneratorOptions], void>
+			> &
+				Record<
+					"javascript/dynamic",
+					SyncBailHook<[JavascriptGenerator, EmptyGeneratorOptions], void>
+				> &
+				Record<
+					"javascript/esm",
+					SyncBailHook<[JavascriptGenerator, EmptyGeneratorOptions], void>
+				> &
+				Record<
+					"json",
+					SyncBailHook<[JsonGenerator, JsonGeneratorOptions], void>
+				> &
+				Record<
+					"asset",
+					SyncBailHook<[AssetGenerator, AssetGeneratorOptions], void>
+				> &
+				Record<
+					"asset/inline",
+					SyncBailHook<[AssetGenerator, AssetGeneratorOptions], void>
+				> &
+				Record<
+					"asset/resource",
+					SyncBailHook<[AssetGenerator, AssetGeneratorOptions], void>
+				> &
+				Record<
+					"asset/source",
+					SyncBailHook<[AssetSourceGenerator, EmptyGeneratorOptions], void>
+				> &
+				Record<
+					"asset/bytes",
+					SyncBailHook<[AssetBytesGenerator, EmptyGeneratorOptions], void>
+				> &
+				Record<
+					"webassembly/async",
+					SyncBailHook<[Generator, EmptyParserOptions], void>
+				> &
+				Record<
+					"webassembly/sync",
+					SyncBailHook<[Generator, EmptyParserOptions], void>
+				> &
+				Record<"css", SyncBailHook<[CssGenerator, CssGeneratorOptions], void>> &
+				Record<
+					"css/auto",
+					SyncBailHook<[CssGenerator, CssAutoGeneratorOptions], void>
+				> &
+				Record<
+					"css/module",
+					SyncBailHook<[CssGenerator, CssModuleGeneratorOptions], void>
+				> &
+				Record<
+					"css/global",
+					SyncBailHook<[CssGenerator, CssGlobalGeneratorOptions], void>
+				> &
+				Record<string, SyncBailHook<[Generator, GeneratorOptions], void>>
 		>;
-		generator: HookMap<SyncBailHook<[any, GeneratorOptions], void>>;
 		createModuleClass: HookMap<
 			SyncBailHook<
 				[
@@ -13166,6 +13482,10 @@ declare interface PnpApi {
 		options: { considerBuiltins: boolean }
 	) => null | string;
 }
+declare interface Position {
+	line: number;
+	column: number;
+}
 declare class PrefetchPlugin {
 	constructor(context: string, request?: string);
 	context: null | string;
@@ -17815,6 +18135,7 @@ declare abstract class WeakTupleMap<K extends any[], V> {
 	delete(...args: K): void;
 	clear(): void;
 }
+declare abstract class WebAssemblyParser extends ParserClass {}
 declare interface WebAssemblyRenderContext {
 	/**
 	 * the chunk

yarn.lock

@@ -2393,7 +2393,7 @@ camelcase@^6.3.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
   integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
 
-caniuse-lite@^1.0.30001737, caniuse-lite@^1.0.30001746:
+caniuse-lite@^1.0.30001746:
   version "1.0.30001746"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001746.tgz#199d20f04f5369825e00ff7067d45d5dfa03aee7"
   integrity sha512-eA7Ys/DGw+pnkWWSE/id29f2IcPHVoE8wxtvE5JdvD2V28VTDPy1yEeo11Guz0sJ4ZeGRcm3uaTcAqK1LXaphA==
@@ -3034,7 +3034,7 @@ eastasianwidth@^0.2.0:
   resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
   integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
 
-electron-to-chromium@^1.5.211, electron-to-chromium@^1.5.227:
+electron-to-chromium@^1.5.227:
   version "1.5.228"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.228.tgz#38b849bc8714bd21fb64f5ad56bf8cfd8638e1e9"
   integrity sha512-nxkiyuqAn4MJ1QbobwqJILiDtu/jk14hEAWaMiJmNPh1Z+jqoFlBFZjdXwLWGeVSeu9hGLg6+2G9yJaW8rBIFA==
@@ -6247,7 +6247,7 @@ node-preload@^0.2.1:
   dependencies:
     process-on-spawn "^1.0.0"
 
-node-releases@^2.0.19, node-releases@^2.0.21:
+node-releases@^2.0.21:
   version "2.0.21"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.21.tgz#f59b018bc0048044be2d4c4c04e4c8b18160894c"
   integrity sha512-5b0pgg78U3hwXkCM8Z9b2FJdPZlr9Psr9V2gQPESdGHqbntyFJKFW4r5TeWGFzafGY3hzs1JC62VEQMbl1JFkw==
@@ -7179,10 +7179,10 @@ schema-utils@^3.0.0, schema-utils@^3.1.1:
     ajv "^6.12.5"
     ajv-keywords "^3.5.2"
 
-schema-utils@^4.0.0, schema-utils@^4.3.0, schema-utils@^4.3.2:
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.3.2.tgz#0c10878bf4a73fd2b1dfd14b9462b26788c806ae"
-  integrity sha512-Gn/JaSk/Mt9gYubxTtSn/QCV4em9mpAPiR1rqy/Ocu19u/G9J5WWdNoUT4SiV6mFC3y6cxyFcFwdzPM3FgxGAQ==
+schema-utils@^4.0.0, schema-utils@^4.3.0, schema-utils@^4.3.3:
+  version "4.3.3"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.3.3.tgz#5b1850912fa31df90716963d45d9121fdfc09f46"
+  integrity sha512-eflK8wEtyOE6+hsaRVPxvUKYCpRgzLqDTb8krvAsRIwOGlHoSgYLgBXoubGgLd2fT41/OUYdb48v4k4WWHQurA==
   dependencies:
     "@types/json-schema" "^7.0.9"
     ajv "^8.9.0"
@@ -7685,10 +7685,10 @@ synckit@^0.11.7, synckit@^0.11.8:
   dependencies:
     "@pkgr/core" "^0.2.4"
 
-tapable@^2.2.0, tapable@^2.2.1, tapable@^2.2.3:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.3.tgz#4b67b635b2d97578a06a2713d2f04800c237e99b"
-  integrity sha512-ZL6DDuAlRlLGghwcfmSn9sK3Hr6ArtyudlSAiCqQ6IfE+b+HHbydbYDIG15IfS5do+7XQQBdBiubF/cV2dnDzg==
+tapable@^2.2.0, tapable@^2.2.1, tapable@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.3.0.tgz#7e3ea6d5ca31ba8e078b560f0d83ce9a14aa8be6"
+  integrity sha512-g9ljZiwki/LfxmQADO3dEY1CbpmXT5Hm2fJ+QaGKwSXUylMybePR7/67YW7jOrrvjEgL1Fmz5kzyAjWVWLlucg==
 
 tar@^7.4.3:
   version "7.4.3"
@@ -7973,10 +7973,10 @@ typedarray-to-buffer@^3.1.5:
   dependencies:
     is-typedarray "^1.0.0"
 
-typescript@^5.9.2:
-  version "5.9.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.9.2.tgz#d93450cddec5154a2d5cabe3b8102b83316fb2a6"
-  integrity sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==
+typescript@^5.9.3:
+  version "5.9.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.9.3.tgz#5b4f59e15310ab17a216f5d6cf53ee476ede670f"
+  integrity sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==
 
 uglify-js@^3.1.4:
   version "3.19.3"