webpack 5.76.1 → 5.88.2

package/lib/cache/PackFileCacheStrategy.js

@@ -20,17 +20,22 @@ const {
 /** @typedef {import("../../declarations/WebpackOptions").SnapshotOptions} SnapshotOptions */
 /** @typedef {import("../Cache").Etag} Etag */
 /** @typedef {import("../Compiler")} Compiler */
+/** @typedef {import("../FileSystemInfo").ResolveBuildDependenciesResult} ResolveBuildDependenciesResult */
 /** @typedef {import("../FileSystemInfo").Snapshot} Snapshot */
 /** @typedef {import("../logging/Logger").Logger} Logger */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 /** @typedef {import("../util/fs").IntermediateFileSystem} IntermediateFileSystem */
 
+/** @typedef {Map<string, string | false>} ResolveResults */
+
 class PackContainer {
 	/**
 	 * @param {Object} data stored data
 	 * @param {string} version version identifier
 	 * @param {Snapshot} buildSnapshot snapshot of all build dependencies
 	 * @param {Set<string>} buildDependencies list of all unresolved build dependencies captured
-	 * @param {Map<string, string | false>} resolveResults result of the resolved build dependencies
+	 * @param {ResolveResults} resolveResults result of the resolved build dependencies
 	 * @param {Snapshot} resolveBuildDependenciesSnapshot snapshot of the dependencies of the build dependencies resolving
 	 */
 	constructor(
@@ -58,6 +63,9 @@ class PackContainer {
 		writeLazy(this.data);
 	}
 
+	/**
+	 * @param {ObjectDeserializerContext} context context
+	 */
 	deserialize({ read }) {
 		this.version = read();
 		this.buildSnapshot = read();
@@ -99,7 +107,7 @@ class Pack {
 	constructor(logger, maxAge) {
 		/** @type {Map<string, PackItemInfo>} */
 		this.itemInfo = new Map();
-		/** @type {string[]} */
+		/** @type {(string | undefined)[]} */
 		this.requests = [];
 		this.requestsTimeout = undefined;
 		/** @type {Map<string, PackItemInfo>} */
@@ -111,6 +119,9 @@ class Pack {
 		this.maxAge = maxAge;
 	}
 
+	/**
+	 * @param {string} identifier identifier
+	 */
 	_addRequest(identifier) {
 		this.requests.push(identifier);
 		if (this.requestsTimeout === undefined) {
@@ -149,7 +160,7 @@ class Pack {
 			if (!this.content[loc]) {
 				return undefined;
 			}
-			return this.content[loc].get(identifier);
+			return /** @type {PackContent} */ (this.content[loc]).get(identifier);
 		}
 	}
 
@@ -175,7 +186,7 @@ class Pack {
 			if (loc >= 0) {
 				this._addRequest(identifier);
 				this.freshContent.set(identifier, info);
-				const content = this.content[loc];
+				const content = /** @type {PackContent} */ (this.content[loc]);
 				content.delete(identifier);
 				if (content.items.size === 0) {
 					this.content[loc] = undefined;
@@ -351,11 +362,12 @@ class Pack {
 			mergedIndices = smallUnusedContents;
 		} else return;
 
+		/** @type {PackContent[] } */
 		const mergedContent = [];
 
 		// 3. Remove old content entries
 		for (const i of mergedIndices) {
-			mergedContent.push(this.content[i]);
+			mergedContent.push(/** @type {PackContent} */ (this.content[i]));
 			this.content[i] = undefined;
 		}
 
@@ -364,7 +376,7 @@ class Pack {
 		const mergedItems = new Set();
 		/** @type {Set<string>} */
 		const mergedUsedItems = new Set();
-		/** @type {(function(Map<string, any>): Promise)[]} */
+		/** @type {(function(Map<string, any>): Promise<void>)[]} */
 		const addToMergedMap = [];
 		for (const content of mergedContent) {
 			for (const identifier of content.items) {
@@ -498,17 +510,20 @@ class Pack {
 	 * Only runs for one content to avoid large invalidation.
 	 */
 	_gcOldestContent() {
-		/** @type {PackItemInfo} */
+		/** @type {PackItemInfo | undefined} */
 		let oldest = undefined;
 		for (const info of this.itemInfo.values()) {
 			if (oldest === undefined || info.lastAccess < oldest.lastAccess) {
 				oldest = info;
 			}
 		}
-		if (Date.now() - oldest.lastAccess > this.maxAge) {
-			const loc = oldest.location;
+		if (
+			Date.now() - /** @type {PackItemInfo} */ (oldest).lastAccess >
+			this.maxAge
+		) {
+			const loc = /** @type {PackItemInfo} */ (oldest).location;
 			if (loc < 0) return;
-			const content = this.content[loc];
+			const content = /** @type {PackContent} */ (this.content[loc]);
 			const items = new Set(content.items);
 			const usedItems = new Set(content.used);
 			this._gcAndUpdateLocation(items, usedItems, loc);
@@ -771,6 +786,7 @@ class PackContent {
 
 		// We are in state B
 		const { lazyName } = this;
+		/** @type {string | undefined} */
 		let timeMessage;
 		if (lazyName) {
 			// only log once
@@ -811,7 +827,7 @@ class PackContent {
 
 	/**
 	 * @param {string} reason explanation why unpack is necessary
-	 * @returns {void | Promise} maybe a promise if lazy
+	 * @returns {void | Promise<void>} maybe a promise if lazy
 	 */
 	unpack(reason) {
 		if (this.content) return;
@@ -819,6 +835,7 @@ class PackContent {
 		// Move from state B to C
 		if (this.lazy) {
 			const { lazyName } = this;
+			/** @type {string | undefined} */
 			let timeMessage;
 			if (lazyName) {
 				// only log once
@@ -862,6 +879,9 @@ class PackContent {
 		return size;
 	}
 
+	/**
+	 * @param {string} identifier identifier
+	 */
 	delete(identifier) {
 		this.items.delete(identifier);
 		this.used.delete(identifier);
@@ -906,6 +926,7 @@ class PackContent {
 		}
 		// State B2
 		const { lazyName } = this;
+		/** @type {string | undefined} */
 		let timeMessage;
 		if (lazyName) {
 			// only log once
@@ -959,6 +980,10 @@ class PackContent {
 	}
 }
 
+/**
+ * @param {Buffer} buf buffer
+ * @returns {Buffer} buffer that can be collected
+ */
 const allowCollectingMemory = buf => {
 	const wasted = buf.buffer.byteLength - buf.byteLength;
 	if (wasted > 8192 && (wasted > 1048576 || wasted > buf.byteLength)) {
@@ -978,9 +1003,10 @@ class PackFileCacheStrategy {
 	 * @param {Logger} options.logger a logger
 	 * @param {SnapshotOptions} options.snapshot options regarding snapshotting
 	 * @param {number} options.maxAge max age of cache items
-	 * @param {boolean} options.profile track and log detailed timing information for individual cache items
-	 * @param {boolean} options.allowCollectingMemory allow to collect unused memory created during deserialization
-	 * @param {false | "gzip" | "brotli"} options.compression compression used
+	 * @param {boolean | undefined} options.profile track and log detailed timing information for individual cache items
+	 * @param {boolean | undefined} options.allowCollectingMemory allow to collect unused memory created during deserialization
+	 * @param {false | "gzip" | "brotli" | undefined} options.compression compression used
+	 * @param {boolean | undefined} options.readonly disable storing cache into filesystem
 	 */
 	constructor({
 		compiler,
@@ -993,7 +1019,8 @@ class PackFileCacheStrategy {
 		maxAge,
 		profile,
 		allowCollectingMemory,
-		compression
+		compression,
+		readonly
 	}) {
 		this.fileSerializer = createFileSerializer(
 			fs,
@@ -1012,6 +1039,7 @@ class PackFileCacheStrategy {
 		this.logger = logger;
 		this.maxAge = maxAge;
 		this.profile = profile;
+		this.readonly = readonly;
 		this.allowCollectingMemory = allowCollectingMemory;
 		this.compression = compression;
 		this._extension =
@@ -1025,17 +1053,20 @@ class PackFileCacheStrategy {
 		this.buildDependencies = new Set();
 		/** @type {LazySet<string>} */
 		this.newBuildDependencies = new LazySet();
-		/** @type {Snapshot} */
+		/** @type {Snapshot | undefined} */
 		this.resolveBuildDependenciesSnapshot = undefined;
-		/** @type {Map<string, string | false>} */
+		/** @type {ResolveResults | undefined} */
 		this.resolveResults = undefined;
-		/** @type {Snapshot} */
+		/** @type {Snapshot | undefined} */
 		this.buildSnapshot = undefined;
-		/** @type {Promise<Pack>} */
+		/** @type {Promise<Pack> | undefined} */
 		this.packPromise = this._openPack();
 		this.storePromise = Promise.resolve();
 	}
 
+	/**
+	 * @returns {Promise<Pack>} pack
+	 */
 	_getPack() {
 		if (this.packPromise === undefined) {
 			this.packPromise = this.storePromise.then(() => this._openPack());
@@ -1056,7 +1087,7 @@ class PackFileCacheStrategy {
 		let newBuildDependencies;
 		/** @type {Snapshot} */
 		let resolveBuildDependenciesSnapshot;
-		/** @type {Map<string, string | false>} */
+		/** @type {ResolveResults | undefined} */
 		let resolveResults;
 		logger.time("restore cache container");
 		return this.fileSerializer
@@ -1213,6 +1244,8 @@ class PackFileCacheStrategy {
 	 * @returns {Promise<void>} promise
 	 */
 	store(identifier, etag, data) {
+		if (this.readonly) return Promise.resolve();
+
 		return this._getPack().then(pack => {
 			pack.set(identifier, etag === null ? null : etag.toString(), data);
 		});
@@ -1238,7 +1271,11 @@ class PackFileCacheStrategy {
 			});
 	}
 
+	/**
+	 * @param {LazySet<string>} dependencies dependencies to store
+	 */
 	storeBuildDependencies(dependencies) {
+		if (this.readonly) return;
 		this.newBuildDependencies.addAll(dependencies);
 	}
 
@@ -1282,7 +1319,7 @@ class PackFileCacheStrategy {
 									missing,
 									resolveResults,
 									resolveDependencies
-								} = result;
+								} = /** @type {ResolveBuildDependenciesResult} */ (result);
 								if (this.resolveResults) {
 									for (const [key, value] of resolveResults) {
 										this.resolveResults.set(key, value);
@@ -1377,7 +1414,7 @@ class PackFileCacheStrategy {
 					const content = new PackContainer(
 						pack,
 						this.version,
-						this.buildSnapshot,
+						/** @type {Snapshot} */ (this.buildSnapshot),
 						updatedBuildDependencies,
 						this.resolveResults,
 						this.resolveBuildDependenciesSnapshot

package/lib/cache/ResolverCachePlugin.js

@@ -124,8 +124,11 @@ 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()
 			};
 			let yieldResult;

package/lib/config/browserslistTargetHandler.js

@@ -23,7 +23,7 @@ const inputRx = /^(?:((?:[A-Z]:)?[/\\].*?))?(?::(.+?))?$/i;
  */
 
 /**
- * @param {string} input input string
+ * @param {string | null | undefined} input input string
  * @param {string} context the context directory
  * @returns {BrowserslistHandlerConfig} config
  */
@@ -47,7 +47,7 @@ const parse = (input, context) => {
 };
 
 /**
- * @param {string} input input string
+ * @param {string | null | undefined} input input string
  * @param {string} context the context directory
  * @returns {string[] | undefined} selected browsers
  */
@@ -66,7 +66,7 @@ const load = (input, context) => {
 		  })
 		: browserslist.loadConfig({ path: context, env });
 
-	if (!config) return null;
+	if (!config) return;
 	return browserslist(config);
 };
 
@@ -120,7 +120,7 @@ const resolve = browsers => {
 		and_qq: [10, 4],
 		// baidu: Not supported
 		// and_uc: Not supported
-		// kaios: Not supported
+		kaios: [3, 0],
 		node: [12, 17]
 	});
 
@@ -187,7 +187,7 @@ const resolve = browsers => {
 			// and_qq: Unknown support
 			// baidu: Unknown support
 			// and_uc: Unknown support
-			// kaios: Unknown support
+			kaios: [3, 0],
 			node: [0, 12]
 		}),
 		destructuring: rawChecker({
@@ -206,7 +206,7 @@ const resolve = browsers => {
 			// and_qq: Unknown support
 			// baidu: Unknown support
 			// and_uc: Unknown support
-			// kaios: Unknown support
+			kaios: [2, 5],
 			node: [6, 0]
 		}),
 		bigIntLiteral: rawChecker({
@@ -225,7 +225,7 @@ const resolve = browsers => {
 			// and_qq: Not supported
 			// baidu: Not supported
 			// and_uc: Not supported
-			// kaios: Not supported
+			kaios: [3, 0],
 			node: [10, 4]
 		}),
 		// Support syntax `import` and `export` and no limitations and bugs on Node.js
@@ -246,7 +246,7 @@ const resolve = browsers => {
 			and_qq: [10, 4],
 			// baidu: Not supported
 			// and_uc: Not supported
-			// kaios: Not supported
+			kaios: [3, 0],
 			node: [12, 17]
 		}),
 		dynamicImport: es6DynamicImport,
@@ -269,7 +269,7 @@ const resolve = browsers => {
 			// and_qq: Unknown support
 			// baidu: Unknown support
 			// and_uc: Unknown support
-			// kaios: Unknown support
+			kaios: [3, 0],
 			node: 12
 		}),
 		optionalChaining: rawChecker({
@@ -288,7 +288,7 @@ const resolve = browsers => {
 			// and_qq: Not supported
 			// baidu: Not supported
 			// and_uc: Not supported
-			// kaios: Not supported
+			kaios: [3, 0],
 			node: 14
 		}),
 		templateLiteral: rawChecker({