@depup/webpack 5.111.1-depup.2 → 5.112.0-depup.0

package/lib/{HotModuleReplacementPlugin.js → hmr/HotModuleReplacementPlugin.js}

@@ -6,38 +6,36 @@
 "use strict";
 
 const { RawSource } = require("webpack-sources");
-const ChunkGraph = require("./ChunkGraph");
-const Compilation = require("./Compilation");
-const HotUpdateChunk = require("./HotUpdateChunk");
-const {
-	JAVASCRIPT_MODULE_TYPE_AUTO,
-	JAVASCRIPT_MODULE_TYPE_DYNAMIC,
-	JAVASCRIPT_MODULE_TYPE_ESM,
-	WEBPACK_MODULE_TYPE_RUNTIME
-} = require("./ModuleTypeConstants");
-const NormalModule = require("./NormalModule");
-const RuntimeGlobals = require("./RuntimeGlobals");
-const { getPresentKinds } = require("./TemplatedPathPlugin");
+const Compilation = require("../Compilation");
 const {
 	chunkHasCss,
 	getChunkFilenameTemplate: getCssChunkFilenameTemplate
-} = 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 getParserHooks = require("./hmr/parserHooks");
+} = require("../css/CssModulesPlugin");
+const ConstDependency = require("../dependencies/core/ConstDependency");
+const ImportMetaHotAcceptDependency = require("../dependencies/hmr/ImportMetaHotAcceptDependency");
+const ImportMetaHotDeclineDependency = require("../dependencies/hmr/ImportMetaHotDeclineDependency");
+const ModuleHotAcceptDependency = require("../dependencies/hmr/ModuleHotAcceptDependency");
+const ModuleHotDeclineDependency = require("../dependencies/hmr/ModuleHotDeclineDependency");
+const {
+	isImportMetaFieldEnabled
+} = require("../dependencies/import-meta/ImportMetaPlugin");
+const WebpackError = require("../errors/WebpackError");
+const ChunkGraph = require("../graph/ChunkGraph");
+const HotUpdateChunk = require("../graph/HotUpdateChunk");
 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");
+} = require("../javascript/JavascriptParserHelpers");
+const {
+	JAVASCRIPT_MODULE_TYPE_AUTO,
+	JAVASCRIPT_MODULE_TYPE_DYNAMIC,
+	JAVASCRIPT_MODULE_TYPE_ESM
+} = require("../module/ModuleTypeConstants");
+const NormalModule = require("../module/NormalModule");
+const RuntimeGlobals = require("../runtime/RuntimeGlobals");
+const { getPresentKinds } = require("../template/TemplatedPathPlugin");
+const { find, isSubset } = require("../util/SetHelpers");
+const TupleSet = require("../util/TupleSet");
+const { compareModulesById } = require("../util/comparators");
 const {
 	forEachRuntime,
 	getRuntimeKey,
@@ -45,21 +43,23 @@ const {
 	keyToRuntime,
 	mergeRuntimeOwned,
 	subtractRuntime
-} = require("./util/runtime");
+} = require("../util/runtime");
+const HotModuleReplacementRuntimeModule = require("./HotModuleReplacementRuntimeModule");
+const getParserHooks = require("./parserHooks");
 
 /** @import { CallExpression, Expression } from "estree" */
-/** @import Chunk, { ChunkId } from "./Chunk" */
-/** @import { ModuleId } from "./ChunkGraph" */
-/** @import { AssetInfo } from "./Compilation" */
-/** @import Compiler, { Records } from "./Compiler" */
-/** @import CodeGenerationResults from "./CodeGenerationResults" */
-/** @import Module, { BuildInfo } from "./Module" */
-/** @import { CssModuleBuildMeta } from "./css/CssModule" */
-/** @import { HMRJavascriptParserHooks } from "./hmr/parserHooks" */
-/** @import RuntimeModule from "./RuntimeModule" */
-/** @import BasicEvaluatedExpression from "./javascript/BasicEvaluatedExpression" */
-/** @import JavascriptParser, { Range } from "./javascript/JavascriptParser" */
-/** @import { RuntimeSpec } from "./util/runtime" */
+/** @import Chunk, { ChunkId } from "../graph/Chunk" */
+/** @import { ModuleId } from "../graph/ChunkGraph" */
+/** @import { AssetInfo } from "../Compilation" */
+/** @import Compiler, { Records } from "../Compiler" */
+/** @import CodeGenerationResults from "../module/CodeGenerationResults" */
+/** @import Module, { BuildInfo } from "../module/Module" */
+/** @import { CssModuleBuildMeta } from "../css/CssModule" */
+/** @import { HMRJavascriptParserHooks } from "./parserHooks" */
+/** @import RuntimeModule from "../runtime/RuntimeModule" */
+/** @import BasicEvaluatedExpression from "../javascript/BasicEvaluatedExpression" */
+/** @import JavascriptParser, { Range } from "../javascript/JavascriptParser" */
+/** @import { RuntimeSpec } from "../util/runtime" */
 
 /** @typedef {string[]} Requests */
 
