@faststore/core 3.98.0-dev.5 → 3.98.0-dev.7

package/.turbo/turbo-build.log

@@ -1,23 +1,23 @@
 
-> @faststore/core@3.98.0-dev.4 prebuild /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.98.0-dev.6 prebuild /home/runner/work/faststore/faststore/packages/core
 > na run partytown && na run generate
 
 
-> @faststore/core@3.98.0-dev.4 partytown /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.98.0-dev.6 partytown /home/runner/work/faststore/faststore/packages/core
 > partytown copylib ./public/~partytown
 
 Partytown lib copied to: /home/runner/work/faststore/faststore/packages/core/public/~partytown
 
-> @faststore/core@3.98.0-dev.4 generate /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.98.0-dev.6 generate /home/runner/work/faststore/faststore/packages/core
 > na run generate:schema && na run generate:codegen && na run format:generated
 
 
-> @faststore/core@3.98.0-dev.4 generate:schema /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.98.0-dev.6 generate:schema /home/runner/work/faststore/faststore/packages/core
 > tsx src/server/generator/generateGraphQLSchemaFile.ts
 
 Schema GraphQL file generated successfully
 
-> @faststore/core@3.98.0-dev.4 generate:codegen /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.98.0-dev.6 generate:codegen /home/runner/work/faststore/faststore/packages/core
 > graphql-codegen
 
 [STARTED] Parse Configuration
@@ -37,11 +37,11 @@ Running lifecycle hook "afterStart" scripts...
 [CLI] Loading Documents
 [CLI] Generating output
 
-> @faststore/core@3.98.0-dev.4 format:generated /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.98.0-dev.6 format:generated /home/runner/work/faststore/faststore/packages/core
 > prettier --write "@generated/**/*.{ts,js,tsx,jsx,json}" --loglevel error
 
 
-> @faststore/core@3.98.0-dev.4 build /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.98.0-dev.6 build /home/runner/work/faststore/faststore/packages/core
 > next build
 
 ⚠ No build cache found. Please configure build caching for faster rebuilds. Read more: https://nextjs.org/docs/messages/no-cache
@@ -79,8 +79,8 @@ Import trace for requested module:
 
    Collecting page data ...
    Generating static pages (0/6) ...
-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 (1/6) 
+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 (2/6) 
 
   Generating static pages (4/6) 
 
 ✓ Generating static pages (6/6) 
@@ -88,43 +88,43 @@ Warning: Dynamic Content not found for the page: home. Refer to the Dynamic Cont
    Collecting build traces ...
 
 Route (pages)                              Size     First Load JS
-┌ ● /                                      7.39 kB         147 kB
+┌ ● /                                      7.39 kB         148 kB
 ├   └ css/02259c549b2179f2.css             3.1 kB
 ├   /_app                                  0 B             108 kB
-├ ● /[...slug]                             2.56 kB         157 kB
+├ ● /[...slug]                             2.56 kB         158 kB
 ├ ● /[slug]/p                              98.2 kB         238 kB
 ├   └ css/a6a4ebbe01adbbad.css             22.2 kB
-├ ○ /404                                   1.57 kB         141 kB
-├ ● /500                                   1.57 kB         141 kB
+├ ○ /404                                   1.57 kB         142 kB
+├ ● /500                                   1.57 kB         142 kB
 ├ λ /api/fs/logout                         0 B             108 kB
 ├ λ /api/graphql                           0 B             108 kB
 ├ λ /api/health/live                       0 B             108 kB
 ├ λ /api/health/ready                      0 B             108 kB
 ├ λ /api/preview                           0 B             108 kB
