@faststore/core 3.0.68 → 3.0.70

package/.turbo/turbo-build.log

@@ -57,60 +57,53 @@ This information is used to shape Next.js' roadmap and prioritize features.
 You can learn more, including how to opt-out if you'd not like to participate in this anonymous program, by visiting the following URL:
 https://nextjs.org/telemetry
 
+Browserslist: caniuse-lite is outdated. Please run:
+  npx browserslist@latest --update-db
+  Why you should do it regularly: https://github.com/browserslist/browserslist#browsers-data-updating
+   Linting and checking validity of types ...
 Browserslist: caniuse-lite is outdated. Please run:
   npx browserslist@latest --update-db
   Why you should do it regularly: https://github.com/browserslist/browserslist#browsers-data-updating
    Creating an optimized production build ...
+   Disabled SWC as replacement for Babel because of custom Babel configuration ".babelrc.js" https://nextjs.org/docs/messages/swc-disabled
+   Using external babel configuration from /home/runner/work/faststore/faststore/packages/core/.babelrc.js
 Browserslist: caniuse-lite is outdated. Please run:
   npx update-browserslist-db@latest
   Why you should do it regularly: https://github.com/browserslist/update-db#readme
  ✓ Compiled successfully
-   Linting and checking validity of types ...
-Browserslist: caniuse-lite is outdated. Please run:
-  npx browserslist@latest --update-db
-  Why you should do it regularly: https://github.com/browserslist/browserslist#browsers-data-updating
    Collecting page data ...
-   Generating static pages (0/9) ...
-
   Generating static pages (2/9) 
+   Generating static pages (0/7) ...
+
   Generating static pages (1/7) 
 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/9) 
-
   Generating static pages (6/9) 
-
 ✓ Generating static pages (9/9) 
+
   Generating static pages (3/7) 
+
   Generating static pages (5/7) 
+
 ✓ Generating static pages (7/7) 
    Finalizing page optimization ...
    Collecting build traces ...
 
-Route (app)                                Size     First Load JS
-┌ ○ /_not-found                            876 B            83 kB
-└ ○ /fs-next-update                        138 B          82.2 kB
-+ First Load JS shared by all              82.1 kB
-  ├ chunks/472-369461a1f39981d5.js         28.4 kB
-  ├ chunks/fd9d1056-43c43818840d7811.js    51.1 kB
-  ├ chunks/main-app-e13fa67c2c3ceca5.js    230 B
-  └ chunks/webpack-240d066e53315260.js     2.43 kB
-
 Route (pages)                              Size     First Load JS
-┌ ● /                                      1.04 kB         148 kB
-├   └ css/fa6d43e3c11a59dc.css             755 B
-├   /_app                                  0 B            93.8 kB
-├ ● /[...slug]                             2.65 kB         160 kB
-├   └ css/3eed8d7ed5000eb8.css             2.4 kB
-├ ● /[slug]/p                              10.9 kB         158 kB
-├   └ css/65f6dd6d16812461.css             9.49 kB
-├ ○ /404                                   1.17 kB         131 kB
-├ ● /500                                   1.17 kB         131 kB
-├ ● /account                               447 B           130 kB
-├ λ /api/graphql                           0 B            93.8 kB
-├ λ /api/health/live                       0 B            93.8 kB
-├ λ /api/health/ready                      0 B            93.8 kB
-├ λ /api/preview                           0 B            93.8 kB
-├ ● /checkout                              432 B           130 kB
-├ ● /login                                 1.29 kB         131 kB
-└ ● /s                                     1.22 kB         159 kB
-+ First Load JS shared by all              96.9 kB
-  ├ chunks/framework-21e9365486ba23a6.js   45.4 kB
-  ├ chunks/main-9c9c62c368c0a47e.js        34.8 kB
-  ├ chunks/pages/_app-67b609ce322eae5f.js  11.2 kB
-  ├ chunks/webpack-240d066e53315260.js     2.43 kB
+┌ ● /                                      1.26 kB         143 kB
+├   └ css/197e314c5a03eabd.css             740 B
+├   /_app                                  0 B            93.4 kB
+├ ● /[...slug]                             2.79 kB         156 kB
+├   └ css/e47f1a002bdcf76f.css             2.38 kB
+├ ● /[slug]/p                              10.9 kB         153 kB
+├   └ css/455d52db23e9236a.css             9.47 kB
+├ ○ /404                                   1.45 kB         127 kB
+├ ● /500                                   1.45 kB         127 kB
+├ ● /account                               676 B           126 kB
+├ λ /api/graphql                           0 B            93.4 kB
+├ λ /api/health/live                       0 B            93.4 kB
+├ λ /api/health/ready                      0 B            93.4 kB
+├ λ /api/preview                           0 B            93.4 kB
+├ ● /checkout                              662 B           126 kB
+├ ● /login                                 1.57 kB         127 kB
+└ ● /s                                     2.25 kB         155 kB
++ 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-c25fabc2435c8961.js  12.6 kB
+  ├ chunks/webpack-fdd195abd12b3685.js     2.45 kB
   └ css/5d1f64b61ea581f4.css               3.05 kB
 
 λ  (Server)  server-side renders at runtime (uses getInitialProps or getServerSideProps)

