@sap/cds-dk 9.9.2 → 10.0.3

package/lib/init/template/html5-repo/files/mta.yaml.hbs

@@ -4,7 +4,7 @@ parameters:
 modules:
   - name: {{appName}}-srv
     type: {{language}}
-    path: {{& srvPath}}{{#isJava}}
+    path: {{& srv.path}}{{#isJava}}
     requires:
       - name: {{appName}}-html5-runtime{{/isJava}}
 
@@ -53,9 +53,9 @@ modules:
             Authentication: NoAuthentication
             Type: HTTP
             ProxyType: Internet
-            HTML5.ForwardAuthToken: true
-            HTML5.DynamicDestination: true
-            {{#hasIas}}HTML5.IASDependencyName: {{appName}}-ias-api{{/hasIas}}
+            ForwardAuthToken: true
+            DynamicDestination: true
+            {{#hasIas}}IASDependencyName: {{appName}}-ias-api{{/hasIas}}
     {{/hasWorkzoneStandard}}
 
   {{#apps}}

package/lib/init/template/html5-repo/files/ui5.yaml.hbs

@@ -13,6 +13,10 @@ builder:
       - "/test/**"
       - "/localService/**"
   customTasks:
+    {{#isTypescript}}
+    - name: ui5-tooling-transpile-task
+      afterTask: replaceVersion
+    {{/isTypescript}}
     - name: ui5-task-zipper
       afterTask: generateVersionInfo
       configuration:
@@ -20,7 +24,3 @@ builder:
         relativePaths: true
         additionalFiles:
           - xs-app.json
-    {{#isTypescript}}
-    - name: ui5-tooling-transpile-task
-      afterTask: replaceVersion
-    {{/isTypescript}}

package/lib/init/template/html5-repo/files/values.yaml.hbs

@@ -2,6 +2,9 @@
 html5-apps-repo-host:
   serviceOfferingName: html5-apps-repo
   servicePlanName: app-host
+content-agent-service:
+  serviceOfferingName: content-agent
+  servicePlanName: application
 html5-apps-deployer:
   env:
     SAP_CLOUD_SERVICE: {{strippedAppName}}.service
@@ -11,6 +14,10 @@ html5-apps-deployer:
   image:
     repository: {{appName}}-html5-deployer
   bindings:
+    {{#hasPortal}}
+    portal:
+      serviceInstanceName: portal
+    {{/hasPortal}}
     {{#hasXsuaa}}
     xsuaa:
       serviceInstanceName: xsuaa
@@ -26,6 +33,8 @@ html5-apps-deployer:
       serviceInstanceName: destination
     html5-apps-repo:
       serviceInstanceName: html5-apps-repo-host
+    content-agent-service:
+      serviceInstanceName: content-agent-service
   resources:
     limits:
       cpu: 2000m

package/lib/init/template/html5-repo/index.js

@@ -3,8 +3,7 @@ const { readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
 const { srv4, html5RepoHost, html5Runtime, xsuaa, appDeployer, approuter, mtxSidecar4 } = require('../../registries/mta')
 const { odataApi, html5RepoApi } = require('../../registries/xs-app')
-const { exists } = require('../../../cds').utils
-const { renderAndCopy } = require('../../template')
+const { exists, read } = require('../../../cds').utils
 
 module.exports = class Html5RepoTemplate extends require('../../plugin') {
 
@@ -36,9 +35,9 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
     async combine() {
         const project = readProject()
         const {
-            isJava, srvPath, appPath, apps,
+            isJava, srv, appPath, apps,
             hasApprouter, hasMta, addMta, hasKyma, hasXsuaa, hasMultitenancy, hasUI5,
-            addSample, addApprouter, addContainerize, addKyma, addHelm, addHelmUnifiedRuntime,  addMultitenancy, addWorkzoneStandard, addXsuaa, addIas
+            addSample, addApprouter, addKyma, addMultitenancy, addWorkzoneStandard, addXsuaa, addIas
         } = project
 
         await Promise.all(apps.map(async ({ app }) => {
@@ -46,18 +45,23 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
             project.hasIndexHtml = exists(join(appPath, app, 'webapp/index.html'))
             const additions = [odataApi, html5RepoApi]
             await merge(__dirname, 'files/xs-app.json.hbs').into(join(appPath, app, 'xs-app.json'), { with: project, additions })
-            await merge(__dirname, 'files/app-package.json.hbs').into(join(appPath, app, 'package.json'), { project })
+            const pJsonPath = join(appPath, app, 'package.json')
+            const pJson = exists(pJsonPath) ? await read(pJsonPath) : {}
+            project.ui5 = hasUI5 || pJson.devDependencies?.['@ui5/cli']
+            await merge(__dirname, 'files/app-package.json.hbs').into(pJsonPath, { project })
         }))
 
-        if (hasUI5) {
-            for (const { app } of apps) {
-                project.app = app
-                await merge(__dirname, 'files/app-package.json.hbs').into(join(appPath, app,    'package.json'), { project })
-            }
-
-            for (const { app } of apps) {
-                project.app = app
-                await merge(__dirname, 'files/ui5.yaml.hbs').into(join(appPath, app, 'ui5.yaml'), { project })
+        for (const { app } of apps) {
+            project.app = app
+            const pJsonPath = join(appPath, app, 'package.json')
+            const pJson = exists(pJsonPath) ? await read(pJsonPath) : {}
+            const ui5 = hasUI5 || pJson.devDependencies?.['@ui5/cli']
+            if (ui5) {
+                const isTs = project.isTypescript || !!pJson.devDependencies?.typescript || !!pJson.dependencies?.typescript
+                const additions = [{ in: 'builder.customTasks', where: { name: 'ui5-task-zipper' } }]
+                if (isTs) additions.unshift({ in: 'builder.customTasks', where: { name: 'ui5-tooling-transpile-task' }, at: 0 })
+                project.isTypescript = isTs
+                await merge(__dirname, 'files/ui5.yaml.hbs').into(join(appPath, app, 'ui5.yaml'), { project, additions })
             }
         }
 
@@ -67,7 +71,7 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
 
         const affected = addXsuaa || addApprouter || addWorkzoneStandard || addMultitenancy || addSample || addIas
         if (addMta || affected && hasMta) {
-            const srv = srv4(srvPath)
+            const srvModule = srv4(srv.path)
             project.apps = apps
             const relationships = [{
                 insert: [html5RepoHost, 'name'],
@@ -90,11 +94,11 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
             if (hasMultitenancy) {
                 relationships.push({
                     insert: [html5Runtime, 'name'],
-                    into: [isJava ? srv : mtxSidecar4('gen/mtx/sidecar'), 'requires', 'name']
+                    into: [isJava ? srvModule : mtxSidecar4('gen/mtx/sidecar'), 'requires', 'name']
                 })
                 relationships.push({
                     insert: [html5RepoHost, 'name'],
-                    into: [isJava ? srv : mtxSidecar4('gen/mtx/sidecar'), 'requires', 'name']
+                    into: [isJava ? srvModule : mtxSidecar4('gen/mtx/sidecar'), 'requires', 'name']
                 })
             }
             if (hasXsuaa) {
@@ -105,14 +109,12 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
             }
             await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', {
                 with: project,
-                additions: [srv, appDeployer, html5RepoHost, ...appModules],
+                additions: [srvModule, appDeployer, html5RepoHost, ...appModules],
                 relationships
             })
         }
 
-        // cds10: change to if (addKyma)
-        // needed because of adding kyma to cli options in case of helm
-        if (addContainerize || (addKyma && !addHelm && !addHelmUnifiedRuntime)) {
+        if (addKyma) {
             const additions = [{
                 in: 'modules',
                 where: { name: `${project.appName}-html5-deployer` }
@@ -121,7 +123,6 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
         }
 
         if (addKyma || affected && hasKyma) {
-            await renderAndCopy(join(__dirname, 'files/html5-deployer.package.json.hbs'), 'app/html5-deployer/package.json', project)
             await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', { with: project })
         }
     }

package/lib/init/template/ias/files/Chart.yaml.hbs

@@ -1,6 +1,6 @@
 dependencies:
   - name: service-instance
     alias: identity
-    version: ">0.0.0"{{#hasHelmUnifiedRuntime}}
-    repository: https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz{{/hasHelmUnifiedRuntime}}
+    version: ">0.0.0"{{#hasKymaUnifiedRuntime}}
+    repository: https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz{{/hasKymaUnifiedRuntime}}
 

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

@@ -2,7 +2,7 @@
 modules:
   - name: {{appName}}-srv
     type: {{language}}
-    path: {{& srvPath}}
+    path: {{& srv.path}}
     requires:
       - name: {{appName}}-ias
         parameters:

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

@@ -24,7 +24,7 @@ module.exports = class IasTemplate extends require('../../plugin') {
 
     async combine() {
         const project = readProject()
-        const { isJava, addMta, hasMta, addCfManifest, addKyma, addMultitenancy, hasApprouter, hasMultitenancy, srvPath } = project
+        const { isJava, addMta, hasMta, addCfManifest, addKyma, addMultitenancy, hasApprouter, hasMultitenancy, srv } = project
 
         if (addMultitenancy) {
             const conf = exists('mtx/sidecar/package.json') ? await read('mtx/sidecar/package.json') : {}
@@ -40,10 +40,10 @@ module.exports = class IasTemplate extends require('../../plugin') {
         }
 
         if (addMta || (hasApprouter || hasMultitenancy) && hasMta) {
-            const srv = srv4(srvPath)
-            const srvIdentityBinding = { in: [srv, 'requires'], where: { 'parameters.config.app-identifier': 'srv' } }
-            const srvCertUrlApi = { in: [srv, 'provides'], where: { 'name': 'srv-api' } }
-            const additions = [srv, ias, srvIdentityBinding, srvCertUrlApi]
+            const srvModule = srv4(srv.path)
+            const srvIdentityBinding = { in: [srvModule, 'requires'], where: { 'parameters.config.app-identifier': 'srv' } }
+            const srvCertUrlApi = { in: [srvModule, 'provides'], where: { 'name': 'srv-api' } }
+            const additions = [srvModule, ias, srvIdentityBinding, srvCertUrlApi]
             const overwrites = []
 
             if (hasApprouter) {

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

@@ -1,7 +1,7 @@
 const { join } = require('path')
 const cds = require('../../../cds')
-const { mkdirp, path, rimraf } = cds.utils
-const { env4, readProject } = require('../../projectReader')
+const { mkdirp, path } = cds.utils
+const { env4 } = require('../../projectReader')
 const { renderAndCopy } = require('../../template')
 
 module.exports = class extends require('../../plugin') {
@@ -10,13 +10,5 @@ module.exports = class extends require('../../plugin') {
         const { db, srv, app } = env4('production').folders
         await renderAndCopy(join(__dirname, 'files'), cds.root, { projectName: path.basename(cds.root) })
         await Promise.all([db, srv, app].map(p => mkdirp(p)))
-
-        // cds10: remove
-        // Delete .vscode folder if running in BAS
-        const { isBas } = readProject()
-        if (isBas) {
-            const vscodeFolder = join(cds.root, '.vscode')
-            await rimraf(vscodeFolder)
-        }
     }
 }

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

@@ -2,7 +2,7 @@
 modules:
  - name: {{appName}}-srv
    type: {{language}}
-   path: {{& srvPath}}
+   path: {{& srv.path}}
    requires:
     - name: {{appName}}-kafka
 

package/lib/init/template/kafka/files/values.yaml

@@ -7,4 +7,4 @@ kafka:
   servicePlanName: standard
   parameters:
     public_ip: true
-    allow_access: []
+    allow_access: []

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

@@ -29,16 +29,16 @@ module.exports = class KafkaTemplate extends require('../../plugin') {
 
   async combine() {
     const project = readProject()
-    const { addMta, srvPath, addKyma } = project
+    const { addMta, srv, addKyma } = project
 
     if (addMta) {
-      const srv = srv4(srvPath)
+      const srvModule = srv4(srv.path)
       await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', {
           project,
-          additions: [srv, kafkaMessaging],
+          additions: [srvModule, kafkaMessaging],
           relationships: [{
               insert: [kafkaMessaging, 'name'],
-              into: [srv, 'requires', 'name']
+              into: [srvModule, 'requires', 'name']
           }]
       })
     }

package/lib/init/template/kyma/files/containerize.yaml.hbs

@@ -2,38 +2,38 @@
 _schema-version: '1.0'
 repository: {{& imageRegistry}}
 tag: latest
-{{#hasHelmUnifiedRuntime}}
+{{#hasKymaUnifiedRuntime}}
 {{#isJava}}
 before-all:
   - helm dependency update ./gen/chart
   - mvn clean package -DskipTests=true --batch-mode
 {{/isJava}}
-{{/hasHelmUnifiedRuntime}}
+{{/hasKymaUnifiedRuntime}}
 {{^hasJava}}
-{{#hasHelmUnifiedRuntime}}
+{{#hasKymaUnifiedRuntime}}
 before-all:
   - helm dependency update ./gen/chart
-{{/hasHelmUnifiedRuntime}}
+{{/hasKymaUnifiedRuntime}}
 {{/hasJava}}
-{{^hasHelmUnifiedRuntime}}
+{{^hasKymaUnifiedRuntime}}
 {{#hasJava}}
 before-all:
   - mvn clean package -DskipTests=true --batch-mode
 {{/hasJava}}
-{{/hasHelmUnifiedRuntime}}
+{{/hasKymaUnifiedRuntime}}
 modules:
   - name: {{appName}}-srv
     build-parameters:
       buildpack:
-        {{#hasHelmUnifiedRuntime}}
+        {{#hasKymaUnifiedRuntime}}
         builder: proxy-unified-runtime-dmz.int.repositories.cloud.sap/builder/noble
-        {{/hasHelmUnifiedRuntime}}
-        {{^hasHelmUnifiedRuntime}}
+        {{/hasKymaUnifiedRuntime}}
+        {{^hasKymaUnifiedRuntime}}
         {{#isNodejs}}
         type: nodejs
         {{/isNodejs}}
         builder: builder-jammy-base
-        {{/hasHelmUnifiedRuntime}}
+        {{/hasKymaUnifiedRuntime}}
         path: {{#isNodejs}}gen/srv{{/isNodejs}}{{#isJava}}srv/target/{{appName}}-exec.jar{{/isJava}}
         env:
         {{#isNodejs}}
@@ -41,5 +41,5 @@ modules:
         {{/isNodejs}}
         {{#isJava}}
           SPRING_PROFILES_ACTIVE: cloud
-          BP_JVM_VERSION: 21
+          BP_JVM_VERSION: 25
         {{/isJava}}

package/lib/init/template/kyma/files/values.schema.json

@@ -91,4 +91,4 @@
       ]
     }
   }
-}
+}

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

@@ -47,7 +47,7 @@ module.exports = class KymaTemplate extends require('../../plugin') {
 
   async run() {
     const project = readProject()
-    let registry, domain, tag
+    let registry, domain
     if (!KymaTemplate.hasInProduction() && !project.isBas /* don't run this for the BAS Yeoman generator */) {
       try {
         const domainGuess = execSync(`kubectl config view --minify --output jsonpath="{.clusters[*].cluster.server}"`, { stdio: "pipe" }).toString()
@@ -55,12 +55,6 @@ module.exports = class KymaTemplate extends require('../../plugin') {
         if (domainStartIndex !== -1) domain = domainGuess.substring(domainStartIndex + 4)
       } catch { /* ignore */ }
 
-      // cds10: remove
-      if (exists('containerize.yaml')) {
-        const { repository: r, tag: t } = yaml.parse(join(cds.root, 'containerize.yaml'))
-        if (r) registry = r
-        if (t) tag = t
-      }
       if (!cds.cli.options.y && !cds.cli.options.force) {
         registry ??= await ask4([`registry server: `])
         domain ??= await ask4([`cluster domain: `])
@@ -69,7 +63,7 @@ module.exports = class KymaTemplate extends require('../../plugin') {
     project.registry = registry ?? '<your-container-registry-server>'
     project.domain = domain ?? '<cluster-domain>'
     project.imagePullSecret = 'docker-registry'
-    project.tag = tag ?? 'latest'
+    project.tag = 'latest'
     await copy(join(__dirname, 'files', 'values.schema.json')).to('chart/values.schema.json')
     await merge(__dirname, 'files/Chart.yaml.hbs').into('chart/Chart.yaml', { with: project })
     await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', { with: project })
@@ -84,11 +78,12 @@ module.exports = class KymaTemplate extends require('../../plugin') {
     const {
       addHana, addMultitenancy, addXsuaa, hasApprouter,
       addApprouter, addIas, addAms, hasXsuaa, hasMultitenancy, addWorkzoneStandard,
-      addHtml5Repo, hasHtml5Repo
+      addHtml5Repo, hasHtml5Repo, addAppFrontend
     } = readProject()
 
     if (addHtml5Repo || addWorkzoneStandard || addApprouter && hasHtml5Repo) {
       if (addHtml5Repo) {
+        await KymaTemplate.mergeDependency('service-instance', 'content-agent-service')
         await KymaTemplate.mergeDependency('service-instance', 'html5-apps-repo-host')
         await KymaTemplate.mergeDependency('content-deployment', 'html5-apps-deployer')
       }
@@ -96,6 +91,11 @@ module.exports = class KymaTemplate extends require('../../plugin') {
         await KymaTemplate.mergeDependency('service-instance', 'html5-apps-repo-runtime')
       }
     }
+    if (addAppFrontend) {
+      await KymaTemplate.mergeDependency('service-instance', 'content-agent-service')
+      await KymaTemplate.mergeDependency('service-instance', 'app-front')
+      await KymaTemplate.mergeDependency('content-deployment', 'html5-apps-deployer')
+    }
     if (addMultitenancy || addXsuaa || addIas || addAms) {
       if (addMultitenancy) {
         await KymaTemplate.mergeDependency('web-application', 'sidecar')
@@ -125,7 +125,7 @@ module.exports = class KymaTemplate extends require('../../plugin') {
         name,
         alias,
         version: '>0.0.0',
-        ...((cds.cli.options["unified-runtime"] || project.hasHelmUnifiedRuntime) && { repository: 'https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz' })
+        ...(project.hasKymaUnifiedRuntime && { repository: 'https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz' })
       }]
     }).into('chart/Chart.yaml', {
       with: project,

package/lib/init/template/lint/files/package.json

@@ -3,4 +3,4 @@
     "@sap/eslint-plugin-cds": "^4",
     "eslint": "^10"
   }
-}
+}

package/lib/init/template/malware-scanner/files/mta.yaml.hbs

@@ -2,7 +2,7 @@
 modules:
   - name: {{appName}}-srv
     type: {{language}}
-    path: {{& srvPath}}
+    path: {{& srv.path}}
     requires:
       - name: {{appName}}-malware-scanner
 
@@ -13,4 +13,4 @@ resources:
       service: malware-scanner
       service-plan: clamav
       config:
-        auth: mTLS
+        auth: mTLS

package/lib/init/template/malware-scanner/files/package.json.hbs

@@ -14,4 +14,4 @@
   {{#isNodejs}}
   }
   {{/isNodejs}}
-}
+}

package/lib/init/template/malware-scanner/files/values.yaml

@@ -6,4 +6,4 @@ malware-scanner:
   serviceOfferingName: malware-scanner
   servicePlanName: clamav
   parameters:
-    auth: mTLS
+    auth: mTLS

package/lib/init/template/malware-scanner/index.js

@@ -23,14 +23,14 @@ module.exports = class MalwareScannerTemplate extends require('../../plugin') {
 
     async combine() {
         const project = readProject()
-        const { addMta, addKyma, srvPath } = project
+        const { addMta, addKyma, srv } = project
 
         if (addMta) {
-            const srv = srv4(srvPath)
-            const additions = [srv, malwareScanner ]
+            const srvModule = srv4(srv.path)
+            const additions = [srvModule, malwareScanner ]
             const relationships = [{
                 insert: [malwareScanner, 'name'],
-                into: [srv, 'requires', 'name']
+                into: [srvModule, 'requires', 'name']
             }]
             await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', {
                 with: project, additions, relationships

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

@@ -16,7 +16,7 @@ build-parameters:
 modules:
   - name: {{appName}}-srv
     type: {{language}}
-    path: {{& srvPath}}
+    path: {{& srv.path}}
 {{#isNodejs}}
     parameters:
       instances: 1

package/lib/init/template/mta/files/package.json

@@ -1,5 +1,5 @@
 {
   "devDependencies": {
-    "@sap/cds-dk": "^9"
+    "@sap/cds-dk": "^10"
   }
 }

package/lib/init/template/multitenancy/files/containerize.yaml.hbs

@@ -3,13 +3,13 @@ modules:
   - name: {{appName}}-sidecar
     build-parameters:
       buildpack:
-        {{#hasHelmUnifiedRuntime}}
+        {{#hasKymaUnifiedRuntime}}
         builder: proxy-unified-runtime-dmz.int.repositories.cloud.sap/builder/noble
-        {{/hasHelmUnifiedRuntime}}
-        {{^hasHelmUnifiedRuntime}}
+        {{/hasKymaUnifiedRuntime}}
+        {{^hasKymaUnifiedRuntime}}
         type: nodejs
         builder: builder-jammy-base
-        {{/hasHelmUnifiedRuntime}}
+        {{/hasKymaUnifiedRuntime}}
         path: {{#isNodejs}}gen/{{/isNodejs}}mtx/sidecar{{#isJava}}/gen{{/isJava}}
         env:
-          BP_NODE_RUN_SCRIPTS: ""
+          BP_NODE_RUN_SCRIPTS: ""

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

@@ -2,7 +2,7 @@
 modules:
   - name: {{appName}}-srv
     type: {{language}}
-    path: {{& srvPath}}
+    path: {{& srv.path}}
     requires:
       - name: {{appName}}-registry
         {{#isJava}}

package/lib/init/template/multitenancy/files/package.json.hbs

@@ -1,7 +1,7 @@
 {
   {{#isNodejs}}
   "dependencies": {
-    "@sap/cds-mtxs": "^3"
+    "@sap/cds-mtxs": "^4"
   },
   "cds": {
   {{/isNodejs}}

package/lib/init/template/multitenancy/files/package.sidecar.json.hbs

@@ -1,16 +1,16 @@
 {
   "name": "{{appName}}-mtx",
   "dependencies": {
-    "@cap-js/hana": "^2",
-    "@sap/cds": "^9",
-    "@sap/cds-mtxs": "^3",
+    "@cap-js/hana": "^3",
+    "@sap/cds": "^10",
+    "@sap/cds-mtxs": "^4",
     "@sap/xssec": "^4"
   },
   "devDependencies": {
-    "@cap-js/sqlite": "^2"
+    "@cap-js/sqlite": "^3"
   },
   "engines": {
-    "node": ">=20"
+    "node": "^24"
   },
   "scripts": {
     "start": "cds-serve"{{#isJava}},

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

@@ -44,39 +44,39 @@ module.exports = class MultitenancyTemplate extends require('../../plugin') {
     const project = readProject()
     const {
       isNodejs, isJava, addMta, hasMta,
-      addXsuaa, hasXsuaa, addIas, hasIas, hasHana, addContainerize, addKyma, addHelm, addHelmUnifiedRuntime, hasApprouter,
-      srvPath, appName
+      addXsuaa, hasXsuaa, addIas, hasIas, hasHana, addKyma, hasApprouter,
+      srv, appName
     } = project
 
     if (addMta || (addIas || addXsuaa) && hasMta) {
-      const srv = srv4(srvPath)
+      const srvModule = srv4(srv.path)
       const mtxSidecar = mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar')
-      const modules = [srv, mtxSidecar]
+      const modules = [srvModule, mtxSidecar]
       const services = []
       if (hasIas) services.push(subscriptionManager)
       if (!hasIas || hasXsuaa) services.push(saasRegistry)
-      const apis = [srvApi4(srv), providedMtxApiSidecar4(mtxSidecar)]
+      const apis = [srvApi4(srvModule), providedMtxApiSidecar4(mtxSidecar)]
       if (isJava) {
         const name = hasIas ? '~{mtx-cert-url}' : '~{mtx-url}'
-        apis.push(requiredMtxSidecarApi4(srv, name))
+        apis.push(requiredMtxSidecarApi4(srvModule, name))
       }
       const additions = [...modules, ...services, ...apis]
       const relationships = []
       if (hasXsuaa) {
         relationships.push({
           insert: [saasRegistry, 'name'],
-          into: [isJava ? srv : mtxSidecar, 'requires', 'name']
+          into: [isJava ? srvModule : mtxSidecar, 'requires', 'name']
         })
       }
       if (hasIas) {
         relationships.push({
           insert: [subscriptionManager, 'name'],
-          into: [isJava ? srv : mtxSidecar, 'requires', 'name']
+          into: [isJava ? srvModule : mtxSidecar, 'requires', 'name']
         })
       }
       if (isJava) {
         relationships.push({
-          insert: [srv, 'name'],
+          insert: [srvModule, 'name'],
           into: [mtxSidecar, 'build-parameters.requires', 'name']
         })
       }
@@ -101,8 +101,7 @@ module.exports = class MultitenancyTemplate extends require('../../plugin') {
     }
 
     // cds10 move to if above
-    // needed because of adding kyma to cli options in case of helm
-    if (addContainerize || (addKyma && !addHelm && !addHelmUnifiedRuntime)) {
+    if (addKyma) {
       const deletions = []
       if (hasHana) {
         deletions.push({

package/lib/init/template/nodejs/files/package.json.hbs

@@ -1,11 +1,12 @@
 {
   "name": "{{ projectName }}",
   "version": "1.0.0",
+  "type": "module",
   "dependencies": {
-    "@sap/cds": "^9"
+    "@sap/cds": "^10"
   },
   "devDependencies": {
-    "@cap-js/sqlite": "^2.4"
+    "@cap-js/sqlite": "^3"
   },
   "scripts": {
     "start": "cds-serve"

package/lib/init/template/portal/files/containerize.yaml.hbs

@@ -3,13 +3,13 @@ modules:
   - name: {{appName}}-portal-deployer
     build-parameters:
       buildpack:
-        {{#hasHelmUnifiedRuntime}}
+        {{#hasKymaUnifiedRuntime}}
         builder: proxy-unified-runtime-dmz.int.repositories.cloud.sap/builder/noble
-        {{/hasHelmUnifiedRuntime}}
-        {{^hasHelmUnifiedRuntime}}
+        {{/hasKymaUnifiedRuntime}}
+        {{^hasKymaUnifiedRuntime}}
         type: nodejs
         builder: builder-jammy-base
-        {{/hasHelmUnifiedRuntime}}
+        {{/hasKymaUnifiedRuntime}}
         path: app/portal
         env:
           BP_NODE_RUN_SCRIPTS: ""