@sap/cds-dk 10.1.2 → 10.2.1

package/lib/env/schemas/cds-rc.js

@@ -76,6 +76,11 @@ module.exports = {
                         }
                     },
                     properties: {
+                        minify: {
+                            type: ["boolean", "object"],
+                            description: "Minify the model before compilation.",
+                            default: false
+                        },
                         target: {
                             type: "string",
                             description: "Specify the folder which contains generated build results. Defaults to './gen'.",

package/lib/import/importapi.js

@@ -2,7 +2,6 @@ let cds = require('../cds');
 let { path } = cds.utils;
 let common = require('./common');
 let odata = require('./odata');
-let openapi = require('./openapi');
 let messages = require('./message').getMessages();
 
 module.exports = Object.assign(cds_import, {
@@ -81,15 +80,15 @@ async function cds_import_from_edmx(filepath, options = { keepNamespace: false }
 
 /**
  * This is the import API function to generate CSN from openapi files.
+ * cds11: remove once @cap-js/openapi is a required project dependency
  * @param {string} filepath
  * - a single valid filepath
  * @returns {object} CSN
  */
 async function cds_import_from_openapi(filepath, options = {}) {
-    // validates the input file
     filepath = await common.isValidInputFile(path.resolve(process.cwd(), filepath));
     const src = await common.getContentFromFile(filepath);
-    let csn = openapi.openAPI2csn(src);
+    let csn = require('@cap-js/openapi').import.openAPI2csn(src);
     options.inputFileKind = 'rest';
     return csn;
 }

package/lib/init/constants.js

@@ -5,7 +5,7 @@ module.exports = {
     COMMAND_ADD: 'add',
 
     JAVA_LTS_VERSIONS: [25],
-    MAVEN_ARCHETYPE_VERSION: '5.1.1',
+    MAVEN_ARCHETYPE_VERSION: '5.2.0',
 
     OPTIONS: Object.freeze({
         COMPLETION: 'completion',

package/lib/init/index.js

@@ -1,7 +1,7 @@
 
 const { readdirSync } = require('node:fs')
 const { basename, join, relative, resolve } = require('node:path')
-const { OPTIONS, COMMAND_INIT } = require('./constants'), { JAVA, COMPLETION } = OPTIONS
+const { OPTIONS, COMMAND_INIT } = require('./constants'), { JAVA, NODEJS, COMPLETION } = OPTIONS
 const validate = require('./validate')
 const cmd = require('../util/command')
 
@@ -113,7 +113,11 @@ module.exports = class CDSGenerator {
             throw `in your home directory, use 'cds init <project>'`
         }
         const { options } = cds.cli
-        this.cwd = options.cwd || process.cwd();
+        if (cds.cli.command !== COMMAND_INIT && options.workspace === true) {
+            throw 'the --workspace argument must not be empty'
+        }
+        const cwd = options.cwd || process.cwd()
+        this.cwd = options.workspace ? resolve(cwd, options.workspace) : cwd
         cds.root = resolve(this.cwd, projectName || '.');
         this.projectName = basename(cds.root);
 
@@ -138,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)
@@ -184,7 +189,8 @@ module.exports = class CDSGenerator {
         }
 
         if (cds.cli.command === COMMAND_INIT) {
-            console.log ('Successfully initialized CAP project')
+            const runtime = options.add.has(JAVA) || options.add.has(NODEJS)
+            console.log (`Successfully initialized CAP project${runtime ? '' : ` without a runtime. Choose one with ${BOLD+'cds add nodejs'+RESET} or ${BOLD+'cds add java'+RESET}.`}`)
             let relativeProjectPath = relative(this.cwd, cds.root)
             if (relativeProjectPath)
                 console.log ('Continue with:', BOLD +'code', relativeProjectPath, RESET)

package/lib/init/plugin.js

@@ -46,7 +46,7 @@ module.exports = class Plugin {
     /**
      * Runs the combine operations for interoperability with other plugins.
      * @param {string} [facet] This plugin's facet name, forwarded to `readProject(facet)`
-     *   so `add<Facet>` accessors can tell whether this facet is the one being added.
+     *   so `affected()` can tell whether this facet is the one being added.
      */
     async combine(facet) { } // eslint-disable-line no-unused-vars
 

package/lib/init/projectReader.js

@@ -66,8 +66,7 @@ module.exports = new class ProjectReader {
      * This function dynamically resolves project properties and returns an object with these properties.
      *
      * @param {string} [caller] The facet whose `combine()`/`run()` is requesting the project.
-     *   Used to resolve `add<Facet>` accessors: a template asks "am I being added right now?".
-     *   Omit when no facet context applies; `add<Facet>` then reflects only the CLI add list.
+     *   Used by `affected()` to include the calling template in relationship changes.
      * @returns {ProjectConfig} An object representing the project configuration.
      */
     readProject(caller) {
@@ -81,7 +80,8 @@ module.exports = new class ProjectReader {
         const _isESM = () => pkgJson().type === 'module'
         const _isTypescript = () => !!pkgJson().dependencies?.typescript || !!pkgJson().devDependencies?.typescript
         const _hasTyper = () => !!pkgJson().dependencies?.['@cap-js/cds-typer'] || !!pkgJson().devDependencies?.['@cap-js/cds-typer']
-        const _inProd = plugin => require(`./template/${plugin}`).hasInProduction(env) || cds.cli.command === 'add' && cds.cli.argv[0]?.split(',').includes(plugin) || cds.cli.options.add?.has(plugin)
+        const _adding = plugin => cds.cli.command === 'add' && cds.cli.argv[0]?.split(',').includes(plugin) || cds.cli.options.add?.has(plugin)
+        const _inProd = plugin => require(`./template/${plugin}`).hasInProduction(env) || _adding(plugin)
         const _uiEmbedded = () => exists(join(env.folders.app, 'xs-app.json'))
         const _uiModule = () => !_uiEmbedded() && isdir(env.folders.app) && fs.readdirSync(resolve(cds.root, env.folders.app)).length > 0
         const _isJava = () => this.isJava
@@ -101,6 +101,7 @@ module.exports = new class ProjectReader {
         const reserved = {
             dependencies: () => pkgJson().dependencies,
             devDependencies: () => pkgJson().devDependencies,
+            affected: () => (target, ...triggers) => _inProd(target) && [caller, target, ...triggers].some(_adding),
             has: x => _inProd(x),
             profile: () => cds.cli.options?.for,
             profileSpecified: () => !!cds.cli.options.for,
@@ -112,6 +113,11 @@ module.exports = new class ProjectReader {
             isESM: () => _isESM,
             hasEsmStyle: () => _isTypescript() || _isESM(),
             hasTyper: () => _hasTyper(),
+            hasNpmWorkspaces: () => {
+                const workspaces = pkgJson().workspaces
+                const patterns = Array.isArray(workspaces) ? workspaces : workspaces?.packages ?? []
+                return patterns.includes(`${env.folders.app.replace(/\/$/, '')}/*`)
+            },
             srv: () => {
                 const path = join(env.build.target, env.folders.srv.replace(/\/$/, '')).replace(/\\/g, '/')
                 return { path }
@@ -136,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
@@ -232,14 +239,9 @@ module.exports = new class ProjectReader {
             const _get = property => {
                 const p = property
                 if (p in reserved) return reserved[p]()
-                for (const prefix of ['has', 'is', 'add']) if (p.startsWith(prefix) && p.length > prefix.length) {
+                for (const prefix of ['has', 'is']) if (p.startsWith(prefix) && p.length > prefix.length) {
                     const facet = p.slice(prefix.length).replace(/([a-z0-9])([A-Z])/g, '$1-$2').toLowerCase()
-                    const inProd = _inProd(facet)
-                    if (prefix === 'add') {
-                        const adding = plugin => cds.cli.command === 'add' && cds.cli.argv[0]?.split(',').includes(plugin) || cds.cli.options.add?.has(plugin)
-                        return inProd && (adding(facet) || (caller && adding(caller)))
-                    }
-                    return inProd
+                    return _inProd(facet)
                 }
             }
             return new Proxy({}, {
@@ -317,6 +319,7 @@ function _normalizeSpringBootCfg(obj) {
  * @property {string} archiveName The name of the archive.
  * @property {Object} db Database configuration.
  * @property {string} configFile The name of the configuration file. This is typically the `package.json` for Node.js and `.cdsrc.json` for Java.
+ * @property {(target: string, ...triggers: string[]) => boolean} affected Whether the target facet exists and this operation adds the owning, target, or a triggering facet.
  * @property {string} appPath The path to the app folder.
  * @property {string} approuterPath The path to the approuter folder.
  * @property {string} html5DeployerPath The path to the HTML5 application content deployer folder.
@@ -331,6 +334,7 @@ function _normalizeSpringBootCfg(obj) {
  * @property {boolean} hasEsmStyle Indicates if code supports ESM-style imports and exports. This is true for ESM and Typescript projects.
  * @property {boolean} isTypescript Indicates if the project is a Typescript project.
  * @property {boolean} hasTyper Indicates if code supports CDS typer.
+ * @property {boolean} hasNpmWorkspaces Indicates if UI modules use npm workspaces.
  * @property {boolean} hasKyma Indicates if the project uses Kyma.
  * @property {boolean} hasMta Indicates if the project uses MTA deployment.
  * @property {boolean} hasConnectivity Indicates if the project uses connectivity.

package/lib/init/registries/mta.js

@@ -24,11 +24,6 @@ const xsuaa = {
     where: { type: 'org.cloudfoundry.managed-service', 'parameters.service': 'xsuaa' }
 }
 
-const xsuaa4 = plan => ({
-    in: 'resources',
-    where: { type: 'org.cloudfoundry.managed-service', 'parameters.service': 'xsuaa', 'parameters.service-plan': plan }
-})
-
 const destination = {
     in: 'resources',
     where: { type: 'org.cloudfoundry.managed-service', 'parameters.service': 'destination' }
@@ -224,7 +219,6 @@ module.exports = {
     approuter,
     ias,
     xsuaa,
-    xsuaa4,
     destination,
     destinations,
     destinationSideBySideExtensibility,

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

@@ -32,10 +32,10 @@ module.exports = class AiTemplate extends require('../../plugin') {
 
     async combine(facet) {
         const project = readProject(facet)
-        const { addMta, addKyma, addMultitenancy, srv } = project
+        const { affected, srv } = project
         const { plan } = cds.cli.options
 
-        if (addMta) {
+        if (affected('mta')) {
             if (plan) project.servicePlan = plan
             const srvModule = srv4(srv.path)
             await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', {
@@ -48,12 +48,12 @@ module.exports = class AiTemplate extends require('../../plugin') {
             })
         }
 
-        if (addKyma) {
+        if (affected('kyma')) {
             await merge(__dirname, 'files/values.yaml').into('chart/values.yaml')
             await KymaTemplate.mergeDependency('service-instance', 'aicore')
         }
 
-        if (addMultitenancy) {
+        if (affected('multitenancy')) {
             await merge(__dirname, 'files/package.json.hbs').into('mtx/sidecar/package.json', { project })
         }
     }

package/lib/init/template/ams/files/extensionDeveloper.dcl

@@ -0,0 +1,6 @@
+// Grants the CAP role `cds.ExtensionDeveloper` (required for `cds push`/`pull`).
+// Assign the resulting `ExtensionDeveloper` policy to users/groups in the AMS cockpit.
+// Names are quoted because `cds.ExtensionDeveloper` contains a dot (a DCL token).
+POLICY "ExtensionDeveloper" {
+	ASSIGN ROLE "cds.ExtensionDeveloper";
+}

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

@@ -7,6 +7,12 @@ modules:
     properties:
       AMS_DCL_ROOT: ams/dcl
 
+  - name: {{appName}}-mtx
+    deployed-after:
+      - {{appName}}-ams-policies-deployer
+    properties:
+      AMS_DCL_ROOT: ams/dcl
+
   - name: {{appName}}-ams-policies-deployer
     type: javascript.nodejs
     {{#isJava}}

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

@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "@sap/ams": "^3"
+  }
+}

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

@@ -1,7 +1,14 @@
 const { readProject } = require('../../projectReader')
 const { merge, sort } = require('../../merge')
-const { srv4 } = require('../../registries/mta')
+const { srv4, mtxSidecar4 } = require('../../registries/mta')
 const mvn = require('../../mvn')
+const cds = require('../../../cds')
+const { read, write, exists, mkdirp, path: { join, dirname } } = cds.utils
+
+// Keep custom policies below the DCL root; cds build regenerates ams/dcl/cap/.
+const EXTENSION_DEVELOPER_DCL = join('ams', 'dcl', 'extensibility', 'extensionDeveloper.dcl')
+
+const SIDECAR_PACKAGE_JSON = join('mtx', 'sidecar', 'package.json')
 
 module.exports = class AmsTemplate extends require('../../plugin') {
 
@@ -24,54 +31,49 @@ module.exports = class AmsTemplate extends require('../../plugin') {
         project.isNodejs && await sort('package.json', 'dependencies')
         await sort('package.json', 'devDependencies')
         if (project.isJava) await mvn.add('ams')
+        // The sidecar's cds.ExtensionDeveloper role needs a custom DCL policy.
+        if (project.hasExtensibility && !exists(EXTENSION_DEVELOPER_DCL)) {
+            const template = await read(join(__dirname, 'files', 'extensionDeveloper.dcl'), 'utf-8')
+            await mkdirp(dirname(EXTENSION_DEVELOPER_DCL))
+            await write(EXTENSION_DEVELOPER_DCL, template)
+        }
+        if (project.isNodejs && exists(SIDECAR_PACKAGE_JSON)) {
+            await merge(__dirname, 'files/sidecar.package.json.hbs').into(SIDECAR_PACKAGE_JSON, { project })
+            await sort(SIDECAR_PACKAGE_JSON, 'dependencies')
+        }
     }
 
     async combine(facet) {
         const project = readProject(facet)
-        const { addMta, addCfManifest, addKyma } = project
+        const { affected } = project
 
-        if (addMta) {
-            await this.#combineWithMta(project)
+        if (affected('mta')) {
+            const additions = [
+                srv4(project.srv.path),
+                { in: 'modules', where: { name: `${project.appName}-ams-policies-deployer` } }
+            ]
+            if (project.hasMultitenancy) {
+                additions.push(mtxSidecar4(project.isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar'))
+            }
+            await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', { project, additions })
         }
 
-        if (addCfManifest) {
-            await this.#combineWithCfManifest(project)
+        if (affected('cf-manifest')) {
+            const amsPoliciesDeployer = {
+                in: 'applications',
+                where: { name: `${project.appName}-ams-policies-deployer` }
+            }
+            await merge(__dirname, 'files/manifest.yml.hbs').into('manifest.yml', { project, additions: [amsPoliciesDeployer] })
         }
 
-        if (addKyma) {
-            await this.#combineWithHelm(project)
-            await this.#combineWithContainerize(project)
+        if (affected('kyma')) {
+            const chartDependency = { in: 'dependencies', where: { alias: 'ams-policies-deployer' } }
+            const containerModule = { in: 'modules', where: { name: `${project.appName}-ams-policies-deployer` } }
+            await Promise.all([
+                merge(__dirname, 'files/Chart.yaml.hbs').into('chart/Chart.yaml', { project, additions: [chartDependency] }),
+                merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', { project }),
+                merge(__dirname, 'files/containerize.yaml.hbs').into('containerize.yaml', { project, additions: [containerModule] })
+            ])
         }
     }
-
-    async #combineWithMta(project) {
-        const srvModule = srv4(project.srv.path)
-        const amsPoliciesDeployer = {
-            in: 'modules',
-            where: { 'name': `${project.appName}-ams-policies-deployer` }
-        }
-        await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', { project, additions: [srvModule, amsPoliciesDeployer] })
-    }
-
-    async #combineWithCfManifest(project) {
-        const amsPoliciesDeployer = {
-            in: 'applications',
-            where: { 'name': `${project.appName}-ams-policies-deployer` }
-        }
-        await merge(__dirname, 'files/manifest.yml.hbs').into('manifest.yml', { project, additions: [amsPoliciesDeployer] })
-    }
-
-    async #combineWithHelm(project) {
-        const amsPoliciesDeployer = {
-            in: 'dependencies',
-            where: { 'alias': 'ams-policies-deployer' }
-        }
-        await merge(__dirname, 'files/Chart.yaml.hbs').into('chart/Chart.yaml', { project, additions: [amsPoliciesDeployer] })
-        await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', { project })
-    }
-
-    async #combineWithContainerize(project) {
-        const amsDeployer = { in: 'modules', where: { 'name': `${project.appName}-ams-policies-deployer` } }
-        await merge(__dirname, 'files/containerize.yaml.hbs').into('containerize.yaml', { project, additions: [amsDeployer] })
-    }
 }

package/lib/init/template/app-frontend/files/mta.yaml.hbs

@@ -48,7 +48,9 @@ modules:
       build-result: dist
       builder: custom
       commands:
+        {{^hasNpmWorkspaces}}
         - npm ci
+        {{/hasNpmWorkspaces}}
         - npm run build
       supported-platforms: []
   {{/apps}}

package/lib/init/template/app-frontend/files/ui5.yaml.hbs

@@ -13,10 +13,6 @@ builder:
       - "/test/**"
       - "/localService/**"
   customTasks:
-    {{#isTypescript}}
-    - name: ui5-tooling-transpile-task
-      afterTask: replaceVersion
-    {{/isTypescript}}
     - name: ui5-task-zipper
       afterTask: generateVersionInfo
       configuration:

package/lib/init/template/app-frontend/index.js

@@ -17,8 +17,13 @@ module.exports = class extends require('../../plugin') {
 
     async run() {
         const project = readProject()
-        const { appUIPaths, apps, appPath, configFile, hasUI5 } = project
+        const { configFile } = project
         await merge(__dirname, 'files/package.json.hbs').into(configFile, { project })
+        await this._prepareApps(project)
+    }
+
+    async _prepareApps(project) {
+        const { appUIPaths, apps, appPath, hasUI5 } = project
 
         for (const { app } of apps) {
             project.app = app
@@ -28,9 +33,12 @@ module.exports = class extends require('../../plugin') {
             project.ui5 = ui5
             await merge(__dirname, 'files/app-package.json.hbs').into(pJsonPath, { project })
             if (ui5) {
+                const isTs = !!pJson.devDependencies?.typescript || !!pJson.dependencies?.typescript
                 const additions = [{ in: 'builder.customTasks', where: { name: 'ui5-task-zipper' } }]
-                if (project.isTypescript) additions.unshift({ in: 'builder.customTasks', where: { name: 'ui5-tooling-transpile-task' }, at: 0 })
-                await merge(__dirname, 'files/ui5.yaml.hbs').into(join(appPath, app, 'ui5.yaml'), { project, additions })
+                const transpileTask = { in: 'builder.customTasks', where: { name: 'ui5-tooling-transpile-task' }, at: 0 }
+                const ui5YamlPath = join(appPath, app, 'ui5.yaml')
+                await merge(__dirname, 'files/ui5.yaml.hbs').into(ui5YamlPath, { project, additions, deletions: isTs ? [] : [{ item: transpileTask }] })
+                if (isTs) await merge({ builder: { customTasks: [{ name: 'ui5-tooling-transpile-task', afterTask: 'replaceVersion' }] } }).into(ui5YamlPath, { additions: [transpileTask] })
                 await renderAndCopy(join(__dirname, 'files/index.html.hbs'), join(appPath, app, 'webapp/index.html'), project)
             }
         }
@@ -53,32 +61,30 @@ module.exports = class extends require('../../plugin') {
     async combine(facet) {
         const project = readProject(facet)
         const {
-            srv, appPath, apps,
-            hasMta, addMta, hasXsuaa, addSample, addApprouter, addWorkzoneStandard, addXsuaa, addIas,
-            addVue, addReact, addAppFrontend, hasKyma, addKyma
+            srv, appPath, apps, affected
         } = project
 
-        await Promise.all(apps.map(async ({ app }) => {
-            project.app = app
-            project.hasIndexHtml = exists(join(appPath, app, 'webapp/index.html'))
-            const additions = [srvApi]
-            await merge(__dirname, 'files/xs-app.json.hbs').into(join(appPath, app, 'xs-app.json'), { with: project, additions })
-        }))
+        if (affected('app-frontend', 'xsuaa', 'sample', 'vue', 'react')) {
+            await Promise.all(apps.map(async ({ app }) => {
+                project.app = app
+                project.hasIndexHtml = exists(join(appPath, app, 'webapp/index.html'))
+                const additions = [srvApi]
+                await merge(__dirname, 'files/xs-app.json.hbs').into(join(appPath, app, 'xs-app.json'), { with: project, additions })
+            }))
+        }
 
         // later -> rather consider adding to app-front package.json
         // if (hasMultitenancy) {
         //  await merge({ cds: { requires: { 'app-front':true } } }).into('mtx/sidecar/package.json')
         // }
 
-        const affected = addXsuaa || addApprouter || addWorkzoneStandard || addSample || addIas
-        if (addMta || affected && hasMta) {
+        if (affected('mta', 'xsuaa', 'approuter', 'workzone-standard', 'sample', 'ias')) {
             const srvModule = srv4(srv.path)
             project.apps = apps
             const relationships = [{
                 insert: [appFront, 'name'],
                 into: [appDeployer, 'requires', 'name'],
             }]
-            const appModules = []
             for (const { app } of project.apps) {
                 const html5App = { in: 'modules', where: { type: 'html5', path: `${appPath}${app}` } }
                 relationships.push({
@@ -86,7 +92,7 @@ module.exports = class extends require('../../plugin') {
                     into: [appDeployer, 'build-parameters.requires'],
                 })
             }
-            if (hasXsuaa) {
+            if (affected('xsuaa', 'mta')) {
                 relationships.push({
                     insert: [xsuaa, 'name'],
                     into: [appDeployer, 'requires']
@@ -94,16 +100,16 @@ module.exports = class extends require('../../plugin') {
             }
             await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', {
                 with: project,
-                additions: [srvModule, appDeployer, appFront, ...appModules],
+                additions: [srvModule, appDeployer, appFront],
                 relationships
             })
         }
 
 
         // Vue + React
-        const promises = []
         const cds = require('../../../cds')
-        if (addAppFrontend || addVue || addReact) {
+        if (affected('app-frontend', 'vue', 'react')) {
+            await this._prepareApps(project)
             const addVite = cds.cli.argv[0] === 'react' || cds.cli.argv[0] === 'vue'
             const into = cds.cli.options.into
             const isRootLayout = addVite && (into === undefined || into === '' || into === '.')
@@ -124,26 +130,25 @@ module.exports = class extends require('../../plugin') {
                 const fromXsApp = join(appPath, 'xs-app.json')
                 const toXsApp = join(appPath, 'public/xs-app.json')
                 if (exists(fromXsApp) && !exists(toXsApp)) {
-                    promises.push(rename(fromXsApp, toXsApp))
+                    await rename(fromXsApp, toXsApp)
                 }
                 const fromManifest = join(appPath, 'webapp/manifest.json')
                 const toManifest = join(appPath, 'public/manifest.json')
                 if (exists(fromManifest) && !exists(toManifest)) {
-                    promises.push(rename(fromManifest, toManifest))
+                    await rename(fromManifest, toManifest)
                 }
                 $`npm install --prefix ${appPath} adm-zip --save-dev` // required for zipping /dist in the Vite build step
             }
         }
-        await Promise.all(promises)
 
-        if (addKyma) {
+        if (affected('kyma')) {
             const additions = [{
                 in: 'modules',
                 where: { name: `${project.appName}-html5-deployer` }
             }]
             await merge(__dirname, '/files/containerize.yaml.hbs').into('containerize.yaml', { with: project, additions })
         }
-        if (addKyma || affected && hasKyma) {
+        if (affected('kyma', 'xsuaa', 'approuter', 'workzone-standard', 'sample', 'ias')) {
             await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', { with: project })
         }
     }

package/lib/init/template/application-logging/index.js

@@ -28,30 +28,30 @@ module.exports = class ApplicationLoggingTemplate extends require('../../plugin'
 
     async combine(facet) {
         const project = readProject(facet)
-        const { addMta, hasMta, hasApprouter, isJava, addMultitenancy, hasMultitenancy, srv } = project
+        const { affected, isJava, srv } = project
 
-        if (addMta || (addMultitenancy && hasMta)) {
-            const additions = [], relationships = []
+        if (affected('mta', 'multitenancy', 'approuter')) {
+            const relationships = []
             const srvModule = srv4(srv.path)
             relationships.push({
                 insert: [applicationLogging, 'name'],
                 into: [srvModule, 'requires', 'name']
             })
-            if (hasMultitenancy) {
+            if (affected('multitenancy', 'mta')) {
                 const mtxSidecar = mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar')
                 relationships.push({
                     insert: [applicationLogging, 'name'],
                     into: [mtxSidecar, 'requires', 'name']
                 })
             }
-            if (hasApprouter) {
+            if (affected('approuter', 'mta')) {
                 relationships.push({
                     insert: [applicationLogging, 'name'],
                     into: [approuter, 'requires', 'name']
                 })
             }
             await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', {
-                with: project, additions, relationships
+                with: project, relationships
             })
         }
     }

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: