webpack 5.101.3 → 5.102.1

package/lib/asset/AssetModulesPlugin.js

@@ -7,22 +7,19 @@
 
 const {
 	ASSET_MODULE_TYPE,
+	ASSET_MODULE_TYPE_BYTES,
 	ASSET_MODULE_TYPE_INLINE,
 	ASSET_MODULE_TYPE_RESOURCE,
 	ASSET_MODULE_TYPE_SOURCE
 } = require("../ModuleTypeConstants");
-const { cleverMerge } = require("../util/cleverMerge");
 const { compareModulesByIdOrIdentifier } = require("../util/comparators");
 const createSchemaValidation = require("../util/create-schema-validation");
 const memoize = require("../util/memoize");
 
 /** @typedef {import("webpack-sources").Source} Source */
-/** @typedef {import("../../declarations/WebpackOptions").AssetParserOptions} AssetParserOptions */
 /** @typedef {import("schema-utils").Schema} Schema */
-/** @typedef {import("../Chunk")} Chunk */
 /** @typedef {import("../Compilation").AssetInfo} AssetInfo */
 /** @typedef {import("../Compiler")} Compiler */
-/** @typedef {import("../Module")} Module */
 /** @typedef {import("../Module").BuildInfo} BuildInfo */
 /** @typedef {import("../Module").CodeGenerationResult} CodeGenerationResult */
 /** @typedef {import("../NormalModule")} NormalModule */
