webpack 5.92.1 → 5.94.0

package/lib/dependencies/CssExportDependency.js

@@ -5,16 +5,23 @@
 
 "use strict";
 
+const { cssExportConvention } = require("../util/conventions");
 const makeSerializable = require("../util/makeSerializable");
 const NullDependency = require("./NullDependency");
 
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
+/** @typedef {import("../../declarations/WebpackOptions").CssGeneratorExportsConvention} CssGeneratorExportsConvention */
+/** @typedef {import("../CssModule")} CssModule */
 /** @typedef {import("../Dependency")} Dependency */
 /** @typedef {import("../Dependency").ExportsSpec} ExportsSpec */
+/** @typedef {import("../Dependency").UpdateHashContext} UpdateHashContext */
 /** @typedef {import("../DependencyTemplate").CssDependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
+/** @typedef {import("../css/CssExportsGenerator")} CssExportsGenerator */
+/** @typedef {import("../css/CssGenerator")} CssGenerator */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @typedef {import("../util/Hash")} Hash */
 
 class CssExportDependency extends NullDependency {
 	/**
@@ -31,24 +38,60 @@ class CssExportDependency extends NullDependency {
 		return "css :export";
 	}
 
+	/**
+	 * @param {string} name export name
+	 * @param {CssGeneratorExportsConvention} convention convention of the export name
+	 * @returns {string[]} convention results
+	 */
+	getExportsConventionNames(name, convention) {
+		if (this._conventionNames) {
+			return this._conventionNames;
+		}
+		this._conventionNames = cssExportConvention(name, convention);
+		return this._conventionNames;
+	}
+
 	/**
 	 * Returns the exported names
 	 * @param {ModuleGraph} moduleGraph module graph
 	 * @returns {ExportsSpec | undefined} export names
 	 */
 	getExports(moduleGraph) {
-		const name = this.name;
+		const module = /** @type {CssModule} */ (moduleGraph.getParentModule(this));
+		const convention =
+			/** @type {CssGenerator | CssExportsGenerator} */
+			(module.generator).convention;
+		const names = this.getExportsConventionNames(this.name, convention);
 		return {
-			exports: [
-				{
-					name,
-					canMangle: true
-				}
-			],
+			exports: names.map(name => ({
+				name,
+				canMangle: true
+			})),
 			dependencies: undefined
 		};
 	}
 
+	/**
+	 * Update the hash
+	 * @param {Hash} hash hash to be updated
+	 * @param {UpdateHashContext} context context
+	 * @returns {void}
+	 */
+	updateHash(hash, { chunkGraph }) {
+		const module = /** @type {CssModule} */ (
+			chunkGraph.moduleGraph.getParentModule(this)
+		);
+		const generator =
+			/** @type {CssGenerator | CssExportsGenerator} */
+			(module.generator);
+		const names = this.getExportsConventionNames(
+			this.name,
+			generator.convention
+		);
+		hash.update("exportsConvention");
+		hash.update(JSON.stringify(names));
+	}
+
 	/**
 	 * @param {ObjectSerializerContext} context context
 	 */
@@ -79,9 +122,29 @@ CssExportDependency.Template = class CssExportDependencyTemplate extends (
 	 * @param {DependencyTemplateContext} templateContext the context object
 	 * @returns {void}
 	 */
-	apply(dependency, source, { cssExportsData }) {
+	apply(
+		dependency,
+		source,
+		{ cssExportsData, module: m, runtime, moduleGraph }
+	) {
 		const dep = /** @type {CssExportDependency} */ (dependency);
-		cssExportsData.exports.set(dep.name, dep.value);
+		const module = /** @type {CssModule} */ (m);
+		const convention = /** @type {CssGenerator | CssExportsGenerator} */ (
+			module.generator
+		).convention;
+		const names = dep.getExportsConventionNames(dep.name, convention);
+		const usedNames = /** @type {string[]} */ (
+			names
+				.map(name =>
+					moduleGraph.getExportInfo(module, name).getUsedName(name, runtime)
+				)
+				.filter(Boolean)
+		);
+		if (usedNames.length === 0) return;
+
+		for (const used of usedNames) {
+			cssExportsData.exports.set(used, dep.value);
+		}
 	}
 };
 

package/lib/dependencies/CssImportDependency.js

@@ -26,9 +26,7 @@ const ModuleDependency = require("./ModuleDependency");
 class CssImportDependency extends ModuleDependency {
 	/**
 	 * Example of dependency:
-	 *
 	 * \@import url("landscape.css") layer(forms) screen and (orientation: landscape) screen and (orientation: landscape);
-	 *
 	 * @param {string} request request
 	 * @param {Range} range range of the argument
 	 * @param {string | undefined} layer layer

package/lib/dependencies/CssLocalIdentifierDependency.js

@@ -5,6 +5,7 @@
 
 "use strict";
 
+const { cssExportConvention } = require("../util/conventions");
 const createHash = require("../util/createHash");
 const { makePathsRelative } = require("../util/identifier");
 const makeSerializable = require("../util/makeSerializable");
@@ -17,6 +18,7 @@ const NullDependency = require("./NullDependency");
 /** @typedef {import("../CssModule")} CssModule */
 /** @typedef {import("../Dependency")} Dependency */
 /** @typedef {import("../Dependency").ExportsSpec} ExportsSpec */
+/** @typedef {import("../Dependency").UpdateHashContext} UpdateHashContext */
 /** @typedef {import("../DependencyTemplate").CssDependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
@@ -25,6 +27,7 @@ const NullDependency = require("./NullDependency");
 /** @typedef {import("../css/CssParser").Range} Range */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @typedef {import("../util/Hash")} Hash */
 
 /**
  * @param {string} local css local
@@ -88,24 +91,62 @@ class CssLocalIdentifierDependency extends NullDependency {
 		return "css local identifier";
 	}
 
+	/**
+	 * @param {string} name export name
+	 * @param {CssGeneratorExportsConvention} convention convention of the export name
+	 * @returns {string[]} convention results
+	 */
+	getExportsConventionNames(name, convention) {
+		if (this._conventionNames) {
+			return this._conventionNames;
+		}
+		this._conventionNames = cssExportConvention(this.name, convention);
+		return this._conventionNames;
+	}
+
 	/**
 	 * Returns the exported names
 	 * @param {ModuleGraph} moduleGraph module graph
 	 * @returns {ExportsSpec | undefined} export names
 	 */
 	getExports(moduleGraph) {
-		const name = this.name;
+		const module = /** @type {CssModule} */ (moduleGraph.getParentModule(this));
+		const convention = /** @type {CssGenerator | CssExportsGenerator} */ (
+			module.generator
+		).convention;
+		const names = this.getExportsConventionNames(this.name, convention);
 		return {
-			exports: [
-				{
-					name,
-					canMangle: true
-				}
-			],
+			exports: names.map(name => ({
+				name,
+				canMangle: true
+			})),
 			dependencies: undefined
 		};
 	}
 
+	/**
+	 * Update the hash
+	 * @param {Hash} hash hash to be updated
+	 * @param {UpdateHashContext} context context
+	 * @returns {void}
+	 */
+	updateHash(hash, { chunkGraph }) {
+		const module = /** @type {CssModule} */ (
+			chunkGraph.moduleGraph.getParentModule(this)
+		);
+		const generator = /** @type {CssGenerator | CssExportsGenerator} */ (
+			module.generator
+		);
+		const names = this.getExportsConventionNames(
+			this.name,
+			generator.convention
+		);
+		hash.update("exportsConvention");
+		hash.update(JSON.stringify(names));
+		hash.update("localIdentName");
+		hash.update(generator.localIdentName);
+	}
+
 	/**
 	 * @param {ObjectSerializerContext} context context
 	 */
@@ -137,7 +178,7 @@ class CssLocalIdentifierDependency extends NullDependency {
 const escapeCssIdentifier = (str, omitUnderscore) => {
 	const escaped = `${str}`.replace(
 		// cspell:word uffff
-		/[^a-zA-Z0-9_\u0081-\uffff-]/g,
+		/[^a-zA-Z0-9_\u0081-\uFFFF-]/g,
 		s => `\\${s}`
 	);
 	return !omitUnderscore && /^(?!--)[0-9-]/.test(escaped)
@@ -158,7 +199,7 @@ CssLocalIdentifierDependency.Template = class CssLocalIdentifierDependencyTempla
 		dependency,
 		source,
 		{
-			module,
+			module: m,
 			moduleGraph,
 			chunkGraph,
 			runtime,
@@ -167,26 +208,32 @@ CssLocalIdentifierDependency.Template = class CssLocalIdentifierDependencyTempla
 		}
 	) {
 		const dep = /** @type {CssLocalIdentifierDependency} */ (dependency);
-		const used = moduleGraph
-			.getExportInfo(module, dep.name)
-			.getUsedName(dep.name, runtime);
-
-		if (!used) return;
+		const module = /** @type {CssModule} */ (m);
+		const convention = /** @type {CssGenerator | CssExportsGenerator} */ (
+			module.generator
+		).convention;
+		const names = dep.getExportsConventionNames(dep.name, convention);
+		const usedNames = /** @type {string[]} */ (
+			names
+				.map(name =>
+					moduleGraph.getExportInfo(module, name).getUsedName(name, runtime)
+				)
+				.filter(Boolean)
+		);
+		if (usedNames.length === 0) return;
 
+		// use the first usedName to generate localIdent, it's shorter when mangle exports enabled
 		const localIdent =
 			dep.prefix +
-			getLocalIdent(
-				used,
-				/** @type {CssModule} */ (module),
-				chunkGraph,
-				runtimeTemplate
-			);
+			getLocalIdent(usedNames[0], module, chunkGraph, runtimeTemplate);
 		source.replace(
 			dep.range[0],
 			dep.range[1] - 1,
 			escapeCssIdentifier(localIdent, dep.prefix)
 		);
-		if (used) cssExportsData.exports.set(used, localIdent);
+		for (const used of usedNames) {
+			cssExportsData.exports.set(used, localIdent);
+		}
 	}
 };
 

package/lib/dependencies/CssSelfLocalIdentifierDependency.js

@@ -43,8 +43,9 @@ class CssSelfLocalIdentifierDependency extends CssLocalIdentifierDependency {
 	 * @returns {string | null} an identifier to merge equal requests
 	 */
 	getResourceIdentifier() {
-		return `self`;
+		return "self";
 	}
+
 	/**
 	 * Returns the exported names
 	 * @param {ModuleGraph} moduleGraph module graph

package/lib/dependencies/CssUrlDependency.js

@@ -25,9 +25,9 @@ const ModuleDependency = require("./ModuleDependency");
 /** @typedef {import("../util/Hash")} Hash */
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
 
-const getIgnoredRawDataUrlModule = memoize(() => {
-	return new RawDataUrlModule("data:,", `ignored-asset`, `(ignored asset)`);
-});
+const getIgnoredRawDataUrlModule = memoize(
+	() => new RawDataUrlModule("data:,", "ignored-asset", "(ignored asset)")
+);
 
 class CssUrlDependency extends ModuleDependency {
 	/**
@@ -106,9 +106,8 @@ const cssEscapeString = str => {
 		return str.replace(/[\n\t ()'"\\]/g, m => `\\${m}`);
 	} else if (countQuotation <= countApostrophe) {
 		return `"${str.replace(/[\n"\\]/g, m => `\\${m}`)}"`;
-	} else {
-		return `'${str.replace(/[\n'\\]/g, m => `\\${m}`)}'`;
 	}
+	return `'${str.replace(/[\n'\\]/g, m => `\\${m}`)}'`;
 };
 
 CssUrlDependency.Template = class CssUrlDependencyTemplate extends (

package/lib/dependencies/DynamicExports.js

@@ -15,7 +15,7 @@ const parserStateExportsState = new WeakMap();
  * @param {ParserState} parserState parser state
  * @returns {void}
  */
-exports.bailout = parserState => {
+module.exports.bailout = parserState => {
 	const value = parserStateExportsState.get(parserState);
 	parserStateExportsState.set(parserState, false);
 	if (value === true) {
@@ -29,7 +29,7 @@ exports.bailout = parserState => {
  * @param {ParserState} parserState parser state
  * @returns {void}
  */
-exports.enable = parserState => {
+module.exports.enable = parserState => {
 	const value = parserStateExportsState.get(parserState);
 	if (value === false) return;
 	parserStateExportsState.set(parserState, true);
@@ -44,7 +44,7 @@ exports.enable = parserState => {
  * @param {ParserState} parserState parser state
  * @returns {void}
  */
-exports.setFlagged = parserState => {
+module.exports.setFlagged = parserState => {
 	const value = parserStateExportsState.get(parserState);
 	if (value !== true) return;
 	const buildMeta = /** @type {BuildMeta} */ (parserState.module.buildMeta);
@@ -56,7 +56,7 @@ exports.setFlagged = parserState => {
  * @param {ParserState} parserState parser state
  * @returns {void}
  */
-exports.setDynamic = parserState => {
+module.exports.setDynamic = parserState => {
 	const value = parserStateExportsState.get(parserState);
 	if (value !== true) return;
 	/** @type {BuildMeta} */
@@ -67,7 +67,7 @@ exports.setDynamic = parserState => {
  * @param {ParserState} parserState parser state
  * @returns {boolean} true, when enabled
  */
-exports.isEnabled = parserState => {
+module.exports.isEnabled = parserState => {
 	const value = parserStateExportsState.get(parserState);
 	return value === true;
 };

package/lib/dependencies/ExportsInfoDependency.js

@@ -72,7 +72,7 @@ const getProperty = (moduleGraph, module, _exportName, property, runtime) => {
 				case UsageState.Unused:
 					return false;
 				case UsageState.NoInfo:
-					return undefined;
+					return;
 				case UsageState.Unknown:
 					return null;
 				default:
@@ -82,7 +82,6 @@ const getProperty = (moduleGraph, module, _exportName, property, runtime) => {
 		case "provideInfo":
 			return moduleGraph.getExportsInfo(module).isExportProvided(exportName);
 	}
-	return undefined;
 };
 
 class ExportsInfoDependency extends NullDependency {

package/lib/dependencies/HarmonyAcceptImportDependency.js

@@ -18,7 +18,7 @@ class HarmonyAcceptImportDependency extends HarmonyImportDependency {
 	 * @param {string} request the request string
 	 */
 	constructor(request) {
-		super(request, NaN);
+		super(request, Number.NaN);
 		this.weak = true;
 	}
 

package/lib/dependencies/HarmonyEvaluatedImportSpecifierDependency.js

@@ -112,11 +112,10 @@ HarmonyEvaluatedImportSpecifierDependency.Template = class HarmonyEvaluatedImpor
 				break;
 			}
 			case "namespace": {
-				if (ids[0] === "__esModule") {
-					value = ids.length === 1 || undefined;
-				} else {
-					value = exportsInfo.isExportProvided(ids);
-				}
+				value =
+					ids[0] === "__esModule"
+						? ids.length === 1 || undefined
+						: exportsInfo.isExportProvided(ids);
 				break;
 			}
 			case "dynamic": {

package/lib/dependencies/HarmonyExportDependencyParserPlugin.js

@@ -145,30 +145,34 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 			"HarmonyExportDependencyParserPlugin",
 			(statement, id, name, idx) => {
 				const settings = parser.getTagData(id, harmonySpecifierTag);
-				let dep;
 				const harmonyNamedExports = (parser.state.harmonyNamedExports =
 					parser.state.harmonyNamedExports || new Set());
 				harmonyNamedExports.add(name);
 				InnerGraph.addVariableUsage(parser, id, name);
-				if (settings) {
-					dep = new HarmonyExportImportedSpecifierDependency(
-						settings.source,
-						settings.sourceOrder,
-						settings.ids,
-						name,
-						harmonyNamedExports,
-						null,
-						exportPresenceMode,
-						null,
-						settings.assertions
-					);
-				} else {
-					dep = new HarmonyExportSpecifierDependency(id, name);
-				}
+				const dep = settings
+					? new HarmonyExportImportedSpecifierDependency(
+							settings.source,
+							settings.sourceOrder,
+							settings.ids,
+							name,
+							harmonyNamedExports,
+							null,
+							exportPresenceMode,
+							null,
+							settings.assertions
+						)
+					: new HarmonyExportSpecifierDependency(id, name);
 				dep.loc = Object.create(
 					/** @type {DependencyLocation} */ (statement.loc)
 				);
 				dep.loc.index = idx;
+				const isAsiSafe = !parser.isAsiPosition(
+					/** @type {Range} */
+					(statement.range)[0]
+				);
+				if (!isAsiSafe) {
+					parser.setAsiPosition(/** @type {Range} */ (statement.range)[1]);
+				}
 				parser.state.current.addDependency(dep);
 				return true;
 			}
@@ -202,6 +206,13 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 					/** @type {DependencyLocation} */ (statement.loc)
 				);
 				dep.loc.index = idx;
+				const isAsiSafe = !parser.isAsiPosition(
+					/** @type {Range} */
+					(statement.range)[0]
+				);
+				if (!isAsiSafe) {
+					parser.setAsiPosition(/** @type {Range} */ (statement.range)[1]);
+				}
 				parser.state.current.addDependency(dep);
 				return true;
 			}

package/lib/dependencies/HarmonyExportExpressionDependency.js

@@ -193,7 +193,7 @@ HarmonyExportExpressionDependency.Template = class HarmonyExportDependencyTempla
 				source.replace(
 					dep.rangeStatement[0],
 					dep.range[0] - 1,
-					content + "(" + dep.prefix
+					`${content}(${dep.prefix}`
 				);
 				source.replace(dep.range[1], dep.rangeStatement[1] - 0.5, ");");
 				return;