webpack 5.111.1 → 5.112.1

package/lib/{SourceMapDevToolPlugin.js → devtool/SourceMapDevToolPlugin.js}

@@ -5,17 +5,17 @@
 
 "use strict";
 
-const { ConcatSource, RawSource } = require("webpack-sources");
-const Compilation = require("./Compilation");
+const { ConcatSource, RawSource, util } = require("webpack-sources");
+const Compilation = require("../Compilation");
+const { dirname, relative } = require("../fs/fs");
+const ProgressPlugin = require("../logging/ProgressPlugin");
+const { getPresentKinds } = require("../template/TemplatedPathPlugin");
+const asyncLib = require("../util/async");
+const createHash = require("../util/createHash");
+const { makePathsAbsolute } = require("../util/identifier");
 const ModuleFilenameHelpers = require("./ModuleFilenameHelpers");
-const ProgressPlugin = require("./ProgressPlugin");
 const SourceMapDevToolModuleOptionsPlugin = require("./SourceMapDevToolModuleOptionsPlugin");
-const { getPresentKinds } = require("./TemplatedPathPlugin");
-const asyncLib = require("./util/async");
-const createHash = require("./util/createHash");
-const { dirname, relative } = require("./util/fs");
-const generateDebugId = require("./util/generateDebugId");
-const { makePathsAbsolute } = require("./util/identifier");
+const generateDebugId = require("./generateDebugId");
 
 /** @import { MapOptions, Source, RawSourceMap } from "webpack-sources" */
 /**
@@ -23,25 +23,122 @@ const { makePathsAbsolute } = require("./util/identifier");
  * 	DevtoolNamespace,
  * 	DevtoolModuleFilenameTemplate,
  * 	DevtoolFallbackModuleFilenameTemplate
- * } from "../declarations/WebpackOptions"
+ * } from "../../declarations/WebpackOptions"
  */
+/** @import { ItemCacheFacade } from "../cache/CacheFacade" */
+/** @import Chunk from "../graph/Chunk" */
+/** @import { Asset, AssetInfo } from "../Compilation" */
+/** @import Compiler from "../Compiler" */
+/** @import Module from "../module/Module" */
 /**
  * @import {
- * 	SourceMapDevToolPluginOptions,
- * 	Rules
- * } from "../declarations/plugins/SourceMapDevToolPlugin"
+ * 	TemplatePath as SourceMappingURLComment
+ * } from "../template/TemplatedPathPlugin"
  */
