@faststore/core 4.7.1-dev.0 → 4.7.1-dev.2

package/.turbo/turbo-generate.log

@@ -1,9 +1,9 @@
 
-> @faststore/core@4.7.0 generate /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@4.7.1-dev.1 generate /home/runner/work/faststore/faststore/packages/core
 > pnpm run gen-types && pnpm run cache-graphql 
 
 
-> @faststore/core@4.7.0 gen-types /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@4.7.1-dev.1 gen-types /home/runner/work/faststore/faststore/packages/core
 > node ../cli/bin/run generate-types .
 
 [STARTED] Parse Configuration
@@ -19,7 +19,7 @@
 [COMPLETED] Generate to /home/runner/work/faststore/faststore/packages/core/@generated/
 [COMPLETED] Generate outputs
 
-> @faststore/core@4.7.0 cache-graphql /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@4.7.1-dev.1 cache-graphql /home/runner/work/faststore/faststore/packages/core
 > node ../cli/bin/run cache-graphql --config=./discovery.config.default.js --queries=./@generated/persisted-documents.json
 
 [Info] - Config file location: /home/runner/work/faststore/faststore/packages/core/discovery.config.default.js

package/.turbo/turbo-test.log

@@ -1,5 +1,5 @@
 
-> @faststore/core@4.7.0 test /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@4.7.1-dev.1 test /home/runner/work/faststore/faststore/packages/core
 > vitest run
 
 
@@ -7,22 +7,22 @@
 
 Not implemented: navigation to another Document
 Not implemented: navigation to another Document
-Browserslist: browsers data (caniuse-lite) is 6 months old. Please run:
+Browserslist: browsers data (caniuse-lite) is 7 months old. Please run:
   npx update-browserslist-db@latest
   Why you should do it regularly: https://github.com/browserslist/update-db#readme
- ✓  browser  test/sdk/ui/useScrollRestoration.browser.test.ts (43 tests) 858ms
- ✓  browser  test/components/account/cards/MyAccountListCards.browser.test.tsx (14 tests) 2348ms
-     ✓ shows the tab bar and renders Personal cards by default  824ms
-     ✓ paginates when there are more than 25 cards  397ms
- ✓  browser  test/components/account/ContractSwitcher.browser.test.tsx (13 tests) 3333ms
-     ✓ shows an error state when the list fails to load  715ms
-     ✓ requires selecting a contract before Confirm is enabled, then switches (REQ-03)  559ms
-     ✓ keeps Confirm disabled until a different contract is selected  440ms
-     ✓ keeps Confirm disabled when the selected contract is filtered out  322ms
-     ✓ does not reload when the switch returns false  353ms
- ✓  browser  test/sdk/localization/useBindingSelector.browser.test.tsx (9 tests) 119ms
- ✓  browser  test/components/ui/ProductGallery/GalleryPageHeightLock.browser.test.tsx (8 tests) 265ms
- ✓  browser  test/sdk/session/reconcileSessionLocale.browser.test.ts (5 tests) 40ms
+ ✓  browser  test/sdk/ui/useScrollRestoration.browser.test.ts (43 tests) 1209ms
+ ✓  browser  test/components/account/ContractSwitcher.browser.test.tsx (13 tests) 2734ms
+     ✓ shows an error state when the list fails to load  597ms
+     ✓ requires selecting a contract before Confirm is enabled, then switches (REQ-03)  367ms
+     ✓ keeps Confirm disabled when the selected contract is filtered out  310ms
+     ✓ does not reload when the switch returns false  342ms
+ ✓  browser  test/components/account/cards/MyAccountListCards.browser.test.tsx (14 tests) 2532ms
+     ✓ shows the tab bar and renders Personal cards by default  1068ms
+     ✓ paginates when there are more than 25 cards  345ms
+ ✓  browser  test/sdk/localization/useBindingSelector.browser.test.tsx (9 tests) 97ms
+ ✓  browser  test/sdk/session/reconcileSessionLocale.browser.test.ts (5 tests) 15ms
+ ✓  browser  test/components/ui/ProductGallery/GalleryPageHeightLock.browser.test.tsx (8 tests) 211ms
+ ✓  browser  test/sdk/recommendations/useRecommendationShelf.browser.test.tsx (12 tests) 172ms
 stderr | test/components/RecommendationShelf/RecommendationShelf.browser.test.tsx
 Error in optimistic validation: TypeError: Failed to parse URL from /api/graphql?operationName=ValidateCartMutation&operationHash=3c71b0d3fc2bade14df68abfa271858beb361b12
     at node:internal/deps/undici/undici:16416:13
@@ -49,11 +49,10 @@ Browserslist: browsers data (caniuse-lite) is 6 months old. Please run:
   }
 }
 
- ✓  browser  test/sdk/recommendations/useRecommendationShelf.browser.test.tsx (12 tests) 262ms
 stderr | test/components/RecommendationShelf/RecommendationShelf.browser.test.tsx > RecommendationShelf > renders nothing when there is an error
 Error fetching recommendations undefined boom for campaign vrn:recommendations:acc:rec-top-items-v2:campaign-1
 
- ✓  browser  test/components/RecommendationShelf/RecommendationShelf.browser.test.tsx (7 tests) 365ms
+ ✓  browser  test/components/RecommendationShelf/RecommendationShelf.browser.test.tsx (7 tests) 114ms
 stderr | test/pages/password-protection.browser.test.tsx > PasswordProtectionLogin > posts the password and redirects to the requested return path
 Warning: An update to PasswordProtectionLogin inside a test was not wrapped in act(...).
 
