webpack 5.20.1 → 5.21.2

package/lib/APIPlugin.js

@@ -33,6 +33,12 @@ const REPLACEMENTS = {
 		type: "string",
 		assign: true
 	},
+	__webpack_base_uri__: {
+		expr: RuntimeGlobals.baseURI,
+		req: [RuntimeGlobals.baseURI],
+		type: "string",
+		assign: true
+	},
 	__webpack_modules__: {
 		expr: RuntimeGlobals.moduleFactories,
 		req: [RuntimeGlobals.moduleFactories],

package/lib/Compilation.js

@@ -1872,6 +1872,7 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
 				});
 			}
 
+			this.processDependenciesQueue.invalidate(module);
 			this.processModuleDependencies(module, err => {
 				if (err) return callback(err);
 				this.removeReasonsOfDependencyBlock(module, {

package/lib/Generator.js

@@ -28,6 +28,7 @@
  * @property {RuntimeSpec} runtime the runtime
  * @property {ConcatenationScope=} concatenationScope when in concatenated module, information about other concatenated modules
  * @property {string} type which kind of code should be generated
+ * @property {function(): Map<string, any>=} getData get access to the code generation data
  */
 
 /**

package/lib/ModuleDependencyError.js

@@ -21,12 +21,21 @@ class ModuleDependencyError extends WebpackError {
 		super(err.message);
 
 		this.name = "ModuleDependencyError";
-		this.details = err.stack.split("\n").slice(1).join("\n");
+		this.details =
+			err && !(/** @type {any} */ (err).hideStack)
+				? err.stack.split("\n").slice(1).join("\n")
+				: undefined;
 		this.module = module;
 		this.loc = loc;
+		/** error is not (de)serialized, so it might be undefined after deserialization */
 		this.error = err;
 
 		Error.captureStackTrace(this, this.constructor);
+
+		if (err && /** @type {any} */ (err).hideStack) {
+			this.stack =
+				err.stack.split("\n").slice(1).join("\n") + "\n\n" + this.stack;
+		}
 	}
 }
 

package/lib/ModuleDependencyWarning.js

@@ -21,13 +21,21 @@ class ModuleDependencyWarning extends WebpackError {
 		super(err ? err.message : "");
 
 		this.name = "ModuleDependencyWarning";
-		this.details = err && err.stack.split("\n").slice(1).join("\n");
+		this.details =
+			err && !(/** @type {any} */ (err).hideStack)
+				? err.stack.split("\n").slice(1).join("\n")
+				: undefined;
 		this.module = module;
 		this.loc = loc;
 		/** error is not (de)serialized, so it might be undefined after deserialization */
 		this.error = err;
 
 		Error.captureStackTrace(this, this.constructor);
+
+		if (err && /** @type {any} */ (err).hideStack) {
+			this.stack =
+				err.stack.split("\n").slice(1).join("\n") + "\n\n" + this.stack;
+		}
 	}
 }
 

package/lib/MultiStats.js

@@ -7,7 +7,10 @@
 
 const identifierUtils = require("./util/identifier");
 
+/** @typedef {import("../declarations/WebpackOptions").StatsOptions} StatsOptions */
 /** @typedef {import("./Stats")} Stats */
+/** @typedef {import("./stats/DefaultStatsFactoryPlugin").KnownStatsCompilation} KnownStatsCompilation */
+/** @typedef {import("./stats/DefaultStatsFactoryPlugin").StatsCompilation} StatsCompilation */
 
 const indent = (str, prefix) => {
 	const rem = str.replace(/\n([^\n])/g, "\n" + prefix + "$1");
@@ -70,8 +73,13 @@ class MultiStats {
 		};
 	}
 
