Bump Astro 5→6, Tina canary→stable, CF adapter 12→13

astro.config.mjs

@@ -23,16 +23,5 @@ export default defineConfig({
 		ssr: {
 			noExternal: ['@tinacms/astro', '@tinacms/bridge'],
 		},
-		build: {
-			rollupOptions: {
-				onwarn(warning, warn) {
-					if (warning.code === 'UNUSED_EXTERNAL_IMPORT' &&
-						warning.exporter === 'tinacms/dist/client') {
-						return;
-					}
-					warn(warning);
-				}
-			}
-		}
-	}
+	},
 });

package.json

@@ -3,6 +3,9 @@
   "type": "module",
   "version": "0.0.1",
   "packageManager": "pnpm@10.28.2",
+  "engines": {
+    "node": ">=22.12.0"
+  },
   "scripts": {
     "dev": "tinacms dev -c \"astro dev\"",
     "build": "cross-env NODE_OPTIONS=--max-old-space-size=4096 tinacms build --content=local --skip-cloud-checks -c \"astro build\"",
@@ -13,25 +16,23 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/cloudflare": "^12.6.13",
-    "@astrojs/mdx": "^4.3.0",
-    "@astrojs/rss": "^4.0.15",
-    "@astrojs/sitemap": "^3.7.0",
-    "@tinacms/astro": "0.0.0-c724883-20260514062230",
-    "astro": "^5.16.0"
+    "@astrojs/cloudflare": "^13.1.10",
+    "@astrojs/mdx": "^5.0.6",
+    "@astrojs/rss": "^4.0.18",
+    "@astrojs/sitemap": "^3.7.2",
+    "@tinacms/astro": "^0.4.0",
+    "astro": "^6.3.7"
   },
   "devDependencies": {
-    "@tinacms/cli": "0.0.0-c724883-20260514062230",
-    "@types/node": "^25.1.0",
+    "@tinacms/cli": "^2.4.0",
+    "@types/node": "^25.9.1",
     "cross-env": "^7.0.3",
-    "tinacms": "0.0.0-c724883-20260514062230",
-    "wrangler": "4.59.2"
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
+    "tinacms": "^3.8.2",
+    "wrangler": "^4.95.0"
   },
   "pnpm": {
-    "overrides": {
-      "react": "18.3.1",
-      "react-dom": "18.3.1"
-    },
     "onlyBuiltDependencies": [
       "better-sqlite3",
       "core-js",

public/admin/.gitignore

@@ -1,3 +1,2 @@
 index.html
-assets/
-bridge.js
+assets/

src/content.config.ts

@@ -0,0 +1,16 @@
+/**
+ * Content is sourced from TinaCMS (see `src/lib/data.ts`), not Astro's
+ * content layer, so these collections are unused at runtime. We only
+ * declare `config` to stop Astro auto-generating it as a Markdown
+ * collection: `src/content/config` holds JSON (Tina's global config), so
+ * the default Markdown glob finds nothing and warns. Pointing it at JSON
+ * silences that. `blog` and `page` keep their Markdown auto-generation.
+ */
+import { defineCollection } from 'astro:content';
+import { glob } from 'astro/loaders';
+
+const config = defineCollection({
+	loader: glob({ pattern: '**/*.json', base: 'src/content/config' }),
+});
+
+export const collections = { config };

src/pages/rss.xml.ts

@@ -0,0 +1,21 @@
+import type { APIContext } from 'astro';
+import rss from '@astrojs/rss';
+import config from '../content/config/config.json';
+import { listBlogs } from '../lib/data';
+
+export const prerender = true;
+
+export async function GET(context: APIContext) {
+	const posts = await listBlogs();
+	return rss({
+		title: config.seo.title,
+		description: config.seo.description,
+		site: context.site ?? '',
+		items: posts.map((post) => ({
+			title: post.title,
+			description: post.description ?? undefined,
+			pubDate: post.pubDate ? new Date(post.pubDate) : undefined,
+			link: `/blog/${post._sys.filename}/`,
+		})),
+	});
+}

wrangler.toml

@@ -2,7 +2,7 @@
 name = "ssw-website-global"
 compatibility_date = "2025-05-20"
 compatibility_flags = ["nodejs_compat"]
-main = "./dist/_worker.js/index.js"
+main = "@astrojs/cloudflare/entrypoints/server"
 
 [assets]
 directory = "./dist"