webpack 5.90.3 → 5.92.0

package/lib/dependencies/CssLocalIdentifierDependency.js

@@ -5,18 +5,72 @@
 
 "use strict";
 
+const createHash = require("../util/createHash");
+const { makePathsRelative } = require("../util/identifier");
 const makeSerializable = require("../util/makeSerializable");
 const NullDependency = require("./NullDependency");
 
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
+/** @typedef {import("../../declarations/WebpackOptions").CssGeneratorExportsConvention} CssGeneratorExportsConvention */
+/** @typedef {import("../../declarations/WebpackOptions").CssGeneratorLocalIdentName} CssGeneratorLocalIdentName */
+/** @typedef {import("../ChunkGraph")} ChunkGraph */
+/** @typedef {import("../CssModule")} CssModule */
 /** @typedef {import("../Dependency")} Dependency */
 /** @typedef {import("../Dependency").ExportsSpec} ExportsSpec */
 /** @typedef {import("../DependencyTemplate").CssDependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
+/** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
+/** @typedef {import("../css/CssExportsGenerator")} CssExportsGenerator */
+/** @typedef {import("../css/CssGenerator")} CssGenerator */
 /** @typedef {import("../css/CssParser").Range} Range */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 
+/**
+ * @param {string} local css local
+ * @param {CssModule} module module
+ * @param {ChunkGraph} chunkGraph chunk graph
+ * @param {RuntimeTemplate} runtimeTemplate runtime template
+ * @returns {string} local ident
+ */
+const getLocalIdent = (local, module, chunkGraph, runtimeTemplate) => {
+	const localIdentName =
+		/** @type {CssGenerator | CssExportsGenerator} */
+		(module.generator).localIdentName;
+	const relativeResourcePath = makePathsRelative(
+		/** @type {string} */ (module.context),
+		module.resourceResolveData.path
+	);
+	const { hashFunction, hashDigest, hashDigestLength, hashSalt, uniqueName } =
+		runtimeTemplate.outputOptions;
+	const hash = createHash(hashFunction);
+	if (hashSalt) {
+		hash.update(hashSalt);
+	}
+	hash.update(relativeResourcePath);
+	if (!/\[local\]/.test(localIdentName)) {
+		hash.update(local);
+	}
+	const localIdentHash = /** @type {string} */ (hash.digest(hashDigest))
+		// Remove all leading digits
+		.replace(/^\d+/, "")
+		// Replace all slashes with underscores (same as in base64url)
+		.replace(/\//g, "_")
+		// Remove everything that is not an alphanumeric or underscore
+		.replace(/[^A-Za-z0-9_]+/g, "_")
+		.slice(0, hashDigestLength);
+	return runtimeTemplate.compilation
+		.getPath(localIdentName, {
+			filename: relativeResourcePath,
+			hash: localIdentHash,
+			contentHash: localIdentHash,
+			chunkGraph,
+			module
+		})
+		.replace(/\[local\]/g, local)
+		.replace(/\[uniqueName\]/g, uniqueName);
+};
+
 class CssLocalIdentifierDependency extends NullDependency {
 	/**
 	 * @param {string} name name
@@ -103,7 +157,14 @@ CssLocalIdentifierDependency.Template = class CssLocalIdentifierDependencyTempla
 	apply(
 		dependency,
 		source,
-		{ module, moduleGraph, chunkGraph, runtime, runtimeTemplate, cssExports }
+		{
+			module,
+			moduleGraph,
+			chunkGraph,
+			runtime,
+			runtimeTemplate,
+			cssExportsData
+		}
 	) {
 		const dep = /** @type {CssLocalIdentifierDependency} */ (dependency);
 		const used = moduleGraph
@@ -112,19 +173,20 @@ CssLocalIdentifierDependency.Template = class CssLocalIdentifierDependencyTempla
 
 		if (!used) return;
 
-		const moduleId = chunkGraph.getModuleId(module);
-		const identifier =
+		const localIdent =
 			dep.prefix +
-			(runtimeTemplate.outputOptions.uniqueName
-				? runtimeTemplate.outputOptions.uniqueName + "-"
-				: "") +
-			(used ? moduleId + "-" + used : "-");
+			getLocalIdent(
+				used,
+				/** @type {CssModule} */ (module),
+				chunkGraph,
+				runtimeTemplate
+			);
 		source.replace(
 			dep.range[0],
 			dep.range[1] - 1,
-			escapeCssIdentifier(identifier, dep.prefix)
+			escapeCssIdentifier(localIdent, dep.prefix)
 		);
-		if (used) cssExports.set(used, identifier);
+		if (used) cssExportsData.exports.set(used, localIdent);
 	}
 };
 

