@sap/cds-dk 7.9.6 → 7.9.8

package/bin/version.js

@@ -62,27 +62,29 @@ function list_versions(args, options) {
 }
 
 function info({ root:cwd=process.cwd() }) {
-  const env = require('../lib').env.for('cds', cwd)
-  const isJava = env['project-nature'] === 'java'
-  if (isJava && process.stderr.isTTY) {
+  const cds = require('../lib')
+  const env = cds.env.for('cds', cwd)
+  env.cli ??= {}; env.cli.version ??= {}
+  const javaInfo = !env.cli.version.skipjava && env['project-nature'] === 'java'
+  if (javaInfo && process.stderr.isTTY) {
     console.error('\x1b[2m'+'This takes a while. Collecting Java versions...', '\x1b[0m')
   }
 
   const npmRoot = execSync('npm root -g').toString().trim()
   let versions = {
-    ..._versions_from(_pkg_path('@sap/cds-dk', __dirname), '@sap/cds-dk (global)'), // ... linked in cap/dev setup
-    ..._versions_from(_pkg_path('@sap/cds-dk', npmRoot), '@sap/cds-dk (global)'), // ... or installed globally
+    ..._versions_from(_pkg_path('@sap/cds-dk', npmRoot), '@sap/cds-dk (global)'), // linked in cap/dev or installed globally
     ..._versions_from(_pkg_path('@sap/cds-dk', cwd)), // local dk, important for Java projects
     ..._versions_from(_pkg_path('@sap/cds', __dirname)), // @sap/cds from here
-    ..._versions_from(cwd), // ... or from local app dependencies
-    ..._versions_from(_pkg_path('@sap/cds-compiler', cwd, __dirname)), // compiler is no direct dependency, so list it explicitly
+    ..._versions_from(_pkg_path('@sap/cds', cds.home)),  // ... or local @sap/cds
+    ..._versions_from(cwd), // ... more from local app dependencies
+    '@sap/cds-compiler': cds.compiler.version(),
     'Node.js': process.version,
-    'home': require('../lib/cds').home, // effective (local) cds
+    'home': cds.home, // effective cds home
   }
   // sort Node entries
   versions = Object.keys(versions).sort().reduce((all, key) => { all[key] = versions[key]; return all }, {})
 
-  if (isJava) {
+  if (javaInfo) {
     Object.assign(versions, capJavaVersion(cwd))
   }
   return versions

package/lib/build/provider/mtx-sidecar/index.js

@@ -45,7 +45,7 @@ class MtxSidecarBuildPlugin extends NodejsBuildPlugin {
      */
     async _buildNodeApp(sidecarEnv) {
         const destSidecar = this.task.dest
-        const destSidecarSrc = path.join(destSidecar, cds.env.folders.srv)
+        const destSidecarSrc = path.join(destSidecar, sidecarEnv.folders.srv)
         const model = this._compileSidecarSync(sidecarEnv)
         await this.compileToJson(model, path.join(destSidecarSrc, DEFAULT_CSN_FILE_NAME))
         await this.collectLanguageBundles(model, path.join(destSidecarSrc, getI18nDefaultFolder()))

package/lib/build/provider/nodejs/index.js

@@ -165,6 +165,7 @@ class NodejsBuildPlugin extends EdmxBuildPlugin {
         if (this.task.options.workspaces) {
             workspaces = Array.isArray(this.task.options.workspaces) ? this.task.options.workspaces : [this.task.options.workspaces]
         } else {
+            // devDependencies are not considered
             workspaces = await getWorkspaces(true, false, wsRoot);
         }
         if (workspaces.length) {
@@ -203,7 +204,7 @@ class NodejsBuildPlugin extends EdmxBuildPlugin {
         } catch (err) {
             // ignore
         }
-        if (fs.existsSync(path.join(dir, '.gitmodules')) || fs.existsSync(path.join(dir, 'node_modules'))) {
+        if (fs.existsSync(path.join(dir, '.gitmodules'))) {
             return // project root reached
         }
         if (path.dirname(dir) !== dir) {

package/lib/build/util.js

@@ -189,7 +189,8 @@ async function getWorkspaces(resolve = false, devDependencies = true, wsRoot = c
         // read npm workspaces
         const pkgs = await _execNpmWs(wsRoot)
         pkgs.forEach(pkg => {
-            if (!resolve || devDependencies && pgkJson.devDependencies?.[pkg] || pgkJson.dependencies?.[pkg]) {
+            // only create tarball archives for dependencies with version '*' 
+            if (!resolve || devDependencies && pgkJson.devDependencies?.[pkg] === '*' || pgkJson.dependencies?.[pkg] === '*') {
                 const workspace = _getWorkspace(wsRoot, pkg)
                 if (workspace) {
                     workspaces.push(workspace)

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@sap/cds-dk",
-  "version": "7.9.6",
+  "version": "7.9.8",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@sap/cds-dk",
-      "version": "7.9.6",
+      "version": "7.9.8",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/cds": "^7",
@@ -81,10 +81,10 @@
       }
     },
     "node_modules/@eslint/eslintrc/node_modules/debug": {
-      "version": "4.3.5",
+      "version": "4.3.7",
       "license": "MIT",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -96,7 +96,7 @@
       }
     },
     "node_modules/@eslint/eslintrc/node_modules/ms": {
-      "version": "2.1.2",
+      "version": "2.1.3",
       "license": "MIT"
     },
     "node_modules/@eslint/js": {
@@ -124,10 +124,10 @@
       }
     },
     "node_modules/@humanwhocodes/config-array/node_modules/debug": {
-      "version": "4.3.5",
+      "version": "4.3.7",
       "license": "MIT",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -139,7 +139,7 @@
       }
     },
     "node_modules/@humanwhocodes/config-array/node_modules/ms": {
-      "version": "2.1.2",
+      "version": "2.1.3",
       "license": "MIT"
     },
     "node_modules/@humanwhocodes/module-importer": {
@@ -208,7 +208,7 @@
       }
     },
     "node_modules/@sap/cds": {
-      "version": "7.9.4",
+      "version": "7.9.5",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@cap-js/cds-types": "<=0.2.0",
@@ -225,7 +225,7 @@
       }
     },
     "node_modules/@sap/cds-compiler": {
-      "version": "4.9.6",
+      "version": "4.9.8",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "antlr4": "4.9.3"
@@ -261,7 +261,7 @@
       }
     },
     "node_modules/@sap/cds-mtxs": {
-      "version": "1.18.2",
+      "version": "1.18.3",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/hdi-deploy": "^4",
@@ -273,7 +273,7 @@
       }
     },
     "node_modules/@sap/eslint-plugin-cds": {
-      "version": "3.0.4",
+      "version": "3.0.5",
       "license": "See LICENSE file",
       "dependencies": {
         "@sap/cds": ">=7",
@@ -424,11 +424,11 @@
       }
     },
     "node_modules/agent-base/node_modules/debug": {
-      "version": "4.3.5",
+      "version": "4.3.7",
       "license": "MIT",
       "optional": true,
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -440,7 +440,7 @@
       }
     },
     "node_modules/agent-base/node_modules/ms": {
-      "version": "2.1.2",
+      "version": "2.1.3",
       "license": "MIT",
       "optional": true
     },
@@ -549,7 +549,7 @@
       "license": "MIT"
     },
     "node_modules/axios": {
-      "version": "1.7.2",
+      "version": "1.7.7",
       "license": "MIT",
       "dependencies": {
         "follow-redirects": "^1.15.6",
@@ -581,7 +581,7 @@
       "optional": true
     },
     "node_modules/big.js": {
-      "version": "6.2.1",
+      "version": "6.2.2",
       "license": "MIT",
       "engines": {
         "node": "*"
@@ -610,7 +610,7 @@
       }
     },
     "node_modules/body-parser": {
-      "version": "1.20.2",
+      "version": "1.20.3",
       "license": "MIT",
       "dependencies": {
         "bytes": "3.1.2",
@@ -621,7 +621,7 @@
         "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
         "on-finished": "2.4.1",
-        "qs": "6.11.0",
+        "qs": "6.13.0",
         "raw-body": "2.5.2",
         "type-is": "~1.6.18",
         "unpipe": "1.0.0"
@@ -986,7 +986,7 @@
       "optional": true
     },
     "node_modules/encodeurl": {
-      "version": "1.0.2",
+      "version": "2.0.0",
       "license": "MIT",
       "engines": {
         "node": ">= 0.8"
@@ -1141,10 +1141,10 @@
       }
     },
     "node_modules/eslint/node_modules/debug": {
-      "version": "4.3.5",
+      "version": "4.3.7",
       "license": "MIT",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -1156,7 +1156,7 @@
       }
     },
     "node_modules/eslint/node_modules/ms": {
-      "version": "2.1.2",
+      "version": "2.1.3",
       "license": "MIT"
     },
     "node_modules/espree": {
@@ -1224,35 +1224,35 @@
       }
     },
     "node_modules/express": {
-      "version": "4.19.2",
+      "version": "4.21.0",
       "license": "MIT",
       "dependencies": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
-        "body-parser": "1.20.2",
+        "body-parser": "1.20.3",
         "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
         "cookie": "0.6.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
         "depd": "2.0.0",
-        "encodeurl": "~1.0.2",
+        "encodeurl": "~2.0.0",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
-        "finalhandler": "1.2.0",
+        "finalhandler": "1.3.1",
         "fresh": "0.5.2",
         "http-errors": "2.0.0",
-        "merge-descriptors": "1.0.1",
+        "merge-descriptors": "1.0.3",
         "methods": "~1.1.2",
         "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.7",
+        "path-to-regexp": "0.1.10",
         "proxy-addr": "~2.0.7",
-        "qs": "6.11.0",
+        "qs": "6.13.0",
         "range-parser": "~1.2.1",
         "safe-buffer": "5.2.1",
-        "send": "0.18.0",
-        "serve-static": "1.15.0",
+        "send": "0.19.0",
+        "serve-static": "1.16.2",
         "setprototypeof": "1.2.0",
         "statuses": "2.0.1",
         "type-is": "~1.6.18",
@@ -1322,11 +1322,11 @@
       }
     },
     "node_modules/finalhandler": {
-      "version": "1.2.0",
+      "version": "1.3.1",
       "license": "MIT",
       "dependencies": {
         "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
+        "encodeurl": "~2.0.0",
         "escape-html": "~1.0.3",
         "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
@@ -1375,7 +1375,7 @@
       "license": "ISC"
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.6",
+      "version": "1.15.9",
       "funding": [
         {
           "type": "individual",
@@ -1666,11 +1666,11 @@
       }
     },
     "node_modules/http-proxy-agent/node_modules/debug": {
-      "version": "4.3.5",
+      "version": "4.3.7",
       "license": "MIT",
       "optional": true,
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -1682,7 +1682,7 @@
       }
     },
     "node_modules/http-proxy-agent/node_modules/ms": {
-      "version": "2.1.2",
+      "version": "2.1.3",
       "license": "MIT",
       "optional": true
     },
@@ -1699,11 +1699,11 @@
       }
     },
     "node_modules/https-proxy-agent/node_modules/debug": {
-      "version": "4.3.5",
+      "version": "4.3.7",
       "license": "MIT",
       "optional": true,
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -1715,7 +1715,7 @@
       }
     },
     "node_modules/https-proxy-agent/node_modules/ms": {
-      "version": "2.1.2",
+      "version": "2.1.3",
       "license": "MIT",
       "optional": true
     },
@@ -1757,7 +1757,7 @@
       "optional": true
     },
     "node_modules/ignore": {
-      "version": "5.3.1",
+      "version": "5.3.2",
       "license": "MIT",
       "engines": {
         "node": ">= 4"
@@ -1997,8 +1997,11 @@
       }
     },
     "node_modules/merge-descriptors": {
-      "version": "1.0.1",
-      "license": "MIT"
+      "version": "1.0.3",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
     },
     "node_modules/methods": {
       "version": "1.1.2",
@@ -2214,7 +2217,7 @@
       "license": "MIT"
     },
     "node_modules/node-abi": {
-      "version": "3.65.0",
+      "version": "3.67.0",
       "license": "MIT",
       "optional": true,
       "dependencies": {
@@ -2418,7 +2421,7 @@
       }
     },
     "node_modules/path-to-regexp": {
-      "version": "0.1.7",
+      "version": "0.1.10",
       "license": "MIT"
     },
     "node_modules/picomatch": {
@@ -2503,7 +2506,7 @@
       "license": "MIT"
     },
     "node_modules/pump": {
-      "version": "3.0.0",
+      "version": "3.0.2",
       "license": "MIT",
       "optional": true,
       "dependencies": {
@@ -2519,10 +2522,10 @@
       }
     },
     "node_modules/qs": {
-      "version": "6.11.0",
+      "version": "6.13.0",
       "license": "BSD-3-Clause",
       "dependencies": {
-        "side-channel": "^1.0.4"
+        "side-channel": "^1.0.6"
       },
       "engines": {
         "node": ">=0.6"
@@ -2698,7 +2701,7 @@
       }
     },
     "node_modules/send": {
-      "version": "0.18.0",
+      "version": "0.19.0",
       "license": "MIT",
       "dependencies": {
         "debug": "2.6.9",
@@ -2730,18 +2733,25 @@
       "version": "2.0.0",
       "license": "MIT"
     },
+    "node_modules/send/node_modules/encodeurl": {
+      "version": "1.0.2",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/send/node_modules/ms": {
       "version": "2.1.3",
       "license": "MIT"
     },
     "node_modules/serve-static": {
-      "version": "1.15.0",
+      "version": "1.16.2",
       "license": "MIT",
       "dependencies": {
-        "encodeurl": "~1.0.2",
+        "encodeurl": "~2.0.0",
         "escape-html": "~1.0.3",
         "parseurl": "~1.3.3",
-        "send": "0.18.0"
+        "send": "0.19.0"
       },
       "engines": {
         "node": ">= 0.8.0"
@@ -2888,11 +2898,11 @@
       }
     },
     "node_modules/socks-proxy-agent/node_modules/debug": {
-      "version": "4.3.5",
+      "version": "4.3.7",
       "license": "MIT",
       "optional": true,
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -2904,7 +2914,7 @@
       }
     },
     "node_modules/socks-proxy-agent/node_modules/ms": {
-      "version": "2.1.2",
+      "version": "2.1.3",
       "license": "MIT",
       "optional": true
     },
@@ -3136,7 +3146,7 @@
       }
     },
     "node_modules/uglify-js": {
-      "version": "3.19.0",
+      "version": "3.19.3",
       "license": "BSD-2-Clause",
       "optional": true,
       "bin": {
@@ -3280,7 +3290,7 @@
       }
     },
     "node_modules/yaml": {
-      "version": "2.4.5",
+      "version": "2.5.1",
       "license": "ISC",
       "bin": {
         "yaml": "bin.mjs"

package/package.json

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