-/** @import { ItemCacheFacade } from "./CacheFacade" */
-/** @import Chunk from "./Chunk" */
-/** @import { Asset, AssetInfo } from "./Compilation" */
-/** @import Compiler from "./Compiler" */
-/** @import Module from "./Module" */
+/** @import { OutputFileSystem } from "../fs/fs" */
+
 /**
- * @import {
- * 	TemplatePath as SourceMappingURLComment
- * } from "./TemplatedPathPlugin"
+ * @inline
+ * @minLength 1
+ * @absolutePath false
+ * @typedef {string} NonEmptyRelativePath
+ */
+
+/**
+ * @inline
+ * @minLength 1
+ * @typedef {string} NonEmptyString
+ */
+
+/**
+ * A rule condition.
+ * @inline
+ * @typedef {Rule} RulesBranch1Item
+ */
+
+/**
+ * Append no SourceMap comment to the bundle, but still generate SourceMaps.
+ * @inline
+ * @typedef {(false | null)} SourceMapDevToolPluginOptionsAppendBranch1
+ */
+
+/**
+ * Custom function generating the identifier.
+ * @inline
+ * @typedef {import("./ModuleFilenameHelpers").ModuleFilenameTemplateFunction} SourceMapDevToolPluginOptionsFallbackModuleFilenameTemplateBranch2
+ */
+
+/**
+ * Disable separate SourceMap file and inline SourceMap as DataUrl.
+ * @inline
+ * @typedef {(false | null)} SourceMapDevToolPluginOptionsFilenameBranch1
+ */
+
+/**
+ * Custom function generating the identifier.
+ * @inline
+ * @typedef {import("./ModuleFilenameHelpers").ModuleFilenameTemplateFunction} SourceMapDevToolPluginOptionsModuleFilenameTemplateBranch2
+ */
+
+/**
+ * A glob pattern.
+ * @inline
+ * @minLength 1
+ * @typedef {string} RuleGlobPattern
+ */
+
+/**
+ * @minItems 1
+ * @inline
+ * @typedef {RuleGlobPattern[]} RuleGlobList
+ */
+
+/**
+ * Glob patterns matched against the file name, `!` in front of a pattern excludes it, and a relative pattern matches at any depth.
+ * @since 5.112.0
+ * @inline
+ * @typedef {object} RuleGlob
+ * @property {RuleGlobList | NonEmptyString} glob Glob patterns to match.
+ */
+
+/**
+ * Condition used to match resource (string, RegExp or Function).
+ * @typedef {RegExp | NonEmptyString | RuleGlob | import("./ModuleFilenameHelpers").MatcherFn} Rule
+ */
+
+/**
+ * One or multiple conditions used to match resource.
+ * @typedef {RulesBranch1Item[] | Rule} Rules
+ */
+
+/**
+ * Emit the 'scopes' field, which tells a debugger the generated expression each imported ESM binding reads, so it resolves under the name the source uses.
+ * @since 5.112.0
+ * @inline
+ * @typedef {boolean} SourceMapDevToolPluginOptionsScopes
+ */
+
+/**
+ * @schema plugins/SourceMapDevToolPlugin
+ * @typedef {object} SourceMapDevToolPluginOptions
+ * @property {SourceMapDevToolPluginOptionsAppendBranch1 | NonEmptyString | import("../template/TemplatedPathPlugin").TemplatePathFn=} append Appends the given value to the original asset. Usually the #sourceMappingURL comment. [url] is replaced with a URL to the source map file. false disables the appending.
+ * @property {boolean=} columns Indicates whether column mappings should be used (defaults to true).
+ * @property {boolean=} debugIds Emit debug IDs into source and SourceMap.
+ * @property {Rules=} exclude Exclude modules that match the given value from source map generation.
+ * @property {NonEmptyString | SourceMapDevToolPluginOptionsFallbackModuleFilenameTemplateBranch2=} fallbackModuleFilenameTemplate Generator string or function to create identifiers of modules for the 'sources' array in the SourceMap used only if 'moduleFilenameTemplate' would result in a conflict.
+ * @property {string=} fileContext Path prefix to which the [file] placeholder is relative to.
+ * @property {SourceMapDevToolPluginOptionsFilenameBranch1 | NonEmptyRelativePath=} filename Defines the output filename of the SourceMap (will be inlined if no value is provided).
+ * @property {Rules=} ignoreList Decide whether to ignore source files that match the specified value in the SourceMap.
+ * @property {Rules=} include Include source maps for module paths that match the given value.
+ * @property {boolean=} module Indicates whether SourceMaps from loaders should be used (defaults to true).
+ * @property {NonEmptyString | SourceMapDevToolPluginOptionsModuleFilenameTemplateBranch2=} moduleFilenameTemplate Generator string or function to create identifiers of modules for the 'sources' array in the SourceMap.
+ * @property {string=} namespace Namespace prefix to allow multiple webpack roots in the devtools.
+ * @property {boolean=} noSources Omit the 'sourceContents' array from the SourceMap.
+ * @property {string=} publicPath Provide a custom public path for the SourceMapping comment.
+ * @property {SourceMapDevToolPluginOptionsScopes=} scopes
+ * @property {string=} sourceRoot Provide a custom value for the 'sourceRoot' property in the SourceMap.
+ * @property {Rules=} test Include source maps for modules based on their extension (defaults to .js and .css).
  */
