@ui5/task-adaptation 1.6.4-rc.1 → 1.6.4-rc.2

package/CHANGELOG.md

@@ -2,7 +2,10 @@
 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.6.4-rc.1...HEAD).
+A list of unreleased changes can be found [here](https://github.com/SAP/ui5-task-adaptation/compare/v1.6.4-rc.2...HEAD).
+
+<a name="v1.6.4-rc.2"></a>
+## [v1.6.4-rc.2] - 2026-04-06
 
 <a name="v1.6.4-rc.1"></a>
 ## [v1.6.4-rc.1] - 2026-04-06
@@ -176,6 +179,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.6.4-rc.2]: https://github.com/SAP/ui5-task-adaptation/compare/v1.6.4-rc.1...v1.6.4-rc.2
 [v1.6.4-rc.1]: https://github.com/SAP/ui5-task-adaptation/compare/v1.6.3...v1.6.4-rc.1
 [v1.6.3]: https://github.com/SAP/ui5-task-adaptation/compare/v1.6.2...v1.6.3
 [v1.6.2]: https://github.com/SAP/ui5-task-adaptation/compare/v1.6.1...v1.6.2

package/dist/adapters/commands/i18nPropertiesMergeCommand.js

@@ -26,16 +26,19 @@ export default class I18nPropertiesMergeCommand extends MergeCommand {
             if (i18nPathWithExtension) {
                 // build regex to match specific + language related files
                 const i18nPath = trimExtension(i18nPathWithExtension);
-                const regex = new RegExp("^" + escapeRegex(i18nPath) + TRANSLATION_REGEX_PATTERN);
+                const regexSource = "^" + escapeRegex(i18nPath) + TRANSLATION_REGEX_PATTERN;
                 if (change.changeType.includes("addNewModelEnhanceWith")) {
-                    copyPaths.add(regex);
+                    copyPaths.add(regexSource);
                 }
                 else {
-                    mergePaths.add(regex);
+                    mergePaths.add(regexSource);
                 }
             }
         });
-        return { mergePaths: Array.from(mergePaths), copyPaths: Array.from(copyPaths) };
+        return {
+            mergePaths: Array.from(mergePaths, source => new RegExp(source)),
+            copyPaths: Array.from(copyPaths, source => new RegExp(source))
+        };
     }
     async execute(files, filename, appVariantContent) {
         // merge/copy logic

package/dist/repositories/localRepository.d.ts

@@ -7,8 +7,8 @@ export default class LocalRepository implements IRepository {
     constructor(configuration: IConfiguration);
     downloadAnnotationFile(_uri: string): Promise<Map<string, string>>;
     getAppVariantIdHierarchy(appId: string): Promise<IAppVariantIdHierarchyItem[]>;
-    fetch(appId: string, _cachebusterToken: string): Promise<Map<string, string>>;
-    fetchReuseLib(libName: string, _cachebusterToken: string, _lib: IReuseLibInfo): Promise<Map<string, string>>;
+    fetch(appId: string, cachebusterToken: string): Promise<Map<string, string>>;
+    fetchReuseLib(libName: string, cachebusterToken: string, _lib: IReuseLibInfo): Promise<Map<string, string>>;
     private collectAppVariantIdHierarchyItems;
     private getExistingManifestPath;
     private readFilesInBaseAppDir;

package/dist/repositories/localRepository.js

@@ -17,22 +17,27 @@ export default class LocalRepository {
         await this.collectAppVariantIdHierarchyItems(appId, items);
         return items;
     }
-    fetch(appId, _cachebusterToken) {
-        return this.readFilesInBaseAppDir(appId);
+    fetch(appId, cachebusterToken) {
+        return this.readFilesInBaseAppDir(appId, cachebusterToken);
     }
-    fetchReuseLib(libName, _cachebusterToken, _lib) {
-        return this.readFilesInBaseAppDir(libName);
+    fetchReuseLib(libName, cachebusterToken, _lib) {
+        return this.readFilesInBaseAppDir(libName, cachebusterToken);
     }
     async collectAppVariantIdHierarchyItems(appId, items) {
+        const appDir = this.getLocalFilesDirectory(appId);
+        const filenames = [
+            ["manifest.json"],
+            ["manifest.appdescr_variant"],
+            ["webapp", "manifest.json"],
+            ["webapp", "manifest.appdescr_variant"],
+        ];
+        const filepaths = filenames.map((filename) => path.join(appDir, ...filename));
+        const existingManifestPath = await this.getExistingManifestPath(filepaths);
         items.push({
             appVariantId: appId,
             repoName: appId,
-            cachebusterToken: "local"
+            cachebusterToken: path.dirname(existingManifestPath)
         });
-        const appDir = this.getLocalFilesDirectory(appId);
-        const filenames = ["manifest.json", "manifest.appdescr_variant"];
-        const filepaths = filenames.map((filename) => path.join(appDir, filename));
-        const existingManifestPath = await this.getExistingManifestPath(filepaths);
         if (existingManifestPath.endsWith("manifest.appdescr_variant")) {
             const manifestContent = await fs.readFile(existingManifestPath, "utf-8");
             const manifest = JSON.parse(manifestContent);
@@ -47,10 +52,9 @@ export default class LocalRepository {
         }
         throw new Error(`None of the paths exist: '${filePaths.join("', '")}'.`);
     }
-    readFilesInBaseAppDir(appId) {
-        const appDir = this.getLocalFilesDirectory(appId);
-        log.verbose(`Fetching base app files from local directory: ${appDir}`);
-        return FsUtil.readFilesRecursively(appDir);
+    readFilesInBaseAppDir(_appId, cachebusterToken) {
+        log.verbose(`Fetching base app files from local directory: ${cachebusterToken}`);
+        return FsUtil.readFilesRecursively(cachebusterToken);
     }
     getLocalFilesDirectory(appId) {
         const baseDir = this.configuration.adpDir

package/package.json

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