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

package/lib/ModuleGraph.js

@@ -14,18 +14,21 @@ const SortableSet = require("./util/SortableSet");
 const WeakTupleMap = require("./util/WeakTupleMap");
 const { sortWithSourceOrder } = require("./util/comparators");
 
-/** @typedef {import("./Compilation").ModuleMemCaches} ModuleMemCaches */
-/** @typedef {import("./DependenciesBlock")} DependenciesBlock */
-/** @typedef {import("./Dependency")} Dependency */
-/** @typedef {import("./ExportsInfo").ExportInfo} ExportInfo */
-/** @typedef {import("./ExportsInfo").ExportInfoName} ExportInfoName */
-/** @typedef {import("./Module")} Module */
-/** @typedef {import("./ModuleProfile")} ModuleProfile */
-/** @typedef {import("./RequestShortener")} RequestShortener */
-/** @typedef {import("./util/runtime").RuntimeSpec} RuntimeSpec */
-/** @typedef {import("./dependencies/HarmonyImportSideEffectDependency")} HarmonyImportSideEffectDependency */
-/** @typedef {import("./dependencies/HarmonyImportSpecifierDependency")} HarmonyImportSpecifierDependency */
-/** @typedef {import("./util/comparators").DependencySourceOrder} DependencySourceOrder */
+/** @import { ModuleMemCaches } from "./Compilation" */
+/** @import DependenciesBlock from "./DependenciesBlock" */
+/** @import Dependency, { ExportInfoName } from "./Dependency" */
+/** @import { ExportInfo } from "./ExportsInfo" */
+/** @import Module from "./Module" */
+/** @import ModuleProfile from "./ModuleProfile" */
+/** @import RequestShortener from "./RequestShortener" */
+/** @import { RuntimeSpec } from "./util/runtime" */
+/** @import HarmonyImportSideEffectDependency from "./dependencies/HarmonyImportSideEffectDependency" */
+/**
+ * @import HarmonyImportSpecifierDependency, {
+ * 	idsSymbol as HarmonyImportSpecifierDependencyIDsSymbol
+ * } from "./dependencies/HarmonyImportSpecifierDependency"
+ */
+/** @import { DependencySourceOrder } from "./util/comparators" */
 
 /**
  * Defines the optimization bailout function callback.
@@ -124,9 +127,16 @@ class ModuleGraphModule {
 
 /** @typedef {EXPECTED_OBJECT} MetaKey */
 
-/** @typedef {import("./dependencies/CommonJsExportRequireDependency").idsSymbol} CommonJsExportRequireDependencyIDsSymbol */
-/** @typedef {import("./dependencies/HarmonyImportSpecifierDependency").idsSymbol} HarmonyImportSpecifierDependencyIDsSymbol */
-/** @typedef {import("./dependencies/HarmonyExportImportedSpecifierDependency").idsSymbol} HarmonyExportImportedSpecifierDependencyIDsSymbol */
+/**
+ * @import {
+ * 	idsSymbol as CommonJsExportRequireDependencyIDsSymbol
+ * } from "./dependencies/CommonJsExportRequireDependency"
+ */
+/**
+ * @import {
+ * 	idsSymbol as HarmonyExportImportedSpecifierDependencyIDsSymbol
+ * } from "./dependencies/HarmonyExportImportedSpecifierDependency"
+ */
 
 /**
  * Defines the known meta type used by this module.
@@ -171,6 +181,15 @@ class ModuleGraph {
 		 */
 		this._cacheStage = undefined;
 
