webpack 5.107.1 → 5.108.0

package/lib/errors/JSONParseError.js

@@ -4,8 +4,8 @@
 
 "use strict";
 
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Error, EXPECTED_ANY, string]>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Error, EXPECTED_ANY, string]>} ObjectSerializerContext */
 
 const makeSerializable = require("../util/makeSerializable");
 
@@ -92,10 +92,8 @@ class JSONParseError extends SyntaxError {
 	 * Serializes this instance into the provided serializer context.
 	 * @param {ObjectSerializerContext} context context
 	 */
-	serialize({ write }) {
-		write(this.systemError);
-		write(this.raw);
-		write(this.txt);
+	serialize(context) {
+		context.write(this.systemError).write(this.raw).write(this.txt);
 	}
 
 	/**
@@ -104,8 +102,11 @@ class JSONParseError extends SyntaxError {
 	 * @returns {JSONParseError} DelegatedModule
 	 */
 	static deserialize(context) {
-		const { read } = context;
-		return new JSONParseError(read(), read(), read());
+		const systemError = context.read();
+		const c1 = context.rest;
+		const raw = c1.read();
+		const c2 = c1.rest;
+		return new JSONParseError(systemError, raw, c2.read());
 	}
 }
 

package/lib/errors/ModuleBuildError.js

@@ -9,11 +9,11 @@ const { cutOffLoaderExecution } = require("../ErrorHelpers");
 const makeSerializable = require("../util/makeSerializable");
 const WebpackError = require("./WebpackError");
 
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
-
 /** @typedef {Error & { hideStack?: boolean }} ErrorWithHideStack */
 
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[string | ErrorWithHideStack]>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[string | ErrorWithHideStack]>} ObjectSerializerContext */
+
 class ModuleBuildError extends WebpackError {
 	/**
 	 * Creates an instance of ModuleBuildError.
@@ -32,7 +32,14 @@ class ModuleBuildError extends WebpackError {
 				const stack = cutOffLoaderExecution(err.stack);
 
 				if (!err.hideStack) {
-					message += stack;
+					// V8 prefixes `.stack` with "Name: message"; JSC and others emit
+					// frames only, which would drop the message. Lead with it then.
+					message +=
+						typeof err.message === "string" &&
+						err.message &&
+						!stack.includes(err.message)
+							? `${err.name ? `${err.name}: ` : ""}${err.message}`
+							: stack;
 				} else {
 					details = stack;
 
@@ -52,7 +59,9 @@ class ModuleBuildError extends WebpackError {
 
 		/** @type {string} */
 		this.name = "ModuleBuildError";
+		/** @type {string | undefined} */
 		this.details = details;
+		/** @type {string | ErrorWithHideStack} */
 		this.error = err;
 	}
 
