Merge branch 'main' into revert-952-rm-cds.middlewares.after

Author: sjvans

.devcontainer/devcontainer.json

@@ -1,11 +1,15 @@
 {
-    "image":"mcr.microsoft.com/devcontainers/universal:2",
+    "image":"mcr.microsoft.com/vscode/devcontainers/javascript-node:22",
     "customizations": {
         "vscode": {
             "extensions": [
                 "fcrespo82.markdown-table-formatter",
                 "vue.volar"
             ]
         }
-    }
+    },
+    "runArgs": [
+        // disable IPv6, see https://github.com/vitejs/vite/issues/16522
+        "--sysctl", "net.ipv6.conf.all.disable_ipv6=1"
+    ]
 }

.github/etc/create-review.cjs

@@ -71,7 +71,7 @@ module.exports = async ({ github, require, exec, core }) => {
     const diffs = {}
     data.filter(obj => extname(obj.filename) === '.md')
         .forEach(obj => {
-            diffs[obj.filename.replace('./', '')] = obj.patch.split('\n')
+            diffs[obj.filename.replace('./', '')] = obj.patch?.split('\n') ?? []
         })
 
     if (existsSync(markdownlintLogFile)) {

.github/workflows/PR-SAP.yml

@@ -18,7 +18,7 @@ jobs:
         run: |
           git config --global credential.helper "cache --timeout=3600"
           echo -e "url=https://user:${GH_TOKEN}@github.com\n" | git credential approve
-          echo -e "url=https://user:${GH_TOKEN_PARENT}@github.tools.sap\n" | git credential approve
+          echo -e "url=https://user:${GH_TOKEN_TOOLS_DOCS}@github.tools.sap\n" | git credential approve
           git clone --depth 1 --no-single-branch https://github.tools.sap/cap/docs docs
           cd docs
           git checkout $GITHUB_HEAD_REF || git checkout main
@@ -27,7 +27,7 @@ jobs:
           git checkout $GITHUB_HEAD_REF
         env:
           GH_TOKEN:        ${{ secrets.GITHUB_TOKEN }}
-          GH_TOKEN_PARENT: ${{ secrets.GH_TOKEN_PARENT }}
+          GH_TOKEN_TOOLS_DOCS: ${{ secrets.GH_TOKEN_TOOLS_DOCS }}
       - name: Use Node.js
         uses: actions/setup-node@v4
         with:
@@ -44,6 +44,7 @@ jobs:
         working-directory: docs
         env:
           NODE_OPTIONS: "--max-old-space-size=6144"
+          VITE_CAPIRE_CI_HOST: "github.com"
       - name: Find broken anchor links
         working-directory: docs
         run: |

.github/workflows/lint.yml

@@ -19,7 +19,7 @@ jobs:
       run: |
         git config --global credential.helper "cache --timeout=3600"
         echo -e "url=https://user:${GH_TOKEN}@github.com\n" | git credential approve
-        echo -e "url=https://user:${GH_TOKEN_PARENT}@github.tools.sap\n" | git credential approve
+        echo -e "url=https://user:${GH_TOKEN_TOOLS_DOCS}@github.tools.sap\n" | git credential approve
         git clone --depth 1 --no-single-branch https://github.tools.sap/cap/docs docs
         cd docs
         git checkout $GITHUB_HEAD_REF || git checkout main
@@ -28,7 +28,7 @@ jobs:
         git checkout $GITHUB_HEAD_REF
       env:
         GH_TOKEN:        ${{ secrets.GITHUB_TOKEN }}
-        GH_TOKEN_PARENT: ${{ secrets.GH_TOKEN_PARENT }}
+        GH_TOKEN_TOOLS_DOCS: ${{ secrets.GH_TOKEN_TOOLS_DOCS }}
     - name: Use Node.js
       uses: actions/setup-node@v4
       with:

.nvmrc

@@ -1 +1 @@
-v18
+v20

.vitepress/config.js

@@ -5,6 +5,9 @@ const base =  process.env.GH_BASE || '/docs/'
 import { defineConfig } from 'vitepress'
 import languages from './languages'
 import path from 'node:path'
+import { Menu } from './menu.js'
+
+const menu = await Menu.from ('./menu.md')
 
 const config = defineConfig({
 
@@ -35,6 +38,8 @@ const config = defineConfig({
   },
 
   themeConfig: {
+    sidebar: menu.items,
+    nav: menu.navbar,
     logo: '/cap-logo.svg',
     outline: [2,3],
     socialLinks: [
@@ -65,7 +70,7 @@ const config = defineConfig({
 
   vite: {
     build: {
-      chunkSizeWarningLimit: 5000, // chunk for local search index dominates
+      chunkSizeWarningLimit: 6000, // chunk for local search index dominates
     },
     css: {
       preprocessorOptions: {
@@ -101,8 +106,8 @@ config.rewrites = rewrites
 // Add custom capire info to the theme config
 config.themeConfig.capire = {
   versions: {
-    java_services: '3.7.2',
-    java_cds4j: '3.7.2'
+    java_services: '3.10.1',
+    java_cds4j: '3.10.1'
   },
   gotoLinks: [],
   maven_host_base: 'https://repo1.maven.org/maven2'

.vitepress/theme/components/ConfigInspect.vue

@@ -15,10 +15,11 @@
       </div>
       <div class="vp-code-group vp-doc" v-else>
         <CodeGroup :groups="[
-          { id: 'pkg-priv', label: '~/.cdsrc.json',  lang: 'json',       group, code: pkgStr, private: true },
-          { id: 'pkg', label: 'package/.cdsrc.json', lang: 'json',       group, code: pkgStr },
-          { id: 'js',  label: '.cdsrc.js',           lang: 'js',         group, code: jsStr },
-          { id: 'yml', label: '.cdsrc.yaml',         lang: 'yml',        group, code: ymlStr },
+          { id: 'pkg-rc',   label: 'package.json',   lang: 'json',       group, code: pkgStr },
+          { id: 'pkg-priv', label: '~/.cdsrc.json',  lang: 'json',       group, code: rcJsonStr, private: true },
+          { id: 'pkg',      label: '.cdsrc.json',    lang: 'json',       group, code: rcJsonStr },
+          { id: 'js',  label: '.cdsrc.js',           lang: 'js',         group, code: rcJsStr },
+          { id: 'yml', label: '.cdsrc.yaml',         lang: 'yml',        group, code: rcYmlStr },
           { id: 'env', label: '.env file',           lang: 'properties', group, code: propStr },
           { id: 'shl', label: 'Linux/macOS Shells',  lang: 'sh',         group, code: 'export '+envStr, transient: true },
           { id: 'shp', label: 'Powershell',          lang: 'powershell', group, code: '$Env:'+envStr, transient: true },
@@ -80,18 +81,18 @@
   FloatingVue.options.themes.cfgPopper = { $extend: 'dropdown' }
 
   const slots = useSlots()
-  //@ts-expect-error
   const slotVal = slots.default?.().at(0)?.children?.toString().trim() ?? 'error: provide <Config>your_key:value</Config>'
 
-  const [key, val] = slotVal.split(/\s*[:=]\s*/)
+  const [key, val] = slotVal.split(/\s*[:=]\s*(.*)/) // split on first `:` or `=`
   const label = labelProp || `${keyOnly ? key: slotVal}`
 
   const cfgKey = ref()
   const popperVisible = ref(false)
   const group = ref()
   const pkgStr = ref()
-  const jsStr = ref()
-  const ymlStr = ref()
+  const rcJsonStr = ref()
+  const rcJsStr = ref()
+  const rcYmlStr = ref()
   const propStr = ref()
   const envStr = ref()
   const javaAppyml = ref()
@@ -116,14 +117,16 @@
     const pkg = toJson(key, jsonVal ?? value)
 
     pkgStr.value = JSON.stringify(pkg, null, 2)
-    jsStr.value = 'module.exports = ' + pkgStr.value.replace(/"(\w*?)":/g, '$1:')
+    rcJsonStr.value = JSON.stringify(pkg.cds??{}, null, 2)
+    rcJsStr.value = 'module.exports = ' + rcJsonStr.value.replace(/"(\w*?)":/g, '$1:')
+    rcYmlStr.value = yaml.stringify(pkg.cds)
     propStr.value = `${key}=${jsonVal ? JSON.stringify(jsonVal) : value}`
 
     let envKey = key.replaceAll('_', '__').replaceAll('.', '_')
     if (/^[a-z_]+$/.test(envKey)) envKey = envKey.toUpperCase() // only uppercase if not camelCase
     envStr.value = `${envKey}=${jsonVal ? JSON.stringify(jsonVal) : value}`
 
-    javaAppyml.value = ymlStr.value = yaml.stringify(pkg)
+    javaAppyml.value = yaml.stringify(pkg)
     javaEnvStr.value = `-D${propStr.value}`
   })
 

.vitepress/theme/styles.scss

@@ -57,7 +57,8 @@
     --vp-c-text-1: rgba(255, 255, 245, 0.86);
 
     /* brightness fine-tuned to turn #fff into --vp-c-bg */
-    img, svg.adapt-dark {
+    img, svg.adapt-dark,
+    video.bright { // assuming videos are usually dark, only darken them if marked as bright
       filter: brightness(.884) invert(1) hue-rotate(177deg)
     }
     img.mute-dark {

CONTRIBUTING.md

@@ -26,7 +26,7 @@ npm run docs:dev
 
 Which usually starts a dev server on http://localhost:5173/ like this:
 
-```
+```sh
   vitepress v1.0.0...
 
   ➜  Local:   http://localhost:5173/

README.md

@@ -35,7 +35,7 @@ npm run start
 ```
 
 This will respond with:
-```
+```sh
   vitepress v1...
 
   ➜  Local:   http://localhost:5173/docs/