Promote Payload cutover to production

.env.example

@@ -1,16 +1,30 @@
-# Strapi v5 server base URL (no trailing slash and no /admin path)
+# Provider switch retained during the rollback window. Unknown values use Strapi.
+CMS_PROVIDER=strapi
+
+# Only this exact pair permits draft reads. All other values are published-only.
+CMS_MODE=published
+DEPLOYMENT_ROLE=production
+
+# Payload API base URL and server-only read credentials.
+PAYLOAD_URL=https://cms.epyc.in
+PAYLOAD_READ_TOKEN=
+PAYLOAD_PREVIEW_TOKEN=
+
+# HMAC secret shared with Payload's revalidation webhook. The webhook sends a
+# hex SHA-256 signature in the x-epyc-signature header.
+CMS_REVALIDATION_SECRET=
+
+# Strapi v5 server base URL retained for migration and rollback.
 STRAPI_URL=https://your-strapi-server.com
 
 # Read-only API token from Strapi Admin → Settings → API Tokens
 # Leave blank if the collections are publicly readable
 STRAPI_API_TOKEN=
 
-# Set to "true" to fetch unpublished drafts (?status=draft) with caching off.
-# Use only on preview/staging — the token above must have draft read access.
+# Legacy fallback. Drafts still require DEPLOYMENT_ROLE=preview.
 STRAPI_PREVIEW=
 
-# Public base URL of the R2 bucket (custom domain) that serves Strapi media.
-# The image loader prepends this to Strapi's bare /uploads/* paths.
+# Public base URL of the R2 media bucket.
 NEXT_PUBLIC_MEDIA_BASE_URL=https://media.epyc.in
 
 # Contact form submissions are stored in Cloudflare D1, reached through the `DB`

.github/workflows/ci.yml

@@ -2,7 +2,10 @@ name: CI
 
 on:
   pull_request:
-    branches: [develop, master, production]
+    # `main` is the default branch and `production` is the release branch.
+    # These were previously [develop, master, production] — branch names this
+    # repo no longer uses — so CI never ran on a normal pull request.
+    branches: [main, production]
   workflow_dispatch:
 
 jobs:
@@ -19,14 +22,19 @@ jobs:
 
       - uses: actions/setup-node@v4
         with:
-          node-version: 20
+          # 22, not 20: lib/tools/counters.test.ts runs its SQL against the
+          # built-in `node:sqlite`, which does not exist before Node 22.
+          node-version: 22
           cache: pnpm
 
       - run: pnpm install --frozen-lockfile
 
       - name: Typecheck
         run: pnpm exec tsc --noEmit
 
+      - name: Test
+        run: pnpm test
+
       - name: Typecheck contact-webhook worker
         # The consumer Worker is excluded from the root tsconfig (different
         # libs), so it has its own project — check it explicitly.

.github/workflows/deploy-production.yml

@@ -45,6 +45,15 @@ jobs:
           STRAPI_URL: ${{ secrets.PRODUCTION_STRAPI_URL }}
           STRAPI_API_TOKEN: ${{ secrets.PRODUCTION_STRAPI_API_TOKEN }}
           STRAPI_PREVIEW: ${{ secrets.PRODUCTION_STRAPI_PREVIEW }}
+          # Published-only reads. robots.ts and the root layout's metadata are
+          # evaluated at build time, so these must be present here as well as in
+          # the Worker's vars.
+          CMS_PROVIDER: payload
+          CMS_MODE: published
+          DEPLOYMENT_ROLE: production
+          PAYLOAD_URL: https://epyc-payload-cms.epyc.workers.dev
+          PAYLOAD_READ_TOKEN: ${{ secrets.PRODUCTION_PAYLOAD_READ_TOKEN }}
+          CMS_REVALIDATION_SECRET: ${{ secrets.CMS_REVALIDATION_SECRET }}
 
       - name: Upload secrets to Cloudflare Workers (production)
         env:
