webpack 5.107.0 → 5.107.1

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/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/Compilation.js

@@ -372,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 */
 
 /**
@@ -5239,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;
@@ -5357,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,
@@ -5373,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,
@@ -5389,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) {
@@ -5403,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) {

package/lib/EvalSourceMapDevToolPlugin.js

@@ -23,7 +23,6 @@ const { makePathsAbsolute } = require("./util/identifier");
 /** @typedef {import("../declarations/plugins/SourceMapDevToolPlugin").Rules} Rules */
 /** @typedef {import("./Compiler")} Compiler */
 /** @typedef {import("./ChunkGraph").ModuleId} ModuleId */
-/** @typedef {import("./TemplatedPathPlugin").TemplatePath} TemplatePath */
 
 /** @type {WeakMap<Source, Source>} */
 const cache = new WeakMap();

package/lib/ExportsInfo.js

@@ -114,6 +114,21 @@ class ExportsInfo {
 	constructor() {
 		/** @type {Exports} */
 		this._exports = new Map();
+
+		// `_otherExportsInfo` is a fallback entry for unlisted exports. Two roles:
+		// 1. factory template — `getExportInfo` creates `new ExportInfo(name, this)`,
+		//    so created export info extends its properties.
+		// 2. flags whether the whole exportsInfo can be statically analyzed.
+		// Its `used` reachable values:
+		// 	- NoInfo: no use analysis yet (`optimization#usedExports` off), or used without info
+		// 	- Unused: analyzed, no unlisted export needed
+		// 	- Unknown: used in unknown way
+		// 	- Used/OnlyPropertiesUsed: never reached
+		// Its `provided` reachable values:
+		// 	- undefined: provision not determined yet
+		// 	- false: determined, no unlisted export is provided
+		// 	- null: only runtime knows (dynamic/unknown exports)
+		// 	- true: never reached
 		/** @type {ExportInfo} */
 		this._otherExportsInfo = new ExportInfo(null);
 		/** @type {ExportInfo} */
@@ -239,22 +254,12 @@ class ExportsInfo {
 
 	setHasProvideInfo() {
 		for (const exportInfo of this._exports.values()) {
-			if (exportInfo.provided === undefined) {
-				exportInfo.provided = false;
-			}
-			if (exportInfo.canMangleProvide === undefined) {
-				exportInfo.canMangleProvide = true;
-			}
+			exportInfo.setHasProvideInfo();
 		}
 		if (this._redirectTo !== undefined) {
 			this._redirectTo.setHasProvideInfo();
 		} else {
-			if (this._otherExportsInfo.provided === undefined) {
-				this._otherExportsInfo.provided = false;
-			}
-			if (this._otherExportsInfo.canMangleProvide === undefined) {
-				this._otherExportsInfo.canMangleProvide = true;
-			}
+			this._otherExportsInfo.setHasProvideInfo();
 		}
 	}
 
@@ -436,20 +441,8 @@ class ExportsInfo {
 			if (this._redirectTo.setUsedInUnknownWay(runtime)) {
 				changed = true;
 			}
-		} else {
-			if (
-				this._otherExportsInfo.setUsedConditionally(
-					(used) => used < UsageState.Unknown,
-					UsageState.Unknown,
-					runtime
-				)
-			) {
-				changed = true;
-			}
-			if (this._otherExportsInfo.canMangleUse !== false) {
-				this._otherExportsInfo.canMangleUse = false;
-				changed = true;
-			}
+		} else if (this._otherExportsInfo.setUsedInUnknownWay(runtime)) {
+			changed = true;
 		}
 		return changed;
 	}
@@ -470,14 +463,8 @@ class ExportsInfo {
 			if (this._redirectTo.setUsedWithoutInfo(runtime)) {
 				changed = true;
 			}
-		} else {
-			if (this._otherExportsInfo.setUsed(UsageState.NoInfo, runtime)) {
-				changed = true;
-			}
-			if (this._otherExportsInfo.canMangleUse !== false) {
-				this._otherExportsInfo.canMangleUse = false;
-				changed = true;
-			}
+		} else if (this._otherExportsInfo.setUsedWithoutInfo(runtime)) {
+			changed = true;
 		}
 		return changed;
 	}
@@ -1030,6 +1017,15 @@ class ExportInfo {
 		return changed;
 	}
 
+	setHasProvideInfo() {
+		if (this.provided === undefined) {
+			this.provided = false;
+		}
+		if (this.canMangleProvide === undefined) {
+			this.canMangleProvide = true;
+		}
+	}
+
 	setHasUseInfo() {
 		if (!this._hasUseInRuntimeInfo) {
 			this._hasUseInRuntimeInfo = true;

package/lib/ExternalModule.js

@@ -12,8 +12,9 @@ const { UsageState } = require("./ExportsInfo");
 const InitFragment = require("./InitFragment");
 const Module = require("./Module");
 const {
+	ASSET_URL_TYPE,
+	ASSET_URL_TYPES,
 	CSS_IMPORT_TYPES,
-	CSS_URL_TYPES,
 	JAVASCRIPT_TYPE,
 	JAVASCRIPT_TYPES
 } = require("./ModuleSourceTypeConstants");
@@ -72,7 +73,7 @@ const { register } = require("./util/serialization");
 
 /** @typedef {{ attributes?: ImportAttributes, phase?: ImportPhaseType, externalType: "import" | "module" | undefined }} ImportDependencyMeta */
 /** @typedef {{ layer?: string, supports?: string, media?: string }} CssImportDependencyMeta */
-/** @typedef {{ sourceType: "css-url" }} AssetDependencyMeta */
+/** @typedef {{ sourceType: "asset-url" | "css-url" }} AssetDependencyMeta */
 
 /** @typedef {ImportDependencyMeta | CssImportDependencyMeta | AssetDependencyMeta} DependencyMeta */
 
@@ -736,13 +737,14 @@ class ExternalModule extends Module {
 	 * @returns {SourceTypes} types available (do not mutate)
 	 */
 	getSourceTypes() {
-		if (
-			this.externalType === "asset" &&
-			this.dependencyMeta &&
-			/** @type {AssetDependencyMeta} */
-			(this.dependencyMeta).sourceType === "css-url"
-		) {
-			return CSS_URL_TYPES;
+		if (this.externalType === "asset" && this.dependencyMeta) {
+			const sourceType =
+				/** @type {AssetDependencyMeta} */
+				(this.dependencyMeta).sourceType;
+			// TODO webpack 6 drop "css-url" once the alias is removed
+			if (sourceType === ASSET_URL_TYPE || sourceType === "css-url") {
+				return ASSET_URL_TYPES;
+			}
 		} else if (this.externalType === "css-import") {
 			return CSS_IMPORT_TYPES;
 		}
@@ -1113,12 +1115,14 @@ class ExternalModule extends Module {
 				data.set("url", { javascript: /** @type {string} */ (request) });
 				return { sources, runtimeRequirements: RUNTIME_REQUIREMENTS, data };
 			}
-			case "css-url": {
+			// TODO webpack 6 remove "css-url" alias
+			case "css-url":
+			case "asset-url": {
 				/** @type {Sources} */
 				const sources = new Map();
 				/** @type {CodeGenerationResultData} */
 				const data = new Map();
-				data.set("url", { "css-url": /** @type {string} */ (request) });
+				data.set("url", { [ASSET_URL_TYPE]: /** @type {string} */ (request) });
 				return { sources, runtimeRequirements: RUNTIME_REQUIREMENTS, data };
 			}
 			case "css-import": {

package/lib/ExternalModuleFactoryPlugin.js

@@ -7,6 +7,7 @@
 
 const util = require("util");
 const ExternalModule = require("./ExternalModule");
+const { ASSET_URL_TYPE } = require("./ModuleSourceTypeConstants");
 const ContextElementDependency = require("./dependencies/ContextElementDependency");
 const CssImportDependency = require("./dependencies/CssImportDependency");
 const CssUrlDependency = require("./dependencies/CssUrlDependency");
@@ -212,7 +213,7 @@ class ExternalModuleFactoryPlugin {
 						resolvedType === "asset" &&
 						dependency instanceof CssUrlDependency
 					) {
-						dependencyMeta = { sourceType: "css-url" };
+						dependencyMeta = { sourceType: ASSET_URL_TYPE };
 					}
 
 					callback(

package/lib/Module.js

@@ -119,7 +119,7 @@ const makeSerializable = require("./util/makeSerializable");
  * @typedef {object} AllCodeGenerationSchemas
  * @property {Set<string>} topLevelDeclarations top level declarations for javascript modules
  * @property {InitFragment<EXPECTED_ANY>[]} chunkInitFragments chunk init fragments for javascript modules
- * @property {{ javascript?: string, ["css-url"]?: string }} url url for css and javascript modules
+ * @property {{ javascript?: string, ["asset-url"]?: string }} url url for asset modules
  * @property {string} filename a filename for asset modules
  * @property {AssetInfo} assetInfo an asset info for asset modules
  * @property {string} fullContentHash a full content hash for asset modules

package/lib/ModuleNotFoundError.js

@@ -0,0 +1,10 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+
+"use strict";
+
+// TODO remove in webpack 6
+// Some old plugins use `require("webpack/lib/ModuleNotFoundError")`, in webpack@6 developer should migrate to `compiler.webpack.ModuleNotFoundError`
+module.exports = require("./errors/ModuleNotFoundError");

package/lib/ModuleSourceTypeConstants.js

@@ -25,6 +25,11 @@ const WEBASSEMBLY_TYPE = "webassembly";
  */
 const ASSET_TYPE = "asset";
 
+/**
+ * @type {Readonly<"asset-url">}
+ */
+const ASSET_URL_TYPE = "asset-url";
+
 /**
  * @type {Readonly<"css">}
  */
@@ -35,11 +40,6 @@ const CSS_TYPE = "css";
  */
 const CSS_IMPORT_TYPE = "css-import";
 
-/**
- * @type {Readonly<"css-url">}
- */
-const CSS_URL_TYPE = "css-url";
-
 /**
  * @type {Readonly<"css-text">}
  */
@@ -72,7 +72,7 @@ const UNKNOWN_TYPE = "unknown";
 
 /**
  * Defines the all types type used by this module.
- * @typedef {JAVASCRIPT_TYPE | RUNTIME_TYPE | WEBASSEMBLY_TYPE | ASSET_TYPE | CSS_TYPE | CSS_IMPORT_TYPE | CSS_URL_TYPE | CSS_TEXT_TYPE | HTML_TYPE | SHARED_INIT_TYPE | REMOTE_GENERATOR_TYPE | CONSUME_SHARED_GENERATOR_TYPE | UNKNOWN_TYPE} AllTypes
+ * @typedef {JAVASCRIPT_TYPE | RUNTIME_TYPE | WEBASSEMBLY_TYPE | ASSET_TYPE | ASSET_URL_TYPE | CSS_TYPE | CSS_IMPORT_TYPE | CSS_TEXT_TYPE | HTML_TYPE | SHARED_INIT_TYPE | REMOTE_GENERATOR_TYPE | CONSUME_SHARED_GENERATOR_TYPE | UNKNOWN_TYPE} AllTypes
  */
 
 /**
@@ -91,17 +91,17 @@ const ASSET_TYPES = new Set([ASSET_TYPE]);
 const ASSET_AND_JAVASCRIPT_TYPES = new Set([ASSET_TYPE, JAVASCRIPT_TYPE]);
 
 /**
- * @type {ReadonlySet<"css-url" | "asset">}
+ * @type {ReadonlySet<"asset-url" | "asset">}
  */
-const ASSET_AND_CSS_URL_TYPES = new Set([ASSET_TYPE, CSS_URL_TYPE]);
+const ASSET_AND_ASSET_URL_TYPES = new Set([ASSET_TYPE, ASSET_URL_TYPE]);
 
 /**
- * @type {ReadonlySet<"javascript" | "css-url" | "asset">}
+ * @type {ReadonlySet<"javascript" | "asset-url" | "asset">}
  */
-const ASSET_AND_JAVASCRIPT_AND_CSS_URL_TYPES = new Set([
+const ASSET_AND_JAVASCRIPT_AND_ASSET_URL_TYPES = new Set([
 	ASSET_TYPE,
 	JAVASCRIPT_TYPE,
-	CSS_URL_TYPE
+	ASSET_URL_TYPE
 ]);
 
 /**
@@ -110,9 +110,12 @@ const ASSET_AND_JAVASCRIPT_AND_CSS_URL_TYPES = new Set([
 const JAVASCRIPT_TYPES = new Set([JAVASCRIPT_TYPE]);
 
 /**
- * @type {ReadonlySet<"javascript" | "css-url">}
+ * @type {ReadonlySet<"javascript" | "asset-url">}
  */
-const JAVASCRIPT_AND_CSS_URL_TYPES = new Set([JAVASCRIPT_TYPE, CSS_URL_TYPE]);
+const JAVASCRIPT_AND_ASSET_URL_TYPES = new Set([
+	JAVASCRIPT_TYPE,
+	ASSET_URL_TYPE
+]);
 
 /**
  * @type {ReadonlySet<"javascript" | "css">}
@@ -125,9 +128,9 @@ const JAVASCRIPT_AND_CSS_TYPES = new Set([JAVASCRIPT_TYPE, CSS_TYPE]);
 const CSS_TYPES = new Set([CSS_TYPE]);
 
 /**
- * @type {ReadonlySet<"css-url">}
+ * @type {ReadonlySet<"asset-url">}
  */
-const CSS_URL_TYPES = new Set([CSS_URL_TYPE]);
+const ASSET_URL_TYPES = new Set([ASSET_URL_TYPE]);
 
 /**
  * @type {ReadonlySet<"css-text">}
@@ -176,27 +179,26 @@ const CONSUME_SHARED_TYPES = new Set([CONSUME_SHARED_GENERATOR_TYPE]);
  */
 const SHARED_INIT_TYPES = new Set([SHARED_INIT_TYPE]);
 
-module.exports.ASSET_AND_CSS_URL_TYPES = ASSET_AND_CSS_URL_TYPES;
-module.exports.ASSET_AND_JAVASCRIPT_AND_CSS_URL_TYPES =
-	ASSET_AND_JAVASCRIPT_AND_CSS_URL_TYPES;
+module.exports.ASSET_AND_ASSET_URL_TYPES = ASSET_AND_ASSET_URL_TYPES;
+module.exports.ASSET_AND_JAVASCRIPT_AND_ASSET_URL_TYPES =
+	ASSET_AND_JAVASCRIPT_AND_ASSET_URL_TYPES;
 module.exports.ASSET_AND_JAVASCRIPT_TYPES = ASSET_AND_JAVASCRIPT_TYPES;
 module.exports.ASSET_TYPE = ASSET_TYPE;
 module.exports.ASSET_TYPES = ASSET_TYPES;
+module.exports.ASSET_URL_TYPE = ASSET_URL_TYPE;
+module.exports.ASSET_URL_TYPES = ASSET_URL_TYPES;
 module.exports.CONSUME_SHARED_TYPES = CONSUME_SHARED_TYPES;
 module.exports.CSS_IMPORT_TYPE = CSS_IMPORT_TYPE;
 module.exports.CSS_IMPORT_TYPES = CSS_IMPORT_TYPES;
 module.exports.CSS_TEXT_TYPE = CSS_TEXT_TYPE;
 module.exports.CSS_TEXT_TYPES = CSS_TEXT_TYPES;
 module.exports.CSS_TYPE = CSS_TYPE;
-module.exports.CSS_TYPE = CSS_TYPE;
 module.exports.CSS_TYPES = CSS_TYPES;
-module.exports.CSS_URL_TYPE = CSS_URL_TYPE;
-module.exports.CSS_URL_TYPES = CSS_URL_TYPES;
 module.exports.HTML_TYPE = HTML_TYPE;
 module.exports.HTML_TYPES = HTML_TYPES;
+module.exports.JAVASCRIPT_AND_ASSET_URL_TYPES = JAVASCRIPT_AND_ASSET_URL_TYPES;
 module.exports.JAVASCRIPT_AND_CSS_TEXT_TYPES = JAVASCRIPT_AND_CSS_TEXT_TYPES;
 module.exports.JAVASCRIPT_AND_CSS_TYPES = JAVASCRIPT_AND_CSS_TYPES;
-module.exports.JAVASCRIPT_AND_CSS_URL_TYPES = JAVASCRIPT_AND_CSS_URL_TYPES;
 module.exports.JAVASCRIPT_TYPE = JAVASCRIPT_TYPE;
 module.exports.JAVASCRIPT_TYPES = JAVASCRIPT_TYPES;
 module.exports.NO_TYPES = NO_TYPES;