webpack 5.110.2 → 5.110.3

package/lib/javascript/JavascriptModulesPlugin.js

@@ -1680,6 +1680,8 @@ class JavascriptModulesPlugin {
 						continue;
 					}
 				}
+				// An async entry is not awaited here: that needs top-level `await`,
+				// gated on an option held back from the patch release (revert #21881).
 				let i = jsEntries.length;
 				for (const [entryModule, entrypoint] of jsEntries) {
 					const chunks =

package/lib/optimize/ConcatenatedModule.js

@@ -181,6 +181,7 @@ const findIdentifiers = (source) => {
  * @property {string=} comment
  * @property {ExportName} ids
  * @property {ExportName} exportName
+ * @property {boolean=} accessorCall the raw name is the wrapper accessor call itself, so it binds looser than the identifier it replaces
  */
 
 /**
@@ -494,11 +495,14 @@ const getFinalBinding = (
 				/** @type {NonNullable<ConcatenatedModuleInfo["namespaceObjectName"]>} */
 				(info.namespaceObjectName),
 			ids: /** @type {ExportName} */ (usedName),
-			exportName
+			exportName,
+			accessorCall: info.wrapped
 		};
 	}
 
-	if (exportName.length === 0) {
+	if (moduleExportsAccess) {
+		// Skip ESM interop when require() targets a module outside the concatenation
+	} else if (exportName.length === 0) {
 		switch (exportsType) {
 			case "default-only":
 				if (deferred) info.deferredNamespaceObjectUsed = true;
@@ -509,7 +513,8 @@ const getFinalBinding = (
 						? /** @type {string} */ (info.deferredNamespaceObjectName)
 						: getInteropExpr(info, info.interopNamespaceObject2Name),
 					ids: exportName,
-					exportName
+					exportName,
+					accessorCall: !deferred && info.wrapped
 				};
 			case "default-with-named":
 				if (deferred) info.deferredNamespaceObjectUsed = true;
@@ -520,7 +525,8 @@ const getFinalBinding = (
 						? /** @type {string} */ (info.deferredNamespaceObjectName)
 						: getInteropExpr(info, info.interopNamespaceObjectName),
 					ids: exportName,
-					exportName
+					exportName,
+					accessorCall: !deferred && info.wrapped
 				};
 			case "namespace":
 			case "dynamic":
@@ -611,7 +617,8 @@ const getFinalBinding = (
 								info,
 								rawName: getExternalModuleExpr(info),
 								ids: exportName,
-								exportName
+								exportName,
+								accessorCall: info.wrapped
 							};
 						}
 						info.interopDefaultAccessUsed = true;
@@ -657,7 +664,8 @@ const getFinalBinding = (
 						/** @type {NonNullable<ConcatenatedModuleInfo["namespaceObjectName"]>} */
 						(info.namespaceObjectName),
 					ids: exportName,
-					exportName
+					exportName,
+					accessorCall: info.wrapped
 				};
 			case "external":
 				if (deferred) {
@@ -673,7 +681,8 @@ const getFinalBinding = (
 					info,
 					rawName: getExternalModuleExpr(info),
 					ids: exportName,
-					exportName
+					exportName,
+					accessorCall: info.wrapped
 				};
 		}
 	}
@@ -938,9 +947,13 @@ const getFinalName = (
 		let reference;
 		/** @type {boolean} */
 		let isPropertyAccess;
+		// the raw name is the wrapper accessor call itself, so the reference binds
+		// looser than the identifier it stands in for
+		let accessorCall = false;
 		if ("rawName" in binding) {
 			reference = `${binding.rawName}${comment || ""}${propertyAccess(ids)}`;
 			isPropertyAccess = ids.length > 0;
+			accessorCall = binding.accessorCall === true;
 		} else {
 			const { info, name: exportId } = binding;
 			const name = info.internalNames.get(exportId);
@@ -970,6 +983,10 @@ const getFinalName = (
 			} else if (binding.info.wrapped) {
 				return asiSafe === false ? `;(${reference})` : `(${reference})`;
 			}
+		} else if (accessorCall && !asCall) {
+			// without parentheses `new X()` would construct the accessor rather
+			// than what it returns
+			return asiSafe === false ? `;(${reference})` : `(${reference})`;
 		}
 
 		return reference;
@@ -1849,6 +1866,13 @@ class ConcatenatedModule extends Module {
 					for (const reference of ConcatenationScope.findModuleReferences(
 						/** @type {Source} */ (info.internalSource)
 					)) {
+						if (reference.leaked) {
+							throw new Error(
+								`Unsubstituted module reference "${reference.name}" in ${info.module.readableIdentifier(
+									requestShortener
+								)}`
+							);
+						}
 						if (visitedReferences.has(reference.name)) continue;
 						visitedReferences.add(reference.name);
 						const match = ConcatenationScope.matchModuleReference(
@@ -1942,6 +1966,13 @@ class ConcatenatedModule extends Module {
 									ignoredScopes
 								);
 							} else {
+								if (ConcatenationScope.isLeakedModuleReference(name)) {
+									throw new Error(
+										`Unsubstituted module reference "${name}" in ${info.module.readableIdentifier(
+											requestShortener
+										)}`
+									);
+								}
 								allUsedNames.add(name);
 								freeNames.add(name);
 							}

package/lib/prefetch/ResourceHintPlugin.js

@@ -300,7 +300,12 @@ const collectEntrypointHints = (compilation, entryName, hints) => {
 	const out = [];
 	/** @type {Set<string>} */
 	const seenKeys = new Set();
-	const push = (/** @type {EntrypointHint} */ h) => {
+	/**
+	 * Appends a hint, dropping one already emitted for the same rel + href.
+	 * @param {EntrypointHint} h hint to append
+	 * @returns {void}
+	 */
+	const push = (h) => {
 		const key = `${h.rel}\0${h.href}`;
 		if (seenKeys.has(key)) return;
 		seenKeys.add(key);

package/lib/runtime/AsyncModuleRuntimeModule.js

@@ -57,7 +57,11 @@ class AsyncModuleRuntimeModule extends HelperRuntimeModule {
 									`${cst} hasUnresolvedAsyncSubgraph = asyncDeps.some((id) => {`,
 									Template.indent([
 										`${cst} cache = __webpack_module_cache__[id];`,
-										"return !cache || cache[webpackDone] === false;"
+										"if (!cache) return true;",
+										// A cached entry no longer means finished, and a rejected
+										// one is done but its error must still reach the importer.
+										`${cst} deps = cache.exports;`,
+										"return deps[webpackDone] !== true || deps[webpackError] !== undefined;"
 									]),
 									"});",
 									"if (hasUnresolvedAsyncSubgraph) {",

package/lib/runtime/MakeDeferredNamespaceObjectRuntime.js

@@ -290,7 +290,17 @@ class MakeOptimizedDeferredNamespaceObjectRuntimeModule extends HelperRuntimeMod
 				]),
 				"};",
 				hasAsync
-					? `if(isAsync) obj[${RuntimeGlobals.deferredModuleAsyncTransitiveDependenciesSymbol}] = asyncDeps;`
+					? // `GatherAsynchronousTransitiveDependencies` skips a module that is
+						// already evaluating, and evaluates the rest right here.
+						`if(isAsync) obj[${RuntimeGlobals.deferredModuleAsyncTransitiveDependenciesSymbol}] = asyncDeps.filter(${runtimeTemplate.basicFunction(
+							"id",
+							[
+								`${cst} dep = __webpack_module_cache__[id];`,
+								"if (dep && (dep.evaluating || dep.evaluatingAsync)) return false;",
+								"r(id);",
+								"return true;"
+							]
+						)});`
 					: "",
 				"return obj;"
 			]),

package/lib/schemes/HttpUriPlugin.js

@@ -149,7 +149,8 @@ const verifyIntegrity = (content, integrity) => {
 };
 
 /**
- * Parses key value pairs.
+ * Parses key value pairs. Keys are lower-cased because HTTP directive names are
+ * case-insensitive; values are kept verbatim (they may be quoted field lists).
  * @param {string} str input
  * @returns {Record<string, string>} parsed
  */
@@ -159,11 +160,11 @@ const parseKeyValuePairs = (str) => {
 	for (const item of str.split(",")) {
 		const i = item.indexOf("=");
 		if (i >= 0) {
-			const key = item.slice(0, i).trim();
+			const key = item.slice(0, i).trim().toLowerCase();
 			const value = item.slice(i + 1).trim();
 			result[key] = value;
 		} else {
-			const key = item.trim();
+			const key = item.trim().toLowerCase();
 			if (!key) continue;
 			result[key] = key;
 		}
@@ -186,7 +187,9 @@ const parseCacheControl = (cacheControl, requestTime) => {
 	let validUntil = 0;
 	if (cacheControl) {
 		const parsed = parseKeyValuePairs(cacheControl);
-		if (parsed["no-cache"]) storeCache = storeLock = false;
+		if (parsed["no-cache"] || parsed["no-store"]) {
+			storeCache = storeLock = false;
+		}
 		if (parsed["max-age"] && !Number.isNaN(Number(parsed["max-age"]))) {
 			validUntil = requestTime + Number(parsed["max-age"]) * 1000;
 		}
@@ -984,7 +987,11 @@ class HttpUriPlugin {
 							/** @type {Buffer[]} */
 							const bufferArr = [];
 
-							const contentEncoding = res.headers["content-encoding"];
+							// content codings are case-insensitive tokens
+							const contentEncodingHeader = res.headers["content-encoding"];
+							const contentEncoding =
+								contentEncodingHeader &&
+								contentEncodingHeader.trim().toLowerCase();
 							/** @type {Readable} */
 							let stream = res;
 							if (contentEncoding === "gzip") {
@@ -994,6 +1001,16 @@ class HttpUriPlugin {
 							} else if (contentEncoding === "deflate") {
 								stream = stream.pipe(createInflate());
 							}
+							if (stream !== res) {
+								// a decompressor error never reaches the request's handler
+								stream.once("error", (err) => {
+									logger.log(
+										`GET ${url} [${res.statusCode}] (invalid encoding)`
+									);
+									err.message += `\nwhile decompressing ${url}`;
+									callback(err);
+								});
+							}
 
 							stream.on(
 								"data",

package/lib/serialization/FileMiddleware.js

@@ -549,9 +549,13 @@ class FileMiddleware extends SerializerMiddleware {
 								});
 							}
 							if (compression) {
-								pipeline(compression, stream, reject);
+								// resolve on the pipeline, not on the transform's "finish":
+								// the latter fires before the destination has flushed
+								pipeline(compression, stream, (err) => {
+									if (err) return reject(err);
+									resolve();
+								});
 								stream = compression;
-								stream.on("finish", () => resolve());
 							} else {
 								stream.on("error", (err) => reject(err));
 								stream.on("finish", () => resolve());
@@ -793,6 +797,15 @@ class FileMiddleware extends SerializerMiddleware {
 										});
 										return;
 									}
+									// a file truncated after `stat` reads 0 bytes forever
+									if (bytesRead === 0 && remaining > 0) {
+										this.fs.close(fd, (err) => {
+											reject(
+												err || new Error(`Unexpected end of file ${file}`)
+											);
+										});
+										return;
+									}
 									/** @type {number} */
 									(currentBufferUsed) += bytesRead;
 									remaining -= bytesRead;

package/lib/util/ArrayQueue.js

@@ -90,11 +90,11 @@ class ArrayQueue {
 	[Symbol.iterator]() {
 		return {
 			next: () => {
-				const item = this.dequeue();
-				if (item) {
+				// length, not truthiness: a queued `0`/`false`/`undefined` is a value
+				if (this.length > 0) {
 					return {
 						done: false,
-						value: item
+						value: /** @type {T} */ (this.dequeue())
 					};
 				}
 				return {

package/lib/util/URLAbsoluteSpecifier.js

@@ -17,6 +17,7 @@ const _0CharCode = "0".charCodeAt(0);
 const _9CharCode = "9".charCodeAt(0);
 const plusCharCode = "+".charCodeAt(0);
 const hyphenCharCode = "-".charCodeAt(0);
+const dotCharCode = ".".charCodeAt(0);
 const colonCharCode = ":".charCodeAt(0);
 const hashCharCode = "#".charCodeAt(0);
 const queryCharCode = "?".charCodeAt(0);
@@ -46,7 +47,8 @@ function getScheme(specifier) {
 		(ch >= aUpperCaseCharCode && ch <= zUpperCaseCharCode) ||
 		(ch >= _0CharCode && ch <= _9CharCode) ||
 		ch === plusCharCode ||
-		ch === hyphenCharCode
+		ch === hyphenCharCode ||
+		ch === dotCharCode
 	) {
 		if (++i === specifier.length) return;
 		ch = specifier.charCodeAt(i);

package/lib/util/conventions.js

@@ -115,7 +115,11 @@ module.exports.cssExportConvention = (input, convention) => {
 	const set = new Set();
 	if (typeof convention === "function") {
 		const result = convention(input);
-		const validate = (/** @type {string} */ name) => {
+		/**
+		 * @param {string} name name returned by the convention function
+		 * @returns {void}
+		 */
+		const validate = (name) => {
 			if (typeof name !== "string" || name.length === 0) {
 				throw new Error(
 					`exportsConvention function must return a non-empty string or an array of non-empty strings, got ${safeStringify(result)}`

package/lib/util/internalSerializables.js

@@ -211,6 +211,8 @@ module.exports = {
 	"errors/EnvironmentNotSupportAsyncWarning": () =>
 		require("../errors/EnvironmentNotSupportAsyncWarning"),
 	"errors/HookWebpackError": () => require("../errors/HookWebpackError"),
+	"errors/ImportedBindingAssignmentError": () =>
+		require("../errors/ImportedBindingAssignmentError"),
 	"errors/InvalidDependenciesModuleWarning": () =>
 		require("../errors/InvalidDependenciesModuleWarning"),
 	"errors/JSONParseError": () => require("../errors/JSONParseError"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "5.110.2",
+  "version": "5.110.3",
   "description": "Packs ECMAScript/CommonJs/AMD modules for the browser. Allows you to split your codebase into multiple bundles, which can be loaded on demand. Supports loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff.",
   "homepage": "https://github.com/webpack/webpack",
   "bugs": "https://github.com/webpack/webpack/issues",