+		// incremental rebuilds: when set, move/copyOutgoingModuleConnections record
+		// their seal-time graph mutations (concatenation) here so they can be reversed,
+		// keeping this durable graph reusable across rebuilds
+		/**
+		 * @type {{ oldModule?: Module, newModule: Module, movedOut?: ModuleGraphConnection[] | undefined, movedIn?: ModuleGraphConnection[] | undefined, copied?: ModuleGraphConnection[] }[] | undefined}
+		 * @private
+		 */
+		this._mutationJournal = undefined;
+
 		/**
 		 * @type {WeakMap<Dependency, DependencySourceOrder>}
 		 * @private
@@ -395,6 +414,59 @@ class ModuleGraph {
 		this._dependencyMap.set(dependency, null);
 	}
 
+	/**
+	 * Removes every outgoing connection of `module` whose dependency is in
+	 * `staleDependencies`, including inactive ones left by `updateModule`
+	 * re-targeting (which the dependency-keyed `removeConnection` misses). Needed
+	 * when a module is rebuilt against a persisted graph so stale connections don't
+	 * linger in the old target's incoming set and crash seal-time plugins.
+	 * @param {Module} module the rebuilt origin module
+	 * @param {Set<Dependency>} staleDependencies dependencies replaced by the rebuild
+	 * @returns {void}
+	 */
+	_removeStaleOutgoingConnections(module, staleDependencies) {
+		const mgm = this._getModuleGraphModule(module);
+		const outgoing = mgm.outgoingConnections;
+		if (outgoing === undefined) return;
+		for (const connection of outgoing) {
+			if (
+				!staleDependencies.has(
+					/** @type {Dependency} */ (connection.dependency)
+				)
+			) {
+				continue;
+			}
+			outgoing.delete(connection);
+			if (connection.module !== null) {
+				this._getModuleGraphModule(
+					connection.module
+				).incomingConnections.delete(connection);
+			}
+		}
+	}
+
+	/**
+	 * Assigns `module`'s pending outgoing connections into the dependency map by
+	 * origin. `getConnection` normally does this lazily keyed by a dependency's
+	 * PARENT module; an incremental barrel un-lazy wires a re-export target from
+	 * the importer's walk, so the export dep's parent differs from its origin
+	 * barrel and the lazy flush never reaches it. Flush by origin to fix that.
+	 * @param {Module} module the origin module
+	 * @returns {void}
+	 */
+	_flushUnassignedConnections(module) {
+		const mgm = this._getModuleGraphModule(module);
+		const pending = mgm._unassignedConnections;
+		if (pending === undefined || pending.length === 0) return;
+		for (const connection of pending) {
+			this._dependencyMap.set(
+				/** @type {Dependency} */ (connection.dependency),
+				connection
+			);
+		}
+		pending.length = 0;
+	}
+
 	/**
 	 * Adds the provided dependency to the module graph.
 	 * @param {Dependency} dependency the referencing dependency
@@ -437,6 +509,35 @@ class ModuleGraph {
 		mgm.async = false;
 	}
 
+	/**
+	 * Removes a module from the graph entirely, detaching its connections. Used to
+	 * drop stale runtime modules on an incremental rebuild so the persisted graph
+	 * doesn't accumulate them.
+	 * @param {Module} module the module to remove
+	 * @returns {void}
+	 */
+	_removeModule(module) {
+		const mgm = this._moduleMap.get(module);
+		if (mgm === undefined) return;
+		if (mgm.outgoingConnections !== undefined) {
+			for (const connection of mgm.outgoingConnections) {
+				if (connection.module && connection.module !== module) {
+					const other = this._moduleMap.get(connection.module);
+					if (other !== undefined) other.incomingConnections.delete(connection);
+				}
+			}
+		}
+		for (const connection of mgm.incomingConnections) {
+			if (connection.originModule && connection.originModule !== module) {
+				const other = this._moduleMap.get(connection.originModule);
+				if (other !== undefined && other.outgoingConnections !== undefined) {
+					other.outgoingConnections.delete(connection);
+				}
+			}
+		}
+		this._moduleMap.delete(module);
+	}
+
 	/**
 	 * Removes all module attributes.
 	 * @returns {void}
@@ -461,6 +562,11 @@ class ModuleGraph {
 		if (oldModule === newModule) return;
 		const oldMgm = this._getModuleGraphModule(oldModule);
 		const newMgm = this._getModuleGraphModule(newModule);
+		const journal = this._mutationJournal;
+		/** @type {ModuleGraphConnection[] | undefined} */
+		const movedOut = journal ? [] : undefined;
+		/** @type {ModuleGraphConnection[] | undefined} */
+		const movedIn = journal ? [] : undefined;
 		// Outgoing connections
 		const oldConnections = oldMgm.outgoingConnections;
 		if (oldConnections !== undefined) {
@@ -473,6 +579,7 @@ class ModuleGraph {
 					connection.originModule = newModule;
 					newConnections.add(connection);
 					oldConnections.delete(connection);
+					if (movedOut) movedOut.push(connection);
 				}
 			}
 		}
