webpack 5.92.1 → 5.94.0

package/lib/asset/AssetGenerator.js

@@ -18,7 +18,9 @@ const { makePathsRelative } = require("../util/identifier");
 const nonNumericOnlyHash = require("../util/nonNumericOnlyHash");
 
 /** @typedef {import("webpack-sources").Source} Source */
+/** @typedef {import("../../declarations/WebpackOptions").AssetGeneratorDataUrlOptions} AssetGeneratorDataUrlOptions */
 /** @typedef {import("../../declarations/WebpackOptions").AssetGeneratorOptions} AssetGeneratorOptions */
+/** @typedef {import("../../declarations/WebpackOptions").AssetModuleFilename} AssetModuleFilename */
 /** @typedef {import("../../declarations/WebpackOptions").AssetModuleOutputPath} AssetModuleOutputPath */
 /** @typedef {import("../../declarations/WebpackOptions").RawPublicPath} RawPublicPath */
 /** @typedef {import("../Compilation")} Compilation */
@@ -26,11 +28,21 @@ const nonNumericOnlyHash = require("../util/nonNumericOnlyHash");
 /** @typedef {import("../Generator").GenerateContext} GenerateContext */
 /** @typedef {import("../Generator").UpdateHashContext} UpdateHashContext */
 /** @typedef {import("../Module")} Module */
+/** @typedef {import("../Module").BuildInfo} BuildInfo */
 /** @typedef {import("../Module").ConcatenationBailoutReasonContext} ConcatenationBailoutReasonContext */
 /** @typedef {import("../NormalModule")} NormalModule */
 /** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
+/** @typedef {import("../TemplatedPathPlugin").TemplatePath} TemplatePath */
 /** @typedef {import("../util/Hash")} Hash */
+/** @typedef {import("../util/createHash").Algorithm} Algorithm */
 
