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

package/.turbo/turbo-build.log

@@ -1,23 +1,23 @@
 
-> @faststore/core@3.96.4-dev.0 prebuild /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.97.0-dev.1 prebuild /home/runner/work/faststore/faststore/packages/core
 > na run partytown && na run generate
 
 
-> @faststore/core@3.96.4-dev.0 partytown /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.97.0-dev.1 partytown /home/runner/work/faststore/faststore/packages/core
 > partytown copylib ./public/~partytown
 
 Partytown lib copied to: /home/runner/work/faststore/faststore/packages/core/public/~partytown
 
-> @faststore/core@3.96.4-dev.0 generate /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.97.0-dev.1 generate /home/runner/work/faststore/faststore/packages/core
 > na run generate:schema && na run generate:codegen && na run format:generated
 
 
-> @faststore/core@3.96.4-dev.0 generate:schema /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.97.0-dev.1 generate:schema /home/runner/work/faststore/faststore/packages/core
 > tsx src/server/generator/generateGraphQLSchemaFile.ts
 
 Schema GraphQL file generated successfully
 
-> @faststore/core@3.96.4-dev.0 generate:codegen /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.97.0-dev.1 generate:codegen /home/runner/work/faststore/faststore/packages/core
 > graphql-codegen
 
 [STARTED] Parse Configuration
@@ -37,11 +37,11 @@ Running lifecycle hook "afterStart" scripts...
 [CLI] Loading Documents
 [CLI] Generating output
 
-> @faststore/core@3.96.4-dev.0 format:generated /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.97.0-dev.1 format:generated /home/runner/work/faststore/faststore/packages/core
 > prettier --write "@generated/**/*.{ts,js,tsx,jsx,json}" --loglevel error
 
 
-> @faststore/core@3.96.4-dev.0 build /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.97.0-dev.1 build /home/runner/work/faststore/faststore/packages/core
 > next build
 
 ⚠ No build cache found. Please configure build caching for faster rebuilds. Read more: https://nextjs.org/docs/messages/no-cache
@@ -58,7 +58,7 @@ Browserslist: caniuse-lite is outdated. Please run:
    Creating an optimized production build ...
    Disabled SWC as replacement for Babel because of custom Babel configuration ".babelrc.js" https://nextjs.org/docs/messages/swc-disabled
    Using external babel configuration from /home/runner/work/faststore/faststore/packages/core/.babelrc.js
-Browserslist: browsers data (caniuse-lite) is 12 months old. Please run:
+Browserslist: browsers data (caniuse-lite) is 13 months old. Please run:
   npx update-browserslist-db@latest
   Why you should do it regularly: https://github.com/browserslist/update-db#readme
 <w> [webpack.cache.PackFileCacheStrategy] Skipped not serializable cache item 'Compilation/modules|/home/runner/work/faststore/faststore/node_modules/.pnpm/next@13.5.11_@babel+core@7.26.7_@opentelemetry+api@1.4.1_react-dom@18.3.1_react@18.3.1__react@18.3.1_sass@1.83.4/node_modules/next/dist/build/webpack/loaders/css-loader/src/index.js??ruleSet[1].rules[7].oneOf[9].use[1]!/home/runner/work/faststore/faststore/node_modules/.pnpm/next@13.5.11_@babel+core@7.26.7_@opentelemetry+api@1.4.1_react-dom@18.3.1_react@18.3.1__react@18.3.1_sass@1.83.4/node_modules/next/dist/build/webpack/loaders/postcss-loader/src/index.js??ruleSet[1].rules[7].oneOf[9].use[2]!/home/runner/work/faststore/faststore/node_modules/.pnpm/next@13.5.11_@babel+core@7.26.7_@opentelemetry+api@1.4.1_react-dom@18.3.1_react@18.3.1__react@18.3.1_sass@1.83.4/node_modules/next/dist/build/webpack/loaders/resolve-url-loader/index.js??ruleSet[1].rules[7].oneOf[9].use[3]!/home/runner/work/faststore/faststore/node_modules/.pnpm/next@13.5.11_@babel+core@7.26.7_@opentelemetry+api@1.4.1_react-dom@18.3.1_react@18.3.1__react@18.3.1_sass@1.83.4/node_modules/next/dist/compiled/sass-loader/cjs.js??ruleSet[1].rules[7].oneOf[9].use[4]!/home/runner/work/faststore/faststore/packages/core/src/components/common/Toast/section.module.scss': No serializer registered for Warning
@@ -80,8 +80,8 @@ Import trace for requested module:
    Collecting page data ...
    Generating static pages (0/6) ...
 
   Generating static pages (1/6) 
-Warning: Dynamic Content not found for the page: home. Refer to the Dynamic Content documentation at https://developers.vtex.com/docs/guides/faststore/dynamic-content-overview for mapping the page and the corresponding data-fetching function.
 
   Generating static pages (2/6) 
+Warning: Dynamic Content not found for the page: home. Refer to the Dynamic Content documentation at https://developers.vtex.com/docs/guides/faststore/dynamic-content-overview for mapping the page and the corresponding data-fetching function.
 
   Generating static pages (4/6) 
 
 ✓ Generating static pages (6/6) 
    Finalizing page optimization ...
@@ -111,8 +111,8 @@ Route (pages)                              Size     First Load JS
 ├   └ css/0fc6b2ff69142c6a.css             4.74 kB
 ├ λ /pvt/account/orders                    9.78 kB         150 kB
 ├   └ css/40a294d0a24ad01d.css             14.1 kB
-├ λ /pvt/account/orders/[id]               12.1 kB         152 kB
-├   └ css/5eecefd2c6deeee4.css             13.3 kB
+├ λ /pvt/account/orders/[id]               13.2 kB         153 kB
+├   └ css/edb7b00b99fe13ed.css             13.4 kB
 ├ λ /pvt/account/profile                   1.98 kB         142 kB
 ├   └ css/47f1b4e8de15d314.css             4.42 kB
 ├ λ /pvt/account/security                  3.96 kB         144 kB
@@ -123,8 +123,8 @@ Route (pages)                              Size     First Load JS
 + First Load JS shared by all              112 kB
   ├ chunks/framework-d514426edf885c68.js   45.4 kB
   ├ chunks/main-ec03882c4375091d.js        33.2 kB
-  ├ chunks/pages/_app-dbee0add24c249fe.js  25.8 kB
-  ├ chunks/webpack-5ac0858ff0030797.js     3.85 kB
+  ├ chunks/pages/_app-5875d79041a9064f.js  25.9 kB
+  ├ chunks/webpack-5269d37fda85c9f2.js     3.85 kB
   └ css/0f070d03aacd9cc5.css               3.57 kB
 
 λ  (Server)  server-side renders at runtime (uses getInitialProps or getServerSideProps)

package/.turbo/turbo-test.log

@@ -1,16 +1,17 @@
 
-> @faststore/core@3.96.4-dev.0 test /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.97.0-dev.1 test /home/runner/work/faststore/faststore/packages/core
 > jest
 
-PASS test/utils/multipleTemplates.test.ts (27.936 s)
-PASS test/utils/clearCookies.test.ts (27.74 s)
+PASS test/utils/multipleTemplates.test.ts (27.725 s)
+PASS test/utils/clearCookies.test.ts (27.116 s)
 PASS test/utils/cookieCacheBusting.test.ts
 PASS test/server/cms/global.test.ts
 PASS test/server/cms/index.test.ts
-PASS test/server/index.test.ts (32.559 s)
+PASS test/server/index.test.ts (32.42 s)
+A worker process has failed to exit gracefully and has been force exited. This is likely caused by tests leaking due to improper teardown. Try running with --detectOpenHandles to find leaks. Active timers can also cause this, ensure that .unref() was called on them.
 
 Test Suites: 6 passed, 6 total
 Tests:       47 passed, 47 total
 Snapshots:   0 total
-Time:        33.77 s
+Time:        33.84 s
 Ran all test suites.

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.
 
