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

package/.turbo/turbo-generate.log

@@ -1,9 +1,9 @@
 
-> @faststore/core@4.5.0-dev.4 generate /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@4.5.0-dev.6 generate /home/runner/work/faststore/faststore/packages/core
 > pnpm run gen-types && pnpm run cache-graphql 
 
 
-> @faststore/core@4.5.0-dev.4 gen-types /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@4.5.0-dev.6 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.5.0-dev.4 cache-graphql /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@4.5.0-dev.6 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,11 +1,11 @@
 
-> @faststore/core@4.5.0-dev.4 test /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@4.5.0-dev.6 test /home/runner/work/faststore/faststore/packages/core
 > vitest run
 
 
  RUN  v4.0.7 /home/runner/work/faststore/faststore/packages/core
 
- ✓  browser  test/sdk/session/reconcileSessionLocale.browser.test.ts (5 tests) 38ms
+ ✓  browser  test/sdk/session/reconcileSessionLocale.browser.test.ts (5 tests) 46ms
 stderr | test/components/RecommendationShelf/RecommendationShelf.browser.test.tsx
 Error in optimistic validation: TypeError: Failed to parse URL from /api/graphql?operationName=ValidateCartMutation&operationHash=8199d03debb0a6751ec53d8ee8987b78d0292acb
     at node:internal/deps/undici/undici:16416:13
@@ -32,13 +32,15 @@
   }
 }
 
+Browserslist: browsers data (caniuse-lite) is 6 months old. Please run:
+  npx update-browserslist-db@latest
+  Why you should do it regularly: https://github.com/browserslist/update-db#readme
 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 (8 tests) 276ms
- ✓  browser  test/components/account/ContractSwitcher.browser.test.tsx (13 tests) 2269ms
-     ✓ shows an error state when the list fails to load  428ms
-     ✓ requires selecting a contract before Confirm is enabled, then switches (REQ-03)  420ms
+ ✓  browser  test/components/RecommendationShelf/RecommendationShelf.browser.test.tsx (8 tests) 237ms
+ ✓  browser  test/components/account/ContractSwitcher.browser.test.tsx (13 tests) 1804ms
+     ✓ shows an error state when the list fails to load  571ms
 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(...).
 
@@ -268,10 +270,12 @@ 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/sdk/session/getInitialSession.browser.test.ts (6 tests) 43ms
- ✓  browser  test/pages/password-protection.browser.test.tsx (6 tests) 1568ms
-     ✓ renders the password protection form  617ms
- ✓  browser  test/sdk/account/changeContractToken.browser.test.ts (9 tests) 52ms
+ ✓  browser  test/pages/password-protection.browser.test.tsx (6 tests) 1941ms
+     ✓ renders the password protection form  822ms
+ ✓  browser  test/sdk/session/getInitialSession.browser.test.ts (6 tests) 25ms
+ ✓  browser  test/sdk/account/changeContractToken.browser.test.ts (9 tests) 59ms
+ ✓  browser  test/components/account/OrganizationDrawer.browser.test.tsx (5 tests) 1651ms
+     ✓ renders the menu view with contract details and manage footer  974ms
 stderr | test/sdk/localization/store-url.browser.test.ts
 Error in optimistic validation: TypeError: Cannot read properties of undefined (reading 'read')
     at validateCart (/home/runner/work/faststore/faststore/packages/core/src/sdk/cart/index.ts:121:27)
@@ -279,12 +283,9 @@ 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) 17ms
- ✓  browser  test/components/account/OrganizationDrawer.browser.test.tsx (5 tests) 2247ms
-     ✓ renders the menu view with contract details and manage footer  1249ms
-     ✓ opens the contract switcher and returns to the menu on back  505ms
-     ✓ resets to the menu when the drawer closes  303ms
- ✓  browser  test/sdk/account/useAvailableContracts.browser.test.ts (6 tests) 85ms
+ ✓  browser  test/sdk/localization/store-url.browser.test.ts (3 tests) 36ms
+ ✓  browser  test/sdk/account/useAvailableContracts.browser.test.ts (6 tests) 91ms
+ ✓  browser  test/sdk/account/useSwitchContract.browser.test.ts (4 tests) 53ms
 stderr | test/components/account/doLogout.browser.test.ts
 Error in optimistic validation: TypeError: Cannot read properties of undefined (reading 'read')
     at validateCart (/home/runner/work/faststore/faststore/packages/core/src/sdk/cart/index.ts:121:27)
@@ -292,9 +293,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/sdk/account/useSwitchContract.browser.test.ts (4 tests) 47ms
- ✓  browser  test/components/account/doLogout.browser.test.ts (1 test) 45ms
- ✓  browser  test/components/account/OrganizationDrawerHeader.browser.test.tsx (3 tests) 263ms
+ ✓  browser  test/components/account/doLogout.browser.test.ts (1 test) 24ms
+ ✓  browser  test/components/account/OrganizationDrawerHeader.browser.test.tsx (3 tests) 249ms
 stderr | test/sdk/account/clearPersistedSessionState.browser.test.ts
 Error in optimistic validation: TypeError: Cannot read properties of undefined (reading 'read')
     at validateCart (/home/runner/work/faststore/faststore/packages/core/src/sdk/cart/index.ts:121:27)
