@faststore/core 3.42.0 → 3.43.0

package/.turbo/turbo-build.log

@@ -1,23 +1,23 @@
 
-> @faststore/core@3.41.9 prebuild /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.42.0 prebuild /home/runner/work/faststore/faststore/packages/core
 > na run partytown && na run generate
 
 
-> @faststore/core@3.41.9 partytown /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.42.0 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.41.9 generate /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.42.0 generate /home/runner/work/faststore/faststore/packages/core
 > na run generate:schema && na run generate:codegen && na run format:generated
 
 
-> @faststore/core@3.41.9 generate:schema /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.42.0 generate:schema /home/runner/work/faststore/faststore/packages/core
 > tsx src/server/generator/generateGraphQLSchemaFile.ts
 
 Schema GraphQL file generated successfully
 
-> @faststore/core@3.41.9 generate:codegen /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.42.0 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.41.9 format:generated /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.42.0 format:generated /home/runner/work/faststore/faststore/packages/core
 > prettier --write "@generated/**/*.{ts,js,tsx,jsx,json}" --loglevel error
 
 
-> @faststore/core@3.41.9 build /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.42.0 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
@@ -69,29 +69,29 @@ Warning: Dynamic Content not found for the page: home. Refer to the Dynamic Cont
 Route (pages)                              Size     First Load JS
 ┌ ● /                                      3.86 kB         124 kB
 ├   └ css/b1806cbafd0c1f81.css             3.06 kB
-├   /_app                                  0 B            92.4 kB
-├ ● /[...slug]                             2.34 kB         133 kB
+├   /_app                                  0 B            92.5 kB
+├ ● /[...slug]                             2.44 kB         133 kB
 ├ ● /[slug]/p                              35.7 kB         156 kB
 ├   ├ css/a3ca6a9b63f657be.css             5.75 kB
 ├   ├ css/62a5153ac7061286.css             6.11 kB
 ├   └ css/b5bf49598c8f8b66.css             16.1 kB
 ├ ○ /404                                   1.48 kB         122 kB
 ├ ● /500                                   1.48 kB         122 kB
-├ λ /account                               240 B          92.7 kB
+├ λ /account                               240 B          92.8 kB
 ├ λ /account/profile                       1.34 kB         122 kB
 ├   └ css/249b9deaabc0d32d.css             2.51 kB
-├ λ /api/graphql                           0 B            92.4 kB
-├ λ /api/health/live                       0 B            92.4 kB
-├ λ /api/health/ready                      0 B            92.4 kB
-├ λ /api/preview                           0 B            92.4 kB
+├ λ /api/graphql                           0 B            92.5 kB
+├ λ /api/health/live                       0 B            92.5 kB
+├ λ /api/health/ready                      0 B            92.5 kB
+├ λ /api/preview                           0 B            92.5 kB
 ├ ● /checkout                              694 B           121 kB
 ├ ● /login                                 1.59 kB         122 kB
 └ ● /s                                     3.17 kB         134 kB
-+ First Load JS shared by all              95.9 kB
++ First Load JS shared by all              96 kB
   ├ chunks/framework-807b0f81cbc129f0.js   45.4 kB
   ├ chunks/main-5569625b3fdd6741.js        33.1 kB
-  ├ chunks/pages/_app-0f16b6b5d7dfab2a.js  10.4 kB
-  ├ chunks/webpack-d72e5eb27bf80195.js     3.62 kB
+  ├ chunks/pages/_app-f02182ccd58f2781.js  10.4 kB
+  ├ chunks/webpack-0dd5a14ceff64065.js     3.68 kB
   └ css/0a57ee6c7a57788c.css               3.49 kB
 
 λ  (Server)  server-side renders at runtime (uses getInitialProps or getServerSideProps)

package/.turbo/turbo-test.log

@@ -1,14 +1,14 @@
 
-> @faststore/core@3.41.9 test /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.42.0 test /home/runner/work/faststore/faststore/packages/core
 > jest
 
-PASS test/utils/multipleTemplates.test.ts (23.58 s)
-PASS test/server/cms/global.test.ts (24.55 s)
+PASS test/server/cms/global.test.ts (24.058 s)
+PASS test/utils/multipleTemplates.test.ts (24.28 s)
 PASS test/server/cms/index.test.ts
