@faststore/core 3.0.11 → 3.0.13

package/.turbo/turbo-build.log

@@ -1,6 +1,6 @@
 $ yarn partytown & yarn generate && next build
-$ faststore generate-graphql -c
 $ partytown copylib ./public/~partytown
+$ faststore generate-graphql -c
 Partytown lib copied to: /home/runner/work/faststore/faststore/packages/core/public/~partytown
 success - GraphQL schema, types, and optimizations successfully generated 🎉
 ⚠ No build cache found. Please configure build caching for faster rebuilds. Read more: https://nextjs.org/docs/messages/no-cache
@@ -27,6 +27,8 @@ Browserslist: caniuse-lite is outdated. Please run:
    Generating static pages (0/7) ...
 
   Generating static pages (1/7) 
 
   Generating static pages (3/7) 
+warn - CustomIconsAlert not found. Add a new component for this section or remove it from the CMS
+warn - SimpleAlert not found. Add a new component for this section or remove it from the CMS
 
   Generating static pages (5/7) 
 
 ✓ Generating static pages (7/7) 
    Finalizing page optimization ...
@@ -53,7 +55,7 @@ Route (pages)                              Size     First Load JS
 + First Load JS shared by all              96.5 kB
   ├ chunks/framework-8e279965036b6169.js   45.4 kB
   ├ chunks/main-6f63f6746cc029db.js        33.1 kB
-  ├ chunks/pages/_app-6516d0c2c7e0e686.js  12.5 kB
+  ├ chunks/pages/_app-ad8623e78bc5b766.js  12.5 kB
   ├ chunks/webpack-b4a2fdf4ef127bb7.js     2.45 kB
   └ css/5d1f64b61ea581f4.css               3.05 kB
 

package/.turbo/turbo-test.log

@@ -1,23 +1,23 @@
 $ jest
-PASS test/server/index.test.ts (21.487 s)
+PASS test/server/index.test.ts (21.419 s)
   FastStore GraphQL Layer
     @faststore/api
-      ✓ should return a valid GraphQL schema (9 ms)
-      ✓ should return a valid GraphQL schema contain all expected types (21 ms)
-      ✓ should return a valid GraphQL schema contain all expected queries (5 ms)
+      ✓ should return a valid GraphQL schema (8 ms)
+      ✓ should return a valid GraphQL schema contain all expected types (7 ms)
+      ✓ should return a valid GraphQL schema contain all expected queries (1 ms)
       ✓ should return a valid GraphQL schema contain all expected mutations (1 ms)
     VTEX API Extension
-      ✓ getTypeDefsFromFolder function should return an Array (8 ms)
+      ✓ getTypeDefsFromFolder function should return an Array (5 ms)
     Third Party API Extension
-      ✓ getTypeDefsFromFolder function should return an Array (23 ms)
+      ✓ getTypeDefsFromFolder function should return an Array (4 ms)
     Final Schema after merging
-      ✓ should return a valid merged GraphQL schema (57 ms)
+      ✓ should return a valid merged GraphQL schema (26 ms)
     Envelop
-      ✓ should exist with its plugins (67 ms)
-      ✓ should handle options and execute (289 ms)
+      ✓ should exist with its plugins (39 ms)
+      ✓ should handle options and execute (329 ms)
 
 Test Suites: 1 passed, 1 total
 Tests:       9 passed, 9 total
 Snapshots:   0 total
-Time:        21.534 s
+Time:        21.518 s
 Ran all test suites.

package/faststore.config.default.js

@@ -88,6 +88,10 @@ module.exports = {
     gtmContainerId: 'GTM-PGHZ95N',
   },
 