+# 3.97.0-dev.2 (2026-02-06)
+
+### Features
+
+- reorder feature ([#3153](https://github.com/vtex/faststore/issues/3153)) ([d0fdeec](https://github.com/vtex/faststore/commit/d0fdeec77cd94e16f1b79dcc927487320983ba0e))
+
+# [3.97.0-dev.1](https://github.com/vtex/faststore/compare/v3.96.5...v3.97.0-dev.1) (2026-02-03)
+
+# 3.97.0-dev.0 (2026-01-27)
+
+**Note:** Version bump only for package @faststore/core
+
 # [3.97.0-dev.0](https://github.com/vtex/faststore/compare/v3.96.4-dev.0...v3.97.0-dev.0) (2026-01-27)
 
 ### Features
@@ -15,6 +27,18 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 **Note:** Version bump only for package @faststore/core
 
+## [3.96.5](https://github.com/vtex/faststore/compare/v3.96.4...v3.96.5) (2026-02-02)
+
+### Bug Fixes
+
+- normalize set cookies domain host - SFS-3034 ([#3190](https://github.com/vtex/faststore/issues/3190)) ([645c91d](https://github.com/vtex/faststore/commit/645c91debeb16379f41aff6cb2225e2ed3b6086b))
+
+## [3.96.4](https://github.com/vtex/faststore/compare/v3.96.3...v3.96.4) (2026-01-26)
+
+### Bug Fixes
+
+- close filter on apply button click in FilterSlider component ([#3187](https://github.com/vtex/faststore/issues/3187)) ([f3c96eb](https://github.com/vtex/faststore/commit/f3c96eb5e73178d8c863a3e40ac576dc623a0624))
+
 ## [3.96.3](https://github.com/vtex/faststore/compare/v3.96.2...v3.96.3) (2026-01-21)
 
 **Note:** Version bump only for package @faststore/core

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faststore/core",
-  "version": "3.97.0-dev.0",
+  "version": "3.97.0-dev.2",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -51,11 +51,11 @@
     "@envelop/graphql-jit": "^8.0.3",
     "@envelop/parser-cache": "^6.0.2",
     "@envelop/validation-cache": "^6.0.2",
-    "@faststore/api": "3.96.4-dev.0",
-    "@faststore/graphql-utils": "^3.96.4-dev.0",
-    "@faststore/lighthouse": "3.96.4-dev.0",
-    "@faststore/sdk": "3.96.4-dev.0",
-    "@faststore/ui": "3.96.4-dev.0",
+    "@faststore/api": "3.97.0-dev.2",
+    "@faststore/graphql-utils": "^3.97.0-dev.2",
+    "@faststore/lighthouse": "3.97.0-dev.2",
+    "@faststore/sdk": "3.97.0-dev.2",
+    "@faststore/ui": "3.97.0-dev.2",
     "@graphql-codegen/cli": "5.0.2",
     "@graphql-codegen/client-preset": "4.2.6",
     "@graphql-codegen/typescript": "4.0.7",
@@ -123,5 +123,5 @@
     "ts-jest": "29.1.1",
     "typescript": "5.3.2"
   },
-  "gitHead": "595e9b6e3377c1f1d40990ec9f1248832913c708"
+  "gitHead": "301d4a4aa7651b1cc4cdf6e480e0242476aa00b0"
 }

package/src/components/account/orders/MyAccountOrderDetails/MyAccountOrderActions/MyAccountOrderActions.tsx

@@ -9,22 +9,29 @@ import {
 import { useState } from 'react'
 import MyAccountOrderActionModal from 'src/components/account/orders/MyAccountOrderDetails/MyAccountOrderActionModal'
 import { useCancelOrder } from 'src/sdk/account/useCancelOrder'
+import { useReorder } from 'src/sdk/account/useReorder'
+import type { ServerOrderDetailsQueryQuery } from '@generated/graphql'
+
+type Order = ServerOrderDetailsQueryQuery['userOrder']
 
 interface MyAccountOrderActionsProps {
   allowCancellation: boolean
   orderId: string
   customerEmail?: string
+  order: Order
 }
 
 export default function MyAccountOrderActions({
   allowCancellation,
   orderId,
   customerEmail,
+  order,
 }: MyAccountOrderActionsProps) {
   const [isCancelOpen, setIsCancelOpen] = useState<boolean>(false)
   const { pushToast } = useUI()
 
   const { cancelOrder, loading } = useCancelOrder()
+  const { reorder } = useReorder()
 
   const handleCancel = async () => {
     const data = {
@@ -54,9 +61,8 @@ export default function MyAccountOrderActions({
     }
   }
 
-  // Don't render if no actions are available
-  if (!allowCancellation) {
-    return null
+  const handleReorder = () => {
+    reorder(order)
   }
 
   return (
@@ -67,13 +73,20 @@ export default function MyAccountOrderActions({
             <UIIcon name="DotsThree" data-fs-dropdown-icon />
           </DropdownButton>
           <DropdownMenu align="right">
+            <DropdownItem
+              type="button"
+              onClick={handleReorder}
+              data-fs-order-actions-item
+              data-fs-order-actions-item-reorder
+            >
+              Reorder
+            </DropdownItem>
             {allowCancellation && (
               <DropdownItem
                 type="button"
                 onClick={() => setIsCancelOpen(true)}
-                style={{
-                  color: 'var(--fs-color-text)',
-                }}
+                data-fs-order-actions-item
+                data-fs-order-actions-item-cancel
               >
                 Cancel order
               </DropdownItem>

package/src/components/account/orders/MyAccountOrderDetails/MyAccountOrderActions/styles.scss

@@ -7,4 +7,14 @@
   [data-fs-dropdown-button] {
     width: var(--fs-spacing-7);
   }
+
+  [data-fs-order-actions-item] {
+    color: var(--fs-color-text);
+  }
+
+  [data-fs-order-actions-item-reorder] {
+    @include media(">=tablet") {
+      display: none;
+    }
+  }
 }

package/src/components/account/orders/MyAccountOrderDetails/MyAccountOrderDetails.tsx

@@ -6,6 +6,7 @@ import { MyAccountDeliveryOptionAccordion } from './MyAccountDeliveryOptionAccor
 import MyAccountOrderActions from './MyAccountOrderActions'
 import MyAccountOrderedByCard from './MyAccountOrderedByCard'
 import MyAccountPaymentCard from './MyAccountPaymentCard'
+import MyAccountReorderButton from './MyAccountReorderButton'
 import MyAccountSummaryCard from './MyAccountSummaryCard'
 
 import type {
@@ -55,11 +56,15 @@ export default function MyAccountOrderDetails({
           </div>
         </div>
 
-        <MyAccountOrderActions
-          allowCancellation={order.allowCancellation}
-          orderId={order.orderId}
-          customerEmail={order.clientProfileData?.email}
-        />
+        <div data-fs-order-details-header-actions>
+          <MyAccountReorderButton order={order} />
+          <MyAccountOrderActions
+            allowCancellation={order.allowCancellation}
+            orderId={order.orderId}
+            customerEmail={order.clientProfileData?.email}
+            order={order}
+          />
+        </div>
       </header>
 
       <main data-fs-order-details-content>

package/src/components/account/orders/MyAccountOrderDetails/MyAccountReorderButton/MyAccountReorderButton.tsx

@@ -0,0 +1,37 @@
+import { Button } from '@faststore/ui'
+import { useReorder } from 'src/sdk/account/useReorder'
+import type { ServerOrderDetailsQueryQuery } from '@generated/graphql'
+
+type Order = ServerOrderDetailsQueryQuery['userOrder']
+
+export interface MyAccountReorderButtonProps {
+  order: Order
+  onClick?: () => void
+}
+
+export default function MyAccountReorderButton({
+  order,
+  onClick,
+}: MyAccountReorderButtonProps) {
+  const { reorder, loading } = useReorder()
+
+  const handleClick = async () => {
+    try {
+      await reorder(order)
+      onClick?.()
+    } catch (error) {
+      console.error(error)
+    }
+  }
+
+  return (
+    <Button
+      variant="secondary"
+      data-fs-reorder-button
+      onClick={handleClick}
+      disabled={loading}
+    >
+      Reorder
+    </Button>
+  )
+}

package/src/components/account/orders/MyAccountOrderDetails/MyAccountReorderButton/index.ts

@@ -0,0 +1,2 @@
+export { default } from './MyAccountReorderButton'
+export type { MyAccountReorderButtonProps } from './MyAccountReorderButton'

package/src/components/account/orders/MyAccountOrderDetails/MyAccountReorderButton/styles.scss

@@ -0,0 +1,10 @@
+[data-fs-reorder-button] {
+  flex-shrink: 0;
+
+  &:hover:not(:disabled) {
+    --fs-button-secondary-bkg-color: var(--fs-button-primary-bkg-color);
+    --fs-button-secondary-text-color: var(--fs-button-primary-text-color);
+    --fs-button-secondary-bkg-color-hover: var(--fs-button-primary-bkg-color-hover);
+    --fs-button-secondary-bkg-color-active: var(--fs-button-primary-bkg-color-active);
+  }
+}

package/src/components/account/orders/MyAccountOrderDetails/section.module.scss

@@ -15,6 +15,7 @@
   @import "./MyAccountPaymentCard/styles.scss";
   @import "./MyAccountDeliveryOptionAccordion/styles.scss";
   @import "./MyAccountOrderActions/styles.scss";
+  @import "./MyAccountReorderButton/styles.scss";
   @import "./MyAccountStatusCard/styles.scss";
   @import "./MyAccountMoreInformationCard/styles.scss";
   @import "./MyAccountBuyingPolicyAlert/styles.scss";
@@ -24,24 +25,24 @@
   // --------------------------------------------------------
 
   // Default properties
-  --fs-order-details-padding                        : 0 20px;
+  --fs-order-details-padding: 0 20px;
 
   // Header
-  --fs-order-details-header-gap                     : var(--fs-spacing-3);
-  --fs-order-details-header-padding                 : var(--fs-spacing-5) 0 var(--fs-spacing-4);
-  --fs-order-details-header-weight                  : var(--fs-text-weight-semibold);
-  --fs-order-details-header-size                    : var(--fs-text-size-4);
-  --fs-order-details-header-line-height             : 1.33;
+  --fs-order-details-header-gap: var(--fs-spacing-3);
+  --fs-order-details-header-padding: var(--fs-spacing-5) 0 var(--fs-spacing-4);
+  --fs-order-details-header-weight: var(--fs-text-weight-semibold);
+  --fs-order-details-header-size: var(--fs-text-size-4);
+  --fs-order-details-header-line-height: 1.33;
 
   // Content
-  --fs-order-details-content-gap                     : var(--fs-spacing-4);
+  --fs-order-details-content-gap: var(--fs-spacing-4);
 
   // --------------------------------------------------------
   // Structural Styles
   // --------------------------------------------------------
 
-  @include media (">=notebook") {
-    --fs-order-details-padding                      : 0;
+  @include media(">=notebook") {
+    --fs-order-details-padding: 0;
   }
 
   [data-fs-order-details-header] {
@@ -52,14 +53,14 @@
     justify-content: space-between;
     padding: var(--fs-order-details-header-padding);
 
-    @include media (">=tablet") {
-      --fs-order-details-header-gap                 : var(--fs-spacing-2);
+    @include media(">=tablet") {
+      --fs-order-details-header-gap: var(--fs-spacing-2);
 
       align-items: center;
     }
 
-    @include media (">=notebook") {
-      --fs-order-details-header-padding             : var(--fs-spacing-6) 0;
+    @include media(">=notebook") {
+      --fs-order-details-header-padding: var(--fs-spacing-6) 0;
     }
 
     [data-fs-order-details-header-title] {
@@ -70,11 +71,21 @@
 
       [data-fs-order-details-header-back-button] {
         flex-shrink: 0;
-        margin-top: calc(var(--fs-spacing-2) * -1); // Align the back button with the title
-        margin-left: calc(var(--fs-spacing-2) * -1); // Align the back button with the content
+        margin-top:
+          calc(
+            var(--fs-spacing-2) * -1
+          ); // Align the back button with the title
+
+        margin-left:
+          calc(
+            var(--fs-spacing-2) * -1
+          ); // Align the back button with the content
 
         @include media(">=notebook") {
-          margin-top: calc(var(--fs-spacing-1) * -1); // Align the back button with the title
+          margin-top:
+            calc(
+              var(--fs-spacing-1) * -1
+            ); // Align the back button with the title
         }
       }
 
@@ -98,6 +109,19 @@
         @include truncate-title(2);
       }
     }
+
+    [data-fs-order-details-header-actions] {
+      display: flex;
+      flex-direction: row;
+      gap: var(--fs-spacing-2);
+      align-items: center;
+
+      [data-fs-reorder-button] {
+        @include media("<tablet") {
+          display: none;
+        }
+      }
+    }
   }
 
   [data-fs-order-details-content] {
@@ -105,7 +129,7 @@
     flex-direction: column;
     gap: var(--fs-order-details-content-gap);
 
-    @include media (">=notebook") {
+    @include media(">=notebook") {
       display: grid;
       grid-template-columns: repeat(2, 1fr);
     }

package/src/components/search/Filter/FilterSlider.tsx

@@ -97,7 +97,7 @@ function FilterSlider({
   applyButtonLabel,
 }: FilterSliderProps & ReturnType<typeof useFilter>) {
   const { resetInfiniteScroll, setState, state } = useSearch()
-  const { openRegionSlider } = useUI()
+  const { closeFilter, openRegionSlider } = useUI()
 
   const cmsData = getGlobalSettings()
   const { deliveryPromise: deliveryPromiseSettings } = cmsData ?? {}
@@ -147,6 +147,8 @@ function FilterSlider({
                 : selected,
               page: 0,
             })
+
+            closeFilter()
           },
           children: applyButtonLabel ?? 'Apply',
         }}

package/src/pages/api/graphql.ts

@@ -13,24 +13,91 @@ import { execute } from '../../server'
 
 const DEFAULT_MAX_AGE = 5 * 60 // 5 minutes
 const DEFAULT_STALE_WHILE_REVALIDATE = 60 * 60 // 1 hour
+const ALLOWED_HOST_SUFFIXES = ['localhost', '.vtex.app', '.localhost']
+
+// Example: "Set-Cookie: key=value; Domain=example.com; Path=/"
+const MATCH_DOMAIN_REGEXP = /(?:^|;\s*)(?:domain=)([^;]+)/i
 
 /**
- * This function replaces the setCookie domain so that we can use localhost in dev environment.
- *
- * @param request NextApiRequest
- * @param setCookie setCookie string that comes from FastStore API
- * @returns setCookie string with it domains replace
+ * Extracts hostname from the incoming request.
  */
-const replaceSetCookieDomain = (request: NextApiRequest, setCookie: string) => {
-  const MATCH_DOMAIN_REGEXP = /(?:^|;\s*)(?:domain=)([^;]+)/i
-  const faststoreAPIHostname = new URL(`https://${request.headers.host}`)
-    .hostname
-
-  // Replaces original cookie domain for FastStore API's domain hostname
-  return setCookie.replace(
-    MATCH_DOMAIN_REGEXP,
-    `; domain=${faststoreAPIHostname}`
-  )
+const getRequestHostname = ({
+  request,
+}: {
+  request: NextApiRequest
+}): string | null => {
+  const hostHeader = request.headers.host?.trim()
+  if (!hostHeader) {
+    return null
+  }
+
+  try {
+    return new URL(`https://${hostHeader}`).hostname
+  } catch {
+    return null
+  }
+}
+
+/**
+ * Checks whether the cookie domain should be replaced by host.
+ */
+const shouldReplaceCookieDomain = ({
+  cookieDomain,
+  host,
+}: {
+  cookieDomain: string
+  host: string
+}) => {
+  const normalizedDomain = cookieDomain.replace(/^\./, '').toLowerCase()
+  const normalizedHost = host.toLowerCase()
+
+  return normalizedDomain !== normalizedHost
+}
+
+/**
+ * Determines if host is eligible for domain normalization.
+ */
+const isAllowedHost = ({
+  host,
+  allowList,
+}: {
+  host: string
+  allowList: string[]
+}) => {
+  const normalizedHost = host.toLowerCase()
+
+  return allowList.some((suffix) => normalizedHost.endsWith(suffix))
+}
+
+/**
+ * Ensure the cookie domain matches the current host so the browser can store it.
+ */
+const normalizeSetCookieDomain = ({
+  request,
+  setCookie,
+}: {
+  request: NextApiRequest
+  setCookie: string
+}) => {
+  const domainMatch = setCookie.match(MATCH_DOMAIN_REGEXP)
+  if (!domainMatch) {
+    return setCookie
+  }
+
+  const host = getRequestHostname({ request })
+  if (!host) {
+    return setCookie
+  }
+  const cookieDomain = domainMatch[1]
+
+  if (
+    !isAllowedHost({ host, allowList: ALLOWED_HOST_SUFFIXES }) ||
+    !shouldReplaceCookieDomain({ cookieDomain, host })
+  ) {
+    return setCookie
+  }
+
+  return setCookie.replace(MATCH_DOMAIN_REGEXP, `; domain=${host}`)
 }
 
 const parseRequest = (request: NextApiRequest) => {
@@ -201,9 +268,7 @@ const handler: NextApiHandler = async (request, response) => {
       response.setHeader(
         'set-cookie',
         setCookieValues.map(({ setCookie }) =>
-          process.env.NODE_ENV !== 'production'
-            ? replaceSetCookieDomain(request, setCookie)
-            : setCookie
+          normalizeSetCookieDomain({ request, setCookie })
         )
       )
     }