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

package/lib/HotModuleReplacementPlugin.js

@@ -18,18 +18,20 @@ const {
 } = require("./ModuleTypeConstants");
 const NormalModule = require("./NormalModule");
 const RuntimeGlobals = require("./RuntimeGlobals");
-const WebpackError = require("./WebpackError");
 const { chunkHasCss } = require("./css/CssModulesPlugin");
 const ConstDependency = require("./dependencies/ConstDependency");
 const ImportMetaHotAcceptDependency = require("./dependencies/ImportMetaHotAcceptDependency");
 const ImportMetaHotDeclineDependency = require("./dependencies/ImportMetaHotDeclineDependency");
+const { isImportMetaFieldEnabled } = require("./dependencies/ImportMetaPlugin");
 const ModuleHotAcceptDependency = require("./dependencies/ModuleHotAcceptDependency");
 const ModuleHotDeclineDependency = require("./dependencies/ModuleHotDeclineDependency");
+const WebpackError = require("./errors/WebpackError");
 const HotModuleReplacementRuntimeModule = require("./hmr/HotModuleReplacementRuntimeModule");
 const JavascriptParser = require("./javascript/JavascriptParser");
 const {
 	evaluateToIdentifier
 } = require("./javascript/JavascriptParserHelpers");
+const ConcatenatedModule = require("./optimize/ConcatenatedModule");
 const { find, isSubset } = require("./util/SetHelpers");
 const TupleSet = require("./util/TupleSet");
 const { compareModulesById } = require("./util/comparators");
