webpack 5.45.1 → 5.46.0

package/lib/NormalModule.js

@@ -350,18 +350,20 @@ class NormalModule extends Module {
 		this.resource = m.resource;
 		this.matchResource = m.matchResource;
 		this.loaders = m.loaders;
-		this._sourceTypes = m._sourceTypes;
-		this._sourceSizes = m._sourceSizes;
 	}
 
 	/**
 	 * Assuming this module is in the cache. Remove internal references to allow freeing some memory.
 	 */
 	cleanupForCache() {
-		// Make sure to cache types and sizes before cleanup
-		if (this._sourceTypes === undefined) this.getSourceTypes();
-		for (const type of this._sourceTypes) {
-			this.size(type);
+		// Make sure to cache types and sizes before cleanup when this module has been built
+		// They are accessed by the stats and we don't want them to crash after cleanup
+		// TODO reconsider this for webpack 6
+		if (this.buildInfo) {
+			if (this._sourceTypes === undefined) this.getSourceTypes();
+			for (const type of this._sourceTypes) {
+				this.size(type);
+			}
 		}
 		super.cleanupForCache();
 		this.parser = undefined;

package/lib/asset/AssetModulesPlugin.js

@@ -172,24 +172,29 @@ class AssetModulesPlugin {
 					);
 					if (modules) {
 						for (const module of modules) {
-							const codeGenResult = codeGenerationResults.get(
-								module,
-								chunk.runtime
-							);
-							result.push({
-								render: () => codeGenResult.sources.get(type),
-								filename:
-									module.buildInfo.filename ||
-									codeGenResult.data.get("filename"),
-								info:
-									module.buildInfo.assetInfo ||
-									codeGenResult.data.get("assetInfo"),
-								auxiliary: true,
-								identifier: `assetModule${chunkGraph.getModuleId(module)}`,
-								hash:
-									module.buildInfo.fullContentHash ||
-									codeGenResult.data.get("fullContentHash")
-							});
+							try {
+								const codeGenResult = codeGenerationResults.get(
+									module,
+									chunk.runtime
+								);
+								result.push({
+									render: () => codeGenResult.sources.get(type),
+									filename:
+										module.buildInfo.filename ||
+										codeGenResult.data.get("filename"),
+									info:
+										module.buildInfo.assetInfo ||
+										codeGenResult.data.get("assetInfo"),
+									auxiliary: true,
+									identifier: `assetModule${chunkGraph.getModuleId(module)}`,
+									hash:
+										module.buildInfo.fullContentHash ||
+										codeGenResult.data.get("fullContentHash")
+								});
+							} catch (e) {
+								e.message += `\nduring rendering of asset ${module.identifier()}`;
+								throw e;
+							}
 						}
 					}
 

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/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,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "5.45.1",
+  "version": "5.46.0",
   "author": "Tobias Koppers @sokra",
   "description": "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff.",
   "license": "MIT",
@@ -27,7 +27,7 @@
     "tapable": "^2.1.1",
     "terser-webpack-plugin": "^5.1.3",
     "watchpack": "^2.2.0",
-    "webpack-sources": "^2.3.0"
+    "webpack-sources": "^2.3.1"
   },
   "peerDependenciesMeta": {
     "webpack-cli": {