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

package/lib/{CodeGenerationResults.js → module/CodeGenerationResults.js}

@@ -5,11 +5,11 @@
 
 "use strict";
 
-const { DEFAULTS } = require("./config/defaults");
-const { getOrInsert } = require("./util/MapHelpers");
-const { first } = require("./util/SetHelpers");
-const createHash = require("./util/createHash");
-const { RuntimeSpecMap, runtimeToString } = require("./util/runtime");
+const { DEFAULTS } = require("../config/defaults");
+const { getOrInsert } = require("../util/MapHelpers");
+const { first } = require("../util/SetHelpers");
+const createHash = require("../util/createHash");
+const { RuntimeSpecMap, runtimeToString } = require("../util/runtime");
 
 /** @import { Source } from "webpack-sources" */
 /**
@@ -20,8 +20,8 @@ const { RuntimeSpecMap, runtimeToString } = require("./util/runtime");
  * 	ReadOnlyRuntimeRequirements
  * } from "./Module"
  */
-/** @import { HashFunction } from "./util/Hash" */
-/** @import { RuntimeSpec } from "./util/runtime" */
+/** @import { HashFunction } from "../util/Hash" */
+/** @import { RuntimeSpec } from "../util/runtime" */
 
 /**
  * Stores code generation results keyed by module and runtime so later stages

package/lib/{Generator.js → module/Generator.js}

@@ -5,15 +5,15 @@
 
 "use strict";
 
-const { contextifyStackFrames } = require("./ErrorHelpers");
+const { contextifyStackFrames } = require("../errors/ErrorHelpers");
+const memoize = require("../util/memoize");
 const { JAVASCRIPT_TYPE } = require("./ModuleSourceTypeConstants");
-const memoize = require("./util/memoize");
 
 /** @import { Source } from "webpack-sources" */
-/** @import ChunkGraph from "./ChunkGraph" */
+/** @import ChunkGraph from "../graph/ChunkGraph" */
 /** @import CodeGenerationResults from "./CodeGenerationResults" */
-/** @import ConcatenationScope from "./ConcatenationScope" */
-/** @import DependencyTemplates from "./DependencyTemplates" */
+/** @import ConcatenationScope from "../optimize/ConcatenationScope" */
+/** @import DependencyTemplates from "../template/DependencyTemplates" */
 /**
  * @import {
  * 	CodeGenerationResultData,
@@ -23,12 +23,12 @@ const memoize = require("./util/memoize");
  * 	SourceTypes
  * } from "./Module"
  */
-/** @import ModuleGraph from "./ModuleGraph" */
-/** @import RequestShortener from "./RequestShortener" */
+/** @import ModuleGraph from "../graph/ModuleGraph" */
+/** @import RequestShortener from "../util/RequestShortener" */
 /** @import NormalModule from "./NormalModule" */
-/** @import RuntimeTemplate from "./RuntimeTemplate" */
-/** @import Hash from "./util/Hash" */
-/** @import { RuntimeSpec } from "./util/runtime" */
+/** @import RuntimeTemplate from "../template/RuntimeTemplate" */
+/** @import Hash from "../util/Hash" */
+/** @import { RuntimeSpec } from "../util/runtime" */
 
 /**
  * Defines the generate context type used by this module.
@@ -63,7 +63,9 @@ const memoize = require("./util/memoize");
  * @property {RuntimeTemplate=} runtimeTemplate
  */
 
