webpack 5.109.2 → 5.110.0

package/lib/EvalSourceMapDevToolPlugin.js

@@ -15,14 +15,21 @@ const ConcatenatedModule = require("./optimize/ConcatenatedModule");
 const generateDebugId = require("./util/generateDebugId");
 const { makePathsAbsolute } = require("./util/identifier");
 
-/** @typedef {import("webpack-sources").RawSourceMap} RawSourceMap */
-/** @typedef {import("webpack-sources").Source} Source */
-/** @typedef {import("../declarations/WebpackOptions").DevtoolNamespace} DevtoolNamespace */
-/** @typedef {import("../declarations/WebpackOptions").DevtoolModuleFilenameTemplate} DevtoolModuleFilenameTemplate */
-/** @typedef {import("../declarations/plugins/SourceMapDevToolPlugin").SourceMapDevToolPluginOptions} SourceMapDevToolPluginOptions */
-/** @typedef {import("../declarations/plugins/SourceMapDevToolPlugin").Rules} Rules */
-/** @typedef {import("./Compiler")} Compiler */
-/** @typedef {import("./ChunkGraph").ModuleId} ModuleId */
+/** @import { RawSourceMap, Source } from "webpack-sources" */
+/**
+ * @import {
+ * 	DevtoolNamespace,
+ * 	DevtoolModuleFilenameTemplate
+ * } from "../declarations/WebpackOptions"
+ */
+/**
+ * @import {
+ * 	SourceMapDevToolPluginOptions,
+ * 	Rules
+ * } from "../declarations/plugins/SourceMapDevToolPlugin"
+ */
+/** @import Compiler from "./Compiler" */
+/** @import { ModuleId } from "./ChunkGraph" */
 
 /** @type {WeakMap<Source, Source>} */
 const cache = new WeakMap();

package/lib/ExportsInfo.js

@@ -12,19 +12,22 @@ const SortableSet = require("./util/SortableSet");
 const makeSerializable = require("./util/makeSerializable");
 const { forEachRuntime } = require("./util/runtime");
 
-/** @typedef {import("./Dependency")} Dependency */
-/** @typedef {import("./Dependency").RuntimeSpec} RuntimeSpec */
-/** @typedef {import("./Dependency").ExportInfoName} ExportInfoName */
-/** @typedef {import("./Dependency").ExportsSpecExcludeExports} ExportsSpecExcludeExports */
-/** @typedef {import("./dependencies/HarmonyImportDependency")} HarmonyImportDependency */
-/** @typedef {import("./Module")} Module */
-/** @typedef {import("./ModuleGraph")} ModuleGraph */
-/** @typedef {import("./ModuleGraphConnection")} ModuleGraphConnection */
-/** @typedef {import("./optimize/InlineExports").InlinedValue} InlinedValue */
+/**
+ * @import Dependency, {
+ * 	ExportInfoName,
+ * 	ExportsSpecExcludeExports
+ * } from "./Dependency"
+ */
+/** @import HarmonyImportDependency from "./dependencies/HarmonyImportDependency" */
+/** @import Module from "./Module" */
+/** @import ModuleGraph from "./ModuleGraph" */
+/** @import ModuleGraphConnection from "./ModuleGraphConnection" */
+/** @import { InlinedValue } from "./optimize/InlineExports" */
 /** @typedef {[RestoreProvidedDataExports[], ExportInfo["provided"], ExportInfo["canMangleProvide"], ExportInfo["terminalBinding"]]} RestoreProvidedDataTuple */
 /** @typedef {import("./serialization/ObjectMiddleware").ObjectDeserializerContext<RestoreProvidedDataTuple>} ObjectDeserializerContext */
 /** @typedef {import("./serialization/ObjectMiddleware").ObjectSerializerContext<RestoreProvidedDataTuple>} ObjectSerializerContext */
-/** @typedef {import("./util/Hash")} Hash */
+/** @import Hash from "./util/Hash" */
+/** @import { RuntimeSpec } from "./util/runtime" */
 
 /** @typedef {typeof UsageState.OnlyPropertiesUsed | typeof UsageState.NoInfo | typeof UsageState.Unknown | typeof UsageState.Used} RuntimeUsageStateType */
 /** @typedef {typeof UsageState.Unused | RuntimeUsageStateType} UsageStateType */
@@ -307,6 +310,39 @@ class ExportsInfo {
 		}
 	}
 
