Merge branch '5.next' into 6.x

# Conflicts:
#	.vitepress/config.js

Author: LordSimal

.github/.markdownlint-cli2.jsonc

@@ -75,7 +75,7 @@
     "no-emphasis-as-heading": false
   },
   "customRules": [
-    "./markdownlint-rules/no-space-after-fence.js"
+    "./markdownlint-rules/no-space-after-fence.cjs"
   ],
   "ignores": [
     "node_modules/**"

bin/check-links.js .github/check-links.cjsbin/check-links.js renamed to .github/check-links.cjs

@@ -51,15 +51,15 @@ function checkLink(link, docsDir, lang) {
  * e.g., "toc_en.json" -> "en"
  */
 function getLangFromTocFile(tocFile) {
-  const match = tocFile.match(/^toc_(\w+)\.json$/);
+  const match = tocFile.match(/toc_(\w+)\.json$/);
   return match ? match[1] : null;
 }
 
 /**
  * Main validation function
  */
 function validateTocFiles() {
-  const tocFiles = fs.readdirSync(".").filter((f) => f.match(/^toc_.*\.json$/));
+  const tocFiles = fs.readdirSync(".vitepress").filter((f) => f.match(/^toc_.*\.json$/)).map((f) => `.vitepress/${f}`);
 
   if (tocFiles.length === 0) {
     console.error("No toc_*.json files found");

bin/check-toc-links.js .github/check-toc-links.cjsbin/check-toc-links.js renamed to .github/check-toc-links.cjs

@@ -28,7 +28,7 @@ jobs:
         uses: actions/checkout@v6
 
       - name: Validate config.js syntax
-        run: node --check config.js
+        run: node --check .vitepress/config.js
 
   json-lint:
     name: Validate JSON Files
@@ -40,7 +40,7 @@ jobs:
 
       - name: Validate JSON syntax
         run: |
-          for file in toc_*.json; do
+          for file in .vitepress/toc_*.json; do
             if ! jq empty "$file" 2>/dev/null; then
               echo "Invalid JSON: $file"
               exit 1
@@ -57,7 +57,7 @@ jobs:
         uses: actions/checkout@v6
 
       - name: Check TOC links exist
-        run: node bin/check-toc-links.js
+        run: node .github/check-toc-links.cjs
 
   markdown-lint:
     name: Lint Markdown
@@ -68,7 +68,7 @@ jobs:
         uses: actions/checkout@v6
 
       - name: Lint markdown files
-        uses: DavidAnson/markdownlint-cli2-action@v22
+        uses: DavidAnson/markdownlint-cli2-action@v23
         with:
           config: './.github/.markdownlint-cli2.jsonc'
           globs: 'docs/**/*.md'
@@ -121,4 +121,4 @@ jobs:
 
       - name: Check internal links
         if: steps.changed-files.outputs.files != ''
-        run: node bin/check-links.js --baseline .github/linkchecker-baseline.json ${{ steps.changed-files.outputs.files }}
+        run: node .github/check-links.cjs --baseline .github/linkchecker-baseline.json ${{ steps.changed-files.outputs.files }}

…rkdownlint-rules/no-space-after-fence.js …kdownlint-rules/no-space-after-fence.cjs.github/markdownlint-rules/no-space-after-fence.js renamed to .github/markdownlint-rules/no-space-after-fence.cjs .github/markdownlint-rules/no-space-after-fence.js renamed to .github/markdownlint-rules/no-space-after-fence.cjs

@@ -5,6 +5,10 @@
 .vitepress/.temp
 /node_modules/
 .temp/
+docs/public/favicon/
+docs/public/fonts/
+docs/public/icons/
+docs/public/logo.svg
 
 # IDE and editor specific files #
 #################################

.github/workflows/docs-validation.yml

@@ -1,3 +1,5 @@
+import baseConfig from '@cakephp/docs-skeleton/config'
+
 import { createRequire } from "module";
 const require = createRequire(import.meta.url);
 const toc_en = require("./toc_en.json");
@@ -19,6 +21,7 @@ const versions = {
 
 // This file contains overrides for .vitepress/config.js
 export default {
+  extends: baseConfig,
   base: "/6.x/",
   rewrites: {
     "en/:slug*": ":slug*",

.gitignore

@@ -0,0 +1 @@
+export { default } from '@cakephp/docs-skeleton'