@ui5/builder 4.0.5 → 4.0.7

package/CHANGELOG.md

@@ -2,7 +2,20 @@
 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.5...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
+### Bug Fixes
+- Handle legacy-free UI5 versions [`8b38316`](https://github.com/SAP/ui5-builder/commit/8b38316bae02edfe4da1876884345c040f260c10)
+- **minify:** In case of error, include full resource path in the error messsage [`aadb463`](https://github.com/SAP/ui5-builder/commit/aadb4639461998b2c113d5a4962adbdb135c9762)
+
 
 <a name="v4.0.5"></a>
 ## [v4.0.5] - 2024-12-10
@@ -944,6 +957,8 @@ 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
 [v4.0.3]: https://github.com/SAP/ui5-builder/compare/v4.0.2...v4.0.3

package/LICENSE.txt

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2018-2024 SAP SE or an SAP affiliate company and UI5 Tooling contributors
+   Copyright [yyyy] [name of copyright owner]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

package/lib/lbt/bundle/Builder.js

@@ -54,13 +54,23 @@ class BundleBuilder {
 		this.allowStringBundling = allowStringBundling;
 	}
 
-	getUi5MajorVersion() {
+	getEffectiveUi5MajorVersion() {
 		if (this.targetUi5CoreVersionMajor !== undefined) {
 			return this.targetUi5CoreVersionMajor;
 		}
 
-		if (this.targetUi5CoreVersion && semver.valid(this.targetUi5CoreVersion)) {
-			this.targetUi5CoreVersionMajor = semver.major(this.targetUi5CoreVersion);
+		const parsedVersion = semver.parse(this.targetUi5CoreVersion);
+		if (parsedVersion) {
+			this.targetUi5CoreVersionMajor = parsedVersion.major;
+
+			// legacy-free versions include changes of the upcoming major version
+			// so we should treat them the same as the next major version
+			if (
+				parsedVersion.prerelease.includes("legacy-free") ||
+				parsedVersion.prerelease.includes("legacy-free-SNAPSHOT") // Maven snapshot version
+			) {
+				this.targetUi5CoreVersionMajor += 1;
+			}
 		} else {
 			// Assume legacy version if unable to determine the version
 			this.targetUi5CoreVersionMajor = null;
@@ -85,7 +95,7 @@ class BundleBuilder {
 	}
 
 	determineRequireCallback(modules) {
-		if (this.getUi5MajorVersion() >= 2) {
+		if (this.getEffectiveUi5MajorVersion() >= 2) {
 			// Starting with UI5 2.0.0, method Core.boot does not exist anymore
 			return;
 		}
@@ -212,7 +222,7 @@ class BundleBuilder {
 
 	closeModule(resolvedModule) {
 		if ( resolvedModule.containsCoreSync ) {
-			if ( this.getUi5MajorVersion() >= 2 ) {
+			if ( this.getEffectiveUi5MajorVersion() >= 2 ) {
 				throw new Error("Requiring sap/ui/core/Core synchronously is not supported as of UI5 Version 2");
 			}
 			this.outW.ensureNewLine(); // for clarity and to avoid issues with single line comments

package/lib/processors/jsdoc/lib/createIndexFiles.js

@@ -1,7 +1,7 @@
 /*
  * Node script to create cross-library API index files for use in the UI5 SDKs.
  *
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/lib/processors/jsdoc/lib/transformApiJson.js

@@ -1,7 +1,7 @@
 /**
  * Node script to preprocess api.json files for use in the UI5 SDKs.
  *
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/lib/processors/jsdoc/lib/ui5/plugin.js

@@ -1,7 +1,7 @@
 /*
  * JSDoc3 plugin for UI5 documentation generation.
  *
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/lib/processors/jsdoc/lib/ui5/template/publish.js

@@ -1,7 +1,7 @@
 /*
  * JSDoc3 template for UI5 documentation generation.
  *
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/lib/processors/jsdoc/lib/ui5/template/utils/typeParser.js

@@ -1,7 +1,7 @@
 /**
  * Node script to parse type strings.
  *
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

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/lib/processors/minifier.js

@@ -274,6 +274,7 @@ export default async function({
 			filename,
 			dbgFilename,
 			code,
+			resourcePath,
 			sourceMapOptions
 		}, taskUtil);
 		resource.setString(result.code);

package/lib/processors/minifierWorker.js

@@ -30,6 +30,7 @@ const copyrightCommentsAndBundleCommentPattern = /copyright|\(c\)(?:[0-9]+|\s+[0
  * @param {string} parameters.filename
  * @param {string} parameters.dbgFilename
  * @param {string} parameters.code
+ * @param {string} parameters.resourcePath
  * @param {object} parameters.sourceMapOptions
  * @returns {Promise<undefined>} Promise resolving once minification of the resource has finished
  */
@@ -37,6 +38,7 @@ export default async function execMinification({
 	filename,
 	dbgFilename,
 	code,
+	resourcePath,
 	sourceMapOptions
 }) {
 	try {
@@ -61,7 +63,7 @@ export default async function execMinification({
 	} catch (err) {
 		// Note: err.filename contains the debug-name
 		throw new Error(
-			`Minification failed with error: ${err.message} in file ${filename} ` +
+			`Minification failed with error: ${err.message} in file ${resourcePath} ` +
 			`(line ${err.line}, col ${err.col}, pos ${err.pos})`, {
 				cause: err
 			});

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ui5/builder",
-	"version": "4.0.5",
+	"version": "4.0.7",
 	"description": "UI5 Tooling - Builder",
 	"author": {
 		"name": "SAP SE",
@@ -132,32 +132,32 @@
 		"jsdoc": "^4.0.4",
 		"less-openui5": "^0.11.6",
 		"pretty-data": "^0.40.0",
-		"semver": "^7.6.3",
-		"terser": "^5.37.0",
+		"semver": "^7.7.2",
+		"terser": "^5.39.2",
 		"workerpool": "^9.2.0",
 		"xml2js": "^0.6.2"
 	},
 	"devDependencies": {
 		"@eslint/js": "^9.14.0",
-		"@istanbuljs/esm-loader-hook": "^0.2.0",
+		"@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.16.0",
+		"eslint": "^9.27.0",
 		"eslint-config-google": "^0.14.0",
 		"eslint-plugin-ava": "^15.0.1",
-		"eslint-plugin-jsdoc": "^50.6.0",
-		"esmock": "^2.6.9",
-		"globals": "^15.13.0",
+		"eslint-plugin-jsdoc": "^50.6.17",
+		"esmock": "^2.7.0",
+		"globals": "^16.1.0",
 		"line-column": "^1.0.2",
 		"nyc": "^17.1.0",
 		"open-cli": "^8.0.0",
 		"rimraf": "^6.0.1",
-		"sinon": "^19.0.2",
+		"sinon": "^20.0.0",
 		"tap-xunit": "^2.4.1"
 	}
 }

package/.reuse/dep5

@@ -1,33 +0,0 @@
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: ui5-builder
-Upstream-Contact: SAP OpenUI5 <openui5@sap.com>
-Source: https://github.com/SAP/ui5-builder
-Disclaimer: The code in this project may include calls to APIs (“API Calls”) of
- SAP or third-party products or services developed outside of this project
- (“External Products”).
- “APIs” means application programming interfaces, as well as their respective
- specifications and implementing code that allows software to communicate with
- other software.
- API Calls to External Products are not licensed under the open source license
- that governs this project. The use of such API Calls and related External
- Products are subject to applicable additional agreements with the relevant
- provider of the External Products. In no event shall the open source license
- that governs this project grant any rights in or to any External Products,or
- alter, expand or supersede any terms of the applicable additional agreements.
- If you have a valid license agreement with SAP for the use of a particular SAP
- External Product, then you may make use of any API Calls included in this
- project’s code for that SAP External Product, subject to the terms of such
- license agreement. If you do not have a valid license agreement for the use of
- a particular SAP External Product, then you may only make use of any API Calls
- in this project for that SAP External Product for your internal, non-productive
- and non-commercial test and evaluation of such API Calls. Nothing herein grants
- you any rights to use or access any SAP External Product, or provide any third
- parties the right to use of access any SAP External Product, through API Calls.
-
-Files: *
-Copyright: 2018-2024 SAP SE or an SAP affiliate company and UI5 Tooling contributors
-License: Apache-2.0
-
-Files: lib/processors/jsdoc/lib/*
-Copyright: 2009-2024 SAP SE or an SAP affiliate company and OpenUI5 contributors
-License: Apache-2.0