@faststore/core 2.2.68 → 2.2.70

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 🎉
 warn  - You have enabled experimental feature (scrollRestoration) in next.config.js.
@@ -38,27 +38,28 @@ info  - Generating static pages (7/7)
 info  - Finalizing page optimization...
 
 Route (pages)                              Size     First Load JS
-┌ ● /                                      1.08 kB         142 kB
+┌ ● /                                      2.36 kB         142 kB
+├   └ css/ecdecb8d639a8311.css             5.48 kB
 ├   /_app                                  0 B            83.7 kB
-├ ● /[...slug]                             3.29 kB         145 kB
-├   └ css/527e334fa69cf40a.css             1.85 kB
-├ ● /[slug]/p                              5.89 kB         141 kB
-├   └ css/c33c62a3d0c77436.css             4.48 kB
-├ ○ /404                                   1.03 kB         136 kB
-├ ● /500                                   1.05 kB         136 kB
-├ ● /account                               676 B           136 kB
+├ ● /[...slug]                             4.43 kB         144 kB
+├   └ css/0c844be3b8585e70.css             5.9 kB
+├ ● /[slug]/p                              1.74 kB         141 kB
+├   └ css/a6bcc59f42b42f36.css             2.39 kB
+├ ○ /404                                   1.03 kB         141 kB
+├ ● /500                                   1.05 kB         141 kB
+├ ● /account                               674 B           140 kB
 ├ λ /api/graphql                           0 B            83.7 kB
 ├ λ /api/health/live                       0 B            83.7 kB
 ├ λ /api/health/ready                      0 B            83.7 kB
 ├ λ /api/preview                           0 B            83.7 kB
-├ ● /checkout                              661 B           136 kB
-├ ● /login                                 983 B           136 kB
-└ ● /s                                     2.36 kB         138 kB
+├ ● /checkout                              660 B           140 kB
+├ ● /login                                 984 B           141 kB
+└ ● /s                                     2.36 kB         142 kB
 + First Load JS shared by all              86.8 kB
   ├ chunks/framework-dfd14d7ce6600b03.js   45.3 kB
   ├ chunks/main-e4e873ee741162eb.js        24.2 kB
   ├ chunks/pages/_app-30b9666307e4b3b1.js  12.1 kB
-  ├ chunks/webpack-6c4b31200fed6646.js     2.22 kB
+  ├ chunks/webpack-776cfd646b505dc5.js     2.22 kB
   └ css/5d1f64b61ea581f4.css               3.05 kB
 
 λ  (Server)  server-side renders at runtime (uses getInitialProps or getServerSideProps)

package/.turbo/turbo-test.log

@@ -1,23 +1,23 @@
 $ jest
-PASS test/server/index.test.ts (21.676 s)
+PASS test/server/index.test.ts (21.452 s)
   FastStore GraphQL Layer
     @faststore/api
-      ✓ should return a valid GraphQL schema (8 ms)
+      ✓ should return a valid GraphQL schema (7 ms)
       ✓ should return a valid GraphQL schema contain all expected types (4 ms)
-      ✓ should return a valid GraphQL schema contain all expected queries (2 ms)
-      ✓ should return a valid GraphQL schema contain all expected mutations
+      ✓ 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 (6 ms)
     Third Party API Extension
-      ✓ getTypeDefsFromFolder function should return an Array (17 ms)
+      ✓ getTypeDefsFromFolder function should return an Array (10 ms)
     Final Schema after merging
-      ✓ should return a valid merged GraphQL schema (54 ms)
+      ✓ should return a valid merged GraphQL schema (32 ms)
     Envelop
-      ✓ should exist with its plugins (71 ms)
-      ✓ should handle options and execute (585 ms)
+      ✓ should exist with its plugins (26 ms)
+      ✓ should handle options and execute (320 ms)
 
 Test Suites: 1 passed, 1 total
 Tests:       9 passed, 9 total
 Snapshots:   0 total
-Time:        21.77 s
+Time:        21.62 s
 Ran all test suites.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faststore/core",
-  "version": "2.2.68",
+  "version": "2.2.70",
   "license": "MIT",
   "repository": "vtex/faststore",
   "browserslist": "supports es6-module and not dead",
@@ -37,11 +37,11 @@
     "@envelop/graphql-jit": "^1.1.1",
     "@envelop/parser-cache": "^2.2.0",
     "@envelop/validation-cache": "^2.2.0",