@@ -53,15 +62,21 @@ jobs:
           STRAPI_URL: ${{ secrets.PRODUCTION_STRAPI_URL }}
           STRAPI_API_TOKEN: ${{ secrets.PRODUCTION_STRAPI_API_TOKEN }}
           STRAPI_PREVIEW: ${{ secrets.PRODUCTION_STRAPI_PREVIEW }}
+          PAYLOAD_READ_TOKEN: ${{ secrets.PRODUCTION_PAYLOAD_READ_TOKEN }}
+          CMS_REVALIDATION_SECRET: ${{ secrets.CMS_REVALIDATION_SECRET }}
         run: |
           jq -n \
             --arg STRAPI_URL "$STRAPI_URL" \
             --arg STRAPI_API_TOKEN "$STRAPI_API_TOKEN" \
             --arg STRAPI_PREVIEW "$STRAPI_PREVIEW" \
+            --arg PAYLOAD_READ_TOKEN "$PAYLOAD_READ_TOKEN" \
+            --arg CMS_REVALIDATION_SECRET "$CMS_REVALIDATION_SECRET" \
             '{
               STRAPI_URL: $STRAPI_URL,
               STRAPI_API_TOKEN: $STRAPI_API_TOKEN,
-              STRAPI_PREVIEW: $STRAPI_PREVIEW
+              STRAPI_PREVIEW: $STRAPI_PREVIEW,
+              PAYLOAD_READ_TOKEN: $PAYLOAD_READ_TOKEN,
+              CMS_REVALIDATION_SECRET: $CMS_REVALIDATION_SECRET
             }' \
           | pnpm exec wrangler secret bulk --env production
 

.github/workflows/deploy-staging.yml

@@ -45,6 +45,15 @@ jobs:
           STRAPI_URL: ${{ secrets.STAGING_STRAPI_URL }}
           STRAPI_API_TOKEN: ${{ secrets.STAGING_STRAPI_API_TOKEN }}
           STRAPI_PREVIEW: ${{ secrets.STAGING_STRAPI_PREVIEW }}
+          # Staging is the content-preview site: draft reads, noindex, no sitemap.
+          # robots.ts and the root layout's metadata are evaluated at build time,
+          # so these must be present here as well as in the Worker's vars.
+          CMS_PROVIDER: payload
+          CMS_MODE: draft
+          DEPLOYMENT_ROLE: preview
+          PAYLOAD_URL: https://epyc-payload-cms.epyc.workers.dev
+          PAYLOAD_PREVIEW_TOKEN: ${{ secrets.STAGING_PAYLOAD_PREVIEW_TOKEN }}
+          CMS_REVALIDATION_SECRET: ${{ secrets.CMS_REVALIDATION_SECRET }}
 
       - name: Upload secrets to Cloudflare Workers (staging)
         env:
@@ -53,15 +62,21 @@ jobs:
           STRAPI_URL: ${{ secrets.STAGING_STRAPI_URL }}
           STRAPI_API_TOKEN: ${{ secrets.STAGING_STRAPI_API_TOKEN }}
           STRAPI_PREVIEW: ${{ secrets.STAGING_STRAPI_PREVIEW }}
+          PAYLOAD_PREVIEW_TOKEN: ${{ secrets.STAGING_PAYLOAD_PREVIEW_TOKEN }}
+          CMS_REVALIDATION_SECRET: ${{ secrets.CMS_REVALIDATION_SECRET }}
         run: |
           jq -n \
             --arg STRAPI_URL "$STRAPI_URL" \
             --arg STRAPI_API_TOKEN "$STRAPI_API_TOKEN" \
             --arg STRAPI_PREVIEW "$STRAPI_PREVIEW" \
+            --arg PAYLOAD_PREVIEW_TOKEN "$PAYLOAD_PREVIEW_TOKEN" \
+            --arg CMS_REVALIDATION_SECRET "$CMS_REVALIDATION_SECRET" \
             '{
               STRAPI_URL: $STRAPI_URL,
               STRAPI_API_TOKEN: $STRAPI_API_TOKEN,
