@faststore/core 2.2.3 → 2.2.5

package/.turbo/turbo-build.log

@@ -26,27 +26,27 @@ info  - Generating static pages (7/7)
 info  - Finalizing page optimization...
 
 Route (pages)                              Size     First Load JS
-┌ ● /                                      8.27 kB         126 kB
-├   /_app                                  0 B            78.1 kB
-├ ● /[...slug]                             4.29 kB         139 kB
+┌ ● /                                      3.18 kB         127 kB
+├   /_app                                  0 B            78.6 kB
+├ ● /[...slug]                             4.3 kB          139 kB
 ├   └ css/527e334fa69cf40a.css             1.85 kB
 ├ ● /[slug]/p                              11 kB           135 kB
 ├   └ css/9f79fa103f49bca1.css             11.5 kB
-├ ○ /404                                   1.19 kB         110 kB
-├ ● /500                                   1.21 kB         110 kB
-├ ● /account                               668 B           110 kB
-├ λ /api/graphql                           0 B            78.1 kB
-├ λ /api/health/live                       0 B            78.1 kB
-├ λ /api/health/ready                      0 B            78.1 kB
-├ λ /api/preview                           0 B            78.1 kB
-├ ● /checkout                              655 B           110 kB
-├ ● /login                                 1.09 kB         110 kB
-└ ● /s                                     4.57 kB         125 kB
-+ First Load JS shared by all              81.2 kB
+├ ○ /404                                   1.19 kB         111 kB
+├ ● /500                                   1.2 kB          111 kB
+├ ● /account                               670 B           110 kB
+├ λ /api/graphql                           0 B            78.6 kB
+├ λ /api/health/live                       0 B            78.6 kB
+├ λ /api/health/ready                      0 B            78.6 kB
+├ λ /api/preview                           0 B            78.6 kB
+├ ● /checkout                              657 B           110 kB
+├ ● /login                                 1.09 kB         111 kB
+└ ● /s                                     4.58 kB         125 kB
++ First Load JS shared by all              81.7 kB
   ├ chunks/framework-dfd14d7ce6600b03.js   45.3 kB
   ├ chunks/main-e4e873ee741162eb.js        24.1 kB
-  ├ chunks/pages/_app-7db7de3d205714be.js  6.45 kB
-  ├ chunks/webpack-5e9601db2a72d827.js     2.25 kB
+  ├ chunks/pages/_app-48d56037a2534a44.js  6.99 kB
+  ├ chunks/webpack-743ed70fcff99e29.js     2.25 kB
   └ css/5d1f64b61ea581f4.css               3.06 kB
 
 λ  (Server)  server-side renders at runtime (uses getInitialProps or getServerSideProps)

package/.turbo/turbo-test.log

@@ -1,25 +1,25 @@
 $ tsdx test
 ts-jest[versions] (WARN) Version 29.1.0 of jest installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=25.0.0 <26.0.0). Please do not report issues in ts-jest if you are using unsupported versions.
 ts-jest[versions] (WARN) Version 4.9.4 of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=3.4.0 <4.0.0). Please do not report issues in ts-jest if you are using unsupported versions.
-PASS test/server/index.test.ts (8.454s)
+PASS test/server/index.test.ts (8.708s)
   FastStore GraphQL Layer
     @faststore/api
       ✓ should return a valid GraphQL schema (6ms)
-      ✓ should return a valid GraphQL schema contain all expected types (6ms)
-      ✓ should return a valid GraphQL schema contain all expected queries (1ms)
-      ✓ should return a valid GraphQL schema contain all expected mutations (1ms)
+      ✓ should return a valid GraphQL schema contain all expected types (5ms)
+      ✓ should return a valid GraphQL schema contain all expected queries (2ms)
+      ✓ should return a valid GraphQL schema contain all expected mutations
     VTEX API Extension
-      ✓ getTypeDefsFromFolder function should return an Array (7ms)
+      ✓ getTypeDefsFromFolder function should return an Array (13ms)
     Third Party API Extension
