webpack 5.59.0 → 5.94.0

package/lib/library/AbstractLibraryPlugin.js

@@ -26,7 +26,7 @@ const COMMON_LIBRARY_NAME_MESSAGE =
 
 /**
  * @template T
- * @typedef {Object} LibraryContext
+ * @typedef {object} LibraryContext
  * @property {Compilation} compilation
  * @property {ChunkGraph} chunkGraph
  * @property {T} options
@@ -37,7 +37,7 @@ const COMMON_LIBRARY_NAME_MESSAGE =
  */
 class AbstractLibraryPlugin {
 	/**
-	 * @param {Object} options options
+	 * @param {object} options options
 	 * @param {string} options.pluginName name of the plugin
 	 * @param {LibraryType} options.type used library type
 	 */
@@ -87,6 +87,10 @@ class AbstractLibraryPlugin {
 				}
 			);
 
+			/**
+			 * @param {Chunk} chunk chunk
+			 * @returns {TODO} options for the chunk
+			 */
 			const getOptionsForChunk = chunk => {
 				if (compilation.chunkGraph.getNumberOfEntryModules(chunk) === 0)
 					return false;

package/lib/library/AmdLibraryPlugin.js

@@ -21,14 +21,15 @@ const AbstractLibraryPlugin = require("./AbstractLibraryPlugin");
 /** @template T @typedef {import("./AbstractLibraryPlugin").LibraryContext<T>} LibraryContext<T> */
 
 /**
- * @typedef {Object} AmdLibraryPluginOptions
+ * @typedef {object} AmdLibraryPluginOptions
  * @property {LibraryType} type
  * @property {boolean=} requireAsWrapper
  */
 
 /**
- * @typedef {Object} AmdLibraryPluginParsed
+ * @typedef {object} AmdLibraryPluginParsed
  * @property {string} name
+ * @property {string} amdContainer
  */
 
 /**
@@ -52,23 +53,21 @@ class AmdLibraryPlugin extends AbstractLibraryPlugin {
 	 * @returns {T | false} preprocess as needed by overriding
 	 */
 	parseOptions(library) {
-		const { name } = library;
+		const { name, amdContainer } = library;
 		if (this.requireAsWrapper) {
 			if (name) {
 				throw new Error(
 					`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)
-		};
+		const _name = /** @type {string} */ (name);
+		const _amdContainer = /** @type {string} */ (amdContainer);
+		return { name: _name, amdContainer: _amdContainer };
 	}
 
 	/**
@@ -85,7 +84,11 @@ class AmdLibraryPlugin extends AbstractLibraryPlugin {
 		const modern = runtimeTemplate.supportsArrowFunction();
 		const modules = chunkGraph
 			.getChunkModules(chunk)
-			.filter(m => m instanceof ExternalModule);
+			.filter(
+				m =>
+					m instanceof ExternalModule &&
+					(m.externalType === "amd" || m.externalType === "amd-require")
+			);
 		const externals = /** @type {ExternalModule[]} */ (modules);
 		const externalsDepsArray = JSON.stringify(
 			externals.map(m =>
@@ -111,9 +114,14 @@ class AmdLibraryPlugin extends AbstractLibraryPlugin {
 			(iife || !chunk.hasRuntime() ? " return " : "\n");
 		const fnEnd = iife ? ";\n}" : "\n}";
 
+		let amdContainerPrefix = "";
+		if (options.amdContainer) {
+			amdContainerPrefix = `${options.amdContainer}.`;
+		}
+
 		if (this.requireAsWrapper) {
 			return new ConcatSource(
-				`require(${externalsDepsArray}, ${fnStart}`,
+				`${amdContainerPrefix}require(${externalsDepsArray}, ${fnStart}`,
 				source,
 				`${fnEnd});`
 			);
@@ -123,19 +131,24 @@ class AmdLibraryPlugin extends AbstractLibraryPlugin {
 			});
 
 			return new ConcatSource(
-				`define(${JSON.stringify(name)}, ${externalsDepsArray}, ${fnStart}`,
+				`${amdContainerPrefix}define(${JSON.stringify(
+					name
+				)}, ${externalsDepsArray}, ${fnStart}`,
 				source,
 				`${fnEnd});`
 			);
 		} else if (externalsArguments) {
 			return new ConcatSource(
-				`define(${externalsDepsArray}, ${fnStart}`,
+				`${amdContainerPrefix}define(${externalsDepsArray}, ${fnStart}`,
 				source,
 				`${fnEnd});`
 			);
-		} else {
-			return new ConcatSource(`define(${fnStart}`, source, `${fnEnd});`);
 		}
+		return new ConcatSource(
+			`${amdContainerPrefix}define(${fnStart}`,
+			source,
+			`${fnEnd});`
+		);
 	}
 
 	/**
@@ -155,6 +168,9 @@ class AmdLibraryPlugin extends AbstractLibraryPlugin {
 				chunk
 			});
 			hash.update(name);
+		} else if (options.amdContainer) {
+			hash.update("amdContainer");
+			hash.update(options.amdContainer);
 		}
 	}
 }

package/lib/library/AssignLibraryPlugin.js

@@ -7,6 +7,7 @@
 
 const { ConcatSource } = require("webpack-sources");
 const { UsageState } = require("../ExportsInfo");
+const RuntimeGlobals = require("../RuntimeGlobals");
 const Template = require("../Template");
 const propertyAccess = require("../util/propertyAccess");
 const { getEntryRuntime } = require("../util/runtime");
@@ -16,6 +17,7 @@ const AbstractLibraryPlugin = require("./AbstractLibraryPlugin");
 /** @typedef {import("../../declarations/WebpackOptions").LibraryOptions} LibraryOptions */
 /** @typedef {import("../../declarations/WebpackOptions").LibraryType} LibraryType */
 /** @typedef {import("../Chunk")} Chunk */
+/** @typedef {import("../Compilation")} Compilation */
 /** @typedef {import("../Compilation").ChunkHashContext} ChunkHashContext */
 /** @typedef {import("../Compiler")} Compiler */
 /** @typedef {import("../Module")} Module */
@@ -34,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
@@ -58,6 +59,7 @@ const accessWithInit = (accessor, existingLength, initLast = false) => {
 	let i = 1;
 
 	// all properties printed so far (excluding base)
+	/** @type {string[] | undefined} */
 	let propsSoFar;
 
 	// if there is existingLength, print all properties until this position as property access
@@ -88,16 +90,16 @@ const accessWithInit = (accessor, existingLength, initLast = false) => {
 };
 
 /**
- * @typedef {Object} AssignLibraryPluginOptions
+ * @typedef {object} AssignLibraryPluginOptions
  * @property {LibraryType} type
  * @property {string[] | "global"} prefix name prefix
  * @property {string | false} declare declare name as variable
- * @property {"error"|"copy"|"assign"} unnamed behavior for unnamed library name
+ * @property {"error"|"static"|"copy"|"assign"} unnamed behavior for unnamed library name
  * @property {"copy"|"assign"=} named behavior for named library name
  */
 
 /**
- * @typedef {Object} AssignLibraryPluginParsed
+ * @typedef {object} AssignLibraryPluginParsed
  * @property {string | string[]} name
  * @property {string | string[] | undefined} export
  */
@@ -133,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
 		};
 	}
@@ -172,12 +173,22 @@ class AssignLibraryPlugin extends AbstractLibraryPlugin {
 		moduleGraph.addExtraReason(module, "used as library export");
 	}
 
+	/**
+	 * @param {Compilation} compilation the compilation
+	 * @returns {string[]} the prefix
+	 */
 	_getPrefix(compilation) {
 		return this.prefix === "global"
-			? [compilation.outputOptions.globalObject]
+			? [compilation.runtimeTemplate.globalObject]
 			: this.prefix;
 	}
 
+	/**
+	 * @param {AssignLibraryPluginParsed} options the library options
+	 * @param {Chunk} chunk the chunk
+	 * @param {Compilation} compilation the compilation
+	 * @returns {Array<string>} the resolved full name
+	 */
 	_getResolvedFullName(options, chunk, compilation) {
 		const prefix = this._getPrefix(compilation);
 		const fullName = options.name ? prefix.concat(options.name) : prefix;
@@ -222,9 +233,15 @@ class AssignLibraryPlugin extends AbstractLibraryPlugin {
 	 * @param {LibraryContext<T>} libraryContext context
 	 * @returns {string | undefined} bailout reason
 	 */
-	embedInRuntimeBailout(module, { chunk }, { options, compilation }) {
+	embedInRuntimeBailout(
+		module,
+		{ chunk, codeGenerationResults },
+		{ options, compilation }
+	) {
+		const { data } = codeGenerationResults.get(module, chunk.runtime);
 		const topLevelDeclarations =
-			module.buildInfo && module.buildInfo.topLevelDeclarations;
+			(data && data.get("topLevelDeclarations")) ||
+			(module.buildInfo && module.buildInfo.topLevelDeclarations);
 		if (!topLevelDeclarations)
 			return "it doesn't tell about top level declarations.";
 		const fullNameResolved = this._getResolvedFullName(
@@ -261,19 +278,42 @@ class AssignLibraryPlugin extends AbstractLibraryPlugin {
 	 * @param {LibraryContext<T>} libraryContext context
 	 * @returns {Source} source with library export
 	 */
-	renderStartup(source, module, { chunk }, { options, compilation }) {
+	renderStartup(
+		source,
+		module,
+		{ moduleGraph, chunk },
+		{ options, compilation }
+	) {
 		const fullNameResolved = this._getResolvedFullName(
 			options,
 			chunk,
 			compilation
 		);
+		const staticExports = this.unnamed === "static";
 		const exportAccess = options.export
 			? propertyAccess(
 					Array.isArray(options.export) ? options.export : [options.export]
-			  )
+				)
 			: "";
 		const result = new ConcatSource(source);
-		if (options.name ? this.named === "copy" : this.unnamed === "copy") {
+		if (staticExports) {
+			const exportsInfo = moduleGraph.getExportsInfo(module);
+			const exportTarget = accessWithInit(
+				fullNameResolved,
+				this._getPrefix(compilation).length,
+				true
+			);
+			for (const exportInfo of exportsInfo.orderedExports) {
+				if (!exportInfo.provided) continue;
+				const nameAccess = propertyAccess([exportInfo.name]);
+				result.add(
+					`${exportTarget}${nameAccess} = ${RuntimeGlobals.exports}${exportAccess}${nameAccess};\n`
+				);
+			}
+			result.add(
+				`Object.defineProperty(${exportTarget}, "__esModule", { value: true });\n`
+			);
+		} else if (options.name ? this.named === "copy" : this.unnamed === "copy") {
 			result.add(
 				`var __webpack_export_target__ = ${accessWithInit(
 					fullNameResolved,
@@ -281,10 +321,11 @@ class AssignLibraryPlugin extends AbstractLibraryPlugin {
 					true
 				)};\n`
 			);
-			let exports = "__webpack_exports__";
+			/** @type {string} */
+			let exports = RuntimeGlobals.exports;
 			if (exportAccess) {
 				result.add(
-					`var __webpack_exports_export__ = __webpack_exports__${exportAccess};\n`
+					`var __webpack_exports_export__ = ${RuntimeGlobals.exports}${exportAccess};\n`
 				);
 				exports = "__webpack_exports_export__";
 			}
@@ -300,7 +341,7 @@ class AssignLibraryPlugin extends AbstractLibraryPlugin {
 					fullNameResolved,
 					this._getPrefix(compilation).length,
 					false
-				)} = __webpack_exports__${exportAccess};\n`
+				)} = ${RuntimeGlobals.exports}${exportAccess};\n`
 			);
 		}
 		return result;
@@ -313,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);
 	}
 
 	/**
@@ -325,15 +366,10 @@ class AssignLibraryPlugin extends AbstractLibraryPlugin {
 	 */
 	chunkHash(chunk, hash, chunkHashContext, { options, compilation }) {
 		hash.update("AssignLibraryPlugin");
-		const prefix =
-			this.prefix === "global"
-				? [compilation.outputOptions.globalObject]
-				: this.prefix;
-		const fullName = options.name ? prefix.concat(options.name) : prefix;
-		const fullNameResolved = fullName.map(n =>
-			compilation.getPath(n, {
-				chunk
-			})
+		const fullNameResolved = this._getResolvedFullName(
+			options,
+			chunk,
+			compilation
 		);
 		if (options.name ? this.named === "copy" : this.unnamed === "copy") {
 			hash.update("copy");

package/lib/library/EnableLibraryPlugin.js

@@ -12,6 +12,10 @@
 /** @type {WeakMap<Compiler, Set<LibraryType>>} */
 const enabledTypes = new WeakMap();
 
+/**
+ * @param {Compiler} compiler the compiler instance
+ * @returns {Set<LibraryType>} enabled types
+ */
 const getEnabledTypes = compiler => {
 	let set = enabledTypes.get(compiler);
 	if (set === undefined) {
@@ -48,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(", ")}`
 			);
 		}
 	}
@@ -74,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,
@@ -90,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,
@@ -102,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,
@@ -113,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,
@@ -124,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,
@@ -135,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,
@@ -146,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,
@@ -157,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,
@@ -167,9 +173,20 @@ class EnableLibraryPlugin {
 					}).apply(compiler);
 					break;
 				}
+				case "commonjs-static": {
+					// @ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
+					const AssignLibraryPlugin = require("./AssignLibraryPlugin");
+					new AssignLibraryPlugin({
+						type,
+						prefix: ["exports"],
+						declare: false,
+						unnamed: "static"
+					}).apply(compiler);
+					break;
+				}
 				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,
@@ -223,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

@@ -7,6 +7,7 @@
 
 const { ConcatSource } = require("webpack-sources");
 const { UsageState } = require("../ExportsInfo");
+const RuntimeGlobals = require("../RuntimeGlobals");
 const propertyAccess = require("../util/propertyAccess");
 const { getEntryRuntime } = require("../util/runtime");
 const AbstractLibraryPlugin = require("./AbstractLibraryPlugin");
@@ -21,14 +22,15 @@ const AbstractLibraryPlugin = require("./AbstractLibraryPlugin");
 /** @template T @typedef {import("./AbstractLibraryPlugin").LibraryContext<T>} LibraryContext<T> */
 
 /**
- * @typedef {Object} ExportPropertyLibraryPluginParsed
+ * @typedef {object} ExportPropertyLibraryPluginParsed
  * @property {string | string[]} export
  */
 
 /**
- * @typedef {Object} ExportPropertyLibraryPluginOptions
+ * @typedef {object} ExportPropertyLibraryPluginOptions
  * @property {LibraryType} type
  * @property {boolean} nsObjectUsed the namespace object is used
+ * @property {boolean} runtimeExportsUsed runtime exports are used
  */
 /**
  * @typedef {ExportPropertyLibraryPluginParsed} T
@@ -38,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;
 	}
 
 	/**
@@ -92,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
@@ -103,7 +110,9 @@ class ExportPropertyLibraryPlugin extends AbstractLibraryPlugin {
 	 */
 	renderStartup(source, module, renderContext, { options }) {
 		if (!options.export) return source;
-		const postfix = `__webpack_exports__ = __webpack_exports__${propertyAccess(
+		const postfix = `${RuntimeGlobals.exports} = ${
+			RuntimeGlobals.exports
+		}${propertyAccess(
 			Array.isArray(options.export) ? options.export : [options.export]
 		)};\n`;
 		return new ConcatSource(source, postfix);

package/lib/library/JsonpLibraryPlugin.js

@@ -19,12 +19,12 @@ const AbstractLibraryPlugin = require("./AbstractLibraryPlugin");
 /** @template T @typedef {import("./AbstractLibraryPlugin").LibraryContext<T>} LibraryContext<T> */
 
 /**
- * @typedef {Object} JsonpLibraryPluginOptions
+ * @typedef {object} JsonpLibraryPluginOptions
  * @property {LibraryType} type
  */
 
 /**
- * @typedef {Object} JsonpLibraryPluginParsed
+ * @typedef {object} JsonpLibraryPluginParsed
  * @property {string} name
  */
 
@@ -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
 		};
 	}