@faststore/core 3.60.3 → 3.61.0

package/.turbo/turbo-build.log

@@ -1,23 +1,23 @@
 
-> @faststore/core@3.60.2 prebuild /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.60.4 prebuild /home/runner/work/faststore/faststore/packages/core
 > na run partytown && na run generate
 
 
-> @faststore/core@3.60.2 partytown /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.60.4 partytown /home/runner/work/faststore/faststore/packages/core
 > partytown copylib ./public/~partytown
 
 Partytown lib copied to: /home/runner/work/faststore/faststore/packages/core/public/~partytown
 
-> @faststore/core@3.60.2 generate /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.60.4 generate /home/runner/work/faststore/faststore/packages/core
 > na run generate:schema && na run generate:codegen && na run format:generated
 
 
-> @faststore/core@3.60.2 generate:schema /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.60.4 generate:schema /home/runner/work/faststore/faststore/packages/core
 > tsx src/server/generator/generateGraphQLSchemaFile.ts
 
 Schema GraphQL file generated successfully
 
-> @faststore/core@3.60.2 generate:codegen /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.60.4 generate:codegen /home/runner/work/faststore/faststore/packages/core
 > graphql-codegen
 
 [STARTED] Parse Configuration
@@ -37,11 +37,11 @@ Running lifecycle hook "afterStart" scripts...
 [CLI] Loading Documents
 [CLI] Generating output
 
-> @faststore/core@3.60.2 format:generated /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.60.4 format:generated /home/runner/work/faststore/faststore/packages/core
 > prettier --write "@generated/**/*.{ts,js,tsx,jsx,json}" --loglevel error
 
 
-> @faststore/core@3.60.2 build /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.60.4 build /home/runner/work/faststore/faststore/packages/core
 > next build
 
 ⚠ No build cache found. Please configure build caching for faster rebuilds. Read more: https://nextjs.org/docs/messages/no-cache
@@ -62,8 +62,8 @@ Browserslist: browsers data (caniuse-lite) is 6 months old. Please run:
    Collecting page data ...
    Generating static pages (0/6) ...
 
   Generating static pages (1/6) 
-Warning: Dynamic Content not found for the page: home. Refer to the Dynamic Content documentation at https://developers.vtex.com/docs/guides/faststore/dynamic-content-overview for mapping the page and the corresponding data-fetching function.
 
   Generating static pages (2/6) 
+Warning: Dynamic Content not found for the page: home. Refer to the Dynamic Content documentation at https://developers.vtex.com/docs/guides/faststore/dynamic-content-overview for mapping the page and the corresponding data-fetching function.
 
   Generating static pages (4/6) 
 
 ✓ Generating static pages (6/6) 
    Finalizing page optimization ...
@@ -73,22 +73,22 @@ Route (pages)                              Size     First Load JS
 ┌ ● /                                      3.87 kB         133 kB
 ├   └ css/b1806cbafd0c1f81.css             3.06 kB
 ├   /_app                                  0 B             100 kB
-├ ● /[...slug]                             2.44 kB         141 kB
+├ ● /[...slug]                             2.37 kB         141 kB
 ├ ● /[slug]/p                              32.4 kB         162 kB
 ├   ├ css/a3ca6a9b63f657be.css             5.75 kB
 ├   ├ css/62a5153ac7061286.css             6.11 kB
-├   └ css/b5bf49598c8f8b66.css             16.1 kB
+├   └ css/6831395ff5fd317a.css             16.1 kB
 ├ ○ /404                                   1.48 kB         131 kB
 ├ ● /500                                   1.48 kB         131 kB
 ├ λ /account                               240 B           100 kB
-├ ● /account/[...unknown]                  281 B           100 kB
+├ ● /account/[...unknown]                  281 B           101 kB
 ├ λ /account/403                           2.33 kB         132 kB
 ├   └ css/b7bba8fce075688b.css             4.2 kB
