@sap/cds-dk 9.3.1 → 9.3.2

package/CHANGELOG.md

@@ -6,6 +6,13 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/).
 
+## Version 9.3.2 - 2025-09-16
+
+### Fixed
+
+- `cds add html5-repo` avoids some superfluous configuration combination with `cds add portal`.
+- `cds import` correctly imports OData v2 EDMX files with `Edm.Time` properties having a precision.
+
 ## Version 9.3.1 - 2025-09-08
 
 ### Fixed

package/bin/up.js

@@ -27,9 +27,9 @@ module.exports = Object.assign(up, {
   *cds up --to k8s --namespace e2e-tests*
 `})
 
-const { execSync, spawn } = require('node:child_process')
+const { execSync } = require('node:child_process')
 const cds = require('../lib/cds')
-const { highlight, bold } = require('../lib/util/term')
+const { highlight } = require('../lib/util/term')
 const { exists, fs, path, path: { join } } = cds.utils
 const { readProject } = require('../lib/init/projectReader')
 
@@ -45,27 +45,6 @@ const run = cmd => {
   }
 }
 
-const runDetectingError = async (cmd, errorRegex) => {
-  console.log(highlight(cmd))
-  return new Promise((resolve, reject) => {
-    const child = spawn(cmd, { shell: true, stdio: 'pipe' })
-    let out = '';
-    ['stdout', 'stderr'].forEach(key => {
-      child[key].on('data', data => {
-        process[key].write(data.toString())
-        out += data.toString()
-      })
-    })
-    child.on('close', () => {
-      const error = out.match(errorRegex)
-      if (error) {
-        return reject('Error in command: ' + bold(cmd) + ' → exiting')
-      }
-      resolve(out)
-    })
-  })
-}
-
 async function up() {
   const project = readProject()
   const { apps, appName, hasApprouter, hasXsuaa, isMonorepoMicroservice } = project
@@ -121,7 +100,7 @@ async function up() {
     const nsKubectl = ns ? `-n ${ns}` : ''
 
     run('npm i --package-lock')
-    await runDetectingError('ctz containerize.yaml --log --push', /^\[?ERROR\]?.*/m)
+    run('ctz containerize.yaml --log --push')
     let helmUpgrade = `helm upgrade --install ${appName} ./gen/chart ${nsHelm} --wait --wait-for-jobs --timeout=10m`
     if (hasXsuaa) helmUpgrade += ' --set-file xsuaa.jsonParameters=xs-security.json'
     run(helmUpgrade)

package/lib/import/odata/v2parser.js

@@ -453,6 +453,10 @@ function _getServiceEntityProperty(
 		if (cdsDataType === undefined) {
 			cdsDataType = edmxncdsdatatype[dataType + "_a"];
 			hasInvalidPrecision = true;
+			// Additional fallback for Edm.Time with precision
+			if (cdsDataType === undefined && dataType === 'Edm.Time') {
+				cdsDataType = edmxncdsdatatype[dataType];
+			}
 		}
 	} else if (displayFormat && displayFormat === "Date") {
 		cdsDataType = edmxncdsdatatype[dataType + "_f"];

package/lib/init/template/github-actions/index.js

@@ -1,10 +1,8 @@
 const path = require('node:path')
 const { execSync } = require('node:child_process')
-const term = require('../../../util/term')
 const { readProject } = require('../../projectReader')
 const { renderAndCopy } = require('../../template')
 const cds = require('../../../cds')
-const DEBUG = cds.log('add')._debug
 const { exists, copy } = cds.utils
 
 module.exports = class GitHubActionTemplate extends require('../../plugin') {

package/lib/init/template/html5-repo/files/mta.yaml.hbs

@@ -46,6 +46,7 @@ modules:
             - {{app}}.zip
           target-path: {{#isNodejs}}{{& appPath }}{{/isNodejs}}{{#isJava}}resources{{/isJava}}
       {{/apps}}
+    {{#hasWorkzoneStandard}}
     parameters:
       config:
         HTML5Runtime_enabled: true
@@ -65,6 +66,7 @@ modules:
                 Authentication: NoAuthentication
                 Type: HTTP
                 ProxyType: Internet
+    {{/hasWorkzoneStandard}}
 
   {{#apps}}
   - name: {{strippedAppName}}{{strippedApp}}

package/lib/init/template/html5-repo/index.js

@@ -94,9 +94,6 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
                 relationships.push({
                     insert: [html5Runtime, 'name'],
                     into: [approuter, 'requires', 'name'],
-                }, {
-                    insert: [html5RepoHost, 'name'],
-                    into: [approuter, 'requires', 'name'],
                 })
             }
             if (hasMultitenancy) {

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@sap/cds-dk",
-  "version": "9.3.1",
+  "version": "9.3.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@sap/cds-dk",
-      "version": "9.3.1",
+      "version": "9.3.2",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@cap-js/asyncapi": "^1.0.0",
@@ -120,8 +120,8 @@
       }
     },
     "node_modules/@sap/cds-compiler": {
-      "version": "6.3.0",
-      "integrity": "sha512-4HhZuiKa8SztqtjfM9Iey7yb2U6xQGzUbjib3JXcSSP6AJ6Bz0gViliTwf8dASPTLRtv7HU82277m4uqxU2qjw==",
+      "version": "6.3.4",
+      "integrity": "sha512-3Ip+PgK0yiZXftAC1Pc5euiz4L56t0vX/a4k8xJwTxD0Ccr6G3AvmEFLju5f96D18nr4lH1djC05BeK9yWUpGg==",
       "license": "SEE LICENSE IN LICENSE",
       "bin": {
         "cdsc": "bin/cdsc.js",
@@ -261,8 +261,8 @@
       "license": "MIT"
     },
     "node_modules/axios": {
-      "version": "1.11.0",
-      "integrity": "sha512-1Lx3WLFQWm3ooKDYZD1eXmoGO9fxYQjrycfHFC8P0sCfQVXyROp0p9PFWBehewBOdCwHc+f/b8I0fMto5eSfwA==",
+      "version": "1.12.2",
+      "integrity": "sha512-vMJzPewAlRyOgxV2dU0Cuz2O8zzzx9VYtbJOaBgXFeLc4IV/Eg50n4LowmehOOR61S8ZMpc2K5Sa7g6A4jfkUw==",
       "license": "MIT",
       "dependencies": {
         "follow-redirects": "^1.15.6",
@@ -558,8 +558,8 @@
       }
     },
     "node_modules/detect-libc": {
-      "version": "2.0.4",
-      "integrity": "sha512-3UDv+G9CsCKO1WKMGw9fwq/SWJYbI0c5Y7LU1AXYoDdbhE2AHQ6N6Nb34sG8Fj7T5APy8qXDCKuuIHd1BR0tVA==",
+      "version": "2.1.0",
+      "integrity": "sha512-vEtk+OcP7VBRtQZ1EJ3bdgzSfBjgnEalLTp5zjJrS+2Z1w2KZly4SBdac/WDU3hhsNAZ9E8SC96ME4Ey8MZ7cg==",
       "license": "Apache-2.0",
       "optional": true,
       "engines": {
@@ -1665,8 +1665,8 @@
       }
     },
     "node_modules/tar-fs": {
-      "version": "2.1.3",
-      "integrity": "sha512-090nwYJDmlhwFwEW3QQl+vaNnxsO2yVsd45eTKRBzSzu+hlb1w2K9inVq5b0ngXuLVqQ4ApvsUHHnu/zQNkWAg==",
+      "version": "2.1.4",
+      "integrity": "sha512-mDAjwmZdh7LTT6pNleZ05Yt65HC3E+NiQzl672vQG38jIrehtJk/J3mNwIg+vShQPcLF/LV7CMnDW6vjj6sfYQ==",
       "license": "MIT",
       "optional": true,
       "dependencies": {

package/package.json

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