Merge branch 'main' into d070615-tree-table

mta.yaml

@@ -9,10 +9,10 @@ build-parameters:
     - builder: custom
       commands:
         - npm ci
-        - npx cds build ./shared-db --for hana --production
+        - npx cds build shared-db --for hana --production
-        - npx cds build ./orders --for nodejs --production --ws-pack
+        - npx cds build orders --for nodejs --production --ws-pack
-        - npx cds build ./reviews --for nodejs --production
+        - npx cds build reviews --for nodejs --production
-        - npx cds build ./bookstore --for nodejs --production --ws-pack
+        - npx cds build bookstore --for nodejs --production --ws-pack
 modules:
   - name: orders-srv
     type: nodejs
@@ -88,7 +88,7 @@ modules:
 
   - name: samples
     type: approuter.nodejs
-    path: app-router
+    path: .deploy/app-router
     parameters:
       keep-existing-routes: true
       disk-quota: 256M

package-lock.json

@@ -9,18 +9,11 @@
       "version": "3.0.0",
       "license": "SEE LICENSE IN LICENSE",
       "workspaces": [
-        "./bookshop",
+        "./*",
-        "./bookstore",
+        "./etc/*"
-        "./common",
-        "./fiori",
-        "./orders",
-        "./reviews",
-        "./etc/data-viewer",
-        "./etc/loggers"
       ],
       "devDependencies": {
-        "@cap-js/cds-test": "^0",
+        "@cap-js/cds-test": "^0"
-        "@eslint/js": "^9.22.0"
       }
     },
     "bookshop": {
@@ -184,6 +177,10 @@
       "resolved": "reviews",
       "link": true
     },
+    "node_modules/@capire/shared-db": {
+      "resolved": "shared-db",
+      "link": true
+    },
     "node_modules/@colors/colors": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.6.0.tgz",
@@ -204,16 +201,6 @@
         "kuler": "^2.0.0"
       }
     },
-    "node_modules/@eslint/js": {
-      "version": "9.22.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.22.0.tgz",
-      "integrity": "sha512-vLFajx9o8d1/oL2ZkpMYbkLv8nDB6yaIwFNt7nI4+I80U/z03SxmfOMsLbvWr3p7C+Wnoh//aOu2pQW8cS0HCQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      }
-    },
     "node_modules/@sap-cloud-sdk/connectivity": {
       "version": "3.26.4",
       "resolved": "https://registry.npmjs.org/@sap-cloud-sdk/connectivity/-/connectivity-3.26.4.tgz",
@@ -379,9 +366,9 @@
       "license": "MIT"
     },
     "node_modules/@sap/xssec": {
-      "version": "4.4.0",
+      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/@sap/xssec/-/xssec-4.4.0.tgz",
+      "resolved": "https://registry.npmjs.org/@sap/xssec/-/xssec-4.5.0.tgz",
-      "integrity": "sha512-tVPyF6z6lWN2cucT38kkTu6GTmFXhqd/xa0SrExZ+j8K1cNePEIDHvx/zfibubLeb198vyoreW4QOpR9+Vaj4A==",
+      "integrity": "sha512-Mait0L7EoGYX7o6MlEqPz778pP2Z52f3EcDtEu1rKHkuJwu/mOP4rJh2ZsGVVHWrRQIKRQJCaUTSOMxuL3Txxw==",
       "license": "SAP DEVELOPER LICENSE AGREEMENT",
       "dependencies": {
         "debug": "^4.3.4",
@@ -2481,6 +2468,10 @@
         "@sap/xssec": "^4.2.7",
         "express": "^4.17.1"
       }
+    },
+    "shared-db": {
+      "name": "@capire/shared-db",
+      "version": "3.0.0"
     }
   }
 }

package.json

@@ -5,12 +5,7 @@
   "repository": "https://github.com/sap-samples/cloud-cap-samples.git",
   "author": "daniel.hutzel@sap.com",
   "workspaces": [
-    "./bookshop",
+    "./*",
-    "./bookstore",
-    "./common",
-    "./fiori",
-    "./orders",
-    "./reviews",
     "./etc/*"
   ],
   "devDependencies": {
@@ -38,4 +33,4 @@
   },
   "license": "SEE LICENSE IN LICENSE",
   "private": true
-}
+}

shared-db/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@capire/samples-shared-db",
+  "name": "@capire/shared-db",
   "version": "3.0.0",
   "description": "CAP Sample CDS model deployment for shared-db scenario",
   "cds": {