@faststore/core 2.0.117-alpha.0 → 2.0.120-alpha.0

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

@@ -9,7 +9,7 @@ import type {
   ServerProductPageQueryQuery,
   ServerProductPageQueryQueryVariables,
 } from '@generated/graphql'
-import RenderPageSections from 'src/components/cms/RenderPageSections'
+import RenderSections from 'src/components/cms/RenderSections'
 import BannerNewsletter from 'src/components/sections/BannerNewsletter/BannerNewsletter'
 import CrossSellingShelf from 'src/components/sections/CrossSellingShelf'
 import ProductDetails from 'src/components/sections/ProductDetails'
@@ -21,6 +21,10 @@ import type { PDPContentType } from 'src/server/cms'
 import { getPage } from 'src/server/cms'
 
 import storeConfig from '../../../faststore.config'
+import GlobalSections, {
+  GlobalSectionsData,
+  getGlobalSectionsData,
+} from 'src/components/cms/GlobalSections'
 
 /**
  * Sections: Components imported from each store's custom components and '../components/sections' only.
@@ -33,9 +37,12 @@ const COMPONENTS: Record<string, ComponentType<any>> = {
   ...CUSTOM_COMPONENTS,
 }
 
-type Props = ServerProductPageQueryQuery & PDPContentType
+type Props = ServerProductPageQueryQuery &
+  PDPContentType & {
+    globalSections: GlobalSectionsData
+  }
 
-function Page({ product, sections }: Props) {
+function Page({ product, sections, globalSections }: Props) {
   const { currency } = useSession()
   const { seo } = product
   const title = seo.title || storeConfig.seo.title
@@ -43,7 +50,7 @@ function Page({ product, sections }: Props) {
   const canonical = `${storeConfig.storeUrl}${seo.canonical}`
 
   return (
-    <>
+    <GlobalSections {...globalSections}>
       {/* SEO */}
       <NextSeo
         title={title}
@@ -100,12 +107,12 @@ function Page({ product, sections }: Props) {
         If needed, wrap your component in a <Section /> component
         (not the HTML tag) before rendering it here.
       */}
-      <RenderPageSections
+      <RenderSections
         context={product}
         sections={sections}
         components={COMPONENTS}
       />
-    </>
+    </GlobalSections>
   )
 }
 
@@ -199,10 +206,13 @@ export const getStaticProps: GetStaticProps<
     throw errors[0]
   }
 
+  const globalSections = await getGlobalSectionsData(previewData)
+
   return {
     props: {
       ...data,
       ...cmsPage,
+      globalSections,
     },
   }
 }

package/src/pages/account.tsx

@@ -2,19 +2,41 @@ import { useEffect } from 'react'
 import { NextSeo } from 'next-seo'
 
 import storeConfig from '../../faststore.config'
+import GlobalSections, {
+  GlobalSectionsData,
+  getGlobalSectionsData,
+} from 'src/components/cms/GlobalSections'
+import { GetStaticProps } from 'next'
+import { Locator } from '@vtex/client-cms'
 
