webpack 5.77.0 → 5.78.0

package/lib/json/JsonModulesPlugin.js

@@ -5,6 +5,7 @@
 
 "use strict";
 
+const { JSON_MODULE_TYPE } = require("../ModuleTypeConstants");
 const createSchemaValidation = require("../util/create-schema-validation");
 const JsonGenerator = require("./JsonGenerator");
 const JsonParser = require("./JsonParser");
@@ -20,26 +21,33 @@ const validate = createSchemaValidation(
 	}
 );
 
+const PLUGIN_NAME = "JsonModulesPlugin";
+
+/**
+ * The JsonModulesPlugin is the entrypoint plugin for the json modules feature.
+ * It adds the json module type to the compiler and registers the json parser and generator.
+ */
 class JsonModulesPlugin {
 	/**
 	 * Apply the plugin
 	 * @param {Compiler} compiler the compiler instance
 	 * @returns {void}
+	 *
 	 */
 	apply(compiler) {
 		compiler.hooks.compilation.tap(
-			"JsonModulesPlugin",
+			PLUGIN_NAME,
 			(compilation, { normalModuleFactory }) => {
 				normalModuleFactory.hooks.createParser
-					.for("json")
-					.tap("JsonModulesPlugin", parserOptions => {
+					.for(JSON_MODULE_TYPE)
+					.tap(PLUGIN_NAME, parserOptions => {
 						validate(parserOptions);
 
 						return new JsonParser(parserOptions);
 					});
 				normalModuleFactory.hooks.createGenerator
-					.for("json")
-					.tap("JsonModulesPlugin", () => {
+					.for(JSON_MODULE_TYPE)
+					.tap(PLUGIN_NAME, () => {
 						return new JsonGenerator();
 					});
 			}

package/lib/library/AmdLibraryPlugin.js

@@ -29,6 +29,7 @@ const AbstractLibraryPlugin = require("./AbstractLibraryPlugin");
 /**
  * @typedef {Object} AmdLibraryPluginParsed
  * @property {string} name
+ * @property {string} amdContainer
  */
 
 /**
@@ -52,7 +53,7 @@ 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(
@@ -67,7 +68,8 @@ class AmdLibraryPlugin extends AbstractLibraryPlugin {
 			}
 		}
 		return {
-			name: /** @type {string=} */ (name)
+			name: /** @type {string=} */ (name),
+			amdContainer: /** @type {string=} */ (amdContainer)
 		};
 	}
 
@@ -111,9 +113,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,18 +130,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/node/ReadFileCompileAsyncWasmPlugin.js

@@ -5,6 +5,7 @@
 
 "use strict";
 
+const { WEBASSEMBLY_MODULE_TYPE_ASYNC } = require("../ModuleTypeConstants");
 const RuntimeGlobals = require("../RuntimeGlobals");
 const Template = require("../Template");
 const AsyncWasmLoadingRuntimeModule = require("../wasm-async/AsyncWasmLoadingRuntimeModule");
@@ -85,7 +86,7 @@ class ReadFileCompileAsyncWasmPlugin {
 						if (
 							!chunkGraph.hasModuleInGraph(
 								chunk,
-								m => m.type === "webassembly/async"
+								m => m.type === WEBASSEMBLY_MODULE_TYPE_ASYNC
 							)
 						) {
 							return;

package/lib/node/ReadFileCompileWasmPlugin.js

@@ -5,6 +5,7 @@
 
 "use strict";
 
+const { WEBASSEMBLY_MODULE_TYPE_SYNC } = require("../ModuleTypeConstants");
 const RuntimeGlobals = require("../RuntimeGlobals");
 const Template = require("../Template");
 const WasmChunkLoadingRuntimeModule = require("../wasm-sync/WasmChunkLoadingRuntimeModule");
@@ -69,7 +70,7 @@ class ReadFileCompileWasmPlugin {
 						if (
 							!chunkGraph.hasModuleInGraph(
 								chunk,
-								m => m.type === "webassembly/sync"
+								m => m.type === WEBASSEMBLY_MODULE_TYPE_SYNC
 							)
 						) {
 							return;

package/lib/optimize/ConcatenatedModule.js

@@ -15,6 +15,7 @@ const {
 const ConcatenationScope = require("../ConcatenationScope");
 const { UsageState } = require("../ExportsInfo");
 const Module = require("../Module");
+const { JAVASCRIPT_MODULE_TYPE_ESM } = require("../ModuleTypeConstants");
 const RuntimeGlobals = require("../RuntimeGlobals");
 const Template = require("../Template");
 const HarmonyImportDependency = require("../dependencies/HarmonyImportDependency");
@@ -683,7 +684,7 @@ class ConcatenatedModule extends Module {
 	 * @param {Set<Module>=} options.modules all concatenated modules
 	 */
 	constructor({ identifier, rootModule, modules, runtime }) {
-		super("javascript/esm", null, rootModule && rootModule.layer);
+		super(JAVASCRIPT_MODULE_TYPE_ESM, null, rootModule && rootModule.layer);
 
 		// Info from Factory
 		/** @type {string} */

package/lib/optimize/InnerGraphPlugin.js

@@ -5,6 +5,10 @@
 
 "use strict";
 
+const {
+	JAVASCRIPT_MODULE_TYPE_AUTO,
+	JAVASCRIPT_MODULE_TYPE_ESM
+} = require("../ModuleTypeConstants");
 const PureExpressionDependency = require("../dependencies/PureExpressionDependency");
 const InnerGraph = require("./InnerGraph");
 
@@ -21,6 +25,8 @@ const InnerGraph = require("./InnerGraph");
 
 const { topLevelSymbolTag } = InnerGraph;
 
+const PLUGIN_NAME = "InnerGraphPlugin";
+
 class InnerGraphPlugin {
 	/**
 	 * Apply the plugin
@@ -29,7 +35,7 @@ class InnerGraphPlugin {
 	 */
 	apply(compiler) {
 		compiler.hooks.compilation.tap(
-			"InnerGraphPlugin",
+			PLUGIN_NAME,
 			(compilation, { normalModuleFactory }) => {
 				const logger = compilation.getLogger("webpack.InnerGraphPlugin");
 
@@ -61,11 +67,11 @@ class InnerGraphPlugin {
 						});
 					};
 
-					parser.hooks.program.tap("InnerGraphPlugin", () => {
+					parser.hooks.program.tap(PLUGIN_NAME, () => {
 						InnerGraph.enable(parser.state);
 					});
 
-					parser.hooks.finish.tap("InnerGraphPlugin", () => {
+					parser.hooks.finish.tap(PLUGIN_NAME, () => {
 						if (!InnerGraph.isEnabled(parser.state)) return;
 
 						logger.time("infer dependency usage");
@@ -97,7 +103,7 @@ class InnerGraphPlugin {
 
 					// The following hooks are used during prewalking:
 
-					parser.hooks.preStatement.tap("InnerGraphPlugin", statement => {
+					parser.hooks.preStatement.tap(PLUGIN_NAME, statement => {
 						if (!InnerGraph.isEnabled(parser.state)) return;
 
 						if (parser.scope.topLevelScope === true) {
@@ -110,7 +116,7 @@ class InnerGraphPlugin {
 						}
 					});
 
-					parser.hooks.blockPreStatement.tap("InnerGraphPlugin", statement => {
+					parser.hooks.blockPreStatement.tap(PLUGIN_NAME, statement => {
 						if (!InnerGraph.isEnabled(parser.state)) return;
 
 						if (parser.scope.topLevelScope === true) {
@@ -143,33 +149,30 @@ class InnerGraphPlugin {
 						}
 					});
 
-					parser.hooks.preDeclarator.tap(
-						"InnerGraphPlugin",
-						(decl, statement) => {
-							if (!InnerGraph.isEnabled(parser.state)) return;
-							if (
-								parser.scope.topLevelScope === true &&
-								decl.init &&
-								decl.id.type === "Identifier"
-							) {
-								const name = decl.id.name;
-								if (decl.init.type === "ClassExpression") {
-									const fn = InnerGraph.tagTopLevelSymbol(parser, name);
-									classWithTopLevelSymbol.set(decl.init, fn);
-								} else if (parser.isPure(decl.init, decl.id.range[1])) {
-									const fn = InnerGraph.tagTopLevelSymbol(parser, name);
-									declWithTopLevelSymbol.set(decl, fn);
-									if (
-										!decl.init.type.endsWith("FunctionExpression") &&
-										decl.init.type !== "Literal"
-									) {
-										pureDeclarators.add(decl);
-									}
-									return true;
+					parser.hooks.preDeclarator.tap(PLUGIN_NAME, (decl, statement) => {
+						if (!InnerGraph.isEnabled(parser.state)) return;
+						if (
+							parser.scope.topLevelScope === true &&
+							decl.init &&
+							decl.id.type === "Identifier"
+						) {
+							const name = decl.id.name;
+							if (decl.init.type === "ClassExpression") {
+								const fn = InnerGraph.tagTopLevelSymbol(parser, name);
+								classWithTopLevelSymbol.set(decl.init, fn);
+							} else if (parser.isPure(decl.init, decl.id.range[1])) {
+								const fn = InnerGraph.tagTopLevelSymbol(parser, name);
+								declWithTopLevelSymbol.set(decl, fn);
+								if (
+									!decl.init.type.endsWith("FunctionExpression") &&
+									decl.init.type !== "Literal"
+								) {
+									pureDeclarators.add(decl);
 								}
+								return true;
 							}
 						}
-					);
+					});
 
 					// During real walking we set the TopLevelSymbol state to the assigned
 					// TopLevelSymbol by using the fill datastructures.
@@ -187,7 +190,7 @@ class InnerGraphPlugin {
 
 					// The following hooks are called during walking:
 
-					parser.hooks.statement.tap("InnerGraphPlugin", statement => {
+					parser.hooks.statement.tap(PLUGIN_NAME, statement => {
 						if (!InnerGraph.isEnabled(parser.state)) return;
 						if (parser.scope.topLevelScope === true) {
 							InnerGraph.setTopLevelSymbol(parser.state, undefined);
@@ -219,7 +222,7 @@ class InnerGraphPlugin {
 					});
 
 					parser.hooks.classExtendsExpression.tap(
-						"InnerGraphPlugin",
+						PLUGIN_NAME,
 						(expr, statement) => {
 							if (!InnerGraph.isEnabled(parser.state)) return;
 							if (parser.scope.topLevelScope === true) {
@@ -239,7 +242,7 @@ class InnerGraphPlugin {
 					);
 
 					parser.hooks.classBodyElement.tap(
-						"InnerGraphPlugin",
+						PLUGIN_NAME,
 						(element, classDefinition) => {
 							if (!InnerGraph.isEnabled(parser.state)) return;
 							if (parser.scope.topLevelScope === true) {
@@ -252,7 +255,7 @@ class InnerGraphPlugin {
 					);
 
 					parser.hooks.classBodyValue.tap(
-						"InnerGraphPlugin",
+						PLUGIN_NAME,
 						(expression, element, classDefinition) => {
 							if (!InnerGraph.isEnabled(parser.state)) return;
 							if (parser.scope.topLevelScope === true) {
@@ -292,7 +295,7 @@ class InnerGraphPlugin {
 						}
 					);
 
-					parser.hooks.declarator.tap("InnerGraphPlugin", (decl, statement) => {
+					parser.hooks.declarator.tap(PLUGIN_NAME, (decl, statement) => {
 						if (!InnerGraph.isEnabled(parser.state)) return;
 						const fn = declWithTopLevelSymbol.get(decl);
 
@@ -330,7 +333,7 @@ class InnerGraphPlugin {
 
 					parser.hooks.expression
 						.for(topLevelSymbolTag)
-						.tap("InnerGraphPlugin", () => {
+						.tap(PLUGIN_NAME, () => {
 							const topLevelSymbol = /** @type {TopLevelSymbol} */ (
 								parser.currentTagData
 							);
@@ -343,21 +346,19 @@ class InnerGraphPlugin {
 								currentTopLevelSymbol || true
 							);
 						});
-					parser.hooks.assign
-						.for(topLevelSymbolTag)
-						.tap("InnerGraphPlugin", expr => {
-							if (!InnerGraph.isEnabled(parser.state)) return;
-							if (expr.operator === "=") return true;
-						});
+					parser.hooks.assign.for(topLevelSymbolTag).tap(PLUGIN_NAME, expr => {
+						if (!InnerGraph.isEnabled(parser.state)) return;
+						if (expr.operator === "=") return true;
+					});
 				};
 				normalModuleFactory.hooks.parser
-					.for("javascript/auto")
-					.tap("InnerGraphPlugin", handler);
+					.for(JAVASCRIPT_MODULE_TYPE_AUTO)
+					.tap(PLUGIN_NAME, handler);
 				normalModuleFactory.hooks.parser
-					.for("javascript/esm")
-					.tap("InnerGraphPlugin", handler);
+					.for(JAVASCRIPT_MODULE_TYPE_ESM)
+					.tap(PLUGIN_NAME, handler);
 
-				compilation.hooks.finishModules.tap("InnerGraphPlugin", () => {
+				compilation.hooks.finishModules.tap(PLUGIN_NAME, () => {
 					logger.timeAggregateEnd("infer dependency usage");
 				});
 			}

package/lib/optimize/SideEffectsFlagPlugin.js

@@ -6,6 +6,11 @@
 "use strict";
 
 const glob2regexp = require("glob-to-regexp");
+const {
+	JAVASCRIPT_MODULE_TYPE_AUTO,
+	JAVASCRIPT_MODULE_TYPE_ESM,
+	JAVASCRIPT_MODULE_TYPE_DYNAMIC
+} = require("../ModuleTypeConstants");
 const { STAGE_DEFAULT } = require("../OptimizationStages");
 const HarmonyExportImportedSpecifierDependency = require("../dependencies/HarmonyExportImportedSpecifierDependency");
 const HarmonyImportSpecifierDependency = require("../dependencies/HarmonyImportSpecifierDependency");
@@ -50,6 +55,8 @@ const globToRegexp = (glob, cache) => {
 	return regexp;
 };
 
+const PLUGIN_NAME = "SideEffectsFlagPlugin";
+
 class SideEffectsFlagPlugin {
 	/**
 	 * @param {boolean} analyseSource analyse source code for side effects
@@ -69,48 +76,41 @@ class SideEffectsFlagPlugin {
 			globToRegexpCache.set(compiler.root, cache);
 		}
 		compiler.hooks.compilation.tap(
-			"SideEffectsFlagPlugin",
+			PLUGIN_NAME,
 			(compilation, { normalModuleFactory }) => {
 				const moduleGraph = compilation.moduleGraph;
-				normalModuleFactory.hooks.module.tap(
-					"SideEffectsFlagPlugin",
-					(module, data) => {
-						const resolveData = data.resourceResolveData;
-						if (
-							resolveData &&
-							resolveData.descriptionFileData &&
-							resolveData.relativePath
-						) {
-							const sideEffects = resolveData.descriptionFileData.sideEffects;
-							if (sideEffects !== undefined) {
-								if (module.factoryMeta === undefined) {
-									module.factoryMeta = {};
-								}
-								const hasSideEffects =
-									SideEffectsFlagPlugin.moduleHasSideEffects(
-										resolveData.relativePath,
-										sideEffects,
-										cache
-									);
-								module.factoryMeta.sideEffectFree = !hasSideEffects;
-							}
-						}
-
-						return module;
-					}
-				);
-				normalModuleFactory.hooks.module.tap(
-					"SideEffectsFlagPlugin",
-					(module, data) => {
-						if (typeof data.settings.sideEffects === "boolean") {
+				normalModuleFactory.hooks.module.tap(PLUGIN_NAME, (module, data) => {
+					const resolveData = data.resourceResolveData;
+					if (
+						resolveData &&
+						resolveData.descriptionFileData &&
+						resolveData.relativePath
+					) {
+						const sideEffects = resolveData.descriptionFileData.sideEffects;
+						if (sideEffects !== undefined) {
 							if (module.factoryMeta === undefined) {
 								module.factoryMeta = {};
 							}
-							module.factoryMeta.sideEffectFree = !data.settings.sideEffects;
+							const hasSideEffects = SideEffectsFlagPlugin.moduleHasSideEffects(
+								resolveData.relativePath,
+								sideEffects,
+								cache
+							);
+							module.factoryMeta.sideEffectFree = !hasSideEffects;
 						}
-						return module;
 					}
-				);
+
+					return module;
+				});
+				normalModuleFactory.hooks.module.tap(PLUGIN_NAME, (module, data) => {
+					if (typeof data.settings.sideEffects === "boolean") {
+						if (module.factoryMeta === undefined) {
+							module.factoryMeta = {};
+						}
+						module.factoryMeta.sideEffectFree = !data.settings.sideEffects;
+					}
+					return module;
+				});
 				if (this._analyseSource) {
 					/**
 					 * @param {JavascriptParser} parser the parser
@@ -118,11 +118,11 @@ class SideEffectsFlagPlugin {
 					 */
 					const parserHandler = parser => {
 						let sideEffectsStatement;
-						parser.hooks.program.tap("SideEffectsFlagPlugin", () => {
+						parser.hooks.program.tap(PLUGIN_NAME, () => {
 							sideEffectsStatement = undefined;
 						});
 						parser.hooks.statement.tap(
-							{ name: "SideEffectsFlagPlugin", stage: -100 },
+							{ name: PLUGIN_NAME, stage: -100 },
 							statement => {
 								if (sideEffectsStatement) return;
 								if (parser.scope.topLevelScope !== true) return;
@@ -203,7 +203,7 @@ class SideEffectsFlagPlugin {
 								}
 							}
 						);
-						parser.hooks.finish.tap("SideEffectsFlagPlugin", () => {
+						parser.hooks.finish.tap(PLUGIN_NAME, () => {
 							if (sideEffectsStatement === undefined) {
 								parser.state.module.buildMeta.sideEffectFree = true;
 							} else {
@@ -220,18 +220,18 @@ class SideEffectsFlagPlugin {
 						});
 					};
 					for (const key of [
-						"javascript/auto",
-						"javascript/esm",
-						"javascript/dynamic"
+						JAVASCRIPT_MODULE_TYPE_AUTO,
+						JAVASCRIPT_MODULE_TYPE_ESM,
+						JAVASCRIPT_MODULE_TYPE_DYNAMIC
 					]) {
 						normalModuleFactory.hooks.parser
 							.for(key)
-							.tap("SideEffectsFlagPlugin", parserHandler);
+							.tap(PLUGIN_NAME, parserHandler);
 					}
 				}
 				compilation.hooks.optimizeDependencies.tap(
 					{
-						name: "SideEffectsFlagPlugin",
+						name: PLUGIN_NAME,
 						stage: STAGE_DEFAULT
 					},
 					modules => {

package/lib/sharing/ConsumeSharedPlugin.js

@@ -224,6 +224,10 @@ class ConsumeSharedPlugin {
 										);
 										return resolve();
 									}
+									if (data.name === packageName) {
+										// Package self-referencing
+										return resolve();
+									}
 									const requiredVersion = getRequiredVersionFromDescriptionFile(
 										data,
 										packageName

package/lib/wasm-async/AsyncWebAssemblyModulesPlugin.js

@@ -9,6 +9,7 @@ const { SyncWaterfallHook } = require("tapable");
 const Compilation = require("../Compilation");
 const Generator = require("../Generator");
 const { tryRunOrWebpackError } = require("../HookWebpackError");
+const { WEBASSEMBLY_MODULE_TYPE_ASYNC } = require("../ModuleTypeConstants");
 const WebAssemblyImportDependency = require("../dependencies/WebAssemblyImportDependency");
 const { compareModulesByIdentifier } = require("../util/comparators");
 const memoize = require("../util/memoize");
@@ -53,6 +54,8 @@ const getAsyncWebAssemblyParser = memoize(() =>
 /** @type {WeakMap<Compilation, CompilationHooks>} */
 const compilationHooksMap = new WeakMap();
 
+const PLUGIN_NAME = "AsyncWebAssemblyModulesPlugin";
+
 class AsyncWebAssemblyModulesPlugin {
 	/**
 	 * @param {Compilation} compilation the compilation
@@ -89,7 +92,7 @@ class AsyncWebAssemblyModulesPlugin {
 	 */
 	apply(compiler) {
 		compiler.hooks.compilation.tap(
-			"AsyncWebAssemblyModulesPlugin",
+			PLUGIN_NAME,
 			(compilation, { normalModuleFactory }) => {
 				const hooks =
 					AsyncWebAssemblyModulesPlugin.getCompilationHooks(compilation);
@@ -99,15 +102,15 @@ class AsyncWebAssemblyModulesPlugin {
 				);
 
 				normalModuleFactory.hooks.createParser
-					.for("webassembly/async")
-					.tap("AsyncWebAssemblyModulesPlugin", () => {
+					.for(WEBASSEMBLY_MODULE_TYPE_ASYNC)
+					.tap(PLUGIN_NAME, () => {
 						const AsyncWebAssemblyParser = getAsyncWebAssemblyParser();
 
 						return new AsyncWebAssemblyParser();
 					});
 				normalModuleFactory.hooks.createGenerator
-					.for("webassembly/async")
-					.tap("AsyncWebAssemblyModulesPlugin", () => {
+					.for(WEBASSEMBLY_MODULE_TYPE_ASYNC)
+					.tap(PLUGIN_NAME, () => {
 						const AsyncWebAssemblyJavascriptGenerator =
 							getAsyncWebAssemblyJavascriptGenerator();
 						const AsyncWebAssemblyGenerator = getAsyncWebAssemblyGenerator();
@@ -135,7 +138,7 @@ class AsyncWebAssemblyModulesPlugin {
 							chunk,
 							compareModulesByIdentifier
 						)) {
-							if (module.type === "webassembly/async") {
+							if (module.type === WEBASSEMBLY_MODULE_TYPE_ASYNC) {
 								const filenameTemplate =
 									outputOptions.webassemblyModuleFilename;