webpack 5.112.0 → 5.112.1

package/lib/css/CssModulesPlugin.js

@@ -567,7 +567,7 @@ class CssModulesPlugin {
 							return new CssModule(
 								/** @type {CssModuleCreateData} */
 								(
-									/** @type {unknown} */ ({
+									/** @type {Partial<CssModuleCreateData>} */ ({
 										...createData,
 										exportType
 									})
@@ -609,7 +609,7 @@ class CssModulesPlugin {
 						);
 					}
 					if (injectHMRCode) {
-						const currentModule = /** @type {CssModule} */ (rootModule);
+						const currentModule = rootModule;
 						const exportType = currentModule.exportType || "link";
 						// When exportType !== "link", modules behave like JavaScript modules
 						if (["link", "style"].includes(exportType)) {

package/lib/css/CssParser.js

@@ -63,14 +63,7 @@ const getCommentCompilationWarning = memoize(() =>
 
 // `SourceProcessor` drives the parse and hands already-built AST nodes to the visitors; positions are read from those nodes' ranges rather than re-scanning the source.
 
-/** @import { BuildInfo, BuildMeta } from "../module/Module" */
-/**
- * @import CssModule, {
- * 	CssModuleBuildInfo,
- * 	CssModuleBuildMeta,
- * 	Inheritance
- * } from "./CssModule"
- */
+/** @import CssModule, { BuiltCssModule, Inheritance } from "./CssModule" */
 /** @import { ParserState, PreparsedAst } from "../module/Parser" */
 /**
  * @import {
@@ -851,6 +844,9 @@ const parseIcssImportRequest = (second, rule, source) => {
 	};
 };
 
+/**
+ * @extends {Parser<BuiltCssModule>}
+ */
 class CssParser extends Parser {
 	/**
 	 * Creates an instance of CssParser.
@@ -1066,7 +1062,7 @@ class CssParser extends Parser {
 			);
 		};
 
-		const module = state.module;
+		const module = /** @type {CssModule & BuiltCssModule} */ (state.module);
 
 		// Every CSS Modules export declaration is tracked here so `_resolveAmbiguousExports` can arbitrate cross-kind collisions in one pass at end-of-parse: a class silently wins over CSS-scoped kinds (`@keyframes`, `@counter-style`, `@container`, custom property, grid identifier) — matching css-loader / lightning css / postcss-modules — while other pairs (`class` ↔ `id`, `class` ↔ `:export`, `class` ↔ `@value`, …) surface as a warning so the user can resolve them.
 		/** @typedef {{ kind: string, line: number, column: number, entries: number[] }} DeclarationOfKind */
@@ -1226,11 +1222,9 @@ class CssParser extends Parser {
 		});
 		const knownPropertyIndex = getKnownPropertyIndex(knownProperties);
 
-		/** @type {CssModuleBuildMeta} */
-		(module.buildMeta).isCssModule = isModules;
-		if (/** @type {CssModule} */ (module).exportType === "style") {
-			/** @type {CssModuleBuildMeta} */
-			(module.buildMeta).needIdInConcatenation = true;
+		module.buildMeta.isCssModule = isModules;
+		if (module.exportType === "style") {
+			module.buildMeta.needIdInConcatenation = true;
 		}
 
 		const locConverter = new LocConverter(source);
@@ -4604,8 +4598,7 @@ class CssParser extends Parser {
 									(v) => A.type(v) !== NodeType.Whitespace
 								);
 								if (string && A.type(string) === NodeType.String) {
-									/** @type {CssModuleBuildInfo} */
-									(module.buildInfo).charset = source
+									module.buildInfo.charset = source
 										.slice(A.start(string) + 1, A.end(string) - 1)
 										.toUpperCase();
 								}
@@ -5022,7 +5015,18 @@ class CssParser extends Parser {
 						!(dashed.active && declIsDashed) &&
 						icssDefinitions.has(declName)
 					) {
-						emitICSSSymbol(declName, nameStart, nameEnd);
+						// `themeColor: blue` names the same custom property that
+						// `var(themeColor)` resolves to, so scope it under the dashed
+						// name the value holds instead of substituting it verbatim.
+						const dashedName =
+							this.options.dashedIdents && effectiveLocalMode
+								? localizableDashedValue(declName)
+								: undefined;
+						if (dashedName !== undefined) {
+							emitNamedDashedIdentExport(dashedName, nameStart, nameEnd);
+						} else {
+							emitICSSSymbol(declName, nameStart, nameEnd);
+						}
 					}
 				}
 			},
@@ -5310,25 +5314,22 @@ class CssParser extends Parser {
 		// `as` selects the top-level production of §5.3: a `style` attribute is a
 		// block's contents, anything else a full stylesheet. `as` and `skip` are
 		// per-parse, so only the per-source `locConverter` reaches `process`.
-		new SourceProcessor()
-			.use(/** @type {VisitorMap} */ (visitors))
-			.process(source, {
-				as: /** @type {"stylesheet" | "block-contents"} */ (this.options.as),
-				// Non-modules parses skip selector preludes, but `@custom-selector` expansion needs them, so keep them when the file may use one.
-				skip: isModules
-					? undefined
-					: mayHaveCustomSelectors
-						? SKIP_NON_MODULES_KEEP_SELECTORS
-						: SKIP_NON_MODULES,
-				locConverter
-			});
+		new SourceProcessor().use(visitors).process(source, {
+			as: /** @type {"stylesheet" | "block-contents"} */ (this.options.as),
+			// Non-modules parses skip selector preludes, but `@custom-selector` expansion needs them, so keep them when the file may use one.
+			skip: isModules
+				? undefined
+				: mayHaveCustomSelectors
+					? SKIP_NON_MODULES_KEEP_SELECTORS
+					: SKIP_NON_MODULES,
+			locConverter
+		});
 
 		if (customMediaQueries || customSelectorUses) {
 			resolveCustomMediaAndSelectors();
 		}
 
-		/** @type {BuildInfo} */
-		(module.buildInfo).strict = true;
+		module.buildInfo.strict = true;
 
 		// Topologically sort the `composes … from` files and tag each file's first import dep with `sourceOrder` for cascade-correct load order (cycles keep their natural position).
 		if (composesFirstFileImport.size > 1) {
@@ -5342,7 +5343,7 @@ class CssParser extends Parser {
 			);
 		}
 
-		const buildMeta = /** @type {BuildMeta} */ (state.module.buildMeta);
+		const buildMeta = module.buildMeta;
 
 		buildMeta.exportsType = this.options.namedExports ? "namespace" : "default";
 		buildMeta.defaultObject = this.options.namedExports

package/lib/css/conventions.js

@@ -87,7 +87,7 @@ module.exports.camelCase = (input) => {
 /**
  * Safely stringify an arbitrary value for an error message — falls back to
  * `String(...)` when JSON.stringify would throw (BigInt, circular, etc.).
- * @param {EXPECTED_ANY} value value to stringify
+ * @param {string | string[]} value value to stringify
  * @returns {string} stringified value
  */
 const safeStringify = (value) => {