-├ λ /account/404                           2.03 kB         131 kB
+├ λ /account/404                           2.03 kB         132 kB
 ├   └ css/5347dbc8b71de47d.css             4.25 kB
 ├ λ /account/orders                        8.57 kB         138 kB
 ├   └ css/8a3f440e0ff9cd8e.css             11.9 kB
-├ λ /account/orders/[id]                   10 kB           139 kB
+├ λ /account/orders/[id]                   10 kB           140 kB
 ├   └ css/506442c818624bd2.css             11.5 kB
 ├ λ /account/profile                       1.27 kB         131 kB
 ├ λ /account/security                      1.27 kB         131 kB
@@ -104,7 +104,7 @@ Route (pages)                              Size     First Load JS
   ├ chunks/framework-807b0f81cbc129f0.js   45.4 kB
   ├ chunks/main-f658704b53a96ab1.js        33.1 kB
   ├ chunks/pages/_app-52aa8f30f7707675.js  18.1 kB
-  ├ chunks/webpack-cde3c2053d848754.js     3.69 kB
+  ├ chunks/webpack-c76f1cac87402029.js     3.73 kB
   └ css/0a57ee6c7a57788c.css               3.49 kB
 
 λ  (Server)  server-side renders at runtime (uses getInitialProps or getServerSideProps)

package/.turbo/turbo-test.log

@@ -1,15 +1,14 @@
 
-> @faststore/core@3.60.2 test /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.60.4 test /home/runner/work/faststore/faststore/packages/core
 > jest
 
-PASS test/server/cms/global.test.ts (25.298 s)
-PASS test/utils/multipleTemplates.test.ts (26.037 s)
+PASS test/utils/multipleTemplates.test.ts (25.727 s)
+PASS test/server/cms/global.test.ts (26.444 s)
 PASS test/server/cms/index.test.ts
-PASS test/server/index.test.ts (30.622 s)
-A worker process has failed to exit gracefully and has been force exited. This is likely caused by tests leaking due to improper teardown. Try running with --detectOpenHandles to find leaks. Active timers can also cause this, ensure that .unref() was called on them.
+PASS test/server/index.test.ts (31.174 s)
 
 Test Suites: 4 passed, 4 total
 Tests:       22 passed, 22 total
 Snapshots:   0 total
-Time:        32.048 s
+Time:        32.394 s
 Ran all test suites.

