webpack 5.106.2 → 5.107.1

package/README.md

@@ -302,12 +302,12 @@ For information about the governance of the webpack project, see [GOVERNANCE.md]
 
 - [alexander-akait](https://github.com/alexander-akait) -
   **Alexander Akait** <<sheo13666q@gmail.com>> (he/him)
+- [avivkeller](https://github.com/avivkeller) -
+  **Aviv Keller** <<me@aviv.sh>> (he/him)
 - [evenstensberg](https://github.com/evenstensberg) -
   **Even Stensberg** <<evenstensberg@gmail.com>> (he/him)
 - [ovflowd](https://github.com/ovflowd) -
   **Claudio Wunder** <<cwunder@gnome.org>> (he/they)
-- [snitin315](https://github.com/snitin315) -
-  **Nitin Kumar** <<snitin315@gmail.com>> (he/him)
 - [thelarkinn](https://github.com/thelarkinn) -
   **Sean Larkin** <<selarkin@microsoft.com>> (he/him)
 

package/lib/APIPlugin.js

@@ -14,10 +14,10 @@ const {
 	JAVASCRIPT_MODULE_TYPE_ESM
 } = require("./ModuleTypeConstants");
 const RuntimeGlobals = require("./RuntimeGlobals");
-const WebpackError = require("./WebpackError");
 const ConstDependency = require("./dependencies/ConstDependency");
 const ModuleInitFragmentDependency = require("./dependencies/ModuleInitFragmentDependency");
 const RuntimeRequirementsDependency = require("./dependencies/RuntimeRequirementsDependency");
+const WebpackError = require("./errors/WebpackError");
 const BasicEvaluatedExpression = require("./javascript/BasicEvaluatedExpression");
 const JavascriptModulesPlugin = require("./javascript/JavascriptModulesPlugin");
 const {

package/lib/BannerPlugin.js

@@ -13,10 +13,9 @@ const Template = require("./Template");
 /** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("../declarations/plugins/BannerPlugin").BannerPluginArgument} BannerPluginArgument */
 /** @typedef {import("../declarations/plugins/BannerPlugin").BannerPluginOptions} BannerPluginOptions */
-/** @typedef {import("./Compilation").PathData} PathData */
+/** @typedef {import("./Compilation").PathDataChunk} PathDataChunk */
 /** @typedef {import("./Compiler")} Compiler */
 /** @typedef {import("./Chunk")} Chunk */
-/** @typedef {import("./TemplatedPathPlugin").TemplatePath} TemplatePath */
 
 /** @typedef {(data: { hash?: string, chunk: Chunk, filename: string }) => string} BannerFunction */
 
@@ -117,11 +116,11 @@ class BannerPlugin {
 							continue;
 						}
 
-						/** @type {PathData} */
+						/** @type {PathDataChunk} */
 						const data = { chunk, filename: file };
 
 						const comment = compilation.getPath(
-							/** @type {TemplatePath} */
+							/** @type {string | import("./TemplatedPathPlugin").TemplatePathFn<PathDataChunk>} */
 							(banner),
 							data
 						);

package/lib/Cache.js

@@ -9,9 +9,7 @@ const { AsyncParallelHook, AsyncSeriesBailHook, SyncHook } = require("tapable");
 const {
 	makeWebpackError,
 	makeWebpackErrorCallback
-} = require("./HookWebpackError");
-
-/** @typedef {import("./WebpackError")} WebpackError */
+} = require("./errors/HookWebpackError");
 
 /**
  * Cache validation token whose string representation identifies the build
@@ -21,11 +19,10 @@ const {
  */
 
 /**
- * Completion callback used by cache operations that either fail with a
- * `WebpackError` or resolve with a typed result.
+ * Completion callback used by cache operations that either fail with a `Error` or resolve with a typed result.
  * @template T
  * @callback CallbackCache
- * @param {WebpackError | null} err
+ * @param {Error | null} err
  * @param {T=} result
  * @returns {void}
  */

package/lib/Chunk.js

@@ -26,7 +26,9 @@ const { mergeRuntime } = require("./util/runtime");
 /** @typedef {import("./ChunkGroup").ChunkGroupOptions} ChunkGroupOptions */
 /** @typedef {import("./Entrypoint").EntryOptions} EntryOptions */
 /** @typedef {import("./Module")} Module */
-/** @typedef {import("./TemplatedPathPlugin").TemplatePath} TemplatePath */
+/** @typedef {import("./Compilation").PathDataChunk} PathDataChunk */
+/** @typedef {import("./TemplatedPathPlugin").TemplatePathFn<PathDataChunk>} ChunkFilenameTemplateFn */
+/** @typedef {string | ChunkFilenameTemplateFn} ChunkFilenameTemplate */
 /** @typedef {import("./util/Hash")} Hash */
 /** @typedef {import("./util/runtime").RuntimeSpec} RuntimeSpec */
 
@@ -98,9 +100,9 @@ class Chunk {
 		this.idNameHints = new SortableSet();
 		/** @type {boolean} */
 		this.preventIntegration = false;
-		/** @type {TemplatePath | undefined} */
+		/** @type {ChunkFilenameTemplate | undefined} */
 		this.filenameTemplate = undefined;
-		/** @type {TemplatePath | undefined} */
+		/** @type {ChunkFilenameTemplate | undefined} */
 		this.cssFilenameTemplate = undefined;
 		/**
 		 * @private
@@ -792,26 +794,21 @@ class Chunk {
 		for (const group of this.groupsIterable) {
 			if (group.chunks[group.chunks.length - 1] === this) {
 				for (const childGroup of group.childrenIterable) {
-					for (const key of Object.keys(childGroup.options)) {
-						if (key.endsWith("Order")) {
-							const name = key.slice(0, key.length - "Order".length);
-							let list = lists.get(name);
-							if (list === undefined) {
-								list = [];
-								lists.set(name, list);
-							}
-							list.push({
-								order:
-									/** @type {number} */
-									(
-										childGroup.options[
-											/** @type {keyof ChunkGroupOptions} */
-											(key)
-										]
-									),
-								group: childGroup
-							});
+					const edgeOptions = group.getChildOrderOptions(
+						childGroup,
+						chunkGraph
+					);
+					for (const key of Object.keys(edgeOptions)) {
+						const name = key.slice(0, key.length - "Order".length);
+						let list = lists.get(name);
+						if (list === undefined) {
+							list = [];
+							lists.set(name, list);
 						}
+						list.push({
+							order: edgeOptions[key],
+							group: childGroup
+						});
 					}
 				}
 			}
@@ -850,9 +847,8 @@ class Chunk {
 		const list = [];
 		for (const group of this.groupsIterable) {
 			for (const childGroup of group.childrenIterable) {
-				const order =
-					/** @type {number} */
-					(childGroup.options[/** @type {keyof ChunkGroupOptions} */ (type)]);
+				const edgeOptions = group.getChildOrderOptions(childGroup, chunkGraph);
+				const order = edgeOptions[type];
 				if (order === undefined) continue;
 				list.push({
 					order,

package/lib/ChunkGroup.js

@@ -544,6 +544,53 @@ class ChunkGroup {
 		);
 	}
 
+	/**
+	 * Aggregates per-block `*Order` options for the blocks that bridge this
+	 * chunk group to the given child chunk group. `*Order` options are tied to
+	 * the originating `import()` call and must not be sourced from the child's
+	 * shared options, otherwise a webpackPrefetch/Preload directive from one
+	 * parent would leak into other parents that share the child by name.
+	 * @param {ChunkGroup} childGroup the child chunk group
+	 * @param {ChunkGraph} chunkGraph the chunk graph
+	 * @returns {Record<string, number>} merged `*Order` options for the edge from this group to `childGroup`
+	 */
+	getChildOrderOptions(childGroup, chunkGraph) {
+		/** @type {Record<string, number>} */
+		const result = Object.create(null);
+		let bridged = false;
+		for (const block of childGroup.blocksIterable) {
+			const rootModule = /** @type {Module} */ (block.getRootBlock());
+			if (!chunkGraph.isModuleInChunkGroup(rootModule, this)) continue;
+			bridged = true;
+			const opts = block.groupOptions;
+			if (!opts) continue;
+			for (const key of Object.keys(opts)) {
+				if (!key.endsWith("Order")) continue;
+				const value =
+					/** @type {number} */
+					(opts[/** @type {keyof ChunkGroupOptions} */ (key)]);
+				if (typeof value !== "number") continue;
+				if (result[key] === undefined || value > result[key]) {
+					result[key] = value;
+				}
+			}
+		}
+		// Fall back to the child's own options only when no block bridges
+		// this edge (e.g. a chunk group created by APIs that don't go through
+		// an AsyncDependenciesBlock). Otherwise we'd reintroduce the leak.
+		if (!bridged) {
+			for (const key of Object.keys(childGroup.options)) {
+				if (!key.endsWith("Order")) continue;
+				const value =
+					childGroup.options[/** @type {keyof ChunkGroupOptions} */ (key)];
+				if (typeof value === "number") {
+					result[key] = value;
+				}
+			}
+		}
+		return result;
+	}
+
 	/**
 	 * Groups child chunk groups by their `*Order` options and sorts each group
 	 * by descending order and deterministic chunk-group comparison.
@@ -555,22 +602,17 @@ class ChunkGroup {
 		/** @type {Map<string, { order: number, group: ChunkGroup }[]>} */
 		const lists = new Map();
 		for (const childGroup of this._children) {
-			for (const key of Object.keys(childGroup.options)) {
-				if (key.endsWith("Order")) {
-					const name = key.slice(0, key.length - "Order".length);
-					let list = lists.get(name);
-					if (list === undefined) {
-						lists.set(name, (list = []));
-					}
-					list.push({
-						order:
-							/** @type {number} */
-							(
-								childGroup.options[/** @type {keyof ChunkGroupOptions} */ (key)]
-							),
-						group: childGroup
-					});
+			const edgeOptions = this.getChildOrderOptions(childGroup, chunkGraph);
+			for (const key of Object.keys(edgeOptions)) {
+				const name = key.slice(0, key.length - "Order".length);
+				let list = lists.get(name);
+				if (list === undefined) {
+					lists.set(name, (list = []));
 				}
+				list.push({
+					order: edgeOptions[key],
+					group: childGroup
+				});
 			}
 		}
 		/** @type {Record<string, ChunkGroup[]>} */

package/lib/CompatibilityPlugin.js

@@ -186,13 +186,14 @@ class CompatibilityPlugin {
 							(declarator.id.name === RuntimeGlobals.exports ||
 								declarator.id.name === RuntimeGlobals.require)
 						) {
-							const { name, declaration } =
-								/** @type {CompatibilitySettings} */ (
-									parser.getTagData(
-										declarator.id.name,
-										nestedWebpackIdentifierTag
-									)
-								);
+							const tagData = /** @type {CompatibilitySettings | undefined} */ (
+								parser.getTagData(
+									declarator.id.name,
+									nestedWebpackIdentifierTag
+								)
+							);
+							if (!tagData) return;
+							const { name, declaration } = tagData;
 							if (!declaration.updated) {
 								const dep = new ConstDependency(name, declaration.range);
 								dep.loc = declaration.loc;

package/lib/Compilation.js

@@ -21,42 +21,37 @@ const { MultiItemCache } = require("./CacheFacade");
 const Chunk = require("./Chunk");
 const ChunkGraph = require("./ChunkGraph");
 const ChunkGroup = require("./ChunkGroup");
-const ChunkRenderError = require("./ChunkRenderError");
 const ChunkTemplate = require("./ChunkTemplate");
-const CodeGenerationError = require("./CodeGenerationError");
 const CodeGenerationResults = require("./CodeGenerationResults");
 const Dependency = require("./Dependency");
 const DependencyTemplates = require("./DependencyTemplates");
 const Entrypoint = require("./Entrypoint");
 const ErrorHelpers = require("./ErrorHelpers");
 const FileSystemInfo = require("./FileSystemInfo");
-const {
-	connectChunkGroupAndChunk,
-	connectChunkGroupParentAndChild,
-	connectEntrypointAndDependOn
-} = require("./GraphHelpers");
-const {
-	makeWebpackError,
-	tryRunOrWebpackError
-} = require("./HookWebpackError");
 const MainTemplate = require("./MainTemplate");
 const Module = require("./Module");
-const ModuleDependencyError = require("./ModuleDependencyError");
-const ModuleDependencyWarning = require("./ModuleDependencyWarning");
 const ModuleGraph = require("./ModuleGraph");
-const ModuleHashingError = require("./ModuleHashingError");
-const ModuleNotFoundError = require("./ModuleNotFoundError");
 const ModuleProfile = require("./ModuleProfile");
-const ModuleRestoreError = require("./ModuleRestoreError");
-const ModuleStoreError = require("./ModuleStoreError");
 const ModuleTemplate = require("./ModuleTemplate");
 const { WEBPACK_MODULE_TYPE_RUNTIME } = require("./ModuleTypeConstants");
 const RuntimeGlobals = require("./RuntimeGlobals");
 const RuntimeTemplate = require("./RuntimeTemplate");
 const Stats = require("./Stats");
-const WebpackError = require("./WebpackError");
 const buildChunkGraph = require("./buildChunkGraph");
 const BuildCycleError = require("./errors/BuildCycleError");
+const ChunkRenderError = require("./errors/ChunkRenderError");
+const CodeGenerationError = require("./errors/CodeGenerationError");
+const {
+	makeWebpackError,
+	tryRunOrWebpackError
+} = require("./errors/HookWebpackError");
+const ModuleDependencyError = require("./errors/ModuleDependencyError");
+const ModuleDependencyWarning = require("./errors/ModuleDependencyWarning");
+const ModuleHashingError = require("./errors/ModuleHashingError");
+const ModuleNotFoundError = require("./errors/ModuleNotFoundError");
+const ModuleRestoreError = require("./errors/ModuleRestoreError");
+const ModuleStoreError = require("./errors/ModuleStoreError");
+const WebpackError = require("./errors/WebpackError");
 const { LogType, Logger } = require("./logging/Logger");
 const StatsFactory = require("./stats/StatsFactory");
 const StatsPrinter = require("./stats/StatsPrinter");
@@ -377,6 +372,24 @@ const { isSourceEqual } = require("./util/source");
  * @property {PrepareIdFunction=} prepareId
  */
 
+/**
+ * Path data narrowed for the chunk filename / chunk asset interpolation context,
+ * where `chunk` is always provided. Use as the type parameter to `TemplatePathFn`
+ * for callbacks that receive a chunk context (for example `output.filename`,
+ * `output.chunkFilename`, `output.cssFilename`, `output.cssChunkFilename`,
+ * `optimization.splitChunks.cacheGroups[*].filename`).
+ * @typedef {PathData & { chunk: Chunk | ChunkPathData }} PathDataChunk
+ */
+
+/**
+ * Path data narrowed for the module asset interpolation context, where `module`
+ * and `chunkGraph` are always provided. Use as the type parameter to
+ * `TemplatePathFn` for callbacks that receive a module context (for example
+ * `output.assetModuleFilename`, the per-module `generator.filename` /
+ * `generator.outputPath`, and `module.parser.css.localIdentName`).
+ * @typedef {PathData & { module: Module | ModulePathData, chunkGraph: ChunkGraph }} PathDataModule
+ */
+
 /** @typedef {"module" | "chunk" | "root-of-chunk" | "nested"} ExcludeModulesType */
 
 /**
@@ -3214,7 +3227,7 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
 				let hasProblems = this.reportDependencyErrorsAndWarnings(module, [
 					module
 				]);
-				const errors = module.getErrors();
+				const errors = /** @type {WebpackError[]} */ (module.getErrors());
 				if (errors !== undefined) {
 					for (const error of errors) {
 						if (!error.module) {
@@ -3224,7 +3237,7 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
 						hasProblems = true;
 					}
 				}
-				const warnings = module.getWarnings();
+				const warnings = /** @type {WebpackError[]} */ (module.getWarnings());
 				if (warnings !== undefined) {
 					for (const warning of warnings) {
 						if (!warning.module) {
@@ -3312,7 +3325,10 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
 			this.namedChunkGroups.set(name, entrypoint);
 			this.entrypoints.set(name, entrypoint);
 			this.chunkGroups.push(entrypoint);
-			connectChunkGroupAndChunk(entrypoint, chunk);
+
+			if (entrypoint.pushChunk(chunk)) {
+				chunk.addGroup(entrypoint);
+			}
 
 			/** @type {Set<Module>} */
 			const entryModules = new Set();
@@ -3403,8 +3419,12 @@ Remove the 'runtime' option from the entrypoint.`);
 						entry.setRuntimeChunk(entryChunk);
 						continue outer;
 					}
-					connectEntrypointAndDependOn(entry, dependency);
-					connectChunkGroupParentAndChild(dependency, entry);
+
+					entry.addDependOn(dependency);
+
+					if (dependency.addChild(entry)) {
+						entry.addParent(dependency);
+					}
 				}
 			} else if (runtime) {
 				const entry = /** @type {Entrypoint} */ (this.entrypoints.get(name));
@@ -4156,7 +4176,9 @@ Or do you want to use the entrypoints '${name}' and '${runtime}' independently o
 		}
 		const chunk = this.addChunk(name);
 
-		connectChunkGroupAndChunk(chunkGroup, chunk);
+		if (chunkGroup.pushChunk(chunk)) {
+			chunk.addGroup(chunkGroup);
+		}
 
 		this.chunkGroups.push(chunkGroup);
 		if (name) {
@@ -4200,7 +4222,9 @@ Or do you want to use the entrypoints '${name}' and '${runtime}' independently o
 		}
 		this.chunkGroups.push(entrypoint);
 		this.asyncEntrypoints.push(entrypoint);
-		connectChunkGroupAndChunk(entrypoint, chunk);
+		if (entrypoint.pushChunk(chunk)) {
+			chunk.addGroup(entrypoint);
+		}
 		if (module) {
 			entrypoint.addOrigin(module, loc, request);
 		}
@@ -5233,7 +5257,7 @@ This prevents using hashes of each other and should be avoided.`);
 						);
 
 						assetCacheItem.get((err, sourceFromCache) => {
-							/** @type {TemplatePath} */
+							/** @type {string | import("./TemplatedPathPlugin").TemplatePathFn<EXPECTED_ANY>} */
 							let filenameTemplate;
 							/** @type {string} */
 							let file;
@@ -5351,11 +5375,12 @@ This prevents using hashes of each other and should be avoided.`);
 
 	/**
 	 * Returns interpolated path.
-	 * @param {TemplatePath} filename used to get asset path with hash
-	 * @param {PathData} data context data
+	 * @template {PathData} [T=PathData]
+	 * @param {string | import("./TemplatedPathPlugin").TemplatePathFn<T>} filename used to get asset path with hash
+	 * @param {T=} data context data
 	 * @returns {string} interpolated path
 	 */
-	getPath(filename, data = {}) {
+	getPath(filename, data = /** @type {T} */ ({})) {
 		if (!data.hash) {
 			data = {
 				hash: this.hash,
@@ -5367,11 +5392,12 @@ This prevents using hashes of each other and should be avoided.`);
 
 	/**
 	 * Gets path with info.
-	 * @param {TemplatePath} filename used to get asset path with hash
-	 * @param {PathData} data context data
+	 * @template {PathData} [T=PathData]
+	 * @param {string | import("./TemplatedPathPlugin").TemplatePathFn<T>} filename used to get asset path with hash
+	 * @param {T=} data context data
 	 * @returns {InterpolatedPathAndAssetInfo} interpolated path and asset info
 	 */
-	getPathWithInfo(filename, data = {}) {
+	getPathWithInfo(filename, data = /** @type {T} */ ({})) {
 		if (!data.hash) {
 			data = {
 				hash: this.hash,
@@ -5383,8 +5409,9 @@ This prevents using hashes of each other and should be avoided.`);
 
 	/**
 	 * Returns interpolated path.
-	 * @param {TemplatePath} filename used to get asset path with hash
-	 * @param {PathData} data context data
+	 * @template {PathData} [T=PathData]
+	 * @param {string | import("./TemplatedPathPlugin").TemplatePathFn<T>} filename used to get asset path with hash
+	 * @param {T} data context data
 	 * @returns {string} interpolated path
 	 */
 	getAssetPath(filename, data) {
@@ -5397,8 +5424,9 @@ This prevents using hashes of each other and should be avoided.`);
 
 	/**
 	 * Gets asset path with info.
-	 * @param {TemplatePath} filename used to get asset path with hash
-	 * @param {PathData} data context data
+	 * @template {PathData} [T=PathData]
+	 * @param {string | import("./TemplatedPathPlugin").TemplatePathFn<T>} filename used to get asset path with hash
+	 * @param {T} data context data
 	 * @returns {InterpolatedPathAndAssetInfo} interpolated path and asset info
 	 */
 	getAssetPathWithInfo(filename, data) {
@@ -5493,7 +5521,9 @@ This prevents using hashes of each other and should be avoided.`);
 					...options.entryOptions
 				});
 				chunkGraph.connectChunkAndEntryModule(chunk, module, entrypoint);
-				connectChunkGroupAndChunk(entrypoint, chunk);
+				if (entrypoint.pushChunk(chunk)) {
+					chunk.addGroup(entrypoint);
+				}
 				entrypoint.setRuntimeChunk(chunk);
 				entrypoint.setEntrypointChunk(chunk);
 

package/lib/Compiler.js

@@ -17,7 +17,6 @@ const Cache = require("./Cache");
 const CacheFacade = require("./CacheFacade");
 const ChunkGraph = require("./ChunkGraph");
 const Compilation = require("./Compilation");
-const ConcurrentCompilationError = require("./ConcurrentCompilationError");
 const ContextModuleFactory = require("./ContextModuleFactory");
 const ModuleGraph = require("./ModuleGraph");
 const NormalModuleFactory = require("./NormalModuleFactory");
@@ -25,7 +24,8 @@ const RequestShortener = require("./RequestShortener");
 const ResolverFactory = require("./ResolverFactory");
 const Stats = require("./Stats");
 const Watching = require("./Watching");
-const WebpackError = require("./WebpackError");
+const ConcurrentCompilationError = require("./errors/ConcurrentCompilationError");
+const WebpackError = require("./errors/WebpackError");
 const { Logger } = require("./logging/Logger");
 const { dirname, join, mkdirp } = require("./util/fs");
 const { makePathsRelative } = require("./util/identifier");
@@ -1477,12 +1477,7 @@ ${other}`);
 		// // If we have precompiled schema let's use it
 		if (check) {
 			if (!check(value)) {
-				getValidate()(
-					getSchema(),
-					/** @type {EXPECTED_OBJECT | EXPECTED_OBJECT[]} */
-					(value),
-					options
-				);
+				getValidate()(getSchema(), value, options);
 				require("util").deprecate(
 					() => {},
 					"webpack bug: Pre-compiled schema reports error while real schema is happy. This has performance drawbacks.",
@@ -1493,11 +1488,7 @@ ${other}`);
 		}
 
 		// Otherwise let's standard validation
-		getValidate()(
-			getSchema(),
-			/** @type {EXPECTED_OBJECT | EXPECTED_OBJECT[]} */ (value),
-			options
-		);
+		getValidate()(getSchema(), value, options);
 	}
 }
 

package/lib/ContextModule.js

@@ -7,7 +7,6 @@
 
 const { OriginalSource, RawSource } = require("webpack-sources");
 const AsyncDependenciesBlock = require("./AsyncDependenciesBlock");
-const { makeWebpackError } = require("./HookWebpackError");
 const Module = require("./Module");
 const {
 	JAVASCRIPT_TYPE,
@@ -16,11 +15,12 @@ const {
 const { JAVASCRIPT_MODULE_TYPE_DYNAMIC } = require("./ModuleTypeConstants");
 const RuntimeGlobals = require("./RuntimeGlobals");
 const Template = require("./Template");
-const WebpackError = require("./WebpackError");
 const {
 	getOutgoingAsyncModules
 } = require("./async-modules/AsyncModuleHelpers");
 const { ImportPhase, ImportPhaseUtils } = require("./dependencies/ImportPhase");
+const { makeWebpackError } = require("./errors/HookWebpackError");
+const WebpackError = require("./errors/WebpackError");
 const {
 	compareLocations,
 	compareModulesById,

package/lib/DefinePlugin.js

@@ -12,8 +12,8 @@ const {
 	JAVASCRIPT_MODULE_TYPE_ESM
 } = require("./ModuleTypeConstants");
 const RuntimeGlobals = require("./RuntimeGlobals");
-const WebpackError = require("./WebpackError");
 const ConstDependency = require("./dependencies/ConstDependency");
+const WebpackError = require("./errors/WebpackError");
 const BasicEvaluatedExpression = require("./javascript/BasicEvaluatedExpression");
 const { VariableInfo } = require("./javascript/JavascriptParser");
 const {
@@ -319,7 +319,7 @@ const toCacheVersion = (code) => {
 		const items = Object.keys(code).map((key) => ({
 			key,
 			value: toCacheVersion(
-				/** @type {Record<string, EXPECTED_ANY>} */
+				/** @type {Record<string, CodeValue>} */
 				(code)[key]
 			)
 		}));

package/lib/Dependency.js

@@ -14,7 +14,7 @@ const memoize = require("./util/memoize");
 /** @typedef {import("./ModuleGraphConnection")} ModuleGraphConnection */
 /** @typedef {import("./ModuleGraphConnection").ConnectionState} ConnectionState */
 /** @typedef {import("./RuntimeTemplate")} RuntimeTemplate */
-/** @typedef {import("./WebpackError")} WebpackError */
+/** @typedef {import("./errors/WebpackError")} WebpackError */
 /** @typedef {import("./serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("./serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 /** @typedef {import("./util/Hash")} Hash */
@@ -325,6 +325,14 @@ class Dependency {
 		return getIgnoredModule();
 	}
 
+	/**
+	 * Returns true if this dependency can be concatenated
+	 * @returns {boolean} true if this dependency can be concatenated
+	 */
+	canConcatenate() {
+		return false;
+	}
+
 	/**
 	 * Serializes this instance into the provided serializer context.
 	 * @param {ObjectSerializerContext} context context
@@ -394,6 +402,19 @@ Object.defineProperty(Dependency.prototype, "module", {
 Dependency.isLowPriorityDependency = (dependency) =>
 	/** @type {ModuleDependency} */ (dependency).sourceOrder === Infinity;
 
+// TODO in webpack 6, call canConcatenate() directly on the dependency instance instead of using this static method.
+/**
+ * Returns true if the dependency can be concatenated (scope hoisting).
+ * @param {Dependency} dependency dep
+ * @returns {boolean} true if this dependency supports concatenation
+ */
+Dependency.canConcatenate = (dependency) => {
+	if (typeof dependency.canConcatenate === "function") {
+		return dependency.canConcatenate();
+	}
+	return false;
+};
+
 // TODO remove in webpack 6
 Object.defineProperty(Dependency.prototype, "disconnect", {
 	/**

package/lib/DependencyTemplate.js

@@ -52,6 +52,7 @@
  * @typedef {object} CssData
  * @property {boolean} esModule whether export __esModule
  * @property {Map<string, string>} exports the css exports
+ * @property {Map<string, { line: number, column: number }>=} exportLocs source position (line is 1-based, column is 0-based) of each export's defining identifier in the original CSS, used to emit fine-grained JS-to-CSS source mappings
  */
 
 /** @typedef {DependencyTemplateContext & CssDependencyTemplateContextExtras} CssDependencyTemplateContext */
@@ -67,7 +68,7 @@ class DependencyTemplate {
 	 * @returns {void}
 	 */
 	apply(dependency, source, templateContext) {
-		const AbstractMethodError = require("./AbstractMethodError");
+		const AbstractMethodError = require("./errors/AbstractMethodError");
 
 		throw new AbstractMethodError();
 	}

package/lib/EnvironmentPlugin.js

@@ -6,7 +6,7 @@
 "use strict";
 
 const DefinePlugin = require("./DefinePlugin");
-const WebpackError = require("./WebpackError");
+const WebpackError = require("./errors/WebpackError");
 
 /** @typedef {import("./Compiler")} Compiler */
 /** @typedef {import("./DefinePlugin").CodeValue} CodeValue */