@ui5/builder 2.11.9 → 2.11.11

package/CHANGELOG.md

@@ -2,7 +2,19 @@
 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/v2.11.9...HEAD).
+A list of unreleased changes can be found [here](https://github.com/SAP/ui5-builder/compare/v2.11.11...HEAD).
+
+<a name="v2.11.11"></a>
+## [v2.11.11] - 2024-01-18
+### Bug Fixes
+- **flexChangesBundler:** Merge existing with new flexibility-bundle.json [`b9e372d`](https://github.com/SAP/ui5-builder/commit/b9e372dfec2abb83f7779112c93480f86a4a4fbb)
+
+
+<a name="v2.11.10"></a>
+## [v2.11.10] - 2023-04-12
+### Dependency Updates
+- Bump xml2js from 0.4.23 to 0.5.0 [`3058c45`](https://github.com/SAP/ui5-builder/commit/3058c459f9514a5ac3526f85c77f26aab311b03e)
+
 
 <a name="v2.11.9"></a>
 ## [v2.11.9] - 2022-11-30
@@ -679,6 +691,8 @@ to load the custom bundle file instead.
 - Add ability to configure component preloads and custom bundles [`2241e5f`](https://github.com/SAP/ui5-builder/commit/2241e5ff98fd95f1f80cc74959655ae7a9c660e7)
 
 
+[v2.11.11]: https://github.com/SAP/ui5-builder/compare/v2.11.10...v2.11.11
+[v2.11.10]: https://github.com/SAP/ui5-builder/compare/v2.11.9...v2.11.10
 [v2.11.9]: https://github.com/SAP/ui5-builder/compare/v2.11.8...v2.11.9
 [v2.11.8]: https://github.com/SAP/ui5-builder/compare/v2.11.7...v2.11.8
 [v2.11.7]: https://github.com/SAP/ui5-builder/compare/v2.11.6...v2.11.7

package/README.md

@@ -9,6 +9,12 @@
 [![npm Package Version](https://badge.fury.io/js/%40ui5%2Fbuilder.svg)](https://www.npmjs.com/package/@ui5/builder)
 [![Coverage Status](https://coveralls.io/repos/github/SAP/ui5-builder/badge.svg)](https://coveralls.io/github/SAP/ui5-builder)
 
+> [UI5 Tooling v3](https://sap.github.io/ui5-tooling/v3) is the latest and stable version 🎉
+>
+> [UI5 Tooling v2](https://sap.github.io/ui5-tooling/v2) has been deprecated 🚫  
+>
+> Please migrate your projects to [UI5 Tooling v3](https://sap.github.io/ui5-tooling/v3/updates/migrate-v3/)!
+
 ## Documentation
 Can be found here: [sap.github.io/ui5-tooling](https://sap.github.io/ui5-tooling/pages/Builder/)
 

package/jsdoc.json

@@ -29,7 +29,7 @@
 	"openGraph": {
 		"title": "UI5 Tooling - API Reference",
 		"type": "website",
-		"image": "https://sap.github.io/ui5-tooling/docs/images/UI5_logo_wide.png",
+		"image": "https://sap.github.io/ui5-tooling/v2/images/UI5_logo_wide.png",
 		"site_name": "UI5 Tooling - API Reference",
 		"url": "https://sap.github.io/ui5-tooling/"
 	},

package/lib/processors/bundlers/flexChangesBundler.js

@@ -12,9 +12,11 @@ const resourceFactory = require("@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<module:@ui5/fs.Resource[]>} Promise resolving with flex changes bundle resources
  */
-module.exports = function({resources, options: {pathPrefix, hasFlexBundleVersion}}) {
+module.exports = function({resources, options: {pathPrefix, hasFlexBundleVersion}, existingFlexBundle = {}}) {
 	let bundleName = "changes-bundle.json";
 
 	function sortByTimeStamp(a, b) {
@@ -78,7 +80,7 @@ module.exports = function({resources, options: {pathPrefix, hasFlexBundleVersion
 			return JSON.stringify(changes);
 		} else {
 			bundleName = "flexibility-bundle.json";
-			const newChangeFormat = {
+			let newChangeFormat = {
 				changes,
 				compVariants,
 				variants,
@@ -86,11 +88,33 @@ module.exports = 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/tasks/bundlers/generateFlexChangesBundle.js

@@ -71,15 +71,21 @@ module.exports = async function({workspace, taskUtil, options: {namespace}}) {
 	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": "2.11.9",
+	"version": "2.11.11",
 	"description": "UI5 Tooling - Builder",
 	"author": {
 		"name": "SAP SE",
@@ -38,7 +38,7 @@
 		"jsdoc-watch": "npm run jsdoc && chokidar \"./lib/**/*.js\" -c \"npm run jsdoc-generate\"",
 		"preversion": "npm test",
 		"version": "git-chglog --next-tag v$npm_package_version -o CHANGELOG.md && git add CHANGELOG.md",
-		"postversion": "git push --follow-tags",
+		"prepublishOnly": "git push --follow-tags",
 		"release-note": "git-chglog -c .chglog/release-config.yml v$npm_package_version",
 		"depcheck": "depcheck --ignores docdash --ignore-patterns lib/processors/jsdoc/lib/ui5"
 	},
@@ -111,26 +111,26 @@
 		"escope": "^4.0.0",
 		"espree": "^6.2.1",
 		"globby": "^11.1.0",
-		"graceful-fs": "^4.2.10",
+		"graceful-fs": "^4.2.11",
 		"jsdoc": "^3.6.11",
-		"less-openui5": "^0.11.3",
+		"less-openui5": "^0.11.6",
 		"make-dir": "^3.1.0",
 		"pretty-data": "^0.40.0",
 		"pretty-hrtime": "^1.0.3",
 		"replacestream": "^4.0.3",
 		"rimraf": "^3.0.2",
-		"semver": "^7.3.8",
-		"terser": "^5.15.1",
-		"xml2js": "^0.4.23",
+		"semver": "^7.5.4",
+		"terser": "^5.27.0",
+		"xml2js": "^0.5.0",
 		"yazl": "^2.5.1"
 	},
 	"devDependencies": {
 		"ava": "^3.15.0",
-		"chai": "^4.3.6",
+		"chai": "^4.4.1",
 		"chai-fs": "^2.0.0",
 		"chokidar-cli": "^3.0.0",
 		"cross-env": "^7.0.3",
-		"depcheck": "^1.4.3",
+		"depcheck": "^1.4.7",
 		"docdash": "^1.2.0",
 		"eslint": "^7.32.0",
 		"eslint-config-google": "^0.14.0",