Thinkmill · SamLeatherdale · Mar 26, 2025 · Apr 9, 2025
diff --git a/src/app/keystatic/keystatic.config.tsx → keystatic.config.ts b/src/app/keystatic/keystatic.config.tsx → keystatic.config.ts
@@ -2,11 +2,11 @@ import { config } from '@keystatic/core'
 import type { LocalConfig, GitHubConfig } from '@keystatic/core'
 
 // Schema
-import admin from './schema/singletons/admin'
-import events from './schema/collections/events'
-import talks from './schema/collections/talks'
-import persons from './schema/collections/persons'
-import sponsors from './schema/collections/sponsors'
+import admin from './src/app/keystatic/schema/singletons/admin'
+import events from './src/app/keystatic/schema/collections/events'
+import talks from './src/app/keystatic/schema/collections/talks'
+import persons from './src/app/keystatic/schema/collections/persons'
+import sponsors from './src/app/keystatic/schema/collections/sponsors'
 
 // Storage strategy
 const storage: LocalConfig['storage'] | GitHubConfig['storage'] =

diff --git a/next.config.js → next.config.ts b/next.config.js → next.config.ts
@@ -1,5 +1,6 @@
-/** @type {import('next').NextConfig} */
-const nextConfig = {
+import { NextConfig } from 'next'
+
+const nextConfig: NextConfig = {
   reactStrictMode: false,
   async redirects() {
     return [

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -11,8 +11,9 @@
   "dependencies": {
     "@headlessui/react": "^1.7.14",
     "@heroicons/react": "^2.0.17",
-    "@keystatic/core": "^0.0.110",
-    "@keystatic/next": "^0.0.11",
+    "@keystatic/core": "^0.5.46",
+    "@keystatic/next": "^5.0.4",
+    "@markdoc/markdoc": "^0.5.1",
     "@tailwindcss/container-queries": "^0.1.1",
     "@tailwindcss/typography": "^0.5.9",
     "@types/node": "^18.16.5",
@@ -24,7 +25,7 @@
     "date-fns": "^2.30.0",
     "eslint": "^8.40.0",
     "eslint-config-next": "^13.4.5",
-    "next": "^13.5.10",
+    "next": "^15.2.4",
     "postcss": "^8.4.31",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

diff --git a/src/app/api/keystatic/[...params]/route.ts b/src/app/api/keystatic/[...params]/route.ts
@@ -0,0 +1,6 @@
+import { makeRouteHandler } from '@keystatic/next/route-handler'
+import config from '../../../../../keystatic.config'
+
+export const { GET, POST } = makeRouteHandler({
+  config,
+})
diff --git a/src/app/keystatic/keystatic.tsx → src/app/keystatic/keystatic.ts b/src/app/keystatic/keystatic.tsx → src/app/keystatic/keystatic.ts
@@ -1,5 +1,5 @@
 'use client'
 import { makePage } from '@keystatic/next/ui/app'
-import config from '@/app/keystatic/keystatic.config'
+import config from '../../../keystatic.config'
 
 export default makePage(config)
diff --git a/src/app/keystatic/layout.tsx b/src/app/keystatic/layout.tsx
@@ -4,13 +4,6 @@ export const metadata = {
   title: 'Keystatic: Admin UI',
 }
 
-export default function RootLayout() {
-  return (
-    <html>
-      <head />
-      <body>
-        <KeystaticApp />
-      </body>
-    </html>
-  )
+export default function Layout() {
+  return <KeystaticApp />
 }
diff --git a/src/app/keystatic/reader.ts b/src/app/keystatic/reader.ts
@@ -1,4 +1,4 @@
 import { createReader } from '@keystatic/core/reader'
-import keystaticConfig from './keystatic.config'
+import keystaticConfig from '../../../keystatic.config'
 
 export const reader = createReader('', keystaticConfig)
diff --git a/src/components/event-card/listing.tsx b/src/components/event-card/listing.tsx
@@ -14,7 +14,6 @@ import { TextLink } from '../text-link'
 import { asyncComponent } from '@/lib/async-component'
 import { reader } from '@/app/keystatic/reader'
 import { Status, getStatus } from '@/lib/get-status'
-import events from '@/app/keystatic/schema/collections/events'
 
 const eventStatusClasses: Record<Status, string> = {
   UPCOMING: 'bg-highlight',

diff --git a/src/pages/api/keystatic/[[...params]].tsx b/src/pages/api/keystatic/[[...params]].tsx