webpack 5.99.5 → 5.99.7

package/lib/library/EnableLibraryPlugin.js

@@ -12,6 +12,11 @@
 /** @type {WeakMap<Compiler, Set<LibraryType>>} */
 const enabledTypes = new WeakMap();
 
+/**
+ * @typedef {object} EnableLibraryPluginOptions
+ * @property {() => void=} additionalApply function that runs when applying the current plugin.
+ */
+
 /**
  * @param {Compiler} compiler the compiler instance
  * @returns {Set<LibraryType>} enabled types
@@ -28,9 +33,13 @@ const getEnabledTypes = compiler => {
 class EnableLibraryPlugin {
 	/**
 	 * @param {LibraryType} type library type that should be available
+	 * @param {EnableLibraryPluginOptions} options options of EnableLibraryPlugin
 	 */
-	constructor(type) {
+	constructor(type, options = {}) {
+		/** @type {LibraryType} */
 		this.type = type;
+		/** @type {EnableLibraryPluginOptions} */
+		this.options = options;
 	}
 
 	/**
@@ -67,13 +76,17 @@ class EnableLibraryPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
-		const { type } = this;
+		const { type, options } = this;
 
 		// Only enable once
 		const enabled = getEnabledTypes(compiler);
 		if (enabled.has(type)) return;
 		enabled.add(type);
 
+		if (typeof options.additionalApply === "function") {
+			options.additionalApply();
+		}
+
 		if (typeof type === "string") {
 			const enableExportProperty = () => {
 				const ExportPropertyTemplatePlugin = require("./ExportPropertyLibraryPlugin");

package/lib/library/ModuleLibraryPlugin.js

@@ -39,6 +39,8 @@ const AbstractLibraryPlugin = require("./AbstractLibraryPlugin");
  * @property {string | string[]=} export
  */
 
+const PLUGIN_NAME = "ModuleLibraryPlugin";
+
 /**
  * @typedef {ModuleLibraryPluginParsed} T
  * @extends {AbstractLibraryPlugin<ModuleLibraryPluginParsed>}
@@ -62,34 +64,31 @@ class ModuleLibraryPlugin extends AbstractLibraryPlugin {
 	apply(compiler) {
 		super.apply(compiler);
 
-		compiler.hooks.compilation.tap("ModernModuleLibraryPlugin", compilation => {
+		compiler.hooks.thisCompilation.tap(PLUGIN_NAME, compilation => {
 			const { exportsDefinitions } =
 				ConcatenatedModule.getCompilationHooks(compilation);
-			exportsDefinitions.tap(
-				"ModernModuleLibraryPlugin",
-				(definitions, module) => {
-					// If we have connections not all modules were concatenated, so we need the wrapper
-					const connections =
-						compilation.moduleGraph.getIncomingConnections(module);
-
-					for (const connection of connections) {
-						if (connection.originModule) {
-							return false;
-						}
+			exportsDefinitions.tap(PLUGIN_NAME, (definitions, module) => {
+				// If we have connections not all modules were concatenated, so we need the wrapper
+				const connections =
+					compilation.moduleGraph.getIncomingConnections(module);
+
+				for (const connection of connections) {
+					if (connection.originModule) {
+						return false;
 					}
+				}
 
-					// Runtime and splitting chunks now requires the wrapper too
-					for (const chunk of compilation.chunkGraph.getModuleChunksIterable(
-						module
-					)) {
-						if (!chunk.hasRuntime()) {
-							return false;
-						}
+				// Runtime and splitting chunks now requires the wrapper too
+				for (const chunk of compilation.chunkGraph.getModuleChunksIterable(
+					module
+				)) {
+					if (!chunk.hasRuntime()) {
+						return false;
 					}
-
-					return true;
 				}
-			);
+
+				return true;
+			});
 		});
 	}
 
@@ -121,11 +120,11 @@ class ModuleLibraryPlugin extends AbstractLibraryPlugin {
 	renderStartup(
 		source,
 		module,
-		{ moduleGraph, chunk },
+		{ moduleGraph, chunk, codeGenerationResults },
 		{ options, compilation }
 	) {
 		const result = new ConcatSource(source);
-		const exportsInfos = options.export
+		const exportsInfo = options.export
 			? [
 					moduleGraph.getExportInfo(
 						module,
@@ -136,7 +135,9 @@ class ModuleLibraryPlugin extends AbstractLibraryPlugin {
 		const definitions =
 			/** @type {BuildMeta} */
 			(module.buildMeta).exportsFinalName || {};
+		/** @type {string[]} */
 		const shortHandedExports = [];
+		/** @type {[string, string][]} */
 		const exports = [];
 		const isAsync = moduleGraph.isAsync(module);
 
@@ -146,7 +147,11 @@ class ModuleLibraryPlugin extends AbstractLibraryPlugin {
 			);
 		}
 
