fix: Update Adp writer deploy scripts

.changeset/dull-moons-brush.md

@@ -0,0 +1,5 @@
+---
+'@sap-ux/adp-tooling': patch
+---
+
+Update deploy scripts and ui5.yaml with latest ui5 builder configurations

packages/adp-tooling/src/types.ts

@@ -531,6 +531,24 @@ export interface CustomConfig {
         support: ToolsSupport;
     };
 }
+export interface CloudTarget {
+    url: string | undefined;
+    authenticationType: string | undefined;
+    ignoreCertErrors: boolean;
+}
+
+export interface OnPremTarget {
+    destination?: string;
+}
+
+export type CloudCustomTaskConfigTarget = OnPremTarget | CloudTarget;
+
+export interface CloudCustomTaskConfig {
+    type: string;
+    appName: string | undefined;
+    languages: Language[];
+    target: CloudCustomTaskConfigTarget;
+}
 
 export interface InboundChangeContentAddInboundId {
     inbound: {

packages/adp-tooling/src/writer/options.ts

@@ -14,9 +14,10 @@ import type {
     Content,
     CloudApp,
     ChangeInboundNavigation,
-    InternalInboundNavigation
+    InternalInboundNavigation,
+    CloudCustomTaskConfig,
+    CloudCustomTaskConfigTarget
 } from '../types';
-
 /**
  * Generate the configuration for the middlewares required for the ui5.yaml.
  *
@@ -178,21 +179,32 @@ function addOpenSourceMiddlewares(ui5Config: UI5Config, config: AdpWriterConfig)
  * @returns list of required tasks.
  */
 function getAdpCloudCustomTasks(config: AdpWriterConfig & { target: AbapTarget } & { app: CloudApp }): CustomTask[] {
+    let target: CloudCustomTaskConfigTarget;
+    if (config.target.destination) {
+        target = { destination: config.target.destination };
+    } else {
+        target = {
+            url: config.target.url,
+            authenticationType: config.target.authenticationType,
+            ignoreCertErrors: false
+        };
+    }
+    const configuration: CloudCustomTaskConfig = {
+        type: 'abap',
+        appName: config?.app?.bspName,
+        languages: config?.app?.languages?.map((language: Language) => {
+            return {
+                sap: language.sap,
+                i18n: language.i18n
+            };
+        }),
+        target
+    };
     return [
         {
             name: 'app-variant-bundler-build',
             beforeTask: 'escapeNonAsciiCharacters',
-            configuration: {
-                type: 'abap',
-                destination: config.target?.destination,
-                appName: config?.app?.bspName,
-                languages: config?.app?.languages?.map((language: Language) => {
-                    return {
-                        sap: language.sap,
-                        i18n: language.i18n
-                    };
-                })
-            }
+            configuration
         }
     ];
 }

packages/adp-tooling/templates/project/package.json

@@ -15,14 +15,15 @@
         "@sap-ux/ui5-proxy-middleware": "^1.3.0",
         "@sap-ux/deploy-tooling": "^0.11.7"<%}%>,
         "@ui5/task-adaptation": "^1.3.0",
-        "@ui5/cli": "^3.9.2"
+        "@ui5/cli": "^3.9.2"<%if (locals.deploy) {%>,
+        "rimraf": "^5.0.5"<%}%>
     },
     "scripts": {
         "build": "ui5 build --exclude-task generateFlexChangesBundle generateComponentPreload minify --clean-dest",
         "start": "<%= locals.options?.fioriTools ? 'fiori run' : 'ui5 serve' %> --open /test/flp.html#app-preview",
         "start-editor": "<%= locals.options?.fioriTools ? 'fiori run' : 'ui5 serve' %> --open /test/adaptation-editor.html"<%if (locals.deploy) {%>,
-        "deploy": "ui5 build --config ui5-deploy.yaml --exclude-task <%= locals.options?.fioriTools ? 'deploy-to-abap' : 'abap-deploy-task' %> generateFlexChangesBundle generateComponentPreload --clean-dest && <%= locals.options?.fioriTools ? 'fiori deploy' : 'deploy' %> --config ui5-deploy.yaml",
-        "undeploy": "<%= locals.options?.fioriTools ? 'fiori undeploy' : 'undeploy' %> --config ui5-deploy.yaml --lrep \"apps/<%= app.reference %>/appVariants/<%= app.id %>/\"",
+        "deploy": "npm run build && <%= locals.options?.fioriTools ? 'fiori deploy' : 'deploy' %> --config ui5-deploy.yaml && rimraf archive.zip",
+        "undeploy": "npm run build && <%= locals.options?.fioriTools ? 'fiori undeploy' : 'undeploy' %> --config ui5-deploy.yaml",
         "deploy-test": "npm run build && fiori deploy --config ui5-deploy.yaml --testMode true"<%}%>
     }
 }