-/** @import { OutputFileSystem } from "./util/fs" */
 
 /**
  * Defines the source map task type used by this module.
@@ -199,7 +296,7 @@ const getTaskForFile = (
 
 	return {
 		file,
-		source: /** @type {string} */ (source),
+		source,
 		assetInfo,
 		sourceMap,
 		mapSource,
@@ -210,6 +307,10 @@ const getTaskForFile = (
 
 const PLUGIN_NAME = "SourceMapDevToolPlugin";
 
+/** @typedef {SourceMapDevToolPluginOptions["filename"] | SourceMapDevToolPluginOptions["append"] | Rules | DevtoolModuleFilenameTemplate | DevtoolFallbackModuleFilenameTemplate | DevtoolNamespace} CacheKeyOption */
+/** @typedef {CacheKeyValue[]} CacheKeyValues */
+/** @typedef {string | false | null | undefined | RuleGlob | CacheKeyValues} CacheKeyValue */
+
 /**
  * Maps a configuration value (string, RegExp, function, nullish, or array of
  * such) into a JSON-serializable form. Functions and RegExps are turned into
@@ -221,8 +322,8 @@ const PLUGIN_NAME = "SourceMapDevToolPlugin";
  * we deliberately avoid any homemade `|` / `,` separators that could collide
  * with characters appearing inside user-provided values such as `publicPath`,
  * template strings, or `sourceRoot`.
- * @param {EXPECTED_ANY} value option value
- * @returns {EXPECTED_ANY} JSON-serializable representation
+ * @param {CacheKeyOption} value option value
+ * @returns {CacheKeyValue} JSON-serializable representation
  */
 const toCacheKeyValue = (value) => {
 	if (value === undefined || value === null) return value;
@@ -274,6 +375,7 @@ class SourceMapDevToolPlugin {
 			options.columns !== false,
 			Boolean(options.noSources),
 			Boolean(options.debugIds),
+			Boolean(options.scopes),
 			options.sourceRoot || "",
 			toCacheKeyValue(options.ignoreList),
 			options.publicPath || "",
@@ -289,14 +391,14 @@ class SourceMapDevToolPlugin {
 	apply(compiler) {
 		compiler.hooks.validate.tap(PLUGIN_NAME, () => {
 			compiler.validate(
-				() => require("../schemas/plugins/SourceMapDevToolPlugin.json"),
+				() => require("../../schemas/plugins/SourceMapDevToolPlugin.json"),
 				this.options,
 				{
 					name: "SourceMap DevTool Plugin",
 					baseDataPath: "options"
 				},
 				(options) =>
-					require("../schemas/plugins/SourceMapDevToolPlugin.check")(options)
+					require("../../schemas/plugins/SourceMapDevToolPlugin.check")(options)
 			);
 		});
 
@@ -722,6 +824,32 @@ class SourceMapDevToolPlugin {
 									if (debugIdValue !== undefined) {
 										outputSourceMap.debugId = debugIdValue;
 									}
+									const { codeGenerationResults } = compilation;
+									if (options.scopes && codeGenerationResults) {
+										// The spread above shares `names` with a map a
+										// `SourceMapSource` may hold, and encoding appends to it.
+										outputSourceMap.names = sourceMap.names
+											? [...sourceMap.names]
+											: [];
+										const runtime = chunk && chunk.runtime;
+										util.scopes.addScopesToSourceMap(
+											outputSourceMap,
+											(sourceIndex) => {
+												const module = modules[sourceIndex];
+												if (
+													typeof module === "string" ||
+													!codeGenerationResults.has(module, runtime)
+												) {
+													return;
+												}
+												return codeGenerationResults.getData(
+													module,
+													runtime,
+													"importBindings"
+												);
+											}
+										);
+									}
 
 									if (sourceMapFilename) {
 										// Hold the serialized map as a `Buffer`, which `RawSource`

package/lib/{util → devtool}/generateDebugId.js

@@ -5,7 +5,7 @@
 
 "use strict";
 
-const createHash = require("./createHash");
+const createHash = require("../util/createHash");
 
 /**
  * Returns generated debug id.

package/lib/{IgnoreWarningsPlugin.js → diagnostics/IgnoreWarningsPlugin.js}

@@ -5,8 +5,8 @@
 
 "use strict";
 
-/** @import Compiler from "./Compiler" */
-/** @import Compilation from "./Compilation" */
+/** @import Compiler from "../Compiler" */
+/** @import Compilation from "../Compilation" */
 
 /** @typedef {(warning: Error, compilation: Compilation) => boolean} IgnoreFn */
 

package/lib/{NoEmitOnErrorsPlugin.js → diagnostics/NoEmitOnErrorsPlugin.js}

@@ -5,7 +5,7 @@
 
 "use strict";
 
-/** @import Compiler from "./Compiler" */
+/** @import Compiler from "../Compiler" */
 
 const PLUGIN_NAME = "NoEmitOnErrorsPlugin";
 

package/lib/diagnostics/WarnCaseSensitiveModulesPlugin.js

@@ -0,0 +1,64 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+
+"use strict";
+
+/** @import Compiler from "../Compiler" */
+/** @import Module from "../module/Module" */
+/** @import NormalModule from "../module/NormalModule" */
+
+const CaseSensitiveModulesWarning = require("../errors/CaseSensitiveModulesWarning");
+
+const PLUGIN_NAME = "WarnCaseSensitiveModulesPlugin";
+
+class WarnCaseSensitiveModulesPlugin {
+	/**
+	 * Applies the plugin by registering its hooks on the compiler.
+	 * @param {Compiler} compiler the compiler instance
+	 * @returns {void}
+	 */
+	apply(compiler) {
+		compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
+			compilation.hooks.seal.tap(PLUGIN_NAME, () => {
+				/** @type {Map<string, Map<string, Module>>} */
+				const moduleWithoutCase = new Map();
+				for (const module of compilation.modules) {
+					const identifier = module.identifier();
+
+					// Ignore `data:` URLs, because it's not a real path
+					if (
+						/** @type {NormalModule} */
+						(module).resourceResolveData !== undefined &&
+						/** @type {NormalModule} */
+						(module).resourceResolveData.encodedContent !== undefined
+					) {
+						continue;
+					}
+
+					const lowerIdentifier = identifier.toLowerCase();
+					let map = moduleWithoutCase.get(lowerIdentifier);
+					if (map === undefined) {
+						map = new Map();
+						moduleWithoutCase.set(lowerIdentifier, map);
+					}
+					map.set(identifier, module);
+				}
+				for (const pair of moduleWithoutCase) {
+					const map = pair[1];
+					if (map.size > 1) {
+						compilation.warnings.push(
+							new CaseSensitiveModulesWarning(
+								map.values(),
+								compilation.moduleGraph
+							)
+						);
+					}
+				}
+			});
+		});
+	}
+}
+
+module.exports = WarnCaseSensitiveModulesPlugin;

package/lib/{WarnDeprecatedOptionPlugin.js → diagnostics/WarnDeprecatedOptionPlugin.js}

@@ -5,9 +5,9 @@
 
 "use strict";
 
-const WebpackError = require("./errors/WebpackError");
+const DeprecatedOptionWarning = require("../errors/DeprecatedOptionWarning");
 
-/** @import Compiler from "./Compiler" */
+/** @import Compiler from "../Compiler" */
 
 const PLUGIN_NAME = "WarnDeprecatedOptionPlugin";
 
@@ -41,24 +41,4 @@ class WarnDeprecatedOptionPlugin {
 	}
 }
 
-class DeprecatedOptionWarning extends WebpackError {
-	/**
-	 * Create an instance deprecated option warning
-	 * @param {string} option the target option
-	 * @param {string | number} value the deprecated option value
-	 * @param {string} suggestion the suggestion replacement
-	 */
-	constructor(option, value, suggestion) {
-		super();
-
-		/** @type {string} */
-		this.name = "DeprecatedOptionWarning";
-		/** @type {string} */
-		this.message =
-			"configuration\n" +
-			`The value '${value}' for option '${option}' is deprecated. ` +
-			`Use '${suggestion}' instead.`;
-	}
-}
-
 module.exports = WarnDeprecatedOptionPlugin;

package/lib/diagnostics/WarnNoModeSetPlugin.js

@@ -0,0 +1,27 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+
+"use strict";
+
+const NoModeWarning = require("../errors/NoModeWarning");
+
+/** @import Compiler from "../Compiler" */
+
+const PLUGIN_NAME = "WarnNoModeSetPlugin";
+
+class WarnNoModeSetPlugin {
+	/**
+	 * Applies the plugin by registering its hooks on the compiler.
+	 * @param {Compiler} compiler the compiler instance
+	 * @returns {void}
+	 */
+	apply(compiler) {
+		compiler.hooks.thisCompilation.tap(PLUGIN_NAME, (compilation) => {
+			compilation.warnings.push(new NoModeWarning());
+		});
+	}
+}
+
+module.exports = WarnNoModeSetPlugin;

package/lib/dll/DelegatedModule.js

@@ -6,30 +6,33 @@
 "use strict";
 
 const { OriginalSource, RawSource } = require("webpack-sources");
-const Module = require("../Module");
+const StaticExportsDependency = require("../dependencies/core/StaticExportsDependency");
+const isDependencyKind = require("../graph/isDependencyKind");
+const Module = require("../module/Module");
 const {
 	JAVASCRIPT_TYPE,
 	JAVASCRIPT_TYPES
-} = require("../ModuleSourceTypeConstants");
-const { JAVASCRIPT_MODULE_TYPE_DYNAMIC } = require("../ModuleTypeConstants");
-const RuntimeGlobals = require("../RuntimeGlobals");
-const DelegatedSourceDependency = require("../dependencies/DelegatedSourceDependency");
-const StaticExportsDependency = require("../dependencies/StaticExportsDependency");
+} = require("../module/ModuleSourceTypeConstants");
+const {
+	JAVASCRIPT_MODULE_TYPE_DYNAMIC
+} = require("../module/ModuleTypeConstants");
+const RuntimeGlobals = require("../runtime/RuntimeGlobals");
 const makeSerializable = require("../util/makeSerializable");
+const DelegatedSourceDependency = require("./DelegatedSourceDependency");
 
 /**
  * @import {
  * 	DllReferencePluginOptions
- * } from "../../declarations/plugins/dll/DllReferencePlugin"
+ * } from "./DllReferencePlugin"
  */
-/** @import { ModuleId } from "../ChunkGraph" */
+/** @import { ModuleId } from "../graph/ChunkGraph" */
 /**
  * @import {
  * 	WebpackOptionsNormalizedWithDefaults as WebpackOptions
  * } from "../config/defaults"
  */
 /** @import Compilation from "../Compilation" */
-/** @import { UpdateHashContext } from "../Dependency" */
+/** @import { UpdateHashContext } from "../graph/Dependency" */
 /** @import { ManifestModuleData } from "./LibManifestPlugin" */
 /**
  * @import {
@@ -44,15 +47,15 @@ const makeSerializable = require("../util/makeSerializable");
  * 	Sources,
  * 	RuntimeRequirements,
  * 	SourceTypes
- * } from "../Module"
+ * } from "../module/Module"
  */
-/** @import RequestShortener from "../RequestShortener" */
-/** @import { ResolverWithOptions } from "../ResolverFactory" */
+/** @import RequestShortener from "../util/RequestShortener" */
+/** @import { ResolverWithOptions } from "../resolve/ResolverFactory" */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[DelegatedModuleSourceRequest, DelegatedModuleData, DelegatedModuleType, string, string | Module]>} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[DelegatedModuleSourceRequest, DelegatedModuleData, DelegatedModuleType, string, string | Module]>} ObjectSerializerContext */
-/** @import { Exports } from "../dependencies/StaticExportsDependency" */
+/** @import { Exports } from "../dependencies/core/StaticExportsDependency" */
 /** @import Hash from "../util/Hash" */
-/** @import { InputFileSystem } from "../util/fs" */
+/** @import { InputFileSystem } from "../fs/fs" */
 
 /** @typedef {string} DelegatedModuleSourceRequest */
 
@@ -305,10 +308,9 @@ class DelegatedModule extends Module {
 		if (this.buildMeta) {
 			const nextMeta = { ...next.buildMeta };
 			const exportsDependency = this.dependencies[1];
-			const builtExports =
-				exportsDependency instanceof StaticExportsDependency
-					? exportsDependency.exports
-					: undefined;
+			const builtExports = isDependencyKind(exportsDependency, "static-exports")
+				? exportsDependency.exports
+				: undefined;
 			if (
 				JSON.stringify(this.buildMeta) !== JSON.stringify(nextMeta) ||
 				JSON.stringify(builtExports) !== JSON.stringify(next.exports || true)
@@ -324,9 +326,9 @@ class DelegatedModule extends Module {
 	 */
 	cleanupForCache() {
 		super.cleanupForCache();
-		this.delegateData =
-			/** @type {EXPECTED_ANY} */
-			(undefined);
+		this.delegateData = /** @type {DelegatedModuleData} */ (
+			/** @type {DelegatedModuleData | undefined} */ (undefined)
+		);
 	}
 }
 

package/lib/dll/DelegatedModuleFactoryPlugin.js

@@ -11,7 +11,7 @@ const DelegatedModule = require("./DelegatedModule");
  * @import {
  * 	DllReferencePluginOptions,
  * 	DllReferencePluginOptionsContent
- * } from "../../declarations/plugins/dll/DllReferencePlugin"
+ * } from "./DllReferencePlugin"
  */
 /**
  * @import {
@@ -20,7 +20,7 @@ const DelegatedModule = require("./DelegatedModule");
  * 	DelegatedModuleType
  * } from "./DelegatedModule"
  */
-/** @import NormalModuleFactory from "../NormalModuleFactory" */
+/** @import NormalModuleFactory from "../module/NormalModuleFactory" */
 /** @import { AssociatedObjectForCache } from "../util/identifier" */
 
 /**

package/lib/dll/DelegatedPlugin.js

@@ -5,8 +5,8 @@
 
 "use strict";
 
-const DelegatedSourceDependency = require("../dependencies/DelegatedSourceDependency");
 const DelegatedModuleFactoryPlugin = require("./DelegatedModuleFactoryPlugin");
+const DelegatedSourceDependency = require("./DelegatedSourceDependency");
 
 /** @import Compiler from "../Compiler" */
 /** @import { Options } from "./DelegatedModuleFactoryPlugin" */

package/lib/{dependencies → dll}/DelegatedSourceDependency.js

@@ -5,8 +5,8 @@
 
 "use strict";
 
+const ModuleDependency = require("../dependencies/core/ModuleDependency");
 const makeSerializable = require("../util/makeSerializable");
-const ModuleDependency = require("./ModuleDependency");
 
 class DelegatedSourceDependency extends ModuleDependency {
 	/**
@@ -26,9 +26,10 @@ class DelegatedSourceDependency extends ModuleDependency {
 	}
 }
 
-makeSerializable(
-	DelegatedSourceDependency,
+makeSerializable(DelegatedSourceDependency, [
+	"webpack/lib/dll/DelegatedSourceDependency",
+	// TODO in the next major release: remove, they restore pre-move cache packs
 	"webpack/lib/dependencies/DelegatedSourceDependency"
-);
+]);
 
 module.exports = DelegatedSourceDependency;

package/lib/{dependencies → dll}/DllEntryDependency.js

@@ -5,10 +5,10 @@
 
 "use strict";
 
-const Dependency = require("../Dependency");
+const Dependency = require("../graph/Dependency");
 const makeSerializable = require("../util/makeSerializable");
 
-/** @import EntryDependency from "./EntryDependency" */
+/** @import EntryDependency from "../entry/EntryDependency" */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[EntryDependency[], string]>} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[EntryDependency[], string]>} ObjectSerializerContext */
 
@@ -52,9 +52,10 @@ class DllEntryDependency extends Dependency {
 	}
 }
 
-makeSerializable(
-	DllEntryDependency,
+makeSerializable(DllEntryDependency, [
+	"webpack/lib/dll/DllEntryDependency",
+	// TODO in the next major release: remove, they restore pre-move cache packs
 	"webpack/lib/dependencies/DllEntryDependency"
-);
+]);
 
 module.exports = DllEntryDependency;

package/lib/dll/DllEntryPlugin.js

@@ -5,12 +5,12 @@
 
 "use strict";
 
-const DllEntryDependency = require("../dependencies/DllEntryDependency");
-const EntryDependency = require("../dependencies/EntryDependency");
+const EntryDependency = require("../entry/EntryDependency");
+const DllEntryDependency = require("./DllEntryDependency");
 const DllModuleFactory = require("./DllModuleFactory");
 
 /** @import Compiler from "../Compiler" */
-/** @import { EntryOptions } from "../Entrypoint" */
+/** @import { EntryOptions } from "../graph/Entrypoint" */
 
 /** @typedef {string[]} Entries */
 /** @typedef {EntryOptions & { name: string }} Options */

package/lib/dll/DllModule.js

@@ -6,13 +6,15 @@
 "use strict";
 
 const { RawSource } = require("webpack-sources");
-const Module = require("../Module");
+const Module = require("../module/Module");
 const {
 	JAVASCRIPT_TYPE,
 	JAVASCRIPT_TYPES
-} = require("../ModuleSourceTypeConstants");
-const { JAVASCRIPT_MODULE_TYPE_DYNAMIC } = require("../ModuleTypeConstants");
-const RuntimeGlobals = require("../RuntimeGlobals");
+} = require("../module/ModuleSourceTypeConstants");
+const {
+	JAVASCRIPT_MODULE_TYPE_DYNAMIC
+} = require("../module/ModuleTypeConstants");
+const RuntimeGlobals = require("../runtime/RuntimeGlobals");
 const makeSerializable = require("../util/makeSerializable");
 
 /**
@@ -21,7 +23,7 @@ const makeSerializable = require("../util/makeSerializable");
  * } from "../config/defaults"
  */
 /** @import Compilation from "../Compilation" */
