webpack 5.106.1 → 5.107.0

package/lib/optimize/ConcatenatedModule.js

@@ -14,6 +14,7 @@ const {
 	ReplaceSource
 } = require("webpack-sources");
 const ConcatenationScope = require("../ConcatenationScope");
+const Dependency = require("../Dependency");
 const { UsageState } = require("../ExportsInfo");
 const Module = require("../Module");
 const {
@@ -24,7 +25,6 @@ const { JAVASCRIPT_MODULE_TYPE_ESM } = require("../ModuleTypeConstants");
 const RuntimeGlobals = require("../RuntimeGlobals");
 const Template = require("../Template");
 const { DEFAULTS } = require("../config/defaults");
-const HarmonyImportDependency = require("../dependencies/HarmonyImportDependency");
 const { ImportPhaseUtils } = require("../dependencies/ImportPhase");
 const JavascriptParser = require("../javascript/JavascriptParser");
 const {
@@ -55,15 +55,14 @@ const {
 	subtractRuntimeCondition
 } = require("../util/runtime");
 
-/** @typedef {import("eslint-scope").Reference} Reference */
-/** @typedef {import("eslint-scope").Scope} Scope */
-/** @typedef {import("eslint-scope").Variable} Variable */
 /** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("../config/defaults").WebpackOptionsNormalizedWithDefaults} WebpackOptions */
 /** @typedef {import("../ChunkGraph")} ChunkGraph */
 /** @typedef {import("../CodeGenerationResults")} CodeGenerationResults */
 /** @typedef {import("../Compilation")} Compilation */
 /** @typedef {import("../Dependency").UpdateHashContext} UpdateHashContext */
+/** @typedef {import("../dependencies/ModuleDependency")} ModuleDependency */
+/** @typedef {import("../dependencies/HarmonyImportDependency")} HarmonyImportDependency */
 /** @typedef {import("../DependencyTemplates")} DependencyTemplates */
 /** @typedef {import("../ExportsInfo").ExportInfo} ExportInfo */
 /** @typedef {import("../Module").BuildCallback} BuildCallback */
@@ -86,6 +85,9 @@ const {
 /** @typedef {import("../ResolverFactory").ResolverWithOptions} ResolverWithOptions */
 /** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
 /** @typedef {import("../javascript/JavascriptModulesPlugin").ChunkRenderContext} ChunkRenderContext */
+/** @typedef {import("../javascript/JavascriptModulesPlugin").Scope} Scope */
+/** @typedef {import("../javascript/JavascriptModulesPlugin").Reference} Reference */
+/** @typedef {import("../javascript/JavascriptModulesPlugin").Variable} Variable */
 /** @typedef {import("../javascript/JavascriptParser").Program} Program */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
@@ -362,6 +364,20 @@ const getFinalBinding = (
 				switch (exportName[0]) {
 					case "default":
 						exportName = exportName.slice(1);
+						if (deferred) {
+							// `ns.default` for a deferred default-with-named external
+							// module must read through the optimized `.a` getter
+							// (which lazily evaluates the module and returns its
+							// exports), not the proxy namespace itself — otherwise
+							// `typeof ns.default` / `ns.default instanceof X`
+							// observe the proxy instead of the actual default.
+							return {
+								info,
+								rawName: `${info.deferredName}.a`,
+								ids: exportName,
+								exportName
+							};
+						}
 						break;
 					case "__esModule":
 						return {
@@ -392,6 +408,18 @@ const getFinalBinding = (
 						exportName
 					};
 				}
+				if (deferred) {
+					// As with default-with-named above, `ns.default` for a
+					// deferred default-only external must read through the
+					// optimized `.a` getter so that `typeof` / `instanceof`
+					// observe the actual default value rather than the proxy.
+					return {
+						info,
+						rawName: `${info.deferredName}.a`,
+						ids: exportName,
+						exportName
+					};
+				}
 				break;
 			}
 			case "dynamic":
@@ -795,6 +823,7 @@ class ConcatenatedModule extends Module {
 	}
 
 	/**
+	 * Returns the source types this module can generate.
 	 * @returns {SourceTypes} types available (do not mutate)
 	 */
 	getSourceTypes() {
@@ -806,6 +835,7 @@ class ConcatenatedModule extends Module {
 	}
 
 	/**
+	 * Returns the unique identifier used to reference this module.
 	 * @returns {string} a unique identifier of the module
 	 */
 	identifier() {
@@ -813,6 +843,7 @@ class ConcatenatedModule extends Module {
 	}
 
 	/**
+	 * Returns a human-readable identifier for this module.
 	 * @param {RequestShortener} requestShortener the request shortener
 	 * @returns {string} a user readable identifier of the module
 	 */
@@ -823,6 +854,7 @@ class ConcatenatedModule extends Module {
 	}
 
 	/**
+	 * Gets the library identifier.
 	 * @param {LibIdentOptions} options options
 	 * @returns {LibIdent | null} an identifier for library inclusion
 	 */
@@ -831,6 +863,7 @@ class ConcatenatedModule extends Module {
 	}
 
 	/**
+	 * Returns the path used when matching this module against rule conditions.
 	 * @returns {NameForCondition | null} absolute path which should be used for condition matching (usually the resource path)
 	 */
 	nameForCondition() {
@@ -838,6 +871,7 @@ class ConcatenatedModule extends Module {
 	}
 
 	/**
+	 * Gets side effects connection state.
 	 * @param {ModuleGraph} moduleGraph the module graph
 	 * @returns {ConnectionState} how this module should be connected to referencing modules when consumed for side-effects only
 	 */
@@ -846,6 +880,7 @@ class ConcatenatedModule extends Module {
 	}
 
 	/**
+	 * Builds the module using the provided compilation context.
 	 * @param {WebpackOptions} options webpack options
 	 * @param {Compilation} compilation the compilation
 	 * @param {ResolverWithOptions} resolver the resolver
@@ -883,7 +918,7 @@ class ConcatenatedModule extends Module {
 			// populate dependencies
 			for (const d of m.dependencies.filter(
 				(dep) =>
-					!(dep instanceof HarmonyImportDependency) ||
+					!Dependency.canConcatenate(dep) ||
 					!this._modules.has(
 						/** @type {Module} */
 						(compilation.moduleGraph.getModule(dep))
@@ -891,6 +926,20 @@ class ConcatenatedModule extends Module {
 			)) {
 				this.dependencies.push(d);
 			}
+			// populate codeGenerationDependencies — the inner modules'
+			// templates are applied during ConcatenatedModule.codeGeneration,
+			// so the referenced modules must have been code-generated by then.
+			// Skip references that point back into the concat set itself.
+			if (m.codeGenerationDependencies !== undefined) {
+				for (const d of m.codeGenerationDependencies) {
+					const referenced =
+						/** @type {Module} */
+						(compilation.moduleGraph.getModule(d));
+					if (!this._modules.has(referenced)) {
+						this.addCodeGenerationDependency(d);
+					}
+				}
+			}
 			// populate blocks
 			for (const d of m.blocks) {
 				this.blocks.push(d);
@@ -958,6 +1007,7 @@ class ConcatenatedModule extends Module {
 	}
 
 	/**
+	 * Returns the estimated size for the requested source type.
 	 * @param {string=} type the source type for which the size should be estimated
 	 * @returns {number} the estimated size of the module (must be non-zero)
 	 */
@@ -1000,7 +1050,10 @@ class ConcatenatedModule extends Module {
 			 */
 			const references = connections
 				.filter((connection) => {
-					if (!(connection.dependency instanceof HarmonyImportDependency)) {
+					if (
+						!connection.dependency ||
+						!Dependency.canConcatenate(connection.dependency)
+					) {
 						return false;
 					}
 					if (
@@ -1243,6 +1296,7 @@ class ConcatenatedModule extends Module {
 	}
 
 	/**
+	 * Adds the provided file dependencies to the module.
 	 * @param {FileSystemDependencies} fileDependencies set where file dependencies are added to
 	 * @param {FileSystemDependencies} contextDependencies set where context dependencies are added to
 	 * @param {FileSystemDependencies} missingDependencies set where missing dependencies are added to
@@ -1265,6 +1319,7 @@ class ConcatenatedModule extends Module {
 	}
 
 	/**
+	 * Generates code and runtime requirements for this module.
 	 * @param {CodeGenerationContext} context context for code generation
 	 * @returns {CodeGenerationResult} result
 	 */
@@ -2244,6 +2299,7 @@ ${defineGetters}`
 	}
 
 	/**
+	 * Updates the hash with the data contributed by this instance.
 	 * @param {Hash} hash the hash used to track dependencies
 	 * @param {UpdateHashContext} context context
 	 * @returns {void}

package/lib/optimize/EnsureChunkConditionsPlugin.js

@@ -15,13 +15,14 @@ const PLUGIN_NAME = "EnsureChunkConditionsPlugin";
 
 class EnsureChunkConditionsPlugin {
 	/**
-	 * Apply the plugin
+	 * Applies the plugin by registering its hooks on the compiler.
 	 * @param {Compiler} compiler the compiler instance
 	 * @returns {void}
 	 */
 	apply(compiler) {
 		compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
 			/**
+			 * Handles the hook callback for this code path.
 			 * @param {Iterable<Chunk>} chunks the chunks
 			 */
 			const handler = (chunks) => {

package/lib/optimize/FlagIncludedChunksPlugin.js

@@ -16,7 +16,7 @@ const PLUGIN_NAME = "FlagIncludedChunksPlugin";
 
 class FlagIncludedChunksPlugin {
 	/**
-	 * Apply the plugin
+	 * Applies the plugin by registering its hooks on the compiler.
 	 * @param {Compiler} compiler the compiler instance
 	 * @returns {void}
 	 */
@@ -46,6 +46,7 @@ class FlagIncludedChunksPlugin {
 				const modulos = Array.from(
 					{ length: 31 },
 					/**
+					 * Handles the callback logic for this hook.
 					 * @param {number} x x
 					 * @param {number} i i
 					 * @returns {number} result

package/lib/optimize/InnerGraph.js

@@ -22,6 +22,7 @@ const JavascriptParser = require("../javascript/JavascriptParser");
 /** @typedef {(value: boolean | Set<string> | undefined) => void} UsageCallback */
 
 /**
+ * Defines the state object type used by this module.
  * @typedef {object} StateObject
  * @property {InnerGraph} innerGraph
  * @property {TopLevelSymbol=} currentTopLevelSymbol
@@ -32,6 +33,7 @@ const JavascriptParser = require("../javascript/JavascriptParser");
 
 class TopLevelSymbol {
 	/**
+	 * Creates an instance of TopLevelSymbol.
 	 * @param {string} name name of the variable
 	 */
 	constructor(name) {
@@ -47,6 +49,7 @@ const parserStateMap = new WeakMap();
 const topLevelSymbolTag = Symbol("top level symbol");
 
 /**
+ * Returns state.
  * @param {ParserState} parserState parser state
  * @returns {State | undefined} state
  */
@@ -55,6 +58,7 @@ function getState(parserState) {
 }
 
 /**
+ * Processes the provided state.
  * @param {ParserState} state parser state
  * @param {TopLevelSymbol | null} symbol the symbol, or null for all symbols
  * @param {Usage} usage usage data
@@ -79,6 +83,7 @@ module.exports.addUsage = (state, symbol, usage) => {
 /** @typedef {string | TopLevelSymbol | true} Usage */
 
 /**
+ * Processes the provided parser.
  * @param {JavascriptParser} parser the parser
  * @param {string} name name of variable
  * @param {Usage} usage usage data
@@ -95,6 +100,7 @@ module.exports.addVariableUsage = (parser, name, usage) => {
 };
 
 /**
+ * Processes the provided parser state.
  * @param {ParserState} parserState parser state
  * @returns {void}
  */
@@ -103,6 +109,7 @@ module.exports.bailout = (parserState) => {
 };
 
 /**
+ * Processes the provided parser state.
  * @param {ParserState} parserState parser state
  * @returns {void}
  */
@@ -121,6 +128,7 @@ module.exports.enable = (parserState) => {
 /** @typedef {Set<string> | boolean} UsedByExports */
 
 /**
+ * Usage callback map.
  * @param {Dependency} dependency the dependency
  * @param {UsedByExports | undefined} usedByExports usedByExports info
  * @param {ModuleGraph} moduleGraph moduleGraph
@@ -137,7 +145,7 @@ module.exports.getDependencyUsedByExportsCondition = (
 			/** @type {Module} */
 			(moduleGraph.getParentModule(dependency));
 		const exportsInfo = moduleGraph.getExportsInfo(selfModule);
-		return (connections, runtime) => {
+		return (_connections, runtime) => {
 			for (const exportName of usedByExports) {
 				if (exportsInfo.getUsed(exportName, runtime) !== UsageState.Unused) {
 					return true;
@@ -150,6 +158,7 @@ module.exports.getDependencyUsedByExportsCondition = (
 };
 
 /**
+ * Returns usage data.
  * @param {ParserState} state parser state
  * @returns {TopLevelSymbol | void} usage data
  */
@@ -162,6 +171,7 @@ module.exports.getTopLevelSymbol = (state) => {
 };
 
 /**
+ * Processes the provided state.
  * @param {ParserState} state parser state
  * @returns {void}
  */
@@ -260,6 +270,7 @@ module.exports.inferDependencyUsage = (state) => {
 };
 
 /**
+ * Returns false, when unused. Otherwise true.
  * @param {Dependency} dependency the dependency
  * @param {UsedByExports | undefined} usedByExports usedByExports info
  * @param {ModuleGraph} moduleGraph moduleGraph
@@ -290,6 +301,7 @@ module.exports.isDependencyUsedByExports = (
 };
 
 /**
+ * Returns true, when enabled.
  * @param {ParserState} parserState parser state
  * @returns {boolean} true, when enabled
  */
@@ -299,6 +311,7 @@ module.exports.isEnabled = (parserState) => {
 };
 
 /**
+ * Processes the provided state.
  * @param {ParserState} state parser state
  * @param {UsageCallback} onUsageCallback on usage callback
  */
@@ -326,6 +339,7 @@ module.exports.onUsage = (state, onUsageCallback) => {
 };
 
 /**
+ * Processes the provided state.
  * @param {ParserState} state parser state
  * @param {TopLevelSymbol | undefined} symbol the symbol
  */
@@ -338,6 +352,7 @@ module.exports.setTopLevelSymbol = (state, symbol) => {
 };
 
 /**
+ * Returns symbol.
  * @param {JavascriptParser} parser parser
  * @param {string} name name of variable
  * @returns {TopLevelSymbol | undefined} symbol

package/lib/optimize/InnerGraphPlugin.js

@@ -9,6 +9,7 @@ const {
 	JAVASCRIPT_MODULE_TYPE_AUTO,
 	JAVASCRIPT_MODULE_TYPE_ESM
 } = require("../ModuleTypeConstants");
+const RuntimeGlobals = require("../RuntimeGlobals");
 const PureExpressionDependency = require("../dependencies/PureExpressionDependency");
 const InnerGraph = require("./InnerGraph");
 
@@ -29,10 +30,11 @@ const InnerGraph = require("./InnerGraph");
 const { topLevelSymbolTag } = InnerGraph;
 
 const PLUGIN_NAME = "InnerGraphPlugin";
+const impureVariableDeclarationKinds = new Set(["using", "await using"]);
 
 class InnerGraphPlugin {
 	/**
-	 * Apply the plugin
+	 * Applies the plugin by registering its hooks on the compiler.
 	 * @param {Compiler} compiler the compiler instance
 	 * @returns {void}
 	 */
@@ -48,12 +50,14 @@ class InnerGraphPlugin {
 				);
 
 				/**
+				 * Handles the hook callback for this code path.
 				 * @param {JavascriptParser} parser the parser
 				 * @param {JavascriptParserOptions} parserOptions options
 				 * @returns {void}
 				 */
 				const handler = (parser, parserOptions) => {
 					/**
+					 * Processes the provided sup.
 					 * @param {Expression} sup sup
 					 */
 					const onUsageSuper = (sup) => {
@@ -198,14 +202,22 @@ class InnerGraphPlugin {
 						}
 					});
 
-					parser.hooks.preDeclarator.tap(PLUGIN_NAME, (decl, _statement) => {
+					parser.hooks.preDeclarator.tap(PLUGIN_NAME, (decl, statement) => {
 						if (!InnerGraph.isEnabled(parser.state)) return;
+						if (impureVariableDeclarationKinds.has(statement.kind)) return;
 						if (
 							parser.scope.topLevelScope === true &&
 							decl.init &&
 							decl.id.type === "Identifier"
 						) {
 							const name = decl.id.name;
+							// Skip webpack runtime variables handled by CompatibilityPlugin
+							if (
+								name === RuntimeGlobals.require ||
+								name === RuntimeGlobals.exports
+							) {
+								return;
+							}
 							if (
 								decl.init.type === "ClassExpression" &&
 								parser.isPure(

package/lib/optimize/LimitChunkCountPlugin.js

@@ -14,6 +14,7 @@ const { compareChunks } = require("../util/comparators");
 /** @typedef {import("../Compiler")} Compiler */
 
 /**
+ * Defines the chunk combination type used by this module.
  * @typedef {object} ChunkCombination
  * @property {boolean} deleted this is set to true when combination was removed
  * @property {number} sizeDiff
@@ -27,6 +28,7 @@ const { compareChunks } = require("../util/comparators");
  */
 
 /**
+ * Adds the provided map to this object.
  * @template K, V
  * @param {Map<K, Set<V>>} map map
  * @param {K} key key
@@ -45,6 +47,7 @@ const PLUGIN_NAME = "LimitChunkCountPlugin";
 
 class LimitChunkCountPlugin {
 	/**
+	 * Creates an instance of LimitChunkCountPlugin.
 	 * @param {LimitChunkCountPluginOptions=} options options object
 	 */
 	constructor(options = { maxChunks: 1 }) {
@@ -53,6 +56,7 @@ class LimitChunkCountPlugin {
 	}
 
 	/**
+	 * Applies the plugin by registering its hooks on the compiler.
 	 * @param {Compiler} compiler the webpack compiler
 	 * @returns {void}
 	 */
@@ -105,11 +109,13 @@ class LimitChunkCountPlugin {
 
 						// Layer 2: ordered by smallest combined size
 						/**
+						 * Handles the stage callback for this hook.
 						 * @param {ChunkCombination} c combination
 						 * @returns {number} integrated size
 						 */
 						(c) => c.integratedSize,
 						/**
+						 * Handles the callback logic for this hook.
 						 * @param {number} a a
 						 * @param {number} b b
 						 * @returns {number} result
@@ -118,11 +124,13 @@ class LimitChunkCountPlugin {
 
 						// Layer 3: ordered by position difference in orderedChunk (-> to be deterministic)
 						/**
+						 * Handles the callback logic for this hook.
 						 * @param {ChunkCombination} c combination
 						 * @returns {number} position difference
 						 */
 						(c) => c.bIdx - c.aIdx,
 						/**
+						 * Handles the callback logic for this hook.
 						 * @param {number} a a
 						 * @param {number} b b
 						 * @returns {number} result
@@ -131,6 +139,7 @@ class LimitChunkCountPlugin {
 
 						// Layer 4: ordered by position in orderedChunk (-> to be deterministic)
 						/**
+						 * Handles the callback logic for this hook.
 						 * @param {ChunkCombination} a a
 						 * @param {ChunkCombination} b b
 						 * @returns {number} result

package/lib/optimize/MangleExportsPlugin.js

@@ -20,11 +20,13 @@ const { compareSelect, compareStringsNumeric } = require("../util/comparators");
 /** @typedef {import("../util/concatenate").UsedNames} UsedNames */
 
 /**
+ * Defines the comparator type used by this module.
  * @template T
  * @typedef {import("../util/comparators").Comparator<T>} Comparator
  */
 
 /**
+ * Checks whether it can mangle.
  * @param {ExportsInfo} exportsInfo exports info
  * @returns {boolean} mangle is possible
  */
@@ -45,6 +47,7 @@ const canMangle = (exportsInfo) => {
 /** @type {Comparator<ExportInfo>} */
 const comparator = compareSelect((e) => e.name, compareStringsNumeric);
 /**
+ * Mangle exports info.
  * @param {boolean} deterministic use deterministic names
  * @param {ExportsInfo} exportsInfo exports info
  * @param {boolean | undefined} isNamespace is namespace object
@@ -158,6 +161,7 @@ const PLUGIN_NAME = "MangleExportsPlugin";
 
 class MangleExportsPlugin {
 	/**
+	 * Creates an instance of MangleExportsPlugin.
 	 * @param {boolean} deterministic use deterministic names
 	 */
 	constructor(deterministic) {
@@ -166,7 +170,7 @@ class MangleExportsPlugin {
 	}
 
 	/**
-	 * Apply the plugin
+	 * Applies the plugin by registering its hooks on the compiler.
 	 * @param {Compiler} compiler the compiler instance
 	 * @returns {void}
 	 */

package/lib/optimize/MergeDuplicateChunksPlugin.js

@@ -16,6 +16,7 @@ const PLUGIN_NAME = "MergeDuplicateChunksPlugin";
 
 class MergeDuplicateChunksPlugin {
 	/**
+	 * Creates an instance of MergeDuplicateChunksPlugin.
 	 * @param {MergeDuplicateChunksPluginOptions=} options options object
 	 */
 	constructor(options = { stage: STAGE_BASIC }) {
@@ -24,6 +25,7 @@ class MergeDuplicateChunksPlugin {
 	}
 
 	/**
+	 * Applies the plugin by registering its hooks on the compiler.
 	 * @param {Compiler} compiler the compiler
 	 * @returns {void}
 	 */

package/lib/optimize/MinChunkSizePlugin.js

@@ -15,6 +15,7 @@ const PLUGIN_NAME = "MinChunkSizePlugin";
 
 class MinChunkSizePlugin {
 	/**
+	 * Creates an instance of MinChunkSizePlugin.
 	 * @param {MinChunkSizePluginOptions} options options object
 	 */
 	constructor(options) {
@@ -23,7 +24,7 @@ class MinChunkSizePlugin {
 	}
 
 	/**
-	 * Apply the plugin
+	 * Applies the plugin by registering its hooks on the compiler.
 	 * @param {Compiler} compiler the compiler instance
 	 * @returns {void}
 	 */

package/lib/optimize/MinMaxSizeWarning.js

@@ -5,11 +5,12 @@
 
 "use strict";
 
-const SizeFormatHelpers = require("../SizeFormatHelpers");
-const WebpackError = require("../WebpackError");
+const WebpackError = require("../errors/WebpackError");
+const formatSize = require("../util/formatSize");
 
 class MinMaxSizeWarning extends WebpackError {
 	/**
+	 * Creates an instance of MinMaxSizeWarning.
 	 * @param {string[] | undefined} keys keys
 	 * @param {number} minSize minimum size
 	 * @param {number} maxSize maximum size
@@ -25,8 +26,8 @@ class MinMaxSizeWarning extends WebpackError {
 		super(
 			"SplitChunksPlugin\n" +
 				`${keysMessage}\n` +
-				`Configured minSize (${SizeFormatHelpers.formatSize(minSize)}) is ` +
-				`bigger than maxSize (${SizeFormatHelpers.formatSize(maxSize)}).\n` +
+				`Configured minSize (${formatSize(minSize)}) is ` +
+				`bigger than maxSize (${formatSize(maxSize)}).\n` +
 				"This seem to be a invalid optimization.splitChunks configuration."
 		);
 	}