+	/**
+	 * @param {any} options stats options
+	 * @returns {StatsCompilation} json output
+	 */
 	toJson(options) {
 		options = this._createChildOptions(options, { forToString: false });
+		/** @type {KnownStatsCompilation} */
 		const obj = {};
 		obj.children = this.stats.map((stat, idx) => {
 			const obj = stat.toJson(options.children[idx]);

package/lib/NoModeWarning.js

@@ -8,13 +8,13 @@
 const WebpackError = require("./WebpackError");
 
 module.exports = class NoModeWarning extends WebpackError {
-	constructor(modules) {
+	constructor() {
 		super();
 
 		this.name = "NoModeWarning";
 		this.message =
 			"configuration\n" +
-			"The 'mode' option has not been set, webpack will fallback to 'production' for this value. " +
+			"The 'mode' option has not been set, webpack will fallback to 'production' for this value.\n" +
 			"Set 'mode' option to 'development' or 'production' to enable defaults for each environment.\n" +
 			"You can also set it to 'none' to disable any default behavior. " +
 			"Learn more: https://webpack.js.org/configuration/mode/";

package/lib/NormalModule.js

@@ -993,6 +993,13 @@ class NormalModule extends Module {
 			runtimeRequirements.add(RuntimeGlobals.thisAsExports);
 		}
 
+		/** @type {Map<string, any>} */
+		let data;
+		const getData = () => {
+			if (data === undefined) data = new Map();
+			return data;
+		};
+
 		const sources = new Map();
 		for (const type of this.generator.getTypes(this)) {
 			const source = this.error
@@ -1007,6 +1014,7 @@ class NormalModule extends Module {
 						runtimeRequirements,
 						runtime,
 						concatenationScope,
+						getData,
 						type
 				  });
 
@@ -1018,7 +1026,8 @@ class NormalModule extends Module {
 		/** @type {CodeGenerationResult} */
 		const resultEntry = {
 			sources,
-			runtimeRequirements
+			runtimeRequirements,
+			data
 		};
 		return resultEntry;
 	}

package/lib/RuntimePlugin.js

@@ -47,6 +47,7 @@ const GLOBALS_ON_REQUIRE = [
 	RuntimeGlobals.moduleFactoriesAddOnly,
 	RuntimeGlobals.interceptModuleExecution,
 	RuntimeGlobals.publicPath,
+	RuntimeGlobals.baseURI,
 	RuntimeGlobals.scriptNonce,
 	RuntimeGlobals.uncaughtErrorHandler,
 	RuntimeGlobals.asyncModule,

package/lib/Stats.js

@@ -5,7 +5,9 @@
 
 "use strict";
 
+/** @typedef {import("../declarations/WebpackOptions").StatsOptions} StatsOptions */
 /** @typedef {import("./Compilation")} Compilation */
+/** @typedef {import("./stats/DefaultStatsFactoryPlugin").StatsCompilation} StatsCompilation */
 
 class Stats {
 	/**
@@ -47,6 +49,10 @@ class Stats {
 		);
 	}
 
+	/**
+	 * @param {(string|StatsOptions)=} options stats options
+	 * @returns {StatsCompilation} json output
+	 */
 	toJson(options) {
 		options = this.compilation.createStatsOptions(options, {
 			forToString: false

package/lib/asset/AssetGenerator.js

@@ -47,7 +47,7 @@ class AssetGenerator extends Generator {
 	 */
 	generate(
 		module,
-		{ runtime, chunkGraph, runtimeTemplate, runtimeRequirements, type }
+		{ runtime, chunkGraph, runtimeTemplate, runtimeRequirements, type, getData }
 	) {
 		switch (type) {
 			case "asset":
@@ -146,6 +146,15 @@ class AssetGenerator extends Generator {
 						sourceFilename,
 						...info
 					};
+					if (getData) {
+						// Due to code generation caching module.buildInfo.XXX can't used to store such information
+						// It need to be stored in the code generation results instead, where it's cached too
+						// TODO webpack 6 For back-compat reasons we also store in on module.buildInfo
+						const data = getData();
+						data.set("fullContentHash", fullHash);
+						data.set("filename", filename);
+						data.set("assetInfo", info);
+					}
 
 					runtimeRequirements.add(RuntimeGlobals.publicPath); // add __webpack_require__.p
 

package/lib/asset/AssetModulesPlugin.js

@@ -145,14 +145,23 @@ class AssetModulesPlugin {
 					);
 					if (modules) {
 						for (const module of modules) {
+							const codeGenResult = codeGenerationResults.get(
+								module,
+								chunk.runtime
+							);
 							result.push({
-								render: () =>
-									codeGenerationResults.getSource(module, chunk.runtime, type),
-								filename: module.buildInfo.filename,
-								info: module.buildInfo.assetInfo,
+								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
+								hash:
+									module.buildInfo.fullContentHash ||
+									codeGenResult.data.get("fullContentHash")
 							});
 						}
 					}

package/lib/cache/IdleFileCachePlugin.js

@@ -127,9 +127,15 @@ class IdleFileCachePlugin {
 					});
 					return;
 				}
-				currentIdlePromise = currentIdlePromise.then(() =>
-					strategy.afterAllStored()
-				);
+				currentIdlePromise = currentIdlePromise
+					.then(() => strategy.afterAllStored())
+					.catch(err => {
+						const logger = compiler.getInfrastructureLogger(
+							"IdleFileCachePlugin"
+						);
+						logger.warn(`Background tasks during idle failed: ${err.message}`);
+						logger.debug(err.stack);
+					});
 				isInitialStore = false;
 			}
 		};

package/lib/config/defaults.js

@@ -275,6 +275,7 @@ const applyCacheDefaults = (cache, { name, mode }) => {
 						dir = undefined;
 						break;
 					}
+					dir = parent;
 				}
 				if (!dir) {
 					return path.resolve(cwd, ".cache/webpack");

package/lib/dependencies/HarmonyImportDependency.js

@@ -128,9 +128,11 @@ class HarmonyImportDependency extends ModuleDependency {
 					if (exportInfo.provided === false) {
 						// We are sure that it's not provided
 						const providedExports = exportsInfo.getProvidedExports();
-						const moreInfo = Array.isArray(providedExports)
-							? ` (possible exports: ${providedExports.join(", ")})`
-							: " (possible exports unknown)";
+						const moreInfo = !Array.isArray(providedExports)
+							? " (possible exports unknown)"
+							: providedExports.length === 0
+							? " (module has no exports)"
+							: ` (possible exports: ${providedExports.join(", ")})`;
 						return [
 							new HarmonyLinkingError(
 								`export ${ids

package/lib/dependencies/HarmonyImportSpecifierDependency.js

@@ -111,7 +111,9 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 	 */
 	getReferencedExports(moduleGraph, runtime) {
 		let ids = this.getIds(moduleGraph);
-		if (ids.length > 0 && ids[0] === "default") {
+		if (ids.length === 0) return Dependency.EXPORTS_OBJECT_REFERENCED;
+		let namespaceObjectAsContext = this.namespaceObjectAsContext;
+		if (ids[0] === "default") {
 			const selfModule = moduleGraph.getParentModule(this);
 			const importedModule = moduleGraph.getModule(this);
 			switch (
@@ -124,13 +126,18 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 				case "default-with-named":
 					if (ids.length === 1) return Dependency.EXPORTS_OBJECT_REFERENCED;
 					ids = ids.slice(1);
+					namespaceObjectAsContext = true;
 					break;
 				case "dynamic":
 					return Dependency.EXPORTS_OBJECT_REFERENCED;
 			}
 		}
 
-		if (this.namespaceObjectAsContext) {
+		if (
+			this.call &&
+			!this.directImport &&
+			(namespaceObjectAsContext || ids.length > 1)
+		) {
 			if (ids.length === 1) return Dependency.EXPORTS_OBJECT_REFERENCED;
 			ids = ids.slice(0, -1);
 		}

package/lib/index.js

@@ -26,6 +26,7 @@ const memoize = require("./util/memoize");
 /** @typedef {import("./Compilation").Asset} Asset */
 /** @typedef {import("./Compilation").AssetInfo} AssetInfo */
 /** @typedef {import("./Parser").ParserState} ParserState */
+/** @typedef {import("./stats/DefaultStatsFactoryPlugin").StatsCompilation} StatsCompilation */
 
 /**
  * @template {Function} T

package/lib/json/JsonGenerator.js

@@ -38,14 +38,13 @@ const stringifySafe = data => {
 const createObjectForExportsInfo = (data, exportsInfo, runtime) => {
 	if (exportsInfo.otherExportsInfo.getUsed(runtime) !== UsageState.Unused)
 		return data;
-	const reducedData = Array.isArray(data) ? [] : {};
-	for (const exportInfo of exportsInfo.exports) {
-		if (exportInfo.name in reducedData) return data;
-	}
+	const isArray = Array.isArray(data);
+	const reducedData = isArray ? [] : {};
 	for (const key of Object.keys(data)) {
 		const exportInfo = exportsInfo.getReadOnlyExportInfo(key);
 		const used = exportInfo.getUsed(runtime);
 		if (used === UsageState.Unused) continue;
+
 		let value;
 		if (used === UsageState.OnlyPropertiesUsed && exportInfo.exportsInfo) {
 			value = createObjectForExportsInfo(
@@ -59,7 +58,13 @@ const createObjectForExportsInfo = (data, exportsInfo, runtime) => {
 		const name = exportInfo.getUsedName(key, runtime);
 		reducedData[name] = value;
 	}
-	if (Array.isArray(reducedData)) {
+	if (isArray) {
+		let arrayLengthWhenUsed =
+			exportsInfo.getReadOnlyExportInfo("length").getUsed(runtime) !==
+			UsageState.Unused
+				? data.length
+				: undefined;
+
 		let sizeObjectMinusArray = 0;
 		for (let i = 0; i < reducedData.length; i++) {
 			if (reducedData[i] === undefined) {
@@ -68,8 +73,24 @@ const createObjectForExportsInfo = (data, exportsInfo, runtime) => {
 				sizeObjectMinusArray += `${i}`.length + 3;
 			}
 		}
-		if (sizeObjectMinusArray < 0) return Object.assign({}, reducedData);
-		for (let i = 0; i < reducedData.length; i++) {
+		if (arrayLengthWhenUsed !== undefined) {
+			sizeObjectMinusArray +=
+				`${arrayLengthWhenUsed}`.length +
+				8 -
+				(arrayLengthWhenUsed - reducedData.length) * 2;
+		}
+		if (sizeObjectMinusArray < 0)
+			return Object.assign(
+				arrayLengthWhenUsed === undefined
+					? {}
+					: { length: arrayLengthWhenUsed },
+				reducedData
+			);
+		const generatedLength =
+			arrayLengthWhenUsed !== undefined
+				? Math.max(arrayLengthWhenUsed, reducedData.length)
+				: reducedData.length;
+		for (let i = 0; i < generatedLength; i++) {
 			if (reducedData[i] === undefined) {
 				reducedData[i] = 0;
 			}

package/lib/serialization/ObjectMiddleware.js

@@ -208,12 +208,14 @@ class ObjectMiddleware extends SerializerMiddleware {
 	}
 
 	static getSerializerFor(object) {
-		let c = object.constructor;
-		if (!c) {
-			if (Object.getPrototypeOf(object) === null) {
-				// Object created with Object.create(null)
-				c = null;
-			} else {
+		const proto = Object.getPrototypeOf(object);
+		let c;
+		if (proto === null) {
+			// Object created with Object.create(null)
+			c = null;
+		} else {
+			c = proto.constructor;
+			if (!c) {
 				throw new Error(
 					"Serialization of objects with prototype without valid constructor property not possible"
 				);