templates: bump for v3.5.0 (#9844)

🤖 Automated bump of templates for v3.5.0

Triggered by user: @paulpopus

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

templates/with-postgres/src/migrations/20241210_000627_initial.json

@@ -1,5 +1,5 @@
 {
-  "id": "fe47c90a-13f2-4f88-b36e-bd589c23c11e",
+  "id": "3a7129dd-a5a9-4fff-97c9-e02c3cf1e365",
   "prevId": "00000000-0000-0000-0000-000000000000",
   "version": "7",
   "dialect": "postgresql",

templates/with-postgres/src/migrations/index.ts

@@ -1,9 +1,9 @@
-import * as migration_20241206_203050_initial from './20241206_203050_initial'
+import * as migration_20241210_000627_initial from './20241210_000627_initial'
 
 export const migrations = [
   {
-    up: migration_20241206_203050_initial.up,
-    down: migration_20241206_203050_initial.down,
-    name: '20241206_203050_initial',
+    up: migration_20241210_000627_initial.up,
+    down: migration_20241210_000627_initial.down,
+    name: '20241210_000627_initial',
   },
 ]

templates/with-vercel-postgres/src/migrations/20241210_000603_initial.json

@@ -1,5 +1,5 @@
 {
-  "id": "04656a51-7bed-4876-aca5-106943383efa",
+  "id": "559763df-0cb1-4831-b61e-7176a2b4f9d5",
   "prevId": "00000000-0000-0000-0000-000000000000",
   "version": "7",
   "dialect": "postgresql",

templates/with-vercel-postgres/src/migrations/index.ts

@@ -1,9 +1,9 @@
-import * as migration_20241206_203025_initial from './20241206_203025_initial'
+import * as migration_20241210_000603_initial from './20241210_000603_initial'
 
 export const migrations = [
   {
-    up: migration_20241206_203025_initial.up,
-    down: migration_20241206_203025_initial.down,
-    name: '20241206_203025_initial',
+    up: migration_20241210_000603_initial.up,
+    down: migration_20241210_000603_initial.down,
+    name: '20241210_000603_initial',
   },
 ]

templates/with-vercel-website/src/app/(frontend)/[slug]/page.tsx

@@ -13,6 +13,7 @@ import { RenderBlocks } from '@/blocks/RenderBlocks'
 import { RenderHero } from '@/heros/RenderHero'
 import { generateMeta } from '@/utilities/generateMeta'
 import PageClient from './page.client'
+import { LivePreviewListener } from '@/components/LivePreviewListener'
 
 export async function generateStaticParams() {
   const payload = await getPayload({ config: configPromise })
@@ -71,6 +72,8 @@ export default async function Page({ params: paramsPromise }: Args) {
       {/* Allows redirects for valid pages too */}
       <PayloadRedirects disableNotFound url={url} />
 
+      <LivePreviewListener />
+
       <RenderHero {...hero} />
       <RenderBlocks blocks={layout} />
     </article>

templates/with-vercel-website/src/app/(frontend)/layout.tsx

@@ -8,7 +8,6 @@ import React from 'react'
 import { AdminBar } from '@/components/AdminBar'
 import { Footer } from '@/Footer/Component'
 import { Header } from '@/Header/Component'
-import { LivePreviewListener } from '@/components/LivePreviewListener'
 import { Providers } from '@/providers'
 import { InitTheme } from '@/providers/Theme/InitTheme'
 import { mergeOpenGraph } from '@/utilities/mergeOpenGraph'
@@ -34,7 +33,6 @@ export default async function RootLayout({ children }: { children: React.ReactNo
               preview: isEnabled,
             }}
           />
-          <LivePreviewListener />
 
           <Header />
           {children}

templates/with-vercel-website/src/app/(frontend)/posts/[slug]/page.tsx

@@ -13,6 +13,7 @@ import type { Post } from '@/payload-types'
 import { PostHero } from '@/heros/PostHero'
 import { generateMeta } from '@/utilities/generateMeta'
 import PageClient from './page.client'
+import { LivePreviewListener } from '@/components/LivePreviewListener'
 
 export async function generateStaticParams() {
   const payload = await getPayload({ config: configPromise })
@@ -54,6 +55,8 @@ export default async function Post({ params: paramsPromise }: Args) {
       {/* Allows redirects for valid pages too */}
       <PayloadRedirects disableNotFound url={url} />
 
+      <LivePreviewListener />
+
       <PostHero post={post} />
 
       <div className="flex flex-col items-center gap-4 pt-8">

templates/with-vercel-website/src/collections/Pages/index.ts

@@ -48,14 +48,12 @@ export const Pages: CollectionConfig<'pages'> = {
         return path
       },
     },
-    preview: (data) => {
-      const path = generatePreviewPath({
+    preview: (data, { req }) =>
+      generatePreviewPath({
         slug: typeof data?.slug === 'string' ? data.slug : '',
         collection: 'pages',
-      })
-
-      return path
-    },
+        req,
+      }),
     useAsTitle: 'title',
   },
   fields: [

templates/with-vercel-website/src/collections/Posts/index.ts

@@ -54,19 +54,18 @@ export const Posts: CollectionConfig<'posts'> = {
         const path = generatePreviewPath({
           slug: typeof data?.slug === 'string' ? data.slug : '',
           collection: 'posts',
+          // req, TODO: thread `req` once 3.5.1 is out, see notes in `generatePreviewPath`
         })
 
         return path
       },
     },
-    preview: (data) => {
-      const path = generatePreviewPath({
+    preview: (data, { req }) =>
+      generatePreviewPath({
         slug: typeof data?.slug === 'string' ? data.slug : '',
         collection: 'posts',
-      })
-
-      return path
-    },
+        req,
+      }),
     useAsTitle: 'title',
   },
   fields: [

templates/with-vercel-website/src/components/PayloadRedirects/index.tsx

@@ -12,11 +12,9 @@ interface Props {
 
 /* This component helps us with SSR based dynamic redirects */
 export const PayloadRedirects: React.FC<Props> = async ({ disableNotFound, url }) => {
-  const slug = url.startsWith('/') ? url : `${url}`
-
   const redirects = await getCachedRedirects()()
 
-  const redirectItem = redirects.find((redirect) => redirect.from === slug)
+  const redirectItem = redirects.find((redirect) => redirect.from === url)
 
   if (redirectItem) {
     if (redirectItem.to?.url) {

templates/with-vercel-website/src/migrations/20241210_000617_initial.json

@@ -1,5 +1,5 @@
 {
-  "id": "919ba4d0-3a70-45cc-865e-26ea213d8969",
+  "id": "37ea3c82-a0e9-4bfa-9693-f24bdd61e87c",
   "prevId": "00000000-0000-0000-0000-000000000000",
   "version": "7",
   "dialect": "postgresql",

templates/with-vercel-website/src/migrations/index.ts

@@ -1,9 +1,9 @@
-import * as migration_20241206_203040_initial from './20241206_203040_initial'
+import * as migration_20241210_000617_initial from './20241210_000617_initial'
 
 export const migrations = [
   {
-    up: migration_20241206_203040_initial.up,
-    down: migration_20241206_203040_initial.down,
-    name: '20241206_203040_initial',
+    up: migration_20241210_000617_initial.up,
+    down: migration_20241210_000617_initial.down,
+    name: '20241210_000617_initial',
   },
 ]

templates/with-vercel-website/src/utilities/generatePreviewPath.ts

@@ -1,4 +1,4 @@
-import { CollectionSlug } from 'payload'
+import { PayloadRequest, CollectionSlug } from 'payload'
 
 const collectionPrefixMap: Partial<Record<CollectionSlug, string>> = {
   posts: '/posts',
@@ -8,9 +8,10 @@ const collectionPrefixMap: Partial<Record<CollectionSlug, string>> = {
 type Props = {
   collection: keyof typeof collectionPrefixMap
   slug: string
+  req?: PayloadRequest // TODO: make this required once 3.5.1 is out, it's a new argument in that version
 }
 
-export const generatePreviewPath = ({ collection, slug }: Props) => {
+export const generatePreviewPath = ({ collection, slug, req }: Props) => {
   const path = `${collectionPrefixMap[collection]}/${slug}`
 
   const params = {
@@ -25,5 +26,12 @@ export const generatePreviewPath = ({ collection, slug }: Props) => {
     encodedParams.append(key, value)
   })
 
-  return `/next/preview?${encodedParams.toString()}`
+  let url = `/next/preview?${encodedParams.toString()}`
+
+  // TODO: remove this check once 3.5.1 is out, see note above
+  if (req) {
+    url = `${req.protocol}//${req.host}${url}`
+  }
+
+  return url
 }