webpack 5.111.1 → 5.112.1

package/lib/{APIPlugin.js → javascript/APIPlugin.js}

@@ -5,45 +5,45 @@
 
 "use strict";
 
+const ConstDependency = require("../dependencies/core/ConstDependency");
+const ModuleInitFragmentDependency = require("../dependencies/core/ModuleInitFragmentDependency");
+const RuntimeRequirementsDependency = require("../dependencies/core/RuntimeRequirementsDependency");
+const WebpackError = require("../errors/WebpackError");
 const {
 	getExternalModuleNodeCommonjsInitFragment
-} = require("./ExternalModule");
+} = require("../externals/ExternalModule");
+const BasicEvaluatedExpression = require("../javascript/BasicEvaluatedExpression");
+const JavascriptModulesPlugin = require("../javascript/JavascriptModulesPlugin");
+const {
+	evaluateToString,
+	toConstantDependency
+} = require("../javascript/JavascriptParserHelpers");
 const {
 	JAVASCRIPT_MODULE_TYPE_AUTO,
 	JAVASCRIPT_MODULE_TYPE_DYNAMIC,
 	JAVASCRIPT_MODULE_TYPE_ESM
-} = require("./ModuleTypeConstants");
-const RuntimeGlobals = require("./RuntimeGlobals");
-const ConstDependency = require("./dependencies/ConstDependency");
-const ModuleInitFragmentDependency = require("./dependencies/ModuleInitFragmentDependency");
-const RuntimeRequirementsDependency = require("./dependencies/RuntimeRequirementsDependency");
-const WebpackError = require("./errors/WebpackError");
-const BasicEvaluatedExpression = require("./javascript/BasicEvaluatedExpression");
-const JavascriptModulesPlugin = require("./javascript/JavascriptModulesPlugin");
-const {
-	evaluateToString,
-	toConstantDependency
-} = require("./javascript/JavascriptParserHelpers");
-const ChunkNameRuntimeModule = require("./runtime/ChunkNameRuntimeModule");
-const GetFullHashRuntimeModule = require("./runtime/GetFullHashRuntimeModule");
-const memoize = require("./util/memoize");
-const { forEachRuntime } = require("./util/runtime");
+} = require("../module/ModuleTypeConstants");
+const ChunkNameRuntimeModule = require("../runtime/ChunkNameRuntimeModule");
+const GetFullHashRuntimeModule = require("../runtime/GetFullHashRuntimeModule");
+const RuntimeGlobals = require("../runtime/RuntimeGlobals");
+const memoize = require("../util/memoize");
+const { forEachRuntime } = require("../util/runtime");
 
 const getConcatenatedModule = memoize(() =>
-	require("./optimize/ConcatenatedModule")
+	require("../optimize/ConcatenatedModule")
 );
 
-/** @import Compiler from "./Compiler" */
-/** @import Module, { BuildInfo } from "./Module" */
+/** @import Compiler from "../Compiler" */
+/** @import Module from "../module/Module" */
 /**
  * @import {
  * 	JavascriptModuleBuildInfo
- * } from "./javascript/JavascriptModule"
+ * } from "../javascript/JavascriptModule"
  */
-/** @import Compilation from "./Compilation" */
-/** @import ChunkGraph from "./ChunkGraph" */
-/** @import { RuntimeSpec } from "./util/runtime" */
-/** @import JavascriptParser, { Range } from "./javascript/JavascriptParser" */
+/** @import Compilation from "../Compilation" */
+/** @import ChunkGraph from "../graph/ChunkGraph" */
+/** @import { RuntimeSpec } from "../util/runtime" */
+/** @import JavascriptParser, { Range } from "../javascript/JavascriptParser" */
 
 // Modules reassigning `__webpack_public_path__` at runtime, per compilation, since
 // a baked specifier cannot reflect that. Also kept in `buildInfo`: a module
@@ -342,8 +342,7 @@ class APIPlugin {
 							declarator.id.type === "Identifier" &&
 							declarator.id.name === "module"
 						) {
-							/** @type {BuildInfo} */
-							(parser.state.module.buildInfo).moduleArgument =
+							parser.state.module.buildInfo.moduleArgument =
 								"__webpack_module__";
 						}
 					});