-      ✓ getTypeDefsFromFolder function should return an Array (12ms)
+      ✓ getTypeDefsFromFolder function should return an Array (5ms)
     Final Schema after merging
       ✓ should return a valid merged GraphQL schema (32ms)
     Envelop
-      ✓ should exist with its plugins (33ms)
-      ✓ should handle options and execute (415ms)
+      ✓ should exist with its plugins (34ms)
+      ✓ should handle options and execute (510ms)
 
 Test Suites: 1 passed, 1 total
 Tests:       9 passed, 9 total
 Snapshots:   0 total
-Time:        9.08s
+Time:        9.412s
 Ran all test suites.

package/faststore.config.default.js

@@ -0,0 +1,95 @@
+module.exports = {
+  seo: {
+    title: 'FastStore Starter',
+    description: 'Fast Demo Store',
+    titleTemplate: '%s | FastStore',
+    author: 'Store Framework',
+  },
+
+  // Theming
+  theme: 'custom-theme',
+
+  // Ecommerce Platform
+  platform: 'vtex',
+
+  // Platform specific configs for API
+  api: {
+    storeId: 'storeframework',
+    workspace: 'master',
+    environment: 'vtexcommercestable',
+    hideUnavailableItems: false,
+    incrementAddress: true,
+  },
+
+  // Default session
+  session: {
+    currency: {
+      code: 'USD',
+      symbol: '$',
+    },
+    locale: 'en-US',
+    channel: '{"salesChannel":"1","regionId":""}',
+    country: 'USA',
+    deliveryMode: null,
+    addressType: null,
+    postalCode: null,
+    geoCoordinates: null,
+    person: null,
+  },
+
+  // Default cart
+  cart: {
+    id: '',
+    items: [],
+    messages: [],
+    shouldSplitItem: true,
+  },
+
+  // Production URLs
+  storeUrl: 'https://vtexfaststore.com',
+  secureSubdomain: 'https://secure.vtexfaststore.com',
+  checkoutUrl: 'https://secure.vtexfaststore.com/checkout',
+  loginUrl: 'https://secure.vtexfaststore.com/api/io/login',
+  accountUrl: 'https://secure.vtexfaststore.com/api/io/account',
+
+  // Preview redirects
+  previewRedirects: {
+    home: '/',
+    plp: '/office',
+    search: '/s?q=headphone',
+    pdp: '/apple-magic-mouse/p',
+  },
+
+  // Lighthouse CI
+  lighthouse: {
+    server: process.env.BASE_SITE_URL || 'http://localhost:3000',
+    pages: {
+      home: '/',
+      pdp: '/apple-magic-mouse/p',
+      collection: '/office',
+    },
+  },
+
+  // E2E CI
+  cypress: {
+    pages: {
+      home: '/',
+      pdp: '/apple-magic-mouse/p',
+      collection: '/office',
+      collection_2: '/technology',
+      collection_filtered:
+        '/office/?category-1=office&marca=acer&facets=category-1%2Cmarca',
+      search: '/s?q=orange',
+    },
+  },
+
+  analytics: {
+    // https://developers.google.com/tag-platform/tag-manager/web#standard_web_page_installation,
+    gtmContainerId: 'GTM-PGHZ95N',
+  },
+
+  experimental: {
+    cypressVersion: 12,
+    enableCypressExtension: false,
+  },
+}

package/faststore.config.js

