Indivar · vairi · Apr 16, 2026 · Apr 16, 2026 · Apr 16, 2026
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,6 +20,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '22'
+
       - name: Setup Bun
         uses: oven-sh/setup-bun@v2
         with:

diff --git a/CLAUDE.md b/CLAUDE.md
@@ -6,7 +6,7 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co
 
 Astro Fleet is a multi-site Astro monorepo for agencies and multi-brand companies. Each site lives in `sites/<domain>/` and is independently deployable. Shared components and config live in `packages/`.
 
-**Stack:** Astro 5, Bun, Turborepo 2, Tailwind CSS 4, TypeScript (strict mode). Static-first — zero client-side JS by default.
+**Stack:** Astro 6, Bun, Turborepo 2, Tailwind CSS 4, TypeScript (strict mode). Static-first — zero client-side JS by default. Fonts are self-hosted via the Astro 6 Fonts API (configured in each site's `astro.config.mjs`, no third-party Google Fonts requests).
 
 ## Commands
 

diff --git a/README.md b/README.md
@@ -89,7 +89,7 @@ bun run dev --filter=yourdomain.com
 
 ## Stack
 
-Astro 5 · Bun · Turborepo 2 · Tailwind CSS 4 · TypeScript · Static-first (zero JS by default)
+Astro 6 · Bun · Turborepo 2 · Tailwind CSS 4 · TypeScript · Static-first (zero JS by default)
 
 ## License
 

diff --git a/bun.lock b/bun.lock
diff --git a/scripts/new-site.sh b/scripts/new-site.sh
@@ -62,10 +62,9 @@ SITE_TITLE=$(echo "$DOMAIN" | sed 's/\..*//' | sed 's/./\U&/')
 sed -i'' -e "s|'Starter Site'|'$SITE_TITLE'|g" "$ROOT_DIR/sites/$DOMAIN/src/lib/site-config.ts"
 sed -i'' -e "s|'Built with Astro Fleet'|'Powered by $SITE_TITLE'|g" "$ROOT_DIR/sites/$DOMAIN/src/lib/site-config.ts"
 
-# 5. Apply design preset if not corporate (corporate is the default in starter)
+# 5. Apply design preset — update CSS and astro.config.mjs fonts
 if [ "$PRESET" = "saas" ]; then
   cat > "$ROOT_DIR/sites/$DOMAIN/src/styles/global.css" << 'CSSEOF'
-@import url('https://fonts.googleapis.com/css2?family=Sora:wght@400;500;600;700;800&family=Inter:wght@400;500;600;700&display=swap');
 @import "tailwindcss";
 
 @theme {
@@ -100,9 +99,35 @@ a { color: inherit; text-decoration: none; }
 a:hover { color: var(--color-accent); }
 CSSEOF
 
+  cat > "$ROOT_DIR/sites/$DOMAIN/astro.config.mjs" << CONFEOF
+import { defineConfig, fontProviders } from 'astro/config';
+import tailwindcss from '@tailwindcss/vite';
+import sitemap from '@astrojs/sitemap';
+
+export default defineConfig({
+  site: 'https://www.$DOMAIN',
+  integrations: [sitemap()],
+  vite: { plugins: [tailwindcss()] },
+  output: 'static',
+  fonts: [
+    {
+      provider: fontProviders.google(),
+      name: 'Sora',
+      cssVariable: '--font-heading',
+      weights: [400, 500, 600, 700, 800],
+    },
+    {
+      provider: fontProviders.google(),
+      name: 'Inter',
+      cssVariable: '--font-body',
+      weights: [400, 500, 600, 700],
+    },
+  ],
+});
+CONFEOF
+
 elif [ "$PRESET" = "warm" ]; then
   cat > "$ROOT_DIR/sites/$DOMAIN/src/styles/global.css" << 'CSSEOF'
-@import url('https://fonts.googleapis.com/css2?family=Playfair+Display:wght@400;600;700;800&family=Source+Sans+3:wght@400;500;600;700&display=swap');
 @import "tailwindcss";
 
 @theme {
@@ -136,6 +161,33 @@ h1, h2, h3, h4, h5, h6 {
 a { color: inherit; text-decoration: none; }
 a:hover { color: var(--color-accent); }
 CSSEOF
+
+  cat > "$ROOT_DIR/sites/$DOMAIN/astro.config.mjs" << CONFEOF
+import { defineConfig, fontProviders } from 'astro/config';
+import tailwindcss from '@tailwindcss/vite';
+import sitemap from '@astrojs/sitemap';
+
+export default defineConfig({
+  site: 'https://www.$DOMAIN',
+  integrations: [sitemap()],
+  vite: { plugins: [tailwindcss()] },
+  output: 'static',
+  fonts: [
+    {
+      provider: fontProviders.google(),
+      name: 'Playfair Display',
+      cssVariable: '--font-heading',
+      weights: [400, 600, 700, 800],
+    },
+    {
+      provider: fontProviders.google(),
+      name: 'Source Sans 3',
+      cssVariable: '--font-body',
+      weights: [400, 500, 600, 700],
+    },
+  ],
+});
+CONFEOF
 fi
 
 # 6. Clean up sed backup files (macOS sed creates .bak files with -i'')

diff --git a/sites/flux-analytics.com/astro.config.mjs b/sites/flux-analytics.com/astro.config.mjs
@@ -1,4 +1,4 @@
-import { defineConfig } from 'astro/config';
+import { defineConfig, fontProviders } from 'astro/config';
 import tailwindcss from '@tailwindcss/vite';
 import sitemap from '@astrojs/sitemap';
 
@@ -7,4 +7,18 @@ export default defineConfig({
   integrations: [sitemap()],
   vite: { plugins: [tailwindcss()] },
   output: 'static',
+  fonts: [
+    {
+      provider: fontProviders.google(),
+      name: 'Sora',
+      cssVariable: '--font-heading',
+      weights: [400, 500, 600, 700, 800],
+    },
+    {
+      provider: fontProviders.google(),
+      name: 'Inter',
+      cssVariable: '--font-body',
+      weights: [400, 500, 600, 700],
+    },
+  ],
 });
diff --git a/sites/flux-analytics.com/package.json b/sites/flux-analytics.com/package.json
@@ -10,7 +10,7 @@
     "lint": "astro check"
   },
   "dependencies": {
-    "astro": "^5",
+    "astro": "^6",
     "@astro-fleet/shared-ui": "workspace:*",
     "@astro-fleet/config": "workspace:*"
   },

diff --git a/sites/flux-analytics.com/src/styles/global.css b/sites/flux-analytics.com/src/styles/global.css
@@ -1,4 +1,3 @@
-@import url('https://fonts.googleapis.com/css2?family=Sora:wght@400;500;600;700;800&family=Inter:wght@400;500;600;700&display=swap');
 @import "tailwindcss";
 
 @theme {

diff --git a/sites/meridian-advisory.com/astro.config.mjs b/sites/meridian-advisory.com/astro.config.mjs
@@ -1,4 +1,4 @@
-import { defineConfig } from 'astro/config';
+import { defineConfig, fontProviders } from 'astro/config';
 import tailwindcss from '@tailwindcss/vite';
 import sitemap from '@astrojs/sitemap';
 
@@ -7,4 +7,18 @@ export default defineConfig({
   integrations: [sitemap()],
   vite: { plugins: [tailwindcss()] },
   output: 'static',
+  fonts: [
+    {
+      provider: fontProviders.google(),
+      name: 'Inter',
+      cssVariable: '--font-heading',
+      weights: [400, 500, 600, 700, 800, 900],
+    },
+    {
+      provider: fontProviders.google(),
+      name: 'Inter',
+      cssVariable: '--font-body',
+      weights: [400, 500, 600, 700],
+    },
+  ],
 });
diff --git a/sites/meridian-advisory.com/package.json b/sites/meridian-advisory.com/package.json
@@ -10,7 +10,7 @@
     "lint": "astro check"
   },
   "dependencies": {
-    "astro": "^5",
+    "astro": "^6",
     "@astro-fleet/shared-ui": "workspace:*",
     "@astro-fleet/config": "workspace:*"
   },

diff --git a/sites/meridian-advisory.com/src/styles/global.css b/sites/meridian-advisory.com/src/styles/global.css
@@ -1,6 +1,3 @@
-/* Google Fonts: Inter for headings */
-@import url('https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700;800;900&display=swap');
-
 @import "tailwindcss";
 
 /* ============================================================

diff --git a/sites/olive-and-vine.com/astro.config.mjs b/sites/olive-and-vine.com/astro.config.mjs
@@ -1,4 +1,4 @@
-import { defineConfig } from 'astro/config';
+import { defineConfig, fontProviders } from 'astro/config';
 import tailwindcss from '@tailwindcss/vite';
 import sitemap from '@astrojs/sitemap';
 
@@ -7,4 +7,18 @@ export default defineConfig({
   integrations: [sitemap()],
   vite: { plugins: [tailwindcss()] },
   output: 'static',
+  fonts: [
+    {
+      provider: fontProviders.google(),
+      name: 'Playfair Display',
+      cssVariable: '--font-heading',
+      weights: [400, 600, 700, 800],
+    },
+    {
+      provider: fontProviders.google(),
+      name: 'Source Sans 3',
+      cssVariable: '--font-body',
+      weights: [400, 500, 600, 700],
+    },
+  ],
 });
diff --git a/sites/olive-and-vine.com/package.json b/sites/olive-and-vine.com/package.json
@@ -10,7 +10,7 @@
     "lint": "astro check"
   },
   "dependencies": {
-    "astro": "^5",
+    "astro": "^6",
     "@astro-fleet/shared-ui": "workspace:*",
     "@astro-fleet/config": "workspace:*"
   },

diff --git a/sites/olive-and-vine.com/src/styles/global.css b/sites/olive-and-vine.com/src/styles/global.css
@@ -1,4 +1,3 @@
-@import url('https://fonts.googleapis.com/css2?family=Playfair+Display:wght@400;600;700;800&family=Source+Sans+3:wght@400;500;600;700&display=swap');
 @import "tailwindcss";
 
 @theme {

diff --git a/sites/starter/astro.config.mjs b/sites/starter/astro.config.mjs
@@ -1,4 +1,4 @@
-import { defineConfig } from 'astro/config';
+import { defineConfig, fontProviders } from 'astro/config';
 import tailwindcss from '@tailwindcss/vite';
 import sitemap from '@astrojs/sitemap';
 
@@ -7,4 +7,18 @@ export default defineConfig({
   integrations: [sitemap()],
   vite: { plugins: [tailwindcss()] },
   output: 'static',
+  fonts: [
+    {
+      provider: fontProviders.google(),
+      name: 'Inter',
+      cssVariable: '--font-heading',
+      weights: [400, 500, 600, 700, 800, 900],
+    },
+    {
+      provider: fontProviders.google(),
+      name: 'Inter',
+      cssVariable: '--font-body',
+      weights: [400, 500, 600, 700],
+    },
+  ],
 });
diff --git a/sites/starter/package.json b/sites/starter/package.json
@@ -10,7 +10,7 @@
     "lint": "astro check"
   },
   "dependencies": {
-    "astro": "^5",
+    "astro": "^6",
     "@astro-fleet/shared-ui": "workspace:*",
     "@astro-fleet/config": "workspace:*"
   },

diff --git a/sites/starter/src/styles/global.css b/sites/starter/src/styles/global.css
@@ -1,6 +1,3 @@
-/* Google Fonts: Inter for headings */
-@import url('https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700;800;900&display=swap');
-
 @import "tailwindcss";
 
 /* ============================================================