-function Page() {
+type Props = {
+  globalSections: GlobalSectionsData
+}
+
+function Page({ globalSections }: Props) {
   useEffect(() => {
     window.location.href = `${storeConfig.accountUrl}${window.location.search}`
   }, [])
 
   return (
-    <>
+    <GlobalSections {...globalSections}>
       <NextSeo noindex nofollow />
 
       <div>loading...</div>
-    </>
+    </GlobalSections>
   )
 }
 
+export const getStaticProps: GetStaticProps<
+  Props,
+  Record<string, string>,
+  Locator
+> = async ({ previewData }) => {
+  const globalSections = await getGlobalSectionsData(previewData)
+
+  return {
+    props: { globalSections },
+  }
+}
+
 export default Page

package/src/pages/checkout.tsx

@@ -2,19 +2,41 @@ import { useEffect } from 'react'
 import { NextSeo } from 'next-seo'
 
 import storeConfig from '../../faststore.config'
+import GlobalSections, {
+  GlobalSectionsData,
+  getGlobalSectionsData,
+} from 'src/components/cms/GlobalSections'
+import { GetStaticProps } from 'next'
+import { Locator } from '@vtex/client-cms'
 
-function Page() {
+type Props = {
+  globalSections: GlobalSectionsData
+}
+
+function Page({ globalSections }: Props) {
   useEffect(() => {
     window.location.href = storeConfig.checkoutUrl
   }, [])
 
   return (
-    <>
+    <GlobalSections {...globalSections}>
       <NextSeo noindex nofollow />
 
       <div>loading...</div>
-    </>
+    </GlobalSections>
   )
 }
 
+export const getStaticProps: GetStaticProps<
+  Props,
+  Record<string, string>,
+  Locator
+> = async ({ previewData }) => {
+  const globalSections = await getGlobalSectionsData(previewData)
+
+  return {
+    props: { globalSections },
+  }
+}
+
 export default Page

package/src/pages/index.tsx

@@ -3,7 +3,7 @@ import type { GetStaticProps } from 'next'
 import { NextSeo, SiteLinksSearchBoxJsonLd } from 'next-seo'
 import type { ComponentType } from 'react'
 
-import RenderPageSections from 'src/components/cms/RenderPageSections'
+import RenderSections from 'src/components/cms/RenderSections'
 import BannerText from 'src/components/sections/BannerText'
 import Hero from 'src/components/sections/Hero'
 import IncentivesHeader from 'src/components/sections/Incentives/IncentivesHeader'
@@ -16,6 +16,10 @@ import type { PageContentType } from 'src/server/cms'
 import { getPage } from 'src/server/cms'
 
 import storeConfig from '../../faststore.config'
+import GlobalSections, {
+  GlobalSectionsData,
+  getGlobalSectionsData,
+} from 'src/components/cms/GlobalSections'
 
 /* A list of components that can be used in the CMS. */
 const COMPONENTS: Record<string, ComponentType<any>> = {
@@ -28,11 +32,14 @@ const COMPONENTS: Record<string, ComponentType<any>> = {
   ...CUSTOM_COMPONENTS,
 }
 
-type Props = PageContentType
+type Props = {
+  page: PageContentType
+  globalSections: GlobalSectionsData
+}
 
-function Page({ sections, settings }: Props) {
+function Page({ page: { sections, settings }, globalSections }: Props) {
   return (
-    <>
+    <GlobalSections {...globalSections}>
       {/* SEO */}
       <NextSeo
         title={settings.seo.title}
@@ -67,8 +74,8 @@ function Page({ sections, settings }: Props) {
         If needed, wrap your component in a <Section /> component
         (not the HTML tag) before rendering it here.
       */}
-      <RenderPageSections sections={sections} components={COMPONENTS} />
-    </>
+      <RenderSections sections={sections} components={COMPONENTS} />
+    </GlobalSections>
   )
 }
 
@@ -76,18 +83,21 @@ export const getStaticProps: GetStaticProps<
   Props,
   Record<string, string>,
   Locator
-> = async (context) => {
+> = async ({ previewData }) => {
   const page = await getPage<PageContentType>({
-    ...(context.previewData?.contentType === 'page'
-      ? context.previewData
+    ...(previewData?.contentType === 'page'
+      ? previewData
       : { filters: { 'settings.seo.slug': '/' } }),
     contentType: 'page',
   })
 
+  const globalSections = await getGlobalSectionsData(previewData)
+
   return {
-    props: page,
+    props: { page, globalSections },
   }
 }
 
 Page.displayName = 'Page'
+
 export default mark(Page)

package/src/pages/login.tsx

@@ -3,21 +3,43 @@ import { NextSeo } from 'next-seo'
 import { EmptyState as UIEmptyState, Loader as UILoader } from '@faststore/ui'
 
 import storeConfig from '../../faststore.config'
+import GlobalSections, {
+  GlobalSectionsData,
+  getGlobalSectionsData,
+} from 'src/components/cms/GlobalSections'
+import { GetStaticProps } from 'next'
+import { Locator } from '@vtex/client-cms'
 
-function Page() {
+type Props = {
+  globalSections: GlobalSectionsData
+}
+
+function Page({ globalSections }: Props) {
   useEffect(() => {
     window.location.href = `${storeConfig.loginUrl}${window.location.search}`
   }, [])
 
   return (
-    <>
+    <GlobalSections {...globalSections}>
       <NextSeo noindex nofollow />
 
       <UIEmptyState title="Loading" bkgColor="light">
         <UILoader />
       </UIEmptyState>
-    </>
+    </GlobalSections>
   )
 }
 
+export const getStaticProps: GetStaticProps<
+  Props,
+  Record<string, string>,
+  Locator
+> = async ({ previewData }) => {
+  const globalSections = await getGlobalSectionsData(previewData)
+
+  return {
+    props: { globalSections },
+  }
+}
+
 export default Page

package/src/pages/s.tsx

@@ -12,6 +12,16 @@ import { useApplySearchState } from 'src/sdk/search/state'
 import { mark } from 'src/sdk/tests/mark'
 
 import storeConfig from '../../faststore.config'
+import GlobalSections, {
+  getGlobalSectionsData,
+  GlobalSectionsData,
+} from 'src/components/cms/GlobalSections'
+import { Locator } from '@vtex/client-cms'
+import { GetStaticProps } from 'next'
+
+type Props = {
+  globalSections: GlobalSectionsData
+}
 
 const useSearchParams = () => {
   const [params, setParams] = useState<SearchState | null>(null)
@@ -26,7 +36,7 @@ const useSearchParams = () => {
   return params
 }
 
-function Page() {
+function Page({ globalSections }: Props) {
   const searchParams = useSearchParams()
   const applySearchState = useApplySearchState()
   const title = 'Search Results'
@@ -37,47 +47,61 @@ function Page() {
   }
 
   return (
-    <SearchProvider
-      onChange={applySearchState}
-      itemsPerPage={ITEMS_PER_PAGE}
-      {...searchParams}
-    >
-      {/* SEO */}
-      <NextSeo
-        noindex
-        title={title}
-        description={description}
-        titleTemplate={titleTemplate}
-        openGraph={{
-          type: 'website',
-          title,
-          description,
-        }}
-      />
-
-      <UISROnly as="h1" text={title} />
-
-      {/*
-        WARNING: Do not import or render components from any
-        other folder than '../components/sections' in here.
-
-        This is necessary to keep the integration with the CMS
-        easy and consistent, enabling the change and reorder
-        of elements on this page.
-
-        If needed, wrap your component in a <Section /> component
-        (not the HTML tag) before rendering it here.
-      */}
-      <Breadcrumb name="All Products" />
-
-      <ProductGallery
-        title="Search Results"
-        searchTerm={searchParams.term ?? undefined}
-      />
-    </SearchProvider>
+    <GlobalSections {...globalSections}>
+      <SearchProvider
+        onChange={applySearchState}
+        itemsPerPage={ITEMS_PER_PAGE}
+        {...searchParams}
+      >
+        {/* SEO */}
+        <NextSeo
+          noindex
+          title={title}
+          description={description}
+          titleTemplate={titleTemplate}
+          openGraph={{
+            type: 'website',
+            title,
+            description,
+          }}
+        />
+
+        <UISROnly as="h1" text={title} />
+
+        {/*
+          WARNING: Do not import or render components from any
+          other folder than '../components/sections' in here.
+
+          This is necessary to keep the integration with the CMS
+          easy and consistent, enabling the change and reorder
+          of elements on this page.
+
+          If needed, wrap your component in a <Section /> component
+          (not the HTML tag) before rendering it here.
+        */}
+        <Breadcrumb name="All Products" />
+
+        <ProductGallery
+          title="Search Results"
+          searchTerm={searchParams.term ?? undefined}
+        />
+      </SearchProvider>
+    </GlobalSections>
   )
 }
 
+export const getStaticProps: GetStaticProps<
+  Props,
+  Record<string, string>,
+  Locator
+> = async ({ previewData }) => {
+  const globalSections = await getGlobalSectionsData(previewData)
+
+  return {
+    props: { globalSections },
+  }
+}
+
 Page.displayName = 'Page'
 
 export default mark(Page)

package/.next/BUILD_ID

@@ -1 +0,0 @@
-kFT8gMGQbscGgKaZLxG_K

package/.next/build-manifest.json

@@ -1,99 +0,0 @@
-{
-  "polyfillFiles": [
-    "static/chunks/polyfills-c67a75d1b6f99dc8.js"
-  ],
-  "devFiles": [],
-  "ampDevFiles": [],
-  "lowPriorityFiles": [
-    "static/kFT8gMGQbscGgKaZLxG_K/_buildManifest.js",
-    "static/kFT8gMGQbscGgKaZLxG_K/_ssgManifest.js"
-  ],
-  "rootMainFiles": [],
-  "pages": {
-    "/": [
-      "static/chunks/webpack-f725b61675603493.js",
-      "static/chunks/framework-dfd14d7ce6600b03.js",
-      "static/chunks/main-9746772201fe3ac1.js",
-      "static/chunks/351-a4e28d64f48c5269.js",
-      "static/chunks/781-e1b538e051ff4c3e.js",
-      "static/css/3a57acf6e411f24d.css",
-      "static/chunks/pages/index-d48285f48d2a66ea.js"
-    ],
-    "/404": [
-      "static/chunks/webpack-f725b61675603493.js",
-      "static/chunks/framework-dfd14d7ce6600b03.js",
-      "static/chunks/main-9746772201fe3ac1.js",
-      "static/chunks/351-a4e28d64f48c5269.js",
-      "static/chunks/pages/404-3637ef83b3359df7.js"
-    ],
-    "/500": [
-      "static/chunks/webpack-f725b61675603493.js",
-      "static/chunks/framework-dfd14d7ce6600b03.js",
-      "static/chunks/main-9746772201fe3ac1.js",
-      "static/chunks/351-a4e28d64f48c5269.js",
-      "static/chunks/pages/500-910883c20541d9ce.js"
-    ],
-    "/[...slug]": [
-      "static/chunks/webpack-f725b61675603493.js",
-      "static/chunks/framework-dfd14d7ce6600b03.js",
-      "static/chunks/main-9746772201fe3ac1.js",
-      "static/chunks/351-a4e28d64f48c5269.js",
-      "static/chunks/264-5b07911df63b8601.js",
-      "static/css/1f987650dd4e39d0.css",
-      "static/chunks/pages/[...slug]-29d3b81ee0953846.js"
-    ],
-    "/[slug]/p": [
-      "static/chunks/webpack-f725b61675603493.js",
-      "static/chunks/framework-dfd14d7ce6600b03.js",
-      "static/chunks/main-9746772201fe3ac1.js",
-      "static/chunks/351-a4e28d64f48c5269.js",
-      "static/chunks/781-e1b538e051ff4c3e.js",
-      "static/css/4abccf9803c3c356.css",
-      "static/chunks/pages/[slug]/p-9b24055cb30ee7a8.js"
-    ],
-    "/_app": [
-      "static/chunks/webpack-f725b61675603493.js",
-      "static/chunks/framework-dfd14d7ce6600b03.js",
-      "static/chunks/main-9746772201fe3ac1.js",
-      "static/css/502746c995f64cce.css",
-      "static/chunks/pages/_app-4aeb21d72aeea9b7.js"
-    ],
-    "/_error": [
-      "static/chunks/webpack-f725b61675603493.js",
-      "static/chunks/framework-dfd14d7ce6600b03.js",
-      "static/chunks/main-9746772201fe3ac1.js",
-      "static/chunks/pages/_error-a7a0c1d9bfbb4f38.js"
-    ],
-    "/account": [
-      "static/chunks/webpack-f725b61675603493.js",
-      "static/chunks/framework-dfd14d7ce6600b03.js",
-      "static/chunks/main-9746772201fe3ac1.js",
-      "static/chunks/351-a4e28d64f48c5269.js",
-      "static/chunks/pages/account-b8fc5222ffe89b60.js"
-    ],
-    "/checkout": [
-      "static/chunks/webpack-f725b61675603493.js",
-      "static/chunks/framework-dfd14d7ce6600b03.js",
-      "static/chunks/main-9746772201fe3ac1.js",
-      "static/chunks/351-a4e28d64f48c5269.js",
-      "static/chunks/pages/checkout-f8cb7cb22225ef9d.js"
-    ],
-    "/login": [
-      "static/chunks/webpack-f725b61675603493.js",
-      "static/chunks/framework-dfd14d7ce6600b03.js",
-      "static/chunks/main-9746772201fe3ac1.js",
-      "static/chunks/351-a4e28d64f48c5269.js",
-      "static/chunks/pages/login-45cc84352bac2408.js"
-    ],
-    "/s": [
-      "static/chunks/webpack-f725b61675603493.js",
-      "static/chunks/framework-dfd14d7ce6600b03.js",
-      "static/chunks/main-9746772201fe3ac1.js",
-      "static/chunks/351-a4e28d64f48c5269.js",
-      "static/chunks/264-5b07911df63b8601.js",
-      "static/css/6f4d3e91f1d161a8.css",
-      "static/chunks/pages/s-ba2868e14fedb65b.js"
-    ]
-  },
-  "ampFirstPages": []
-}