@@ -55,6 +57,7 @@ const {
 /** @typedef {import("./Dependency").DependencyLocation} DependencyLocation */
 /** @typedef {import("./Module")} Module */
 /** @typedef {import("./Module").BuildInfo} BuildInfo */
+/** @typedef {import("./css/CssModule").CssModuleBuildMeta} CssModuleBuildMeta */
 /** @typedef {import("./RuntimeModule")} RuntimeModule */
 /** @typedef {import("./javascript/BasicEvaluatedExpression")} BasicEvaluatedExpression */
 /** @typedef {import("./javascript/JavascriptParserHelpers").Range} Range */
@@ -63,6 +66,7 @@ const {
 /** @typedef {string[]} Requests */
 
 /**
+ * Defines the hmr javascript parser hooks type used by this module.
  * @typedef {object} HMRJavascriptParserHooks
  * @property {SyncBailHook<[Expression | SpreadElement, Requests], void>} hotAcceptCallback
  * @property {SyncBailHook<[CallExpression, Requests], void>} hotAcceptWithoutCallback
@@ -78,7 +82,7 @@ const {
 /** @typedef {Set<ChunkId>} ChunkIds */
 /** @typedef {Set<Module>} ModuleSet */
 
-/** @typedef {{ updatedChunkIds: ChunkIds, removedChunkIds: ChunkIds, removedModules: ModuleSet, filename: string, assetInfo: AssetInfo }} HotUpdateMainContentByRuntimeItem */
+/** @typedef {{ updatedChunkIds: ChunkIds, removedChunkIds: ChunkIds, removedModules: ModuleSet, forceLoadChunkIds: ChunkIds, filename: string, assetInfo: AssetInfo }} HotUpdateMainContentByRuntimeItem */
 /** @typedef {Map<string, HotUpdateMainContentByRuntimeItem>} HotUpdateMainContentByRuntime */
 
 /** @type {WeakMap<JavascriptParser, HMRJavascriptParserHooks>} */
@@ -88,6 +92,7 @@ const PLUGIN_NAME = "HotModuleReplacementPlugin";
 
 class HotModuleReplacementPlugin {
 	/**
+	 * Returns the attached hooks.
 	 * @param {JavascriptParser} parser the parser
 	 * @returns {HMRJavascriptParserHooks} the attached hooks
 	 */
@@ -109,7 +114,7 @@ class HotModuleReplacementPlugin {
 	}
 
 	/**
-	 * Apply the plugin
+	 * Applies the plugin by registering its hooks on the compiler.
 	 * @param {Compiler} compiler the compiler instance
 	 * @returns {void}
 	 */
@@ -121,6 +126,7 @@ class HotModuleReplacementPlugin {
 		const runtimeRequirements = [RuntimeGlobals.module];
 
 		/**
+		 * Creates an accept handler.
 		 * @param {JavascriptParser} parser the parser
 		 * @param {typeof ModuleHotAcceptDependency} ParamDependency dependency
 		 * @returns {(expr: CallExpression) => boolean | undefined} callback
@@ -136,7 +142,7 @@ class HotModuleReplacementPlugin {
 					/** @type {Range} */ (expr.callee.range),
 					runtimeRequirements
 				);
-				dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+				dep.loc = parser.getLocation(expr);
 				module.addPresentationalDependency(dep);
 				/** @type {BuildInfo} */
 				(module.buildInfo).moduleConcatenationBailout =
@@ -163,10 +169,7 @@ class HotModuleReplacementPlugin {
 								/** @type {Range} */ (param.range)
 							);
 							dep.optional = true;
-							dep.loc = Object.create(
-								/** @type {DependencyLocation} */ (expr.loc)
-							);
-							dep.loc.index = idx;
+							dep.setLocWithIndex(parser.getLocation(expr), idx);
 							module.addDependency(dep);
 							requests.push(request);
 						}
@@ -187,6 +190,7 @@ class HotModuleReplacementPlugin {
 		};
 
 		/**
+		 * Creates a decline handler.
 		 * @param {JavascriptParser} parser the parser
 		 * @param {typeof ModuleHotDeclineDependency} ParamDependency dependency
 		 * @returns {(expr: CallExpression) => boolean | undefined} callback
@@ -198,7 +202,7 @@ class HotModuleReplacementPlugin {
 				/** @type {Range} */ (expr.callee.range),
 				runtimeRequirements
 			);
-			dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+			dep.loc = parser.getLocation(expr);
 			module.addPresentationalDependency(dep);
 			/** @type {BuildInfo} */
 			(module.buildInfo).moduleConcatenationBailout = "Hot Module Replacement";
@@ -219,8 +223,7 @@ class HotModuleReplacementPlugin {
 						/** @type {Range} */ (param.range)
 					);
 					dep.optional = true;
-					dep.loc = Object.create(/** @type {DependencyLocation} */ (expr.loc));
-					dep.loc.index = idx;
+					dep.setLocWithIndex(parser.getLocation(expr), idx);
 					module.addDependency(dep);
 				}
 			}
@@ -228,6 +231,7 @@ class HotModuleReplacementPlugin {
 		};
 
 		/**
+		 * Creates a hmr expression handler.
 		 * @param {JavascriptParser} parser the parser
 		 * @returns {(expr: Expression) => boolean | undefined} callback
 		 */
@@ -238,7 +242,7 @@ class HotModuleReplacementPlugin {
 				/** @type {Range} */ (expr.range),
 				runtimeRequirements
 			);
-			dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+			dep.loc = parser.getLocation(expr);
 			module.addPresentationalDependency(dep);
 			/** @type {BuildInfo} */
 			(module.buildInfo).moduleConcatenationBailout = "Hot Module Replacement";
@@ -246,6 +250,7 @@ class HotModuleReplacementPlugin {
 		};
 
 		/**
+		 * Processes the provided parser.
 		 * @param {JavascriptParser} parser the parser
 		 * @returns {void}
 		 */
@@ -281,6 +286,7 @@ class HotModuleReplacementPlugin {
 		};
 
 		/**
+		 * Apply import meta hot.
 		 * @param {JavascriptParser} parser the parser
 		 * @returns {void}
 		 */