-/** @import Dependency, { UpdateHashContext } from "../Dependency" */
+/** @import Dependency, { UpdateHashContext } from "../graph/Dependency" */
 /**
  * @import {
  * 	BuildCallback,
@@ -31,14 +33,14 @@ const makeSerializable = require("../util/makeSerializable");
  * 	NeedBuildContext,
  * 	Sources,
  * 	SourceTypes
- * } from "../Module"
+ * } from "../module/Module"
  */
-/** @import RequestShortener from "../RequestShortener" */
-/** @import { ResolverWithOptions } from "../ResolverFactory" */
+/** @import RequestShortener from "../util/RequestShortener" */
+/** @import { ResolverWithOptions } from "../resolve/ResolverFactory" */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[string]>} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[string]>} ObjectSerializerContext */
 /** @import Hash from "../util/Hash" */
-/** @import { InputFileSystem } from "../util/fs" */
+/** @import { InputFileSystem } from "../fs/fs" */
 
 const RUNTIME_REQUIREMENTS = new Set([
 	RuntimeGlobals.require,
@@ -185,7 +187,9 @@ class DllModule extends Module {
 	 */
 	cleanupForCache() {
 		super.cleanupForCache();
-		this.dependencies = /** @type {EXPECTED_ANY} */ (undefined);
+		this.dependencies = /** @type {Dependency[]} */ (
+			/** @type {Dependency[] | undefined} */ (undefined)
+		);
 	}
 }