New website design

.github/workflows/pr.yaml

@@ -43,7 +43,9 @@ jobs:
       - name: Check if PR only changes draft blog posts
         id: check
         run: |
-          CHANGED=$(gh pr diff ${{ github.event.pull_request.number }} --name-only)
+          CHANGED=$(gh api --paginate \
+            "repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/files" \
+            --jq '.[].filename')
           DRAFTS_ONLY=true
           for file in $CHANGED; do
             case "$file" in
@@ -88,9 +90,21 @@ jobs:
         run: yarn workspaces foreach --all install
       - name: Check cache
         run: yarn check:dependencies
+      # Antora spends most of the build cloning content repositories: a green
+      # run measured 426s of 606s in contentAggregated, against 165s of actual
+      # conversion. Restoring the clones turns those into incremental fetches.
+      # The key is deliberately stable, so the cache is written once per
+      # playbook revision rather than on every run, which would churn the
+      # repository's shared 10 GB cache budget.
+      - name: Cache Antora content
+        uses: actions/cache@v6
+        with:
+          path: ${{ github.workspace }}/.antora-cache
+          key: antora-content-v1-${{ hashFiles('antora-playbook-snippets/antora-playbook.yml') }}
       - name: Build
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          ANTORA_CACHE_DIR: ${{ github.workspace }}/.antora-cache
         run: yarn build-all
       - name: Run checks
         run: yarn checks
@@ -99,7 +113,7 @@ jobs:
           mkdir pull_request
           echo ${{ github.event.pull_request.number }} > ./pull_request/number
       - name: Upload artifacts
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
         with:
           name: website
           path: |

.gitignore

@@ -29,10 +29,13 @@ resources
 antora-playbook-*.yml
 
 #temporary
-local-antora-playbook-*
 antora-playbook.yml
 /.hugo_build.lock
+/tests/antora-ui/out
 
 .playwright-cli/
 skills-lock.json
 build/unused-media.txt
+
+# CI relocates ANTORA_CACHE_DIR here so it can be cached between runs
+/.antora-cache

.gitleaks.toml

@@ -0,0 +1,13 @@
+# Secret-scanner allowlist (gitleaks v8 format; also read by leaktk).
+#
+# The DocSearch widget needs Algolia's search-only API key in the browser, so
+# antora-ui-camel/src/js/08-docsearch.js embeds it and the built bundle under
+# antora-ui-camel/public/_/js/ carries it minified. It is a public, read-only
+# key by design, not a credential; scanners flag the bundle as a "Generic
+# Secret" every time the hashed filename changes.
+
+[[allowlists]]
+description = "Algolia DocSearch search-only API key for the apache_camel index"
+condition = "AND"
+paths = ['''^antora-ui-camel/(src/js/08-docsearch\.js|public/_/js/site-[0-9a-f]+\.js)$''']
+regexes = ['''1b7e52df4759e32dd49adedb286997f6''']

antora-local-build.sh

@@ -35,10 +35,10 @@ antora-playbook-snippets/assemble-playbook.sh antora-playbook-local-quick.yml ..
 
 if [ "$2" = "full" ]
 then
-  yarn build:antora-local-full2
+  yarn build:antora-local-full
 elif [ "$2" = "quick" ]
 then
   yarn build:antora-local-quick
 else
-  yarn build:antora-local-partial2
+  yarn build:antora-local-partial
 fi

antora-playbook-snippets/antora-playbook.yml

@@ -106,6 +106,11 @@ runtime:
 
 antora:
   extensions:
+    # First, so it times the phases that follow. Antora suppresses its own
+    # progress output whenever stdout is not a TTY, which is always the case
+    # under `yarn build-all` and on CI.
+    - ./extensions/build-progress.js
+
     - ./extensions/promote-deprecated-attribute.js
 
     # Registers the [asciinema] block and injects the player assets plus the asciinema-styles,

antora-ui-camel/gulpfile.js