@@ -61,10 +70,7 @@ class ModuleBuildError extends WebpackError {
 	 * @param {ObjectSerializerContext} context context
 	 */
 	serialize(context) {
-		const { write } = context;
-
-		write(this.error);
-
+		context.write(this.error);
 		super.serialize(context);
 	}
 
@@ -73,11 +79,8 @@ class ModuleBuildError extends WebpackError {
 	 * @param {ObjectDeserializerContext} context context
 	 */
 	deserialize(context) {
-		const { read } = context;
-
-		this.error = read();
-
-		super.deserialize(context);
+		this.error = context.read();
+		super.deserialize(context.rest);
 	}
 }
 

package/lib/errors/ModuleDependencyError.js

@@ -23,16 +23,23 @@ class ModuleDependencyError extends WebpackError {
 
 		/** @type {string} */
 		this.name = "ModuleDependencyError";
+		/** @type {string | undefined} */
 		this.details =
 			err && !err.hideStack
 				? /** @type {string} */ (err.stack).split("\n").slice(1).join("\n")
 				: undefined;
+		/** @type {Module} */
 		this.module = module;
+		/** @type {DependencyLocation} */
 		this.loc = loc;
-		/** error is not (de)serialized, so it might be undefined after deserialization */
+		/**
+		 * error is not (de)serialized, so it might be undefined after deserialization
+		 * @type {ErrorWithHideStack}
+		 */
 		this.error = err;
 
 		if (err && err.hideStack && err.stack) {
+			/** @type {string | undefined} */
 			this.stack = /** @type {string} */ `${err.stack
 				.split("\n")
 				.slice(1)

package/lib/errors/ModuleDependencyWarning.js

@@ -24,16 +24,23 @@ class ModuleDependencyWarning extends WebpackError {
 
 		/** @type {string} */
 		this.name = "ModuleDependencyWarning";
+		/** @type {string | undefined} */
 		this.details =
 			err && !err.hideStack
 				? /** @type {string} */ (err.stack).split("\n").slice(1).join("\n")
 				: undefined;
+		/** @type {Module} */
 		this.module = module;
+		/** @type {DependencyLocation} */
 		this.loc = loc;
-		/** error is not (de)serialized, so it might be undefined after deserialization */
+		/**
+		 * error is not (de)serialized, so it might be undefined after deserialization
+		 * @type {ErrorWithHideStack}
+		 */
 		this.error = err;
 
 		if (err && err.hideStack && err.stack) {
+			/** @type {string | undefined} */
 			this.stack = /** @type {string} */ `${err.stack
 				.split("\n")
 				.slice(1)

package/lib/errors/ModuleError.js

@@ -9,8 +9,8 @@ const { cleanUp } = require("../ErrorHelpers");
 const makeSerializable = require("../util/makeSerializable");
 const WebpackError = require("./WebpackError");
 
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Error]>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Error]>} ObjectSerializerContext */
 
 class ModuleError extends WebpackError {
 	/**
@@ -46,10 +46,7 @@ class ModuleError extends WebpackError {
 	 * @param {ObjectSerializerContext} context context
 	 */
 	serialize(context) {
-		const { write } = context;
-
-		write(this.error);
-
+		context.write(this.error);
 		super.serialize(context);
 	}
 
@@ -58,11 +55,8 @@ class ModuleError extends WebpackError {
 	 * @param {ObjectDeserializerContext} context context
 	 */
 	deserialize(context) {
-		const { read } = context;
-
-		this.error = read();
-
-		super.deserialize(context);
+		this.error = context.read();
+		super.deserialize(context.rest);
 	}
 }
 

package/lib/errors/ModuleHashingError.js

@@ -20,9 +20,13 @@ class ModuleHashingError extends WebpackError {
 
 		/** @type {string} */
 		this.name = "ModuleHashingError";
+		/** @type {Error} */
 		this.error = error;
+		/** @type {string} */
 		this.message = error.message;
+		/** @type {string | undefined} */
 		this.details = error.stack;
+		/** @type {Module} */
 		this.module = module;
 	}
 }

package/lib/errors/ModuleNotFoundError.js

@@ -81,9 +81,12 @@ class ModuleNotFoundError extends WebpackError {
 
 		/** @type {string} */
 		this.name = "ModuleNotFoundError";
+		/** @type {string | undefined} */
 		this.details = err.details;
+		/** @type {Module | null} */
 		this.module = module;
 		this.error = err;
+		/** @type {DependencyLocation} */
 		this.loc = loc;
 	}
 }

package/lib/errors/ModuleParseError.js

@@ -10,8 +10,8 @@ const WebpackError = require("./WebpackError");
 
 /** @typedef {import("../Dependency").DependencyLocation} DependencyLocation */
 /** @typedef {import("../Dependency").SourcePosition} SourcePosition */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Error]>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Error]>} ObjectSerializerContext */
 
 const WASM_HEADER = Buffer.from([0x00, 0x61, 0x73, 0x6d]);
 
@@ -105,10 +105,7 @@ class ModuleParseError extends WebpackError {
 	 * @param {ObjectSerializerContext} context context
 	 */
 	serialize(context) {
-		const { write } = context;
-
-		write(this.error);
-
+		context.write(this.error);
 		super.serialize(context);
 	}
 
@@ -117,11 +114,8 @@ class ModuleParseError extends WebpackError {
 	 * @param {ObjectDeserializerContext} context context
 	 */
 	deserialize(context) {
-		const { read } = context;
-
-		this.error = read();
-
-		super.deserialize(context);
+		this.error = context.read();
+		super.deserialize(context.rest);
 	}
 }
 

package/lib/errors/ModuleRestoreError.js

@@ -38,7 +38,9 @@ class ModuleRestoreError extends WebpackError {
 		this.name = "ModuleRestoreError";
 		/** @type {string | undefined} */
 		this.details = details;
+		/** @type {Module} */
 		this.module = module;
+		/** @type {string | Error} */
 		this.error = err;
 	}
 }

package/lib/errors/ModuleStoreError.js

@@ -36,8 +36,11 @@ class ModuleStoreError extends WebpackError {
 
 		/** @type {string} */
 		this.name = "ModuleStoreError";
+		/** @type {string | undefined} */
 		this.details = /** @type {string | undefined} */ (details);
+		/** @type {Module} */
 		this.module = module;
+		/** @type {string | Error} */
 		this.error = err;
 	}
 }

package/lib/errors/ModuleWarning.js

