@ui5/task-adaptation 1.5.2-rc.1 → 1.5.2

package/CHANGELOG.md

@@ -2,13 +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.5.2-rc.1...HEAD).
+A list of unreleased changes can be found [here](https://github.com/SAP/ui5-task-adaptation/compare/v1.5.2...HEAD).
 
-<a name="v1.5.2-rc.1"></a>
-## [v1.5.2-rc.1] - 2025-08-22
+<a name="v1.5.2"></a>
+## [v1.5.2] - 2025-08-25
+### Bug Fixes
+- Removed moved changes [`babdc1b`](https://github.com/SAP/ui5-task-adaptation/commit/babdc1bce8e407b2638e014cfaa4e6547bba10ac)
 
-<a name="v1.5.2-rc.0"></a>
-## [v1.5.2-rc.0] - 2025-08-19
 
 <a name="v1.5.1"></a>
 ## [v1.5.1] - 2025-08-06
@@ -125,8 +125,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.5.2-rc.1]: https://github.com/SAP/ui5-task-adaptation/compare/v1.5.2-rc.0...v1.5.2-rc.1
-[v1.5.2-rc.0]: https://github.com/SAP/ui5-task-adaptation/compare/v1.5.1...v1.5.2-rc.0
+[v1.5.2]: https://github.com/SAP/ui5-task-adaptation/compare/v1.5.1...v1.5.2
 [v1.5.1]: https://github.com/SAP/ui5-task-adaptation/compare/v1.4.3...v1.5.1
 [v1.4.3]: https://github.com/SAP/ui5-task-adaptation/compare/v1.4.2...v1.4.3
 [v1.4.2]: https://github.com/SAP/ui5-task-adaptation/compare/v1.4.0...v1.4.2

package/dist/baseAppManager.js

@@ -104,6 +104,9 @@ export default class BaseApp {
     }
     VALIDATION_RULES = new Map([["sap.app/id", (value) => {
                 if (!value.includes(".")) {
+                    // https://help.sap.com/docs/bas/developing-sap-fiori-app-in-sap-business-application-studio/releasing-sap-fiori-application-to-be-extensible-in-adaptation-projects-on-sap-s-4hana-cloud
+                    // In the manifest.json file, make sure that the attribute
+                    // sap.app/id has at least 2 segments.
                     throw new Error(`The original application id '${value}' should consist of multiple segments split by dot, e.g.: original.id`);
                 }
             }]]);

package/dist/index.js

@@ -1,5 +1,5 @@
 import * as dotenv from "dotenv";
-import { logBetaUsage, logBuilderVersion } from "./util/commonUtil.js";
+import { logBuilderVersion } from "./util/commonUtil.js";
 import AppVariant from "./appVariantManager.js";
 import BaseApp from "./baseAppManager.js";
 import I18nMerger from "./util/i18nMerger.js";
@@ -13,7 +13,6 @@ export default ({ workspace, options, taskUtil }) => {
     dotenv.config();
     async function process(workspace, taskUtil) {
         logBuilderVersion();
-        logBetaUsage();
         const processor = determineProcessor(options.configuration);
         const adaptationProject = await AppVariant.fromWorkspace(workspace, options.projectNamespace);
         const appVariantIdHierarchy = await processor.getAppVariantIdHierarchy(adaptationProject.reference);

package/dist/processors/cfProcessor.js

@@ -41,7 +41,7 @@ export default class CFProcessor {
         // Also skip if no routes or no routes with a destination property
         const xsAppJson = JSON.parse(xsAppJsonContent);
         if (!Array.isArray(xsAppJson.routes) || !xsAppJson.routes.some((route) => route.destination)) {
-            log.info(`No routes with 'destination' found in xs-app.json for app '${this.configuration.appName}'. Skipping xs-app.json update.`);
+            log.verbose(`No routes with 'destination' found in xs-app.json for app '${this.configuration.appName}'. Skipping xs-app.json update.`);
             return;
         }
         const { serviceInstanceName, space } = this.configuration;
@@ -61,7 +61,7 @@ export default class CFProcessor {
             baseAppFiles.set("xs-app.json", JSON.stringify(xsAppJson, null, 2));
         }
         else {
-            log.warn(`No endpoints found for app '${this.configuration.appName}'. xs-app.json will not be updated.`);
+            log.info(`No endpoints found for app '${this.configuration.appName}'. xs-app.json will not be updated.`);
         }
     }
     enhanceRoutesWithEndpointAndService(serviceCredentials, baseRoutes) {

package/dist/util/cfUtil.js

@@ -214,7 +214,7 @@ export default class CFUtil {
             return validKey.credentials;
         }
         const uniqueServiceKeyName = await uniqueServiceKeyNamePromise;
-        log.info(`No valid service key found with proper endpoints structure. Creating new service key '${uniqueServiceKeyName}' for '${serviceInstance.name}'`);
+        log.verbose(`No valid service key found with proper endpoints structure. Creating new service key '${uniqueServiceKeyName}' for '${serviceInstance.name}'`);
         await this.createServiceKey(serviceInstance.name, uniqueServiceKeyName);
         // Get the newly created service key and validate its endpoints
         const newValidKey = await this.getServiceKeyWithValidEndpoints(serviceInstance.guid);

package/package.json

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

package/scripts/publish.ts

@@ -1,256 +0,0 @@
-import { promises as fs } from "fs";
-import path from "path";
-import yargs from "yargs";
-import { hideBin } from "yargs/helpers";
-import { Octokit } from "@octokit/rest";
-import { retry } from "@octokit/plugin-retry";
-
-const OctokitClass = Octokit.plugin(retry);
-
-
-/**
- * Recursively get all file paths in the workspace root, excluding:
- *   - test/lib/integration
- *   - test/fixtures
- *   - test/expected
- *   - test/lib/index.perf.ts
- * Returns relative paths from the root.
- */
-async function getAllRootFilesExceptTestExclusions(root: string): Promise<string[]> {
-    const excludeDirs = [
-        "test/lib/integration",
-        "test/fixtures",
-        "test/expected",
-        ".git",
-        "coverage",
-        ".DS_Store",
-        "node_modules",
-        ".nyc_output",
-        "coverage",
-        "dist",
-        "dist-debug",
-        "dist.zip",
-        ".env",
-        "test/resources/metadata/download"
-    ];
-    const excludeFiles = [
-        "test/lib/index.perf.ts",
-        "scripts/test-integration-prep.sh",
-        "Jenkinsfile"
-    ];
-
-    async function walk(dir: string): Promise<string[]> {
-        const dirents = await fs.readdir(dir, { withFileTypes: true });
-        const files: string[] = [];
-        for (const dirent of dirents) {
-            const relPath = path.relative(root, path.join(dir, dirent.name));
-            if (excludeDirs.some(ex => relPath === ex || relPath.startsWith(ex + path.sep))) {
-                continue;
-            }
-            if (excludeFiles.includes(relPath)) {
-                continue;
-            }
-            if (dirent.isDirectory()) {
-                files.push(...await walk(path.join(dir, dirent.name)));
-            } else {
-                files.push(relPath);
-            }
-        }
-        return files;
-    }
-    return walk(root);
-}
-
-const FILES = await getAllRootFilesExceptTestExclusions(process.cwd());
-
-
-interface PublishArgs {
-    p?: string;
-    dryRun?: boolean;
-    tag?: string;
-    branch?: string;
-    [key: string]: unknown;
-}
-
-async function publish() {
-    const argv = yargs(hideBin(process.argv))
-        .option("p", {
-            type: "string",
-            description: "GitHub token (-p)",
-            alias: "p"
-        })
-        .option("dryRun", {
-            type: "boolean",
-            description: "Run without publishing",
-            default: false
-        })
-        .option("tag", {
-            type: "string",
-            description: "Publish with a specific tag"
-        })
-        .option("branch", {
-            type: "string",
-            description: "Branch to update (default: main)",
-            default: "main",
-            alias: "b"
-        })
-        .help()
-        .alias("h", "help")
-        .parseSync() as PublishArgs;
-
-    if (argv.dryRun) {
-        console.log("Dry run: no publishing will be performed.");
-        return;
-    }
-    const auth = argv.p;
-    if (auth) {
-        const octokit = new OctokitClass({ auth });
-        const ORGANIZATION = "SAP";
-        const REPO = "ui5-task-adaptation";
-        await uploadToRepo(octokit, ORGANIZATION, REPO, argv.branch);
-        if (argv.tag) {
-            console.log(`Published with tag: ${argv.tag}`);
-        }
-    } else {
-        console.log("Github token is not provided.");
-    }
-}
-
-
-async function getLatestVersion(): Promise<string> {
-    const pkg = await fs.readFile(path.join(process.cwd(), "package.json"), { encoding: "utf-8" });
-    const pkgJson = JSON.parse(pkg);
-    return pkgJson.version;
-}
-
-
-async function uploadToRepo(
-    octokit: InstanceType<typeof OctokitClass>,
-    org: string,
-    repo: string,
-    branch: string = "main"
-): Promise<void> {
-    const fileBlobs = await Promise.all(Object.values(FILES).map(file => toBlob(octokit, org, repo, path.join(process.cwd(), file))));
-    const currentCommit = await getCurrentCommit(octokit, org, repo, branch);
-    const newTree = await createNewTree(
-        octokit,
-        org,
-        repo,
-        fileBlobs,
-        FILES,
-        currentCommit.treeSha
-    );
-    const currentVersion = await getLatestVersion();
-    const commitMessage = `Release ${currentVersion}`;
-    const newCommit = await createNewCommit(
-        octokit,
-        org,
-        repo,
-        commitMessage,
-        newTree.sha,
-        currentCommit.commitSha
-    );
-    await setBranchToCommit(octokit, org, repo, branch, newCommit.sha);
-}
-
-
-async function getCurrentCommit(
-    octokit: InstanceType<typeof OctokitClass>,
-    org: string,
-    repo: string,
-    branch: string = "main"
-): Promise<{ commitSha: string; treeSha: string }> {
-    const { data: refData } = await octokit.git.getRef({
-        owner: org,
-        repo,
-        ref: `heads/${branch}`,
-    });
-    const commitSha = refData.object.sha
-    const { data: commitData } = await octokit.git.getCommit({
-        owner: org,
-        repo,
-        commit_sha: commitSha,
-    });
-    return {
-        commitSha,
-        treeSha: commitData.tree.sha,
-    }
-}
-
-
-async function toBlob(
-    octokit: InstanceType<typeof OctokitClass>,
-    org: string,
-    repo: string,
-    filePath: string
-): Promise<{ sha: string }> {
-    const content = await fs.readFile(filePath, { encoding: "utf8" });
-    const blobData = await octokit.git.createBlob({
-        owner: org,
-        repo,
-        content,
-        encoding: "utf-8",
-    })
-    return blobData.data;
-}
-
-
-async function createNewTree(
-    octokit: InstanceType<typeof OctokitClass>,
-    owner: string,
-    repo: string,
-    blobs: { sha: string }[],
-    paths: string[],
-    parentTreeSha: string
-): Promise<any> {
-    const tree = blobs.map(({ sha }, i) => ({
-        path: paths[i],
-        mode: "100644" as const,
-        type: "blob" as const,
-        sha,
-    }));
-    const { data } = await octokit.git.createTree({
-        owner,
-        repo,
-        tree,
-        base_tree: parentTreeSha,
-    })
-    return data;
-}
-
-
-async function createNewCommit(
-    octokit: InstanceType<typeof OctokitClass>,
-    org: string,
-    repo: string,
-    message: string,
-    currentTreeSha: string,
-    currentCommitSha: string
-): Promise<any> {
-    const commit = await octokit.git.createCommit({
-        owner: org,
-        repo,
-        message,
-        tree: currentTreeSha,
-        parents: [currentCommitSha],
-    });
-    return commit.data;
-};
-
-
-async function setBranchToCommit(
-    octokit: InstanceType<typeof OctokitClass>,
-    org: string,
-    repo: string,
-    branch: string = "main",
-    commitSha: string
-): Promise<any> {
-    return octokit.git.updateRef({
-        owner: org,
-        repo,
-        ref: `heads/${branch}`,
-        sha: commitSha,
-    });
-}
-
-publish();

package/scripts/test-integration-prep.sh

@@ -1,4 +0,0 @@
-for d in test/fixtures/*/ ; do
-    echo "$d"
-    npm --prefix $d i
-done