@sap/cds-dk 6.8.0 → 6.8.1

package/CHANGELOG.md

@@ -7,6 +7,12 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## Version 6.8.1 - 2023-05-10
+
+### Fixed
+
+- `cds-ts watch` no longer fails with strange compilation errors if called in combination w/ `ts-node`
+
 ## Version 6.8.0 - 2023-05-04
 
 ### Added

package/bin/watch.js

@@ -80,8 +80,8 @@ async function watch ([cwd], {
     _options: JSON.stringify(options)
   })
   if (process.env.CDS_TYPESCRIPT) {
-    const tsNodeRegister = localOrGlobal('ts-node', 'register')
-    env.NODE_OPTIONS = `-r ${tsNodeRegister} ` + (env.NODE_OPTIONS || '')
+    // Needed by ts-node/tsc to find the tsconfig.json. Same as `--project`.
+    env.TS_NODE_PROJECT = env.TS_NODE_PROJECT ?? cwd ?? process.cwd()
   }
 
   // allow running w/o or partial local node_modules, also add cds-dk for its sqlite
@@ -194,18 +194,6 @@ function paths (dir) {
   return parts.map ((_,i,a)=> a.slice(0,n-i).join(sep)+nm).filter(p => fs.existsSync(p))
 }
 
-function localOrGlobal (id, pathInMod) {
-  // require package.json to get a stable root path of the moduloe, not its main script
-  const modPath = require.resolve (id+'/package.json', { paths:[ process.cwd(), npmGlobalModules() ] })
-  return resolve(modPath, '..', pathInMod)
-}
-
-function npmGlobalModules() {
-  try {
-    return require ('child_process').execSync('npm root -g').toString().trim()
-  } catch (err) { return }
-}
-
 //
 // Child process impl launched by watch
 //

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@sap/cds-dk",
-  "version": "6.8.0",
+  "version": "6.8.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@sap/cds-dk",
-      "version": "6.8.0",
+      "version": "6.8.1",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/cds": "~6.8.0",
@@ -54,12 +54,12 @@
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "2.0.2",
+      "version": "2.0.3",
       "license": "MIT",
       "dependencies": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
-        "espree": "^9.5.1",
+        "espree": "^9.5.2",
         "globals": "^13.19.0",
         "ignore": "^5.2.0",
         "import-fresh": "^3.2.1",
@@ -75,7 +75,7 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.39.0",
+      "version": "8.40.0",
       "license": "MIT",
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -227,7 +227,7 @@
       }
     },
     "node_modules/@sap/cds-mtxs": {
-      "version": "1.8.0",
+      "version": "1.8.1",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/hdi-deploy": "^4",
@@ -1083,13 +1083,13 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.39.0",
+      "version": "8.40.0",
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.4.0",
-        "@eslint/eslintrc": "^2.0.2",
-        "@eslint/js": "8.39.0",
+        "@eslint/eslintrc": "^2.0.3",
+        "@eslint/js": "8.40.0",
         "@humanwhocodes/config-array": "^0.11.8",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
@@ -1100,8 +1100,8 @@
         "doctrine": "^3.0.0",
         "escape-string-regexp": "^4.0.0",
         "eslint-scope": "^7.2.0",
-        "eslint-visitor-keys": "^3.4.0",
-        "espree": "^9.5.1",
+        "eslint-visitor-keys": "^3.4.1",
+        "espree": "^9.5.2",
         "esquery": "^1.4.2",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
@@ -1152,7 +1152,7 @@
       }
     },
     "node_modules/eslint-visitor-keys": {
-      "version": "3.4.0",
+      "version": "3.4.1",
       "license": "Apache-2.0",
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -1162,12 +1162,12 @@
       }
     },
     "node_modules/espree": {
-      "version": "9.5.1",
+      "version": "9.5.2",
       "license": "BSD-2-Clause",
       "dependencies": {
         "acorn": "^8.8.0",
         "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^3.4.0"
+        "eslint-visitor-keys": "^3.4.1"
       },
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -2057,7 +2057,7 @@
       "optional": true
     },
     "node_modules/node-fetch": {
-      "version": "2.6.9",
+      "version": "2.6.11",
       "license": "MIT",
       "optional": true,
       "dependencies": {

package/package.json

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