Merge branch 'main' into ext-view-alias

.github/renovate.json

@@ -6,7 +6,7 @@
   ],
   "rebaseWhen": "conflicted",
   "includePaths": [
-    ".vitepress/config.ts",
+    ".vitepress/config.*",
     ".github/workflows/",
     "package.json",
     "**/*.md"
@@ -37,7 +37,7 @@
   "customManagers": [
     {
       "customType": "regex",
-      "fileMatch": [ ".vitepress/config.ts" ],
+      "fileMatch": [ ".vitepress/config.*" ],
       "matchStrings": [
         "java_services\\s*:\\s*'(?<currentValue>.*?)'"
       ],
@@ -47,7 +47,7 @@
     },
     {
       "customType": "regex",
-      "fileMatch": [ ".vitepress/config.ts" ],
+      "fileMatch": [ ".vitepress/config.*" ],
       "matchStrings": [
         "java_cds4j\\s*:\\s*'(?<currentValue>.*?)'"
       ],

.github/workflows/PR-SAP.yml

@@ -3,6 +3,7 @@ name: PR Build (SAP)
 on:
   pull_request:
     branches: [main]
+  merge_group:
 
 concurrency:
   group: pr-sap-${{ github.workflow }}-${{ github.head_ref || github.run_id }}

.github/workflows/PR.yml

@@ -2,6 +2,7 @@ name: PR Build
 
 on:
   pull_request:
+  merge_group:
 
 concurrency:
   group: pr-${{ github.workflow }}-${{ github.head_ref || github.run_id }}

.github/workflows/lint.yml

@@ -5,6 +5,7 @@ on:
     branches: [main]
     paths:
       - '**.md'
+  merge_group:
   workflow_dispatch:
 
 jobs:

.vitepress/config.js

@@ -101,8 +101,8 @@ config.rewrites = rewrites
 // Add custom capire info to the theme config
 config.themeConfig.capire = {
   versions: {
-    java_services: '3.4.0',
-    java_cds4j: '3.4.0'
+    java_services: '3.5.0',
+    java_cds4j: '3.5.0'
   },
   gotoLinks: [],
   maven_host_base: 'https://repo1.maven.org/maven2'

.vitepress/menu.js

@@ -44,10 +44,10 @@ export class MenuItem {
    * Reads a submenu from the given file and adds all its items
    * into this item's child items.
    */
-  async include (filename, parent='.', _rewrite = rewrites) {
+  async include (filename, parent='.', _rewrite = rewrites, include, exclude) {
     const root = dirname(parent), folder = dirname(filename)
     const rewrite = link => link[0] === '/' ? link : _rewrite (normalize(join(folder,link)))
-    const {items} = await Menu.from (join(root,filename), rewrite)
+    const {items} = await Menu.from (join(root,filename), rewrite, include, exclude)
     const children = this.items ??= []; children.push (...items)
     this.link = '/'+folder+'/'
     this.collapsed = true
@@ -92,7 +92,7 @@ export class Menu extends MenuItem {
 
       // Add new item to parent, and to the stack of children
       let child = !text ? parent : children[hashes.length] = parent.add (text, link)
-      if (is_submenu) await child.include (link, file, rewrite, !text)
+      if (is_submenu) await child.include (link, file, rewrite, include, exclude)
     }
 
     // Return menu when all includes are done

.vitepress/theme/Layout.vue

@@ -5,7 +5,7 @@ import ShortcutsList from './components/ShortcutsList.vue'
 import ImplVariants from './components/implvariants/ImplVariants.vue'
 import NavScreenMenuItem from './components/implvariants/NavScreenMenuItem.vue'
 import Ribbon from './components/Ribbon.vue'
-// import ScrollToTop from './components/ScrollToTop.vue'
+import ScrollToTop from './components/ScrollToTopSimple.vue'
 
 const isPreview = !!import.meta.env.VITE_CAPIRE_PREVIEW
 

.vitepress/theme/components/ScrollToTopSimple.vue

@@ -0,0 +1,12 @@
+<!-- eslint-disable vue/valid-template-root -->
+<template />
+
+<script setup>
+  import { onMounted } from 'vue'
+
+  // Add back-to-top behavior to the outline's 'On this page' title
+  onMounted(() => {
+    const e = document.getElementById('doc-outline-aria-label')
+    if (e) e.onclick = ()=> document.location = '#'
+  })
+</script>

.vitepress/theme/components/UnderConstruction.vue

@@ -0,0 +1,7 @@
+<template>
+  <Badge
+    type="info"
+    text="Under Construction"
+    title="This section is under construction and may not be complete. Check back later for updates..."
+  />
+</template>

.vitepress/theme/index.ts

@@ -7,6 +7,7 @@ import Alpha from './components/Alpha.vue';
 import Beta from './components/Beta.vue';
 import Concept from './components/Concept.vue'
 import Since from './components/Since.vue';
+import UnderConstruction from './components/UnderConstruction.vue';
 // import ScrollToTop from './components/ScrollToTop.vue'
 import CfgInspect from './components/ConfigInspect.vue';
 import TwoslashFloatingVue from '@shikijs/vitepress-twoslash/client'
@@ -28,6 +29,7 @@ export default {
     ctx.app.component('Beta', Beta)
     ctx.app.component('Concept', Concept)
     ctx.app.component('Since', Since)
+    ctx.app.component('UnderConstruction', UnderConstruction)
     // ctx.app.component('ScrollToTop', ScrollToTop)
     ctx.app.use(TwoslashFloatingVue)
   }

.vitepress/theme/styles.scss

@@ -45,6 +45,7 @@
 
   --vp-c-text-1: #000;
   h1, h2, h3, h4, h5 { color: rgba(60, 60, 67) }
+  h6 { color: transparent; position: absolute; margin-top: -7.7em; right: 0px; } // we use h6 for alternative anchor targets
 
 
   /* inverts image colors in dark mode */
@@ -76,12 +77,18 @@ main {
 
     // Set margin-bottom to group groups of h3/h4 together, as in req.error/warn/info/notify
     h3, h4 { margin-bottom: 0em; }
+    h3 + p { margin-top: 1.5em; }
+    h4 + p { margin-top: 1.1em; }
 
     h1 + .subtitle {
       margin: -40px 0 48px;
       font-size: 1.7em;
       font-weight: 400;
     }
+    h2 + .subtitle {
+      margin-top: -44px;
+      font-size: 24px;
+    }
     h3 + .subtitle {
       margin-top: 0;
       font-size: 1.1em;
@@ -131,17 +138,33 @@ main {
       }
     }
 
-    .caption {
-      text-align: center;
-      color: #888;
+    table {
+      tr, th, td {
+        // &:nth-child(2n) {
+          background-color: transparent !important;
+        // }
+      }
+      td, th {
+        border-color: #bbb; .dark & { border-color: #555 };
+        border-right: none;
+        border-left: none;
+        padding-top: 7px;
+        padding-bottom: 7px;
+        line-height: 1.5em;
+      }
     }
-
-    table.centered {
+    .centered table {
       margin-left: auto;
       margin-right: auto;
       width: max-content;
     }
 
+    .caption {
+      text-align: center;
+      color: #888;
+    }
+
+
     div.language-zsh pre code {
       line-height: 1.4em
     }
@@ -334,13 +357,14 @@ main {
   img.zoom40 { zoom: 40% }
   img.zoom33 { zoom: 33% }
   img.zoom25 { zoom: 25% }
+  img.zoom20 { zoom: 20% }
 
   .best-practice::after { content: ' — Best Practice'; color: #777; font-style: italic; }
   .anti-pattern::after { content: ' — Anti Pattern'; color: #e00 }
   .prefer::before { content: 'Prefer: '; color: #0a0 }
   .avoid::before { content: 'Avoid: '; color: #e00 }
 
-  .good .green { color:#0a0 };
+  .good, .green { color:#0a0 };
   .bad, .red, .important { color:darkred; .dark & { color:#e00 } }
   .grey { color:#777 };
 
@@ -451,6 +475,12 @@ kbd {
   padding-left: 22px;
 }
 
+.quote {
+  padding-left: 22px;
+  font-family: serif;
+  font-style: italic;
+}
+
 a.learn-more, p.learn-more, .learn-more {
   font-style: italic;
   margin-top: -10px;