@depup/webpack 5.110.3-depup.0 → 5.111.1-depup.0

package/lib/runtime/EnsureChunkRuntimeModule.js

@@ -7,6 +7,8 @@
 const RuntimeGlobals = require("../RuntimeGlobals");
 const RuntimeModule = require("../RuntimeModule");
 const Template = require("../Template");
+const { getOnlyHandlerKey } = require("../util/handlerKeys");
+const { propertyAccess } = require("../util/property");
 
 /** @import Compilation from "../Compilation" */
 /** @import { ReadOnlyRuntimeRequirements } from "../Module" */
@@ -31,6 +33,17 @@ class EnsureChunkRuntimeModule extends RuntimeModule {
 		this.runtimeRequirements = runtimeRequirements;
 	}
 
+	/**
+	 * The `[handlerMap, key]` pairs this module installs onto a chunk handler map
+	 * such as `__webpack_require__.f`, or `null` where it cannot name them.
+	 * @returns {[string, string][] | null} installed chunk handlers (do not mutate)
+	 */
+	getInstalledChunkHandlers() {
+		// Reads a map rather than installing onto one, so reading its code back would
+		// render it in a cycle.
+		return RuntimeModule.NO_CHUNK_HANDLERS;
+	}
+
 	/**
 	 * Generates runtime code for this runtime module.
 	 * @returns {string | null} runtime code
@@ -38,8 +51,8 @@ class EnsureChunkRuntimeModule extends RuntimeModule {
 	generate() {
 		const compilation = /** @type {Compilation} */ (this.compilation);
 		const { runtimeTemplate } = compilation;
-		// An analyzable `import()` dispatches the handlers itself, so a build can need the
-		// map without the function around it.
+		// HMR force-loads through the handler map by bare chunk id, so a build can need
+		// the map without the function around it.
 		const withEnsureChunk = this.runtimeRequirements.has(
 			RuntimeGlobals.ensureChunk
 		);
@@ -50,24 +63,30 @@ class EnsureChunkRuntimeModule extends RuntimeModule {
 			);
 			const handlers = RuntimeGlobals.ensureChunkHandlers;
 			if (!withEnsureChunk) return `${handlers} = {};`;
+			const args = `chunkId${withFetchPriority ? ", fetchPriority" : ""}`;
+			const forwarded = `chunkId, promises${
+				withFetchPriority ? ", fetchPriority" : ""
+			}`;
+			const only = getOnlyHandlerKey(this, handlers);
+			// One handler needs no walk over the others, and most chunks carry one.
+			const body =
+				only === null
+					? `return Promise.all(Object.keys(${handlers}).reduce(${runtimeTemplate.basicFunction(
+							"promises, key",
+							[`${handlers}[key](${forwarded});`, "return promises;"]
+						)}, []));`
+					: Template.asString([
+							`${runtimeTemplate.renderConst()} promises = [];`,
+							`${handlers}${propertyAccess([only])}(${forwarded});`,
+							"return Promise.all(promises);"
+						]);
 			return Template.asString([
 				`${handlers} = {};`,
 				"// This file contains only the entry chunk.",
 				"// The chunk loading function for additional chunks",
-				`${RuntimeGlobals.ensureChunk} = ${runtimeTemplate.basicFunction(
-					`chunkId${withFetchPriority ? ", fetchPriority" : ""}`,
-					[
-						`return Promise.all(Object.keys(${handlers}).reduce(${runtimeTemplate.basicFunction(
-							"promises, key",
-							[
-								`${handlers}[key](chunkId, promises${
-									withFetchPriority ? ", fetchPriority" : ""
-								});`,
-								"return promises;"
-							]
-						)}, []));`
-					]
-				)};`
+				`${RuntimeGlobals.ensureChunk} = ${runtimeTemplate.basicFunction(args, [
+					body
+				])};`
 			]);
 		}
 		// There ensureChunk is used somewhere in the tree, so we need an empty requireEnsure

package/lib/runtime/GetChunkFilenameRuntimeModule.js

@@ -67,6 +67,15 @@ class GetChunkFilenameRuntimeModule extends RuntimeModule {
 		}
 	}
 