@@ -1,95 +1,11 @@
-module.exports = {
-  seo: {
-    title: 'FastStore Starter',
-    description: 'Fast Demo Store',
-    titleTemplate: '%s | FastStore',
-    author: 'Store Framework',
-  },
+const defaultConfig = require('./faststore.config.default')
+const starterConfig = require('./src/customizations/faststore.config')
 
-  // Theming
-  theme: 'custom-theme',
+const deepmerge = require('deepmerge')
 
-  // Ecommerce Platform
-  platform: 'vtex',
+/**
+ * @type {typeof defaultConfig & Record<string, any>}
+ * */
+const finalConfig = deepmerge(defaultConfig, starterConfig)
 
-  // Platform specific configs for API
-  api: {
-    storeId: 'storeframework',
-    workspace: 'master',
-    environment: 'vtexcommercestable',
-    hideUnavailableItems: false,
-    incrementAddress: true,
-  },
-
-  // Default session
-  session: {
-    currency: {
-      code: 'USD',
-      symbol: '$',
-    },
-    locale: 'en-US',
-    channel: '{"salesChannel":"1","regionId":""}',
-    country: 'USA',
-    deliveryMode: null,
-    addressType: null,
-    postalCode: null,
-    geoCoordinates: null,
-    person: null,
-  },
-
-  // Default cart
-  cart: {
-    id: '',
-    items: [],
-    messages: [],
-    shouldSplitItem: true,
-  },
-
-  // Production URLs
-  storeUrl: 'https://vtexfaststore.com',
-  secureSubdomain: 'https://secure.vtexfaststore.com',
-  checkoutUrl: 'https://secure.vtexfaststore.com/checkout',
-  loginUrl: 'https://secure.vtexfaststore.com/api/io/login',
-  accountUrl: 'https://secure.vtexfaststore.com/api/io/account',
-
-  // Preview redirects
-  previewRedirects: {
-    home: '/',
-    plp: '/office',
-    search: '/s?q=headphone',
-    pdp: '/apple-magic-mouse/p',
-  },
-
-  // Lighthouse CI
-  lighthouse: {
-    server: process.env.BASE_SITE_URL || 'http://localhost:3000',
-    pages: {
-      home: '/',
-      pdp: '/apple-magic-mouse/p',
-      collection: '/office',
-    },
-  },
-
-  // E2E CI
-  cypress: {
-    pages: {
-      home: '/',
-      pdp: '/apple-magic-mouse/p',
-      collection: '/office',
-      collection_2: '/technology',
-      collection_filtered:
-        '/office/?category-1=office&marca=acer&facets=category-1%2Cmarca',
-      search: '/s?q=orange',
-    },
-  },
-
-  analytics: {
-    // https://developers.google.com/tag-platform/tag-manager/web#standard_web_page_installation,
-    gtmContainerId: 'GTM-PGHZ95N',
-  },
-
-  experimental: {
-    cypressVersion: 12,
-    enableCypressExtension: false,
-  },
-}
+module.exports = finalConfig

package/next.config.js