package/.turbo/turbo-test.log

@@ -1,10 +1,10 @@
 $ jest
-PASS test/utils/multipleTemplates.test.ts (31.947 s)
-PASS test/server/cms/index.test.ts (32.528 s)
-PASS test/server/index.test.ts (33.753 s)
+PASS test/server/cms/index.test.ts (30.313 s)
+PASS test/utils/multipleTemplates.test.ts (30.717 s)
+PASS test/server/index.test.ts (32.94 s)
 
 Test Suites: 3 passed, 3 total
 Tests:       19 passed, 19 total
 Snapshots:   0 total
-Time:        34.797 s
+Time:        33.945 s
 Ran all test suites.

package/@generated/gql.ts

@@ -44,7 +44,7 @@ const documents = {
     types.SubscribeToNewsletterDocument,
   '\n  query ClientManyProductsQuery(\n    $first: Int!\n    $after: String\n    $sort: StoreSort!\n    $term: String!\n    $selectedFacets: [IStoreSelectedFacet!]!\n  ) {\n    ...ClientManyProducts\n    search(\n      first: $first\n      after: $after\n      sort: $sort\n      term: $term\n      selectedFacets: $selectedFacets\n    ) {\n      products {\n        pageInfo {\n          totalCount\n        }\n        edges {\n          node {\n            ...ProductSummary_product\n          }\n        }\n      }\n    }\n  }\n':
     types.ClientManyProductsQueryDocument,
-  '\n  query ClientProductGalleryQuery(\n    $first: Int!\n    $after: String!\n    $sort: StoreSort!\n    $term: String!\n    $selectedFacets: [IStoreSelectedFacet!]!\n  ) {\n    ...ClientProductGallery\n    search(\n      first: $first\n      after: $after\n      sort: $sort\n      term: $term\n      selectedFacets: $selectedFacets\n    ) {\n      products {\n        pageInfo {\n          totalCount\n        }\n      }\n      facets {\n        ...Filter_facets\n      }\n      metadata {\n        ...SearchEvent_metadata\n      }\n    }\n  }\n':
+  '\n  query ClientProductGalleryQuery(\n    $first: Int!\n    $after: String!\n    $sort: StoreSort!\n    $term: String!\n    $selectedFacets: [IStoreSelectedFacet!]!\n  ) {\n    ...ClientProductGallery\n    redirect(term: $term, selectedFacets: $selectedFacets) {\n      url\n    }\n    search(\n      first: $first\n      after: $after\n      sort: $sort\n      term: $term\n      selectedFacets: $selectedFacets\n    ) {\n      products {\n        pageInfo {\n          totalCount\n        }\n      }\n      facets {\n        ...Filter_facets\n      }\n      metadata {\n        ...SearchEvent_metadata\n      }\n    }\n  }\n':
     types.ClientProductGalleryQueryDocument,
   '\n  fragment SearchEvent_metadata on SearchMetadata {\n    isTermMisspelled\n    logicalOperator\n    fuzzy\n  }\n':
     types.SearchEvent_MetadataFragmentDoc,
@@ -160,7 +160,7 @@ export function gql(
  * The gql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
 export function gql(
-  source: '\n  query ClientProductGalleryQuery(\n    $first: Int!\n    $after: String!\n    $sort: StoreSort!\n    $term: String!\n    $selectedFacets: [IStoreSelectedFacet!]!\n  ) {\n    ...ClientProductGallery\n    search(\n      first: $first\n      after: $after\n      sort: $sort\n      term: $term\n      selectedFacets: $selectedFacets\n    ) {\n      products {\n        pageInfo {\n          totalCount\n        }\n      }\n      facets {\n        ...Filter_facets\n      }\n      metadata {\n        ...SearchEvent_metadata\n      }\n    }\n  }\n'
+  source: '\n  query ClientProductGalleryQuery(\n    $first: Int!\n    $after: String!\n    $sort: StoreSort!\n    $term: String!\n    $selectedFacets: [IStoreSelectedFacet!]!\n  ) {\n    ...ClientProductGallery\n    redirect(term: $term, selectedFacets: $selectedFacets) {\n      url\n    }\n    search(\n      first: $first\n      after: $after\n      sort: $sort\n      term: $term\n      selectedFacets: $selectedFacets\n    ) {\n      products {\n        pageInfo {\n          totalCount\n        }\n      }\n      facets {\n        ...Filter_facets\n      }\n      metadata {\n        ...SearchEvent_metadata\n      }\n    }\n  }\n'
 ): typeof import('./graphql').ClientProductGalleryQueryDocument
 /**
  * The gql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.

package/@generated/graphql.ts

@@ -1430,6 +1430,7 @@ export type ClientProductGalleryQueryQueryVariables = Exact<{
 }>
 
 export type ClientProductGalleryQueryQuery = {
+  redirect: { url: string | null } | null
   search: {
     products: { pageInfo: { totalCount: number } }
     facets: Array<
@@ -2039,7 +2040,7 @@ export const ClientManyProductsQueryDocument = {
 export const ClientProductGalleryQueryDocument = {
   __meta__: {
     operationName: 'ClientProductGalleryQuery',
-    operationHash: '054742a6e1a39f1e09237dcec956879d964f3f20',
+    operationHash: 'bfc40da32b60f9404a4adb96b0856e3fbb04b076',
   },
 } as unknown as TypedDocumentString<
   ClientProductGalleryQueryQuery,

package/@generated/persisted-documents.json

@@ -4,7 +4,7 @@
   "534fae829675533052d75fd4aa509b9cf85b4d40": "fragment CartItem on StoreOffer { itemOffered { ...CartProductItem } listPrice price quantity seller { identifier } } fragment CartMessage on StoreCartMessage { status text } fragment CartProductItem on StoreProduct { additionalProperty { name propertyID value valueReference } brand { name } gtin image { alternateName url } isVariantOf { name productGroupID skuVariants { activeVariations availableVariations slugsMap } } name sku unitMultiplier } mutation ValidateCartMutation($cart: IStoreCart!, $session: IStoreSession!) { validateCart(cart: $cart, session: $session) { messages { ...CartMessage } order { acceptedOffer { ...CartItem } orderNumber } } }",
   "feb7005103a859e2bc8cf2360d568806fd88deba": "mutation SubscribeToNewsletter($data: IPersonNewsletter!) { subscribeToNewsletter(data: $data) { id } }",
   "c0d7d2ae1d5aaae5d50eea683b389377c36fb57d": "fragment ClientManyProducts on Query { search( first: $first after: $after sort: $sort term: $term selectedFacets: $selectedFacets ) { products { pageInfo { totalCount } } } } fragment ProductSummary_product on StoreProduct { additionalProperty { name propertyID value valueReference } brand { brandName: name } brand { name } gtin image { alternateName url } isVariantOf { name productGroupID } name offers { lowPrice offers { availability listPrice price quantity seller { identifier } } } id: productID sku slug } query ClientManyProductsQuery($after: String, $first: Int!, $selectedFacets: [IStoreSelectedFacet!]!, $sort: StoreSort!, $term: String!) { search( first: $first after: $after sort: $sort term: $term selectedFacets: $selectedFacets ) { products { edges { node { ...ProductSummary_product } } pageInfo { totalCount } } } ...ClientManyProducts }",
-  "054742a6e1a39f1e09237dcec956879d964f3f20": "fragment ClientProductGallery on Query { search( first: $first after: $after sort: $sort term: $term selectedFacets: $selectedFacets ) { products { pageInfo { totalCount } } } } fragment Filter_facets on StoreFacet { ... on StoreFacetBoolean { __typename key label values { label quantity selected value } } ... on StoreFacetRange { __typename key label max { absolute selected } min { absolute selected } } } fragment SearchEvent_metadata on SearchMetadata { fuzzy isTermMisspelled logicalOperator } query ClientProductGalleryQuery($after: String!, $first: Int!, $selectedFacets: [IStoreSelectedFacet!]!, $sort: StoreSort!, $term: String!) { search( first: $first after: $after sort: $sort term: $term selectedFacets: $selectedFacets ) { facets { ...Filter_facets } metadata { ...SearchEvent_metadata } products { pageInfo { totalCount } } } ...ClientProductGallery }",
+  "bfc40da32b60f9404a4adb96b0856e3fbb04b076": "fragment ClientProductGallery on Query { search( first: $first after: $after sort: $sort term: $term selectedFacets: $selectedFacets ) { products { pageInfo { totalCount } } } } fragment Filter_facets on StoreFacet { ... on StoreFacetBoolean { __typename key label values { label quantity selected value } } ... on StoreFacetRange { __typename key label max { absolute selected } min { absolute selected } } } fragment SearchEvent_metadata on SearchMetadata { fuzzy isTermMisspelled logicalOperator } query ClientProductGalleryQuery($after: String!, $first: Int!, $selectedFacets: [IStoreSelectedFacet!]!, $sort: StoreSort!, $term: String!) { redirect(term: $term, selectedFacets: $selectedFacets) { url } search( first: $first after: $after sort: $sort term: $term selectedFacets: $selectedFacets ) { facets { ...Filter_facets } metadata { ...SearchEvent_metadata } products { pageInfo { totalCount } } } ...ClientProductGallery }",
   "cedeb0c3e7ec1678400fe2ae930f5a79382fba1e": "fragment CartProductItem on StoreProduct { additionalProperty { name propertyID value valueReference } brand { name } gtin image { alternateName url } isVariantOf { name productGroupID skuVariants { activeVariations availableVariations slugsMap } } name sku unitMultiplier } fragment ClientProduct on Query { product(locator: $locator) { id: productID } } fragment ProductDetailsFragment_product on StoreProduct { additionalProperty { name propertyID value valueReference } brand { name } description gtin image { alternateName url } isVariantOf { name productGroupID skuVariants { activeVariations availableVariations slugsMap } } name offers { lowPrice offers { availability listPrice price seller { identifier } } } id: productID sku unitMultiplier ...CartProductItem } query ClientProductQuery($locator: [IStoreSelectedFacet!]!) { product(locator: $locator) { ...ProductDetailsFragment_product } ...ClientProduct }",
   "a8a27661f6a032e086c047339e0d0f180f0e0161": "fragment ClientSearchSuggestions on Query { search(first: 5, term: $term, selectedFacets: $selectedFacets) { suggestions { terms { value } } } } fragment ProductSummary_product on StoreProduct { additionalProperty { name propertyID value valueReference } brand { brandName: name } brand { name } gtin image { alternateName url } isVariantOf { name productGroupID } name offers { lowPrice offers { availability listPrice price quantity seller { identifier } } } id: productID sku slug } fragment SearchEvent_metadata on SearchMetadata { fuzzy isTermMisspelled logicalOperator } query ClientSearchSuggestionsQuery($selectedFacets: [IStoreSelectedFacet!], $term: String!) { search(first: 5, term: $term, selectedFacets: $selectedFacets) { metadata { ...SearchEvent_metadata } products { pageInfo { totalCount } } suggestions { products { ...ProductSummary_product } terms { value } } } ...ClientSearchSuggestions }",
   "e2385b0f11726d0068f96548f57a8dd441c064e3": "fragment ClientTopSearchSuggestions on Query { search(first: 5, term: $term, selectedFacets: $selectedFacets) { suggestions { terms { value } } } } query ClientTopSearchSuggestionsQuery($selectedFacets: [IStoreSelectedFacet!], $term: String!) { search(first: 5, term: $term, selectedFacets: $selectedFacets) { suggestions { terms { value } } } ...ClientTopSearchSuggestions }",

package/README.md

@@ -43,6 +43,7 @@ A quick look at the top-level files and directories you'll see in a this NextJS
     ├── public
     ├── src
     ├── test
+    ├── .babelrc.js
     ├── .editorconfig
     ├── .prettierignore
     ├── .prettierrrc

package/next-env.d.ts

@@ -1,6 +1,5 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
-/// <reference types="next/navigation-types/compat/navigation" />
 
 // NOTE: This file should not be edited
 // see https://nextjs.org/docs/basic-features/typescript for more information.

package/next.config.js

@@ -1,7 +1,6 @@
 // @ts-check
 const path = require('path')
 const storeConfig = require('./faststore.config')
-const webpack = require('webpack')
 
 /**
  * @type {import('next').NextConfig}
@@ -41,16 +40,6 @@ const nextConfig = {
         }
       })
 
-    // Make css order works as expected in Next 13. See https://github.com/vercel/next.js/issues/51030#issuecomment-2005254907
-    config.plugins.push(
-      new webpack.BannerPlugin({
-        banner: '@layer base, components, theme;',
-        test: /\.css$/,
-        raw: true,
-        entryOnly: false,
-      })
-    )
-
     // Reduce the number of chunks so we ship a smaller first bundle.
     // This should help reducing TBT
     if (!isServer && !dev && config.optimization?.splitChunks) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faststore/core",
-  "version": "3.0.68",
+  "version": "3.0.70",
   "license": "MIT",
   "repository": "vtex/faststore",
   "browserslist": "supports es6-module and not dead",
@@ -129,5 +129,5 @@
     "node": "18.19.0",
     "yarn": "1.19.1"
   },
-  "gitHead": "d12b653cdc379d4449666b2a405922c1b27c372d"
+  "gitHead": "09cdd6fbdeacc796d24738e232d660153dade68d"
 }

package/src/components/cart/CartItem/CartItem.tsx

@@ -1,8 +1,3 @@
-import type {
-  AddToCartEvent,
-  CurrencyCode,
-  RemoveFromCartEvent,
-} from '@faststore/sdk'
 import { sendAnalyticsEvent } from '@faststore/sdk'
 import {
   CartItem as UICartItem,
@@ -10,14 +5,19 @@ import {
   CartItemSummary as UICartItemSummary,
 } from '@faststore/ui'
 import { useCallback, useMemo } from 'react'
+import type {
+  AddToCartEvent,
+  CurrencyCode,
+  RemoveFromCartEvent,
+} from '@faststore/sdk'
 
-import type { AnalyticsItem } from 'app/sdk/analytics/types'
 import { Image } from 'src/components/ui/Image'
-import type { CartItem as ICartItem } from 'src/sdk/cart'
 import { cartStore } from 'src/sdk/cart'
-import { useRemoveButton } from 'src/sdk/cart/useRemoveButton'
 import { useFormattedPrice } from 'src/sdk/product/useFormattedPrice'
 import { useSession } from 'src/sdk/session'
+import { useRemoveButton } from 'src/sdk/cart/useRemoveButton'
+import type { CartItem as ICartItem } from 'src/sdk/cart'
+import type { AnalyticsItem } from 'src/sdk/analytics/types'
 
 function useCartItemEvent() {
   const {

package/src/components/sections/ProductDetails/ProductDetails.tsx

@@ -1,10 +1,10 @@
-import { useEffect, useMemo, useState } from 'react'
+import { useEffect, useState, useMemo } from 'react'
 
 import type { CurrencyCode, ViewItemEvent } from '@faststore/sdk'
 import { sendAnalyticsEvent } from '@faststore/sdk'
 
 import { gql } from '@generated'
-import type { AnalyticsItem } from 'app/sdk/analytics/types'
+import type { AnalyticsItem } from 'src/sdk/analytics/types'
 import { useFormattedPrice } from 'src/sdk/product/useFormattedPrice'
 import { useSession } from 'src/sdk/session'
 
@@ -12,10 +12,10 @@ import Section from '../Section'
 
 import styles from './section.module.scss'
 
-import { useOverrideComponents } from '../../../sdk/overrides/OverrideContext'
 import { usePDP } from '../../../sdk/overrides/PageProvider'
-import { getOverridableSection } from '../../../sdk/overrides/getOverriddenSection'
+import { useOverrideComponents } from '../../../sdk/overrides/OverrideContext'
 import { ProductDetailsDefaultComponents } from './DefaultComponents'
+import { getOverridableSection } from '../../../sdk/overrides/getOverriddenSection'
 
 export interface ProductDetailsProps {
   productTitle: {

package/src/components/sections/ProductTiles/ProductTiles.tsx

@@ -2,10 +2,10 @@ import { useEffect, useRef } from 'react'
 import { useInView } from 'react-intersection-observer'
 
 import type { ClientManyProductsQueryQueryVariables } from '@generated/graphql'
-import { useViewItemListEvent } from 'app/sdk/analytics/hooks/useViewItemListEvent'
 import ProductCard from 'src/components/product/ProductCard'
 import ProductTilesSkeleton from 'src/components/skeletons/ProductTilesSkeleton'
 import Tiles, { Tile } from 'src/components/ui/Tiles'
+import { useViewItemListEvent } from 'src/sdk/analytics/hooks/useViewItemListEvent'
 import { useProductsQuery } from 'src/sdk/product/useProductsQuery'
 
 import Section from '../Section'

package/src/components/templates/SearchPage/SearchPage.tsx

@@ -1,4 +1,3 @@
-import { useSearch } from '@faststore/sdk'
 import type { ComponentType } from 'react'
 
 import RenderSections from 'src/components/cms/RenderSections'
@@ -10,7 +9,6 @@ import { OverriddenDefaultNewsletter as Newsletter } from 'src/components/sectio
 import { OverriddenDefaultProductGallery as ProductGallery } from 'src/components/sections/ProductGallery/OverriddenDefaultProductGallery'
 import { OverriddenDefaultProductShelf as ProductShelf } from 'src/components/sections/ProductShelf/OverriddenDefaultProductShelf'
 import ProductTiles from 'src/components/sections/ProductTiles'
-import { ITEMS_PER_PAGE } from 'src/constants'
 import CUSTOM_COMPONENTS from 'src/customizations/src/components'
 import { SearchPageContextType } from 'src/pages/s'
 import PageProvider, { SearchPageContext } from 'src/sdk/overrides/PageProvider'
@@ -18,8 +16,8 @@ import {
   useCreateUseGalleryPage,
   UseGalleryPageContext,
 } from 'src/sdk/product/usePageProductsQuery'
-import { useProductGalleryQuery } from 'src/sdk/product/useProductGalleryQuery'
 import { SearchContentType } from 'src/server/cms'
+import type { ClientProductGalleryQueryQuery as ClientProductGalleryQuery } from '@generated/graphql'
 
 /**
  * Sections: Components imported from each store's custom components and '../components/sections' only.
@@ -38,32 +36,16 @@ const COMPONENTS: Record<string, ComponentType<any>> = {
 }
 
 export type SearchPageProps = {
-  data: SearchPageContextType
+  data: SearchPageContextType & ClientProductGalleryQuery
   page: SearchContentType
 }
 
-function SearchPage({
-  page: { sections, settings },
-  data: server,
-}: SearchPageProps) {
-  const {
-    state: { sort, term, selectedFacets },
-  } = useSearch()
-  const itemsPerPage = settings?.productGallery?.itemsPerPage ?? ITEMS_PER_PAGE
-
-  const { data: pageProductGalleryData } = useProductGalleryQuery({
-    term,
-    sort,
-    selectedFacets,
-    itemsPerPage,
-  })
-
+function SearchPage({ page: { sections }, data: serverData }: SearchPageProps) {
   const { pages, useGalleryPage } = useCreateUseGalleryPage()
 
   const context = {
     data: {
-      ...server,
-      ...pageProductGalleryData,
+      ...serverData,
       pages,
     },
   } as SearchPageContext

package/src/components/templates/SearchPage/SearchWrapper.tsx

@@ -0,0 +1,68 @@
+import { useRouter } from 'next/router'
+import { useSearch } from '@faststore/sdk'
+
+import type { SearchContentType } from 'src/server/cms'
+import type { SearchPageContextType } from 'src/pages/s'
+import { useProductGalleryQuery } from 'src/sdk/product/useProductGalleryQuery'
+import Section from 'src/components/sections/Section'
+import EmptyState from 'src/components/sections/EmptyState'
+import ProductGalleryStyles from 'src/components/sections/ProductGallery/section.module.scss'
+
+import SearchPage from './SearchPage'
+
+function EmptySearch() {
+  return (
+    <Section
+      className={`${ProductGalleryStyles.section} section-product-gallery`}
+    >
+      <section data-testid="product-gallery" data-fs-product-listing>
+        <EmptyState title="" showLoader />
+      </section>
+    </Section>
+  )
+}
+
+export type SearchWrapperProps = {
+  itemsPerPage: number
+  searchContentType: SearchContentType
+  serverData: SearchPageContextType
+}
+
+export default function SearchWrapper({
+  itemsPerPage,
+  searchContentType,
+  serverData,
+}: SearchWrapperProps) {
+  const router = useRouter()
+  const {
+    state: { term, sort, selectedFacets },
+  } = useSearch()
+  const { data: pageProductGalleryData, isValidating } = useProductGalleryQuery(
+    {
+      term,
+      sort,
+      itemsPerPage,
+      selectedFacets,
+    }
+  )
+
+  if (isValidating || !pageProductGalleryData) {
+    return <EmptySearch />
+  }
+
+  // Redirect when there are registered Intelligent Search redirects on VTEX Admin
+  if (pageProductGalleryData?.redirect?.url) {
+    router.replace(pageProductGalleryData?.redirect?.url, null, {
+      shallow: true,
+    })
+
+    return <EmptySearch />
+  }
+
+  return (
+    <SearchPage
+      page={searchContentType}
+      data={{ ...serverData, ...pageProductGalleryData }}
+    />
+  )
+}

package/src/components/templates/SearchPage/index.ts

@@ -1,2 +1,5 @@
 export { default } from './SearchPage'
 export type { SearchPageProps } from './SearchPage'
+
+export { default as SearchWrapper } from './SearchWrapper'
+export type { SearchWrapperProps } from './SearchWrapper'

package/src/components/ui/ProductShelf/ProductShelf.tsx

@@ -1,7 +1,7 @@
 import { useEffect, useId, useRef } from 'react'
 
-import { useViewItemListEvent } from 'app/sdk/analytics/hooks/useViewItemListEvent'
 import ProductShelfSkeleton from 'src/components/skeletons/ProductShelfSkeleton'
+import { useViewItemListEvent } from 'src/sdk/analytics/hooks/useViewItemListEvent'
 import { useOverrideComponents } from 'src/sdk/overrides/OverrideContext'
 import { useProductsQuery } from 'src/sdk/product/useProductsQuery'
 import { textToKebabCase } from 'src/utils/utilities'

package/src/pages/_app.tsx

@@ -7,9 +7,9 @@ import type { AppProps } from 'next/app'
 import NextNProgress from 'nextjs-progressbar'
 
 import { UIProvider } from '@faststore/ui'
-import AnalyticsHandler from 'app/sdk/analytics'
-import ErrorBoundary from 'app/sdk/error/ErrorBoundary'
 import Layout from 'src/Layout'
+import AnalyticsHandler from 'src/sdk/analytics'
+import ErrorBoundary from 'src/sdk/error/ErrorBoundary'
 
 import storeConfig from '../../faststore.config'
 

package/src/pages/_document.tsx

@@ -1,6 +1,6 @@
 import { Head, Html, Main, NextScript } from 'next/document'
 
-import ThirdPartyScripts from 'app/components/ThirdPartyScripts'
+import ThirdPartyScripts from 'src/components/ThirdPartyScripts'
 import { WebFonts } from 'src/customizations/src/GlobalOverrides'
 
 function Document() {

package/src/pages/s.tsx

@@ -1,3 +1,8 @@
+import { useMemo } from 'react'
+import { NextSeo } from 'next-seo'
+import { useRouter } from 'next/router'
+import type { GetStaticProps } from 'next'
+
 import type { SearchState } from '@faststore/sdk'
 import {
   formatSearchState,
@@ -5,9 +10,6 @@ import {
   SearchProvider,
 } from '@faststore/sdk'
 import { SROnly as UISROnly } from '@faststore/ui'
-import { NextSeo } from 'next-seo'
-import { useRouter } from 'next/router'
-import { useMemo } from 'react'
 
 import { ITEMS_PER_PAGE } from 'src/constants'
 import { useApplySearchState } from 'src/sdk/search/state'
@@ -15,12 +17,11 @@ import { mark } from 'src/sdk/tests/mark'
 
 import { Locator } from '@vtex/client-cms'
 import storeConfig from 'faststore.config'
-import { GetStaticProps } from 'next'
 import GlobalSections, {
   getGlobalSectionsData,
   GlobalSectionsData,
 } from 'src/components/cms/GlobalSections'
-import SearchPage from 'src/components/templates/SearchPage/SearchPage'
+import { SearchWrapper } from 'src/components/templates/SearchPage'
 import { getPage, SearchContentType } from 'src/server/cms'
 
 type Props = {
@@ -33,11 +34,11 @@ export interface SearchPageContextType {
   searchTerm?: string
 }
 
-type UseSearchParams = {
+const useSearchParams = ({
+  sort: defaultSort,
+}: {
   sort: SearchState['sort']
-}
-
-const useSearchParams = ({ sort: defaultSort }: UseSearchParams) => {
+}) => {
   const { asPath } = useRouter()
 
   return useMemo(() => {
@@ -56,24 +57,19 @@ const useSearchParams = ({ sort: defaultSort }: UseSearchParams) => {
 
 function Page({ page: searchContentType, globalSections }: Props) {
   const { settings } = searchContentType
+  const applySearchState = useApplySearchState()
   const searchParams = useSearchParams({
     sort: settings?.productGallery?.sortBySelection as SearchState['sort'],
   })
-  const applySearchState = useApplySearchState()
+
   const title = 'Search Results'
   const { description, titleTemplate } = storeConfig.seo
-
   const itemsPerPage = settings?.productGallery?.itemsPerPage ?? ITEMS_PER_PAGE
 
   if (!searchParams) {
     return null
   }
 
-  const server = {
-    title,
-    searchTerm: searchParams.term ?? undefined,
-  } as SearchPageContextType
-
   return (
     <GlobalSections {...globalSections}>
       <SearchProvider
@@ -107,7 +103,14 @@ function Page({ page: searchContentType, globalSections }: Props) {
           If needed, wrap your component in a <Section /> component
           (not the HTML tag) before rendering it here.
         */}
-        <SearchPage page={searchContentType} data={server}></SearchPage>
+        <SearchWrapper
+          itemsPerPage={itemsPerPage}
+          searchContentType={searchContentType}
+          serverData={{
+            title,
+            searchTerm: searchParams.term ?? undefined,
+          }}
+        />
       </SearchProvider>
     </GlobalSections>
   )