+	/**
+	 * Resets provide-side info so FlagDependencyExports can recompute it on an
+	 * incremental rebuild against the persisted module graph (which otherwise
+	 * keeps exports removed by the rebuild, since the plugin only merges).
+	 * @returns {void}
+	 */
+	_resetProvidedExports() {
+		for (const exportInfo of this._exports.values()) {
+			exportInfo._resetProvideInfo();
+		}
+		this._redirectTo = undefined;
+		this._otherExportsInfo._resetProvideInfo();
+	}
+
+	/**
+	 * Resets the use-side info to the undetermined state so FlagDependencyUsage
+	 * can re-trace usage on an incremental rebuild. The persisted graph keeps a
+	 * module marked "used", which stops the trace re-queuing it, so exports newly
+	 * used by a changed importer would never be flagged.
+	 * @returns {void}
+	 */
+	_resetUsedExports() {
+		for (const exportInfo of this._exports.values()) {
+			exportInfo._resetUseInfo();
+		}
+		this._sideEffectsOnlyInfo._resetUseInfo();
+		// every InlinedUsedName was just cleared, so drop the fast-path flag
+		this._hasInlinedExports = false;
+		// never follow _redirectTo: it points into another module's exports info
+		// (FlagDependencyExports targets), whose own reset/re-trace owns that state
+		this._otherExportsInfo._resetUseInfo();
+	}
+
 	setHasUseInfo() {
 		for (const exportInfo of this._exports.values()) {
 			exportInfo.setHasUseInfo();
@@ -353,7 +389,7 @@ class ExportsInfo {
 	/**
 	 * Gets read only export info.
 	 * @param {ExportInfoName} name export name
-	 * @returns {ExportInfo} export info for this name
+	 * @returns {InstanceType<ExportInfo>} export info for this name
 	 */
 	getReadOnlyExportInfo(name) {
 		const info = this._exports.get(name);
@@ -1263,6 +1299,56 @@ class ExportInfo {
 		if (this.canMangleProvide === undefined) {
 			this.canMangleProvide = true;
 		}
+		// mirror setHasUseInfo: after a provide reset the owned nested info is
+		// undefined again, and FlagDependencyExports only upgrades from false/null
+		if (this.exportsInfoOwned) {
+			/** @type {ExportsInfo} */
+			(this.exportsInfo).setHasProvideInfo();
+		}
+	}
+
+	/**
+	 * Resets provide-side info to the undetermined state (use info untouched).
+	 * @returns {void}
+	 */
+	_resetProvideInfo() {
+		this.provided = undefined;
+		this.terminalBinding = false;
+		this.canMangleProvide = undefined;
+		this._inlinedValue = undefined;
+		if (this.exportsInfoOwned) {
+			// reset the owned nested info in place so its use state survives
+			/** @type {ExportsInfo} */
+			(this.exportsInfo)._resetProvidedExports();
+		} else {
+			this.exportsInfo = undefined;
+		}
+		this._target = undefined;
+		// also drop the memoized max target so it cannot serve stale entries
+		this._maxTarget = undefined;
+		// clear the provide-side pure bit; FlagDependencyExports only ever sets it
+		// true, so an export that turned impure would otherwise stay marked pure
+		this._inlineFlags &= ~PURE_PROVIDE_FLAG;
+	}
+
+	/**
+	 * Resets the use-side info to the undetermined state (provide info untouched,
+	 * incl. the pure-provide bit) so FlagDependencyUsage can re-trace it.
+	 * @returns {void}
+	 */
+	_resetUseInfo() {
+		this._globalUsed = undefined;
+		this._usedInRuntime = undefined;
+		this._hasUseInRuntimeInfo = false;
+		this.canMangleUse = undefined;
+		this._usedName = null;
+		this._inlineFlags &= PURE_PROVIDE_FLAG;
+		// mirror setHasUseInfo: recurse into an owned nested exportsInfo, where
+		// FlagDependencyUsage also writes usage
+		if (this.exportsInfoOwned) {
+			/** @type {ExportsInfo} */
+			(this.exportsInfo)._resetUsedExports();
+		}
 	}
 
 	setHasUseInfo() {
@@ -1965,7 +2051,8 @@ class ExportInfo {
 	}
 }
 
+ExportsInfo.ExportInfo = ExportInfo;
+ExportsInfo.RestoreProvidedData = RestoreProvidedData;
+ExportsInfo.UsageState = UsageState;
+
 module.exports = ExportsInfo;
-module.exports.ExportInfo = ExportInfo;
-module.exports.RestoreProvidedData = RestoreProvidedData;
-module.exports.UsageState = UsageState;

package/lib/ExportsInfoApiPlugin.js

@@ -13,10 +13,8 @@ const {
 const ConstDependency = require("./dependencies/ConstDependency");
 const ExportsInfoDependency = require("./dependencies/ExportsInfoDependency");
 
-/** @typedef {import("./Compiler")} Compiler */
-/** @typedef {import("./Dependency").DependencyLocation} DependencyLocation */
-/** @typedef {import("./javascript/JavascriptParser")} JavascriptParser */
-/** @typedef {import("./javascript/JavascriptParser").Range} Range */
+/** @import Compiler from "./Compiler" */
+/** @import JavascriptParser, { Range } from "./javascript/JavascriptParser" */
 
 const PLUGIN_NAME = "ExportsInfoApiPlugin";