@sap/cds-dk 10.2.0 → 10.2.1

package/CHANGELOG.md

@@ -6,6 +6,19 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/).
 
+## Version 10.2.1 - tbd
+
+### Fixed
+
+- `cds watch` now falls back to globally installed Vite when it is unavailable locally.
+- `cds push` now rejects extension projects without a non-empty string `name` in `package.json`.
+- `cds add html5-repo approuter` opens React and sample UIs from the application root without Portal.
+- `cds add approuter` uses each HTML5 Repository UI's own `xs-app.json` for UI routing and forwards remaining requests to the backend.
+- `cds add approuter` uses TCP health probes on Kyma to avoid caching an empty HTML5 app list during deployment.
+- `cds add` configures dependencies for all space-separated facets.
+- `cds version` and `cds -v` now work on systems without the `which` command.
+- `cds deploy --to hana` now retries intermittent HANA connection failures before TLS is established up to three times.
+
 ## Version 10.2.0 - 2026-10-21
 
 ### Added

package/bin/bind.js

@@ -3,7 +3,7 @@ const { FILE } = require('./completion')
 
 module.exports = Object.assign(cds_bind, {
     staticCompletions: () => ({
-        '--on':          ['cf', 'k8s'],
+        '--on':          ['cf', 'k8s', 'kyma'],
         '--for':         ['development', 'production', 'hybrid'],
         '--out':         FILE(),
         '--output-file': FILE(),
@@ -38,7 +38,7 @@ module.exports = Object.assign(cds_bind, {
 
         Profile to store binding information. Defaults to *hybrid*.
 
-    *-n | --on* cf | k8s
+    *-n | --on* cf | k8s | kyma
 
         Target platform (Cloud Foundry or Kubernetes) to bind to.
         Defaults to *k8s* when Helm charts are present and no *mta.yaml* exists, otherwise *cf*.
@@ -95,8 +95,9 @@ const { readProject } = require('../lib/init/projectReader')
 
 async function cds_bind(args, options) {
     const { hasKyma, hasMta } = readProject()
-    const onKyma = cds.cli.options.on === 'k8s'  || (hasKyma && !hasMta && cds.cli.options.on !== 'cf')
-    const { on = onKyma ? 'k8s' : 'cf', 'to-app-services': app, to, out, 'output-file': outputFile, exec, credentials } = options
+    const onKyma = ['k8s', 'kyma'].includes(cds.cli.options.on) || (hasKyma && !hasMta && cds.cli.options.on !== 'cf')
+    const { on: platform = onKyma ? 'k8s' : 'cf', 'to-app-services': app, to, out, 'output-file': outputFile, exec, credentials } = options
+    const on = platform === 'kyma' ? 'k8s' : platform
 
     if (exec) {
         process.env.CDS_ENV ??= 'hybrid'

package/bin/completion/scripts/cds.fish

@@ -95,7 +95,7 @@ complete -c cds -f -n '__fish_seen_subcommand_from bind y' -a '--out'
 complete -c cds -f -n '__fish_seen_subcommand_from bind y' -a '--output-file'
 complete -c cds -f -n '__fish_seen_subcommand_from bind y' -a '--to'
 complete -c cds -f -n '__fish_seen_subcommand_from bind y' -a '--to-app-services'
-complete -c cds -f -n '__fish_seen_subcommand_from bind y && __fish_prev_arg_in --on' -a 'cf k8s'
+complete -c cds -f -n '__fish_seen_subcommand_from bind y && __fish_prev_arg_in --on' -a 'cf k8s kyma'
 complete -c cds -f -n '__fish_seen_subcommand_from bind y && __fish_prev_arg_in --for' -a 'development hybrid production'
 complete -c cds -f -n '__fish_seen_subcommand_from bindings' -a '--as'
 complete -c cds -f -n '__fish_seen_subcommand_from bindings && __fish_prev_arg_in --as' -a 'json yaml'
@@ -170,6 +170,7 @@ complete -c cds -f -n '__fish_seen_subcommand_from debug' -a '--cf'
 complete -c cds -f -n '__fish_seen_subcommand_from debug' -a '--force'
 complete -c cds -f -n '__fish_seen_subcommand_from debug' -a '--host'
 complete -c cds -f -n '__fish_seen_subcommand_from debug' -a '--k8s'
+complete -c cds -f -n '__fish_seen_subcommand_from debug' -a '--kyma'
 complete -c cds -f -n '__fish_seen_subcommand_from debug' -a '--no-devtools'
 complete -c cds -f -n '__fish_seen_subcommand_from debug' -a '--port'
 complete -c cds -f -n '__fish_seen_subcommand_from deploy d && __fish_prev_arg_in --out' -a "(__fish_complete_path)"
@@ -195,7 +196,7 @@ complete -c cds -f -n '__fish_seen_subcommand_from deploy d && string match -q -
 complete -c cds -f -n '__fish_seen_subcommand_from deploy d && string match -q -- "-*" (commandline -ct)' -a '--with-mocks'
 complete -c cds -f -n '__fish_seen_subcommand_from deploy d && string match -q -- "-*" (commandline -ct)' -a '--xdry'
 complete -c cds -f -n '__fish_seen_subcommand_from deploy d && __fish_prev_arg_in --to' -a 'hana sqlite'
-complete -c cds -f -n '__fish_seen_subcommand_from deploy d && __fish_prev_arg_in --on' -a 'cf k8s'
+complete -c cds -f -n '__fish_seen_subcommand_from deploy d && __fish_prev_arg_in --on' -a 'cf k8s kyma'
 complete -c cds -f -n '__fish_seen_subcommand_from deploy d && __fish_prev_arg_in --for' -a 'development hybrid production'
 complete -c cds -f -n '__fish_seen_subcommand_from env e' -a '--for'
 complete -c cds -f -n '__fish_seen_subcommand_from env e' -a '--json'
@@ -542,7 +543,7 @@ complete -c cds -f -n '__fish_seen_subcommand_from up && __fish_prev_arg_in --ov
 complete -c cds -f -n '__fish_seen_subcommand_from up' -a '--namespace'
 complete -c cds -f -n '__fish_seen_subcommand_from up' -a '--overlay'
 complete -c cds -f -n '__fish_seen_subcommand_from up' -a '--to'
-complete -c cds -f -n '__fish_seen_subcommand_from up && __fish_prev_arg_in --to' -a 'cf k8s'
+complete -c cds -f -n '__fish_seen_subcommand_from up && __fish_prev_arg_in --to' -a 'cf k8s kyma'
 complete -c cds -f -n '__fish_seen_subcommand_from upgrade' -a '--at'
 complete -c cds -f -n '__fish_seen_subcommand_from upgrade' -a '--fix'
 complete -c cds -f -n '__fish_seen_subcommand_from upgrade' -a '--local'

package/bin/completion/scripts/cds.ps1

@@ -49,7 +49,7 @@ $_CDS_COMPLETIONS = @{
     };
     '__optionValues' = @{
     'bind' = @{
-        '--on' = @('cf', 'k8s');
+        '--on' = @('cf', 'k8s', 'kyma');
         '--for' = @('development', 'hybrid', 'production');
         '--out' = ':file';
         '--output-file' = ':file';
@@ -86,7 +86,7 @@ $_CDS_COMPLETIONS = @{
     };
     'deploy' = @{
         '--to' = @('hana', 'sqlite');
-        '--on' = @('cf', 'k8s');
+        '--on' = @('cf', 'k8s', 'kyma');
         '--for' = @('development', 'hybrid', 'production');
         '--out' = ':file';
         '--vcap-file' = ':file:json';
@@ -165,7 +165,7 @@ $_CDS_COMPLETIONS = @{
         '--with' = ':dir'
     };
     'up' = @{
-        '--to' = @('cf', 'k8s');
+        '--to' = @('cf', 'k8s', 'kyma');
         '--overlay' = ':file:mtaext'
     };
     'version' = @{
@@ -199,7 +199,7 @@ $_CDS_COMPLETIONS = @{
     'build' = @('--dest', '--for', '--log-level', '--no-clean', '--no-ws-pack', '--options-model', '--opts', '--project', '--src', '--ws', '--ws-pack');
     'compile' = @('--all', '--asyncapi:merged', '--beta', '--clean', '--conceptual', '--dest', '--dialect', '--docs', '--files', '--flavor', '--for', '--from', '--lang', '--locations', '--log-level', '--min', '--odata-version', '--openapi:config-file', '--openapi:diagram', '--openapi:servers', '--openapi:url', '--parse', '--plain', '--resolved', '--service', '--sort', '--sources', '--sql-dialect', '--to');
     'completion' = @('--add', '--curr', '--line', '--prev', '--profile', '--remove', '--shell');
-    'debug' = @('--cf', '--force', '--host', '--k8s', '--no-devtools', '--port');
+    'debug' = @('--cf', '--force', '--host', '--k8s', '--kyma', '--no-devtools', '--port');
     'deploy' = @('--auto-undeploy', '--delta-from', '--dry', '--for', '--model-only', '--no-build', '--no-save', '--on', '--out', '--resolve-bindings', '--script', '--store-credentials', '--to', '--tunnel-address', '--vcap-file', '--with-auto-schema-evolution', '--with-mocks', '--xdry');
     'env' = @('--for', '--json', '--keys', '--list', '--mocked', '--process-env', '--properties', '--raw', '--resolve-bindings', '--sources');
     'eval' = @('--quiet', '--silent');

package/bin/completion/scripts/cds.sh

@@ -64,7 +64,7 @@ _completeCds()
             build) COMPREPLY=( $(compgen -W ""--dest" "--for" "--log-level" "--no-clean" "--no-ws-pack" "--options-model" "--opts" "--project" "--src" "--ws" "--ws-pack"" -- "$current") ) ;;
             compile) COMPREPLY=( $(compgen -W ""--all" "--asyncapi:merged" "--beta" "--clean" "--conceptual" "--dest" "--dialect" "--docs" "--files" "--flavor" "--for" "--from" "--lang" "--locations" "--log-level" "--min" "--odata-version" "--openapi:config-file" "--openapi:diagram" "--openapi:servers" "--openapi:url" "--parse" "--plain" "--resolved" "--service" "--sort" "--sources" "--sql-dialect" "--to"" -- "$current") ) ;;
             completion) COMPREPLY=( $(compgen -W ""--add" "--curr" "--line" "--prev" "--profile" "--remove" "--shell"" -- "$current") ) ;;
-            debug) COMPREPLY=( $(compgen -W ""--cf" "--force" "--host" "--k8s" "--no-devtools" "--port"" -- "$current") ) ;;
+            debug) COMPREPLY=( $(compgen -W ""--cf" "--force" "--host" "--k8s" "--kyma" "--no-devtools" "--port"" -- "$current") ) ;;
             deploy) COMPREPLY=( $(compgen -W ""--auto-undeploy" "--delta-from" "--dry" "--for" "--model-only" "--no-build" "--no-save" "--on" "--out" "--resolve-bindings" "--script" "--store-credentials" "--to" "--tunnel-address" "--vcap-file" "--with-auto-schema-evolution" "--with-mocks" "--xdry"" -- "$current") ) ;;
             env) COMPREPLY=( $(compgen -W ""--for" "--json" "--keys" "--list" "--mocked" "--process-env" "--properties" "--raw" "--resolve-bindings" "--sources"" -- "$current") ) ;;
             eval) COMPREPLY=( $(compgen -W ""--quiet" "--silent"" -- "$current") ) ;;
@@ -102,7 +102,7 @@ _completeCds()
     case "$cmd" in
         bind)
             case "$previous" in
-            --on) COMPREPLY=( $(compgen -W ""cf" "k8s"" -- "$current") ) ; return 0 ;;
+            --on) COMPREPLY=( $(compgen -W ""cf" "k8s" "kyma"" -- "$current") ) ; return 0 ;;
             --for) COMPREPLY=( $(compgen -W ""development" "production" "hybrid"" -- "$current") ) ; return 0 ;;
             --out) COMPREPLY=( $(compgen -f -- "$current") ) ; return 0 ;;
             --output-file) COMPREPLY=( $(compgen -f -- "$current") ) ; return 0 ;;