@@ -302,12 +302,12 @@ 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/OrganizationDrawerFooter.browser.test.tsx (3 tests) 248ms
  ✓  browser  test/sdk/account/clearPersistedSessionState.browser.test.ts (1 test) 8ms
- ✓  browser  test/components/account/OrganizationDrawerFooter.browser.test.tsx (3 tests) 243ms
- ✓  browser  test/utils/isLocalHost.browser.test.ts (3 tests) 5ms
- ✓  node  test/utils/localization/bindingPaths.test.ts (71 tests) 19ms
+ ✓  browser  test/utils/isLocalHost.browser.test.ts (3 tests) 4ms
+ ✓  node  test/utils/localization/bindingPaths.test.ts (71 tests) 23ms
  ✓  browser  test/sdk/session/reconcileSessionLocale.disabled.browser.test.ts (1 test) 3ms
- ✓  node  test/server/password-protection-service.test.ts (22 tests) 31ms
+ ✓  node  test/server/password-protection-service.test.ts (22 tests) 30ms
 stderr | test/sdk/account/refreshToken.browser.test.ts
 Error in optimistic validation: TypeError: Cannot read properties of undefined (reading 'read')
     at validateCart (/home/runner/work/faststore/faststore/packages/core/src/sdk/cart/index.ts:121:27)
@@ -315,11 +315,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)
 
- ✓  node  test/utils/match-url.test.ts (10 tests) 9ms
- ✓  browser  test/sdk/account/refreshToken.browser.test.ts (1 test) 5ms
- ✓  node  test/sdk/localization/useBindingSelector.test.tsx (22 tests) 14ms
- ✓  node  test/pages/api/unlock.test.ts (15 tests) 223ms
- ✓  node  test/sdk/localization/bindingSelector.test.ts (18 tests) 10ms
+ ✓  browser  test/sdk/account/refreshToken.browser.test.ts (1 test) 6ms
+ ✓  node  test/utils/match-url.test.ts (10 tests) 10ms
+ ✓  node  test/sdk/localization/useBindingSelector.test.tsx (22 tests) 10ms
+ ✓  node  test/pages/api/unlock.test.ts (15 tests) 201ms
+ ✓  node  test/sdk/localization/bindingSelector.test.ts (18 tests) 6ms
 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?
 
@@ -383,22 +383,23 @@ Warning: React does not recognize the `providerProps` prop on a DOM element. If
     at Suspense
     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) 82ms
- ✓  node  test/utils/cookieCacheBusting.test.ts (10 tests) 14ms
+ ✓  node  test/components/search/SearchInputComponent.test.tsx (6 tests) 73ms
+ ✓  node  test/utils/cookieCacheBusting.test.ts (10 tests) 13ms
  ✓  node  test/sdk/search/useSearchHistory.test.ts (13 tests) 51ms
- ✓  node  test/utils/clearCookies.test.ts (20 tests) 22ms
- ✓  node  test/components/quotes/MyAccountListQuotesTable.test.tsx (12 tests) 356ms
+ ✓  node  test/experimental/myAccountCmsServerSideProps.test.ts (5 tests) 9ms
+ ✓  node  test/utils/clearCookies.test.ts (20 tests) 27ms
 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) 46ms