@@ -382,13 +388,31 @@ class HotModuleReplacementPlugin {
 					for (const chunk of compilation.chunks) {
 						const chunkId = /** @type {ChunkId} */ (chunk.id);
 
-						records.chunkModuleIds[chunkId] = Array.from(
-							chunkGraph.getOrderedChunkModulesIterable(
-								chunk,
-								compareModulesById(chunkGraph)
-							),
-							(m) => /** @type {ModuleId} */ (chunkGraph.getModuleId(m))
-						);
+						/** @type {ModuleId[]} */
+						const moduleIds = [];
+						for (const m of chunkGraph.getOrderedChunkModulesIterable(
+							chunk,
+							compareModulesById(chunkGraph)
+						)) {
+							moduleIds.push(
+								/** @type {ModuleId} */ (chunkGraph.getModuleId(m))
+							);
+							if (m instanceof ConcatenatedModule && m.modules) {
+								for (const innerModule of m.modules) {
+									if (
+										innerModule.buildMeta &&
+										/** @type {CssModuleBuildMeta} */ (innerModule.buildMeta)
+											.needIdInConcatenation
+									) {
+										const innerId = chunkGraph.getModuleId(innerModule);
+										if (innerId !== null) {
+											moduleIds.push(innerId);
+										}
+									}
+								}
+							}
+						}
+						records.chunkModuleIds[chunkId] = moduleIds;
 					}
 				});
 				/** @type {TupleSet<Module, Chunk>} */