@@ -484,8 +591,69 @@ class ModuleGraph {
 				connection.module = newModule;
 				newConnections2.add(connection);
 				oldConnections2.delete(connection);
+				if (movedIn) movedIn.push(connection);
+			}
+		}
+		if (journal) journal.push({ oldModule, newModule, movedOut, movedIn });
+	}
+
+	/**
+	 * Start recording connection moves so they can later be reversed for incremental rebuilds.
+	 * @returns {void}
+	 */
+	_startMutationJournal() {
+		this._mutationJournal = [];
+	}
+
+	/**
+	 * Reverse all recorded connection moves, restoring the graph to its pre-seal
+	 * (end-of-make) state, then stop recording (incremental rebuilds).
+	 * @returns {void}
+	 */
+	_restoreFromMutationJournal() {
+		const journal = this._mutationJournal;
+		if (journal === undefined) return;
+		for (let i = journal.length - 1; i >= 0; i--) {
+			const { oldModule, newModule, movedOut, movedIn, copied } = journal[i];
+			const newMgm = this._getModuleGraphModule(newModule);
+			// copyOutgoingModuleConnections clones connections onto newModule and the
+			// external targets; undo by deleting the clones (there is no oldModule)
+			if (copied !== undefined) {
+				for (const connection of copied) {
+					if (newMgm.outgoingConnections !== undefined) {
+						newMgm.outgoingConnections.delete(connection);
+					}
+					if (connection.module !== null && connection.module !== undefined) {
+						this._getModuleGraphModule(
+							connection.module
+						).incomingConnections.delete(connection);
+					}
+				}
+				continue;
+			}
+			const oldModuleT = /** @type {Module} */ (oldModule);
+			const oldMgm = this._getModuleGraphModule(oldModuleT);
+			if (movedOut !== undefined) {
+				if (oldMgm.outgoingConnections === undefined) {
+					oldMgm.outgoingConnections = new SortableSet();
+				}
+				for (const connection of movedOut) {
+					connection.originModule = oldModuleT;
+					oldMgm.outgoingConnections.add(connection);
+					if (newMgm.outgoingConnections !== undefined) {
+						newMgm.outgoingConnections.delete(connection);
+					}
+				}
+			}
+			if (movedIn !== undefined) {
+				for (const connection of movedIn) {
+					connection.module = oldModuleT;
+					oldMgm.incomingConnections.add(connection);
+					newMgm.incomingConnections.delete(connection);
+				}
 			}
 		}
+		this._mutationJournal = undefined;
 	}
 
 	/**
@@ -499,6 +667,9 @@ class ModuleGraph {
 		if (oldModule === newModule) return;
 		const oldMgm = this._getModuleGraphModule(oldModule);
 		const newMgm = this._getModuleGraphModule(newModule);
+		const journal = this._mutationJournal;
+		/** @type {ModuleGraphConnection[] | undefined} */
+		const copied = journal ? [] : undefined;
 		// Outgoing connections
 		const oldConnections = oldMgm.outgoingConnections;
 		if (oldConnections !== undefined) {
@@ -515,9 +686,13 @@ class ModuleGraph {
 						const otherMgm = this._getModuleGraphModule(newConnection.module);
 						otherMgm.incomingConnections.add(newConnection);
 					}
+					if (copied) copied.push(newConnection);
 				}
 			}
 		}