-    "@faststore/api": "^2.2.56",
-    "@faststore/components": "^2.2.67",
-    "@faststore/graphql-utils": "^2.2.56",
-    "@faststore/sdk": "^2.2.61",
-    "@faststore/ui": "^2.2.67",
+    "@faststore/api": "^2.2.69",
+    "@faststore/components": "^2.2.69",
+    "@faststore/graphql-utils": "^2.2.69",
+    "@faststore/sdk": "^2.2.69",
+    "@faststore/ui": "^2.2.69",
     "@graphql-codegen/cli": "^3.3.1",
     "@graphql-codegen/typescript": "^3.0.4",
     "@graphql-codegen/typescript-operations": "^3.0.4",
@@ -78,8 +78,8 @@
   "devDependencies": {
     "@cypress/code-coverage": "^3.12.1",
     "@envelop/testing": "^6.0.0",
-    "@faststore/cli": "^2.2.56",
-    "@faststore/eslint-config": "^2.2.56",
+    "@faststore/cli": "^2.2.69",
+    "@faststore/eslint-config": "^2.2.69",
     "@faststore/lighthouse": "^1.12.32",
     "@lhci/cli": "^0.9.0",
     "@testing-library/cypress": "^10.0.1",
@@ -123,5 +123,5 @@
     "node": "18.19.0",
     "yarn": "1.19.1"
   },
-  "gitHead": "7f7a80acfe28da4f8466d5513411c3a01722e959"
+  "gitHead": "f3b56c76db2f97cc9d0e6b81839b4eda151044e8"
 }

package/src/components/cms/GlobalSections.tsx

@@ -8,9 +8,9 @@ import Toast from 'src/components/common/Toast'
 import RenderSections from './RenderSections'
 
 import { OverriddenDefaultAlert as Alert } from 'src/components/sections/Alert/OverriddenDefaultAlert'
+import { OverriddenDefaultNavbar as Navbar } from 'src/components/sections/Navbar/OverriddenDefaultNavbar'
 import { OverriddenDefaultRegionBar as RegionBar } from 'src/components/sections/RegionBar/OverriddenDefaultRegionBar'
 import Footer from 'src/components/sections/Footer'
-import Navbar from 'src/components/sections/Navbar'
 
 const RegionModal = lazy(() => import('src/components/region/RegionModal'))
 const CartSidebar = lazy(() => import('src/components/cart/CartSidebar'))

package/src/components/navigation/Navbar/Navbar.tsx

@@ -12,17 +12,10 @@ import CartToggle from 'src/components/cart/CartToggle'
 import Logo from 'src/components/ui/Logo'
 import Link from 'src/components/ui/Link'
 import { ButtonSignIn } from 'src/components/ui/Button'
+import { useOverrideComponents } from 'src/sdk/overrides/OverrideContext'
 
 import type { NavbarProps as SectionNavbarProps } from '../../sections/Navbar'
 
