@sap/cds-dk 7.6.1 → 7.7.1

package/lib/init/template/nodejs/files/.vscode/extensions.json

@@ -9,8 +9,7 @@
 		"esbenp.prettier-vscode",
 		"mechatroner.rainbow-csv",
 		"qwtel.sqlite-viewer",
-		"humao.rest-client",
-		"sdras.night-owl"
+		"humao.rest-client"
 	],
 	// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
 	"unwantedRecommendations": [

package/lib/init/template/nodejs/files/README.md

@@ -15,7 +15,7 @@ File or Folder | Purpose
 
 ## Next Steps
 
-- Open a new terminal and run `cds watch` 
+- Open a new terminal and run `cds watch`
 - (in VS Code simply choose _**Terminal** > Run Task > cds watch_)
 - Start adding content, for example, a [db/schema.cds](db/schema.cds).
 

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

@@ -15,12 +15,14 @@
 	</script>
 
 	<script id="sap-ushell-bootstrap" src="https://sapui5.hana.ondemand.com/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
-	<script id="sap-ui-bootstrap" src="https://sapui5.hana.ondemand.com/resources/sap-ui-core.js"
-			data-sap-ui-libs="sap.m, sap.ushell, sap.collaboration, sap.ui.layout"
-			data-sap-ui-compatVersion="edge"
-			data-sap-ui-theme="sap_horizon"
-			data-sap-ui-frameOptions="allow"
-	></script>
+    <script id="sap-ui-bootstrap" src="https://sapui5.hana.ondemand.com/resources/sap-ui-core.js"
+      data-sap-ui-libs="sap.m, sap.ushell, sap.collaboration, sap.ui.layout"
+      data-sap-ui-compatVersion="edge"
+      data-sap-ui-async="true"
+      data-sap-ui-preload="async"
+      data-sap-ui-theme="sap_horizon"
+      data-sap-ui-frameOptions="allow"
+    ></script>
 	<script>
 		sap.ui.getCore().attachInit(()=> sap.ushell.Container.createRenderer().placeAt("content"))
 	</script>

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

@@ -1,5 +1,5 @@
 const { join } = require('path')
-const cds = require('../../../cds'), { exists, copy } = cds.utils
+const cds = require('../../../cds'), { exists, read, write, copy } = cds.utils
 const { env4, readProject } = require('../../projectReader')
 
 module.exports = class SampleTemplate extends require('../../plugin') {
@@ -13,11 +13,21 @@ module.exports = class SampleTemplate extends require('../../plugin') {
     async run() {
         const { db, srv, app } = env4('production').folders
         const language = exists('pom.xml') ? 'java' : 'nodejs'
+
         await Promise.all([
           copy(join(__dirname, 'files', 'db')).to(db),
-          copy(join(__dirname, 'files', 'app')).to(app),
           copy(join(__dirname, 'files', 'srv')).to(srv),
           copy(join(__dirname, 'files', language)).to(srv)
         ])
+
+        await copy(join(__dirname, 'files', 'app')).to(app)
+        const { appName, appPath, appUIPaths } = readProject()
+
+        // manifest.json must be unique
+        await Promise.all(appUIPaths.map(async p => {
+            const manifest = await read(join(appPath, p, 'webapp/manifest.json'))
+            manifest['sap.app'].id = appName + '.' + p
+            await write(join(appPath, p, 'webapp/manifest.json'), manifest, { spaces: 2 })
+        }))
     }
 }

package/lib/util/cf.js

@@ -192,6 +192,7 @@ Deployment will stop in the near future for Cloud Foundry client versions < ${CF
     async getServices(app) {
         const { spaceGuid: space_guids, orgGuid: organization_guids } = await this.getCfSpaceInfo();
         const apps = await this._cfRequest('/v3/apps', { space_guids, organization_guids, names: app });
+        if (apps.resources.length < 1) throw `Cannot find app with name '${app}'`
         const guid = apps.resources[0].guid;
         const env = await this._cfRequest('/v3/apps/'+guid+'/env', { space_guids, organization_guids, names: app });
         return Object.values(env.system_env_json.VCAP_SERVICES).flat();

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@sap/cds-dk",
-  "version": "7.6.1",
+  "version": "7.7.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@sap/cds-dk",
-      "version": "7.6.1",
+      "version": "7.7.1",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/cds": "^7",
@@ -88,7 +88,7 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.56.0",
+      "version": "8.57.0",
       "license": "MIT",
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -177,7 +177,7 @@
       }
     },
     "node_modules/@sap/cds": {
-      "version": "7.6.3",
+      "version": "7.7.0",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@cap-js/cds-types": "<1",
@@ -194,7 +194,7 @@
       }
     },
     "node_modules/@sap/cds-compiler": {
-      "version": "4.6.2",
+      "version": "4.7.6",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "antlr4": "4.9.3"
@@ -209,10 +209,10 @@
       }
     },
     "node_modules/@sap/cds-fiori": {
-      "version": "1.2.2",
+      "version": "1.2.3",
       "license": "SEE LICENSE IN LICENSE",
       "peerDependencies": {
-        "@sap/cds": ">=7",
+        "@sap/cds": ">=7.1",
         "express": ">=4"
       }
     },