@@ -9,8 +9,8 @@ const { cleanUp } = require("../ErrorHelpers");
 const makeSerializable = require("../util/makeSerializable");
 const WebpackError = require("./WebpackError");
 
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Error]>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Error]>} ObjectSerializerContext */
 
 class ModuleWarning extends WebpackError {
 	/**
@@ -33,7 +33,9 @@ class ModuleWarning extends WebpackError {
 
 		/** @type {string} */
 		this.name = "ModuleWarning";
+		/** @type {Error} */
 		this.warning = warning;
+		/** @type {string | undefined} */
 		this.details =
 			warning && typeof warning === "object" && warning.stack
 				? cleanUp(warning.stack, this.message)
@@ -45,10 +47,7 @@ class ModuleWarning extends WebpackError {
 	 * @param {ObjectSerializerContext} context context
 	 */
 	serialize(context) {
-		const { write } = context;
-
-		write(this.warning);
-
+		context.write(this.warning);
 		super.serialize(context);
 	}
 
@@ -57,11 +56,8 @@ class ModuleWarning extends WebpackError {
 	 * @param {ObjectDeserializerContext} context context
 	 */
 	deserialize(context) {
-		const { read } = context;
-
-		this.warning = read();
-
-		super.deserialize(context);
+		this.warning = context.read();
+		super.deserialize(context.rest);
 	}
 }
 

package/lib/errors/NodeStuffInWebError.js

@@ -27,6 +27,7 @@ ${description}`
 
 		/** @type {string} */
 		this.name = "NodeStuffInWebError";
+		/** @type {DependencyLocation} */
 		this.loc = loc;
 	}
 }

package/lib/errors/NonErrorEmittedError.js

@@ -15,7 +15,9 @@ class NonErrorEmittedError extends WebpackError {
 	constructor(error) {
 		super();
 
+		/** @type {string} */
 		this.name = "NonErrorEmittedError";
+		/** @type {string} */
 		this.message = `(Emitted value instead of an instance of Error) ${error}`;
 	}
 }

package/lib/errors/UnhandledSchemeError.js

@@ -25,6 +25,7 @@ class UnhandledSchemeError extends WebpackError {
 				'\nWebpack supports "data:" and "file:" URIs by default.' +
 				`\nYou may need an additional plugin to handle "${scheme}:" URIs.`
 		);
+		/** @type {string} */
 		this.file = resource;
 		/** @type {string} */
 		this.name = "UnhandledSchemeError";

package/lib/esm/ModuleChunkLoadingPlugin.js

@@ -115,7 +115,6 @@ class ModuleChunkLoadingPlugin {
 				.tap(PLUGIN_NAME, (chunk, set) => {
 					if (!isEnabledForChunk(chunk)) return;
 					set.add(RuntimeGlobals.publicPath);
-					set.add(RuntimeGlobals.loadScript);
 					set.add(RuntimeGlobals.getChunkUpdateScriptFilename);
 					set.add(RuntimeGlobals.moduleCache);
 					set.add(RuntimeGlobals.hmrModuleData);

package/lib/esm/ModuleChunkLoadingRuntimeModule.js

@@ -150,6 +150,13 @@ class ModuleChunkLoadingRuntimeModule extends RuntimeModule {
 			? `${RuntimeGlobals.hmrRuntimeStatePrefix}_module`
 			: undefined;
 
+		const cst = runtimeTemplate.renderConst();
+		const lt = runtimeTemplate.renderLet();
+		const installedChunksObject = `{\n${Template.indent(
+			Array.from(initialChunkIds, (id) => `${JSON.stringify(id)}: 0`).join(
+				",\n"
+			)
+		)}\n}`;
 		return Template.asString([
 			withBaseURI
 				? this._generateBaseUri(chunk, rootOutputDir)
@@ -158,18 +165,14 @@ class ModuleChunkLoadingRuntimeModule extends RuntimeModule {
 			"// object to store loaded and loading chunks",
 			"// undefined = chunk not loaded, null = chunk preloaded/prefetched",
 			"// [resolve, Promise] = chunk loading, 0 = chunk loaded",
-			`var installedChunks = ${
-				stateExpression ? `${stateExpression} = ${stateExpression} || ` : ""
-			}{`,
-			Template.indent(
-				Array.from(initialChunkIds, (id) => `${JSON.stringify(id)}: 0`).join(
-					",\n"
-				)
-			),
-			"};",
+			`${cst} installedChunks = ${
+				stateExpression
+					? runtimeTemplate.assignOr(stateExpression, installedChunksObject)
+					: installedChunksObject
+			};`,
 			"",
 			withLoading || withExternalInstallChunk
-				? `var installChunk = ${runtimeTemplate.basicFunction("data", [
+				? `${cst} installChunk = ${runtimeTemplate.basicFunction("data", [
 						runtimeTemplate.destructureObject(
 							[
 								RuntimeGlobals.esmIds,
@@ -211,7 +214,7 @@ class ModuleChunkLoadingRuntimeModule extends RuntimeModule {
 							hasJsMatcher !== false
 								? Template.indent([
 										"// import() chunk loading for javascript",
-										`var installedChunkData = ${RuntimeGlobals.hasOwnProperty}(installedChunks, chunkId) ? installedChunks[chunkId] : undefined;`,
+										`${lt} installedChunkData = ${RuntimeGlobals.hasOwnProperty}(installedChunks, chunkId) ? installedChunks[chunkId] : undefined;`,
 										'if(installedChunkData !== 0) { // 0 means "already installed".',
 										Template.indent([
 											"",
@@ -227,7 +230,7 @@ class ModuleChunkLoadingRuntimeModule extends RuntimeModule {
 													: `if(${hasJsMatcher("chunkId")}) {`,
 												Template.indent([
 													"// setup Promise in chunk cache",
-													`var promise = ${importFunctionName}(${
+													`${lt} promise = ${importFunctionName}(${
 														compilation.outputOptions.publicPath === "auto"
 															? JSON.stringify(rootOutputDir)
 															: RuntimeGlobals.publicPath
@@ -240,7 +243,7 @@ class ModuleChunkLoadingRuntimeModule extends RuntimeModule {
 															"throw e;"
 														]
 													)});`,
-													`var promise = Promise.race([promise, new Promise(${runtimeTemplate.expressionFunction(
+													`promise = Promise.race([promise, new Promise(${runtimeTemplate.expressionFunction(
 														"installedChunkData = installedChunks[chunkId] = [resolve]",
 														"resolve"
 													)})])`,
@@ -263,6 +266,7 @@ class ModuleChunkLoadingRuntimeModule extends RuntimeModule {
 				? `${
 						RuntimeGlobals.prefetchChunkHandlers
 					}.j = ${runtimeTemplate.basicFunction("chunkId", [
+						// prefetch is a browser-only resource hint; no-op without a DOM (e.g. node side of a universal build)
 						isNeutralPlatform
 							? "if (typeof document === 'undefined') return;"
 							: "",
@@ -275,7 +279,7 @@ class ModuleChunkLoadingRuntimeModule extends RuntimeModule {
 							"installedChunks[chunkId] = null;",
 							linkPrefetch.call(
 								Template.asString([
-									"var link = document.createElement('link');",
+									`${cst} link = document.createElement('link');`,
 									charset ? "link.charset = 'utf-8';" : "",
 									crossOriginLoading
 										? `link.crossOrigin = ${JSON.stringify(
@@ -303,6 +307,7 @@ class ModuleChunkLoadingRuntimeModule extends RuntimeModule {
 				? `${
 						RuntimeGlobals.preloadChunkHandlers
 					}.j = ${runtimeTemplate.basicFunction("chunkId", [
+						// preload is a browser-only resource hint; no-op without a DOM (e.g. node side of a universal build)
 						isNeutralPlatform
 							? "if (typeof document === 'undefined') return;"
 							: "",
@@ -315,7 +320,7 @@ class ModuleChunkLoadingRuntimeModule extends RuntimeModule {
 							"installedChunks[chunkId] = null;",
 							linkPreload.call(
 								Template.asString([
-									"var link = document.createElement('link');",
+									`${cst} link = document.createElement('link');`,
 									charset ? "link.charset = 'utf-8';" : "",
 									`if (${RuntimeGlobals.scriptNonce}) {`,
 									Template.indent(
@@ -370,30 +375,30 @@ class ModuleChunkLoadingRuntimeModule extends RuntimeModule {
 								"resolve, reject",
 								[
 									"// start update chunk loading",
-									`var url = ${RuntimeGlobals.publicPath} + ${RuntimeGlobals.getChunkUpdateScriptFilename}(chunkId);`,
-									`var onResolve = ${runtimeTemplate.basicFunction("obj", [
-										`var updatedModules = obj.${RuntimeGlobals.esmModules};`,
-										`var updatedRuntime = obj.${RuntimeGlobals.esmRuntime};`,
+									`${cst} url = ${RuntimeGlobals.publicPath} + ${RuntimeGlobals.getChunkUpdateScriptFilename}(chunkId);`,
+									`${cst} onResolve = ${runtimeTemplate.basicFunction("obj", [
+										`${cst} updatedModules = obj.${RuntimeGlobals.esmModules};`,
+										`${cst} updatedRuntime = obj.${RuntimeGlobals.esmRuntime};`,
 										"if(updatedRuntime) currentUpdateRuntime.push(updatedRuntime);",
 										"for(var moduleId in updatedModules) {",
 										Template.indent([
 											`if(${RuntimeGlobals.hasOwnProperty}(updatedModules, moduleId)) {`,
 											Template.indent([
 												"currentUpdate[moduleId] = updatedModules[moduleId];",
-												"if(updatedModulesList) updatedModulesList.push(moduleId);"
+												`${runtimeTemplate.optionalChaining("updatedModulesList", "push(moduleId)")};`
 											]),
 											"}"
 										]),
 										"}",
 										"resolve(obj);"
 									])};`,
-									`var onReject = ${runtimeTemplate.basicFunction("error", [
-										"var errorMsg = error.message || 'unknown reason';",
+									`${cst} onReject = ${runtimeTemplate.basicFunction("error", [
+										`${cst} errorMsg = error.message || 'unknown reason';`,
 										"error.message = 'Loading hot update chunk ' + chunkId + ' failed.\\n(' + errorMsg + ')';",
 										"error.name = 'ChunkLoadError';",
 										"reject(error);"
 									])}`,
-									`var loadScript = ${runtimeTemplate.basicFunction(
+									`${cst} loadScript = ${runtimeTemplate.basicFunction(
 										"url, onResolve, onReject",
 										[
 											`return ${importFunctionName}(/* webpackIgnore: true */ url).then(onResolve).catch(onReject)`