+  cms: {
+    data: process.env.CMS_DATA,
+  },
+
   experimental: {
     cypressVersion: 12,
     enableCypressExtension: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faststore/core",
-  "version": "3.0.11",
+  "version": "3.0.13",
   "license": "MIT",
   "repository": "vtex/faststore",
   "browserslist": "supports es6-module and not dead",
@@ -41,7 +41,7 @@
     "@envelop/validation-cache": "^2.2.0",
     "@faststore/api": "^3.0.7",
     "@faststore/components": "^3.0.7",
-    "@faststore/graphql-utils": "^3.0.7",
+    "@faststore/graphql-utils": "^3.0.13",
     "@faststore/sdk": "^3.0.7",
     "@faststore/ui": "^3.0.7",
     "@graphql-codegen/cli": "^3.3.1",
@@ -83,7 +83,7 @@
   "devDependencies": {
     "@cypress/code-coverage": "^3.12.1",
     "@envelop/testing": "^6.0.0",
-    "@faststore/cli": "^3.0.7",
+    "@faststore/cli": "^3.0.13",
     "@faststore/eslint-config": "^3.0.7",
     "@faststore/lighthouse": "^1.12.32",
     "@lhci/cli": "^0.9.0",
@@ -128,5 +128,5 @@
     "node": "18.19.0",
     "yarn": "1.19.1"
   },
-  "gitHead": "3ab949e5801ba04f7e884b63f0e5e2cde9df0ceb"
+  "gitHead": "9ccaaa8c2e9e6b2c9f3c82ac3d52405e51ddd6a0"
 }

package/src/components/cms/GlobalSections.tsx

@@ -1,8 +1,9 @@
 import { Locator, Section } from '@vtex/client-cms'
 import type { ComponentType } from 'react'
 import { PropsWithChildren, lazy } from 'react'
+import storeConfig from 'faststore.config'
 import CUSTOM_COMPONENTS from 'src/customizations/src/components'
-import { PageContentType, getPage } from 'src/server/cms'
+import { PageContentType, getPage, getPageByVersionId } from 'src/server/cms'
 
 import Toast from 'src/components/common/Toast'
 import RenderSections from './RenderSections'