-├ ● /checkout                              749 B           140 kB
-├ ● /login                                 1.7 kB          141 kB
-├ λ /pvt/account                           247 B           108 kB
-├ ● /pvt/account/[...unknown]              287 B           108 kB
-├ λ /pvt/account/403                       2.98 kB         142 kB
+├ ● /checkout                              749 B           141 kB
+├ ● /login                                 1.7 kB          142 kB
+├ λ /pvt/account                           247 B           109 kB
+├ ● /pvt/account/[...unknown]              287 B           109 kB
+├ λ /pvt/account/403                       2.98 kB         143 kB
 ├   └ css/0fae3d432331aae9.css             4.68 kB
 ├ λ /pvt/account/404                       2.18 kB         142 kB
 ├   └ css/0fc6b2ff69142c6a.css             4.74 kB
-├ λ /pvt/account/orders                    9.78 kB         149 kB
+├ λ /pvt/account/orders                    9.78 kB         150 kB
 ├   └ css/40a294d0a24ad01d.css             14.1 kB
-├ λ /pvt/account/orders/[id]               13.7 kB         153 kB
+├ λ /pvt/account/orders/[id]               13.7 kB         154 kB
 ├   └ css/08d03445f1797608.css             13.8 kB
-├ λ /pvt/account/profile                   1.98 kB         141 kB
+├ λ /pvt/account/profile                   1.98 kB         142 kB
 ├   └ css/47f1b4e8de15d314.css             4.42 kB
-├ λ /pvt/account/security                  3.96 kB         143 kB
+├ λ /pvt/account/security                  3.96 kB         144 kB
 ├   └ css/973dd40d4773e8cd.css             5.74 kB
-├ λ /pvt/account/user-details              1.91 kB         141 kB
+├ λ /pvt/account/user-details              1.91 kB         142 kB
 ├   └ css/05c399956ff24b77.css             4.54 kB
-└ ● /s                                     3.36 kB         158 kB
-+ First Load JS shared by all              111 kB
+└ ● /s                                     3.36 kB         159 kB
++ First Load JS shared by all              112 kB
   ├ chunks/framework-d514426edf885c68.js   45.4 kB
   ├ chunks/main-ec03882c4375091d.js        33.2 kB
-  ├ chunks/pages/_app-eae02e7ad5c9db46.js  25.2 kB
-  ├ chunks/webpack-f021535669f6ed5e.js     3.9 kB
+  ├ chunks/pages/_app-9709623009fd94a5.js  25.8 kB
+  ├ chunks/webpack-c56d30359092c45c.js     3.9 kB
   └ css/0f070d03aacd9cc5.css               3.57 kB
 
 λ  (Server)  server-side renders at runtime (uses getInitialProps or getServerSideProps)

package/.turbo/turbo-test.log

@@ -1,16 +1,16 @@
 
-> @faststore/core@3.98.0-dev.4 test /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.98.0-dev.6 test /home/runner/work/faststore/faststore/packages/core
 > jest
 
-PASS test/utils/multipleTemplates.test.ts (29.087 s)
-PASS test/utils/clearCookies.test.ts (28.223 s)
-PASS test/server/cms/global.test.ts
+PASS test/utils/multipleTemplates.test.ts (27.088 s)
+PASS test/utils/clearCookies.test.ts (27.484 s)
 PASS test/utils/cookieCacheBusting.test.ts
+PASS test/server/cms/global.test.ts
 PASS test/server/cms/index.test.ts
-PASS test/server/index.test.ts (33.718 s)
+PASS test/server/index.test.ts (31.032 s)
 
 Test Suites: 6 passed, 6 total
 Tests:       47 passed, 47 total
 Snapshots:   0 total
-Time:        34.716 s
+Time:        32.089 s
 Ran all test suites.

