webpack 5.43.0 → 5.46.0

package/lib/esm/ModuleChunkLoadingRuntimeModule.js

@@ -67,6 +67,9 @@ class ModuleChunkLoadingRuntimeModule extends RuntimeModule {
 		} = compilation;
 		const fn = RuntimeGlobals.ensureChunkHandlers;
 		const withBaseURI = this._runtimeRequirements.has(RuntimeGlobals.baseURI);
+		const withExternalInstallChunk = this._runtimeRequirements.has(
+			RuntimeGlobals.externalInstallChunk
+		);
 		const withLoading = this._runtimeRequirements.has(
 			RuntimeGlobals.ensureChunkHandlers
 		);
@@ -110,6 +113,38 @@ class ModuleChunkLoadingRuntimeModule extends RuntimeModule {
 			),
 			"};",
 			"",
+			withLoading || withExternalInstallChunk
+				? `var installChunk = ${runtimeTemplate.basicFunction("data", [
+						runtimeTemplate.destructureObject(
+							["ids", "modules", "runtime"],
+							"data"
+						),
+						'// add "modules" to the modules object,',
+						'// then flag all "ids" as loaded and fire callback',
+						"var moduleId, chunkId, i = 0;",
+						"for(moduleId in modules) {",
+						Template.indent([
+							`if(${RuntimeGlobals.hasOwnProperty}(modules, moduleId)) {`,
+							Template.indent(
+								`${RuntimeGlobals.moduleFactories}[moduleId] = modules[moduleId];`
+							),
+							"}"
+						]),
+						"}",
+						"if(runtime) runtime(__webpack_require__);",
+						"for(;i < ids.length; i++) {",
+						Template.indent([
+							"chunkId = ids[i];",
+							`if(${RuntimeGlobals.hasOwnProperty}(installedChunks, chunkId) && installedChunks[chunkId]) {`,
+							Template.indent("installedChunks[chunkId][0]();"),
+							"}",
+							"installedChunks[ids[i]] = 0;"
+						]),
+						"}",
+						withOnChunkLoad ? `${RuntimeGlobals.onChunksLoaded}();` : ""
+				  ])}`
+				: "// no install chunk",
+			"",
 			withLoading
 				? Template.asString([
 						`${fn}.j = ${runtimeTemplate.basicFunction(
@@ -137,45 +172,13 @@ class ModuleChunkLoadingRuntimeModule extends RuntimeModule {
 														rootOutputDir
 													)} + ${
 														RuntimeGlobals.getChunkScriptFilename
-													}(chunkId)).then(${runtimeTemplate.basicFunction(
-														"data",
+													}(chunkId)).then(installChunk, ${runtimeTemplate.basicFunction(
+														"e",
 														[
-															runtimeTemplate.destructureObject(
-																["ids", "modules", "runtime"],
-																"data"
-															),
-															'// add "modules" to the modules object,',
-															'// then flag all "ids" as loaded and fire callback',
-															"var moduleId, chunkId, i = 0;",
-															"for(moduleId in modules) {",
-															Template.indent([
-																`if(${RuntimeGlobals.hasOwnProperty}(modules, moduleId)) {`,
-																Template.indent(
-																	`${RuntimeGlobals.moduleFactories}[moduleId] = modules[moduleId];`
-																),
-																"}"
-															]),
-															"}",
-															"if(runtime) runtime(__webpack_require__);",
-															"for(;i < ids.length; i++) {",
-															Template.indent([
-																"chunkId = ids[i];",
-																`if(${RuntimeGlobals.hasOwnProperty}(installedChunks, chunkId) && installedChunks[chunkId]) {`,
-																Template.indent(
-																	"installedChunks[chunkId][0]();"
-																),
-																"}",
-																"installedChunks[ids[i]] = 0;"
-															]),
-															"}",
-															withOnChunkLoad
-																? `${RuntimeGlobals.onChunksLoaded}();`
-																: ""
+															"if(installedChunks[chunkId] !== 0) installedChunks[chunkId] = undefined;",
+															"throw e;"
 														]
-													)}, ${runtimeTemplate.basicFunction("e", [
-														"if(installedChunks[chunkId] !== 0) installedChunks[chunkId] = undefined;",
-														"throw e;"
-													])});`,
+													)});`,
 													`var promise = Promise.race([promise, new Promise(${runtimeTemplate.expressionFunction(
 														`installedChunkData = installedChunks[chunkId] = [resolve]`,
 														"resolve"
@@ -193,6 +196,12 @@ class ModuleChunkLoadingRuntimeModule extends RuntimeModule {
 				  ])
 				: "// no chunk on demand loading",
 			"",
+			withExternalInstallChunk
+				? Template.asString([
+						`${RuntimeGlobals.externalInstallChunk} = installChunk;`
+				  ])
+				: "// no external install chunk",
+			"",
 			withOnChunkLoad
 				? `${
 						RuntimeGlobals.onChunksLoaded

package/lib/hmr/HotModuleReplacement.runtime.js

@@ -9,6 +9,7 @@ var $interceptModuleExecution$ = undefined;
 var $moduleCache$ = undefined;
 // eslint-disable-next-line no-unused-vars
 var $hmrModuleData$ = undefined;
+/** @type {() => Promise}  */
 var $hmrDownloadManifest$ = undefined;
 var $hmrDownloadUpdateHandlers$ = undefined;
 var $hmrInvalidateModuleHandlers$ = undefined;
@@ -209,8 +210,12 @@ module.exports = function () {
 
 	function setStatus(newStatus) {
 		currentStatus = newStatus;
+		var results = [];
+
 		for (var i = 0; i < registeredStatusHandlers.length; i++)
-			registeredStatusHandlers[i].call(null, newStatus);
+			results[i] = registeredStatusHandlers[i].call(null, newStatus);
+
+		return Promise.all(results);
 	}
 
 	function trackBlockingPromise(promise) {
@@ -219,7 +224,7 @@ module.exports = function () {
 				setStatus("prepare");
 				blockingPromises.push(promise);
 				waitForBlockingPromises(function () {
-					setStatus("ready");
+					return setStatus("ready");
 				});
 				return promise;
 			case "prepare":
@@ -243,47 +248,47 @@ module.exports = function () {
 		if (currentStatus !== "idle") {
 			throw new Error("check() is only allowed in idle status");
 		}
-		setStatus("check");
-		return $hmrDownloadManifest$().then(function (update) {
-			if (!update) {
-				setStatus(applyInvalidatedModules() ? "ready" : "idle");
-				return null;
-			}
-
-			setStatus("prepare");
-
-			var updatedModules = [];
-			blockingPromises = [];
-			currentUpdateApplyHandlers = [];
-
-			return Promise.all(
-				Object.keys($hmrDownloadUpdateHandlers$).reduce(function (
-					promises,
-					key
-				) {
-					$hmrDownloadUpdateHandlers$[key](
-						update.c,
-						update.r,
-						update.m,
-						promises,
-						currentUpdateApplyHandlers,
-						updatedModules
-					);
-					return promises;
-				},
-				[])
-			).then(function () {
-				return waitForBlockingPromises(function () {
-					if (applyOnUpdate) {
-						return internalApply(applyOnUpdate);
-					} else {
-						setStatus("ready");
+		return setStatus("check")
+			.then($hmrDownloadManifest$)
+			.then(function (update) {
+				if (!update) {
+					return setStatus(applyInvalidatedModules() ? "ready" : "idle");
+				}
 
-						return updatedModules;
-					}
+				return setStatus("prepare").then(function () {
+					var updatedModules = [];
+					blockingPromises = [];
+					currentUpdateApplyHandlers = [];
+
+					return Promise.all(
+						Object.keys($hmrDownloadUpdateHandlers$).reduce(function (
+							promises,
+							key
+						) {
+							$hmrDownloadUpdateHandlers$[key](
+								update.c,
+								update.r,
+								update.m,
+								promises,
+								currentUpdateApplyHandlers,
+								updatedModules
+							);
+							return promises;
+						},
+						[])
+					).then(function () {
+						return waitForBlockingPromises(function () {
+							if (applyOnUpdate) {
+								return internalApply(applyOnUpdate);
+							} else {
+								return setStatus("ready").then(function () {
+									return updatedModules;
+								});
+							}
+						});
+					});
 				});
 			});
-		});
 	}
 
 	function hotApply(options) {
@@ -312,21 +317,20 @@ module.exports = function () {
 			.filter(Boolean);
 
 		if (errors.length > 0) {
-			setStatus("abort");
-			return Promise.resolve().then(function () {
+			return setStatus("abort").then(function () {
 				throw errors[0];
 			});
 		}
 
 		// Now in "dispose" phase
-		setStatus("dispose");
+		var disposePromise = setStatus("dispose");
 
 		results.forEach(function (result) {
 			if (result.dispose) result.dispose();
 		});
 
 		// Now in "apply" phase
-		setStatus("apply");
+		var applyPromise = setStatus("apply");
 
 		var error;
 		var reportError = function (err) {
@@ -345,25 +349,27 @@ module.exports = function () {
 			}
 		});
 
-		// handle errors in accept handlers and self accepted module load
-		if (error) {
-			setStatus("fail");
-			return Promise.resolve().then(function () {
-				throw error;
-			});
-		}
+		return Promise.all([disposePromise, applyPromise]).then(function () {
+			// handle errors in accept handlers and self accepted module load
+			if (error) {
+				return setStatus("fail").then(function () {
+					throw error;
+				});
+			}
 
-		if (queuedInvalidatedModules) {
-			return internalApply(options).then(function (list) {
-				outdatedModules.forEach(function (moduleId) {
-					if (list.indexOf(moduleId) < 0) list.push(moduleId);
+			if (queuedInvalidatedModules) {
+				return internalApply(options).then(function (list) {
+					outdatedModules.forEach(function (moduleId) {
+						if (list.indexOf(moduleId) < 0) list.push(moduleId);
+					});
+					return list;
 				});
-				return list;
-			});
-		}
+			}
 
-		setStatus("idle");
-		return Promise.resolve(outdatedModules);
+			return setStatus("idle").then(function () {
+				return outdatedModules;
+			});
+		});
 	}
 
 	function applyInvalidatedModules() {

package/lib/hmr/lazyCompilationBackend.js

@@ -20,7 +20,7 @@ module.exports = (compiler, client, callback) => {
 	const activeModules = new Map();
 	const prefix = "/lazy-compilation-using-";
 
-	const server = http.createServer((req, res) => {
+	const requestListener = (req, res) => {
 		const keys = req.url.slice(prefix.length).split("@");
 		req.socket.on("close", () => {
 			setTimeout(() => {
@@ -51,7 +51,8 @@ module.exports = (compiler, client, callback) => {
 			}
 		}
 		if (moduleActivated && compiler.watching) compiler.watching.invalidate();
-	});
+	};
+	const server = http.createServer(requestListener);
 	let isClosing = false;
 	/** @type {Set<import("net").Socket>} */
 	const sockets = new Set();
@@ -78,6 +79,8 @@ module.exports = (compiler, client, callback) => {
 		callback(null, {
 			dispose(callback) {
 				isClosing = true;
+				// Removing the listener is a workaround for a memory leak in node.js
+				server.off("request", requestListener);
 				server.close(err => {
 					callback(err);
 				});

package/lib/javascript/JavascriptModulesPlugin.js

@@ -834,7 +834,9 @@ class JavascriptModulesPlugin {
 				}
 			}
 			if (runtimeRequirements.has(RuntimeGlobals.onChunksLoaded)) {
-				startupSource.add(`${RuntimeGlobals.onChunksLoaded}();\n`);
+				startupSource.add(
+					`__webpack_exports__ = ${RuntimeGlobals.onChunksLoaded}(__webpack_exports__);\n`
+				);
 			}
 			source.add(
 				hooks.renderStartup.call(startupSource, lastInlinedModule, {

package/lib/library/SystemLibraryPlugin.js

@@ -72,7 +72,7 @@ class SystemLibraryPlugin extends AbstractLibraryPlugin {
 	render(source, { chunkGraph, moduleGraph, chunk }, { options, compilation }) {
 		const modules = chunkGraph
 			.getChunkModules(chunk)
-			.filter(m => m instanceof ExternalModule);
+			.filter(m => m instanceof ExternalModule && m.externalType === "system");
 		const externals = /** @type {ExternalModule[]} */ (modules);
 
 		// The name this bundle should be registered as with System

package/lib/prefetch/ChunkPrefetchStartupRuntimeModule.js

@@ -32,16 +32,17 @@ class ChunkPrefetchStartupRuntimeModule extends RuntimeModule {
 					`${RuntimeGlobals.onChunksLoaded}(0, ${JSON.stringify(
 						// This need to include itself to delay execution after this chunk has been fully loaded
 						onChunks.filter(c => c === chunk).map(c => c.id)
-					)}, ${runtimeTemplate.expressionFunction(
+					)}, ${runtimeTemplate.basicFunction(
+						"",
 						chunks.size < 3
 							? Array.from(
 									chunks,
 									c =>
-										`${RuntimeGlobals.prefetchChunk}(${JSON.stringify(c.id)})`
-							  ).join(", ")
+										`${RuntimeGlobals.prefetchChunk}(${JSON.stringify(c.id)});`
+							  )
 							: `${JSON.stringify(Array.from(chunks, c => c.id))}.map(${
 									RuntimeGlobals.prefetchChunk
-							  })`
+							  });`
 					)}, 5);`
 			)
 		);

package/lib/runtime/OnChunksLoadedRuntimeModule.js

@@ -58,7 +58,11 @@ class OnChunksLoadedRuntimeModule extends RuntimeModule {
 						]),
 						"}",
 						"if(fulfilled) {",
-						Template.indent(["deferred.splice(i--, 1)", "result = fn();"]),
+						Template.indent([
+							"deferred.splice(i--, 1)",
+							"var r = fn();",
+							"if (r !== undefined) result = r;"
+						]),
 						"}"
 					]),
 					"}",

package/lib/schemes/DataUriPlugin.js

@@ -11,15 +11,14 @@ const NormalModule = require("../NormalModule");
 
 // data URL scheme: "data:text/javascript;charset=utf-8;base64,some-string"
 // http://www.ietf.org/rfc/rfc2397.txt
-const URIRegEx = /^data:(?:[^;,]+)?(?:(?:;[^;,]+)*?)(;base64)?,(.*)$/i;
-const URIMetaRegEx = /^data:([^;,]+)?(?:(?:;[^;,]+)*?)(?:;(base64))?,/i;
+const URIRegEx = /^data:([^;,]+)?((?:;[^;,]+)*?)(?:;(base64))?,(.*)$/i;
 
 const decodeDataURI = uri => {
 	const match = URIRegEx.exec(uri);
 	if (!match) return null;
 
-	const isBase64 = match[1];
-	const body = match[2];
+	const isBase64 = match[3];
+	const body = match[4];
 	return isBase64
 		? Buffer.from(body, "base64")
 		: Buffer.from(decodeURIComponent(body), "ascii");
@@ -38,10 +37,12 @@ class DataUriPlugin {
 				normalModuleFactory.hooks.resolveForScheme
 					.for("data")
 					.tap("DataUriPlugin", resourceData => {
-						const match = URIMetaRegEx.exec(resourceData.resource);
+						const match = URIRegEx.exec(resourceData.resource);
 						if (match) {
 							resourceData.data.mimetype = match[1] || "";
-							resourceData.data.encoding = match[2] || false;
+							resourceData.data.parameters = match[2] || "";
+							resourceData.data.encoding = match[3] || false;
+							resourceData.data.encodedContent = match[4] || "";
 						}
 					});
 				NormalModule.getCompilationHooks(compilation)

package/lib/stats/DefaultStatsFactoryPlugin.js

@@ -1182,11 +1182,14 @@ const SIMPLE_EXTRACTORS = {
 				type,
 				compilation: { moduleGraph }
 			} = context;
-			object.reasons = factory.create(
+			const groupsReasons = factory.create(
 				`${type.slice(0, -8)}.reasons`,
 				Array.from(moduleGraph.getIncomingConnections(module)),
 				context
 			);
+			const limited = spaceLimited(groupsReasons, options.reasonsSpace);
+			object.reasons = limited.children;
+			object.filteredReasons = limited.filteredChildren;
 		},
 		usedExports: (
 			object,
@@ -1764,6 +1767,16 @@ const moduleGroup = (children, modules) => {
 	};
 };
 
+const reasonGroup = (children, reasons) => {
+	let active = false;
+	for (const reason of children) {
+		active = active || reason.active;
+	}
+	return {
+		active
+	};
+};
+
 /** @type {Record<string, (groupConfigs: GroupConfig[], context: StatsFactoryContext, options: NormalizedStatsOptions) => void>} */
 const ASSETS_GROUPERS = {
 	_: (groupConfigs, context, options) => {
@@ -2074,7 +2087,24 @@ const RESULT_GROUPERS = {
 	"compilation.modules": MODULES_GROUPERS("module"),
 	"chunk.modules": MODULES_GROUPERS("chunk"),
 	"chunk.rootModules": MODULES_GROUPERS("root-of-chunk"),
-	"module.modules": MODULES_GROUPERS("nested")
+	"module.modules": MODULES_GROUPERS("nested"),
+	"module.reasons": {
+		groupReasonsByOrigin: groupConfigs => {
+			groupConfigs.push({
+				getKeys: reason => {
+					return [reason.module];
+				},
+				createGroup: (key, children, reasons) => {
+					return {
+						type: "from origin",
+						module: key,
+						children,
+						...reasonGroup(children, reasons)
+					};
+				}
+			});
+		}
+	}
 };
 
 // remove a prefixed "!" that can be specified to reverse sort order

package/lib/stats/DefaultStatsPresetPlugin.js

@@ -50,6 +50,7 @@ const NAMED_PRESETS = {
 		modulesSpace: Infinity,
 		chunkModulesSpace: Infinity,
 		assetsSpace: Infinity,
+		reasonsSpace: Infinity,
 		children: true
 	},
 	detailed: {
@@ -72,8 +73,9 @@ const NAMED_PRESETS = {
 		logging: true,
 		runtimeModules: true,
 		exclude: false,
-		modulesSpace: Infinity,
-		assetsSpace: Infinity
+		modulesSpace: 1000,
+		assetsSpace: 1000,
+		reasonsSpace: 1000
 	},
 	minimal: {
 		all: false,
@@ -194,6 +196,8 @@ const DEFAULTS = {
 	depth: OFF_FOR_TO_STRING,
 	cachedAssets: OFF_FOR_TO_STRING,
 	reasons: OFF_FOR_TO_STRING,
+	reasonsSpace: (o, { forToString }) => (forToString ? 15 : Infinity),
+	groupReasonsByOrigin: ON_FOR_TO_STRING,
 	usedExports: OFF_FOR_TO_STRING,
 	providedExports: OFF_FOR_TO_STRING,
 	optimizationBailout: OFF_FOR_TO_STRING,

package/lib/stats/DefaultStatsPrinterPlugin.js

@@ -374,6 +374,10 @@ const SIMPLE_PRINTERS = {
 					"modules"
 			  )}`
 			: undefined,
+	"module.filteredReasons": filteredReasons =>
+		filteredReasons > 0
+			? `${filteredReasons} ${plural(filteredReasons, "reason", "reasons")}`
+			: undefined,
 	"module.filteredChildren": filteredChildren =>
 		filteredChildren > 0
 			? `${filteredChildren} ${plural(filteredChildren, "module", "modules")}`
@@ -393,6 +397,10 @@ const SIMPLE_PRINTERS = {
 	"moduleReason.active": (active, { formatFlag }) =>
 		active ? undefined : formatFlag("inactive"),
 	"moduleReason.resolvedModule": (module, { magenta }) => magenta(module),
+	"moduleReason.filteredChildren": filteredChildren =>
+		filteredChildren > 0
+			? `${filteredChildren} ${plural(filteredChildren, "reason", "reasons")}`
+			: undefined,
 
 	"module.profile.total": (value, { formatTime }) => formatTime(value),
 	"module.profile.resolving": (value, { formatTime }) =>
@@ -590,6 +598,7 @@ const ITEM_NAMES = {
 	"module.modules[]": "module",
 	"module.children[]": "module",
 	"module.reasons[]": "moduleReason",
+	"moduleReason.children[]": "moduleReason",
 	"module.issuerPath[]": "moduleIssuer",
 	"chunk.origins[]": "chunkOrigin",
 	"chunk.modules[]": "module",
@@ -721,6 +730,7 @@ const PREFERRED_ORDERS = {
 		"usedExports",
 		"optimizationBailout",
 		"reasons",
+		"filteredReasons",
 		"issuerPath",
 		"profile",
 		"modules",
@@ -734,7 +744,9 @@ const PREFERRED_ORDERS = {
 		"module",
 		"resolvedModule",
 		"loc",
-		"explanation"
+		"explanation",
+		"children",
+		"filteredChildren"
 	],
 	"module.profile": [
 		"total",
@@ -1019,10 +1031,32 @@ const SIMPLE_ELEMENT_JOINERS = {
 	chunkGroupAsset: joinOneLine,
 	chunkGroupChildGroup: joinOneLine,
 	chunkGroupChild: joinOneLine,
+	// moduleReason: (items, { moduleReason }) => {
+	// 	let hasName = false;
+	// 	return joinOneLine(
+	// 		items.filter(item => {
+	// 			switch (item.element) {
+	// 				case "moduleId":
+	// 					if (moduleReason.moduleId === moduleReason.module && item.content)
+	// 						hasName = true;
+	// 					break;
+	// 				case "module":
+	// 					if (hasName) return false;
+	// 					break;
+	// 				case "resolvedModule":
+	// 					return (
+	// 						moduleReason.module !== moduleReason.resolvedModule &&
+	// 						item.content
+	// 					);
+	// 			}
+	// 			return true;
+	// 		})
+	// 	);
+	// },
 	moduleReason: (items, { moduleReason }) => {
 		let hasName = false;
-		return joinOneLine(
-			items.filter(item => {
+		return joinExplicitNewLine(
+			items.map(item => {
 				switch (item.element) {
 					case "moduleId":
 						if (moduleReason.moduleId === moduleReason.module && item.content)
@@ -1032,13 +1066,21 @@ const SIMPLE_ELEMENT_JOINERS = {
 						if (hasName) return false;
 						break;
 					case "resolvedModule":
-						return (
-							moduleReason.module !== moduleReason.resolvedModule &&
-							item.content
-						);
+						if (moduleReason.module === moduleReason.resolvedModule)
+							return false;
+						break;
+					case "children":
+						if (item.content) {
+							return {
+								...item,
+								content: `\n${item.content}\n`
+							};
+						}
+						break;
 				}
-				return true;
-			})
+				return item;
+			}),
+			"  "
 		);
 	},
 	"module.profile": joinInBrackets,