@@ -143,7 +143,7 @@ _completeCds()
         deploy)
             case "$previous" in
             --to) COMPREPLY=( $(compgen -W ""sqlite" "hana"" -- "$current") ) ; return 0 ;;
-            --on) COMPREPLY=( $(compgen -W ""cf" "k8s"" -- "$current") ) ; return 0 ;;
+            --on) COMPREPLY=( $(compgen -W ""cf" "k8s" "kyma"" -- "$current") ) ; return 0 ;;
             --for) COMPREPLY=( $(compgen -W ""development" "production" "hybrid"" -- "$current") ) ; return 0 ;;
             --out) COMPREPLY=( $(compgen -f -- "$current") ) ; return 0 ;;
             --vcap-file) COMPREPLY=( $(compgen -f -- "$current" | grep -E '\.(json)$') ) ; return 0 ;;
@@ -218,7 +218,7 @@ _completeCds()
             esac ;;
         up)
             case "$previous" in
-            --to) COMPREPLY=( $(compgen -W ""cf" "k8s"" -- "$current") ) ; return 0 ;;
+            --to) COMPREPLY=( $(compgen -W ""cf" "k8s" "kyma"" -- "$current") ) ; return 0 ;;
             --overlay) COMPREPLY=( $(compgen -f -- "$current" | grep -E '\.(mtaext)$') ) ; return 0 ;;
             esac ;;
         version)