@@ -283,13 +282,14 @@ act(() => {
 This ensures that you're testing the behavior the user would see in the browser. Learn more at https://reactjs.org/link/wrap-tests-with-act
     at PasswordProtectionLogin (/home/runner/work/faststore/faststore/packages/core/src/pages/password-protection/index.tsx:19:69)
 
- ✓  browser  test/pages/password-protection.browser.test.tsx (6 tests) 1247ms
-     ✓ renders the password protection form  670ms
- ✓  browser  test/sdk/session/getInitialSession.browser.test.ts (6 tests) 25ms
- ✓  browser  test/components/account/OrganizationDrawer.browser.test.tsx (5 tests) 596ms
-     ✓ renders the menu view with contract details and manage footer  329ms
+ ✓  browser  test/pages/password-protection.browser.test.tsx (6 tests) 1132ms
+     ✓ renders the password protection form  466ms
+ ✓  browser  test/sdk/session/getInitialSession.browser.test.ts (6 tests) 18ms
+ ✓  browser  test/components/account/OrganizationDrawer.browser.test.tsx (5 tests) 1348ms
+     ✓ renders the menu view with contract details and manage footer  744ms
+     ✓ opens the contract switcher and returns to the menu on back  304ms
  ✓  browser  test/sdk/account/changeContractToken.browser.test.ts (9 tests) 24ms
-stderr | test/components/cms/RenderSections.browser.test.tsx
+stderr | test/sdk/localization/store-url.browser.test.ts
 Error in optimistic validation: TypeError: Cannot read properties of undefined (reading 'read')
     at waitForSessionValidated (/home/runner/work/faststore/faststore/packages/core/src/sdk/cart/waitForSessionValidated.ts:16:32)
     at validateCart (/home/runner/work/faststore/faststore/packages/core/src/sdk/cart/index.ts:120:9)
@@ -297,8 +297,8 @@ This ensures that you're testing the behavior the user would see in the browser.
     at a (/home/runner/work/faststore/faststore/packages/sdk/dist/es/index.mjs:354:23)
     at processTicksAndRejections (node:internal/process/task_queues:103:5)
 
- ✓  browser  test/components/cms/RenderSections.browser.test.tsx (5 tests) 80ms
-stderr | test/sdk/localization/store-url.browser.test.ts
+ ✓  browser  test/sdk/localization/store-url.browser.test.ts (3 tests) 5ms
+stderr | test/components/cms/RenderSections.browser.test.tsx
 Error in optimistic validation: TypeError: Cannot read properties of undefined (reading 'read')
     at waitForSessionValidated (/home/runner/work/faststore/faststore/packages/core/src/sdk/cart/waitForSessionValidated.ts:16:32)
     at validateCart (/home/runner/work/faststore/faststore/packages/core/src/sdk/cart/index.ts:120:9)
@@ -306,11 +306,11 @@ This ensures that you're testing the behavior the user would see in the browser.
     at a (/home/runner/work/faststore/faststore/packages/sdk/dist/es/index.mjs:354:23)
     at processTicksAndRejections (node:internal/process/task_queues:103:5)
 
- ✓  browser  test/sdk/localization/store-url.browser.test.ts (3 tests) 5ms
- ✓  browser  test/sdk/account/useAvailableContracts.browser.test.ts (6 tests) 37ms
- ✓  browser  test/components/templates/SearchPage/SearchWrapper.browser.test.tsx (3 tests) 42ms
- ✓  browser  test/sdk/recommendations/useRecommendationShelf.sessionFallback.browser.test.tsx (2 tests) 86ms
- ✓  browser  test/sdk/account/useSwitchContract.browser.test.ts (4 tests) 35ms
+ ✓  browser  test/sdk/account/useAvailableContracts.browser.test.ts (6 tests) 36ms
+ ✓  browser  test/components/cms/RenderSections.browser.test.tsx (5 tests) 65ms
+ ✓  browser  test/components/templates/SearchPage/SearchWrapper.browser.test.tsx (3 tests) 35ms
+ ✓  browser  test/sdk/recommendations/useRecommendationShelf.sessionFallback.browser.test.tsx (2 tests) 126ms
+ ✓  browser  test/sdk/account/useSwitchContract.browser.test.ts (4 tests) 39ms
 stderr | test/components/account/doLogout.browser.test.ts
 Error in optimistic validation: TypeError: Cannot read properties of undefined (reading 'read')
     at waitForSessionValidated (/home/runner/work/faststore/faststore/packages/core/src/sdk/cart/waitForSessionValidated.ts:16:32)
@@ -319,9 +319,10 @@ This ensures that you're testing the behavior the user would see in the browser.
     at a (/home/runner/work/faststore/faststore/packages/sdk/dist/es/index.mjs:354:23)
     at processTicksAndRejections (node:internal/process/task_queues:103:5)
 
- ✓  browser  test/components/account/doLogout.browser.test.ts (1 test) 33ms
- ✓  browser  test/components/ui/LocalizationButton.browser.test.tsx (3 tests) 47ms
- ✓  browser  test/components/sections/Account/AccountListCards.browser.test.tsx (3 tests) 71ms
+ ✓  browser  test/components/account/doLogout.browser.test.ts (1 test) 23ms
+ ✓  browser  test/components/ui/LocalizationButton.browser.test.tsx (3 tests) 45ms
+ ✓  browser  test/components/sections/Account/AccountListCards.browser.test.tsx (3 tests) 72ms
+ ✓  browser  test/components/account/OrganizationDrawerHeader.browser.test.tsx (3 tests) 250ms
 stderr | test/sdk/account/clearPersistedSessionState.browser.test.ts
 Error in optimistic validation: TypeError: Cannot read properties of undefined (reading 'read')
     at waitForSessionValidated (/home/runner/work/faststore/faststore/packages/core/src/sdk/cart/waitForSessionValidated.ts:16:32)
@@ -330,15 +331,11 @@ This ensures that you're testing the behavior the user would see in the browser.
     at a (/home/runner/work/faststore/faststore/packages/sdk/dist/es/index.mjs:354:23)
     at processTicksAndRejections (node:internal/process/task_queues:103:5)
 
- ✓  browser  test/sdk/account/clearPersistedSessionState.browser.test.ts (1 test) 10ms
- ✓  browser  test/components/account/OrganizationDrawerHeader.browser.test.tsx (3 tests) 336ms
- ✓  browser  test/components/account/OrganizationDrawerFooter.browser.test.tsx (3 tests) 296ms
- ✓  browser  test/utils/isLocalHost.browser.test.ts (3 tests) 6ms
- ✓  browser  test/sdk/session/reconcileSessionLocale.disabled.browser.test.ts (1 test) 2ms
- ✓  node  test/utils/localization/bindingPaths.test.ts (71 tests) 33ms
- ✓  browser  test/components/skeletons/ProductGridSkeleton.browser.test.tsx (2 tests) 31ms
- ✓  node  test/server/password-protection-service.test.ts (22 tests) 34ms
- ✓  node  test/utils/match-url.test.ts (10 tests) 13ms
+ ✓  browser  test/sdk/account/clearPersistedSessionState.browser.test.ts (1 test) 8ms
+ ✓  browser  test/components/account/OrganizationDrawerFooter.browser.test.tsx (3 tests) 301ms
+ ✓  browser  test/utils/isLocalHost.browser.test.ts (3 tests) 4ms
+ ✓  browser  test/sdk/session/reconcileSessionLocale.disabled.browser.test.ts (1 test) 3ms
+ ✓  node  test/utils/localization/bindingPaths.test.ts (71 tests) 32ms
 stderr | test/sdk/account/refreshToken.browser.test.ts
 Error in optimistic validation: TypeError: Cannot read properties of undefined (reading 'read')
     at waitForSessionValidated (/home/runner/work/faststore/faststore/packages/core/src/sdk/cart/waitForSessionValidated.ts:16:32)
@@ -347,10 +344,13 @@ This ensures that you're testing the behavior the user would see in the browser.
     at a (/home/runner/work/faststore/faststore/packages/sdk/dist/es/index.mjs:354:23)
     at processTicksAndRejections (node:internal/process/task_queues:103:5)
 
- ✓  browser  test/sdk/account/refreshToken.browser.test.ts (1 test) 5ms
- ✓  node  test/sdk/localization/useBindingSelector.test.tsx (22 tests) 16ms
- ✓  node  test/pages/api/unlock.test.ts (15 tests) 179ms
- ✓  node  test/sdk/localization/bindingSelector.test.ts (18 tests) 11ms
+ ✓  browser  test/components/skeletons/ProductGridSkeleton.browser.test.tsx (2 tests) 34ms
+ ✓  browser  test/sdk/account/refreshToken.browser.test.ts (1 test) 6ms
+ ✓  node  test/server/password-protection-service.test.ts (22 tests) 31ms
+ ✓  node  test/utils/match-url.test.ts (10 tests) 9ms
+ ✓  node  test/pages/api/unlock.test.ts (15 tests) 265ms
+ ✓  node  test/sdk/localization/useBindingSelector.test.tsx (22 tests) 11ms
+ ✓  node  test/sdk/localization/bindingSelector.test.ts (18 tests) 10ms
 stderr | test/components/search/SearchInputComponent.test.tsx
 Warning: forwardRef render functions accept exactly two parameters: props and ref. Did you forget to use the ref parameter?
 
@@ -415,17 +415,18 @@ Warning: React does not recognize the `providerProps` prop on a DOM element. If
     at Wrapper (/home/runner/work/faststore/faststore/packages/core/test/components/search/SearchInputComponent.test.tsx:106:20)
 
  ✓  node  test/components/search/SearchInputComponent.test.tsx (6 tests) 73ms
- ✓  node  test/sdk/search/useSearchHistory.test.ts (13 tests) 56ms
- ✓  node  test/utils/cookieCacheBusting.test.ts (10 tests) 14ms
+ ✓  node  test/sdk/search/useSearchHistory.test.ts (13 tests) 44ms
+ ✓  node  test/utils/cookieCacheBusting.test.ts (10 tests) 15ms
 stderr | test/pages/pvt/account/cards/index.test.ts > Cards page getServerSideProps > redirects to /pvt/account/403 when the query fails with 401/403
 { extensions: { status: 401 } }
 
 stderr | test/pages/pvt/account/cards/index.test.ts > Cards page getServerSideProps > renders the error state (no redirect) when the query fails with a non-auth status
 { extensions: { status: 502 } }
 
- ✓  node  test/pages/pvt/account/cards/index.test.ts (8 tests) 14ms
- ✓  node  test/utils/clearCookies.test.ts (20 tests) 21ms
+ ✓  node  test/pages/pvt/account/cards/index.test.ts (8 tests) 8ms
+ ✓  node  test/utils/clearCookies.test.ts (20 tests) 26ms
  ✓  node  test/experimental/myAccountCmsServerSideProps.test.ts (5 tests) 7ms
+ ✓  node  test/components/quotes/MyAccountListQuotesTable.test.tsx (12 tests) 398ms
 stderr | test/pages/api/graphql.test.ts > /api/graphql error status propagation > propagates the upstream 400 from a wrapped BadRequestError instead of 500
 Graphql execution returned with error:  [
   {
@@ -474,7 +475,7 @@ Warning: React does not recognize the `providerProps` prop on a DOM element. If
 
 stderr | test/pages/api/graphql.test.ts > /api/graphql request handling > maps BadRequestError thrown by execute to its status
 Something unexpected occurred querying Graphql endpoint: 
- T [FastStoreError]: malformed
+ E [FastStoreError]: malformed
     at /home/runner/work/faststore/faststore/packages/core/test/pages/api/graphql.test.ts:190:31
     at /home/runner/work/faststore/faststore/packages/core/test/pages/api/graphql.test.ts:196:39
     at file:///home/runner/work/faststore/faststore/node_modules/.pnpm/@vitest+runner@4.0.18/node_modules/@vitest/runner/dist/index.js:1024:60
@@ -490,7 +491,7 @@ Warning: React does not recognize the `providerProps` prop on a DOM element. If
 
 stderr | test/pages/api/graphql.test.ts > /api/graphql request handling > maps UnauthorizedError thrown by execute to its status
 Something unexpected occurred querying Graphql endpoint: 
- re [FastStoreError]: expired
+ ie [FastStoreError]: expired
     at /home/runner/work/faststore/faststore/packages/core/test/pages/api/graphql.test.ts:191:33
     at /home/runner/work/faststore/faststore/packages/core/test/pages/api/graphql.test.ts:196:39
     at file:///home/runner/work/faststore/faststore/node_modules/.pnpm/@vitest+runner@4.0.18/node_modules/@vitest/runner/dist/index.js:1024:60
@@ -518,68 +519,68 @@ Warning: React does not recognize the `providerProps` prop on a DOM element. If
     at file:///home/runner/work/faststore/faststore/node_modules/.pnpm/@vitest+runner@4.0.18/node_modules/@vitest/runner/dist/index.js:1653:37
     at Traces.$ (file:///home/runner/work/faststore/faststore/node_modules/.pnpm/vitest@4.0.18_@opentelemetry+api@1.9.0_@types+node@20.19.13_jiti@2.6.1_jsdom@27.4.0_sas_13be941c57d55f08f06eeaf1c180ddfe/node_modules/vitest/dist/chunks/traces.CCmnQaNT.js:142:27)
 
- ✓  node  test/pages/api/graphql.test.ts (17 tests) 34ms
- ✓  node  test/components/quotes/MyAccountListQuotesTable.test.tsx (12 tests) 415ms
- ✓  node  test/components/quotes/MyAccountListQuotes.test.tsx (9 tests) 820ms
-     ✓ navigates with the search term on blur  364ms
-     ✓ navigates without a label param when the search is cleared  361ms
+ ✓  node  test/pages/api/graphql.test.ts (17 tests) 33ms
 stderr | test/sdk/account/useSetPassword.test.ts > useSetPassword > maps wrongcredentials error responses to the existing message
 Set password request failed: Bad Request
 
- ✓  node  test/sdk/account/useSetPassword.test.ts (6 tests) 39ms
- ✓  node  test/sdk/orderEntry/useOrderEntryOperation.test.ts (8 tests) 36ms
- ✓  node  test/components/quotes/quoteFilters.test.ts (23 tests) 42ms
- ✓  node  test/utils/multipleTemplates.test.ts (8 tests) 7ms
- ✓  node  test/utils/localization/localizeRedirectDestination.test.ts (11 tests) 6ms
- ✓  node  test/sdk/account/getMyAccountRoutes.test.ts (12 tests) 7ms
- ✓  node  test/sdk/orderEntry/useOrderEntryUpload.test.ts (8 tests) 52ms
- ✓  node  test/sdk/redirects/index.test.ts (7 tests) 54ms
- ✓  node  test/components/quotes/MyAccountQuotesFilterSlider.test.tsx (5 tests) 155ms
- ✓  node  test/utils/productJsonLd.test.ts (17 tests) 12ms
- ✓  node  test/proxy.localization.test.ts (5 tests) 32ms
- ✓  node  test/server/index.test.ts (7 tests) 850ms
-       ✓ should handle options and execute  348ms
- ✓  node  test/sdk/orderEntry/useOrderEntry.test.ts (8 tests) 49ms
- ✓  node  test/sdk/session/syncSalesChannelFromOrderForm.test.ts (6 tests) 7ms
- ✓  node  test/components/quotes/MyAccountQuotesSelectedTags.test.tsx (8 tests) 119ms
- ✓  node  test/sdk/analytics/useStartRecommendationSession.test.ts (6 tests) 48ms
- ✓  node  test/proxy.test.ts (4 tests) 32ms
- ✓  node  test/server/webops-api.test.ts (9 tests) 18ms
- ✓  node  test/sdk/orderEntry/useOrderFormItems.test.ts (7 tests) 42ms
- ✓  node  test/sdk/cart/waitForSessionValidated.test.ts (5 tests) 13ms
- ✓  node  test/server/cms/myAccountDefaultSections.test.ts (7 tests) 7ms
+ ✓  node  test/sdk/account/useSetPassword.test.ts (6 tests) 29ms
+ ✓  node  test/components/quotes/MyAccountListQuotes.test.tsx (9 tests) 833ms
+     ✓ navigates with the search term on blur  366ms
+     ✓ navigates without a label param when the search is cleared  358ms
+ ✓  node  test/components/quotes/quoteFilters.test.ts (23 tests) 25ms
+ ✓  node  test/utils/multipleTemplates.test.ts (8 tests) 6ms
+ ✓  node  test/sdk/orderEntry/useOrderEntryOperation.test.ts (8 tests) 44ms
+ ✓  node  test/utils/localization/localizeRedirectDestination.test.ts (11 tests) 5ms
+ ✓  node  test/utils/localization/hreflang.test.ts (8 tests) 6ms
+ ✓  node  test/sdk/account/getMyAccountRoutes.test.ts (12 tests) 8ms
+ ✓  node  test/sdk/orderEntry/useOrderEntryUpload.test.ts (8 tests) 61ms
+ ✓  node  test/sdk/redirects/index.test.ts (7 tests) 80ms
+ ✓  node  test/components/quotes/MyAccountQuotesFilterSlider.test.tsx (5 tests) 154ms
+ ✓  node  test/utils/productJsonLd.test.ts (17 tests) 10ms
+ ✓  node  test/proxy.localization.test.ts (5 tests) 37ms
+ ✓  node  test/sdk/orderEntry/useOrderEntry.test.ts (8 tests) 29ms
+ ✓  node  test/server/index.test.ts (7 tests) 939ms
+       ✓ should handle options and execute  391ms
+ ✓  node  test/sdk/session/syncSalesChannelFromOrderForm.test.ts (6 tests) 6ms
+ ✓  node  test/components/quotes/MyAccountQuotesSelectedTags.test.tsx (8 tests) 99ms
+ ✓  node  test/sdk/analytics/useStartRecommendationSession.test.ts (6 tests) 42ms
+ ✓  node  test/sdk/orderEntry/useOrderFormItems.test.ts (7 tests) 36ms
+ ✓  node  test/server/webops-api.test.ts (9 tests) 19ms
+ ✓  node  test/proxy.test.ts (4 tests) 28ms
+ ✓  node  test/sdk/cart/waitForSessionValidated.test.ts (5 tests) 12ms
+ ✓  node  test/sdk/localization/store-url.test.ts (4 tests) 4ms
+ ✓  node  test/server/cms/myAccountDefaultSections.test.ts (7 tests) 6ms
  ✓  node  test/server/content/service.test.ts (5 tests) 5ms
- ✓  node  test/utils/productJsonLdRendering.test.tsx (4 tests) 19ms
- ✓  node  test/sdk/account/refreshToken.test.ts (5 tests) 8ms
- ✓  node  test/server/cms/global.test.ts (3 tests) 6ms
- ✓  node  test/sdk/localization/store-url.test.ts (1 test) 4ms
- ✓  node  test/sdk/auth/useAuth.test.ts (5 tests) 31ms
- ✓  node  test/components/quotes/MyAccountQuotesStatusSelector.test.tsx (6 tests) 155ms
- ✓  node  test/utils/getRequestHostname.test.ts (12 tests) 6ms
- ✓  node  test/pages/api/preview.test.ts (2 tests) 9ms
- ✓  node  test/server/rootSpan.test.ts (4 tests) 50ms
+ ✓  node  test/utils/productJsonLdRendering.test.tsx (4 tests) 14ms
+ ✓  node  test/sdk/account/refreshToken.test.ts (5 tests) 6ms
+ ✓  node  test/server/cms/global.test.ts (3 tests) 5ms
+ ✓  node  test/sdk/auth/useAuth.test.ts (5 tests) 35ms
+ ✓  node  test/components/quotes/MyAccountQuotesStatusSelector.test.tsx (6 tests) 144ms
+ ✓  node  test/utils/getRequestHostname.test.ts (12 tests) 7ms
+ ✓  node  test/server/rootSpan.test.ts (4 tests) 40ms
+ ✓  node  test/pages/api/preview.test.ts (2 tests) 8ms
+ ✓  node  test/components/search/SearchInput.test.ts (6 tests) 8ms
  ✓  node  test/utils/validateSessionRefreshToken.test.ts (6 tests) 5ms
- ✓  node  test/components/account/Layout.test.tsx (6 tests) 77ms
- ✓  node  test/components/search/SearchInput.test.ts (6 tests) 9ms
- ✓  node  test/sdk/recommendations/vrn.test.ts (5 tests) 7ms
- ✓  node  test/utils/retry.test.ts (5 tests) 15ms
+ ✓  node  test/components/account/Layout.test.tsx (6 tests) 59ms
+ ✓  node  test/sdk/recommendations/vrn.test.ts (5 tests) 5ms
+ ✓  node  test/utils/retry.test.ts (5 tests) 14ms
  ✓  node  test/server/cms/index.test.ts (2 tests) 5ms
  ✓  node  test/sdk/account/getB2BSessionClaims.test.ts (4 tests) 5ms
- ✓  node  test/utils/unlockResponse.test.ts (11 tests) 5ms
+ ✓  node  test/utils/unlockResponse.test.ts (11 tests) 6ms
  ✓  node  test/sdk/recommendations/useRecommendations.test.ts (2 tests) 5ms
- ✓  node  test/sdk/recommendations/useRecommendationUserId.test.ts (4 tests) 192ms
- ✓  node  test/utils/isLocalHost.test.ts (7 tests) 6ms
+ ✓  node  test/sdk/recommendations/useRecommendationUserId.test.ts (4 tests) 181ms
+ ✓  node  test/utils/isLocalHost.test.ts (7 tests) 5ms
+ ✓  node  test/components/account/OrganizationDrawerBody.test.tsx (3 tests) 60ms
  ✓  node  test/utils/userOrderStatus.test.ts (3 tests) 4ms
- ✓  node  test/components/account/OrganizationDrawerBody.test.tsx (3 tests) 42ms
  ✓  node  test/utils/getCookie.test.ts (4 tests) 5ms
- ✓  node  test/sdk/analytics/utils.test.ts (2 tests) 5ms
+ ✓  node  test/sdk/analytics/utils.test.ts (2 tests) 4ms
  ✓  node  test/components/auth/ProfileChallenge.test.tsx (3 tests) 29ms
- ✓  node  test/instrumentation.test.ts (3 tests) 5ms
+ ✓  node  test/instrumentation.test.ts (3 tests) 7ms
  ✓  node  test/sdk/account/clearPersistedSessionState.test.ts (1 test) 11ms
- ✓  node  test/components/quotes/MyAccountQuoteStatusBadge.test.tsx (2 tests) 25ms
+ ✓  node  test/components/quotes/MyAccountQuoteStatusBadge.test.tsx (2 tests) 27ms
 
- Test Files  93 passed (93)
-      Tests  742 passed (742)
-   Start at  21:32:47
-   Duration  45.76s (transform 11.27s, setup 0ms, import 38.81s, tests 14.72s, environment 57.88s)
+ Test Files  94 passed (94)
+      Tests  753 passed (753)
+   Start at  16:48:59
+   Duration  46.17s (transform 12.82s, setup 0ms, import 40.03s, tests 14.85s, environment 56.78s)
 

package/@generated/gql.ts

@@ -29,7 +29,7 @@ type Documents = {
     "\n  fragment ServerCollectionPage on Query {\n    collection(slug: $slug) {\n      id\n    }\n  }\n": typeof types.ServerCollectionPageFragmentDoc,
     "\n  fragment ServerProduct on Query {\n    product(locator: $locator) {\n      id: productID\n    }\n  }\n": typeof types.ServerProductFragmentDoc,
     "\n  query ServerAccountPageQuery {\n    accountProfile {\n      name\n    }\n  }\n": typeof types.ServerAccountPageQueryDocument,
-    "\n  query ServerCollectionPageQuery($slug: String!) {\n    ...ServerCollectionPage\n    collection(slug: $slug) {\n      seo {\n        title\n        description\n      }\n      breadcrumbList {\n        itemListElement {\n          item\n          name\n          position\n        }\n      }\n      meta {\n        selectedFacets {\n          key\n          value\n        }\n      }\n      otherLocales {\n        locale\n        slug\n      }\n    }\n  }\n": typeof types.ServerCollectionPageQueryDocument,
+    "\n  query ServerCollectionPageQuery($slug: String!) {\n    ...ServerCollectionPage\n    collection(slug: $slug) {\n      seo {\n        title\n        description\n      }\n      breadcrumbList {\n        itemListElement {\n          item\n          name\n          position\n        }\n      }\n      meta {\n        selectedFacets {\n          key\n          value\n        }\n      }\n      otherLocales {\n        locale\n        slug\n      }\n      canonicalSlug\n    }\n  }\n": typeof types.ServerCollectionPageQueryDocument,
     "\n  query ServerProductQuery($locator: [IStoreSelectedFacet!]!) {\n    ...ServerProduct\n    product(locator: $locator) {\n      id: productID\n\n      seo {\n        title\n        description\n        canonical\n      }\n\n      brand {\n        name\n      }\n\n      sku\n      gtin\n      mpn\n      name\n      description\n      releaseDate\n\n      breadcrumbList {\n        itemListElement {\n          item\n          name\n          position\n        }\n      }\n\n      image {\n        url\n        alternateName\n      }\n\n      offers {\n        lowPrice\n        highPrice\n        lowPriceWithTaxes\n        priceCurrency\n        offers {\n          availability\n          price\n          priceValidUntil\n          priceCurrency\n          itemCondition\n          priceToken\n          seller {\n            identifier\n          }\n        }\n      }\n\n      isVariantOf {\n        productGroupID\n      }\n\n      otherLocales {\n        locale\n        slug\n      }\n\n      defaultLocaleSlug\n\n      ...ProductDetailsFragment_product\n    }\n  }\n": typeof types.ServerProductQueryDocument,
     "\n  query ServerListCardsQuery {\n    listCreditCards {\n      list {\n        accountId\n        bin\n        cardNumber\n        cardLabel\n        paymentSystem\n        paymentSystemName\n        isDefault\n        isActive\n        origin\n      }\n    }\n    accountProfile {\n      name\n    }\n    hasAdHocCardAccess\n  }\n": typeof types.ServerListCardsQueryDocument,
     "\n  fragment UserOrderItemsFragment on UserOrderItems {\n    id\n    name\n    quantity\n    sellingPrice\n    unitMultiplier\n    measurementUnit\n    imageUrl\n    detailUrl\n    refId\n    rewardValue\n  }\n": typeof types.UserOrderItemsFragmentFragmentDoc,
@@ -82,7 +82,7 @@ const documents: Documents = {
     "\n  fragment ServerCollectionPage on Query {\n    collection(slug: $slug) {\n      id\n    }\n  }\n": types.ServerCollectionPageFragmentDoc,
     "\n  fragment ServerProduct on Query {\n    product(locator: $locator) {\n      id: productID\n    }\n  }\n": types.ServerProductFragmentDoc,
     "\n  query ServerAccountPageQuery {\n    accountProfile {\n      name\n    }\n  }\n": types.ServerAccountPageQueryDocument,
-    "\n  query ServerCollectionPageQuery($slug: String!) {\n    ...ServerCollectionPage\n    collection(slug: $slug) {\n      seo {\n        title\n        description\n      }\n      breadcrumbList {\n        itemListElement {\n          item\n          name\n          position\n        }\n      }\n      meta {\n        selectedFacets {\n          key\n          value\n        }\n      }\n      otherLocales {\n        locale\n        slug\n      }\n    }\n  }\n": types.ServerCollectionPageQueryDocument,
+    "\n  query ServerCollectionPageQuery($slug: String!) {\n    ...ServerCollectionPage\n    collection(slug: $slug) {\n      seo {\n        title\n        description\n      }\n      breadcrumbList {\n        itemListElement {\n          item\n          name\n          position\n        }\n      }\n      meta {\n        selectedFacets {\n          key\n          value\n        }\n      }\n      otherLocales {\n        locale\n        slug\n      }\n      canonicalSlug\n    }\n  }\n": types.ServerCollectionPageQueryDocument,
     "\n  query ServerProductQuery($locator: [IStoreSelectedFacet!]!) {\n    ...ServerProduct\n    product(locator: $locator) {\n      id: productID\n\n      seo {\n        title\n        description\n        canonical\n      }\n\n      brand {\n        name\n      }\n\n      sku\n      gtin\n      mpn\n      name\n      description\n      releaseDate\n\n      breadcrumbList {\n        itemListElement {\n          item\n          name\n          position\n        }\n      }\n\n      image {\n        url\n        alternateName\n      }\n\n      offers {\n        lowPrice\n        highPrice\n        lowPriceWithTaxes\n        priceCurrency\n        offers {\n          availability\n          price\n          priceValidUntil\n          priceCurrency\n          itemCondition\n          priceToken\n          seller {\n            identifier\n          }\n        }\n      }\n\n      isVariantOf {\n        productGroupID\n      }\n\n      otherLocales {\n        locale\n        slug\n      }\n\n      defaultLocaleSlug\n\n      ...ProductDetailsFragment_product\n    }\n  }\n": types.ServerProductQueryDocument,
     "\n  query ServerListCardsQuery {\n    listCreditCards {\n      list {\n        accountId\n        bin\n        cardNumber\n        cardLabel\n        paymentSystem\n        paymentSystemName\n        isDefault\n        isActive\n        origin\n      }\n    }\n    accountProfile {\n      name\n    }\n    hasAdHocCardAccess\n  }\n": types.ServerListCardsQueryDocument,
     "\n  fragment UserOrderItemsFragment on UserOrderItems {\n    id\n    name\n    quantity\n    sellingPrice\n    unitMultiplier\n    measurementUnit\n    imageUrl\n    detailUrl\n    refId\n    rewardValue\n  }\n": types.UserOrderItemsFragmentFragmentDoc,
@@ -180,7 +180,7 @@ export function gql(source: "\n  query ServerAccountPageQuery {\n    accountProf
 /**
  * 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 ServerCollectionPageQuery($slug: String!) {\n    ...ServerCollectionPage\n    collection(slug: $slug) {\n      seo {\n        title\n        description\n      }\n      breadcrumbList {\n        itemListElement {\n          item\n          name\n          position\n        }\n      }\n      meta {\n        selectedFacets {\n          key\n          value\n        }\n      }\n      otherLocales {\n        locale\n        slug\n      }\n    }\n  }\n"): typeof import('./graphql').ServerCollectionPageQueryDocument;
+export function gql(source: "\n  query ServerCollectionPageQuery($slug: String!) {\n    ...ServerCollectionPage\n    collection(slug: $slug) {\n      seo {\n        title\n        description\n      }\n      breadcrumbList {\n        itemListElement {\n          item\n          name\n          position\n        }\n      }\n      meta {\n        selectedFacets {\n          key\n          value\n        }\n      }\n      otherLocales {\n        locale\n        slug\n      }\n      canonicalSlug\n    }\n  }\n"): typeof import('./graphql').ServerCollectionPageQueryDocument;
 /**
  * The gql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */

package/@generated/graphql.ts

@@ -1345,13 +1345,24 @@ export type StoreCartMessage = {
 export type StoreCollection = {
   /** List of items consisting of chain linked web pages, ending with the current page. */
   breadcrumbList: StoreBreadcrumbList;
+  /**
+   * Slug the catalog resolves for the requested locale, lowercased.
+   * Meant for the page's canonical URL: `slug` echoes the path the shopper
+   * visited, and by-linkid matches case-insensitively, so without this every
+   * casing variant would claim to be canonical. Unlike `otherLocales`, it may fall
+   * back to a slug registered for another locale, so it must never be used to
+   * build hreflang annotations.
+   */
+  canonicalSlug: Maybe<Scalars['String']['output']>;
   /** Collection ID. */
   id: Scalars['ID']['output'];
   /** Collection meta information. Used for search. */
   meta: StoreCollectionMeta;
   /**
    * Localized versions of this collection for all available locales.
-   * Only populated when localization is enabled.
+   * Only announces slugs the catalog has registered for each locale, so it is safe
+   * to build hreflang annotations from. Only populated when localization is
+   * enabled.
    */
   otherLocales: Maybe<Array<StoreCollectionLocale>>;
   /** Meta tag data. */
@@ -2820,7 +2831,7 @@ export type ServerCollectionPageQueryQueryVariables = Exact<{
 }>;
 
 
-export type ServerCollectionPageQueryQuery = { collection: { id: string, seo: { title: string, description: string }, breadcrumbList: { itemListElement: Array<{ item: string, name: string, position: number }> }, meta: { selectedFacets: Array<{ key: string, value: string }> }, otherLocales: Array<{ locale: string, slug: string }> | null } };
+export type ServerCollectionPageQueryQuery = { collection: { canonicalSlug: string | null, id: string, seo: { title: string, description: string }, breadcrumbList: { itemListElement: Array<{ item: string, name: string, position: number }> }, meta: { selectedFacets: Array<{ key: string, value: string }> }, otherLocales: Array<{ locale: string, slug: string }> | null } };
 
 export type ServerProductQueryQueryVariables = Exact<{
   locator: Array<IStoreSelectedFacet> | IStoreSelectedFacet;
@@ -3624,7 +3635,7 @@ export const SearchEvent_MetadataFragmentDoc = new TypedDocumentString(`
 }
     `, {"fragmentName":"SearchEvent_metadata"}) as unknown as TypedDocumentString<SearchEvent_MetadataFragment, unknown>;
 export const ServerAccountPageQueryDocument = {"__meta__":{"operationName":"ServerAccountPageQuery","operationHash":"9baae331b75848a310fecb457e8c971ae27897ff"}} as unknown as TypedDocumentString<ServerAccountPageQueryQuery, ServerAccountPageQueryQueryVariables>;
-export const ServerCollectionPageQueryDocument = {"__meta__":{"operationName":"ServerCollectionPageQuery","operationHash":"d46841b30ae1f6350021b5cf02f253d56c848664"}} as unknown as TypedDocumentString<ServerCollectionPageQueryQuery, ServerCollectionPageQueryQueryVariables>;
+export const ServerCollectionPageQueryDocument = {"__meta__":{"operationName":"ServerCollectionPageQuery","operationHash":"fa5f52d2e0c1c7905c1d8572b81ce48d62265a14"}} as unknown as TypedDocumentString<ServerCollectionPageQueryQuery, ServerCollectionPageQueryQueryVariables>;
 export const ServerProductQueryDocument = {"__meta__":{"operationName":"ServerProductQuery","operationHash":"13fc9efa8628b91971e3a8aa985e6cdbed70adae"}} as unknown as TypedDocumentString<ServerProductQueryQuery, ServerProductQueryQueryVariables>;
 export const ServerListCardsQueryDocument = {"__meta__":{"operationName":"ServerListCardsQuery","operationHash":"392cf85d18d66b94d6ea8d6b2a3c6ffb5c94683d"}} as unknown as TypedDocumentString<ServerListCardsQueryQuery, ServerListCardsQueryQueryVariables>;
 export const ServerOrderDetailsQueryDocument = {"__meta__":{"operationName":"ServerOrderDetailsQuery","operationHash":"bdf677bbccce12186a5ef15aebdce46585a99782"}} as unknown as TypedDocumentString<ServerOrderDetailsQueryQuery, ServerOrderDetailsQueryQueryVariables>;

package/@generated/persisted-documents.json

@@ -1,6 +1,6 @@
 {
   "9baae331b75848a310fecb457e8c971ae27897ff": "query ServerAccountPageQuery { accountProfile { name } }",
-  "d46841b30ae1f6350021b5cf02f253d56c848664": "fragment ServerCollectionPage on Query { collection(slug: $slug) { id } } query ServerCollectionPageQuery($slug: String!) { collection(slug: $slug) { breadcrumbList { itemListElement { item name position } } meta { selectedFacets { key value } } otherLocales { locale slug } seo { description title } } ...ServerCollectionPage }",
+  "fa5f52d2e0c1c7905c1d8572b81ce48d62265a14": "fragment ServerCollectionPage on Query { collection(slug: $slug) { id } } query ServerCollectionPageQuery($slug: String!) { collection(slug: $slug) { breadcrumbList { itemListElement { item name position } } canonicalSlug meta { selectedFacets { key value } } otherLocales { locale slug } seo { description title } } ...ServerCollectionPage }",
   "13fc9efa8628b91971e3a8aa985e6cdbed70adae": "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 ProductDetailsFragment_product on StoreProduct { additionalProperty { name propertyID value valueReference } brand { name } description gtin image { alternateName url } isVariantOf { name productGroupID skuVariants { activeVariations allVariantProducts { name productID } availableVariations slugsMap } } name offers { lowPrice lowPriceWithTaxes offers { availability listPrice listPriceWithTaxes price priceToken priceWithTaxes quantity seller { identifier } } } id: productID sku unitMultiplier ...CartProductItem } fragment ServerProduct on Query { product(locator: $locator) { id: productID } } query ServerProductQuery($locator: [IStoreSelectedFacet!]!) { product(locator: $locator) { brand { name } breadcrumbList { itemListElement { item name position } } defaultLocaleSlug description gtin image { alternateName url } isVariantOf { productGroupID } mpn name offers { highPrice lowPrice lowPriceWithTaxes offers { availability itemCondition price priceCurrency priceToken priceValidUntil seller { identifier } } priceCurrency } otherLocales { locale slug } id: productID releaseDate seo { canonical description title } sku ...ProductDetailsFragment_product } ...ServerProduct }",
   "392cf85d18d66b94d6ea8d6b2a3c6ffb5c94683d": "query ServerListCardsQuery { accountProfile { name } hasAdHocCardAccess listCreditCards { list { accountId bin cardLabel cardNumber isActive isDefault origin paymentSystem paymentSystemName } } }",
   "bdf677bbccce12186a5ef15aebdce46585a99782": "query ServerOrderDetailsQuery($orderId: String!) { accountProfile { name } userOrder(orderId: $orderId) { allowCancellation budgetData { budgets { allocations { id linkedEntity { id } reservations } balance { remaining } id name } } canProcessOrderAuthorization clientProfileData { corporateName email firstName isCorporate lastName phone } creationDate customFields { fields { name refId value } id type } deliveryOptionsData { contact { email name phone } deliveryOptions { address { addressId addressType city complement country entityId geoCoordinates neighborhood number postalCode receiverName reference state street versionId } deliveryChannel deliveryCompany deliveryWindow { endDateUtc price startDateUtc } friendlyDeliveryOptionName friendlyShippingEstimate items { id imageUrl name price quantity sellingPrice tax taxPriceTagsTotal total uniqueId } pickupStoreInfo { additionalInfo address { addressId addressType city complement country entityId geoCoordinates neighborhood number postalCode receiverName reference state street versionId } dockId friendlyName isPickupStore } quantityOfDifferentItems selectedSla seller shippingEstimate shippingEstimateDate total } } orderId paymentData { transactions { isActive payments { bankIssuedInvoiceIdentificationNumber connectorResponses { authId } group id installments lastDigits paymentOrigin paymentSystemName redemptionCode referenceValue tid url value } } } ruleForAuthorization { dimensionId orderAuthorizationId rule { authorizationData { authorizers { authorizationDate email id type } requireAllApprovals } authorizedEmails doId id isUserAuthorized isUserNextAuthorizer name notification priority scoreInterval { accept deny } status timeout trigger { condition { conditionType description expression greatherThan lessThan } effect { description effectType funcPath } } } } shopper { email firstName lastName phone } status statusDescription storePreferencesData { currencyCode } totals { id name value } } }",

package/@generated/schema.graphql

@@ -1330,9 +1330,20 @@ type StoreCollection {
   type: StoreCollectionType!
   """
   Localized versions of this collection for all available locales.
-  Only populated when localization is enabled.
+  Only announces slugs the catalog has registered for each locale, so it is safe
+  to build hreflang annotations from. Only populated when localization is
+  enabled.
   """
   otherLocales: [StoreCollectionLocale!]
+  """
+  Slug the catalog resolves for the requested locale, lowercased.
+  Meant for the page's canonical URL: `slug` echoes the path the shopper
+  visited, and by-linkid matches case-insensitively, so without this every
+  casing variant would claim to be canonical. Unlike `otherLocales`, it may fall
+  back to a slug registered for another locale, so it must never be used to
+  build hreflang annotations.
+  """
+  canonicalSlug: String
 }
 
 """

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.
 
+## [4.7.1-dev.2](https://github.com/vtex/faststore/compare/v4.7.1-dev.1...v4.7.1-dev.2) (2026-09-02)
+
+**Note:** Version bump only for package @faststore/core
+
+## [4.7.1-dev.1](https://github.com/vtex/faststore/compare/v4.7.1-dev.0...v4.7.1-dev.1) (2026-09-01)
+
+### Bug Fixes
+
+- point localized canonical and hreflang at the rendered locale ([#3470](https://github.com/vtex/faststore/issues/3470)) ([d9038cf](https://github.com/vtex/faststore/commit/d9038cf631cf40eae5b9d9e3eb2c33290eba7b73))
+
 ## [4.7.1-dev.0](https://github.com/vtex/faststore/compare/v4.7.0...v4.7.1-dev.0) (2026-08-31)
 
 **Note:** Version bump only for package @faststore/core

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faststore/core",
-  "version": "4.7.1-dev.0",
+  "version": "4.7.1-dev.2",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -71,11 +71,11 @@
     "style-loader": "^3.3.1",
     "swr": "^2.2.5",
     "use-sync-external-store": "^1.6.0",
-    "@faststore/api": "4.7.1-dev.0",
-    "@faststore/diagnostics": "4.7.1-dev.0",
-    "@faststore/lighthouse": "4.7.1-dev.0",
-    "@faststore/sdk": "4.7.1-dev.0",
-    "@faststore/ui": "4.7.1-dev.0"
+    "@faststore/api": "4.7.1-dev.2",
+    "@faststore/lighthouse": "4.7.1-dev.2",
+    "@faststore/ui": "4.7.1-dev.2",
+    "@faststore/diagnostics": "4.7.1-dev.2",
+    "@faststore/sdk": "4.7.1-dev.2"
   },
   "devDependencies": {
     "@cypress/code-coverage": "^3.12.1",

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

@@ -1,4 +1,5 @@
 import { NextSeo, SiteLinksSearchBoxJsonLd } from 'next-seo'
+import { useRouter } from 'next/router'
 import type { ComponentType } from 'react'
 
 import { default as GLOBAL_COMPONENTS } from 'src/components/cms/global/Components'
@@ -53,6 +54,7 @@ export default function LandingPage({
   globalSections,
   globalSettings,
 }: LandingPageProps) {
+  const router = useRouter()
   const context = {
     data: serverData,
     globalSettings,
@@ -63,7 +65,7 @@ export default function LandingPage({
     storeConfig.seo.titleTemplate ??
     storeConfig.seo.title
 
-  const storeURL = getStoreURL()
+  const storeURL = getStoreURL(router.locale)
 
   return (
     <>

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

@@ -24,6 +24,7 @@ import { faststoreLoader } from 'src/components/ui/Image/loader'
 import { LocalizedProductProvider } from 'src/sdk/localization/LocalizedProductContext'
 import ProductListing from './ProductListing'
 import { getStoreURL } from 'src/sdk/localization/useLocalizationConfig'
+import { buildHreflangLinks } from 'src/utils/localization/hreflang'
 
 export type ProductListingPageProps = {
   data: ServerCollectionPageQueryQuery & ServerManyProductsQueryQuery
@@ -105,10 +106,22 @@ export default function ProductListingPage({
     collection?.seo.description || // Use description that comes from the Checkout API
     plpSeo?.descriptionTemplate?.replace(/%s/g, () => title) || // Use description template from the SEO config for PLP
     storeSeo.description // Use default description from the store SEO config
-  const storeURL = getStoreURL()
-
+  const otherLocales = server.collection?.otherLocales
+  const storeURL = getStoreURL(router.locale).replace(/\/$/, '')
+
+  // The slug the catalog resolves, not the one the shopper typed: by-linkid
+  // matches case-insensitively, so /Apparel and /apparel are the same page and
+  // must not each claim to be canonical. `otherLocales` is deliberately not
+  // used here — it only carries registered translations, so a page reached
+  // through a locale with no translation of its own would have no canonical at
+  // all. Falls back to the visited path when the backend resolves no slug.
+  const canonicalSlug = server.collection?.canonicalSlug
   const [pathname] = router.asPath.split('?')
-  const canonical = `${storeURL}${pathname}`
+  const canonical = canonicalSlug
+    ? `${storeURL}/${canonicalSlug}`
+    : `${storeURL}${pathname}`
+
+  const hreflangLinks = buildHreflangLinks(otherLocales, router.locale)
   const itemsPerPage = settings?.productGallery?.itemsPerPage ?? ITEMS_PER_PAGE
 
   let itemListElements = collection?.breadcrumbList.itemListElement ?? []
@@ -143,10 +156,7 @@ export default function ProductListingPage({
     : undefined
 
   return (
-    <LocalizedProductProvider
-      otherLocales={server.collection?.otherLocales}
-      urlSuffix=""
-    >
+    <LocalizedProductProvider otherLocales={otherLocales} urlSuffix="">
       <SearchProvider
         onChange={applySearchState}
         itemsPerPage={itemsPerPage}
@@ -169,6 +179,7 @@ export default function ProductListingPage({
           description={description}
           titleTemplate={titleTemplate}
           canonical={canonical}
+          languageAlternates={hreflangLinks}
           openGraph={{
             type: 'website',
             title,

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

@@ -110,6 +110,7 @@ const query = gql(`
         locale
         slug
       }
+      canonicalSlug
     }
   }
 `)

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

@@ -3,6 +3,7 @@ import deepmerge from 'deepmerge'
 import type { GetStaticPaths, GetStaticProps } from 'next'
 import { BreadcrumbJsonLd, NextSeo, ProductJsonLd } from 'next-seo'
 import Head from 'next/head'
+import { useRouter } from 'next/router'
 import type { ComponentType } from 'react'
 
 import { gql } from '@generated'
@@ -28,6 +29,7 @@ import { useSession } from 'src/sdk/session'
 import { execute } from 'src/server'
 import { getComponentKey } from 'src/utils/cms'
 import { getChannelForLocale } from 'src/utils/localization/bindingPaths'
+import { buildHreflangLinks } from 'src/utils/localization/hreflang'
 import { toProductJsonLdOffer } from 'src/utils/productJsonLd'
 
 import storeConfig from 'discovery.config'
@@ -97,46 +99,6 @@ const overwriteMerge = (_: any[], sourceArray: any[]) => sourceArray
 const isClientOfferEnabled = (storeConfig as StoreConfig).experimental
   .enableClientOffer
 
-function buildHreflangLinks(
-  storeConfig: StoreConfig,
-  otherLocales: Array<{ locale: string; slug: string }> | null | undefined
-): Array<{ rel: string; hrefLang: string; href: string }> {
-  if (!storeConfig.localization?.enabled || !otherLocales?.length) return []
-
-  const locales = storeConfig.localization.locales
-  const baseStoreUrl = storeConfig.storeUrl.replace(/\/$/, '')
-  const defaultLocale = storeConfig.localization.defaultLocale
-  const links: Array<{ rel: string; hrefLang: string; href: string }> = []
-
-  for (const { locale, slug } of otherLocales) {
-    const bindingUrl = locales?.[locale]?.bindings?.[0]?.url
-    if (typeof bindingUrl === 'string' && bindingUrl.length > 0) {
-      links.push({
-        rel: 'alternate',
-        hrefLang: locale,
-        href: `${bindingUrl.replace(/\/$/, '')}/${slug}/p`,
-      })
-    }
-  }
-
-  // PREMISE: the default locale is served at the store root (no locale prefix),
-  // which is how Next.js i18n sub-path routing works — the `defaultLocale` has no
-  // prefix while other locales live under `/{locale}`. Hence `x-default` points to
-  // `${storeUrl}/{slug}/p`. If a store ever serves its default locale under a path
-  // prefix or a dedicated domain instead of the root, this href must be derived
-  // from that locale's binding URL instead of `storeUrl`.
-  const defaultEntry = otherLocales.find((e) => e.locale === defaultLocale)
-  if (defaultEntry) {
-    links.push({
-      rel: 'alternate',
-      hrefLang: 'x-default',
-      href: `${baseStoreUrl}/${defaultEntry.slug}/p`,
-    })
-  }
-
-  return links
-}
-
 // With client-side offer enabled, `useOffer` only refreshes price aggregates —
 // it does not rebuild the per-seller array the buy button reads. Keep that array
 // from SSG, but inject the fresh Pricing Fallback token into the best offer so the
@@ -162,6 +124,7 @@ function Page({
   meta,
 }: Props) {
   const { currency } = useSession()
+  const router = useRouter()
 
   const { product } = server
   const {
@@ -197,15 +160,16 @@ function Page({
 
   // hreflang alternate links for multi-locale stores
   const hreflangLinks = buildHreflangLinks(
-    storeConfig as StoreConfig,
-    server.product.otherLocales
+    server.product.otherLocales,
+    router.locale,
+    '/p'
   )
 
   let itemListElements = product.breadcrumbList.itemListElement ?? []
   if (itemListElements.length !== 0) {
     itemListElements = itemListElements.map(
       ({ item: pathname, name, position }) => {
-        const pageUrl = getStoreURL() + pathname
+        const pageUrl = getStoreURL(router.locale) + pathname
 
         return { name, position, item: pageUrl }
       }
@@ -314,7 +278,7 @@ function Page({
               ]
             : []),
         ]}
-        additionalLinkTags={hreflangLinks}
+        languageAlternates={hreflangLinks}
         titleTemplate={titleTemplate}
       />
 
@@ -512,7 +476,10 @@ export const getStaticProps: GetStaticProps<
   const { seo } = data.product
   const title = seo.title
   const description = seo.description
-  const canonical = `${getStoreURL()}${seo.canonical}`
+  // Without the locale, static rendering has no request to match a binding
+  // against and falls back to the default locale, so a localized PDP would
+  // point its canonical at the default locale's prefix.
+  const canonical = `${getStoreURL(locale).replace(/\/$/, '')}${seo.canonical}`
 
   const meta = { title, description, canonical }
 

package/src/pages/index.tsx

@@ -1,5 +1,6 @@
 import type { GetStaticProps } from 'next'
 import { NextSeo, OrganizationJsonLd, SiteLinksSearchBoxJsonLd } from 'next-seo'
+import { useRouter } from 'next/router'
 
 import RenderSections from 'src/components/cms/RenderSections'
 import type { PageContentType } from 'src/server/cms'
@@ -28,6 +29,7 @@ function Page({
   globalSections: globalSectionsProp,
   serverData,
 }: Props) {
+  const router = useRouter()
   const { sections: globalSections, settings: globalSettings } =
     globalSectionsProp ?? {}
   const context = {
@@ -53,7 +55,7 @@ function Page({
     {} as Record<string, string>
   )
 
-  const storeUrl = getStoreURL()
+  const storeUrl = getStoreURL(router.locale)
 
   return (
     <>

package/src/sdk/localization/settings.ts

@@ -28,6 +28,38 @@ export function getSettingsFromConfig(
   }
 }
 
+/**
+ * Resolves a locale's settings from configuration alone, without a request URL.
+ *
+ * Statically rendered pages have no request to match a binding against, so
+ * `getSettings` falls back to the default locale on the server and every
+ * server-rendered URL ends up describing the default locale rather than the page
+ * being built. Next resolves the locale for us during rendering, and this maps
+ * it back to a binding.
+ *
+ * The binding tie-break matches the rest of the localization layer (see
+ * `getChannelForLocale`): the one marked default, else the first declared.
+ * Returns null when the locale is unknown or has no usable binding, leaving the
+ * caller on its existing fallback.
+ */
+export function getSettingsForLocale(
+  locale?: string
+): LocalizationSettings | null {
+  if (!locale || !config.localization?.enabled) return null
+
+  const localeConfig = config.localization.locales?.[locale]
+
+  if (!localeConfig) return null
+
+  const binding =
+    localeConfig.bindings?.find((el) => el.isDefault) ??
+    localeConfig.bindings?.at(0)
+
+  if (!binding) return null
+
+  return getSettingsFromConfig(localeConfig, binding)
+}
+
 export function getSettings(params?: {
   url?: string | URL
 }): LocalizationSettings {

package/src/sdk/localization/useLocalizationConfig.tsx

@@ -2,7 +2,11 @@ import config from 'discovery.config'
 import deepEqual from 'fast-deep-equal'
 import React, { useEffect, useRef, useState } from 'react'
 import { sessionStore } from '../session'
-import { type LocalizationSettings, getSettings } from './settings'
+import {
+  type LocalizationSettings,
+  getSettings,
+  getSettingsForLocale,
+} from './settings'
 
 export const useLocalizationConfig = (params?: { url?: string | URL }) => {
   const defaultConfig = config.localization.locales[
@@ -66,13 +70,22 @@ export const useLocalizationConfig = (params?: { url?: string | URL }) => {
 type ConfigType =
   (typeof config)['localization']['locales'][keyof (typeof config)['localization']['locales']]
 
-export const getStoreURL = () => {
+/**
+ * Base URL of the storefront the current page belongs to.
+ *
+ * @param locale - Locale being rendered, as resolved by Next. Required for
+ *   anything a crawler reads (canonical, hreflang, JSON-LD): without it, server
+ *   rendering has no `window.location` to match a binding against and silently
+ *   falls back to the default locale's binding, so a localized page would
+ *   advertise URLs under the default locale's prefix.
+ */
+export const getStoreURL = (locale?: string) => {
   // If localization is not enabled, use storeUrl from config
   if (!config.localization?.enabled === true) {
     return config.storeUrl
   }
 
-  return getSettings().storeURL
+  return getSettingsForLocale(locale)?.storeURL ?? getSettings().storeURL
 }
 
 /** @description receives an react component and returns a new component with the storeURL as optional */

package/src/utils/localization/hreflang.ts

@@ -0,0 +1,73 @@
+import storeConfig from 'discovery.config'
+import { getSettingsForLocale } from 'src/sdk/localization/settings'
+import { getStoreURL } from 'src/sdk/localization/useLocalizationConfig'
+
+export type LocaleSlug = { locale: string; slug: string }
+
+export type HreflangLink = { hrefLang: string; href: string }
+
+/**
+ * Builds the hreflang cluster for a page the catalog resolves in more than one
+ * locale.
+ *
+ * `otherLocales` carries registered translations only, so a page reached through
+ * a locale that never registered a slug for it is missing from its own cluster.
+ * Search engines ignore a set that does not reference itself, which would make
+ * those annotations inert while still being reported as errors, so the cluster
+ * is dropped entirely rather than published without a self-reference.
+ *
+ * Feed the result to NextSeo's `languageAlternates`, not `additionalLinkTags`:
+ * the latter keys tags by href, so the default locale and `x-default` share a
+ * key and Next drops one of them.
+ *
+ * @param otherLocales - Slug registered for each locale that resolves this page
+ * @param currentLocale - Locale being rendered. Next leaves it undefined only
+ *   when i18n is off, which means a single locale: the default one
+ * @param urlSuffix - Appended after the slug: '/p' for products, '' for collections
+ */
+export function buildHreflangLinks(
+  otherLocales: LocaleSlug[] | null | undefined,
+  currentLocale: string | undefined,
+  urlSuffix = ''
+): HreflangLink[] {
+  if (!storeConfig.localization?.enabled || !otherLocales?.length) return []
+
+  const defaultLocale = storeConfig.localization.defaultLocale
+  const renderedLocale = currentLocale ?? defaultLocale
+
+  if (!otherLocales.some(({ locale }) => locale === renderedLocale)) return []
+
+  const links: HreflangLink[] = otherLocales
+    .filter(({ locale }) => {
+      const settings = getSettingsForLocale(locale)
+      if (!settings) {
+        console.warn(
+          `[hreflang] locale "${locale}" has no usable binding in discoveryConfig — skipped`
+        )
+      }
+      return settings !== null
+    })
+    .map(({ locale, slug }) => ({
+      hrefLang: locale,
+      href: `${getStoreURL(locale).replace(/\/$/, '')}/${slug}${urlSuffix}`,
+    }))
+
+  // x-default is what a shopper gets when no advertised locale matches, so it
+  // has to be a URL that is canonical in its own right. That is the default
+  // locale's binding, not the store root: a store whose default locale is served
+  // under a prefix or its own domain answers at the root too, but that root URL
+  // canonicalizes elsewhere and would send the cluster to a page that disclaims
+  // itself.
+  const defaultEntry = otherLocales.find(
+    ({ locale }) => locale === defaultLocale
+  )
+
+  if (defaultEntry) {
+    links.push({
+      hrefLang: 'x-default',
+      href: `${getStoreURL(defaultLocale).replace(/\/$/, '')}/${defaultEntry.slug}${urlSuffix}`,
+    })
+  }
+
+  return links
+}

package/test/sdk/localization/store-url.test.ts

@@ -93,4 +93,20 @@ describe('localization store url', () => {
       config.localization.locales['pt-BR'].bindings[0].url
     )
   })
+
+  // Static rendering has no window.location to match a binding against, so
+  // without a locale every page describes itself with the default locale's URL.
+  it('returns the requested locale binding instead of the default one', () => {
+    expect(getStoreURL('en-US')).toEqual('https://brandless.fast.store/en-US')
+  })
+
+  it('prefers the binding marked default over declaration order', () => {
+    expect(getStoreURL('pt-BR')).toEqual('https://brandless.myvtex.com')
+  })
+
+  it('falls back to the default locale for a locale that is not configured', () => {
+    expect(getStoreURL('fr-FR')).toEqual(
+      config.localization.locales['pt-BR'].bindings[0].url
+    )
+  })
 })

package/test/utils/localization/hreflang.test.ts

@@ -0,0 +1,149 @@
+import { describe, expect, it, vi } from 'vitest'
+import { buildHreflangLinks } from '../../../src/utils/localization/hreflang.js'
+
+vi.mock(import('../../../discovery.config.js'), async (original) => ({
+  default: {
+    ...((await original()).default ?? {}),
+    localization: {
+      enabled: true,
+      defaultLocale: 'en-US',
+      regions: {},
+      locales: {
+        'en-US': {
+          code: 'en-US',
+          bindings: [
+            {
+              currencyCode: 'USD',
+              // The default locale is served under a prefix, not at the root.
+              url: 'https://brandless.fast.store/en-US',
+              salesChannel: '1',
+              isDefault: true,
+            },
+          ],
+        },
+        'pt-BR': {
+          code: 'pt-BR',
+          bindings: [
+            {
+              currencyCode: 'BRL',
+              url: 'https://brandless.fast.store/pt-BR',
+              salesChannel: '2',
+              isDefault: true,
+            },
+          ],
+        },
+        'it-IT': {
+          code: 'it-IT',
+          bindings: [
+            {
+              currencyCode: 'USD',
+              // Bindings are arbitrary paths, not locale codes.
+              url: 'https://brandless.fast.store/europe/it',
+              salesChannel: '1',
+              isDefault: true,
+            },
+          ],
+        },
+      },
+      currencies: {
+        USD: { code: 'USD', name: 'US Dollar', symbol: '$' },
+        BRL: { code: 'BRL', name: 'Brazilian Real', symbol: 'R$' },
+      },
+    },
+  },
+}))
+
+const OTHER_LOCALES = [
+  { locale: 'en-US', slug: 'eletronicos' },
+  { locale: 'pt-BR', slug: 'eletronicos' },
+  { locale: 'it-IT', slug: 'elettronica' },
+]
+
+describe('buildHreflangLinks', () => {
+  it('points each locale at its own binding', () => {
+    const links = buildHreflangLinks(OTHER_LOCALES, 'en-US')
+
+    expect(links).toContainEqual({
+      hrefLang: 'pt-BR',
+      href: 'https://brandless.fast.store/pt-BR/eletronicos',
+    })
+    expect(links).toContainEqual({
+      hrefLang: 'it-IT',
+      href: 'https://brandless.fast.store/europe/it/elettronica',
+    })
+  })
+
+  // A cluster that does not reference itself is ignored by search engines.
+  it('includes the rendered locale itself', () => {
+    const links = buildHreflangLinks(OTHER_LOCALES, 'en-US')
+
+    expect(links).toContainEqual({
+      hrefLang: 'en-US',
+      href: 'https://brandless.fast.store/en-US/eletronicos',
+    })
+  })
+
+  // The store root answers too, but it canonicalizes elsewhere, so pointing
+  // x-default at it would send the cluster to a page that disclaims itself.
+  it('derives x-default from the default locale binding, not the store root', () => {
+    const links = buildHreflangLinks(OTHER_LOCALES, 'en-US')
+
+    expect(links).toContainEqual({
+      hrefLang: 'x-default',
+      href: 'https://brandless.fast.store/en-US/eletronicos',
+    })
+  })
+
+  it('appends the product suffix when given one', () => {
+    const links = buildHreflangLinks(
+      [{ locale: 'pt-BR', slug: 'camisa-12' }],
+      'pt-BR',
+      '/p'
+    )
+
+    expect(links).toContainEqual({
+      hrefLang: 'pt-BR',
+      href: 'https://brandless.fast.store/pt-BR/camisa-12/p',
+    })
+  })
+
+  it('omits x-default when the default locale has no slug registered', () => {
+    const links = buildHreflangLinks(
+      [{ locale: 'pt-BR', slug: 'eletronicos' }],
+      'pt-BR'
+    )
+
+    expect(links.some(({ hrefLang }) => hrefLang === 'x-default')).toBe(false)
+  })
+
+  // The catalog resolves the page in it-IT by falling back to another locale's
+  // slug, so the shopper sees it, but it-IT registered no translation and is
+  // therefore missing from the cluster it would be annotating.
+  it('annotates nothing when the rendered locale is not in the cluster', () => {
+    const links = buildHreflangLinks(
+      [
+        { locale: 'en-US', slug: 'eletronicos' },
+        { locale: 'pt-BR', slug: 'eletronicos' },
+      ],
+      'it-IT'
+    )
+
+    expect(links).toEqual([])
+  })
+
+  // Next only leaves the locale undefined when i18n is off, which means the
+  // store has a single locale and it is the default one.
+  it('falls back to the default locale when Next reports none', () => {
+    const links = buildHreflangLinks(OTHER_LOCALES, undefined)
+
+    expect(links).toContainEqual({
+      hrefLang: 'en-US',
+      href: 'https://brandless.fast.store/en-US/eletronicos',
+    })
+  })
+
+  it('annotates nothing when there are no alternates', () => {
+    expect(buildHreflangLinks(null, 'en-US')).toEqual([])
+    expect(buildHreflangLinks([], 'en-US')).toEqual([])
+  })
+})