@@ -402,6 +426,7 @@ class HotModuleReplacementPlugin {
 					const records = /** @type {Records} */ (compilation.records);
 					for (const chunk of compilation.chunks) {
 						/**
+						 * Returns module hash.
 						 * @param {Module} module module
 						 * @returns {string} module hash
 						 */
@@ -547,6 +572,8 @@ class HotModuleReplacementPlugin {
 									removedChunkIds: new Set(),
 									/** @type {ModuleSet} */
 									removedModules: new Set(),
+									/** @type {ChunkIds} */
+									forceLoadChunkIds: new Set(),
 									filename,
 									assetInfo
 								}
@@ -673,30 +700,43 @@ class HotModuleReplacementPlugin {
 										}
 									} else {
 										// module is no longer in this runtime combination
-										// We (incorrectly) assume that it's not in an overlapping runtime combination
-										// and dispose it from the main runtimes the chunk was removed from
 										forEachRuntime(removedFromRuntime, (runtime) => {
-											// If the module is still used in this runtime, do not dispose it
-											// This could create a bad runtime state where the module is still loaded,
-											// but no chunk which contains it. This means we don't receive further HMR updates
-											// to this module and that's bad.
-											// TODO force load one of the chunks which contains the module
-											for (const moduleRuntime of runtimes) {
-												if (typeof moduleRuntime === "string") {
-													if (moduleRuntime === runtime) return;
-												} else if (
-													moduleRuntime !== undefined &&
-													moduleRuntime.has(/** @type {string} */ (runtime))
-												) {
-													return;
-												}
-											}
 											const item =
 												/** @type {HotUpdateMainContentByRuntimeItem} */ (
 													hotUpdateMainContentByRuntime.get(
 														/** @type {string} */ (runtime)
 													)
 												);
+											// Module still in this runtime via another chunk: force-load one so
+											// it keeps an installed owner instead of being disposed (lost updates).
+											const stillInRuntime = [...runtimes].some(
+												(moduleRuntime) =>
+													typeof moduleRuntime === "string"
+														? moduleRuntime === runtime
+														: moduleRuntime !== undefined &&
+															moduleRuntime.has(/** @type {string} */ (runtime))
+											);
+											if (stillInRuntime) {
+												for (const moduleChunk of chunkGraph.getModuleChunksIterable(
+													module
+												)) {
+													const chunkRuntime = moduleChunk.runtime;
+													const inRuntime =
+														typeof chunkRuntime === "string"
+															? chunkRuntime === runtime
+															: chunkRuntime !== undefined &&
+																chunkRuntime.has(
+																	/** @type {string} */ (runtime)
+																);
+													if (inRuntime) {
+														item.forceLoadChunkIds.add(
+															/** @type {ChunkId} */ (moduleChunk.id)
+														);
+														break;
+													}
+												}
+												return;
+											}
 											item.removedModules.add(module);
 										});
 									}
@@ -794,6 +834,7 @@ class HotModuleReplacementPlugin {
 							removedChunkIds,
 							removedModules,
 							updatedChunkIds,
+							forceLoadChunkIds,
 							filename,
 							assetInfo
 						} of hotUpdateMainContentByRuntime.values()) {
@@ -802,7 +843,8 @@ class HotModuleReplacementPlugin {
 								old &&
 								(!isSubset(old.removedChunkIds, removedChunkIds) ||
 									!isSubset(old.removedModules, removedModules) ||
-									!isSubset(old.updatedChunkIds, updatedChunkIds))
+									!isSubset(old.updatedChunkIds, updatedChunkIds) ||
+									!isSubset(old.forceLoadChunkIds, forceLoadChunkIds))
 							) {
 								compilation.warnings.push(
 									new WebpackError(`HotModuleReplacementPlugin
@@ -819,20 +861,30 @@ To fix this, make sure to include [runtime] in the output.hotUpdateMainFilename
 								for (const chunkId of updatedChunkIds) {
 									old.updatedChunkIds.add(chunkId);
 								}
+								for (const chunkId of forceLoadChunkIds) {
+									old.forceLoadChunkIds.add(chunkId);
+								}
 								continue;
 							}
 							hotUpdateMainContentByFilename.set(filename, {
 								removedChunkIds,
 								removedModules,
 								updatedChunkIds,
+								forceLoadChunkIds,
 								assetInfo
 							});
 						}
 						for (const [
 							filename,
-							{ removedChunkIds, removedModules, updatedChunkIds, assetInfo }
+							{
+								removedChunkIds,
+								removedModules,
+								updatedChunkIds,
+								forceLoadChunkIds,
+								assetInfo
+							}
 						] of hotUpdateMainContentByFilename) {
-							/** @type {{ c: ChunkId[], r: ChunkId[], m: ModuleId[], css?: { r: ChunkId[] } }} */
+							/** @type {{ c: ChunkId[], r: ChunkId[], m: ModuleId[], f?: ChunkId[], css?: { r: ChunkId[] } }} */
 							const hotUpdateMainJson = {
 								c: [...updatedChunkIds],
 								r: [...removedChunkIds],
@@ -849,6 +901,12 @@ To fix this, make sure to include [runtime] in the output.hotUpdateMainFilename
 											]
 							};
 
+							// Chunks the client must load so a module whose only loaded chunk
+							// left a runtime keeps an installed owner (see force-load branch).
+							if (forceLoadChunkIds.size > 0) {
+								hotUpdateMainJson.f = [...forceLoadChunkIds];
+							}
+
 							// Build CSS removed chunks list (chunks in updatedChunkIds that no longer have CSS)
 							/** @type {ChunkId[]} */
 							const cssRemovedChunkIds = [];
@@ -897,9 +955,13 @@ To fix this, make sure to include [runtime] in the output.hotUpdateMainFilename
 
 				normalModuleFactory.hooks.parser
 					.for(JAVASCRIPT_MODULE_TYPE_AUTO)
-					.tap(PLUGIN_NAME, (parser) => {
+					.tap(PLUGIN_NAME, (parser, parserOptions) => {
 						applyModuleHot(parser);
-						applyImportMetaHot(parser);
+						if (
+							isImportMetaFieldEnabled(parserOptions.importMeta, "webpackHot")
+						) {
+							applyImportMetaHot(parser);
+						}
 					});
 				normalModuleFactory.hooks.parser
 					.for(JAVASCRIPT_MODULE_TYPE_DYNAMIC)
@@ -908,11 +970,15 @@ To fix this, make sure to include [runtime] in the output.hotUpdateMainFilename
 					});
 				normalModuleFactory.hooks.parser
 					.for(JAVASCRIPT_MODULE_TYPE_ESM)
-					.tap(PLUGIN_NAME, (parser) => {
-						applyImportMetaHot(parser);
+					.tap(PLUGIN_NAME, (parser, parserOptions) => {
+						if (
+							isImportMetaFieldEnabled(parserOptions.importMeta, "webpackHot")
+						) {
+							applyImportMetaHot(parser);
+						}
 					});
 				normalModuleFactory.hooks.module.tap(PLUGIN_NAME, (module) => {
-					module.hot = true;
+					if (module instanceof NormalModule) module.hot = true;
 					return module;
 				});
 

package/lib/IgnorePlugin.js

@@ -19,9 +19,11 @@ const PLUGIN_NAME = "IgnorePlugin";
 
 class IgnorePlugin {
 	/**
+	 * Creates an instance of IgnorePlugin.
 	 * @param {IgnorePluginOptions} options IgnorePlugin options
 	 */
 	constructor(options) {
+		/** @type {IgnorePluginOptions} */
 		this.options = options;
 		this.checkIgnore = this.checkIgnore.bind(this);
 	}
@@ -58,14 +60,15 @@ class IgnorePlugin {
 	}
 
 	/**
-	 * 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.validate.tap(PLUGIN_NAME, () => {
 			compiler.validate(
-				require("../schemas/plugins/IgnorePlugin.json"),
+				/** @type {EXPECTED_ANY} */
+				(require("../schemas/plugins/IgnorePlugin.json")),
 				this.options,
 				{
 					name: "Ignore Plugin",

package/lib/IgnoreWarningsPlugin.js

@@ -14,6 +14,7 @@ const PLUGIN_NAME = "IgnoreWarningsPlugin";
 
 class IgnoreWarningsPlugin {
 	/**
+	 * Creates an instance of IgnoreWarningsPlugin.
 	 * @param {IgnoreFn[]} ignoreWarnings conditions to ignore warnings
 	 */
 	constructor(ignoreWarnings) {
@@ -22,7 +23,7 @@ class IgnoreWarningsPlugin {
 	}
 
 	/**
-	 * Apply the plugin
+	 * Applies the plugin by registering its hooks on the compiler.
 	 * @param {Compiler} compiler the compiler instance
 	 * @returns {void}
 	 */

package/lib/InitFragment.js

@@ -16,6 +16,7 @@ const makeSerializable = require("./util/makeSerializable");
 /** @typedef {string} InitFragmentKey */
 
 /**
+ * Defines the maybe mergeable init fragment type used by this module.
  * @template GenerateContext
  * @typedef {object} MaybeMergeableInitFragment
  * @property {InitFragmentKey=} key
@@ -28,6 +29,7 @@ const makeSerializable = require("./util/makeSerializable");
  */
 
 /**
+ * Extract fragment index.
  * @template T
  * @param {T} fragment the init fragment
  * @param {number} index index
@@ -36,6 +38,7 @@ const makeSerializable = require("./util/makeSerializable");
 const extractFragmentIndex = (fragment, index) => [fragment, index];
 
 /**
+ * Sorts fragment with index.
  * @template T
  * @param {[MaybeMergeableInitFragment<T>, number]} a first pair
  * @param {[MaybeMergeableInitFragment<T>, number]} b second pair
@@ -50,11 +53,13 @@ const sortFragmentWithIndex = ([a, i], [b, j]) => {
 };
 
 /**
+ * Represents InitFragment.
  * @template GenerateContext
  * @implements {MaybeMergeableInitFragment<GenerateContext>}
  */
 class InitFragment {
 	/**
+	 * Creates an instance of InitFragment.
 	 * @param {string | Source | undefined} content the source code that will be included as initialization code
 	 * @param {number} stage category of initialization code (contribute to order)
 	 * @param {number} position position in the category (contribute to order)
@@ -62,14 +67,20 @@ class InitFragment {
 	 * @param {string | Source=} endContent the source code that will be included at the end of the module
 	 */
 	constructor(content, stage, position, key, endContent) {
+		/** @type {string | Source | undefined} */
 		this.content = content;
+		/** @type {number} */
 		this.stage = stage;
+		/** @type {number} */
 		this.position = position;
+		/** @type {string | undefined} */
 		this.key = key;
+		/** @type {string | Source | undefined} */
 		this.endContent = endContent;
 	}
 
 	/**
+	 * Returns the source code that will be included as initialization code.
 	 * @param {GenerateContext} context context
 	 * @returns {string | Source | undefined} the source code that will be included as initialization code
 	 */
@@ -78,6 +89,7 @@ class InitFragment {
 	}
 
 	/**
+	 * Returns the source code that will be included at the end of the module.
 	 * @param {GenerateContext} context context
 	 * @returns {string | Source | undefined} the source code that will be included at the end of the module
 	 */
@@ -86,6 +98,7 @@ class InitFragment {
 	}
 
 	/**
+	 * Adds the provided source to the init fragment.
 	 * @template Context
 	 * @param {Source} source sources
 	 * @param {MaybeMergeableInitFragment<Context>[]} initFragments init fragments
@@ -165,6 +178,7 @@ class InitFragment {
 	}
 
 	/**
+	 * Serializes this instance into the provided serializer context.
 	 * @param {ObjectSerializerContext} context context
 	 */
 	serialize(context) {
@@ -178,6 +192,7 @@ class InitFragment {
 	}
 
 	/**
+	 * Restores this instance from the provided deserializer context.
 	 * @param {ObjectDeserializerContext} context context
 	 */
 	deserialize(context) {

package/lib/JavascriptMetaInfoPlugin.js

@@ -10,17 +10,18 @@ const {
 	JAVASCRIPT_MODULE_TYPE_DYNAMIC,
 	JAVASCRIPT_MODULE_TYPE_ESM
 } = require("./ModuleTypeConstants");
-const InnerGraph = require("./optimize/InnerGraph");
+const { getInnerGraphUtils } = require("./optimize/InnerGraph");
 
 /** @typedef {import("./Compiler")} Compiler */
 /** @typedef {import("./Module").BuildInfo} BuildInfo */
+/** @typedef {import("./javascript/JavascriptModule").JavascriptModuleBuildInfo} JavascriptModuleBuildInfo */
 /** @typedef {import("./javascript/JavascriptParser")} JavascriptParser */
 
 const PLUGIN_NAME = "JavascriptMetaInfoPlugin";
 
 class JavascriptMetaInfoPlugin {
 	/**
-	 * Apply the plugin
+	 * Applies the plugin by registering its hooks on the compiler.
 	 * @param {Compiler} compiler the compiler instance
 	 * @returns {void}
 	 */
@@ -28,21 +29,23 @@ class JavascriptMetaInfoPlugin {
 		compiler.hooks.compilation.tap(
 			PLUGIN_NAME,
 			(compilation, { normalModuleFactory }) => {
+				const innerGraph = getInnerGraphUtils(compilation);
 				/**
+				 * Handles the hook callback for this code path.
 				 * @param {JavascriptParser} parser the parser
 				 * @returns {void}
 				 */
 				const handler = (parser) => {
 					parser.hooks.call.for("eval").tap(PLUGIN_NAME, () => {
 						const buildInfo =
-							/** @type {BuildInfo} */
+							/** @type {JavascriptModuleBuildInfo} */
 							(parser.state.module.buildInfo);
 						buildInfo.moduleConcatenationBailout = "eval()";
-						const currentSymbol = InnerGraph.getTopLevelSymbol(parser.state);
+						const currentSymbol = innerGraph.getTopLevelSymbol(parser.state);
 						if (currentSymbol) {
-							InnerGraph.addUsage(parser.state, null, currentSymbol);
+							innerGraph.addUsage(parser.state, null, currentSymbol);
 						} else {
-							InnerGraph.bailout(parser.state);
+							innerGraph.bailout(parser.state);
 						}
 					});
 					parser.hooks.finish.tap(PLUGIN_NAME, () => {