package/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.98.0-dev.7](https://github.com/vtex/faststore/compare/v3.98.0-dev.6...v3.98.0-dev.7) (2026-03-26)
+
+**Note:** Version bump only for package @faststore/core
+
+# [3.98.0-dev.6](https://github.com/vtex/faststore/compare/v3.98.0-dev.5...v3.98.0-dev.6) (2026-03-24)
+
+### Bug Fixes
+
+- enhance cache key management in useQuery ([#3230](https://github.com/vtex/faststore/issues/3230)) ([3f28502](https://github.com/vtex/faststore/commit/3f28502a8d381e476728661ea1150d0777ba87d1))
+
 # [3.98.0-dev.5](https://github.com/vtex/faststore/compare/v3.98.0-dev.4...v3.98.0-dev.5) (2026-03-24)
 
 ### Features

package/cms/faststore/sections.json

@@ -2548,11 +2548,11 @@
     }
   },
   {
-    "name": "Webchat",
+    "name": "ShoppingAssistant",
     "requiredScopes": [],
     "schema": {
-      "title": "Webchat",
-      "description": "Webchat widget. Loads when this section is added to the page.",
+      "title": "Shopping Assistant",
+      "description": "To enable Shopping Assistant, make sure you have finished the setup at Agentic CX > Dashboard.",
       "type": "object",
       "properties": {}
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faststore/core",
-  "version": "3.98.0-dev.5",
+  "version": "3.98.0-dev.7",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -85,6 +85,7 @@
     "fast-deep-equal": "^3.1.3",
     "fs-extra": "^10.1.0",
     "graphql": "^15.6.0",
+    "idb-keyval": "^5.1.3",
     "include-media": "^1.4.10",
     "isomorphic-unfetch": "^3.1.0",
     "lexical": "^0.34.0",
@@ -123,5 +124,5 @@
     "ts-jest": "29.1.1",
     "typescript": "5.3.2"
   },
-  "gitHead": "ac9042810ec4d2d0f2c50d710325120dba135451"
+  "gitHead": "e1ba23ab797254f3d2676d75db84b82649dcce87"
 }

package/src/components/ThirdPartyScripts/index.ts

@@ -1,2 +1,2 @@
 export { default } from './ThirdPartyScripts'
-export { useWebchatScript } from './useWebchatScript'
+export { useShoppingAssistant } from './useShoppingAssistant'

package/src/components/ThirdPartyScripts/{useWebchatScript.tsx → useShoppingAssistant.tsx}

@@ -1,21 +1,21 @@
 import type { RefObject } from 'react'
 import { useEffect } from 'react'
 
-const WEBCHAT_SCRIPT_URL = 'https://cdn.cloud.weni.ai/agentic-cx.js'
+const SHOPPING_ASSISTANT_SCRIPT_URL = 'https://cdn.cloud.weni.ai/agentic-cx.js'
 
 /**
- * Injects the webchat script when the hook runs, unless third-party scripts are disabled.
- * @param containerRef - Optional ref to an HTMLElement. When provided, the script is appended inside this container (e.g. inside the Webchat section). Otherwise the script is appended to document.head.
+ * Injects the Shopping Assistant script when the hook runs, unless third-party scripts are disabled.
+ * @param containerRef - Optional ref to an HTMLElement. When provided, the script is appended inside this container (e.g. inside the ShoppingAssistant section). Otherwise the script is appended to document.head.
  * Must be used in a component rendered in the body (not inside Next.js Head) so that useEffect runs on the client.
  */
-export function useWebchatScript(
+export function useShoppingAssistant(
   containerRef?: RefObject<HTMLElement | null>
 ): void {
   useEffect(() => {
     if (process.env.DISABLE_3P_SCRIPTS) return
 
     const script = document.createElement('script')
-    script.src = WEBCHAT_SCRIPT_URL
+    script.src = SHOPPING_ASSISTANT_SCRIPT_URL
     const container = containerRef?.current
     if (container) {
       container.appendChild(script)

package/src/components/account/MyAccountDrawer/OrganizationDrawer/OrganizationDrawer.tsx

@@ -11,6 +11,7 @@ import storeConfig from '../../../../../discovery.config'
 import { ProfileSummary } from '../ProfileSummary/ProfileSummary'
 import { OrganizationDrawerBody } from './OrganizationDrawerBody'
 import { OrganizationDrawerHeader } from './OrganizationDrawerHeader'
+import { setReloadAfterLogoutReturn } from './useReloadAfterLogoutReturn'
 import styles from './section.module.scss'
 
 type OrganizationDrawerProps = {
@@ -27,6 +28,7 @@ const clearBrowserStorageForCurrentDomain = async () => {
     const sessionStorageKeys = [
       'faststore_session_ready',
       'faststore_auth_cookie_value',
+      'faststore_person_id',
       'faststore_cache_bust_last_value',
     ]
 
@@ -53,6 +55,25 @@ const clearBrowserStorageForCurrentDomain = async () => {
     } catch {}
   } catch {}
 
+  // Clear IndexedDB: remove session key first (avoids blocked when DB has open connections),
+  // then delete the whole keyval-store
+  try {
+    if ('indexedDB' in window) {
+      const { del } = await import('idb-keyval')
+      await del('fs::session').catch(() => {})
+    }
+
+    const idb = window.indexedDB
+    if (idb) {
+      await new Promise<void>((resolve) => {
+        const req = idb.deleteDatabase('keyval-store')
+        req.onsuccess = () => resolve()
+        req.onerror = () => resolve()
+        req.onblocked = () => resolve()
+      })
+    }
+  } catch {}
+
   // Clear all cookies containing 'vtex' in the name (case-insensitive)
   try {
     const hostname = window.location.hostname
@@ -80,21 +101,6 @@ const clearBrowserStorageForCurrentDomain = async () => {
       }
     }
   } catch {}
-
-  // Clear IndexedDB (keyval-store)
-  try {
-    if (!('indexedDB' in window)) return
-
-    const idb = window.indexedDB
-    if (!idb) return
-
-    await new Promise<void>((resolve) => {
-      const req = idb.deleteDatabase('keyval-store')
-      req.onsuccess = () => resolve()
-      req.onerror = () => resolve()
-      req.onblocked = () => resolve()
-    })
-  } catch {}
 }
 
 export const doLogout = async (_event?: unknown) => {
@@ -104,16 +110,19 @@ export const doLogout = async (_event?: unknown) => {
     // Clear client-side storage (sessionStorage, localStorage, IndexedDB, non-HttpOnly cookies)
     await clearBrowserStorageForCurrentDomain()
 
-    // Clear HttpOnly cookies via API endpoint (server-side)
+    // Clear HttpOnly cookies via API endpoint (server-side).
+    // Must await and consume the response so Set-Cookie headers are fully processed before redirect.
     try {
-      await fetch('/api/fs/logout', {
+      const res = await fetch('/api/fs/logout', {
         method: 'POST',
         credentials: 'include',
       })
+      await res.json().catch((): null => null)
     } catch {
-      // Continue even if API call fails
+      // Continue even if API call fails (e.g. network error)
     }
   } finally {
+    setReloadAfterLogoutReturn()
     window.location.assign(
       `${storeConfig.secureSubdomain}/api/vtexid/pub/logout?scope=${storeConfig.api.storeId}&returnUrl=${storeConfig.storeUrl}`
     )

package/src/components/account/MyAccountDrawer/OrganizationDrawer/useReloadAfterLogoutReturn.ts

@@ -0,0 +1,75 @@
+import { useEffect } from 'react'
+
+/**
+ * When the user logs out from the OrganizationDrawer, we redirect to VTEX ID logout
+ * and then return to the store. We need to reload so session-dependent data
+ * (e.g. ProductShelf) and caches are fresh. This module ties that reload to the drawer flow.
+ *
+ * The return can happen in two ways:
+ * 1) bfcache restore: user hits Back or browser restores from cache → pageshow with persisted=true
+ * 2) Fresh load: VTEX ID redirects back → new navigation, persisted=false
+ *
+ * We handle both: check the flag on mount (fresh load) and on pageshow (bfcache).
+ */
+
+export const RELOAD_AFTER_LOGOUT_KEY = 'faststore_reload_after_logout_return'
+
+/**
+ * Call before redirecting to logout. When the user returns to the store, the app
+ * will reload once so session state and caches are fresh.
+ */
+export const setReloadAfterLogoutReturn = (): void => {
+  if (typeof sessionStorage === 'undefined') return
+  try {
+    sessionStorage.setItem(RELOAD_AFTER_LOGOUT_KEY, '1')
+  } catch {
+    // Ignore
+  }
+}
+
+const RELOAD_DELAY_MS = 1000
+
+/**
+ * Forces a full navigation with cache-busting param instead of reload().
+ * Bypasses disk cache by changing the URL, ensuring fresh HTML and API responses.
+ */
+const forceRefreshWithoutCache = (): void => {
+  const url = new URL(window.location.href)
+  url.searchParams.set('_', Date.now().toString())
+  window.location.replace(url.toString())
+}
+
+const checkAndReloadIfReturnedFromLogout = (): void => {
+  try {
+    if (sessionStorage.getItem(RELOAD_AFTER_LOGOUT_KEY)) {
+      sessionStorage.removeItem(RELOAD_AFTER_LOGOUT_KEY)
+      setTimeout(forceRefreshWithoutCache, RELOAD_DELAY_MS)
+    }
+  } catch {
+    // Ignore.
+  }
+}
+
+/**
+ * Hook to use in _app. Ensures a full reload when the user returns from logout
+ * (either via bfcache or fresh redirect), so data matches the new session.
+ */
+export const useReloadAfterLogoutReturn = (): void => {
+  useEffect(() => {
+    if (typeof window === 'undefined') return
+
+    // 1) On mount: handles fresh load return (VTEX ID redirect). pageshow with persisted=false
+    //    means we never get the event for that case, so we must check here.
+    checkAndReloadIfReturnedFromLogout()
+
+    // 2) On pageshow with persisted: handles bfcache restore
+    const onPageShow = (event: PageTransitionEvent) => {
+      if (event.persisted) {
+        checkAndReloadIfReturnedFromLogout()
+      }
+    }
+
+    window.addEventListener('pageshow', onPageShow)
+    return () => window.removeEventListener('pageshow', onPageShow)
+  }, [])
+}

package/src/components/cms/global/Components.ts

@@ -36,9 +36,11 @@ const RegionSlider = dynamic(
     ),
   { ssr: false }
 )
-const Webchat = dynamic(
+const ShoppingAssistant = dynamic(
   () =>
-    import(/* webpackChunkName: "Webchat" */ 'src/components/sections/Webchat'),
+    import(
+      /* webpackChunkName: "ShoppingAssistant" */ 'src/components/sections/ShoppingAssistant'
+    ),
   { ssr: false }
 )
 
@@ -51,7 +53,7 @@ const COMPONENTS: Record<string, ComponentType<any>> = {
   [getComponentKey(RegionModal, 'RegionModal')]: RegionModal, // out of viewport
   [getComponentKey(RegionSlider, 'RegionSlider')]: RegionSlider, // out of viewport
   [getComponentKey(Footer, 'Footer')]: Footer, // out of viewport
-  [getComponentKey(Webchat, 'Webchat')]: Webchat,
+  [getComponentKey(ShoppingAssistant, 'ShoppingAssistant')]: ShoppingAssistant,
   ...PLUGINS_COMPONENTS,
   ...CUSTOM_COMPONENTS,
 }

package/src/components/sections/ShoppingAssistant/ShoppingAssistant.tsx

@@ -0,0 +1,24 @@
+import { useRef } from 'react'
+
+import { useShoppingAssistant } from 'src/components/ThirdPartyScripts'
+
+import Section from '../Section'
+
+import styles from './section.module.scss'
+
+const ShoppingAssistant = () => {
+  const scriptContainerRef = useRef<HTMLDivElement>(null)
+  useShoppingAssistant(scriptContainerRef)
+
+  return (
+    <Section
+      className={`${styles.section} section-shopping-assistant layout__section`}
+    >
+      <div ref={scriptContainerRef} aria-hidden="true" hidden />
+    </Section>
+  )
+}
+
+ShoppingAssistant.$componentKey = 'ShoppingAssistant'
+
+export default ShoppingAssistant

package/src/components/sections/ShoppingAssistant/index.ts

@@ -0,0 +1 @@
+export { default } from './ShoppingAssistant'

package/src/pages/_app.tsx

@@ -6,6 +6,7 @@ import { useRouter } from 'next/router'
 import { useSearch } from '@faststore/sdk'
 import { UIProvider } from '@faststore/ui'
 
+import { useReloadAfterLogoutReturn } from 'src/components/account/MyAccountDrawer/OrganizationDrawer/useReloadAfterLogoutReturn'
 import ThirdPartyScripts from 'src/components/ThirdPartyScripts'
 import Layout from 'src/Layout'
 import AnalyticsHandler from 'src/sdk/analytics'
@@ -24,6 +25,7 @@ import { ITEMS_PER_PAGE } from 'src/constants'
 
 function App({ Component, pageProps }: AppProps) {
   useGeolocation()
+  useReloadAfterLogoutReturn()
   storeConfig.experimental?.scrollRestoration && useScrollRestoration()
   const router = useRouter()
   const { start: startGlobalSearchState } = useSearch()

package/src/sdk/graphql/request.ts

@@ -29,7 +29,7 @@ export const request = async <Query = unknown, Variables = unknown>(
   variables: Variables,
   options?: RequestOptions
 ) => {
-  // Get cache busting value based on cookie changes
+  // Get cache busting value based person?.id from session
   const value = getClientCacheBustingValue()
 
   const { data, errors } = await baseRequest<Variables, Query>('/api/graphql', {

package/src/sdk/graphql/useQuery.ts

@@ -1,8 +1,10 @@
-import useSWR from 'swr'
 import type { SWRConfiguration } from 'swr'
+import useSWR from 'swr'
+
+import { getClientCacheBustingValue } from 'src/utils/cookieCacheBusting'
 
-import { request } from './request'
 import type { Operation, RequestOptions } from './request'
+import { request } from './request'
 
 export type QueryOptions = SWRConfiguration &
   RequestOptions & { doNotRun?: boolean }
@@ -12,6 +14,19 @@ export const getKey = <Variables>(
   variables: Variables
 ) => `${operationName}::${JSON.stringify(variables)}`
 
+/**
+ * Returns a suffix for the cache key based on auth state (logged-in vs anonymous).
+ * This ensures SWR keeps separate cache entries for logged-in and logged-out users,
+ * avoiding stale product data (e.g. prices, availability) when switching session state.
+ */
+const getSessionCacheKeySuffix = (): string => {
+  if (typeof window === 'undefined') {
+    return ''
+  }
+  const value = getClientCacheBustingValue()
+  return value ?? ''
+}
+
 export const DEFAULT_OPTIONS = {
   errorRetryCount: 3,
   refreshWhenHidden: false,
@@ -27,10 +42,12 @@ export const useQuery = <Data, Variables = Record<string, unknown>>(
   options?: QueryOptions
 ) =>
   useSWR<Data>(
-    () =>
-      options?.doNotRun
-        ? null
-        : getKey(operation['__meta__']['operationName'], variables),
+    () => {
+      if (options?.doNotRun) return null
+      const baseKey = getKey(operation['__meta__']['operationName'], variables)
+      const sessionSuffix = getSessionCacheKeySuffix()
+      return `${baseKey}::${sessionSuffix}`
+    },
     {
       fetcher: () => {
         return new Promise((resolve) => {