webpack 5.92.1 → 5.94.0

package/lib/cache/PackFileCacheStrategy.js

@@ -160,19 +160,18 @@ class Pack {
 		const info = this.itemInfo.get(identifier);
 		this._addRequest(identifier);
 		if (info === undefined) {
-			return undefined;
+			return;
 		}
 		if (info.etag !== etag) return null;
 		info.lastAccess = Date.now();
 		const loc = info.location;
 		if (loc === -1) {
 			return info.freshValue;
-		} else {
-			if (!this.content[loc]) {
-				return undefined;
-			}
-			return /** @type {PackContent} */ (this.content[loc]).get(identifier);
 		}
+		if (!this.content[loc]) {
+			return;
+		}
+		return /** @type {PackContent} */ (this.content[loc]).get(identifier);
 	}
 
 	/**
@@ -528,7 +527,7 @@ class Pack {
 	 */
 	_gcOldestContent() {
 		/** @type {PackItemInfo | undefined} */
-		let oldest = undefined;
+		let oldest;
 		for (const info of this.itemInfo.values()) {
 			if (oldest === undefined || info.lastAccess < oldest.lastAccess) {
 				oldest = info;
@@ -677,16 +676,16 @@ class PackContentItems {
 							logger.log(`Serialization of '${key}': ${duration} ms`);
 						else logger.debug(`Serialization of '${key}': ${duration} ms`);
 					}
-				} catch (e) {
+				} catch (err) {
 					rollback(s);
-					if (e === NOT_SERIALIZABLE) continue;
+					if (err === NOT_SERIALIZABLE) continue;
 					const msg = "Skipped not serializable cache item";
-					if (e.message.includes("ModuleBuildError")) {
-						logger.log(`${msg} (in build error): ${e.message}`);
-						logger.debug(`${msg} '${key}' (in build error): ${e.stack}`);
+					if (err.message.includes("ModuleBuildError")) {
+						logger.log(`${msg} (in build error): ${err.message}`);
+						logger.debug(`${msg} '${key}' (in build error): ${err.stack}`);
 					} else {
-						logger.warn(`${msg}: ${e.message}`);
-						logger.debug(`${msg} '${key}': ${e.stack}`);
+						logger.warn(`${msg}: ${err.message}`);
+						logger.debug(`${msg} '${key}': ${err.stack}`);
 					}
 				}
 			}
@@ -698,7 +697,7 @@ class PackContentItems {
 		try {
 			write(true);
 			write(this.map);
-		} catch (e) {
+		} catch (_err) {
 			rollback(s);
 
 			// Try to serialize each item on it's own
@@ -708,13 +707,13 @@ class PackContentItems {
 				try {
 					write(key);
 					write(value);
-				} catch (e) {
+				} catch (err) {
 					rollback(s);
-					if (e === NOT_SERIALIZABLE) continue;
+					if (err === NOT_SERIALIZABLE) continue;
 					logger.warn(
-						`Skipped not serializable cache item '${key}': ${e.message}`
+						`Skipped not serializable cache item '${key}': ${err.message}`
 					);
-					logger.debug(e.stack);
+					logger.debug(err.stack);
 				}
 			}
 			write(null);
@@ -817,6 +816,7 @@ class PackContent {
 			return this.content.get(identifier);
 		}
 
+		const logger = /** @type {Logger} */ (this.logger);
 		// We are in state B
 		const { lazyName } = this;
 		/** @type {string | undefined} */
@@ -827,35 +827,35 @@ class PackContent {
 			timeMessage = `restore cache content ${lazyName} (${formatSize(
 				this.getSize()
 			)})`;
-			this.logger.log(
+			logger.log(
 				`starting to restore cache content ${lazyName} (${formatSize(
 					this.getSize()
 				)}) because of request to: ${identifier}`
 			);
-			this.logger.time(timeMessage);
+			logger.time(timeMessage);
 		}
 		const value = this.lazy();
 		if ("then" in value) {
 			return value.then(data => {
 				const map = data.map;
 				if (timeMessage) {
-					this.logger.timeEnd(timeMessage);
+					logger.timeEnd(timeMessage);
 				}
 				// Move to state C
 				this.content = map;
 				this.lazy = SerializerMiddleware.unMemoizeLazy(this.lazy);
 				return map.get(identifier);
 			});
-		} else {
-			const map = value.map;
-			if (timeMessage) {
-				this.logger.timeEnd(timeMessage);
-			}
-			// Move to state C
-			this.content = map;
-			this.lazy = SerializerMiddleware.unMemoizeLazy(this.lazy);
-			return map.get(identifier);
 		}
+
+		const map = value.map;
+		if (timeMessage) {
+			logger.timeEnd(timeMessage);
+		}
+		// Move to state C
+		this.content = map;
+		this.lazy = SerializerMiddleware.unMemoizeLazy(this.lazy);
+		return map.get(identifier);
 	}
 
 	/**
@@ -865,6 +865,7 @@ class PackContent {
 	unpack(reason) {
 		if (this.content) return;
 
+		const logger = /** @type {Logger} */ (this.logger);
 		// Move from state B to C
 		if (this.lazy) {
 			const { lazyName } = this;
@@ -876,27 +877,26 @@ class PackContent {
 				timeMessage = `unpack cache content ${lazyName} (${formatSize(
 					this.getSize()
 				)})`;
-				this.logger.log(
+				logger.log(
 					`starting to unpack cache content ${lazyName} (${formatSize(
 						this.getSize()
 					)}) because ${reason}`
 				);
-				this.logger.time(timeMessage);
+				logger.time(timeMessage);
 			}
 			const value = this.lazy();
 			if ("then" in value) {
 				return value.then(data => {
 					if (timeMessage) {
-						this.logger.timeEnd(timeMessage);
+						logger.timeEnd(timeMessage);
 					}
 					this.content = data.map;
 				});
-			} else {
-				if (timeMessage) {
-					this.logger.timeEnd(timeMessage);
-				}
-				this.content = value.map;
 			}
+			if (timeMessage) {
+				logger.timeEnd(timeMessage);
+			}
+			this.content = value.map;
 		}
 	}
 
@@ -957,6 +957,7 @@ class PackContent {
 			);
 			return;
 		}
+		const logger = /** @type {Logger} */ (this.logger);
 		// State B2
 		const { lazyName } = this;
 		/** @type {string | undefined} */
@@ -967,12 +968,12 @@ class PackContent {
 			timeMessage = `unpack cache content ${lazyName} (${formatSize(
 				this.getSize()
 			)})`;
-			this.logger.log(
+			logger.log(
 				`starting to unpack cache content ${lazyName} (${formatSize(
 					this.getSize()
 				)}) because it's outdated and need to be serialized`
 			);
-			this.logger.time(timeMessage);
+			logger.time(timeMessage);
 		}
 		const value = this.lazy();
 		this.outdated = false;
@@ -981,7 +982,7 @@ class PackContent {
 			this.lazy = write(() =>
 				value.then(data => {
 					if (timeMessage) {
-						this.logger.timeEnd(timeMessage);
+						logger.timeEnd(timeMessage);
 					}
 					const oldMap = data.map;
 					/** @type {Map<string, any>} */
@@ -999,7 +1000,7 @@ class PackContent {
 		} else {
 			// Move to state C1
 			if (timeMessage) {
-				this.logger.timeEnd(timeMessage);
+				logger.timeEnd(timeMessage);
 			}
 			const oldMap = value.map;
 			/** @type {Map<string, any>} */
@@ -1148,19 +1149,19 @@ class PackFileCacheStrategy {
 			})
 			.then(packContainer => {
 				logger.timeEnd("restore cache container");
-				if (!packContainer) return undefined;
+				if (!packContainer) return;
 				if (!(packContainer instanceof PackContainer)) {
 					logger.warn(
 						`Restored pack from ${cacheLocation}${this._extension}, but contained content is unexpected.`,
 						packContainer
 					);
-					return undefined;
+					return;
 				}
 				if (packContainer.version !== version) {
 					logger.log(
 						`Restored pack from ${cacheLocation}${this._extension}, but version doesn't match.`
 					);
-					return undefined;
+					return;
 				}
 				logger.time("check build dependencies");
 				return Promise.all([
@@ -1321,7 +1322,7 @@ class PackFileCacheStrategy {
 				pack.stopCapturingRequests();
 				if (!pack.invalid) return;
 				this.packPromise = undefined;
-				this.logger.log(`Storing pack...`);
+				this.logger.log("Storing pack...");
 				let promise;
 				const newBuildDependencies = new Set();
 				for (const dep of this.newBuildDependencies) {
@@ -1439,7 +1440,7 @@ class PackFileCacheStrategy {
 				}
 				return promise.then(() => {
 					if (reportProgress) reportProgress(0.8, "serialize pack");
-					this.logger.time(`store pack`);
+					this.logger.time("store pack");
 					const updatedBuildDependencies = new Set(this.buildDependencies);
 					for (const dep of newBuildDependencies) {
 						updatedBuildDependencies.add(dep);
@@ -1464,7 +1465,7 @@ class PackFileCacheStrategy {
 								this.buildDependencies.add(dep);
 							}
 							this.newBuildDependencies.clear();
-							this.logger.timeEnd(`store pack`);
+							this.logger.timeEnd("store pack");
 							const stats = pack.getContentStats();
 							this.logger.log(
 								"Stored pack (%d items, %d files, %d MiB)",
@@ -1474,7 +1475,7 @@ class PackFileCacheStrategy {
 							);
 						})
 						.catch(err => {
-							this.logger.timeEnd(`store pack`);
+							this.logger.timeEnd("store pack");
 							this.logger.warn(`Caching failed for pack: ${err}`);
 							this.logger.debug(err.stack);
 						});

package/lib/cache/ResolverCachePlugin.js

@@ -59,11 +59,10 @@ const objectToString = (object, excludeContext) => {
 	for (const key in object) {
 		if (excludeContext && key === "context") continue;
 		const value = object[key];
-		if (typeof value === "object" && value !== null) {
-			str += `|${key}=[${objectToString(value, false)}|]`;
-		} else {
-			str += `|${key}=|${value}`;
-		}
+		str +=
+			typeof value === "object" && value !== null
+				? `|${key}=[${objectToString(value, false)}|]`
+				: `|${key}=|${value}`;
 	}
 	return str;
 };
@@ -241,7 +240,8 @@ class ResolverCachePlugin {
 									}
 								}
 								const itemCache = cache.getItemCache(identifier, null);
-								let callbacks, yields;
+								let callbacks;
+								let yields;
 								const done = withYield
 									? (err, result) => {
 											if (callbacks === undefined) {

package/lib/cache/mergeEtags.js

@@ -34,27 +34,23 @@ const mergeEtags = (a, b) => {
 	if (typeof a === "string") {
 		if (typeof b === "string") {
 			return `${a}|${b}`;
-		} else {
-			const temp = b;
-			b = a;
-			a = temp;
 		}
-	} else {
-		if (typeof b !== "string") {
-			// both a and b are objects
-			let map = dualObjectMap.get(a);
-			if (map === undefined) {
-				dualObjectMap.set(a, (map = new WeakMap()));
-			}
-			const mergedEtag = map.get(b);
-			if (mergedEtag === undefined) {
-				const newMergedEtag = new MergedEtag(a, b);
-				map.set(b, newMergedEtag);
-				return newMergedEtag;
-			} else {
-				return mergedEtag;
-			}
+		const temp = b;
+		b = a;
+		a = temp;
+	} else if (typeof b !== "string") {
+		// both a and b are objects
+		let map = dualObjectMap.get(a);
+		if (map === undefined) {
+			dualObjectMap.set(a, (map = new WeakMap()));
 		}
+		const mergedEtag = map.get(b);
+		if (mergedEtag === undefined) {
+			const newMergedEtag = new MergedEtag(a, b);
+			map.set(b, newMergedEtag);
+			return newMergedEtag;
+		}
+		return mergedEtag;
 	}
 	// a is object, b is string
 	let map = objectStringMap.get(a);
@@ -66,9 +62,8 @@ const mergeEtags = (a, b) => {
 		const newMergedEtag = new MergedEtag(a, b);
 		map.set(b, newMergedEtag);
 		return newMergedEtag;
-	} else {
-		return mergedEtag;
 	}
+	return mergedEtag;
 };
 
 module.exports = mergeEtags;