@depup/webpack 5.109.2-depup.0 → 5.110.1-depup.0

package/lib/dependencies/HarmonyImportDependencyParserPlugin.js

@@ -5,8 +5,8 @@
 
 "use strict";
 
-const HotModuleReplacementPlugin = require("../HotModuleReplacementPlugin");
 const WebpackError = require("../errors/WebpackError");
+const getParserHooks = require("../hmr/parserHooks");
 const {
 	VariableInfo,
 	getImportAttributes
@@ -29,25 +29,30 @@ const HarmonyImportSideEffectDependency = require("./HarmonyImportSideEffectDepe
 const HarmonyImportSpecifierDependency = require("./HarmonyImportSpecifierDependency");
 const { ImportPhaseUtils, createGetImportPhase } = require("./ImportPhase");
 
-/** @typedef {import("estree").Expression} Expression */
-/** @typedef {import("estree").PrivateIdentifier} PrivateIdentifier */
-/** @typedef {import("estree").Identifier} Identifier */
-/** @typedef {import("estree").MemberExpression} MemberExpression */
-/** @typedef {import("../../declarations/WebpackOptions").JavascriptParserOptions} JavascriptParserOptions */
-/** @typedef {import("../Dependency").DependencyLocation} DependencyLocation */
-/** @typedef {import("../Module")} Module */
-/** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
-/** @typedef {import("../javascript/JavascriptParser").ExportAllDeclaration} ExportAllDeclaration */
-/** @typedef {import("../javascript/JavascriptParser").ExportNamedDeclaration} ExportNamedDeclaration */
-/** @typedef {import("../javascript/JavascriptParser").ImportAttributes} ImportAttributes */
-/** @typedef {import("../javascript/JavascriptParser").ImportDeclaration} ImportDeclaration */
-/** @typedef {import("../javascript/JavascriptParser").Range} Range */
-/** @typedef {import("../javascript/JavascriptParser").Members} Members */
-/** @typedef {import("../javascript/JavascriptParser").MembersOptionals} MembersOptionals */
-/** @typedef {import("./HarmonyImportDependency").Ids} Ids */
-/** @typedef {import("./HarmonyImportDependency").ExportPresenceMode} ExportPresenceMode */
-/** @typedef {import("./ImportPhase").ImportPhaseType} ImportPhaseType */
-/** @typedef {import("./HarmonyImportGuard").GuardFrame} GuardFrame */
+/**
+ * @import {
+ * 	Expression,
+ * 	PrivateIdentifier,
+ * 	Identifier,
+ * 	MemberExpression
+ * } from "estree"
+ */
+/**
+ * @import {
+ * 	JavascriptParserOptions
+ * } from "../../declarations/WebpackOptions"
+ */
+/** @import Module from "../Module" */
+/**
+ * @import JavascriptParser, {
+ * 	ImportAttributes,
+ * 	Range,
+ * 	Members
+ * } from "../javascript/JavascriptParser"
+ */
+/** @import { Ids, ExportPresenceMode } from "./HarmonyImportDependency" */
+/** @import { ImportPhaseType } from "./ImportPhase" */
+/** @import { GuardFrame } from "./HarmonyImportGuard" */
 
 const harmonySpecifierTag = Symbol("harmony import");
 
@@ -147,7 +152,7 @@ const findImportSpecifier = (parser, node) => {
 	}
 };
 
-module.exports = class HarmonyImportDependencyParserPlugin {
+class HarmonyImportDependencyParserPlugin {
 	/**
 	 * Creates an instance of HarmonyImportDependencyParserPlugin.
 	 * @param {JavascriptParserOptions} options options
@@ -496,7 +501,7 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 				return true;
 			});
 		const { hotAcceptCallback, hotAcceptWithoutCallback } =
-			HotModuleReplacementPlugin.getParserHooks(parser);
+			getParserHooks(parser);
 		hotAcceptCallback.tap(PLUGIN_NAME, (expr, requests) => {
 			if (!HarmonyExports.isEnabled(parser.state)) {
 				// This is not a harmony module, skip it
@@ -567,6 +572,8 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 			return { consequent, alternate };
 		});
 	}
-};
+}
+
+HarmonyImportDependencyParserPlugin.harmonySpecifierTag = harmonySpecifierTag;
 
-module.exports.harmonySpecifierTag = harmonySpecifierTag;
+module.exports = HarmonyImportDependencyParserPlugin;

package/lib/dependencies/HarmonyImportGuard.js

@@ -6,19 +6,18 @@
 "use strict";
 
 const { InlinedUsedName } = require("../optimize/InlineExports");
-const memoize = require("../util/memoize");
 
-/** @typedef {import("estree").Expression} Expression */
-/** @typedef {import("../Dependency")} Dependency */
-/** @typedef {import("../Module")} Module */
-/** @typedef {import("../ModuleGraph")} ModuleGraph */
-/** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
-/** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
-/** @typedef {import("./CommonJsFullRequireDependency")} CommonJsFullRequireDependency */
-/** @typedef {import("./CommonJsRequireDependency")} CommonJsRequireDependency */
-/** @typedef {import("./HarmonyEvaluatedImportSpecifierDependency")} HarmonyEvaluatedImportSpecifierDependency */
-/** @typedef {import("./HarmonyImportSpecifierDependency")} HarmonyImportSpecifierDependency */
-/** @typedef {import("./ImportDependency")} ImportDependency */
+/** @import { Expression } from "estree" */
+/** @import Dependency from "../Dependency" */
+/** @import Module from "../Module" */
+/** @import ModuleGraph from "../ModuleGraph" */
+/** @import JavascriptParser from "../javascript/JavascriptParser" */
+/** @import { RuntimeSpec } from "../util/runtime" */
+/** @import CommonJsFullRequireDependency from "./CommonJsFullRequireDependency" */
+/** @import CommonJsRequireDependency from "./CommonJsRequireDependency" */
+/** @import HarmonyEvaluatedImportSpecifierDependency from "./HarmonyEvaluatedImportSpecifierDependency" */
+/** @import HarmonyImportSpecifierDependency from "./HarmonyImportSpecifierDependency" */
+/** @import ImportDependency from "./ImportDependency" */
 
 // Tuple-encoded boolean formula over guard dependencies. Split into per-shape
 // aliases so the recursive references resolve through array/object types.
@@ -44,13 +43,6 @@ const memoize = require("../util/memoize");
  * @property {GuardFormula | null=} presenceFormula memoized presence formula (null = no presence atom)
  */
 
-const getHarmonyImportSpecifierDependency = memoize(() =>
-	require("./HarmonyImportSpecifierDependency")
-);
-const getHarmonyEvaluatedImportSpecifierDependency = memoize(() =>
-	require("./HarmonyEvaluatedImportSpecifierDependency")
-);
-
 // Tri-state truthiness: UNKNOWN means not statically known.
 const UNKNOWN = 0;
 const FALSE = 1;
@@ -214,19 +206,17 @@ const isDeadByGuards = (guards, moduleGraph, runtime) => {
  * @returns {GuardFormula | null} formula, or null when it has no knowable atom
  */
 const buildFrameLivenessFormula = (parser, frame) => {
-	const HarmonyImportSpecifierDependency =
-		getHarmonyImportSpecifierDependency();
-	const HarmonyEvaluatedImportSpecifierDependency =
-		getHarmonyEvaluatedImportSpecifierDependency();
 	const deps = /** @type {Module} */ (parser.state.module).dependencies;
 	/** @type {Map<number, HarmonyImportSpecifierDependency>} */
 	const depByRangeStart = new Map();
 	for (let i = /** @type {number} */ (frame.depStart); i < deps.length; i++) {
-		const dep = deps[i];
+		const dep = /** @type {HarmonyEvaluatedImportSpecifierDependency} */ (
+			deps[i]
+		);
 		// Exclude `"x" in ns` evaluated deps; those feed the presence formula only.
 		if (
-			dep instanceof HarmonyImportSpecifierDependency &&
-			!(dep instanceof HarmonyEvaluatedImportSpecifierDependency) &&
+			dep.isHarmonyImportSpecifier === true &&
+			dep.isHarmonyEvaluatedImportSpecifier !== true &&
 			dep.range
 		) {
 			depByRangeStart.set(dep.range[0], dep);
@@ -341,14 +331,14 @@ const evalPresenceFormula = (formula, name, member, needTruthy) => {
  * @returns {GuardFormula | null} formula, or null when it has no presence atom
  */
 const buildFramePresenceFormula = (parser, frame) => {
-	const HarmonyEvaluatedImportSpecifierDependency =
-		getHarmonyEvaluatedImportSpecifierDependency();
 	const deps = /** @type {Module} */ (parser.state.module).dependencies;
 	/** @type {Map<number, HarmonyEvaluatedImportSpecifierDependency>} */
 	const depByRangeStart = new Map();
 	for (let i = /** @type {number} */ (frame.depStart); i < deps.length; i++) {
-		const dep = deps[i];
-		if (dep instanceof HarmonyEvaluatedImportSpecifierDependency && dep.range) {
+		const dep = /** @type {HarmonyEvaluatedImportSpecifierDependency} */ (
+			deps[i]
+		);
+		if (dep.isHarmonyEvaluatedImportSpecifier === true && dep.range) {
 			depByRangeStart.set(dep.range[0], dep);
 		}
 	}

package/lib/dependencies/HarmonyImportSideEffectDependency.js

@@ -6,19 +6,20 @@
 "use strict";
 
 const Dependency = require("../Dependency");
+const InitFragment = require("../InitFragment");
 const Module = require("../Module");
 const { JAVASCRIPT_TYPE } = require("../ModuleSourceTypeConstants");
 const makeSerializable = require("../util/makeSerializable");
 const HarmonyImportDependency = require("./HarmonyImportDependency");
+const { ImportPhaseUtils } = require("./ImportPhase");
 
-/** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
-/** @typedef {import("../Dependency").GetConditionFn} GetConditionFn */
-/** @typedef {import("../Dependency").LazyUntil} LazyUntil */
-/** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
-/** @typedef {import("../ModuleGraph")} ModuleGraph */
-/** @typedef {import("../ModuleGraphConnection").ConnectionState} ConnectionState */
-/** @typedef {import("../javascript/JavascriptParser").ImportAttributes} ImportAttributes */
-/** @typedef {import("./ImportPhase").ImportPhaseType} ImportPhaseType */
+/** @import { ReplaceSource } from "webpack-sources" */
+/** @import { GetConditionFn, LazyUntil } from "../Dependency" */
+/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
+/** @import ModuleGraph from "../ModuleGraph" */
+/** @import { ConnectionState } from "../ModuleGraphConnection" */
+/** @import { ImportAttributes } from "../javascript/JavascriptParser" */
+/** @import { ImportPhaseType } from "./ImportPhase" */
 
 class HarmonyImportSideEffectDependency extends HarmonyImportDependency {
 	/**
@@ -93,7 +94,8 @@ HarmonyImportSideEffectDependency.Template = class HarmonyImportSideEffectDepend
 	 * @returns {void}
 	 */
 	apply(dependency, source, templateContext) {
-		const { moduleGraph, concatenationScope } = templateContext;
+		const { moduleGraph, concatenationScope, runtime, initFragments } =
+			templateContext;
 
 		const module = /** @type {Module} */ (moduleGraph.getModule(dependency));
 
@@ -103,6 +105,33 @@ HarmonyImportSideEffectDependency.Template = class HarmonyImportSideEffectDepend
 		}
 
 		if (concatenationScope && concatenationScope.isModuleInScope(module)) {
+			if (concatenationScope.isModuleWrapped(module)) {
+				const dep = /** @type {HarmonyImportSideEffectDependency} */ (
+					dependency
+				);
+				if (ImportPhaseUtils.isDefer(dep.phase)) return;
+				const connection = moduleGraph.getConnection(dep);
+				if (!connection || !connection.isTargetActive(runtime)) return;
+				// A hoisted body cannot be deferred, so its imports evaluate at their
+				// own slots; calling from here would run them after everything hoisted
+				// in between. Eagerness stops at one level: a module is generated
+				// before its importers, so it never learns whether it is itself eager.
+				if (concatenationScope.isWrapped()) {
+					initFragments.push(
+						new InitFragment(
+							`${concatenationScope.createModuleReference(module, {
+								moduleExportsAccess: true,
+								asiSafe: true
+							})};\n`,
+							InitFragment.STAGE_HARMONY_IMPORTS,
+							/** @type {number} */ (dep.sourceOrder),
+							`cjs eager init ${module.identifier()}`
+						)
+					);
+				} else {
+					concatenationScope.registerEagerModule(module);
+				}
+			}
 			return;
 		}
 		super.apply(dependency, source, templateContext);

package/lib/dependencies/HarmonyImportSpecifierDependency.js

@@ -11,6 +11,7 @@ const Template = require("../Template");
 const {
 	InlinedUsedName,
 	isExportInlined,
+	isInlineEnabled,
 	isInlineExportsEnabled
 } = require("../optimize/InlineExports");
 const {
@@ -18,38 +19,48 @@ const {
 } = require("../optimize/InnerGraph");
 const { getTrimmedIdsAndRange } = require("../util/chainedImports");
 const makeSerializable = require("../util/makeSerializable");
-const memoize = require("../util/memoize");
 const { propertyAccess } = require("../util/property");
 const traverseDestructuringAssignmentProperties = require("../util/traverseDestructuringAssignmentProperties");
 const HarmonyImportDependency = require("./HarmonyImportDependency");
+const HarmonyImportGuard = require("./HarmonyImportGuard");
 const { ImportPhaseUtils } = require("./ImportPhase");
 
-/** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
-/** @typedef {import("../Dependency").GetConditionFn} GetConditionFn */
-/** @typedef {import("../Dependency").RawReferencedExports} RawReferencedExports */
-/** @typedef {import("../Dependency").ReferencedExports} ReferencedExports */
-/** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
-/** @typedef {import("../Module")} Module */
-/** @typedef {import("../Module").BuildMeta} BuildMeta */
-/** @typedef {import("../ModuleGraph")} ModuleGraph */
-/** @typedef {import("../ModuleGraphConnection")} ModuleGraphConnection */
-/** @typedef {import("../ModuleGraphConnection").ConnectionState} ConnectionState */
-/** @typedef {import("../errors/WebpackError")} WebpackError */
-/** @typedef {import("../javascript/JavascriptParser").DestructuringAssignmentProperties} DestructuringAssignmentProperties */
-/** @typedef {import("../javascript/JavascriptParser").ImportAttributes} ImportAttributes */
-/** @typedef {import("../javascript/JavascriptParser").Range} Range */
-/** @typedef {import("../optimize/InnerGraph").UsedByExports} UsedByExports */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
-/** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
-/** @typedef {import("../util/chainedImports").IdRanges} IdRanges */
-/** @typedef {import("./HarmonyImportDependency").ExportPresenceMode} ExportPresenceMode */
+/** @import { ReplaceSource } from "webpack-sources" */
+/** @import { GetConditionFn, ReferencedExports } from "../Dependency" */
+/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
+/** @import Module, { BuildMeta } from "../Module" */
+/** @import ModuleGraph from "../ModuleGraph" */
+/**
+ * @import ModuleGraphConnection, {
+ * 	ConnectionState
+ * } from "../ModuleGraphConnection"
+ */
+/** @import WebpackError from "../errors/WebpackError" */
+/**
+ * @import {
+ * 	DestructuringAssignmentProperties,
+ * 	ImportAttributes,
+ * 	Range
+ * } from "../javascript/JavascriptParser"
+ */
+/** @import { UsedByExports } from "../optimize/InnerGraph" */
+/**
+ * @import {
+ * 	ObjectDeserializerContext,
+ * 	ObjectSerializerContext
+ * } from "../serialization/ObjectMiddleware"
+ */
+/** @import { RuntimeSpec } from "../util/runtime" */
+/** @import { IdRanges } from "../util/chainedImports" */
+/** @import { ExportPresenceMode } from "./HarmonyImportDependency" */
 /** @typedef {HarmonyImportDependency.Ids} Ids */
-/** @typedef {import("./ImportPhase").ImportPhaseType} ImportPhaseType */
-/** @typedef {import("./HarmonyImportGuard").DependencyGuard} DependencyGuard */
-/** @typedef {import("../javascript/JavascriptModule").JavascriptModuleBuildMeta} JavascriptModuleBuildMeta */
-
-const getHarmonyImportGuard = memoize(() => require("./HarmonyImportGuard"));
+/** @import { ImportPhaseType } from "./ImportPhase" */
+/** @import { DependencyGuard } from "./HarmonyImportGuard" */
+/**
+ * @import {
+ * 	JavascriptModuleBuildMeta
+ * } from "../javascript/JavascriptModule"
+ */
 
 const idsSymbol = /** @type {symbol} */ (
 	Symbol("HarmonyImportSpecifierDependency.ids")
@@ -57,7 +68,22 @@ const idsSymbol = /** @type {symbol} */ (
 
 const { ExportPresenceModes } = HarmonyImportDependency;
 
+/**
+ * One condition closure per module graph and variant rather than per dependency.
+ * The dependency the condition was built for is always the one on the connection
+ * it is called with, since `ModuleGraph#setResolvedModule` is the only caller of
+ * `getCondition` and pairs the two. Indexed by
+ * `(usedByExports ? 1 : 0) | (inlineEnabled ? 2 : 0)`.
+ * @type {WeakMap<ModuleGraph, (GetConditionFn | undefined)[]>}
+ */
+const conditionsByModuleGraph = new WeakMap();
+
 class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
+	// read by `HarmonyImportGuard` in place of `instanceof`, which would cycle
+	get isHarmonyImportSpecifier() {
+		return true;
+	}
+
 	/**
 	 * Creates an instance of HarmonyImportSpecifierDependency.
 	 * @param {string} request request
@@ -181,36 +207,59 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 			moduleGraph
 		);
 		if (usedByExportsCondition === false) return false;
+		const inlineEnabled = isInlineExportsEnabled(moduleGraph);
 		// Keep the connection unconditional (fast path) when nothing can deactivate it
 		if (
 			usedByExportsCondition === null &&
 			this.branchGuards === undefined &&
-			!isInlineExportsEnabled(moduleGraph)
+			!inlineEnabled
 		) {
 			return null;
 		}
-		const dep = this;
-		return (connection, runtime) => {
+		// Everything the condition still needs is either per module graph or on
+		// the connection it is called with, so one closure per variant serves the
+		// whole graph instead of one per dependency.
+		const slot =
+			(usedByExportsCondition === null ? 0 : 1) | (inlineEnabled ? 2 : 0);
+		let variants = conditionsByModuleGraph.get(moduleGraph);
+		if (variants === undefined) {
+			variants = [undefined, undefined, undefined, undefined];
+			conditionsByModuleGraph.set(moduleGraph, variants);
+		}
+		const cached = variants[slot];
+		if (cached !== undefined) return cached;
+		/** @type {GetConditionFn} */
+		const condition = (connection, runtime) => {
+			const dep = /** @type {HarmonyImportSpecifierDependency} */ (
+				connection.dependency
+			);
 			if (usedByExportsCondition !== null) {
 				const result = usedByExportsCondition(connection, runtime);
 				if (result === false) return false;
 			}
-			const ids = dep.getIds(moduleGraph);
-			if (
-				ids.length > 0 &&
-				isExportInlined(moduleGraph, connection.module, ids, runtime)
-			) {
-				return false;
+			// `isInlineEnabled` is the cheap module-level precondition of
+			// `isExportInlined`; checking it here keeps the id lookup off the hot
+			// path for the common target module that has no inlined exports
+			if (inlineEnabled && isInlineEnabled(connection.module)) {
+				const ids = dep.getIds(moduleGraph);
+				if (
+					ids.length > 0 &&
+					isExportInlined(moduleGraph, connection.module, ids, runtime)
+				) {
+					return false;
+				}
 			}
 			const guards = dep.branchGuards;
 			if (
 				guards !== undefined &&
-				getHarmonyImportGuard().isDeadByGuards(guards, moduleGraph, runtime)
+				HarmonyImportGuard.isDeadByGuards(guards, moduleGraph, runtime)
 			) {
 				return false;
 			}
 			return true;
 		};
+		variants[slot] = condition;
+		return condition;
 	}
 
 	/**
@@ -287,21 +336,19 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 	 */
 	_getReferencedExportsInDestructuring(ids) {
 		if (this.referencedPropertiesInDestructuring) {
-			/** @type {RawReferencedExports} */
-			const refsInDestructuring = [];
+			/** @type {ReferencedExports} */
+			const refs = [];
 			traverseDestructuringAssignmentProperties(
 				this.referencedPropertiesInDestructuring,
-				(stack) => refsInDestructuring.push(stack.map((p) => p.id))
+				(stack) => {
+					const idsInDestructuring = stack.map((p) => p.id);
+					// Destructuring consumer can't accept an inlined literal
+					refs.push({
+						name: ids ? [...ids, ...idsInDestructuring] : idsInDestructuring,
+						canInline: false
+					});
+				}
 			);
-			/** @type {ReferencedExports} */
-			const refs = [];
-			for (const idsInDestructuring of refsInDestructuring) {
-				// Destructuring consumer can't accept an inlined literal
-				refs.push({
-					name: ids ? [...ids, ...idsInDestructuring] : idsInDestructuring,
-					canInline: false
-				});
-			}
 			return refs;
 		}
 		return ids
@@ -643,5 +690,6 @@ HarmonyImportSpecifierDependency.Template = class HarmonyImportSpecifierDependen
 	}
 };
 
+HarmonyImportSpecifierDependency.idsSymbol = idsSymbol;
+
 module.exports = HarmonyImportSpecifierDependency;
-module.exports.idsSymbol = idsSymbol;

package/lib/dependencies/HarmonyModulesPlugin.js

@@ -27,9 +27,13 @@ const HarmonyImportSpecifierDependency = require("./HarmonyImportSpecifierDepend
 const HarmonyTopLevelThisParserPlugin = require("./HarmonyTopLevelThisParserPlugin");
 const TopLevelAwaitDependency = require("./TopLevelAwaitDependency");
 
-/** @typedef {import("../../declarations/WebpackOptions").JavascriptParserOptions} JavascriptParserOptions */
-/** @typedef {import("../Compiler")} Compiler */
-/** @typedef {import("../javascript/JavascriptParser")} Parser */
+/**
+ * @import {
+ * 	JavascriptParserOptions
+ * } from "../../declarations/WebpackOptions"
+ */
+/** @import Compiler from "../Compiler" */
+/** @import Parser from "../javascript/JavascriptParser" */
 
 /**
  * Defines the harmony modules plugin options type used by this module.

package/lib/dependencies/HarmonyTopLevelThisParserPlugin.js

@@ -8,9 +8,7 @@
 const ConstDependency = require("./ConstDependency");
 const HarmonyExports = require("./HarmonyExports");
 
-/** @typedef {import("../Dependency").DependencyLocation} DependencyLocation */
-/** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
-/** @typedef {import("../javascript/JavascriptParser").Range} Range */
+/** @import JavascriptParser, { Range } from "../javascript/JavascriptParser" */
 
 const PLUGIN_NAME = "HarmonyTopLevelThisParserPlugin";