+		if (journal && copied !== undefined && copied.length > 0) {
+			journal.push({ newModule, copied });
+		}
 	}
 
 	/**
@@ -752,7 +927,7 @@ class ModuleGraph {
 	 * Returns info about the export.
 	 * @param {Module} module the module
 	 * @param {string} exportName the export
-	 * @returns {ExportInfo} info about the export
+	 * @returns {InstanceType<ExportInfo>} info about the export
 	 */
 	getExportInfo(module, exportName) {
 		const mgm = this._getModuleGraphModule(module);
@@ -763,7 +938,7 @@ class ModuleGraph {
 	 * Gets read only export info.
 	 * @param {Module} module the module
 	 * @param {string} exportName the export
-	 * @returns {ExportInfo} info about the export (do not modify)
+	 * @returns {InstanceType<ExportInfo>} info about the export (do not modify)
 	 */
 	getReadOnlyExportInfo(module, exportName) {
 		const mgm = this._getModuleGraphModule(module);
@@ -1044,9 +1219,7 @@ class ModuleGraph {
 				const moduleGraph = moduleGraphForModuleMap.get(module);
 				if (!moduleGraph) {
 					throw new Error(
-						`${
-							deprecateMessage
-						}There was no ModuleGraph assigned to the Module for backward-compat (Use the new API)`
+						`${deprecateMessage}There was no ModuleGraph assigned to the Module for backward-compat (Use the new API)`
 					);
 				}
 				return moduleGraph;
@@ -1090,5 +1263,6 @@ const moduleGraphForModuleMap = new WeakMap();
 /** @type {Map<string, (module: Module) => ModuleGraph>} */
 const deprecateMap = new Map();
 
+ModuleGraph.ModuleGraphConnection = ModuleGraphConnection;
+
 module.exports = ModuleGraph;
-module.exports.ModuleGraphConnection = ModuleGraphConnection;

package/lib/ModuleGraphConnection.js

@@ -5,10 +5,9 @@
 
 "use strict";
 
-/** @typedef {import("./Dependency")} Dependency */
-/** @typedef {import("./Dependency").GetConditionFn} GetConditionFn */
-/** @typedef {import("./Module")} Module */
-/** @typedef {import("./util/runtime").RuntimeSpec} RuntimeSpec */
+/** @import Dependency, { GetConditionFn } from "./Dependency" */
+/** @import Module from "./Module" */
+/** @import { RuntimeSpec } from "./util/runtime" */
 
 /**
  * Module itself is not connected, but transitive modules are connected transitively.
@@ -195,14 +194,8 @@ class ModuleGraphConnection {
 	}
 }
 
-/** @typedef {typeof TRANSITIVE_ONLY} TRANSITIVE_ONLY */
-/** @typedef {typeof CIRCULAR_CONNECTION} CIRCULAR_CONNECTION */
+ModuleGraphConnection.CIRCULAR_CONNECTION = CIRCULAR_CONNECTION;
+ModuleGraphConnection.TRANSITIVE_ONLY = TRANSITIVE_ONLY;
+ModuleGraphConnection.addConnectionStates = addConnectionStates;
 
 module.exports = ModuleGraphConnection;
-module.exports.CIRCULAR_CONNECTION = /** @type {typeof CIRCULAR_CONNECTION} */ (
-	CIRCULAR_CONNECTION
-);
-module.exports.TRANSITIVE_ONLY = /** @type {typeof TRANSITIVE_ONLY} */ (
-	TRANSITIVE_ONLY
-);
-module.exports.addConnectionStates = addConnectionStates;

package/lib/ModuleInfoHeaderPlugin.js

@@ -11,14 +11,12 @@ const Template = require("./Template");
 const CssModulesPlugin = require("./css/CssModulesPlugin");
 const JavascriptModulesPlugin = require("./javascript/JavascriptModulesPlugin");
 
-/** @typedef {import("webpack-sources").Source} Source */
-/** @typedef {import("./Compiler")} Compiler */
-/** @typedef {import("./ExportsInfo")} ExportsInfo */
-/** @typedef {import("./ExportsInfo").ExportInfo} ExportInfo */
-/** @typedef {import("./Module")} Module */
-/** @typedef {import("./Module").BuildMeta} BuildMeta */
-/** @typedef {import("./ModuleGraph")} ModuleGraph */
-/** @typedef {import("./RequestShortener")} RequestShortener */
+/** @import { Source } from "webpack-sources" */
+/** @import Compiler from "./Compiler" */
+/** @import ExportsInfo, { ExportInfo } from "./ExportsInfo" */
+/** @import Module, { BuildMeta } from "./Module" */
+/** @import ModuleGraph from "./ModuleGraph" */
+/** @import RequestShortener from "./RequestShortener" */
 
 /**
  * Join iterable with comma.
@@ -49,7 +47,7 @@ const joinIterableWithComma = (iterable) => {
  * @param {ExportsInfo} exportsInfo data
  * @param {ModuleGraph} moduleGraph moduleGraph
  * @param {RequestShortener} requestShortener requestShortener
- * @param {Set<ExportInfo>} alreadyPrinted deduplication set
+ * @param {Set<InstanceType<ExportInfo>>} alreadyPrinted deduplication set
  * @returns {void}
  */
 const printExportsInfoToSource = (
@@ -65,7 +63,7 @@ const printExportsInfoToSource = (
 	let alreadyPrintedExports = 0;
 
 	// determine exports to print
-	/** @type {ExportInfo[]} */
+	/** @type {InstanceType<ExportInfo>[]} */
 	const printedExports = [];
 	for (const exportInfo of exportsInfo.orderedExports) {
 		if (!alreadyPrinted.has(exportInfo)) {

package/lib/ModuleTemplate.js

@@ -6,18 +6,21 @@
 "use strict";
 
 const util = require("util");
-const memoize = require("./util/memoize");
+const JavascriptModulesPlugin = require("./javascript/JavascriptModulesPlugin");
 
-/** @typedef {import("tapable").Tap} Tap */
-/** @typedef {import("webpack-sources").Source} Source */
-/** @typedef {import("./Chunk")} Chunk */
-/** @typedef {import("./Compilation")} Compilation */
-/** @typedef {import("./DependencyTemplates")} DependencyTemplates */
-/** @typedef {import("./Module")} Module */
-/** @typedef {import("./RuntimeTemplate")} RuntimeTemplate */
-/** @typedef {import("./javascript/JavascriptModulesPlugin").ChunkRenderContext} ChunkRenderContext */
-/** @typedef {import("./javascript/JavascriptModulesPlugin").ModuleRenderContext}  ModuleRenderContext */
-/** @typedef {import("./util/Hash")} Hash */
+/** @import { Tap } from "tapable" */
+/** @import { Source } from "webpack-sources" */
+/** @import Compilation from "./Compilation" */
+/** @import DependencyTemplates from "./DependencyTemplates" */
+/** @import Module from "./Module" */
+/** @import RuntimeTemplate from "./RuntimeTemplate" */
+/**
+ * @import {
+ * 	ChunkRenderContext,
+ * 	ModuleRenderContext
+ * } from "./javascript/JavascriptModulesPlugin"
+ */
+/** @import Hash from "./util/Hash" */
 
 /**
  * Defines the if set type used by this module.
@@ -25,10 +28,6 @@ const memoize = require("./util/memoize");
  * @typedef {import("tapable").IfSet<T>} IfSet
  */
 
-const getJavascriptModulesPlugin = memoize(() =>
-	require("./javascript/JavascriptModulesPlugin")
-);
-
 // TODO webpack 6: remove this class
 class ModuleTemplate {
 	/**
@@ -51,18 +50,18 @@ class ModuleTemplate {
 					 * @param {(source: Source, module: Module, moduleRenderContext: ModuleRenderContext, dependencyTemplates: DependencyTemplates) => Source} fn fn
 					 */
 					(options, fn) => {
-						getJavascriptModulesPlugin()
-							.getCompilationHooks(compilation)
-							.renderModuleContent.tap(
-								options,
-								(source, module, renderContext) =>
-									fn(
-										source,
-										module,
-										renderContext,
-										renderContext.dependencyTemplates
-									)
-							);
+						JavascriptModulesPlugin.getCompilationHooks(
+							compilation
+						).renderModuleContent.tap(
+							options,
+							(source, module, renderContext) =>
+								fn(
+									source,
+									module,
+									renderContext,
+									renderContext.dependencyTemplates
+								)
+						);
 					},
 					"ModuleTemplate.hooks.content is deprecated (use JavascriptModulesPlugin.getCompilationHooks().renderModuleContent instead)",
 					"DEP_MODULE_TEMPLATE_CONTENT"
@@ -77,18 +76,18 @@ class ModuleTemplate {
 					 * @param {(source: Source, module: Module, moduleRenderContext: ModuleRenderContext, dependencyTemplates: DependencyTemplates) => Source} fn fn
 					 */
 					(options, fn) => {
-						getJavascriptModulesPlugin()
-							.getCompilationHooks(compilation)
-							.renderModuleContent.tap(
-								options,
-								(source, module, renderContext) =>
-									fn(
-										source,
-										module,
-										renderContext,
-										renderContext.dependencyTemplates
-									)
-							);
+						JavascriptModulesPlugin.getCompilationHooks(
+							compilation
+						).renderModuleContent.tap(
+							options,
+							(source, module, renderContext) =>
+								fn(
+									source,
+									module,
+									renderContext,
+									renderContext.dependencyTemplates
+								)
+						);
 					},
 					"ModuleTemplate.hooks.module is deprecated (use JavascriptModulesPlugin.getCompilationHooks().renderModuleContent instead)",
 					"DEP_MODULE_TEMPLATE_MODULE"
@@ -103,18 +102,18 @@ class ModuleTemplate {
 					 * @param {(source: Source, module: Module, chunkRenderContext: ChunkRenderContext, dependencyTemplates: DependencyTemplates) => Source} fn fn
 					 */
 					(options, fn) => {
-						getJavascriptModulesPlugin()
-							.getCompilationHooks(compilation)
-							.renderModuleContainer.tap(
-								options,
-								(source, module, renderContext) =>
-									fn(
-										source,
-										module,
-										renderContext,
-										renderContext.dependencyTemplates
-									)
-							);
+						JavascriptModulesPlugin.getCompilationHooks(
+							compilation
+						).renderModuleContainer.tap(
+							options,
+							(source, module, renderContext) =>
+								fn(
+									source,
+									module,
+									renderContext,
+									renderContext.dependencyTemplates
+								)
+						);
 					},
 					"ModuleTemplate.hooks.render is deprecated (use JavascriptModulesPlugin.getCompilationHooks().renderModuleContainer instead)",
 					"DEP_MODULE_TEMPLATE_RENDER"
@@ -129,18 +128,18 @@ class ModuleTemplate {
 					 * @param {(source: Source, module: Module, chunkRenderContext: ChunkRenderContext, dependencyTemplates: DependencyTemplates) => Source} fn fn
 					 */
 					(options, fn) => {
-						getJavascriptModulesPlugin()
-							.getCompilationHooks(compilation)
-							.renderModulePackage.tap(
-								options,
-								(source, module, renderContext) =>
-									fn(
-										source,
-										module,
-										renderContext,
-										renderContext.dependencyTemplates
-									)
-							);
+						JavascriptModulesPlugin.getCompilationHooks(
+							compilation
+						).renderModulePackage.tap(
+							options,
+							(source, module, renderContext) =>
+								fn(
+									source,
+									module,
+									renderContext,
+									renderContext.dependencyTemplates
+								)
+						);
 					},
 					"ModuleTemplate.hooks.package is deprecated (use JavascriptModulesPlugin.getCompilationHooks().renderModulePackage instead)",
 					"DEP_MODULE_TEMPLATE_PACKAGE"