webpack 5.111.1 → 5.112.1

package/lib/{ConcatenationScope.js → optimize/ConcatenationScope.js}

@@ -8,16 +8,16 @@
 const {
 	DEFAULT_EXPORT,
 	NAMESPACE_OBJECT_EXPORT
-} = require("./util/concatenate");
+} = require("../util/concatenate");
 
 /** @import { Source } from "webpack-sources" */
-/** @import Module from "./Module" */
+/** @import Module from "../module/Module" */
 /**
  * @import {
  * 	ConcatenatedModuleInfo,
  * 	ModuleInfo,
  * 	ExportName as Ids
- * } from "./optimize/ConcatenatedModule"
+ * } from "./ConcatenatedModule"
  */
 
 /** @typedef {{ start: number, end: number, name: string, leaked: boolean }} ModuleReferenceMatch */
@@ -39,6 +39,41 @@ const IDENTIFIER_CHARACTER_REGEXP = /[\w$]/;
 /** @type {WeakMap<Source, ModuleReferenceMatch[]>} */
 const moduleReferencesCache = new WeakMap();
 
+/**
+ * Hex encodings of the export paths a concatenation references, keyed by the
+ * module map every scope of that concatenation shares, so they die with it.
+ * @type {WeakMap<Map<Module, ModuleInfo>, { single: Map<string, string>, multi: Map<string, string> }>}
+ */
+const exportDataCache = new WeakMap();
+
+/**
+ * Hex-encodes one export path. A path is named by many references over one
+ * concatenation, so the encoding is cached rather than rebuilt per reference.
+ * @param {Map<Module, ModuleInfo>} modulesMap the scope's module map
+ * @param {string[]} ids the export path
+ * @returns {string} the hex encoding of the path
+ */
+const encodeExportData = (modulesMap, ids) => {
+	let caches = exportDataCache.get(modulesMap);
+	if (caches === undefined) {
+		caches = { single: new Map(), multi: new Map() };
+		exportDataCache.set(modulesMap, caches);
+	}
+	// a one-element path is keyed by the element itself, so the common case
+	// costs no key building; anything longer is keyed by its JSON
+	const single = ids.length === 1;
+	const cache = single ? caches.single : caches.multi;
+	const key = single ? ids[0] : JSON.stringify(ids);
+	const cached = cache.get(key);
+	if (cached !== undefined) return cached;
+	const encoded = Buffer.from(
+		single ? JSON.stringify(ids) : key,
+		"utf8"
+	).toString("hex");
+	cache.set(key, encoded);
+	return encoded;
+};
+
 /**
  * Encodes how a concatenated module reference should be interpreted when it is
  * later reconstructed from its placeholder identifier.
@@ -217,9 +252,7 @@ class ConcatenationScope {
 			: asiSafe === false
 				? "_asiSafe0"
 				: "";
-		const exportData = ids
-			? Buffer.from(JSON.stringify(ids), "utf8").toString("hex")
-			: "ns";
+		const exportData = ids ? encodeExportData(this._modulesMap, ids) : "ns";
 		// a "._" is appended to allow "delete ...", which would cause a SyntaxError in strict mode
 		return `__WEBPACK_MODULE_REFERENCE__${info.index}_${exportData}${callFlag}${directImportFlag}${deferredImportFlag}${mangleableNamespaceFlag}${moduleExportsAccessFlag}${asiSafeFlag}__._`;
 	}

package/lib/optimize/ConstExportsPlugin.js

@@ -5,14 +5,14 @@
 
 "use strict";
 
-const CircularModulesPlugin = require("../CircularModulesPlugin");
-const { UsageState } = require("../ExportsInfo");
+const { UsageState } = require("../graph/ExportsInfo");
+const BasicEvaluatedExpression = require("../javascript/BasicEvaluatedExpression");
+const { VariableInfoFlags } = require("../javascript/JavascriptParser");
 const {
 	JAVASCRIPT_MODULE_TYPE_AUTO,
 	JAVASCRIPT_MODULE_TYPE_ESM
-} = require("../ModuleTypeConstants");
-const BasicEvaluatedExpression = require("../javascript/BasicEvaluatedExpression");
-const { VariableInfoFlags } = require("../javascript/JavascriptParser");
+} = require("../module/ModuleTypeConstants");
+const CircularModulesPlugin = require("./CircularModulesPlugin");
 const {
 	InlinedUsedName,
 	enableInlineExports,
@@ -23,7 +23,7 @@ const { CircularKind } = CircularModulesPlugin;
 
 /** @import { InlinedValue } from "./InlineExports" */
 /** @import Compiler from "../Compiler" */
