@faststore/core 3.0.58 → 3.0.59

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 🎉
 ⚠ No build cache found. Please configure build caching for faster rebuilds. Read more: https://nextjs.org/docs/messages/no-cache
@@ -38,7 +38,7 @@ Route (app)                                Size     First Load JS
   ├ chunks/472-369461a1f39981d5.js         28.4 kB
   ├ chunks/fd9d1056-43c43818840d7811.js    51.1 kB
   ├ chunks/main-app-e13fa67c2c3ceca5.js    230 B
-  └ chunks/webpack-d7ccbda472189c19.js     2.43 kB
+  └ chunks/webpack-a45dc84c9a0ef3fd.js     2.43 kB
 
 Route (pages)                              Size     First Load JS
 ┌ ● /                                      1.04 kB         148 kB
@@ -61,8 +61,8 @@ Route (pages)                              Size     First Load JS
 + 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-00cee674a20813ff.js  11.2 kB
-  ├ chunks/webpack-d7ccbda472189c19.js     2.43 kB
+  ├ chunks/pages/_app-1930798899758fda.js  11.2 kB
+  ├ chunks/webpack-a45dc84c9a0ef3fd.js     2.43 kB
   └ css/5d1f64b61ea581f4.css               3.05 kB
 
 λ  (Server)  server-side renders at runtime (uses getInitialProps or getServerSideProps)

package/.turbo/turbo-test.log

@@ -1,9 +1,9 @@
 $ jest
-PASS test/server/cms/index.test.ts (28.539 s)
-PASS test/server/index.test.ts (30.283 s)
+PASS test/server/cms/index.test.ts (29.963 s)
+PASS test/server/index.test.ts (31.672 s)
 
 Test Suites: 2 passed, 2 total
-Tests:       12 passed, 12 total
+Tests:       11 passed, 11 total
 Snapshots:   0 total
-Time:        31.156 s
+Time:        32.63 s
 Ran all test suites.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faststore/core",
-  "version": "3.0.58",
+  "version": "3.0.59",
   "license": "MIT",
   "repository": "vtex/faststore",
   "browserslist": "supports es6-module and not dead",
@@ -125,5 +125,5 @@
     "node": "18.19.0",
     "yarn": "1.19.1"
   },
-  "gitHead": "e1f415c74cfb74de617dc85669792439a1e6be29"
+  "gitHead": "6f2082f0a7f34b560d13060a7ab5d907871e7353"
 }

package/src/server/cms/index.ts

@@ -5,14 +5,6 @@ import MissingContentError from 'src/sdk/error/MissingContentError'
 import MultipleContentError from 'src/sdk/error/MultipleContentError'
 import config from '../../../faststore.config'
 
