@sap-ux/adp-tooling 0.12.84 → 0.12.87

package/dist/types.d.ts

@@ -468,6 +468,15 @@ export interface CustomConfig {
         support: ToolsSupport;
     };
 }
+export type CloudCustomTaskConfigTarget = DestinationAbapTarget | (Pick<UrlAbapTarget, 'url' | 'client' | 'scp' | 'authenticationType'> & {
+    ignoreCertErrors?: boolean;
+});
+export interface CloudCustomTaskConfig {
+    type: string;
+    appName: string | undefined;
+    languages: Language[];
+    target: AbapTarget;
+}
 export interface InboundChangeContentAddInboundId {
     inbound: {
         [inboundId: string]: AddInboundModel;

package/dist/writer/options.js

@@ -6,6 +6,7 @@ exports.enhanceUI5YamlWithCustomConfig = enhanceUI5YamlWithCustomConfig;
 exports.hasDeployConfig = hasDeployConfig;
 exports.enhanceUI5DeployYaml = enhanceUI5DeployYaml;
 exports.enhanceManifestChangeContentWithFlpConfig = enhanceManifestChangeContentWithFlpConfig;
+const VSCODE_URL = 'https://REQUIRED_FOR_VSCODE.example';
 /**
  * Generate the configuration for the middlewares required for the ui5.yaml.
  *
@@ -68,7 +69,7 @@ function enhanceUI5DeployYaml(ui5Config, config) {
  */
 function addFioriToolsMiddlewares(ui5Config, config) {
     const backendConfig = { ...config.target };
-    backendConfig.url ??= 'https://REQUIRED_FOR_VSCODE.example';
+    backendConfig.url ??= VSCODE_URL;
     backendConfig.path = '/sap';
     ui5Config.addFioriToolsAppReloadMiddleware();
     ui5Config.addCustomMiddleware([
@@ -152,21 +153,36 @@ function addOpenSourceMiddlewares(ui5Config, config) {
  * @returns list of required tasks.
  */
 function getAdpCloudCustomTasks(config) {
+    let target;
+    if (config?.target?.destination) {
+        target = {
+            destination: config.target.destination,
+            url: config.target?.url ?? VSCODE_URL
+        };
+    }
+    else {
+        target = {
+            url: config.target.url ?? VSCODE_URL,
+            authenticationType: config.target.authenticationType,
+            ignoreCertErrors: false
+        };
+    }
+    const configuration = {
+        type: 'abap',
+        appName: config?.app?.bspName,
+        languages: config?.app?.languages?.map((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) => {
-                    return {
-                        sap: language.sap,
-                        i18n: language.i18n
-                    };
-                })
-            }
+            configuration
         }
     ];
 }

package/package.json

@@ -9,7 +9,7 @@
   "bugs": {
     "url": "https://github.com/SAP/open-ux-tools/issues?q=is%3Aopen+is%3Aissue+label%3Abug+label%3Aadp-tooling"
   },
-  "version": "0.12.84",
+  "version": "0.12.87",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -34,12 +34,12 @@
     "uuid": "10.0.0",
     "@sap-ux/axios-extension": "1.17.4",
     "@sap-ux/btp-utils": "0.17.0",
-    "@sap-ux/inquirer-common": "0.5.4",
+    "@sap-ux/inquirer-common": "0.5.5",
     "@sap-ux/logger": "0.6.0",
-    "@sap-ux/project-access": "1.28.7",
-    "@sap-ux/project-input-validator": "0.3.3",
+    "@sap-ux/project-access": "1.28.8",
+    "@sap-ux/project-input-validator": "0.3.4",
     "@sap-ux/system-access": "0.5.19",
-    "@sap-ux/ui5-config": "0.25.2"
+    "@sap-ux/ui5-config": "0.26.0"
   },
   "devDependencies": {
     "@types/adm-zip": "0.5.5",

package/templates/project/package.json

@@ -21,8 +21,8 @@
         "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",
+        "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"<%}%>
     }
 }