-		for (const exportInfo of exportsInfos) {
+		const varType = compilation.outputOptions.environment.const
+			? "const"
+			: "var";
+
+		for (const exportInfo of exportsInfo) {
 			if (!exportInfo.provided) continue;
 
 			let shouldContinue = false;
@@ -159,6 +164,7 @@ class ModuleLibraryPlugin extends AbstractLibraryPlugin {
 				for (const reexportInfo of exp.orderedExports) {
 					if (
 						reexportInfo.provided === false &&
+						reexportInfo.name !== "default" &&
 						reexportInfo.name === /** @type {string[]} */ (reexport.export)[0]
 					) {
 						shouldContinue = true;
@@ -168,32 +174,51 @@ class ModuleLibraryPlugin extends AbstractLibraryPlugin {
 
 			if (shouldContinue) continue;
 
-			const webpackExportsProperty = exportInfo.getUsedName(
-				exportInfo.name,
-				chunk.runtime
-			);
-			const definition =
-				definitions[/** @type {string} */ (webpackExportsProperty)];
+			const originalName = exportInfo.name;
+			const usedName =
+				/** @type {string} */
+				(exportInfo.getUsedName(originalName, chunk.runtime));
+			/** @type {string | undefined} */
+			const definition = definitions[usedName];
 			const finalName =
 				definition ||
-				`${RuntimeGlobals.exports}${Template.toIdentifier(exportInfo.name)}`;
+				`${RuntimeGlobals.exports}${Template.toIdentifier(originalName)}`;
 
 			if (!definition) {
 				result.add(
-					`var ${finalName} = ${RuntimeGlobals.exports}${propertyAccess([
-						/** @type {string} */
-						(exportInfo.getUsedName(exportInfo.name, chunk.runtime))
-					])}\n`
+					`${varType} ${finalName} = ${RuntimeGlobals.exports}${propertyAccess([
+						usedName
+					])};\n`
 				);
 			}
 
-			if (finalName && (finalName.includes(".") || finalName.includes("["))) {
-				exports.push([exportInfo.name, finalName]);
+			if (
+				finalName &&
+				(finalName.includes(".") ||
+					finalName.includes("[") ||
+					finalName.includes("("))
+			) {
+				if (exportInfo.isReexport()) {
+					const { data } = codeGenerationResults.get(module, chunk.runtime);
+					const topLevelDeclarations =
+						(data && data.get("topLevelDeclarations")) ||
+						(module.buildInfo && module.buildInfo.topLevelDeclarations);
+
+					if (topLevelDeclarations && topLevelDeclarations.has(originalName)) {
+						const name = `${RuntimeGlobals.exports}${Template.toIdentifier(originalName)}`;
+						result.add(`${varType} ${name} = ${finalName};\n`);
+						shortHandedExports.push(`${name} as ${originalName}`);
+					} else {
+						exports.push([originalName, finalName]);
+					}
+				} else {
+					exports.push([originalName, finalName]);
+				}
 			} else {
 				shortHandedExports.push(
-					definition && finalName === exportInfo.name
+					definition && finalName === originalName
 						? finalName
-						: `${finalName} as ${exportInfo.name}`
+						: `${finalName} as ${originalName}`
 				);
 			}
 		}
@@ -203,9 +228,7 @@ class ModuleLibraryPlugin extends AbstractLibraryPlugin {
 		}
 
 		for (const [exportName, final] of exports) {
-			result.add(
-				`export ${compilation.outputOptions.environment.const ? "const" : "var"} ${exportName} = ${final};\n`
-			);
+			result.add(`export ${varType} ${exportName} = ${final};\n`);
 		}
 
 		return result;

package/lib/logging/createConsoleLogger.js

@@ -89,7 +89,6 @@ module.exports = ({ level = "info", debug = false, console }) => {
 						.concat(debug)
 						.map(filterToFunction)
 		);
-	/** @type {number} */
 	const loglevel = LogLevel[`${level}`] || 0;
 
 	/**

package/lib/node/CommonJsChunkLoadingPlugin.js

@@ -13,12 +13,14 @@ const StartupChunkDependenciesPlugin = require("../runtime/StartupChunkDependenc
 
 /**
  * @typedef {object} CommonJsChunkLoadingPluginOptions
- * @property {boolean} [asyncChunkLoading] enable async chunk loading
+ * @property {boolean=} asyncChunkLoading enable async chunk loading
  */
 
+const PLUGIN_NAME = "CommonJsChunkLoadingPlugin";
+
 class CommonJsChunkLoadingPlugin {
 	/**
-	 * @param {CommonJsChunkLoadingPluginOptions} [options] options
+	 * @param {CommonJsChunkLoadingPluginOptions=} options options
 	 */
 	constructor(options = {}) {
 		this._asyncChunkLoading = options.asyncChunkLoading;
@@ -40,81 +42,75 @@ class CommonJsChunkLoadingPlugin {
 			chunkLoading: chunkLoadingValue,
 			asyncChunkLoading: this._asyncChunkLoading
 		}).apply(compiler);
-		compiler.hooks.thisCompilation.tap(
-			"CommonJsChunkLoadingPlugin",
-			compilation => {
-				const globalChunkLoading = compilation.outputOptions.chunkLoading;
-				/**
-				 * @param {Chunk} chunk chunk
-				 * @returns {boolean} true, if wasm loading is enabled for the chunk
-				 */
-				const isEnabledForChunk = chunk => {
-					const options = chunk.getEntryOptions();
-					const chunkLoading =
-						options && options.chunkLoading !== undefined
-							? options.chunkLoading
-							: globalChunkLoading;
-					return chunkLoading === chunkLoadingValue;
-				};
-				const onceForChunkSet = new WeakSet();
-				/**
-				 * @param {Chunk} chunk chunk
-				 * @param {Set<string>} set runtime requirements
-				 */
-				const handler = (chunk, set) => {
-					if (onceForChunkSet.has(chunk)) return;
-					onceForChunkSet.add(chunk);
-					if (!isEnabledForChunk(chunk)) return;
-					set.add(RuntimeGlobals.moduleFactoriesAddOnly);
-					set.add(RuntimeGlobals.hasOwnProperty);
-					compilation.addRuntimeModule(
-						chunk,
-						new ChunkLoadingRuntimeModule(set)
-					);
-				};
+		compiler.hooks.thisCompilation.tap(PLUGIN_NAME, compilation => {
+			const globalChunkLoading = compilation.outputOptions.chunkLoading;
+			/**
+			 * @param {Chunk} chunk chunk
+			 * @returns {boolean} true, if wasm loading is enabled for the chunk
+			 */
+			const isEnabledForChunk = chunk => {
+				const options = chunk.getEntryOptions();
+				const chunkLoading =
+					options && options.chunkLoading !== undefined
+						? options.chunkLoading
+						: globalChunkLoading;
+				return chunkLoading === chunkLoadingValue;
+			};
+			const onceForChunkSet = new WeakSet();
+			/**
+			 * @param {Chunk} chunk chunk
+			 * @param {Set<string>} set runtime requirements
+			 */
+			const handler = (chunk, set) => {
+				if (onceForChunkSet.has(chunk)) return;
+				onceForChunkSet.add(chunk);
+				if (!isEnabledForChunk(chunk)) return;
+				set.add(RuntimeGlobals.moduleFactoriesAddOnly);
+				set.add(RuntimeGlobals.hasOwnProperty);
+				compilation.addRuntimeModule(chunk, new ChunkLoadingRuntimeModule(set));
+			};
 
-				compilation.hooks.runtimeRequirementInTree
-					.for(RuntimeGlobals.ensureChunkHandlers)
-					.tap("CommonJsChunkLoadingPlugin", handler);
-				compilation.hooks.runtimeRequirementInTree
-					.for(RuntimeGlobals.hmrDownloadUpdateHandlers)
-					.tap("CommonJsChunkLoadingPlugin", handler);
-				compilation.hooks.runtimeRequirementInTree
-					.for(RuntimeGlobals.hmrDownloadManifest)
-					.tap("CommonJsChunkLoadingPlugin", handler);
-				compilation.hooks.runtimeRequirementInTree
-					.for(RuntimeGlobals.baseURI)
-					.tap("CommonJsChunkLoadingPlugin", handler);
-				compilation.hooks.runtimeRequirementInTree
-					.for(RuntimeGlobals.externalInstallChunk)
-					.tap("CommonJsChunkLoadingPlugin", handler);
-				compilation.hooks.runtimeRequirementInTree
-					.for(RuntimeGlobals.onChunksLoaded)
-					.tap("CommonJsChunkLoadingPlugin", handler);
+			compilation.hooks.runtimeRequirementInTree
+				.for(RuntimeGlobals.ensureChunkHandlers)
+				.tap(PLUGIN_NAME, handler);
+			compilation.hooks.runtimeRequirementInTree
+				.for(RuntimeGlobals.hmrDownloadUpdateHandlers)
+				.tap(PLUGIN_NAME, handler);
+			compilation.hooks.runtimeRequirementInTree
+				.for(RuntimeGlobals.hmrDownloadManifest)
+				.tap(PLUGIN_NAME, handler);
+			compilation.hooks.runtimeRequirementInTree
+				.for(RuntimeGlobals.baseURI)
+				.tap(PLUGIN_NAME, handler);
+			compilation.hooks.runtimeRequirementInTree
+				.for(RuntimeGlobals.externalInstallChunk)
+				.tap(PLUGIN_NAME, handler);
+			compilation.hooks.runtimeRequirementInTree
+				.for(RuntimeGlobals.onChunksLoaded)
+				.tap(PLUGIN_NAME, handler);
 
-				compilation.hooks.runtimeRequirementInTree
-					.for(RuntimeGlobals.ensureChunkHandlers)
-					.tap("CommonJsChunkLoadingPlugin", (chunk, set) => {
-						if (!isEnabledForChunk(chunk)) return;
-						set.add(RuntimeGlobals.getChunkScriptFilename);
-					});
-				compilation.hooks.runtimeRequirementInTree
-					.for(RuntimeGlobals.hmrDownloadUpdateHandlers)
-					.tap("CommonJsChunkLoadingPlugin", (chunk, set) => {
-						if (!isEnabledForChunk(chunk)) return;
-						set.add(RuntimeGlobals.getChunkUpdateScriptFilename);
-						set.add(RuntimeGlobals.moduleCache);
-						set.add(RuntimeGlobals.hmrModuleData);
-						set.add(RuntimeGlobals.moduleFactoriesAddOnly);
-					});
-				compilation.hooks.runtimeRequirementInTree
-					.for(RuntimeGlobals.hmrDownloadManifest)
-					.tap("CommonJsChunkLoadingPlugin", (chunk, set) => {
-						if (!isEnabledForChunk(chunk)) return;
-						set.add(RuntimeGlobals.getUpdateManifestFilename);
-					});
-			}
-		);
+			compilation.hooks.runtimeRequirementInTree
+				.for(RuntimeGlobals.ensureChunkHandlers)
+				.tap(PLUGIN_NAME, (chunk, set) => {
+					if (!isEnabledForChunk(chunk)) return;
+					set.add(RuntimeGlobals.getChunkScriptFilename);
+				});
+			compilation.hooks.runtimeRequirementInTree
+				.for(RuntimeGlobals.hmrDownloadUpdateHandlers)
+				.tap(PLUGIN_NAME, (chunk, set) => {
+					if (!isEnabledForChunk(chunk)) return;
+					set.add(RuntimeGlobals.getChunkUpdateScriptFilename);
+					set.add(RuntimeGlobals.moduleCache);
+					set.add(RuntimeGlobals.hmrModuleData);
+					set.add(RuntimeGlobals.moduleFactoriesAddOnly);
+				});
+			compilation.hooks.runtimeRequirementInTree
+				.for(RuntimeGlobals.hmrDownloadManifest)
+				.tap(PLUGIN_NAME, (chunk, set) => {
+					if (!isEnabledForChunk(chunk)) return;
+					set.add(RuntimeGlobals.getUpdateManifestFilename);
+				});
+		});
 	}
 }
 

package/lib/node/NodeEnvironmentPlugin.js

@@ -20,6 +20,8 @@ const nodeConsole = require("./nodeConsole");
  * @property {InfrastructureLogging} infrastructureLogging infrastructure logging options
  */
 
+const PLUGIN_NAME = "NodeEnvironmentPlugin";
+
 class NodeEnvironmentPlugin {
 	/**
 	 * @param {NodeEnvironmentPluginOptions} options options
@@ -55,7 +57,7 @@ class NodeEnvironmentPlugin {
 		compiler.outputFileSystem = fs;
 		compiler.intermediateFileSystem = fs;
 		compiler.watchFileSystem = new NodeWatchFileSystem(inputFileSystem);
-		compiler.hooks.beforeRun.tap("NodeEnvironmentPlugin", compiler => {
+		compiler.hooks.beforeRun.tap(PLUGIN_NAME, compiler => {
 			if (
 				compiler.inputFileSystem === inputFileSystem &&
 				inputFileSystem.purge

package/lib/node/NodeTemplatePlugin.js

@@ -12,12 +12,12 @@ const EnableChunkLoadingPlugin = require("../javascript/EnableChunkLoadingPlugin
 
 /**
  * @typedef {object} NodeTemplatePluginOptions
- * @property {boolean} [asyncChunkLoading] enable async chunk loading
+ * @property {boolean=} asyncChunkLoading enable async chunk loading
  */
 
 class NodeTemplatePlugin {
 	/**
-	 * @param {NodeTemplatePluginOptions} [options] options object
+	 * @param {NodeTemplatePluginOptions=} options options object
 	 */
 	constructor(options = {}) {
 		this._options = options;

package/lib/node/ReadFileCompileAsyncWasmPlugin.js

@@ -15,14 +15,14 @@ const AsyncWasmLoadingRuntimeModule = require("../wasm-async/AsyncWasmLoadingRun
 
 /**
  * @typedef {object} ReadFileCompileAsyncWasmPluginOptions
- * @property {boolean} [import] use import?
+ * @property {boolean=} import use import?
  */
 
 const PLUGIN_NAME = "ReadFileCompileAsyncWasmPlugin";
 
 class ReadFileCompileAsyncWasmPlugin {
 	/**
-	 * @param {ReadFileCompileAsyncWasmPluginOptions} [options] options object
+	 * @param {ReadFileCompileAsyncWasmPluginOptions=} options options object
 	 */
 	constructor({ import: useImport = false } = {}) {
 		this._import = useImport;

package/lib/node/ReadFileCompileWasmPlugin.js

@@ -15,8 +15,8 @@ const WasmChunkLoadingRuntimeModule = require("../wasm-sync/WasmChunkLoadingRunt
 
 /**
  * @typedef {object} ReadFileCompileWasmPluginOptions
- * @property {boolean} [mangleImports] mangle imports
- * @property {boolean} [import] use import?
+ * @property {boolean=} mangleImports mangle imports
+ * @property {boolean=} import use import?
  */
 
 // TODO webpack 6 remove
@@ -25,7 +25,7 @@ const PLUGIN_NAME = "ReadFileCompileWasmPlugin";
 
 class ReadFileCompileWasmPlugin {
 	/**
-	 * @param {ReadFileCompileWasmPluginOptions} [options] options object
+	 * @param {ReadFileCompileWasmPluginOptions=} options options object
 	 */
 	constructor(options = {}) {
 		this.options = options;

package/lib/optimize/AggressiveMergingPlugin.js

@@ -17,7 +17,7 @@ const { STAGE_ADVANCED } = require("../OptimizationStages");
 
 class AggressiveMergingPlugin {
 	/**
-	 * @param {AggressiveMergingPluginOptions=} [options] options object
+	 * @param {AggressiveMergingPluginOptions=} options options object
 	 */
 	constructor(options) {
 		if (