-type Cache<T> = {
-  [key: string]: { data: Array<T> }
-}
-type ExtraOptions = {
-  cmsClient?: ClientCMS
-  cache?: Cache<ContentData>
-}
-
 export type Options =
   | Locator
   | {
@@ -53,68 +45,49 @@ export const clientCMS = new ClientCMS({
   tenant: config.api.storeId,
 })
 
-/*
- * This in memory cache exists because for each page (think category or department)
- * we are fetching all the pages of the same content type from the headless CMS to
- * find the one that matches the slug.
- *
- * So instead of making multiple request for the Headless CMS API for each page we make
- * one for each content-type and reuse the results for the next page.
- *
- * Since we rebuild on a CMS publication the server will go away and will "invalidate"
- * the cache
- */
-const getCMSPageCache = {}
-
 export const getCMSPage = async (
   options: Options,
-  extraOptions?: ExtraOptions
+  cmsClient: ClientCMS = clientCMS
 ) => {
-  const cmsClient = extraOptions?.cmsClient ?? clientCMS
-  const cache = extraOptions?.cache ?? getCMSPageCache
-
   if (isLocator(options)) {
     return await cmsClient
       .getCMSPage(options)
       .then((page) => ({ data: [page] }))
   }
 
-  if (!cache[options.contentType]) {
-    const pages = []
-    let page = 1
-    const perPage = 10
-    const response = await cmsClient.getCMSPagesByContentType(
-      options.contentType,
-      { ...options.filters, page: page, perPage }
-    )
-
-    pages.push(...response.data)
-
-    const totalPagesToFetch = Math.ceil(response.totalItems / perPage) // How many pages have content
-    const pagesToFetch = Array.from(
-      { length: totalPagesToFetch - 1 }, // We want all those pages minus the first one that we fetched
-      (_, i) => i + 2 // + 1 because indices are 0 based, and + 1 because we already fetched the first
-    )
-
-    if (response.totalItems > pages.length) {
-      const restOfPages = await Promise.all(
-        pagesToFetch.map((i) =>
-          cmsClient.getCMSPagesByContentType(options.contentType, {
-            ...options.filters,
-            page: i,
-            perPage,
-          })
-        )
+  const pages = []
+  let page = 1
+  const perPage = 10
+  const response = await cmsClient.getCMSPagesByContentType(
+    options.contentType,
+    { ...options.filters, page: page, perPage }
+  )
+
+  pages.push(...response.data)
+
+  const totalPagesToFetch = Math.ceil(response.totalItems / perPage) // How many pages have content
+  const pagesToFetch = Array.from(
+    { length: totalPagesToFetch - 1 }, // We want all those pages minus the first one that we fetched
+    (_, i) => i + 2 // + 1 because indices are 0 based, and + 1 because we already fetched the first
+  )
+
+  if (response.totalItems > pages.length) {
+    const restOfPages = await Promise.all(
+      pagesToFetch.map((i) =>
+        cmsClient.getCMSPagesByContentType(options.contentType, {
+          ...options.filters,
+          page: i,
+          perPage,
+        })
       )
+    )
 
-      restOfPages.forEach((response) => {
-        pages.push(...response.data)
-      })
-    }
-    cache[options.contentType] = { data: pages }
+    restOfPages.forEach((response) => {
+      pages.push(...response.data)
+    })
   }
 
-  return cache[options.contentType]
+  return { data: pages }
 }
 
 export const getPage = async <T extends ContentData>(options: Options) => {

package/test/server/cms/index.test.ts

@@ -29,10 +29,7 @@ describe('CMS Integration', () => {
       })
       clientCMS.getCMSPagesByContentType = mockFunction
 
-      const result = await getCMSPage(
-        { contentType: 'plp' },
-        { cmsClient: clientCMS }
-      )
+      const result = await getCMSPage({ contentType: 'plp' }, clientCMS)
 
       expect(mockFunction.mock.calls.length).toBe(1)
       expect(result.data.length).toBe(3)
@@ -59,37 +56,10 @@ describe('CMS Integration', () => {
 
       clientCMS.getCMSPagesByContentType = mockFunction
 
-      const result = await getCMSPage(
-        { contentType: 'plp' },
-        { cmsClient: clientCMS, cache: {} }
-      )
+      const result = await getCMSPage({ contentType: 'plp' }, clientCMS)
 
       expect(mockFunction.mock.calls.length).toBe(2)
       expect(result.data.length).toBe(15)
     })
-
-    it('it makes no request if the cache is filled', async () => {
-      const mockFunction: jest.Mock<typeof clientCMS.getCMSPagesByContentType> =
-        jest.fn()
-
-      mockFunction.mockImplementationOnce(() => {
-        return Promise.resolve({
-          data: mockData(10),
-          hasNextPage: true,
-          totalItems: 15,
-        })
-      })
-
-      clientCMS.getCMSPagesByContentType = mockFunction
-
-      const cache = { plp: { data: [] } }
-      const result = await getCMSPage(
-        { contentType: 'plp' },
-        { cmsClient: clientCMS, cache: cache }
-      )
-
-      expect(mockFunction.mock.calls.length).toBe(0)
-      expect(result.data.length).toBe(0)
-    })
   })
 })

package/.next/static/2K9MWkRja381SNNuLNTU8/_buildManifest.js

@@ -1 +0,0 @@
-self.__BUILD_MANIFEST=function(s,c,a,e,t,b,i,u){return{__rewrites:{afterFiles:[],beforeFiles:[],fallback:[]},"/":[s,c,a,e,t,"static/css/fa6d43e3c11a59dc.css","static/chunks/pages/index-86dd2dba6f6f1621.js"],"/404":[s,c,a,b,"static/chunks/pages/404-be2217109dab18cf.js"],"/500":[s,c,a,b,"static/chunks/pages/500-64a07a16830e129c.js"],"/_error":["static/chunks/pages/_error-65ac7445167ddb62.js"],"/account":[s,c,a,"static/chunks/pages/account-70e52900601fc5eb.js"],"/checkout":[s,c,a,"static/chunks/pages/checkout-fe8c38b138ddecef.js"],"/login":[s,c,a,b,"static/chunks/pages/login-258e5b7ecec36481.js"],"/s":[s,c,a,e,t,i,u,"static/chunks/pages/s-53cc10ba9aa8331e.js"],"/[slug]/p":[s,c,a,e,t,"static/css/65f6dd6d16812461.css","static/chunks/pages/[slug]/p-25a61a48b78901e5.js"],"/[...slug]":[s,c,a,e,t,i,u,"static/css/3eed8d7ed5000eb8.css","static/chunks/pages/[...slug]-12c6dd879f1da8e0.js"],sortedPages:["/","/404","/500","/_app","/_error","/account","/checkout","/login","/s","/[slug]/p","/[...slug]"]}}("static/chunks/470-a762f2bf2d218abf.js","static/css/25261a033e496803.css","static/chunks/432-ea0bb3dcebbaab7b.js","static/css/548bab931c45c770.css","static/chunks/590-2e7ce772420d1e1a.js","static/css/ec44b650be144ada.css","static/css/185f3332f3d0db64.css","static/chunks/722-36fe06b9c486056e.js"),self.__BUILD_MANIFEST_CB&&self.__BUILD_MANIFEST_CB();