webpack 5.92.1 → 5.94.0

package/lib/javascript/JavascriptParserHelpers.js

@@ -21,8 +21,8 @@ const BasicEvaluatedExpression = require("./BasicEvaluatedExpression");
  * @param {(string[] | null)=} runtimeRequirements runtime requirements
  * @returns {function(Expression): true} plugin function
  */
-exports.toConstantDependency = (parser, value, runtimeRequirements) => {
-	return function constDependency(expr) {
+module.exports.toConstantDependency = (parser, value, runtimeRequirements) =>
+	function constDependency(expr) {
 		const dep = new ConstDependency(
 			value,
 			/** @type {Range} */ (expr.range),
@@ -32,43 +32,39 @@ exports.toConstantDependency = (parser, value, runtimeRequirements) => {
 		parser.state.module.addPresentationalDependency(dep);
 		return true;
 	};
-};
 
 /**
  * @param {string} value the string value
  * @returns {function(Expression): BasicEvaluatedExpression} plugin function
  */
-exports.evaluateToString = value => {
-	return function stringExpression(expr) {
+module.exports.evaluateToString = value =>
+	function stringExpression(expr) {
 		return new BasicEvaluatedExpression()
 			.setString(value)
 			.setRange(/** @type {Range} */ (expr.range));
 	};
-};
 
 /**
  * @param {number} value the number value
  * @returns {function(Expression): BasicEvaluatedExpression} plugin function
  */
-exports.evaluateToNumber = value => {
-	return function stringExpression(expr) {
+module.exports.evaluateToNumber = value =>
+	function stringExpression(expr) {
 		return new BasicEvaluatedExpression()
 			.setNumber(value)
 			.setRange(/** @type {Range} */ (expr.range));
 	};
-};
 
 /**
  * @param {boolean} value the boolean value
  * @returns {function(Expression): BasicEvaluatedExpression} plugin function
  */
-exports.evaluateToBoolean = value => {
-	return function booleanExpression(expr) {
+module.exports.evaluateToBoolean = value =>
+	function booleanExpression(expr) {
 		return new BasicEvaluatedExpression()
 			.setBoolean(value)
 			.setRange(/** @type {Range} */ (expr.range));
 	};
-};
 
 /**
  * @param {string} identifier identifier
@@ -77,9 +73,14 @@ exports.evaluateToBoolean = value => {
  * @param {boolean|null=} truthy is truthy, null if nullish
  * @returns {function(Expression): BasicEvaluatedExpression} callback
  */
-exports.evaluateToIdentifier = (identifier, rootInfo, getMembers, truthy) => {
-	return function identifierExpression(expr) {
-		let evaluatedExpression = new BasicEvaluatedExpression()
+module.exports.evaluateToIdentifier = (
+	identifier,
+	rootInfo,
+	getMembers,
+	truthy
+) =>
+	function identifierExpression(expr) {
+		const evaluatedExpression = new BasicEvaluatedExpression()
 			.setIdentifier(identifier, rootInfo, getMembers)
 			.setSideEffects(false)
 			.setRange(/** @type {Range} */ (expr.range));
@@ -97,15 +98,14 @@ exports.evaluateToIdentifier = (identifier, rootInfo, getMembers, truthy) => {
 
 		return evaluatedExpression;
 	};
-};
 
 /**
  * @param {JavascriptParser} parser the parser
  * @param {string} message the message
  * @returns {function(Expression): boolean | undefined} callback to handle unsupported expression
  */
-exports.expressionIsUnsupported = (parser, message) => {
-	return function unsupportedExpression(expr) {
+module.exports.expressionIsUnsupported = (parser, message) =>
+	function unsupportedExpression(expr) {
 		const dep = new ConstDependency(
 			"(void 0)",
 			/** @type {Range} */ (expr.range),
@@ -122,8 +122,7 @@ exports.expressionIsUnsupported = (parser, message) => {
 		);
 		return true;
 	};
-};
 
-exports.skipTraversal = () => true;
+module.exports.skipTraversal = () => true;
 
-exports.approve = () => true;
+module.exports.approve = () => true;

package/lib/javascript/StartupHelpers.js

@@ -15,6 +15,7 @@ const { getAllChunks } = require("./ChunkHelpers");
 /** @typedef {import("../Chunk").ChunkId} ChunkId */
 /** @typedef {import("../Compilation")} Compilation */
 /** @typedef {import("../ChunkGraph")} ChunkGraph */
+/** @typedef {import("../ChunkGraph").ModuleId} ModuleId */
 /** @typedef {import("../Entrypoint")} Entrypoint */
 /** @typedef {import("../ChunkGraph").EntryModuleWithChunkGroup} EntryModuleWithChunkGroup */
 /** @typedef {import("../ChunkGroup")} ChunkGroup */
@@ -23,6 +24,9 @@ const { getAllChunks } = require("./ChunkHelpers");
 
 const EXPORT_PREFIX = `var ${RuntimeGlobals.exports} = `;
 
+/** @typedef {Set<Chunk>} Chunks */
+/** @typedef {ModuleId[]} ModuleIds */
+
 /**
  * @param {ChunkGraph} chunkGraph chunkGraph
  * @param {RuntimeTemplate} runtimeTemplate runtimeTemplate
@@ -31,7 +35,7 @@ const EXPORT_PREFIX = `var ${RuntimeGlobals.exports} = `;
  * @param {boolean} passive true: passive startup with on chunks loaded
  * @returns {string} runtime code
  */
-exports.generateEntryStartup = (
+module.exports.generateEntryStartup = (
 	chunkGraph,
 	runtimeTemplate,
 	entries,
@@ -46,9 +50,16 @@ exports.generateEntryStartup = (
 		)}`
 	];
 
-	const runModule = id => {
-		return `__webpack_exec__(${JSON.stringify(id)})`;
-	};
+	/**
+	 * @param {ModuleId} id id
+	 * @returns {string} fn to execute
+	 */
+	const runModule = id => `__webpack_exec__(${JSON.stringify(id)})`;
+	/**
+	 * @param {Chunks} chunks chunks
+	 * @param {ModuleIds} moduleIds module ids
+	 * @param {boolean=} final true when final, otherwise false
+	 */
 	const outputCombination = (chunks, moduleIds, final) => {
 		if (chunks.size === 0) {
 			runtime.push(
@@ -71,16 +82,19 @@ exports.generateEntryStartup = (
 		}
 	};
 
-	let currentChunks = undefined;
-	let currentModuleIds = undefined;
+	/** @type {Chunks | undefined} */
+	let currentChunks;
+	/** @type {ModuleIds | undefined} */
+	let currentModuleIds;
 
 	for (const [module, entrypoint] of entries) {
 		const runtimeChunk =
 			/** @type {Entrypoint} */
 			(entrypoint).getRuntimeChunk();
-		const moduleId = chunkGraph.getModuleId(module);
+		const moduleId = /** @type {ModuleId} */ (chunkGraph.getModuleId(module));
 		const chunks = getAllChunks(
-			/** @type {Entrypoint} */ (entrypoint),
+			/** @type {Entrypoint} */
+			(entrypoint),
 			chunk,
 			runtimeChunk
 		);
@@ -89,10 +103,14 @@ exports.generateEntryStartup = (
 			currentChunks.size === chunks.size &&
 			isSubset(currentChunks, chunks)
 		) {
-			currentModuleIds.push(moduleId);
+			/** @type {ModuleIds} */
+			(currentModuleIds).push(moduleId);
 		} else {
 			if (currentChunks) {
-				outputCombination(currentChunks, currentModuleIds);
+				outputCombination(
+					currentChunks,
+					/** @type {ModuleIds} */ (currentModuleIds)
+				);
 			}
 			currentChunks = chunks;
 			currentModuleIds = [moduleId];
@@ -101,7 +119,12 @@ exports.generateEntryStartup = (
 
 	// output current modules with export prefix
 	if (currentChunks) {
-		outputCombination(currentChunks, currentModuleIds, true);
+		outputCombination(
+			currentChunks,
+			/** @type {ModuleIds} */
+			(currentModuleIds),
+			true
+		);
 	}
 	runtime.push("");
 	return Template.asString(runtime);
@@ -114,7 +137,12 @@ exports.generateEntryStartup = (
  * @param {Chunk} chunk chunk
  * @returns {void}
  */
-exports.updateHashForEntryStartup = (hash, chunkGraph, entries, chunk) => {
+module.exports.updateHashForEntryStartup = (
+	hash,
+	chunkGraph,
+	entries,
+	chunk
+) => {
 	for (const [module, entrypoint] of entries) {
 		const runtimeChunk =
 			/** @type {Entrypoint} */
@@ -137,7 +165,7 @@ exports.updateHashForEntryStartup = (hash, chunkGraph, entries, chunk) => {
  * @param {function(Chunk, ChunkGraph): boolean} filterFn filter function
  * @returns {Set<number | string>} initially fulfilled chunk ids
  */
-exports.getInitialChunkIds = (chunk, chunkGraph, filterFn) => {
+module.exports.getInitialChunkIds = (chunk, chunkGraph, filterFn) => {
 	const initialChunkIds = new Set(chunk.ids);
 	for (const c of chunk.getAllInitialChunks()) {
 		if (c === chunk || filterFn(c, chunkGraph)) continue;

package/lib/json/JsonGenerator.js

@@ -27,7 +27,7 @@ const RuntimeGlobals = require("../RuntimeGlobals");
 const stringifySafe = data => {
 	const stringified = JSON.stringify(data);
 	if (!stringified) {
-		return undefined; // Invalid JSON
+		return; // Invalid JSON
 	}
 
 	return stringified.replace(/\u2028|\u2029/g, str =>
@@ -53,22 +53,16 @@ const createObjectForExportsInfo = (data, exportsInfo, runtime) => {
 		if (used === UsageState.Unused) continue;
 
 		/** @type {RawJsonData} */
-		let value;
-		if (used === UsageState.OnlyPropertiesUsed && exportInfo.exportsInfo) {
-			value = createObjectForExportsInfo(
-				data[key],
-				exportInfo.exportsInfo,
-				runtime
-			);
-		} else {
-			value = data[key];
-		}
+		const value =
+			used === UsageState.OnlyPropertiesUsed && exportInfo.exportsInfo
+				? createObjectForExportsInfo(data[key], exportInfo.exportsInfo, runtime)
+				: data[key];
 
 		const name = /** @type {string} */ (exportInfo.getUsedName(key, runtime));
 		/** @type {Record<string, RawJsonData>} */ (reducedData)[name] = value;
 	}
 	if (isArray) {
-		let arrayLengthWhenUsed =
+		const arrayLengthWhenUsed =
 			exportsInfo.getReadOnlyExportInfo("length").getUsed(runtime) !==
 			UsageState.Unused
 				? data.length
@@ -173,7 +167,7 @@ class JsonGenerator extends Generator {
 		}
 		const exportsInfo = moduleGraph.getExportsInfo(module);
 		/** @type {RawJsonData} */
-		let finalJson =
+		const finalJson =
 			typeof data === "object" &&
 			data &&
 			exportsInfo.otherExportsInfo.getUsed(runtime) === UsageState.Unused

package/lib/json/JsonModulesPlugin.js

@@ -33,7 +33,6 @@ class JsonModulesPlugin {
 	 * Apply the plugin
 	 * @param {Compiler} compiler the compiler instance
 	 * @returns {void}
-	 *
 	 */
 	apply(compiler) {
 		compiler.hooks.compilation.tap(
@@ -48,9 +47,7 @@ class JsonModulesPlugin {
 					});
 				normalModuleFactory.hooks.createGenerator
 					.for(JSON_MODULE_TYPE)
-					.tap(PLUGIN_NAME, () => {
-						return new JsonGenerator();
-					});
+					.tap(PLUGIN_NAME, () => new JsonGenerator());
 			}
 		);
 	}

package/lib/json/JsonParser.js

@@ -49,9 +49,11 @@ class JsonParser extends Parser {
 			data =
 				typeof source === "object"
 					? source
-					: parseFn(source[0] === "\ufeff" ? source.slice(1) : source);
-		} catch (e) {
-			throw new Error(`Cannot parse JSON: ${/** @type {Error} */ (e).message}`);
+					: parseFn(source[0] === "\uFEFF" ? source.slice(1) : source);
+		} catch (err) {
+			throw new Error(
+				`Cannot parse JSON: ${/** @type {Error} */ (err).message}`
+			);
 		}
 		const jsonData = new JsonData(/** @type {Buffer | RawJsonData} */ (data));
 		const buildInfo = /** @type {BuildInfo} */ (state.module.buildInfo);

package/lib/library/AmdLibraryPlugin.js

@@ -60,17 +60,14 @@ class AmdLibraryPlugin extends AbstractLibraryPlugin {
 					`AMD library name must be unset. ${AbstractLibraryPlugin.COMMON_LIBRARY_NAME_MESSAGE}`
 				);
 			}
-		} else {
-			if (name && typeof name !== "string") {
-				throw new Error(
-					`AMD library name must be a simple string or unset. ${AbstractLibraryPlugin.COMMON_LIBRARY_NAME_MESSAGE}`
-				);
-			}
+		} else if (name && typeof name !== "string") {
+			throw new Error(
+				`AMD library name must be a simple string or unset. ${AbstractLibraryPlugin.COMMON_LIBRARY_NAME_MESSAGE}`
+			);
 		}
-		return {
-			name: /** @type {string} */ (name),
-			amdContainer: /** @type {string} */ (amdContainer)
-		};
+		const _name = /** @type {string} */ (name);
+		const _amdContainer = /** @type {string} */ (amdContainer);
+		return { name: _name, amdContainer: _amdContainer };
 	}
 
 	/**
@@ -146,13 +143,12 @@ class AmdLibraryPlugin extends AbstractLibraryPlugin {
 				source,
 				`${fnEnd});`
 			);
-		} else {
-			return new ConcatSource(
-				`${amdContainerPrefix}define(${fnStart}`,
-				source,
-				`${fnEnd});`
-			);
 		}
+		return new ConcatSource(
+			`${amdContainerPrefix}define(${fnStart}`,
+			source,
+			`${fnEnd});`
+		);
 	}
 
 	/**

package/lib/library/AssignLibraryPlugin.js

@@ -36,9 +36,8 @@ const IDENTIFIER_REGEX =
  * @param {string} name name to be validated
  * @returns {boolean} true, when valid
  */
-const isNameValid = name => {
-	return !KEYWORD_REGEX.test(name) && IDENTIFIER_REGEX.test(name);
-};
+const isNameValid = name =>
+	!KEYWORD_REGEX.test(name) && IDENTIFIER_REGEX.test(name);
 
 /**
  * @param {string[]} accessor variable plus properties
@@ -136,15 +135,14 @@ class AssignLibraryPlugin extends AbstractLibraryPlugin {
 					`Library name must be a string or string array. ${AbstractLibraryPlugin.COMMON_LIBRARY_NAME_MESSAGE}`
 				);
 			}
-		} else {
-			if (name && typeof name !== "string" && !Array.isArray(name)) {
-				throw new Error(
-					`Library name must be a string, string array or unset. ${AbstractLibraryPlugin.COMMON_LIBRARY_NAME_MESSAGE}`
-				);
-			}
+		} else if (name && typeof name !== "string" && !Array.isArray(name)) {
+			throw new Error(
+				`Library name must be a string, string array or unset. ${AbstractLibraryPlugin.COMMON_LIBRARY_NAME_MESSAGE}`
+			);
 		}
+		const _name = /** @type {string | string[]} */ (name);
 		return {
-			name: /** @type {string | string[]} */ (name),
+			name: _name,
 			export: library.export
 		};
 	}
@@ -356,7 +354,7 @@ class AssignLibraryPlugin extends AbstractLibraryPlugin {
 	 * @returns {void}
 	 */
 	runtimeRequirements(chunk, set, libraryContext) {
-		// we don't need to return exports from runtime
+		set.add(RuntimeGlobals.exports);
 	}
 
 	/**

package/lib/library/EnableLibraryPlugin.js

@@ -52,10 +52,11 @@ class EnableLibraryPlugin {
 			throw new Error(
 				`Library type "${type}" is not enabled. ` +
 					"EnableLibraryPlugin need to be used to enable this type of library. " +
-					'This usually happens through the "output.enabledLibraryTypes" option. ' +
-					'If you are using a function as entry which sets "library", you need to add all potential library types to "output.enabledLibraryTypes". ' +
-					"These types are enabled: " +
-					Array.from(getEnabledTypes(compiler)).join(", ")
+					`This usually happens through the "output.enabledLibraryTypes" option. ` +
+					`If you are using a function as entry which sets "library", you need to add all potential library types to "output.enabledLibraryTypes". ` +
+					`These types are enabled: ${Array.from(
+						getEnabledTypes(compiler)
+					).join(", ")}`
 			);
 		}
 	}
@@ -78,12 +79,13 @@ class EnableLibraryPlugin {
 				const ExportPropertyTemplatePlugin = require("./ExportPropertyLibraryPlugin");
 				new ExportPropertyTemplatePlugin({
 					type,
-					nsObjectUsed: type !== "module"
+					nsObjectUsed: !["module", "modern-module"].includes(type),
+					runtimeExportsUsed: type !== "modern-module"
 				}).apply(compiler);
 			};
 			switch (type) {
 				case "var": {
-					//@ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
+					// @ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
 					const AssignLibraryPlugin = require("./AssignLibraryPlugin");
 					new AssignLibraryPlugin({
 						type,
@@ -94,7 +96,7 @@ class EnableLibraryPlugin {
 					break;
 				}
 				case "assign-properties": {
-					//@ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
+					// @ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
 					const AssignLibraryPlugin = require("./AssignLibraryPlugin");
 					new AssignLibraryPlugin({
 						type,
@@ -106,7 +108,7 @@ class EnableLibraryPlugin {
 					break;
 				}
 				case "assign": {
-					//@ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
+					// @ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
 					const AssignLibraryPlugin = require("./AssignLibraryPlugin");
 					new AssignLibraryPlugin({
 						type,
@@ -117,7 +119,7 @@ class EnableLibraryPlugin {
 					break;
 				}
 				case "this": {
-					//@ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
+					// @ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
 					const AssignLibraryPlugin = require("./AssignLibraryPlugin");
 					new AssignLibraryPlugin({
 						type,
@@ -128,7 +130,7 @@ class EnableLibraryPlugin {
 					break;
 				}
 				case "window": {
-					//@ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
+					// @ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
 					const AssignLibraryPlugin = require("./AssignLibraryPlugin");
 					new AssignLibraryPlugin({
 						type,
@@ -139,7 +141,7 @@ class EnableLibraryPlugin {
 					break;
 				}
 				case "self": {
-					//@ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
+					// @ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
 					const AssignLibraryPlugin = require("./AssignLibraryPlugin");
 					new AssignLibraryPlugin({
 						type,
@@ -150,7 +152,7 @@ class EnableLibraryPlugin {
 					break;
 				}
 				case "global": {
-					//@ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
+					// @ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
 					const AssignLibraryPlugin = require("./AssignLibraryPlugin");
 					new AssignLibraryPlugin({
 						type,
@@ -161,7 +163,7 @@ class EnableLibraryPlugin {
 					break;
 				}
 				case "commonjs": {
-					//@ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
+					// @ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
 					const AssignLibraryPlugin = require("./AssignLibraryPlugin");
 					new AssignLibraryPlugin({
 						type,
@@ -172,7 +174,7 @@ class EnableLibraryPlugin {
 					break;
 				}
 				case "commonjs-static": {
-					//@ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
+					// @ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
 					const AssignLibraryPlugin = require("./AssignLibraryPlugin");
 					new AssignLibraryPlugin({
 						type,
@@ -184,7 +186,7 @@ class EnableLibraryPlugin {
 				}
 				case "commonjs2":
 				case "commonjs-module": {
-					//@ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
+					// @ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
 					const AssignLibraryPlugin = require("./AssignLibraryPlugin");
 					new AssignLibraryPlugin({
 						type,
@@ -238,6 +240,14 @@ class EnableLibraryPlugin {
 					}).apply(compiler);
 					break;
 				}
+				case "modern-module": {
+					enableExportProperty();
+					const ModernModuleLibraryPlugin = require("./ModernModuleLibraryPlugin");
+					new ModernModuleLibraryPlugin({
+						type
+					}).apply(compiler);
+					break;
+				}
 				default:
 					throw new Error(`Unsupported library type ${type}.
 Plugins which provide custom library types must call EnableLibraryPlugin.setEnabled(compiler, type) to disable this error.`);

package/lib/library/ExportPropertyLibraryPlugin.js

@@ -30,6 +30,7 @@ const AbstractLibraryPlugin = require("./AbstractLibraryPlugin");
  * @typedef {object} ExportPropertyLibraryPluginOptions
  * @property {LibraryType} type
  * @property {boolean} nsObjectUsed the namespace object is used
+ * @property {boolean} runtimeExportsUsed runtime exports are used
  */
 /**
  * @typedef {ExportPropertyLibraryPluginParsed} T
@@ -39,12 +40,13 @@ class ExportPropertyLibraryPlugin extends AbstractLibraryPlugin {
 	/**
 	 * @param {ExportPropertyLibraryPluginOptions} options options
 	 */
-	constructor({ type, nsObjectUsed }) {
+	constructor({ type, nsObjectUsed, runtimeExportsUsed }) {
 		super({
 			pluginName: "ExportPropertyLibraryPlugin",
 			type
 		});
 		this.nsObjectUsed = nsObjectUsed;
+		this.runtimeExportsUsed = runtimeExportsUsed;
 	}
 
 	/**
@@ -93,7 +95,11 @@ class ExportPropertyLibraryPlugin extends AbstractLibraryPlugin {
 	 * @param {LibraryContext<T>} libraryContext context
 	 * @returns {void}
 	 */
-	runtimeRequirements(chunk, set, libraryContext) {}
+	runtimeRequirements(chunk, set, libraryContext) {
+		if (this.runtimeExportsUsed) {
+			set.add(RuntimeGlobals.exports);
+		}
+	}
 
 	/**
 	 * @param {Source} source source

package/lib/library/JsonpLibraryPlugin.js

@@ -54,8 +54,9 @@ class JsonpLibraryPlugin extends AbstractLibraryPlugin {
 				`Jsonp library name must be a simple string. ${AbstractLibraryPlugin.COMMON_LIBRARY_NAME_MESSAGE}`
 			);
 		}
+		const _name = /** @type {string} */ (name);
 		return {
-			name: /** @type {string} */ (name)
+			name: _name
 		};
 	}