-              STRAPI_PREVIEW: $STRAPI_PREVIEW
+              STRAPI_PREVIEW: $STRAPI_PREVIEW,
+              PAYLOAD_PREVIEW_TOKEN: $PAYLOAD_PREVIEW_TOKEN,
+              CMS_REVALIDATION_SECRET: $CMS_REVALIDATION_SECRET
             }' \
           | pnpm exec wrangler secret bulk --env staging
 

.gitignore

@@ -61,3 +61,9 @@ graphify-out/
 /.design-sync/.cache/
 /.design-sync/learnings/
 /.design-sync/node_modules
+
+# Local-only embed widget test page — never ship this
+public/embed-test.html
+
+# Parity and migration reports — generated, may contain CMS content
+artifacts/

app/(my-app)/blog/[slug]/page.tsx

@@ -1,7 +1,6 @@
 import type { Metadata } from 'next'
 import { notFound } from 'next/navigation'
-import { fetchStrapi } from '@/lib/strapi/client'
-import type { StrapiList, StrapiBlog } from '@/lib/strapi/types'
+import { getCMS } from '@/lib/cms'
 import { BlogPost } from '@/components/sections/blog-post'
 import { CTAFooter } from '@/components/sections/cta-footer'
 import { normalise } from '@/lib/blogs/normalise'