-const getModuleParseError = memoize(() => require("./errors/ModuleParseError"));
+const getModuleParseError = memoize(() =>
+	require("../errors/ModuleParseError")
+);
 
 class Generator {
 	/**
@@ -117,7 +119,7 @@ class Generator {
 	 * @returns {SourceTypes} available types (do not mutate)
 	 */
 	getTypes(module) {
-		const AbstractMethodError = require("./errors/AbstractMethodError");
+		const AbstractMethodError = require("../errors/AbstractMethodError");
 
 		throw new AbstractMethodError();
 	}
@@ -138,7 +140,7 @@ class Generator {
 	 * @returns {number} estimate size of the module
 	 */
 	getSize(module, type) {
-		const AbstractMethodError = require("./errors/AbstractMethodError");
+		const AbstractMethodError = require("../errors/AbstractMethodError");
 
 		throw new AbstractMethodError();
 	}
@@ -155,7 +157,7 @@ class Generator {
 		module,
 		{ dependencyTemplates, runtimeTemplate, moduleGraph, type }
 	) {
-		const AbstractMethodError = require("./errors/AbstractMethodError");
+		const AbstractMethodError = require("../errors/AbstractMethodError");
 
 		throw new AbstractMethodError();
 	}

package/lib/{Module.js → module/Module.js}

@@ -6,76 +6,85 @@
 "use strict";
 
 const util = require("util");
-const ChunkGraph = require("./ChunkGraph");
-const DependenciesBlock = require("./DependenciesBlock");
-const ModuleGraph = require("./ModuleGraph");
+const ChunkGraph = require("../graph/ChunkGraph");
+const DependenciesBlock = require("../graph/DependenciesBlock");
+const ModuleGraph = require("../graph/ModuleGraph");
+const RuntimeGlobals = require("../runtime/RuntimeGlobals");
+const { first } = require("../util/SetHelpers");
+const { compareChunksById } = require("../util/comparators");
+const makeSerializable = require("../util/makeSerializable");
+const { JAVASCRIPT_TYPES } = require("./ModuleSourceTypeConstants");
 const {
 	JAVASCRIPT_TYPE,
 	UNKNOWN_TYPE
 } = require("./ModuleSourceTypeConstants");
-const { JAVASCRIPT_TYPES } = require("./ModuleSourceTypeConstants");
-const RuntimeGlobals = require("./RuntimeGlobals");
-const { first } = require("./util/SetHelpers");
-const { compareChunksById } = require("./util/comparators");
-const makeSerializable = require("./util/makeSerializable");
 
 /** @import { Source } from "webpack-sources" */
-/** @import { ResolveOptions } from "../declarations/WebpackOptions" */
+/** @import { ResolveOptions } from "../../declarations/WebpackOptions" */
 /**
  * @import {
  * 	WebpackOptionsNormalizedWithDefaults as WebpackOptions
- * } from "./config/defaults"
+ * } from "../config/defaults"
  */
-/** @import Chunk from "./Chunk" */
-/** @import { ModuleId } from "./ChunkGraph" */
-/** @import ChunkGroup from "./ChunkGroup" */
+/** @import Chunk from "../graph/Chunk" */
+/** @import { ModuleId } from "../graph/ChunkGraph" */
+/** @import ChunkGroup from "../graph/ChunkGroup" */
 /** @import CodeGenerationResults from "./CodeGenerationResults" */
 /**
  * @import Compilation, {
  * 	AssetInfo,
  * 	FileSystemDependencies,
  * 	UnsafeCacheData
- * } from "./Compilation"
+ * } from "../Compilation"
  */
-/** @import ConcatenationScope from "./ConcatenationScope" */
-/** @import Dependency, { UpdateHashContext } from "./Dependency" */
-/** @import DependencyTemplates from "./DependencyTemplates" */
+/** @import ConcatenationScope from "../optimize/ConcatenationScope" */
+/** @import Dependency, { UpdateHashContext } from "../graph/Dependency" */
+/** @import DependencyTemplates from "../template/DependencyTemplates" */
 /** @import { AllTypes } from "./ModuleSourceTypeConstants" */
-/** @import FileSystemInfo from "./FileSystemInfo" */
-/** @import { ConnectionState } from "./ModuleGraphConnection" */
+/** @import FileSystemInfo from "../fs/FileSystemInfo" */
+/** @import { ConnectionState } from "../graph/ModuleGraphConnection" */
 /** @import { ModuleTypes } from "./ModuleTypeConstants" */
-/** @import { OptimizationBailouts } from "./ModuleGraph" */
+/** @import { OptimizationBailouts } from "../graph/ModuleGraph" */
 /** @import ModuleProfile from "./ModuleProfile" */
+/** @import RemoteModule from "../container/RemoteModule" */
+/** @import ConsumeSharedModule from "../sharing/ConsumeSharedModule" */
+/** @import CssModule from "../css/CssModule" */
+/** @import HtmlModule from "../html/HtmlModule" */
+/** @import ConcatenatedModule from "../optimize/ConcatenatedModule" */
+/** @import ExternalModule from "../externals/ExternalModule" */
+/** @import NormalModule from "./NormalModule" */
+/** @import RuntimeModule from "../runtime/RuntimeModule" */
+/** @import ContextModule from "../context/ContextModule" */
 /** @import NormalModuleFactory from "./NormalModuleFactory" */
-/** @import RequestShortener from "./RequestShortener" */
-/** @import { ResolverWithOptions } from "./ResolverFactory" */
-/** @import RuntimeTemplate from "./RuntimeTemplate" */
+/** @import RequestShortener from "../util/RequestShortener" */
+/** @import { ResolverWithOptions } from "../resolve/ResolverFactory" */
+/** @import RuntimeTemplate from "../template/RuntimeTemplate" */
 /**
  * Defines the init fragment type used by this module.
  * @template T
- * @typedef {import("./InitFragment")<T>} InitFragment
+ * @typedef {import("../template/InitFragment")<T>} InitFragment
  */
-/** @import WebpackError from "./errors/WebpackError" */
+/** @import WebpackError from "../errors/WebpackError" */
 /**
  * @import {
  * 	ObjectDeserializerContext,
  * 	ObjectSerializerContext
- * } from "./serialization/ObjectMiddleware"
+ * } from "../serialization/ObjectMiddleware"
  */
-/** @import Hash from "./util/Hash" */
-/** @import { InputFileSystem } from "./util/fs" */
-/** @import { AssociatedObjectForCache } from "./util/identifier" */
-/** @import { RuntimeSpec } from "./util/runtime" */
+/** @import Hash from "../util/Hash" */
+/** @import { InputFileSystem } from "../fs/fs" */
+/** @import { AssociatedObjectForCache } from "../util/identifier" */
+/** @import { RuntimeSpec } from "../util/runtime" */
 /**
  * @template T
- * @typedef {import("./util/SortableSet")<T>} SortableSet
+ * @typedef {import("../util/SortableSet")<T>} SortableSet
  */
 /** @typedef {"namespace" | "default-only" | "default-with-named" | "dynamic"} ExportsType */
 
 /**
  * Defines the shared type used by this module.
  * @template T
- * @typedef {import("./util/LazySet")<T>} LazySet<T>
+ * @typedef {import("../util/LazySet")<T>} LazySet<T>
  */
 
 /**
@@ -95,7 +104,7 @@ const makeSerializable = require("./util/makeSerializable");
 
 /** @typedef {ReadonlySet<typeof JAVASCRIPT_TYPE | string>} BasicSourceTypes */
 
-// TODO webpack 6: compilation will be required in CodeGenerationContext
+// TODO in the next major release: compilation will be required in CodeGenerationContext
 /**
  * Defines the code generation context type used by this module.
  * @typedef {object} CodeGenerationContext
@@ -268,6 +277,21 @@ const deprecatedNeedRebuild = util.deprecate(
 
 /** @typedef {(requestShortener: RequestShortener) => string} OptimizationBailoutFunction */
 
+/**
+ * The kinds a module can be, each naming the class `is(kind)` narrows to.
+ * @typedef {{
+ * external: ExternalModule,
+ * normal: NormalModule,
+ * runtime: RuntimeModule,
+ * context: ContextModule,
+ * remote: RemoteModule,
+ * "consume-shared": ConsumeSharedModule,
+ * css: CssModule,
+ * html: HtmlModule,
+ * concatenated: ConcatenatedModule,
+ * }} ModuleKinds
+ */
+
 class Module extends DependenciesBlock {
 	/**
 	 * Creates an instance of Module.
@@ -297,7 +321,7 @@ class Module extends DependenciesBlock {
 		/** @type {FactoryMeta | undefined} */
 		this.factoryMeta = undefined;
 		// TODO refactor this -> options object filled from Factory
-		// TODO webpack 6: use an enum
+		// TODO in the next major release: use an enum
 		/** @type {boolean} */
 		this.useSourceMap = false;
 		/** @type {boolean} */
@@ -319,7 +343,7 @@ class Module extends DependenciesBlock {
 		this.codeGenerationDependencies = undefined;
 	}
 
-	// TODO remove in webpack 6
+	// TODO in the next major release: remove
 	// BACKWARD-COMPAT START
 	/**
 	 * Returns the module id assigned by the chunk graph.
@@ -881,7 +905,9 @@ class Module extends DependenciesBlock {
 	isAccessibleInChunk(chunkGraph, chunk, ignoreChunk) {
 		// Check if module is accessible in ALL chunk groups
 		for (const chunkGroup of chunk.groupsIterable) {
-			if (!this.isAccessibleInChunkGroup(chunkGraph, chunkGroup)) return false;
+			if (!this.isAccessibleInChunkGroup(chunkGraph, chunkGroup, ignoreChunk)) {
+				return false;
+			}
 		}
 		return true;
 	}
@@ -906,9 +932,9 @@ class Module extends DependenciesBlock {
 				}
 			}
 			// 2. If the chunk group is initial, we can break here because it's not accessible.
-			if (chunkGroup.isInitial()) return false;
+			if (cg.isInitial()) return false;
 			// 3. Enqueue all parents because it must be accessible from ALL parents
-			for (const parent of chunkGroup.parentsIterable) queue.add(parent);
+			for (const parent of cg.parentsIterable) queue.add(parent);
 		}
 		// When we processed through the whole list and we didn't bailout, the module is accessible
 		return true;
@@ -1029,7 +1055,7 @@ class Module extends DependenciesBlock {
 	 * @returns {string} a unique identifier of the module
 	 */
 	identifier() {
-		const AbstractMethodError = require("./errors/AbstractMethodError");
+		const AbstractMethodError = require("../errors/AbstractMethodError");
 
 		throw new AbstractMethodError();
 	}
@@ -1042,7 +1068,7 @@ class Module extends DependenciesBlock {
 	 * @returns {string} a user readable identifier of the module
 	 */
 	readableIdentifier(requestShortener) {
-		const AbstractMethodError = require("./errors/AbstractMethodError");
+		const AbstractMethodError = require("../errors/AbstractMethodError");
 
 		throw new AbstractMethodError();
 	}
@@ -1059,7 +1085,7 @@ class Module extends DependenciesBlock {
 	 * @returns {void}
 	 */
 	build(options, compilation, resolver, fs, callback) {
-		const AbstractMethodError = require("./errors/AbstractMethodError");
+		const AbstractMethodError = require("../errors/AbstractMethodError");
 
 		throw new AbstractMethodError();
 	}
@@ -1085,6 +1111,16 @@ class Module extends DependenciesBlock {
 		return undefined;
 	}
 
+	/**
+	 * Returns whether this module is of the given kind; a subclass is every kind its parent is.
+	 * @template {keyof ModuleKinds} K
+	 * @param {K} kind a module kind
+	 * @returns {this is ModuleKinds[K]} true when this module is of that kind
+	 */
+	is(kind) {
+		return /** @type {typeof Module} */ (this.constructor).KINDS.has(kind);
+	}
+
 	/**
 	 * Basic source types are high-level categories like javascript, css, webassembly, etc.
 	 * We only have built-in knowledge about the javascript basic type here; other basic types may be
@@ -1109,7 +1145,7 @@ class Module extends DependenciesBlock {
 	 */
 	source(dependencyTemplates, runtimeTemplate, type = JAVASCRIPT_TYPE) {
 		if (this.codeGeneration === Module.prototype.codeGeneration) {
-			const AbstractMethodError = require("./errors/AbstractMethodError");
+			const AbstractMethodError = require("../errors/AbstractMethodError");
 
 			throw new AbstractMethodError();
 		}
@@ -1145,7 +1181,7 @@ class Module extends DependenciesBlock {
 	 * @returns {number} the estimated size of the module (must be non-zero)
 	 */
 	size(type) {
-		const AbstractMethodError = require("./errors/AbstractMethodError");
+		const AbstractMethodError = require("../errors/AbstractMethodError");
 
 		throw new AbstractMethodError();
 	}
@@ -1167,6 +1203,22 @@ class Module extends DependenciesBlock {
 		return null;
 	}
 
+	/**
+	 * Returns the module this one was built around: itself, or the root of a scope-hoisted concatenation.
+	 * @returns {Module} the root module
+	 */
+	getRootModule() {
+		return this;
+	}
+
+	/**
+	 * Returns the modules this one was built from: itself, or every module merged by scope hoisting.
+	 * @returns {Iterable<Module>} the source modules (do not mutate)
+	 */
+	getSourceModules() {
+		return [this];
+	}
+
 	/**
 	 * Returns the reason this module cannot be concatenated, when one exists.
 	 * @param {ConcatenationBailoutReasonContext} context context
@@ -1176,6 +1228,15 @@ class Module extends DependenciesBlock {
 		return `Module Concatenation is not implemented for ${this.constructor.name}`;
 	}
 
+	/**
+	 * Whether a concatenation may defer this module behind its lazy CommonJS
+	 * accessor. A generator ignoring `ConcatenationScope#isWrapped` answers false.
+	 * @returns {boolean} true, when it may be wrapped
+	 */
+	canBeWrappedInConcatenation() {
+		return true;
+	}
+
 	/**
 	 * Gets side effects connection state.
 	 * @param {ModuleGraph} moduleGraph the module graph
@@ -1362,10 +1423,10 @@ class Module extends DependenciesBlock {
 		super.deserialize(context);
 	}
 
-	// TODO remove in webpack 6
+	// TODO in the next major release: remove
 	/**
 	 * Gets source basic types.
-	 * @deprecated In webpack 6, call getSourceBasicTypes() directly on the module instance instead of using this static method.
+	 * @deprecated In the next major release, call getSourceBasicTypes() directly on the module instance instead of using this static method.
 	 * @param {Module} module the module
 	 * @returns {ReturnType<Module["getSourceBasicTypes"]>} the source types of the module
 	 */
@@ -1379,9 +1440,13 @@ class Module extends DependenciesBlock {
 	}
 }
 
-makeSerializable(Module, "webpack/lib/Module");
+makeSerializable(Module, [
+	"webpack/lib/module/Module",
+	// TODO in the next major release: remove, they restore pre-move cache packs
+	"webpack/lib/Module"
+]);
 
-// TODO remove in webpack 6
+// TODO in the next major release: remove
 Object.defineProperty(Module.prototype, "hasEqualsChunks", {
 	/**
 	 * Gets has equals chunks.
@@ -1395,7 +1460,7 @@ Object.defineProperty(Module.prototype, "hasEqualsChunks", {
 	}
 });
 
-// TODO remove in webpack 6
+// TODO in the next major release: remove
 Object.defineProperty(Module.prototype, "isUsed", {
 	/**
 	 * Returns throw an error.
@@ -1409,7 +1474,7 @@ Object.defineProperty(Module.prototype, "isUsed", {
 	}
 });
 
-// TODO remove in webpack 6
+// TODO in the next major release: remove
 Object.defineProperty(Module.prototype, "errors", {
 	/**
 	 * Returns errors.
@@ -1433,7 +1498,7 @@ Object.defineProperty(Module.prototype, "errors", {
 	)
 });
 
-// TODO remove in webpack 6
+// TODO in the next major release: remove
 Object.defineProperty(Module.prototype, "warnings", {
 	/**
 	 * Returns warnings.
@@ -1457,7 +1522,7 @@ Object.defineProperty(Module.prototype, "warnings", {
 	)
 });
 
-// TODO remove in webpack 6
+// TODO in the next major release: remove
 Object.defineProperty(Module.prototype, "used", {
 	/**
 	 * Returns throw an error.
@@ -1480,4 +1545,7 @@ Object.defineProperty(Module.prototype, "used", {
 	}
 });
 
+/** @type {Set<keyof ModuleKinds>} */
+Module.KINDS = new Set();
+
 module.exports = Module;

package/lib/{ModuleFactory.js → module/ModuleFactory.js}

@@ -5,8 +5,8 @@
 
 "use strict";
 
-/** @import { ResolveOptions } from "../declarations/WebpackOptions" */
-/** @import Dependency from "./Dependency" */
+/** @import { ResolveOptions } from "../../declarations/WebpackOptions" */
+/** @import Dependency from "../graph/Dependency" */
 /** @import Module from "./Module" */
 
 /**
@@ -53,7 +53,7 @@ class ModuleFactory {
 	 * @returns {void}
 	 */
 	create(data, callback) {
-		const AbstractMethodError = require("./errors/AbstractMethodError");
+		const AbstractMethodError = require("../errors/AbstractMethodError");
 
 		throw new AbstractMethodError();
 	}