package/bin/completion/scripts/cds.zsh

@@ -61,7 +61,7 @@ _completeCds() {
         build) compadd -S '' -- "--dest" "--for" "--log-level" "--no-clean" "--no-ws-pack" "--options-model" "--opts" "--project" "--src" "--ws" "--ws-pack" ;;
         compile) compadd -S '' -- "--all" "--asyncapi:merged" "--beta" "--clean" "--conceptual" "--dest" "--dialect" "--docs" "--files" "--flavor" "--for" "--from" "--lang" "--locations" "--log-level" "--min" "--odata-version" "--openapi:config-file" "--openapi:diagram" "--openapi:servers" "--openapi:url" "--parse" "--plain" "--resolved" "--service" "--sort" "--sources" "--sql-dialect" "--to" ;;
         completion) compadd -S '' -- "--add" "--curr" "--line" "--prev" "--profile" "--remove" "--shell" ;;
-        debug) compadd -S '' -- "--cf" "--force" "--host" "--k8s" "--no-devtools" "--port" ;;
+        debug) compadd -S '' -- "--cf" "--force" "--host" "--k8s" "--kyma" "--no-devtools" "--port" ;;
         deploy) compadd -S '' -- "--auto-undeploy" "--delta-from" "--dry" "--for" "--model-only" "--no-build" "--no-save" "--on" "--out" "--resolve-bindings" "--script" "--store-credentials" "--to" "--tunnel-address" "--vcap-file" "--with-auto-schema-evolution" "--with-mocks" "--xdry" ;;
         env) compadd -S '' -- "--for" "--json" "--keys" "--list" "--mocked" "--process-env" "--properties" "--raw" "--resolve-bindings" "--sources" ;;
         eval) compadd -S '' -- "--quiet" "--silent" ;;