@@ -40,17 +39,7 @@ function rewriteMediaUrls(html: string): string {
 
 export async function generateMetadata({ params }: { params: Params }): Promise<Metadata> {
   const { slug } = await params
-  const { data } = await fetchStrapi<StrapiList<StrapiBlog>>('/blogs', {
-    'filters[slug][$eq]': slug,
-    'fields[0]': 'title',
-    'fields[1]': 'metaTitle',
-    'fields[2]': 'metaDescription',
-    'fields[3]': 'content',
-    'fields[4]': 'coverImageAlt',
-    'populate[coverImage][fields]': 'url,width,height,alternativeText',
-    'pagination[limit]': '1',
-  })
-  const blog = data[0]
+  const blog = await getCMS().getBlogBySlug(slug)
   if (!blog) return {}
 
   const ogImage = blog.coverImage
@@ -73,26 +62,13 @@ export async function generateMetadata({ params }: { params: Params }): Promise<
 export default async function BlogDetailPage({ params }: { params: Params }) {
   const { slug } = await params
 
-  const [{ data }, { data: relatedData }] = await Promise.all([
-    fetchStrapi<StrapiList<StrapiBlog>>('/blogs', {
-      'filters[slug][$eq]': slug,
-      'populate[coverImage][fields]': 'url,width,height,alternativeText,formats',
-      'populate[author][fields]': 'name,slug',
-      'pagination[limit]': '1',
-    }),
-    fetchStrapi<StrapiList<StrapiBlog>>('/blogs', {
-      'filters[slug][$ne]': slug,
-      'populate[coverImage][fields]': 'url,width,height,alternativeText,formats',
-      'populate[author][fields]': 'name,slug',
-      'sort': 'publishedDate:desc',
-      'pagination[limit]': '3',
-    }),
+  const [blog, relatedData] = await Promise.all([
+    getCMS().getBlogBySlug(slug),
+    getCMS().listBlogs({ excludeSlug: slug, limit: 3 }),
   ])
-
-  const blog = data[0]
   if (!blog) notFound()
 
-  const relatedBlogs = relatedData.filter((b) => b.slug).map((b) => normalise(b))
+  const relatedBlogs = relatedData.map((b) => normalise(b))
 
   const jsonLd = {
     '@context': 'https://schema.org',

app/(my-app)/blog/page.tsx

@@ -1,6 +1,5 @@
 import type { Metadata } from 'next'
-import { fetchStrapi } from '@/lib/strapi/client'
-import type { StrapiList, StrapiBlog } from '@/lib/strapi/types'
+import { getCMS } from '@/lib/cms'
 import { BlogIndex } from '@/components/sections/blog-index'
 import { CTAFooter } from '@/components/sections/cta-footer'
 import { normalise } from '@/lib/blogs/normalise'
@@ -19,13 +18,8 @@ export const metadata: Metadata = {
 export const revalidate = 60
 
 export default async function BlogsPage() {
-  const { data } = await fetchStrapi<StrapiList<StrapiBlog>>('/blogs', {
-    'populate[coverImage][fields]': 'url,width,height,alternativeText,formats',
-    'populate[author][fields]': 'name,slug',
-    'sort': 'publishedDate:desc',
-    'pagination[limit]': '100',
-  })
-  const blogs = data.filter((b) => b.slug).map((b) => normalise(b))
+  const data = await getCMS().listBlogs({ limit: 100 })
+  const blogs = data.map((b) => normalise(b))
 
   const itemListJsonLd = {
     '@context': 'https://schema.org',

app/(my-app)/gallery/[slug]/page.tsx

@@ -1,7 +1,6 @@
 import type { Metadata } from 'next'
 import { notFound } from 'next/navigation'
-import { fetchStrapi } from '@/lib/strapi/client'
-import type { StrapiList, StrapiGalleryItem } from '@/lib/strapi/types'
+import { getCMS } from '@/lib/cms'
 import { normaliseGallery } from '@/lib/gallery/normalise'
 import { GalleryDetail } from '@/components/sections/gallery-detail'
 import { CTAFooter } from '@/components/sections/cta-footer'
@@ -11,22 +10,13 @@ export const revalidate = 60
 const GALLERY_TITLE = 'Gallery'
 const GALLERY_DESCRIPTION = 'Stills, motion clips, and prototypes from the EPYC studio.'
 
-const POPULATE_PARAMS = {
-  'populate[image][fields]': 'url,width,height,alternativeText',
-}
-
 export async function generateMetadata({
   params,
 }: {
   params: Promise<{ slug: string }>
 }): Promise<Metadata> {
   const { slug } = await params
-  const { data } = await fetchStrapi<StrapiList<StrapiGalleryItem>>('/gallery-items', {
-    'filters[slug][$eq]': slug,
-    ...POPULATE_PARAMS,
-    'pagination[limit]': '1',
-  })
-  const raw = data[0]
+  const raw = await getCMS().getGalleryItemBySlug(slug)
   if (!raw) return { title: GALLERY_TITLE }
 
   const item = normaliseGallery(raw)
@@ -60,24 +50,14 @@ export default async function GalleryItemPage({
 }) {
   const { slug } = await params
 
-  const [{ data }, { data: allData }] = await Promise.all([
-    fetchStrapi<StrapiList<StrapiGalleryItem>>('/gallery-items', {
-      'filters[slug][$eq]': slug,
-      ...POPULATE_PARAMS,
-      'pagination[limit]': '1',
-    }),
-    fetchStrapi<StrapiList<StrapiGalleryItem>>('/gallery-items', {
-      'filters[slug][$ne]': slug,
-      ...POPULATE_PARAMS,
-      'pagination[limit]': '3',
-    }),
+  const [raw, allData] = await Promise.all([
+    getCMS().getGalleryItemBySlug(slug),
+    getCMS().listGalleryItems({ excludeSlug: slug, limit: 3 }),
   ])
-
-  const raw = data[0]
   if (!raw) notFound()
 
   const item = normaliseGallery(raw)
-  const related = allData.filter((r) => r.slug).map((r) => normaliseGallery(r))
+  const related = allData.map((r) => normaliseGallery(r))
 
   return (
     <>

app/(my-app)/gallery/page.tsx

@@ -1,6 +1,5 @@
 import type { Metadata } from 'next'
-import { fetchStrapi } from '@/lib/strapi/client'
-import type { StrapiList, StrapiGalleryItem } from '@/lib/strapi/types'
+import { getCMS } from '@/lib/cms'
 import { normaliseGallery } from '@/lib/gallery/normalise'
 import { GalleryIndex } from '@/components/sections/gallery-index'
 import { FAQs } from '@/components/sections/faqs'
@@ -19,11 +18,8 @@ export const metadata: Metadata = {
 export const revalidate = 60
 
 export default async function GalleryPage() {
-  const { data } = await fetchStrapi<StrapiList<StrapiGalleryItem>>('/gallery-items', {
-    'populate[image][fields]': 'url,width,height,alternativeText',
-    'pagination[limit]': '500',
-  })
-  const items = data.filter((item) => item.slug).map((item) => normaliseGallery(item))
+  const data = await getCMS().listGalleryItems({ limit: 500 })
+  const items = data.map((item) => normaliseGallery(item))
 
   return (
     <>

app/(my-app)/layout.tsx

@@ -3,8 +3,9 @@
 import localFont from 'next/font/local'
 import Script from 'next/script'
 import './globals.css'
 import { FloatingMenuButton } from '@/components/ui/floating-menu'
 import { site } from '@/data/site'
+import { isPreviewDeployment } from '@/lib/cms/config'
 
 const inter = Inter({
   subsets: ['latin'],
@@ -89,7 +90,9 @@
   twitter: {
     card: 'summary_large_image',
   },
-  robots: { index: true, follow: true, 'max-image-preview': 'large' },
+  robots: isPreviewDeployment()
+    ? { index: false, follow: false }
+    : { index: true, follow: true, 'max-image-preview': 'large' },
 }
 
 export default function RootLayout({

app/(my-app)/projects/page.tsx

@@ -1,6 +1,5 @@
 import type { Metadata } from 'next'
-import { fetchStrapi } from '@/lib/strapi/client'
-import type { StrapiList, StrapiProject } from '@/lib/strapi/types'
+import { getCMS } from '@/lib/cms'
 import { ProjectsIndex } from '@/components/sections/projects-index'
 import { CTAFooter } from '@/components/sections/cta-footer'
 import { normaliseProject } from '@/lib/projects/normalise'
@@ -18,14 +17,8 @@ export const metadata: Metadata = {
 export const revalidate = 60
 
 export default async function ProjectsPage() {
-  const { data } = await fetchStrapi<StrapiList<StrapiProject>>('/projects', {
-    'populate[thumbnail][fields]': 'url,width,height,alternativeText,formats',
-    'populate[industry][fields]': 'title,slug',
-    'populate[platform][fields]': 'title,slug',
-    'sort': 'featured:desc,publishedAt:desc',
-    'pagination[limit]': '200',
-  })
-  const projects = data.filter((p) => p.slug).map((p) => normaliseProject(p))
+  const data = await getCMS().listProjects({ limit: 200 })
+  const projects = data.map((p) => normaliseProject(p))
 
   return (
     <>

app/(my-app)/sitemap.ts

@@ -1,23 +1,17 @@
 import type { MetadataRoute } from "next";
 import { site } from "@/data/site";
-import { fetchStrapi } from "@/lib/strapi/client";
-
-type SlugEntry = { slug: string; publishedAt: string };
-type StrapiSlugList = { data: SlugEntry[]; meta: unknown };
+import { getCMS } from "@/lib/cms";
+import { isPreviewDeployment } from "@/lib/cms/config";
 
 export const revalidate = 60;
 
 export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
+  if (isPreviewDeployment()) return [];
   const url = (path: string) => ({ url: `${site.url}${path}` });
 
-  const blogs = await fetchStrapi<StrapiSlugList>("/blogs", {
-    "fields[0]": "slug",
-    "fields[1]": "publishedAt",
-    "pagination[limit]": "1000",
-    "sort": "publishedDate:desc",
-  });
+  const blogs = await getCMS().listBlogSlugsForSitemap();
 
-  const blogEntries = blogs.data.map(({ slug, publishedAt }) => ({
+  const blogEntries = blogs.map(({ slug, publishedAt }) => ({
     url: `${site.url}/blog/${slug}`,
     lastModified: new Date(publishedAt),
   }));