@@ -74,9 +71,11 @@ const validateParserOptions = createSchemaValidation(
 const getAssetGenerator = memoize(() => require("./AssetGenerator"));
 const getAssetParser = memoize(() => require("./AssetParser"));
 const getAssetSourceParser = memoize(() => require("./AssetSourceParser"));
+const getAssetBytesParser = memoize(() => require("./AssetBytesParser"));
 const getAssetSourceGenerator = memoize(() =>
 	require("./AssetSourceGenerator")
 );
+const getAssetBytesGenerator = memoize(() => require("./AssetBytesGenerator"));
 
 const type = ASSET_MODULE_TYPE;
 const PLUGIN_NAME = "AssetModulesPlugin";
@@ -95,11 +94,6 @@ class AssetModulesPlugin {
 					.for(ASSET_MODULE_TYPE)
 					.tap(PLUGIN_NAME, (parserOptions) => {
 						validateParserOptions(parserOptions);
-						parserOptions = cleverMerge(
-							/** @type {AssetParserOptions} */
-							(compiler.options.module.parser.asset),
-							parserOptions
-						);
 
 						let dataUrlCondition = parserOptions.dataUrlCondition;
 						if (!dataUrlCondition || typeof dataUrlCondition === "object") {
@@ -134,6 +128,13 @@ class AssetModulesPlugin {
 
 						return new AssetSourceParser();
 					});
+				normalModuleFactory.hooks.createParser
+					.for(ASSET_MODULE_TYPE_BYTES)
+					.tap(PLUGIN_NAME, (_parserOptions) => {
+						const AssetBytesParser = getAssetBytesParser();
+
+						return new AssetBytesParser();
+					});
 
 				for (const type of [
 					ASSET_MODULE_TYPE,
@@ -186,6 +187,14 @@ class AssetModulesPlugin {
 						return new AssetSourceGenerator(compilation.moduleGraph);
 					});
 
+				normalModuleFactory.hooks.createGenerator
+					.for(ASSET_MODULE_TYPE_BYTES)
+					.tap(PLUGIN_NAME, () => {
+						const AssetBytesGenerator = getAssetBytesGenerator();
+
+						return new AssetBytesGenerator(compilation.moduleGraph);
+					});
+
 				compilation.hooks.renderManifest.tap(PLUGIN_NAME, (result, options) => {
 					const { chunkGraph } = compilation;
 					const { chunk, codeGenerationResults, runtimeTemplate } = options;
@@ -245,10 +254,15 @@ class AssetModulesPlugin {
 									entryInfo = assetInfo;
 									entryHash = fullContentHash;
 								} else {
-									entryFilename = buildInfo.filename || data.get("filename");
-									entryInfo = buildInfo.assetInfo || data.get("assetInfo");
+									entryFilename =
+										/** @type {string} */
+										(buildInfo.filename || data.get("filename"));
+									entryInfo =
+										/** @type {AssetInfo} */
+										(buildInfo.assetInfo || data.get("assetInfo"));
 									entryHash =
-										buildInfo.fullContentHash || data.get("fullContentHash");
+										/** @type {string} */
+										(buildInfo.fullContentHash || data.get("fullContentHash"));
 								}
 
 								result.push({
@@ -280,10 +294,14 @@ class AssetModulesPlugin {
 						const data =
 							/** @type {NonNullable<CodeGenerationResult["data"]>} */
 							(codeGenerationResult.data);
-						context.assets.set(data.get("filename"), {
-							source,
-							info: data.get("assetInfo")
-						});
+						context.assets.set(
+							/** @type {string} */
+							(data.get("filename")),
+							{
+								source,
+								info: data.get("assetInfo")
+							}
+						);
 					}
 				);
 			}

package/lib/asset/AssetParser.js

@@ -33,15 +33,19 @@ class AssetParser extends Parser {
 			throw new Error("AssetParser doesn't accept preparsed AST");
 		}
 
-		const buildInfo = /** @type {BuildInfo} */ (state.module.buildInfo);
+		const buildInfo =
+			/** @type {BuildInfo} */
+			(state.module.buildInfo);
 		buildInfo.strict = true;
-		const buildMeta = /** @type {BuildMeta} */ (state.module.buildMeta);
+		const buildMeta =
+			/** @type {BuildMeta} */
+			(state.module.buildMeta);
 		buildMeta.exportsType = "default";
 		buildMeta.defaultObject = false;
 
 		if (typeof this.dataUrlCondition === "function") {
 			buildInfo.dataUrl = this.dataUrlCondition(source, {
-				filename: state.module.matchResource || state.module.resource,
+				filename: /** @type {string} */ (state.module.getResource()),
 				module: state.module
 			});
 		} else if (typeof this.dataUrlCondition === "boolean") {

package/lib/asset/AssetSourceGenerator.js

@@ -60,7 +60,7 @@ class AssetSourceGenerator extends Generator {
 					concatenationScope.registerNamespaceExport(
 						ConcatenationScope.NAMESPACE_OBJECT_EXPORT
 					);
-					sourceContent = `${runtimeTemplate.supportsConst() ? "const" : "var"} ${
+					sourceContent = `${runtimeTemplate.renderConst()} ${
 						ConcatenationScope.NAMESPACE_OBJECT_EXPORT
 					} = ${JSON.stringify(encodedSource)};`;
 				} else {

package/lib/asset/RawDataUrlModule.js

@@ -12,10 +12,11 @@ const { ASSET_MODULE_TYPE_RAW_DATA_URL } = require("../ModuleTypeConstants");
 const RuntimeGlobals = require("../RuntimeGlobals");
 const makeSerializable = require("../util/makeSerializable");
 
-/** @typedef {import("../../declarations/WebpackOptions").WebpackOptionsNormalized} WebpackOptions */
+/** @typedef {import("../config/defaults").WebpackOptionsNormalizedWithDefaults} WebpackOptions */
 /** @typedef {import("../Compilation")} Compilation */
 /** @typedef {import("../Dependency").UpdateHashContext} UpdateHashContext */
 /** @typedef {import("../Module").BuildCallback} BuildCallback */
+/** @typedef {import("../Module").RuntimeRequirements} RuntimeRequirements */
 /** @typedef {import("../Module").CodeGenerationContext} CodeGenerationContext */
 /** @typedef {import("../Module").CodeGenerationResult} CodeGenerationResult */
 /** @typedef {import("../Module").NeedBuildCallback} NeedBuildCallback */
@@ -23,7 +24,6 @@ const makeSerializable = require("../util/makeSerializable");
 /** @typedef {import("../Module").SourceTypes} SourceTypes */
 /** @typedef {import("../RequestShortener")} RequestShortener */
 /** @typedef {import("../ResolverFactory").ResolverWithOptions} ResolverWithOptions */
-/** @typedef {import("../WebpackError")} WebpackError */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 /** @typedef {import("../util/Hash")} Hash */
@@ -120,6 +120,7 @@ class RawDataUrlModule extends Module {
 		data.set("url", {
 			javascript: this.url
 		});
+		/** @type {RuntimeRequirements} */
 		const runtimeRequirements = new Set();
 		runtimeRequirements.add(RuntimeGlobals.module);
 		return { sources, runtimeRequirements, data };

package/lib/async-modules/AsyncModuleHelpers.js

@@ -10,17 +10,19 @@ const HarmonyImportDependency = require("../dependencies/HarmonyImportDependency
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../Module")} Module */
 
+/** @typedef {Set<Module>} Modules */
+
 /**
  * @param {ModuleGraph} moduleGraph module graph
  * @param {Module} module module
- * @returns {Set<Module>} set of modules
+ * @returns {Modules} set of modules
  */
 const getOutgoingAsyncModules = (moduleGraph, module) => {
-	/** @type {Set<Module>} */
+	/** @type {Modules} */
 	const set = new Set();
-	/** @type {Set<Module>} */
+	/** @type {Modules} */
 	const seen = new Set();
-	(function g(/** @type {Module} */ module) {
+	(function g(module) {
 		if (!moduleGraph.isAsync(module) || seen.has(module)) return;
 		seen.add(module);
 		if (module.buildMeta && module.buildMeta.async) {

package/lib/buildChunkGraph.js

@@ -15,7 +15,6 @@ const { getEntryRuntime, mergeRuntime } = require("./util/runtime");
 /** @typedef {import("./ChunkGroup")} ChunkGroup */
 /** @typedef {import("./Compilation")} Compilation */
 /** @typedef {import("./DependenciesBlock")} DependenciesBlock */
-/** @typedef {import("./Dependency")} Dependency */
 /** @typedef {import("./Dependency").DependencyLocation} DependencyLocation */
 /** @typedef {import("./Entrypoint")} Entrypoint */
 /** @typedef {import("./Module")} Module */

package/lib/cache/MemoryCachePlugin.js

@@ -7,11 +7,9 @@
 
 const Cache = require("../Cache");
 
-/** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("../Cache").Data} Data */
 /** @typedef {import("../Cache").Etag} Etag */
 /** @typedef {import("../Compiler")} Compiler */
-/** @typedef {import("../Module")} Module */
 
 class MemoryCachePlugin {
 	/**

package/lib/cache/MemoryWithGcCachePlugin.js

@@ -7,11 +7,9 @@
 
 const Cache = require("../Cache");
 
-/** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("../Cache").Data} Data */
 /** @typedef {import("../Cache").Etag} Etag */
 /** @typedef {import("../Compiler")} Compiler */
-/** @typedef {import("../Module")} Module */
 
 /**
  * @typedef {object} MemoryWithGcCachePluginOptions

package/lib/cache/PackFileCacheStrategy.js

@@ -51,11 +51,17 @@ class PackContainer {
 		resolveResults,
 		resolveBuildDependenciesSnapshot
 	) {
+		/** @type {Pack | (() => Pack) } */
 		this.data = data;
+		/** @type {string} */
 		this.version = version;
+		/** @type {Snapshot} */
 		this.buildSnapshot = buildSnapshot;
+		/** @type {BuildDependencies} */
 		this.buildDependencies = buildDependencies;
+		/** @type {ResolveResults} */
 		this.resolveResults = resolveResults;
+		/** @type {Snapshot} */
 		this.resolveBuildDependenciesSnapshot = resolveBuildDependenciesSnapshot;
 	}
 
@@ -104,10 +110,15 @@ class PackItemInfo {
 	 * @param {Data} value fresh value of item
 	 */
 	constructor(identifier, etag, value) {
+		/** @type {string} */
 		this.identifier = identifier;
+		/** @type {string | null | undefined} */
 		this.etag = etag;
+		/** @type {number} */
 		this.location = -1;
+		/** @type {number} */
 		this.lastAccess = Date.now();
+		/** @type {Data} */
 		this.freshValue = value;
 	}
 }
@@ -1285,7 +1296,9 @@ class PackFileCacheStrategy {
 						logger.timeEnd("check build dependencies");
 						if (buildSnapshotValid && resolveValid) {
 							logger.time("restore cache content metadata");
-							const d = /** @type {TODO} */ (packContainer).data();
+							const d =
+								/** @type {() => Pack} */
+								(packContainer.data)();
 							logger.timeEnd("restore cache content metadata");
 							return d;
 						}

package/lib/cache/ResolverCachePlugin.js

@@ -26,10 +26,7 @@ const makeSerializable = require("../util/makeSerializable");
  * @typedef {import("tapable").SyncHook<T>} SyncHook
  */
 
-/**
- * @template H
- * @typedef {import("tapable").HookMapInterceptor<H>} HookMapInterceptor
- */
+/** @typedef {Set<string>} Dependencies  */
 
 class CacheEntry {
 	/**
@@ -163,11 +160,8 @@ class ResolverCachePlugin {
 			const newResolveContext = {
 				...resolveContext,
 				stack: new Set(),
-				/** @type {LazySet<string>} */
 				missingDependencies: new LazySet(),
-				/** @type {LazySet<string>} */
 				fileDependencies: new LazySet(),
-				/** @type {LazySet<string>} */
 				contextDependencies: new LazySet()
 			};
 			/** @type {ResolveRequest[] | undefined} */
@@ -186,8 +180,8 @@ class ResolverCachePlugin {
 			const propagate = (key) => {
 				if (resolveContext[key]) {
 					addAllToSet(
-						/** @type {Set<string>} */ (resolveContext[key]),
-						/** @type {Set<string>} */ (newResolveContext[key])
+						/** @type {Dependencies} */ (resolveContext[key]),
+						/** @type {Dependencies} */ (newResolveContext[key])
 					);
 				}
 			};
@@ -207,11 +201,11 @@ class ResolverCachePlugin {
 					const missingDependencies = newResolveContext.missingDependencies;
 					fileSystemInfo.createSnapshot(
 						resolveTime,
-						/** @type {Set<string>} */
+						/** @type {Dependencies} */
 						(fileDependencies),
-						/** @type {Set<string>} */
+						/** @type {Dependencies} */
 						(contextDependencies),
-						/** @type {Set<string>} */
+						/** @type {Dependencies} */
 						(missingDependencies),
 						snapshotOptions,
 						(err, snapshot) => {
@@ -404,21 +398,21 @@ class ResolverCachePlugin {
 										cachedResolves++;
 										if (resolveContext.missingDependencies) {
 											addAllToSet(
-												/** @type {Set<string>} */
+												/** @type {Dependencies} */
 												(resolveContext.missingDependencies),
 												snapshot.getMissingIterable()
 											);
 										}
 										if (resolveContext.fileDependencies) {
 											addAllToSet(
-												/** @type {Set<string>} */
+												/** @type {Dependencies} */
 												(resolveContext.fileDependencies),
 												snapshot.getFileIterable()
 											);
 										}
 										if (resolveContext.contextDependencies) {
 											addAllToSet(
-												/** @type {Set<string>} */
+												/** @type {Dependencies} */
 												(resolveContext.contextDependencies),
 												snapshot.getContextIterable()
 											);

package/lib/cache/getLazyHashedEtag.js

@@ -34,7 +34,7 @@ class LazyHashedEtag {
 		if (this._hash === undefined) {
 			const hash = createHash(this._hashFunction);
 			this._obj.updateHash(hash);
-			this._hash = /** @type {string} */ (hash.digest("base64"));
+			this._hash = hash.digest("base64");
 		}
 		return this._hash;
 	}

package/lib/config/browserslistTargetHandler.js

@@ -15,59 +15,46 @@ const browserslist = require("browserslist");
 // [[C:]/path/to/config][:env]
 const inputRx = /^(?:((?:[A-Z]:)?[/\\].*?))?(?::(.+?))?$/i;
 
-/**
- * @typedef {object} BrowserslistHandlerConfig
- * @property {string=} configPath
- * @property {string=} env
- * @property {string=} query
- */
-
 /**
  * @param {string | null | undefined} input input string
  * @param {string} context the context directory
- * @returns {BrowserslistHandlerConfig} config
+ * @returns {string[] | undefined} selected browsers
  */
-const parse = (input, context) => {
-	if (!input) {
-		return {};
-	}
-
-	if (path.isAbsolute(input)) {
+const load = (input, context) => {
+	// browserslist:path-to-config
+	// browserslist:path-to-config:env
+	if (input && path.isAbsolute(input)) {
 		const [, configPath, env] = inputRx.exec(input) || [];
-		return { configPath, env };
-	}
 
-	const config = browserslist.findConfig(context);
+		const config = browserslist.loadConfig({
+			config: configPath,
+			env
+		});
 
-	if (config && Object.keys(config).includes(input)) {
-		return { env: input };
+		return browserslist(config, { env });
 	}
 
-	return { query: input };
-};
+	const env = input || undefined;
 
-/**
- * @param {string | null | undefined} input input string
- * @param {string} context the context directory
- * @returns {string[] | undefined} selected browsers
- */
-const load = (input, context) => {
-	const { configPath, env, query } = parse(input, context);
+	const config = browserslist.loadConfig({
+		path: context,
+		env
+	});
 
-	// if a query is specified, then use it, else
-	// if a path to a config is specified then load it, else
-	// find a nearest config
-	const config =
-		query ||
-		(configPath
-			? browserslist.loadConfig({
-					config: configPath,
-					env
-				})
-			: browserslist.loadConfig({ path: context, env }));
+	// browserslist
+	// browserslist:env
+	if (config) {
+		try {
+			return browserslist(config, { env, throwOnMissing: true });
+		} catch (_err) {
+			// Nothing, no `env` was found in browserslist, maybe input is `queries`
+		}
+	}
 
-	if (!config) return;
-	return browserslist(config);
+	// browserslist:query
+	if (env) {
+		return browserslist(env);
+	}
 };
 
 /**
@@ -104,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 */
@@ -188,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]
 		}),
@@ -207,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]
 		}),
@@ -253,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({
@@ -270,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
 		}),
@@ -289,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
 		}),
@@ -327,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]
 		}),
@@ -345,7 +346,7 @@ const resolve = (browsers) => {
 		fetchWasm: browserProperty,
 		global: nodeProperty,
 		importScripts: false,
-		importScriptsInWorker: true,
+		importScriptsInWorker: Boolean(browserProperty),
 		nodeBuiltins: nodeProperty,
 		nodePrefixForCoreModules:
 			nodeProperty &&