package/lib/dependencies/CssUrlDependency.js

@@ -5,6 +5,7 @@
 
 "use strict";
 
+const RawDataUrlModule = require("../asset/RawDataUrlModule");
 const makeSerializable = require("../util/makeSerializable");
 const memoize = require("../util/memoize");
 const ModuleDependency = require("./ModuleDependency");
@@ -24,7 +25,9 @@ const ModuleDependency = require("./ModuleDependency");
 /** @typedef {import("../util/Hash")} Hash */
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
 
-const getRawDataUrlModule = memoize(() => require("../asset/RawDataUrlModule"));
+const getIgnoredRawDataUrlModule = memoize(() => {
+	return new RawDataUrlModule("data:,", `ignored-asset`, `(ignored asset)`);
+});
 
 class CssUrlDependency extends ModuleDependency {
 	/**
@@ -51,8 +54,7 @@ class CssUrlDependency extends ModuleDependency {
 	 * @returns {Module | null} a module
 	 */
 	createIgnoredModule(context) {
-		const RawDataUrlModule = getRawDataUrlModule();
-		return new RawDataUrlModule("data:,", `ignored-asset`, `(ignored asset)`);
+		return getIgnoredRawDataUrlModule();
 	}
 
 	/**
@@ -124,6 +126,7 @@ CssUrlDependency.Template = class CssUrlDependencyTemplate extends (
 		{ moduleGraph, runtimeTemplate, codeGenerationResults }
 	) {
 		const dep = /** @type {CssUrlDependency} */ (dependency);
+		const module = /** @type {Module} */ (moduleGraph.getModule(dep));
 
 		/** @type {string | undefined} */
 		let newValue;
@@ -132,8 +135,7 @@ CssUrlDependency.Template = class CssUrlDependencyTemplate extends (
 			case "string":
 				newValue = cssEscapeString(
 					runtimeTemplate.assetUrl({
-						publicPath: "",
-						module: /** @type {Module} */ (moduleGraph.getModule(dep)),
+						module,
 						codeGenerationResults
 					})
 				);
@@ -141,8 +143,7 @@ CssUrlDependency.Template = class CssUrlDependencyTemplate extends (
 			case "url":
 				newValue = `url(${cssEscapeString(
 					runtimeTemplate.assetUrl({
-						publicPath: "",
-						module: /** @type {Module} */ (moduleGraph.getModule(dep)),
+						module,
 						codeGenerationResults
 					})
 				)})`;
@@ -159,4 +160,6 @@ CssUrlDependency.Template = class CssUrlDependencyTemplate extends (
 
 makeSerializable(CssUrlDependency, "webpack/lib/dependencies/CssUrlDependency");
 
+CssUrlDependency.PUBLIC_PATH_AUTO = "__WEBPACK_CSS_PUBLIC_PATH_AUTO__";
+
 module.exports = CssUrlDependency;

package/lib/dependencies/ExportsInfoDependency.js

@@ -25,13 +25,13 @@ const NullDependency = require("./NullDependency");
 /**
  * @param {ModuleGraph} moduleGraph the module graph
  * @param {Module} module the module
- * @param {string[] | null} exportName name of the export if any
+ * @param {string[] | null} _exportName name of the export if any
  * @param {string | null} property name of the requested property
  * @param {RuntimeSpec} runtime for which runtime
  * @returns {any} value of the property
  */
-const getProperty = (moduleGraph, module, exportName, property, runtime) => {
-	if (!exportName) {
+const getProperty = (moduleGraph, module, _exportName, property, runtime) => {
+	if (!_exportName) {
 		switch (property) {
 			case "usedExports": {
 				const usedExports = moduleGraph
@@ -48,10 +48,11 @@ const getProperty = (moduleGraph, module, exportName, property, runtime) => {
 			}
 		}
 	}
+	const exportName = /** @type {string[]} */ (_exportName);
 	switch (property) {
 		case "canMangle": {
 			const exportsInfo = moduleGraph.getExportsInfo(module);
-			const exportInfo = exportsInfo.getExportInfo(exportName[0]);
+			const exportInfo = exportsInfo.getReadOnlyExportInfoRecursive(exportName);
 			if (exportInfo) return exportInfo.canMangle;
 			return exportsInfo.otherExportsInfo.canMangle;
 		}

package/lib/dependencies/ExternalModuleDependency.js

@@ -92,11 +92,13 @@ ExternalModuleDependency.Template = class ExternalModuleDependencyTemplate exten
 	apply(dependency, source, templateContext) {
 		super.apply(dependency, source, templateContext);
 		const dep = /** @type {ExternalModuleDependency} */ (dependency);
-		const { chunkInitFragments } = templateContext;
+		const { chunkInitFragments, runtimeTemplate } = templateContext;
 
 		chunkInitFragments.push(
 			new ExternalModuleInitFragment(
-				dep.importedModule,
+				`${runtimeTemplate.supportNodePrefixForCoreModules() ? "node:" : ""}${
+					dep.importedModule
+				}`,
 				dep.specifiers,
 				dep.default
 			)

package/lib/dependencies/ExternalModuleInitFragment.js

@@ -20,7 +20,7 @@ const makeSerializable = require("../util/makeSerializable");
 class ExternalModuleInitFragment extends InitFragment {
 	/**
 	 * @param {string} importedModule imported module
-	 * @param {Array<{ name: string, value?: string }>|ImportSpecifiers} specifiers import specifiers
+	 * @param {Array<{ name: string, value?: string }> | ImportSpecifiers} specifiers import specifiers
 	 * @param {string=} defaultImport default import
 	 */
 	constructor(importedModule, specifiers, defaultImport) {
@@ -56,7 +56,9 @@ class ExternalModuleInitFragment extends InitFragment {
 		const newSpecifiersMap = new Map(this.specifiers);
 		for (const [name, specifiers] of other.specifiers) {
 			if (newSpecifiersMap.has(name)) {
-				const currentSpecifiers = newSpecifiersMap.get(name);
+				const currentSpecifiers =
+					/** @type {Set<string>} */
+					(newSpecifiersMap.get(name));
 				for (const spec of specifiers) currentSpecifiers.add(spec);
 			} else {
 				newSpecifiersMap.set(name, specifiers);
@@ -71,7 +73,7 @@ class ExternalModuleInitFragment extends InitFragment {
 
 	/**
 	 * @param {GenerateContext} context context
-	 * @returns {string | Source} the source code that will be included as initialization code
+	 * @returns {string | Source | undefined} the source code that will be included as initialization code
 	 */
 	getContent({ runtimeRequirements }) {
 		const namedImports = [];

package/lib/dependencies/HarmonyEvaluatedImportSpecifierDependency.js

@@ -14,7 +14,7 @@ const HarmonyImportSpecifierDependency = require("./HarmonyImportSpecifierDepend
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../Module").BuildMeta} BuildMeta */
 /** @typedef {import("../ModuleGraphConnection")} ModuleGraphConnection */
-/** @typedef {import("../javascript/JavascriptParser").Assertions} Assertions */
+/** @typedef {import("../javascript/JavascriptParser").ImportAttributes} ImportAttributes */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
@@ -33,11 +33,11 @@ class HarmonyEvaluatedImportSpecifierDependency extends HarmonyImportSpecifierDe
 	 * @param {TODO} ids ids
 	 * @param {TODO} name name
 	 * @param {Range} range location in source code
-	 * @param {Assertions} assertions assertions
+	 * @param {ImportAttributes} attributes import assertions
 	 * @param {string} operator operator
 	 */
-	constructor(request, sourceOrder, ids, name, range, assertions, operator) {
-		super(request, sourceOrder, ids, name, range, false, assertions, []);
+	constructor(request, sourceOrder, ids, name, range, attributes, operator) {
+		super(request, sourceOrder, ids, name, range, false, attributes, []);
 		this.operator = operator;
 	}
 

package/lib/dependencies/HarmonyExportDependencyParserPlugin.js

@@ -14,11 +14,14 @@ const HarmonyExportSpecifierDependency = require("./HarmonyExportSpecifierDepend
 const { ExportPresenceModes } = require("./HarmonyImportDependency");
 const {
 	harmonySpecifierTag,
-	getAssertions
+	getAttributes
 } = require("./HarmonyImportDependencyParserPlugin");
 const HarmonyImportSideEffectDependency = require("./HarmonyImportSideEffectDependency");
 
+/** @typedef {import("../Dependency").DependencyLocation} DependencyLocation */
 /** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
+/** @typedef {import("../javascript/JavascriptParser").FunctionDeclaration} FunctionDeclaration */
+/** @typedef {import("../javascript/JavascriptParser").Range} Range */
 
 const { HarmonyStarExportsList } = HarmonyExportImportedSpecifierDependency;
 
@@ -37,16 +40,24 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 						: ExportPresenceModes.AUTO;
 	}
 
+	/**
+	 * @param {JavascriptParser} parser the parser
+	 * @returns {void}
+	 */
 	apply(parser) {
 		const { exportPresenceMode } = this;
 		parser.hooks.export.tap(
 			"HarmonyExportDependencyParserPlugin",
 			statement => {
 				const dep = new HarmonyExportHeaderDependency(
-					statement.declaration && statement.declaration.range,
-					statement.range
+					/** @type {Range | false} */ (
+						statement.declaration && statement.declaration.range
+					),
+					/** @type {Range} */ (statement.range)
+				);
+				dep.loc = Object.create(
+					/** @type {DependencyLocation} */ (statement.loc)
 				);
-				dep.loc = Object.create(statement.loc);
 				dep.loc.index = -1;
 				parser.state.module.addPresentationalDependency(dep);
 				return true;
@@ -57,16 +68,21 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 			(statement, source) => {
 				parser.state.lastHarmonyImportOrder =
 					(parser.state.lastHarmonyImportOrder || 0) + 1;
-				const clearDep = new ConstDependency("", statement.range);
-				clearDep.loc = Object.create(statement.loc);
+				const clearDep = new ConstDependency(
+					"",
+					/** @type {Range} */ (statement.range)
+				);
+				clearDep.loc = /** @type {DependencyLocation} */ (statement.loc);
 				clearDep.loc.index = -1;
 				parser.state.module.addPresentationalDependency(clearDep);
 				const sideEffectDep = new HarmonyImportSideEffectDependency(
-					source,
+					/** @type {string} */ (source),
 					parser.state.lastHarmonyImportOrder,
-					getAssertions(statement)
+					getAttributes(statement)
+				);
+				sideEffectDep.loc = Object.create(
+					/** @type {DependencyLocation} */ (statement.loc)
 				);
-				sideEffectDep.loc = Object.create(statement.loc);
 				sideEffectDep.loc.index = -1;
 				parser.state.current.addDependency(sideEffectDep);
 				return true;
@@ -76,13 +92,12 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 			"HarmonyExportDependencyParserPlugin",
 			(statement, expr) => {
 				const isFunctionDeclaration = expr.type === "FunctionDeclaration";
-				const comments = parser.getComments([
-					statement.range[0],
-					expr.range[0]
-				]);
+				const exprRange = /** @type {Range} */ (expr.range);
+				const statementRange = /** @type {Range} */ (statement.range);
+				const comments = parser.getComments([statementRange[0], exprRange[0]]);
 				const dep = new HarmonyExportExpressionDependency(
-					expr.range,
-					statement.range,
+					exprRange,
+					statementRange,
 					comments
 						.map(c => {
 							switch (c.type) {
@@ -98,12 +113,11 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 						? expr.id.name
 						: isFunctionDeclaration
 							? {
-									id: expr.id ? expr.id.name : undefined,
 									range: [
-										expr.range[0],
+										exprRange[0],
 										expr.params.length > 0
-											? expr.params[0].range[0]
-											: expr.body.range[0]
+											? /** @type {Range} */ (expr.params[0].range)[0]
+											: /** @type {Range} */ (expr.body.range)[0]
 									],
 									prefix: `${expr.async ? "async " : ""}function${
 										expr.generator ? "*" : ""
@@ -112,7 +126,9 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 								}
 							: undefined
 				);
-				dep.loc = Object.create(statement.loc);
+				dep.loc = Object.create(
+					/** @type {DependencyLocation} */ (statement.loc)
+				);
 				dep.loc.index = -1;
 				parser.state.current.addDependency(dep);
 				InnerGraph.addVariableUsage(
@@ -149,7 +165,9 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 				} else {
 					dep = new HarmonyExportSpecifierDependency(id, name);
 				}
-				dep.loc = Object.create(statement.loc);
+				dep.loc = Object.create(
+					/** @type {DependencyLocation} */ (statement.loc)
+				);
 				dep.loc.index = idx;
 				parser.state.current.addDependency(dep);
 				return true;
@@ -168,7 +186,7 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 						parser.state.harmonyStarExports || new HarmonyStarExportsList();
 				}
 				const dep = new HarmonyExportImportedSpecifierDependency(
-					source,
+					/** @type {string} */ (source),
 					parser.state.lastHarmonyImportOrder,
 					id ? [id] : [],
 					name,
@@ -180,7 +198,9 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 				if (harmonyStarExports) {
 					harmonyStarExports.push(dep);
 				}
-				dep.loc = Object.create(statement.loc);
+				dep.loc = Object.create(
+					/** @type {DependencyLocation} */ (statement.loc)
+				);
 				dep.loc.index = idx;
 				parser.state.current.addDependency(dep);
 				return true;

package/lib/dependencies/HarmonyExportHeaderDependency.js

@@ -17,7 +17,7 @@ const NullDependency = require("./NullDependency");
 
 class HarmonyExportHeaderDependency extends NullDependency {
 	/**
-	 * @param {Range} range range
+	 * @param {Range | false} range range
 	 * @param {Range} rangeStatement range statement
 	 */
 	constructor(range, rangeStatement) {