Merge branch 'feat/next-13' into feat/next-metadata-SFS-815

vtex · Sep 11, 2024 · 8eee614 · 8eee614
2 parents 36d8d69 + 33581c1
commit 8eee614
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 6 deletions.
diff --git a/...ons/BannerNewsletter/BannerNewsletter.tsx → ...ons/BannerNewsletter/BannerNewsletter.tsx b/...ons/BannerNewsletter/BannerNewsletter.tsx → ...ons/BannerNewsletter/BannerNewsletter.tsx
@@ -6,7 +6,7 @@ import { OverriddenDefaultBannerText as BannerText } from 'app/components/sectio
 import type { NewsletterProps } from 'app/components/sections/Newsletter'
 import { OverriddenDefaultNewsletter as Newsletter } from 'app/components/sections/Newsletter/OverriddenDefaultNewsletter'
 
-import Section from '../Section'
+import Section from 'src/components/sections/Section'
 import styles from './section.module.scss'
 
 function BannerNewsletter({

diff --git a/...ions/BannerNewsletter/section.module.scss → ...ions/BannerNewsletter/section.module.scss b/...ions/BannerNewsletter/section.module.scss → ...ions/BannerNewsletter/section.module.scss
diff --git a/packages/core/app/fs-next-update/page.tsx b/packages/core/app/fs-next-update/page.tsx
@@ -7,6 +7,7 @@ import { OverriddenDefaultBannerText as BannerText } from 'app/components/sectio
 import { OverriddenDefaultHero as Hero } from 'app/components/sections/Hero/OverriddenDefaultHero'
 import { OverriddenDefaultNewsletter as Newsletter } from 'app/components/sections/Newsletter/OverriddenDefaultNewsletter'
 import { OverriddenDefaultProductShelf as ProductShelf } from 'app/components/sections/ProductShelf/OverriddenDefaultProductShelf'
+import BannerNewsletter from 'app/components/sections/BannerNewsletter/BannerNewsletter'
 import ProductTiles from 'app/components/sections/ProductTiles'
 
 import Incentives from 'app/components/sections/Incentives'
@@ -22,6 +23,7 @@ const COMPONENTS: Record<string, ComponentType<any>> = {
   Incentives,
   ProductShelf,
   BannerText,
+  BannerNewsletter,
   Newsletter,
   ProductTiles,
   ...CUSTOM_COMPONENTS,

diff --git a/packages/core/src/components/templates/LandingPage/LandingPage.tsx b/packages/core/src/components/templates/LandingPage/LandingPage.tsx
@@ -9,7 +9,7 @@ import Incentives from 'app/components/sections/Incentives'
 import PageProvider from 'app/sdk/overrides/PageProvider'
 import type { PageContentType } from 'app/server/cms'
 import { getPage } from 'app/server/cms'
-import BannerNewsletter from 'src/components/sections/BannerNewsletter/BannerNewsletter'
+import BannerNewsletter from 'app/components/sections/BannerNewsletter/BannerNewsletter'
 import { OverriddenDefaultCrossSellingShelf as CrossSellingShelf } from 'src/components/sections/CrossSellingShelf/OverriddenDefaultCrossSellingShelf'
 import { OverriddenDefaultNewsletter as Newsletter } from 'app/components/sections/Newsletter/OverriddenDefaultNewsletter'
 import { OverriddenDefaultProductShelf as ProductShelf } from 'app/components/sections/ProductShelf/OverriddenDefaultProductShelf'

diff --git a/packages/core/src/components/templates/ProductListingPage/ProductListing.tsx b/packages/core/src/components/templates/ProductListingPage/ProductListing.tsx
@@ -3,7 +3,7 @@ import type { ServerCollectionPageQueryQuery } from '@generated/graphql'
 import { OverriddenDefaultBannerText as BannerText } from 'app/components/sections/BannerText/OverriddenDefaultBannerText'
 import { OverriddenDefaultHero as Hero } from 'app/components/sections/Hero/OverriddenDefaultHero'
 import deepmerge from 'deepmerge'
-import BannerNewsletter from 'src/components/sections/BannerNewsletter/BannerNewsletter'
+import BannerNewsletter from 'app/components/sections/BannerNewsletter/BannerNewsletter'
 import { OverriddenDefaultBreadcrumb as Breadcrumb } from 'src/components/sections/Breadcrumb/OverriddenDefaultBreadcrumb'
 import { OverriddenDefaultNewsletter as Newsletter } from 'app/components/sections/Newsletter/OverriddenDefaultNewsletter'
 import { OverriddenDefaultProductGallery as ProductGallery } from 'src/components/sections/ProductGallery/OverriddenDefaultProductGallery'

diff --git a/packages/core/src/components/templates/SearchPage/SearchPage.tsx b/packages/core/src/components/templates/SearchPage/SearchPage.tsx
@@ -6,7 +6,7 @@ import { OverriddenDefaultBannerText as BannerText } from 'app/components/sectio
 import { OverriddenDefaultHero as Hero } from 'app/components/sections/Hero/OverriddenDefaultHero'
 import PageProvider, { SearchPageContext } from 'app/sdk/overrides/PageProvider'
 import { SearchContentType } from 'app/server/cms'
-import BannerNewsletter from 'src/components/sections/BannerNewsletter/BannerNewsletter'
+import BannerNewsletter from 'app/components/sections/BannerNewsletter/BannerNewsletter'
 import { OverriddenDefaultBreadcrumb as Breadcrumb } from 'src/components/sections/Breadcrumb/OverriddenDefaultBreadcrumb'
 import { OverriddenDefaultNewsletter as Newsletter } from 'app/components/sections/Newsletter/OverriddenDefaultNewsletter'
 import { OverriddenDefaultProductGallery as ProductGallery } from 'src/components/sections/ProductGallery/OverriddenDefaultProductGallery'

diff --git a/packages/core/src/pages/[slug]/p.tsx b/packages/core/src/pages/[slug]/p.tsx
@@ -13,7 +13,7 @@ import {
 import RenderSections from 'app/components/cms/RenderSections'
 import { OverriddenDefaultBannerText as BannerText } from 'app/components/sections/BannerText/OverriddenDefaultBannerText'
 import { OverriddenDefaultHero as Hero } from 'app/components/sections/Hero/OverriddenDefaultHero'
-import BannerNewsletter from 'src/components/sections/BannerNewsletter/BannerNewsletter'
+import BannerNewsletter from 'app/components/sections/BannerNewsletter/BannerNewsletter'
 import { OverriddenDefaultBreadcrumb as Breadcrumb } from 'src/components/sections/Breadcrumb/OverriddenDefaultBreadcrumb'
 import { OverriddenDefaultCrossSellingShelf as CrossSellingShelf } from 'src/components/sections/CrossSellingShelf/OverriddenDefaultCrossSellingShelf'
 import { OverriddenDefaultNewsletter as Newsletter } from 'app/components/sections/Newsletter/OverriddenDefaultNewsletter'

diff --git a/packages/core/src/pages/index.tsx b/packages/core/src/pages/index.tsx
@@ -9,7 +9,7 @@ import { OverriddenDefaultHero as Hero } from 'app/components/sections/Hero/Over
 import Incentives from 'app/components/sections/Incentives'
 import type { PageContentType } from 'app/server/cms'
 import { getPage } from 'app/server/cms'
-import BannerNewsletter from 'src/components/sections/BannerNewsletter/BannerNewsletter'
+import BannerNewsletter from 'app/components/sections/BannerNewsletter/BannerNewsletter'
 import { OverriddenDefaultNewsletter as Newsletter } from 'app/components/sections/Newsletter/OverriddenDefaultNewsletter'
 import { OverriddenDefaultProductShelf as ProductShelf } from 'app/components/sections/ProductShelf/OverriddenDefaultProductShelf'
 import ProductTiles from 'app/components/sections/ProductTiles'