@@ -50,6 +51,21 @@ export default GlobalSections
 export const getGlobalSectionsData = async (
   previewData: Locator
 ): Promise<GlobalSectionsData> => {
+  if (storeConfig.cms.data) {
+    const cmsData = JSON.parse(storeConfig.cms.data)
+    const page = cmsData[GLOBAL_SECTIONS_CONTENT_TYPE][0]
+
+    if (page) {
+      const pageData = await getPageByVersionId<PageContentType>({
+        contentType: GLOBAL_SECTIONS_CONTENT_TYPE,
+        documentId: page.documentId,
+        versionId: page.versionId,
+      })
+
+      return pageData
+    }
+  }
+
   const { sections } = await getPage<PageContentType>({
     ...(previewData?.contentType === GLOBAL_SECTIONS_CONTENT_TYPE &&
       previewData),

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

@@ -10,11 +10,11 @@ import { OverriddenDefaultNewsletter as Newsletter } from 'src/components/sectio
 import { OverriddenDefaultProductShelf as ProductShelf } from 'src/components/sections/ProductShelf/OverriddenDefaultProductShelf'
 import Incentives from 'src/components/sections/Incentives'
 import ProductTiles from 'src/components/sections/ProductTiles'
-import { getPage } from 'src/server/cms'
+import { getPage, getPageByVersionId } from 'src/server/cms'
 import type { PageContentType } from 'src/server/cms'
 import CUSTOM_COMPONENTS from 'src/customizations/src/components'
 
-import storeConfig from '../../../../faststore.config'
+import storeConfig from 'faststore.config'
 
 /* A list of components that can be used in the CMS. */
 const COMPONENTS: Record<string, ComponentType<any>> = {
@@ -85,6 +85,23 @@ export const getLandingPageBySlug = async (
   previewData: Locator
 ) => {
   try {
+    if (storeConfig.cms.data) {
+      const cmsData = JSON.parse(storeConfig.cms.data)
+      const pageBySlug = cmsData['landingPage'].find((page) => {
+        slug === page.settings?.seo?.slug
+      })
+
+      if (pageBySlug) {
+        const landingPageData = await getPageByVersionId<PageContentType>({
+          contentType: 'landingPage',
+          documentId: pageBySlug.documentId,
+          versionId: pageBySlug.versionId,
+        })
+
+        return landingPageData
+      }
+    }
+
     const landingPageData = await getPage<PageContentType>({
       ...(previewData?.contentType === 'landingPage'
         ? previewData

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

@@ -1,5 +1,6 @@
 import { isNotFoundError } from '@faststore/api'
 import type { GetStaticPaths, GetStaticProps } from 'next'
+import storeConfig from 'faststore.config'
 
 import { gql } from '@generated'
 import type {
@@ -14,7 +15,12 @@ import GlobalSections, {
   getGlobalSectionsData,
   GlobalSectionsData,
 } from 'src/components/cms/GlobalSections'
-import { getPage, PageContentType, PLPContentType } from 'src/server/cms'
+import {
+  getPage,
+  getPageByVersionId,
+  PageContentType,
+  PLPContentType,
+} from 'src/server/cms'
 import ProductListingPage, {
   ProductListingPageProps,
 } from 'src/components/templates/ProductListingPage'
@@ -100,7 +106,7 @@ export const getStaticProps: GetStaticProps<
     }
   }
 
-  const [{ data, errors = [] }, page] = await Promise.all([
+  const [{ data, errors = [] }] = await Promise.all([
     execute<
       ServerCollectionPageQueryQueryVariables,
       ServerCollectionPageQueryQuery
@@ -108,11 +114,27 @@ export const getStaticProps: GetStaticProps<
       variables: { slug },
       operation: query,
     }),
-    getPage<PLPContentType>({
+  ])
+
+  let pageData
+
+  if (storeConfig.cms.data) {
+    const cmsData = JSON.parse(storeConfig.cms.data)
+    const page = cmsData['plp'][0]
+
+    if (page) {
+      pageData = await getPageByVersionId<PLPContentType>({
+        contentType: 'plp',
+        documentId: page.documentId,
+        versionId: page.versionId,
+      })
+    }
+  } else {
+    pageData = await getPage<PLPContentType>({
       ...(previewData?.contentType === 'plp' ? previewData : null),
       contentType: 'plp',
-    }),
-  ])
+    })
+  }
 
   const notFound = errors.find(isNotFoundError)
 
@@ -130,7 +152,7 @@ export const getStaticProps: GetStaticProps<
   return {
     props: {
       data,
-      page,
+      page: pageData,
       globalSections: await globalSectionsPromise,
       type: 'plp',
       key: slug,

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

@@ -21,13 +21,13 @@ import { useSession } from 'src/sdk/session'
 import { mark } from 'src/sdk/tests/mark'
 import { execute } from 'src/server'
 import type { PDPContentType } from 'src/server/cms'
-import { getPage } from 'src/server/cms'
+import { getPage, getPageByVersionId } from 'src/server/cms'
 
 import GlobalSections, {
   GlobalSectionsData,
   getGlobalSectionsData,
 } from 'src/components/cms/GlobalSections'
-import storeConfig from '../../../faststore.config'
+import storeConfig from 'faststore.config'
 import { useProductQuery } from 'src/sdk/product/useProductQuery'
 import PageProvider, { PDPContext } from 'src/sdk/overrides/PageProvider'
 
@@ -200,18 +200,34 @@ export const getStaticProps: GetStaticProps<
   Locator
 > = async ({ params, previewData }) => {
   const slug = params?.slug ?? ''
-  const [searchResult, cmsPage, globalSections] = await Promise.all([
+  const [searchResult, globalSections] = await Promise.all([
     execute<ServerProductQueryQueryVariables, ServerProductQueryQuery>({
       variables: { locator: [{ key: 'slug', value: slug }] },
       operation: query,
     }),
-    getPage<PDPContentType>({
-      ...(previewData?.contentType === 'pdp' ? previewData : null),
-      contentType: 'pdp',
-    }),
     getGlobalSectionsData(previewData),
   ])
 
+  let cmsPage
+
+  if (storeConfig.cms.data) {
+    const cmsData = JSON.parse(storeConfig.cms.data)
+    const page = cmsData['pdp'][0]
+
+    if (page) {
+      cmsPage = getPageByVersionId<PDPContentType>({
+        contentType: 'pdp',
+        documentId: page.documentId,
+        versionId: page.versionId,
+      })
+    }
+  } else {
+    cmsPage = getPage<PDPContentType>({
+      ...(previewData?.contentType === 'pdp' ? previewData : null),
+      contentType: 'pdp',
+    })
+  }
+
   const { data, errors = [] } = searchResult
 
   const notFound = errors.find(isNotFoundError)

package/src/pages/index.tsx

@@ -13,7 +13,7 @@ import ProductTiles from 'src/components/sections/ProductTiles'
 import CUSTOM_COMPONENTS from 'src/customizations/src/components'
 import { mark } from 'src/sdk/tests/mark'
 import type { PageContentType } from 'src/server/cms'
-import { getPage } from 'src/server/cms'
+import { getPage, getPageByVersionId } from 'src/server/cms'
 
 import GlobalSections, {
   GlobalSectionsData,
@@ -85,13 +85,29 @@ export const getStaticProps: GetStaticProps<
   Record<string, string>,
   Locator
 > = async ({ previewData }) => {
-  const [page, globalSections] = await Promise.all([
-    getPage<PageContentType>({
-      ...(previewData?.contentType === 'home' && previewData),
-      contentType: 'home',
-    }),
-    getGlobalSectionsData(previewData),
-  ])
+  const globalSections = await getGlobalSectionsData(previewData)
+
+  if (storeConfig.cms.data) {
+    const cmsData = JSON.parse(storeConfig.cms.data)
+    const page = cmsData['home'][0]
+
+    if (page) {
+      const pageData = await getPageByVersionId<PageContentType>({
+        contentType: 'home',
+        documentId: page.documentId,
+        versionId: page.versionId,
+      })
+
+      return {
+        props: { page: pageData, globalSections },
+      }
+    }
+  }
+
+  const page = await getPage<PageContentType>({
+    ...(previewData?.contentType === 'home' && previewData),
+    contentType: 'home',
+  })
 
   return {
     props: { page, globalSections },

package/src/pages/s.tsx

@@ -19,8 +19,8 @@ import GlobalSections, {
   getGlobalSectionsData,
   GlobalSectionsData,
 } from 'src/components/cms/GlobalSections'
-import { getPage, SearchContentType } from 'src/server/cms'
-import storeConfig from '../../faststore.config'
+import { getPage, getPageByVersionId, SearchContentType } from 'src/server/cms'
+import storeConfig from 'faststore.config'
 import SearchPage from 'src/components/templates/SearchPage/SearchPage'
 
 type Props = {
@@ -118,13 +118,29 @@ export const getStaticProps: GetStaticProps<
   Record<string, string>,
   Locator
 > = async ({ previewData }) => {
-  const [page, globalSections] = await Promise.all([
-    getPage<SearchContentType>({
-      ...(previewData?.contentType === 'search' ? previewData : null),
-      contentType: 'search',
-    }),
-    getGlobalSectionsData(previewData),
-  ])
+  const globalSections = await getGlobalSectionsData(previewData)
+
+  if (storeConfig.cms.data) {
+    const cmsData = JSON.parse(storeConfig.cms.data)
+    const page = cmsData['search'][0]
+
+    if (page) {
+      const pageData = await getPageByVersionId<SearchContentType>({
+        contentType: 'search',
+        documentId: page.documentId,
+        versionId: page.versionId,
+      })
+
+      return {
+        props: { page: pageData, globalSections },
+      }
+    }
+  }
+
+  const page = await getPage<SearchContentType>({
+    ...(previewData?.contentType === 'search' ? previewData : null),
+    contentType: 'search',
+  })
 
   return {
     props: {

package/src/sdk/graphql/prefetchQuery.ts

@@ -3,11 +3,10 @@ import type { Cache } from 'swr'
 
 import { request } from './request'
 import { getKey } from './useQuery'
-import type { RequestOptions } from './request'
-import { TypedDocumentString } from '@generated/graphql'
+import type { Operation, RequestOptions } from './request'
 
 export const prefetchQuery = <Data, Variables = Record<string, unknown>>(
-  operation: TypedDocumentString<any, any>,
+  operation: Operation,
   variables: Variables,
   { cache, ...options }: Partial<RequestOptions> & { cache: Cache }
 ) => {

package/src/sdk/graphql/request.ts

@@ -1,6 +1,7 @@
 import { TypedDocumentString } from '@generated/graphql'
 
 export type RequestOptions = Omit<BaseRequestOptions, 'operation' | 'variables'>
+export type Operation = Pick<TypedDocumentString<any, any>, '__meta__'>
 
 export interface GraphQLResponse<D = any> {
   data: D
@@ -8,7 +9,7 @@ export interface GraphQLResponse<D = any> {
 }
 
 export interface BaseRequestOptions<V = any> {
-  operation: TypedDocumentString<any, any>
+  operation: Operation
   variables: V
   fetchOptions?: RequestInit
 }
@@ -20,7 +21,7 @@ const DEFAULT_HEADERS_BY_VERB: Record<string, Record<string, string>> = {
 }
 
 export const request = async <Query = unknown, Variables = unknown>(
-  operation: TypedDocumentString<any, any>,
+  operation: Operation,
   variables: Variables,
   options?: RequestOptions
 ) => {

package/src/sdk/graphql/useLazyQuery.ts

@@ -1,12 +1,11 @@
 import useSWR from 'swr'
 
-import { request } from './request'
+import { type Operation, request } from './request'
 import { DEFAULT_OPTIONS, getKey } from './useQuery'
 import type { QueryOptions } from './useQuery'
-import { TypedDocumentString } from '@generated/graphql'
 
 export const useLazyQuery = <Data, Variables = Record<string, unknown>>(
-  operation: TypedDocumentString<any, any>,
+  operation: Operation,
   variables: Variables,
   options?: QueryOptions
 ) => {

package/src/sdk/graphql/useQuery.ts

@@ -2,8 +2,7 @@ import useSWR from 'swr'
 import type { SWRConfiguration } from 'swr'
 
 import { request } from './request'
-import type { RequestOptions } from './request'
-import { TypedDocumentString } from '@generated/graphql'
+import type { Operation, RequestOptions } from './request'
 
 export type QueryOptions = SWRConfiguration &
   RequestOptions & { doNotRun?: boolean }
@@ -23,7 +22,7 @@ export const DEFAULT_OPTIONS = {
 }
 
 export const useQuery = <Data, Variables = Record<string, unknown>>(
-  operation: TypedDocumentString<any, any>,
+  operation: Operation,
   variables: Variables,
   options?: QueryOptions
 ) =>

package/src/server/cms.ts

@@ -39,6 +39,32 @@ export const getPage = async <T extends ContentData>(options: Options) => {
   return pages[0] as T
 }
 
+export type VersionOptions = {
+  contentType: string
+  documentId: string
+  versionId: string
+}
+
+export const getPageByVersionId = async <T extends ContentData>(
+  options: VersionOptions
+) => {
+  const result = await clientCMS
+    .getCMSPage(options)
+    .then((page) => ({ data: [page] }))
+
+  const pages = result.data
+
+  if (!pages[0]) {
+    throw new MissingContentError(options)
+  }
+
+  if (pages.length !== 1) {
+    throw new MultipleContentError(options)
+  }
+
+  return pages[0] as T
+}
+
 type ProductGallerySettings = {
   settings: {
     productGallery: {

package/src/server/index.ts

@@ -27,10 +27,10 @@ import vtexExtensionsResolvers from '../customizations/src/graphql/vtex/resolver
 import thirdPartyResolvers from '../customizations/src/graphql/thirdParty/resolvers'
 
 import { apiOptions } from './options'
-import { TypedDocumentString } from '@generated/graphql'
+import { Operation } from '../sdk/graphql/request'
 
 interface ExecuteOptions<V = Record<string, unknown>> {
-  operation: Pick<TypedDocumentString<any, any>, '__meta__'>
+  operation: Operation
   variables: V
   query?: string | null
 }

package/tsconfig.json

@@ -14,6 +14,8 @@
     "paths": {
       "src/*": ["src/*"],
       "@generated/*": ["@generated/*"],
+      "@faststore/core": ["index.ts"],
+      "@faststore/core/api": ["api/index.ts"],
       "@faststore/core/experimental": ["src/experimental/index.ts"]
     },
     "forceConsistentCasingInFileNames": true,