package/{app → src}/sdk/analytics/index.tsx

@@ -1,5 +1,3 @@
-'use client'
-
 import type { AnalyticsEvent } from '@faststore/sdk'
 import { useAnalyticsEvent } from '@faststore/sdk'
 

package/src/sdk/cart/useBuyButton.ts

@@ -1,12 +1,12 @@
-import type { AddToCartEvent, CurrencyCode } from '@faststore/sdk'
 import { sendAnalyticsEvent } from '@faststore/sdk'
 import { useCallback } from 'react'
+import type { CurrencyCode, AddToCartEvent } from '@faststore/sdk'
 
-import type { AnalyticsItem } from 'app/sdk/analytics/types'
+import type { AnalyticsItem } from 'src/sdk/analytics/types'
 import type { CartItem } from 'src/sdk/cart'
 
-import { useUI } from '@faststore/ui'
 import { useSession } from '../session'
+import { useUI } from '@faststore/ui'
 import { cartStore } from './index'
 
 export const useBuyButton = (item: CartItem | null) => {

package/src/sdk/cart/useRemoveButton.ts

@@ -1,12 +1,12 @@
-import type { CurrencyCode, RemoveFromCartEvent } from '@faststore/sdk'
 import { sendAnalyticsEvent } from '@faststore/sdk'
 import { useCallback } from 'react'
+import type { CurrencyCode, RemoveFromCartEvent } from '@faststore/sdk'
 
-import type { AnalyticsItem } from 'app/sdk/analytics/types'
+import type { AnalyticsItem } from 'src/sdk/analytics/types'
 
-import type { CartItem } from '.'
 import { useSession } from '../session'
 import { cartStore } from './index'
+import type { CartItem } from '.'
 
 export const useRemoveButton = (item: CartItem | null) => {
   const {

package/{app → src}/sdk/error/ErrorBoundary/ErrorBoundary.tsx

@@ -1,5 +1,3 @@
-'use client'
-
 import { Component } from 'react'
 import type { ErrorInfo, ReactNode } from 'react'