- ✓  node  test/components/quotes/quoteFilters.test.ts (23 tests) 25ms
- ✓  node  test/utils/multipleTemplates.test.ts (8 tests) 5ms
- ✓  node  test/utils/localization/localizeRedirectDestination.test.ts (11 tests) 5ms
- ✓  node  test/components/quotes/MyAccountListQuotes.test.tsx (9 tests) 840ms
-     ✓ navigates with the search term on blur  362ms
-     ✓ navigates without a label param when the search is cleared  363ms
- ✓  node  test/sdk/orderEntry/useOrderEntryOperation.test.ts (8 tests) 46ms
+ ✓  node  test/sdk/account/useSetPassword.test.ts (6 tests) 48ms
+ ✓  node  test/components/quotes/MyAccountListQuotesTable.test.tsx (12 tests) 354ms
+ ✓  node  test/components/quotes/quoteFilters.test.ts (23 tests) 32ms
+ ✓  node  test/utils/multipleTemplates.test.ts (8 tests) 4ms
+ ✓  node  test/utils/localization/localizeRedirectDestination.test.ts (11 tests) 4ms
+ ✓  node  test/components/quotes/MyAccountListQuotes.test.tsx (9 tests) 833ms
+     ✓ navigates with the search term on blur  363ms
+     ✓ navigates without a label param when the search is cleared  356ms
+ ✓  node  test/sdk/orderEntry/useOrderEntryOperation.test.ts (8 tests) 43ms
 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:  [
   {
@@ -446,45 +447,47 @@ Warning: React does not recognize the `providerProps` prop on a DOM element. If
 ]
 
  ✓  node  test/pages/api/graphql.test.ts (10 tests) 24ms
- ✓  node  test/sdk/orderEntry/useOrderEntryUpload.test.ts (8 tests) 53ms
- ✓  node  test/sdk/analytics/useStartRecommendationSession.test.ts (6 tests) 63ms
- ✓  node  test/components/quotes/MyAccountQuotesFilterSlider.test.tsx (5 tests) 151ms
- ✓  node  test/proxy.localization.test.ts (5 tests) 45ms
- ✓  node  test/server/index.test.ts (7 tests) 803ms
- ✓  node  test/sdk/orderEntry/useOrderEntry.test.ts (8 tests) 48ms
+ ✓  node  test/sdk/orderEntry/useOrderEntryUpload.test.ts (8 tests) 52ms
+ ✓  node  test/sdk/analytics/useStartRecommendationSession.test.ts (6 tests) 58ms
+ ✓  node  test/components/quotes/MyAccountQuotesFilterSlider.test.tsx (5 tests) 145ms
+ ✓  node  test/proxy.localization.test.ts (5 tests) 73ms
+ ✓  node  test/sdk/account/getMyAccountRoutes.test.ts (10 tests) 5ms
+ ✓  node  test/sdk/orderEntry/useOrderEntry.test.ts (8 tests) 37ms
+ ✓  node  test/server/index.test.ts (7 tests) 1241ms
+       ✓ should handle options and execute  743ms
  ✓  node  test/proxy.test.ts (4 tests) 25ms
- ✓  node  test/sdk/orderEntry/useOrderFormItems.test.ts (7 tests) 39ms
- ✓  node  test/server/webops-api.test.ts (9 tests) 26ms
- ✓  node  test/components/quotes/MyAccountQuotesSelectedTags.test.tsx (8 tests) 121ms
- ✓  node  test/sdk/account/refreshToken.test.ts (5 tests) 6ms
- ✓  node  test/server/cms/global.test.ts (3 tests) 6ms
- ✓  node  test/sdk/account/getMyAccountRoutes.test.ts (8 tests) 7ms
- ✓  node  test/server/content/service.test.ts (5 tests) 6ms
- ✓  node  test/sdk/localization/store-url.test.ts (1 test) 5ms
+ ✓  node  test/server/webops-api.test.ts (9 tests) 22ms
+ ✓  node  test/components/quotes/MyAccountQuotesSelectedTags.test.tsx (8 tests) 72ms
+ ✓  node  test/sdk/account/refreshToken.test.ts (5 tests) 7ms
+ ✓  node  test/sdk/orderEntry/useOrderFormItems.test.ts (7 tests) 37ms
+ ✓  node  test/server/cms/global.test.ts (3 tests) 3ms
+ ✓  node  test/server/content/service.test.ts (5 tests) 5ms
+ ✓  node  test/sdk/localization/store-url.test.ts (1 test) 4ms
  ✓  node  test/sdk/analytics/hasEnabledRecommendationShelf.test.ts (6 tests) 4ms
  ✓  node  test/utils/getRequestHostname.test.ts (12 tests) 6ms
- ✓  node  test/sdk/auth/useAuth.test.ts (5 tests) 37ms
- ✓  node  test/components/quotes/MyAccountQuotesStatusSelector.test.tsx (6 tests) 168ms
- ✓  node  test/pages/api/preview.test.ts (2 tests) 7ms
- ✓  node  test/utils/validateSessionRefreshToken.test.ts (6 tests) 5ms
+ ✓  node  test/sdk/auth/useAuth.test.ts (5 tests) 29ms
+ ✓  node  test/components/quotes/MyAccountQuotesStatusSelector.test.tsx (6 tests) 135ms
+ ✓  node  test/utils/validateSessionRefreshToken.test.ts (6 tests) 3ms
+ ✓  node  test/pages/api/preview.test.ts (2 tests) 16ms
  ✓  node  test/components/search/SearchInput.test.ts (6 tests) 8ms
- ✓  node  test/components/RecommendationShelf/vrn.test.ts (5 tests) 6ms
- ✓  node  test/server/cms/index.test.ts (2 tests) 15ms
- ✓  node  test/utils/retry.test.ts (5 tests) 12ms
- ✓  node  test/components/account/Layout.test.tsx (4 tests) 41ms
+ ✓  node  test/components/RecommendationShelf/vrn.test.ts (5 tests) 5ms
+ ✓  node  test/server/cms/index.test.ts (2 tests) 8ms
+ ✓  node  test/utils/retry.test.ts (5 tests) 13ms
+ ✓  node  test/components/account/Layout.test.tsx (4 tests) 39ms
  ✓  node  test/components/RecommendationShelf/useRecommendationUserId.test.ts (4 tests) 190ms
- ✓  node  test/utils/unlockResponse.test.ts (11 tests) 6ms
+ ✓  node  test/utils/unlockResponse.test.ts (11 tests) 5ms
+ ✓  node  test/server/cms/myAccountDefaultSections.test.ts (5 tests) 4ms
  ✓  node  test/components/RecommendationShelf/useRecommendations.test.ts (2 tests) 5ms
- ✓  node  test/utils/isLocalHost.test.ts (7 tests) 5ms
+ ✓  node  test/utils/isLocalHost.test.ts (7 tests) 6ms
  ✓  node  test/utils/userOrderStatus.test.ts (3 tests) 4ms
- ✓  node  test/components/account/OrganizationDrawerBody.test.tsx (3 tests) 54ms
- ✓  node  test/sdk/analytics/utils.test.ts (2 tests) 4ms
- ✓  node  test/components/auth/ProfileChallenge.test.tsx (3 tests) 37ms
- ✓  node  test/sdk/account/clearPersistedSessionState.test.ts (1 test) 14ms
- ✓  node  test/components/quotes/MyAccountQuoteStatusBadge.test.tsx (2 tests) 25ms
-
- Test Files  71 passed (71)
-      Tests  558 passed (558)
-   Start at  17:14:38
-   Duration  36.96s (transform 9.22s, setup 0ms, collect 28.92s, tests 11.09s, environment 50.83s, prepare 1.28s)
+ ✓  node  test/components/account/OrganizationDrawerBody.test.tsx (3 tests) 40ms
+ ✓  node  test/sdk/analytics/utils.test.ts (2 tests) 3ms
+ ✓  node  test/components/auth/ProfileChallenge.test.tsx (3 tests) 26ms
+ ✓  node  test/sdk/account/clearPersistedSessionState.test.ts (1 test) 13ms
+ ✓  node  test/components/quotes/MyAccountQuoteStatusBadge.test.tsx (2 tests) 23ms
+
+ Test Files  73 passed (73)
+      Tests  570 passed (570)
+   Start at  21:42:33
+   Duration  33.01s (transform 7.79s, setup 0ms, collect 26.92s, tests 10.65s, environment 41.89s, prepare 1.09s)
 

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.5.0-dev.7](https://github.com/vtex/faststore/compare/v4.5.0-dev.6...v4.5.0-dev.7) (2026-08-03)
+
+### Features
+
+- CMS-driven custom My Account pages ([#3411](https://github.com/vtex/faststore/issues/3411)) ([e38b278](https://github.com/vtex/faststore/commit/e38b2780bb7386a8ef7b83a9e3de5956bf6de50e))
+
+# [4.5.0-dev.6](https://github.com/vtex/faststore/compare/v4.5.0-dev.5...v4.5.0-dev.6) (2026-07-28)
+
+### Bug Fixes
+
+- prevent My Account 500s from empty session profile and missing CMS content ([#3417](https://github.com/vtex/faststore/issues/3417)) ([2c2a18f](https://github.com/vtex/faststore/commit/2c2a18fe8f4127404d6634933cce778a64169c08))
+
 # [4.5.0-dev.5](https://github.com/vtex/faststore/compare/v4.5.0-dev.4...v4.5.0-dev.5) (2026-07-27)
 
 ### Features

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faststore/core",
-  "version": "4.5.0-dev.5",
+  "version": "4.5.0-dev.7",
   "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.5.0-dev.5",
-    "@faststore/diagnostics": "4.5.0-dev.5",
-    "@faststore/sdk": "4.5.0-dev.5",
-    "@faststore/lighthouse": "4.5.0-dev.5",
-    "@faststore/ui": "4.5.0-dev.5"
+    "@faststore/lighthouse": "4.5.0-dev.7",
+    "@faststore/diagnostics": "4.5.0-dev.7",
+    "@faststore/api": "4.5.0-dev.7",
+    "@faststore/ui": "4.5.0-dev.7",
+    "@faststore/sdk": "4.5.0-dev.7"
   },
   "devDependencies": {
     "@cypress/code-coverage": "^3.12.1",

package/src/experimental/myAccountCmsServerSideProps.ts

@@ -0,0 +1,146 @@
+import { gql } from '@generated/gql'
+import type {
+  ServerAccountPageQueryQuery,
+  ServerAccountPageQueryQueryVariables,
+} from '@generated/graphql'
+import type { Locator } from '@vtex/client-cms'
+import type { GetServerSideProps } from 'next'
+
+import { getGlobalSectionsData } from 'src/components/cms/GlobalSections'
+import { getIsRepresentative } from 'src/sdk/account/getIsRepresentative'
+import type { AccountNavigationLabels } from 'src/sdk/account/getMyAccountRoutes'
+import { validateUser } from 'src/sdk/account/validateUser'
+import { execute } from 'src/server'
+import { fetchMyAccountPageContent } from 'src/server/cms/fetchMyAccountPageContent'
+import { injectGlobalSections } from 'src/server/cms/global'
+import { extractAccountNavigationData } from 'src/server/cms/myAccountDefaultSections'
+import { localizeRedirectDestination } from 'src/utils/localization/localizeRedirectDestination'
+import { withLocaleValidationSSR } from 'src/utils/localization/withLocaleValidation'
+import { getMyAccountRedirect } from 'src/utils/myAccountRedirect'
+import storeConfig from '../../discovery.config'
+import type { MyAccountProps } from './myAccountServerSideProps'
+
+export type MyAccountCmsPageProps = MyAccountProps & {
+  pageSections: Array<{
+    name: string
+    data: Record<string, unknown>
+    $componentKey?: string
+  }>
+  navigationLabels: AccountNavigationLabels
+}
+
+const query = gql(`
+  query ServerAccountPageQuery {
+    accountProfile {
+      name
+    }
+  }
+`)
+
+/**
+ * Reusable SSR factory for CMS-driven custom My Account pages.
+ * Keeps the same auth/redirect guards as `myAccountServerSideProps`.
+ */
+export function myAccountCmsServerSideProps(
+  contentType: string,
+  pagePath: string
+): GetServerSideProps<MyAccountCmsPageProps, Record<string, string>, Locator> {
+  const handler: GetServerSideProps<
+    MyAccountCmsPageProps,
+    Record<string, string>,
+    Locator
+  > = async (context) => {
+    const contentContext = {
+      previewData: context.previewData,
+      locale: context.locale,
+    }
+
+    const validationResult = await validateUser(context)
+
+    if (!validationResult.isValid && !validationResult.needsRefresh) {
+      return {
+        redirect: {
+          destination: localizeRedirectDestination('/login', context),
+          permanent: false,
+        },
+      }
+    }
+
+    if (!validationResult.isValid && validationResult.needsRefresh) {
+      const currentPath = context.req.url || '/pvt/account'
+      return {
+        redirect: {
+          destination: localizeRedirectDestination(
+            `/pvt/account/403?from=${encodeURIComponent(currentPath)}`,
+            context
+          ),
+          permanent: false,
+        },
+      }
+    }
+
+    const { isFaststoreMyAccountEnabled, redirect } = getMyAccountRedirect({
+      query: context.query,
+    })
+
+    if (!isFaststoreMyAccountEnabled) {
+      return { redirect }
+    }
+
+    const isRepresentative = getIsRepresentative({
+      headers: context.req.headers as Record<string, string>,
+      account: storeConfig.api.storeId,
+    })
+
+    const [
+      globalSectionsPromise,
+      globalSectionsHeaderPromise,
+      globalSectionsFooterPromise,
+    ] = getGlobalSectionsData(contentContext)
+
+    const [
+      pageContent,
+      account,
+      globalSections,
+      globalSectionsHeader,
+      globalSectionsFooter,
+    ] = await Promise.all([
+      fetchMyAccountPageContent(contentType, contentContext, pagePath),
+      execute<
+        ServerAccountPageQueryQueryVariables,
+        ServerAccountPageQueryQuery
+      >(
+        {
+          variables: {},
+          operation: query,
+        },
+        { headers: { ...context.req.headers } }
+      ),
+      globalSectionsPromise,
+      globalSectionsHeaderPromise,
+      globalSectionsFooterPromise,
+    ])
+
+    const { pageSections, navigationData } = extractAccountNavigationData(
+      pageContent.sections
+    )
+
+    const globalSectionsResult = injectGlobalSections({
+      globalSections,
+      globalSectionsHeader,
+      globalSectionsFooter,
+    })
+
+    return {
+      props: {
+        globalSections: globalSectionsResult,
+        accountName: account.data?.accountProfile?.name ?? '',
+        isRepresentative,
+        pageSections,
+        navigationLabels: navigationData as AccountNavigationLabels,
+      },
+    }
+  }
+
+  return withLocaleValidationSSR(handler)
+}

package/src/experimental/myAccountServerSideProps.ts

@@ -114,7 +114,7 @@ const getServerSidePropsBase: GetServerSideProps<
   return {
     props: {
       globalSections: globalSectionsResult,
-      accountName: account.data.accountProfile.name,
+      accountName: account.data?.accountProfile?.name ?? '',
       isRepresentative,
     },
   }

package/src/pages/pvt/account/404.tsx

@@ -147,9 +147,9 @@ const getServerSidePropsBase: GetServerSideProps<
 
   return {
     props: {
-      page,
+      page: page ?? ({ sections: [], settings: {} } as PageContentType),
       globalSections: globalSectionsResult,
-      accountName: account.data.accountProfile.name,
+      accountName: account.data?.accountProfile?.name ?? '',
     },
   }
 }

package/src/sdk/account/getMyAccountRoutes.ts

@@ -3,6 +3,12 @@ export interface Route {
   title: string
   /* Accessible path within My Account */
   route: string
+  /**
+   * When set, the page body renders from this CMS content-type.
+   * Presence of this field is the single opt-in for a CMS-driven page.
+   * Pure CMS vs hybrid is derived by the CLI from whether a code body exists.
+   */
+  contentType?: string
 }
 
 export type AccountNavigationLabels = Partial<{

package/src/server/cms/fetchMyAccountPageContent.ts

@@ -16,22 +16,23 @@ export async function fetchMyAccountPageContent(
   context: FetchMyAccountPageContentContext,
   pagePath: string
 ) {
-  const pageContent = await contentService
-    .getSingleContent<PageContentType>({
-      contentType,
-      previewData: context.previewData,
-      locale: context.locale,
-    })
-    .catch((err) => {
-      console.warn('[MyAccount CMS fallback]', {
+  const pageContent =
+    (await contentService
+      .getSingleContent<PageContentType>({
         contentType,
+        previewData: context.previewData,
         locale: context.locale,
-        fallbackReason: err instanceof Error ? err.message : String(err),
-        page: pagePath,
       })
+      .catch((err) => {
+        console.warn('[MyAccount CMS fallback]', {
+          contentType,
+          locale: context.locale,
+          fallbackReason: err instanceof Error ? err.message : String(err),
+          page: pagePath,
+        })
 
-      return { sections: [], settings: {} } as PageContentType
-    })
+        return { sections: [], settings: {} } as PageContentType
+      })) ?? ({ sections: [], settings: {} } as PageContentType)
 
   const sections = withDefaultMyAccountSections(
     contentType,

package/src/server/cms/myAccountDefaultSections.ts

@@ -1,4 +1,4 @@
-export type MyAccountContentType =
+export type NativeMyAccountContentType =
   | 'myAccountProfile'
   | 'myAccountOrders'
   | 'myAccountOrderDetails'
@@ -6,13 +6,16 @@ export type MyAccountContentType =
   | 'myAccountSecurity'
   | 'myAccountUnauthorized'
 
+/** Store content-types are opaque strings; native literals keep autocompletion. */
+export type MyAccountContentType = NativeMyAccountContentType | (string & {})
+
 export type DefaultMyAccountSection = {
   name: string
   $componentKey: string
   data: Record<string, unknown>
 }
 
-const DEFAULT_SECTION_KEYS: Record<MyAccountContentType, string[]> = {
+const DEFAULT_SECTION_KEYS: Record<NativeMyAccountContentType, string[]> = {
   myAccountProfile: ['AccountNavigation', 'AccountProfile'],
   myAccountOrders: ['AccountNavigation', 'AccountOrdersList'],
   myAccountOrderDetails: [
@@ -34,7 +37,9 @@ const DEFAULT_SECTION_KEYS: Record<MyAccountContentType, string[]> = {
 export function getDefaultMyAccountSections(
   contentType: MyAccountContentType
 ): DefaultMyAccountSection[] {
-  return (DEFAULT_SECTION_KEYS[contentType] ?? []).map((key) => ({
+  return (
+    DEFAULT_SECTION_KEYS[contentType as NativeMyAccountContentType] ?? []
+  ).map((key) => ({
     name: key,
     $componentKey: key,
     data: {},

package/src/utils/myAccountRedirect.tsx

@@ -1,6 +1,16 @@
 import storeConfig from 'discovery.config'
 import type { ParsedUrlQuery } from 'node:querystring'
 
+type MyAccountRedirect = { destination: string; permanent: boolean }
+
+/**
+ * Discriminated union so callers that guard on `isFaststoreMyAccountEnabled`
+ * get a non-nullable `redirect`.
+ */
+export type MyAccountRedirectResult =
+  | { isFaststoreMyAccountEnabled: false; redirect: MyAccountRedirect }
+  | { isFaststoreMyAccountEnabled: true; redirect: null }
+
 /**
  * Check if the Faststore My Account feature flag is enabled.
  * If not, redirect to the legacy My Account URL with the query parameters.
@@ -8,10 +18,9 @@ import type { ParsedUrlQuery } from 'node:querystring'
  * @param {ParsedUrlQuery} query - The query parameters from the request.
  * @returns {Object} - An object containing the feature flag status and redirect information.
  */
-export function getMyAccountRedirect({ query }: { query: ParsedUrlQuery }): {
-  isFaststoreMyAccountEnabled: boolean
-  redirect: { destination: string; permanent: boolean } | null
-} {
+export function getMyAccountRedirect({
+  query,
+}: { query: ParsedUrlQuery }): MyAccountRedirectResult {
   const isFaststoreMyAccountEnabled =
     storeConfig.experimental?.enableFaststoreMyAccount
 
@@ -29,8 +38,8 @@ export function getMyAccountRedirect({ query }: { query: ParsedUrlQuery }): {
       permanent: false,
     }
 
-    return { isFaststoreMyAccountEnabled, redirect }
+    return { isFaststoreMyAccountEnabled: false, redirect }
   }
 
-  return { isFaststoreMyAccountEnabled, redirect: null }
+  return { isFaststoreMyAccountEnabled: true, redirect: null }
 }

package/test/experimental/myAccountCmsServerSideProps.test.ts

@@ -0,0 +1,221 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+const mockValidateUser = vi.fn()
+const mockGetMyAccountRedirect = vi.fn()
+const mockGetIsRepresentative = vi.fn()
+const mockFetchMyAccountPageContent = vi.fn()
+const mockGetGlobalSectionsData = vi.fn()
+const mockExecute = vi.fn()
+const mockInjectGlobalSections = vi.fn()
+const mockLocalizeRedirectDestination = vi.fn(
+  (destination: string) => destination
+)
+
+vi.mock('src/sdk/account/validateUser', () => ({
+  validateUser: (...args: unknown[]) => mockValidateUser(...args),
+}))
+
+vi.mock('src/utils/myAccountRedirect', () => ({
+  getMyAccountRedirect: (...args: unknown[]) =>
+    mockGetMyAccountRedirect(...args),
+}))
+
+vi.mock('src/sdk/account/getIsRepresentative', () => ({
+  getIsRepresentative: (...args: unknown[]) => mockGetIsRepresentative(...args),
+}))
+
+vi.mock('src/server/cms/fetchMyAccountPageContent', () => ({
+  fetchMyAccountPageContent: (...args: unknown[]) =>
+    mockFetchMyAccountPageContent(...args),
+}))
+
+vi.mock('src/components/cms/GlobalSections', () => ({
+  getGlobalSectionsData: (...args: unknown[]) =>
+    mockGetGlobalSectionsData(...args),
+}))
+
+vi.mock('src/server', () => ({
+  execute: (...args: unknown[]) => mockExecute(...args),
+}))
+
+vi.mock('src/server/cms/global', () => ({
+  injectGlobalSections: (...args: unknown[]) =>
+    mockInjectGlobalSections(...args),
+}))
+
+vi.mock('src/utils/localization/localizeRedirectDestination', () => ({
+  localizeRedirectDestination: (...args: unknown[]) =>
+    mockLocalizeRedirectDestination(...(args as [string])),
+}))
+
+vi.mock('src/utils/localization/withLocaleValidation', () => ({
+  withLocaleValidationSSR: <T>(fn: T) => fn,
+}))
+
+vi.mock('../../../discovery.config', () => ({
+  default: { api: { storeId: 'teststore' } },
+}))
+
+vi.mock('@generated/gql', () => ({
+  gql: (source: string) => source,
+}))
+
+import { myAccountCmsServerSideProps } from '../../../src/experimental/myAccountCmsServerSideProps'
+
+function buildContext(overrides: Record<string, unknown> = {}) {
+  return {
+    previewData: undefined,
+    locale: 'en-US',
+    query: {},
+    req: {
+      url: '/pvt/account/wishlist',
+      headers: {},
+    },
+    ...overrides,
+  } as never
+}
+
+describe('myAccountCmsServerSideProps', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockGetIsRepresentative.mockReturnValue(false)
+    mockGetGlobalSectionsData.mockReturnValue([
+      Promise.resolve({ sections: [], settings: {} }),
+      Promise.resolve({ sections: [] }),
+      Promise.resolve({ sections: [] }),
+    ])
+    mockInjectGlobalSections.mockReturnValue({
+      sections: [{ name: 'Children', data: {} }],
+      settings: {},
+    })
+    mockExecute.mockResolvedValue({
+      data: { accountProfile: { name: 'Ada' } },
+      errors: undefined,
+    })
+  })
+
+  it('redirects to login when the user is invalid and does not need refresh', async () => {
+    mockValidateUser.mockResolvedValue({
+      isValid: false,
+      needsRefresh: false,
+    })
+
+    const result = await myAccountCmsServerSideProps(
+      'myAccountWishlist',
+      '/pvt/account/wishlist'
+    )(buildContext())
+
+    expect(result).toEqual({
+      redirect: { destination: '/login', permanent: false },
+    })
+  })
+
+  it('redirects to 403 when the user is invalid and needs refresh', async () => {
+    mockValidateUser.mockResolvedValue({
+      isValid: false,
+      needsRefresh: true,
+    })
+
+    const result = await myAccountCmsServerSideProps(
+      'myAccountWishlist',
+      '/pvt/account/wishlist'
+    )(buildContext())
+
+    expect(result).toEqual({
+      redirect: {
+        destination: `/pvt/account/403?from=${encodeURIComponent('/pvt/account/wishlist')}`,
+        permanent: false,
+      },
+    })
+  })
+
+  it('returns the My Account disabled redirect', async () => {
+    mockValidateUser.mockResolvedValue({ isValid: true })
+    mockGetMyAccountRedirect.mockReturnValue({
+      isFaststoreMyAccountEnabled: false,
+      redirect: { destination: '/login', permanent: false },
+    })
+
+    const result = await myAccountCmsServerSideProps(
+      'myAccountWishlist',
+      '/pvt/account/wishlist'
+    )(buildContext())
+
+    expect(result).toEqual({
+      redirect: { destination: '/login', permanent: false },
+    })
+  })
+
+  it('returns pageSections, navigationLabels and accountName on success', async () => {
+    mockValidateUser.mockResolvedValue({ isValid: true })
+    mockGetMyAccountRedirect.mockReturnValue({
+      isFaststoreMyAccountEnabled: true,
+      redirect: { destination: '/login', permanent: false },
+    })
+    mockFetchMyAccountPageContent.mockResolvedValue({
+      sections: [
+        {
+          name: 'AccountNavigation',
+          $componentKey: 'AccountNavigation',
+          data: { profileLabel: 'Profile' },
+        },
+        {
+          name: 'HelloAccount',
+          $componentKey: 'HelloAccount',
+          data: { label: 'Hi' },
+        },
+      ],
+      settings: {},
+    })
+
+    const result = await myAccountCmsServerSideProps(
+      'myAccountWishlist',
+      '/pvt/account/wishlist'
+    )(buildContext())
+
+    expect(result).toMatchObject({
+      props: {
+        accountName: 'Ada',
+        isRepresentative: false,
+        navigationLabels: { profileLabel: 'Profile' },
+        pageSections: [
+          {
+            name: 'HelloAccount',
+            $componentKey: 'HelloAccount',
+            data: { label: 'Hi' },
+          },
+        ],
+      },
+    })
+    expect(mockFetchMyAccountPageContent).toHaveBeenCalledWith(
+      'myAccountWishlist',
+      { previewData: undefined, locale: 'en-US' },
+      '/pvt/account/wishlist'
+    )
+  })
+
+  it('returns empty pageSections when the content-type is unpublished', async () => {
+    mockValidateUser.mockResolvedValue({ isValid: true })
+    mockGetMyAccountRedirect.mockReturnValue({
+      isFaststoreMyAccountEnabled: true,
+      redirect: { destination: '/login', permanent: false },
+    })
+    mockFetchMyAccountPageContent.mockResolvedValue({
+      sections: [],
+      settings: {},
+    })
+
+    const result = await myAccountCmsServerSideProps(
+      'myAccountWishlist',
+      '/pvt/account/wishlist'
+    )(buildContext())
+
+    expect(result).toMatchObject({
+      props: {
+        pageSections: [],
+        navigationLabels: {},
+        accountName: 'Ada',
+      },
+    })
+  })
+})

package/test/sdk/account/getMyAccountRoutes.test.ts

@@ -73,6 +73,45 @@ describe('getMyAccountRoutes', () => {
     expect(result.find((r) => r.route === QUOTES_ROUTE)?.title).toBe('Quotes')
   })
 
+  it('preserves contentType through getMyAccountRoutes', () => {
+    const result = getMyAccountRoutes({
+      routes: [
+        {
+          title: 'Wishlist',
+          route: '/pvt/account/wishlist',
+          contentType: 'myAccountWishlist',
+        },
+      ],
+    })
+
+    const wishlist = result.find((r) => r.route === '/pvt/account/wishlist')
+    expect(wishlist?.contentType).toBe('myAccountWishlist')
+    expect(wishlist?.title).toBe('Wishlist')
+  })
+
+  it('keeps custom-route titles when CMS labels override native routes (FR-011)', () => {
+    const result = getMyAccountRoutes({
+      routes: [
+        {
+          title: 'Wishlist',
+          route: '/pvt/account/wishlist',
+          contentType: 'myAccountWishlist',
+        },
+      ],
+      labels: { profileLabel: 'Meu Perfil', ordersLabel: 'Meus Pedidos' },
+    })
+
+    expect(result.find((r) => r.route === PROFILE_ROUTE)?.title).toBe(
+      'Meu Perfil'
+    )
+    expect(result.find((r) => r.route === ORDERS_ROUTE)?.title).toBe(
+      'Meus Pedidos'
+    )
+    expect(result.find((r) => r.route === '/pvt/account/wishlist')?.title).toBe(
+      'Wishlist'
+    )
+  })
+
   it('marks Quotes as a B2B-only route', () => {
     expect(ROUTES_ONLY_FOR_B2B_MEMBERS).toContain(QUOTES_ROUTE)
   })

package/test/server/cms/myAccountDefaultSections.test.ts

@@ -0,0 +1,49 @@
+import { describe, expect, it } from 'vitest'
+
+import {
+  getDefaultMyAccountSections,
+  withDefaultMyAccountSections,
+} from '../../../src/server/cms/myAccountDefaultSections'
+
+describe('getDefaultMyAccountSections', () => {
+  it('returns the native section list for myAccountProfile', () => {
+    expect(getDefaultMyAccountSections('myAccountProfile')).toEqual([
+      {
+        name: 'AccountNavigation',
+        $componentKey: 'AccountNavigation',
+        data: {},
+      },
+      { name: 'AccountProfile', $componentKey: 'AccountProfile', data: {} },
+    ])
+  })
+
+  it('returns an empty list for store (unknown) content-types', () => {
+    expect(getDefaultMyAccountSections('myAccountWishlist')).toEqual([])
+  })
+})
+
+describe('withDefaultMyAccountSections', () => {
+  it('returns published sections when present', () => {
+    const sections = [
+      {
+        name: 'HelloAccount',
+        $componentKey: 'HelloAccount',
+        data: { label: 'Hi' },
+      },
+    ]
+
+    expect(withDefaultMyAccountSections('myAccountWishlist', sections)).toEqual(
+      sections
+    )
+  })
+
+  it('falls back to defaults for native types when sections are empty', () => {
+    expect(withDefaultMyAccountSections('myAccountSecurity', [])).toEqual(
+      getDefaultMyAccountSections('myAccountSecurity')
+    )
+  })
+
+  it('falls back to [] for store types when sections are empty', () => {
+    expect(withDefaultMyAccountSections('myAccountWishlist', null)).toEqual([])
+  })
+})