-PASS test/server/index.test.ts (29.038 s)
+PASS test/server/index.test.ts (29.435 s)
 
 Test Suites: 4 passed, 4 total
 Tests:       22 passed, 22 total
 Snapshots:   0 total
-Time:        30.255 s
+Time:        30.555 s
 Ran all test suites.

package/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.43.0](https://github.com/vtex/faststore/compare/v3.42.0...v3.43.0) (2025-05-12)
+
+### Features
+
+- [CP-432] [CP-433] Adding CP integration as a data source alternative to hCMS ([#2807](https://github.com/vtex/faststore/issues/2807)) ([122e2d9](https://github.com/vtex/faststore/commit/122e2d94cb94a6edc9726a3be8d83e62fa44a51e)), closes [/github.com/vtex/faststore/pull/2807/files#diff-63a7f8cba93bce2eb5ed6be3a1bcf1fbde76d643b165ae2a1a44cc8765dfb73fR141](https://github.com//github.com/vtex/faststore/pull/2807/files/issues/diff-63a7f8cba93bce2eb5ed6be3a1bcf1fbde76d643b165ae2a1a44cc8765dfb73fR141) [/github.com/vtex/faststore/pull/2807/files#diff-8dd0ec358e808043c69af593825ff65e9afe1dd776dad04f15480a45b57a2608R91](https://github.com//github.com/vtex/faststore/pull/2807/files/issues/diff-8dd0ec358e808043c69af593825ff65e9afe1dd776dad04f15480a45b57a2608R91) [/github.com/vtex/faststore/pull/2807/files#diff-63a7f8cba93bce2eb5ed6be3a1bcf1fbde76d643b165ae2a1a44cc8765dfb73fR24](https://github.com//github.com/vtex/faststore/pull/2807/files/issues/diff-63a7f8cba93bce2eb5ed6be3a1bcf1fbde76d643b165ae2a1a44cc8765dfb73fR24)
+
 # [3.42.0](https://github.com/vtex/faststore/compare/v3.41.9...v3.42.0) (2025-05-08)
 
 ### Features

package/discovery.config.default.js

@@ -88,6 +88,8 @@ module.exports = {
     plp: '/office',
     search: '/s?q=headphone',
     pdp: '/apple-magic-mouse/p',
+    500: '/500',
+    404: '/404',
   },
 
   // Lighthouse CI
@@ -122,6 +124,10 @@ module.exports = {
     data: process.env.CMS_DATA,
   },
 
+  contentSource: {
+    type: 'CMS',
+  },
+
   experimental: {
     cypressVersion: 12,
     enableCypressExtension: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faststore/core",
-  "version": "3.42.0",
+  "version": "3.43.0",
   "license": "MIT",
   "repository": "vtex/faststore",
   "browserslist": "supports es6-module and not dead",
@@ -62,6 +62,7 @@
     "@parcel/watcher": "^2.4.0",
     "@types/react": "^18.2.42",
     "@vtex/client-cms": "^0.2.12",
+    "@vtex/client-cp": "0.2.2",
     "@vtex/prettier-config": "1.0.0",
     "autoprefixer": "^10.4.0",
     "css-loader": "^6.7.1",
@@ -105,5 +106,5 @@
     "ts-jest": "29.1.1",
     "typescript": "5.3.2"
   },
-  "gitHead": "d8814aed0849211cb76d06b880c6d556bf1ac898"
+  "gitHead": "201303ea329a26779a521232b5f866dea4aa278c"
 }

package/src/components/cms/GlobalSections.tsx

@@ -1,6 +1,8 @@
-import type { Locator, Section } from '@vtex/client-cms'
+import type { Section } from '@vtex/client-cms'
 import storeConfig from 'discovery.config'
-import { type PageContentType, getPage } from 'src/server/cms'
+import type { PageContentType } from 'src/server/cms'
+import { contentService } from 'src/server/content/service'
+import type { PreviewData } from 'src/server/content/types'
 
 export const GLOBAL_SECTIONS_CONTENT_TYPE = 'globalSections'
 export const GLOBAL_SECTIONS_HEADER_CONTENT_TYPE = 'globalHeaderSections'
@@ -11,7 +13,7 @@ export type GlobalSectionsData = {
 }
 
 export const getGlobalSectionsByType = async (
-  previewData: Locator,
+  previewData: PreviewData,
   contentType: string
 ): Promise<GlobalSectionsData> => {
   if (storeConfig.cms.data) {
@@ -19,26 +21,28 @@ export const getGlobalSectionsByType = async (
     const page = cmsData[contentType][0]
 
     if (page) {
-      const pageData = getPage<PageContentType>({
-        contentType: contentType,
+      const pageData = contentService.getSingleContent<PageContentType>({
+        contentType,
+        previewData,
         documentId: page.documentId,
         versionId: page.versionId,
+        releaseId: page.releaseId,
       })
 
       return pageData
     }
   }
 
-  const pageData = getPage<PageContentType>({
-    ...(previewData?.contentType === contentType && previewData),
-    contentType: contentType,
+  const pageData = contentService.getSingleContent<PageContentType>({
+    contentType,
+    previewData,
   })
 
   return pageData
 }
 
 export const getGlobalSectionsData = (
-  previewData: Locator
+  previewData: PreviewData
 ): Promise<GlobalSectionsData>[] => {
   const globalSections = getGlobalSectionsByType(
     previewData,

package/src/components/templates/LandingPage/LandingPage.tsx

@@ -1,4 +1,3 @@
-import type { Locator } from '@vtex/client-cms'
 import { NextSeo, SiteLinksSearchBoxJsonLd } from 'next-seo'
 import type { ComponentType } from 'react'
 
@@ -17,9 +16,10 @@ import { default as GLOBAL_COMPONENTS } from 'src/components/cms/global/Componen
 import MissingContentError from 'src/sdk/error/MissingContentError/MissingContentError'
 import PageProvider from 'src/sdk/overrides/PageProvider'
 import type { PageContentType } from 'src/server/cms'
-import { getPage } from 'src/server/cms'
 
 import storeConfig from 'discovery.config'
+import type { PreviewData } from 'src/server/content/types'
+import { contentService } from 'src/server/content/service'
 
 /* A list of components that can be used in the CMS. */
 const COMPONENTS: Record<string, ComponentType<any>> = {
@@ -105,7 +105,7 @@ export default function LandingPage({
 
 export const getLandingPageBySlug = async (
   slug: string,
-  previewData: Locator
+  previewData: PreviewData
 ) => {
   try {
     if (storeConfig.cms.data) {
@@ -115,26 +115,30 @@ export const getLandingPageBySlug = async (
       })
 
       if (pageBySlug) {
-        const landingPageData = await getPage<PageContentType>({
-          contentType: 'landingPage',
-          documentId: pageBySlug.documentId,
-          versionId: pageBySlug.versionId,
-        })
+        const landingPageData =
+          await contentService.getSingleContent<PageContentType>({
+            contentType: 'landingPage',
+            previewData,
+            documentId: pageBySlug.documentId,
+            versionId: pageBySlug.versionId,
+            releaseId: pageBySlug.releaseId,
+            slug: pageBySlug.settings?.seo?.slug,
+          })
 
         return landingPageData
       }
     }
 
-    const landingPageData = await getPage<PageContentType>({
-      ...(previewData?.contentType === 'landingPage'
-        ? previewData
-        : {
-            filters: {
-              filters: { 'settings.seo.slug': `/${slug}` },
-            },
-          }),
-      contentType: 'landingPage',
-    })
+    const landingPageData =
+      await contentService.getSingleContent<PageContentType>({
+        contentType: 'landingPage',
+        previewData,
+        slug,
+        filters:
+          previewData?.contentType !== 'landingPage'
+            ? { filters: { 'settings.seo.slug': `/${slug}` } }
+            : undefined,
+      })
     return landingPageData
   } catch (error) {
     if (error instanceof MissingContentError) {

package/src/components/templates/ProductListingPage/ProductListing.tsx

@@ -23,6 +23,8 @@ import {
 } from 'src/sdk/product/usePageProductsQuery'
 import { useProductGalleryQuery } from 'src/sdk/product/useProductGalleryQuery'
 import { useApplySearchState } from 'src/sdk/search/state'
+import { useRouter } from 'next/router'
+import { isContentPlatformSource } from 'src/server/content/utils'
 
 const ScrollToTopButton = dynamic(
   () =>
@@ -49,6 +51,7 @@ export default function ProductListing({
   serverManyProductsVariables,
   globalSections,
 }: ProductListingPageProps) {
+  const router = useRouter()
   const { state } = useSearch()
   const { sort, term, selectedFacets } = state
 
@@ -56,7 +59,9 @@ export default function ProductListing({
 
   const applySearchState = useApplySearchState()
   useEffect(() => {
-    applySearchState(formatSearchState(state))
+    if (!isContentPlatformSource() || !router.isPreview) {
+      applySearchState(formatSearchState(state))
+    }
   }, [])
 
   const { data: pageProductGalleryData } = useProductGalleryQuery({

package/src/experimental/searchServerSideFunctions/getServerSideProps.ts

@@ -1,16 +1,17 @@
 import type { GetServerSideProps } from 'next'
 import type { SearchPageProps } from './getStaticProps'
 
-import type { Locator } from '@vtex/client-cms'
 import storeConfig from 'discovery.config'
 import { getGlobalSectionsData } from 'src/components/cms/GlobalSections'
 import { type SearchContentType, getPage } from 'src/server/cms'
 import { injectGlobalSections } from 'src/server/cms/global'
+import type { PreviewData } from 'src/server/content/types'
+import { contentService } from 'src/server/content/service'
 
 export const getServerSideProps: GetServerSideProps<
   SearchPageProps,
   Record<string, string>,
-  Locator
+  PreviewData
 > = async (context) => {
   const { previewData, query, res } = context
   const searchTerm = (query.q as string)?.split('+').join(' ')
@@ -31,10 +32,12 @@ export const getServerSideProps: GetServerSideProps<
         globalSectionsHeader,
         globalSectionsFooter,
       ] = await Promise.all([
-        getPage<SearchContentType>({
+        contentService.getSingleContent<SearchContentType>({
           contentType: 'search',
+          previewData,
           documentId: page.documentId,
           versionId: page.versionId,
+          releaseId: page.releaseId,
         }),
         globalSectionsPromise,
         globalSectionsHeaderPromise,
@@ -58,9 +61,9 @@ export const getServerSideProps: GetServerSideProps<
 
   const [page, globalSections, globalSectionsHeader, globalSectionsFooter] =
     await Promise.all([
-      getPage<SearchContentType>({
-        ...(previewData?.contentType === 'search' ? previewData : null),
+      contentService.getSingleContent<SearchContentType>({
         contentType: 'search',
+        previewData,
       }),
       globalSectionsPromise,
       globalSectionsHeaderPromise,

package/src/experimental/searchServerSideFunctions/getStaticProps.ts

@@ -1,12 +1,13 @@
-import type { Locator } from '@vtex/client-cms'
 import storeConfig from 'discovery.config'
 import type { GetStaticProps } from 'next'
 import {
   getGlobalSectionsData,
   type GlobalSectionsData,
 } from 'src/components/cms/GlobalSections'
-import { getPage, type SearchContentType } from 'src/server/cms'
+import type { SearchContentType } from 'src/server/cms'
 import { injectGlobalSections } from 'src/server/cms/global'
+import { contentService } from 'src/server/content/service'
+import type { PreviewData } from 'src/server/content/types'
 
 export type SearchPageProps = {
   page: SearchContentType
@@ -21,10 +22,9 @@ export type SearchPageProps = {
 export const getStaticProps: GetStaticProps<
   SearchPageProps,
   Record<string, string>,
-  Locator
+  PreviewData
 > = async (context) => {
   const { previewData } = context
-
   const [
     globalSectionsPromise,
     globalSectionsHeaderPromise,
@@ -42,10 +42,12 @@ export const getStaticProps: GetStaticProps<
         globalSectionsHeader,
         globalSectionsFooter,
       ] = await Promise.all([
-        getPage<SearchContentType>({
+        contentService.getSingleContent<SearchContentType>({
           contentType: 'search',
+          previewData,
           documentId: page.documentId,
           versionId: page.versionId,
+          releaseId: page.releaseId,
         }),
         globalSectionsPromise,
         globalSectionsHeaderPromise,
@@ -66,9 +68,9 @@ export const getStaticProps: GetStaticProps<
 
   const [page, globalSections, globalSectionsHeader, globalSectionsFooter] =
     await Promise.all([
-      getPage<SearchContentType>({
-        ...(previewData?.contentType === 'search' ? previewData : null),
+      contentService.getSingleContent<SearchContentType>({
         contentType: 'search',
+        previewData,
       }),
       globalSectionsPromise,
       globalSectionsHeaderPromise,

package/src/pages/404.tsx

@@ -1,4 +1,3 @@
-import type { Locator } from '@vtex/client-cms'
 import type { GetStaticProps } from 'next'
 import { NextSeo } from 'next-seo'
 import type { ComponentType } from 'react'
@@ -12,8 +11,10 @@ import RenderSections from 'src/components/cms/RenderSections'
 import { OverriddenDefaultEmptyState as EmptyState } from 'src/components/sections/EmptyState/OverriddenDefaultEmptyState'
 import CUSTOM_COMPONENTS from 'src/customizations/src/components'
 import PLUGINS_COMPONENTS from 'src/plugins'
-import { type PageContentType, getPage } from 'src/server/cms'
+import type { PageContentType } from 'src/server/cms'
 import { injectGlobalSections } from 'src/server/cms/global'
+import { contentService } from 'src/server/content/service'
+import type { PreviewData } from 'src/server/content/types'
 
 /* A list of components that can be used in the CMS. */
 const COMPONENTS: Record<string, ComponentType<any>> = {
@@ -55,7 +56,7 @@ function Page({ page: { sections }, globalSections }: Props) {
 export const getStaticProps: GetStaticProps<
   Props,
   Record<string, string>,
-  Locator
+  PreviewData
 > = async ({ previewData }) => {
   const [
     globalSectionsPromise,
@@ -65,9 +66,9 @@ export const getStaticProps: GetStaticProps<
 
   const [page, globalSections, globalSectionsHeader, globalSectionsFooter] =
     await Promise.all([
-      getPage<PageContentType>({
-        ...(previewData?.contentType === '404' && previewData),
+      contentService.getSingleContent<PageContentType>({
         contentType: '404',
+        previewData,
       }),
       globalSectionsPromise,
       globalSectionsHeaderPromise,

package/src/pages/500.tsx

@@ -1,4 +1,3 @@
-import type { Locator } from '@vtex/client-cms'
 import type { GetStaticProps } from 'next'
 import { NextSeo } from 'next-seo'
 import type { ComponentType } from 'react'
@@ -12,8 +11,10 @@ import RenderSections from 'src/components/cms/RenderSections'
 import { OverriddenDefaultEmptyState as EmptyState } from 'src/components/sections/EmptyState/OverriddenDefaultEmptyState'
 import CUSTOM_COMPONENTS from 'src/customizations/src/components'
 import PLUGINS_COMPONENTS from 'src/plugins'
-import { type PageContentType, getPage } from 'src/server/cms'
+import type { PageContentType } from 'src/server/cms'
 import { injectGlobalSections } from 'src/server/cms/global'
+import { contentService } from 'src/server/content/service'
+import type { PreviewData } from 'src/server/content/types'
 
 /* A list of components that can be used in the CMS. */
 const COMPONENTS: Record<string, ComponentType<any>> = {
@@ -56,7 +57,7 @@ function Page({ page: { sections }, globalSections }: Props) {
 export const getStaticProps: GetStaticProps<
   Props,
   Record<string, string>,
-  Locator
+  PreviewData
 > = async ({ previewData }) => {
   const [
     globalSectionsPromise,
@@ -66,9 +67,9 @@ export const getStaticProps: GetStaticProps<
 
   const [page, globalSections, globalSectionsHeader, globalSectionsFooter] =
     await Promise.all([
-      getPage<PageContentType>({
-        ...(previewData?.contentType === '500' && previewData),
+      contentService.getSingleContent<PageContentType>({
         contentType: '500',
+        previewData,
       }),
       globalSectionsPromise,
       globalSectionsHeaderPromise,

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

@@ -12,7 +12,6 @@ import type {
 import { execute } from 'src/server'
 
 import type { SearchState } from '@faststore/sdk'
-import type { Locator } from '@vtex/client-cms'
 import dynamic from 'next/dynamic'
 import {
   getGlobalSectionsData,
@@ -28,9 +27,11 @@ import ProductListingPage, {
 import { getRedirect } from 'src/sdk/redirects'
 import type { PageContentType } from 'src/server/cms'
 import { injectGlobalSections } from 'src/server/cms/global'
-import { getPLP, type PLPContentType } from 'src/server/cms/plp'
+import type { PLPContentType } from 'src/server/cms/plp'
 import { getDynamicContent } from 'src/utils/dynamicContent'
 import { fetchServerManyProducts } from 'src/utils/fetchProductGallerySSR'
+import { contentService } from 'src/server/content/service'
+import type { PreviewData } from 'src/server/content/types'
 
 const LandingPage = dynamic(
   () => import('src/components/templates/LandingPage')
@@ -103,7 +104,7 @@ const query = gql(`
 export const getStaticProps: GetStaticProps<
   Props,
   { slug: string[] },
-  Locator
+  PreviewData
 > = async ({ params, previewData }) => {
   const slug = params?.slug.join('/') ?? ''
   const rewrites = (await storeConfig.rewrites?.()) ?? []
@@ -162,7 +163,13 @@ export const getStaticProps: GetStaticProps<
       variables: { slug },
       operation: query,
     }),
-    getPLP(slug, previewData, rewrites),
+    contentService.getPlpContent(
+      {
+        previewData,
+        slug,
+      },
+      rewrites
+    ),
     globalSectionsPromise,
     globalSectionsHeaderPromise,
     globalSectionsFooterPromise,

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

@@ -1,5 +1,4 @@
 import { isNotFoundError } from '@faststore/api'
-import type { Locator } from '@vtex/client-cms'
 import deepmerge from 'deepmerge'
 import type { GetStaticPaths, GetStaticProps } from 'next'
 import { BreadcrumbJsonLd, NextSeo, ProductJsonLd } from 'next-seo'
@@ -37,7 +36,9 @@ import { getOfferUrl, useOffer } from 'src/sdk/offer'
 import PageProvider, { type PDPContext } from 'src/sdk/overrides/PageProvider'
 import { useProductQuery } from 'src/sdk/product/useProductQuery'
 import { injectGlobalSections } from 'src/server/cms/global'
-import { getPDP, type PDPContentType } from 'src/server/cms/pdp'
+import type { PDPContentType } from 'src/server/cms/pdp'
+import { contentService } from 'src/server/content/service'
+import type { PreviewData } from 'src/server/content/types'
 
 type StoreConfig = typeof storeConfig & {
   experimental: {
@@ -183,7 +184,9 @@ function Page({
       <BreadcrumbJsonLd itemListElements={itemListElements} />
       <ProductJsonLd
         id={`${meta.canonical}${settings?.seo?.id ?? ''}`}
-        mainEntityOfPage={`${meta.canonical}${settings?.seo?.mainEntityOfPage ?? ''}`}
+        mainEntityOfPage={`${meta.canonical}${
+          settings?.seo?.mainEntityOfPage ?? ''
+        }`}
         productName={product.name}
         description={product.description}
         brand={product.brand.name}
@@ -283,7 +286,7 @@ const query = gql(`
 export const getStaticProps: GetStaticProps<
   Props,
   { slug: string },
-  Locator
+  PreviewData
 > = async ({ params, previewData }) => {
   const slug = params?.slug ?? ''
 
@@ -333,7 +336,13 @@ export const getStaticProps: GetStaticProps<
     throw errors[0]
   }
 
-  const cmsPage: PDPContentType = await getPDP(data.product, previewData)
+  const cmsPage: PDPContentType = await contentService.getPdpContent(
+    data.product,
+    {
+      previewData,
+      slug,
+    }
+  )
 
   const { seo } = data.product
   const title = seo.title