@ui5/task-adaptation 1.0.23 → 1.1.0

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-task-adaptation/compare/v1.0.23...HEAD).
+A list of unreleased changes can be found [here](https://github.com/SAP/ui5-task-adaptation/compare/v1.1.0...HEAD).
+
+<a name="v1.1.0"></a>
+## [v1.1.0] - 2024-01-30
+### Bug Fixes
+- Include app variant id in bundle name [`afab97a`](https://github.com/SAP/ui5-task-adaptation/commit/afab97a10867a58b6e96eb4310f288d29773cf66)
+
 
 <a name="v1.0.23"></a>
 ## [v1.0.23] - 2024-01-19
@@ -67,6 +73,7 @@ A list of unreleased changes can be found [here](https://github.com/SAP/ui5-task
 <a name="v1.0.0"></a>
 ## v1.0.0 - 2020-12-09
 
+[v1.1.0]: https://github.com/SAP/ui5-task-adaptation/compare/v1.0.23...v1.1.0
 [v1.0.23]: https://github.com/SAP/ui5-task-adaptation/compare/v1.0.21...v1.0.23
 [v1.0.21]: https://github.com/SAP/ui5-task-adaptation/compare/v1.0.20...v1.0.21
 [v1.0.20]: https://github.com/SAP/ui5-task-adaptation/compare/v1.0.19...v1.0.20

package/dist/appVariantManager.d.ts

@@ -7,11 +7,4 @@ export default class AppVariantManager {
     private static isManifestAppVariant;
     static getAppVariantInfo(appVariantResources: any[]): Promise<IAppVariantInfo>;
     private static omitFiles;
-    /**
-     * We need to add texts properties to changes because not all have texts property.
-     * Changes without texts property can causes issues in bundle.js
-     * This is needed for now, and will be removed as soon as change merger in openUI5 is updated
-     * @param changes
-     */
-    private static patchMissingTextsNode;
 }

package/dist/appVariantManager.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const commonUtil_1 = require("./util/commonUtil");
 const resourceUtil_1 = require("./util/resourceUtil");
 const path_1 = require("path");
-const log = require("@ui5/logger").getLogger("@ui5/task-adaptation::AppVariantManager");
+const commonUtil_1 = require("./util/commonUtil");
 const EXTENSIONS = "js,json,xml,html,properties,change,appdescr_variant";
 class AppVariantManager {
     static async process(appVariantResources, projectNamespace, taskUtil) {
@@ -11,7 +10,6 @@ class AppVariantManager {
         for (const resource of appVariantResources) {
             this.omitFiles(resource, taskUtil);
         }
-        this.patchMissingTextsNode(appVariantInfo?.manifest?.content ?? []);
         await this.renameChanges(appVariantResources, projectNamespace, appVariantInfo);
         return appVariantInfo;
     }
@@ -73,22 +71,6 @@ class AppVariantManager {
             taskUtil.setTag(resource, taskUtil.STANDARD_TAGS.OmitFromBuildResult, true);
         }
     }
-    /**
-     * We need to add texts properties to changes because not all have texts property.
-     * Changes without texts property can causes issues in bundle.js
-     * This is needed for now, and will be removed as soon as change merger in openUI5 is updated
-     * @param changes
-     */
-    static patchMissingTextsNode(changes) {
-        log.verbose("Adjusting appdescr_ui5_addNewModelEnhanceWith with module");
-        for (const change of changes) {
-            if (change.changeType === "appdescr_ui5_addNewModelEnhanceWith") {
-                if (!change.texts && change.content?.bundleUrl) {
-                    change.texts = { i18n: change.content.bundleUrl };
-                }
-            }
-        }
-    }
 }
 exports.default = AppVariantManager;
 //# sourceMappingURL=appVariantManager.js.map

package/dist/baseAppManager.d.ts

@@ -23,5 +23,6 @@ export default class BaseAppManager {
     private static fillAppVariantIdHierarchy;
     static validateProperty(value: string, property: string): void;
     static applyDescriptorChanges(baseAppManifest: any, appVariantInfo: IAppVariantInfo): Promise<void>;
+    private static adjustAddNewModelEnhanceWith;
     static writeToWorkspace(baseAppFiles: Map<string, string>, projectNamespace: string): any[];
 }

package/dist/baseAppManager.js

@@ -12,7 +12,7 @@ class BaseAppManager {
     static async process(baseAppFiles, appVariantInfo, options, processor) {
         const baseAppManifest = this.getBaseAppManifest(baseAppFiles);
         const { id, version } = this.getIdVersion(baseAppManifest.content);
-        const renamedBaseAppFiles = (0, commonUtil_1.renameResources)(baseAppFiles, appVariantInfo.reference, appVariantInfo.id);
+        const renamedBaseAppFiles = (0, commonUtil_2.renameResources)(baseAppFiles, appVariantInfo.reference, appVariantInfo.id);
         const { filepath, content } = this.getBaseAppManifest(renamedBaseAppFiles);
         await processor.updateLandscapeSpecificContent(content, renamedBaseAppFiles);
         this.fillAppVariantIdHierarchy(processor, id, version, content);
@@ -56,7 +56,7 @@ class BaseAppManager {
         return i18nNode["bundleName"].replace(sapAppId, "").replaceAll(".", "/").substring(1);
     }
     static extractI18NFromBundleUrl(i18nNode) {
-        return (0, commonUtil_2.removePropertiesExtension)(i18nNode["bundleUrl"]);
+        return (0, commonUtil_1.removePropertiesExtension)(i18nNode["bundleUrl"]);
     }
     static getBaseAppManifest(baseAppFiles) {
         let filepath = [...baseAppFiles.keys()].find(filepath => filepath.endsWith("manifest.json"));
@@ -94,14 +94,31 @@ class BaseAppManager {
             ...manifest.content,
             ...appVariantInfo.manifestChanges
         ];
-        if (manifest.layer) {
-            allChanges.forEach(item => item.layer = manifest.layer);
+        const changesContent = new Array();
+        const i18nBundleName = (0, commonUtil_1.dotToUnderscore)(appVariantInfo.id);
+        for (const change of structuredClone(allChanges)) {
+            if (manifest.layer) {
+                change.layer = manifest.layer;
+            }
+            this.adjustAddNewModelEnhanceWith(change, i18nBundleName);
+            changesContent.push(new Change(change));
         }
-        const changesContent = allChanges.map(change => new Change(change));
         if (changesContent.length > 0) {
             await Applier.applyChanges(baseAppManifest, changesContent, strategy);
         }
     }
+    static adjustAddNewModelEnhanceWith(change, i18nBundleName) {
+        if (change.changeType === "appdescr_ui5_addNewModelEnhanceWith") {
+            if (change.texts == null) {
+                // We need to add texts properties to changes because not all
+                // have texts property. Changes without texts property can
+                // causes issues in bundle.js This is needed for now, and will
+                // be removed as soon as change merger in openUI5 is updated
+                change.texts = { i18n: change.content?.bundleUrl || "i18n/i18n.properties" };
+            }
+            change.texts.i18n = i18nBundleName + "/" + change.texts.i18n;
+        }
+    }
     static writeToWorkspace(baseAppFiles, projectNamespace) {
         const IGNORE_FILES = [
             "/manifest-bundle.zip",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ui5/task-adaptation",
-    "version": "1.0.23",
+    "version": "1.1.0",
     "description": "Custom task for ui5-builder which allows building UI5 Flexibility Adaptation Projects for SAP BTP, Cloud Foundry environment",
     "main": "index.js",
     "scripts": {