webpack 5.111.1 → 5.112.1

package/lib/dll/DllModuleFactory.js

@@ -5,16 +5,16 @@
 
 "use strict";
 
-const ModuleFactory = require("../ModuleFactory");
+const ModuleFactory = require("../module/ModuleFactory");
 const DllModule = require("./DllModule");
 
 /**
  * @import {
  * 	ModuleFactoryCallback,
  * 	ModuleFactoryCreateData
- * } from "../ModuleFactory"
+ * } from "../module/ModuleFactory"
  */
-/** @import DllEntryDependency from "../dependencies/DllEntryDependency" */
+/** @import DllEntryDependency from "./DllEntryDependency" */
 
 class DllModuleFactory extends ModuleFactory {
 	constructor() {

package/lib/dll/DllPlugin.js

@@ -5,18 +5,30 @@
 
 "use strict";
 
-const FlagAllModulesAsUsedPlugin = require("../FlagAllModulesAsUsedPlugin");
+const FlagAllModulesAsUsedPlugin = require("../optimize/FlagAllModulesAsUsedPlugin");
 const DllEntryPlugin = require("./DllEntryPlugin");
 const LibManifestPlugin = require("./LibManifestPlugin");
 
-/**
- * @import {
- * 	DllPluginOptions
- * } from "../../declarations/plugins/dll/DllPlugin"
- */
 /** @import Compiler from "../Compiler" */
 /** @import { Entries, Options } from "./DllEntryPlugin" */
 
+/**
+ * @inline
+ * @minLength 1
+ * @typedef {string} NonEmptyString
+ */
+
+/**
+ * @schema plugins/dll/DllPlugin
+ * @typedef {object} DllPluginOptions
+ * @property {NonEmptyString=} context Context of requests in the manifest file (defaults to the webpack context).
+ * @property {boolean=} entryOnly If true, only entry points will be exposed (default: true).
+ * @property {boolean=} format If true, manifest json file (output) will be formatted.
+ * @property {NonEmptyString=} name Name of the exposed dll function (external name, use value of 'output.library').
+ * @property {NonEmptyString} path Absolute path to the manifest json file (output).
+ * @property {NonEmptyString=} type Type of the dll bundle (external type, use value of 'output.libraryTarget').
+ */
+
 const PLUGIN_NAME = "DllPlugin";
 
 class DllPlugin {

package/lib/dll/DllReferencePlugin.js

@@ -5,23 +5,115 @@
 
 "use strict";
 
-const ExternalModuleFactoryPlugin = require("../ExternalModuleFactoryPlugin");
-const DelegatedSourceDependency = require("../dependencies/DelegatedSourceDependency");
-const WebpackError = require("../errors/WebpackError");
+const DllManifestError = require("../errors/DllManifestError");
+const ExternalModuleFactoryPlugin = require("../externals/ExternalModuleFactoryPlugin");
 const { fileUrlToPath, makePathsRelative } = require("../util/identifier");
 const parseJson = require("../util/parseJson");
 const DelegatedModuleFactoryPlugin = require("./DelegatedModuleFactoryPlugin");
+const DelegatedSourceDependency = require("./DelegatedSourceDependency");
 
 /** @import { Externals } from "../../declarations/WebpackOptions" */
+/** @import Compiler, { CompilationParams } from "../Compiler" */
+/** @import { InputFileSystem } from "../fs/fs" */
+
 /**
- * @import {
- * 	DllReferencePluginOptions,
- * 	DllReferencePluginOptionsContent,
- * 	DllReferencePluginOptionsManifest
- * } from "../../declarations/plugins/dll/DllReferencePlugin"
+ * @inline
+ * @absolutePath true
+ * @typedef {string} AbsolutePath
+ */
+
+/**
+ * @inline
+ * @minLength 1
+ * @typedef {string} NonEmptyString
+ */
+
+/**
+ * Name of the export.
+ * @inline
+ * @typedef {NonEmptyString} DllReferencePluginOptionsContentValueExportsBranch1Item
+ */
+
+/**
+ * List of provided exports of the module.
+ * @inline
+ * @typedef {DllReferencePluginOptionsContentValueExportsBranch1Item[]} DllReferencePluginOptionsContentValueExportsBranch1
+ */
+
+/**
+ * Exports unknown/dynamic.
+ * @inline
+ * @typedef {true} DllReferencePluginOptionsContentValueExportsBranch2
+ */
+
+/**
+ * Module info.
+ * @inline
+ * @typedef {object} DllReferencePluginOptionsContentValue
+ * @property {{ [key: string]: EXPECTED_ANY }=} buildMeta Meta information about the module.
+ * @property {DllReferencePluginOptionsContentValueExportsBranch1 | DllReferencePluginOptionsContentValueExportsBranch2=} exports Information about the provided exports of the module.
+ * @property {number | NonEmptyString} id Module ID.
+ */
+
+/**
+ * An extension.
+ * @inline
+ * @typedef {string} DllReferencePluginOptionsBranch1ObjectExtensionsItem
+ */
+
+/**
+ * @inline
+ * @typedef {object} DllReferencePluginOptionsBranch1Object
+ * @property {AbsolutePath=} context Context of requests in the manifest (or content property) as absolute path.
+ * @property {DllReferencePluginOptionsBranch1ObjectExtensionsItem[]=} extensions Extensions used to resolve modules in the dll bundle (only used when using 'scope').
+ * @property {AbsolutePath | DllReferencePluginOptionsManifest} manifest An object containing content and name or a string to the absolute path of the JSON manifest to be loaded upon compilation.
+ * @property {NonEmptyString=} name The name where the dll is exposed (external name, defaults to manifest.name).
+ * @property {NonEmptyString=} scope Prefix which is used for accessing the content of the dll.
+ * @property {DllReferencePluginOptionsSourceType=} sourceType How the dll is exposed (libraryTarget, defaults to manifest.type).
+ * @property {"require" | "object"=} type The way how the export of the dll bundle is used.
+ */
+
+/**
+ * An extension.
+ * @inline
+ * @typedef {string} DllReferencePluginOptionsBranch2ObjectExtensionsItem
+ */
+
+/**
+ * @inline
+ * @typedef {object} DllReferencePluginOptionsBranch2Object
+ * @property {DllReferencePluginOptionsContent} content
+ * @property {AbsolutePath=} context Context of requests in the manifest (or content property) as absolute path.
+ * @property {DllReferencePluginOptionsBranch2ObjectExtensionsItem[]=} extensions Extensions used to resolve modules in the dll bundle (only used when using 'scope').
+ * @property {NonEmptyString} name The name where the dll is exposed (external name).
+ * @property {NonEmptyString=} scope Prefix which is used for accessing the content of the dll.
+ * @property {DllReferencePluginOptionsSourceType=} sourceType How the dll is exposed (libraryTarget).
+ * @property {"require" | "object"=} type The way how the export of the dll bundle is used.
+ */
+
+/**
+ * The mappings from request to module info.
+ * @minProperties 1
+ * @typedef {{ [key: string]: DllReferencePluginOptionsContentValue }} DllReferencePluginOptionsContent
+ */
+
+/**
+ * An object containing content, name and type.
+ * @typedef {object} DllReferencePluginOptionsManifest
+ * @property {DllReferencePluginOptionsContent} content
+ * @property {NonEmptyString=} name The name where the dll is exposed (external name).
+ * @property {DllReferencePluginOptionsSourceType=} type
+ */
+
+/**
+ * The type how the dll is exposed (external type).
+ * @typedef {"var" | "assign" | "this" | "window" | "global" | "commonjs" | "commonjs2" | "commonjs-module" | "amd" | "amd-require" | "umd" | "umd2" | "jsonp" | "system"} DllReferencePluginOptionsSourceType
+ */
+
+/**
+ * @schema plugins/dll/DllReferencePlugin
+ * @typedef {DllReferencePluginOptionsBranch1Object | DllReferencePluginOptionsBranch2Object} DllReferencePluginOptions
  */
-/** @import Compiler, { CompilationParams } from "../Compiler" */
-/** @import { InputFileSystem } from "../util/fs" */
 
 /** @typedef {{ path: string, data: DllReferencePluginOptionsManifest | undefined, error: Error | undefined }} CompilationDataItem */
 
@@ -87,10 +179,7 @@ class DllReferencePlugin {
 						try {
 							data.data =
 								/** @type {DllReferencePluginOptionsManifest} */
-								(
-									/** @type {unknown} */
-									(parseJson(/** @type {Buffer} */ (result).toString("utf8")))
-								);
+								(parseJson(/** @type {Buffer} */ (result).toString("utf8")));
 						} catch (parseErr) {
 							// Store the error in the params so that it can
 							// be added as a compilation error later on.
@@ -186,20 +275,4 @@ class DllReferencePlugin {
 	}
 }
 
-class DllManifestError extends WebpackError {
-	/**
-	 * Creates an instance of DllManifestError.
-	 * @param {string} filename filename of the manifest
-	 * @param {string} message error message
-	 */
-	constructor(filename, message) {
-		super();
-
-		/** @type {string} */
-		this.name = "DllManifestError";
-		/** @type {string} */
-		this.message = `Dll manifest ${filename}\n${message}`;
-	}
-}
-
 module.exports = DllReferencePlugin;

package/lib/dll/LibManifestPlugin.js

@@ -5,17 +5,17 @@
 
 "use strict";
 
-const EntryDependency = require("../dependencies/EntryDependency");
+const { dirname, mkdirp } = require("../fs/fs");
+const isDependencyKind = require("../graph/isDependencyKind");
 const { someInIterable } = require("../util/IterableHelpers");
 const asyncLib = require("../util/async");
 const { compareModulesById } = require("../util/comparators");
-const { dirname, mkdirp } = require("../util/fs");
 
-/** @import { ModuleId } from "../ChunkGraph" */
+/** @import { ModuleId } from "../graph/ChunkGraph" */
 /** @import Compiler from "../Compiler" */
-/** @import { ExportInfoName } from "../Dependency" */
-/** @import { BuildMeta } from "../Module" */
-/** @import { IntermediateFileSystem } from "../util/fs" */
+/** @import { ExportInfoName } from "../graph/Dependency" */
+/** @import { BuildMeta } from "../module/Module" */
+/** @import { IntermediateFileSystem } from "../fs/fs" */
 
 /**
  * Defines the manifest module data type used by this module.
@@ -92,7 +92,9 @@ class LibManifestPlugin {
 								this.options.entryOnly &&
 								!someInIterable(
 									moduleGraph.getIncomingConnections(module),
-									(c) => c.dependency instanceof EntryDependency
+									(c) =>
+										c.dependency !== null &&
+										isDependencyKind(c.dependency, "entry")
 								)
 							) {
 								continue;

package/lib/electron/ElectronTargetPlugin.js

@@ -5,11 +5,11 @@
 
 "use strict";
 
-const ExternalsPlugin = require("../ExternalsPlugin");
+const ExternalsPlugin = require("../externals/ExternalsPlugin");
 
 /** @import { ExternalsType } from "../../declarations/WebpackOptions" */
 /** @import Compiler from "../Compiler" */
-/** @import Dependency from "../Dependency" */
+/** @import Dependency from "../graph/Dependency" */
 /** @typedef {"main" | "preload" | "renderer"} ElectronContext */
 
 const SHARED_MODULES = [

package/lib/{DynamicEntryPlugin.js → entry/DynamicEntryPlugin.js}

@@ -5,18 +5,18 @@
 
 "use strict";
 
+const EntryDependency = require("./EntryDependency");
 const EntryOptionPlugin = require("./EntryOptionPlugin");
 const EntryPlugin = require("./EntryPlugin");
-const EntryDependency = require("./dependencies/EntryDependency");
 
 /**
  * @import {
  * 	EntryDescriptionNormalized,
  * 	EntryStatic,
  * 	EntryStaticNormalized
- * } from "../declarations/WebpackOptions"
+ * } from "../../declarations/WebpackOptions.d.ts"
  */
-/** @import Compiler from "./Compiler" */
+/** @import Compiler from "../Compiler" */
 
 const PLUGIN_NAME = "DynamicEntryPlugin";
 

package/lib/{dependencies → entry}/EntryDependency.js

@@ -5,8 +5,10 @@
 
 "use strict";
 
+/** @import { DependencyKinds } from "../graph/Dependency" */
+
+const ModuleDependency = require("../dependencies/core/ModuleDependency");
 const makeSerializable = require("../util/makeSerializable");
-const ModuleDependency = require("./ModuleDependency");
 
 class EntryDependency extends ModuleDependency {
 	/**
@@ -26,6 +28,13 @@ class EntryDependency extends ModuleDependency {
 	}
 }
 
-makeSerializable(EntryDependency, "webpack/lib/dependencies/EntryDependency");
+makeSerializable(EntryDependency, [
+	"webpack/lib/entry/EntryDependency",
+	// TODO in the next major release: remove, they restore pre-move cache packs
+	"webpack/lib/dependencies/EntryDependency"
+]);
+
+/** @type {Set<keyof DependencyKinds>} */
+EntryDependency.KINDS = new Set([...ModuleDependency.KINDS, "entry"]);
 
 module.exports = EntryDependency;

package/lib/{EntryOptionPlugin.js → entry/EntryOptionPlugin.js}

@@ -11,10 +11,10 @@ const { SyncBailHook } = require("tapable");
  * @import {
  * 	EntryDescriptionNormalized as EntryDescription,
  * 	EntryNormalized as Entry
- * } from "../declarations/WebpackOptions"
+ * } from "../../declarations/WebpackOptions.d.ts"
  */
-/** @import Compiler from "./Compiler" */
-/** @import { EntryOptions } from "./Entrypoint" */
+/** @import Compiler from "../Compiler" */
+/** @import { EntryOptions } from "../graph/Entrypoint" */
 
 /**
  * @typedef {object} EntryOptionPluginHooks
@@ -121,17 +121,17 @@ class EntryOptionPlugin {
 			library: desc.library
 		};
 		if (desc.chunkLoading) {
-			const EnableChunkLoadingPlugin = require("./javascript/EnableChunkLoadingPlugin");
+			const EnableChunkLoadingPlugin = require("../javascript/EnableChunkLoadingPlugin");
 
 			EnableChunkLoadingPlugin.checkEnabled(compiler, desc.chunkLoading);
 		}
 		if (desc.wasmLoading) {
-			const EnableWasmLoadingPlugin = require("./wasm/EnableWasmLoadingPlugin");
+			const EnableWasmLoadingPlugin = require("../wasm/EnableWasmLoadingPlugin");
 
 			EnableWasmLoadingPlugin.checkEnabled(compiler, desc.wasmLoading);
 		}
 		if (desc.library) {
-			const EnableLibraryPlugin = require("./library/EnableLibraryPlugin");
+			const EnableLibraryPlugin = require("../library/EnableLibraryPlugin");
 
 			EnableLibraryPlugin.checkEnabled(compiler, desc.library.type);
 		}

package/lib/entry/EntryPlugin.js

@@ -0,0 +1,75 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+
+"use strict";
+
+const EntryDependency = require("./EntryDependency");
+
+/** @import Compiler from "../Compiler" */
+/** @import { EntryOptions } from "../graph/Entrypoint" */
+
+const PLUGIN_NAME = "EntryPlugin";
+
+class EntryPlugin {
+	/**
+	 * An entry plugin which will handle creation of the EntryDependency
+	 * @param {string} context context path
+	 * @param {string} entry entry path
+	 * @param {EntryOptions | string=} options entry options (passing a string is deprecated)
+	 */
+	constructor(context, entry, options) {
+		/** @type {string} */
+		this.context = context;
+		/** @type {string} */
+		this.entry = entry;
+		this.options = options || "";
+	}
+
+	/**
+	 * 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, { normalModuleFactory }) => {
+				compilation.dependencyFactories.set(
+					EntryDependency,
+					normalModuleFactory
+				);
+			}
+		);
+
+		const { entry, options, context } = this;
+		const dep = EntryPlugin.createDependency(entry, options);
+
+		compiler.hooks.make.tapAsync(PLUGIN_NAME, (compilation, callback) => {
+			compilation.addEntry(context, dep, options, (err) => {
+				callback(err);
+			});
+		});
+	}
+
+	/**
+	 * Creates a dependency.
+	 * @param {string} entry entry request
+	 * @param {EntryOptions | string} options entry options (passing string is deprecated)
+	 * @returns {EntryDependency} the dependency
+	 */
+	static createDependency(entry, options) {
+		const dep = new EntryDependency(entry);
+		// TODO in the next major release: remove string option
+		dep.loc = {
+			name:
+				typeof options === "object"
+					? /** @type {string} */ (options.name)
+					: options
+		};
+		return dep;
+	}
+}
+
+module.exports = EntryPlugin;

package/lib/errors/AbstractMethodError.js

@@ -31,7 +31,7 @@ function Message() {
 	/** @type {RegExpMatchArray | null} */
 	const match =
 		/** @type {string} */
-		(/** @type {unknown} */ (this.stack))
+		(/** @type {string | undefined} */ (this.stack))
 			.split("\n")[3]
 			.match(CURRENT_METHOD_REGEXP);
 

package/lib/{performance → errors}/AssetsOverSizeLimitWarning.js

@@ -5,10 +5,10 @@
 
 "use strict";
 
-const WebpackError = require("../errors/WebpackError");
 const formatSize = require("../util/formatSize");
+const WebpackError = require("./WebpackError");
 
-/** @import { AssetDetails } from "./SizeLimitsPlugin" */
+/** @import { AssetDetails } from "../performance/SizeLimitsPlugin" */
 
 class AssetsOverSizeLimitWarning extends WebpackError {
 	/**

package/lib/errors/AsyncDependencyToInitialChunkError.js

@@ -7,8 +7,8 @@
 
 const WebpackError = require("./WebpackError");
 
-/** @import { DependencyLocation } from "../Dependency" */
-/** @import Module from "../Module" */
+/** @import { DependencyLocation } from "../graph/Dependency" */
+/** @import Module from "../module/Module" */
 
 /**
  * Error raised when webpack detects an attempt to lazy-load a chunk name that

package/lib/errors/BuildCycleError.js

@@ -7,7 +7,7 @@
 
 const WebpackError = require("./WebpackError");
 
-/** @import Module from "../Module" */
+/** @import Module from "../module/Module" */
 
 class BuildCycleError extends WebpackError {
 	/**

package/lib/{WarnCaseSensitiveModulesPlugin.js → errors/CaseSensitiveModulesWarning.js}

@@ -5,12 +5,10 @@
 
 "use strict";
 
-/** @import Compiler from "./Compiler" */
-/** @import Module from "./Module" */
-/** @import ModuleGraph from "./ModuleGraph" */
-/** @import NormalModule from "./NormalModule" */
+const WebpackError = require("./WebpackError");
 
-const WebpackError = require("./errors/WebpackError");
+/** @import Module from "../module/Module" */
+/** @import ModuleGraph from "../graph/ModuleGraph" */
 
 /**
  * Sorts the conflicting modules by identifier to keep warning output stable.
@@ -80,54 +78,4 @@ ${modulesList}`);
 	}
 }
 
-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;
+module.exports = CaseSensitiveModulesWarning;

package/lib/errors/ChunkRenderError.js

@@ -7,7 +7,7 @@
 
 const WebpackError = require("./WebpackError");
 
-/** @import Chunk from "../Chunk" */
+/** @import Chunk from "../graph/Chunk" */
 
 class ChunkRenderError extends WebpackError {
 	/**

package/lib/errors/CodeGenerationError.js

@@ -7,7 +7,7 @@
 
 const WebpackError = require("./WebpackError");
 
-/** @import Module from "../Module" */
+/** @import Module from "../module/Module" */
 
 class CodeGenerationError extends WebpackError {
 	/**

package/lib/errors/CommentCompilationWarning.js

@@ -8,7 +8,7 @@
 const makeSerializable = require("../util/makeSerializable");
 const WebpackError = require("./WebpackError");
 
-/** @import { DependencyLocation } from "../Dependency" */
+/** @import { DependencyLocation } from "../graph/Dependency" */
 
 /**
  * Warning used for comment-related compilation issues, such as malformed magic

package/lib/errors/ConflictingEntryExportsWarning.js

@@ -0,0 +1,38 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Alexander Akait @alexander-akait
+*/
+
+"use strict";
+
+const WebpackError = require("./WebpackError");
+
+/** @import Chunk from "../graph/Chunk" */
+
+/**
+ * Warning raised when several modules of an `entryExports: "all"` entry bind the same
+ * export name, which leaves the name out of the merged exports.
+ */
+class ConflictingEntryExportsWarning extends WebpackError {
+	/**
+	 * Captures the entry's chunk and the names it cannot expose.
+	 * @param {Chunk} chunk the chunk carrying the entry
+	 * @param {string[]} names the conflicting export names
+	 */
+	constructor(chunk, names) {
+		super(
+			`Entry "${chunk.name || chunk.id}" contains conflicting exports for the ${
+				names.length === 1 ? "name" : "names"
+			} ${names.map((name) => `'${name}'`).join(", ")}, so ${
+				names.length === 1 ? "it is" : "they are"
+			} not exposed by the merged exports.`
+		);
+
+		/** @type {string} */
+		this.name = "ConflictingEntryExportsWarning";
+		/** @type {Chunk} */
+		this.chunk = chunk;
+	}
+}
+
+module.exports = ConflictingEntryExportsWarning;

package/lib/{dependencies → errors}/CriticalDependencyWarning.js

@@ -23,9 +23,10 @@ class CriticalDependencyWarning extends WebpackError {
 	}
 }
 
-makeSerializable(
-	CriticalDependencyWarning,
+makeSerializable(CriticalDependencyWarning, [
+	"webpack/lib/errors/CriticalDependencyWarning",
+	// TODO in the next major release: remove, they restore pre-move cache packs
 	"webpack/lib/dependencies/CriticalDependencyWarning"
-);
+]);
 
 module.exports = CriticalDependencyWarning;

package/lib/errors/DeprecatedOptionWarning.js

@@ -0,0 +1,30 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Florent Cailhol @ooflorent
+*/
+
+"use strict";
+
+const WebpackError = require("./WebpackError");
+
+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 = DeprecatedOptionWarning;