-/** @import ExportsInfo from "../ExportsInfo" */
+/** @import ExportsInfo from "../graph/ExportsInfo" */
 /** @import JavascriptParser from "../javascript/JavascriptParser" */
 /**
  * @import {
@@ -159,7 +159,7 @@ class ConstExportsPlugin {
 
 				if (!this.options.inlineExports) return;
 
-				// Lets HarmonyImportSpecifierDependency.getCondition skip the inline check
+				// Lets ESMImportSpecifierDependency.getCondition skip the inline check
 				// (and stay unconditional) when this plugin is not active
 				enableInlineExports(compilation.moduleGraph);
 

package/lib/optimize/EnsureChunkConditionsPlugin.js

@@ -5,10 +5,10 @@
 
 "use strict";
 
-const { STAGE_BASIC } = require("../OptimizationStages");
+const { STAGE_BASIC } = require("./OptimizationStages");
 
-/** @import Chunk from "../Chunk" */
-/** @import ChunkGroup from "../ChunkGroup" */
+/** @import Chunk from "../graph/Chunk" */
+/** @import ChunkGroup from "../graph/ChunkGroup" */
 /** @import Compiler from "../Compiler" */
 
 const PLUGIN_NAME = "EnsureChunkConditionsPlugin";

package/lib/{FlagAllModulesAsUsedPlugin.js → optimize/FlagAllModulesAsUsedPlugin.js}

@@ -5,10 +5,10 @@
 
 "use strict";
 
-const { getEntryRuntime, mergeRuntimeOwned } = require("./util/runtime");
+const { getEntryRuntime, mergeRuntimeOwned } = require("../util/runtime");
 
