@ui5/builder 3.1.1 → 3.3.0

package/.reuse/dep5

@@ -25,9 +25,9 @@ Disclaimer: The code in this project may include calls to APIs (“API Calls”)
  parties the right to use of access any SAP External Product, through API Calls.
 
 Files: *
-Copyright: 2018-2023 SAP SE or an SAP affiliate company and UI5 Tooling contributors
+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-2023 SAP SE or an SAP affiliate company and OpenUI5 contributors
+Copyright: 2009-2024 SAP SE or an SAP affiliate company and OpenUI5 contributors
 License: Apache-2.0

package/CHANGELOG.md

@@ -2,10 +2,28 @@
 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/v3.1.1...HEAD).
+A list of unreleased changes can be found [here](https://github.com/SAP/ui5-builder/compare/v3.3.0...HEAD).
+
+<a name="v3.3.0"></a>
+## [v3.3.0] - 2024-01-18
+### Features
+- **flexChangesBundler:** Merge existing with new flexibility-bundle.json [`fd070ab`](https://github.com/SAP/ui5-builder/commit/fd070abaa22680ee70b448fa0ac406a8f2b57cc5)
+
+
+<a name="v3.2.0"></a>
+## [v3.2.0] - 2023-12-12
+### Bug Fixes
+- Incomplete multi-character sanitization ([#959](https://github.com/SAP/ui5-builder/issues/959)) [`d61f1b7`](https://github.com/SAP/ui5-builder/commit/d61f1b744495f5428db33467218077e7996f1575)
+- Add guard against prototype pollution ([#960](https://github.com/SAP/ui5-builder/issues/960)) [`ba230d9`](https://github.com/SAP/ui5-builder/commit/ba230d922cac0acd291dfe18b0ae7a95eae8b190)
+- Incomplete string escaping or encoding ([#958](https://github.com/SAP/ui5-builder/issues/958)) [`50bb0d9`](https://github.com/SAP/ui5-builder/commit/50bb0d97e76fb312412cf29fae18b76cc88df6f4)
+- **manifestCreator:** set fallbackLocale to empty string if no locale is present ([#962](https://github.com/SAP/ui5-builder/issues/962)) [`26526a0`](https://github.com/SAP/ui5-builder/commit/26526a08ff38ee11ed3bd506f7ef0610f1d1ccb0)
+
+### Features
+- depCache bundling mode ([#951](https://github.com/SAP/ui5-builder/issues/951)) [`f2cf564`](https://github.com/SAP/ui5-builder/commit/f2cf564f0f71d635e58a743c7bdef1f427e341b2)
+
 
 <a name="v3.1.1"></a>
-## [v3.1.1] - 2023-11-19
+## [v3.1.1] - 2023-11-20
 ### Bug Fixes
 - Handle graceful termination of workerpool for parallel builds ([#953](https://github.com/SAP/ui5-builder/issues/953)) [`f7b9f27`](https://github.com/SAP/ui5-builder/commit/f7b9f27ac5966bd89e52e4c2d5b03482a0f3dbb7)
 - **Bundling:** Detect manifest.json dependency of libraries [`6f9995f`](https://github.com/SAP/ui5-builder/commit/6f9995f5b47a6094fa93b5d433be849b1d3cdc7e)
@@ -839,6 +857,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)
+[v3.3.0]: https://github.com/SAP/ui5-builder/compare/v3.2.0...v3.3.0
+[v3.2.0]: https://github.com/SAP/ui5-builder/compare/v3.1.1...v3.2.0
 [v3.1.1]: https://github.com/SAP/ui5-builder/compare/v3.1.0...v3.1.1
 [v3.1.0]: https://github.com/SAP/ui5-builder/compare/v3.0.9...v3.1.0
 [v3.0.9]: https://github.com/SAP/ui5-builder/compare/v3.0.8...v3.0.9

package/LICENSE.txt

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2018-2023 SAP SE or an SAP affiliate company and UI5 Tooling contributors
+   Copyright 2018-2024 SAP SE or an SAP affiliate company and UI5 Tooling contributors
 
    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/AutoSplitter.js

@@ -41,6 +41,8 @@ class AutoSplitter {
 		const numberOfParts = options.numberOfParts;
 		let totalSize = 0;
 		const moduleSizes = Object.create(null);
+		const depCacheSizes = [];
+		let depCacheLoaderSize = 0;
 		this.optimize = !!options.optimize;
 
 		// ---- resolve module definition
@@ -74,6 +76,27 @@ class AutoSplitter {
 					totalSize += "sap.ui.requireSync('');".length + toRequireJSName(module).length;
 				});
 				break;
+			case SectionType.DepCache:
+				depCacheLoaderSize = "sap.ui.loader.config({depCacheUI5:{}});".length;
+				totalSize += depCacheLoaderSize;
+
+				section.modules.forEach( (module) => {
+					promises.push((async () => {
+						const resource = await this.pool.findResourceWithInfo(module);
+						const deps = resource.info.dependencies.filter(
+							(dep) =>
+								!resource.info.isConditionalDependency(dep) &&
+								!resource.info.isImplicitDependency(dep)
+						);
+						if (deps.length > 0) {
+							const depSize = `"${module}": [${deps.map((dep) => `"${dep}"`).join(",")}],`.length;
+							totalSize += depSize;
+
+							depCacheSizes.push({size: depSize, module});
+						}
+					})());
+				});
+				break;
 			default:
 				break;
 			}
@@ -180,6 +203,36 @@ class AutoSplitter {
 					totalSize += 21 + toRequireJSName(module).length;
 				});
 				break;
+			case SectionType.DepCache:
+				currentSection = {
+					mode: SectionType.DepCache,
+					filters: []
+				};
+				currentModule.sections.push( currentSection );
+				totalSize += depCacheLoaderSize;
+
+				depCacheSizes.forEach((depCache) => {
+					if ( part + 1 < numberOfParts && totalSize + depCache.size / 2 > partSize ) {
+						part++;
+						// start a new module
+						totalSize = depCacheLoaderSize;
+						currentSection = {
+							mode: SectionType.DepCache,
+							filters: []
+						};
+						currentModule = {
+							name: moduleNameWithPart.replace(/__part__/, part),
+							sections: [currentSection]
+						};
+						splittedModules.push(currentModule);
+					}
+
+					if (!currentSection.filters.includes(depCache.module)) {
+						currentSection.filters.push(depCache.module);
+						totalSize += depCache.size;
+					}
+				});
+				break;
 			default:
 				break;
 			}

package/lib/lbt/bundle/Builder.js

@@ -71,6 +71,14 @@ const EVOBundleFormat = {
 			resolvedModule.executes(MODULE__UI5LOADER_AUTOCONFIG) ||
 			resolvedModule.executes(MODULE__JQUERY_SAP_GLOBAL) ||
 			resolvedModule.executes(MODULE__SAP_UI_CORE_CORE);
+	},
+
+	beforeDepCache(outW) {
+		outW.writeln(`sap.ui.loader.config({depCacheUI5:{`);
+	},
+
+	afterDepCache(outW) {
+		outW.writeln(`}});`);
 	}
 };
 
@@ -220,6 +228,8 @@ class BundleBuilder {
 			return this.writeBundleInfos([section]);
 		case SectionType.Require:
 			return this.writeRequires(section);
+		case SectionType.DepCache:
+			return this.writeDepCache(section);
 		default:
 			throw new Error("unknown section mode " + section.mode);
 		}
@@ -549,6 +559,59 @@ class BundleBuilder {
 		});
 	}
 
+	// When AutoSplit is enabled for depCache, we need to ensure that modules
+	// are not duplicated across files. This might happen due to the filters provided.
+	// So, certain modules that are included in depCache could be dependencies of another
+	// module in the next file. This will also duplicate its dependency definition if we do not filter.
+	#depCacheSet = new Set();
+	async writeDepCache(section) {
+		const outW = this.outW;
+		let hasDepCache = false;
+
+		const sequence = section.modules.slice().sort();
+
+		if (sequence.length > 0) {
+			for (const module of sequence) {
+				if (this.#depCacheSet.has(module)) {
+					continue;
+				}
+
+				this.#depCacheSet.add(module);
+				let resource = null;
+				try {
+					resource = await this.pool.findResourceWithInfo(module);
+				} catch (e) {
+					log.error(`    couldn't find ${module}`);
+				}
+
+				if (resource != null) {
+					const deps = resource.info.dependencies.filter(
+						(dep) =>
+							!resource.info.isConditionalDependency(dep) &&
+							!resource.info.isImplicitDependency(dep)
+					);
+					if (deps.length > 0) {
+						if (!hasDepCache) {
+							hasDepCache = true;
+							outW.ensureNewLine();
+							this.targetBundleFormat.beforeDepCache(outW, section);
+						}
+
+						outW.writeln(
+							`"${module}": [${deps.map((dep) => `"${dep}"`).join(",")}],`
+						);
+					} else {
+						log.verbose(`    skipped ${module}, no dependencies`);
+					}
+				}
+			}
+
+			if (hasDepCache) {
+				this.targetBundleFormat.afterDepCache(outW, section);
+			}
+		}
+	}
+
 	async getSourceMapForModule({moduleName, moduleContent, resourcePath}) {
 		let moduleSourceMap = null;
 		let newModuleContent = moduleContent;

package/lib/lbt/bundle/BundleDefinition.js

@@ -27,5 +27,12 @@ export const SectionType = {
 	 * Usually used as the last section in a merged module to enforce loading and
 	 * execution of some specific module or modules.
 	 */
-	Require: "require"
+	Require: "require",
+
+	/**
+	 * Dependency cache information that lists modules and their dependencies
+	 * of all types: JS, declarative views/fragments.
+	 * Only the dependencies of the modules are stored as 'depCache' configuration.
+	 */
+	DepCache: "depCache"
 };

package/lib/lbt/bundle/ResolvedBundleDefinition.js

@@ -64,7 +64,11 @@ class ResolvedBundleDefinition {
 				return Promise.all(
 					modules.map( (submodule) => {
 						return pool.getModuleInfo(submodule).then(
-							(subinfo) => bundleInfo.addSubModule(subinfo)
+							(subinfo) => {
+								if (!bundleInfo.subModules.includes(subinfo.name)) {
+									bundleInfo.addSubModule(subinfo);
+								}
+							}
 						);
 					})
 				);

package/lib/lbt/bundle/Resolver.js

@@ -198,7 +198,7 @@ class BundleResolver {
 			let oldIgnoredResources;
 			let oldSelectedResourcesSequence;
 
-			if ( section.mode == SectionType.Require ) {
+			if ( [SectionType.Require, SectionType.DepCache].includes(section.mode) ) {
 				oldSelectedResources = selectedResources;
 				oldIgnoredResources = visitedResources;
 				oldSelectedResourcesSequence = selectedResourcesSequence;
@@ -254,7 +254,7 @@ class BundleResolver {
 			});
 
 			return Promise.all(promises).then( function() {
-				if ( section.mode == SectionType.Require ) {
+				if ( [SectionType.Require, SectionType.DepCache].includes(section.mode) ) {
 					newKeys = selectedResourcesSequence;
 					selectedResources = oldSelectedResources;
 					visitedResources = oldIgnoredResources;

package/lib/lbt/resources/ResourceFilterList.js

@@ -12,7 +12,7 @@ function makeFileTypePattern(fileTypes) {
 		if ( !type.startsWith(".") ) {
 			type = "." + type;
 		}
-		return type.replace(/[*+?.()|^$]/g, "\\$&");
+		return type.replace(/[*+?.()|^$\\]/g, "\\$&");
 	}).join("|") + ")";
 }
 

package/lib/processors/bundlers/flexChangesBundler.js

@@ -20,9 +20,11 @@ import {createResource} from "@ui5/fs/resourceFactory";
  * @param {string} parameters.options.pathPrefix Prefix for bundle path
  * @param {string} parameters.options.hasFlexBundleVersion true if minUI5Version >= 1.73 than
  *															create flexibility-bundle.json
+ * @param {object} [parameters.existingFlexBundle={}] Object with existing flexibility-bundle.json
+ * 															to merge with new changes
  * @returns {Promise<@ui5/fs/Resource[]>} Promise resolving with flex changes bundle resources
  */
-export default function({resources, options: {pathPrefix, hasFlexBundleVersion}}) {
+export default function({resources, options: {pathPrefix, hasFlexBundleVersion}, existingFlexBundle = {}}) {
 	let bundleName = "changes-bundle.json";
 
 	function sortByTimeStamp(a, b) {
@@ -86,7 +88,7 @@ export default function({resources, options: {pathPrefix, hasFlexBundleVersion}}
 			return JSON.stringify(changes);
 		} else {
 			bundleName = "flexibility-bundle.json";
-			const newChangeFormat = {
+			let newChangeFormat = {
 				changes,
 				compVariants,
 				variants,
@@ -94,11 +96,33 @@ export default function({resources, options: {pathPrefix, hasFlexBundleVersion}}
 				variantDependentControlChanges,
 				variantManagementChanges
 			};
-
+			if (Object.keys(existingFlexBundle).length > 0) {
+				newChangeFormat = mergeFlexChangeBundles(newChangeFormat);
+			}
 			return JSON.stringify(newChangeFormat);
 		}
 	}
 
+	/**
+	 * Merge new and existing bundles
+	 *
+	 * @param {object} newFlexBundle Object with new content of flexibility-bundle.json
+	 * @returns {object} Object with merged content of new and existing flexibility-bundle.json
+	 */
+	function mergeFlexChangeBundles(newFlexBundle) {
+		const result = {};
+
+		Object.keys(newFlexBundle).forEach((key) => {
+			if (existingFlexBundle[key] && Array.isArray(existingFlexBundle[key])) {
+				result[key] = existingFlexBundle[key].concat(newFlexBundle[key]);
+			} else {
+				result[key] = newFlexBundle[key];
+			}
+		});
+
+		return result;
+	}
+
 	return Promise.all(resources.map((resource) => {
 		return resource.getBuffer().then((buffer) => {
 			return JSON.parse(buffer.toString());

package/lib/processors/jsdoc/lib/createIndexFiles.cjs

@@ -1,7 +1,7 @@
 /*
  * Node script to create cross-library API index files for use in the UI5 SDKs.
  *
- * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -135,10 +135,11 @@ function createIndexFiles(versionInfoFile, unpackedTestresourcesRoot, targetFile
 	function collectLists(oSymbol) {
 
 		function addData(oDataType, oEntityObject, sObjectType, sSymbolName) {
-			let sSince = oDataType !== "since" ? oEntityObject[oDataType].since : oEntityObject.since,
-				oData = {
+			const sSince = oDataType !== "since" ? oEntityObject[oDataType].since : oEntityObject.since;
+			const sText = oDataType !== "since" ? oEntityObject[oDataType].text : oEntityObject.description;
+			const oData = {
 					control: sSymbolName,
-					text: oEntityObject[oDataType].text || oEntityObject.description,
+					text: sText || undefined,
 					type: sObjectType,
 					"static": !!oEntityObject.static,
 					visibility: oEntityObject.visibility
@@ -173,7 +174,7 @@ function createIndexFiles(versionInfoFile, unpackedTestresourcesRoot, targetFile
 			addData("deprecated", oSymbol, "class", oSymbol.name);
 		}
 
-		if (oSymbol.experimental) {
+		if (oSymbol.experimental && !oSymbol.deprecated) {
 			addData("experimental", oSymbol, "class", oSymbol.name);
 		}
 
@@ -187,7 +188,7 @@ function createIndexFiles(versionInfoFile, unpackedTestresourcesRoot, targetFile
 				addData("deprecated", oMethod, "methods", oSymbol.name);
 			}
 
-			if (oMethod.experimental) {
+			if (oMethod.experimental && !oSymbol.deprecated) {
 				addData("experimental", oMethod, "methods", oSymbol.name);
 			}
 
@@ -202,7 +203,7 @@ function createIndexFiles(versionInfoFile, unpackedTestresourcesRoot, targetFile
 				addData("deprecated", oEvent, "events", oSymbol.name);
 			}
 
-			if (oEvent.experimental) {
+			if (oEvent.experimental && !oSymbol.deprecated) {
 				addData("experimental", oEvent, "events", oSymbol.name);
 			}
 
@@ -469,6 +470,17 @@ function createIndexFiles(versionInfoFile, unpackedTestresourcesRoot, targetFile
 
 					aKeys.forEach((sKey) => {
 						oSorted[sKey] = oList[sKey];
+						oSorted[sKey].apis.sort((a,b) => {
+							const keyA = `${a.control}|${a.entityName || ""}`.toLowerCase();
+							const keyB = `${b.control}|${b.entityName || ""}`.toLowerCase();
+							if ( keyA === keyB ) {
+								if ( a.static === b.static ) {
+									return 0;
+								}
+								return a.static ? -1 : 1;
+							}
+							return keyA < keyB ? -1 : 1;
+						}); // sort entries within the same version alphabetically (case insensitive)
 					});
 
 					return oSorted;

package/lib/processors/jsdoc/lib/transformApiJson.cjs

@@ -1,10 +1,12 @@
 /*
  * Node script to preprocess api.json files for use in the UI5 SDKs.
  *
- * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
+/* eslint-disable */
+
 "use strict";
 const cheerio = require("cheerio");
 const path = require('path');
@@ -462,8 +464,9 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 
 						// Description
 						if (oAggregation.deprecated) {
-							oAggregation.description = formatters.formatDescription(oAggregation.description,
-								oAggregation.deprecated.text, oAggregation.deprecated.since);
+							oAggregation.description = formatters.formatDescription(oAggregation.description);
+							oAggregation.deprecatedText = formatters.formatDeprecated(oAggregation.deprecated.since,
+								oAggregation.deprecated.text);
 						} else {
 							oAggregation.description = formatters.formatDescriptionSince(oAggregation.description, oAggregation.since);
 						}

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

@@ -1,7 +1,7 @@
 /*
  * JSDoc3 plugin for UI5 documentation generation.
  *
- * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -21,7 +21,7 @@
  *   experimental
  *
  *   final
- * 
+ *
  *   hideconstructor
  *
  *   interface
@@ -32,7 +32,7 @@
  *
  *   ui5-restricted
  *
- * 
+ *
  *
  * It furthermore listens to the following JSDoc3 events to implement additional functionality
  *
@@ -2137,7 +2137,7 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 			"",
 			newStyle && info.doc ? info.doc : "",
 			"",
-			"@returns {sap.ui.core.ID" + (info.cardinality === "0..n" ? "[]" : "") + "}",
+			`@returns {${info.cardinality === "0..n" ? "sap.ui.core.ID[]" : "sap.ui.core.ID|null"}}`,
 			info.since ? "@since " + info.since : "",
 			info.deprecation ? "@deprecated " + info.deprecation : "",
 			info.experimental ? "@experimental " + info.experimental : "",
@@ -2923,7 +2923,7 @@ exports.handlers = {
 				};
 			}
 
-			if ( doclet.kind === 'member' && doclet.isEnum && Array.isArray(doclet.properties) ) {
+			if ( (doclet.kind === 'member' || doclet.kind === 'constant') && doclet.isEnum && Array.isArray(doclet.properties) ) {
 				// determine unique enum identifier from key set
 				let enumID = doclet.properties.map(function(prop) {
 					return prop.name;

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

@@ -1,7 +1,7 @@
 /*
  * JSDoc3 template for UI5 documentation generation.
  *
- * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -89,6 +89,10 @@ function merge(target, source) {
 	if ( source != null ) {
 		// simple single source merge
 		Object.keys(source).forEach((prop) => {
+			// guarding against prototype pollution. (https://codeql.github.com/codeql-query-help/javascript/js-prototype-pollution-utility/#example)
+			if (prop === "__proto__" || prop === "constructor") {
+				return;
+			}
 			const value = source[prop];
 			if ( value != null && value.constructor === Object ) {
 				merge(target[prop] || {}, value);
@@ -169,7 +173,7 @@ function isModuleExport($) {
 }
 
 function isaClass($) {
-	return /^(namespace|interface|class|typedef)$/.test($.kind) || ($.kind === 'member' && $.isEnum )/* isNonEmptyNamespace($) */;
+	return /^(namespace|interface|class|typedef)$/.test($.kind) || (($.kind === 'member' || $.kind === 'constant') && $.isEnum )/* isNonEmptyNamespace($) */;
 }
 
 function supportsInheritance($) {
@@ -187,7 +191,7 @@ function supportsInheritance($) {
 function isFirstClassSymbol($) {
 	return (
 		/^(namespace|interface|class|typedef)$/.test($.kind)
-		|| $.kind === 'member' && $.isEnum
+		|| ($.kind === 'member' || $.kind === 'constant') && $.isEnum
 		|| ['function', 'member'].includes($.kind) && isModuleExport($)
 	)/* isNonEmptyNamespace($) */;
 }
@@ -723,7 +727,7 @@ function getMembersOfKind(data, kind) {
 	switch (kind) {
 	case 'property':
 		fnFilter = function($) {
-			return $.kind === 'constant' || ($.kind === 'member' && !$.isEnum);
+			return ($.kind === 'constant' || $.kind === 'member') && !$.isEnum;
 		};
 		break;
 	case 'event':
@@ -2030,7 +2034,7 @@ function createAPIJSON4Symbol(symbol, omitDefaults) {
 	}
 	*/
 
-	const kind = (symbol.kind === 'member' && symbol.isEnum) ? "enum" : symbol.kind; // handle pseudo-kind 'enum'
+	const kind = ((symbol.kind === 'member' || symbol.kind === 'constant') && symbol.isEnum) ? "enum" : symbol.kind; // handle pseudo-kind 'enum'
 
 	tag(kind);
 
@@ -2118,7 +2122,13 @@ function createAPIJSON4Symbol(symbol, omitDefaults) {
 			// secTags(symbol); // TODO repeat from class?
 			closeTag("constructor");
 
+		} else {
+
+			// even though the constructor is omitted here, the "hide" information is needed because in TypeScript it even exists when omitted
+			attrib("hideconstructor", true, /* default */ false, /* raw */ true); // as boolean
+
 		}
+
 	} else if ( kind === 'namespace' ) {
 		if ( symbol.__ui5.stereotype || symbol.__ui5.metadata ) {
 			tag("ui5-metadata");

package/lib/processors/manifestCreator.js

@@ -233,7 +233,11 @@ async function createManifest(
 			if ( library.getDocumentation() ) {
 				let desc = library.getDocumentation();
 				// remove all tags
-				desc = desc.replace(/\s+/g, " ").replace(/<\/?[a-zA-Z][a-zA-Z0-9_$.]*(\s[^>]*)>/g, "");
+				let prevDesc;
+				do { // Safely strip tags (https://codeql.github.com/codeql-query-help/javascript/js-incomplete-multi-character-sanitization/#example)
+					prevDesc = desc;
+					desc = desc.replace(/\s+/g, " ").replace(/<\/?[a-zA-Z][a-zA-Z0-9_$.]*(\s[^>]*)>/g, "");
+				} while (prevDesc !== desc);
 				// extract summary (first sentence)
 				const m = /^([\w\W]+?[.;!?])[^a-zA-Z0-9_$]/.exec(desc);
 				return m ? m[1] : desc;
@@ -556,9 +560,11 @@ async function createManifest(
 
 		const supportedLocalesArray = Array.from(supportedLocales);
 		supportedLocalesArray.sort();
+
 		return {
 			bundleUrl: i18n,
-			supportedLocales: supportedLocalesArray
+			supportedLocales: supportedLocalesArray,
+			fallbackLocale: supportedLocalesArray.length === 1 ? supportedLocalesArray[0] : undefined
 		};
 	}
 

package/lib/tasks/bundlers/generateFlexChangesBundle.js

@@ -83,15 +83,21 @@ export default async function({workspace, taskUtil, options = {}}) {
 	if (allResources.length > 0) {
 		const version = semver.coerce(await readManifestMinUI5Version());
 		let hasFlexBundleVersion = false;
+		let flexBundle = {};
 		if (semver.compare(version, "1.73.0") >= 0) {
 			hasFlexBundleVersion = true;
+			const flexBundleResource = await workspace.byPath(`${pathPrefix}/changes/flexibility-bundle.json`);
+			if (flexBundleResource) {
+				flexBundle = JSON.parse(await flexBundleResource.getString());
+			}
 		}
 		const processedResources = await flexChangesBundler({
 			resources: allResources,
 			options: {
 				pathPrefix,
 				hasFlexBundleVersion
-			}
+			},
+			existingFlexBundle: flexBundle
 		});
 		await Promise.all(processedResources.map((resource) => {
 			log.verbose("Writing flexibility changes bundle");

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ui5/builder",
-	"version": "3.1.1",
+	"version": "3.3.0",
 	"description": "UI5 Tooling - Builder",
 	"author": {
 		"name": "SAP SE",
@@ -47,7 +47,7 @@
 		"jsdoc-watch": "npm run jsdoc && chokidar \"./lib/**/*.js\" -c \"npm run jsdoc-generate\"",
 		"preversion": "npm test",
 		"version": "git-chglog --sort semver --next-tag v$npm_package_version -o CHANGELOG.md v3.0.0.. && git add CHANGELOG.md",
-		"postversion": "git push --follow-tags",
+		"prepublishOnly": "git push --follow-tags",
 		"release-note": "git-chglog --sort semver -c .chglog/release-config.yml v$npm_package_version",
 		"depcheck": "depcheck --ignores @ui5/builder,docdash,@istanbuljs/esm-loader-hook,catharsis --parsers='**/*.js:es6,**/*.cjs:es6'"
 	},
@@ -131,26 +131,26 @@
 		"pretty-data": "^0.40.0",
 		"rimraf": "^5.0.5",
 		"semver": "^7.5.4",
-		"terser": "^5.24.0",
+		"terser": "^5.27.0",
 		"workerpool": "^6.5.1",
 		"xml2js": "^0.6.2"
 	},
 	"devDependencies": {
 		"@istanbuljs/esm-loader-hook": "^0.2.0",
-		"@jridgewell/trace-mapping": "^0.3.20",
-		"@ui5/project": "^3.7.3",
+		"@jridgewell/trace-mapping": "^0.3.21",
+		"@ui5/project": "^3.9.0",
 		"ava": "^5.3.1",
-		"chai": "^4.3.10",
+		"chai": "^4.4.1",
 		"chai-fs": "^2.0.0",
 		"chokidar-cli": "^3.0.0",
 		"cross-env": "^7.0.3",
 		"depcheck": "^1.4.7",
 		"docdash": "^2.0.2",
-		"eslint": "^8.54.0",
+		"eslint": "^8.56.0",
 		"eslint-config-google": "^0.14.0",
 		"eslint-plugin-ava": "^14.0.0",
-		"eslint-plugin-jsdoc": "^46.9.0",
-		"esmock": "^2.6.0",
+		"eslint-plugin-jsdoc": "^46.10.1",
+		"esmock": "^2.6.2",
 		"line-column": "^1.0.2",
 		"nyc": "^15.1.0",
 		"open-cli": "^7.2.0",