@@ -16,7 +16,7 @@ const nextConfig = {
     defaultLocale: 'en-US',
   },
   sassOptions: {
-    additionalData: `@import "src/customizations/styles/custom-mixins.scss";`,
+    additionalData: `@import "src/customizations/src/styles/custom-mixins.scss";`,
   },
   // TODO: We won't need to enable this experimental feature when migrating to Next.js 13
   experimental: {
@@ -43,6 +43,7 @@ const nextConfig = {
 
     return config
   },
+  redirects: storeConfig.redirects,
 }
 
 module.exports = nextConfig

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faststore/core",
-  "version": "2.2.3",
+  "version": "2.2.5",
   "license": "MIT",
   "browserslist": "supports es6-module and not dead",
   "exports": {
@@ -80,7 +80,7 @@
   "devDependencies": {
     "@cypress/code-coverage": "^3.12.1",
     "@envelop/testing": "^6.0.0",
-    "@faststore/cli": "^2.2.0",
+    "@faststore/cli": "^2.2.5",
     "@faststore/eslint-config": "^2.2.0",
     "@faststore/lighthouse": "^1.12.32",
     "@lhci/cli": "^0.9.0",
@@ -129,5 +129,5 @@
   "msw": {
     "workerDirectory": "public"
   },
-  "gitHead": "b07156e43dc655ae2b2fec9b81f0499ddbd42416"
+  "gitHead": "271888ce74d9ca8ea683ec299f90c6aeff27f26f"
 }

package/src/components/ThirdPartyScripts/ThirdPartyScripts.tsx

@@ -1,5 +1,5 @@
 import { Partytown } from '@builder.io/partytown/react'
-import OverrideComponents from 'src/customizations/GlobalOverrides'
+import OverrideComponents from 'src/customizations/src/GlobalOverrides'
 import storeConfig from '../../../faststore.config'
 import GoogleTagManager from './GoogleTagManager'
 import VTEX from './vtex'

package/src/components/cms/GlobalSections.tsx

@@ -1,7 +1,7 @@
 import { Locator, Section } from '@vtex/client-cms'
 import type { ComponentType } from 'react'
 import { PropsWithChildren, lazy } from 'react'
-import CUSTOM_COMPONENTS from 'src/customizations/components'
+import CUSTOM_COMPONENTS from 'src/customizations/src/components'
 import { PageContentType, getPage } from 'src/server/cms'
 
 import Toast from 'src/components/common/Toast'

package/src/components/sections/Alert/Overrides.tsx

@@ -1,7 +1,7 @@
 import { Alert as UIAlert, Icon as UIIcon } from '@faststore/ui'
 
 import { getSectionOverrides } from 'src/utils/overrides'
-import { override } from 'src/customizations/components/overrides/Alert'
+import { override } from 'src/customizations/src/components/overrides/Alert'
 import type { AlertOverrideDefinition } from 'src/typings/overrides'
 
 const { Alert, Icon } = getSectionOverrides(

package/src/components/sections/BannerText/Overrides.tsx

@@ -4,7 +4,7 @@ import {
 } from '@faststore/ui'
 
 import { getSectionOverrides } from 'src/utils/overrides'
-import { override } from 'src/customizations/components/overrides/BannerText'
+import { override } from 'src/customizations/src/components/overrides/BannerText'
 import type { BannerTextOverrideDefinition } from 'src/typings/overrides'
 
 const { BannerText, BannerTextContent } = getSectionOverrides(

package/src/components/sections/Breadcrumb/Overrides.tsx

@@ -1,7 +1,7 @@
 import { Breadcrumb as UIBreadcrumb, Icon as UIIcon } from '@faststore/ui'
 
 import { getSectionOverrides } from 'src/utils/overrides'
-import { override } from 'src/customizations/components/overrides/Breadcrumb'
+import { override } from 'src/customizations/src/components/overrides/Breadcrumb'
 import type { BreadcrumbOverrideDefinition } from 'src/typings/overrides'
 
 const { Breadcrumb, Icon } = getSectionOverrides(

package/src/components/sections/EmptyState/Overrides.tsx

@@ -1,7 +1,7 @@
 import { EmptyState as UIEmptyState } from '@faststore/ui'
 
 import { getSectionOverrides } from 'src/utils/overrides'
-import { override } from 'src/customizations/components/overrides/EmptyState'
+import { override } from 'src/customizations/src/components/overrides/EmptyState'
 import type { EmptyStateOverrideDefinition } from 'src/typings/overrides'
 
 const { EmptyState } = getSectionOverrides(

package/src/components/sections/Hero/Overrides.tsx

@@ -5,7 +5,7 @@ import {
 } from '@faststore/ui'
 
 import { getSectionOverrides } from 'src/utils/overrides'
-import { override } from 'src/customizations/components/overrides/Hero'
+import { override } from 'src/customizations/src/components/overrides/Hero'
 import type { HeroOverrideDefinition } from 'src/typings/overrides'
 
 const { Hero, HeroImage, HeroHeader } = getSectionOverrides(

package/src/components/sections/Navbar/Overrides.tsx

@@ -13,7 +13,7 @@ import {
 } from '@faststore/ui'
 
 import { getSectionOverrides } from 'src/utils/overrides'
-import { override } from 'src/customizations/components/overrides/Navbar'
+import { override } from 'src/customizations/src/components/overrides/Navbar'
 import type { NavbarOverrideDefinition } from 'src/typings/overrides'
 
 const {

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

@@ -6,7 +6,7 @@ import {
 import { NewsletterAddendum } from 'src/components/ui/Newsletter/NewsletterAddendum'
 
 import { getSectionOverrides } from 'src/utils/overrides'
-import { override } from 'src/customizations/components/overrides/Newsletter'
+import { override } from 'src/customizations/src/components/overrides/Newsletter'
 import type { NewsletterOverrideDefinition } from 'src/typings/overrides'
 
 const {

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

@@ -17,7 +17,7 @@ import { Image } from 'src/components/ui/Image'
 import LocalNotAvailableButton from 'src/components/product/NotAvailableButton'
 
 import { getSectionOverrides } from 'src/utils/overrides'
-import { override } from 'src/customizations/components/overrides/ProductDetails'
+import { override } from 'src/customizations/src/components/overrides/ProductDetails'
 import type { ProductDetailsOverrideDefinition } from 'src/typings/overrides'
 
 const {

package/src/components/sections/ProductGallery/Overrides.tsx

@@ -14,7 +14,7 @@ const FilterSlider = lazy(
 )
 
 import { getSectionOverrides } from 'src/utils/overrides'
-import { override } from 'src/customizations/components/overrides/ProductGallery'
+import { override } from 'src/customizations/src/components/overrides/ProductGallery'
 import type { ProductGalleryOverrideDefinition } from 'src/typings/overrides'
 
 const {

package/src/components/sections/ProductShelf/Overrides.tsx

@@ -4,7 +4,7 @@ import ProductCard from 'src/components/product/ProductCard'
 import Carousel from 'src/components/ui/Carousel'
 
 import { getSectionOverrides } from 'src/utils/overrides'
-import { override } from 'src/customizations/components/overrides/ProductShelf'
+import { override } from 'src/customizations/src/components/overrides/ProductShelf'
 import type { ProductShelfOverrideDefinition } from 'src/typings/overrides'
 
 const { ProductShelf, __experimentalCarousel, __experimentalProductCard } =

package/src/components/sections/RegionBar/Overrides.tsx

@@ -1,7 +1,7 @@
 import { RegionBar as UIRegionBar, Icon as UIIcon } from '@faststore/ui'
 
 import { getSectionOverrides } from 'src/utils/overrides'
-import { override } from 'src/customizations/components/overrides/RegionBar'
+import { override } from 'src/customizations/src/components/overrides/RegionBar'
 import type { RegionBarOverrideDefinition } from 'src/typings/overrides'
 
 const { RegionBar, LocationIcon, ButtonIcon } = getSectionOverrides(

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

@@ -12,7 +12,7 @@ import BannerText from 'src/components/sections/BannerText'
 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/components'
+import CUSTOM_COMPONENTS from 'src/customizations/src/components'
 
 import storeConfig from '../../../../faststore.config'
 

package/src/components/templates/ProductListingPage/ProductListing.tsx

@@ -10,7 +10,7 @@ import { useSearch } from '@faststore/sdk'
 
 import type { ComponentType } from 'react'
 import RenderSections from 'src/components/cms/RenderSections'
-import CUSTOM_COMPONENTS from 'src/customizations/components'
+import CUSTOM_COMPONENTS from 'src/customizations/src/components'
 import { PLPContentType } from 'src/server/cms'
 
 import {

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

@@ -4,7 +4,7 @@ import type { ComponentType } from 'react'
 import Breadcrumb from 'src/components/sections/Breadcrumb'
 import ProductGallery from 'src/components/sections/ProductGallery'
 import { ITEMS_PER_PAGE } from 'src/constants'
-import CUSTOM_COMPONENTS from 'src/customizations/components'
+import CUSTOM_COMPONENTS from 'src/customizations/src/components'
 import RenderSections from 'src/components/cms/RenderSections'
 import { SearchContentType } from 'src/server/cms'
 import { useProductGalleryQuery } from 'src/sdk/product/useProductGalleryQuery'

package/src/customizations/faststore.config.js

@@ -0,0 +1,2 @@
+// This is a placeholder file for when starter files are copied here
+module.exports = {}

package/src/customizations/{GlobalOverrides.tsx → src/GlobalOverrides.tsx}

@@ -1,6 +1,6 @@
-import WebFontsOverrides from 'src/customizations/components/overrides/WebFonts'
+import WebFontsOverrides from 'src/customizations/src/components/overrides/WebFonts'
 import { default as CoreWebFonts } from 'src/fonts/WebFonts'
-import ThirdPartyScriptsOverrides from 'src/customizations/components/overrides/ThirdPartyScripts'
+import ThirdPartyScriptsOverrides from 'src/customizations/src/components/overrides/ThirdPartyScripts'
 
 const Components = {
   WebFonts: CoreWebFonts,

package/src/customizations/{components → src/components}/overrides/ThirdPartyScripts.tsx

@@ -1,4 +1,4 @@
-import { default as ThirdPartyScripts } from 'src/customizations/scripts/ThirdPartyScripts'
+import { default as ThirdPartyScripts } from 'src/customizations/src/scripts/ThirdPartyScripts'
 
 const overrides = {
   components: {

package/src/customizations/{components → src/components}/overrides/WebFonts.tsx

@@ -1,4 +1,4 @@
-import { default as CustomWebFonts } from 'src/customizations/fonts/WebFonts'
+import { default as CustomWebFonts } from 'src/customizations/src/fonts/WebFonts'
 
 const overrides = {
   components: {

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

@@ -15,7 +15,7 @@ import BannerNewsletter from 'src/components/sections/BannerNewsletter/BannerNew
 import Breadcrumb from 'src/components/sections/Breadcrumb'
 import CrossSellingShelf from 'src/components/sections/CrossSellingShelf'
 import ProductDetails from 'src/components/sections/ProductDetails'
-import CUSTOM_COMPONENTS from 'src/customizations/components'
+import CUSTOM_COMPONENTS from 'src/customizations/src/components'
 import { useSession } from 'src/sdk/session'
 import { mark } from 'src/sdk/tests/mark'
 import { execute } from 'src/server'

package/src/pages/_app.tsx

@@ -1,7 +1,7 @@
 // FastStore UI's base styles
 import '../styles/global/index.scss'
 
-import '../customizations/themes/index.scss'
+import '../customizations/src/themes/index.scss'
 
 import type { AppProps } from 'next/app'
 import NextNProgress from 'nextjs-progressbar'

package/src/pages/_document.tsx

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

package/src/pages/index.tsx

@@ -10,7 +10,7 @@ import Incentives from 'src/components/sections/Incentives'
 import Newsletter from 'src/components/sections/Newsletter'
 import ProductShelf from 'src/components/sections/ProductShelf'
 import ProductTiles from 'src/components/sections/ProductTiles'
-import CUSTOM_COMPONENTS from 'src/customizations/components'
+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'

package/src/server/generator/schema.ts

@@ -13,7 +13,7 @@ import { apiOptions } from '../options'
 export function getTypeDefsFromFolder(
   customPath: string | string[]
 ): TypeSource {
-  const basePath = ['src', 'customizations', 'graphql']
+  const basePath = ['src', 'customizations', 'src', 'graphql']
 
   const pathArray = Array.isArray(customPath) ? customPath : [customPath]
 

package/src/server/index.ts

@@ -23,8 +23,8 @@ import type { TypeSource } from '@graphql-tools/utils'
 
 import persisted from '../../@generated/graphql/persisted.json'
 
-import vtexExtensionsResolvers from '../customizations/graphql/vtex/resolvers'
-import thirdPartyResolvers from '../customizations/graphql/thirdParty/resolvers'
+import vtexExtensionsResolvers from '../customizations/src/graphql/vtex/resolvers'
+import thirdPartyResolvers from '../customizations/src/graphql/thirdParty/resolvers'
 
 import { apiOptions } from './options'