@@ -230,7 +230,7 @@
       }
     },
     "node_modules/@sap/cds-mtxs": {
-      "version": "1.15.0",
+      "version": "1.16.0",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/hdi-deploy": "^4",
@@ -750,11 +750,11 @@
       }
     },
     "node_modules/body-parser": {
-      "version": "1.20.1",
+      "version": "1.20.2",
       "license": "MIT",
       "dependencies": {
         "bytes": "3.1.2",
-        "content-type": "~1.0.4",
+        "content-type": "~1.0.5",
         "debug": "2.6.9",
         "depd": "2.0.0",
         "destroy": "1.2.0",
@@ -762,7 +762,7 @@
         "iconv-lite": "0.4.24",
         "on-finished": "2.4.1",
         "qs": "6.11.0",
-        "raw-body": "2.5.1",
+        "raw-body": "2.5.2",
         "type-is": "~1.6.18",
         "unpipe": "1.0.0"
       },
@@ -1052,13 +1052,12 @@
       "license": "MIT"
     },
     "node_modules/define-data-property": {
-      "version": "1.1.3",
+      "version": "1.1.4",
       "license": "MIT",
       "dependencies": {
+        "es-define-property": "^1.0.0",
         "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.4",
-        "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.1"
+        "gopd": "^1.0.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -1200,14 +1199,14 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.56.0",
+      "version": "8.57.0",
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
         "@eslint/eslintrc": "^2.1.4",
-        "@eslint/js": "8.56.0",
-        "@humanwhocodes/config-array": "^0.11.13",
+        "@eslint/js": "8.57.0",
+        "@humanwhocodes/config-array": "^0.11.14",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
         "@ungap/structured-clone": "^1.2.0",
@@ -1341,12 +1340,12 @@
       }
     },
     "node_modules/express": {
-      "version": "4.18.2",
+      "version": "4.18.3",
       "license": "MIT",
       "dependencies": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
-        "body-parser": "1.20.1",
+        "body-parser": "1.20.2",
         "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
         "cookie": "0.5.0",
@@ -1490,7 +1489,7 @@
       }
     },
     "node_modules/flatted": {
-      "version": "3.2.9",
+      "version": "3.3.1",
       "license": "ISC"
     },
     "node_modules/follow-redirects": {
@@ -1689,7 +1688,7 @@
       }
     },
     "node_modules/has-proto": {
-      "version": "1.0.1",
+      "version": "1.0.3",
       "license": "MIT",
       "engines": {
         "node": ">= 0.4"
@@ -2261,7 +2260,7 @@
       }
     },
     "node_modules/node-abi": {
-      "version": "3.54.0",
+      "version": "3.56.0",
       "license": "MIT",
       "optional": true,
       "dependencies": {
@@ -2477,7 +2476,7 @@
       }
     },
     "node_modules/prebuild-install": {
-      "version": "7.1.1",
+      "version": "7.1.2",
       "license": "MIT",
       "optional": true,
       "dependencies": {
@@ -2595,7 +2594,7 @@
       }
     },
     "node_modules/raw-body": {
-      "version": "2.5.1",
+      "version": "2.5.2",
       "license": "MIT",
       "dependencies": {
         "bytes": "3.1.2",
@@ -2844,10 +2843,10 @@
       }
     },
     "node_modules/side-channel": {
-      "version": "1.0.5",
+      "version": "1.0.6",
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.6",
+        "call-bind": "^1.0.7",
         "es-errors": "^1.3.0",
         "get-intrinsic": "^1.2.4",
         "object-inspect": "^1.13.1"
@@ -2917,7 +2916,7 @@
       }
     },
     "node_modules/socks": {
-      "version": "2.7.3",
+      "version": "2.8.1",
       "license": "MIT",
       "optional": true,
       "dependencies": {
@@ -3274,8 +3273,11 @@
       }
     },
     "node_modules/yaml": {
-      "version": "2.3.4",
+      "version": "2.4.0",
       "license": "ISC",
+      "bin": {
+        "yaml": "bin.mjs"
+      },
       "engines": {
         "node": ">= 14"
       }

package/package.json

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