@sap/cds-dk 8.9.2 → 8.9.3

package/CHANGELOG.md

@@ -7,6 +7,17 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/).
 
+## Version 8.9.3 - 2025-04-24
+
+### Fixed
+
+- `cds add workzone` uses the backend destination `srv-api` instead of `{{appName}}-srv-api` on Cloud Foundry.
+- `cds init` uses latest Maven Java archetype version 3.9.1 for creating Java projects.
+
+### Changed
+
+- `cds add pipeline` also creates UI5 resources if required.
+
 ## Version 8.9.2 - 2025-04-16
 
 ### Fixed

package/lib/build/provider/mtx-extension/index.js

@@ -124,8 +124,8 @@ class MtxExtensionBuildPlugin extends InternalBuildPlugin {
     _linter() {
         let linter
         try {
-            // Make sure cds-mtxs APIs are loaded
-            linter = require('@sap/cds-mtxs').xt?.linter
+            // Make sure cds-mtxs APIs are loaded, from local mtxs preferrably
+            linter = require(require.resolve('@sap/cds-mtxs', { paths: [cds.root, __dirname] })).xt?.linter
             if (!linter) {
                 this.pushMessage('MTXS linter cannot be loaded. Update of @sap/cds-dk and @sap/cds-mtxs modules required? Skipping extension model lint step.')
                 return null // too old mtxs

package/lib/init/constants.js

@@ -5,7 +5,7 @@ module.exports = {
     COMMAND_ADD: 'add',
 
     JAVA_LTS_VERSIONS: [17, 21],
-    MAVEN_ARCHETYPE_VERSION: '3.9.0',
+    MAVEN_ARCHETYPE_VERSION: '3.9.1',
 
     OPTIONS: Object.freeze({
         COMPLETION: 'completion',

package/lib/init/template/destination/files/mta.yaml.hbs

@@ -29,7 +29,7 @@ resources:
           instance:
             existing_destinations_policy: update
             destinations:
-              - Name: {{appName}}-srv-api
+              - Name: srv-api
                 URL: ~{srv-api/srv-url}
                 Authentication: NoAuthentication
                 Type: HTTP

package/lib/init/template/pipeline/files/app-package.json.hbs

@@ -0,0 +1,20 @@
+{
+  "name": "{{app}}"{{#hasUI5}},
+  "version": "1.0.0",
+  "main": "webapp/index.html",
+  "scripts": {
+    "build": "ui5 build preload --clean-dest --config ui5-deploy.yaml",
+    "build-local": "ui5 build preload --clean-dest",
+    "start": "ui5 serve"
+  },
+  "devDependencies": {
+    "@ui5/cli": "^4",
+    "ui5-task-zipper": "^3"
+  },
+  "ui5": {
+    "dependencies": [
+      "ui5-task-zipper"
+    ]
+  }
+  {{/hasUI5}}
+}

package/lib/init/template/pipeline/files/ui5-deploy.yaml.hbs

@@ -0,0 +1,25 @@
+---
+# yaml-language-server: $schema=https://sap.github.io/ui5-tooling/schema/ui5.yaml.json
+specVersion: '3.1'
+metadata:
+  name: {{app}}
+type: application
+resources:
+  configuration:
+    propertiesFileSourceEncoding: UTF-8
+builder:
+  resources:
+    excludes:
+      - "/test/**"
+      - "/localService/**"
+  customTasks:
+    - name: ui5-task-zipper
+      afterTask: generateVersionInfo
+      configuration:
+        archiveName: {{app}}
+        additionalFiles:
+          - xs-app.json
+    {{#isTypescript}}
+    - name: ui5-tooling-transpile-task
+      afterTask: replaceVersion
+    {{/isTypescript}}

package/lib/init/template/pipeline/files/ui5.yaml.hbs

@@ -0,0 +1,6 @@
+---
+# yaml-language-server: $schema=https://sap.github.io/ui5-tooling/schema/ui5.yaml.json
+specVersion: '3.1'
+metadata:
+  name: {{app}}
+type: application

package/lib/init/template/pipeline/index.js

@@ -1,6 +1,8 @@
-const { join } = require('path');
+const { join } = require('path')
 const cds = require('../../../cds')
 const { exists, copy } = cds.utils
+const { readProject } = require('../../projectReader')
+const { merge } = require('../../merge')
 const { URLS } = require('../../constants')
 
 module.exports = class PipelineTemplate extends require('../../plugin') {
@@ -23,6 +25,20 @@ module.exports = class PipelineTemplate extends require('../../plugin') {
 
     async run() {
         await copy(join(__dirname, 'files')).to(cds.root)
+
+        const project = readProject()
+        const { apps, appPath, hasUI5 } = project
+
+        if (hasUI5) { // UI5 integration might be needed even without HTML5 repo
+            for (const { app } of apps) {
+                project.app = app
+                await Promise.all([
+                    merge(__dirname, 'files/app-package.json.hbs').into(join(appPath, app, 'package.json'), { project }),
+                    merge(__dirname, 'files/ui5.yaml.hbs').into(join(appPath, app, 'ui5.yaml'), { project }),
+                    merge(__dirname, 'files/ui5-deploy.yaml.hbs').into(join(appPath, app, 'ui5-deploy.yaml'), { project })
+                ])
+            }
+        }
     }
 
     async finalize() {

package/lib/init/template/workzone-standard/files/mta.yaml.hbs

@@ -69,7 +69,7 @@ resources:
           instance:
             existing_destinations_policy: update
             destinations:
-              - Name: {{appName}}-srv-api
+              - Name: srv-api
                 URL: ~{srv-api/srv-url}
                 Authentication: NoAuthentication
                 Type: HTTP

package/lib/init/template/workzone-standard/files/xs-app.json.hbs

@@ -4,7 +4,7 @@
     {
       "source": "^/?odata/(.*)$",
       "target": "/odata/$1",
-      "destination": "{{appName}}-srv-api",
+      "destination": "srv-api",
       {{#hasXsuaa}}"authenticationType": "xsuaa",{{/hasXsuaa}}
       "csrfProtection": true
     },

package/lib/init/template/workzone-standard/index.js

@@ -40,7 +40,7 @@ module.exports = class extends require('../../plugin') {
 
   async combine() {
     const project = readProject()
-    const { isJava, hasMta, srvPath, apps, appPath, appName, appUIPaths, hasMultitenancy } = project
+    const { isJava, hasMta, srvPath, apps, appPath, appUIPaths, hasMultitenancy } = project
 
     await Promise.all(appUIPaths.map(p => {
       project.uiApp = p
@@ -51,7 +51,7 @@ module.exports = class extends require('../../plugin') {
       const additions = [odataApi]
       const overwrites = [{
         item: [odataApi, 'destination'],
-        withValue: `${appName}-srv-api`
+        withValue: `srv-api`
       }]
       project.app = app
       await merge(__dirname, 'files/xs-app.json.hbs').into(join(appPath, app, 'xs-app.json'), { with: project, additions, overwrites })

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@sap/cds-dk",
-  "version": "8.9.2",
+  "version": "8.9.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@sap/cds-dk",
-      "version": "8.9.2",
+      "version": "8.9.3",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@cap-js/asyncapi": "^1.0.0",
@@ -43,7 +43,7 @@
       }
     },
     "node_modules/@cap-js/db-service": {
-      "version": "1.19.1",
+      "version": "1.20.0",
       "license": "SEE LICENSE",
       "optional": true,
       "dependencies": {
@@ -64,11 +64,11 @@
       }
     },
     "node_modules/@cap-js/sqlite": {
-      "version": "1.10.0",
+      "version": "1.11.0",
       "license": "SEE LICENSE",
       "optional": true,
       "dependencies": {
-        "@cap-js/db-service": "^1.19.0",
+        "@cap-js/db-service": "^1.20.0",
         "better-sqlite3": "^11.0.0"
       },
       "peerDependencies": {
@@ -76,7 +76,7 @@
       }
     },
     "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.6.0",
+      "version": "4.6.1",
       "license": "MIT",
       "dependencies": {
         "eslint-visitor-keys": "^3.4.3"
@@ -128,7 +128,7 @@
       }
     },
     "node_modules/@eslint/core": {
-      "version": "0.12.0",
+      "version": "0.13.0",
       "license": "Apache-2.0",
       "dependencies": {
         "@types/json-schema": "^7.0.15"
@@ -159,7 +159,7 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.24.0",
+      "version": "9.25.1",
       "license": "MIT",
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -183,16 +183,6 @@
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
-    "node_modules/@eslint/plugin-kit/node_modules/@eslint/core": {
-      "version": "0.13.0",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@types/json-schema": "^7.0.15"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      }
-    },
     "node_modules/@humanfs/core": {
       "version": "0.19.1",
       "license": "Apache-2.0",
@@ -311,7 +301,7 @@
       }
     },
     "node_modules/@sap/cds-mtxs": {
-      "version": "2.7.1",
+      "version": "2.7.2",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/hdi-deploy": ">=4",
@@ -836,7 +826,7 @@
       }
     },
     "node_modules/detect-libc": {
-      "version": "2.0.3",
+      "version": "2.0.4",
       "license": "Apache-2.0",
       "optional": true,
       "engines": {
@@ -936,17 +926,17 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.24.0",
+      "version": "9.25.1",
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.12.1",
         "@eslint/config-array": "^0.20.0",
-        "@eslint/config-helpers": "^0.2.0",
-        "@eslint/core": "^0.12.0",
+        "@eslint/config-helpers": "^0.2.1",
+        "@eslint/core": "^0.13.0",
         "@eslint/eslintrc": "^3.3.1",
-        "@eslint/js": "9.24.0",
-        "@eslint/plugin-kit": "^0.2.7",
+        "@eslint/js": "9.25.1",
+        "@eslint/plugin-kit": "^0.2.8",
         "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@humanwhocodes/retry": "^0.4.2",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds-dk",
-  "version": "8.9.2",
+  "version": "8.9.3",
   "description": "Command line client and development toolkit for the SAP Cloud Application Programming Model",
   "homepage": "https://cap.cloud.sap/",
   "keywords": [