webpack 5.99.6 → 5.99.8

package/lib/json/JsonModulesPlugin.js

@@ -16,8 +16,8 @@ const JsonParser = require("./JsonParser");
 /** @typedef {import("../util/fs").JsonValue} JsonValue */
 
 const validate = createSchemaValidation(
-	require("../../schemas/plugins/JsonModulesPluginParser.check.js"),
-	() => require("../../schemas/plugins/JsonModulesPluginParser.json"),
+	require("../../schemas/plugins/json/JsonModulesPluginParser.check.js"),
+	() => require("../../schemas/plugins/json/JsonModulesPluginParser.json"),
 	{
 		name: "Json Modules Plugin",
 		baseDataPath: "parser"
@@ -25,8 +25,8 @@ const validate = createSchemaValidation(
 );
 
 const validateGenerator = createSchemaValidation(
-	require("../../schemas/plugins/JsonModulesPluginGenerator.check.js"),
-	() => require("../../schemas/plugins/JsonModulesPluginGenerator.json"),
+	require("../../schemas/plugins/json/JsonModulesPluginGenerator.check.js"),
+	() => require("../../schemas/plugins/json/JsonModulesPluginGenerator.json"),
 	{
 		name: "Json Modules Plugin",
 		baseDataPath: "generator"

package/lib/library/AbstractLibraryPlugin.js

@@ -93,7 +93,7 @@ class AbstractLibraryPlugin {
 
 			/**
 			 * @param {Chunk} chunk chunk
-			 * @returns {TODO} options for the chunk
+			 * @returns {T | false} options for the chunk
 			 */
 			const getOptionsForChunk = chunk => {
 				if (compilation.chunkGraph.getNumberOfEntryModules(chunk) === 0)

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,22 +174,21 @@ 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`
 				);
 			}
 
@@ -193,12 +198,27 @@ class ModuleLibraryPlugin extends AbstractLibraryPlugin {
 					finalName.includes("[") ||
 					finalName.includes("("))
 			) {
-				exports.push([exportInfo.name, finalName]);
+				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}`
 				);
 			}
 		}
@@ -208,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/node/CommonJsChunkLoadingPlugin.js

@@ -16,6 +16,8 @@ const StartupChunkDependenciesPlugin = require("../runtime/StartupChunkDependenc
  * @property {boolean=} asyncChunkLoading enable async chunk loading
  */
 
+const PLUGIN_NAME = "CommonJsChunkLoadingPlugin";
+
 class CommonJsChunkLoadingPlugin {
 	/**
 	 * @param {CommonJsChunkLoadingPluginOptions=} options options
@@ -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/nodeConsole.js

@@ -8,6 +8,7 @@
 const util = require("util");
 const truncateArgs = require("../logging/truncateArgs");
 
+/** @typedef {import("../../declarations/WebpackOptions").InfrastructureLogging} InfrastructureLogging */
 /** @typedef {import("../logging/createConsoleLogger").LoggerConsole} LoggerConsole */
 
 /* eslint-disable no-console */
@@ -16,7 +17,7 @@ const truncateArgs = require("../logging/truncateArgs");
  * @param {object} options options
  * @param {boolean=} options.colors colors
  * @param {boolean=} options.appendOnly append only
- * @param {NodeJS.WritableStream} options.stream stream
+ * @param {NonNullable<InfrastructureLogging["stream"]>} options.stream stream
  * @returns {LoggerConsole} logger function
  */
 module.exports = ({ colors, appendOnly, stream }) => {
@@ -57,7 +58,7 @@ module.exports = ({ colors, appendOnly, stream }) => {
 
 	const writeStatusMessage = () => {
 		if (!currentStatusMessage) return;
-		const l = /** @type {TODO} */ (stream).columns || 40;
+		const l = stream.columns || 40;
 		const args = truncateArgs(currentStatusMessage, l - 1);
 		const str = args.join(" ");
 		const coloredStr = `\u001B[1m${str}\u001B[39m\u001B[22m`;