@ui5/builder 4.0.6 → 4.0.7

package/CHANGELOG.md

@@ -2,7 +2,13 @@
 All notable changes to this project will be documented in this file.  
 This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-A list of unreleased changes can be found [here](https://github.com/SAP/ui5-builder/compare/v4.0.6...HEAD).
+A list of unreleased changes can be found [here](https://github.com/SAP/ui5-builder/compare/v4.0.7...HEAD).
+
+<a name="v4.0.7"></a>
+## [v4.0.7] - 2025-05-18
+### Bug Fixes
+- **manifestEnhancer:** Only use valid files for supportedLocales ([#1080](https://github.com/SAP/ui5-builder/issues/1080)) [`a6c04d2`](https://github.com/SAP/ui5-builder/commit/a6c04d26ae964566c82e82d1be2ef6a7fd836530)
+
 
 <a name="v4.0.6"></a>
 ## [v4.0.6] - 2025-04-29
@@ -951,6 +957,7 @@ to load the custom bundle file instead.
 
 ### Features
 - Add ability to configure component preloads and custom bundles [`2241e5f`](https://github.com/SAP/ui5-builder/commit/2241e5ff98fd95f1f80cc74959655ae7a9c660e7)
+[v4.0.7]: https://github.com/SAP/ui5-builder/compare/v4.0.6...v4.0.7
 [v4.0.6]: https://github.com/SAP/ui5-builder/compare/v4.0.5...v4.0.6
 [v4.0.5]: https://github.com/SAP/ui5-builder/compare/v4.0.4...v4.0.5
 [v4.0.4]: https://github.com/SAP/ui5-builder/compare/v4.0.3...v4.0.4

package/lib/processors/manifestEnhancer.js

@@ -7,6 +7,58 @@ const log = getLogger("builder:processors:manifestEnhancer");
 
 const APP_DESCRIPTOR_V22 = new Version("1.21.0");
 
+/*
+ * Matches a legacy Java locale string, which is the format used by the UI5 Runtime (ResourceBundle)
+ * to load i18n properties files.
+ * Special case: "sr_Latn" is also supported, although the BCP47 script part is not supported by the Java locale format.
+ *
+ * Variants are limited to the format from BCP47, but with underscores instead of hyphens.
+ */
+//                          [     language     ]    [    region    ][                variants               ]
+const rLegacyJavaLocale = /^([a-z]{2,3}|sr_Latn)(?:_([A-Z]{2}|\d{3})((?:_[0-9a-zA-Z]{5,8}|_[0-9][0-9a-zA-Z]{3})*)?)?$/;
+
+// See https://github.com/SAP/openui5/blob/d7ecf2792788719d35b4eee3085a327d545bab24/src/sap.ui.core/src/sap/base/i18n/LanguageFallback.js#L10
+const sapSupportabilityVariants = ["saptrc", "sappsd", "saprigi"];
+
+function getBCP47LocaleFromPropertiesFilename(locale) {
+	const match = rLegacyJavaLocale.exec(locale);
+	if (!match) {
+		return null;
+	}
+	let [, language, region, variants] = match;
+	let script;
+
+	variants = variants?.slice(1); // Remove leading underscore
+
+	// Special handling of sr_Latn (see regex above)
+	// Note: This needs to be in sync with the runtime logic:
+	// https://github.com/SAP/openui5/blob/d7ecf2792788719d35b4eee3085a327d545bab24/src/sap.ui.core/src/sap/base/i18n/LanguageFallback.js#L87
+	if (language === "sr_Latn") {
+		language = "sr";
+		script = "Latn";
+	}
+
+	if (language === "en" && region === "US" && sapSupportabilityVariants.includes(variants)) {
+		// Convert to private use section
+		// Note: This needs to be in sync with the runtime logic:
+		// https://github.com/SAP/openui5/blob/d7ecf2792788719d35b4eee3085a327d545bab24/src/sap.ui.core/src/sap/base/i18n/LanguageFallback.js#L75
+		variants = `x-${variants}`;
+	}
+
+	let bcp47Locale = language;
+	if (script) {
+		bcp47Locale += `-${script}`;
+	}
+	if (region) {
+		bcp47Locale += `-${region}`;
+	}
+	if (variants) {
+		// Convert to BCP47 variant format
+		bcp47Locale += `-${variants.replace(/_/g, "-")}`;
+	}
+	return bcp47Locale;
+}
+
 function isAbsoluteUrl(url) {
 	if (url.startsWith("/")) {
 		return true;
@@ -132,6 +184,8 @@ class ManifestEnhancer {
 
 		this.isModified = false;
 		this.runInvoked = false;
+
+		this.supportedLocalesCache = new Map();
 	}
 
 	markModified() {
@@ -151,7 +205,14 @@ class ManifestEnhancer {
 		}
 	}
 
-	async findSupportedLocales(i18nBundleUrl) {
+	findSupportedLocales(i18nBundleUrl) {
+		if (!this.supportedLocalesCache.has(i18nBundleUrl)) {
+			this.supportedLocalesCache.set(i18nBundleUrl, this._findSupportedLocales(i18nBundleUrl));
+		}
+		return this.supportedLocalesCache.get(i18nBundleUrl);
+	}
+
+	async _findSupportedLocales(i18nBundleUrl) {
 		const i18nBundleName = path.basename(i18nBundleUrl, ".properties");
 		const i18nBundlePrefix = `${i18nBundleName}_`;
 		const i18nBundleDir = path.dirname(i18nBundleUrl);
@@ -165,8 +226,13 @@ class ManifestEnhancer {
 			if (fileNameWithoutExtension === i18nBundleName) {
 				supportedLocales.push("");
 			} else if (fileNameWithoutExtension.startsWith(i18nBundlePrefix)) {
-				const locale = fileNameWithoutExtension.replace(i18nBundlePrefix, "");
-				supportedLocales.push(locale);
+				const fileNameLocale = fileNameWithoutExtension.replace(i18nBundlePrefix, "");
+				const bcp47Locale = getBCP47LocaleFromPropertiesFilename(fileNameLocale);
+				if (bcp47Locale) {
+					supportedLocales.push(bcp47Locale);
+				} else {
+					log.warn(`Ignoring unexpected locale in filename '${fileName}' for bundle '${i18nBundleUrl}'`);
+				}
 			}
 		});
 		return supportedLocales.sort();

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ui5/builder",
-	"version": "4.0.6",
+	"version": "4.0.7",
 	"description": "UI5 Tooling - Builder",
 	"author": {
 		"name": "SAP SE",
@@ -132,8 +132,8 @@
 		"jsdoc": "^4.0.4",
 		"less-openui5": "^0.11.6",
 		"pretty-data": "^0.40.0",
-		"semver": "^7.7.1",
-		"terser": "^5.39.0",
+		"semver": "^7.7.2",
+		"terser": "^5.39.2",
 		"workerpool": "^9.2.0",
 		"xml2js": "^0.6.2"
 	},
@@ -142,17 +142,17 @@
 		"@istanbuljs/esm-loader-hook": "^0.3.0",
 		"@jridgewell/trace-mapping": "^0.3.25",
 		"@ui5/project": "^4.0.4",
-		"ava": "^6.2.0",
+		"ava": "^6.3.0",
 		"chokidar-cli": "^3.0.0",
 		"cross-env": "^7.0.3",
 		"depcheck": "^1.4.7",
 		"docdash": "^2.0.2",
-		"eslint": "^9.25.1",
+		"eslint": "^9.27.0",
 		"eslint-config-google": "^0.14.0",
 		"eslint-plugin-ava": "^15.0.1",
-		"eslint-plugin-jsdoc": "^50.6.11",
+		"eslint-plugin-jsdoc": "^50.6.17",
 		"esmock": "^2.7.0",
-		"globals": "^16.0.0",
+		"globals": "^16.1.0",
 		"line-column": "^1.0.2",
 		"nyc": "^17.1.0",
 		"open-cli": "^8.0.0",