package/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.61.0](https://github.com/vtex/faststore/compare/v3.60.4...v3.61.0) (2025-07-04)
+
+### Features
+
+- implement CP branch preview support ([#2885](https://github.com/vtex/faststore/issues/2885)) ([a55fe24](https://github.com/vtex/faststore/commit/a55fe24dac70ccfedc6296001bd5c18225affeda)), closes [/github.com/vtex/faststore/pull/2885/files#diff-63a7f8cba93bce2eb5ed6be3a1bcf1fbde76d643b165ae2a1a44cc8765dfb73fR40](https://github.com//github.com/vtex/faststore/pull/2885/files/issues/diff-63a7f8cba93bce2eb5ed6be3a1bcf1fbde76d643b165ae2a1a44cc8765dfb73fR40) [/github.com/vtex/faststore/pull/2885/files#diff-63a7f8cba93bce2eb5ed6be3a1bcf1fbde76d643b165ae2a1a44cc8765dfb73fR250](https://github.com//github.com/vtex/faststore/pull/2885/files/issues/diff-63a7f8cba93bce2eb5ed6be3a1bcf1fbde76d643b165ae2a1a44cc8765dfb73fR250) [/github.com/vtex/faststore/pull/2885/files#diff-8dd0ec358e808043c69af593825ff65e9afe1dd776dad04f15480a45b57a2608L36](https://github.com//github.com/vtex/faststore/pull/2885/files/issues/diff-8dd0ec358e808043c69af593825ff65e9afe1dd776dad04f15480a45b57a2608L36) [/github.com/vtex/faststore/pull/2885/files#diff-6728e613609d08999bccf3fc982a6a61c19d6d8eb08eb4d7adb66f4a6924843dR14](https://github.com//github.com/vtex/faststore/pull/2885/files/issues/diff-6728e613609d08999bccf3fc982a6a61c19d6d8eb08eb4d7adb66f4a6924843dR14) [/github.com/vtex/faststore/pull/2885/files#diff-7c7bcf90ece929b012c8fa7a7b62eac4ab72ca06aa5684add108af699bd62f50R38](https://github.com//github.com/vtex/faststore/pull/2885/files/issues/diff-7c7bcf90ece929b012c8fa7a7b62eac4ab72ca06aa5684add108af699bd62f50R38) [/github.com/vtex/faststore/pull/2885/files#diff-b45ed72491ecc419d59ca49fa8b4fc7a45deb55758a6a401f3c8401c11114227R148](https://github.com//github.com/vtex/faststore/pull/2885/files/issues/diff-b45ed72491ecc419d59ca49fa8b4fc7a45deb55758a6a401f3c8401c11114227R148) [/github.com/vtex/faststore/pull/2885/files#diff-8dd0ec358e808043c69af593825ff65e9afe1dd776dad04f15480a45b57a2608R52](https://github.com//github.com/vtex/faststore/pull/2885/files/issues/diff-8dd0ec358e808043c69af593825ff65e9afe1dd776dad04f15480a45b57a2608R52) [/github.com/vtex/faststore/pull/2885/files#diff-6728e613609d08999bccf3fc982a6a61c19d6d8eb08eb4d7adb66f4a6924843dR22](https://github.com//github.com/vtex/faststore/pull/2885/files/issues/diff-6728e613609d08999bccf3fc982a6a61c19d6d8eb08eb4d7adb66f4a6924843dR22) [/github.com/vtex/faststore/blob/main/packages/core/discovery.config.default.js#L128](https://github.com//github.com/vtex/faststore/blob/main/packages/core/discovery.config.default.js/issues/L128) [/github.com/vtex/faststore/blob/main/packages/core/discovery.config.default.js#L128](https://github.com//github.com/vtex/faststore/blob/main/packages/core/discovery.config.default.js/issues/L128)
+
+## [3.60.4](https://github.com/vtex/faststore/compare/v3.60.3...v3.60.4) (2025-07-04)
+
+**Note:** Version bump only for package @faststore/core
+
 ## [3.60.3](https://github.com/vtex/faststore/compare/v3.60.2...v3.60.3) (2025-07-02)
 
 **Note:** Version bump only for package @faststore/core

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faststore/core",
-  "version": "3.60.3",
+  "version": "3.61.0",
   "license": "MIT",
   "repository": "vtex/faststore",
   "browserslist": "supports es6-module and not dead",
@@ -48,7 +48,7 @@
     "@faststore/graphql-utils": "^3.56.1",
     "@faststore/lighthouse": "^3.56.1",
     "@faststore/sdk": "^3.60.3",
-    "@faststore/ui": "^3.56.1",
+    "@faststore/ui": "^3.60.4",
     "@graphql-codegen/cli": "5.0.2",
     "@graphql-codegen/client-preset": "4.2.6",
     "@graphql-codegen/typescript": "4.0.7",
@@ -61,7 +61,7 @@
     "@parcel/watcher": "^2.4.0",
     "@types/react": "^18.2.42",
     "@vtex/client-cms": "^0.2.12",
-    "@vtex/client-cp": "0.2.2",
+    "@vtex/client-cp": "0.3.0",
     "@vtex/prettier-config": "1.0.0",
     "autoprefixer": "^10.4.0",
     "css-loader": "^6.7.1",
@@ -105,5 +105,5 @@
     "ts-jest": "29.1.1",
     "typescript": "5.3.2"
   },
-  "gitHead": "e0f5b29a904c59d59bdf348d5d6caebd311358fe"
+  "gitHead": "2ba46c81202a84ae4a13e61e7a453c034df6b187"
 }

package/src/components/cms/RenderSections.tsx

@@ -9,7 +9,9 @@ import {
 import { useUI } from '@faststore/ui'
 import type { Section } from '@vtex/client-cms'
 import dynamic from 'next/dynamic'
+import { useRouter } from 'next/router'
 import useTTI from 'src/sdk/performance/useTTI'
+import { isContentPlatformSource } from 'src/server/content/utils'
 import SectionBoundary from './SectionBoundary'
 import ViewportObserver from './ViewportObserver'
 import COMPONENTS from './global/Components'
@@ -28,6 +30,11 @@ const Toast = dynamic(
   { ssr: false }
 )
 
+const PreviewTag = dynamic(
+  () => import(/* webpackChunkName: "PreviewTag" */ '../common/PreviewTag'),
+  { ssr: false }
+)
+
 const useDividedSections = (sections: Section[]) => {
   return useMemo(() => {
     const indexChildren = sections.findIndex(({ name }) => name === 'Children')
@@ -137,9 +144,20 @@ function RenderSections({
   )
 
   const { isInteractive } = useTTI()
+  const router = useRouter()
+
+  const shouldDisplayPreviewTag = isContentPlatformSource() && router.isPreview
 
   return (
     <>
+      {shouldDisplayPreviewTag && (
+        <LazyLoadingSection
+          sectionName="PreviewTag"
+          isInteractive={isInteractive}
+        >
+          <PreviewTag />
+        </LazyLoadingSection>
+      )}
       {firstSections && (
         <RenderSectionsBase
           sections={firstSections}

package/src/components/common/PreviewTag/PreviewTag.tsx

@@ -0,0 +1,49 @@
+import { useEffect } from 'react'
+import { Tag as UITag } from '@faststore/ui'
+import Section from 'src/components/sections/Section/Section'
+
+import styles from './section.module.scss'
+
+export interface PreviewTagProps {
+  text?: string
+  exitUrl?: string
+}
+
+function PreviewTag({ text = 'Preview', exitUrl }: PreviewTagProps) {
+  useEffect(() => {
+    const handleBeforeUnload = () => {
+      navigator.sendBeacon('/api/preview?action=clear')
+    }
+
+    window.addEventListener('beforeunload', handleBeforeUnload)
+
+    return () => {
+      window.removeEventListener('beforeunload', handleBeforeUnload)
+    }
+  }, [])
+
+  const handleExitPreview = () => {
+    if (typeof window !== 'undefined') {
+      const exitPath =
+        exitUrl || window.location.pathname + window.location.search
+      window.location.href = `/api/preview?action=clear&redirect=${encodeURIComponent(
+        exitPath
+      )}`
+    }
+  }
+
+  return (
+    <Section className={`${styles.section} section-preview-tag`}>
+      <UITag
+        data-fs-preview-tag
+        testId="fs-preview-tag"
+        variant="danger"
+        label={text}
+        iconButtonLabel="Exit preview"
+        onClose={handleExitPreview}
+      />
+    </Section>
+  )
+}
+
+export default PreviewTag

package/src/components/common/PreviewTag/index.ts

@@ -0,0 +1,2 @@
+export { default } from './PreviewTag'
+export type { PreviewTagProps } from './PreviewTag'

package/src/components/common/PreviewTag/section.module.scss

@@ -0,0 +1,16 @@
+@layer components {
+  .section {
+    @import "@faststore/ui/src/components/atoms/Badge/styles.scss";
+    @import "@faststore/ui/src/components/atoms/Icon/styles.scss";
+    @import "@faststore/ui/src/components/molecules/Tag/styles.scss";
+
+    [data-fs-preview-tag] {
+      box-shadow: var(--fs-shadow-darker);
+      backdrop-filter: blur(var(--fs-spacing-1));
+      position: fixed;
+      top: 1rem;
+      right: 1rem;
+      z-index: 10000;
+    }
+  }
+}

package/src/pages/[...slug].tsx

@@ -119,7 +119,7 @@ export const getStaticProps: GetStaticProps<
 
   const landingPage = await landingPagePromise
 
-  if (landingPage) {
+  if (landingPage && Object.keys(landingPage).length > 0) {
     const [
       serverData,
       globalSections,

package/src/pages/api/preview.ts

@@ -1,9 +1,13 @@
-import type { NextApiHandler, NextApiRequest } from 'next'
+import type { NextApiHandler, NextApiRequest, NextApiResponse } from 'next'
 
 import { previewRedirects } from '../../../discovery.config'
 import { contentService } from 'src/server/content/service'
 import { isLocator } from 'src/server/cms'
-import { isContentPlatformSource } from 'src/server/content/utils'
+import {
+  isBranchPreview,
+  isContentPlatformSource,
+} from 'src/server/content/utils'
+import type { PreviewData } from 'src/server/content/types'
 
 type Settings = {
   seo: {
@@ -27,20 +31,32 @@ const pickParam = (req: NextApiRequest, parameter: string) => {
 }
 
 const setPreviewAndRedirect = (
-  res: any,
+  res: NextApiResponse,
   previewData: Record<string, string>,
   redirectPath: string
 ) => {
-  res.setPreviewData(previewData, {
+  const options: { maxAge: number; path?: string } = {
     maxAge: 3600,
-    path: redirectPath,
-  })
+  }
+
+  if (!isBranchPreview(previewData as PreviewData)) {
+    options.path = redirectPath
+  }
+
+  res.setPreviewData(previewData, options)
   res.redirect(redirectPath)
 }
 
 // TODO: Improve security by disabling CMS preview in production
 const handler: NextApiHandler = async (req, res) => {
   try {
+    if (pickParam(req, 'action') === 'clear') {
+      res.clearPreviewData()
+      const redirectTo = pickParam(req, 'redirect') || '/'
+      res.redirect(redirectTo)
+      return
+    }
+
     let slug = pickParam(req, 'slug')
     if (slug && !slug.startsWith('/')) {
       slug = `/${slug}`

package/src/server/content/service.ts

@@ -2,7 +2,7 @@ import type { ContentData, Locator } from '@vtex/client-cms'
 import ClientCP from '@vtex/client-cp'
 import type { ContentEntry, EntryPathParams } from '@vtex/client-cp'
 import { getCMSPage, getPage, type PageContentType } from 'src/server/cms'
-import type { ContentOptions, ContentParams } from './types'
+import type { ContentOptions, ContentParams, PreviewData } from './types'
 import config from '../../../discovery.config'
 import { getPLP, type PLPContentType } from '../cms/plp'
 import {
@@ -15,7 +15,9 @@ import MissingContentError from 'src/sdk/error/MissingContentError'
 import { getPDP, type PDPContentType } from '../cms/pdp'
 import MultipleContentError from 'src/sdk/error/MultipleContentError'
 import type { ServerProductQueryQuery } from '@generated/graphql'
-import { isContentPlatformSource } from './utils'
+import { isBranchPreview, isContentPlatformSource } from './utils'
+
+type ContentResult = ContentData | (ContentEntry & PageContentType)
 
 export class ContentService {
   private clientCP: ClientCP
@@ -37,22 +39,15 @@ export class ContentService {
     return getPage(options.cmsOptions)
   }
 
-  async getContent(params: ContentParams) {
+  async getMultipleContent(
+    params: ContentParams
+  ): Promise<{ data: ContentResult[] }> {
     const options = this.createContentOptions(params)
 
     if (isContentPlatformSource()) {
       const serviceParams = this.convertOptionsToParams(options)
       const { entries } = await this.clientCP.listEntries(serviceParams)
-      const data = await Promise.all(
-        entries.map(async (entry) => {
-          const entryData = await this.getSingleEntry(
-            { ...serviceParams, entryId: entry.id },
-            !!options.isPreview
-          )
-          return this.mergeEntryWithData(entry, entryData)
-        })
-      )
-      return { data }
+      return this.fillEntriesWithData(entries, serviceParams, options.isPreview)
     }
     return getCMSPage(options.cmsOptions)
   }
@@ -65,10 +60,10 @@ export class ContentService {
     const options = this.createContentOptions(plpParams)
 
     if (isContentPlatformSource()) {
-      const pages = (await this.getContent(plpParams)).data
+      const pages = (await this.getMultipleContent(plpParams)).data
       if (!pages?.length) throw new MissingContentError(options.cmsOptions)
       return findBestPLPTemplate(
-        pages,
+        pages as Partial<PLPContentType>[],
         options.slug,
         rewrites
       ) as PLPContentType
@@ -84,9 +79,12 @@ export class ContentService {
     const options = this.createContentOptions(pdpParams)
 
     if (isContentPlatformSource()) {
-      const pages = (await this.getContent(pdpParams)).data
+      const pages = (await this.getMultipleContent(pdpParams)).data
       if (!pages.length) throw new MissingContentError(options.cmsOptions)
-      return findBestPDPTemplate(pages, product) as PDPContentType
+      return findBestPDPTemplate(
+        pages as Partial<PDPContentType>[],
+        product
+      ) as PDPContentType
     }
     return getPDP(product, options.cmsOptions as Locator)
   }
@@ -96,64 +94,92 @@ export class ContentService {
   ): Promise<T> {
     const params = this.convertOptionsToParams(options)
     try {
-      const entry: PageContentType =
-        params.entryId || params.slug
-          ? await this.getSingleEntry(params, !!options.isPreview)
-          : await this.fetchFirstEntry(params, !!options.isPreview)
-
+      const entry: PageContentType = await this.getEntry(
+        params,
+        options.isPreview
+      )
       return entry as T
     } catch (err: unknown) {
-      if (isNotFoundError(err)) console.error('Content not found', err)
+      if (isNotFoundError(err)) console.warn('Content not found', err)
       else throw err
     }
   }
 
-  private async getSingleEntry(
+  private async fillEntriesWithData(
+    entries: ContentEntry[],
+    serviceParams: EntryPathParams,
+    isPreview: boolean
+  ): Promise<{ data: (ContentEntry & PageContentType)[] }> {
+    const data = await Promise.all(
+      entries.map(async (entry) => {
+        const entryData = await this.getEntryData(
+          { ...serviceParams, entryId: entry.id },
+          isPreview
+        )
+        return this.mergeEntryWithData(entry, entryData)
+      })
+    )
+    return { data }
+  }
+
+  private async getEntry(
+    params: EntryPathParams,
+    isPreview: boolean
+  ): Promise<PageContentType> {
+    return params.entryId || params.slug
+      ? await this.getEntryData(params, isPreview)
+      : await this.fetchFirstEntryFromList(params, isPreview)
+  }
+
+  private async getEntryData(
     params: EntryPathParams,
     isPreview: boolean
   ): Promise<PageContentType> {
+    if (!params.entryId && !params.slug) {
+      const operation = isPreview ? 'Preview' : 'getEntry'
+      throw new Error(`${operation} requires entryId or slug`)
+    }
+
     if (isPreview) {
-      if (params.entryId)
-        return this.clientCP.previewEntryById(
-          params
-        ) as Promise<PageContentType>
-      if (params.slug)
-        return this.clientCP.previewEntryBySlug(
-          params
-        ) as Promise<PageContentType>
-      throw new Error('Preview requires entryId or slug')
-    }
-    if (params.entryId)
-      return this.clientCP.getEntry(params) as Promise<PageContentType>
-    if (params.slug)
-      return this.clientCP.getEntryBySlug(params) as Promise<PageContentType>
-    throw new Error('getEntry requires entryId or slug')
+      return params.entryId
+        ? (this.clientCP.previewEntryById(params) as Promise<PageContentType>)
+        : (this.clientCP.previewEntryBySlug(params) as Promise<PageContentType>)
+    }
+
+    return params.entryId
+      ? (this.clientCP.getEntry(params) as Promise<PageContentType>)
+      : (this.clientCP.getEntryBySlug(params) as Promise<PageContentType>)
   }
 
-  private async fetchFirstEntry(
+  private async fetchFirstEntryFromList(
     params: EntryPathParams,
     isPreview: boolean
   ): Promise<PageContentType> {
     const { entries } = await this.clientCP.listEntries(params)
     if (!entries || entries.length === 0) {
-      console.error('No entries found for params', params)
+      console.warn('No entries found for params', params)
       return {} as PageContentType
     }
     if (entries.length > 1) {
       throw new MultipleContentError(params)
     }
-    return this.getSingleEntry({ ...params, entryId: entries[0].id }, isPreview)
+    return this.getEntryData({ ...params, entryId: entries[0].id }, isPreview)
   }
 
-  private mergeEntryWithData(
-    entry: ContentEntry,
-    data: PageContentType
-  ): ContentEntry & PageContentType {
+  private createContentOptions(params: ContentParams): ContentOptions {
+    const { contentType, previewData, slug } = params
+
+    const contentPreviewEnabled = previewData?.contentType === contentType
+    const branchPreviewEnabled = isBranchPreview(previewData)
+
     return {
-      ...entry,
-      ...data,
-      id: entry.id,
-      name: entry.name || '',
+      cmsOptions: this.buildCmsOptions(
+        params,
+        contentPreviewEnabled,
+        branchPreviewEnabled
+      ),
+      ...(slug !== undefined && { slug }),
+      isPreview: contentPreviewEnabled || branchPreviewEnabled,
     }
   }
 
@@ -176,8 +202,10 @@ export class ContentService {
       params.branchId = cmsOptions.releaseId
     }
     if ('filters' in cmsOptions && cmsOptions.filters) {
-      const nested = cmsOptions.filters.filters as Record<string, any>
-      if (nested['settings.seo.slug']) {
+      const nested = (
+        cmsOptions.filters as { filters?: Record<string, unknown> }
+      ).filters as Record<string, unknown>
+      if (nested && nested['settings.seo.slug']) {
         const seo = nested['settings.seo.slug'] as string
         params.slug = seo.replace(/^\//, '')
       }
@@ -187,33 +215,44 @@ export class ContentService {
     return params as EntryPathParams
   }
 
-  private createContentOptions(params: ContentParams): ContentOptions {
+  private buildCmsOptions(
+    params: ContentParams,
+    isContentPreview: boolean,
+    isBranchPreview: boolean
+  ) {
     const {
       contentType,
       previewData,
-      slug,
       documentId,
       versionId,
       releaseId,
       filters,
     } = params
-
-    const isPreview = previewData?.contentType === contentType
     const { slug: _, ...previewLocator } = previewData || {}
 
-    const cmsOptions = {
+    return {
       contentType,
-      ...(isPreview ? previewLocator : {}),
+      ...(isContentPreview ? previewLocator : {}),
+      ...(isBranchPreview && {
+        versionId: previewData?.versionId,
+        releaseId: previewData?.releaseId,
+      }),
       ...(documentId !== undefined && { documentId }),
       ...(versionId !== undefined && { versionId }),
       ...(releaseId !== undefined && { releaseId }),
       ...(filters && { filters }),
     }
+  }
 
+  private mergeEntryWithData(
+    entry: ContentEntry,
+    data: PageContentType
+  ): ContentEntry & PageContentType {
     return {
-      cmsOptions,
-      ...(slug !== undefined && { slug }),
-      isPreview,
+      ...entry,
+      ...data,
+      id: entry.id,
+      name: entry.name || '',
     }
   }
 }

package/src/server/content/types.ts

@@ -16,7 +16,7 @@ export interface ContentParams {
   documentId?: string
   versionId?: string
   releaseId?: string
-  filters?: Record<string, any>
+  filters?: Record<string, unknown>
 }
 
 export interface ContentOptions {

package/src/server/content/utils.ts

@@ -1,8 +1,17 @@
 import { contentSource } from '../../../discovery.config'
-import { ContentSourceType } from './types'
+import { ContentSourceType, type PreviewData } from './types'
 
 export function isContentPlatformSource(): boolean {
   return (
     contentSource.type.toLocaleLowerCase() === ContentSourceType.ContentPlatform
   )
 }
+
+export function isBranchPreview(
+  previewData: PreviewData | null | undefined
+): boolean {
+  return (
+    isContentPlatformSource() &&
+    !!(previewData?.versionId || previewData?.releaseId)
+  )
+}