@@ -359,8 +358,7 @@ class APIPlugin {
 							statement.id &&
 							statement.id.name === "module"
 						) {
-							/** @type {BuildInfo} */
-							(parser.state.module.buildInfo).moduleArgument =
+							parser.state.module.buildInfo.moduleArgument =
 								"__webpack_module__";
 						}
 					};
@@ -378,8 +376,7 @@ class APIPlugin {
 
 							if (key === "__non_webpack_require__" && moduleOutput) {
 								if (nodeTarget) {
-									/** @type {JavascriptModuleBuildInfo} */
-									(parser.state.module.buildInfo).needCreateRequire = true;
+									parser.state.module.buildInfo.needCreateRequire = true;
 								} else {
 									const warning = new WebpackError(
 										`${PLUGIN_NAME}\n__non_webpack_require__ is only allowed in target node`
@@ -405,8 +402,7 @@ class APIPlugin {
 								RuntimeGlobals.requireScope
 							]);
 							parser.hooks.assign.for(key).tap(PLUGIN_NAME, (expr) => {
-								/** @type {JavascriptModuleBuildInfo} */
-								(parser.state.module.buildInfo).usingPublicPathOverride = true;
+								parser.state.module.buildInfo.usingPublicPathOverride = true;
 								addRuntimePublicPathOverride(compilation, parser.state.module);
 								// A destructuring target is no expression to replace; the read
 								// handler still spells the global, with a read's requirement.
@@ -455,8 +451,7 @@ class APIPlugin {
 					parser.hooks.expression
 						.for("__webpack_module__.id")
 						.tap(PLUGIN_NAME, (expr) => {
-							/** @type {JavascriptModuleBuildInfo} */
-							(parser.state.module.buildInfo).moduleConcatenationBailout =
+							parser.state.module.buildInfo.moduleConcatenationBailout =
 								"__webpack_module__.id";
 							const moduleArgument = parser.state.module.moduleArgument;
 							if (moduleArgument === "__webpack_module__") {
@@ -486,8 +481,7 @@ class APIPlugin {
 					parser.hooks.expression
 						.for("__webpack_module__")
 						.tap(PLUGIN_NAME, (expr) => {
-							/** @type {JavascriptModuleBuildInfo} */
-							(parser.state.module.buildInfo).moduleConcatenationBailout =
+							parser.state.module.buildInfo.moduleConcatenationBailout =
 								"__webpack_module__";
 							const moduleArgument = parser.state.module.moduleArgument;
 							if (moduleArgument === "__webpack_module__") {

package/lib/javascript/ArrayPushCallbackChunkFormatPlugin.js

@@ -7,8 +7,7 @@
 
 const { ConcatSource, PrefixSource, RawSource } = require("webpack-sources");
 const { RuntimeGlobals } = require("..");
-const HotUpdateChunk = require("../HotUpdateChunk");
-const Template = require("../Template");
+const Template = require("../template/Template");
 const { getCompilationHooks } = require("./JavascriptModulesPlugin");
 const {
 	generateEntryStartup,
@@ -16,8 +15,8 @@ const {
 } = require("./StartupHelpers");
 
 /** @import Compiler from "../Compiler" */
-/** @import { EntryModuleWithChunkGroup } from "../ChunkGraph" */
-/** @import CodeGenerationResults from "../CodeGenerationResults" */
+/** @import { EntryModuleWithChunkGroup } from "../graph/ChunkGraph" */
+/** @import CodeGenerationResults from "../module/CodeGenerationResults" */
 
 const PLUGIN_NAME = "ArrayPushCallbackChunkFormatPlugin";
 
@@ -44,7 +43,7 @@ class ArrayPushCallbackChunkFormatPlugin {
 			const hooks = getCompilationHooks(compilation);
 			hooks.renderChunk.tap(PLUGIN_NAME, (modules, renderContext) => {
 				const { chunk, chunkGraph, runtimeTemplate } = renderContext;
-				const hotUpdateChunk = chunk instanceof HotUpdateChunk ? chunk : null;
+				const hotUpdateChunk = chunk.isHotUpdate() ? chunk : null;
 				const globalObject = runtimeTemplate.globalObject;
 				const source = new ConcatSource();
 				const runtimeModules = chunkGraph.getChunkRuntimeModulesInOrder(chunk);

package/lib/javascript/BasicEvaluatedExpression.js

@@ -58,15 +58,15 @@ class BasicEvaluatedExpression {
 		this.expression = undefined;
 		// _v1..._v5 hold the scalar type-specific fields, the accessors narrow
 		// them by type; expression-valued fields get typed slots below
-		/** @type {unknown} */
+		/** @type {boolean | number | bigint | RegExp | string | string[] | InstanceType<VariableInfo> | undefined} */
 		this._v1 = undefined;
-		/** @type {unknown} */
+		/** @type {string | InstanceType<VariableInfo> | undefined} */
 		this._v2 = undefined;
-		/** @type {unknown} */
+		/** @type {"cooked" | "raw" | GetMembers | undefined} */
 		this._v3 = undefined;
-		/** @type {unknown} */
+		/** @type {GetMembersOptionals | undefined} */
 		this._v4 = undefined;
-		/** @type {unknown} */
+		/** @type {GetMemberRanges | undefined} */
 		this._v5 = undefined;
 		// expression-valued fields stay plain data properties: a type that
 		// references the class inside one of its own accessors makes tsc fork
@@ -290,16 +290,16 @@ class BasicEvaluatedExpression {
 	}
 
 	/**
-	 * @returns {EXPECTED_ANY[] | undefined} const array values
+	 * @returns {string[] | undefined} const array values
 	 */
 	get array() {
 		return this.type === TypeConstArray
-			? /** @type {unknown[]} */ (this._v1)
+			? /** @type {string[]} */ (this._v1)
 			: undefined;
 	}
 
 	/**
-	 * @param {EXPECTED_ANY[] | undefined} value const array values
+	 * @param {string[] | undefined} value const array values
 	 */
 	set array(value) {
 		this._v1 = value;
@@ -487,7 +487,7 @@ class BasicEvaluatedExpression {
 
 	/**
 	 * As compile time value.
-	 * @returns {undefined | null | string | number | boolean | RegExp | EXPECTED_ANY[] | bigint} the javascript value
+	 * @returns {undefined | null | string | number | boolean | RegExp | string[] | bigint} the javascript value
 	 */
 	asCompileTimeValue() {
 		switch (this.type) {

package/lib/javascript/ChunkHelpers.js

@@ -5,9 +5,12 @@
 
 "use strict";
 
-const Entrypoint = require("../Entrypoint");
-
-/** @import Chunk from "../Chunk" */
+/** @import Chunk from "../graph/Chunk" */
+/** @import ChunkGraph from "../graph/ChunkGraph" */
+/** @import Entrypoint from "../graph/Entrypoint" */
+/** @import Module from "../module/Module" */
+/** @import Hash from "../util/Hash" */
+/** @import { ChunkHashContext } from "../Compilation" */
 
 /**
  * Returns chunks.
@@ -26,7 +29,7 @@ const getAllChunks = (entrypoint, excludedChunk1, excludedChunk2) => {
 			groups.add(group);
 		}
 		for (const parent of group.parentsIterable) {
-			if (parent instanceof Entrypoint) queue.add(parent);
+			if (parent.isEntrypoint()) queue.add(parent);
 		}
 	}
 	groups.add(entrypoint);
@@ -43,4 +46,61 @@ const getAllChunks = (entrypoint, excludedChunk1, excludedChunk2) => {
 	return chunks;
 };
 
+/**
+ * Returns } Object containing chunk entries and runtime chunk.
+ * @param {Chunk} chunk The chunk to get information for
+ * @param {ChunkGraph} chunkGraph The chunk graph containing the chunk
+ * @returns {{ entries: [Module, Entrypoint | undefined][], runtimeChunk: Chunk | null }} Object containing chunk entries and runtime chunk
+ */
+function getChunkInfo(chunk, chunkGraph) {
+	const entries = [
+		...chunkGraph.getChunkEntryModulesWithChunkGroupIterable(chunk)
+	];
+	const runtimeChunk =
+		entries.length > 0
+			? /** @type {Entrypoint[][]} */
+				(entries)[0][1].getRuntimeChunk()
+			: null;
+
+	return {
+		entries,
+		runtimeChunk
+	};
+}
+
+/**
+ * Creates a chunk hash handler
+ * @param {string} name The name of the chunk
+ * @returns {(chunk: Chunk, hash: Hash, { chunkGraph }: ChunkHashContext) => void} The chunk hash handler
+ */
+function createChunkHashHandler(name) {
+	/**
+	 * Processes the provided chunk.
+	 * @param {Chunk} chunk The chunk to get information for
+	 * @param {Hash} hash The hash to update
+	 * @param {ChunkHashContext} chunkHashContext The chunk hash context
+	 * @returns {void}
+	 */
+	return (chunk, hash, { chunkGraph }) => {
+		if (chunk.hasRuntime()) return;
+		const { entries, runtimeChunk } = getChunkInfo(chunk, chunkGraph);
+		hash.update(name);
+		hash.update("1");
+		if (runtimeChunk && runtimeChunk.hash) {
+			// WHY: any change to the runtime chunk must move this hash, and its
+			// internal implementation is not ours to depend on or inspect — the import
+			// names its hashed filename:
+			// import __webpack_require__ from "./runtime-main.e9400aee33633a3973bd.js";
+			// https://github.com/webpack/webpack/issues/19439
+			hash.update(runtimeChunk.hash);
+		}
+
+		const { updateHashForEntryStartup } = require("./StartupHelpers");
+
+		updateHashForEntryStartup(hash, chunkGraph, entries, chunk);
+	};
+}
+
 module.exports.getAllChunks = getAllChunks;
+module.exports.createChunkHashHandler = createChunkHashHandler;
+module.exports.getChunkInfo = getChunkInfo;

package/lib/javascript/CommonJsChunkFormatPlugin.js

@@ -6,13 +6,10 @@
 "use strict";
 
 const { ConcatSource, RawSource } = require("webpack-sources");
-const RuntimeGlobals = require("../RuntimeGlobals");
-const Template = require("../Template");
+const RuntimeGlobals = require("../runtime/RuntimeGlobals");
+const Template = require("../template/Template");
 const { getUndoPath } = require("../util/identifier");
-const {
-	createChunkHashHandler,
-	getChunkInfo
-} = require("./ChunkFormatHelpers");
+const { createChunkHashHandler, getChunkInfo } = require("./ChunkHelpers");
 const {
 	getChunkFilenameTemplate,
 	getCompilationHooks
@@ -22,7 +19,6 @@ const {
 	generateEntryStartup
 } = require("./StartupHelpers");
 
-/** @import Chunk from "../Chunk" */
 /** @import Compiler from "../Compiler" */
 
 const PLUGIN_NAME = "CommonJsChunkFormatPlugin";
@@ -79,13 +75,9 @@ class CommonJsChunkFormatPlugin {
 						.split("/");
 					const runtimeOutputName = compilation
 						.getPath(
-							getChunkFilenameTemplate(
-								/** @type {Chunk} */
-								(runtimeChunk),
-								compilation.outputOptions
-							),
+							getChunkFilenameTemplate(runtimeChunk, compilation.outputOptions),
 							{
-								chunk: /** @type {Chunk} */ (runtimeChunk),
+								chunk: runtimeChunk,
 								contentHashType: "javascript"
 							}
 						)

package/lib/{CompatibilityPlugin.js → javascript/CompatibilityPlugin.js}

@@ -5,19 +5,19 @@
 
 "use strict";
 
+const ConstDependency = require("../dependencies/core/ConstDependency");
 const {
 	JAVASCRIPT_MODULE_TYPE_AUTO,
 	JAVASCRIPT_MODULE_TYPE_DYNAMIC,
 	JAVASCRIPT_MODULE_TYPE_ESM
-} = require("./ModuleTypeConstants");
-const RuntimeGlobals = require("./RuntimeGlobals");
-const ConstDependency = require("./dependencies/ConstDependency");
+} = require("../module/ModuleTypeConstants");
+const RuntimeGlobals = require("../runtime/RuntimeGlobals");
 
 /** @import { CallExpression } from "estree" */
-/** @import Compiler from "./Compiler" */
-/** @import { DependencyLocation } from "./Dependency" */
-/** @import ContextDependency from "./dependencies/ContextDependency" */
-/** @import JavascriptParser, { Range } from "./javascript/JavascriptParser" */
+/** @import Compiler from "../Compiler" */
+/** @import { DependencyLocation } from "../graph/Dependency" */
+/** @import ContextDependency from "../dependencies/context/ContextDependency" */
+/** @import JavascriptParser, { Range } from "../javascript/JavascriptParser" */
 
 /**
  * Captures the source range of a renamed compatibility binding so it can be

package/lib/{ConstPlugin.js → javascript/ConstPlugin.js}

@@ -5,29 +5,30 @@
 
 "use strict";
 
+const CachedConstDependency = require("../dependencies/core/CachedConstDependency");
+const ConstDependency = require("../dependencies/core/ConstDependency");
+const { evaluateToString } = require("../javascript/JavascriptParserHelpers");
 const {
 	JAVASCRIPT_MODULE_TYPE_AUTO,
 	JAVASCRIPT_MODULE_TYPE_DYNAMIC,
 	JAVASCRIPT_MODULE_TYPE_ESM
-} = require("./ModuleTypeConstants");
-const CachedConstDependency = require("./dependencies/CachedConstDependency");
-const ConstDependency = require("./dependencies/ConstDependency");
-const { evaluateToString } = require("./javascript/JavascriptParserHelpers");
-const { parseResource } = require("./util/identifier");
+} = require("../module/ModuleTypeConstants");
+const { parseResource } = require("../util/identifier");
 
 /**
  * @import {
  * 	AssignmentProperty,
  * 	Expression,
  * 	Identifier,
+ * 	LogicalExpression,
  * 	Pattern,
  * 	Statement,
  * 	Super,
  * 	VariableDeclaration
  * } from "estree"
  */
-/** @import Compiler from "./Compiler" */
-/** @import JavascriptParser, { Range } from "./javascript/JavascriptParser" */
+/** @import Compiler from "../Compiler" */
+/** @import JavascriptParser, { Range } from "../javascript/JavascriptParser" */
 
 /** @typedef {Set<string>} Declarations */
 
@@ -123,7 +124,7 @@ const getHoistedDeclarations = (branch, includeFunctionDeclarations) => {
 				break;
 			case "FunctionDeclaration":
 				if (includeFunctionDeclarations) {
-					collectDeclaration(declarations, /** @type {Identifier} */ (node.id));
+					collectDeclaration(declarations, node.id);
 				}
 				break;
 			case "VariableDeclaration":
@@ -140,6 +141,71 @@ const getHoistedDeclarations = (branch, includeFunctionDeclarations) => {
 
 const PLUGIN_NAME = "ConstPlugin";
 
+/**
+ * @param {JavascriptParser} parser the parser
+ * @param {Expression} expression the operand
+ * @returns {boolean} whether the built-in evaluator cannot resolve the operand
+ */
+const isUnknownLocal = (parser, expression) => {
+	const root = parser.getMemberExpressionRoot(expression);
+	return (
+		root.type === "Identifier" &&
+		root.name !== "undefined" &&
+		parser._isDefinedPlainVariable(root.name)
+	);
+};
+
+/**
+ * Walks chains of unknown locals without evaluating every prefix.
+ * @param {JavascriptParser} parser the parser
+ * @param {LogicalExpression} expression the logical chain
+ * @returns {boolean} whether the entire expression was walked
+ */
+const walkUnknownLocalChain = (parser, expression) => {
+	if (expression.left.type !== "LogicalExpression") return false;
+	const logicalHook = parser.hooks.expressionLogicalOperator;
+	if (logicalHook.interceptors.length !== 0 || logicalHook.taps.length !== 1) {
+		return false;
+	}
+	for (const type of ["Identifier", "MemberExpression", "LogicalExpression"]) {
+		const hook = parser.hooks.evaluate.get(type);
+		if (
+			hook &&
+			(hook.interceptors.length !== 0 ||
+				hook.taps.some(
+					(tap) =>
+						tap.name !== "JavascriptParser" &&
+						// ImportMetaPlugin only evaluates members rooted at import.meta.
+						!(type === "MemberExpression" && tap.name === "ImportMetaPlugin")
+				))
+		) {
+			return false;
+		}
+	}
+	/** @type {Expression[]} */
+	const rightOperands = [];
+	/** @type {Expression} */
+	let current = expression;
+	while (current.type === "LogicalExpression") {
+		if (
+			current.operator !== expression.operator ||
+			!isUnknownLocal(parser, current.right)
+		) {
+			return false;
+		}
+		rightOperands.push(current.right);
+		current = current.left;
+	}
+	if (!isUnknownLocal(parser, current)) return false;
+	// All prefix evaluations precede the first operand walk. Keep that order:
+	// walking an operand may change the parser's bindings or plugin state.
+	parser.walkExpression(current);
+	for (let index = rightOperands.length - 1; index >= 0; index--) {
+		parser.walkExpression(rightOperands[index]);
+	}
+	return true;
+};
+
 class ConstPlugin {
 	/**
 	 * Applies the plugin by registering its hooks on the compiler.
@@ -242,6 +308,7 @@ class ConstPlugin {
 								expression.operator === "&&" ||
 								expression.operator === "||"
 							) {
+								if (walkUnknownLocalChain(parser, expression)) return false;
 								const param = parser.evaluateExpression(expression.left);
 								const bool = param.asBool();
 								if (typeof bool === "boolean") {

package/lib/{ExportsInfoApiPlugin.js → javascript/ExportsInfoApiPlugin.js}

@@ -5,16 +5,16 @@
 
 "use strict";
 
+const ConstDependency = require("../dependencies/core/ConstDependency");
 const {
 	JAVASCRIPT_MODULE_TYPE_AUTO,
 	JAVASCRIPT_MODULE_TYPE_DYNAMIC,
 	JAVASCRIPT_MODULE_TYPE_ESM
-} = require("./ModuleTypeConstants");
-const ConstDependency = require("./dependencies/ConstDependency");
-const ExportsInfoDependency = require("./dependencies/ExportsInfoDependency");
+} = require("../module/ModuleTypeConstants");
+const ExportsInfoDependency = require("./ExportsInfoDependency");
 
-/** @import Compiler from "./Compiler" */
-/** @import JavascriptParser, { Range } from "./javascript/JavascriptParser" */
+/** @import Compiler from "../Compiler" */
+/** @import JavascriptParser, { Range } from "../javascript/JavascriptParser" */
 
 const PLUGIN_NAME = "ExportsInfoApiPlugin";
 

package/lib/{dependencies → javascript}/ExportsInfoDependency.js

@@ -5,15 +5,15 @@
 
 "use strict";
 
-const { UsageState } = require("../ExportsInfo");
+const NullDependency = require("../dependencies/core/NullDependency");
+const { UsageState } = require("../graph/ExportsInfo");
 const makeSerializable = require("../util/makeSerializable");
-const NullDependency = require("./NullDependency");
 
 /** @import { ReplaceSource } from "webpack-sources" */
-/** @import Dependency, { ExportInfoName } from "../Dependency" */
-/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
-/** @import Module from "../Module" */
-/** @import ModuleGraph from "../ModuleGraph" */
+/** @import Dependency, { ExportInfoName } from "../graph/Dependency" */
+/** @import { DependencyTemplateContext } from "../template/DependencyTemplate" */
+/** @import Module from "../module/Module" */
+/** @import ModuleGraph from "../graph/ModuleGraph" */
 /** @import { Range } from "../javascript/JavascriptParser" */
 /** @import { RuntimeSpec } from "../util/runtime" */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range, ExportInfoName[] | null, string | null]>} ObjectDeserializerContext */
@@ -130,10 +130,11 @@ class ExportsInfoDependency extends NullDependency {
 	}
 }
 
-makeSerializable(
-	ExportsInfoDependency,
+makeSerializable(ExportsInfoDependency, [
+	"webpack/lib/javascript/ExportsInfoDependency",
+	// TODO in the next major release: remove, they restore pre-move cache packs
 	"webpack/lib/dependencies/ExportsInfoDependency"
-);
+]);
 
 ExportsInfoDependency.Template = class ExportsInfoDependencyTemplate extends (
 	NullDependency.Template