+	/**
+	 * The `[handlerMap, key]` pairs this module installs onto a chunk handler map
+	 * such as `__webpack_require__.f`, or `null` where it cannot name them.
+	 * @returns {[string, string][] | null} installed chunk handlers (do not mutate)
+	 */
+	getInstalledChunkHandlers() {
+		return RuntimeModule.NO_CHUNK_HANDLERS;
+	}
+
 	/**
 	 * Generates runtime code for this runtime module.
 	 * @returns {string | null} runtime code
@@ -96,10 +105,9 @@ class GetChunkFilenameRuntimeModule extends RuntimeModule {
 			return length ? hash.slice(0, length) : hash;
 		};
 
-		// `[fullhash:<digest>]`/`[hash:<digest>]` would resolve to a runtime
-		// `getFullHash()` expression that can't be re-encoded; instead this module is
-		// flagged `fullHash` and re-rendered after hashing, so we inline the
-		// re-encoded full hash here — byte-identical to the statically emitted file.
+		// A digest cannot be re-encoded from the runtime `getFullHash()` expression,
+		// so this module is flagged `fullHash` and re-rendered after hashing: the
+		// inlined value is byte-identical to the statically emitted file.
 		/** @type {HashWithDigestFunction} */
 		const fullHashWithDigest = (digest, length) => {
 			const fullHash = compilation.fullHash;

package/lib/runtime/GetFullHashRuntimeModule.js

@@ -26,6 +26,15 @@ class GetFullHashRuntimeModule extends RuntimeModule {
 		return false;
 	}
 
+	/**
+	 * The `[handlerMap, key]` pairs this module installs onto a chunk handler map
+	 * such as `__webpack_require__.f`, or `null` where it cannot name them.
+	 * @returns {[string, string][] | null} installed chunk handlers (do not mutate)
+	 */
+	getInstalledChunkHandlers() {
+		return RuntimeModule.NO_CHUNK_HANDLERS;
+	}
+
 	/**
 	 * Generates runtime code for this runtime module.
 	 * @returns {string | null} runtime code

package/lib/runtime/GetMainFilenameRuntimeModule.js

@@ -35,6 +35,15 @@ class GetMainFilenameRuntimeModule extends RuntimeModule {
 		this.filename = filename;
 	}
 
+	/**
+	 * The `[handlerMap, key]` pairs this module installs onto a chunk handler map
+	 * such as `__webpack_require__.f`, or `null` where it cannot name them.
+	 * @returns {[string, string][] | null} installed chunk handlers (do not mutate)
+	 */
+	getInstalledChunkHandlers() {
+		return RuntimeModule.NO_CHUNK_HANDLERS;
+	}
+
 	/**
 	 * Generates runtime code for this runtime module.
 	 * @returns {string | null} runtime code

package/lib/runtime/GetWorkletBootstrapRuntimeModule.js

@@ -33,6 +33,15 @@ class GetWorkletBootstrapRuntimeModule extends RuntimeModule {
 		return false;
 	}
 
+	/**
+	 * The `[handlerMap, key]` pairs this module installs onto a chunk handler map
+	 * such as `__webpack_require__.f`, or `null` where it cannot name them.
+	 * @returns {[string, string][] | null} installed chunk handlers (do not mutate)
+	 */
+	getInstalledChunkHandlers() {
+		return RuntimeModule.NO_CHUNK_HANDLERS;
+	}
+
 	/**
 	 * Generates runtime code for this runtime module.
 	 * @returns {string | null} runtime code

package/lib/runtime/GlobalRuntimeModule.js

@@ -25,6 +25,15 @@ class GlobalRuntimeModule extends RuntimeModule {
 		return false;
 	}
 
+	/**
+	 * The `[handlerMap, key]` pairs this module installs onto a chunk handler map
+	 * such as `__webpack_require__.f`, or `null` where it cannot name them.
+	 * @returns {[string, string][] | null} installed chunk handlers (do not mutate)
+	 */
+	getInstalledChunkHandlers() {
+		return RuntimeModule.NO_CHUNK_HANDLERS;
+	}
+
 	/**
 	 * Generates runtime code for this runtime module.
 	 * @returns {string | null} runtime code
@@ -53,10 +62,8 @@ class GlobalRuntimeModule extends RuntimeModule {
 					"if (typeof window === 'object') return window;"
 				),
 				"}"
-				// It can still be `undefined`, but nothing to do about it...
-				// We return `undefined`, instead of nothing here, so it's
-				// easier to handle this case:
-				//   if (!global) { … }
+				// It can still be `undefined`, and nothing here can help that. Returning
+				// `undefined` rather than nothing keeps `if (!global)` working.
 			]),
 			"})();"
 		]);

package/lib/runtime/HasOwnPropertyRuntimeModule.js

@@ -26,6 +26,15 @@ class HasOwnPropertyRuntimeModule extends RuntimeModule {
 		return false;
 	}
 
+	/**
+	 * The `[handlerMap, key]` pairs this module installs onto a chunk handler map
+	 * such as `__webpack_require__.f`, or `null` where it cannot name them.
+	 * @returns {[string, string][] | null} installed chunk handlers (do not mutate)
+	 */
+	getInstalledChunkHandlers() {
+		return RuntimeModule.NO_CHUNK_HANDLERS;
+	}
+
 	/**
 	 * Generates runtime code for this runtime module.
 	 * @returns {string | null} runtime code

package/lib/runtime/HelperRuntimeModule.js

@@ -18,6 +18,16 @@ class HelperRuntimeModule extends RuntimeModule {
 	constructor(name) {
 		super(name);
 	}
+
+	/**
+	 * The `[handlerMap, key]` pairs this module installs onto a chunk handler map
+	 * such as `__webpack_require__.f`, or `null` where it cannot name them.
+	 * @returns {[string, string][] | null} installed chunk handlers (do not mutate)
+	 */
+	getInstalledChunkHandlers() {
+		// A helper defines a function on the require global and nothing else.
+		return RuntimeModule.NO_CHUNK_HANDLERS;
+	}
 }
 
 module.exports = HelperRuntimeModule;