@@ -95,7 +95,7 @@ _completeCds() {
     case "$cmd" in
         bind)
             case "$previous" in
-            --on) compadd -S '' -- "cf" "k8s" ; return ;;
+            --on) compadd -S '' -- "cf" "k8s" "kyma" ; return ;;
             --for) compadd -S '' -- "development" "hybrid" "production" ; return ;;
             --out) compstate[nomatches]='' ; _path_files ; return ;;
             --output-file) compstate[nomatches]='' ; _path_files ; return ;;
@@ -136,7 +136,7 @@ _completeCds() {
         deploy)
             case "$previous" in
             --to) compadd -S '' -- "hana" "sqlite" ; return ;;
-            --on) compadd -S '' -- "cf" "k8s" ; return ;;
+            --on) compadd -S '' -- "cf" "k8s" "kyma" ; return ;;
             --for) compadd -S '' -- "development" "hybrid" "production" ; return ;;
             --out) compstate[nomatches]='' ; _path_files ; return ;;
             --vcap-file) compstate[nomatches]='' ; _path_files -g '*.json' ; return ;;
@@ -211,7 +211,7 @@ _completeCds() {
             esac ;;
         up)
             case "$previous" in
-            --to) compadd -S '' -- "cf" "k8s" ; return ;;
+            --to) compadd -S '' -- "cf" "k8s" "kyma" ; return ;;
             --overlay) compstate[nomatches]='' ; _path_files -g '*.mtaext' ; return ;;
             esac ;;
         version)

package/bin/debug.js

