Merge branch 'main' into migration-tool

Author: DanSchlachter

.github/cli/grab-cli-texts.js

@@ -20,11 +20,14 @@ const toOutput = (str) => [
     `> ${cmd}`,
     '',
     str
-        .replace(/\n.*home.*[|:].*/g, '') // remove absolute cds home path as it's system-specific
+        .replace(/([\S]+)\/node_modules/g, '.../node_modules') // remove system-specific paths
+        .replace(/([\S]+)\/bin\/node/g, '.../bin/node')
+        .replace(/([\S]+)\/your-project/g, '.../your-project') // sample project path
         .replace(/\<(.*?)\>/g, '&lt;$1&gt;') // <foo> -> &lt;foo&gt;
-        .replace(/^\x1b\[1m(.*?)\x1b\[(:?0|39|49)m\n/gm, '<strong>$1</strong>') // bold at beginning of line -> strong
-        .replace(/(\s*)\x1b\[4m(.*?)\x1b\[(:?0|39|49)m/g, '$1<i>$2</i>') // underline -> i
-        .replace(/(\s*)\x1b\[\d+m(.*?)\x1b\[(:?0|39|49)m/g, '$1<em>$2</em>') // other colors -> em
+        .replace(/^\x1b\[1m(.*?)\x1b\[(?:0|39|49)m\n/gm, '<strong>$1</strong>') // bold at beginning of line -> strong
+        .replace(/(\s*)\x1b\[(?:2|4)m(.*?)\x1b\[(?:0|39|49)m/g, '$1<i>$2</i>') // underline or grey -> i
+        .replace(/(\s*)\x1b\[[1-9]+m(.*?)\x1b\[(?:0|32|33|39|49)m/g, '$1<em>$2</em>') // other colors -> em
+        .replace(/\x1b\[0m/g, '') // remove all remaining resets
     ,
     `</pre>`
 ].join('\n')

.github/cli/grab-cli-texts.sh

@@ -6,7 +6,7 @@ dir=`dirname -- "$0"`
 proj=/tmp/your-project
 rm -rf ${proj}
 mkdir -p `dirname ${proj}`
-pushd `dirname ${proj}` && cds init `basename ${proj}` && pushd `basename ${proj}` && npm i && popd && popd
+pushd `dirname ${proj}` && cds init `basename ${proj}` --nodejs && pushd `basename ${proj}` && npm i && popd && popd
 
 echo
 echo "Grabbing CLI texts..."

.github/workflows/update-content.yml

@@ -16,12 +16,12 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Set up Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
-          node-version: '22'
+          node-version: 24
 
       - name: Extract CLI texts
         run: |
@@ -51,12 +51,12 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Set up Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
-          node-version: '22'
+          node-version: 24
 
       - name: Update Java Properties
         run: |

.vitepress/config.js

@@ -2,9 +2,9 @@
 const base =  process.env.GH_BASE || '/docs/'
 
 // Construct vitepress config object...
+import path from 'node:path'
 import { defineConfig } from 'vitepress'
 import languages from './languages'
-import path from 'node:path'
 import { Menu } from './menu.js'
 
 const config = defineConfig({
@@ -191,9 +191,9 @@ if (process.env.VITE_CAPIRE_EXTRA_ASSETS) {
 }
 
 // Add custom markdown renderers...
+import { dl } from '@mdit/plugin-dl'
 import * as MdAttrsPropagate from './lib/md-attrs-propagate'
 import * as MdTypedModels from './lib/md-typed-models'
-import { dl } from '@mdit/plugin-dl'
 
 config.markdown.config = md => {
   MdAttrsPropagate.install(md)
@@ -202,8 +202,8 @@ config.markdown.config = md => {
 }
 
 // Add custom buildEnd hook
-import * as cdsMavenSite from './lib/cds-maven-site'
 import { promises as fs } from 'node:fs'
+import * as cdsMavenSite from './lib/cds-maven-site'
 config.buildEnd = async ({ outDir, site }) => {
   const sitemapURL = new URL(config.themeConfig.capire.siteURL.href)
   sitemapURL.pathname = path.join(sitemapURL.pathname, 'sitemap.xml')

.vitepress/theme/components/implvariants/ImplVariants.vue

@@ -12,6 +12,8 @@ const toggle = typeof localStorage !== 'undefined' ? useVariant() : () => {}
 const knownImplVariants = ['node', 'java']
 
 onMounted(() => {
+  if (!supportsVariants.value) return
+
   let check = currentCheckState()
   // Persist value even intially. If query param was used, users expect to get this value from now on, even if not using the query anymore.
   const variantNew = check ? 'java' : 'node'
@@ -93,6 +95,7 @@ transition: none !important;
 }
 
 watchEffect(() => {
+  if (!supportsVariants.value) return
   setTimeout(() => { // otherwise DOM is not ready
     if (typeof document !== 'undefined') {
       animationsOff(() => setClass(currentCheckState()) )