-import {
-  Navbar as NavbarWrapper,
-  NavbarHeader,
-  NavbarRow,
-  NavbarButtons,
-  IconButton,
-} from 'src/components/sections/Navbar/Overrides'
-
 export interface NavbarProps {
   /**
    * Logo props.
@@ -75,9 +68,16 @@ function Navbar({
   home: { label: homeLabel },
   signIn: { button: signInButton },
   menu: {
-    icon: { icon: menuIcon, alt: menuIconAlt = IconButton.props['aria-label'] },
+    icon: { icon: menuIcon, alt: menuIconAlt },
   },
 }: NavbarProps) {
+  const {
+    Navbar: NavbarWrapper,
+    NavbarHeader,
+    NavbarRow,
+    NavbarButtons,
+    IconButton,
+  } = useOverrideComponents<'Navbar'>()
   const scrollDirection = useScrollDirection()
   const { openNavbar, navbar: displayNavbar } = useUI()
   const searchMobileRef = useRef<SearchInputRef>(null)
@@ -107,7 +107,7 @@ function Navbar({
                 onClick={openNavbar}
                 icon={<UIIcon name={menuIcon} width={32} height={32} />}
                 {...IconButton.props}
-                aria-label={menuIconAlt}
+                aria-label={menuIconAlt ?? IconButton.props['aria-label']}
               />
               <Link
                 data-fs-navbar-logo

package/src/components/navigation/NavbarLinks/NavbarLinks.tsx

@@ -8,11 +8,7 @@ import RegionButton from 'src/components/region/RegionButton'
 import type { NavbarProps } from 'src/components/navigation/Navbar'
 
 import { mark } from 'src/sdk/tests/mark'
-
-import {
-  NavbarLinks as NavbarLinksWrapper,
-  NavbarLinksList,
-} from 'src/components/sections/Navbar/Overrides'
+import { useOverrideComponents } from 'src/sdk/overrides/OverrideContext'
 
 interface NavbarLinksProps extends UINavbarLinksProps {
   links: NavbarProps['links']
@@ -29,6 +25,8 @@ function NavbarLinks({
   region: { icon: regionIcon, label: regionLabel, shouldDisplayRegion },
   ...otherProps
 }: NavbarLinksProps) {
+  const { NavbarLinks: NavbarLinksWrapper, NavbarLinksList } =
+    useOverrideComponents<'Navbar'>()
   return (
     <NavbarLinksWrapper.Component {...otherProps} {...NavbarLinksWrapper.props}>
       <div data-fs-navbar-links-wrapper data-fs-content="navbar">

package/src/components/navigation/NavbarSlider/NavbarSlider.tsx

@@ -10,13 +10,7 @@ import { mark } from 'src/sdk/tests/mark'
 import type { NavbarProps } from '../Navbar'
 
 import styles from './section.module.scss'
-
-import {
-  NavbarSlider as NavbarSliderWrapper,
-  NavbarSliderHeader,
-  NavbarSliderContent,
-  NavbarSliderFooter,
-} from 'src/components/sections/Navbar/Overrides'
+import { useOverrideComponents } from 'src/sdk/overrides/OverrideContext'
 
 interface NavbarSliderProps {
   logo: NavbarProps['logo']
@@ -33,6 +27,13 @@ function NavbarSlider({
   home: { label: homeLabel },
   signIn: { button: signInButton },
 }: NavbarSliderProps) {
+  const {
+    NavbarSlider: NavbarSliderWrapper,
+    NavbarSliderHeader,
+    NavbarSliderContent,
+    NavbarSliderFooter,
+  } = useOverrideComponents<'Navbar'>()
+
   const { closeNavbar } = useUI()
   const { fade, fadeOut } = useFadeEffect()
 

package/src/components/sections/BannerNewsletter/BannerNewsletter.tsx

@@ -1,6 +1,9 @@
-import { BannerTextProps } from 'src/components/sections/BannerText'
 import { OverriddenDefaultBannerText as BannerText } from 'src/components/sections/BannerText/OverriddenDefaultBannerText'
-import Newsletter, { NewsletterProps } from 'src/components/sections/Newsletter'
+import type { BannerTextProps } from 'src/components/sections/BannerText'
+
+import { OverriddenDefaultNewsletter as Newsletter } from 'src/components/sections/Newsletter/OverriddenDefaultNewsletter'
+import type { NewsletterProps } from 'src/components/sections/Newsletter'
+
 import Section from '../Section'
 import styles from './section.module.scss'
 

package/src/components/sections/Navbar/DefaultComponents.ts

@@ -0,0 +1,27 @@
+import {
+  Navbar as UINavbar,
+  NavbarLinks as UINavbarLinks,
+  NavbarLinksList as UINavbarLinksList,
+  NavbarSlider as UINavbarSlider,
+  NavbarSliderHeader as UINavbarSliderHeader,
+  NavbarSliderContent as UINavbarSliderContent,
+  NavbarSliderFooter as UINavbarSliderFooter,
+  NavbarHeader as UINavbarHeader,
+  NavbarRow as UINavbarRow,
+  NavbarButtons as UINavbarButtons,
+  IconButton as UIIconButton,
+} from '@faststore/ui'
+
+export const NavbarDefaultComponents = {
+  Navbar: UINavbar,
+  NavbarLinks: UINavbarLinks,
+  NavbarLinksList: UINavbarLinksList,
+  NavbarSlider: UINavbarSlider,
+  NavbarSliderHeader: UINavbarSliderHeader,
+  NavbarSliderContent: UINavbarSliderContent,
+  NavbarSliderFooter: UINavbarSliderFooter,
+  NavbarHeader: UINavbarHeader,
+  NavbarRow: UINavbarRow,
+  NavbarButtons: UINavbarButtons,
+  IconButton: UIIconButton,
+} as const

package/src/components/sections/Navbar/OverriddenDefaultNavbar.ts

@@ -0,0 +1,12 @@
+import { override } from 'src/customizations/src/components/overrides/Navbar'
+import { getOverriddenSection } from 'src/sdk/overrides/getOverriddenSection'
+import type { SectionOverrideDefinition } from 'src/typings/overridesDefinition'
+
+/**
+ * This component exists to support overrides 1.0
+ *
+ * This allows users to override the default Navbar section present in the Headless CMS
+ */
+export const OverriddenDefaultNavbar = getOverriddenSection(
+  override as SectionOverrideDefinition<'Navbar'>
+)

package/src/components/sections/Newsletter/DefaultComponents.ts

@@ -0,0 +1,25 @@
+import {
+  Button as UIButton,
+  InputField as UIInputField,
+  Icon as UIIcon,
+  Newsletter as UINewsletter,
+  NewsletterContent as UINewsletterContent,
+  NewsletterForm as UINewsletterForm,
+  NewsletterHeader as UINewsletterHeader,
+} from '@faststore/ui'
+
+import { NewsletterAddendum as UINewsletterAddendum } from 'src/components/ui/Newsletter'
+
+export const NewsletterDefaultComponents = {
+  Button: UIButton,
+  HeaderIcon: UIIcon,
+  InputFieldEmail: UIInputField,
+  InputFieldName: UIInputField,
+  Newsletter: UINewsletter,
+  NewsletterAddendum: UINewsletterAddendum,
+  NewsletterContent: UINewsletterContent,
+  NewsletterForm: UINewsletterForm,
+  NewsletterHeader: UINewsletterHeader,
+  ToastIconError: UIIcon,
+  ToastIconSuccess: UIIcon,
+} as const

package/src/components/sections/Newsletter/Newsletter.tsx

@@ -1,7 +1,6 @@
 import {
   NewsletterProps as UINewsletterProps,
   NewsletterAddendumProps as UINewsletterAddendumProps,
-  NewsletterFormProps as UINewsletterFormProps,
   NewsletterHeaderProps as UINewsletterHeaderProps,
 } from '@faststore/ui'
 
@@ -74,7 +73,7 @@ export interface NewsletterProps {
   toastSubscribeError?: SubscribeMessage
 }
 
-const Newsletter = function Newsletter({
+function Newsletter({
   icon,
   title,
   description,

package/src/components/sections/Newsletter/OverriddenDefaultNewsletter.ts

@@ -0,0 +1,12 @@
+import { override } from 'src/customizations/src/components/overrides/Newsletter'
+import { getOverriddenSection } from 'src/sdk/overrides/getOverriddenSection'
+import type { SectionOverrideDefinition } from 'src/typings/overridesDefinition'
+
+/**
+ * This component exists to support overrides 1.0
+ *
+ * This allows users to override the default Newsletter section present in the Headless CMS
+ */
+export const OverriddenDefaultNewsletter = getOverriddenSection(
+  override as SectionOverrideDefinition<'Newsletter'>
+)

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

@@ -4,12 +4,12 @@ import type { Locator } from '@vtex/client-cms'
 
 import MissingContentError from 'src/sdk/error/MissingContentError/MissingContentError'
 import RenderSections from 'src/components/cms/RenderSections'
+import { OverriddenDefaultBannerText as BannerText } from 'src/components/sections/BannerText/OverriddenDefaultBannerText'
 import { OverriddenDefaultHero as Hero } from 'src/components/sections/Hero/OverriddenDefaultHero'
-import Incentives from 'src/components/sections/Incentives'
+import { OverriddenDefaultNewsletter as Newsletter } from 'src/components/sections/Newsletter/OverriddenDefaultNewsletter'
 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 { OverriddenDefaultBannerText as BannerText } from 'src/components/sections/BannerText/OverriddenDefaultBannerText'
-import Newsletter from 'src/components/sections/Newsletter'
 import { getPage } from 'src/server/cms'
 import type { PageContentType } from 'src/server/cms'
 import CUSTOM_COMPONENTS from 'src/customizations/src/components'

package/src/components/ui/Newsletter/Newsletter.tsx

@@ -5,21 +5,9 @@ import { useUI } from '@faststore/ui'
 import type { InputFieldProps } from '@faststore/ui'
 
 import { useNewsletter } from 'src/sdk/newsletter/useNewsletter'
+import { useOverrideComponents } from 'src/sdk/overrides/OverrideContext'
 
 import type { NewsletterProps as SectionNewsletterProps } from 'src/components/sections/Newsletter'
-import {
-  Newsletter as NewsletterWrapper,
-  NewsletterAddendum,
-  NewsletterContent,
-  NewsletterForm,
-  NewsletterHeader,
-  ToastIconSuccess,
-  ToastIconError,
-  HeaderIcon,
-  InputFieldName,
-  InputFieldEmail,
-  Button,
-} from 'src/components/sections/Newsletter/Overrides'
 
 export type NewsletterProps = SectionNewsletterProps
 
@@ -38,6 +26,20 @@ function Newsletter({
   toastSubscribeError,
   colorVariant,
 }: NewsletterProps) {
+  const {
+    Button,
+    HeaderIcon,
+    InputFieldName,
+    InputFieldEmail,
+    Newsletter: NewsletterWrapper,
+    NewsletterAddendum,
+    NewsletterContent,
+    NewsletterForm,
+    NewsletterHeader,
+    ToastIconError,
+    ToastIconSuccess,
+  } = useOverrideComponents<'Newsletter'>()
+
   const { pushToast } = useUI()
   const { subscribeUser, loading, data } = useNewsletter()
 

package/src/components/ui/Newsletter/index.ts

@@ -1,2 +1,5 @@
 export { default } from './Newsletter'
 export type { NewsletterProps } from './Newsletter'
+
+export { NewsletterAddendum } from './NewsletterAddendum'
+export type { NewsletterAddendumProps } from './NewsletterAddendum'

package/src/pages/index.tsx

@@ -6,9 +6,9 @@ import type { ComponentType } from 'react'
 import RenderSections from 'src/components/cms/RenderSections'
 import { OverriddenDefaultBannerText as BannerText } from 'src/components/sections/BannerText/OverriddenDefaultBannerText'
 import { OverriddenDefaultHero as Hero } from 'src/components/sections/Hero/OverriddenDefaultHero'
-import Incentives from 'src/components/sections/Incentives'
-import Newsletter from 'src/components/sections/Newsletter'
+import { OverriddenDefaultNewsletter as Newsletter } from 'src/components/sections/Newsletter/OverriddenDefaultNewsletter'
 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 CUSTOM_COMPONENTS from 'src/customizations/src/components'
 import { mark } from 'src/sdk/tests/mark'

package/src/sdk/overrides/sections.tsx

@@ -2,6 +2,8 @@ import Alert from '../../components/sections/Alert'
 import BannerText from '../../components/sections/BannerText'
 import Breadcrumb from '../../components/sections/Breadcrumb'
 import Hero from '../../components/sections/Hero'
+import Navbar from '../../components/sections/Navbar'
+import Newsletter from '../../components/sections/Newsletter'
 import ProductShelf from '../../components/sections/ProductShelf'
 import CrossSellingShelf from '../../components/sections/CrossSellingShelf'
 import ProductDetails from '../../components/sections/ProductDetails'
@@ -15,6 +17,8 @@ import { BannerTextDefaultComponents } from '../../components/sections/BannerTex
 import { BreadcrumbDefaultComponents } from 'src/components/sections/Breadcrumb/DefaultComponents'
 import { CrossSellingShelfDefaultComponents } from 'src/components/sections/CrossSellingShelf/DefaultComponents'
 import { HeroDefaultComponents } from '../../components/sections/Hero/DefaultComponents'
+import { NavbarDefaultComponents } from 'src/components/sections/Navbar/DefaultComponents'
+import { NewsletterDefaultComponents } from '../../components/sections/Newsletter/DefaultComponents'
 import { ProductDetailsDefaultComponents } from '../../components/sections/ProductDetails/DefaultComponents'
 import { ProductGalleryDefaultComponents } from '../../components/sections/ProductGallery/DefaultComponents'
 import { ProductShelfDefaultComponents } from '../../components/sections/ProductShelf/DefaultComponents'
@@ -26,6 +30,8 @@ export const Sections = {
   Breadcrumb,
   CrossSellingShelf,
   Hero,
+  Navbar,
+  Newsletter,
   ProductDetails,
   ProductGallery,
   ProductShelf,
@@ -43,6 +49,8 @@ export const DefaultComponents: Partial<
   Breadcrumb: BreadcrumbDefaultComponents,
   CrossSellingShelf: CrossSellingShelfDefaultComponents,
   Hero: HeroDefaultComponents,
+  Navbar: NavbarDefaultComponents,
+  Newsletter: NewsletterDefaultComponents,
   ProductDetails: ProductDetailsDefaultComponents,
   ProductGallery: ProductGalleryDefaultComponents,
   ProductShelf: ProductShelfDefaultComponents,

package/src/typings/overrides.ts

@@ -58,6 +58,8 @@ export type SupportedSectionsOverridesV2 = Pick<
   | 'Breadcrumb'
   | 'CrossSellingShelf'
   | 'Hero'
+  | 'Navbar'
+  | 'Newsletter'
   | 'ProductShelf'
   | 'ProductDetails'
   | 'ProductGallery'