@@ -1,7 +1,7 @@
 module.exports = Object.assign(debug, {
   options: ['--port', '--host', '--no-devtools'],
   shortcuts: ['-p', '-h', undefined, '-f'],
-  flags: ['--force', '--k8s', '--cf'],
+  flags: ['--force', '--k8s', '--cf', '--kyma'],
   help: `
 # SYNOPSIS
 
@@ -36,7 +36,7 @@ module.exports = Object.assign(debug, {
 
       Force Cloud Foundry mode.
 
-    *--k8s*
+    *--k8s* | *--kyma*
 
       Force Kubernetes mode. Use env vars KUBE_NAMESPACE or NAMESPACE to select a namespace.
 
@@ -71,7 +71,7 @@ async function debug() {
   let attempts = 0
 
   const { hasKyma, hasMta } = readProject()
-  const onKyma = cds.cli.options.k8s || hasKyma && !hasMta && !cds.cli.options.cf
+  const onKyma = cds.cli.options.k8s || cds.cli.options.kyma || hasKyma && !hasMta && !cds.cli.options.cf
 
   if (!appName) { // local app
     if (cds.env['project-nature'] === 'java') {

package/bin/deploy/index.js

@@ -4,7 +4,7 @@ const { options, flags, shortcuts } = require('./options');
 module.exports = Object.assign(deploy, {
   staticCompletions: () => ({
       '--to':         ['sqlite', 'hana'],
-      '--on':         ['cf', 'k8s'],
+      '--on':         ['cf', 'k8s', 'kyma'],
       '--for':        ['development', 'production', 'hybrid'],
       '--out':        FILE(),
       '--vcap-file':  FILE('json'),
@@ -58,7 +58,7 @@ module.exports = Object.assign(deploy, {
       Write the DDL statements to the given file.
       Not available in combination with '--to hana'.
 
-    *--on* | *-n* cf|k8s
+    *--on* | *-n* cf|k8s|kyma
 
       The target platform.
       Defaults to *k8s* when Helm charts are present and no *mta.yaml* exists, otherwise *cf*.

package/bin/deploy/to-hana/hana.js

@@ -149,7 +149,7 @@ Therefore, specifying the CDS model is not required when calling 'cds deploy'.`;
 
     const { readProject } = require('../../../lib/init/projectReader')
     const { hasKyma, hasMta } = readProject()
-    const onKyma = cds.cli.options.on === 'k8s'  || (hasKyma && !hasMta && cds.cli.options.on !== 'cf')
+    const onKyma = ['k8s', 'kyma'].includes(cds.cli.options.on) || (hasKyma && !hasMta && cds.cli.options.on !== 'cf')
     if (onKyma) {
       const cp = require('node:child_process')
 

package/bin/deploy/to-hana/hdiDeployUtil.js

@@ -39,20 +39,31 @@ module.exports = new class HdiDeployUtil {
         if (options.use_hdb === false) options.use_hdb = undefined
         deployerEnv.HDI_DEPLOY_OPTIONS = JSON.stringify(options)
 
-        return await new Promise((resolve, reject) => {
-            deploy(dbDir, deployerEnv, (error, response) => {
-                if (error) return reject(error)
-                if (response?.exitCode) {
-                    let message = `HDI deployment failed with exit code ${response.exitCode}.`
-                    if (response.signal) message += `. ${response.signal}`
-                    return reject(new Error(message))
-                }
-                return resolve()
-            }, {
-              stderrCB: buffer => console.error(buffer.toString()),
-              stdoutCB: buffer => console.log(buffer.toString())
-          })
-        })
+        for (let attempt = 0; ; attempt++) {
+            const response = await new Promise((resolve, reject) => {
+                deploy(dbDir, deployerEnv, (error, response) => {
+                    if (error) return reject(error)
+                    resolve(response)
+                }, {
+                    stderrCB: buffer => console.error(buffer.toString()),
+                    stdoutCB: buffer => console.log(buffer.toString())
+                })
+            })
+            if (!response?.exitCode) return
+
+            const errors = response.deployerMessages?.filter(({ severity }) => severity === 'ERROR')
+            const retryable = errors?.length && errors.every(({ message }) =>
+                /Could not connect to any host:.*Client network socket disconnected before secure TLS connection was established/.test(message))
+            if (attempt >= 3 || response.signal || !retryable) {
+                let message = `HDI deployment failed with exit code ${response.exitCode}.`
+                if (response.signal) message += `. ${response.signal}`
+                throw new Error(message)
+            }
+
+            const delay = 2000 * 2 ** attempt
+            console.warn(`HANA connection interrupted before TLS was established. Retrying HDI deployment in ${delay / 1000}s (${attempt + 1}/3).`)
+            await new Promise(resolve => setTimeout(resolve, delay))
+        }
     }
 
     _loadHdiDeployLib(cwd) {

package/bin/up.js

@@ -2,7 +2,7 @@ const { FILE } = require('./completion');
 
 module.exports = Object.assign(up, {
   staticCompletions: () => ({
-      '--to':      ['cf', 'k8s'],
+      '--to':      ['cf', 'k8s', 'kyma'],
       '--overlay': FILE('mtaext')
   }),
   options: ['--to', '--namespace', '--overlay'],
@@ -17,7 +17,7 @@ module.exports = Object.assign(up, {
 
 # OPTIONS
 
-  *-2* | *--to* cf|k8s
+  *-2* | *--to* cf|k8s|kyma
 
     The platform to deploy to.
 
@@ -124,7 +124,7 @@ const _mtaextForOverlay = overlay => {
 async function up() {
   const project = readProject()
   const { approuterPath, html5DeployerPath, apps, appName, hasApprouter, hasXsuaa, isMonorepoMicroservice, hasKyma, hasMta, k8s } = project
-  const toKyma = cds.cli.options.to === 'k8s' || hasKyma && !hasMta, toCf = !toKyma
+  const toKyma = ['k8s', 'kyma'].includes(cds.cli.options.to) || hasKyma && !hasMta, toCf = !toKyma
 
   if (cds.cli.options.overlay && toKyma) {
     console.log(warn(`Ignoring --overlay ${cds.cli.options.overlay} (Cloud Foundry only)`))

package/bin/version.js

@@ -84,7 +84,7 @@ async function node_versions(o) {
   // Call npm root and npm ls in parallel...
   const [ [npm_version], [npm_exec], [npm_root_g],[npm_root_l], lines ] = await Promise.all ([
     $`npm --version`,
-    process.platform === 'win32' ? $`where npm.cmd` : $`which npm`,
+    process.platform === 'win32' ? $`where npm.cmd` : $`command -v npm`,
     $`npm root --global`,
     $`npm root --local`,
     $`npm ls -lp ${

package/bin/watch/vite-watch.js

@@ -35,15 +35,21 @@ async function findViteApps() {
 }
 
 async function loadCreateServer(fromPath) {
+  let vitePath
   try {
-      const vitePath = require.resolve('vite', { paths: [fromPath] })
-      return (await import(pathToFileURL(vitePath).href)).createServer
-    } catch(e) {
+    vitePath = require.resolve('vite', { paths: [fromPath] })
+  } catch (e) {
+    if (e.code !== 'MODULE_NOT_FOUND') throw e
+    const globalRoot = require('node:child_process').execSync('npm root -g', { cwd: require('node:os').tmpdir() }).toString().trim()
+    try {
+      vitePath = require.resolve('vite', { paths: [globalRoot] })
+    } catch (e) {
       if (e.code !== 'MODULE_NOT_FOUND') throw e
-      /* try next path */
+      const relative = path.relative(cds.root, fromPath)
+      throw `[cds] - Found Vite app in ${relative}, but package "vite" is not installed. Run ${BOLD}npm install -g vite${RESET} to install it.`
+    }
   }
-  const relative = path.relative(cds.root, fromPath)
-  throw `[cds] - Found Vite app in ${relative}, but package "vite" is not installed. Run ${BOLD}npm install vite --prefix ${relative}${RESET} to install it.`
+  return (await import(pathToFileURL(vitePath).href)).createServer
 }
 
 function collectServicePrefixes() {

package/lib/bind/shared.js

@@ -39,7 +39,7 @@ const PreferredKinds = {
 
 async function bind(options = {}) {
     const { hasKyma, hasMta } = readProject()
-    const onKyma = cds.cli.options.on === 'k8s'  || (hasKyma && !hasMta && cds.cli.options.on !== 'cf')
+    const onKyma = ['k8s', 'kyma'].includes(cds.cli.options.on) || (hasKyma && !hasMta && cds.cli.options.on !== 'cf')
     options.on = onKyma ? 'k8s' : 'cf'
 
     let on

package/lib/init/index.js

@@ -142,6 +142,7 @@ module.exports = class CDSGenerator {
             validate.projectFolder(this.cwd)
         }
         const plugins = command === COMMAND_INIT ? options.add : new Set(facets)
+        options.add = plugins
         await this._fillTemplateList(plugins)
 
         const cmds = Object.values(OPTIONS)

package/lib/init/projectReader.js

@@ -142,8 +142,9 @@ module.exports = new class ProjectReader {
                     isdir(path.join(cds.root, cds.env.folders.app, e)) && isApp(e)
                 )
                 return apps.map((app, i) => {
-                    const manifestPath = path.resolve(cds.root, cds.env.folders.app, app, 'webapp/manifest.json')
-                    const manifest = exists(manifestPath) ? JSON.parse(fs.readFileSync(manifestPath, 'utf-8')) : {}
+                    const manifestPath = ['webapp/manifest.json', 'public/manifest.json', 'manifest.json']
+                        .map(p => path.resolve(cds.root, cds.env.folders.app, app, p)).find(exists)
+                    const manifest = manifestPath ? JSON.parse(fs.readFileSync(manifestPath, 'utf-8')) : {}
                     const inbounds = manifest?.['sap.app']?.crossNavigation?.inbounds
                     const [firstInbound] = Object.values(inbounds ?? { intent: { semanticObject: 'Books', action: 'display' } })
                     const vizId = firstInbound.semanticObject + '-' + firstInbound.action

package/lib/init/template/approuter/files/values.yaml.hbs

@@ -16,20 +16,11 @@ approuter:
       ephemeral-storage: 1G
       cpu: 500m
       memory: 500M
-{{^hasMultitenancy}}
-  health:
-    liveness:
-      path: /
-    readiness:
-      path: /
-{{/hasMultitenancy}}
-{{#hasMultitenancy}}
   health:
     liveness:
       path: ""
     readiness:
       path: ""
-{{/hasMultitenancy}}
 {{=<% %>=}}
   envFrom:
     - configMapRef:

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

@@ -2,9 +2,6 @@
   {{#hasPortal}}
   "welcomeFile": "/cp.portal",
   {{/hasPortal}}
-  {{#hasHtml5Repo}}
-  "authenticationMethod": "route",
-  {{/hasHtml5Repo}}
   "routes": [
     {{#hasMTXRoute}}
     {
@@ -20,30 +17,11 @@
       "authenticationType": "none"
     },
     {{/hasMTXRouteJava}}
-    {{#hasHtml5Repo}}
-    {
-      "source": "^/?odata/(.*)$",
-      "target": "/odata/$1",
-      "destination": "srv-api",
-      {{^hasIas}}{{#hasXsuaa}}"authenticationType": "xsuaa",{{/hasXsuaa}}{{/hasIas}}
-      {{#hasIas}}"authenticationType": "ias",{{/hasIas}}
-      "csrfProtection": true
-    },
-    {
-      "source": "^(.*)$",
-      "target": "$1",
-      "service": "html5-apps-repo-rt"{{^hasIas}}{{#hasXsuaa}},
-      "authenticationType": "xsuaa"{{/hasXsuaa}}{{/hasIas}}{{#hasIas}},
-      "authenticationType": "ias"{{/hasIas}}
-    }
-    {{/hasHtml5Repo}}
-    {{^hasHtml5Repo}}
     {
       "source": "^/(.*)$",
       "target": "$1",
       "destination": "srv-api",
       "csrfProtection": true
     }
-    {{/hasHtml5Repo}}
   ]
 }

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

@@ -11,7 +11,6 @@ const {
     approuterMTXRoute,
     approuterMTXRouteJava // xs-app.json config
 } = require('../../registries/mta')
-const { srvApi, html5RepoApi } = require('../../registries/xs-app')
 const KymaTemplate = require('../kyma')
 
 module.exports = class ApprouterTemplate extends require('../../plugin') {
@@ -36,7 +35,7 @@ module.exports = class ApprouterTemplate extends require('../../plugin') {
         const project = readProject(facet)
         const {
             isNodejs, isJava,
-            hasMTXRoute, hasMTXRouteJava, hasMultitenancy, hasHtml5Repo,
+            hasMTXRoute, hasMTXRouteJava, hasMultitenancy,
             affected, srv, approuterPath
         } = project
 
@@ -89,15 +88,15 @@ module.exports = class ApprouterTemplate extends require('../../plugin') {
             await merge(__dirname, '/files/containerize.yaml.hbs').into('containerize.yaml', { with: project, additions })
         }
 
-        if (affected('approuter', 'html5-repo', 'xsuaa', 'ias', 'multitenancy', 'extensibility', 'kyma', 'portal')) {
+        if (affected('approuter', 'html5-repo', 'multitenancy', 'extensibility', 'portal')) {
             const xsAppPath = join(approuterPath, 'xs-app.json')
-            const additions = hasMTXRoute ? [{ ...approuterMTXRoute, at: 0 }] : []
+            const additions = [{ in: 'routes', where: { source: '^/(.*)$', destination: 'srv-api' } }]
+            if (hasMTXRoute) additions.push({ ...approuterMTXRoute, at: 0 })
             if (hasMTXRouteJava) additions.push({ ...approuterMTXRouteJava, at: 0 })
-            const deletions = []
-            if (hasHtml5Repo) {
-                additions.push(srvApi, html5RepoApi)
-                deletions.push({ item: { in: 'routes', where: { source: '^/(.*)$' } } })
-            }
+            const deletions = [
+                { item: { in: 'routes', where: { source: '^/?odata/(.*)$', target: '/odata/$1', destination: 'srv-api' } } },
+                { item: { in: 'routes', where: { source: '^(.*)$', target: '$1', service: 'html5-apps-repo-rt' } } }
+            ]
             await merge(__dirname, 'files/xs-app.json.hbs').into(xsAppPath, { project, additions, deletions })
         }
     }

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

@@ -91,6 +91,18 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
             }
         }
 
+        if (affected('approuter', 'html5-repo', 'sample', 'react', 'vue', 'portal')) {
+            const app = project.apps.find(a => a.app === 'browse') ?? project.apps[0]
+            if (app) {
+                const xsAppPath = join(project.approuterPath, 'xs-app.json')
+                const xsApp = await read(xsAppPath)
+                const welcomeFile = `/${app.manifestAppId.replace(/[.-]/g, '')}/index.html`
+                if (!xsApp.welcomeFile || ['/fiori-apps.html', welcomeFile].includes(xsApp.welcomeFile)) {
+                    await merge({ welcomeFile: project.hasPortal ? '/cp.portal' : welcomeFile }).into(xsAppPath, { forceOverwrite: true })
+                }
+            }
+        }
+
         if (affected('multitenancy')) {
             await merge({ cds: { requires: { 'html5-host': true } } }).into('mtx/sidecar/package.json')
         }

package/lib/init/template/react/files/vite.config.{{extension}}.hbs

@@ -1,8 +1,7 @@
-import { defineConfig } from 'vite'
 import AdmZip from 'adm-zip'
 import react from '@vitejs/plugin-react'
 
-export default defineConfig({
+export default {
   base: '{{{base}}}',
   plugins: [react(), {
       name: 'zip-dist', // zipping ./dist is required for BTP HTML5 repo or Application Frontend deployment
@@ -17,4 +16,4 @@ export default defineConfig({
       '/odata': 'http://localhost:4004'
     }
   }
-})
+}

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

@@ -1,5 +1,5 @@
 const cds = require('../../../cds')
-const { path, sh: $ } = cds.utils
+const { path } = cds.utils
 const { renderAndCopy } = require('../../template')
 const { merge } = require('../../merge')
 const { readProject } = require('../../projectReader')
@@ -50,7 +50,5 @@ module.exports = class ReactTemplate extends require('../../plugin') {
     if (typescript) await renderAndCopy(path.join(__dirname, 'typescript'), target, { modelsPath })
     await merge({ scripts: { watch: 'cds watch --exclude app/' }, workspaces: ['app/*'] }).into('package.json')
     if (typescript) await merge({ compilerOptions: { noEmit: true }, exclude: ['app'] }).into('tsconfig.json')
-    const root = cds.cli.command === 'init' ? cds.cli.argv[0] : cds.root
-    await $`npm i --prefix ${root}`
   }
 }

package/lib/init/template/sample/files/app/index.html.hbs

@@ -0,0 +1,18 @@
+<!doctype html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <title>{{appName}}</title>
+  <style>html, body, body > div, #container, #container-uiarea { height: 100%; }</style>
+  <script id="sap-ui-bootstrap" src="https://ui5.sap.com/resources/sap-ui-core.js"
+    data-sap-ui-theme="sap_horizon"
+    data-sap-ui-compat-version="edge"
+    data-sap-ui-async="true"
+    data-sap-ui-on-init="module:sap/ui/core/ComponentSupport"
+    data-sap-ui-resourceroots='{"{{appName}}.{{app}}":"./"}'></script>
+</head>
+<body class="sapUiBody">
+  <div data-sap-ui-component data-name="{{appName}}.{{app}}" data-id="container" data-settings='{"id":"{{app}}"}'></div>
+</body>
+</html>

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

@@ -35,6 +35,7 @@ module.exports = class SampleTemplate extends require('../../plugin') {
             for (const uiApp of ['admin-books', 'admin-authors', 'browse', 'genres']) {
                 project.app = uiApp
                 await renderAndCopy(join(__dirname, 'files/app', uiApp), join(app, uiApp), project)
+                await renderAndCopy(join(__dirname, 'files/app/index.html.hbs'), join(app, uiApp, 'webapp/index.html'), project)
             }
             await Promise.all([
                 copy(join(__dirname, 'files/app/common.cds')).to(app, 'common.cds'),

package/lib/init/template/vue/files/vite.config.{{extension}}.hbs

@@ -1,8 +1,7 @@
-import { defineConfig } from 'vite'
 import AdmZip from 'adm-zip'
 import vue from '@vitejs/plugin-vue'
 
-export default defineConfig({
+export default {
   base: '{{{base}}}',
   plugins: [vue(), {
       name: 'zip-dist', // zipping ./dist is required for BTP HTML5 repo or Application Frontend deployment
@@ -17,4 +16,4 @@ export default defineConfig({
       '/odata': 'http://localhost:4004'
     }
   }
-})
+}

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

@@ -1,5 +1,5 @@
 const cds = require('../../../cds')
-const { path, sh: $ } = cds.utils
+const { path } = cds.utils
 const { renderAndCopy } = require('../../template')
 const { merge } = require('../../merge')
 const { readProject } = require('../../projectReader')
@@ -48,7 +48,5 @@ module.exports = class VueTemplate extends require('../../plugin') {
     if (typescript) await renderAndCopy(path.join(__dirname, 'typescript'), target)
     await merge({ scripts: { watch: 'cds watch --exclude app/' }, workspaces: ['app/*'] }).into('package.json')
     if (typescript) await merge({ compilerOptions: { noEmit: true }, exclude: ['app'] }).into('tsconfig.json')
-    const root = cds.cli.command === 'init' ? cds.cli.argv[0] : cds.root
-    await $`npm i --prefix ${root}`
   }
 }