+/**
+ * @template T
+ * @template U
+ * @param {Array<T> | Set<T>} a a
+ * @param {Array<U> | Set<U>} b b
+ * @returns {Array<T> & Array<U>} array
+ */
 const mergeMaybeArrays = (a, b) => {
 	const set = new Set();
 	if (Array.isArray(a)) for (const item of a) set.add(item);
@@ -40,6 +52,13 @@ const mergeMaybeArrays = (a, b) => {
 	return Array.from(set);
 };
 
+/**
+ * @template {object} T
+ * @template {object} U
+ * @param {TODO} a a
+ * @param {TODO} b b
+ * @returns {T & U} object
+ */
 const mergeAssetInfo = (a, b) => {
 	const result = { ...a, ...b };
 	for (const key of Object.keys(a)) {
@@ -69,6 +88,13 @@ const mergeAssetInfo = (a, b) => {
 	return result;
 };
 
+/**
+ * @template {object} T
+ * @template {object} U
+ * @param {TODO} a a
+ * @param {TODO} b b
+ * @returns {T & U} object
+ */
 const mergeRelatedInfo = (a, b) => {
 	const result = { ...a, ...b };
 	for (const key of Object.keys(a)) {
@@ -80,7 +106,13 @@ const mergeRelatedInfo = (a, b) => {
 	return result;
 };
 
+/**
+ * @param {"base64" | false} encoding encoding
+ * @param {Source} source source
+ * @returns {string} encoded data
+ */
 const encodeDataUri = (encoding, source) => {
+	/** @type {string | undefined} */
 	let encodedContent;
 
 	switch (encoding) {
@@ -95,9 +127,13 @@ const encodeDataUri = (encoding, source) => {
 				encodedContent = content.toString("utf-8");
 			}
 
-			encodedContent = encodeURIComponent(encodedContent).replace(
+			encodedContent = encodeURIComponent(
+				/** @type {string} */
+				(encodedContent)
+			).replace(
 				/[!'()*]/g,
-				character => "%" + character.codePointAt(0).toString(16)
+				character =>
+					`%${/** @type {number} */ (character.codePointAt(0)).toString(16)}`
 			);
 			break;
 		}
@@ -135,7 +171,7 @@ const DEFAULT_ENCODING = "base64";
 class AssetGenerator extends Generator {
 	/**
 	 * @param {AssetGeneratorOptions["dataUrl"]=} dataUrlOptions the options for the data url
-	 * @param {string=} filename override for output.assetModuleFilename
+	 * @param {AssetModuleFilename=} filename override for output.assetModuleFilename
 	 * @param {RawPublicPath=} publicPath override for output.assetModulePublicPath
 	 * @param {AssetModuleOutputPath=} outputPath the output path for the emitted file which is not included in the runtime import
 	 * @param {boolean=} emit generate output asset
@@ -183,9 +219,14 @@ class AssetGenerator extends Generator {
 		}
 
 		/** @type {string | boolean | undefined} */
-		let mimeType = this.dataUrlOptions.mimetype;
+		let mimeType =
+			/** @type {AssetGeneratorDataUrlOptions} */
+			(this.dataUrlOptions).mimetype;
 		if (mimeType === undefined) {
-			const ext = path.extname(module.nameForCondition());
+			const ext = path.extname(
+				/** @type {string} */
+				(module.nameForCondition())
+			);
 			if (
 				module.resourceResolveData &&
 				module.resourceResolveData.mimetype !== undefined
@@ -241,7 +282,10 @@ class AssetGenerator extends Generator {
 			default: {
 				let content;
 				const originalSource = /** @type {Source} */ (module.originalSource());
-				if (module.buildInfo.dataUrl) {
+				if (
+					/** @type {BuildInfo} */
+					(module.buildInfo).dataUrl
+				) {
 					let encodedSource;
 					if (typeof this.dataUrlOptions === "function") {
 						encodedSource = this.dataUrlOptions.call(
@@ -253,15 +297,16 @@ class AssetGenerator extends Generator {
 							}
 						);
 					} else {
-						/** @type {string | false | undefined} */
-						let encoding = this.dataUrlOptions.encoding;
-						if (encoding === undefined) {
-							if (
-								module.resourceResolveData &&
-								module.resourceResolveData.encoding !== undefined
-							) {
-								encoding = module.resourceResolveData.encoding;
-							}
+						/** @type {"base64" | false | undefined} */
+						let encoding =
+							/** @type {AssetGeneratorDataUrlOptions} */
+							(this.dataUrlOptions).encoding;
+						if (
+							encoding === undefined &&
+							module.resourceResolveData &&
+							module.resourceResolveData.encoding !== undefined
+						) {
+							encoding = module.resourceResolveData.encoding;
 						}
 						if (encoding === undefined) {
 							encoding = DEFAULT_ENCODING;
@@ -287,13 +332,20 @@ class AssetGenerator extends Generator {
 							encoding ? `;${encoding}` : ""
 						},${encodedContent}`;
 					}
-					const data = getData();
+					const data =
+						/** @type {NonNullable<GenerateContext["getData"]>} */
+						(getData)();
 					data.set("url", Buffer.from(encodedSource));
 					content = JSON.stringify(encodedSource);
 				} else {
 					const assetModuleFilename =
-						this.filename || runtimeTemplate.outputOptions.assetModuleFilename;
-					const hash = createHash(runtimeTemplate.outputOptions.hashFunction);
+						this.filename ||
+						/** @type {AssetModuleFilename} */
+						(runtimeTemplate.outputOptions.assetModuleFilename);
+					const hash = createHash(
+						/** @type {Algorithm} */
+						(runtimeTemplate.outputOptions.hashFunction)
+					);
 					if (runtimeTemplate.outputOptions.hashSalt) {
 						hash.update(runtimeTemplate.outputOptions.hashSalt);
 					}
@@ -303,9 +355,11 @@ class AssetGenerator extends Generator {
 					);
 					const contentHash = nonNumericOnlyHash(
 						fullHash,
-						runtimeTemplate.outputOptions.hashDigestLength
+						/** @type {number} */
+						(runtimeTemplate.outputOptions.hashDigestLength)
 					);
-					module.buildInfo.fullContentHash = fullHash;
+					/** @type {BuildInfo} */
+					(module.buildInfo).fullContentHash = fullHash;
 					const sourceFilename = this.getSourceFileName(
 						module,
 						runtimeTemplate
@@ -349,7 +403,8 @@ class AssetGenerator extends Generator {
 							compilation.outputOptions.publicPath === "auto"
 								? CssUrlDependency.PUBLIC_PATH_AUTO
 								: compilation.getAssetPath(
-										compilation.outputOptions.publicPath,
+										/** @type {TemplatePath} */
+										(compilation.outputOptions.publicPath),
 										{
 											hash: compilation.hash
 										}
@@ -375,8 +430,10 @@ class AssetGenerator extends Generator {
 						assetInfo = mergeAssetInfo(assetInfo, info);
 						filename = path.posix.join(outputPath, filename);
 					}
-					module.buildInfo.filename = filename;
-					module.buildInfo.assetInfo = assetInfo;
+					/** @type {BuildInfo} */
+					(module.buildInfo).filename = filename;
+					/** @type {BuildInfo} */
+					(module.buildInfo).assetInfo = assetInfo;
 					if (getData) {
 						// Due to code generation caching module.buildInfo.XXX can't used to store such information
 						// It need to be stored in the code generation results instead, where it's cached too
@@ -399,12 +456,9 @@ class AssetGenerator extends Generator {
 							ConcatenationScope.NAMESPACE_OBJECT_EXPORT
 						} = ${content};`
 					);
-				} else {
-					runtimeRequirements.add(RuntimeGlobals.module);
-					return new RawSource(
-						`${RuntimeGlobals.module}.exports = ${content};`
-					);
 				}
+				runtimeRequirements.add(RuntimeGlobals.module);
+				return new RawSource(`${RuntimeGlobals.module}.exports = ${content};`);
 			}
 		}
 	}
@@ -416,9 +470,8 @@ class AssetGenerator extends Generator {
 	getTypes(module) {
 		if ((module.buildInfo && module.buildInfo.dataUrl) || this.emit === false) {
 			return JS_TYPES;
-		} else {
-			return JS_AND_ASSET_TYPES;
 		}
+		return JS_AND_ASSET_TYPES;
 	}
 
 	/**
@@ -450,11 +503,10 @@ class AssetGenerator extends Generator {
 					// 4/3 = base64 encoding
 					// 34 = ~ data url header + footer + rounding
 					return originalSource.size() * 1.34 + 36;
-				} else {
-					// it's only estimated so this number is probably fine
-					// Example: m.exports=r.p+"0123456789012345678901.ext"
-					return 42;
 				}
+				// it's only estimated so this number is probably fine
+				// Example: m.exports=r.p+"0123456789012345678901.ext"
+				return 42;
 		}
 	}
 
@@ -462,8 +514,12 @@ class AssetGenerator extends Generator {
 	 * @param {Hash} hash hash that will be modified
 	 * @param {UpdateHashContext} updateHashContext context for updating hash
 	 */
-	updateHash(hash, { module, runtime, runtimeTemplate, chunkGraph }) {
-		if (module.buildInfo.dataUrl) {
+	updateHash(hash, updateHashContext) {
+		const { module } = updateHashContext;
+		if (
+			/** @type {BuildInfo} */
+			(module.buildInfo).dataUrl
+		) {
 			hash.update("data-url");
 			// this.dataUrlOptions as function should be pure and only depend on input source and filename
 			// therefore it doesn't need to be hashed
@@ -472,19 +528,26 @@ class AssetGenerator extends Generator {
 					.ident;
 				if (ident) hash.update(ident);
 			} else {
+				const dataUrlOptions =
+					/** @type {AssetGeneratorDataUrlOptions} */
+					(this.dataUrlOptions);
 				if (
-					this.dataUrlOptions.encoding &&
-					this.dataUrlOptions.encoding !== DEFAULT_ENCODING
+					dataUrlOptions.encoding &&
+					dataUrlOptions.encoding !== DEFAULT_ENCODING
 				) {
-					hash.update(this.dataUrlOptions.encoding);
+					hash.update(dataUrlOptions.encoding);
 				}
-				if (this.dataUrlOptions.mimetype)
-					hash.update(this.dataUrlOptions.mimetype);
+				if (dataUrlOptions.mimetype) hash.update(dataUrlOptions.mimetype);
 				// computed mimetype depends only on module filename which is already part of the hash
 			}
 		} else {
 			hash.update("resource");
 
+			const { module, chunkGraph, runtime } = updateHashContext;
+			const runtimeTemplate =
+				/** @type {NonNullable<UpdateHashContext["runtimeTemplate"]>} */
+				(updateHashContext.runtimeTemplate);
+
 			const pathData = {
 				module,
 				runtime,
@@ -506,7 +569,9 @@ class AssetGenerator extends Generator {
 			}
 
 			const assetModuleFilename =
-				this.filename || runtimeTemplate.outputOptions.assetModuleFilename;
+				this.filename ||
+				/** @type {AssetModuleFilename} */
+				(runtimeTemplate.outputOptions.assetModuleFilename);
 			const { path: filename, info } =
 				runtimeTemplate.compilation.getAssetPathWithInfo(
 					assetModuleFilename,

package/lib/asset/AssetModulesPlugin.js

@@ -17,9 +17,12 @@ 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("../Chunk")} Chunk */
 /** @typedef {import("../Compiler")} Compiler */
 /** @typedef {import("../Module")} Module */
+/** @typedef {import("../Module").BuildInfo} BuildInfo */
+/** @typedef {import("../Module").CodeGenerationResult} CodeGenerationResult */
 
 /**
  * @param {string} name name of definitions
@@ -89,7 +92,8 @@ class AssetModulesPlugin {
 					.tap(plugin, parserOptions => {
 						validateParserOptions(parserOptions);
 						parserOptions = cleverMerge(
-							compiler.options.module.parser.asset,
+							/** @type {AssetParserOptions} */
+							(compiler.options.module.parser.asset),
 							parserOptions
 						);
 
@@ -107,21 +111,21 @@ class AssetModulesPlugin {
 					});
 				normalModuleFactory.hooks.createParser
 					.for(ASSET_MODULE_TYPE_INLINE)
-					.tap(plugin, parserOptions => {
+					.tap(plugin, _parserOptions => {
 						const AssetParser = getAssetParser();
 
 						return new AssetParser(true);
 					});
 				normalModuleFactory.hooks.createParser
 					.for(ASSET_MODULE_TYPE_RESOURCE)
-					.tap(plugin, parserOptions => {
+					.tap(plugin, _parserOptions => {
 						const AssetParser = getAssetParser();
 
 						return new AssetParser(false);
 					});
 				normalModuleFactory.hooks.createParser
 					.for(ASSET_MODULE_TYPE_SOURCE)
-					.tap(plugin, parserOptions => {
+					.tap(plugin, _parserOptions => {
 						const AssetSourceParser = getAssetSourceParser();
 
 						return new AssetSourceParser();
@@ -137,7 +141,7 @@ class AssetModulesPlugin {
 						.tap(plugin, generatorOptions => {
 							validateGeneratorOptions[type](generatorOptions);
 
-							let dataUrl = undefined;
+							let dataUrl;
 							if (type !== ASSET_MODULE_TYPE_RESOURCE) {
 								dataUrl = generatorOptions.dataUrl;
 								if (!dataUrl || typeof dataUrl === "object") {
@@ -149,9 +153,9 @@ class AssetModulesPlugin {
 								}
 							}
 
-							let filename = undefined;
-							let publicPath = undefined;
-							let outputPath = undefined;
+							let filename;
+							let publicPath;
+							let outputPath;
 							if (type !== ASSET_MODULE_TYPE_INLINE) {
 								filename = generatorOptions.filename;
 								publicPath = generatorOptions.publicPath;
@@ -193,24 +197,23 @@ class AssetModulesPlugin {
 									module,
 									chunk.runtime
 								);
+								const buildInfo = /** @type {BuildInfo} */ (module.buildInfo);
+								const data =
+									/** @type {NonNullable<CodeGenerationResult["data"]>} */
+									(codeGenResult.data);
 								result.push({
-									render: () => codeGenResult.sources.get(type),
-									filename:
-										module.buildInfo.filename ||
-										codeGenResult.data.get("filename"),
-									info:
-										module.buildInfo.assetInfo ||
-										codeGenResult.data.get("assetInfo"),
+									render: () =>
+										/** @type {Source} */ (codeGenResult.sources.get(type)),
+									filename: buildInfo.filename || data.get("filename"),
+									info: buildInfo.assetInfo || data.get("assetInfo"),
 									auxiliary: true,
 									identifier: `assetModule${chunkGraph.getModuleId(module)}`,
-									hash:
-										module.buildInfo.fullContentHash ||
-										codeGenResult.data.get("fullContentHash")
+									hash: buildInfo.fullContentHash || data.get("fullContentHash")
 								});
-							} catch (e) {
-								/** @type {Error} */ (e).message +=
+							} catch (err) {
+								/** @type {Error} */ (err).message +=
 									`\nduring rendering of asset ${module.identifier()}`;
-								throw e;
+								throw err;
 							}
 						}
 					}
@@ -224,9 +227,12 @@ class AssetModulesPlugin {
 						const { codeGenerationResult } = options;
 						const source = codeGenerationResult.sources.get(ASSET_MODULE_TYPE);
 						if (source === undefined) return;
-						context.assets.set(codeGenerationResult.data.get("filename"), {
+						const data =
+							/** @type {NonNullable<CodeGenerationResult["data"]>} */
+							(codeGenerationResult.data);
+						context.assets.set(data.get("filename"), {
 							source,
-							info: codeGenerationResult.data.get("assetInfo")
+							info: data.get("assetInfo")
 						});
 					}
 				);

package/lib/asset/AssetSourceGenerator.js

@@ -34,13 +34,8 @@ class AssetSourceGenerator extends Generator {
 		}
 
 		const content = originalSource.source();
-
-		let encodedSource;
-		if (typeof content === "string") {
-			encodedSource = content;
-		} else {
-			encodedSource = content.toString("utf-8");
-		}
+		const encodedSource =
+			typeof content === "string" ? content : content.toString("utf-8");
 
 		let sourceContent;
 		if (concatenationScope) {

package/lib/async-modules/AwaitDependenciesInitFragment.js

@@ -52,13 +52,12 @@ class AwaitDependenciesInitFragment extends InitFragment {
 			return "";
 		}
 		if (promises.size === 1) {
-			for (const p of promises) {
-				return Template.asString([
-					`var __webpack_async_dependencies__ = __webpack_handle_async_dependencies__([${p}]);`,
-					`${p} = (__webpack_async_dependencies__.then ? (await __webpack_async_dependencies__)() : __webpack_async_dependencies__)[0];`,
-					""
-				]);
-			}
+			const [p] = promises;
+			return Template.asString([
+				`var __webpack_async_dependencies__ = __webpack_handle_async_dependencies__([${p}]);`,
+				`${p} = (__webpack_async_dependencies__.then ? (await __webpack_async_dependencies__)() : __webpack_async_dependencies__)[0];`,
+				""
+			]);
 		}
 		const sepPromises = Array.from(promises).join(", ");
 		// TODO check if destructuring is supported

package/lib/buildChunkGraph.js

@@ -209,7 +209,7 @@ const extractBlockModules = (module, moduleGraph, runtime, blockModulesMap) => {
 					const merged = /** @type {ConnectionState} */ (modules[idx]);
 					/** @type {ModuleGraphConnection[]} */
 					(/** @type {unknown} */ (modules[idx + 1])).push(connection);
-					if (merged === true) continue outer;
+					if (merged === true) continue;
 					modules[idx] = ModuleGraphConnection.addConnectionStates(
 						merged,
 						state
@@ -234,7 +234,6 @@ const extractBlockModules = (module, moduleGraph, runtime, blockModulesMap) => {
 };
 
 /**
- *
  * @param {Logger} logger a logger
  * @param {Compilation} compilation the compilation
  * @param {InputEntrypointsAndModules} inputEntrypointsAndModules chunk groups which are processed with the modules
@@ -286,7 +285,6 @@ const visitModules = (
 	}
 
 	/**
-	 *
 	 * @param {DependenciesBlock} block block
 	 * @param {RuntimeSpec} runtime runtime
 	 * @returns {BlockModulesInFlattenTuples} block modules in flatten tuples
@@ -316,15 +314,14 @@ const visitModules = (
 			for (const [block, blockModules] of map)
 				blockModulesMap.set(block, blockModules);
 			return map.get(block);
-		} else {
-			logger.time("visitModules: prepare");
-			extractBlockModules(module, moduleGraph, runtime, blockModulesMap);
-			blockModules =
-				/** @type {BlockModulesInFlattenTuples} */
-				(blockModulesMap.get(block));
-			logger.timeAggregate("visitModules: prepare");
-			return blockModules;
 		}
+		logger.time("visitModules: prepare");
+		extractBlockModules(module, moduleGraph, runtime, blockModulesMap);
+		blockModules =
+			/** @type {BlockModulesInFlattenTuples} */
+			(blockModulesMap.get(block));
+		logger.timeAggregate("visitModules: prepare");
+		return blockModules;
 	};
 
 	let statProcessedQueueItems = 0;
@@ -332,12 +329,12 @@ const visitModules = (
 	let statConnectedChunkGroups = 0;
 	let statProcessedChunkGroupsForMerging = 0;
 	let statMergedAvailableModuleSets = 0;
-	let statForkedAvailableModules = 0;
-	let statForkedAvailableModulesCount = 0;
-	let statForkedAvailableModulesCountPlus = 0;
-	let statForkedMergedModulesCount = 0;
-	let statForkedMergedModulesCountPlus = 0;
-	let statForkedResultModulesCount = 0;
+	const statForkedAvailableModules = 0;
+	const statForkedAvailableModulesCount = 0;
+	const statForkedAvailableModulesCountPlus = 0;
+	const statForkedMergedModulesCount = 0;
+	const statForkedMergedModulesCountPlus = 0;
+	const statForkedResultModulesCount = 0;
 	let statChunkGroupInfoUpdated = 0;
 	let statChildChunkGroupsReconnected = 0;
 
@@ -1179,7 +1176,6 @@ const visitModules = (
 };
 
 /**
- *
  * @param {Compilation} compilation the compilation
  * @param {BlocksWithNestedBlocks} blocksWithNestedBlocks flag for blocks that have nested blocks
  * @param {BlockConnections} blockConnections connection for blocks
@@ -1195,7 +1191,6 @@ const connectChunkGroups = (
 
 	/**
 	 * Helper function to check if all modules of a chunk are available
-	 *
 	 * @param {ChunkGroup} chunkGroup the chunkGroup to scan
 	 * @param {bigint} availableModules the comparator set
 	 * @returns {boolean} return true if all modules of a chunk are available

package/lib/cache/IdleFileCachePlugin.js

@@ -11,7 +11,7 @@ const ProgressPlugin = require("../ProgressPlugin");
 /** @typedef {import("../Compiler")} Compiler */
 /** @typedef {import("./PackFileCacheStrategy")} PackFileCacheStrategy */
 
-const BUILD_DEPENDENCIES_KEY = Symbol();
+const BUILD_DEPENDENCIES_KEY = Symbol("build dependencies key");
 
 class IdleFileCachePlugin {
 	/**
@@ -38,7 +38,7 @@ class IdleFileCachePlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
-		let strategy = this.strategy;
+		const strategy = this.strategy;
 		const idleTimeout = this.idleTimeout;
 		const idleTimeoutForInitialStore = Math.min(
 			idleTimeout,
@@ -119,7 +119,7 @@ class IdleFileCachePlugin {
 				currentIdlePromise = promise.then(() => strategy.afterAllStored());
 				if (reportProgress) {
 					currentIdlePromise = currentIdlePromise.then(() => {
-						reportProgress(1, `stored`);
+						reportProgress(1, "stored");
 					});
 				}
 				return currentIdlePromise.then(() => {
@@ -175,7 +175,7 @@ class IdleFileCachePlugin {
 			}
 		};
 		/** @type {ReturnType<typeof setTimeout> | undefined} */
-		let idleTimer = undefined;
+		let idleTimer;
 		compiler.cache.hooks.beginIdle.tap(
 			{ name: "IdleFileCachePlugin", stage: Cache.STAGE_DISK },
 			() => {

package/lib/cache/MemoryWithGcCachePlugin.js

@@ -20,6 +20,7 @@ class MemoryWithGcCachePlugin {
 	constructor({ maxGenerations }) {
 		this._maxGenerations = maxGenerations;
 	}
+
 	/**
 	 * Apply the plugin
 	 * @param {Compiler} compiler the compiler instance
@@ -106,12 +107,11 @@ class MemoryWithGcCachePlugin {
 						oldCache.delete(identifier);
 						cache.set(identifier, cacheEntry);
 						return null;
-					} else {
-						if (cacheEntry.etag !== etag) return null;
-						oldCache.delete(identifier);
-						cache.set(identifier, cacheEntry);
-						return cacheEntry.data;
 					}
+					if (cacheEntry.etag !== etag) return null;
+					oldCache.delete(identifier);
+					cache.set(identifier, cacheEntry);
+					return cacheEntry.data;
 				}
 				gotHandlers.push((result, callback) => {
 					if (result === undefined) {