@@ -391,8 +391,8 @@ class HotModuleReplacementPlugin {
 							moduleIds.push(
 								/** @type {ModuleId} */ (chunkGraph.getModuleId(m))
 							);
-							if (m instanceof ConcatenatedModule && m.modules) {
-								for (const innerModule of m.modules) {
+							if (m.getRootModule() !== m) {
+								for (const innerModule of m.getSourceModules()) {
 									if (
 										innerModule.buildMeta &&
 										/** @type {CssModuleBuildMeta} */ (innerModule.buildMeta)
@@ -409,11 +409,11 @@ class HotModuleReplacementPlugin {
 						records.chunkModuleIds[chunkId] = moduleIds;
 					}
 				});
-				/** @type {TupleSet<Module, Chunk>} */
+				/** @type {TupleSet<[Module], Chunk>} */
 				const updatedModules = new TupleSet();
-				/** @type {TupleSet<Module, Chunk>} */
+				/** @type {TupleSet<[Module], Chunk>} */
 				const fullHashModules = new TupleSet();
-				/** @type {TupleSet<Module, RuntimeSpec>} */
+				/** @type {TupleSet<[Module], RuntimeSpec>} */
 				const nonCodeGeneratedModules = new TupleSet();
 				compilation.hooks.fullHash.tap(PLUGIN_NAME, (hash) => {
 					const chunkGraph = compilation.chunkGraph;
@@ -682,7 +682,7 @@ class HotModuleReplacementPlugin {
 											? chunkGraph.getModuleHash(module, newRuntime)
 											: codeGenerationResults.getHash(module, newRuntime);
 										if (hash !== oldHash) {
-											if (module.type === WEBPACK_MODULE_TYPE_RUNTIME) {
+											if (module.is("runtime")) {
 												newRuntimeModules = newRuntimeModules || [];
 												newRuntimeModules.push(
 													/** @type {RuntimeModule} */ (module)
@@ -998,7 +998,7 @@ To fix this, make sure to include [runtime] in the output.hotUpdateMainFilename
 						}
 					});
 				normalModuleFactory.hooks.module.tap(PLUGIN_NAME, (module) => {
-					if (module instanceof NormalModule) module.hot = true;
+					if (module.is("normal")) module.hot = true;
 					return module;
 				});
 

package/lib/hmr/HotModuleReplacementRuntimeModule.js

@@ -5,9 +5,9 @@
 
 "use strict";
 
-const RuntimeGlobals = require("../RuntimeGlobals");
-const RuntimeModule = require("../RuntimeModule");
-const Template = require("../Template");
+const RuntimeGlobals = require("../runtime/RuntimeGlobals");
+const RuntimeModule = require("../runtime/RuntimeModule");
+const Template = require("../template/Template");
 
 /** @import Compilation from "../Compilation" */
 

package/lib/hmr/JavascriptHotModuleReplacement.runtime.js

@@ -10,6 +10,8 @@
 /** @typedef {(data: HotData) => void} DisposeHandler */
 /** @typedef {(outdatedDependencies: ModuleId[]) => void} AcceptCallback */
 /** @typedef {(err: unknown, context: { moduleId: ModuleId, dependencyId: ModuleId }) => void} AcceptErrorHandler */
+/** @typedef {(err: unknown, context: { moduleId: ModuleId, module: HotModule }) => void} SelfAcceptErrorHandler */
+/** @typedef {(module: HotModule, exports: EXPECTED_ANY, require: typeof __webpack_require__) => void} ModuleFactory */
 /** @typedef {{ type: string, moduleId: ModuleId, dependencyId?: ModuleId, error: unknown, originalError?: unknown }} HotErrorEvent */
 /** @typedef {(reportError: (err: unknown) => void) => Promise<ModuleId[]>} ApplyFn */
 
@@ -43,7 +45,7 @@
  * @property {Record<ModuleId, AcceptCallback>} _acceptedDependencies accept callbacks by dependency id
  * @property {Record<ModuleId, AcceptErrorHandler | undefined>} _acceptedErrorHandlers error handlers by dependency id
  * @property {Record<ModuleId, boolean>} _declinedDependencies declined dependency ids
- * @property {boolean | EXPECTED_FUNCTION} _selfAccepted true or the self-accept error handler
+ * @property {boolean | SelfAcceptErrorHandler} _selfAccepted true or the self-accept error handler
  * @property {boolean} _selfDeclined module declined itself
  * @property {boolean} _selfInvalidated module invalidated itself
  * @property {DisposeHandler[]} _disposeHandlers registered dispose handlers
@@ -71,7 +73,7 @@
  */
 
 /** @typedef {{ chain: ModuleId[], id: ModuleId }} QueueItem */
-/** @typedef {{ module: ModuleId, require: (id?: ModuleId) => void, errorHandler: boolean | EXPECTED_FUNCTION }} SelfAcceptedModule */
+/** @typedef {{ module: ModuleId, require: (id?: ModuleId) => void, errorHandler: boolean | SelfAcceptErrorHandler }} SelfAcceptedModule */
 
 // Globals injected by code generation; declared here only to type the template.
 /* eslint-disable no-unassigned-vars */
@@ -81,7 +83,7 @@ var $installedChunks$;
 var $loadUpdateChunk$;
 /** @type {Record<ModuleId, HotModule>} */
 var $moduleCache$;
-/** @type {Record<ModuleId, EXPECTED_FUNCTION>} */
+/** @type {Record<ModuleId, ModuleFactory>} */
 var $moduleFactories$;
 /** @type {Record<string, EnsureChunkHandler>} */
 var $ensureChunkHandlers$;
@@ -100,7 +102,7 @@ var __webpack_require__;
 module.exports = function () {
 	/** @type {Record<ModuleId, boolean>} */
 	var currentUpdateChunks;
-	/** @type {Record<ModuleId, EXPECTED_FUNCTION | false>} */
+	/** @type {Record<ModuleId, ModuleFactory | false>} */
 	var currentUpdate;
 	/** @type {ModuleId[]} */
 	var currentUpdateRemovedChunks;
@@ -210,7 +212,7 @@ module.exports = function () {
 		var outdatedDependencies = {};
 		/** @type {ModuleId[]} */
 		var outdatedModules = [];
-		/** @type {Record<ModuleId, EXPECTED_FUNCTION>} */
+		/** @type {Record<ModuleId, ModuleFactory>} */
 		var appliedUpdate = {};
 
 		/**
@@ -286,7 +288,7 @@ module.exports = function () {
 					};
 				}
 				if (doApply) {
-					appliedUpdate[moduleId] = /** @type {EXPECTED_FUNCTION} */ (
+					appliedUpdate[moduleId] = /** @type {ModuleFactory} */ (
 						newModuleFactory
 					);
 					addAllToSet(
@@ -314,7 +316,7 @@ module.exports = function () {
 				}
 			}
 		}
-		currentUpdate = /** @type {Record<ModuleId, EXPECTED_FUNCTION | false>} */ (
+		currentUpdate = /** @type {Record<ModuleId, ModuleFactory | false>} */ (
 			/** @type {unknown} */ (undefined)
 		);
 
@@ -580,7 +582,7 @@ module.exports = function () {
 		currentUpdate = removedModules.reduce(function (obj, key) {
 			obj[key] = false;
 			return obj;
-		}, /** @type {Record<ModuleId, EXPECTED_FUNCTION | false>} */ ({}));
+		}, /** @type {Record<ModuleId, ModuleFactory | false>} */ ({}));
 		currentUpdateRuntime = [];
 		chunkIds.forEach(function (chunkId) {
 			if (

package/lib/hmr/JavascriptHotModuleReplacementHelper.js

@@ -5,9 +5,9 @@
 
 "use strict";
 
-const RuntimeGlobals = require("../RuntimeGlobals");
+const RuntimeGlobals = require("../runtime/RuntimeGlobals");
 
-const Template = require("../Template");
+const Template = require("../template/Template");
 
 /**
  * Generates javascript hmr.

package/lib/hmr/LazyCompilationPlugin.js

@@ -6,21 +6,27 @@
 "use strict";
 
 const { RawSource } = require("webpack-sources");
-const AsyncDependenciesBlock = require("../AsyncDependenciesBlock");
-const Dependency = require("../Dependency");
-const Module = require("../Module");
-const ModuleFactory = require("../ModuleFactory");
-const { JAVASCRIPT_TYPES } = require("../ModuleSourceTypeConstants");
-const { JAVASCRIPT_TYPE } = require("../ModuleSourceTypeConstants");
+const CommonJsRequireDependency = require("../dependencies/commonjs/CommonJsRequireDependency");
+const AsyncDependenciesBlock = require("../graph/AsyncDependenciesBlock");
+const Dependency = require("../graph/Dependency");
+const isDependencyKind = require("../graph/isDependencyKind");
+const Module = require("../module/Module");
+const ModuleFactory = require("../module/ModuleFactory");
+const { JAVASCRIPT_TYPES } = require("../module/ModuleSourceTypeConstants");
+const { JAVASCRIPT_TYPE } = require("../module/ModuleSourceTypeConstants");
 const {
 	WEBPACK_MODULE_TYPE_LAZY_COMPILATION_PROXY
-} = require("../ModuleTypeConstants");
-const RuntimeGlobals = require("../RuntimeGlobals");
-const Template = require("../Template");
-const CommonJsRequireDependency = require("../dependencies/CommonJsRequireDependency");
+} = require("../module/ModuleTypeConstants");
+const RuntimeGlobals = require("../runtime/RuntimeGlobals");
+const Template = require("../template/Template");
 const { resolveByProperty } = require("../util/cleverMerge");
+const memoize = require("../util/memoize");
 const { registerNotSerializable } = require("../util/serialization");
 
+const getMatchModuleGlobCondition = memoize(
+	() => require("../util/globUtils").matchModuleGlobCondition
+);
+
 /**
  * @import {
  * 	WebpackOptionsNormalizedWithDefaults as WebpackOptions
@@ -28,7 +34,7 @@ const { registerNotSerializable } = require("../util/serialization");
  */
 /** @import Compilation from "../Compilation" */
 /** @import Compiler from "../Compiler" */
-/** @import { UpdateHashContext } from "../Dependency" */
+/** @import { UpdateHashContext } from "../graph/Dependency" */
 /**
  * @import {
  * 	BuildCallback,
@@ -43,19 +49,19 @@ const { registerNotSerializable } = require("../util/serialization");
  * 	SourceTypes,
  * 	Sources,
  * 	RuntimeRequirements
- * } from "../Module"
+ * } from "../module/Module"
  */
 /**
  * @import {
  * 	ModuleFactoryCallback,
  * 	ModuleFactoryCreateData
- * } from "../ModuleFactory"
+ * } from "../module/ModuleFactory"
  */
-/** @import RequestShortener from "../RequestShortener" */
-/** @import { ResolverWithOptions } from "../ResolverFactory" */
-/** @import HarmonyImportDependency from "../dependencies/HarmonyImportDependency" */
+/** @import RequestShortener from "../util/RequestShortener" */
+/** @import { ResolverWithOptions } from "../resolve/ResolverFactory" */
+/** @import ESMImportDependency from "../dependencies/esm/ESMImportDependency" */
 /** @import Hash from "../util/Hash" */
-/** @import { InputFileSystem } from "../util/fs" */
+/** @import { InputFileSystem } from "../fs/fs" */
 
 /** @typedef {{ client: string, data: string, active: boolean }} ModuleResult */
 
@@ -182,6 +188,9 @@ const checkTest = (test, module) => {
 		const name = module.nameForCondition();
 		return name && test.test(name);
 	}
+	if (typeof test === "object") {
+		return getMatchModuleGlobCondition()(test, module);
+	}
 	return false;
 };
 
@@ -505,6 +514,7 @@ class LazyCompilationDependencyFactory extends ModuleFactory {
 /** @typedef {BackendHandler | PromiseBackendHandler} BackEnd */
 
 /** @typedef {(module: Module) => boolean} TestFn */
+/** @typedef {import("../util/globUtils").GlobCondition} GlobCondition */
 
 /**
  * Defines the options type used by this module.
@@ -512,7 +522,7 @@ class LazyCompilationDependencyFactory extends ModuleFactory {
  * @property {BackEnd} backend the backend
  * @property {boolean=} entries
  * @property {boolean=} imports
- * @property {RegExp | string | TestFn=} test additional filter for lazy compiled entrypoint modules
+ * @property {RegExp | string | TestFn | GlobCondition=} test additional filter for lazy compiled entrypoint modules
  */
 
 const PLUGIN_NAME = "LazyCompilationPlugin";
@@ -529,7 +539,7 @@ class LazyCompilationPlugin {
 		this.entries = entries;
 		/** @type {boolean | undefined} */
 		this.imports = imports;
-		/** @type {string | RegExp | TestFn | undefined} */
+		/** @type {string | RegExp | GlobCondition | TestFn | undefined} */
 		this.test = test;
 	}
 
@@ -585,7 +595,7 @@ class LazyCompilationPlugin {
 									block.dependencies.some(
 										(dep) =>
 											dep.type === "import()" &&
-											/** @type {HarmonyImportDependency} */ (dep).request ===
+											/** @type {ESMImportDependency} */ (dep).request ===
 												hmrDep.request
 									)
 							);
@@ -597,7 +607,7 @@ class LazyCompilationPlugin {
 									(this.imports &&
 										(dep.type === "import()" ||
 											dep.type === "import() context element")) ||
-									(this.entries && dep.type === "entry")
+									(this.entries && isDependencyKind(dep, "entry"))
 							)
 						) {
 							return module;