chore: try tina config changes.

Author: benjamsf

.github/workflows/deploypages.yml

@@ -87,14 +87,6 @@ jobs:
       - name: Install deps
         run: npm ci
 
-      # ----- Build Tina admin (./admin) -----
-      - name: Build TinaCMS admin
-        env:
-          TINA_PUBLIC_CLIENT_ID: ${{ secrets.TINA_PUBLIC_CLIENT_ID }}
-          TINA_TOKEN:            ${{ secrets.TINA_TOKEN }}
-          ENABLE_TINA_ADMIN: true
-        run: npx tinacms build
-
       # ----- Build Docusaurus site (./build) -----
       - name: Build docs site
         env:
@@ -104,6 +96,14 @@ jobs:
           DOCS_BASEURL: ${{ secrets.DOCS_BASEURL }}   # e.g. /Docusaurus-docs/
         run: npm run build
 
+          # ----- Build Tina admin (./admin) -----
+      - name: Build TinaCMS admin
+        env:
+          TINA_PUBLIC_CLIENT_ID: ${{ secrets.TINA_PUBLIC_CLIENT_ID }}
+          TINA_TOKEN:            ${{ secrets.TINA_TOKEN }}
+          ENABLE_TINA_ADMIN: true
+        run: npx tinacms build
+
       # ----- Copy Tina into <baseUrl>/admin -----
       - name: Relocate Tina admin inside baseUrl
         run: |

build.sh

@@ -1,32 +1,17 @@
-
-#!/bin/bash
-set -e
-
-echo "🚩 ENABLE_TINA_ADMIN: $ENABLE_TINA_ADMIN"
-
-if [[ "$ENABLE_TINA_ADMIN" == "true" ]]; then
-  echo "📦 Building Tina admin UI…"
-  npx @tinacms/cli build          # produces public/admin
-
-  # ------------------------------------------
-  # Copy Tina bundle into the final build dir
-  # ------------------------------------------
-  # DOCS_BASEURL may be "/", "/Docusaurus-docs/", etc.
-  BASE="${DOCS_BASEURL:-/}"
-  BASE="${BASE#/}" ; BASE="${BASE%/}"   # strip leading/trailing /
-  DEST="build"
-  [[ -n "$BASE" ]] && DEST="$DEST/$BASE"
-  DEST="$DEST/admin"
-
-  echo "🔀  Copying Tina → $DEST"
-  rm -rf "$DEST"
-  mkdir -p "$DEST"
-  cp -a public/admin/. "$DEST/"
-else
-  echo "⏭️  Tina admin build skipped"
+#!/usr/bin/env bash
+set -euo pipefail
+
+echo "▶ ENABLE_TINA_ADMIN = ${ENABLE_TINA_ADMIN:-false}"
+echo "▶ DOCS_BASEURL      = ${DOCS_BASEURL:-/}"
+
+#───────────────────────────────────────────────────────────────#
+# 1. Build Tina -> public/admin
+#───────────────────────────────────────────────────────────────#
+if [[ "${ENABLE_TINA_ADMIN:-}" == "true" ]]; then
+  echo "📦  Building TinaCMS admin …"
+  npx tinacms build
 fi
 
-
 # Ensure sidebar index exists
 if [ ! -f "src/sidebars/index.json" ]; then
   echo '{"items": []}' > src/sidebars/index.json
@@ -47,4 +32,17 @@ find "$SRC_DIR" -name 'index.html' | while read -r html; do
   npx html-inline --nocompress --inlinemin --root "$PROJECT_ROOT" "$html" > "$out_path"
 done
 
+if [[ "${ENABLE_TINA_ADMIN:-}" == "true" ]]; then
+  BASE="${DOCS_BASEURL:-/}"
+  BASE="${BASE#/}" ; BASE="${BASE%/}"     # trim slashes
+
+  dest="build"
+  [[ -n "$BASE" ]] && dest="${dest}/${BASE}"
+  dest="${dest}/admin"
+
+  echo "🚚  Copying  public/admin → ${dest}"
+  mkdir -p "${dest}"
+  cp -a public/admin/. "${dest}/"
+fi
+
 echo "✅ All slide decks inlined to: $OUT_DIR"

tina/config.ts

@@ -75,15 +75,18 @@ function sidebarItemFields() {
 
 export default defineConfig({
   branch,
-  // TinaCloud configuration
   clientId: process.env.TINA_PUBLIC_CLIENT_ID!,
   token: process.env.TINA_TOKEN!,
 
   build: {
+    /**
+     * Keep the generated files in   public/admin
+     * but make every internal link start with   <baseUrl>/admin
+     */
     outputFolder: "admin",
     publicFolder: "public",
-    // THIS IS THE KEY FIX: Set basePath for sub-path deployment
-    basePath: process.env.DOCS_BASEURL || "/Docusaurus-docs",
+    basePath: `${(process.env.DOCS_BASEURL || "/Docusaurus-docs")
+                  .replace(/\/$/, "")}/admin`,
   },
   media: {
     tina: {