webpack 5.30.0 → 5.31.0

package/lib/Dependency.js

@@ -55,6 +55,7 @@ const memoize = require("./util/memoize");
  * @property {(string | ExportSpec)[]=} exports nested exports
  * @property {ModuleGraphConnection=} from when reexported: from which module
  * @property {string[] | null=} export when reexported: from which export
+ * @property {number=} priority when reexported: with which priority
  * @property {boolean=} hidden export is not visible, because another export blends over it
  */
 
@@ -64,6 +65,7 @@ const memoize = require("./util/memoize");
  * @property {Set<string>=} excludeExports when exports = true, list of unaffected exports
  * @property {Set<string>=} hideExports list of maybe prior exposed, but now hidden exports
  * @property {ModuleGraphConnection=} from when reexported: from which module
+ * @property {number=} priority when reexported: with which priority
  * @property {boolean=} canMangle can the export be renamed (defaults to true)
  * @property {boolean=} terminalBinding are the exports terminal bindings that should be checked for export star conflicts
  * @property {Module[]=} dependencies module on which the result depends on

package/lib/ExportsInfo.js

@@ -269,13 +269,15 @@ class ExportsInfo {
 	 * @param {Set<string>=} excludeExports list of unaffected exports
 	 * @param {any=} targetKey use this as key for the target
 	 * @param {ModuleGraphConnection=} targetModule set this module as target
+	 * @param {number=} priority priority
 	 * @returns {boolean} true, if this call changed something
 	 */
 	setUnknownExportsProvided(
 		canMangle,
 		excludeExports,
 		targetKey,
-		targetModule
+		targetModule,
+		priority
 	) {
 		let changed = false;
 		if (excludeExports) {
@@ -295,7 +297,7 @@ class ExportsInfo {
 				changed = true;
 			}
 			if (targetKey) {
-				exportInfo.setTarget(targetKey, targetModule, [exportInfo.name]);
+				exportInfo.setTarget(targetKey, targetModule, [exportInfo.name], -1);
 			}
 		}
 		if (this._redirectTo !== undefined) {
@@ -304,7 +306,8 @@ class ExportsInfo {
 					canMangle,
 					excludeExports,
 					targetKey,
-					targetModule
+					targetModule,
+					priority
 				)
 			) {
 				changed = true;
@@ -322,7 +325,12 @@ class ExportsInfo {
 				changed = true;
 			}
 			if (targetKey) {
-				this._otherExportsInfo.setTarget(targetKey, targetModule, undefined);
+				this._otherExportsInfo.setTarget(
+					targetKey,
+					targetModule,
+					undefined,
+					priority
+				);
 			}
 		}
 		return changed;
@@ -819,17 +827,20 @@ class ExportInfo {
 		this.exportsInfoOwned = false;
 		/** @type {ExportsInfo=} */
 		this.exportsInfo = undefined;
-		/** @type {Map<any, { connection: ModuleGraphConnection, export: string[] } | null>=} */
+		/** @type {Map<any, { connection: ModuleGraphConnection | null, export: string[], priority: number }>=} */
 		this._target = undefined;
 		if (initFrom && initFrom._target) {
 			this._target = new Map();
 			for (const [key, value] of initFrom._target) {
-				this._target.set(
-					key,
-					value ? { connection: value.connection, export: [name] } : null
-				);
+				this._target.set(key, {
+					connection: value.connection,
+					export: value.export || [name],
+					priority: value.priority
+				});
 			}
 		}
+		/** @type {Map<any, { connection: ModuleGraphConnection | null, export: string[], priority: number }>=} */
+		this._maxTarget = undefined;
 	}
 
 	// TODO webpack 5 remove
@@ -1023,46 +1034,45 @@ class ExportInfo {
 	 */
 	unsetTarget(key) {
 		if (!this._target) return false;
-		return this._target.delete(key);
+		if (this._target.delete(key)) {
+			this._maxTarget = undefined;
+			return true;
+		}
+		return false;
 	}
 
 	/**
 	 * @param {any} key the key
-	 * @param {ModuleGraphConnection=} connection the target module if a single one
+	 * @param {ModuleGraphConnection} connection the target module if a single one
 	 * @param {string[]=} exportName the exported name
+	 * @param {number=} priority priority
 	 * @returns {boolean} true, if something has changed
 	 */
-	setTarget(key, connection, exportName) {
+	setTarget(key, connection, exportName, priority = 0) {
 		if (exportName) exportName = [...exportName];
 		if (!this._target) {
 			this._target = new Map();
-			this._target.set(
-				key,
-				connection ? { connection, export: exportName } : null
-			);
+			this._target.set(key, { connection, export: exportName, priority });
 			return true;
 		}
 		const oldTarget = this._target.get(key);
 		if (!oldTarget) {
 			if (oldTarget === null && !connection) return false;
-			this._target.set(
-				key,
-				connection ? { connection, export: exportName } : null
-			);
-			return true;
-		}
-		if (!connection) {
-			this._target.set(key, null);
+			this._target.set(key, { connection, export: exportName, priority });
+			this._maxTarget = undefined;
 			return true;
 		}
 		if (
 			oldTarget.connection !== connection ||
+			oldTarget.priority !== priority ||
 			(exportName
 				? !oldTarget.export || !equals(oldTarget.export, exportName)
 				: oldTarget.export)
 		) {
 			oldTarget.connection = connection;
 			oldTarget.export = exportName;
+			oldTarget.priority = priority;
+			this._maxTarget = undefined;
 			return true;
 		}
 		return false;
@@ -1171,6 +1181,29 @@ class ExportInfo {
 		return !this.terminalBinding && this._target && this._target.size > 0;
 	}
 
+	_getMaxTarget() {
+		if (this._maxTarget !== undefined) return this._maxTarget;
+		if (this._target.size <= 1) return (this._maxTarget = this._target);
+		let maxPriority = -Infinity;
+		let minPriority = Infinity;
+		for (const { priority } of this._target.values()) {
+			if (maxPriority < priority) maxPriority = priority;
+			if (minPriority > priority) minPriority = priority;
+		}
+		// This should be very common
+		if (maxPriority === minPriority) return (this._maxTarget = this._target);
+
+		// This is an edge case
+		const map = new Map();
+		for (const [key, value] of this._target) {
+			if (maxPriority === value.priority) {
+				map.set(key, value);
+			}
+		}
+		this._maxTarget = map;
+		return map;
+	}
+
 	/**
 	 * @param {ModuleGraph} moduleGraph the module graph
 	 * @param {function(Module): boolean} validTargetModuleFilter a valid target module
@@ -1188,7 +1221,7 @@ class ExportInfo {
 	 */
 	_findTarget(moduleGraph, validTargetModuleFilter, alreadyVisited) {
 		if (!this._target || this._target.size === 0) return undefined;
-		let rawTarget = this._target.values().next().value;
+		let rawTarget = this._getMaxTarget().values().next().value;
 		if (!rawTarget) return undefined;
 		/** @type {{ module: Module, export: string[] | undefined }} */
 		let target = {
@@ -1296,7 +1329,7 @@ class ExportInfo {
 		if (alreadyVisited && alreadyVisited.has(this)) return CIRCULAR;
 		const newAlreadyVisited = new Set(alreadyVisited);
 		newAlreadyVisited.add(this);
-		const values = this._target.values();
+		const values = this._getMaxTarget().values();
 		const target = resolveTarget(values.next().value, newAlreadyVisited);
 		if (target === CIRCULAR) return CIRCULAR;
 		if (target === null) return undefined;
@@ -1324,7 +1357,7 @@ class ExportInfo {
 		const target = this._getTarget(moduleGraph, resolveTargetFilter, undefined);
 		if (target === CIRCULAR) return undefined;
 		if (!target) return undefined;
-		const originalTarget = this._target.values().next().value;
+		const originalTarget = this._getMaxTarget().values().next().value;
 		if (
 			originalTarget.connection === target.connection &&
 			originalTarget.export === target.export
@@ -1336,7 +1369,8 @@ class ExportInfo {
 			connection: updateOriginalConnection
 				? updateOriginalConnection(target)
 				: target.connection,
-			export: target.export
+			export: target.export,
+			priority: 0
 		});
 		return target;
 	}

package/lib/FileSystemInfo.js

@@ -27,11 +27,12 @@ const RBDT_RESOLVE_CJS = 0;
 const RBDT_RESOLVE_ESM = 1;
 const RBDT_RESOLVE_DIRECTORY = 2;
 const RBDT_RESOLVE_CJS_FILE = 3;
-const RBDT_RESOLVE_ESM_FILE = 4;
-const RBDT_DIRECTORY = 5;
-const RBDT_FILE = 6;
-const RBDT_DIRECTORY_DEPENDENCIES = 7;
-const RBDT_FILE_DEPENDENCIES = 8;
+const RBDT_RESOLVE_CJS_FILE_AS_CHILD = 4;
+const RBDT_RESOLVE_ESM_FILE = 5;
+const RBDT_DIRECTORY = 6;
+const RBDT_FILE = 7;
+const RBDT_DIRECTORY_DEPENDENCIES = 8;
+const RBDT_FILE_DEPENDENCIES = 9;
 
 const INVALID = Symbol("invalid");
 
@@ -63,7 +64,7 @@ const INVALID = Symbol("invalid");
  * @property {Set<string>} files list of files
  * @property {Set<string>} directories list of directories
  * @property {Set<string>} missing list of missing entries
- * @property {Map<string, string>} resolveResults stored resolve results
+ * @property {Map<string, string | false>} resolveResults stored resolve results
  * @property {Object} resolveDependencies dependencies of the resolving
  * @property {Set<string>} resolveDependencies.files list of files
  * @property {Set<string>} resolveDependencies.directories list of directories
@@ -1103,15 +1104,23 @@ class FileSystemInfo {
 		const resolveCjs = createResolver({
 			extensions: [".js", ".json", ".node"],
 			conditionNames: ["require", "node"],
+			exportsFields: ["exports"],
+			fileSystem: this.fs
+		});
+		const resolveCjsAsChild = createResolver({
+			extensions: [".js", ".json", ".node"],
+			conditionNames: ["require", "node"],
+			exportsFields: [],
 			fileSystem: this.fs
 		});
 		const resolveEsm = createResolver({
 			extensions: [".js", ".json", ".node"],
 			fullySpecified: true,
 			conditionNames: ["import", "node"],
+			exportsFields: ["exports"],
 			fileSystem: this.fs
 		});
-		return { resolveContext, resolveEsm, resolveCjs };
+		return { resolveContext, resolveEsm, resolveCjs, resolveCjsAsChild };
 	}
 
 	/**
@@ -1124,7 +1133,8 @@ class FileSystemInfo {
 		const {
 			resolveContext,
 			resolveEsm,
-			resolveCjs
+			resolveCjs,
+			resolveCjsAsChild
 		} = this._createBuildDependenciesResolvers();
 
 		/** @type {Set<string>} */
@@ -1143,7 +1153,7 @@ class FileSystemInfo {
 		const resolveDirectories = new Set();
 		/** @type {Set<string>} */
 		const resolveMissing = new Set();
-		/** @type {Map<string, string>} */
+		/** @type {Map<string, string | false>} */
 		const resolveResults = new Map();
 		const invalidResolveResults = new Set();
 		const resolverContext = {
@@ -1211,13 +1221,11 @@ class FileSystemInfo {
 					resolveResults.set(key, undefined);
 					resolveContext(context, path, resolverContext, (err, result) => {
 						if (err) {
-							invalidResolveResults.add(key);
-							if (
-								err.code === "ENOENT" ||
-								err.code === "UNDECLARED_DEPENDENCY"
-							) {
+							if (expected === false) {
+								resolveResults.set(key, false);
 								return callback();
 							}
+							invalidResolveResults.add(key);
 							err.message += `\nwhile resolving '${path}' in ${context} to a directory`;
 							return callback(err);
 						}
@@ -1239,12 +1247,12 @@ class FileSystemInfo {
 					}
 					resolveResults.set(key, undefined);
 					resolve(context, path, resolverContext, (err, result) => {
-						if (expected) {
+						if (typeof expected === "string") {
 							if (result === expected) {
 								resolveResults.set(key, result);
 							} else {
 								invalidResolveResults.add(key);
-								this.logger.debug(
+								this.logger.warn(
 									`Resolving '${path}' in ${context} for build dependencies doesn't lead to expected result '${expected}', but to '${result}' instead. Resolving dependencies are ignored for this path.\n${pathToString(
 										job
 									)}`
@@ -1252,13 +1260,11 @@ class FileSystemInfo {
 							}
 						} else {
 							if (err) {
-								invalidResolveResults.add(key);
-								if (
-									err.code === "ENOENT" ||
-									err.code === "UNDECLARED_DEPENDENCY"
-								) {
+								if (expected === false) {
+									resolveResults.set(key, false);
 									return callback();
 								}
+								invalidResolveResults.add(key);
 								err.message += `\nwhile resolving '${path}' in ${context} as file\n${pathToString(
 									job
 								)}`;
@@ -1303,6 +1309,10 @@ class FileSystemInfo {
 						resolveFile(path, "f", resolveCjs);
 						break;
 					}
+					case RBDT_RESOLVE_CJS_FILE_AS_CHILD: {
+						resolveFile(path, "c", resolveCjsAsChild);
+						break;
+					}
 					case RBDT_RESOLVE_ESM_FILE: {
 						resolveFile(path, "e", resolveEsm);
 						break;
@@ -1382,11 +1392,29 @@ class FileSystemInfo {
 									const context = dirname(this.fs, path);
 									for (const modulePath of module.paths) {
 										if (childPath.startsWith(modulePath)) {
-											let request = childPath.slice(modulePath.length + 1);
+											let subPath = childPath.slice(modulePath.length + 1);
+											const packageMatch = /^(@[^\\/]+[\\/])[^\\/]+/.exec(
+												subPath
+											);
+											if (packageMatch) {
+												push({
+													type: RBDT_FILE,
+													context: undefined,
+													path:
+														modulePath +
+														childPath[modulePath.length] +
+														packageMatch[0] +
+														childPath[modulePath.length] +
+														"package.json",
+													expected: false,
+													issuer: job
+												});
+											}
+											let request = subPath.replace(/\\/g, "/");
 											if (request.endsWith(".js"))
 												request = request.slice(0, -3);
 											push({
-												type: RBDT_RESOLVE_CJS_FILE,
+												type: RBDT_RESOLVE_CJS_FILE_AS_CHILD,
 												context,
 												path: request,
 												expected: child.filename,
@@ -1517,17 +1545,32 @@ class FileSystemInfo {
 								return callback(e);
 							}
 							const depsObject = packageData.dependencies;
+							const optionalDepsObject = packageData.optionalDependencies;
+							const allDeps = new Set();
+							const optionalDeps = new Set();
 							if (typeof depsObject === "object" && depsObject) {
 								for (const dep of Object.keys(depsObject)) {
-									push({
-										type: RBDT_RESOLVE_DIRECTORY,
-										context: packagePath,
-										path: dep,
-										expected: undefined,
-										issuer: job
-									});
+									allDeps.add(dep);
 								}
 							}
+							if (
+								typeof optionalDepsObject === "object" &&
+								optionalDepsObject
+							) {
+								for (const dep of Object.keys(optionalDepsObject)) {
+									allDeps.add(dep);
+									optionalDeps.add(dep);
+								}
+							}
+							for (const dep of allDeps) {
+								push({
+									type: RBDT_RESOLVE_DIRECTORY,
+									context: packagePath,
+									path: dep,
+									expected: !optionalDeps.has(dep),
+									issuer: job
+								});
+							}
 							callback();
 						});
 						break;
@@ -1555,13 +1598,14 @@ class FileSystemInfo {
 	}
 
 	/**
-	 * @param {Map<string, string>} resolveResults results from resolving
+	 * @param {Map<string, string | false>} resolveResults results from resolving
 	 * @param {function(Error=, boolean=): void} callback callback with true when resolveResults resolve the same way
 	 * @returns {void}
 	 */
 	checkResolveResultsValid(resolveResults, callback) {
 		const {
 			resolveCjs,
+			resolveCjsAsChild,
 			resolveEsm,
 			resolveContext
 		} = this._createBuildDependenciesResolvers();
@@ -1573,6 +1617,8 @@ class FileSystemInfo {
 				switch (type) {
 					case "d":
 						resolveContext(context, path, {}, (err, result) => {
+							if (expectedResult === false)
+								return callback(err ? undefined : INVALID);
 							if (err) return callback(err);
 							if (result !== expectedResult) return callback(INVALID);
 							callback();
@@ -1580,6 +1626,17 @@ class FileSystemInfo {
 						break;
 					case "f":
 						resolveCjs(context, path, {}, (err, result) => {
+							if (expectedResult === false)
+								return callback(err ? undefined : INVALID);
+							if (err) return callback(err);
+							if (result !== expectedResult) return callback(INVALID);
+							callback();
+						});
+						break;
+					case "c":
+						resolveCjsAsChild(context, path, {}, (err, result) => {
+							if (expectedResult === false)
+								return callback(err ? undefined : INVALID);
 							if (err) return callback(err);
 							if (result !== expectedResult) return callback(INVALID);
 							callback();
@@ -1587,6 +1644,8 @@ class FileSystemInfo {
 						break;
 					case "e":
 						resolveEsm(context, path, {}, (err, result) => {
+							if (expectedResult === false)
+								return callback(err ? undefined : INVALID);
 							if (err) return callback(err);
 							if (result !== expectedResult) return callback(INVALID);
 							callback();

package/lib/FlagDependencyExportsPlugin.js

@@ -119,6 +119,7 @@ class FlagDependencyExportsPlugin {
 									const exports = exportDesc.exports;
 									const globalCanMangle = exportDesc.canMangle;
 									const globalFrom = exportDesc.from;
+									const globalPriority = exportDesc.priority;
 									const globalTerminalBinding =
 										exportDesc.terminalBinding || false;
 									const exportDeps = exportDesc.dependencies;
@@ -135,7 +136,8 @@ class FlagDependencyExportsPlugin {
 												globalCanMangle,
 												exportDesc.excludeExports,
 												globalFrom && dep,
-												globalFrom
+												globalFrom,
+												globalPriority
 											)
 										) {
 											changed = true;
@@ -154,6 +156,7 @@ class FlagDependencyExportsPlugin {
 												let exports = undefined;
 												let from = globalFrom;
 												let fromExport = undefined;
+												let priority = globalPriority;
 												let hidden = false;
 												if (typeof exportNameOrSpec === "string") {
 													name = exportNameOrSpec;
@@ -167,6 +170,8 @@ class FlagDependencyExportsPlugin {
 														exports = exportNameOrSpec.exports;
 													if (exportNameOrSpec.from !== undefined)
 														from = exportNameOrSpec.from;
+													if (exportNameOrSpec.priority !== undefined)
+														priority = exportNameOrSpec.priority;
 													if (exportNameOrSpec.terminalBinding !== undefined)
 														terminalBinding = exportNameOrSpec.terminalBinding;
 													if (exportNameOrSpec.hidden !== undefined)
@@ -174,7 +179,10 @@ class FlagDependencyExportsPlugin {
 												}
 												const exportInfo = exportsInfo.getExportInfo(name);
 
-												if (exportInfo.provided === false) {
+												if (
+													exportInfo.provided === false ||
+													exportInfo.provided === null
+												) {
 													exportInfo.provided = true;
 													changed = true;
 												}
@@ -204,7 +212,8 @@ class FlagDependencyExportsPlugin {
 														: exportInfo.setTarget(
 																dep,
 																from,
-																fromExport === undefined ? [name] : fromExport
+																fromExport === undefined ? [name] : fromExport,
+																priority
 														  ))
 												) {
 													changed = true;

package/lib/cache/PackFileCacheStrategy.js

@@ -29,7 +29,7 @@ class PackContainer {
 	 * @param {string} version version identifier
 	 * @param {Snapshot} buildSnapshot snapshot of all build dependencies
 	 * @param {Set<string>} buildDependencies list of all unresolved build dependencies captured
-	 * @param {Map<string, string>} resolveResults result of the resolved build dependencies
+	 * @param {Map<string, string | false>} resolveResults result of the resolved build dependencies
 	 * @param {Snapshot} resolveBuildDependenciesSnapshot snapshot of the dependencies of the build dependencies resolving
 	 */
 	constructor(
@@ -809,7 +809,7 @@ class PackFileCacheStrategy {
 		this.newBuildDependencies = new LazySet();
 		/** @type {Snapshot} */
 		this.resolveBuildDependenciesSnapshot = undefined;
-		/** @type {Map<string, string>} */
+		/** @type {Map<string, string | false>} */
 		this.resolveResults = undefined;
 		/** @type {Snapshot} */
 		this.buildSnapshot = undefined;
@@ -838,7 +838,7 @@ class PackFileCacheStrategy {
 		let newBuildDependencies;
 		/** @type {Snapshot} */
 		let resolveBuildDependenciesSnapshot;
-		/** @type {Map<string, string>} */
+		/** @type {Map<string, string | false>} */
 		let resolveResults;
 		logger.time("restore cache container");
 		return this.fileSerializer

package/lib/config/defaults.js

@@ -117,6 +117,7 @@ const A = (obj, prop, factory) => {
  */
 const applyWebpackOptionsBaseDefaults = options => {
 	F(options, "context", () => process.cwd());
+	applyInfrastructureLoggingDefaults(options.infrastructureLogging);
 };
 
 /**
@@ -235,8 +236,6 @@ const applyWebpackOptionsDefaults = options => {
 		getResolveLoaderDefaults({ cache }),
 		options.resolveLoader
 	);
-
-	applyInfrastructureLoggingDefaults(options.infrastructureLogging);
 };
 
 /**
@@ -1077,8 +1076,14 @@ const getResolveLoaderDefaults = ({ cache }) => {
  * @returns {void}
  */
 const applyInfrastructureLoggingDefaults = infrastructureLogging => {
+	F(infrastructureLogging, "stream", () => process.stderr);
+	const tty =
+		/** @type {any} */ (infrastructureLogging.stream).isTTY &&
+		process.env.TERM !== "dumb";
 	D(infrastructureLogging, "level", "info");
 	D(infrastructureLogging, "debug", false);
+	D(infrastructureLogging, "colors", tty);
+	D(infrastructureLogging, "appendOnly", !tty);
 };
 
 exports.applyWebpackOptionsBaseDefaults = applyWebpackOptionsBaseDefaults;

package/lib/dependencies/HarmonyExportExpressionDependency.js

@@ -39,6 +39,7 @@ class HarmonyExportExpressionDependency extends NullDependency {
 	getExports(moduleGraph) {
 		return {
 			exports: ["default"],
+			priority: 1,
 			terminalBinding: true,
 			dependencies: undefined
 		};

package/lib/dependencies/HarmonyExportImportedSpecifierDependency.js

@@ -543,6 +543,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 						export: item.ids,
 						hidden: item.hidden
 					})),
+					priority: 1,
 					dependencies: [from.module]
 				};
 			}
@@ -557,6 +558,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 								export: ["default"]
 							}
 						],
+						priority: 1,
 						dependencies: [from.module]
 					};
 				}
@@ -584,6 +586,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 							]
 						}
 					],
+					priority: 1,
 					dependencies: [from.module]
 				};
 			}
@@ -597,6 +600,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 							export: null
 						}
 					],
+					priority: 1,
 					dependencies: [from.module]
 				};
 			}
@@ -610,6 +614,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 							export: ["default"]
 						}
 					],
+					priority: 1,
 					dependencies: [from.module]
 				};
 			}

package/lib/dependencies/HarmonyExportSpecifierDependency.js

@@ -35,6 +35,7 @@ class HarmonyExportSpecifierDependency extends NullDependency {
 	getExports(moduleGraph) {
 		return {
 			exports: [this.name],
+			priority: 1,
 			terminalBinding: true,
 			dependencies: undefined
 		};

package/lib/hmr/HotModuleReplacement.runtime.js

@@ -101,6 +101,7 @@ module.exports = function () {
 	}
 
 	function createModuleHotObject(moduleId, me) {
+		var _main = currentChildModule !== moduleId;
 		var hot = {
 			// private stuff
 			_acceptedDependencies: {},
@@ -110,10 +111,10 @@ module.exports = function () {
 			_selfDeclined: false,
 			_selfInvalidated: false,
 			_disposeHandlers: [],
-			_main: currentChildModule !== moduleId,
+			_main: _main,
 			_requireSelf: function () {
 				currentParents = me.parents.slice();
-				currentChildModule = moduleId;
+				currentChildModule = _main ? undefined : moduleId;
 				__webpack_require__(moduleId);
 			},
 

package/lib/hmr/JavascriptHotModuleReplacement.runtime.js

@@ -207,7 +207,7 @@ module.exports = function () {
 			var module = $moduleCache$[outdatedModuleId];
 			if (
 				module &&
-				module.hot._selfAccepted &&
+				(module.hot._selfAccepted || module.hot._main) &&
 				// removed self-accepted modules should not be required
 				appliedUpdate[outdatedModuleId] !== warnUnexpectedRequire &&
 				// when called invalidate self-accepting is not possible

package/lib/logging/createConsoleLogger.js

@@ -13,11 +13,29 @@ const { LogType } = require("./Logger");
 
 /** @typedef {function(string): boolean} FilterFunction */
 
+/**
+ * @typedef {Object} LoggerConsole
+ * @property {function(): void} clear
+ * @property {function(): void} trace
+ * @property {(...args: any[]) => void} info
+ * @property {(...args: any[]) => void} log
+ * @property {(...args: any[]) => void} warn
+ * @property {(...args: any[]) => void} error
+ * @property {(...args: any[]) => void=} debug
+ * @property {(...args: any[]) => void=} group
+ * @property {(...args: any[]) => void=} groupCollapsed
+ * @property {(...args: any[]) => void=} groupEnd
+ * @property {(...args: any[]) => void=} status
+ * @property {(...args: any[]) => void=} profile
+ * @property {(...args: any[]) => void=} profileEnd
+ * @property {(...args: any[]) => void=} logTime
+ */
+
 /**
  * @typedef {Object} LoggerOptions
  * @property {false|true|"none"|"error"|"warn"|"info"|"log"|"verbose"} level loglevel
  * @property {FilterTypes|boolean} debug filter for debug logging
- * @property {Console & { status?: Function, logTime?: Function }} console the console to log to
+ * @property {LoggerConsole} console the console to log to
  */
 
 /**

package/lib/node/NodeEnvironmentPlugin.js

@@ -11,11 +11,16 @@ const createConsoleLogger = require("../logging/createConsoleLogger");
 const NodeWatchFileSystem = require("./NodeWatchFileSystem");
 const nodeConsole = require("./nodeConsole");
 
+/** @typedef {import("../../declarations/WebpackOptions").InfrastructureLogging} InfrastructureLogging */
 /** @typedef {import("../Compiler")} Compiler */
 
 class NodeEnvironmentPlugin {
+	/**
+	 * @param {Object} options options
+	 * @param {InfrastructureLogging} options.infrastructureLogging infrastructure logging options
+	 */
 	constructor(options) {
-		this.options = options || {};
+		this.options = options;
 	}
 
 	/**
@@ -24,16 +29,18 @@ class NodeEnvironmentPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
-		compiler.infrastructureLogger = createConsoleLogger(
-			Object.assign(
-				{
-					level: "info",
-					debug: false,
-					console: nodeConsole
-				},
-				this.options.infrastructureLogging
-			)
-		);
+		const { infrastructureLogging } = this.options;
+		compiler.infrastructureLogger = createConsoleLogger({
+			level: infrastructureLogging.level || "info",
+			debug: infrastructureLogging.debug || false,
+			console:
+				infrastructureLogging.console ||
+				nodeConsole({
+					colors: infrastructureLogging.colors,
+					appendOnly: infrastructureLogging.appendOnly,
+					stream: infrastructureLogging.stream
+				})
+		});
 		compiler.inputFileSystem = new CachedInputFileSystem(fs, 60000);
 		const inputFileSystem = compiler.inputFileSystem;
 		compiler.outputFileSystem = fs;

package/lib/node/nodeConsole.js

@@ -8,127 +8,136 @@
 const util = require("util");
 const truncateArgs = require("../logging/truncateArgs");
 
-const tty = process.stderr.isTTY && process.env.TERM !== "dumb";
+module.exports = ({ colors, appendOnly, stream }) => {
+	let currentStatusMessage = undefined;
+	let hasStatusMessage = false;
+	let currentIndent = "";
+	let currentCollapsed = 0;
 
-let currentStatusMessage = undefined;
-let hasStatusMessage = false;
-let currentIndent = "";
-let currentCollapsed = 0;
-
-const indent = (str, prefix, colorPrefix, colorSuffix) => {
-	if (str === "") return str;
-	prefix = currentIndent + prefix;
-	if (tty) {
-		return (
-			prefix +
-			colorPrefix +
-			str.replace(/\n/g, colorSuffix + "\n" + prefix + colorPrefix) +
-			colorSuffix
-		);
-	} else {
-		return prefix + str.replace(/\n/g, "\n" + prefix);
-	}
-};
+	const indent = (str, prefix, colorPrefix, colorSuffix) => {
+		if (str === "") return str;
+		prefix = currentIndent + prefix;
+		if (colors) {
+			return (
+				prefix +
+				colorPrefix +
+				str.replace(/\n/g, colorSuffix + "\n" + prefix + colorPrefix) +
+				colorSuffix
+			);
+		} else {
+			return prefix + str.replace(/\n/g, "\n" + prefix);
+		}
+	};
 
-const clearStatusMessage = () => {
-	if (hasStatusMessage) {
-		process.stderr.write("\x1b[2K\r");
-		hasStatusMessage = false;
-	}
-};
+	const clearStatusMessage = () => {
+		if (hasStatusMessage) {
+			stream.write("\x1b[2K\r");
+			hasStatusMessage = false;
+		}
+	};
 
-const writeStatusMessage = () => {
-	if (!currentStatusMessage) return;
-	const l = process.stderr.columns;
-	const args = l
-		? truncateArgs(currentStatusMessage, l - 1)
-		: currentStatusMessage;
-	const str = args.join(" ");
-	const coloredStr = `\u001b[1m${str}\u001b[39m\u001b[22m`;
-	process.stderr.write(`\x1b[2K\r${coloredStr}`);
-	hasStatusMessage = true;
-};
+	const writeStatusMessage = () => {
+		if (!currentStatusMessage) return;
+		const l = stream.columns;
+		const args = l
+			? truncateArgs(currentStatusMessage, l - 1)
+			: currentStatusMessage;
+		const str = args.join(" ");
+		const coloredStr = `\u001b[1m${str}\u001b[39m\u001b[22m`;
+		stream.write(`\x1b[2K\r${coloredStr}`);
+		hasStatusMessage = true;
+	};
 
-const writeColored = (prefix, colorPrefix, colorSuffix) => {
-	return (...args) => {
-		if (currentCollapsed > 0) return;
-		clearStatusMessage();
-		const str = indent(util.format(...args), prefix, colorPrefix, colorSuffix);
-		process.stderr.write(str + "\n");
-		writeStatusMessage();
+	const writeColored = (prefix, colorPrefix, colorSuffix) => {
+		return (...args) => {
+			if (currentCollapsed > 0) return;
+			clearStatusMessage();
+			const str = indent(
+				util.format(...args),
+				prefix,
+				colorPrefix,
+				colorSuffix
+			);
+			stream.write(str + "\n");
+			writeStatusMessage();
+		};
 	};
-};
 
-const writeGroupMessage = writeColored(
-	"<-> ",
-	"\u001b[1m\u001b[36m",
-	"\u001b[39m\u001b[22m"
-);
+	const writeGroupMessage = writeColored(
+		"<-> ",
+		"\u001b[1m\u001b[36m",
+		"\u001b[39m\u001b[22m"
+	);
 
-const writeGroupCollapsedMessage = writeColored(
-	"<+> ",
-	"\u001b[1m\u001b[36m",
-	"\u001b[39m\u001b[22m"
-);
+	const writeGroupCollapsedMessage = writeColored(
+		"<+> ",
+		"\u001b[1m\u001b[36m",
+		"\u001b[39m\u001b[22m"
+	);
 
-module.exports = {
-	log: writeColored("    ", "\u001b[1m", "\u001b[22m"),
-	debug: writeColored("    ", "", ""),
-	trace: writeColored("    ", "", ""),
-	info: writeColored("<i> ", "\u001b[1m\u001b[32m", "\u001b[39m\u001b[22m"),
-	warn: writeColored("<w> ", "\u001b[1m\u001b[33m", "\u001b[39m\u001b[22m"),
-	error: writeColored("<e> ", "\u001b[1m\u001b[31m", "\u001b[39m\u001b[22m"),
-	logTime: writeColored("<t> ", "\u001b[1m\u001b[35m", "\u001b[39m\u001b[22m"),
-	group: (...args) => {
-		writeGroupMessage(...args);
-		if (currentCollapsed > 0) {
+	return {
+		log: writeColored("    ", "\u001b[1m", "\u001b[22m"),
+		debug: writeColored("    ", "", ""),
+		trace: writeColored("    ", "", ""),
+		info: writeColored("<i> ", "\u001b[1m\u001b[32m", "\u001b[39m\u001b[22m"),
+		warn: writeColored("<w> ", "\u001b[1m\u001b[33m", "\u001b[39m\u001b[22m"),
+		error: writeColored("<e> ", "\u001b[1m\u001b[31m", "\u001b[39m\u001b[22m"),
+		logTime: writeColored(
+			"<t> ",
+			"\u001b[1m\u001b[35m",
+			"\u001b[39m\u001b[22m"
+		),
+		group: (...args) => {
+			writeGroupMessage(...args);
+			if (currentCollapsed > 0) {
+				currentCollapsed++;
+			} else {
+				currentIndent += "  ";
+			}
+		},
+		groupCollapsed: (...args) => {
+			writeGroupCollapsedMessage(...args);
 			currentCollapsed++;
-		} else {
-			currentIndent += "  ";
-		}
-	},
-	groupCollapsed: (...args) => {
-		writeGroupCollapsedMessage(...args);
-		currentCollapsed++;
-	},
-	groupEnd: () => {
-		if (currentCollapsed > 0) currentCollapsed--;
-		else if (currentIndent.length >= 2)
-			currentIndent = currentIndent.slice(0, currentIndent.length - 2);
-	},
-	// eslint-disable-next-line node/no-unsupported-features/node-builtins
-	profile: console.profile && (name => console.profile(name)),
-	// eslint-disable-next-line node/no-unsupported-features/node-builtins
-	profileEnd: console.profileEnd && (name => console.profileEnd(name)),
-	clear:
-		tty &&
+		},
+		groupEnd: () => {
+			if (currentCollapsed > 0) currentCollapsed--;
+			else if (currentIndent.length >= 2)
+				currentIndent = currentIndent.slice(0, currentIndent.length - 2);
+		},
 		// eslint-disable-next-line node/no-unsupported-features/node-builtins
-		console.clear &&
-		(() => {
-			clearStatusMessage();
+		profile: console.profile && (name => console.profile(name)),
+		// eslint-disable-next-line node/no-unsupported-features/node-builtins
+		profileEnd: console.profileEnd && (name => console.profileEnd(name)),
+		clear:
+			!appendOnly &&
 			// eslint-disable-next-line node/no-unsupported-features/node-builtins
-			console.clear();
-			writeStatusMessage();
-		}),
-	status: tty
-		? (name, ...args) => {
-				args = args.filter(Boolean);
-				if (name === undefined && args.length === 0) {
-					clearStatusMessage();
-					currentStatusMessage = undefined;
-				} else if (
-					typeof name === "string" &&
-					name.startsWith("[webpack.Progress] ")
-				) {
-					currentStatusMessage = [name.slice(19), ...args];
-					writeStatusMessage();
-				} else if (name === "[webpack.Progress]") {
-					currentStatusMessage = [...args];
-					writeStatusMessage();
-				} else {
-					currentStatusMessage = [name, ...args];
-					writeStatusMessage();
-				}
-		  }
-		: writeColored("<s> ", "", "")
+			console.clear &&
+			(() => {
+				clearStatusMessage();
+				// eslint-disable-next-line node/no-unsupported-features/node-builtins
+				console.clear();
+				writeStatusMessage();
+			}),
+		status: appendOnly
+			? writeColored("<s> ", "", "")
+			: (name, ...args) => {
+					args = args.filter(Boolean);
+					if (name === undefined && args.length === 0) {
+						clearStatusMessage();
+						currentStatusMessage = undefined;
+					} else if (
+						typeof name === "string" &&
+						name.startsWith("[webpack.Progress] ")
+					) {
+						currentStatusMessage = [name.slice(19), ...args];
+						writeStatusMessage();
+					} else if (name === "[webpack.Progress]") {
+						currentStatusMessage = [...args];
+						writeStatusMessage();
+					} else {
+						currentStatusMessage = [name, ...args];
+						writeStatusMessage();
+					}
+			  }
+	};
 };

package/lib/util/runtime.js

@@ -347,7 +347,7 @@ const subtractRuntime = (a, b) => {
 		return undefined;
 	} else if (typeof a === "string") {
 		if (typeof b === "string") {
-			return undefined;
+			return a;
 		} else if (b.has(a)) {
 			return undefined;
 		} else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "5.30.0",
+  "version": "5.31.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",
@@ -53,7 +53,7 @@
     "es5-ext": "^0.10.53",
     "es6-promise-polyfill": "^1.2.0",
     "eslint": "^7.14.0",
-    "eslint-config-prettier": "^7.0.0",
+    "eslint-config-prettier": "^8.1.0",
     "eslint-plugin-jest": "^24.1.3",
     "eslint-plugin-jsdoc": "^32.0.2",
     "eslint-plugin-node": "^11.0.0",

package/schemas/WebpackOptions.json

@@ -1211,6 +1211,18 @@
       "type": "object",
       "additionalProperties": false,
       "properties": {
+        "appendOnly": {
+          "description": "Only appends lines to the output. Avoids updating existing output e. g. for status messages. This option is only used when no custom console is provided.",
+          "type": "boolean"
+        },
+        "colors": {
+          "description": "Enables/Disables colorful output. This option is only used when no custom console is provided.",
+          "type": "boolean"
+        },
+        "console": {
+          "description": "Custom console used for logging.",
+          "tsType": "Console"
+        },
         "debug": {
           "description": "Enable debug logging for specific loggers.",
           "anyOf": [
@@ -1226,6 +1238,10 @@
         "level": {
           "description": "Log level.",
           "enum": ["none", "error", "warn", "info", "log", "verbose"]
+        },
+        "stream": {
+          "description": "Stream used for logging output. Defaults to process.stderr. This option is only used when no custom console is provided.",
+          "tsType": "NodeJS.WritableStream"
         }
       }
     },

package/types.d.ts

@@ -3197,9 +3197,10 @@ declare abstract class ExportInfo {
 	setUsed(newValue: UsageStateType, runtime: RuntimeSpec): boolean;
 	unsetTarget(key?: any): boolean;
 	setTarget(
-		key?: any,
-		connection?: ModuleGraphConnection,
-		exportName?: string[]
+		key: any,
+		connection: ModuleGraphConnection,
+		exportName?: string[],
+		priority?: number
 	): boolean;
 	getUsed(runtime: RuntimeSpec): UsageStateType;
 
@@ -3303,6 +3304,11 @@ declare interface ExportSpec {
 	 */
 	export?: null | string[];
 
+	/**
+	 * when reexported: with which priority
+	 */
+	priority?: number;
+
 	/**
 	 * export is not visible, because another export blends over it
 	 */
@@ -3327,7 +3333,8 @@ declare abstract class ExportsInfo {
 		canMangle?: boolean,
 		excludeExports?: Set<string>,
 		targetKey?: any,
-		targetModule?: ModuleGraphConnection
+		targetModule?: ModuleGraphConnection,
+		priority?: number
 	): boolean;
 	setUsedInUnknownWay(runtime: RuntimeSpec): boolean;
 	setUsedWithoutInfo(runtime: RuntimeSpec): boolean;
@@ -3376,6 +3383,11 @@ declare interface ExportsSpec {
 	 */
 	from?: ModuleGraphConnection;
 
+	/**
+	 * when reexported: with which priority
+	 */
+	priority?: number;
+
 	/**
 	 * can the export be renamed (defaults to true)
 	 */
@@ -3829,7 +3841,7 @@ declare abstract class FileSystemInfo {
 		callback: (arg0?: Error, arg1?: ResolveBuildDependenciesResult) => void
 	): void;
 	checkResolveResultsValid(
-		resolveResults: Map<string, string>,
+		resolveResults: Map<string, string | false>,
 		callback: (arg0?: Error, arg1?: boolean) => void
 	): void;
 	createSnapshot(
@@ -4184,6 +4196,21 @@ type ImportSource = undefined | null | string | SimpleLiteral | RegExpLiteral;
  * Options for infrastructure level logging.
  */
 declare interface InfrastructureLogging {
+	/**
+	 * Only appends lines to the output. Avoids updating existing output e. g. for status messages. This option is only used when no custom console is provided.
+	 */
+	appendOnly?: boolean;
+
+	/**
+	 * Enables/Disables colorful output. This option is only used when no custom console is provided.
+	 */
+	colors?: boolean;
+
+	/**
+	 * Custom console used for logging.
+	 */
+	console?: Console;
+
 	/**
 	 * Enable debug logging for specific loggers.
 	 */
@@ -4198,6 +4225,11 @@ declare interface InfrastructureLogging {
 	 * Log level.
 	 */
 	level?: "none" | "verbose" | "error" | "warn" | "info" | "log";
+
+	/**
+	 * Stream used for logging output. Defaults to process.stderr. This option is only used when no custom console is provided.
+	 */
+	stream?: NodeJS.WritableStream;
 }
 declare abstract class InitFragment {
 	content: string | Source;
@@ -6493,8 +6525,18 @@ declare class NoEmitOnErrorsPlugin {
 	apply(compiler: Compiler): void;
 }
 declare class NodeEnvironmentPlugin {
-	constructor(options?: any);
-	options: any;
+	constructor(options: {
+		/**
+		 * infrastructure logging options
+		 */
+		infrastructureLogging: InfrastructureLogging;
+	});
+	options: {
+		/**
+		 * infrastructure logging options
+		 */
+		infrastructureLogging: InfrastructureLogging;
+	};
 
 	/**
 	 * Apply the plugin
@@ -8333,7 +8375,7 @@ declare interface ResolveBuildDependenciesResult {
 	/**
 	 * stored resolve results
 	 */
-	resolveResults: Map<string, string>;
+	resolveResults: Map<string, string | false>;
 
 	/**
 	 * dependencies of the resolving