diff --git a/.github/renovate.json b/.github/renovate.json index 3168cb8b8..141f5b287 100644 --- a/.github/renovate.json +++ b/.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*'(?.*?)'" ], @@ -47,7 +47,7 @@ }, { "customType": "regex", - "fileMatch": [ ".vitepress/config.ts" ], + "fileMatch": [ ".vitepress/config.*" ], "matchStrings": [ "java_cds4j\\s*:\\s*'(?.*?)'" ], diff --git a/.github/workflows/PR-SAP.yml b/.github/workflows/PR-SAP.yml index f6d1a8db8..e6ef04866 100644 --- a/.github/workflows/PR-SAP.yml +++ b/.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 }} diff --git a/.github/workflows/PR.yml b/.github/workflows/PR.yml index ebee41b82..fad693786 100644 --- a/.github/workflows/PR.yml +++ b/.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 }} diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 4daf7b7ad..8966978f7 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -5,6 +5,7 @@ on: branches: [main] paths: - '**.md' + merge_group: workflow_dispatch: jobs: diff --git a/.vitepress/config.js b/.vitepress/config.js index 50cf14c85..050746f20 100644 --- a/.vitepress/config.js +++ b/.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' diff --git a/.vitepress/menu.js b/.vitepress/menu.js index b7a5a11d1..b436f21d8 100644 --- a/.vitepress/menu.js +++ b/.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 diff --git a/.vitepress/theme/Layout.vue b/.vitepress/theme/Layout.vue index 174087fbd..6b502bd16 100644 --- a/.vitepress/theme/Layout.vue +++ b/.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 diff --git a/.vitepress/theme/components/ConfigInspect.vue b/.vitepress/theme/components/ConfigInspect.vue index 6a34a7d34..522f6ffa6 100644 --- a/.vitepress/theme/components/ConfigInspect.vue +++ b/.vitepress/theme/components/ConfigInspect.vue @@ -59,9 +59,10 @@ } ) - const { java, keyOnly } = defineProps<{ + const { java, keyOnly, label:labelProp } = defineProps<{ java?: boolean, - keyOnly?: boolean + keyOnly?: boolean, + label?: string }>() FloatingVue.options.themes.cfgPopper = { $extend: 'dropdown' } @@ -69,7 +70,7 @@ const slotVal = slots.default?.().at(0)?.children?.toString().trim() ?? 'error: provide your_key:value' const [key, val] = slotVal.split(/\s*[:=]\s*/) - const label = `${keyOnly ? key: slotVal}` + const label = labelProp || `${keyOnly ? key: slotVal}` const cfgKey = ref() const popperVisible = ref(false) diff --git a/.vitepress/theme/components/ScrollToTopSimple.vue b/.vitepress/theme/components/ScrollToTopSimple.vue new file mode 100644 index 000000000..7999c3862 --- /dev/null +++ b/.vitepress/theme/components/ScrollToTopSimple.vue @@ -0,0 +1,12 @@ + +