@@ -21,7 +21,8 @@ const glob = {
   test: 'test/**/*-test.js',
   formatcss: [
     `${srcDir}/css/**/*.css`,
-    `!${srcDir}/css/**/typeface-droid-sans-mono.css`,
+    `!${srcDir}/css/**/typeface-archivo.css`,
+    `!${srcDir}/css/**/typeface-jetbrains-mono.css`,
     `!${srcDir}/css/**/typeface-open-sans.css`,
   ],
   js: ['gulpfile.js', 'gulp.d/**/*.js', `${srcDir}/{helpers,js}/**/*.js`],

antora-ui-camel/package.json

@@ -12,7 +12,9 @@
     "node": ">= 22.12.0"
   },
   "browserslist": [
-    "last 2 versions"
+    "last 2 versions",
+    "safari >= 16.4",
+    "ios_saf >= 16.4"
   ],
   "scripts": {
     "build": "gulp bundle",
@@ -23,6 +25,8 @@
   "devDependencies": {
     "@asciidoctor/core": "^3.0.2",
     "@asciidoctor/tabs": "1.0.0-beta.3",
+    "@fontsource/archivo": "^5.3.0",
+    "@fontsource/jetbrains-mono": "^5.3.0",
     "@openfonts/open-sans_latin-ext": "^1.44.0",
     "@ronilaukkarinen/gulp-stylelint": "^14.1.2",
     "@vscode/gulp-vinyl-zip": "^2.5.0",
@@ -67,7 +71,6 @@
     "stylelint-config-standard": "^34.0.0",
     "svg4everybody": "^2.1.9",
     "toml": "^4.2.0",
-    "typeface-droid-sans-mono": "^0.0.44",
     "undertaker": "^2.0.0",
     "vinyl-buffer": "~1.0",
     "vinyl-fs": "^4.0.2"

antora-ui-camel/public/_/data/rev-manifest.json

@@ -1,37 +1,28 @@
 {
-  "css/site.css": "css/site-74543f5b13.css",
+  "css/site.css": "css/site-fa37b1d407.css",
   "css/vendor/docsearch.css": "css/vendor/docsearch-7619faa207.css",
   "img/algolia.svg": "img/algolia-f4ab98e0de.svg",
   "img/apache-kafka.svg": "img/apache-kafka-88809b7472.svg",
   "img/apache-karaf.svg": "img/apache-karaf-7bdb5ce2e3.svg",
-  "img/articles.svg": "img/articles-88ac404d18.svg",
-  "img/asf_logo_wide.svg": "img/asf_logo_wide-3982e7e19b.svg",
   "img/back.svg": "img/back-e8d811f74c.svg",
-  "img/blog.svg": "img/blog-4c7fa4cb60.svg",
   "img/books.svg": "img/books-77a59b07e1.svg",
   "img/brand-logos.svg": "img/brand-logos-a2b35bbdec.svg",
   "img/bugfix.svg": "img/bugfix-4280bf9490.svg",
   "img/calendar.svg": "img/calendar-b4b3ab1bf7.svg",
-  "img/caret.svg": "img/caret-d6dacc711e.svg",
+  "img/caret.svg": "img/caret-8823676a4b.svg",
   "img/chevron.svg": "img/chevron-63cb534773.svg",
   "img/cli.svg": "img/cli-9cede0128a.svg",
   "img/close.svg": "img/close-af0b99e31b.svg",
   "img/community.svg": "img/community-2ec8a3dc8b.svg",
-  "img/contributing.svg": "img/contributing-107909992d.svg",
   "img/copy-checkmark.svg": "img/copy-checkmark-9a4caf1664.svg",
   "img/copy.svg": "img/copy-d7c1e3194d.svg",
   "img/docs.svg": "img/docs-7d0adf1156.svg",
-  "img/documentation.svg": "img/documentation-abb1b7f8b1.svg",
-  "img/download.svg": "img/download-63cdd75074.svg",
   "img/examples.svg": "img/examples-07d01f2bc0.svg",
   "img/github.svg": "img/github-0cae1e39c4.svg",
-  "img/home-o.svg": "img/home-o-97a33fc02f.svg",
-  "img/home.svg": "img/home-934e2b15ea.svg",
   "img/jbang.svg": "img/jbang-e88e00f7fa.svg",
   "img/karavan.svg": "img/karavan-8621354711.svg",
   "img/knative.svg": "img/knative-5010ee4773.svg",
   "img/kubernetes.svg": "img/kubernetes-07ba46aaa2.svg",
-  "img/logo-camel-medium.png": "img/logo-camel-medium-372cf8688f.png",
   "img/logo-d.svg": "img/logo-d-a567cee6fa.svg",
   "img/menu.svg": "img/menu-8775cec4be.svg",
   "img/quarkus.svg": "img/quarkus-446ffca541.svg",
@@ -40,11 +31,9 @@
   "img/security.svg": "img/security-06abe157b3.svg",
   "img/sparkle.svg": "img/sparkle-da54b1f43c.svg",
   "img/spring-boot.svg": "img/spring-boot-0a7cb95564.svg",
-  "img/support.svg": "img/support-7219bb2f58.svg",
-  "img/team.svg": "img/team-899f1050c2.svg",
   "img/tooling.svg": "img/tooling-f5e235c238.svg",
   "img/user-stories.svg": "img/user-stories-cccc5f7c8f.svg",
-  "js/site.js": "js/site-72c5696123.js",
+  "js/site.js": "js/site-2261680ded.js",
   "js/vendor/docsearch.js": "js/vendor/docsearch-f8ce9408ec.js",
   "js/vendor/highlight.js": "js/vendor/highlight-de2def4bea.js",
   "js/vendor/svg4everybody.js": "js/vendor/svg4everybody-a0c573f2b9.js",

antora-ui-camel/public/_/helpers/asset.js

@@ -1,39 +1,30 @@
 'use strict'
 
 const manifest = {
-  "css/site.css": "css/site-74543f5b13.css",
+  "css/site.css": "css/site-fa37b1d407.css",
   "css/vendor/docsearch.css": "css/vendor/docsearch-7619faa207.css",
   "img/algolia.svg": "img/algolia-f4ab98e0de.svg",
   "img/apache-kafka.svg": "img/apache-kafka-88809b7472.svg",
   "img/apache-karaf.svg": "img/apache-karaf-7bdb5ce2e3.svg",
-  "img/articles.svg": "img/articles-88ac404d18.svg",
-  "img/asf_logo_wide.svg": "img/asf_logo_wide-3982e7e19b.svg",
   "img/back.svg": "img/back-e8d811f74c.svg",
-  "img/blog.svg": "img/blog-4c7fa4cb60.svg",
   "img/books.svg": "img/books-77a59b07e1.svg",
   "img/brand-logos.svg": "img/brand-logos-a2b35bbdec.svg",
   "img/bugfix.svg": "img/bugfix-4280bf9490.svg",
   "img/calendar.svg": "img/calendar-b4b3ab1bf7.svg",
-  "img/caret.svg": "img/caret-d6dacc711e.svg",
+  "img/caret.svg": "img/caret-8823676a4b.svg",
   "img/chevron.svg": "img/chevron-63cb534773.svg",
   "img/cli.svg": "img/cli-9cede0128a.svg",
   "img/close.svg": "img/close-af0b99e31b.svg",
   "img/community.svg": "img/community-2ec8a3dc8b.svg",
-  "img/contributing.svg": "img/contributing-107909992d.svg",
   "img/copy-checkmark.svg": "img/copy-checkmark-9a4caf1664.svg",
   "img/copy.svg": "img/copy-d7c1e3194d.svg",
   "img/docs.svg": "img/docs-7d0adf1156.svg",
-  "img/documentation.svg": "img/documentation-abb1b7f8b1.svg",
-  "img/download.svg": "img/download-63cdd75074.svg",
   "img/examples.svg": "img/examples-07d01f2bc0.svg",
   "img/github.svg": "img/github-0cae1e39c4.svg",
-  "img/home-o.svg": "img/home-o-97a33fc02f.svg",
-  "img/home.svg": "img/home-934e2b15ea.svg",
   "img/jbang.svg": "img/jbang-e88e00f7fa.svg",
   "img/karavan.svg": "img/karavan-8621354711.svg",
   "img/knative.svg": "img/knative-5010ee4773.svg",
   "img/kubernetes.svg": "img/kubernetes-07ba46aaa2.svg",
-  "img/logo-camel-medium.png": "img/logo-camel-medium-372cf8688f.png",
   "img/logo-d.svg": "img/logo-d-a567cee6fa.svg",
   "img/menu.svg": "img/menu-8775cec4be.svg",
   "img/quarkus.svg": "img/quarkus-446ffca541.svg",
@@ -42,11 +33,9 @@ const manifest = {
   "img/security.svg": "img/security-06abe157b3.svg",
   "img/sparkle.svg": "img/sparkle-da54b1f43c.svg",
   "img/spring-boot.svg": "img/spring-boot-0a7cb95564.svg",
-  "img/support.svg": "img/support-7219bb2f58.svg",
-  "img/team.svg": "img/team-899f1050c2.svg",
   "img/tooling.svg": "img/tooling-f5e235c238.svg",
   "img/user-stories.svg": "img/user-stories-cccc5f7c8f.svg",
-  "js/site.js": "js/site-72c5696123.js",
+  "js/site.js": "js/site-2261680ded.js",
   "js/vendor/docsearch.js": "js/vendor/docsearch-f8ce9408ec.js",
   "js/vendor/highlight.js": "js/vendor/highlight-de2def4bea.js",
   "js/vendor/svg4everybody.js": "js/vendor/svg4everybody-a0c573f2b9.js",

antora-ui-camel/public/_/helpers/withChromeData.js

@@ -0,0 +1,51 @@
+'use strict'
+
+const fs = require('fs')
+const path = require('path')
+const yaml = require('js-yaml')
+
+const absolute = /^(?:https?:)?\/\//
+
+// Antora evaluates UI helpers in its own process, so this runs against the
+// cwd of the Antora (or `gulp preview`) run: the repository root, or
+// antora-ui-camel for the preview.
+const candidates = [
+  path.join(process.cwd(), 'data', 'chrome.yaml'),
+  path.resolve(process.cwd(), '..', 'data', 'chrome.yaml'),
+]
+const dataPath = candidates.find((candidate) => fs.existsSync(candidate))
+if (!dataPath) {
+  throw new Error(
+    'withChromeData: data/chrome.yaml not found; run Antora from the camel-website repository root ' +
+    '(cwd: ' + process.cwd() + ')'
+  )
+}
+
+// js-yaml 4's load() uses the safe schema by default; safeLoad was removed in
+// v4 because it became redundant. This is not PyYAML's unsafe load.
+const chromeData = yaml.load(fs.readFileSync(dataPath, 'utf8'))
+
+const mapLink = (link, siteRootPath) => {
+  return Object.assign({}, link, {
+    url: absolute.test(link.url) ? link.url : siteRootPath + link.url,
+  })
+}
+
+module.exports = (options) => {
+  const siteRootPath = options.data.root.siteRootPath
+  // Merge onto the existing data frame instead of replacing it outright:
+  // replacing it drops inherited private variables such as @root, which
+  // Handlebars templates inside this block need to reach the top-level
+  // context (e.g. uiRootPath) from any depth, including inside {{#each}}.
+  return options.fn(this, {
+    data: Object.assign({}, options.data, {
+      brand: chromeData.brand,
+      columns: chromeData.columns.map((column) => ({
+        title: column.title,
+        links: column.links.map((link) => mapLink(link, siteRootPath)),
+      })),
+      social: chromeData.social.map((link) => mapLink(link, siteRootPath)),
+      legal: chromeData.legal.map((link) => mapLink(link, siteRootPath)),
+    }),
+  })
+}

antora-ui-camel/public/_/helpers/withMenuData.js

@@ -17,24 +17,38 @@ const data = fs.readFileSync(configPath, 'utf8')
 const hugoConfig = toml.parse(data)
 const mainMenu = hugoConfig.menu.main
 
+// Hugo orders menu.main by weight, not by its position in config.toml. Sort
+// here too, on both levels, so the two renderings cannot silently diverge if
+// a weight is ever reordered without moving the corresponding block.
+const byWeight = (a, b) => (a.weight || 0) - (b.weight || 0)
+
 const createMenu = (item) => {
   return {
     url: item.url || '#',
     name: item.name,
-    pre: item.pre,
-    children: mainMenu.filter((child) => child.parent === item.identifier).map(createMenu),
+    children: mainMenu
+      .filter((child) => child.parent === item.identifier)
+      .sort(byWeight)
+      .map(createMenu),
   }
 }
 
-const menuData = mainMenu.filter((item) => typeof item.parent === 'undefined').map(createMenu)
+const menuData = mainMenu
+  .filter((item) => typeof item.parent === 'undefined')
+  .sort(byWeight)
+  .map(createMenu)
 
 module.exports = (options) => {
   const siteRootPath = options.data.root.siteRootPath
   const mappedMenuData = menuData.map((item) => mapItem(item, siteRootPath))
+  // Merge onto the existing data frame instead of replacing it outright:
+  // replacing it drops inherited private variables such as @root, which
+  // Handlebars templates inside this block need to reach the top-level
+  // context (e.g. uiRootPath) from any depth, including inside {{#each}}.
   return options.fn(this, {
-    data: {
+    data: Object.assign({}, options.data, {
       items: mappedMenuData,
-    },
+    }),
   })
 }
 
@@ -43,7 +57,6 @@ const mapItem = (item, siteRootPath) => {
   return {
     url,
     name: item.name,
-    pre: item.pre,
     children: item.children.map((child) => mapItem(child, siteRootPath)),
   }
 }