webpack 5.107.2 → 5.108.0

package/lib/RawModule.js

@@ -29,8 +29,8 @@ const makeSerializable = require("./util/makeSerializable");
 /** @typedef {import("./ModuleGraphConnection").ConnectionState} ConnectionState */
 /** @typedef {import("./RequestShortener")} RequestShortener */
 /** @typedef {import("./ResolverFactory").ResolverWithOptions} ResolverWithOptions */
-/** @typedef {import("./serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("./serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @typedef {import("./serialization/ObjectMiddleware").ObjectDeserializerContext<[string, string, string, ReadOnlyRuntimeRequirements | null]>} ObjectDeserializerContext */
+/** @typedef {import("./serialization/ObjectMiddleware").ObjectSerializerContext<[string, string, string, ReadOnlyRuntimeRequirements | null]>} ObjectSerializerContext */
 /** @typedef {import("./util/Hash")} Hash */
 /** @typedef {import("./util/fs").InputFileSystem} InputFileSystem */
 
@@ -44,9 +44,13 @@ class RawModule extends Module {
 	 */
 	constructor(source, identifier, readableIdentifier, runtimeRequirements) {
 		super(JAVASCRIPT_MODULE_TYPE_DYNAMIC, null);
+		/** @type {string} */
 		this.sourceStr = source;
+		/** @type {string} */
 		this.identifierStr = identifier || this.sourceStr;
+		/** @type {string} */
 		this.readableIdentifierStr = readableIdentifier || this.identifierStr;
+		/** @type {ReadOnlyRuntimeRequirements | null} */
 		this.runtimeRequirements = runtimeRequirements || null;
 	}
 
@@ -161,12 +165,11 @@ class RawModule extends Module {
 	 * @param {ObjectSerializerContext} context context
 	 */
 	serialize(context) {
-		const { write } = context;
-
-		write(this.sourceStr);
-		write(this.identifierStr);
-		write(this.readableIdentifierStr);
-		write(this.runtimeRequirements);
+		context
+			.write(this.sourceStr)
+			.write(this.identifierStr)
+			.write(this.readableIdentifierStr)
+			.write(this.runtimeRequirements);
 
 		super.serialize(context);
 	}
@@ -176,14 +179,15 @@ class RawModule extends Module {
 	 * @param {ObjectDeserializerContext} context context
 	 */
 	deserialize(context) {
-		const { read } = context;
-
-		this.sourceStr = read();
-		this.identifierStr = read();
-		this.readableIdentifierStr = read();
-		this.runtimeRequirements = read();
-
-		super.deserialize(context);
+		this.sourceStr = context.read();
+		const c1 = context.rest;
+		this.identifierStr = c1.read();
+		const c2 = c1.rest;
+		this.readableIdentifierStr = c2.read();
+		const c3 = c2.rest;
+		this.runtimeRequirements = c3.read();
+
+		super.deserialize(c3.rest);
 	}
 }
 

package/lib/RecordIdsPlugin.js

@@ -50,6 +50,7 @@ class RecordIdsPlugin {
 	 * @param {RecordIdsPluginOptions=} options object
 	 */
 	constructor(options) {
+		/** @type {RecordIdsPluginOptions} */
 		this.options = options || {};
 	}
 

package/lib/RuntimeGlobals.js

@@ -455,3 +455,8 @@ module.exports.uncaughtErrorHandler = "__webpack_require__.oe";
  * an object containing all installed WebAssembly.Instance export objects keyed by module id
  */
 module.exports.wasmInstances = "__webpack_require__.w";
+
+/**
+ * the Worker constructor for universal targets (global Worker or worker_threads)
+ */
+module.exports.worker = "__webpack_require__.wc";

package/lib/RuntimePlugin.js

@@ -6,6 +6,7 @@
 "use strict";
 
 const RuntimeGlobals = require("./RuntimeGlobals");
+const { getPresentKinds } = require("./TemplatedPathPlugin");
 const RuntimeRequirementsDependency = require("./dependencies/RuntimeRequirementsDependency");
 const JavascriptModulesPlugin = require("./javascript/JavascriptModulesPlugin");
 const AsyncModuleRuntimeModule = require("./runtime/AsyncModuleRuntimeModule");
@@ -37,6 +38,7 @@ const RuntimeIdRuntimeModule = require("./runtime/RuntimeIdRuntimeModule");
 const SetAnonymousDefaultNameRuntimeModule = require("./runtime/SetAnonymousDefaultNameRuntimeModule");
 const SystemContextRuntimeModule = require("./runtime/SystemContextRuntimeModule");
 const ToBinaryRuntimeModule = require("./runtime/ToBinaryRuntimeModule");
+const WorkerRuntimeModule = require("./runtime/WorkerRuntimeModule");
 const ShareRuntimeModule = require("./sharing/ShareRuntimeModule");
 const StringXor = require("./util/StringXor");
 const memoize = require("./util/memoize");
@@ -113,7 +115,26 @@ const TREE_DEPENDENCIES = {
 	[RuntimeGlobals.shareScopeMap]: [RuntimeGlobals.hasOwnProperty]
 };
 
-const FULLHASH_REGEXP = /\[(?:full)?hash(?::\d+)?\]/;
+/**
+ * @param {string} template path template
+ * @returns {boolean} true when it references the compilation `[fullhash]`/`[hash]`
+ */
+const usesFullHash = (template) => {
+	const kinds = getPresentKinds(template);
+	return kinds.has("fullhash") || kinds.has("hash");
+};
+
+// `[fullhash:<digest>]`/`[hash:<digest>]` — a non-numeric first arg is a digest (a
+// numeric one is just a length). The re-encoded full hash must be inlined post-hash
+// rather than read from the runtime `getFullHash()` expression.
+const FULLHASH_DIGEST_REGEXP = /\[(?:fullhash|hash):(?!\d+\])\w/;
+
+/**
+ * @param {string} template path template
+ * @returns {boolean} true when it references `[fullhash:<digest>]`/`[hash:<digest>]`
+ */
+const usesFullHashWithDigest = (template) =>
+	FULLHASH_DIGEST_REGEXP.test(template);
 
 const PLUGIN_NAME = "RuntimePlugin";
 
@@ -279,10 +300,7 @@ class RuntimePlugin {
 					} else {
 						const module = new PublicPathRuntimeModule(publicPath);
 
-						if (
-							typeof publicPath !== "string" ||
-							FULLHASH_REGEXP.test(publicPath)
-						) {
+						if (typeof publicPath !== "string" || usesFullHash(publicPath)) {
 							module.fullHash = true;
 						}
 
@@ -329,7 +347,7 @@ class RuntimePlugin {
 				.tap(PLUGIN_NAME, (chunk, set, { chunkGraph }) => {
 					if (
 						typeof compilation.outputOptions.chunkFilename === "string" &&
-						FULLHASH_REGEXP.test(compilation.outputOptions.chunkFilename)
+						usesFullHash(compilation.outputOptions.chunkFilename)
 					) {
 						set.add(RuntimeGlobals.getFullHash);
 					}
@@ -339,13 +357,20 @@ class RuntimePlugin {
 							"javascript",
 							"javascript",
 							RuntimeGlobals.getChunkScriptFilename,
-							(chunk) =>
-								getJavascriptModulesPlugin().chunkHasJs(chunk, chunkGraph) &&
-								(chunk.filenameTemplate ||
-									(chunk.canBeInitial()
-										? compilation.outputOptions.filename
-										: compilation.outputOptions.chunkFilename)),
-							set.has(RuntimeGlobals.hmrDownloadUpdateHandlers)
+							(chunk) => {
+								const javascriptModulesPlugin = getJavascriptModulesPlugin();
+
+								return (
+									javascriptModulesPlugin.chunkHasJs(chunk, chunkGraph) &&
+									javascriptModulesPlugin.getChunkFilenameTemplate(
+										chunk,
+										compilation.outputOptions
+									)
+								);
+							},
+							set.has(RuntimeGlobals.hmrDownloadUpdateHandlers),
+							typeof compilation.outputOptions.chunkFilename === "string" &&
+								usesFullHashWithDigest(compilation.outputOptions.chunkFilename)
 						)
 					);
 					return true;
@@ -355,7 +380,7 @@ class RuntimePlugin {
 				.tap(PLUGIN_NAME, (chunk, set, { chunkGraph }) => {
 					if (
 						typeof compilation.outputOptions.cssChunkFilename === "string" &&
-						FULLHASH_REGEXP.test(compilation.outputOptions.cssChunkFilename)
+						usesFullHash(compilation.outputOptions.cssChunkFilename)
 					) {
 						set.add(RuntimeGlobals.getFullHash);
 					}
@@ -376,7 +401,11 @@ class RuntimePlugin {
 									)
 								);
 							},
-							set.has(RuntimeGlobals.hmrDownloadUpdateHandlers)
+							set.has(RuntimeGlobals.hmrDownloadUpdateHandlers),
+							typeof compilation.outputOptions.cssChunkFilename === "string" &&
+								usesFullHashWithDigest(
+									compilation.outputOptions.cssChunkFilename
+								)
 						)
 					);
 					return true;
@@ -384,11 +413,7 @@ class RuntimePlugin {
 			compilation.hooks.runtimeRequirementInTree
 				.for(RuntimeGlobals.getChunkUpdateScriptFilename)
 				.tap(PLUGIN_NAME, (chunk, set) => {
-					if (
-						FULLHASH_REGEXP.test(
-							compilation.outputOptions.hotUpdateChunkFilename
-						)
-					) {
+					if (usesFullHash(compilation.outputOptions.hotUpdateChunkFilename)) {
 						set.add(RuntimeGlobals.getFullHash);
 					}
 					compilation.addRuntimeModule(
@@ -398,7 +423,12 @@ class RuntimePlugin {
 							"javascript update",
 							RuntimeGlobals.getChunkUpdateScriptFilename,
 							(_chunk) => compilation.outputOptions.hotUpdateChunkFilename,
-							true
+							true,
+							typeof compilation.outputOptions.hotUpdateChunkFilename ===
+								"string" &&
+								usesFullHashWithDigest(
+									compilation.outputOptions.hotUpdateChunkFilename
+								)
 						)
 					);
 					return true;
@@ -406,11 +436,7 @@ class RuntimePlugin {
 			compilation.hooks.runtimeRequirementInTree
 				.for(RuntimeGlobals.getUpdateManifestFilename)
 				.tap(PLUGIN_NAME, (chunk, set) => {
-					if (
-						FULLHASH_REGEXP.test(
-							compilation.outputOptions.hotUpdateMainFilename
-						)
-					) {
+					if (usesFullHash(compilation.outputOptions.hotUpdateMainFilename)) {
 						set.add(RuntimeGlobals.getFullHash);
 					}
 					compilation.addRuntimeModule(
@@ -499,6 +525,12 @@ class RuntimePlugin {
 					compilation.addRuntimeModule(chunk, new RelativeUrlRuntimeModule());
 					return true;
 				});
+			compilation.hooks.runtimeRequirementInTree
+				.for(RuntimeGlobals.worker)
+				.tap(PLUGIN_NAME, (chunk, _set) => {
+					compilation.addRuntimeModule(chunk, new WorkerRuntimeModule());
+					return true;
+				});
 			compilation.hooks.runtimeRequirementInTree
 				.for(RuntimeGlobals.onChunksLoaded)
 				.tap(PLUGIN_NAME, (chunk, _set) => {