-/** @import Compiler from "./Compiler" */
-/** @import { RuntimeSpec } from "./util/runtime" */
+/** @import Compiler from "../Compiler" */
+/** @import { RuntimeSpec } from "../util/runtime" */
 
 const PLUGIN_NAME = "FlagAllModulesAsUsedPlugin";
 class FlagAllModulesAsUsedPlugin {

package/lib/{FlagDependencyExportsPlugin.js → optimize/FlagDependencyExportsPlugin.js}

@@ -5,24 +5,24 @@
 
 "use strict";
 
-const Queue = require("./util/Queue");
-const asyncLib = require("./util/async");
-const { compareModulesByIdentifier } = require("./util/comparators");
-const createHash = require("./util/createHash");
+const asyncLib = require("../util/async");
+const { compareModulesByIdentifier } = require("../util/comparators");
+const createHash = require("../util/createHash");
+const Queue = require("./Queue");
 
-/** @import Compiler from "./Compiler" */
-/** @import DependenciesBlock from "./DependenciesBlock" */
+/** @import Compiler from "../Compiler" */
+/** @import DependenciesBlock from "../graph/DependenciesBlock" */
 /**
  * @import Dependency, {
  * 	ExportSpec,
  * 	ExportsSpec,
  * 	ExportInfoName
- * } from "./Dependency"
+ * } from "../graph/Dependency"
  */
-/** @import ExportsInfo, { RestoreProvidedData } from "./ExportsInfo" */
-/** @import { HashFunction } from "../declarations/WebpackOptions" */
-/** @import LazyBarrelController from "./LazyBarrel" */
-/** @import Module, { BuildInfo } from "./Module" */
+/** @import ExportsInfo, { RestoreProvidedData } from "../graph/ExportsInfo" */
+/** @import { HashFunction } from "../../declarations/WebpackOptions" */
+/** @import LazyBarrels from "./LazyBarrels" */
+/** @import Module, { BuildInfo } from "../module/Module" */
 
 const PLUGIN_NAME = "FlagDependencyExportsPlugin";
 const PLUGIN_LOGGER_NAME = `webpack.${PLUGIN_NAME}`;
@@ -33,13 +33,13 @@ const PLUGIN_LOGGER_NAME = `webpack.${PLUGIN_NAME}`;
  * Cache key fragment for what changes provided exports without changing the
  * module's source: still-lazy barrel requests and DefinePlugin value versions.
  * @param {Module} module the module
- * @param {LazyBarrelController} lazyBarrelController the compilation's lazy barrel controller
+ * @param {LazyBarrels} lazyBarrels the compilation's lazy barrels
  * @param {HashFunction} hashFunction hash function for long keys
  * @returns {string} etag for provided-exports mem/persistent cache, "" when neither applies
  */
-const getProvidedExportsEtag = (module, lazyBarrelController, hashFunction) => {
-	const lazyRequests = lazyBarrelController.getLazyRequests(module);
-	const buildInfo = /** @type {BuildInfo | undefined} */ (module.buildInfo);
+const getProvidedExportsEtag = (module, lazyBarrels, hashFunction) => {
+	const lazyRequests = lazyBarrels.getLazyRequests(module);
+	const buildInfo = module.buildInfo;
 	const valueDependencies = buildInfo && buildInfo.valueDependencies;
 	const hasValueDependencies =
 		valueDependencies !== undefined && valueDependencies.size > 0;
@@ -80,7 +80,7 @@ class FlagDependencyExportsPlugin {
 		compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
 			const moduleGraph = compilation.moduleGraph;
 			const cache = compilation.getCache(PLUGIN_NAME);
-			const lazyBarrelController = compilation._lazyBarrelController;
+			const lazyBarrels = compilation._lazyBarrels;
 			const hashFunction = compilation.outputOptions.hashFunction;
 			compilation.hooks.finishModules.tapAsync(
 				PLUGIN_NAME,
@@ -134,7 +134,7 @@ class FlagDependencyExportsPlugin {
 							const memCacheEntry = memCache && memCache.get(this);
 							const etag = getProvidedExportsEtag(
 								module,
-								lazyBarrelController,
+								lazyBarrels,
 								hashFunction
 							);
 							// validated by the still-lazy request keys: reference-change
@@ -145,9 +145,8 @@ class FlagDependencyExportsPlugin {
 								exportsInfo.restoreProvided(memCacheEntry.data);
 								return callback();
 							}
-							const buildHash = /** @type {string} */ (
-								/** @type {BuildInfo} */ (module.buildInfo).hash
-							);
+							const buildHash = /** @type {BuildInfo} */ (module.buildInfo)
+								.hash;
 							cache.get(
 								module.identifier(),
 								etag ? `${buildHash}|${etag}` : buildHash,
@@ -391,10 +390,7 @@ class FlagDependencyExportsPlugin {
 											if (exports) {
 												const nestedExportsInfo =
 													exportInfo.createNestedExportsInfo();
-												mergeExports(
-													/** @type {ExportsInfo} */ (nestedExportsInfo),
-													exports
-												);
+												mergeExports(nestedExportsInfo, exports);
 											}
 
 											if (
@@ -534,7 +530,7 @@ class FlagDependencyExportsPlugin {
 										moduleMemCaches && moduleMemCaches.get(module);
 									const etag = getProvidedExportsEtag(
 										module,
-										lazyBarrelController,
+										lazyBarrels,
 										hashFunction
 									);
 									if (memCache) {
@@ -545,9 +541,8 @@ class FlagDependencyExportsPlugin {
 										};
 										memCache.set(this, entry);
 									}
-									const buildHash = /** @type {string} */ (
-										/** @type {BuildInfo} */ (module.buildInfo).hash
-									);
+									const buildHash = /** @type {BuildInfo} */ (module.buildInfo)
+										.hash;
 									cache.store(
 										module.identifier(),
 										etag ? `${buildHash}|${etag}` : buildHash,

package/lib/{FlagDependencyUsagePlugin.js → optimize/FlagDependencyUsagePlugin.js}

@@ -5,21 +5,21 @@
 
 "use strict";
 
-const Dependency = require("./Dependency");
-const { UsageState } = require("./ExportsInfo");
-const ModuleGraphConnection = require("./ModuleGraphConnection");
+const Dependency = require("../graph/Dependency");
+const { UsageState } = require("../graph/ExportsInfo");
+const ModuleGraphConnection = require("../graph/ModuleGraphConnection");
+const ArrayQueue = require("../util/ArrayQueue");
+const TupleSet = require("../util/TupleSet");
+const { getEntryRuntime, mergeRuntimeOwned } = require("../util/runtime");
 const { STAGE_DEFAULT } = require("./OptimizationStages");
-const ArrayQueue = require("./util/ArrayQueue");
-const TupleQueue = require("./util/TupleQueue");
-const TupleSet = require("./util/TupleSet");
-const { getEntryRuntime, mergeRuntimeOwned } = require("./util/runtime");
+const TupleQueue = require("./TupleQueue");
 
-/** @import Compiler from "./Compiler" */
-/** @import DependenciesBlock from "./DependenciesBlock" */
-/** @import { ReferencedExport, ReferencedExports } from "./Dependency" */
-/** @import ExportsInfo from "./ExportsInfo" */
-/** @import Module from "./Module" */
-/** @import { RuntimeSpec } from "./util/runtime" */
+/** @import Compiler from "../Compiler" */
+/** @import DependenciesBlock from "../graph/DependenciesBlock" */
+/** @import { ExportInfoName, ReferencedExport, ReferencedExports } from "../graph/Dependency" */
+/** @import ExportsInfo from "../graph/ExportsInfo" */
+/** @import Module from "../module/Module" */
+/** @import { RuntimeSpec } from "../util/runtime" */
 
 const {
 	NO_EXPORTS_REFERENCED,
@@ -33,12 +33,12 @@ const PLUGIN_LOGGER_NAME = `webpack.${PLUGIN_NAME}`;
 // Hoisted stateless predicates for setUsedConditionally on the innermost
 // used-export loop, so they aren't re-allocated per export.
 /**
- * @param {import("./ExportsInfo").UsageStateType} used usage state
+ * @param {import("../graph/ExportsInfo").UsageStateType} used usage state
  * @returns {boolean} whether unused
  */
 const IS_UNUSED = (used) => used === UsageState.Unused;
 /**
- * @param {import("./ExportsInfo").UsageStateType} used usage state
+ * @param {import("../graph/ExportsInfo").UsageStateType} used usage state
  * @returns {boolean} whether not used
  */
 const IS_NOT_USED = (used) => used !== UsageState.Used;
@@ -77,10 +77,29 @@ class FlagDependencyUsagePlugin {
 					/** @type {Map<ExportsInfo, Module>} */
 					const exportInfoToModuleMap = new Map();
 
-					/** @type {TupleQueue<Module, RuntimeSpec>} */
+					/**
+					 * Returns the module owning an export of a nested exports info. A
+					 * nested exports info redirecting to a module's exports owns only
+					 * its own names, the rest belong to the redirect target.
+					 * @param {ExportsInfo} exportsInfo nested exports info
+					 * @param {ExportInfoName} name export name
+					 * @returns {Module | undefined} the module owning the export
+					 */
+					const getExportOwnerModule = (exportsInfo, name) => {
+						/** @type {ExportsInfo | undefined} */
+						let current = exportsInfo;
+						while (current !== undefined) {
+							const owner = exportInfoToModuleMap.get(current);
+							if (owner !== undefined) return owner;
+							if (current._exports.has(name)) return;
+							current = current._redirectTo;
+						}
+					};
+
+					/** @type {TupleQueue<[Module], RuntimeSpec>} */
 					const queue = new TupleQueue();
 
-					/** @type {TupleSet<Module, RuntimeSpec> | undefined} */
+					/** @type {TupleSet<[Module], RuntimeSpec> | undefined} */
 					let walkedSideEffectFreeModules;
 
 					/**
@@ -179,7 +198,10 @@ class FlagDependencyUsagePlugin {
 													const currentModule =
 														currentExportsInfo === exportsInfo
 															? module
-															: exportInfoToModuleMap.get(currentExportsInfo);
+															: getExportOwnerModule(
+																	currentExportsInfo,
+																	usedExport[i]
+																);
 													if (currentModule) {
 														queue.enqueue(currentModule, runtime);
 													}
@@ -198,7 +220,10 @@ class FlagDependencyUsagePlugin {
 											const currentModule =
 												currentExportsInfo === exportsInfo
 													? module
-													: exportInfoToModuleMap.get(currentExportsInfo);
+													: getExportOwnerModule(
+															currentExportsInfo,
+															usedExport[i]
+														);
 											if (currentModule) {
 												queue.enqueue(currentModule, runtime);
 											}

package/lib/{FlagEntryExportAsUsedPlugin.js → optimize/FlagEntryExportAsUsedPlugin.js}

@@ -5,9 +5,9 @@
 
 "use strict";
 
-const { getEntryRuntime } = require("./util/runtime");
+const { getEntryRuntime } = require("../util/runtime");
 
-/** @import Compiler from "./Compiler" */
+/** @import Compiler from "../Compiler" */
 
 const PLUGIN_NAME = "FlagEntryExportAsUsedPlugin";
 

package/lib/optimize/FlagIncludedChunksPlugin.js

@@ -7,9 +7,9 @@
 
 const { compareIds } = require("../util/comparators");
 
-/** @import Chunk, { ChunkId } from "../Chunk" */
+/** @import Chunk, { ChunkId } from "../graph/Chunk" */
 /** @import Compiler from "../Compiler" */
-/** @import Module from "../Module" */
+/** @import Module from "../module/Module" */
 
 const PLUGIN_NAME = "FlagIncludedChunksPlugin";
 

package/lib/optimize/InlineExports.js

@@ -14,8 +14,8 @@ const { propertyAccess } = require("../util/property");
  * 	ObjectSerializerContext
  * } from "../serialization/ObjectMiddleware"
  */
-/** @import ModuleGraph from "../ModuleGraph" */
-/** @import Module from "../Module" */
+/** @import ModuleGraph from "../graph/ModuleGraph" */
+/** @import Module from "../module/Module" */
 /** @import { RuntimeSpec } from "../util/runtime" */
 /** @import Hash from "../util/Hash" */
 
@@ -170,11 +170,7 @@ const isInlineExportsEnabled = (moduleGraph) =>
  * @returns {boolean} true when inlining is enabled for this module
  */
 const isInlineEnabled = (module) =>
-	Boolean(
-		module.buildInfo &&
-		/** @type {import("../Module").BuildInfo} */
-		(module.buildInfo).inlineExports
-	);
+	Boolean(module.buildInfo && module.buildInfo.inlineExports);
 
 /**
  * Check whether an import to `module` for `ids` resolves to an inlined value.
@@ -190,11 +186,20 @@ const isExportInlined = (moduleGraph, module, ids, runtime) => {
 	return moduleGraph.getExportsInfo(module).hasInlinedUsedName(ids, runtime);
 };
 
+/**
+ * Whether a used name is an inlined value rather than a property name.
+ * @template V
+ * @param {V} value a used name
+ * @returns {value is Extract<V, InlinedUsedName>} true when the value is inlined
+ */
+const isInlinedUsedName = (value) => value instanceof InlinedUsedName;
+
 module.exports.InlinedUsedName = InlinedUsedName;
 module.exports.InlinedValue = InlinedValue;
 module.exports.MAX_INLINE_BYTES = MAX_INLINE_BYTES;
 module.exports.enableInlineExports = enableInlineExports;
 module.exports.isExportInlined = isExportInlined;
 module.exports.isInlineEnabled = isInlineEnabled;
+module.exports.isInlinedUsedName = isInlinedUsedName;
 module.exports.isInlineExportsEnabled = isInlineExportsEnabled;
 module.exports.toInlinedValue = toInlinedValue;

package/lib/optimize/InnerGraph.js

@@ -5,14 +5,14 @@
 
 "use strict";
 
-const { UsageState } = require("../ExportsInfo");
+const { UsageState } = require("../graph/ExportsInfo");
 const JavascriptParser = require("../javascript/JavascriptParser");
 
 /** @import Compilation from "../Compilation" */
-/** @import Dependency, { GetConditionFn } from "../Dependency" */
-/** @import Module from "../Module" */
-/** @import ModuleGraph from "../ModuleGraph" */
-/** @import { ParserState } from "../Parser" */
+/** @import Dependency, { GetConditionFn } from "../graph/Dependency" */
+/** @import Module from "../module/Module" */
+/** @import ModuleGraph from "../graph/ModuleGraph" */
+/** @import { ParserState } from "../module/Parser" */
 /** @import { RuntimeSpec } from "../util/runtime" */
 
 /** @typedef {boolean | ((compilation: Compilation, module: Module) => boolean)} PureCondition */
@@ -485,12 +485,4 @@ module.exports.getInnerGraphUtils = (compilation) => {
 	return utils;
 };
 
-/**
- * Usage callback map.
- * @param {Dependency} dependency the dependency
- * @param {UsedByExports | undefined} usedByExports usedByExports info
- * @param {ModuleGraph} moduleGraph moduleGraph
- * @returns {null | false | GetConditionFn} function to determine if the connection is active
- */
-
 module.exports.topLevelSymbolTag = topLevelSymbolTag;

package/lib/optimize/InnerGraphPlugin.js

@@ -5,17 +5,17 @@
 
 "use strict";
 
+const {
+	harmonySpecifierTag
+} = require("../dependencies/esm/ESMImportDependencyParserPlugin");
+const isDependencyKind = require("../graph/isDependencyKind");
 const {
 	JAVASCRIPT_MODULE_TYPE_AUTO,
 	JAVASCRIPT_MODULE_TYPE_ESM
-} = require("../ModuleTypeConstants");
-const RuntimeGlobals = require("../RuntimeGlobals");
-const {
-	harmonySpecifierTag
-} = require("../dependencies/HarmonyImportDependencyParserPlugin");
-const HarmonyImportSideEffectDependency = require("../dependencies/HarmonyImportSideEffectDependency");
-const PureExpressionDependency = require("../dependencies/PureExpressionDependency");
+} = require("../module/ModuleTypeConstants");
+const RuntimeGlobals = require("../runtime/RuntimeGlobals");
 const { getInnerGraphUtils, topLevelSymbolTag } = require("./InnerGraph");
+const PureExpressionDependency = require("./PureExpressionDependency");
 
 /**
  * @import {
@@ -36,8 +36,8 @@ const { getInnerGraphUtils, topLevelSymbolTag } = require("./InnerGraph");
  */
 /** @import Compilation from "../Compilation" */
 /** @import Compiler from "../Compiler" */
-/** @import Dependency from "../Dependency" */
-/** @import Module from "../Module" */
+/** @import Dependency from "../graph/Dependency" */
+/** @import Module from "../module/Module" */
 /** @import JavascriptParser, { Range } from "../javascript/JavascriptParser" */
 /** @import { TopLevelSymbol } from "./InnerGraph" */
 
@@ -185,7 +185,7 @@ class InnerGraphPlugin {
 								const moduleGraph = compilation.moduleGraph;
 								for (const dep of module.dependencies) {
 									if (
-										dep instanceof HarmonyImportSideEffectDependency &&
+										isDependencyKind(dep, "esm-side-effect-import") &&
 										dep.request === source
 									) {
 										const m = moduleGraph.getModule(dep);