From da702cc17e3dd50bfd421545f33867397d0163be Mon Sep 17 00:00:00 2001
From: Chancellor Clark <chancellor.clark@bigcommerce.com>
Date: Tue, 6 Jan 2026 13:28:26 -0700
Subject: [PATCH 01/69] chore(ci): remove conditionally based on deployments
 (#2807)

---
 .github/workflows/deploy.yml           | 5 +++--
 .github/workflows/regression-tests.yml | 1 -
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 36899bfe75..49423e3825 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -1,7 +1,8 @@
 name: Production Tag Deployment
 env:
-    VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
-    VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }}
+    # secrets is for dependabot compatibility; prefer vars when available
+    VERCEL_ORG_ID: ${{ vars.VERCEL_ORG_ID != '' && vars.VERCEL_ORG_ID || secrets.VERCEL_ORG_ID }}
+    VERCEL_PROJECT_ID: ${{ vars.VERCEL_PROJECT_ID != '' && vars.VERCEL_PROJECT_ID || secrets.VERCEL_PROJECT_ID }}
 on:
     push:
         tags:
diff --git a/.github/workflows/regression-tests.yml b/.github/workflows/regression-tests.yml
index afcbc46c2f..ef81ebc18e 100644
--- a/.github/workflows/regression-tests.yml
+++ b/.github/workflows/regression-tests.yml
@@ -13,7 +13,6 @@ concurrency:
 
 jobs:
   unlighthouse-audit:
-    if: ${{ contains(fromJson('["Production – catalyst-canary", "Preview – catalyst-canary"]'), github.event.deployment_status.environment) }}
     name: Unlighthouse Audit - ${{ matrix.device }}
     runs-on: ubuntu-latest
     strategy:

From dd559b2d9f354387e19d7c81a809eed97bfc9be3 Mon Sep 17 00:00:00 2001
From: Jorge Moya <jorge.moya@bigcommerce.com>
Date: Tue, 6 Jan 2026 14:40:09 -0600
Subject: [PATCH 02/69] fix(core): minor UX improvements for Reviews components
 (#2809)

---
 .changeset/two-years-flow.md                              | 8 ++++++++
 .../(default)/product/[slug]/_components/reviews.tsx      | 8 ++++++++
 core/vibes/soul/sections/reviews/index.tsx                | 6 +++---
 3 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/two-years-flow.md

diff --git a/.changeset/two-years-flow.md b/.changeset/two-years-flow.md
new file mode 100644
index 0000000000..9699fcb78c
--- /dev/null
+++ b/.changeset/two-years-flow.md
@@ -0,0 +1,8 @@
+---
+"@bigcommerce/catalyst-core": patch
+---
+
+Minor UX improvements for the Reviews section:
+- Show `totalCount` for reviews.
+- Show `averageRating` up to the first decimal.
+- Hide `averageRating` next to rating stars when there are no reviews.
diff --git a/core/app/[locale]/(default)/product/[slug]/_components/reviews.tsx b/core/app/[locale]/(default)/product/[slug]/_components/reviews.tsx
index 5fae6d44b7..4bfc58e359 100644
--- a/core/app/[locale]/(default)/product/[slug]/_components/reviews.tsx
+++ b/core/app/[locale]/(default)/product/[slug]/_components/reviews.tsx
@@ -35,6 +35,7 @@ const ReviewsQuery = graphql(
         product(entityId: $entityId) {
           reviewSummary {
             averageRating
+            numberOfReviews
           }
           reviews(first: $first, after: $after, before: $before, last: $last) {
             pageInfo {
@@ -161,6 +162,12 @@ export const Reviews = async ({
     return { email: session?.user?.email ?? '', name: obfuscatedName };
   });
 
+  const streamableTotalCount = Streamable.from(async () => {
+    const product = await streamableReviewsData;
+
+    return product?.reviewSummary.numberOfReviews ?? 0;
+  });
+
   return (
     <>
       <ReviewsSection
@@ -184,6 +191,7 @@ export const Reviews = async ({
         streamableImages={streamableImages}
         streamableProduct={streamableProductName}
         streamableUser={streamableUser}
+        totalCount={streamableTotalCount}
       />
       <Stream fallback={null} value={streamableReviewsData}>
         {(product) =>
diff --git a/core/vibes/soul/sections/reviews/index.tsx b/core/vibes/soul/sections/reviews/index.tsx
index 35ac2e69b0..a56b61d583 100644
--- a/core/vibes/soul/sections/reviews/index.tsx
+++ b/core/vibes/soul/sections/reviews/index.tsx
@@ -17,7 +17,7 @@ interface Review {
 interface Props {
   reviews: Streamable<Review[]>;
   averageRating: Streamable<number>;
-  totalCount?: Streamable<string>;
+  totalCount?: Streamable<number>;
   paginationInfo?: Streamable<CursorPaginationInfo>;
   nextLabel?: Streamable<string>;
   previousLabel?: Streamable<string>;
@@ -117,7 +117,7 @@ export function Reviews({
                   {(averageRating) => (
                     <>
                       <div className="mb-2 font-heading text-5xl leading-none tracking-tighter @2xl:text-6xl">
-                        {averageRating}
+                        {parseFloat(averageRating.toFixed(1))}
                       </div>
                       <Rating rating={averageRating} showRating={false} />
                     </>
@@ -221,7 +221,7 @@ export function ReviewsEmptyState({
           <div className="mb-2 font-heading text-5xl leading-none tracking-tighter @2xl:text-6xl">
             0
           </div>
-          <Rating rating={0} />
+          <Rating rating={0} showRating={false} />
         </>
       }
       sidebarSize="medium"

From b57bffaf28b8c9714f99f7af581871f6e9f6f944 Mon Sep 17 00:00:00 2001
From: Chancellor Clark <chancellor.clark@bigcommerce.com>
Date: Tue, 6 Jan 2026 14:55:54 -0700
Subject: [PATCH 03/69] fix: clear pagination cursors when sort option changes
 (#2811)

When the sort option is changed in the product filter, the before/after
pagination query params are now removed. This prevents stale pagination
cursors from being used with the new sort order, which could lead to
incorrect results or empty pages.

Changes:
- Updated Sorting component to use useQueryStates instead of useQueryState
- Now manages sort, before, and after params together
- Clears before and after params when sort value changes

Co-authored-by: Claude <noreply@anthropic.com>
---
 .changeset/clear-pagination-on-sort.md        |  5 +++++
 .../products-list-section/sorting.tsx         | 20 +++++++++++++------
 2 files changed, 19 insertions(+), 6 deletions(-)
 create mode 100644 .changeset/clear-pagination-on-sort.md

diff --git a/.changeset/clear-pagination-on-sort.md b/.changeset/clear-pagination-on-sort.md
new file mode 100644
index 0000000000..db507d2143
--- /dev/null
+++ b/.changeset/clear-pagination-on-sort.md
@@ -0,0 +1,5 @@
+---
+"@bigcommerce/catalyst-core": patch
+---
+
+Fix pagination cursor persistence when changing sort order. The `before` and `after` query parameters are now cleared when the sort option changes, preventing stale pagination cursors from causing incorrect results or empty pages.
diff --git a/core/vibes/soul/sections/products-list-section/sorting.tsx b/core/vibes/soul/sections/products-list-section/sorting.tsx
index fde97d65a5..b041425607 100644
--- a/core/vibes/soul/sections/products-list-section/sorting.tsx
+++ b/core/vibes/soul/sections/products-list-section/sorting.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import { parseAsString, useQueryState } from 'nuqs';
+import { parseAsString, useQueryStates } from 'nuqs';
 import { useOptimistic, useTransition } from 'react';
 
 import { SelectField } from '@/vibes/soul/form/select-field';
@@ -24,11 +24,15 @@ export function Sorting({
   defaultValue?: string;
   placeholder?: Streamable<string | null>;
 }) {
-  const [param, setParam] = useQueryState(
-    paramName,
-    parseAsString.withDefault(defaultValue).withOptions({ shallow: false, history: 'push' }),
+  const [params, setParams] = useQueryStates(
+    {
+      [paramName]: parseAsString.withDefault(defaultValue),
+      before: parseAsString,
+      after: parseAsString,
+    },
+    { shallow: false, history: 'push' },
   );
-  const [optimisticParam, setOptimisticParam] = useOptimistic(param);
+  const [optimisticParam, setOptimisticParam] = useOptimistic(params[paramName] ?? defaultValue);
   const [isPending, startTransition] = useTransition();
   const options = useStreamable(streamableOptions);
   const label = useStreamable(streamableLabel) ?? 'Sort';
@@ -42,7 +46,11 @@ export function Sorting({
       onValueChange={(value) => {
         startTransition(async () => {
           setOptimisticParam(value);
-          await setParam(value);
+          await setParams({
+            [paramName]: value,
+            before: null,
+            after: null,
+          });
         });
       }}
       options={options}

From ea9d6337d2bb8e5c166cb1de3385631e12fea4a3 Mon Sep 17 00:00:00 2001
From: Jorge Moya <jorge.moya@bigcommerce.com>
Date: Wed, 7 Jan 2026 16:16:00 -0600
Subject: [PATCH 04/69] fix(core): delete duplicate select component (#2813)

* fix(core): delete duplicate select component

* fix: remove console.log
---
 .changeset/fuzzy-needles-attend.md            |  5 ++
 core/vibes/soul/form/select-field/index.tsx   | 73 -------------------
 core/vibes/soul/form/select/index.tsx         |  4 +-
 .../sections/cart/shipping-form/index.tsx     |  6 +-
 .../product-detail/product-detail-form.tsx    |  4 +-
 .../products-list-section/sorting.tsx         |  4 +-
 6 files changed, 15 insertions(+), 81 deletions(-)
 create mode 100644 .changeset/fuzzy-needles-attend.md
 delete mode 100644 core/vibes/soul/form/select-field/index.tsx

diff --git a/.changeset/fuzzy-needles-attend.md b/.changeset/fuzzy-needles-attend.md
new file mode 100644
index 0000000000..0fde34205b
--- /dev/null
+++ b/.changeset/fuzzy-needles-attend.md
@@ -0,0 +1,5 @@
+---
+"@bigcommerce/catalyst-core": patch
+---
+
+Delete duplicate Select component.
diff --git a/core/vibes/soul/form/select-field/index.tsx b/core/vibes/soul/form/select-field/index.tsx
deleted file mode 100644
index f7775c2edc..0000000000
--- a/core/vibes/soul/form/select-field/index.tsx
+++ /dev/null
@@ -1,73 +0,0 @@
-'use client';
-
-import { clsx } from 'clsx';
-import * as React from 'react';
-
-import { FieldError } from '@/vibes/soul/form/field-error';
-import { Label } from '@/vibes/soul/form/label';
-import { Select, type Props as SelectProps } from '@/vibes/soul/form/select';
-
-export interface SelectFieldProps extends SelectProps {
-  label: string;
-  name: string;
-  value: string;
-  hideLabel?: boolean;
-  className?: string;
-}
-
-export function SelectField({
-  label,
-  className,
-  hideLabel = false,
-  name,
-  value,
-  colorScheme,
-  pending,
-  placeholder,
-  variant,
-  options,
-  errors,
-  onFocus,
-  onBlur,
-  onOptionMouseEnter,
-  onValueChange,
-  ...rest
-}: SelectFieldProps) {
-  const id = React.useId();
-
-  return (
-    <div className={clsx('w-full', className)}>
-      <Label
-        className={clsx(hideLabel && 'sr-only', 'mb-2')}
-        colorScheme={colorScheme}
-        htmlFor={id}
-      >
-        {label}
-      </Label>
-      {/* Workaround for https://github.com/radix-ui/primitives/issues/3198, remove when fixed */}
-      <input name={name} type="hidden" value={value} />
-      <Select
-        colorScheme={colorScheme}
-        errors={errors}
-        id={id}
-        label={label}
-        name={`${name}_display`} // Temp `_display` to avoid conflicts with the hidden input
-        onBlur={onBlur}
-        onFocus={onFocus}
-        onOptionMouseEnter={onOptionMouseEnter}
-        onValueChange={onValueChange}
-        options={options}
-        pending={pending}
-        placeholder={placeholder}
-        value={value}
-        variant={variant}
-        {...rest}
-      />
-      {errors?.map((error) => (
-        <FieldError className="mt-2" key={error}>
-          {error}
-        </FieldError>
-      ))}
-    </div>
-  );
-}
diff --git a/core/vibes/soul/form/select/index.tsx b/core/vibes/soul/form/select/index.tsx
index 2b64d23744..414f767579 100644
--- a/core/vibes/soul/form/select/index.tsx
+++ b/core/vibes/soul/form/select/index.tsx
@@ -95,7 +95,9 @@ export function Select({
           {label}
         </Label>
       )}
-      <SelectPrimitive.Root {...rest} name={name} value={value}>
+      {/* Workaround for https://github.com/radix-ui/primitives/issues/3198, remove when fixed */}
+      <input name={name} type="hidden" value={value} />
+      <SelectPrimitive.Root {...rest} name={`${name}_display`} value={value}>
         <SelectPrimitive.Trigger
           aria-label={label}
           className={clsx(
diff --git a/core/vibes/soul/sections/cart/shipping-form/index.tsx b/core/vibes/soul/sections/cart/shipping-form/index.tsx
index adce34f39b..23745eff61 100644
--- a/core/vibes/soul/sections/cart/shipping-form/index.tsx
+++ b/core/vibes/soul/sections/cart/shipping-form/index.tsx
@@ -16,7 +16,7 @@ import { FormStatus } from '@/vibes/soul/form/form-status';
 import { Input } from '@/vibes/soul/form/input';
 import { Label } from '@/vibes/soul/form/label';
 import { RadioGroup } from '@/vibes/soul/form/radio-group';
-import { SelectField } from '@/vibes/soul/form/select-field';
+import { Select } from '@/vibes/soul/form/select';
 import { Button } from '@/vibes/soul/primitives/button';
 
 import { shippingActionFormDataSchema } from '../schema';
@@ -267,7 +267,7 @@ export function ShippingForm({
           className={clsx('mt-4 space-y-4', { hidden: !showAddressForm })}
         >
           {Array.isArray(countries) ? (
-            <SelectField
+            <Select
               errors={addressFields.country.errors}
               key={addressFields.country.id}
               label={countryLabel}
@@ -295,7 +295,7 @@ export function ShippingForm({
           />
           <div className="flex gap-3">
             {Array.isArray(states) ? (
-              <SelectField
+              <Select
                 disabled={addressFields.country.value === undefined}
                 errors={addressFields.state.errors}
                 key={addressFields.state.id}
diff --git a/core/vibes/soul/sections/product-detail/product-detail-form.tsx b/core/vibes/soul/sections/product-detail/product-detail-form.tsx
index 318f64aa55..021cd7e909 100644
--- a/core/vibes/soul/sections/product-detail/product-detail-form.tsx
+++ b/core/vibes/soul/sections/product-detail/product-detail-form.tsx
@@ -25,7 +25,7 @@ import { FormStatus } from '@/vibes/soul/form/form-status';
 import { Input } from '@/vibes/soul/form/input';
 import { NumberInput } from '@/vibes/soul/form/number-input';
 import { RadioGroup } from '@/vibes/soul/form/radio-group';
-import { SelectField } from '@/vibes/soul/form/select-field';
+import { Select } from '@/vibes/soul/form/select';
 import { SwatchRadioGroup } from '@/vibes/soul/form/swatch-radio-group';
 import { Textarea } from '@/vibes/soul/form/textarea';
 import { Button } from '@/vibes/soul/primitives/button';
@@ -432,7 +432,7 @@ function FormField({
 
     case 'select':
       return (
-        <SelectField
+        <Select
           errors={formField.errors}
           key={formField.id}
           label={field.label}
diff --git a/core/vibes/soul/sections/products-list-section/sorting.tsx b/core/vibes/soul/sections/products-list-section/sorting.tsx
index b041425607..0798e7c76f 100644
--- a/core/vibes/soul/sections/products-list-section/sorting.tsx
+++ b/core/vibes/soul/sections/products-list-section/sorting.tsx
@@ -3,7 +3,7 @@
 import { parseAsString, useQueryStates } from 'nuqs';
 import { useOptimistic, useTransition } from 'react';
 
-import { SelectField } from '@/vibes/soul/form/select-field';
+import { Select } from '@/vibes/soul/form/select';
 import { Streamable, useStreamable } from '@/vibes/soul/lib/streamable';
 
 export interface Option {
@@ -39,7 +39,7 @@ export function Sorting({
   const placeholder = useStreamable(streamablePlaceholder) ?? 'Sort by';
 
   return (
-    <SelectField
+    <Select
       hideLabel
       label={label}
       name={paramName}

From b4b87a361790bf2edd7614bab1d97490d91ed22f Mon Sep 17 00:00:00 2001
From: Chancellor Clark <chancellor.clark@bigcommerce.com>
Date: Thu, 8 Jan 2026 11:40:33 -0700
Subject: [PATCH 05/69] feat: pass in additional attributes for script tags
 (#2816)

---
 .changeset/script-attributes-support.md       |  5 ++
 core/data-transformers/scripts-transformer.ts | 56 +++++++++++++++++--
 2 files changed, 57 insertions(+), 4 deletions(-)
 create mode 100644 .changeset/script-attributes-support.md

diff --git a/.changeset/script-attributes-support.md b/.changeset/script-attributes-support.md
new file mode 100644
index 0000000000..ce924e8ff9
--- /dev/null
+++ b/.changeset/script-attributes-support.md
@@ -0,0 +1,5 @@
+---
+"@bigcommerce/catalyst-core": patch
+---
+
+Add support for additional HTML attributes on script tags. The scripts transformer now extracts and passes through attributes like `async`, `defer`, `crossorigin`, and `data-*` attributes from BigCommerce script tags to the C15T consent manager, ensuring scripts load with their intended behavior.
diff --git a/core/data-transformers/scripts-transformer.ts b/core/data-transformers/scripts-transformer.ts
index 3af032a3ee..a7d7ec32ec 100644
--- a/core/data-transformers/scripts-transformer.ts
+++ b/core/data-transformers/scripts-transformer.ts
@@ -19,17 +19,54 @@ const BC_TO_C15T_CONSENT_CATEGORY_MAP = {
 
 type ScriptInfo = { textContent: string } | { src: string } | null;
 
+/**
+ * Extracts HTML attributes from a script tag's opening element.
+ * Handles both boolean attributes (async, defer) and key-value attributes (data-*, crossorigin).
+ * @param {string} scriptTag - The full script tag HTML string
+ * @returns {Record<string, string>} Record of attribute name-value pairs (boolean attrs get empty string value)
+ */
+function extractAttributes(scriptTag: string): Record<string, string> {
+  // Extract the opening tag content (everything between <script and >)
+  const openingTagMatch = /<script([^>]*)>/i.exec(scriptTag);
+  const openingTagContent = openingTagMatch?.[1];
+
+  if (!openingTagContent) {
+    return {};
+  }
+
+  // Match attributes in formats: name="value", name='value', or name (boolean)
+  const attributePattern = /([a-zA-Z][\w-]*)\s*(?:=\s*["']([^"']*)["'])?/g;
+  const matches = Array.from(openingTagContent.matchAll(attributePattern));
+
+  // Convert matches to record, filtering out 'src' which is handled separately
+  return matches.reduce<Record<string, string>>((acc, match) => {
+    const name = match[1];
+    const value = match[2];
+
+    // Skip if no name or if it's 'src' (handled separately)
+    if (name && name.toLowerCase() !== 'src') {
+      // Boolean attributes get empty string, others get their value
+      acc[name] = value ?? '';
+    }
+
+    return acc;
+  }, {});
+}
+
 // C15T's ClientSideOptionsProvider creates the <script> element at runtime. BigCommerce's API
 // returns inline scripts wrapped in <script> tags, which would result in nested <script> elements
 // and cause errors. This function extracts both inline content and src attributes to handle cases
 // where InlineScript types may contain external script references.
 function extractScriptInfo(scriptTag: string): ScriptInfo {
+  // Extract attributes first (works for both inline and src scripts)
   // Extract text content (for inline scripts)
   const scriptMatch = /<script[^>]*>([\s\S]*?)<\/script>/i.exec(scriptTag);
   const textContent = scriptMatch?.[1]?.trim();
 
   if (textContent) {
-    return { textContent };
+    return {
+      textContent,
+    };
   }
 
   // Extract src attribute (for external scripts that may be misclassified as inline)
@@ -37,7 +74,9 @@ function extractScriptInfo(scriptTag: string): ScriptInfo {
   const src = srcMatch?.[1];
 
   if (src) {
-    return { src };
+    return {
+      src,
+    };
   }
 
   return null;
@@ -76,14 +115,23 @@ export function scriptsTransformer(scripts: BigCommerceScripts): C15tScripts {
 
     if (script.__typename === 'InlineScript' && script.scriptTag) {
       const scriptInfo = extractScriptInfo(script.scriptTag);
+      const additionalAttributes = extractAttributes(script.scriptTag);
 
       // Prefer textContent if available (true inline script)
       if (scriptInfo !== null && 'textContent' in scriptInfo) {
-        return { ...baseConfig, textContent: scriptInfo.textContent, attributes };
+        return {
+          ...baseConfig,
+          textContent: scriptInfo.textContent,
+          attributes: { ...additionalAttributes, ...attributes },
+        };
       }
 
       if (scriptInfo !== null && 'src' in scriptInfo) {
-        return { ...baseConfig, src: scriptInfo.src, attributes };
+        return {
+          ...baseConfig,
+          src: scriptInfo.src,
+          attributes: { ...additionalAttributes, ...attributes },
+        };
       }
     }
 

From fcb946e47aafc8be2e63bf3fe776ec6caab1fa72 Mon Sep 17 00:00:00 2001
From: Matthew Volk <matt.volk@bigcommerce.com>
Date: Thu, 8 Jan 2026 16:24:10 -0600
Subject: [PATCH 06/69] fix(form): display store password complexity
 requirements in registration form tooltip (#2814)

---
 .changeset/sixty-toes-leave.md                |  5 ++
 .../register/_actions/register-customer.ts    | 15 +++-
 .../(default)/(auth)/register/page-data.ts    | 14 +++
 .../(default)/(auth)/register/page.tsx        |  4 +-
 core/vibes/soul/form/dynamic-form/index.tsx   | 19 ++--
 core/vibes/soul/form/dynamic-form/schema.ts   | 87 ++++++++++++++++---
 .../sections/dynamic-form-section/index.tsx   | 15 +++-
 7 files changed, 135 insertions(+), 24 deletions(-)
 create mode 100644 .changeset/sixty-toes-leave.md

diff --git a/.changeset/sixty-toes-leave.md b/.changeset/sixty-toes-leave.md
new file mode 100644
index 0000000000..56100107d8
--- /dev/null
+++ b/.changeset/sixty-toes-leave.md
@@ -0,0 +1,5 @@
+---
+"@bigcommerce/catalyst-core": patch
+---
+
+Shoppers will now see the store's actual password complexity requirements in the tooltip on the new customer registration form, preventing confusion and failed registration attempts. The schema() function in core/vibes/soul/form/dynamic-form/schema.ts now accepts an optional second parameter passwordComplexity to enable dynamic password validation. The DynamicForm, DynamicFormSection components and their associated server actions also accept an optional passwordComplexity prop that flows through to the schema. Action Required: If you have custom registration or password forms and want to use store-specific password complexity settings, fetch passwordComplexitySettings from the GraphQL API (under site.settings.customers.passwordComplexitySettings) and pass it to your DynamicFormSection component and maintain it in your server action's state. If you don't pass it, password validation defaults to: minimum 8 characters, at least one number, and at least one special character. Conflict Resolution: If merging into custom forms, ensure the passwordComplexity prop is threaded through: Page → DynamicFormSection → DynamicForm → useActionState → schema(). In server actions, add passwordComplexity?: Parameters<typeof schema>[1] to your state type and include it in all return statements to maintain state consistency.
diff --git a/core/app/[locale]/(default)/(auth)/register/_actions/register-customer.ts b/core/app/[locale]/(default)/(auth)/register/_actions/register-customer.ts
index 7b3baf2489..809596ae99 100644
--- a/core/app/[locale]/(default)/(auth)/register/_actions/register-customer.ts
+++ b/core/app/[locale]/(default)/(auth)/register/_actions/register-customer.ts
@@ -335,19 +335,26 @@ function parseRegisterCustomerInput(
 }
 
 export async function registerCustomer<F extends Field>(
-  prevState: { lastResult: SubmissionResult | null; fields: Array<F | FieldGroup<F>> },
+  prevState: {
+    lastResult: SubmissionResult | null;
+    fields: Array<F | FieldGroup<F>>;
+    passwordComplexity?: Parameters<typeof schema>[1];
+  },
   formData: FormData,
 ) {
   const t = await getTranslations('Auth.Register');
   const locale = await getLocale();
   const cartId = await getCartId();
 
-  const submission = parseWithZod(formData, { schema: schema(prevState.fields) });
+  const submission = parseWithZod(formData, {
+    schema: schema(prevState.fields, prevState.passwordComplexity),
+  });
 
   if (submission.status !== 'success') {
     return {
       lastResult: submission.reply(),
       fields: prevState.fields,
+      passwordComplexity: prevState.passwordComplexity,
     };
   }
 
@@ -369,6 +376,7 @@ export async function registerCustomer<F extends Field>(
           formErrors: response.data.customer.registerCustomer.errors.map((error) => error.message),
         }),
         fields: prevState.fields,
+        passwordComplexity: prevState.passwordComplexity,
       };
     }
 
@@ -390,6 +398,7 @@ export async function registerCustomer<F extends Field>(
           formErrors: error.errors.map(({ message }) => message),
         }),
         fields: prevState.fields,
+        passwordComplexity: prevState.passwordComplexity,
       };
     }
 
@@ -397,12 +406,14 @@ export async function registerCustomer<F extends Field>(
       return {
         lastResult: submission.reply({ formErrors: [error.message] }),
         fields: prevState.fields,
+        passwordComplexity: prevState.passwordComplexity,
       };
     }
 
     return {
       lastResult: submission.reply({ formErrors: [t('somethingWentWrong')] }),
       fields: prevState.fields,
+      passwordComplexity: prevState.passwordComplexity,
     };
   }
 
diff --git a/core/app/[locale]/(default)/(auth)/register/page-data.ts b/core/app/[locale]/(default)/(auth)/register/page-data.ts
index 2eb547453d..461237ffa1 100644
--- a/core/app/[locale]/(default)/(auth)/register/page-data.ts
+++ b/core/app/[locale]/(default)/(auth)/register/page-data.ts
@@ -15,6 +15,17 @@ const RegisterCustomerQuery = graphql(
     ) {
       site {
         settings {
+          customers {
+            passwordComplexitySettings {
+              minimumNumbers
+              minimumPasswordLength
+              minimumSpecialCharacters
+              requireLowerCase
+              requireNumbers
+              requireSpecialCharacters
+              requireUpperCase
+            }
+          }
           formFields {
             customer(filters: $customerFilters, sortBy: $customerSortBy) {
               ...FormFieldsFragment
@@ -68,6 +79,8 @@ export const getRegisterCustomerQuery = cache(async ({ address, customer }: Prop
   const addressFields = response.data.site.settings?.formFields.shippingAddress;
   const customerFields = response.data.site.settings?.formFields.customer;
   const countries = response.data.geography.countries;
+  const passwordComplexitySettings =
+    response.data.site.settings?.customers?.passwordComplexitySettings;
 
   if (!addressFields || !customerFields) {
     return null;
@@ -77,5 +90,6 @@ export const getRegisterCustomerQuery = cache(async ({ address, customer }: Prop
     addressFields,
     customerFields,
     countries,
+    passwordComplexitySettings,
   };
 });
diff --git a/core/app/[locale]/(default)/(auth)/register/page.tsx b/core/app/[locale]/(default)/(auth)/register/page.tsx
index b316ed4357..1aeaeb9b58 100644
--- a/core/app/[locale]/(default)/(auth)/register/page.tsx
+++ b/core/app/[locale]/(default)/(auth)/register/page.tsx
@@ -60,7 +60,8 @@ export default async function Register({ params }: Props) {
     notFound();
   }
 
-  const { addressFields, customerFields, countries } = registerCustomerData;
+  const { addressFields, customerFields, countries, passwordComplexitySettings } =
+    registerCustomerData;
 
   const fields = transformFieldsToLayout(
     [
@@ -109,6 +110,7 @@ export default async function Register({ params }: Props) {
     <DynamicFormSection
       action={registerCustomer}
       fields={fields}
+      passwordComplexity={passwordComplexitySettings}
       submitLabel={t('cta')}
       title={t('heading')}
     />
diff --git a/core/vibes/soul/form/dynamic-form/index.tsx b/core/vibes/soul/form/dynamic-form/index.tsx
index 12e3163ae0..21299426e7 100644
--- a/core/vibes/soul/form/dynamic-form/index.tsx
+++ b/core/vibes/soul/form/dynamic-form/index.tsx
@@ -36,7 +36,7 @@ import { SwatchRadioGroup } from '@/vibes/soul/form/swatch-radio-group';
 import { Textarea } from '@/vibes/soul/form/textarea';
 import { Button, ButtonProps } from '@/vibes/soul/primitives/button';
 
-import { Field, FieldGroup, schema } from './schema';
+import { Field, FieldGroup, PasswordComplexitySettings, schema } from './schema';
 
 type Action<S, P> = (state: Awaited<S>, payload: P) => S | Promise<S>;
 
@@ -44,6 +44,7 @@ interface State<F extends Field> {
   fields: Array<F | FieldGroup<F>>;
   lastResult: SubmissionResult | null;
   successMessage?: ReactNode;
+  passwordComplexity?: PasswordComplexitySettings | null;
 }
 
 export type DynamicFormAction<F extends Field> = Action<State<F>, FormData>;
@@ -59,6 +60,7 @@ export interface DynamicFormProps<F extends Field> {
   onCancel?: (e: MouseEvent<HTMLButtonElement>) => void;
   onChange?: (e: FormEvent<HTMLFormElement>) => void;
   onSuccess?: (lastResult: SubmissionResult, successMessage: ReactNode) => void;
+  passwordComplexity?: PasswordComplexitySettings | null;
 }
 
 export function DynamicForm<F extends Field>({
@@ -72,13 +74,18 @@ export function DynamicForm<F extends Field>({
   onCancel,
   onChange,
   onSuccess,
+  passwordComplexity: defaultPasswordComplexity,
 }: DynamicFormProps<F>) {
-  const [{ lastResult, fields, successMessage }, formAction] = useActionState(action, {
-    fields: defaultFields,
-    lastResult: null,
-  });
+  const [{ lastResult, fields, successMessage, passwordComplexity }, formAction] = useActionState(
+    action,
+    {
+      fields: defaultFields,
+      lastResult: null,
+      passwordComplexity: defaultPasswordComplexity,
+    },
+  );
 
-  const dynamicSchema = schema(fields);
+  const dynamicSchema = schema(fields, passwordComplexity);
   const defaultValue = fields
     .flatMap((f) => (Array.isArray(f) ? f : [f]))
     .reduce<z.infer<typeof dynamicSchema>>(
diff --git a/core/vibes/soul/form/dynamic-form/schema.ts b/core/vibes/soul/form/dynamic-form/schema.ts
index 18d356ee86..4b92f5d2b0 100644
--- a/core/vibes/soul/form/dynamic-form/schema.ts
+++ b/core/vibes/soul/form/dynamic-form/schema.ts
@@ -1,5 +1,15 @@
 import { z } from 'zod';
 
+export interface PasswordComplexitySettings {
+  minimumNumbers?: number | null;
+  minimumPasswordLength?: number | null;
+  minimumSpecialCharacters?: number | null;
+  requireLowerCase?: boolean | null;
+  requireNumbers?: boolean | null;
+  requireSpecialCharacters?: boolean | null;
+  requireUpperCase?: boolean | null;
+}
+
 interface FormField {
   name: string;
   label?: string;
@@ -151,7 +161,8 @@ export type SchemaRawShape = Record<
   | z.ZodOptional<z.ZodArray<z.ZodString>>
 >;
 
-function getFieldSchema(field: Field) {
+// eslint-disable-next-line complexity
+function getFieldSchema(field: Field, passwordComplexity?: PasswordComplexitySettings | null) {
   let fieldSchema:
     | z.ZodString
     | z.ZodNumber
@@ -183,20 +194,67 @@ function getFieldSchema(field: Field) {
 
       break;
 
-    case 'password':
-      fieldSchema = z
-        .string()
-        .min(8, { message: 'Be at least 8 characters long' })
-        .regex(/[a-zA-Z]/, { message: 'Contain at least one letter.' })
-        .regex(/[0-9]/, { message: 'Contain at least one number.' })
-        .regex(/[^a-zA-Z0-9]/, {
+    case 'password': {
+      const minLength = passwordComplexity?.minimumPasswordLength ?? 8;
+      const minNumbers = passwordComplexity?.minimumNumbers ?? 0;
+      const minSpecialChars = passwordComplexity?.minimumSpecialCharacters ?? 0;
+      const requireLowerCase = passwordComplexity?.requireLowerCase ?? false;
+      const requireUpperCase = passwordComplexity?.requireUpperCase ?? false;
+      const requireNumbers = passwordComplexity?.requireNumbers ?? true;
+      const requireSpecialChars = passwordComplexity?.requireSpecialCharacters ?? true;
+
+      fieldSchema = z.string().trim();
+
+      fieldSchema = fieldSchema.min(minLength, {
+        message: `Be at least ${minLength} character${minLength !== 1 ? 's' : ''} long`,
+      });
+
+      if (requireLowerCase) {
+        fieldSchema = fieldSchema.regex(/[a-z]/, {
+          message: 'Contain at least one lowercase letter.',
+        });
+      }
+
+      if (requireUpperCase) {
+        fieldSchema = fieldSchema.regex(/[A-Z]/, {
+          message: 'Contain at least one uppercase letter.',
+        });
+      }
+
+      if (requireNumbers && minNumbers > 0) {
+        const numberRegex = new RegExp(`(.*[0-9]){${minNumbers},}`);
+
+        fieldSchema = fieldSchema.regex(numberRegex, {
+          message:
+            minNumbers === 1
+              ? 'Contain at least one number.'
+              : `Contain at least ${minNumbers} numbers.`,
+        });
+      } else if (requireNumbers) {
+        fieldSchema = fieldSchema.regex(/[0-9]/, {
+          message: 'Contain at least one number.',
+        });
+      }
+
+      if (requireSpecialChars && minSpecialChars > 0) {
+        const specialCharRegex = new RegExp(`(.*[^a-zA-Z0-9]){${minSpecialChars},}`);
+
+        fieldSchema = fieldSchema.regex(specialCharRegex, {
+          message:
+            minSpecialChars === 1
+              ? 'Contain at least one special character.'
+              : `Contain at least ${minSpecialChars} special characters.`,
+        });
+      } else if (requireSpecialChars) {
+        fieldSchema = fieldSchema.regex(/[^a-zA-Z0-9]/, {
           message: 'Contain at least one special character.',
-        })
-        .trim();
+        });
+      }
 
       if (field.required !== true) fieldSchema = fieldSchema.optional();
 
       break;
+    }
 
     case 'email':
       fieldSchema = z.string().email({ message: 'Please enter a valid email.' }).trim();
@@ -221,7 +279,10 @@ function getFieldSchema(field: Field) {
   return fieldSchema;
 }
 
-export function schema(fields: Array<Field | FieldGroup<Field>>) {
+export function schema(
+  fields: Array<Field | FieldGroup<Field>>,
+  passwordComplexity?: PasswordComplexitySettings | null,
+) {
   const shape: SchemaRawShape = {};
   let passwordFieldName: string | undefined;
   let confirmPasswordFieldName: string | undefined;
@@ -229,13 +290,13 @@ export function schema(fields: Array<Field | FieldGroup<Field>>) {
   fields.forEach((field) => {
     if (Array.isArray(field)) {
       field.forEach((f) => {
-        shape[f.name] = getFieldSchema(f);
+        shape[f.name] = getFieldSchema(f, passwordComplexity);
 
         if (f.type === 'password') passwordFieldName = f.name;
         if (f.type === 'confirm-password') confirmPasswordFieldName = f.name;
       });
     } else {
-      shape[field.name] = getFieldSchema(field);
+      shape[field.name] = getFieldSchema(field, passwordComplexity);
 
       if (field.type === 'password') passwordFieldName = field.name;
       if (field.type === 'confirm-password') confirmPasswordFieldName = field.name;
diff --git a/core/vibes/soul/sections/dynamic-form-section/index.tsx b/core/vibes/soul/sections/dynamic-form-section/index.tsx
index a3f25d5b10..2a0aa8d775 100644
--- a/core/vibes/soul/sections/dynamic-form-section/index.tsx
+++ b/core/vibes/soul/sections/dynamic-form-section/index.tsx
@@ -1,7 +1,11 @@
 import { clsx } from 'clsx';
 
 import { DynamicForm, DynamicFormAction } from '@/vibes/soul/form/dynamic-form';
-import { Field, FieldGroup } from '@/vibes/soul/form/dynamic-form/schema';
+import {
+  Field,
+  FieldGroup,
+  PasswordComplexitySettings,
+} from '@/vibes/soul/form/dynamic-form/schema';
 import { SectionLayout } from '@/vibes/soul/sections/section-layout';
 
 interface Props<F extends Field> {
@@ -11,6 +15,7 @@ interface Props<F extends Field> {
   fields: Array<F | FieldGroup<F>>;
   submitLabel?: string;
   className?: string;
+  passwordComplexity?: PasswordComplexitySettings | null;
 }
 
 export function DynamicFormSection<F extends Field>({
@@ -20,6 +25,7 @@ export function DynamicFormSection<F extends Field>({
   fields,
   submitLabel,
   action,
+  passwordComplexity,
 }: Props<F>) {
   return (
     <SectionLayout className={clsx('mx-auto w-full max-w-4xl', className)} containerSize="lg">
@@ -33,7 +39,12 @@ export function DynamicFormSection<F extends Field>({
           )}
         </header>
       )}
-      <DynamicForm action={action} fields={fields} submitLabel={submitLabel} />
+      <DynamicForm
+        action={action}
+        fields={fields}
+        passwordComplexity={passwordComplexity}
+        submitLabel={submitLabel}
+      />
     </SectionLayout>
   );
 }

From d4690786b17a7d05ef32f8941e4090101980f8bc Mon Sep 17 00:00:00 2001
From: Jorge Moya <jorge.moya@bigcommerce.com>
Date: Fri, 9 Jan 2026 16:51:27 -0600
Subject: [PATCH 07/69] fix(core): persist checkbox modifier in PDP (#2817)

* fix(core): persist checkbox modifier in PDP

* fix: handle default value for checkbox

* fix: revert form changes but keep track of options in params

* fix: update changset
---
 .changeset/shy-owls-move.md                   | 147 ++++++++++++++++++
 .../product/[slug]/_actions/add-to-cart.tsx   |   6 +-
 .../(default)/product/[slug]/page-data.ts     |   1 -
 .../product-options-transformer.ts            |  22 +--
 .../product-detail/product-detail-form.tsx    |  51 ++++--
 .../soul/sections/product-detail/schema.ts    |   2 +
 6 files changed, 201 insertions(+), 28 deletions(-)
 create mode 100644 .changeset/shy-owls-move.md

diff --git a/.changeset/shy-owls-move.md b/.changeset/shy-owls-move.md
new file mode 100644
index 0000000000..1bc546a7b9
--- /dev/null
+++ b/.changeset/shy-owls-move.md
@@ -0,0 +1,147 @@
+---
+"@bigcommerce/catalyst-core": patch
+---
+
+Persist the checkbox product modifier since it can modify pricing and other product data. By persisting this and tracking in the url, this will trigger a product refetch when added or removed. Incidentally, now we manually control what fields are persisted, since `option.isVariantOption` doesn't apply to `checkbox`, additionally multi options modifiers that are not variant options can also modify price and other product data.
+
+## Migration
+
+### Step 1
+
+Update `product-options-transformer.ts` to manually track persisted fields:
+
+```ts
+case 'DropdownList': {
+    return {
+        // before
+        // persist: option.isVariantOption,
+        // after (manually persist)
+        persist: true,
+        type: 'select',
+        label: option.displayName,
+        required: option.isRequired,
+        name: option.entityId.toString(),
+        defaultValue: values.find((value) => value.isDefault)?.entityId.toString(),
+        options: values.map((value) => ({
+        label: value.label,
+        value: value.entityId.toString(),
+        })),
+    };
+}
+```
+
+Fields that persist and can affect product pricing when selected:
+- Swatch
+- RectangleBoxes
+- RadioButtons
+- ProductPickList
+- ProductPickListWithImages
+- CheckboxOption
+
+### Step 2
+
+Remove `isVariantOption` from GQL query since we no longer use it:
+
+```ts
+export const ProductOptionsFragment = graphql(
+  `
+    fragment ProductOptionsFragment on Product {
+      entityId
+      productOptions(first: 50) {
+        edges {
+          node {
+            __typename
+            entityId
+            displayName
+            isRequired
+            isVariantOption // remove this
+            ...MultipleChoiceFieldFragment
+            ...CheckboxFieldFragment
+            ...NumberFieldFragment
+            ...TextFieldFragment
+            ...MultiLineTextFieldFragment
+            ...DateFieldFragment
+          }
+        }
+      }
+    }
+  `,
+  [
+    MultipleChoiceFieldFragment,
+    CheckboxFieldFragment,
+    NumberFieldFragment,
+    TextFieldFragment,
+    MultiLineTextFieldFragment,
+    DateFieldFragment,
+  ],
+);
+```
+
+### Step 3
+Update `product-detail-form.tsx` to include separate handing of the checkbox field:
+
+```ts
+const defaultValue = fields.reduce<{
+  [Key in keyof SchemaRawShape]?: z.infer<SchemaRawShape[Key]>;
+}>(
+  (acc, field) => {
+    // Checkbox field has to be handled separately because we want to convert checked or unchecked value to true or undefined respectively.
+    // This is because the form expects a boolean value, but we want to store the checked or unchecked value in the query params.
+    if (field.type === 'checkbox') {
+      if (params[field.name] === field.checkedValue) {
+        return {
+          ...acc,
+          [field.name]: 'true',
+        };
+      }
+
+      if (params[field.name] === field.uncheckedValue) {
+        return {
+          ...acc,
+          [field.name]: undefined,
+        };
+      }
+
+      return {
+        ...acc,
+        [field.name]: field.defaultValue, // Default value is either 'true' or undefined
+      };
+    }
+
+    return {
+      ...acc,
+      [field.name]: params[field.name] ?? field.defaultValue,
+    };
+  },
+  { quantity: minQuantity ?? 1 },
+);
+
+...
+
+const handleChange = useCallback(
+  (value: string) => {
+    // Checkbox field has to be handled separately because we want to convert 'true' or '' to the checked or unchecked value respectively.
+    if (field.type === 'checkbox') {
+      void setParams({ [field.name]: value ? field.checkedValue : field.uncheckedValue });
+    } else {
+      void setParams({ [field.name]: value || null }); // Passing `null` to remove the value from the query params if fieldValue is falsey
+    }
+
+    controls.change(value || ''); // If fieldValue is falsey, we set it to an empty string
+  },
+  [setParams, field, controls],
+);
+```
+
+### Step 4
+
+Update schema in `core/vibes/soul/sections/product-detail/schema.ts`:
+
+```ts
+type CheckboxField = {
+  type: 'checkbox';
+  defaultValue?: string;
+  checkedValue: string; // add
+  uncheckedValue: string; // add
+} & FormField;
+```
diff --git a/core/app/[locale]/(default)/product/[slug]/_actions/add-to-cart.tsx b/core/app/[locale]/(default)/product/[slug]/_actions/add-to-cart.tsx
index a3f790bf8a..57b429b99b 100644
--- a/core/app/[locale]/(default)/product/[slug]/_actions/add-to-cart.tsx
+++ b/core/app/[locale]/(default)/product/[slug]/_actions/add-to-cart.tsx
@@ -77,10 +77,8 @@ export const addToCart = async (
           optionEntityId: Number(field.name),
           optionValueEntityId:
             optionValueEntityId === 'true'
-              ? // @ts-expect-error Types from custom fields are not yet available, pending fix
-                Number(field.checkedValue)
-              : // @ts-expect-error Types from custom fields are not yet available, pending fix
-                Number(field.uncheckedValue),
+              ? Number(field.checkedValue)
+              : Number(field.uncheckedValue),
         };
 
         if (accum.checkboxes) {
diff --git a/core/app/[locale]/(default)/product/[slug]/page-data.ts b/core/app/[locale]/(default)/product/[slug]/page-data.ts
index 1959e8589f..6a4b6a1670 100644
--- a/core/app/[locale]/(default)/product/[slug]/page-data.ts
+++ b/core/app/[locale]/(default)/product/[slug]/page-data.ts
@@ -112,7 +112,6 @@ export const ProductOptionsFragment = graphql(
             entityId
             displayName
             isRequired
-            isVariantOption
             ...MultipleChoiceFieldFragment
             ...CheckboxFieldFragment
             ...NumberFieldFragment
diff --git a/core/data-transformers/product-options-transformer.ts b/core/data-transformers/product-options-transformer.ts
index 3c8925b841..4809735c65 100644
--- a/core/data-transformers/product-options-transformer.ts
+++ b/core/data-transformers/product-options-transformer.ts
@@ -18,7 +18,7 @@ export const productOptionsTransformer = async (
         switch (option.displayStyle) {
           case 'Swatch': {
             return {
-              persist: option.isVariantOption,
+              persist: true,
               type: 'swatch-radio-group',
               label: option.displayName,
               required: option.isRequired,
@@ -50,7 +50,7 @@ export const productOptionsTransformer = async (
 
           case 'RectangleBoxes': {
             return {
-              persist: option.isVariantOption,
+              persist: true,
               type: 'button-radio-group',
               label: option.displayName,
               required: option.isRequired,
@@ -65,7 +65,7 @@ export const productOptionsTransformer = async (
 
           case 'RadioButtons': {
             return {
-              persist: option.isVariantOption,
+              persist: true,
               type: 'radio-group',
               label: option.displayName,
               required: option.isRequired,
@@ -80,7 +80,7 @@ export const productOptionsTransformer = async (
 
           case 'DropdownList': {
             return {
-              persist: option.isVariantOption,
+              persist: true,
               type: 'select',
               label: option.displayName,
               required: option.isRequired,
@@ -95,7 +95,7 @@ export const productOptionsTransformer = async (
 
           case 'ProductPickList': {
             return {
-              persist: option.isVariantOption,
+              persist: true,
               type: 'card-radio-group',
               label: option.displayName,
               required: option.isRequired,
@@ -115,7 +115,7 @@ export const productOptionsTransformer = async (
 
           case 'ProductPickListWithImages': {
             return {
-              persist: option.isVariantOption,
+              persist: true,
               type: 'card-radio-group',
               label: option.displayName,
               required: option.isRequired,
@@ -144,7 +144,7 @@ export const productOptionsTransformer = async (
 
       if (option.__typename === 'CheckboxOption') {
         return {
-          persist: option.isVariantOption,
+          persist: true,
           type: 'checkbox',
           label: option.displayName,
           required: option.isRequired,
@@ -157,7 +157,7 @@ export const productOptionsTransformer = async (
 
       if (option.__typename === 'NumberFieldOption') {
         return {
-          persist: option.isVariantOption,
+          persist: false,
           type: 'number',
           label: option.displayName,
           required: option.isRequired,
@@ -174,7 +174,7 @@ export const productOptionsTransformer = async (
 
       if (option.__typename === 'MultiLineTextFieldOption') {
         return {
-          persist: option.isVariantOption,
+          persist: false,
           type: 'textarea',
           label: option.displayName,
           required: option.isRequired,
@@ -187,7 +187,7 @@ export const productOptionsTransformer = async (
 
       if (option.__typename === 'TextFieldOption') {
         return {
-          persist: option.isVariantOption,
+          persist: false,
           type: 'text',
           label: option.displayName,
           required: option.isRequired,
@@ -198,7 +198,7 @@ export const productOptionsTransformer = async (
 
       if (option.__typename === 'DateFieldOption') {
         return {
-          persist: option.isVariantOption,
+          persist: false,
           type: 'date',
           label: option.displayName,
           required: option.isRequired,
diff --git a/core/vibes/soul/sections/product-detail/product-detail-form.tsx b/core/vibes/soul/sections/product-detail/product-detail-form.tsx
index 021cd7e909..dace2f9dd0 100644
--- a/core/vibes/soul/sections/product-detail/product-detail-form.tsx
+++ b/core/vibes/soul/sections/product-detail/product-detail-form.tsx
@@ -118,10 +118,35 @@ export function ProductDetailForm<F extends Field>({
   const defaultValue = fields.reduce<{
     [Key in keyof SchemaRawShape]?: z.infer<SchemaRawShape[Key]>;
   }>(
-    (acc, field) => ({
-      ...acc,
-      [field.name]: params[field.name] ?? field.defaultValue,
-    }),
+    (acc, field) => {
+      // Checkbox field has to be handled separately because we want to convert checked or unchecked value to true or undefined respectively.
+      // This is because the form expects a boolean value, but we want to store the checked or unchecked value in the query params.
+      if (field.type === 'checkbox') {
+        if (params[field.name] === field.checkedValue) {
+          return {
+            ...acc,
+            [field.name]: 'true',
+          };
+        }
+
+        if (params[field.name] === field.uncheckedValue) {
+          return {
+            ...acc,
+            [field.name]: undefined,
+          };
+        }
+
+        return {
+          ...acc,
+          [field.name]: field.defaultValue, // Default value is either 'true' or undefined
+        };
+      }
+
+      return {
+        ...acc,
+        [field.name]: params[field.name] ?? field.defaultValue,
+      };
+    },
     { quantity: minQuantity ?? 1 },
   );
 
@@ -327,20 +352,22 @@ function FormField({
 }) {
   const controls = useInputControl(formField);
 
-  const [params, setParams] = useQueryStates(
+  const [, setParams] = useQueryStates(
     field.persist === true ? { [field.name]: parseAsString.withOptions({ shallow: false }) } : {},
   );
 
   const handleChange = useCallback(
     (value: string) => {
-      // Ensure that if page is reached without a full reload, we are still setting the selection properly based on query params.
-      const fieldValue = value || params[field.name];
-
-      void setParams({ [field.name]: fieldValue || null }); // Passing `null` to remove the value from the query params if fieldValue is falsey
-
-      controls.change(fieldValue ?? ''); // If fieldValue is falsey, we set it to an empty string
+      // Checkbox field has to be handled separately because we want to convert 'true' or '' to the checked or unchecked value respectively.
+      if (field.type === 'checkbox') {
+        void setParams({ [field.name]: value ? field.checkedValue : field.uncheckedValue });
+      } else {
+        void setParams({ [field.name]: value || null }); // Passing `null` to remove the value from the query params if fieldValue is falsey
+      }
+
+      controls.change(value || ''); // If fieldValue is falsey, we set it to an empty string
     },
-    [setParams, field, controls, params],
+    [setParams, field, controls],
   );
 
   const handleOnOptionMouseEnter = (value: string) => {
diff --git a/core/vibes/soul/sections/product-detail/schema.ts b/core/vibes/soul/sections/product-detail/schema.ts
index 510a0a7855..f9e2701e6b 100644
--- a/core/vibes/soul/sections/product-detail/schema.ts
+++ b/core/vibes/soul/sections/product-detail/schema.ts
@@ -23,6 +23,8 @@ type SelectField = {
 type CheckboxField = {
   type: 'checkbox';
   defaultValue?: string;
+  checkedValue: string;
+  uncheckedValue: string;
 } & FormField;
 
 type NumberInputField = {

From 74e4dd11ebf00c312695013c86aab29930fd7a53 Mon Sep 17 00:00:00 2001
From: Jordan Arldt <jordan.arldt@bigcommerce.com>
Date: Mon, 12 Jan 2026 12:22:34 -0600
Subject: [PATCH 08/69] fix(catalyst): CATALYST-1537 Disable filters that are
 no longer available based on selection (#2818)

---
 .changeset/cruel-lizards-join.md              | 398 ++++++++++++++++++
 core/data-transformers/facets-transformer.ts  |  52 ++-
 core/vibes/soul/form/toggle-group/index.tsx   |   2 +-
 .../products-list-section/filters-panel.tsx   |  69 +--
 4 files changed, 473 insertions(+), 48 deletions(-)
 create mode 100644 .changeset/cruel-lizards-join.md

diff --git a/.changeset/cruel-lizards-join.md b/.changeset/cruel-lizards-join.md
new file mode 100644
index 0000000000..b6403f2357
--- /dev/null
+++ b/.changeset/cruel-lizards-join.md
@@ -0,0 +1,398 @@
+---
+"@bigcommerce/catalyst-core": patch
+---
+
+Disable product filters that are no longer available based on the selection.
+
+## Migration steps
+
+### Step 1
+
+Update the `facetsTransformer` function in `core/data-transformers/facets-transformer.ts` to handle disabled filters:
+
+```diff
+  return allFacets.map((facet) => {
+    const refinedFacet = refinedFacets.find((f) => f.displayName === facet.displayName);
+
++    if (refinedFacet == null) {
++      return null;
++    }
++
+    if (facet.__typename === 'CategorySearchFilter') {
+      const refinedCategorySearchFilter =
+-        refinedFacet?.__typename === 'CategorySearchFilter' ? refinedFacet : null;
++        refinedFacet.__typename === 'CategorySearchFilter' ? refinedFacet : null;
+
+      return {
+        type: 'toggle-group' as const,
+        paramName: 'categoryIn',
+        label: facet.displayName,
+        defaultCollapsed: facet.isCollapsedByDefault,
+        options: facet.categories.map((category) => {
+          const refinedCategory = refinedCategorySearchFilter?.categories.find(
+            (c) => c.entityId === category.entityId,
+          );
+          const isSelected = filters.categoryEntityIds?.includes(category.entityId) === true;
++          const disabled = refinedCategory == null && !isSelected;
++          const productCountLabel = disabled ? '' : ` (${category.productCount})`;
++          const label = facet.displayProductCount
++            ? `${category.name}${productCountLabel}`
++            : category.name;
+
+          return {
+-            label: facet.displayProductCount
+-              ? `${category.name} (${category.productCount})`
+-              : category.name,
++            label,
+            value: category.entityId.toString(),
+-            disabled: refinedCategory == null && !isSelected,
++            disabled,
+          };
+        }),
+      };
+    }
+
+    if (facet.__typename === 'BrandSearchFilter') {
+      const refinedBrandSearchFilter =
+-        refinedFacet?.__typename === 'BrandSearchFilter' ? refinedFacet : null;
++        refinedFacet.__typename === 'BrandSearchFilter' ? refinedFacet : null;
+
+      return {
+        type: 'toggle-group' as const,
+        paramName: 'brand',
+        label: facet.displayName,
+        defaultCollapsed: facet.isCollapsedByDefault,
+        options: facet.brands.map((brand) => {
+          const refinedBrand = refinedBrandSearchFilter?.brands.find(
+            (b) => b.entityId === brand.entityId,
+          );
+          const isSelected = filters.brandEntityIds?.includes(brand.entityId) === true;
++          const disabled = refinedBrand == null && !isSelected;
++          const productCountLabel = disabled ? '' : ` (${brand.productCount})`;
++          const label = facet.displayProductCount
++            ? `${brand.name}${productCountLabel}`
++            : brand.name;
+
+          return {
+-            label: facet.displayProductCount ? `${brand.name} (${brand.productCount})` : brand.name,
++            label,
+            value: brand.entityId.toString(),
+-            disabled: refinedBrand == null && !isSelected,
++            disabled,
+          };
+        }),
+      };
+    }
+
+    if (facet.__typename === 'ProductAttributeSearchFilter') {
+      const refinedProductAttributeSearchFilter =
+-        refinedFacet?.__typename === 'ProductAttributeSearchFilter' ? refinedFacet : null;
++        refinedFacet.__typename === 'ProductAttributeSearchFilter' ? refinedFacet : null;
+
+      return {
+        type: 'toggle-group' as const,
+        paramName: `attr_${facet.filterKey}`,
+        label: facet.displayName,
+        defaultCollapsed: facet.isCollapsedByDefault,
+        options: facet.attributes.map((attribute) => {
+          const refinedAttribute = refinedProductAttributeSearchFilter?.attributes.find(
+            (a) => a.value === attribute.value,
+          );
+
+          const isSelected =
+            filters.productAttributes?.some((attr) => attr.values.includes(attribute.value)) ===
+            true;
+
++          const disabled = refinedAttribute == null && !isSelected;
++          const productCountLabel = disabled ? '' : ` (${attribute.productCount})`;
++          const label = facet.displayProductCount
++            ? `${attribute.value}${productCountLabel}`
++            : attribute.value;
++
+          return {
+-            label: facet.displayProductCount
+-              ? `${attribute.value} (${attribute.productCount})`
+-              : attribute.value,
++            label,
+            value: attribute.value,
+-            disabled: refinedAttribute == null && !isSelected,
++            disabled,
+          };
+        }),
+      };
+    }
+
+    if (facet.__typename === 'RatingSearchFilter') {
+      const refinedRatingSearchFilter =
+-        refinedFacet?.__typename === 'RatingSearchFilter' ? refinedFacet : null;
++        refinedFacet.__typename === 'RatingSearchFilter' ? refinedFacet : null;
+      const isSelected = filters.rating?.minRating != null;
+
+      return {
+        type: 'rating' as const,
+        paramName: 'minRating',
+        label: facet.displayName,
+        disabled: refinedRatingSearchFilter == null && !isSelected,
+        defaultCollapsed: facet.isCollapsedByDefault,
+      };
+    }
+
+    if (facet.__typename === 'PriceSearchFilter') {
+      const refinedPriceSearchFilter =
+-        refinedFacet?.__typename === 'PriceSearchFilter' ? refinedFacet : null;
++        refinedFacet.__typename === 'PriceSearchFilter' ? refinedFacet : null;
+      const isSelected = filters.price?.minPrice != null || filters.price?.maxPrice != null;
+
+      return {
+        type: 'range' as const,
+        minParamName: 'minPrice',
+        maxParamName: 'maxPrice',
+        label: facet.displayName,
+        min: facet.selected?.minPrice ?? undefined,
+        max: facet.selected?.maxPrice ?? undefined,
+        disabled: refinedPriceSearchFilter == null && !isSelected,
+        defaultCollapsed: facet.isCollapsedByDefault,
+      };
+    }
+
+    if (facet.freeShipping) {
+      const refinedFreeShippingSearchFilter =
+-        refinedFacet?.__typename === 'OtherSearchFilter' && refinedFacet.freeShipping
++        refinedFacet.__typename === 'OtherSearchFilter' && refinedFacet.freeShipping
+          ? refinedFacet
+          : null;
+      const isSelected = filters.isFreeShipping === true;
+
+      return {
+        type: 'toggle-group' as const,
+        paramName: `shipping`,
+        label: t('freeShippingLabel'),
+        defaultCollapsed: facet.isCollapsedByDefault,
+        options: [
+          {
+            label: t('freeShippingLabel'),
+            value: 'free_shipping',
+            disabled: refinedFreeShippingSearchFilter == null && !isSelected,
+          },
+        ],
+      };
+    }
+
+    if (facet.isFeatured) {
+      const refinedIsFeaturedSearchFilter =
+-        refinedFacet?.__typename === 'OtherSearchFilter' && refinedFacet.isFeatured
++        refinedFacet.__typename === 'OtherSearchFilter' && refinedFacet.isFeatured
+          ? refinedFacet
+          : null;
+      const isSelected = filters.isFeatured === true;
+
+      return {
+        type: 'toggle-group' as const,
+        paramName: `isFeatured`,
+        label: t('isFeaturedLabel'),
+        defaultCollapsed: facet.isCollapsedByDefault,
+        options: [
+          {
+            label: t('isFeaturedLabel'),
+            value: 'on',
+            disabled: refinedIsFeaturedSearchFilter == null && !isSelected,
+          },
+        ],
+      };
+    }
+
+    if (facet.isInStock) {
+      const refinedIsInStockSearchFilter =
+-        refinedFacet?.__typename === 'OtherSearchFilter' && refinedFacet.isInStock
++        refinedFacet.__typename === 'OtherSearchFilter' && refinedFacet.isInStock
+          ? refinedFacet
+          : null;
+      const isSelected = filters.hideOutOfStock === true;
+
+      return {
+        type: 'toggle-group' as const,
+        paramName: `stock`,
+        label: t('inStockLabel'),
+        defaultCollapsed: facet.isCollapsedByDefault,
+        options: [
+          {
+            label: t('inStockLabel'),
+            value: 'in_stock',
+            disabled: refinedIsInStockSearchFilter == null && !isSelected,
+          },
+        ],
+      };
+    }
+
+    return null;
+  });
+```
+
+### Step 2
+
+Fix the disabled state CSS classes in `core/vibes/soul/form/toggle-group/index.tsx`:
+
+```diff
+          <ToggleGroupPrimitive.Item
+            aria-label={option.label}
+            className={clsx(
+-              'data-disabled:pointer-events-none data-disabled:opacity-50 h-12 whitespace-nowrap rounded-full border px-4 font-body text-sm font-normal leading-normal transition-colors focus-visible:outline-0 focus-visible:ring-2',
++              'h-12 whitespace-nowrap rounded-full border px-4 font-body text-sm font-normal leading-normal transition-colors focus-visible:outline-0 focus-visible:ring-2 data-[disabled]:pointer-events-none data-[disabled]:opacity-50',
+              {
+                light:
+                  'border-[var(--toggle-group-light-border,hsl(var(--contrast-100)))] ring-[var(--toggle-group-light-focus,hsl(var(--primary)))] data-[state=on]:border-[var(--toggle-group-light-on-border,hsl(var(--foreground)))] data-[state=off]:bg-[var(--toggle-group-light-off-background,hsl(var(--background)))] data-[state=on]:bg-[var(--toggle-group-light-on-background,hsl(var(--foreground)))] data-[state=off]:text-[var(--toggle-group-light-off-text,hsl(var(--foreground)))] data-[state=on]:text-[var(--toggle-group-light-on-text,hsl(var(--background)))] data-[state=off]:hover:border-[var(--toggle-group-light-off-border-hover,hsl(var(--contrast-200)))] data-[state=off]:hover:bg-[var(--toggle-group-light-off-background-hover,hsl(var(--contrast-100)))]',
+```
+
+### Step 3
+
+Update the FiltersPanel component in `core/vibes/soul/sections/products-list-section/filters-panel.tsx`
+
+```diff
+import { clsx } from 'clsx';
+import { parseAsString, useQueryStates } from 'nuqs';
+-import { Suspense, useOptimistic, useState, useTransition } from 'react';
++import { useOptimistic, useState, useTransition } from 'react';
+
+import { Checkbox } from '@/vibes/soul/form/checkbox';
+import { RangeInput } from '@/vibes/soul/form/range-input';
+import { ToggleGroup } from '@/vibes/soul/form/toggle-group';
+-import { Streamable, useStreamable } from '@/vibes/soul/lib/streamable';
++import { Stream, Streamable, useStreamable } from '@/vibes/soul/lib/streamable';
+import { Accordion, AccordionItem } from '@/vibes/soul/primitives/accordion';
+import { Button } from '@/vibes/soul/primitives/button';
+import { CursorPaginationInfo } from '@/vibes/soul/primitives/cursor-pagination';
+import { Rating } from '@/vibes/soul/primitives/rating';
+import { Link } from '~/components/link';
+
+import { getFilterParsers } from './filter-parsers';
+```
+
+```diff
+  rangeFilterApplyLabel?: Streamable<string>;
+}
+
++type InnerProps = Props & { filters: Filter[] };
++
+function getParamCountLabel(params: Record<string, string | null | string[]>, key: string) {
+  const value = params[key];
+
+  if (Array.isArray(value) && value.length > 0) return `(${value.length})`;
+
+  return '';
+}
+
+export function FiltersPanel({
+  className,
+-  filters,
++  filters: streamableFilters,
+  resetFiltersLabel,
+  rangeFilterApplyLabel,
+}: Props) {
+  return (
+-    <Suspense fallback={<FiltersSkeleton />}>
+-      <FiltersPanelInner
+-        className={className}
+-        filters={filters}
+-        rangeFilterApplyLabel={rangeFilterApplyLabel}
+-        resetFiltersLabel={resetFiltersLabel}
+-      />
+-    </Suspense>
++    <Stream fallback={<FiltersSkeleton />} value={streamableFilters}>
++      {(filters) => (
++        <FiltersPanelInner
++          className={className}
++          filters={filters}
++          rangeFilterApplyLabel={rangeFilterApplyLabel}
++          resetFiltersLabel={resetFiltersLabel}
++        />
++      )}
++    </Stream>
+  );
+}
+
+export function FiltersPanelInner({
+  className,
+-  filters: streamableFilters,
++  filters,
+  resetFiltersLabel: streamableResetFiltersLabel,
+  rangeFilterApplyLabel: streamableRangeFilterApplyLabel,
+  paginationInfo: streamablePaginationInfo,
+-}: Props) {
+-  const filters = useStreamable(streamableFilters);
++}: InnerProps) {
+  const resetFiltersLabel = useStreamable(streamableResetFiltersLabel) ?? 'Reset filters';
+  const rangeFilterApplyLabel = useStreamable(streamableRangeFilterApplyLabel);
+  const paginationInfo = useStreamable(streamablePaginationInfo);
+  const startCursorParamName = paginationInfo?.startCursorParamName ?? 'before';
+  const endCursorParamName = paginationInfo?.endCursorParamName ?? 'after';
+  const [params, setParams] = useQueryStates(
+    {
+      ...getFilterParsers(filters),
+      [startCursorParamName]: parseAsString,
+      [endCursorParamName]: parseAsString,
+    },
+    {
+      shallow: false,
+      history: 'push',
+    },
+  );
+  const [isPending, startTransition] = useTransition();
+  const [optimisticParams, setOptimisticParams] = useOptimistic(params);
+-  const [accordionItems, setAccordionItems] = useState(() =>
++  const [expandedItems, setExpandedItems] = useState(() => {
++    const initial = new Set<string>();
++
+    filters
+      .filter((filter) => filter.type !== 'link-group')
+-      .map((filter, index) => ({
+-        key: index.toString(),
+-        value: index.toString(),
++      .slice(0, 3)
++      .forEach((filter) => {
++        initial.add(filter.label.toLowerCase());
++      });
++
++    return initial;
++  });
++
++  const accordionItems = filters
++    .filter((filter) => filter.type !== 'link-group')
++    .map((filter) => {
++      return {
++        key: filter.label.toLowerCase(),
++        value: filter.label.toLowerCase(),
+        filter,
+-        expanded: index < 3,
+-      })),
+-  );
++        expanded: expandedItems.has(filter.label.toLowerCase()),
++      };
++    });
+
+  if (filters.length === 0) return null;
+
+  const linkGroupFilters = filters.filter(
+    (filter): filter is LinkGroupFilter => filter.type === 'link-group',
+  );
+```
+
+```diff
+      ))}
+      <Accordion
+-        onValueChange={(items) =>
+-          setAccordionItems((prevItems) =>
+-            prevItems.map((prevItem) => ({
+-              ...prevItem,
+-              expanded: items.includes(prevItem.value),
+-            })),
+-          )
+-        }
++        onValueChange={(items) => {
++          setExpandedItems(new Set(items));
++        }}
+        type="multiple"
+        value={accordionItems.filter((item) => item.expanded).map((item) => item.value)}
+      >
+```
+
+
diff --git a/core/data-transformers/facets-transformer.ts b/core/data-transformers/facets-transformer.ts
index 0d182a9254..fc3b1bc2b3 100644
--- a/core/data-transformers/facets-transformer.ts
+++ b/core/data-transformers/facets-transformer.ts
@@ -24,9 +24,13 @@ export const facetsTransformer = async ({
   return allFacets.map((facet) => {
     const refinedFacet = refinedFacets.find((f) => f.displayName === facet.displayName);
 
+    if (refinedFacet == null) {
+      return null;
+    }
+
     if (facet.__typename === 'CategorySearchFilter') {
       const refinedCategorySearchFilter =
-        refinedFacet?.__typename === 'CategorySearchFilter' ? refinedFacet : null;
+        refinedFacet.__typename === 'CategorySearchFilter' ? refinedFacet : null;
 
       return {
         type: 'toggle-group' as const,
@@ -38,13 +42,16 @@ export const facetsTransformer = async ({
             (c) => c.entityId === category.entityId,
           );
           const isSelected = filters.categoryEntityIds?.includes(category.entityId) === true;
+          const disabled = refinedCategory == null && !isSelected;
+          const productCountLabel = disabled ? '' : ` (${category.productCount})`;
+          const label = facet.displayProductCount
+            ? `${category.name}${productCountLabel}`
+            : category.name;
 
           return {
-            label: facet.displayProductCount
-              ? `${category.name} (${category.productCount})`
-              : category.name,
+            label,
             value: category.entityId.toString(),
-            disabled: refinedCategory == null && !isSelected,
+            disabled,
           };
         }),
       };
@@ -52,7 +59,7 @@ export const facetsTransformer = async ({
 
     if (facet.__typename === 'BrandSearchFilter') {
       const refinedBrandSearchFilter =
-        refinedFacet?.__typename === 'BrandSearchFilter' ? refinedFacet : null;
+        refinedFacet.__typename === 'BrandSearchFilter' ? refinedFacet : null;
 
       return {
         type: 'toggle-group' as const,
@@ -64,11 +71,16 @@ export const facetsTransformer = async ({
             (b) => b.entityId === brand.entityId,
           );
           const isSelected = filters.brandEntityIds?.includes(brand.entityId) === true;
+          const disabled = refinedBrand == null && !isSelected;
+          const productCountLabel = disabled ? '' : ` (${brand.productCount})`;
+          const label = facet.displayProductCount
+            ? `${brand.name}${productCountLabel}`
+            : brand.name;
 
           return {
-            label: facet.displayProductCount ? `${brand.name} (${brand.productCount})` : brand.name,
+            label,
             value: brand.entityId.toString(),
-            disabled: refinedBrand == null && !isSelected,
+            disabled,
           };
         }),
       };
@@ -76,7 +88,7 @@ export const facetsTransformer = async ({
 
     if (facet.__typename === 'ProductAttributeSearchFilter') {
       const refinedProductAttributeSearchFilter =
-        refinedFacet?.__typename === 'ProductAttributeSearchFilter' ? refinedFacet : null;
+        refinedFacet.__typename === 'ProductAttributeSearchFilter' ? refinedFacet : null;
 
       return {
         type: 'toggle-group' as const,
@@ -92,12 +104,16 @@ export const facetsTransformer = async ({
             filters.productAttributes?.some((attr) => attr.values.includes(attribute.value)) ===
             true;
 
+          const disabled = refinedAttribute == null && !isSelected;
+          const productCountLabel = disabled ? '' : ` (${attribute.productCount})`;
+          const label = facet.displayProductCount
+            ? `${attribute.value}${productCountLabel}`
+            : attribute.value;
+
           return {
-            label: facet.displayProductCount
-              ? `${attribute.value} (${attribute.productCount})`
-              : attribute.value,
+            label,
             value: attribute.value,
-            disabled: refinedAttribute == null && !isSelected,
+            disabled,
           };
         }),
       };
@@ -105,7 +121,7 @@ export const facetsTransformer = async ({
 
     if (facet.__typename === 'RatingSearchFilter') {
       const refinedRatingSearchFilter =
-        refinedFacet?.__typename === 'RatingSearchFilter' ? refinedFacet : null;
+        refinedFacet.__typename === 'RatingSearchFilter' ? refinedFacet : null;
       const isSelected = filters.rating?.minRating != null;
 
       return {
@@ -119,7 +135,7 @@ export const facetsTransformer = async ({
 
     if (facet.__typename === 'PriceSearchFilter') {
       const refinedPriceSearchFilter =
-        refinedFacet?.__typename === 'PriceSearchFilter' ? refinedFacet : null;
+        refinedFacet.__typename === 'PriceSearchFilter' ? refinedFacet : null;
       const isSelected = filters.price?.minPrice != null || filters.price?.maxPrice != null;
 
       return {
@@ -136,7 +152,7 @@ export const facetsTransformer = async ({
 
     if (facet.freeShipping) {
       const refinedFreeShippingSearchFilter =
-        refinedFacet?.__typename === 'OtherSearchFilter' && refinedFacet.freeShipping
+        refinedFacet.__typename === 'OtherSearchFilter' && refinedFacet.freeShipping
           ? refinedFacet
           : null;
       const isSelected = filters.isFreeShipping === true;
@@ -158,7 +174,7 @@ export const facetsTransformer = async ({
 
     if (facet.isFeatured) {
       const refinedIsFeaturedSearchFilter =
-        refinedFacet?.__typename === 'OtherSearchFilter' && refinedFacet.isFeatured
+        refinedFacet.__typename === 'OtherSearchFilter' && refinedFacet.isFeatured
           ? refinedFacet
           : null;
       const isSelected = filters.isFeatured === true;
@@ -180,7 +196,7 @@ export const facetsTransformer = async ({
 
     if (facet.isInStock) {
       const refinedIsInStockSearchFilter =
-        refinedFacet?.__typename === 'OtherSearchFilter' && refinedFacet.isInStock
+        refinedFacet.__typename === 'OtherSearchFilter' && refinedFacet.isInStock
           ? refinedFacet
           : null;
       const isSelected = filters.hideOutOfStock === true;
diff --git a/core/vibes/soul/form/toggle-group/index.tsx b/core/vibes/soul/form/toggle-group/index.tsx
index 08dc6a81d2..97da3a5049 100644
--- a/core/vibes/soul/form/toggle-group/index.tsx
+++ b/core/vibes/soul/form/toggle-group/index.tsx
@@ -67,7 +67,7 @@ export const ToggleGroup = React.forwardRef<
           <ToggleGroupPrimitive.Item
             aria-label={option.label}
             className={clsx(
-              'data-disabled:pointer-events-none data-disabled:opacity-50 h-12 whitespace-nowrap rounded-full border px-4 font-body text-sm font-normal leading-normal transition-colors focus-visible:outline-0 focus-visible:ring-2',
+              'h-12 whitespace-nowrap rounded-full border px-4 font-body text-sm font-normal leading-normal transition-colors focus-visible:outline-0 focus-visible:ring-2 data-[disabled]:pointer-events-none data-[disabled]:opacity-50',
               {
                 light:
                   'border-[var(--toggle-group-light-border,hsl(var(--contrast-100)))] ring-[var(--toggle-group-light-focus,hsl(var(--primary)))] data-[state=on]:border-[var(--toggle-group-light-on-border,hsl(var(--foreground)))] data-[state=off]:bg-[var(--toggle-group-light-off-background,hsl(var(--background)))] data-[state=on]:bg-[var(--toggle-group-light-on-background,hsl(var(--foreground)))] data-[state=off]:text-[var(--toggle-group-light-off-text,hsl(var(--foreground)))] data-[state=on]:text-[var(--toggle-group-light-on-text,hsl(var(--background)))] data-[state=off]:hover:border-[var(--toggle-group-light-off-border-hover,hsl(var(--contrast-200)))] data-[state=off]:hover:bg-[var(--toggle-group-light-off-background-hover,hsl(var(--contrast-100)))]',
diff --git a/core/vibes/soul/sections/products-list-section/filters-panel.tsx b/core/vibes/soul/sections/products-list-section/filters-panel.tsx
index ffe55398a0..a1ccbb7494 100644
--- a/core/vibes/soul/sections/products-list-section/filters-panel.tsx
+++ b/core/vibes/soul/sections/products-list-section/filters-panel.tsx
@@ -6,12 +6,12 @@
 
 import { clsx } from 'clsx';
 import { parseAsString, useQueryStates } from 'nuqs';
-import { Suspense, useOptimistic, useState, useTransition } from 'react';
+import { useOptimistic, useState, useTransition } from 'react';
 
 import { Checkbox } from '@/vibes/soul/form/checkbox';
 import { RangeInput } from '@/vibes/soul/form/range-input';
 import { ToggleGroup } from '@/vibes/soul/form/toggle-group';
-import { Streamable, useStreamable } from '@/vibes/soul/lib/streamable';
+import { Stream, Streamable, useStreamable } from '@/vibes/soul/lib/streamable';
 import { Accordion, AccordionItem } from '@/vibes/soul/primitives/accordion';
 import { Button } from '@/vibes/soul/primitives/button';
 import { CursorPaginationInfo } from '@/vibes/soul/primitives/cursor-pagination';
@@ -66,6 +66,8 @@ interface Props {
   rangeFilterApplyLabel?: Streamable<string>;
 }
 
+type InnerProps = Props & { filters: Filter[] };
+
 function getParamCountLabel(params: Record<string, string | null | string[]>, key: string) {
   const value = params[key];
 
@@ -76,30 +78,31 @@ function getParamCountLabel(params: Record<string, string | null | string[]>, ke
 
 export function FiltersPanel({
   className,
-  filters,
+  filters: streamableFilters,
   resetFiltersLabel,
   rangeFilterApplyLabel,
 }: Props) {
   return (
-    <Suspense fallback={<FiltersSkeleton />}>
-      <FiltersPanelInner
-        className={className}
-        filters={filters}
-        rangeFilterApplyLabel={rangeFilterApplyLabel}
-        resetFiltersLabel={resetFiltersLabel}
-      />
-    </Suspense>
+    <Stream fallback={<FiltersSkeleton />} value={streamableFilters}>
+      {(filters) => (
+        <FiltersPanelInner
+          className={className}
+          filters={filters}
+          rangeFilterApplyLabel={rangeFilterApplyLabel}
+          resetFiltersLabel={resetFiltersLabel}
+        />
+      )}
+    </Stream>
   );
 }
 
 export function FiltersPanelInner({
   className,
-  filters: streamableFilters,
+  filters,
   resetFiltersLabel: streamableResetFiltersLabel,
   rangeFilterApplyLabel: streamableRangeFilterApplyLabel,
   paginationInfo: streamablePaginationInfo,
-}: Props) {
-  const filters = useStreamable(streamableFilters);
+}: InnerProps) {
   const resetFiltersLabel = useStreamable(streamableResetFiltersLabel) ?? 'Reset filters';
   const rangeFilterApplyLabel = useStreamable(streamableRangeFilterApplyLabel);
   const paginationInfo = useStreamable(streamablePaginationInfo);
@@ -118,16 +121,29 @@ export function FiltersPanelInner({
   );
   const [isPending, startTransition] = useTransition();
   const [optimisticParams, setOptimisticParams] = useOptimistic(params);
-  const [accordionItems, setAccordionItems] = useState(() =>
+  const [expandedItems, setExpandedItems] = useState(() => {
+    const initial = new Set<string>();
+
     filters
       .filter((filter) => filter.type !== 'link-group')
-      .map((filter, index) => ({
-        key: index.toString(),
-        value: index.toString(),
+      .slice(0, 3)
+      .forEach((filter) => {
+        initial.add(filter.label.toLowerCase());
+      });
+
+    return initial;
+  });
+
+  const accordionItems = filters
+    .filter((filter) => filter.type !== 'link-group')
+    .map((filter) => {
+      return {
+        key: filter.label.toLowerCase(),
+        value: filter.label.toLowerCase(),
         filter,
-        expanded: index < 3,
-      })),
-  );
+        expanded: expandedItems.has(filter.label.toLowerCase()),
+      };
+    });
 
   if (filters.length === 0) return null;
 
@@ -155,14 +171,9 @@ export function FiltersPanelInner({
         </div>
       ))}
       <Accordion
-        onValueChange={(items) =>
-          setAccordionItems((prevItems) =>
-            prevItems.map((prevItem) => ({
-              ...prevItem,
-              expanded: items.includes(prevItem.value),
-            })),
-          )
-        }
+        onValueChange={(items) => {
+          setExpandedItems(new Set(items));
+        }}
         type="multiple"
         value={accordionItems.filter((item) => item.expanded).map((item) => item.value)}
       >

From 52ee85ef1b08fc6114aa953f7a7e67c11876e7e2 Mon Sep 17 00:00:00 2001
From: James Q Quick <james.q.quick@gmail.com>
Date: Mon, 12 Jan 2026 16:51:18 -0500
Subject: [PATCH 09/69] Feat: add required indicators to form fields (#2815)

* feat(core): add required prop to Label component and update form elements

- Introduced a `required` prop to the Label component to indicate mandatory fields.
- Updated Input, Textarea, NumberInput, Select, Checkbox, RadioGroup, and other form components to utilize the new `required` prop for better accessibility and user experience.

* refactor(core): format required indicator in Label component for improved readability

* display optional text for form fields instead of required asterisk

* fix linting

* add internationalization and translated messages for optional text

* remove formatting from da.json file

* removed formatting from language files

* removed formatting from language files

* added changeset

* remove 'optional' field from multiple language files

* ensure required prop is passed down in form input components

* pass required prop to RadioGroupPrimitive.Root

* fix linting

* removed optional text from checkbox

* Pass field.required to CheckboxGroup and Checkbox so that optional text can be displayed
---
 .changeset/tricky-hoops-hammer.md             |  9 +++++++
 core/messages/en.json                         |  3 +++
 .../soul/form/button-radio-group/index.tsx    | 14 +++++++++--
 .../soul/form/card-radio-group/index.tsx      | 21 +++++++++++++---
 core/vibes/soul/form/checkbox-group/index.tsx |  4 ++-
 core/vibes/soul/form/dynamic-form/index.tsx   |  3 ++-
 core/vibes/soul/form/input/index.tsx          |  3 ++-
 core/vibes/soul/form/label/index.tsx          | 17 +++++++++++--
 core/vibes/soul/form/number-input/index.tsx   |  3 ++-
 core/vibes/soul/form/radio-group/index.tsx    | 25 ++++++++++++++++---
 .../soul/form/rating-radio-group/index.tsx    |  4 ++-
 core/vibes/soul/form/select/index.tsx         |  4 ++-
 .../soul/form/swatch-radio-group/index.tsx    | 14 +++++++++--
 core/vibes/soul/form/textarea/index.tsx       |  3 ++-
 14 files changed, 108 insertions(+), 19 deletions(-)
 create mode 100644 .changeset/tricky-hoops-hammer.md

diff --git a/.changeset/tricky-hoops-hammer.md b/.changeset/tricky-hoops-hammer.md
new file mode 100644
index 0000000000..de6829a289
--- /dev/null
+++ b/.changeset/tricky-hoops-hammer.md
@@ -0,0 +1,9 @@
+---
+"@bigcommerce/catalyst-core": minor
+---
+
+Add default optional text to form input labels for inputs that are not required.
+
+## Migration
+
+The new required props are optional, so they are backwards compatible. However, this does mean that the `(optional)` text will now show up on fields that aren't explicitly marked as required by passing the required prop to the Label component.
diff --git a/core/messages/en.json b/core/messages/en.json
index 76528b4f56..e8a99d5e6c 100644
--- a/core/messages/en.json
+++ b/core/messages/en.json
@@ -607,5 +607,8 @@
         }
       }
     }
+  },
+  "Form": {
+    "optional": "optional"
   }
 }
diff --git a/core/vibes/soul/form/button-radio-group/index.tsx b/core/vibes/soul/form/button-radio-group/index.tsx
index ae836c477f..102c2a5d86 100644
--- a/core/vibes/soul/form/button-radio-group/index.tsx
+++ b/core/vibes/soul/form/button-radio-group/index.tsx
@@ -48,7 +48,16 @@ export const ButtonRadioGroup = React.forwardRef<
   }
 >(
   (
-    { label, options, errors, className, onOptionMouseEnter, colorScheme = 'light', ...rest },
+    {
+      label,
+      options,
+      errors,
+      className,
+      onOptionMouseEnter,
+      colorScheme = 'light',
+      required,
+      ...rest
+    },
     ref,
   ) => {
     const id = React.useId();
@@ -56,7 +65,7 @@ export const ButtonRadioGroup = React.forwardRef<
     return (
       <div className={clsx('button-radio-group space-y-2', className)}>
         {label !== undefined && label !== '' && (
-          <Label colorScheme={colorScheme} id={id}>
+          <Label colorScheme={colorScheme} id={id} required={required}>
             {label}
           </Label>
         )}
@@ -65,6 +74,7 @@ export const ButtonRadioGroup = React.forwardRef<
           aria-labelledby={id}
           className="flex flex-wrap gap-2"
           ref={ref}
+          required={required}
         >
           {options.map((option) => (
             <RadioGroupPrimitive.Item
diff --git a/core/vibes/soul/form/card-radio-group/index.tsx b/core/vibes/soul/form/card-radio-group/index.tsx
index a1aaeba18b..7a9535b566 100644
--- a/core/vibes/soul/form/card-radio-group/index.tsx
+++ b/core/vibes/soul/form/card-radio-group/index.tsx
@@ -50,7 +50,16 @@ export const CardRadioGroup = React.forwardRef<
   }
 >(
   (
-    { label, options, errors, className, onOptionMouseEnter, colorScheme = 'light', ...rest },
+    {
+      label,
+      options,
+      errors,
+      className,
+      onOptionMouseEnter,
+      colorScheme = 'light',
+      required,
+      ...rest
+    },
     ref,
   ) => {
     const id = React.useId();
@@ -58,11 +67,17 @@ export const CardRadioGroup = React.forwardRef<
     return (
       <div className={clsx('space-y-2', className)}>
         {label !== undefined && label !== '' && (
-          <Label colorScheme={colorScheme} id={id}>
+          <Label colorScheme={colorScheme} id={id} required={required}>
             {label}
           </Label>
         )}
-        <RadioGroupPrimitive.Root {...rest} aria-labelledby={id} className="space-y-2" ref={ref}>
+        <RadioGroupPrimitive.Root
+          {...rest}
+          aria-labelledby={id}
+          className="space-y-2"
+          ref={ref}
+          required={required}
+        >
           {options.map((option) => (
             <RadioGroupPrimitive.Item
               aria-label={option.label}
diff --git a/core/vibes/soul/form/checkbox-group/index.tsx b/core/vibes/soul/form/checkbox-group/index.tsx
index be6ed27f1c..d38b903e2d 100644
--- a/core/vibes/soul/form/checkbox-group/index.tsx
+++ b/core/vibes/soul/form/checkbox-group/index.tsx
@@ -21,6 +21,7 @@ interface Props {
   value: string[];
   onValueChange: (value: string[]) => void;
   colorScheme?: 'light' | 'dark';
+  required?: boolean;
 }
 
 export function CheckboxGroup({
@@ -32,13 +33,14 @@ export function CheckboxGroup({
   value,
   onValueChange,
   colorScheme,
+  required,
 }: Props) {
   const id = React.useId();
 
   return (
     <div className={clsx('space-y-2', className)}>
       {label !== undefined && label !== '' && (
-        <Label colorScheme={colorScheme} id={id}>
+        <Label colorScheme={colorScheme} id={id} required={required}>
           {label}
         </Label>
       )}
diff --git a/core/vibes/soul/form/dynamic-form/index.tsx b/core/vibes/soul/form/dynamic-form/index.tsx
index 21299426e7..0efdb0974e 100644
--- a/core/vibes/soul/form/dynamic-form/index.tsx
+++ b/core/vibes/soul/form/dynamic-form/index.tsx
@@ -276,7 +276,7 @@ function DynamicFormField({
           onBlur={controls.blur}
           onCheckedChange={(value) => controls.change(String(value))}
           onFocus={controls.focus}
-          required={formField.required}
+          required={field.required}
           value={controls.value}
         />
       );
@@ -290,6 +290,7 @@ function DynamicFormField({
           name={formField.name}
           onValueChange={controls.change}
           options={field.options}
+          required={field.required}
           value={Array.isArray(controls.value) ? controls.value : []}
         />
       );
diff --git a/core/vibes/soul/form/input/index.tsx b/core/vibes/soul/form/input/index.tsx
index 5b6ed1ed7b..6c97fa6d2d 100644
--- a/core/vibes/soul/form/input/index.tsx
+++ b/core/vibes/soul/form/input/index.tsx
@@ -39,7 +39,7 @@ export const Input = React.forwardRef<
   return (
     <div className={clsx('w-full space-y-2', className)}>
       {label != null && label !== '' && (
-        <Label colorScheme={colorScheme} htmlFor={id ?? generatedId}>
+        <Label colorScheme={colorScheme} htmlFor={id ?? generatedId} required={required}>
           {label}
         </Label>
       )}
@@ -81,6 +81,7 @@ export const Input = React.forwardRef<
           )}
           id={id ?? generatedId}
           ref={ref}
+          required={required}
         />
       </div>
       {errors?.map((error) => (
diff --git a/core/vibes/soul/form/label/index.tsx b/core/vibes/soul/form/label/index.tsx
index 06585f5623..c19843b2fe 100644
--- a/core/vibes/soul/form/label/index.tsx
+++ b/core/vibes/soul/form/label/index.tsx
@@ -1,5 +1,8 @@
+'use client';
+
 import * as LabelPrimitive from '@radix-ui/react-label';
 import { clsx } from 'clsx';
+import { useTranslations } from 'next-intl';
 import { ComponentPropsWithoutRef } from 'react';
 
 // eslint-disable-next-line valid-jsdoc
@@ -17,8 +20,15 @@ import { ComponentPropsWithoutRef } from 'react';
 export function Label({
   className,
   colorScheme = 'light',
+  required,
+  children,
   ...rest
-}: ComponentPropsWithoutRef<typeof LabelPrimitive.Root> & { colorScheme?: 'light' | 'dark' }) {
+}: ComponentPropsWithoutRef<typeof LabelPrimitive.Root> & {
+  colorScheme?: 'light' | 'dark';
+  required?: boolean;
+}) {
+  const t = useTranslations('Form');
+
   return (
     <LabelPrimitive.Root
       {...rest}
@@ -30,6 +40,9 @@ export function Label({
         }[colorScheme],
         className,
       )}
-    />
+    >
+      {children}
+      {!required && <span className="ml-1 normal-case">({t('optional')})</span>}
+    </LabelPrimitive.Root>
   );
 }
diff --git a/core/vibes/soul/form/number-input/index.tsx b/core/vibes/soul/form/number-input/index.tsx
index a26961055d..c8ea8b59c4 100644
--- a/core/vibes/soul/form/number-input/index.tsx
+++ b/core/vibes/soul/form/number-input/index.tsx
@@ -62,7 +62,7 @@ export const NumberInput = React.forwardRef<
     return (
       <div className={clsx('space-y-2', className)}>
         {label != null && label !== '' && (
-          <Label colorScheme={colorScheme} htmlFor={id}>
+          <Label colorScheme={colorScheme} htmlFor={id} required={required}>
             {label}
           </Label>
         )}
@@ -130,6 +130,7 @@ export const NumberInput = React.forwardRef<
             disabled={disabled}
             id={id}
             ref={ref}
+            required={required}
             type="number"
           />
           <button
diff --git a/core/vibes/soul/form/radio-group/index.tsx b/core/vibes/soul/form/radio-group/index.tsx
index ee8b586125..217f9d8228 100644
--- a/core/vibes/soul/form/radio-group/index.tsx
+++ b/core/vibes/soul/form/radio-group/index.tsx
@@ -23,15 +23,34 @@ export const RadioGroup = React.forwardRef<
   }
 >(
   (
-    { label, options, errors, className, onOptionMouseEnter, colorScheme = 'light', ...rest },
+    {
+      label,
+      options,
+      errors,
+      className,
+      onOptionMouseEnter,
+      colorScheme = 'light',
+      required,
+      ...rest
+    },
     ref,
   ) => {
     const id = React.useId();
 
     return (
       <div className={clsx('space-y-2', className)}>
-        {label !== undefined && label !== '' && <Label id={id}>{label}</Label>}
-        <RadioGroupPrimitive.Root {...rest} aria-labelledby={id} className="space-y-2" ref={ref}>
+        {label !== undefined && label !== '' && (
+          <Label colorScheme={colorScheme} id={id} required={required}>
+            {label}
+          </Label>
+        )}
+        <RadioGroupPrimitive.Root
+          {...rest}
+          aria-labelledby={id}
+          className="space-y-2"
+          ref={ref}
+          required={required}
+        >
           {options.map((option, index) => (
             <RadioGroupItem
               colorScheme={colorScheme}
diff --git a/core/vibes/soul/form/rating-radio-group/index.tsx b/core/vibes/soul/form/rating-radio-group/index.tsx
index c6307ca826..cc02420d16 100644
--- a/core/vibes/soul/form/rating-radio-group/index.tsx
+++ b/core/vibes/soul/form/rating-radio-group/index.tsx
@@ -42,6 +42,7 @@ export const RatingRadioGroup = React.forwardRef<
       onOptionMouseEnter,
       onOptionMouseLeave,
       colorScheme = 'light',
+      required,
       ...rest
     },
     ref,
@@ -74,7 +75,7 @@ export const RatingRadioGroup = React.forwardRef<
 
     return (
       <div className={clsx('rating-radio-group space-y-2', className)}>
-        <Label colorScheme={colorScheme} id={groupId}>
+        <Label colorScheme={colorScheme} id={groupId} required={required}>
           {label}
         </Label>
 
@@ -86,6 +87,7 @@ export const RatingRadioGroup = React.forwardRef<
           onMouseLeave={handleMouseLeave}
           onMouseUp={handleMouseUp}
           ref={ref}
+          required={required}
         >
           <div className="flex items-center gap-1">
             {Array.from({ length: max }, (_, i) => {
diff --git a/core/vibes/soul/form/select/index.tsx b/core/vibes/soul/form/select/index.tsx
index 414f767579..6249b4584e 100644
--- a/core/vibes/soul/form/select/index.tsx
+++ b/core/vibes/soul/form/select/index.tsx
@@ -80,6 +80,7 @@ export function Select({
   onBlur,
   onOptionMouseEnter,
   value,
+  required,
   ...rest
 }: Props) {
   const id = React.useId();
@@ -91,13 +92,14 @@ export function Select({
           className={clsx(hideLabel && 'sr-only', 'mb-2')}
           colorScheme={colorScheme}
           htmlFor={id}
+          required={required}
         >
           {label}
         </Label>
       )}
       {/* Workaround for https://github.com/radix-ui/primitives/issues/3198, remove when fixed */}
       <input name={name} type="hidden" value={value} />
-      <SelectPrimitive.Root {...rest} name={`${name}_display`} value={value}>
+      <SelectPrimitive.Root {...rest} name={`${name}_display`} required={required} value={value}>
         <SelectPrimitive.Trigger
           aria-label={label}
           className={clsx(
diff --git a/core/vibes/soul/form/swatch-radio-group/index.tsx b/core/vibes/soul/form/swatch-radio-group/index.tsx
index 1026dca943..0f52ee4ea3 100644
--- a/core/vibes/soul/form/swatch-radio-group/index.tsx
+++ b/core/vibes/soul/form/swatch-radio-group/index.tsx
@@ -58,7 +58,16 @@ export const SwatchRadioGroup = React.forwardRef<
   }
 >(
   (
-    { label, options, errors, className, colorScheme = 'light', onOptionMouseEnter, ...rest },
+    {
+      label,
+      options,
+      errors,
+      className,
+      colorScheme = 'light',
+      onOptionMouseEnter,
+      required,
+      ...rest
+    },
     ref,
   ) => {
     const id = React.useId();
@@ -66,7 +75,7 @@ export const SwatchRadioGroup = React.forwardRef<
     return (
       <div className={clsx('space-y-2', className)}>
         {label !== undefined && label !== '' && (
-          <Label colorScheme={colorScheme} id={id}>
+          <Label colorScheme={colorScheme} id={id} required={required}>
             {label}
           </Label>
         )}
@@ -75,6 +84,7 @@ export const SwatchRadioGroup = React.forwardRef<
           aria-labelledby={id}
           className="flex flex-wrap gap-1"
           ref={ref}
+          required={required}
         >
           {options.map((option) => (
             <RadioGroupPrimitive.Item
diff --git a/core/vibes/soul/form/textarea/index.tsx b/core/vibes/soul/form/textarea/index.tsx
index 4b0389f74a..8f0f3da74f 100644
--- a/core/vibes/soul/form/textarea/index.tsx
+++ b/core/vibes/soul/form/textarea/index.tsx
@@ -39,7 +39,7 @@ export const Textarea = React.forwardRef<
   return (
     <div className={clsx('space-y-2', className)}>
       {label != null && label !== '' && (
-        <Label colorScheme={colorScheme} htmlFor={id}>
+        <Label colorScheme={colorScheme} htmlFor={id} required={required}>
           {label}
         </Label>
       )}
@@ -65,6 +65,7 @@ export const Textarea = React.forwardRef<
         )}
         id={id}
         ref={ref}
+        required={required}
       />
       {errors?.map((error) => (
         <FieldError key={error}>{error}</FieldError>

From a50fa6fda64cbb1370862f43d272b0069f6d6307 Mon Sep 17 00:00:00 2001
From: Jordan Arldt <jordan.arldt@bigcommerce.com>
Date: Mon, 12 Jan 2026 17:08:27 -0600
Subject: [PATCH 10/69] fix(catalyst): Fix WishlistDetails page from exceeding
 complexity limit, fix e2e tests (#2820)

---
 .changeset/silent-pianos-search.md            | 144 ++++++++++++++++++
 core/components/wishlist/fragment.ts          |  31 +++-
 core/components/wishlist/modals/new.tsx       |   1 +
 core/components/wishlist/modals/rename.tsx    |   1 +
 .../product-card-transformer.ts               |  10 +-
 .../ui/e2e/account/wishlists.mobile.spec.ts   |   9 +-
 core/tests/ui/e2e/account/wishlists.spec.ts   |   8 +-
 7 files changed, 184 insertions(+), 20 deletions(-)
 create mode 100644 .changeset/silent-pianos-search.md

diff --git a/.changeset/silent-pianos-search.md b/.changeset/silent-pianos-search.md
new file mode 100644
index 0000000000..a36ace28eb
--- /dev/null
+++ b/.changeset/silent-pianos-search.md
@@ -0,0 +1,144 @@
+---
+"@bigcommerce/catalyst-core": patch
+---
+
+Fix WishlistDetails page from exceeding GraphQL complexity limit, and fix wishlist e2e tests.
+
+Additionally, add the `required` prop to `core/components/wishlist/modals/new.tsx` and `core/components/wishlist/modals/rename.tsx`
+
+## Migration
+
+### Step 1: Update wishlist GraphQL fragments
+
+In `core/components/wishlist/fragment.ts`, replace the `WishlistItemProductFragment` to use explicit fields instead of `ProductCardFragment`:
+
+```typescript
+export const WishlistItemProductFragment = graphql(
+  `
+    fragment WishlistItemProductFragment on Product {
+      entityId
+      name
+      defaultImage {
+        altText
+        url: urlTemplate(lossy: true)
+      }
+      path
+      brand {
+        name
+        path
+      }
+      reviewSummary {
+        numberOfReviews
+        averageRating
+      }
+      sku
+      showCartAction
+      inventory {
+        isInStock
+      }
+      availabilityV2 {
+        status
+      }
+      ...PricingFragment
+    }
+  `,
+  [PricingFragment],
+);
+```
+
+Remove `ProductCardFragment` from all fragment dependencies in the same file.
+
+### Step 2: Update product card transformer
+
+In `core/data-transformers/product-card-transformer.ts`:
+
+1. Import the `WishlistItemProductFragment`:
+   ```typescript
+   import { WishlistItemProductFragment } from '~/components/wishlist/fragment';
+   ```
+
+2. Update the `singleProductCardTransformer` function signature to accept both fragment types:
+   ```typescript
+   product: ResultOf<typeof ProductCardFragment | typeof WishlistItemProductFragment>
+   ```
+
+3. Add a conditional check for the `inventoryMessage` field:
+   ```typescript
+   inventoryMessage:
+     'variants' in product
+       ? getInventoryMessage(product, outOfStockMessage, showBackorderMessage)
+       : undefined,
+   ```
+
+4. Update the `productCardTransformer` function signature similarly:
+   ```typescript
+   products: Array<ResultOf<typeof ProductCardFragment | typeof WishlistItemProductFragment>>
+   ```
+
+### Step 3: Fix wishlist e2e tests
+
+In `core/tests/ui/e2e/account/wishlists.spec.ts`, update label selectors to use `{ exact: true }` for specificity:
+
+Update all locators for the wishlist name input selectors:
+  ```diff
+  - page.getByLabel(t('Form.nameLabel'))
+  + page.getByLabel(t('Form.nameLabel'), { exact: true })
+  ```
+
+### Step 4: Fix mobile wishlist e2e tests
+
+In `core/tests/ui/e2e/account/wishlists.mobile.spec.ts`, update translation calls to use namespace prefixes:
+
+1. Update the translation initialization:
+  ```diff
+  - const t = await getTranslations('Account.Wishlist');
+  + const t = await getTranslations();
+  ```
+
+2. Update all translation keys to include the namespace:
+  ```diff
+  - await locator.getByRole('button', { name: t('actionsTitle') }).click();
+  - await page.getByRole('menuitem', { name: t('share') }).click();
+  + await locator.getByRole('button', { name: t('Wishlist.actionsTitle') }).click();
+  + await page.getByRole('menuitem', { name: t('Wishlist.share') }).click();
+  ```
+
+  ```diff
+  - await expect(page.getByText(t('shareSuccess'))).toBeVisible();
+  + await expect(page.getByText(t('Wishlist.shareSuccess'))).toBeVisible();
+  ```
+
+### Step 5: Add `required` prop to wishlist modals
+
+Update the modal forms to include the `required` prop on the name input field:
+
+In `core/components/wishlist/modals/new.tsx`:
+```diff
+      <Input
+        {...getInputProps(fields.wishlistName, { type: 'text' })}
+        defaultValue={defaultValue.current}
+        errors={fields.wishlistName.errors}
+        key={fields.wishlistName.id}
+        label={nameLabel}
+        onChange={(e) => {
+          defaultValue.current = e.target.value;
+        }}
++       required
+      />
+```
+
+In `core/components/wishlist/modals/rename.tsx`:
+```diff
+      <Input
+        {...getInputProps(fields.wishlistName, { type: 'text' })}
+        defaultValue={defaultValue.current}
+        errors={fields.wishlistName.errors}
+        key={fields.wishlistName.id}
+        label={nameLabel}
+        onChange={(e) => {
+          defaultValue.current = e.target.value;
+        }}
++       required
+      />
+```
+
diff --git a/core/components/wishlist/fragment.ts b/core/components/wishlist/fragment.ts
index b468c91f7e..c76e458238 100644
--- a/core/components/wishlist/fragment.ts
+++ b/core/components/wishlist/fragment.ts
@@ -1,11 +1,25 @@
 import { PaginationFragment } from '~/client/fragments/pagination';
+import { PricingFragment } from '~/client/fragments/pricing';
 import { graphql } from '~/client/graphql';
-import { ProductCardFragment } from '~/components/product-card/fragment';
 
 export const WishlistItemProductFragment = graphql(
   `
     fragment WishlistItemProductFragment on Product {
-      ...ProductCardFragment
+      entityId
+      name
+      defaultImage {
+        altText
+        url: urlTemplate(lossy: true)
+      }
+      path
+      brand {
+        name
+        path
+      }
+      reviewSummary {
+        numberOfReviews
+        averageRating
+      }
       sku
       showCartAction
       inventory {
@@ -14,9 +28,10 @@ export const WishlistItemProductFragment = graphql(
       availabilityV2 {
         status
       }
+      ...PricingFragment
     }
   `,
-  [ProductCardFragment],
+  [PricingFragment],
 );
 
 export const WishlistItemFragment = graphql(
@@ -30,7 +45,7 @@ export const WishlistItemFragment = graphql(
       }
     }
   `,
-  [WishlistItemProductFragment, ProductCardFragment],
+  [WishlistItemProductFragment],
 );
 
 export const WishlistFragment = graphql(
@@ -52,7 +67,7 @@ export const WishlistFragment = graphql(
       }
     }
   `,
-  [WishlistItemFragment, ProductCardFragment],
+  [WishlistItemFragment],
 );
 
 export const WishlistsFragment = graphql(
@@ -68,7 +83,7 @@ export const WishlistsFragment = graphql(
       }
     }
   `,
-  [WishlistFragment, ProductCardFragment, PaginationFragment],
+  [WishlistFragment, PaginationFragment],
 );
 
 export const WishlistPaginatedItemsFragment = graphql(
@@ -93,7 +108,7 @@ export const WishlistPaginatedItemsFragment = graphql(
       }
     }
   `,
-  [WishlistItemFragment, ProductCardFragment, PaginationFragment],
+  [WishlistItemFragment, PaginationFragment],
 );
 
 export const PublicWishlistFragment = graphql(
@@ -117,5 +132,5 @@ export const PublicWishlistFragment = graphql(
       }
     }
   `,
-  [WishlistItemFragment, ProductCardFragment, PaginationFragment],
+  [WishlistItemFragment, PaginationFragment],
 );
diff --git a/core/components/wishlist/modals/new.tsx b/core/components/wishlist/modals/new.tsx
index a509e38d49..e5fcae488c 100644
--- a/core/components/wishlist/modals/new.tsx
+++ b/core/components/wishlist/modals/new.tsx
@@ -32,6 +32,7 @@ export const NewWishlistModal = ({
         onChange={(e) => {
           defaultValue.current = e.target.value;
         }}
+        required
       />
       {state.lastResult?.status === 'error' && (
         <div className="mt-4">
diff --git a/core/components/wishlist/modals/rename.tsx b/core/components/wishlist/modals/rename.tsx
index 4ff11fb6d6..f5c41a9df7 100644
--- a/core/components/wishlist/modals/rename.tsx
+++ b/core/components/wishlist/modals/rename.tsx
@@ -33,6 +33,7 @@ export const RenameWishlistModal = ({
         onChange={(e) => {
           defaultValue.current = e.target.value;
         }}
+        required
       />
       {state.lastResult?.status === 'error' && (
         <div className="mt-4">
diff --git a/core/data-transformers/product-card-transformer.ts b/core/data-transformers/product-card-transformer.ts
index a0a6f54484..719cec9c04 100644
--- a/core/data-transformers/product-card-transformer.ts
+++ b/core/data-transformers/product-card-transformer.ts
@@ -5,6 +5,7 @@ import { getFormatter } from 'next-intl/server';
 import { Product } from '@/vibes/soul/primitives/product-card';
 import { ExistingResultType } from '~/client/util';
 import { ProductCardFragment } from '~/components/product-card/fragment';
+import { WishlistItemProductFragment } from '~/components/wishlist/fragment';
 
 import { pricesTransformer } from './prices-transformer';
 
@@ -46,7 +47,7 @@ const getInventoryMessage = (
 };
 
 export const singleProductCardTransformer = (
-  product: ResultOf<typeof ProductCardFragment>,
+  product: ResultOf<typeof ProductCardFragment | typeof WishlistItemProductFragment>,
   format: ExistingResultType<typeof getFormatter>,
   outOfStockMessage?: string,
   showBackorderMessage?: boolean,
@@ -62,12 +63,15 @@ export const singleProductCardTransformer = (
     subtitle: product.brand?.name ?? undefined,
     rating: product.reviewSummary.averageRating,
     numberOfReviews: product.reviewSummary.numberOfReviews,
-    inventoryMessage: getInventoryMessage(product, outOfStockMessage, showBackorderMessage),
+    inventoryMessage:
+      'variants' in product
+        ? getInventoryMessage(product, outOfStockMessage, showBackorderMessage)
+        : undefined,
   };
 };
 
 export const productCardTransformer = (
-  products: Array<ResultOf<typeof ProductCardFragment>>,
+  products: Array<ResultOf<typeof ProductCardFragment | typeof WishlistItemProductFragment>>,
   format: ExistingResultType<typeof getFormatter>,
   outOfStockMessage?: string,
   showBackorderMessage?: boolean,
diff --git a/core/tests/ui/e2e/account/wishlists.mobile.spec.ts b/core/tests/ui/e2e/account/wishlists.mobile.spec.ts
index afa3092406..25f0ef6163 100644
--- a/core/tests/ui/e2e/account/wishlists.mobile.spec.ts
+++ b/core/tests/ui/e2e/account/wishlists.mobile.spec.ts
@@ -28,7 +28,7 @@ test('Share button calls navigator.share with the correct URL', async ({ page, c
     };
   });
 
-  const t = await getTranslations('Wishlist');
+  const t = await getTranslations();
   const { id: customerId } = await customer.login();
   const { name, token } = await customer.createWishlist({
     customerId,
@@ -36,14 +36,13 @@ test('Share button calls navigator.share with the correct URL', async ({ page, c
   });
 
   await page.goto('/account/wishlists/');
-  await expect(page.getByRole('heading', { name: t('title'), exact: true })).toBeVisible();
 
   const locator = page.getByRole('region', { name });
 
-  await locator.getByRole('button', { name: t('actionsTitle') }).click();
-  await page.getByRole('menuitem', { name: t('share') }).click();
+  await locator.getByRole('button', { name: t('Wishlist.actionsTitle') }).click();
+  await page.getByRole('menuitem', { name: t('Wishlist.share') }).click();
 
-  await expect(page.getByText(t('shareSuccess'))).toBeVisible();
+  await expect(page.getByText(t('Wishlist.shareSuccess'))).toBeVisible();
 
   const expectedUrl = `${testEnv.PLAYWRIGHT_TEST_BASE_URL}/wishlist/${token}`;
 
diff --git a/core/tests/ui/e2e/account/wishlists.spec.ts b/core/tests/ui/e2e/account/wishlists.spec.ts
index 3c79d611aa..c561372b44 100644
--- a/core/tests/ui/e2e/account/wishlists.spec.ts
+++ b/core/tests/ui/e2e/account/wishlists.spec.ts
@@ -234,11 +234,11 @@ test.describe('Wishlist actions menu', () => {
       page.getByRole('heading', { name: t('Modal.renameTitle', { name }) }),
     ).toBeVisible();
 
-    await expect(page.getByLabel(t('Form.nameLabel'))).toHaveValue(name);
+    await expect(page.getByLabel(t('Form.nameLabel'), { exact: true })).toHaveValue(name);
 
     const newName = `${name} (renamed)`;
 
-    await page.getByLabel(t('Form.nameLabel')).fill(newName);
+    await page.getByLabel(t('Form.nameLabel'), { exact: true }).fill(newName);
     await page.getByRole('button', { name: t('Modal.save') }).click();
 
     await expect(page.getByText(t('Result.updateSuccess'))).toBeVisible();
@@ -258,7 +258,7 @@ test.describe('Wishlist actions menu', () => {
     await locator.getByRole('button', { name: t('actionsTitle') }).click();
     await page.getByRole('menuitem', { name: t('rename') }).click();
 
-    await page.getByLabel(t('Form.nameLabel')).fill('');
+    await page.getByLabel(t('Form.nameLabel'), { exact: true }).fill('');
     await page.getByRole('button', { name: t('Modal.save') }).click();
 
     await expect(page.getByText(t('Errors.nameRequired'))).toBeVisible();
@@ -282,7 +282,7 @@ test.describe('Wishlist actions menu', () => {
 
     await locator.getByRole('button', { name: t('actionsTitle') }).click();
     await page.getByRole('menuitem', { name: t('rename') }).click();
-    await page.getByLabel(t('Form.nameLabel')).fill(`${name} (renamed)`);
+    await page.getByLabel(t('Form.nameLabel'), { exact: true }).fill(`${name} (renamed)`);
     await page.getByRole('button', { name: t('Modal.save') }).click();
 
     await expect(page.getByText(t('Errors.unauthorized'))).toBeVisible();

From e5a03f6a73fe16da55b96b75de70d3bbd846dfba Mon Sep 17 00:00:00 2001
From: Jordan Arldt <jordan.arldt@bigcommerce.com>
Date: Mon, 12 Jan 2026 17:09:05 -0600
Subject: [PATCH 11/69] fix(catalyst): Update data-disabled selectors to
 data-[disabled] (#2821)

---
 .changeset/soft-flies-sip.md                  | 26 +++++++++++++++++++
 .../soul/form/button-radio-group/index.tsx    |  2 +-
 .../soul/form/card-radio-group/index.tsx      |  2 +-
 core/vibes/soul/form/radio-group/index.tsx    |  2 +-
 .../soul/form/rating-radio-group/index.tsx    |  2 +-
 .../soul/form/swatch-radio-group/index.tsx    |  2 +-
 core/vibes/soul/form/switch/index.tsx         |  4 +--
 .../soul/primitives/dropdown-menu/index.tsx   |  2 +-
 8 files changed, 34 insertions(+), 8 deletions(-)
 create mode 100644 .changeset/soft-flies-sip.md

diff --git a/.changeset/soft-flies-sip.md b/.changeset/soft-flies-sip.md
new file mode 100644
index 0000000000..39ede0e9cc
--- /dev/null
+++ b/.changeset/soft-flies-sip.md
@@ -0,0 +1,26 @@
+---
+"@bigcommerce/catalyst-core": patch
+---
+
+Fix data-disabled class selectors in UI components
+
+## Migration
+
+Updated Tailwind CSS class selectors from `data-disabled:` to `data-[disabled]:` in the following components:
+
+- `vibes/soul/form/button-radio-group/index.tsx`
+- `vibes/soul/form/card-radio-group/index.tsx`
+- `vibes/soul/form/radio-group/index.tsx`
+- `vibes/soul/form/rating-radio-group/index.tsx`
+- `vibes/soul/form/swatch-radio-group/index.tsx`
+- `vibes/soul/form/switch/index.tsx`
+- `vibes/soul/primitives/dropdown-menu/index.tsx`
+
+If you have customized any of these components, update your class names:
+
+```diff
+- data-disabled:pointer-events-none data-disabled:opacity-50
++ data-[disabled]:pointer-events-none data-[disabled]:opacity-50
+```
+
+This change ensures proper styling of disabled states using the correct Tailwind CSS data attribute syntax.
diff --git a/core/vibes/soul/form/button-radio-group/index.tsx b/core/vibes/soul/form/button-radio-group/index.tsx
index 102c2a5d86..8580db8798 100644
--- a/core/vibes/soul/form/button-radio-group/index.tsx
+++ b/core/vibes/soul/form/button-radio-group/index.tsx
@@ -80,7 +80,7 @@ export const ButtonRadioGroup = React.forwardRef<
             <RadioGroupPrimitive.Item
               aria-label={option.label}
               className={clsx(
-                'data-disabled:pointer-events-none data-disabled:opacity-50 h-12 whitespace-nowrap rounded-full border px-4 font-body text-sm font-normal leading-normal transition-colors focus-visible:outline-0 focus-visible:ring-2',
+                'h-12 whitespace-nowrap rounded-full border px-4 font-body text-sm font-normal leading-normal transition-colors focus-visible:outline-0 focus-visible:ring-2 data-[disabled]:pointer-events-none data-[disabled]:opacity-50',
                 {
                   light:
                     'border-[var(--button-radio-group-light-unchecked-border,hsl(var(--contrast-100)))] focus-visible:ring-[var(--button-radio-group-light-focus,hsl(var(--primary)))] data-[state=checked]:bg-[var(--button-radio-group-light-checked-background,hsl(var(--foreground)))] data-[state=unchecked]:bg-[var(--button-radio-group-light-unchecked-background,hsl(var(--background)))] data-[state=checked]:text-[var(--button-radio-group-light-checked-text,hsl(var(--background)))] data-[state=unchecked]:text-[var(--button-radio-group-light-unchecked-text,hsl(var(--foreground)))] data-[state=unchecked]:hover:border-[var(--button-radio-group-light-unchecked-border-hover,hsl(var(--contrast-200)))] data-[state=unchecked]:hover:bg-[var(--button-radio-group-light-unchecked-background-hover,hsl(var(--contrast-100)))]',
diff --git a/core/vibes/soul/form/card-radio-group/index.tsx b/core/vibes/soul/form/card-radio-group/index.tsx
index 7a9535b566..c8aa548573 100644
--- a/core/vibes/soul/form/card-radio-group/index.tsx
+++ b/core/vibes/soul/form/card-radio-group/index.tsx
@@ -82,7 +82,7 @@ export const CardRadioGroup = React.forwardRef<
             <RadioGroupPrimitive.Item
               aria-label={option.label}
               className={clsx(
-                'data-disabled:pointer-events-none data-disabled:opacity-50 relative flex h-12 w-full items-center overflow-hidden rounded-lg border font-body text-sm font-normal leading-normal transition-colors focus-visible:outline-0 focus-visible:ring-2 focus-visible:ring-[var(--card-radio-group-focus,hsl(var(--primary)))]',
+                'relative flex h-12 w-full items-center overflow-hidden rounded-lg border font-body text-sm font-normal leading-normal transition-colors focus-visible:outline-0 focus-visible:ring-2 focus-visible:ring-[var(--card-radio-group-focus,hsl(var(--primary)))] data-[disabled]:pointer-events-none data-[disabled]:opacity-50',
                 {
                   light:
                     'border-[var(--card-radio-group-light-unchecked-border,hsl(var(--contrast-100)))] text-[var(--card-radio-group-light-unchecked-text,hsl(var(--foreground)))] data-[state=checked]:bg-[var(--card-radio-group-light-checked-background,hsl(var(--foreground)))] data-[state=unchecked]:bg-[var(--card-radio-group-light-unchecked-background,hsl(var(--background)))] data-[state=checked]:text-[var(--card-radio-group-light-checked-text,hsl(var(--background)))] data-[state=unchecked]:hover:border-[var(--card-radio-group-light-unchecked-border-hover,hsl(var(--contrast-200)))] data-[state=unchecked]:hover:bg-[var(--card-radio-group-light-unchecked-background-hover,hsl(var(--contrast-100)))]',
diff --git a/core/vibes/soul/form/radio-group/index.tsx b/core/vibes/soul/form/radio-group/index.tsx
index 217f9d8228..09311b5206 100644
--- a/core/vibes/soul/form/radio-group/index.tsx
+++ b/core/vibes/soul/form/radio-group/index.tsx
@@ -117,7 +117,7 @@ function RadioGroupItem({
           option.description !== undefined ? `${id}-label ${id}-description` : `${id}-label`
         }
         className={clsx(
-          'data-disabled:pointer-events-none data-disabled:opacity-50 size-5 cursor-default rounded-full border outline-none [&:disabled+label]:pointer-events-none [&:disabled+label]:opacity-50',
+          'size-5 cursor-default rounded-full border outline-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&:disabled+label]:pointer-events-none [&:disabled+label]:opacity-50',
           {
             light: 'bg-[var(--radio-group-light-background,hsl(var(--background)))]',
             dark: 'bg-[var(--radio-group-dark-background,hsl(var(--foreground)))]',
diff --git a/core/vibes/soul/form/rating-radio-group/index.tsx b/core/vibes/soul/form/rating-radio-group/index.tsx
index cc02420d16..0844941554 100644
--- a/core/vibes/soul/form/rating-radio-group/index.tsx
+++ b/core/vibes/soul/form/rating-radio-group/index.tsx
@@ -101,7 +101,7 @@ export const RatingRadioGroup = React.forwardRef<
                   <RadioGroupPrimitive.Item
                     className={clsx(
                       'peer sr-only',
-                      'data-disabled:pointer-events-none data-disabled:opacity-50 transition-colors focus-visible:outline-0 focus-visible:ring-2',
+                      'transition-colors focus-visible:outline-0 focus-visible:ring-2 data-[disabled]:pointer-events-none data-[disabled]:opacity-50',
                       {
                         light:
                           'focus-visible:ring-[var(--rating-radio-group-focus,hsl(var(--primary)))]',
diff --git a/core/vibes/soul/form/swatch-radio-group/index.tsx b/core/vibes/soul/form/swatch-radio-group/index.tsx
index 0f52ee4ea3..e9a527604c 100644
--- a/core/vibes/soul/form/swatch-radio-group/index.tsx
+++ b/core/vibes/soul/form/swatch-radio-group/index.tsx
@@ -90,7 +90,7 @@ export const SwatchRadioGroup = React.forwardRef<
             <RadioGroupPrimitive.Item
               aria-label={option.label}
               className={clsx(
-                'data-disabled:pointer-events-none group relative box-content h-8 w-8 rounded-full border p-0.5 transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--swatch-radio-group-focus,hsl(var(--primary)))] [&:disabled>.disabled-icon]:grid',
+                'group relative box-content h-8 w-8 rounded-full border p-0.5 transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--swatch-radio-group-focus,hsl(var(--primary)))] data-[disabled]:pointer-events-none [&:disabled>.disabled-icon]:grid',
                 {
                   light:
                     'hover:border-[var(--swatch-radio-group-light-unchecked-border-hover,hsl(var(--contrast-200)))] data-[state=checked]:border-[var(--swatch-radio-group-light-checked-border,hsl(var(--foreground)))]',
diff --git a/core/vibes/soul/form/switch/index.tsx b/core/vibes/soul/form/switch/index.tsx
index e11ef21169..d374fc03ad 100644
--- a/core/vibes/soul/form/switch/index.tsx
+++ b/core/vibes/soul/form/switch/index.tsx
@@ -49,7 +49,7 @@ export const Switch = ({
         aria-busy={loading}
         checked={checked}
         className={clsx(
-          '[&:not([data-loading])]:data-disabled:bg-contrast-100 data-disabled:cursor-not-allowed w-12 rounded-full border border-contrast-200 p-[3px] transition-colors duration-100 focus-visible:outline-none focus-visible:ring-2',
+          'w-12 rounded-full border border-contrast-200 p-[3px] transition-colors duration-100 focus-visible:outline-none focus-visible:ring-2 data-[disabled]:cursor-not-allowed [&:not([data-loading])]:data-[disabled]:bg-contrast-100',
         )}
         data-loading={loading ? '' : undefined}
         disabled={disabled || loading}
@@ -59,7 +59,7 @@ export const Switch = ({
       >
         <SwitchPrimitive.Thumb
           className={clsx(
-            'data-disabled:bg-contrast-200 relative block h-5 w-5 overflow-hidden rounded-full transition-transform duration-100 data-[state=checked]:translate-x-full data-[state=unchecked]:bg-contrast-200',
+            'relative block h-5 w-5 overflow-hidden rounded-full transition-transform duration-100 data-[state=checked]:translate-x-full data-[disabled]:bg-contrast-200 data-[state=unchecked]:bg-contrast-200',
             {
               primary: 'bg-[var(--toggle-primary-background,hsl(var(--primary)))]',
               secondary: 'bg-[var(--toggle-secondary-background,hsl(var(--foreground)))]',
diff --git a/core/vibes/soul/primitives/dropdown-menu/index.tsx b/core/vibes/soul/primitives/dropdown-menu/index.tsx
index c455a643ef..3089825aec 100644
--- a/core/vibes/soul/primitives/dropdown-menu/index.tsx
+++ b/core/vibes/soul/primitives/dropdown-menu/index.tsx
@@ -103,7 +103,7 @@ export const DropdownMenu = ({
               <DropdownMenuPrimitive.Item
                 asChild={asChild ?? labelIsComponent}
                 className={clsx(
-                  'data-disabled:bg-contrast-100/50 data-disabled:text-contrast-300/95 data-disabled:cursor-not-allowed cursor-default rounded-lg bg-[var(--dropdown-menu-item-background,transparent)] px-3 py-2 font-[family-name:var(--dropdown-menu-item-font-family,var(--font-family-body))] text-sm font-medium outline-none transition-colors',
+                  'cursor-default rounded-lg bg-[var(--dropdown-menu-item-background,transparent)] px-3 py-2 font-[family-name:var(--dropdown-menu-item-font-family,var(--font-family-body))] text-sm font-medium outline-none transition-colors data-[disabled]:cursor-not-allowed data-[disabled]:bg-contrast-100/50 data-[disabled]:text-contrast-300/95',
                   {
                     default:
                       'text-[var(--dropdown-menu-item-text,hsl(var(--contrast-500)))] ring-[var(--dropdown-menu-item-focus,hsl(var(--primary)))] [&:not([data-disabled])]:hover:bg-[var(--dropdown-menu-item-background-hover,hsl(var(--contrast-100)))] [&:not([data-disabled])]:hover:text-[var(--dropdown-menu-item-text-hover,hsl(var(--foreground)))] [&:not([data-disabled])]:data-[highlighted]:bg-[var(--dropdown-menu-item-background-hover,hsl(var(--contrast-100)))] [&:not([data-disabled])]:data-[highlighted]:text-[var(--dropdown-menu-item-text-hover,hsl(var(--foreground)))]',

From a1f1ed857eab954e085ba67956a954fb2b63882a Mon Sep 17 00:00:00 2001
From: James Q Quick <james.q.quick@gmail.com>
Date: Wed, 14 Jan 2026 11:44:28 -0500
Subject: [PATCH 12/69] [Catalyst 1677] Dont reset login form data (#2819)

* Add preventDefault to login form to prevent resetting of form on failed login attempt

* added changeset

* remove passing of action to form since actions is called manually in onSubmit handler
---
 .changeset/thirty-coins-look.md                        |  5 +++++
 .../soul/sections/sign-in-section/sign-in-form.tsx     | 10 ++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/thirty-coins-look.md

diff --git a/.changeset/thirty-coins-look.md b/.changeset/thirty-coins-look.md
new file mode 100644
index 0000000000..9db70683fc
--- /dev/null
+++ b/.changeset/thirty-coins-look.md
@@ -0,0 +1,5 @@
+---
+"@bigcommerce/catalyst-core": patch
+---
+
+The login form input data will no longer reset on a failed login attempt.
diff --git a/core/vibes/soul/sections/sign-in-section/sign-in-form.tsx b/core/vibes/soul/sections/sign-in-section/sign-in-form.tsx
index 4d3645dfa8..9c0a902836 100644
--- a/core/vibes/soul/sections/sign-in-section/sign-in-form.tsx
+++ b/core/vibes/soul/sections/sign-in-section/sign-in-form.tsx
@@ -2,7 +2,7 @@
 
 import { getFormProps, getInputProps, SubmissionResult, useForm } from '@conform-to/react';
 import { getZodConstraint, parseWithZod } from '@conform-to/zod';
-import { useActionState, useEffect } from 'react';
+import { startTransition, useActionState, useEffect } from 'react';
 import { useFormStatus } from 'react-dom';
 
 import { FormStatus } from '@/vibes/soul/form/form-status';
@@ -37,6 +37,12 @@ export function SignInForm({
     constraint: getZodConstraint(schema),
     shouldValidate: 'onBlur',
     shouldRevalidate: 'onInput',
+    onSubmit(event, { formData }) {
+      event.preventDefault();
+      startTransition(() => {
+        formAction(formData);
+      });
+    },
     onValidate({ formData }) {
       return parseWithZod(formData, { schema });
     },
@@ -70,7 +76,7 @@ export function SignInForm({
   };
 
   return (
-    <form {...getFormProps(form)} action={formAction} className="flex grow flex-col gap-5">
+    <form {...getFormProps(form)} className="flex grow flex-col gap-5">
       <Input
         {...getInputProps(fields.email, { type: 'text' })}
         errors={fields.email.errors}

From f65d81f3b619061f0c3968a14f9b693e55516277 Mon Sep 17 00:00:00 2001
From: Matthew Volk <matt.volk@bigcommerce.com>
Date: Wed, 14 Jan 2026 15:50:31 -0600
Subject: [PATCH 13/69] chore(ci): non-sensitive gh action secrets moved to
 vars (#2824)

* chore(ci): BIGCOMMERCE_STORE_HASH secret is now var

* chore(ci): BIGCOMMERCE_CHANNEL_ID secret is now var
---
 .github/workflows/basic.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/basic.yml b/.github/workflows/basic.yml
index 4a9c901c81..8b374766e6 100644
--- a/.github/workflows/basic.yml
+++ b/.github/workflows/basic.yml
@@ -12,9 +12,9 @@ env:
   TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
   TURBO_TEAM: ${{ vars.TURBO_TEAM }}
   TURBO_REMOTE_CACHE_SIGNATURE_KEY: ${{ secrets.TURBO_REMOTE_CACHE_SIGNATURE_KEY }}
-  BIGCOMMERCE_STORE_HASH: ${{ secrets.BIGCOMMERCE_STORE_HASH }}
+  BIGCOMMERCE_STORE_HASH: ${{ vars.BIGCOMMERCE_STORE_HASH }}
   BIGCOMMERCE_STOREFRONT_TOKEN: ${{ secrets.BIGCOMMERCE_STOREFRONT_TOKEN }}
-  BIGCOMMERCE_CHANNEL_ID: ${{ secrets.BIGCOMMERCE_CHANNEL_ID }}
+  BIGCOMMERCE_CHANNEL_ID: ${{ vars.BIGCOMMERCE_CHANNEL_ID }}
 
 jobs:
   lint-typecheck:

From dcad8565d5eb835a5a68785f59811a67149d0137 Mon Sep 17 00:00:00 2001
From: Jorge Moya <jorge.moya@bigcommerce.com>
Date: Thu, 15 Jan 2026 20:26:09 -0600
Subject: [PATCH 14/69] refactor: decouple fields from state in DynamicForms
 (#2823)

* refactor: decouple fields from state in DynamicForms

* fix: remove options from fields

* fix: pass passwordComplexity as an arg

* fix: remove fields from return state in contact form

* chore: add changeset
---
 .changeset/quiet-heads-heal.md                | 135 ++++++++++++++++++
 .../register/_actions/register-customer.ts    |  20 +--
 .../addresses/_actions/address-action.ts      |  11 +-
 .../addresses/_actions/create-address.ts      |   9 +-
 .../addresses/_actions/delete-address.ts      |   1 -
 .../addresses/_actions/update-address.ts      |   9 +-
 .../purchase/_actions/add-to-cart.tsx         |  16 +--
 .../contact/_actions/submit-contact-form.ts   |  13 +-
 core/vibes/soul/form/dynamic-form/index.tsx   |  39 +++--
 core/vibes/soul/form/dynamic-form/utils.ts    |  22 +++
 .../sections/address-list-section/index.tsx   |  34 +++--
 11 files changed, 237 insertions(+), 72 deletions(-)
 create mode 100644 .changeset/quiet-heads-heal.md
 create mode 100644 core/vibes/soul/form/dynamic-form/utils.ts

diff --git a/.changeset/quiet-heads-heal.md b/.changeset/quiet-heads-heal.md
new file mode 100644
index 0000000000..503db08a92
--- /dev/null
+++ b/.changeset/quiet-heads-heal.md
@@ -0,0 +1,135 @@
+---
+"@bigcommerce/catalyst-core": patch
+---
+
+Refactor DynamicForm actions to decouple fields and passwordComplexity from state, passing them as separate arguments instead. This reduces state payload size by removing fields from state objects and stripping options from fields before passing them to actions (options are only needed for rendering, not processing). All form actions now accept a `DynamicFormActionArgs` object as the first parameter containing fields and optional passwordComplexity, followed by the previous state and formData.
+
+## Migration steps
+
+### Step 1: Changes to DynamicForm component
+
+The `DynamicForm` component and related utilities have been updated to support the new action signature pattern:
+
+**`core/vibes/soul/form/dynamic-form/index.tsx`**:
+- Added `DynamicFormActionArgs<F>` interface that contains `fields` and optional `passwordComplexity`
+- Updated `DynamicFormAction<F>` type to accept `DynamicFormActionArgs<F>` as the first parameter
+- Removed `fields` and `passwordComplexity` from the `State` interface
+- Added automatic removal of `options` from fields before passing to actions (options are only needed for rendering)
+- Updated action binding to use `action.bind(null, { fields: fieldsWithoutOptions, passwordComplexity })`
+
+**`core/vibes/soul/form/dynamic-form/utils.ts`** (new file):
+- Added `removeOptionsFromFields()` utility function that strips the `options` property from field definitions before passing them to actions, reducing the state payload size
+
+```diff
++ export interface DynamicFormActionArgs<F extends Field> {
++   fields: Array<F | FieldGroup<F>>;
++   passwordComplexity?: PasswordComplexitySettings | null;
++ }
++
++ type Action<F extends Field, S, P> = (
++   args: DynamicFormActionArgs<F>,
++   state: Awaited<S>,
++   payload: P,
++ ) => S | Promise<S>;
++
+  interface State {
+    lastResult: SubmissionResult | null;
+-   fields: Array<F | FieldGroup<F>>;
+-   passwordComplexity?: PasswordComplexitySettings | null;
+  }
+```
+
+### Step 2: Update DynamicForm action signatures
+
+All form actions that use `DynamicForm` must be updated to accept `DynamicFormActionArgs<F>` as the first parameter instead of including fields in the state.
+
+Update your form action function signature:
+
+```diff
++ import { DynamicFormActionArgs } from '@/vibes/soul/form/dynamic-form';
+  import { Field, FieldGroup, schema } from '@/vibes/soul/form/dynamic-form/schema';
+
+- export async function myFormAction<F extends Field>(
+-   prevState: {
+-     lastResult: SubmissionResult | null;
+-     fields: Array<F | FieldGroup<F>>;
+-     passwordComplexity?: PasswordComplexitySettings | null;
+-   },
+-   formData: FormData,
+- ) {
++ export async function myFormAction<F extends Field>(
++   { fields, passwordComplexity }: DynamicFormActionArgs<F>,
++   _prevState: {
++     lastResult: SubmissionResult | null;
++   },
++   formData: FormData,
++ ) {
+```
+
+### Step 2: Remove fields and passwordComplexity from state interfaces
+
+Update state interfaces to remove fields and passwordComplexity properties:
+
+```diff
+  interface State {
+    lastResult: SubmissionResult | null;
+-   fields: Array<Field | FieldGroup<Field>>;
+-   passwordComplexity?: PasswordComplexitySettings | null;
+  }
+```
+
+### Step 3: Update action implementations
+
+Remove references to `prevState.fields` and `prevState.passwordComplexity` in action implementations:
+
+```diff
+  const submission = parseWithZod(formData, {
+-   schema: schema(prevState.fields, prevState.passwordComplexity),
++   schema: schema(fields, passwordComplexity),
+  });
+
+  if (submission.status !== 'success') {
+    return {
+      lastResult: submission.reply(),
+-     fields: prevState.fields,
+-     passwordComplexity: prevState.passwordComplexity,
+    };
+  }
+```
+
+### Step 4: Update action calls in components
+
+For actions used with `AddressListSection`, update the action signature to accept fields as the first parameter:
+
+```diff
+- export async function addressAction(
+-   prevState: Awaited<State>,
+-   formData: FormData,
+- ): Promise<State> {
++ export async function addressAction(
++   fields: Array<Field | FieldGroup<Field>>,
++   prevState: Awaited<State>,
++   formData: FormData,
++ ): Promise<State> {
+```
+
+### Step 5: Update DynamicForm usage
+
+No changes needed to `DynamicForm` component usage. The component automatically handles binding fields and passwordComplexity to actions. The `DynamicForm` component now:
+- Automatically removes options from fields before passing them to actions (reducing payload size)
+- Binds fields and passwordComplexity to the action using `action.bind()`
+- Maintains the same props interface, so existing usage continues to work
+
+### Affected files
+
+The following files were updated in this refactor:
+- `core/vibes/soul/form/dynamic-form/index.tsx` - Added `DynamicFormActionArgs` type and updated action binding
+- `core/vibes/soul/form/dynamic-form/utils.ts` - Added `removeOptionsFromFields` utility function
+- `core/app/[locale]/(default)/(auth)/register/_actions/register-customer.ts`
+- `core/app/[locale]/(default)/account/addresses/_actions/address-action.ts`
+- `core/app/[locale]/(default)/account/addresses/_actions/create-address.ts`
+- `core/app/[locale]/(default)/account/addresses/_actions/update-address.ts`
+- `core/app/[locale]/(default)/account/addresses/_actions/delete-address.ts`
+- `core/app/[locale]/(default)/gift-certificates/purchase/_actions/add-to-cart.tsx`
+- `core/app/[locale]/(default)/webpages/[id]/contact/_actions/submit-contact-form.ts`
+- `core/vibes/soul/sections/address-list-section/index.tsx`
diff --git a/core/app/[locale]/(default)/(auth)/register/_actions/register-customer.ts b/core/app/[locale]/(default)/(auth)/register/_actions/register-customer.ts
index 809596ae99..cd7259ab16 100644
--- a/core/app/[locale]/(default)/(auth)/register/_actions/register-customer.ts
+++ b/core/app/[locale]/(default)/(auth)/register/_actions/register-customer.ts
@@ -6,6 +6,7 @@ import { parseWithZod } from '@conform-to/zod';
 import { getLocale, getTranslations } from 'next-intl/server';
 import { z } from 'zod';
 
+import { DynamicFormActionArgs } from '@/vibes/soul/form/dynamic-form';
 import { Field, FieldGroup, schema } from '@/vibes/soul/form/dynamic-form/schema';
 import { signIn } from '~/auth';
 import { client } from '~/client';
@@ -335,10 +336,9 @@ function parseRegisterCustomerInput(
 }
 
 export async function registerCustomer<F extends Field>(
-  prevState: {
+  { fields, passwordComplexity }: DynamicFormActionArgs<F>,
+  _prevState: {
     lastResult: SubmissionResult | null;
-    fields: Array<F | FieldGroup<F>>;
-    passwordComplexity?: Parameters<typeof schema>[1];
   },
   formData: FormData,
 ) {
@@ -347,19 +347,17 @@ export async function registerCustomer<F extends Field>(
   const cartId = await getCartId();
 
   const submission = parseWithZod(formData, {
-    schema: schema(prevState.fields, prevState.passwordComplexity),
+    schema: schema(fields, passwordComplexity),
   });
 
   if (submission.status !== 'success') {
     return {
       lastResult: submission.reply(),
-      fields: prevState.fields,
-      passwordComplexity: prevState.passwordComplexity,
     };
   }
 
   try {
-    const input = parseRegisterCustomerInput(submission.value, prevState.fields);
+    const input = parseRegisterCustomerInput(submission.value, fields);
     const response = await client.fetch({
       document: RegisterCustomerMutation,
       variables: {
@@ -375,8 +373,6 @@ export async function registerCustomer<F extends Field>(
         lastResult: submission.reply({
           formErrors: response.data.customer.registerCustomer.errors.map((error) => error.message),
         }),
-        fields: prevState.fields,
-        passwordComplexity: prevState.passwordComplexity,
       };
     }
 
@@ -397,23 +393,17 @@ export async function registerCustomer<F extends Field>(
         lastResult: submission.reply({
           formErrors: error.errors.map(({ message }) => message),
         }),
-        fields: prevState.fields,
-        passwordComplexity: prevState.passwordComplexity,
       };
     }
 
     if (error instanceof Error) {
       return {
         lastResult: submission.reply({ formErrors: [error.message] }),
-        fields: prevState.fields,
-        passwordComplexity: prevState.passwordComplexity,
       };
     }
 
     return {
       lastResult: submission.reply({ formErrors: [t('somethingWentWrong')] }),
-      fields: prevState.fields,
-      passwordComplexity: prevState.passwordComplexity,
     };
   }
 
diff --git a/core/app/[locale]/(default)/account/addresses/_actions/address-action.ts b/core/app/[locale]/(default)/account/addresses/_actions/address-action.ts
index d94594b41d..19e0ce8823 100644
--- a/core/app/[locale]/(default)/account/addresses/_actions/address-action.ts
+++ b/core/app/[locale]/(default)/account/addresses/_actions/address-action.ts
@@ -11,21 +11,24 @@ export interface State {
   addresses: Address[];
   lastResult: SubmissionResult | null;
   defaultAddress?: DefaultAddressConfiguration;
-  fields: Array<Field | FieldGroup<Field>>;
 }
 
-export async function addressAction(prevState: Awaited<State>, formData: FormData): Promise<State> {
+export async function addressAction(
+  fields: Array<Field | FieldGroup<Field>>,
+  prevState: Awaited<State>,
+  formData: FormData,
+): Promise<State> {
   'use server';
 
   const intent = formData.get('intent');
 
   switch (intent) {
     case 'create': {
-      return await createAddress(prevState, formData);
+      return await createAddress(fields, prevState, formData);
     }
 
     case 'update': {
-      return await updateAddress(prevState, formData);
+      return await updateAddress(fields, prevState, formData);
     }
 
     case 'delete': {
diff --git a/core/app/[locale]/(default)/account/addresses/_actions/create-address.ts b/core/app/[locale]/(default)/account/addresses/_actions/create-address.ts
index 94c7e3dc1e..e6f67f0cea 100644
--- a/core/app/[locale]/(default)/account/addresses/_actions/create-address.ts
+++ b/core/app/[locale]/(default)/account/addresses/_actions/create-address.ts
@@ -196,7 +196,11 @@ function parseAddAddressInput(
   return inputSchema.parse(mappedInput);
 }
 
-export async function createAddress(prevState: Awaited<State>, formData: FormData): Promise<State> {
+export async function createAddress(
+  fields: Array<Field | FieldGroup<Field>>,
+  prevState: Awaited<State>,
+  formData: FormData,
+): Promise<State> {
   const t = await getTranslations('Account.Addresses');
   const customerAccessToken = await getSessionCustomerAccessToken();
 
@@ -210,7 +214,7 @@ export async function createAddress(prevState: Awaited<State>, formData: FormDat
   }
 
   try {
-    const input = parseAddAddressInput(submission.value, prevState.fields);
+    const input = parseAddAddressInput(submission.value, fields);
 
     const response = await client.fetch({
       document: AddCustomerAddressMutation,
@@ -242,7 +246,6 @@ export async function createAddress(prevState: Awaited<State>, formData: FormDat
       ],
       lastResult: submission.reply({ resetForm: true }),
       defaultAddress: prevState.defaultAddress,
-      fields: prevState.fields,
     };
   } catch (error) {
     // eslint-disable-next-line no-console
diff --git a/core/app/[locale]/(default)/account/addresses/_actions/delete-address.ts b/core/app/[locale]/(default)/account/addresses/_actions/delete-address.ts
index 6dd1f82cfe..4760fb1668 100644
--- a/core/app/[locale]/(default)/account/addresses/_actions/delete-address.ts
+++ b/core/app/[locale]/(default)/account/addresses/_actions/delete-address.ts
@@ -86,7 +86,6 @@ export async function deleteAddress(prevState: Awaited<State>, formData: FormDat
       ),
       lastResult: submission.reply({ resetForm: true }),
       defaultAddress: prevState.defaultAddress,
-      fields: prevState.fields,
     };
   } catch (error) {
     // eslint-disable-next-line no-console
diff --git a/core/app/[locale]/(default)/account/addresses/_actions/update-address.ts b/core/app/[locale]/(default)/account/addresses/_actions/update-address.ts
index 54548e9f93..8547f4d7b1 100644
--- a/core/app/[locale]/(default)/account/addresses/_actions/update-address.ts
+++ b/core/app/[locale]/(default)/account/addresses/_actions/update-address.ts
@@ -209,7 +209,11 @@ function parseUpdateAddressInput(
   return inputSchema.parse(mappedInput);
 }
 
-export async function updateAddress(prevState: Awaited<State>, formData: FormData): Promise<State> {
+export async function updateAddress(
+  fields: Array<Field | FieldGroup<Field>>,
+  prevState: Awaited<State>,
+  formData: FormData,
+): Promise<State> {
   const t = await getTranslations('Account.Addresses');
   const customerAccessToken = await getSessionCustomerAccessToken();
 
@@ -223,7 +227,7 @@ export async function updateAddress(prevState: Awaited<State>, formData: FormDat
   }
 
   try {
-    const input = parseUpdateAddressInput(submission.value, prevState.fields);
+    const input = parseUpdateAddressInput(submission.value, fields);
 
     const response = await client.fetch({
       document: UpdateCustomerAddressMutation,
@@ -251,7 +255,6 @@ export async function updateAddress(prevState: Awaited<State>, formData: FormDat
       ),
       lastResult: submission.reply({ resetForm: true }),
       defaultAddress: prevState.defaultAddress,
-      fields: prevState.fields,
     };
   } catch (error) {
     // eslint-disable-next-line no-console
diff --git a/core/app/[locale]/(default)/gift-certificates/purchase/_actions/add-to-cart.tsx b/core/app/[locale]/(default)/gift-certificates/purchase/_actions/add-to-cart.tsx
index a3106caaa9..10f05d1782 100644
--- a/core/app/[locale]/(default)/gift-certificates/purchase/_actions/add-to-cart.tsx
+++ b/core/app/[locale]/(default)/gift-certificates/purchase/_actions/add-to-cart.tsx
@@ -7,7 +7,8 @@ import { getFormatter, getTranslations } from 'next-intl/server';
 import { ReactNode } from 'react';
 import { z } from 'zod';
 
-import { Field, FieldGroup } from '@/vibes/soul/form/dynamic-form/schema';
+import { DynamicFormActionArgs } from '@/vibes/soul/form/dynamic-form';
+import { Field } from '@/vibes/soul/form/dynamic-form/schema';
 import { client } from '~/client';
 import { graphql, ResultOf } from '~/client/graphql';
 import { ExistingResultType } from '~/client/util';
@@ -19,7 +20,6 @@ import { getPreferredCurrencyCode } from '~/lib/currency';
 import { GiftCertificateSettingsFragment } from '../fragment';
 
 interface State {
-  fields: Array<Field | FieldGroup<Field>>;
   lastResult: SubmissionResult | null;
   successMessage?: ReactNode;
 }
@@ -100,8 +100,9 @@ const schema = (
     });
 };
 
-export async function addGiftCertificateToCart(
-  prevState: State,
+export async function addGiftCertificateToCart<F extends Field>(
+  _args: DynamicFormActionArgs<F>,
+  _prevState: State,
   formData: FormData,
 ): Promise<State> {
   const t = await getTranslations('GiftCertificates.Purchase');
@@ -117,7 +118,7 @@ export async function addGiftCertificateToCart(
   });
 
   if (submission.status !== 'success') {
-    return { lastResult: submission.reply(), fields: prevState.fields };
+    return { lastResult: submission.reply() };
   }
 
   const amountFormatted = format.number(submission.value.amount, {
@@ -148,7 +149,6 @@ export async function addGiftCertificateToCart(
 
     return {
       lastResult: submission.reply(),
-      fields: prevState.fields,
       successMessage: t.rich('successMessage', {
         cartLink: (chunks) => (
           <Link className="underline" href="/cart" prefetch="viewport" prefetchKind="full">
@@ -168,27 +168,23 @@ export async function addGiftCertificateToCart(
             return message;
           }),
         }),
-        fields: prevState.fields,
       };
     }
 
     if (error instanceof MissingCartError) {
       return {
         lastResult: submission.reply({ formErrors: [t('missingCart')] }),
-        fields: prevState.fields,
       };
     }
 
     if (error instanceof Error) {
       return {
         lastResult: submission.reply({ formErrors: [error.message] }),
-        fields: prevState.fields,
       };
     }
 
     return {
       lastResult: submission.reply({ formErrors: [t('unknownError')] }),
-      fields: prevState.fields,
     };
   }
 }
diff --git a/core/app/[locale]/(default)/webpages/[id]/contact/_actions/submit-contact-form.ts b/core/app/[locale]/(default)/webpages/[id]/contact/_actions/submit-contact-form.ts
index 346562bb88..fb3bb80777 100644
--- a/core/app/[locale]/(default)/webpages/[id]/contact/_actions/submit-contact-form.ts
+++ b/core/app/[locale]/(default)/webpages/[id]/contact/_actions/submit-contact-form.ts
@@ -6,7 +6,8 @@ import { parseWithZod } from '@conform-to/zod';
 import { getLocale, getTranslations } from 'next-intl/server';
 import { z } from 'zod';
 
-import { Field, FieldGroup, schema } from '@/vibes/soul/form/dynamic-form/schema';
+import { DynamicFormActionArgs } from '@/vibes/soul/form/dynamic-form';
+import { Field, schema } from '@/vibes/soul/form/dynamic-form/schema';
 import { client } from '~/client';
 import { graphql, VariablesOf } from '~/client/graphql';
 import { redirect } from '~/i18n/routing';
@@ -58,18 +59,18 @@ function parseContactFormInput(
 }
 
 export async function submitContactForm<F extends Field>(
-  prevState: { lastResult: SubmissionResult | null; fields: Array<F | FieldGroup<F>> },
+  { fields }: DynamicFormActionArgs<F>,
+  _prevState: { lastResult: SubmissionResult | null },
   formData: FormData,
 ) {
   const t = await getTranslations('WebPages.ContactUs.Form');
   const locale = await getLocale();
 
-  const submission = parseWithZod(formData, { schema: schema(prevState.fields) });
+  const submission = parseWithZod(formData, { schema: schema(fields) });
 
   if (submission.status !== 'success') {
     return {
       lastResult: submission.reply(),
-      fields: prevState.fields,
     };
   }
 
@@ -88,7 +89,6 @@ export async function submitContactForm<F extends Field>(
     if (result.errors.length > 0) {
       return {
         lastResult: submission.reply({ formErrors: result.errors.map((error) => error.message) }),
-        fields: prevState.fields,
       };
     }
   } catch (error) {
@@ -100,20 +100,17 @@ export async function submitContactForm<F extends Field>(
         lastResult: submission.reply({
           formErrors: error.errors.map(({ message }) => message),
         }),
-        fields: prevState.fields,
       };
     }
 
     if (error instanceof Error) {
       return {
         lastResult: submission.reply({ formErrors: [error.message] }),
-        fields: prevState.fields,
       };
     }
 
     return {
       lastResult: submission.reply({ formErrors: [t('somethingWentWrong')] }),
-      fields: prevState.fields,
     };
   }
 
diff --git a/core/vibes/soul/form/dynamic-form/index.tsx b/core/vibes/soul/form/dynamic-form/index.tsx
index 0efdb0974e..620dff9d0c 100644
--- a/core/vibes/soul/form/dynamic-form/index.tsx
+++ b/core/vibes/soul/form/dynamic-form/index.tsx
@@ -37,17 +37,25 @@ import { Textarea } from '@/vibes/soul/form/textarea';
 import { Button, ButtonProps } from '@/vibes/soul/primitives/button';
 
 import { Field, FieldGroup, PasswordComplexitySettings, schema } from './schema';
+import { removeOptionsFromFields } from './utils';
 
-type Action<S, P> = (state: Awaited<S>, payload: P) => S | Promise<S>;
-
-interface State<F extends Field> {
+export interface DynamicFormActionArgs<F extends Field> {
   fields: Array<F | FieldGroup<F>>;
+  passwordComplexity?: PasswordComplexitySettings | null;
+}
+
+type Action<F extends Field, S, P> = (
+  args: DynamicFormActionArgs<F>,
+  state: Awaited<S>,
+  payload: P,
+) => S | Promise<S>;
+
+interface State {
   lastResult: SubmissionResult | null;
   successMessage?: ReactNode;
-  passwordComplexity?: PasswordComplexitySettings | null;
 }
 
-export type DynamicFormAction<F extends Field> = Action<State<F>, FormData>;
+export type DynamicFormAction<F extends Field> = Action<F, State, FormData>;
 
 export interface DynamicFormProps<F extends Field> {
   fields: Array<F | FieldGroup<F>>;
@@ -65,7 +73,7 @@ export interface DynamicFormProps<F extends Field> {
 
 export function DynamicForm<F extends Field>({
   action,
-  fields: defaultFields,
+  fields,
   buttonSize = 'medium',
   cancelLabel = 'Cancel',
   submitLabel = 'Submit',
@@ -74,16 +82,17 @@ export function DynamicForm<F extends Field>({
   onCancel,
   onChange,
   onSuccess,
-  passwordComplexity: defaultPasswordComplexity,
+  passwordComplexity,
 }: DynamicFormProps<F>) {
-  const [{ lastResult, fields, successMessage, passwordComplexity }, formAction] = useActionState(
-    action,
-    {
-      fields: defaultFields,
-      lastResult: null,
-      passwordComplexity: defaultPasswordComplexity,
-    },
-  );
+  // Remove options from fields before passing to action to reduce payload size
+  // Options are only needed for rendering, not for processing form submissions
+  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+  const fieldsWithoutOptions = removeOptionsFromFields(fields) as Array<F | FieldGroup<F>>;
+  const actionWithFields = action.bind(null, { fields: fieldsWithoutOptions, passwordComplexity });
+
+  const [{ lastResult, successMessage }, formAction] = useActionState(actionWithFields, {
+    lastResult: null,
+  });
 
   const dynamicSchema = schema(fields, passwordComplexity);
   const defaultValue = fields
diff --git a/core/vibes/soul/form/dynamic-form/utils.ts b/core/vibes/soul/form/dynamic-form/utils.ts
new file mode 100644
index 0000000000..fda56c8051
--- /dev/null
+++ b/core/vibes/soul/form/dynamic-form/utils.ts
@@ -0,0 +1,22 @@
+import { Field, FieldGroup } from './schema';
+
+function removeOptionsFromField<F extends Field>(field: F) {
+  // Only remove the options property if it exists on the field
+  if ('options' in field) {
+    const { options, ...fieldWithoutOptions } = field;
+
+    return fieldWithoutOptions;
+  }
+
+  return field;
+}
+
+export function removeOptionsFromFields<F extends Field>(fields: Array<F | FieldGroup<F>>) {
+  return fields.map((field) => {
+    if (Array.isArray(field)) {
+      return field.map(removeOptionsFromField);
+    }
+
+    return removeOptionsFromField(field);
+  });
+}
diff --git a/core/vibes/soul/sections/address-list-section/index.tsx b/core/vibes/soul/sections/address-list-section/index.tsx
index f709d2a42a..a16189e619 100644
--- a/core/vibes/soul/sections/address-list-section/index.tsx
+++ b/core/vibes/soul/sections/address-list-section/index.tsx
@@ -29,22 +29,31 @@ export interface DefaultAddressConfiguration {
   id: string | null;
 }
 
-type Action<S, P> = (state: Awaited<S>, payload: P) => S | Promise<S>;
+type Action<F extends Field, S, P> = (
+  fields: Array<F | FieldGroup<F>>,
+  state: Awaited<S>,
+  payload: P,
+) => S | Promise<S>;
 
-interface State<A extends Address, F extends Field> {
+interface State<A extends Address> {
   addresses: A[];
   defaultAddress?: DefaultAddressConfiguration;
   lastResult: SubmissionResult | null;
-  fields: Array<F | FieldGroup<F>>;
 }
 
+type DynamicAddressListFormAction<F extends Field, A extends Address> = Action<
+  F,
+  State<A>,
+  FormData
+>;
+
 export interface AddressListSectionProps<A extends Address, F extends Field> {
   title?: string;
   addresses: A[];
   fields: Array<F | FieldGroup<F>>;
   minimumAddressCount?: number;
   defaultAddress?: DefaultAddressConfiguration;
-  addressAction: Action<State<A, F>, FormData>;
+  addressAction: DynamicAddressListFormAction<F, A>;
   editLabel?: string;
   deleteLabel?: string;
   updateLabel?: string;
@@ -87,14 +96,15 @@ export function AddressListSection<A extends Address, F extends Field>({
   setDefaultLabel = 'Set as default',
   emptyStateTitle = "You don't have any addresses",
 }: AddressListSectionProps<A, F>) {
-  const [state, formAction] = useActionState(addressAction, {
+  const actionWithFields = addressAction.bind(null, fields);
+
+  const [state, formAction] = useActionState(actionWithFields, {
     addresses,
     defaultAddress,
     lastResult: null,
-    fields,
   });
 
-  const [optimisticState, setOptimisticState] = useOptimistic<State<Address, F>, FormData>(
+  const [optimisticState, setOptimisticState] = useOptimistic<State<Address>, FormData>(
     state,
     (prevState, formData) => {
       const intent = formData.get('intent');
@@ -170,7 +180,7 @@ export function AddressListSection<A extends Address, F extends Field>({
           <div className="border-b border-[var(--address-list-section-border,hsl(var(--contrast-100)))] pb-6 pt-5">
             <div className="w-[480px] space-y-4">
               <DynamicForm
-                action={(_prevState, formData) => {
+                action={(_args, _prevState, formData) => {
                   setShowNewAddressForm(false);
 
                   startTransition(() => {
@@ -179,13 +189,12 @@ export function AddressListSection<A extends Address, F extends Field>({
                   });
 
                   return {
-                    fields: optimisticState.fields,
                     lastResult: optimisticState.lastResult,
                   };
                 }}
                 buttonSize="small"
                 cancelLabel={cancelLabel}
-                fields={optimisticState.fields.map((field) => {
+                fields={fields.map((field) => {
                   if ('name' in field && field.name === 'id') {
                     return {
                       ...field,
@@ -206,7 +215,7 @@ export function AddressListSection<A extends Address, F extends Field>({
         )}
         {!isEmpty ? (
           optimisticState.addresses.map((address) => {
-            const addressFields = optimisticState.fields.map<F | FieldGroup<F>>((field) => {
+            const addressFields = fields.map((field) => {
               if (Array.isArray(field)) {
                 return field.map((f) => {
                   return {
@@ -230,7 +239,7 @@ export function AddressListSection<A extends Address, F extends Field>({
                 {activeAddressIds.includes(address.id) ? (
                   <div className="w-[480px] space-y-4">
                     <DynamicForm
-                      action={(_prevState, formData) => {
+                      action={(_args, _prevState, formData) => {
                         setActiveAddressIds((prev) => prev.filter((id) => id !== address.id));
 
                         startTransition(() => {
@@ -239,7 +248,6 @@ export function AddressListSection<A extends Address, F extends Field>({
                         });
 
                         return {
-                          fields: optimisticState.fields,
                           lastResult: optimisticState.lastResult,
                         };
                       }}

From b5f460c0a5fa5161c853884e18816796b9ea73d9 Mon Sep 17 00:00:00 2001
From: bc-svc-local <102379007+bc-svc-local@users.noreply.github.com>
Date: Tue, 20 Jan 2026 18:08:44 +0100
Subject: [PATCH 15/69] Update translations (#2826)

* feat(other): LOCAL-1444 delivery translation

* chore(core): create translations patch

---------

Co-authored-by: bc-svc-local <bc-svc-local@users.noreply.github.com>
---
 .changeset/translations-patch-a10f114b.md | 5 +++++
 core/messages/da.json                     | 3 +++
 core/messages/de.json                     | 3 +++
 core/messages/es-419.json                 | 3 +++
 core/messages/es-AR.json                  | 3 +++
 core/messages/es-CL.json                  | 3 +++
 core/messages/es-CO.json                  | 3 +++
 core/messages/es-LA.json                  | 3 +++
 core/messages/es-MX.json                  | 3 +++
 core/messages/es-PE.json                  | 3 +++
 core/messages/es.json                     | 3 +++
 core/messages/fr.json                     | 3 +++
 core/messages/it.json                     | 3 +++
 core/messages/ja.json                     | 3 +++
 core/messages/nl.json                     | 3 +++
 core/messages/no.json                     | 3 +++
 core/messages/pl.json                     | 3 +++
 core/messages/pt-BR.json                  | 3 +++
 core/messages/pt.json                     | 3 +++
 core/messages/sv.json                     | 3 +++
 20 files changed, 62 insertions(+)
 create mode 100644 .changeset/translations-patch-a10f114b.md

diff --git a/.changeset/translations-patch-a10f114b.md b/.changeset/translations-patch-a10f114b.md
new file mode 100644
index 0000000000..ad17b2636a
--- /dev/null
+++ b/.changeset/translations-patch-a10f114b.md
@@ -0,0 +1,5 @@
+---
+"@bigcommerce/catalyst-core": patch
+---
+
+Update translations.
diff --git a/core/messages/da.json b/core/messages/da.json
index 0efd63c706..e80f496eff 100644
--- a/core/messages/da.json
+++ b/core/messages/da.json
@@ -607,5 +607,8 @@
                 }
             }
         }
+    },
+    "Form": {
+        "optional": "Valgfrit"
     }
 }
diff --git a/core/messages/de.json b/core/messages/de.json
index b002998da1..3edb5413ae 100644
--- a/core/messages/de.json
+++ b/core/messages/de.json
@@ -607,5 +607,8 @@
                 }
             }
         }
+    },
+    "Form": {
+        "optional": "optional"
     }
 }
diff --git a/core/messages/es-419.json b/core/messages/es-419.json
index 343a8b980e..1ae7298df2 100644
--- a/core/messages/es-419.json
+++ b/core/messages/es-419.json
@@ -607,5 +607,8 @@
                 }
             }
         }
+    },
+    "Form": {
+        "optional": "Opcional"
     }
 }
diff --git a/core/messages/es-AR.json b/core/messages/es-AR.json
index 343a8b980e..1ae7298df2 100644
--- a/core/messages/es-AR.json
+++ b/core/messages/es-AR.json
@@ -607,5 +607,8 @@
                 }
             }
         }
+    },
+    "Form": {
+        "optional": "Opcional"
     }
 }
diff --git a/core/messages/es-CL.json b/core/messages/es-CL.json
index 343a8b980e..1ae7298df2 100644
--- a/core/messages/es-CL.json
+++ b/core/messages/es-CL.json
@@ -607,5 +607,8 @@
                 }
             }
         }
+    },
+    "Form": {
+        "optional": "Opcional"
     }
 }
diff --git a/core/messages/es-CO.json b/core/messages/es-CO.json
index 343a8b980e..1ae7298df2 100644
--- a/core/messages/es-CO.json
+++ b/core/messages/es-CO.json
@@ -607,5 +607,8 @@
                 }
             }
         }
+    },
+    "Form": {
+        "optional": "Opcional"
     }
 }
diff --git a/core/messages/es-LA.json b/core/messages/es-LA.json
index 343a8b980e..1ae7298df2 100644
--- a/core/messages/es-LA.json
+++ b/core/messages/es-LA.json
@@ -607,5 +607,8 @@
                 }
             }
         }
+    },
+    "Form": {
+        "optional": "Opcional"
     }
 }
diff --git a/core/messages/es-MX.json b/core/messages/es-MX.json
index 343a8b980e..1ae7298df2 100644
--- a/core/messages/es-MX.json
+++ b/core/messages/es-MX.json
@@ -607,5 +607,8 @@
                 }
             }
         }
+    },
+    "Form": {
+        "optional": "Opcional"
     }
 }
diff --git a/core/messages/es-PE.json b/core/messages/es-PE.json
index 343a8b980e..1ae7298df2 100644
--- a/core/messages/es-PE.json
+++ b/core/messages/es-PE.json
@@ -607,5 +607,8 @@
                 }
             }
         }
+    },
+    "Form": {
+        "optional": "Opcional"
     }
 }
diff --git a/core/messages/es.json b/core/messages/es.json
index 4203b86e62..ebe55611a7 100644
--- a/core/messages/es.json
+++ b/core/messages/es.json
@@ -607,5 +607,8 @@
                 }
             }
         }
+    },
+    "Form": {
+        "optional": "Opcional"
     }
 }
diff --git a/core/messages/fr.json b/core/messages/fr.json
index 4538a7b01d..575915977e 100644
--- a/core/messages/fr.json
+++ b/core/messages/fr.json
@@ -607,5 +607,8 @@
                 }
             }
         }
+    },
+    "Form": {
+        "optional": "facultatif"
     }
 }
diff --git a/core/messages/it.json b/core/messages/it.json
index 91cc5cd5f1..c1070b33fb 100644
--- a/core/messages/it.json
+++ b/core/messages/it.json
@@ -607,5 +607,8 @@
                 }
             }
         }
+    },
+    "Form": {
+        "optional": "facoltativo"
     }
 }
diff --git a/core/messages/ja.json b/core/messages/ja.json
index 01786fbbba..0642921fdc 100644
--- a/core/messages/ja.json
+++ b/core/messages/ja.json
@@ -607,5 +607,8 @@
                 }
             }
         }
+    },
+    "Form": {
+        "optional": "オプション"
     }
 }
diff --git a/core/messages/nl.json b/core/messages/nl.json
index d6df9bb339..0e6c213fd6 100644
--- a/core/messages/nl.json
+++ b/core/messages/nl.json
@@ -607,5 +607,8 @@
                 }
             }
         }
+    },
+    "Form": {
+        "optional": "optioneel"
     }
 }
diff --git a/core/messages/no.json b/core/messages/no.json
index 22f8df5ead..0049c27d45 100644
--- a/core/messages/no.json
+++ b/core/messages/no.json
@@ -607,5 +607,8 @@
                 }
             }
         }
+    },
+    "Form": {
+        "optional": "valgfri"
     }
 }
diff --git a/core/messages/pl.json b/core/messages/pl.json
index 2093fcc28d..db9d859fa4 100644
--- a/core/messages/pl.json
+++ b/core/messages/pl.json
@@ -607,5 +607,8 @@
                 }
             }
         }
+    },
+    "Form": {
+        "optional": "opcjonalne"
     }
 }
diff --git a/core/messages/pt-BR.json b/core/messages/pt-BR.json
index d3cb62be3f..ecdf963c79 100644
--- a/core/messages/pt-BR.json
+++ b/core/messages/pt-BR.json
@@ -607,5 +607,8 @@
                 }
             }
         }
+    },
+    "Form": {
+        "optional": "Opcional"
     }
 }
diff --git a/core/messages/pt.json b/core/messages/pt.json
index d3cb62be3f..ecdf963c79 100644
--- a/core/messages/pt.json
+++ b/core/messages/pt.json
@@ -607,5 +607,8 @@
                 }
             }
         }
+    },
+    "Form": {
+        "optional": "Opcional"
     }
 }
diff --git a/core/messages/sv.json b/core/messages/sv.json
index 38401b1d91..28cd5f61b5 100644
--- a/core/messages/sv.json
+++ b/core/messages/sv.json
@@ -607,5 +607,8 @@
                 }
             }
         }
+    },
+    "Form": {
+        "optional": "frivillig"
     }
 }

From 49b1097c5d4f56b8c3a8d3d97181b09cb79a4070 Mon Sep 17 00:00:00 2001
From: Jorge Moya <jorge.moya@bigcommerce.com>
Date: Wed, 21 Jan 2026 20:16:26 -0600
Subject: [PATCH 16/69] feat(core): filter out child cart line items (#2827)

---
 .changeset/bright-rules-chew.md               | 84 +++++++++++++++++++
 core/app/[locale]/(default)/cart/page-data.ts |  2 +
 core/app/[locale]/(default)/cart/page.tsx     |  6 +-
 core/vibes/soul/sections/cart/client.tsx      |  2 +-
 4 files changed, 91 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/bright-rules-chew.md

diff --git a/.changeset/bright-rules-chew.md b/.changeset/bright-rules-chew.md
new file mode 100644
index 0000000000..620ca913c6
--- /dev/null
+++ b/.changeset/bright-rules-chew.md
@@ -0,0 +1,84 @@
+---
+"@bigcommerce/catalyst-core": patch
+---
+
+Filter out child cart items (items with `parentEntityId`) from cart and cart analytics to prevent duplicate line items when products have parent-child relationships, such as product bundles.
+
+## Migration steps
+
+### Step 1: GraphQL Fragment Updates
+
+The `parentEntityId` field has been added to both physical and digital cart item fragments to identify child items.
+
+Update `core/app/[locale]/(default)/cart/page-data.ts`:
+
+```diff
+  export const PhysicalItemFragment = graphql(`
+    fragment PhysicalItemFragment on CartPhysicalItem {
+      entityId
+      quantity
+      productEntityId
+      variantEntityId
++     parentEntityId
+      listPrice {
+        currencyCode
+        value
+      }
+    }
+  `);
+
+  export const DigitalItemFragment = graphql(`
+    fragment DigitalItemFragment on CartDigitalItem {
+      entityId
+      quantity
+      productEntityId
+      variantEntityId
++     parentEntityId
+      listPrice {
+        currencyCode
+        value
+      }
+    }
+  `);
+```
+
+### Step 2: Cart Display Filtering
+
+Cart line items are now filtered to exclude child items when displaying the cart.
+
+Update `core/app/[locale]/(default)/cart/page.tsx`:
+
+```diff
+  const lineItems = [
+    ...cart.lineItems.giftCertificates,
+    ...cart.lineItems.physicalItems,
+    ...cart.lineItems.digitalItems,
+- ];
++ ].filter((item) => !('parentEntityId' in item) || !item.parentEntityId);
+```
+
+### Step 3: Analytics Data Filtering
+
+Analytics data collection now only includes top-level items to prevent duplicate tracking.
+
+Update `core/app/[locale]/(default)/cart/page.tsx` in the `getAnalyticsData` function:
+
+```diff
+- const lineItems = [...cart.lineItems.physicalItems, ...cart.lineItems.digitalItems];
++ const lineItems = [...cart.lineItems.physicalItems, ...cart.lineItems.digitalItems].filter(
++   (item) => !item.parentEntityId, // Only include top-level items
++ );
+```
+
+### Step 4: Styling Update
+
+Cart subtitle text color has been updated for improved contrast.
+
+Update `core/vibes/soul/sections/cart/client.tsx`:
+
+```diff
+-                  <span className="text-[var(--cart-subtext-text,hsl(var(--contrast-300)))] contrast-more:text-[var(--cart-subtitle-text,hsl(var(--contrast-500)))]">
++                  <span className="text-[var(--cart-subtext-text,hsl(var(--contrast-400)))] contrast-more:text-[var(--cart-subtitle-text,hsl(var(--contrast-500)))]">
+                     {lineItem.subtitle}
+                   </span>
+```
\ No newline at end of file
diff --git a/core/app/[locale]/(default)/cart/page-data.ts b/core/app/[locale]/(default)/cart/page-data.ts
index 83ff9ac449..e1758e1a7e 100644
--- a/core/app/[locale]/(default)/cart/page-data.ts
+++ b/core/app/[locale]/(default)/cart/page-data.ts
@@ -19,6 +19,7 @@ export const PhysicalItemFragment = graphql(`
     quantity
     productEntityId
     variantEntityId
+    parentEntityId
     listPrice {
       currencyCode
       value
@@ -71,6 +72,7 @@ export const DigitalItemFragment = graphql(`
     quantity
     productEntityId
     variantEntityId
+    parentEntityId
     listPrice {
       currencyCode
       value
diff --git a/core/app/[locale]/(default)/cart/page.tsx b/core/app/[locale]/(default)/cart/page.tsx
index d5a767afe6..ff45b25c8d 100644
--- a/core/app/[locale]/(default)/cart/page.tsx
+++ b/core/app/[locale]/(default)/cart/page.tsx
@@ -41,7 +41,9 @@ const getAnalyticsData = async (cartId: string) => {
     return [];
   }
 
-  const lineItems = [...cart.lineItems.physicalItems, ...cart.lineItems.digitalItems];
+  const lineItems = [...cart.lineItems.physicalItems, ...cart.lineItems.digitalItems].filter(
+    (item) => !item.parentEntityId, // Only include top-level items
+  );
 
   return lineItems.map((item) => {
     return {
@@ -98,7 +100,7 @@ export default async function Cart({ params }: Props) {
     ...cart.lineItems.giftCertificates,
     ...cart.lineItems.physicalItems,
     ...cart.lineItems.digitalItems,
-  ];
+  ].filter((item) => !('parentEntityId' in item) || !item.parentEntityId);
 
   const formattedLineItems = lineItems.map((item) => {
     if (item.__typename === 'CartGiftCertificate') {
diff --git a/core/vibes/soul/sections/cart/client.tsx b/core/vibes/soul/sections/cart/client.tsx
index 33f08662d1..ffca261271 100644
--- a/core/vibes/soul/sections/cart/client.tsx
+++ b/core/vibes/soul/sections/cart/client.tsx
@@ -451,7 +451,7 @@ export function CartClient<LineItem extends CartLineItem>({
               <div className="flex grow flex-col flex-wrap justify-between gap-y-2 @xl:flex-row">
                 <div className="flex w-full flex-1 flex-col @xl:w-1/2 @xl:pr-4">
                   <span className="font-medium">{lineItem.title}</span>
-                  <span className="text-[var(--cart-subtext-text,hsl(var(--contrast-300)))] contrast-more:text-[var(--cart-subtitle-text,hsl(var(--contrast-500)))]">
+                  <span className="text-[var(--cart-subtext-text,hsl(var(--contrast-400)))] contrast-more:text-[var(--cart-subtitle-text,hsl(var(--contrast-500)))]">
                     {lineItem.subtitle}
                   </span>
                 </div>

From 8096cc5ebaf983431f06bd2bd94a9a81899c2b29 Mon Sep 17 00:00:00 2001
From: Jorge Moya <jorge.moya@bigcommerce.com>
Date: Wed, 21 Jan 2026 20:19:54 -0600
Subject: [PATCH 17/69] fix(core): improve accessibility for price displays
 (#2829)

* fix(core): remove decorative price element from accessibility tree

* fix: update to include accessibility best practices

* fix: update changeset

* fix: add price label component
---
 .changeset/true-shirts-shop.md                | 118 ++++++++++++++++++
 core/messages/en.json                         |   7 ++
 .../soul/primitives/price-label/index.tsx     |  16 ++-
 core/vibes/soul/sections/cart/client.tsx      |  10 +-
 4 files changed, 147 insertions(+), 4 deletions(-)
 create mode 100644 .changeset/true-shirts-shop.md

diff --git a/.changeset/true-shirts-shop.md b/.changeset/true-shirts-shop.md
new file mode 100644
index 0000000000..b60df6eadb
--- /dev/null
+++ b/.changeset/true-shirts-shop.md
@@ -0,0 +1,118 @@
+---
+"@bigcommerce/catalyst-core": patch
+---
+
+Improve accessibility for price displays by adding screen reader announcements for original prices, sale prices, and price ranges. Visual price elements are hidden from assistive technologies using `aria-hidden="true"` to prevent duplicate announcements, while visually hidden text provides context about pricing information.
+
+## Migration steps
+
+### Step 1: Update Cart Price Display
+
+Update `core/vibes/soul/sections/cart/client.tsx` to add accessibility labels for sale prices:
+
+```diff
+        {lineItem.salePrice && lineItem.salePrice !== lineItem.price ? (
+          <span className="font-medium @xl:ml-auto">
+-           <span className="line-through">{lineItem.price}</span> {lineItem.salePrice}
++           <span className="sr-only">{t('originalPrice', { price: lineItem.price })}</span>
++           <span aria-hidden="true" className="line-through">
++             {lineItem.price}
++           </span>{' '}
++           <span className="sr-only">{t('currentPrice', { price: lineItem.salePrice })}</span>
++           <span aria-hidden="true">{lineItem.salePrice}</span>
+          </span>
+        ) : (
+          <span className="font-medium @xl:ml-auto">{lineItem.price}</span>
+        )}
+```
+
+### Step 2: Update PriceLabel Component
+
+Update `core/vibes/soul/primitives/price-label/index.tsx` to add accessibility improvements for sale prices and price ranges:
+
+```diff
+  import { clsx } from 'clsx';
++ import { useTranslations } from 'next-intl';
+
+  export function PriceLabel({ className, colorScheme = 'light', price }: Props) {
++   const t = useTranslations('Components.Price');
+
+    if (typeof price === 'string') {
+      return (
+        ...
+      );
+    }
+
+    switch (price.type) {
+      case 'range':
+        return (
+          <span ...>
+-           {price.minValue}
+-           &nbsp;&ndash;&nbsp;
+-           {price.maxValue}
++           <span className="sr-only">
++             {t('range', { minValue: price.minValue, maxValue: price.maxValue })}
++           </span>
++           <span aria-hidden="true">
++             {price.minValue} - {price.maxValue}
++           </span>
+          </span>
+        );
+
+      case 'sale':
+        return (
+          <span className={clsx('block font-semibold', className)}>
++           <span className="sr-only">{t('originalPrice', { price: price.previousValue })}</span>
+            <span
++             aria-hidden="true"
+              className={clsx(
+                'font-normal line-through opacity-50',
+                ...
+              )}
+            >
+              {price.previousValue}
+            </span>{' '}
++           <span className="sr-only">{t('currentPrice', { price: price.currentValue })}</span>
+            <span
++             aria-hidden="true"
+              className={clsx(
+                ...
+              )}
+            >
+              {price.currentValue}
+            </span>
+          </span>
+        );
+    }
+  }
+```
+
+### Step 3: Add Translation Keys
+
+Update `core/messages/en.json` to include new translation keys for price accessibility:
+
+```diff 
+  "Cart": {
+    "title": "Cart",
+    "heading": "Your cart",
+    "proceedToCheckout": "Proceed to checkout",
+    "increment": "Increase quantity",
+    "decrement": "Decrease quantity",
+    "removeItem": "Remove item",
+    "cartCombined": "We noticed you had items saved in a previous cart, so we've added them to your current cart for you.",
+    "cartRestored": "You started a cart on another device, and we've restored it here so you can pick up where you left off.",
+    "cartUpdateInProgress": "You have a cart update in progress. Are you sure you want to leave this page? Your changes may be lost.",
++   "originalPrice": "Original price was {price}.",
++   "currentPrice": "Current price is {price}.",
+```
+
+```diff
+    },
++   "Price": {
++     "originalPrice": "Original price was {price}.",
++     "currentPrice": "Current price is {price}.",
++     "range": "Price from {minValue} to {maxValue}."
++   }
+  },
+  "GiftCertificates": {
+```
\ No newline at end of file
diff --git a/core/messages/en.json b/core/messages/en.json
index e8a99d5e6c..5a663c6a74 100644
--- a/core/messages/en.json
+++ b/core/messages/en.json
@@ -304,6 +304,8 @@
     "cartCombined": "We noticed you had items saved in a previous cart, so we've added them to your current cart for you.",
     "cartRestored": "You started a cart on another device, and we've restored it here so you can pick up where you left off.",
     "cartUpdateInProgress": "You have a cart update in progress. Are you sure you want to leave this page? Your changes may be lost.",
+    "originalPrice": "Original price was {price}.",
+    "currentPrice": "Current price is {price}.",
     "CheckoutSummary": {
       "title": "Summary",
       "subTotal": "Subtotal",
@@ -555,6 +557,11 @@
           "description": "These cookies help us provide a better user experience and test new features."
         }
       }
+    },
+    "Price": {
+      "originalPrice": "Original price was {price}.",
+      "currentPrice": "Current price is {price}.",
+      "range": "Price from {minValue} to {maxValue}."
     }
   },
   "GiftCertificates": {
diff --git a/core/vibes/soul/primitives/price-label/index.tsx b/core/vibes/soul/primitives/price-label/index.tsx
index e329e55666..bc20ee1393 100644
--- a/core/vibes/soul/primitives/price-label/index.tsx
+++ b/core/vibes/soul/primitives/price-label/index.tsx
@@ -1,4 +1,5 @@
 import { clsx } from 'clsx';
+import { useTranslations } from 'next-intl';
 
 export interface PriceRange {
   type: 'range';
@@ -35,6 +36,8 @@ interface Props {
  * ```
  */
 export function PriceLabel({ className, colorScheme = 'light', price }: Props) {
+  const t = useTranslations('Components.Price');
+
   if (typeof price === 'string') {
     return (
       <span
@@ -65,16 +68,21 @@ export function PriceLabel({ className, colorScheme = 'light', price }: Props) {
             className,
           )}
         >
-          {price.minValue}
-          &nbsp;&ndash;&nbsp;
-          {price.maxValue}
+          <span className="sr-only">
+            {t('range', { minValue: price.minValue, maxValue: price.maxValue })}
+          </span>
+          <span aria-hidden="true">
+            {price.minValue} - {price.maxValue}
+          </span>
         </span>
       );
 
     case 'sale':
       return (
         <span className={clsx('block font-semibold', className)}>
+          <span className="sr-only">{t('originalPrice', { price: price.previousValue })}</span>
           <span
+            aria-hidden="true"
             className={clsx(
               'font-normal line-through opacity-50',
               {
@@ -85,7 +93,9 @@ export function PriceLabel({ className, colorScheme = 'light', price }: Props) {
           >
             {price.previousValue}
           </span>{' '}
+          <span className="sr-only">{t('currentPrice', { price: price.currentValue })}</span>
           <span
+            aria-hidden="true"
             className={clsx(
               {
                 light: 'text-[var(--price-light-sale-text,hsl(var(--foreground)))]',
diff --git a/core/vibes/soul/sections/cart/client.tsx b/core/vibes/soul/sections/cart/client.tsx
index ffca261271..cbe49988ec 100644
--- a/core/vibes/soul/sections/cart/client.tsx
+++ b/core/vibes/soul/sections/cart/client.tsx
@@ -4,6 +4,7 @@ import { getFormProps, getInputProps, SubmissionResult, useForm } from '@conform
 import { parseWithZod } from '@conform-to/zod';
 import { clsx } from 'clsx';
 import { ArrowRight, GiftIcon, Minus, Plus, Trash2 } from 'lucide-react';
+import { useTranslations } from 'next-intl';
 import {
   ComponentPropsWithoutRef,
   startTransition,
@@ -512,6 +513,8 @@ function CounterForm({
   action: (payload: FormData) => void;
   onSubmit: (formData: FormData) => void;
 }) {
+  const t = useTranslations('Cart');
+
   const [form, fields] = useForm({
     defaultValue: { id: lineItem.id },
     shouldValidate: 'onBlur',
@@ -561,7 +564,12 @@ function CounterForm({
       <div className="flex w-full flex-wrap items-center gap-x-5 gap-y-2">
         {lineItem.salePrice && lineItem.salePrice !== lineItem.price ? (
           <span className="font-medium @xl:ml-auto">
-            <span className="line-through">{lineItem.price}</span> {lineItem.salePrice}
+            <span className="sr-only">{t('originalPrice', { price: lineItem.price })}</span>
+            <span aria-hidden="true" className="line-through">
+              {lineItem.price}
+            </span>{' '}
+            <span className="sr-only">{t('currentPrice', { price: lineItem.salePrice })}</span>
+            <span aria-hidden="true">{lineItem.salePrice}</span>
           </span>
         ) : (
           <span className="font-medium @xl:ml-auto">{lineItem.price}</span>

From a520dbcf14e78b54e10a38c05e11f427b30431c1 Mon Sep 17 00:00:00 2001
From: James Q Quick <james.q.quick@gmail.com>
Date: Fri, 23 Jan 2026 10:29:14 -0500
Subject: [PATCH 18/69] [CATALYST-965] Audit placeholders (#2833)

* Updated gift certificate balance placeholder

* remove placeholders from gift certificates form

* add placeholders for coupon code and gift certificate on cart page

* added changelog

* remove placeholder for coupon code
---
 .changeset/cold-donuts-double.md                            | 5 +++++
 core/app/[locale]/(default)/cart/page.tsx                   | 2 ++
 .../[locale]/(default)/gift-certificates/purchase/page.tsx  | 6 ------
 core/messages/en.json                                       | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)
 create mode 100644 .changeset/cold-donuts-double.md

diff --git a/.changeset/cold-donuts-double.md b/.changeset/cold-donuts-double.md
new file mode 100644
index 0000000000..df347e32eb
--- /dev/null
+++ b/.changeset/cold-donuts-double.md
@@ -0,0 +1,5 @@
+---
+"@bigcommerce/catalyst-core": patch
+---
+
+Add placeholders for gift certificate inputs and remove redundant placeholders in the gift certificate purchase form.
diff --git a/core/app/[locale]/(default)/cart/page.tsx b/core/app/[locale]/(default)/cart/page.tsx
index ff45b25c8d..677f74523e 100644
--- a/core/app/[locale]/(default)/cart/page.tsx
+++ b/core/app/[locale]/(default)/cart/page.tsx
@@ -66,6 +66,7 @@ export default async function Cart({ params }: Props) {
   setRequestLocale(locale);
 
   const t = await getTranslations('Cart');
+  const tGiftCertificates = await getTranslations('GiftCertificates');
   const format = await getFormatter();
   const cartId = await getCartId();
 
@@ -281,6 +282,7 @@ export default async function Cart({ params }: Props) {
                   giftCertificateCodes: checkout?.giftCertificates.map((gc) => gc.code) ?? [],
                   ctaLabel: t('GiftCertificate.apply'),
                   label: t('GiftCertificate.giftCertificateCode'),
+                  placeholder: tGiftCertificates('CheckBalance.inputPlaceholder'),
                   removeLabel: t('GiftCertificate.removeGiftCertificate'),
                 }
               : undefined
diff --git a/core/app/[locale]/(default)/gift-certificates/purchase/page.tsx b/core/app/[locale]/(default)/gift-certificates/purchase/page.tsx
index 7b78bed80e..07edaab6a9 100644
--- a/core/app/[locale]/(default)/gift-certificates/purchase/page.tsx
+++ b/core/app/[locale]/(default)/gift-certificates/purchase/page.tsx
@@ -26,14 +26,12 @@ function getFields(
         type: 'text',
         name: 'senderName',
         label: `${t('Purchase.Form.senderNameLabel')} *`,
-        placeholder: t('Purchase.Form.namePlaceholder'),
         required: true,
       },
       {
         type: 'email',
         name: 'senderEmail',
         label: `${t('Purchase.Form.senderEmailLabel')} *`,
-        placeholder: t('Purchase.Form.emailPlaceholder'),
         required: true,
       },
     ],
@@ -42,14 +40,12 @@ function getFields(
         type: 'text',
         name: 'recipientName',
         label: `${t('Purchase.Form.recipientNameLabel')} *`,
-        placeholder: t('Purchase.Form.namePlaceholder'),
         required: true,
       },
       {
         type: 'email',
         name: 'recipientEmail',
         label: `${t('Purchase.Form.recipientEmailLabel')} *`,
-        placeholder: t('Purchase.Form.emailPlaceholder'),
         required: true,
       },
     ],
@@ -57,7 +53,6 @@ function getFields(
       type: 'textarea',
       name: 'message',
       label: t('Purchase.Form.messageLabel'),
-      placeholder: t('Purchase.Form.messagePlaceholder'),
       required: false,
     },
     {
@@ -87,7 +82,6 @@ function getFields(
               minAmount: String(giftCertificateSettings.minimumAmount.value),
               maxAmount: String(giftCertificateSettings.maximumAmount.value),
             })} *`,
-            placeholder: t('Purchase.Form.customAmountPlaceholder'),
             pattern: '^[0-9]*\\.?[0-9]+$',
             required: true,
           },
diff --git a/core/messages/en.json b/core/messages/en.json
index 5a663c6a74..640f4216a3 100644
--- a/core/messages/en.json
+++ b/core/messages/en.json
@@ -574,7 +574,7 @@
       "title": "Check balance",
       "description": "You can check the balance and get the information about your gift certificate by typing the code in the box below.",
       "inputLabel": "Code",
-      "inputPlaceholder": "Enter code",
+      "inputPlaceholder": "xxx-xxx-xxx-xxx",
       "purchasedDateLabel": "Purchased",
       "senderLabel": "From",
       "Errors": {

From 5c3e4d25c2d929af2b86cee3e4133838e5f3987b Mon Sep 17 00:00:00 2001
From: Jordan Arldt <jordan.arldt@bigcommerce.com>
Date: Fri, 23 Jan 2026 10:19:19 -0600
Subject: [PATCH 19/69] chore(catalyst): CATALYST-1297 Run E2E tests on PRs
 (#2822)

* chore(catalyst): CATALYST-1297 Run E2E tests on PRs

* fix(catalyst): Fix required prop missing on cart shipping form

* chore(catalyst): CATALYST-1297 Use test matrix
---
 .changeset/cute-llamas-listen.md              |  9 ++
 .github/workflows/basic.yml                   | 97 ++++++++++++++++++-
 core/playwright.config.ts                     | 11 ++-
 .../fixtures/utils/api/subscribe/http.ts      |  3 +
 core/tests/tags.ts                            |  4 +
 core/tests/ui/e2e/account/account.spec.ts     | 17 ++--
 .../ui/e2e/account/wishlist-details.spec.ts   |  4 +
 .../ui/e2e/account/wishlists.mobile.spec.ts   |  6 ++
 core/tests/ui/e2e/auth/login.spec.ts          |  2 +-
 core/tests/ui/e2e/auth/register.spec.ts       |  2 -
 core/tests/ui/e2e/blog.spec.ts                |  6 +-
 core/tests/ui/e2e/cart.spec.ts                |  4 +-
 core/tests/ui/e2e/checkout.spec.ts            |  3 +-
 core/tests/ui/e2e/compare.spec.ts             | 26 ++---
 core/tests/ui/e2e/coupon.spec.ts              | 39 ++++++--
 .../tests/ui/e2e/middleware/redirects.spec.ts | 89 +++++++++--------
 core/tests/ui/e2e/product.spec.ts             | 28 +++++-
 core/tests/ui/e2e/search.spec.ts              |  2 +-
 core/tests/ui/e2e/shipping.spec.ts            | 96 ++++++++++++++++--
 .../sections/cart/shipping-form/index.tsx     |  2 +
 20 files changed, 358 insertions(+), 92 deletions(-)
 create mode 100644 .changeset/cute-llamas-listen.md

diff --git a/.changeset/cute-llamas-listen.md b/.changeset/cute-llamas-listen.md
new file mode 100644
index 0000000000..6fc0bf75f1
--- /dev/null
+++ b/.changeset/cute-llamas-listen.md
@@ -0,0 +1,9 @@
+---
+"@bigcommerce/catalyst-core": patch
+---
+
+Run E2E tests on PRs, add 'required' prop to cart shipping calculator
+
+## Migration
+
+Add `required` prop to the Country selector and Country input fields in `core/vibes/soul/sections/cart/shipping-form/index.tsx` on lines 280 and 289.
diff --git a/.github/workflows/basic.yml b/.github/workflows/basic.yml
index 8b374766e6..154de2b562 100644
--- a/.github/workflows/basic.yml
+++ b/.github/workflows/basic.yml
@@ -13,8 +13,18 @@ env:
   TURBO_TEAM: ${{ vars.TURBO_TEAM }}
   TURBO_REMOTE_CACHE_SIGNATURE_KEY: ${{ secrets.TURBO_REMOTE_CACHE_SIGNATURE_KEY }}
   BIGCOMMERCE_STORE_HASH: ${{ vars.BIGCOMMERCE_STORE_HASH }}
-  BIGCOMMERCE_STOREFRONT_TOKEN: ${{ secrets.BIGCOMMERCE_STOREFRONT_TOKEN }}
   BIGCOMMERCE_CHANNEL_ID: ${{ vars.BIGCOMMERCE_CHANNEL_ID }}
+  BIGCOMMERCE_CLIENT_ID: ${{ secrets.BIGCOMMERCE_CLIENT_ID }}
+  BIGCOMMERCE_CLIENT_SECRET: ${{ secrets.BIGCOMMERCE_CLIENT_SECRET }}
+  BIGCOMMERCE_STOREFRONT_TOKEN: ${{ secrets.BIGCOMMERCE_STOREFRONT_TOKEN }}
+  BIGCOMMERCE_ACCESS_TOKEN: ${{ secrets.BIGCOMMERCE_ACCESS_TOKEN }}
+  TEST_CUSTOMER_ID: ${{ vars.TEST_CUSTOMER_ID }}
+  TEST_CUSTOMER_EMAIL: ${{ vars.TEST_CUSTOMER_EMAIL }}
+  TEST_CUSTOMER_PASSWORD: ${{ secrets.TEST_CUSTOMER_PASSWORD }}
+  TESTS_FALLBACK_LOCALE: ${{ vars.TESTS_FALLBACK_LOCALE }}
+  TESTS_READ_ONLY: ${{ vars.TESTS_READ_ONLY }}
+  DEFAULT_PRODUCT_ID: ${{ vars.DEFAULT_PRODUCT_ID }}
+  DEFAULT_COMPLEX_PRODUCT_ID: ${{ vars.DEFAULT_COMPLEX_PRODUCT_ID }}
 
 jobs:
   lint-typecheck:
@@ -75,3 +85,88 @@ jobs:
 
       - name: Run Tests
         run: pnpm run test
+
+  e2e-tests:
+    name: E2E Functional Tests (${{ matrix.name }})
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        include:
+          - name: default
+            browsers: chromium webkit
+            test-filter: tests/ui/e2e
+            trailing-slash: true
+            locale-var: TESTS_LOCALE
+            artifact-name: playwright-report
+          - name: TRAILING_SLASH=false
+            browsers: chromium
+            test-filter: tests/ui/e2e --grep @no-trailing-slash
+            trailing-slash: false
+            locale-var: TESTS_LOCALE
+            artifact-name: playwright-report-no-trailing
+          - name: alternate locale
+            browsers: chromium
+            test-filter: tests/ui/e2e --grep @alternate-locale
+            trailing-slash: true
+            locale-var: TESTS_ALTERNATE_LOCALE
+            artifact-name: playwright-report-alternate-locale
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 2
+
+      - uses: pnpm/action-setup@v3
+
+      - name: Use Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: ".nvmrc"
+          cache: "pnpm"
+
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Install Playwright browsers
+        run: pnpm exec playwright install --with-deps ${{ matrix.browsers }}
+        working-directory: ./core
+
+      # - name: Build catalyst-client
+      #   run: pnpm --filter @bigcommerce/catalyst-client build
+
+      # - name: Build catalyst-core
+      #   run: pnpm --filter @bigcommerce/catalyst-core build
+
+      - name: Build catalyst
+        run: pnpm build
+
+      - name: Start server
+        run: |
+          pnpm start &
+          npx wait-on http://localhost:3000 --timeout 60000
+        working-directory: ./core
+        env:
+          PORT: 3000
+          AUTH_SECRET: ${{ secrets.TESTS_AUTH_SECRET }}
+          AUTH_TRUST_HOST: ${{ vars.TESTS_AUTH_TRUST_HOST }}
+          BIGCOMMERCE_TRUSTED_PROXY_SECRET: ${{ secrets.BIGCOMMERCE_TRUSTED_PROXY_SECRET }}
+          TESTS_LOCALE: ${{ vars[matrix.locale-var] }}
+          TRAILING_SLASH: ${{ matrix.trailing-slash }}
+          DEFAULT_REVALIDATE_TARGET: ${{ matrix.name == 'default' && '1' || '' }}
+
+      - name: Run E2E tests
+        run: pnpm exec playwright test ${{ matrix.test-filter }}
+        working-directory: ./core
+        env:
+          PLAYWRIGHT_TEST_BASE_URL: http://localhost:3000
+
+      - name: Upload test results
+        if: ${{ !cancelled() }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.artifact-name }}
+          path: ./core/.tests/reports/
+          retention-days: 3
diff --git a/core/playwright.config.ts b/core/playwright.config.ts
index 1b1d31338d..c6d11a75b8 100644
--- a/core/playwright.config.ts
+++ b/core/playwright.config.ts
@@ -29,6 +29,7 @@ export default defineConfig({
   projects: [
     {
       name: 'tests-chromium',
+      testIgnore: /.*\.mobile\.spec\.ts$/,
       use: {
         ...devices['Desktop Chrome'],
         launchOptions: {
@@ -38,6 +39,14 @@ export default defineConfig({
         },
       },
     },
+    {
+      name: 'tests-webkit-mobile',
+      testMatch: /.*\.mobile\.spec\.ts$/,
+      use: {
+        ...devices['iPhone 11'],
+        // WebKit doesn't support --disable-web-security
+      },
+    },
   ],
-  retries: 1,
+  retries: 2,
 });
diff --git a/core/tests/fixtures/utils/api/subscribe/http.ts b/core/tests/fixtures/utils/api/subscribe/http.ts
index b6c6876a43..ff804bb4cd 100644
--- a/core/tests/fixtures/utils/api/subscribe/http.ts
+++ b/core/tests/fixtures/utils/api/subscribe/http.ts
@@ -1,3 +1,5 @@
+import { testEnv } from '~/tests/environment';
+
 import { httpClient } from '../client';
 
 import { SubscribeApi } from '.';
@@ -5,6 +7,7 @@ import { SubscribeApi } from '.';
 export const subscribeHttpClient: SubscribeApi = {
   subscribe: async (email: string, firstName: string, lastName: string) => {
     await httpClient.post('/v3/customers/subscribers', {
+      channel_id: testEnv.BIGCOMMERCE_CHANNEL_ID ?? 1,
       email,
       first_name: firstName,
       last_name: lastName,
diff --git a/core/tests/tags.ts b/core/tests/tags.ts
index 607e209c1c..b516f2cfae 100644
--- a/core/tests/tags.ts
+++ b/core/tests/tags.ts
@@ -1,4 +1,8 @@
 export const TAGS = {
   // @writes-data is used to mark tests that modify data on the storefront without directly using the API.
   writesData: '@writes-data',
+  // @alternate-locale is used to mark tests that should be run with an alternate locale setting.
+  alternateLocale: '@alternate-locale',
+  // @no-trailing-slash is used to mark tests that should be run with TRAILING_SLASH disabled.
+  noTrailingSlash: '@no-trailing-slash',
 };
diff --git a/core/tests/ui/e2e/account/account.spec.ts b/core/tests/ui/e2e/account/account.spec.ts
index c9e2854fa9..f2489344cd 100644
--- a/core/tests/ui/e2e/account/account.spec.ts
+++ b/core/tests/ui/e2e/account/account.spec.ts
@@ -2,6 +2,7 @@ import { defaultLocale } from '~/i18n/locales';
 import { testEnv } from '~/tests/environment';
 import { expect, test } from '~/tests/fixtures';
 import { getTranslations } from '~/tests/lib/i18n';
+import { TAGS } from '~/tests/tags';
 
 const accountUrls = [
   '/account/orders',
@@ -18,14 +19,16 @@ accountUrls.forEach((url) => {
 });
 
 accountUrls.forEach((url) => {
-  test(`${url} is restricted for guest users when explicitly browsing to the locale URL`, async ({
-    page,
-  }) => {
-    test.skip(testEnv.TESTS_LOCALE === defaultLocale);
+  test(
+    `${url} is restricted for guest users when explicitly browsing to the locale URL`,
+    { tag: TAGS.alternateLocale },
+    async ({ page }) => {
+      test.skip(testEnv.TESTS_LOCALE === defaultLocale);
 
-    await page.goto(`/${testEnv.TESTS_LOCALE}/${url}`);
-    await expect(page).toHaveURL('/login/', { timeout: 1000 });
-  });
+      await page.goto(`/${testEnv.TESTS_LOCALE}/${url}`);
+      await expect(page).toHaveURL('/login/', { timeout: 1000 });
+    },
+  );
 });
 
 test('Account page displays the menu items for each section', async ({ page, customer }) => {
diff --git a/core/tests/ui/e2e/account/wishlist-details.spec.ts b/core/tests/ui/e2e/account/wishlist-details.spec.ts
index 0131db0a5a..cdf1f838ec 100644
--- a/core/tests/ui/e2e/account/wishlist-details.spec.ts
+++ b/core/tests/ui/e2e/account/wishlist-details.spec.ts
@@ -129,8 +129,12 @@ test('Wishlist details displays an out of stock product correctly', async ({
   page,
   catalog,
   customer,
+  settings,
 }) => {
+  await settings.setInventorySettings({ showOutOfStockMessage: true });
+
   const product = await catalog.createSimpleProduct({
+    inventoryTracking: 'product',
     inventoryLevel: 0,
   });
 
diff --git a/core/tests/ui/e2e/account/wishlists.mobile.spec.ts b/core/tests/ui/e2e/account/wishlists.mobile.spec.ts
index 25f0ef6163..7a7c91dd0c 100644
--- a/core/tests/ui/e2e/account/wishlists.mobile.spec.ts
+++ b/core/tests/ui/e2e/account/wishlists.mobile.spec.ts
@@ -19,6 +19,11 @@ test('Share button calls navigator.share with the correct URL', async ({ page, c
 
   await page.exposeFunction('setNavigatorShareCalled', setNavigatorShareCalled);
   await page.addInitScript(() => {
+    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+    if (!window.navigator.share) {
+      window.navigator.share = async () => Promise.resolve();
+    }
+
     const originalNavigatorShare = window.navigator.share.bind(window.navigator);
 
     window.navigator.share = async (data) => {
@@ -36,6 +41,7 @@ test('Share button calls navigator.share with the correct URL', async ({ page, c
   });
 
   await page.goto('/account/wishlists/');
+  await page.waitForLoadState('networkidle');
 
   const locator = page.getByRole('region', { name });
 
diff --git a/core/tests/ui/e2e/auth/login.spec.ts b/core/tests/ui/e2e/auth/login.spec.ts
index fb9df72817..c3aabddb5c 100644
--- a/core/tests/ui/e2e/auth/login.spec.ts
+++ b/core/tests/ui/e2e/auth/login.spec.ts
@@ -86,7 +86,7 @@ test('JWT login redirects to the specified redirect_to value in the token payloa
 
   await page.goto(`/login/token/${jwt}`);
   await page.waitForURL('/account/addresses/');
-  await expect(page.getByRole('heading', { name: t('title') })).toBeVisible();
+  await expect(page.getByRole('heading', { name: t('title'), exact: true })).toBeVisible();
 });
 
 test('JWT login with an invalid/expired token shows an error message', async ({ page }) => {
diff --git a/core/tests/ui/e2e/auth/register.spec.ts b/core/tests/ui/e2e/auth/register.spec.ts
index e8399406f4..2d20864188 100644
--- a/core/tests/ui/e2e/auth/register.spec.ts
+++ b/core/tests/ui/e2e/auth/register.spec.ts
@@ -37,7 +37,6 @@ test('Registration works as expected', { tag: [TAGS.writesData] }, async ({ page
   await page.getByRole('combobox', { name: 'Country' }).click();
   await page.keyboard.type('United States');
   await page.keyboard.press('Enter');
-  await page.getByRole('radio', { name: 'Home' }).click();
   await page.getByRole('button', { name: t('Auth.Register.cta') }).click();
 
   await expect(page).toHaveURL('/account/orders/');
@@ -84,7 +83,6 @@ test('Registration fails if email is already in use', async ({ page, customer })
   await page.getByRole('combobox', { name: 'Country' }).click();
   await page.keyboard.type('United States');
   await page.keyboard.press('Enter');
-  await page.getByRole('radio', { name: 'Home' }).click();
   await page.getByRole('button', { name: t('cta') }).click();
 
   await expect(page).not.toHaveURL('/account/orders/');
diff --git a/core/tests/ui/e2e/blog.spec.ts b/core/tests/ui/e2e/blog.spec.ts
index 8d71f243ac..650a6df390 100644
--- a/core/tests/ui/e2e/blog.spec.ts
+++ b/core/tests/ui/e2e/blog.spec.ts
@@ -13,13 +13,13 @@ test('Blog is accessible and displays posts', async ({ page, blog }) => {
 
   const breadcrumbs = page.getByLabel('breadcrumb');
 
-  await expect(breadcrumbs.getByText(t('home'))).toBeVisible();
-  await expect(breadcrumbs.getByText(name)).toBeVisible();
+  await expect(breadcrumbs.getByText(t('home')).first()).toBeVisible();
+  await expect(breadcrumbs.getByText(name).first()).toBeVisible();
 
   // eslint-disable-next-line @typescript-eslint/no-misused-promises
   posts.forEach(async (post) => {
     await expect(
-      page.locator(`a[href*="${post.path}"]`).filter({ hasText: post.title }),
+      page.locator(`a[href*="${post.path}"]`).filter({ hasText: post.title }).first(),
     ).toBeVisible();
   });
 });
diff --git a/core/tests/ui/e2e/cart.spec.ts b/core/tests/ui/e2e/cart.spec.ts
index 54443149f8..8a22457e00 100644
--- a/core/tests/ui/e2e/cart.spec.ts
+++ b/core/tests/ui/e2e/cart.spec.ts
@@ -8,8 +8,8 @@ test('Cart page displays empty state when no items are in the cart', async ({ pa
   await page.goto('/cart');
 
   await expect(page.getByRole('heading', { name: t('title') })).toBeVisible();
-  await expect(page.getByText(t('Empty.title'))).toBeVisible();
-  await expect(page.getByText(t('Empty.subtitle'))).toBeVisible();
+  await expect(page.getByRole('heading', { name: t('Empty.title'), exact: true })).toBeVisible();
+  await expect(page.getByText(t('Empty.subtitle')).first()).toBeVisible();
   await expect(page.getByRole('link', { name: t('Empty.cta') })).toBeVisible();
 });
 
diff --git a/core/tests/ui/e2e/checkout.spec.ts b/core/tests/ui/e2e/checkout.spec.ts
index 79403116b9..9620db2a6c 100644
--- a/core/tests/ui/e2e/checkout.spec.ts
+++ b/core/tests/ui/e2e/checkout.spec.ts
@@ -106,6 +106,5 @@ test('Checkout works as a guest shopper', async ({ page, catalog }) => {
   // Complete order
   await page.locator('button[type="submit"]').click();
   await page.waitForLoadState('networkidle');
-
-  expect(page.url()).toContain('/checkout/order-confirmation');
+  await page.waitForURL('**/checkout/order-confirmation', { timeout: 5000 });
 });
diff --git a/core/tests/ui/e2e/compare.spec.ts b/core/tests/ui/e2e/compare.spec.ts
index a48ad57259..8fb73c4a63 100644
--- a/core/tests/ui/e2e/compare.spec.ts
+++ b/core/tests/ui/e2e/compare.spec.ts
@@ -14,8 +14,8 @@ test('Validate compare page', async ({ page, catalog, currency }) => {
   await expect(page.getByRole('heading', { name: `${t('title')} 2` })).toBeVisible();
 
   // Products names
-  await expect(page.getByText(product.name, { exact: true })).toBeVisible();
-  await expect(page.getByText(productWithVariants.name, { exact: true })).toBeVisible();
+  await expect(page.getByText(product.name, { exact: true }).first()).toBeVisible();
+  await expect(page.getByText(productWithVariants.name, { exact: true }).first()).toBeVisible();
 
   // Products CTAs
   await expect(page.getByRole('button', { name: t('addToCart') })).toBeVisible();
@@ -32,8 +32,8 @@ test('Validate compare page', async ({ page, catalog, currency }) => {
     currency: defaultCurrency,
   });
 
-  await expect(page.getByText(productPrice)).toBeVisible();
-  await expect(page.getByText(productWithVariantsPrice)).toBeVisible();
+  await expect(page.getByText(productPrice, { exact: true }).first()).toBeVisible();
+  await expect(page.getByText(productWithVariantsPrice, { exact: true }).first()).toBeVisible();
 });
 
 test('Validate compare page with alternate currency', async ({ page, catalog, currency }) => {
@@ -55,12 +55,14 @@ test('Validate compare page with alternate currency', async ({ page, catalog, cu
   await page.goto(`/compare/?ids=${product.id},${productWithVariants.id}`);
   await page.waitForLoadState('networkidle');
   await expect(
-    page.getByText(
-      format.number(product.price, {
-        style: 'currency',
-        currency: defaultCurrency,
-      }),
-    ),
+    page
+      .getByText(
+        format.number(product.price, {
+          style: 'currency',
+          currency: defaultCurrency,
+        }),
+      )
+      .first(),
   ).toBeVisible();
 
   await currency.selectCurrency(alternateCurrency);
@@ -87,7 +89,7 @@ test('Validate compare page with alternate currency', async ({ page, catalog, cu
     currency: alternateCurrency,
   });
 
-  await expect(page.getByText(formattedProductWithVariantsPrice)).toBeVisible();
+  await expect(page.getByText(formattedProductWithVariantsPrice).first()).toBeVisible();
 });
 
 test('Can add simple product to cart', async ({ page, catalog }) => {
@@ -143,5 +145,5 @@ test('Show empty state when no products are selected', async ({ page }) => {
 
   await page.goto('/compare');
 
-  await expect(page.getByText(t('noProductsToCompare'))).toBeVisible();
+  await expect(page.getByText(t('noProductsToCompare')).first()).toBeVisible();
 });
diff --git a/core/tests/ui/e2e/coupon.spec.ts b/core/tests/ui/e2e/coupon.spec.ts
index c23d1398fd..4738ebb0ed 100644
--- a/core/tests/ui/e2e/coupon.spec.ts
+++ b/core/tests/ui/e2e/coupon.spec.ts
@@ -24,10 +24,26 @@ test('Valid coupon code can be applied to the cart', async ({ page, catalog, pro
   await page.getByRole('button', { name: t('Cart.CheckoutSummary.CouponCode.apply') }).click();
   await page.waitForLoadState('networkidle');
 
-  await expect(page.getByText(coupon.code)).toBeVisible();
-  await expect(
-    page.getByRole('button', { name: t('Cart.CheckoutSummary.CouponCode.removeCouponCode') }),
-  ).toBeVisible();
+  try {
+    await expect(page.getByText(coupon.code)).toBeVisible();
+    await expect(
+      page.getByRole('button', { name: t('Cart.CheckoutSummary.CouponCode.removeCouponCode') }),
+    ).toBeVisible();
+  } catch {
+    // TODO: Remove try/catch when root cause of next state issue is found/resolved [CATALYST-1685]
+    // NextJS seems to have some issues when running local builds.
+    // In this test, the coupon button will get stuck spinning forever and cause the assertions to fail.
+    // This doesn't happen on deployed production builds, just local next builds.
+    // To combat this, if the previous assertions fail, we hard refresh the page and then try again.
+    await page.reload();
+    await expect(page.getByText(coupon.code)).toBeVisible();
+    await expect(
+      page.getByRole('button', { name: t('Cart.CheckoutSummary.CouponCode.removeCouponCode') }),
+    ).toBeVisible();
+
+    // eslint-disable-next-line no-console
+    console.warn('Coupon applied but page got stuck in loading state.');
+  }
 });
 
 test('Invalid coupon code cannot be applied', async ({ page, catalog }) => {
@@ -45,6 +61,7 @@ test('Invalid coupon code cannot be applied', async ({ page, catalog }) => {
 
   await expect(page.getByText(addToCartSuccessMessage)).toBeVisible();
   await page.goto('/cart');
+  await page.waitForLoadState('networkidle');
 
   await expect(page.getByRole('heading', { name: t('Cart.title') })).toBeVisible();
 
@@ -55,7 +72,15 @@ test('Invalid coupon code cannot be applied', async ({ page, catalog }) => {
   await page.getByRole('button', { name: t('Cart.CheckoutSummary.CouponCode.apply') }).click();
   await page.waitForLoadState('networkidle');
 
-  await expect(
-    page.getByText(t('Cart.CheckoutSummary.CouponCode.invalidCouponCode')),
-  ).toBeVisible();
+  try {
+    await expect(
+      page.getByText(t('Cart.CheckoutSummary.CouponCode.invalidCouponCode')),
+    ).toBeVisible();
+  } catch {
+    // TODO: Remove try/catch when root cause of next state issue is found/resolved [CATALYST-1685]
+    await page.reload();
+    await expect(
+      page.getByText(t('Cart.CheckoutSummary.CouponCode.invalidCouponCode')),
+    ).toBeVisible();
+  }
 });
diff --git a/core/tests/ui/e2e/middleware/redirects.spec.ts b/core/tests/ui/e2e/middleware/redirects.spec.ts
index 43222e1b44..8d236551b8 100644
--- a/core/tests/ui/e2e/middleware/redirects.spec.ts
+++ b/core/tests/ui/e2e/middleware/redirects.spec.ts
@@ -2,6 +2,7 @@ import { faker } from '@faker-js/faker';
 
 import { testEnv } from '~/tests/environment';
 import { expect, test } from '~/tests/fixtures';
+import { TAGS } from '~/tests/tags';
 
 test('Middleware follows a dynamic 301 redirect correctly', async ({
   page,
@@ -56,48 +57,52 @@ test('Middleware follows redirects in respect to capitalization', async ({ page,
   await expect(page).toHaveURL(toPath);
 });
 
-test.describe('Trailing slash redirect loop regression tests', () => {
-  test.skip(() => testEnv.TRAILING_SLASH);
-
-  test('Dynamic redirect to a product with a trailing slash in the url does not cause a redirect loop when TRAILING_SLASH=false', async ({
-    page,
-    catalog,
-    redirects,
-  }) => {
-    const productUrlWithoutTrailingSlash = `/dynamic-redirect-product-${faker.string.alpha(6)}`;
-    const product = await catalog.createSimpleProduct({
-      customUrl: {
-        url: `${productUrlWithoutTrailingSlash}/`,
-      },
+test.describe(
+  'Trailing slash redirect loop regression tests',
+  { tag: TAGS.noTrailingSlash },
+  () => {
+    test.skip(() => testEnv.TRAILING_SLASH);
+
+    test('Dynamic redirect to a product with a trailing slash in the url does not cause a redirect loop when TRAILING_SLASH=false', async ({
+      page,
+      catalog,
+      redirects,
+    }) => {
+      const productUrlWithoutTrailingSlash = `/dynamic-redirect-product-${faker.string.alpha(6)}`;
+      const product = await catalog.createSimpleProduct({
+        customUrl: {
+          url: `${productUrlWithoutTrailingSlash}/`,
+        },
+      });
+
+      await redirects.upsertRedirect({
+        fromPath: productUrlWithoutTrailingSlash,
+        to: {
+          type: 'product',
+          entityId: product.id,
+        },
+      });
+
+      await page.goto(productUrlWithoutTrailingSlash);
+      await expect(page).toHaveURL(productUrlWithoutTrailingSlash);
     });
 
-    await redirects.upsertRedirect({
-      fromPath: productUrlWithoutTrailingSlash,
-      to: {
-        type: 'product',
-        entityId: product.id,
-      },
+    test('Manual redirect from a non-trailing-slash path to a trailing-slash path does not cause a redirect loop when TRAILING_SLASH=false', async ({
+      page,
+      redirects,
+    }) => {
+      const pathNoSlash = `/test-manual-redirect-${faker.string.alpha(6)}`;
+
+      await redirects.upsertRedirect({
+        fromPath: pathNoSlash,
+        to: {
+          type: 'url',
+          url: `${pathNoSlash}/`,
+        },
+      });
+
+      await page.goto(pathNoSlash);
+      await expect(page).toHaveURL(pathNoSlash);
     });
-
-    await page.goto(productUrlWithoutTrailingSlash);
-    await expect(page).toHaveURL(productUrlWithoutTrailingSlash);
-  });
-
-  test('Manual redirect from a non-trailing-slash path to a trailing-slash path does not cause a redirect loop when TRAILING_SLASH=false', async ({
-    page,
-    redirects,
-  }) => {
-    const pathNoSlash = `/test-manual-redirect-${faker.string.alpha(6)}`;
-
-    await redirects.upsertRedirect({
-      fromPath: pathNoSlash,
-      to: {
-        type: 'url',
-        url: `${pathNoSlash}/`,
-      },
-    });
-
-    await page.goto(pathNoSlash);
-    await expect(page).toHaveURL(pathNoSlash);
-  });
-});
+  },
+);
diff --git a/core/tests/ui/e2e/product.spec.ts b/core/tests/ui/e2e/product.spec.ts
index 35080ce2cc..3275f06196 100644
--- a/core/tests/ui/e2e/product.spec.ts
+++ b/core/tests/ui/e2e/product.spec.ts
@@ -52,6 +52,9 @@ test('Displays out of stock product correctly when out of stock message is enabl
   catalog,
   settings,
 }) => {
+  // Test is flaky due to cache. Set an increased timeout for the entire test.
+  test.setTimeout(90000);
+
   const t = await getTranslations('Product.ProductDetails');
 
   await settings.setInventorySettings({
@@ -69,7 +72,16 @@ test('Displays out of stock product correctly when out of stock message is enabl
 
   await expect(page.getByRole('heading', { name: product.name })).toBeVisible();
   await expect(page.getByRole('button', { name: t('Submit.outOfStock') })).toBeVisible();
-  await expect(page.getByText('Currently out of stock')).toBeVisible();
+
+  // Test is flakey due to settings cache. Retry assertions several times until it passes.
+  await expect(async () => {
+    try {
+      await expect(page.getByText('Currently out of stock')).toBeVisible();
+    } catch {
+      await page.reload();
+      await expect(page.getByText('Currently out of stock')).toBeVisible();
+    }
+  }).toPass({ timeout: 90000, intervals: [2000] });
 });
 
 test('Displays current stock message when stock level message is enabled', async ({
@@ -77,6 +89,9 @@ test('Displays current stock message when stock level message is enabled', async
   catalog,
   settings,
 }) => {
+  // Test is flaky due to cache. Set an increased timeout for the entire test.
+  test.setTimeout(90000);
+
   const t = await getTranslations('Product.ProductDetails');
 
   await settings.setInventorySettings({
@@ -92,7 +107,16 @@ test('Displays current stock message when stock level message is enabled', async
   await page.waitForLoadState('networkidle');
 
   await expect(page.getByRole('heading', { name: product.name })).toBeVisible();
-  await expect(page.getByText(t('currentStock', { quantity: 10 }))).toBeVisible();
+
+  // Test is flakey due to settings cache. Retry assertions several times until it passes.
+  await expect(async () => {
+    try {
+      await expect(page.getByText(t('currentStock', { quantity: 10 }))).toBeVisible();
+    } catch {
+      await page.reload();
+      await expect(page.getByText(t('currentStock', { quantity: 10 }))).toBeVisible();
+    }
+  }).toPass({ timeout: 90000, intervals: [2000] });
 });
 
 test('Displays product price correctly for an alternate currency', async ({
diff --git a/core/tests/ui/e2e/search.spec.ts b/core/tests/ui/e2e/search.spec.ts
index 760be70b4a..8d6362472d 100644
--- a/core/tests/ui/e2e/search.spec.ts
+++ b/core/tests/ui/e2e/search.spec.ts
@@ -14,7 +14,7 @@ test('Typing in the search bar displays quick search results', async ({ page, ca
 
   await expect(page.getByRole('heading', { name: t('Search.categories') })).toBeVisible();
   await expect(page.getByRole('heading', { name: t('Search.brands') })).toBeVisible();
-  await expect(page.getByRole('heading', { name: t('Search.products') })).toBeVisible();
+  await expect(page.getByRole('heading', { name: t('Search.products') }).first()).toBeVisible();
 
   const searchResultLocator = page.getByRole('region', { name: t('Search.products') });
 
diff --git a/core/tests/ui/e2e/shipping.spec.ts b/core/tests/ui/e2e/shipping.spec.ts
index 3a1b667689..f693f302d4 100644
--- a/core/tests/ui/e2e/shipping.spec.ts
+++ b/core/tests/ui/e2e/shipping.spec.ts
@@ -70,19 +70,34 @@ test('Add shipping estimates', async ({ page, catalog }) => {
 
   await addProductAndGoToCart(page, catalog);
 
+  await page.waitForLoadState('networkidle');
+
   await page.getByRole('button', { name: t('add'), exact: true }).click();
 
   await fillOutShippingForm(page);
 
   await page.getByRole('button', { name: t('viewShippingOptions') }).click();
-  await expect(page.getByLabel(t('shippingOptions'))).toBeVisible();
+
+  try {
+    await expect(page.getByLabel(t('shippingOptions'))).toBeVisible();
+  } catch {
+    // TODO: Remove try/catch when root cause of next state issue is found/resolved [CATALYST-1685]
+    await page.reload();
+    await expect(page.getByLabel(t('shippingOptions'))).toBeVisible();
+  }
 
   const selectedOption = await selectRandomShippingOption(page);
 
   await page.getByRole('button', { name: t('addShipping') }).click();
   await page.waitForLoadState('networkidle');
 
-  await expect(page.getByText(`${selectedOption}${t('change')}`)).toBeVisible();
+  try {
+    await expect(page.getByText(`${selectedOption}${t('change')}`)).toBeVisible();
+  } catch {
+    await page.reload();
+    // TODO: Remove try/catch when root cause of next state issue is found/resolved [CATALYST-1685]
+    await expect(page.getByText(`${selectedOption}${t('change')}`)).toBeVisible();
+  }
 });
 
 test('Update shipping estimates', async ({ page, catalog }) => {
@@ -90,25 +105,52 @@ test('Update shipping estimates', async ({ page, catalog }) => {
 
   await addProductAndGoToCart(page, catalog);
 
+  await page.waitForLoadState('networkidle');
+
   await page.getByRole('button', { name: t('add'), exact: true }).click();
 
   await fillOutShippingForm(page);
 
   await page.getByRole('button', { name: t('viewShippingOptions') }).click();
-  await expect(page.getByLabel(t('shippingOptions'))).toBeVisible();
+
+  try {
+    await expect(page.getByLabel(t('shippingOptions'))).toBeVisible();
+  } catch {
+    // TODO: Remove try/catch when root cause of next state issue is found/resolved [CATALYST-1685]
+    await page.reload();
+    await page.waitForLoadState('networkidle');
+    await expect(page.getByLabel(t('shippingOptions'))).toBeVisible();
+  }
 
   let selectedOption = await selectRandomShippingOption(page);
 
   await page.getByRole('button', { name: t('addShipping') }).click();
   await page.waitForLoadState('networkidle');
 
+  try {
+    await expect(page.getByText(t('change'))).toBeVisible();
+  } catch {
+    // TODO: Remove try/catch when root cause of next state issue is found/resolved [CATALYST-1685]
+    await page.reload();
+    await page.waitForLoadState('networkidle');
+    await expect(page.getByText(t('change'))).toBeVisible();
+  }
+
   await page.getByText(t('change')).click();
   await page.getByRole('button', { name: t('editAddress') }).click();
 
   await fillOutShippingForm(page);
 
   await page.getByRole('button', { name: t('updatedShippingOptions') }).click();
-  await expect(page.getByRole('button', { name: t('updatedShippingOptions') })).toBeHidden();
+
+  try {
+    await expect(page.getByRole('button', { name: t('updatedShippingOptions') })).toBeHidden();
+  } catch {
+    // TODO: Remove try/catch when root cause of next state issue is found/resolved [CATALYST-1685]
+    await page.reload();
+    await page.waitForLoadState('networkidle');
+    await expect(page.getByRole('button', { name: t('updatedShippingOptions') })).toBeHidden();
+  }
 
   if (await page.getByLabel(t('shippingOptions')).isVisible()) {
     selectedOption = await selectRandomShippingOption(page);
@@ -127,6 +169,8 @@ test('Updating cart quantity with a shipping estimate opens the shipping options
 
   await addProductAndGoToCart(page, catalog);
 
+  await page.waitForLoadState('networkidle');
+
   await page.getByRole('button', { name: t('CheckoutSummary.Shipping.add'), exact: true }).click();
 
   await fillOutShippingForm(page);
@@ -134,25 +178,59 @@ test('Updating cart quantity with a shipping estimate opens the shipping options
   await page
     .getByRole('button', { name: t('CheckoutSummary.Shipping.viewShippingOptions') })
     .click();
-  await expect(page.getByLabel(t('CheckoutSummary.Shipping.shippingOptions'))).toBeVisible();
+
+  try {
+    await expect(page.getByLabel(t('CheckoutSummary.Shipping.shippingOptions'))).toBeVisible();
+  } catch {
+    // TODO: Remove try/catch when root cause of next state issue is found/resolved [CATALYST-1685]
+    await page.reload();
+    await page.waitForLoadState('networkidle');
+    await expect(page.getByLabel(t('CheckoutSummary.Shipping.shippingOptions'))).toBeVisible();
+  }
 
   let selectedOption = await selectRandomShippingOption(page);
 
   await page.getByRole('button', { name: t('CheckoutSummary.Shipping.addShipping') }).click();
   await page.waitForLoadState('networkidle');
 
-  await expect(
-    page.getByText(`${selectedOption}${t('CheckoutSummary.Shipping.change')}`),
-  ).toBeVisible();
+  try {
+    await expect(
+      page.getByText(`${selectedOption}${t('CheckoutSummary.Shipping.change')}`),
+    ).toBeVisible();
+  } catch {
+    // TODO: Remove try/catch when root cause of next state issue is found/resolved [CATALYST-1685]
+    await page.reload();
+    await expect(
+      page.getByText(`${selectedOption}${t('CheckoutSummary.Shipping.change')}`),
+    ).toBeVisible();
+  }
 
   await page.getByLabel(t('increment')).click();
   await page.waitForLoadState('networkidle');
 
-  await expect(page.getByLabel(t('CheckoutSummary.Shipping.shippingOptions'))).toBeVisible();
+  try {
+    await expect(page.getByLabel(t('CheckoutSummary.Shipping.shippingOptions'))).toBeVisible();
+  } catch {
+    // TODO: Remove try/catch when root cause of next state issue is found/resolved [CATALYST-1685]
+    await page.reload();
+    await page.waitForLoadState('networkidle');
+    await expect(page.getByLabel(t('CheckoutSummary.Shipping.shippingOptions'))).toBeVisible();
+  }
 
   selectedOption = await selectRandomShippingOption(page);
 
   await page.getByRole('button', { name: t('CheckoutSummary.Shipping.addShipping') }).click();
+
+  try {
+    await expect(
+      page.getByText(`${selectedOption}${t('CheckoutSummary.Shipping.change')}`),
+    ).toBeVisible();
+  } catch {
+    // TODO: Remove try/catch when root cause of next state issue is found/resolved [CATALYST-1685]
+    await page.reload();
+  }
+
+  await page.waitForLoadState('networkidle');
   await expect(
     page.getByText(`${selectedOption}${t('CheckoutSummary.Shipping.change')}`),
   ).toBeVisible();
diff --git a/core/vibes/soul/sections/cart/shipping-form/index.tsx b/core/vibes/soul/sections/cart/shipping-form/index.tsx
index 23745eff61..5fc786474b 100644
--- a/core/vibes/soul/sections/cart/shipping-form/index.tsx
+++ b/core/vibes/soul/sections/cart/shipping-form/index.tsx
@@ -277,6 +277,7 @@ export function ShippingForm({
               onValueChange={countryControl.change}
               options={countries}
               placeholder=""
+              required
               value={countryControl.value ?? ''}
             />
           ) : (
@@ -285,6 +286,7 @@ export function ShippingForm({
               errors={addressFields.country.errors}
               key={addressFields.country.id}
               label={countryLabel}
+              required
             />
           )}
           <Input

From 9f549607229d54a68e20d8543dc14ca2b700ef95 Mon Sep 17 00:00:00 2001
From: Matthew Volk <matt.volk@bigcommerce.com>
Date: Mon, 26 Jan 2026 10:45:23 -0600
Subject: [PATCH 20/69] chore(ci): pass channel-specific env vars to vercel
 deploy (#2834)

* chore(ci): pass channel-specific env vars to vercel deploy

* chore(ci): harden deploy workflow security

replace eval with bash arrays, add timeouts, improve secret handling

* chore(ci): add b2b env vars to deploy workflow
---
 .github/workflows/deploy.yml | 64 ++++++++++++++++++++++++++++--------
 1 file changed, 50 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 49423e3825..9039e24adb 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -11,7 +11,7 @@ on:
             - "@bigcommerce/catalyst-b2b-makeswift@latest"
 jobs:
     deploy-tag:
-        name: Deploy `{{ github.ref_name }}` tag
+        name: Deploy `${{ github.ref_name }}` tag
         runs-on: ubuntu-latest
         concurrency:
             group: ${{ github.workflow }}-${{ github.ref_name }}
@@ -21,25 +21,61 @@ jobs:
             - name: Install Vercel CLI
               run: npm install --global vercel@latest
 
-            - name: Parse Tag and Build Domain
-              id: parse-tag
+            - name: Configure catalyst-core deployment
+              if: contains(github.ref_name, 'catalyst-core@')
               run: |
-                  TAG="${{ github.ref_name }}"
-                  PACKAGE_NAME=$(echo "$TAG" | sed -E 's/^@bigcommerce\/([^@]+)@.*$/\1/')
-                  case "$PACKAGE_NAME" in
-                    "catalyst-core") DOMAIN="catalyst-demo.site" ;;
-                    "catalyst-makeswift") DOMAIN="makeswift.catalyst-demo.site" ;;
-                    "catalyst-b2b-makeswift") DOMAIN="b2b-makeswift.catalyst-demo.site" ;;
-                    *) echo "Error: Unknown package name: $PACKAGE_NAME"; exit 1 ;;
-                  esac
-                  echo "domain=$DOMAIN" >> $GITHUB_OUTPUT
+                  echo "DOMAIN=catalyst-demo.site" >> $GITHUB_ENV
+                  echo "CHANNEL_ID=${{ vars.CORE_BIGCOMMERCE_CHANNEL_ID }}" >> $GITHUB_ENV
+                  echo "STOREFRONT_TOKEN=${{ secrets.CORE_BIGCOMMERCE_STOREFRONT_TOKEN }}" >> $GITHUB_ENV
+
+            - name: Configure catalyst-makeswift deployment
+              if: contains(github.ref_name, 'catalyst-makeswift@')
+              run: |
+                  echo "DOMAIN=makeswift.catalyst-demo.site" >> $GITHUB_ENV
+                  echo "CHANNEL_ID=${{ vars.MAKESWIFT_BIGCOMMERCE_CHANNEL_ID }}" >> $GITHUB_ENV
+                  echo "STOREFRONT_TOKEN=${{ secrets.MAKESWIFT_BIGCOMMERCE_STOREFRONT_TOKEN }}" >> $GITHUB_ENV
+                  echo "MAKESWIFT_KEY=${{ secrets.MAKESWIFT_SITE_API_KEY }}" >> $GITHUB_ENV
+
+            - name: Configure catalyst-b2b-makeswift deployment
+              if: contains(github.ref_name, 'catalyst-b2b-makeswift@')
+              run: |
+                  echo "DOMAIN=b2b-makeswift.catalyst-demo.site" >> $GITHUB_ENV
+                  echo "CHANNEL_ID=${{ vars.B2B_MAKESWIFT_BIGCOMMERCE_CHANNEL_ID }}" >> $GITHUB_ENV
+                  echo "STOREFRONT_TOKEN=${{ secrets.B2B_MAKESWIFT_BIGCOMMERCE_STOREFRONT_TOKEN }}" >> $GITHUB_ENV
+                  echo "MAKESWIFT_KEY=${{ secrets.B2B_MAKESWIFT_SITE_API_KEY }}" >> $GITHUB_ENV
+                  echo "B2B_API_HOST=${{ vars.B2B_API_HOST }}" >> $GITHUB_ENV
+                  echo "BIGCOMMERCE_ACCESS_TOKEN=${{ secrets.B2B_BIGCOMMERCE_ACCESS_TOKEN }}" >> $GITHUB_ENV
 
             - name: Deploy to Vercel
               id: deploy
+              timeout-minutes: 15
+              env:
+                  VERCEL_TOKEN: ${{ secrets.VERCEL_TOKEN }}
               run: |
-                  DEPLOYMENT_URL=$(vercel deploy --token=${{ secrets.VERCEL_TOKEN }})
+                  DEPLOY_ARGS=(
+                    --token="$VERCEL_TOKEN"
+                    --env BIGCOMMERCE_CHANNEL_ID="$CHANNEL_ID"
+                    --env BIGCOMMERCE_STOREFRONT_TOKEN="$STOREFRONT_TOKEN"
+                  )
+
+                  if [[ -n "$MAKESWIFT_KEY" ]]; then
+                    DEPLOY_ARGS+=(--env MAKESWIFT_SITE_API_KEY="$MAKESWIFT_KEY")
+                  fi
+
+                  if [[ -n "$B2B_API_HOST" ]]; then
+                    DEPLOY_ARGS+=(--env B2B_API_HOST="$B2B_API_HOST")
+                  fi
+
+                  if [[ -n "$BIGCOMMERCE_ACCESS_TOKEN" ]]; then
+                    DEPLOY_ARGS+=(--env BIGCOMMERCE_ACCESS_TOKEN="$BIGCOMMERCE_ACCESS_TOKEN")
+                  fi
+
+                  DEPLOYMENT_URL=$(vercel deploy "${DEPLOY_ARGS[@]}")
                   echo "deployment_url=$DEPLOYMENT_URL" >> $GITHUB_OUTPUT
 
             - name: Set Vercel Domain Alias
+              timeout-minutes: 5
+              env:
+                  VERCEL_TOKEN: ${{ secrets.VERCEL_TOKEN }}
               run: |
-                  vercel alias ${{ steps.deploy.outputs.deployment_url }} ${{ steps.parse-tag.outputs.domain }} --token=${{ secrets.VERCEL_TOKEN }}
+                  vercel alias ${{ steps.deploy.outputs.deployment_url }} $DOMAIN --token="$VERCEL_TOKEN"

From 06fd9aa921ad2c4b8b60706e114a9f425f049d40 Mon Sep 17 00:00:00 2001
From: bc-svc-local <102379007+bc-svc-local@users.noreply.github.com>
Date: Mon, 26 Jan 2026 18:40:50 +0100
Subject: [PATCH 21/69] Update translations (#2836)

* feat(other): LOCAL-1444 delivery translation

* chore(core): create translations patch

---------

Co-authored-by: bc-svc-local <bc-svc-local@users.noreply.github.com>
---
 .changeset/translations-patch-48fcea94.md | 5 +++++
 core/messages/da.json                     | 9 ++++++++-
 core/messages/de.json                     | 9 ++++++++-
 core/messages/es-419.json                 | 9 ++++++++-
 core/messages/es-AR.json                  | 9 ++++++++-
 core/messages/es-CL.json                  | 9 ++++++++-
 core/messages/es-CO.json                  | 9 ++++++++-
 core/messages/es-LA.json                  | 9 ++++++++-
 core/messages/es-MX.json                  | 9 ++++++++-
 core/messages/es-PE.json                  | 9 ++++++++-
 core/messages/es.json                     | 9 ++++++++-
 core/messages/fr.json                     | 9 ++++++++-
 core/messages/it.json                     | 9 ++++++++-
 core/messages/ja.json                     | 9 ++++++++-
 core/messages/nl.json                     | 9 ++++++++-
 core/messages/no.json                     | 9 ++++++++-
 core/messages/pl.json                     | 9 ++++++++-
 core/messages/pt-BR.json                  | 9 ++++++++-
 core/messages/pt.json                     | 9 ++++++++-
 core/messages/sv.json                     | 9 ++++++++-
 20 files changed, 157 insertions(+), 19 deletions(-)
 create mode 100644 .changeset/translations-patch-48fcea94.md

diff --git a/.changeset/translations-patch-48fcea94.md b/.changeset/translations-patch-48fcea94.md
new file mode 100644
index 0000000000..ad17b2636a
--- /dev/null
+++ b/.changeset/translations-patch-48fcea94.md
@@ -0,0 +1,5 @@
+---
+"@bigcommerce/catalyst-core": patch
+---
+
+Update translations.
diff --git a/core/messages/da.json b/core/messages/da.json
index e80f496eff..3c83b91536 100644
--- a/core/messages/da.json
+++ b/core/messages/da.json
@@ -304,6 +304,8 @@
         "cartCombined": "Vi bemærkede, at du havde gemt varer i en tidligere indkøbskurv, så vi har føjet dem til din nuværende indkøbskurv for dig.",
         "cartRestored": "Du startede en indkøbskurv på en anden enhed, og vi har gendannet den her, så du kan fortsætte, hvor du slap.",
         "cartUpdateInProgress": "Du har en igangværende opdatering af din indkøbskurv. Er du sikker på, at du vil forlade denne side? Dine ændringer kan gå tabt.",
+        "originalPrice": "Original price was {price}.",
+        "currentPrice": "Current price is {price}.",
         "CheckoutSummary": {
             "title": "Oversigt",
             "subTotal": "Subtotal",
@@ -555,6 +557,11 @@
                     "description": "Disse cookies hjælper os med at give en bedre brugeroplevelse og teste nye funktioner."
                 }
             }
+        },
+        "Price": {
+            "originalPrice": "Original price was {price}.",
+            "currentPrice": "Current price is {price}.",
+            "range": "Price from {minValue} to {maxValue}."
         }
     },
     "GiftCertificates": {
@@ -567,7 +574,7 @@
             "title": "Tjek saldo",
             "description": "Du kan tjekke saldoen og få oplysninger om dit gavekort ved at indtaste koden i feltet nedenfor.",
             "inputLabel": "Kode",
-            "inputPlaceholder": "Indtast kode",
+            "inputPlaceholder": "xxx-xxx-xxx-xxx",
             "purchasedDateLabel": "Købt",
             "senderLabel": "Fra",
             "Errors": {
diff --git a/core/messages/de.json b/core/messages/de.json
index 3edb5413ae..317deae029 100644
--- a/core/messages/de.json
+++ b/core/messages/de.json
@@ -304,6 +304,8 @@
         "cartCombined": "Wir haben festgestellt, dass Sie Artikel in einem früheren Warenkorb gespeichert hatten, also haben wir diese Ihrem aktuellen Warenkorb hinzugefügt.",
         "cartRestored": "Sie haben einen Warenkorb auf einem anderen Gerät angelegt, und wir haben ihn hier wiederhergestellt, damit Sie dort weitermachen können, wo Sie aufgehört haben.",
         "cartUpdateInProgress": "Sie führen derzeit eine Aktualisierung Ihres Warenkorbs durch. Sind Sie sicher, dass Sie diese Seite verlassen möchten? Ihre Änderungen könnten verloren gehen.",
+        "originalPrice": "Original price was {price}.",
+        "currentPrice": "Current price is {price}.",
         "CheckoutSummary": {
             "title": "Übersicht",
             "subTotal": "Zwischensumme",
@@ -555,6 +557,11 @@
                     "description": "Diese Cookies helfen uns, eine bessere Benutzererfahrung zu bieten und neue Funktionen zu testen."
                 }
             }
+        },
+        "Price": {
+            "originalPrice": "Original price was {price}.",
+            "currentPrice": "Current price is {price}.",
+            "range": "Price from {minValue} to {maxValue}."
         }
     },
     "GiftCertificates": {
@@ -567,7 +574,7 @@
             "title": "Guthaben abfragen",
             "description": "Sie können das Guthaben überprüfen und Informationen zu Ihrem Geschenkgutschein erhalten, indem Sie den Code in das Feld unten eingeben.",
             "inputLabel": "Code",
-            "inputPlaceholder": "Code eingeben",
+            "inputPlaceholder": "xxx-xxx-xxx-xxx",
             "purchasedDateLabel": "Gekauft",
             "senderLabel": "Von",
             "Errors": {
diff --git a/core/messages/es-419.json b/core/messages/es-419.json
index 1ae7298df2..f98234073b 100644
--- a/core/messages/es-419.json
+++ b/core/messages/es-419.json
@@ -304,6 +304,8 @@
         "cartCombined": "Notamos que tenías artículos guardados en un carrito anterior, así que los hemos agregado a tu carrito actual.",
         "cartRestored": "Iniciaste un carrito en otro dispositivo y lo hemos restaurado aquí para que puedas continuar desde donde lo dejaste.",
         "cartUpdateInProgress": "Tiene una actualización de carrito en proceso. ¿Estás seguro de que quieres salir de esta página? Es posible que se pierdan sus cambios.",
+        "originalPrice": "Original price was {price}.",
+        "currentPrice": "Current price is {price}.",
         "CheckoutSummary": {
             "title": "Resumen",
             "subTotal": "Subtotal",
@@ -555,6 +557,11 @@
                     "description": "Estas cookies nos ayudan a brindar una mejor experiencia de usuario y probar nuevas funciones."
                 }
             }
+        },
+        "Price": {
+            "originalPrice": "Original price was {price}.",
+            "currentPrice": "Current price is {price}.",
+            "range": "Price from {minValue} to {maxValue}."
         }
     },
     "GiftCertificates": {
@@ -567,7 +574,7 @@
             "title": "Consultar saldo",
             "description": "Puede consultar el saldo y obtener la información sobre su certificado de regalo escribiendo el código en el cuadro a continuación.",
             "inputLabel": "Código",
-            "inputPlaceholder": "Ingresar el código",
+            "inputPlaceholder": "xxx-xxx-xxx-xxx",
             "purchasedDateLabel": "Comprado",
             "senderLabel": "Para",
             "Errors": {
diff --git a/core/messages/es-AR.json b/core/messages/es-AR.json
index 1ae7298df2..f98234073b 100644
--- a/core/messages/es-AR.json
+++ b/core/messages/es-AR.json
@@ -304,6 +304,8 @@
         "cartCombined": "Notamos que tenías artículos guardados en un carrito anterior, así que los hemos agregado a tu carrito actual.",
         "cartRestored": "Iniciaste un carrito en otro dispositivo y lo hemos restaurado aquí para que puedas continuar desde donde lo dejaste.",
         "cartUpdateInProgress": "Tiene una actualización de carrito en proceso. ¿Estás seguro de que quieres salir de esta página? Es posible que se pierdan sus cambios.",
+        "originalPrice": "Original price was {price}.",
+        "currentPrice": "Current price is {price}.",
         "CheckoutSummary": {
             "title": "Resumen",
             "subTotal": "Subtotal",
@@ -555,6 +557,11 @@
                     "description": "Estas cookies nos ayudan a brindar una mejor experiencia de usuario y probar nuevas funciones."
                 }
             }
+        },
+        "Price": {
+            "originalPrice": "Original price was {price}.",
+            "currentPrice": "Current price is {price}.",
+            "range": "Price from {minValue} to {maxValue}."
         }
     },
     "GiftCertificates": {
@@ -567,7 +574,7 @@
             "title": "Consultar saldo",
             "description": "Puede consultar el saldo y obtener la información sobre su certificado de regalo escribiendo el código en el cuadro a continuación.",
             "inputLabel": "Código",
-            "inputPlaceholder": "Ingresar el código",
+            "inputPlaceholder": "xxx-xxx-xxx-xxx",
             "purchasedDateLabel": "Comprado",
             "senderLabel": "Para",
             "Errors": {
diff --git a/core/messages/es-CL.json b/core/messages/es-CL.json
index 1ae7298df2..f98234073b 100644
--- a/core/messages/es-CL.json
+++ b/core/messages/es-CL.json
@@ -304,6 +304,8 @@
         "cartCombined": "Notamos que tenías artículos guardados en un carrito anterior, así que los hemos agregado a tu carrito actual.",
         "cartRestored": "Iniciaste un carrito en otro dispositivo y lo hemos restaurado aquí para que puedas continuar desde donde lo dejaste.",
         "cartUpdateInProgress": "Tiene una actualización de carrito en proceso. ¿Estás seguro de que quieres salir de esta página? Es posible que se pierdan sus cambios.",
+        "originalPrice": "Original price was {price}.",
+        "currentPrice": "Current price is {price}.",
         "CheckoutSummary": {
             "title": "Resumen",
             "subTotal": "Subtotal",
@@ -555,6 +557,11 @@
                     "description": "Estas cookies nos ayudan a brindar una mejor experiencia de usuario y probar nuevas funciones."
                 }
             }
+        },
+        "Price": {
+            "originalPrice": "Original price was {price}.",
+            "currentPrice": "Current price is {price}.",
+            "range": "Price from {minValue} to {maxValue}."
         }
     },
     "GiftCertificates": {
@@ -567,7 +574,7 @@
             "title": "Consultar saldo",
             "description": "Puede consultar el saldo y obtener la información sobre su certificado de regalo escribiendo el código en el cuadro a continuación.",
             "inputLabel": "Código",
-            "inputPlaceholder": "Ingresar el código",
+            "inputPlaceholder": "xxx-xxx-xxx-xxx",
             "purchasedDateLabel": "Comprado",
             "senderLabel": "Para",
             "Errors": {
diff --git a/core/messages/es-CO.json b/core/messages/es-CO.json
index 1ae7298df2..f98234073b 100644
--- a/core/messages/es-CO.json
+++ b/core/messages/es-CO.json
@@ -304,6 +304,8 @@
         "cartCombined": "Notamos que tenías artículos guardados en un carrito anterior, así que los hemos agregado a tu carrito actual.",
         "cartRestored": "Iniciaste un carrito en otro dispositivo y lo hemos restaurado aquí para que puedas continuar desde donde lo dejaste.",
         "cartUpdateInProgress": "Tiene una actualización de carrito en proceso. ¿Estás seguro de que quieres salir de esta página? Es posible que se pierdan sus cambios.",
+        "originalPrice": "Original price was {price}.",
+        "currentPrice": "Current price is {price}.",
         "CheckoutSummary": {
             "title": "Resumen",
             "subTotal": "Subtotal",
@@ -555,6 +557,11 @@
                     "description": "Estas cookies nos ayudan a brindar una mejor experiencia de usuario y probar nuevas funciones."
                 }
             }
+        },
+        "Price": {
+            "originalPrice": "Original price was {price}.",
+            "currentPrice": "Current price is {price}.",
+            "range": "Price from {minValue} to {maxValue}."
         }
     },
     "GiftCertificates": {
@@ -567,7 +574,7 @@
             "title": "Consultar saldo",
             "description": "Puede consultar el saldo y obtener la información sobre su certificado de regalo escribiendo el código en el cuadro a continuación.",
             "inputLabel": "Código",
-            "inputPlaceholder": "Ingresar el código",
+            "inputPlaceholder": "xxx-xxx-xxx-xxx",
             "purchasedDateLabel": "Comprado",
             "senderLabel": "Para",
             "Errors": {
diff --git a/core/messages/es-LA.json b/core/messages/es-LA.json
index 1ae7298df2..f98234073b 100644
--- a/core/messages/es-LA.json
+++ b/core/messages/es-LA.json
@@ -304,6 +304,8 @@
         "cartCombined": "Notamos que tenías artículos guardados en un carrito anterior, así que los hemos agregado a tu carrito actual.",
         "cartRestored": "Iniciaste un carrito en otro dispositivo y lo hemos restaurado aquí para que puedas continuar desde donde lo dejaste.",
         "cartUpdateInProgress": "Tiene una actualización de carrito en proceso. ¿Estás seguro de que quieres salir de esta página? Es posible que se pierdan sus cambios.",
+        "originalPrice": "Original price was {price}.",
+        "currentPrice": "Current price is {price}.",
         "CheckoutSummary": {
             "title": "Resumen",
             "subTotal": "Subtotal",
@@ -555,6 +557,11 @@
                     "description": "Estas cookies nos ayudan a brindar una mejor experiencia de usuario y probar nuevas funciones."
                 }
             }
+        },
+        "Price": {
+            "originalPrice": "Original price was {price}.",
+            "currentPrice": "Current price is {price}.",
+            "range": "Price from {minValue} to {maxValue}."
         }
     },
     "GiftCertificates": {
@@ -567,7 +574,7 @@
             "title": "Consultar saldo",
             "description": "Puede consultar el saldo y obtener la información sobre su certificado de regalo escribiendo el código en el cuadro a continuación.",
             "inputLabel": "Código",
-            "inputPlaceholder": "Ingresar el código",
+            "inputPlaceholder": "xxx-xxx-xxx-xxx",
             "purchasedDateLabel": "Comprado",
             "senderLabel": "Para",
             "Errors": {
diff --git a/core/messages/es-MX.json b/core/messages/es-MX.json
index 1ae7298df2..f98234073b 100644
--- a/core/messages/es-MX.json
+++ b/core/messages/es-MX.json
@@ -304,6 +304,8 @@
         "cartCombined": "Notamos que tenías artículos guardados en un carrito anterior, así que los hemos agregado a tu carrito actual.",
         "cartRestored": "Iniciaste un carrito en otro dispositivo y lo hemos restaurado aquí para que puedas continuar desde donde lo dejaste.",
         "cartUpdateInProgress": "Tiene una actualización de carrito en proceso. ¿Estás seguro de que quieres salir de esta página? Es posible que se pierdan sus cambios.",
+        "originalPrice": "Original price was {price}.",
+        "currentPrice": "Current price is {price}.",
         "CheckoutSummary": {
             "title": "Resumen",
             "subTotal": "Subtotal",
@@ -555,6 +557,11 @@
                     "description": "Estas cookies nos ayudan a brindar una mejor experiencia de usuario y probar nuevas funciones."
                 }
             }
+        },
+        "Price": {
+            "originalPrice": "Original price was {price}.",
+            "currentPrice": "Current price is {price}.",
+            "range": "Price from {minValue} to {maxValue}."
         }
     },
     "GiftCertificates": {
@@ -567,7 +574,7 @@
             "title": "Consultar saldo",
             "description": "Puede consultar el saldo y obtener la información sobre su certificado de regalo escribiendo el código en el cuadro a continuación.",
             "inputLabel": "Código",
-            "inputPlaceholder": "Ingresar el código",
+            "inputPlaceholder": "xxx-xxx-xxx-xxx",
             "purchasedDateLabel": "Comprado",
             "senderLabel": "Para",
             "Errors": {
diff --git a/core/messages/es-PE.json b/core/messages/es-PE.json
index 1ae7298df2..f98234073b 100644
--- a/core/messages/es-PE.json
+++ b/core/messages/es-PE.json
@@ -304,6 +304,8 @@
         "cartCombined": "Notamos que tenías artículos guardados en un carrito anterior, así que los hemos agregado a tu carrito actual.",
         "cartRestored": "Iniciaste un carrito en otro dispositivo y lo hemos restaurado aquí para que puedas continuar desde donde lo dejaste.",
         "cartUpdateInProgress": "Tiene una actualización de carrito en proceso. ¿Estás seguro de que quieres salir de esta página? Es posible que se pierdan sus cambios.",
+        "originalPrice": "Original price was {price}.",
+        "currentPrice": "Current price is {price}.",
         "CheckoutSummary": {
             "title": "Resumen",
             "subTotal": "Subtotal",
@@ -555,6 +557,11 @@
                     "description": "Estas cookies nos ayudan a brindar una mejor experiencia de usuario y probar nuevas funciones."
                 }
             }
+        },
+        "Price": {
+            "originalPrice": "Original price was {price}.",
+            "currentPrice": "Current price is {price}.",
+            "range": "Price from {minValue} to {maxValue}."
         }
     },
     "GiftCertificates": {
@@ -567,7 +574,7 @@
             "title": "Consultar saldo",
             "description": "Puede consultar el saldo y obtener la información sobre su certificado de regalo escribiendo el código en el cuadro a continuación.",
             "inputLabel": "Código",
-            "inputPlaceholder": "Ingresar el código",
+            "inputPlaceholder": "xxx-xxx-xxx-xxx",
             "purchasedDateLabel": "Comprado",
             "senderLabel": "Para",
             "Errors": {
diff --git a/core/messages/es.json b/core/messages/es.json
index ebe55611a7..c21c783f28 100644
--- a/core/messages/es.json
+++ b/core/messages/es.json
@@ -304,6 +304,8 @@
         "cartCombined": "Nos hemos dado cuenta de que tenías artículos guardados en un carrito anterior, así que los hemos añadido a tu carrito actual.",
         "cartRestored": "Empezaste a llenar un carrito en otro dispositivo y lo hemos restaurado aquí para que puedas seguir donde lo dejaste.",
         "cartUpdateInProgress": "Tienes una actualización del carrito en curso. ¿Seguro que quieres abandonar esta página? Es posible que se pierdan los cambios.",
+        "originalPrice": "Original price was {price}.",
+        "currentPrice": "Current price is {price}.",
         "CheckoutSummary": {
             "title": "Resumen",
             "subTotal": "Subtotal",
@@ -555,6 +557,11 @@
                     "description": "Estas cookies nos ayudan a brindar una mejor experiencia de usuario y probar nuevas funciones."
                 }
             }
+        },
+        "Price": {
+            "originalPrice": "Original price was {price}.",
+            "currentPrice": "Current price is {price}.",
+            "range": "Price from {minValue} to {maxValue}."
         }
     },
     "GiftCertificates": {
@@ -567,7 +574,7 @@
             "title": "Verificar saldo",
             "description": "Puedes comprobar el saldo y obtener la información sobre tu cupón de regalo escribiendo el código en la casilla de abajo.",
             "inputLabel": "Código",
-            "inputPlaceholder": "Introducir código",
+            "inputPlaceholder": "xxx-xxx-xxx-xxx",
             "purchasedDateLabel": "Comprado",
             "senderLabel": "de",
             "Errors": {
diff --git a/core/messages/fr.json b/core/messages/fr.json
index 575915977e..f4ab442a78 100644
--- a/core/messages/fr.json
+++ b/core/messages/fr.json
@@ -304,6 +304,8 @@
         "cartCombined": "Nous avons remarqué que votre panier précédent contenait des articles enregistrés. Nous avons donc ajouté ces articles à votre panier actuel.",
         "cartRestored": "Vous avez débuté vos achats sur un autre appareil. Nous avons restauré votre panier ici pour que vous puissiez reprendre là où vous en étiez.",
         "cartUpdateInProgress": "Une mise à jour de votre panier est en cours. Voulez-vous vraiment quitter cette page ? Vos modifications pourraient être perdues.",
+        "originalPrice": "Original price was {price}.",
+        "currentPrice": "Current price is {price}.",
         "CheckoutSummary": {
             "title": "Récapitulatif",
             "subTotal": "Sous-total",
@@ -555,6 +557,11 @@
                     "description": "Ces cookies nous aident à offrir une meilleure expérience utilisateur et à tester de nouvelles fonctionnalités."
                 }
             }
+        },
+        "Price": {
+            "originalPrice": "Original price was {price}.",
+            "currentPrice": "Current price is {price}.",
+            "range": "Price from {minValue} to {maxValue}."
         }
     },
     "GiftCertificates": {
@@ -567,7 +574,7 @@
             "title": "Vérifier le solde",
             "description": "Vous pouvez vérifier le solde et obtenir des informations sur votre chèque-cadeau en saisissant le code dans la case ci-dessous.",
             "inputLabel": "Code",
-            "inputPlaceholder": "Saisir le code",
+            "inputPlaceholder": "xxx-xxx-xxx-xxx",
             "purchasedDateLabel": "Acheté(s",
             "senderLabel": "De",
             "Errors": {
diff --git a/core/messages/it.json b/core/messages/it.json
index c1070b33fb..3f319e8458 100644
--- a/core/messages/it.json
+++ b/core/messages/it.json
@@ -304,6 +304,8 @@
         "cartCombined": "Abbiamo notato che avevi salvato degli articoli in un carrello precedente, quindi li abbiamo aggiunti al carrello attuale.",
         "cartRestored": "Hai avviato un carrello su un altro dispositivo e lo abbiamo ripristinato qui, così puoi riprendere da dove avevi lasciato.",
         "cartUpdateInProgress": "Hai un aggiornamento del carrello attivo in corso. Uscire dalla pagina? Le modifiche potrebbero andare perse.",
+        "originalPrice": "Original price was {price}.",
+        "currentPrice": "Current price is {price}.",
         "CheckoutSummary": {
             "title": "Riepilogo",
             "subTotal": "Subtotale",
@@ -555,6 +557,11 @@
                     "description": "Questi cookie ci aiutano a fornire un'esperienza utente migliore e a testare nuove funzionalità."
                 }
             }
+        },
+        "Price": {
+            "originalPrice": "Original price was {price}.",
+            "currentPrice": "Current price is {price}.",
+            "range": "Price from {minValue} to {maxValue}."
         }
     },
     "GiftCertificates": {
@@ -567,7 +574,7 @@
             "title": "Controlla il saldo",
             "description": "Puoi controllare il saldo e ottenere informazioni sul tuo buono regalo inserendo il codice nella casella sottostante.",
             "inputLabel": "Codice",
-            "inputPlaceholder": "Inserisci codice",
+            "inputPlaceholder": "xxx-xxx-xxx-xxx",
             "purchasedDateLabel": "Acquistato",
             "senderLabel": "Da",
             "Errors": {
diff --git a/core/messages/ja.json b/core/messages/ja.json
index 0642921fdc..08ae0cd1b6 100644
--- a/core/messages/ja.json
+++ b/core/messages/ja.json
@@ -304,6 +304,8 @@
         "cartCombined": "以前のカートに商品が保存されていたので、それを現在のカートに追加しました。",
         "cartRestored": "別のデバイスでカートに商品が追加されていたため、中断されたところからお買い物を再開できるよう、こちらにカートの内容を復元しました。",
         "cartUpdateInProgress": "カートの更新が進行中です。このページを離れてもよろしいですか?変更内容が失われる可能性があります。",
+        "originalPrice": "Original price was {price}.",
+        "currentPrice": "Current price is {price}.",
         "CheckoutSummary": {
             "title": "要約",
             "subTotal": "小計",
@@ -555,6 +557,11 @@
                     "description": "これらの Cookie は、より良いユーザー エクスペリエンスを提供し、新しい機能をテストするのに役立ちます。"
                 }
             }
+        },
+        "Price": {
+            "originalPrice": "Original price was {price}.",
+            "currentPrice": "Current price is {price}.",
+            "range": "Price from {minValue} to {maxValue}."
         }
     },
     "GiftCertificates": {
@@ -567,7 +574,7 @@
             "title": "残高を確認する",
             "description": "下のボックスにコードを入力すると、残高を確認したり、ギフト券に関する情報を取得したりできます。",
             "inputLabel": "コード",
-            "inputPlaceholder": "コードを入力",
+            "inputPlaceholder": "xxx-xxx-xxx-xxx",
             "purchasedDateLabel": "購入済み",
             "senderLabel": "から",
             "Errors": {
diff --git a/core/messages/nl.json b/core/messages/nl.json
index 0e6c213fd6..99a55d121b 100644
--- a/core/messages/nl.json
+++ b/core/messages/nl.json
@@ -304,6 +304,8 @@
         "cartCombined": "We hebben gezien dat je artikelen in een eerder winkelmandje had opgeslagen, dus we hebben ze voor je aan je huidige winkelmandje toegevoegd.",
         "cartRestored": "Je bent een winkelmandje begonnen op een ander apparaat en we hebben het hier hersteld, zodat je verder kunt gaan waar je was gebleven.",
         "cartUpdateInProgress": "Je winkelwagentje wordt bijgewerkt. Weet je zeker dat je deze pagina wilt verlaten? Je wijzigingen kunnen verloren gaan.",
+        "originalPrice": "Original price was {price}.",
+        "currentPrice": "Current price is {price}.",
         "CheckoutSummary": {
             "title": "Overzicht",
             "subTotal": "Subtotaal",
@@ -555,6 +557,11 @@
                     "description": "Deze cookies helpen ons een betere gebruikerservaring te bieden en nieuwe functies te testen."
                 }
             }
+        },
+        "Price": {
+            "originalPrice": "Original price was {price}.",
+            "currentPrice": "Current price is {price}.",
+            "range": "Price from {minValue} to {maxValue}."
         }
     },
     "GiftCertificates": {
@@ -567,7 +574,7 @@
             "title": "Saldo controleren",
             "description": "Je kunt het saldo controleren en de informatie over je cadeaubon opvragen door de code in het vak hieronder in te voeren.",
             "inputLabel": "Code",
-            "inputPlaceholder": "Code invoeren",
+            "inputPlaceholder": "xxx-xxx-xxx-xxx",
             "purchasedDateLabel": "Gekocht",
             "senderLabel": "Van",
             "Errors": {
diff --git a/core/messages/no.json b/core/messages/no.json
index 0049c27d45..7cc6eecc7b 100644
--- a/core/messages/no.json
+++ b/core/messages/no.json
@@ -304,6 +304,8 @@
         "cartCombined": "Vi la merke til at du hadde varer lagret i en tidligere handlekurv, så vi har lagt dem til i din nåværende handlekurv for deg.",
         "cartRestored": "Du startet en handlekurv på en annen enhet, og vi har gjenopprettet den her, slik at du kan fortsette der du slapp.",
         "cartUpdateInProgress": "Du har en handlekurvoppdatering i gang. Er du sikker på at du vil forlate denne siden? Endringene kan gå tapt.",
+        "originalPrice": "Original price was {price}.",
+        "currentPrice": "Current price is {price}.",
         "CheckoutSummary": {
             "title": "Sammendrag",
             "subTotal": "Delsum",
@@ -555,6 +557,11 @@
                     "description": "Disse informasjonskapslene hjelper oss med å gi en bedre brukeropplevelse og teste nye funksjoner."
                 }
             }
+        },
+        "Price": {
+            "originalPrice": "Original price was {price}.",
+            "currentPrice": "Current price is {price}.",
+            "range": "Price from {minValue} to {maxValue}."
         }
     },
     "GiftCertificates": {
@@ -567,7 +574,7 @@
             "title": "Sjekk saldo",
             "description": "Du kan sjekke saldoen og få informasjon om gavekortet ved å skrive inn koden i boksen nedenfor.",
             "inputLabel": "Kode",
-            "inputPlaceholder": "Skriv inn kode",
+            "inputPlaceholder": "xxx-xxx-xxx-xxx",
             "purchasedDateLabel": "Kjøpt",
             "senderLabel": "Fra",
             "Errors": {
diff --git a/core/messages/pl.json b/core/messages/pl.json
index db9d859fa4..61dbadc8a1 100644
--- a/core/messages/pl.json
+++ b/core/messages/pl.json
@@ -304,6 +304,8 @@
         "cartCombined": "Zauważyliśmy, że w poprzednim koszyku były zapisane produkty, więc dodaliśmy je do bieżącego koszyka.",
         "cartRestored": "Dodano produkty do koszyka na innym urządzeniu. Przywróciliśmy koszyk tutaj, aby umożliwić kontynuowanie zakupów.",
         "cartUpdateInProgress": "You have a cart update in progress. Are you sure you want to leave this page? Your changes may be lost.",
+        "originalPrice": "Original price was {price}.",
+        "currentPrice": "Current price is {price}.",
         "CheckoutSummary": {
             "title": "Podsumowanie",
             "subTotal": "Suma cząstkowa",
@@ -555,6 +557,11 @@
                     "description": "These cookies help us provide a better user experience and test new features."
                 }
             }
+        },
+        "Price": {
+            "originalPrice": "Original price was {price}.",
+            "currentPrice": "Current price is {price}.",
+            "range": "Price from {minValue} to {maxValue}."
         }
     },
     "GiftCertificates": {
@@ -567,7 +574,7 @@
             "title": "Check balance",
             "description": "You can check the balance and get the information about your gift certificate by typing the code in the box below.",
             "inputLabel": "Kod",
-            "inputPlaceholder": "Wprowadź kod",
+            "inputPlaceholder": "xxx-xxx-xxx-xxx",
             "purchasedDateLabel": "Zakupione",
             "senderLabel": "Ze strony",
             "Errors": {
diff --git a/core/messages/pt-BR.json b/core/messages/pt-BR.json
index ecdf963c79..dd7f7f5b99 100644
--- a/core/messages/pt-BR.json
+++ b/core/messages/pt-BR.json
@@ -304,6 +304,8 @@
         "cartCombined": "Percebemos que você tinha itens salvos em um carrinho anterior, então colocamos esses itens no carrinho atual para você.",
         "cartRestored": "Você iniciou um carrinho em outro dispositivo, e restauramos esse carrinho aqui para que você possa continuar de onde parou.",
         "cartUpdateInProgress": "You have a cart update in progress. Are you sure you want to leave this page? Your changes may be lost.",
+        "originalPrice": "Original price was {price}.",
+        "currentPrice": "Current price is {price}.",
         "CheckoutSummary": {
             "title": "Resumo",
             "subTotal": "Subtotal",
@@ -555,6 +557,11 @@
                     "description": "These cookies help us provide a better user experience and test new features."
                 }
             }
+        },
+        "Price": {
+            "originalPrice": "Original price was {price}.",
+            "currentPrice": "Current price is {price}.",
+            "range": "Price from {minValue} to {maxValue}."
         }
     },
     "GiftCertificates": {
@@ -567,7 +574,7 @@
             "title": "Check balance",
             "description": "You can check the balance and get the information about your gift certificate by typing the code in the box below.",
             "inputLabel": "Código",
-            "inputPlaceholder": "Informe o código",
+            "inputPlaceholder": "xxx-xxx-xxx-xxx",
             "purchasedDateLabel": "Comprados",
             "senderLabel": "De",
             "Errors": {
diff --git a/core/messages/pt.json b/core/messages/pt.json
index ecdf963c79..dd7f7f5b99 100644
--- a/core/messages/pt.json
+++ b/core/messages/pt.json
@@ -304,6 +304,8 @@
         "cartCombined": "Percebemos que você tinha itens salvos em um carrinho anterior, então colocamos esses itens no carrinho atual para você.",
         "cartRestored": "Você iniciou um carrinho em outro dispositivo, e restauramos esse carrinho aqui para que você possa continuar de onde parou.",
         "cartUpdateInProgress": "You have a cart update in progress. Are you sure you want to leave this page? Your changes may be lost.",
+        "originalPrice": "Original price was {price}.",
+        "currentPrice": "Current price is {price}.",
         "CheckoutSummary": {
             "title": "Resumo",
             "subTotal": "Subtotal",
@@ -555,6 +557,11 @@
                     "description": "These cookies help us provide a better user experience and test new features."
                 }
             }
+        },
+        "Price": {
+            "originalPrice": "Original price was {price}.",
+            "currentPrice": "Current price is {price}.",
+            "range": "Price from {minValue} to {maxValue}."
         }
     },
     "GiftCertificates": {
@@ -567,7 +574,7 @@
             "title": "Check balance",
             "description": "You can check the balance and get the information about your gift certificate by typing the code in the box below.",
             "inputLabel": "Código",
-            "inputPlaceholder": "Informe o código",
+            "inputPlaceholder": "xxx-xxx-xxx-xxx",
             "purchasedDateLabel": "Comprados",
             "senderLabel": "De",
             "Errors": {
diff --git a/core/messages/sv.json b/core/messages/sv.json
index 28cd5f61b5..4c7e300bba 100644
--- a/core/messages/sv.json
+++ b/core/messages/sv.json
@@ -304,6 +304,8 @@
         "cartCombined": "Vi märkte att du hade varor sparade i en tidigare kundvagn, så vi har lagt till dem i din nuvarande kundvagn åt dig.",
         "cartRestored": "Du startade en kundvagn på en annan enhet, och vi har återställt den här så att du kan fortsätta där du slutade.",
         "cartUpdateInProgress": "Du har en pågående kundvagnsuppdatering. Är du säker på att du vill lämna den här sidan? Dina ändringar kan gå förlorade.",
+        "originalPrice": "Original price was {price}.",
+        "currentPrice": "Current price is {price}.",
         "CheckoutSummary": {
             "title": "Summering",
             "subTotal": "Delsumma",
@@ -555,6 +557,11 @@
                     "description": "Dessa cookies hjälper oss att ge en bättre användarupplevelse och testa nya funktioner."
                 }
             }
+        },
+        "Price": {
+            "originalPrice": "Original price was {price}.",
+            "currentPrice": "Current price is {price}.",
+            "range": "Price from {minValue} to {maxValue}."
         }
     },
     "GiftCertificates": {
@@ -567,7 +574,7 @@
             "title": "Kontrollera saldot",
             "description": "Du kan kontrollera saldot och få information om ditt presentkort genom att skriva in koden i rutan nedan.",
             "inputLabel": "Kod",
-            "inputPlaceholder": "Ange kod",
+            "inputPlaceholder": "xxx-xxx-xxx-xxx",
             "purchasedDateLabel": "Köpt",
             "senderLabel": "Från",
             "Errors": {

From 588c53d850baa22608745337e5bf2610fdc6a5ce Mon Sep 17 00:00:00 2001
From: Ivan Shcherbak <funivan@users.noreply.github.com>
Date: Mon, 26 Jan 2026 21:15:54 +0200
Subject: [PATCH 22/69] fix: Fix successMessage translations (#2831)

---
 core/messages/da.json | 4 ++--
 core/messages/fr.json | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/messages/da.json b/core/messages/da.json
index 3c83b91536..33755c849e 100644
--- a/core/messages/da.json
+++ b/core/messages/da.json
@@ -375,7 +375,7 @@
         "otherDetails": "Andre oplysninger",
         "noOtherDetails": "Der er ingen andre oplysninger.",
         "viewOptions": "Se muligheder",
-        "successMessage": "<cartLink>{CartItems, plural, =1 {1 vare} other {# varer}} tilføjet til din indkøbskurv</cartLink>",
+        "successMessage": "{cartItems, plural, =1 {1 vare} other {# varer}} tilføjet til <cartLink>din indkøbskurv</cartLink>",
         "missingCart": "Indkøbskurven blev ikke fundet. Prøv igen senere.",
         "unknownError": "Ukendt fejl. Prøv igen senere."
     },
@@ -385,7 +385,7 @@
             "increaseQuantity": "Øg mængden",
             "decreaseQuantity": "Reducer mængden",
             "emptySelectPlaceholder": "Vælg en valgmulighed",
-            "successMessage": "<cartLink>{CartItems, plural, =1 {1 vare} other {# varer}} tilføjet til din indkøbskurv</cartLink>",
+            "successMessage": "{cartItems, plural, =1 {1 vare} other {# varer}} tilføjet til <cartLink>din indkøbskurv</cartLink>",
             "missingCart": "Indkøbskurven blev ikke fundet. Prøv igen senere.",
             "unknownError": "Ukendt fejl. Prøv igen senere.",
             "variantRequiredError": "Dette produkt kræver, at der vælges muligheder for at kunne lægges i indkøbskurven.",
diff --git a/core/messages/fr.json b/core/messages/fr.json
index f4ab442a78..cc1171ace4 100644
--- a/core/messages/fr.json
+++ b/core/messages/fr.json
@@ -375,7 +375,7 @@
         "otherDetails": "Autres informations",
         "noOtherDetails": "Aucune information supplémentaire.",
         "viewOptions": "Afficher les options",
-        "successMessage": "<cartLink>{CartItems, plural, =1 {1 article} other {# articles}} ajouté(s) à votre panier</cartLink>",
+        "successMessage": "{cartItems, plural, =1 {1 article} other {# articles}} ajouté(s) à <cartLink>votre panier</cartLink>",
         "missingCart": "Panier introuvable. Veuillez réessayer plus tard.",
         "unknownError": "Erreur inconnue. Veuillez réessayer plus tard."
     },
@@ -385,7 +385,7 @@
             "increaseQuantity": "Augmenter la quantité :",
             "decreaseQuantity": "Réduire la quantité",
             "emptySelectPlaceholder": "Sélectionner une option",
-            "successMessage": "<cartLink>{CartItems, plural, =1 {1 article} other {# articles}} ajouté(s) à votre panier</cartLink>",
+            "successMessage": "{cartItems, plural, =1 {1 article} other {# articles}} ajouté(s) à <cartLink>votre panier</cartLink>",
             "missingCart": "Panier introuvable. Veuillez réessayer plus tard !",
             "unknownError": "Erreur inconnue. Veuillez réessayer plus tard.",
             "variantRequiredError": "Ce produit nécessite de sélectionner des options pour pouvoir être ajouté au panier.",

From 0b653163e4f6aebff95b7e5a0b9fe8e4ecd7c20d Mon Sep 17 00:00:00 2001
From: Jorge Moya <jorge.moya@bigcommerce.com>
Date: Mon, 26 Jan 2026 16:01:16 -0600
Subject: [PATCH 23/69] chore: change changeset from minor to patch (#2837)

---
 .changeset/tricky-hoops-hammer.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/tricky-hoops-hammer.md b/.changeset/tricky-hoops-hammer.md
index de6829a289..254bb9fe6c 100644
--- a/.changeset/tricky-hoops-hammer.md
+++ b/.changeset/tricky-hoops-hammer.md
@@ -1,5 +1,5 @@
 ---
-"@bigcommerce/catalyst-core": minor
+"@bigcommerce/catalyst-core": patch
 ---
 
 Add default optional text to form input labels for inputs that are not required.

From 81b13e4033f7d885e266943d48480d6285cf1c28 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 26 Jan 2026 22:16:00 +0000
Subject: [PATCH 24/69] Version Packages (`canary`) (#2810)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/bright-rules-chew.md           |   84 --
 .changeset/clear-pagination-on-sort.md    |    5 -
 .changeset/cold-donuts-double.md          |    5 -
 .changeset/cruel-lizards-join.md          |  398 --------
 .changeset/cute-llamas-listen.md          |    9 -
 .changeset/fuzzy-needles-attend.md        |    5 -
 .changeset/quiet-heads-heal.md            |  135 ---
 .changeset/script-attributes-support.md   |    5 -
 .changeset/shy-owls-move.md               |  147 ---
 .changeset/silent-pianos-search.md        |  144 ---
 .changeset/sixty-toes-leave.md            |    5 -
 .changeset/soft-flies-sip.md              |   26 -
 .changeset/thirty-coins-look.md           |    5 -
 .changeset/translations-patch-48fcea94.md |    5 -
 .changeset/translations-patch-a10f114b.md |    5 -
 .changeset/tricky-hoops-hammer.md         |    9 -
 .changeset/true-shirts-shop.md            |  118 ---
 .changeset/two-years-flow.md              |    8 -
 core/CHANGELOG.md                         | 1065 +++++++++++++++++++++
 core/package.json                         |    2 +-
 20 files changed, 1066 insertions(+), 1119 deletions(-)
 delete mode 100644 .changeset/bright-rules-chew.md
 delete mode 100644 .changeset/clear-pagination-on-sort.md
 delete mode 100644 .changeset/cold-donuts-double.md
 delete mode 100644 .changeset/cruel-lizards-join.md
 delete mode 100644 .changeset/cute-llamas-listen.md
 delete mode 100644 .changeset/fuzzy-needles-attend.md
 delete mode 100644 .changeset/quiet-heads-heal.md
 delete mode 100644 .changeset/script-attributes-support.md
 delete mode 100644 .changeset/shy-owls-move.md
 delete mode 100644 .changeset/silent-pianos-search.md
 delete mode 100644 .changeset/sixty-toes-leave.md
 delete mode 100644 .changeset/soft-flies-sip.md
 delete mode 100644 .changeset/thirty-coins-look.md
 delete mode 100644 .changeset/translations-patch-48fcea94.md
 delete mode 100644 .changeset/translations-patch-a10f114b.md
 delete mode 100644 .changeset/tricky-hoops-hammer.md
 delete mode 100644 .changeset/true-shirts-shop.md
 delete mode 100644 .changeset/two-years-flow.md

diff --git a/.changeset/bright-rules-chew.md b/.changeset/bright-rules-chew.md
deleted file mode 100644
index 620ca913c6..0000000000
--- a/.changeset/bright-rules-chew.md
+++ /dev/null
@@ -1,84 +0,0 @@
----
-"@bigcommerce/catalyst-core": patch
----
-
-Filter out child cart items (items with `parentEntityId`) from cart and cart analytics to prevent duplicate line items when products have parent-child relationships, such as product bundles.
-
-## Migration steps
-
-### Step 1: GraphQL Fragment Updates
-
-The `parentEntityId` field has been added to both physical and digital cart item fragments to identify child items.
-
-Update `core/app/[locale]/(default)/cart/page-data.ts`:
-
-```diff
-  export const PhysicalItemFragment = graphql(`
-    fragment PhysicalItemFragment on CartPhysicalItem {
-      entityId
-      quantity
-      productEntityId
-      variantEntityId
-+     parentEntityId
-      listPrice {
-        currencyCode
-        value
-      }
-    }
-  `);
-
-  export const DigitalItemFragment = graphql(`
-    fragment DigitalItemFragment on CartDigitalItem {
-      entityId
-      quantity
-      productEntityId
-      variantEntityId
-+     parentEntityId
-      listPrice {
-        currencyCode
-        value
-      }
-    }
-  `);
-```
-
-### Step 2: Cart Display Filtering
-
-Cart line items are now filtered to exclude child items when displaying the cart.
-
-Update `core/app/[locale]/(default)/cart/page.tsx`:
-
-```diff
-  const lineItems = [
-    ...cart.lineItems.giftCertificates,
-    ...cart.lineItems.physicalItems,
-    ...cart.lineItems.digitalItems,
-- ];
-+ ].filter((item) => !('parentEntityId' in item) || !item.parentEntityId);
-```
-
-### Step 3: Analytics Data Filtering
-
-Analytics data collection now only includes top-level items to prevent duplicate tracking.
-
-Update `core/app/[locale]/(default)/cart/page.tsx` in the `getAnalyticsData` function:
-
-```diff
-- const lineItems = [...cart.lineItems.physicalItems, ...cart.lineItems.digitalItems];
-+ const lineItems = [...cart.lineItems.physicalItems, ...cart.lineItems.digitalItems].filter(
-+   (item) => !item.parentEntityId, // Only include top-level items
-+ );
-```
-
-### Step 4: Styling Update
-
-Cart subtitle text color has been updated for improved contrast.
-
-Update `core/vibes/soul/sections/cart/client.tsx`:
-
-```diff
--                  <span className="text-[var(--cart-subtext-text,hsl(var(--contrast-300)))] contrast-more:text-[var(--cart-subtitle-text,hsl(var(--contrast-500)))]">
-+                  <span className="text-[var(--cart-subtext-text,hsl(var(--contrast-400)))] contrast-more:text-[var(--cart-subtitle-text,hsl(var(--contrast-500)))]">
-                     {lineItem.subtitle}
-                   </span>
-```
\ No newline at end of file
diff --git a/.changeset/clear-pagination-on-sort.md b/.changeset/clear-pagination-on-sort.md
deleted file mode 100644
index db507d2143..0000000000
--- a/.changeset/clear-pagination-on-sort.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@bigcommerce/catalyst-core": patch
----
-
-Fix pagination cursor persistence when changing sort order. The `before` and `after` query parameters are now cleared when the sort option changes, preventing stale pagination cursors from causing incorrect results or empty pages.
diff --git a/.changeset/cold-donuts-double.md b/.changeset/cold-donuts-double.md
deleted file mode 100644
index df347e32eb..0000000000
--- a/.changeset/cold-donuts-double.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@bigcommerce/catalyst-core": patch
----
-
-Add placeholders for gift certificate inputs and remove redundant placeholders in the gift certificate purchase form.
diff --git a/.changeset/cruel-lizards-join.md b/.changeset/cruel-lizards-join.md
deleted file mode 100644
index b6403f2357..0000000000
--- a/.changeset/cruel-lizards-join.md
+++ /dev/null
@@ -1,398 +0,0 @@
----
-"@bigcommerce/catalyst-core": patch
----
-
-Disable product filters that are no longer available based on the selection.
-
-## Migration steps
-
-### Step 1
-
-Update the `facetsTransformer` function in `core/data-transformers/facets-transformer.ts` to handle disabled filters:
-
-```diff
-  return allFacets.map((facet) => {
-    const refinedFacet = refinedFacets.find((f) => f.displayName === facet.displayName);
-
-+    if (refinedFacet == null) {
-+      return null;
-+    }
-+
-    if (facet.__typename === 'CategorySearchFilter') {
-      const refinedCategorySearchFilter =
--        refinedFacet?.__typename === 'CategorySearchFilter' ? refinedFacet : null;
-+        refinedFacet.__typename === 'CategorySearchFilter' ? refinedFacet : null;
-
-      return {
-        type: 'toggle-group' as const,
-        paramName: 'categoryIn',
-        label: facet.displayName,
-        defaultCollapsed: facet.isCollapsedByDefault,
-        options: facet.categories.map((category) => {
-          const refinedCategory = refinedCategorySearchFilter?.categories.find(
-            (c) => c.entityId === category.entityId,
-          );
-          const isSelected = filters.categoryEntityIds?.includes(category.entityId) === true;
-+          const disabled = refinedCategory == null && !isSelected;
-+          const productCountLabel = disabled ? '' : ` (${category.productCount})`;
-+          const label = facet.displayProductCount
-+            ? `${category.name}${productCountLabel}`
-+            : category.name;
-
-          return {
--            label: facet.displayProductCount
--              ? `${category.name} (${category.productCount})`
--              : category.name,
-+            label,
-            value: category.entityId.toString(),
--            disabled: refinedCategory == null && !isSelected,
-+            disabled,
-          };
-        }),
-      };
-    }
-
-    if (facet.__typename === 'BrandSearchFilter') {
-      const refinedBrandSearchFilter =
--        refinedFacet?.__typename === 'BrandSearchFilter' ? refinedFacet : null;
-+        refinedFacet.__typename === 'BrandSearchFilter' ? refinedFacet : null;
-
-      return {
-        type: 'toggle-group' as const,
-        paramName: 'brand',
-        label: facet.displayName,
-        defaultCollapsed: facet.isCollapsedByDefault,
-        options: facet.brands.map((brand) => {
-          const refinedBrand = refinedBrandSearchFilter?.brands.find(
-            (b) => b.entityId === brand.entityId,
-          );
-          const isSelected = filters.brandEntityIds?.includes(brand.entityId) === true;
-+          const disabled = refinedBrand == null && !isSelected;
-+          const productCountLabel = disabled ? '' : ` (${brand.productCount})`;
-+          const label = facet.displayProductCount
-+            ? `${brand.name}${productCountLabel}`
-+            : brand.name;
-
-          return {
--            label: facet.displayProductCount ? `${brand.name} (${brand.productCount})` : brand.name,
-+            label,
-            value: brand.entityId.toString(),
--            disabled: refinedBrand == null && !isSelected,
-+            disabled,
-          };
-        }),
-      };
-    }
-
-    if (facet.__typename === 'ProductAttributeSearchFilter') {
-      const refinedProductAttributeSearchFilter =
--        refinedFacet?.__typename === 'ProductAttributeSearchFilter' ? refinedFacet : null;
-+        refinedFacet.__typename === 'ProductAttributeSearchFilter' ? refinedFacet : null;
-
-      return {
-        type: 'toggle-group' as const,
-        paramName: `attr_${facet.filterKey}`,
-        label: facet.displayName,
-        defaultCollapsed: facet.isCollapsedByDefault,
-        options: facet.attributes.map((attribute) => {
-          const refinedAttribute = refinedProductAttributeSearchFilter?.attributes.find(
-            (a) => a.value === attribute.value,
-          );
-
-          const isSelected =
-            filters.productAttributes?.some((attr) => attr.values.includes(attribute.value)) ===
-            true;
-
-+          const disabled = refinedAttribute == null && !isSelected;
-+          const productCountLabel = disabled ? '' : ` (${attribute.productCount})`;
-+          const label = facet.displayProductCount
-+            ? `${attribute.value}${productCountLabel}`
-+            : attribute.value;
-+
-          return {
--            label: facet.displayProductCount
--              ? `${attribute.value} (${attribute.productCount})`
--              : attribute.value,
-+            label,
-            value: attribute.value,
--            disabled: refinedAttribute == null && !isSelected,
-+            disabled,
-          };
-        }),
-      };
-    }
-
-    if (facet.__typename === 'RatingSearchFilter') {
-      const refinedRatingSearchFilter =
--        refinedFacet?.__typename === 'RatingSearchFilter' ? refinedFacet : null;
-+        refinedFacet.__typename === 'RatingSearchFilter' ? refinedFacet : null;
-      const isSelected = filters.rating?.minRating != null;
-
-      return {
-        type: 'rating' as const,
-        paramName: 'minRating',
-        label: facet.displayName,
-        disabled: refinedRatingSearchFilter == null && !isSelected,
-        defaultCollapsed: facet.isCollapsedByDefault,
-      };
-    }
-
-    if (facet.__typename === 'PriceSearchFilter') {
-      const refinedPriceSearchFilter =
--        refinedFacet?.__typename === 'PriceSearchFilter' ? refinedFacet : null;
-+        refinedFacet.__typename === 'PriceSearchFilter' ? refinedFacet : null;
-      const isSelected = filters.price?.minPrice != null || filters.price?.maxPrice != null;
-
-      return {
-        type: 'range' as const,
-        minParamName: 'minPrice',
-        maxParamName: 'maxPrice',
-        label: facet.displayName,
-        min: facet.selected?.minPrice ?? undefined,
-        max: facet.selected?.maxPrice ?? undefined,
-        disabled: refinedPriceSearchFilter == null && !isSelected,
-        defaultCollapsed: facet.isCollapsedByDefault,
-      };
-    }
-
-    if (facet.freeShipping) {
-      const refinedFreeShippingSearchFilter =
--        refinedFacet?.__typename === 'OtherSearchFilter' && refinedFacet.freeShipping
-+        refinedFacet.__typename === 'OtherSearchFilter' && refinedFacet.freeShipping
-          ? refinedFacet
-          : null;
-      const isSelected = filters.isFreeShipping === true;
-
-      return {
-        type: 'toggle-group' as const,
-        paramName: `shipping`,
-        label: t('freeShippingLabel'),
-        defaultCollapsed: facet.isCollapsedByDefault,
-        options: [
-          {
-            label: t('freeShippingLabel'),
-            value: 'free_shipping',
-            disabled: refinedFreeShippingSearchFilter == null && !isSelected,
-          },
-        ],
-      };
-    }
-
-    if (facet.isFeatured) {
-      const refinedIsFeaturedSearchFilter =
--        refinedFacet?.__typename === 'OtherSearchFilter' && refinedFacet.isFeatured
-+        refinedFacet.__typename === 'OtherSearchFilter' && refinedFacet.isFeatured
-          ? refinedFacet
-          : null;
-      const isSelected = filters.isFeatured === true;
-
-      return {
-        type: 'toggle-group' as const,
-        paramName: `isFeatured`,
-        label: t('isFeaturedLabel'),
-        defaultCollapsed: facet.isCollapsedByDefault,
-        options: [
-          {
-            label: t('isFeaturedLabel'),
-            value: 'on',
-            disabled: refinedIsFeaturedSearchFilter == null && !isSelected,
-          },
-        ],
-      };
-    }
-
-    if (facet.isInStock) {
-      const refinedIsInStockSearchFilter =
--        refinedFacet?.__typename === 'OtherSearchFilter' && refinedFacet.isInStock
-+        refinedFacet.__typename === 'OtherSearchFilter' && refinedFacet.isInStock
-          ? refinedFacet
-          : null;
-      const isSelected = filters.hideOutOfStock === true;
-
-      return {
-        type: 'toggle-group' as const,
-        paramName: `stock`,
-        label: t('inStockLabel'),
-        defaultCollapsed: facet.isCollapsedByDefault,
-        options: [
-          {
-            label: t('inStockLabel'),
-            value: 'in_stock',
-            disabled: refinedIsInStockSearchFilter == null && !isSelected,
-          },
-        ],
-      };
-    }
-
-    return null;
-  });
-```
-
-### Step 2
-
-Fix the disabled state CSS classes in `core/vibes/soul/form/toggle-group/index.tsx`:
-
-```diff
-          <ToggleGroupPrimitive.Item
-            aria-label={option.label}
-            className={clsx(
--              'data-disabled:pointer-events-none data-disabled:opacity-50 h-12 whitespace-nowrap rounded-full border px-4 font-body text-sm font-normal leading-normal transition-colors focus-visible:outline-0 focus-visible:ring-2',
-+              'h-12 whitespace-nowrap rounded-full border px-4 font-body text-sm font-normal leading-normal transition-colors focus-visible:outline-0 focus-visible:ring-2 data-[disabled]:pointer-events-none data-[disabled]:opacity-50',
-              {
-                light:
-                  'border-[var(--toggle-group-light-border,hsl(var(--contrast-100)))] ring-[var(--toggle-group-light-focus,hsl(var(--primary)))] data-[state=on]:border-[var(--toggle-group-light-on-border,hsl(var(--foreground)))] data-[state=off]:bg-[var(--toggle-group-light-off-background,hsl(var(--background)))] data-[state=on]:bg-[var(--toggle-group-light-on-background,hsl(var(--foreground)))] data-[state=off]:text-[var(--toggle-group-light-off-text,hsl(var(--foreground)))] data-[state=on]:text-[var(--toggle-group-light-on-text,hsl(var(--background)))] data-[state=off]:hover:border-[var(--toggle-group-light-off-border-hover,hsl(var(--contrast-200)))] data-[state=off]:hover:bg-[var(--toggle-group-light-off-background-hover,hsl(var(--contrast-100)))]',
-```
-
-### Step 3
-
-Update the FiltersPanel component in `core/vibes/soul/sections/products-list-section/filters-panel.tsx`
-
-```diff
-import { clsx } from 'clsx';
-import { parseAsString, useQueryStates } from 'nuqs';
--import { Suspense, useOptimistic, useState, useTransition } from 'react';
-+import { useOptimistic, useState, useTransition } from 'react';
-
-import { Checkbox } from '@/vibes/soul/form/checkbox';
-import { RangeInput } from '@/vibes/soul/form/range-input';
-import { ToggleGroup } from '@/vibes/soul/form/toggle-group';
--import { Streamable, useStreamable } from '@/vibes/soul/lib/streamable';
-+import { Stream, Streamable, useStreamable } from '@/vibes/soul/lib/streamable';
-import { Accordion, AccordionItem } from '@/vibes/soul/primitives/accordion';
-import { Button } from '@/vibes/soul/primitives/button';
-import { CursorPaginationInfo } from '@/vibes/soul/primitives/cursor-pagination';
-import { Rating } from '@/vibes/soul/primitives/rating';
-import { Link } from '~/components/link';
-
-import { getFilterParsers } from './filter-parsers';
-```
-
-```diff
-  rangeFilterApplyLabel?: Streamable<string>;
-}
-
-+type InnerProps = Props & { filters: Filter[] };
-+
-function getParamCountLabel(params: Record<string, string | null | string[]>, key: string) {
-  const value = params[key];
-
-  if (Array.isArray(value) && value.length > 0) return `(${value.length})`;
-
-  return '';
-}
-
-export function FiltersPanel({
-  className,
--  filters,
-+  filters: streamableFilters,
-  resetFiltersLabel,
-  rangeFilterApplyLabel,
-}: Props) {
-  return (
--    <Suspense fallback={<FiltersSkeleton />}>
--      <FiltersPanelInner
--        className={className}
--        filters={filters}
--        rangeFilterApplyLabel={rangeFilterApplyLabel}
--        resetFiltersLabel={resetFiltersLabel}
--      />
--    </Suspense>
-+    <Stream fallback={<FiltersSkeleton />} value={streamableFilters}>
-+      {(filters) => (
-+        <FiltersPanelInner
-+          className={className}
-+          filters={filters}
-+          rangeFilterApplyLabel={rangeFilterApplyLabel}
-+          resetFiltersLabel={resetFiltersLabel}
-+        />
-+      )}
-+    </Stream>
-  );
-}
-
-export function FiltersPanelInner({
-  className,
--  filters: streamableFilters,
-+  filters,
-  resetFiltersLabel: streamableResetFiltersLabel,
-  rangeFilterApplyLabel: streamableRangeFilterApplyLabel,
-  paginationInfo: streamablePaginationInfo,
--}: Props) {
--  const filters = useStreamable(streamableFilters);
-+}: InnerProps) {
-  const resetFiltersLabel = useStreamable(streamableResetFiltersLabel) ?? 'Reset filters';
-  const rangeFilterApplyLabel = useStreamable(streamableRangeFilterApplyLabel);
-  const paginationInfo = useStreamable(streamablePaginationInfo);
-  const startCursorParamName = paginationInfo?.startCursorParamName ?? 'before';
-  const endCursorParamName = paginationInfo?.endCursorParamName ?? 'after';
-  const [params, setParams] = useQueryStates(
-    {
-      ...getFilterParsers(filters),
-      [startCursorParamName]: parseAsString,
-      [endCursorParamName]: parseAsString,
-    },
-    {
-      shallow: false,
-      history: 'push',
-    },
-  );
-  const [isPending, startTransition] = useTransition();
-  const [optimisticParams, setOptimisticParams] = useOptimistic(params);
--  const [accordionItems, setAccordionItems] = useState(() =>
-+  const [expandedItems, setExpandedItems] = useState(() => {
-+    const initial = new Set<string>();
-+
-    filters
-      .filter((filter) => filter.type !== 'link-group')
--      .map((filter, index) => ({
--        key: index.toString(),
--        value: index.toString(),
-+      .slice(0, 3)
-+      .forEach((filter) => {
-+        initial.add(filter.label.toLowerCase());
-+      });
-+
-+    return initial;
-+  });
-+
-+  const accordionItems = filters
-+    .filter((filter) => filter.type !== 'link-group')
-+    .map((filter) => {
-+      return {
-+        key: filter.label.toLowerCase(),
-+        value: filter.label.toLowerCase(),
-        filter,
--        expanded: index < 3,
--      })),
--  );
-+        expanded: expandedItems.has(filter.label.toLowerCase()),
-+      };
-+    });
-
-  if (filters.length === 0) return null;
-
-  const linkGroupFilters = filters.filter(
-    (filter): filter is LinkGroupFilter => filter.type === 'link-group',
-  );
-```
-
-```diff
-      ))}
-      <Accordion
--        onValueChange={(items) =>
--          setAccordionItems((prevItems) =>
--            prevItems.map((prevItem) => ({
--              ...prevItem,
--              expanded: items.includes(prevItem.value),
--            })),
--          )
--        }
-+        onValueChange={(items) => {
-+          setExpandedItems(new Set(items));
-+        }}
-        type="multiple"
-        value={accordionItems.filter((item) => item.expanded).map((item) => item.value)}
-      >
-```
-
-
diff --git a/.changeset/cute-llamas-listen.md b/.changeset/cute-llamas-listen.md
deleted file mode 100644
index 6fc0bf75f1..0000000000
--- a/.changeset/cute-llamas-listen.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-"@bigcommerce/catalyst-core": patch
----
-
-Run E2E tests on PRs, add 'required' prop to cart shipping calculator
-
-## Migration
-
-Add `required` prop to the Country selector and Country input fields in `core/vibes/soul/sections/cart/shipping-form/index.tsx` on lines 280 and 289.
diff --git a/.changeset/fuzzy-needles-attend.md b/.changeset/fuzzy-needles-attend.md
deleted file mode 100644
index 0fde34205b..0000000000
--- a/.changeset/fuzzy-needles-attend.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@bigcommerce/catalyst-core": patch
----
-
-Delete duplicate Select component.
diff --git a/.changeset/quiet-heads-heal.md b/.changeset/quiet-heads-heal.md
deleted file mode 100644
index 503db08a92..0000000000
--- a/.changeset/quiet-heads-heal.md
+++ /dev/null
@@ -1,135 +0,0 @@
----
-"@bigcommerce/catalyst-core": patch
----
-
-Refactor DynamicForm actions to decouple fields and passwordComplexity from state, passing them as separate arguments instead. This reduces state payload size by removing fields from state objects and stripping options from fields before passing them to actions (options are only needed for rendering, not processing). All form actions now accept a `DynamicFormActionArgs` object as the first parameter containing fields and optional passwordComplexity, followed by the previous state and formData.
-
-## Migration steps
-
-### Step 1: Changes to DynamicForm component
-
-The `DynamicForm` component and related utilities have been updated to support the new action signature pattern:
-
-**`core/vibes/soul/form/dynamic-form/index.tsx`**:
-- Added `DynamicFormActionArgs<F>` interface that contains `fields` and optional `passwordComplexity`
-- Updated `DynamicFormAction<F>` type to accept `DynamicFormActionArgs<F>` as the first parameter
-- Removed `fields` and `passwordComplexity` from the `State` interface
-- Added automatic removal of `options` from fields before passing to actions (options are only needed for rendering)
-- Updated action binding to use `action.bind(null, { fields: fieldsWithoutOptions, passwordComplexity })`
-
-**`core/vibes/soul/form/dynamic-form/utils.ts`** (new file):
-- Added `removeOptionsFromFields()` utility function that strips the `options` property from field definitions before passing them to actions, reducing the state payload size
-
-```diff
-+ export interface DynamicFormActionArgs<F extends Field> {
-+   fields: Array<F | FieldGroup<F>>;
-+   passwordComplexity?: PasswordComplexitySettings | null;
-+ }
-+
-+ type Action<F extends Field, S, P> = (
-+   args: DynamicFormActionArgs<F>,
-+   state: Awaited<S>,
-+   payload: P,
-+ ) => S | Promise<S>;
-+
-  interface State {
-    lastResult: SubmissionResult | null;
--   fields: Array<F | FieldGroup<F>>;
--   passwordComplexity?: PasswordComplexitySettings | null;
-  }
-```
-
-### Step 2: Update DynamicForm action signatures
-
-All form actions that use `DynamicForm` must be updated to accept `DynamicFormActionArgs<F>` as the first parameter instead of including fields in the state.
-
-Update your form action function signature:
-
-```diff
-+ import { DynamicFormActionArgs } from '@/vibes/soul/form/dynamic-form';
-  import { Field, FieldGroup, schema } from '@/vibes/soul/form/dynamic-form/schema';
-
-- export async function myFormAction<F extends Field>(
--   prevState: {
--     lastResult: SubmissionResult | null;
--     fields: Array<F | FieldGroup<F>>;
--     passwordComplexity?: PasswordComplexitySettings | null;
--   },
--   formData: FormData,
-- ) {
-+ export async function myFormAction<F extends Field>(
-+   { fields, passwordComplexity }: DynamicFormActionArgs<F>,
-+   _prevState: {
-+     lastResult: SubmissionResult | null;
-+   },
-+   formData: FormData,
-+ ) {
-```
-
-### Step 2: Remove fields and passwordComplexity from state interfaces
-
-Update state interfaces to remove fields and passwordComplexity properties:
-
-```diff
-  interface State {
-    lastResult: SubmissionResult | null;
--   fields: Array<Field | FieldGroup<Field>>;
--   passwordComplexity?: PasswordComplexitySettings | null;
-  }
-```
-
-### Step 3: Update action implementations
-
-Remove references to `prevState.fields` and `prevState.passwordComplexity` in action implementations:
-
-```diff
-  const submission = parseWithZod(formData, {
--   schema: schema(prevState.fields, prevState.passwordComplexity),
-+   schema: schema(fields, passwordComplexity),
-  });
-
-  if (submission.status !== 'success') {
-    return {
-      lastResult: submission.reply(),
--     fields: prevState.fields,
--     passwordComplexity: prevState.passwordComplexity,
-    };
-  }
-```
-
-### Step 4: Update action calls in components
-
-For actions used with `AddressListSection`, update the action signature to accept fields as the first parameter:
-
-```diff
-- export async function addressAction(
--   prevState: Awaited<State>,
--   formData: FormData,
-- ): Promise<State> {
-+ export async function addressAction(
-+   fields: Array<Field | FieldGroup<Field>>,
-+   prevState: Awaited<State>,
-+   formData: FormData,
-+ ): Promise<State> {
-```
-
-### Step 5: Update DynamicForm usage
-
-No changes needed to `DynamicForm` component usage. The component automatically handles binding fields and passwordComplexity to actions. The `DynamicForm` component now:
-- Automatically removes options from fields before passing them to actions (reducing payload size)
-- Binds fields and passwordComplexity to the action using `action.bind()`
-- Maintains the same props interface, so existing usage continues to work
-
-### Affected files
-
-The following files were updated in this refactor:
-- `core/vibes/soul/form/dynamic-form/index.tsx` - Added `DynamicFormActionArgs` type and updated action binding
-- `core/vibes/soul/form/dynamic-form/utils.ts` - Added `removeOptionsFromFields` utility function
-- `core/app/[locale]/(default)/(auth)/register/_actions/register-customer.ts`
-- `core/app/[locale]/(default)/account/addresses/_actions/address-action.ts`
-- `core/app/[locale]/(default)/account/addresses/_actions/create-address.ts`
-- `core/app/[locale]/(default)/account/addresses/_actions/update-address.ts`
-- `core/app/[locale]/(default)/account/addresses/_actions/delete-address.ts`
-- `core/app/[locale]/(default)/gift-certificates/purchase/_actions/add-to-cart.tsx`
-- `core/app/[locale]/(default)/webpages/[id]/contact/_actions/submit-contact-form.ts`
-- `core/vibes/soul/sections/address-list-section/index.tsx`
diff --git a/.changeset/script-attributes-support.md b/.changeset/script-attributes-support.md
deleted file mode 100644
index ce924e8ff9..0000000000
--- a/.changeset/script-attributes-support.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@bigcommerce/catalyst-core": patch
----
-
-Add support for additional HTML attributes on script tags. The scripts transformer now extracts and passes through attributes like `async`, `defer`, `crossorigin`, and `data-*` attributes from BigCommerce script tags to the C15T consent manager, ensuring scripts load with their intended behavior.
diff --git a/.changeset/shy-owls-move.md b/.changeset/shy-owls-move.md
deleted file mode 100644
index 1bc546a7b9..0000000000
--- a/.changeset/shy-owls-move.md
+++ /dev/null
@@ -1,147 +0,0 @@
----
-"@bigcommerce/catalyst-core": patch
----
-
-Persist the checkbox product modifier since it can modify pricing and other product data. By persisting this and tracking in the url, this will trigger a product refetch when added or removed. Incidentally, now we manually control what fields are persisted, since `option.isVariantOption` doesn't apply to `checkbox`, additionally multi options modifiers that are not variant options can also modify price and other product data.
-
-## Migration
-
-### Step 1
-
-Update `product-options-transformer.ts` to manually track persisted fields:
-
-```ts
-case 'DropdownList': {
-    return {
-        // before
-        // persist: option.isVariantOption,
-        // after (manually persist)
-        persist: true,
-        type: 'select',
-        label: option.displayName,
-        required: option.isRequired,
-        name: option.entityId.toString(),
-        defaultValue: values.find((value) => value.isDefault)?.entityId.toString(),
-        options: values.map((value) => ({
-        label: value.label,
-        value: value.entityId.toString(),
-        })),
-    };
-}
-```
-
-Fields that persist and can affect product pricing when selected:
-- Swatch
-- RectangleBoxes
-- RadioButtons
-- ProductPickList
-- ProductPickListWithImages
-- CheckboxOption
-
-### Step 2
-
-Remove `isVariantOption` from GQL query since we no longer use it:
-
-```ts
-export const ProductOptionsFragment = graphql(
-  `
-    fragment ProductOptionsFragment on Product {
-      entityId
-      productOptions(first: 50) {
-        edges {
-          node {
-            __typename
-            entityId
-            displayName
-            isRequired
-            isVariantOption // remove this
-            ...MultipleChoiceFieldFragment
-            ...CheckboxFieldFragment
-            ...NumberFieldFragment
-            ...TextFieldFragment
-            ...MultiLineTextFieldFragment
-            ...DateFieldFragment
-          }
-        }
-      }
-    }
-  `,
-  [
-    MultipleChoiceFieldFragment,
-    CheckboxFieldFragment,
-    NumberFieldFragment,
-    TextFieldFragment,
-    MultiLineTextFieldFragment,
-    DateFieldFragment,
-  ],
-);
-```
-
-### Step 3
-Update `product-detail-form.tsx` to include separate handing of the checkbox field:
-
-```ts
-const defaultValue = fields.reduce<{
-  [Key in keyof SchemaRawShape]?: z.infer<SchemaRawShape[Key]>;
-}>(
-  (acc, field) => {
-    // Checkbox field has to be handled separately because we want to convert checked or unchecked value to true or undefined respectively.
-    // This is because the form expects a boolean value, but we want to store the checked or unchecked value in the query params.
-    if (field.type === 'checkbox') {
-      if (params[field.name] === field.checkedValue) {
-        return {
-          ...acc,
-          [field.name]: 'true',
-        };
-      }
-
-      if (params[field.name] === field.uncheckedValue) {
-        return {
-          ...acc,
-          [field.name]: undefined,
-        };
-      }
-
-      return {
-        ...acc,
-        [field.name]: field.defaultValue, // Default value is either 'true' or undefined
-      };
-    }
-
-    return {
-      ...acc,
-      [field.name]: params[field.name] ?? field.defaultValue,
-    };
-  },
-  { quantity: minQuantity ?? 1 },
-);
-
-...
-
-const handleChange = useCallback(
-  (value: string) => {
-    // Checkbox field has to be handled separately because we want to convert 'true' or '' to the checked or unchecked value respectively.
-    if (field.type === 'checkbox') {
-      void setParams({ [field.name]: value ? field.checkedValue : field.uncheckedValue });
-    } else {
-      void setParams({ [field.name]: value || null }); // Passing `null` to remove the value from the query params if fieldValue is falsey
-    }
-
-    controls.change(value || ''); // If fieldValue is falsey, we set it to an empty string
-  },
-  [setParams, field, controls],
-);
-```
-
-### Step 4
-
-Update schema in `core/vibes/soul/sections/product-detail/schema.ts`:
-
-```ts
-type CheckboxField = {
-  type: 'checkbox';
-  defaultValue?: string;
-  checkedValue: string; // add
-  uncheckedValue: string; // add
-} & FormField;
-```
diff --git a/.changeset/silent-pianos-search.md b/.changeset/silent-pianos-search.md
deleted file mode 100644
index a36ace28eb..0000000000
--- a/.changeset/silent-pianos-search.md
+++ /dev/null
@@ -1,144 +0,0 @@
----
-"@bigcommerce/catalyst-core": patch
----
-
-Fix WishlistDetails page from exceeding GraphQL complexity limit, and fix wishlist e2e tests.
-
-Additionally, add the `required` prop to `core/components/wishlist/modals/new.tsx` and `core/components/wishlist/modals/rename.tsx`
-
-## Migration
-
-### Step 1: Update wishlist GraphQL fragments
-
-In `core/components/wishlist/fragment.ts`, replace the `WishlistItemProductFragment` to use explicit fields instead of `ProductCardFragment`:
-
-```typescript
-export const WishlistItemProductFragment = graphql(
-  `
-    fragment WishlistItemProductFragment on Product {
-      entityId
-      name
-      defaultImage {
-        altText
-        url: urlTemplate(lossy: true)
-      }
-      path
-      brand {
-        name
-        path
-      }
-      reviewSummary {
-        numberOfReviews
-        averageRating
-      }
-      sku
-      showCartAction
-      inventory {
-        isInStock
-      }
-      availabilityV2 {
-        status
-      }
-      ...PricingFragment
-    }
-  `,
-  [PricingFragment],
-);
-```
-
-Remove `ProductCardFragment` from all fragment dependencies in the same file.
-
-### Step 2: Update product card transformer
-
-In `core/data-transformers/product-card-transformer.ts`:
-
-1. Import the `WishlistItemProductFragment`:
-   ```typescript
-   import { WishlistItemProductFragment } from '~/components/wishlist/fragment';
-   ```
-
-2. Update the `singleProductCardTransformer` function signature to accept both fragment types:
-   ```typescript
-   product: ResultOf<typeof ProductCardFragment | typeof WishlistItemProductFragment>
-   ```
-
-3. Add a conditional check for the `inventoryMessage` field:
-   ```typescript
-   inventoryMessage:
-     'variants' in product
-       ? getInventoryMessage(product, outOfStockMessage, showBackorderMessage)
-       : undefined,
-   ```
-
-4. Update the `productCardTransformer` function signature similarly:
-   ```typescript
-   products: Array<ResultOf<typeof ProductCardFragment | typeof WishlistItemProductFragment>>
-   ```
-
-### Step 3: Fix wishlist e2e tests
-
-In `core/tests/ui/e2e/account/wishlists.spec.ts`, update label selectors to use `{ exact: true }` for specificity:
-
-Update all locators for the wishlist name input selectors:
-  ```diff
-  - page.getByLabel(t('Form.nameLabel'))
-  + page.getByLabel(t('Form.nameLabel'), { exact: true })
-  ```
-
-### Step 4: Fix mobile wishlist e2e tests
-
-In `core/tests/ui/e2e/account/wishlists.mobile.spec.ts`, update translation calls to use namespace prefixes:
-
-1. Update the translation initialization:
-  ```diff
-  - const t = await getTranslations('Account.Wishlist');
-  + const t = await getTranslations();
-  ```
-
-2. Update all translation keys to include the namespace:
-  ```diff
-  - await locator.getByRole('button', { name: t('actionsTitle') }).click();
-  - await page.getByRole('menuitem', { name: t('share') }).click();
-  + await locator.getByRole('button', { name: t('Wishlist.actionsTitle') }).click();
-  + await page.getByRole('menuitem', { name: t('Wishlist.share') }).click();
-  ```
-
-  ```diff
-  - await expect(page.getByText(t('shareSuccess'))).toBeVisible();
-  + await expect(page.getByText(t('Wishlist.shareSuccess'))).toBeVisible();
-  ```
-
-### Step 5: Add `required` prop to wishlist modals
-
-Update the modal forms to include the `required` prop on the name input field:
-
-In `core/components/wishlist/modals/new.tsx`:
-```diff
-      <Input
-        {...getInputProps(fields.wishlistName, { type: 'text' })}
-        defaultValue={defaultValue.current}
-        errors={fields.wishlistName.errors}
-        key={fields.wishlistName.id}
-        label={nameLabel}
-        onChange={(e) => {
-          defaultValue.current = e.target.value;
-        }}
-+       required
-      />
-```
-
-In `core/components/wishlist/modals/rename.tsx`:
-```diff
-      <Input
-        {...getInputProps(fields.wishlistName, { type: 'text' })}
-        defaultValue={defaultValue.current}
-        errors={fields.wishlistName.errors}
-        key={fields.wishlistName.id}
-        label={nameLabel}
-        onChange={(e) => {
-          defaultValue.current = e.target.value;
-        }}
-+       required
-      />
-```
-
diff --git a/.changeset/sixty-toes-leave.md b/.changeset/sixty-toes-leave.md
deleted file mode 100644
index 56100107d8..0000000000
--- a/.changeset/sixty-toes-leave.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@bigcommerce/catalyst-core": patch
----
-
-Shoppers will now see the store's actual password complexity requirements in the tooltip on the new customer registration form, preventing confusion and failed registration attempts. The schema() function in core/vibes/soul/form/dynamic-form/schema.ts now accepts an optional second parameter passwordComplexity to enable dynamic password validation. The DynamicForm, DynamicFormSection components and their associated server actions also accept an optional passwordComplexity prop that flows through to the schema. Action Required: If you have custom registration or password forms and want to use store-specific password complexity settings, fetch passwordComplexitySettings from the GraphQL API (under site.settings.customers.passwordComplexitySettings) and pass it to your DynamicFormSection component and maintain it in your server action's state. If you don't pass it, password validation defaults to: minimum 8 characters, at least one number, and at least one special character. Conflict Resolution: If merging into custom forms, ensure the passwordComplexity prop is threaded through: Page → DynamicFormSection → DynamicForm → useActionState → schema(). In server actions, add passwordComplexity?: Parameters<typeof schema>[1] to your state type and include it in all return statements to maintain state consistency.
diff --git a/.changeset/soft-flies-sip.md b/.changeset/soft-flies-sip.md
deleted file mode 100644
index 39ede0e9cc..0000000000
--- a/.changeset/soft-flies-sip.md
+++ /dev/null
@@ -1,26 +0,0 @@
----
-"@bigcommerce/catalyst-core": patch
----
-
-Fix data-disabled class selectors in UI components
-
-## Migration
-
-Updated Tailwind CSS class selectors from `data-disabled:` to `data-[disabled]:` in the following components:
-
-- `vibes/soul/form/button-radio-group/index.tsx`
-- `vibes/soul/form/card-radio-group/index.tsx`
-- `vibes/soul/form/radio-group/index.tsx`
-- `vibes/soul/form/rating-radio-group/index.tsx`
-- `vibes/soul/form/swatch-radio-group/index.tsx`
-- `vibes/soul/form/switch/index.tsx`
-- `vibes/soul/primitives/dropdown-menu/index.tsx`
-
-If you have customized any of these components, update your class names:
-
-```diff
-- data-disabled:pointer-events-none data-disabled:opacity-50
-+ data-[disabled]:pointer-events-none data-[disabled]:opacity-50
-```
-
-This change ensures proper styling of disabled states using the correct Tailwind CSS data attribute syntax.
diff --git a/.changeset/thirty-coins-look.md b/.changeset/thirty-coins-look.md
deleted file mode 100644
index 9db70683fc..0000000000
--- a/.changeset/thirty-coins-look.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@bigcommerce/catalyst-core": patch
----
-
-The login form input data will no longer reset on a failed login attempt.
diff --git a/.changeset/translations-patch-48fcea94.md b/.changeset/translations-patch-48fcea94.md
deleted file mode 100644
index ad17b2636a..0000000000
--- a/.changeset/translations-patch-48fcea94.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@bigcommerce/catalyst-core": patch
----
-
-Update translations.
diff --git a/.changeset/translations-patch-a10f114b.md b/.changeset/translations-patch-a10f114b.md
deleted file mode 100644
index ad17b2636a..0000000000
--- a/.changeset/translations-patch-a10f114b.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@bigcommerce/catalyst-core": patch
----
-
-Update translations.
diff --git a/.changeset/tricky-hoops-hammer.md b/.changeset/tricky-hoops-hammer.md
deleted file mode 100644
index 254bb9fe6c..0000000000
--- a/.changeset/tricky-hoops-hammer.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-"@bigcommerce/catalyst-core": patch
----
-
-Add default optional text to form input labels for inputs that are not required.
-
-## Migration
-
-The new required props are optional, so they are backwards compatible. However, this does mean that the `(optional)` text will now show up on fields that aren't explicitly marked as required by passing the required prop to the Label component.
diff --git a/.changeset/true-shirts-shop.md b/.changeset/true-shirts-shop.md
deleted file mode 100644
index b60df6eadb..0000000000
--- a/.changeset/true-shirts-shop.md
+++ /dev/null
@@ -1,118 +0,0 @@
----
-"@bigcommerce/catalyst-core": patch
----
-
-Improve accessibility for price displays by adding screen reader announcements for original prices, sale prices, and price ranges. Visual price elements are hidden from assistive technologies using `aria-hidden="true"` to prevent duplicate announcements, while visually hidden text provides context about pricing information.
-
-## Migration steps
-
-### Step 1: Update Cart Price Display
-
-Update `core/vibes/soul/sections/cart/client.tsx` to add accessibility labels for sale prices:
-
-```diff
-        {lineItem.salePrice && lineItem.salePrice !== lineItem.price ? (
-          <span className="font-medium @xl:ml-auto">
--           <span className="line-through">{lineItem.price}</span> {lineItem.salePrice}
-+           <span className="sr-only">{t('originalPrice', { price: lineItem.price })}</span>
-+           <span aria-hidden="true" className="line-through">
-+             {lineItem.price}
-+           </span>{' '}
-+           <span className="sr-only">{t('currentPrice', { price: lineItem.salePrice })}</span>
-+           <span aria-hidden="true">{lineItem.salePrice}</span>
-          </span>
-        ) : (
-          <span className="font-medium @xl:ml-auto">{lineItem.price}</span>
-        )}
-```
-
-### Step 2: Update PriceLabel Component
-
-Update `core/vibes/soul/primitives/price-label/index.tsx` to add accessibility improvements for sale prices and price ranges:
-
-```diff
-  import { clsx } from 'clsx';
-+ import { useTranslations } from 'next-intl';
-
-  export function PriceLabel({ className, colorScheme = 'light', price }: Props) {
-+   const t = useTranslations('Components.Price');
-
-    if (typeof price === 'string') {
-      return (
-        ...
-      );
-    }
-
-    switch (price.type) {
-      case 'range':
-        return (
-          <span ...>
--           {price.minValue}
--           &nbsp;&ndash;&nbsp;
--           {price.maxValue}
-+           <span className="sr-only">
-+             {t('range', { minValue: price.minValue, maxValue: price.maxValue })}
-+           </span>
-+           <span aria-hidden="true">
-+             {price.minValue} - {price.maxValue}
-+           </span>
-          </span>
-        );
-
-      case 'sale':
-        return (
-          <span className={clsx('block font-semibold', className)}>
-+           <span className="sr-only">{t('originalPrice', { price: price.previousValue })}</span>
-            <span
-+             aria-hidden="true"
-              className={clsx(
-                'font-normal line-through opacity-50',
-                ...
-              )}
-            >
-              {price.previousValue}
-            </span>{' '}
-+           <span className="sr-only">{t('currentPrice', { price: price.currentValue })}</span>
-            <span
-+             aria-hidden="true"
-              className={clsx(
-                ...
-              )}
-            >
-              {price.currentValue}
-            </span>
-          </span>
-        );
-    }
-  }
-```
-
-### Step 3: Add Translation Keys
-
-Update `core/messages/en.json` to include new translation keys for price accessibility:
-
-```diff 
-  "Cart": {
-    "title": "Cart",
-    "heading": "Your cart",
-    "proceedToCheckout": "Proceed to checkout",
-    "increment": "Increase quantity",
-    "decrement": "Decrease quantity",
-    "removeItem": "Remove item",
-    "cartCombined": "We noticed you had items saved in a previous cart, so we've added them to your current cart for you.",
-    "cartRestored": "You started a cart on another device, and we've restored it here so you can pick up where you left off.",
-    "cartUpdateInProgress": "You have a cart update in progress. Are you sure you want to leave this page? Your changes may be lost.",
-+   "originalPrice": "Original price was {price}.",
-+   "currentPrice": "Current price is {price}.",
-```
-
-```diff
-    },
-+   "Price": {
-+     "originalPrice": "Original price was {price}.",
-+     "currentPrice": "Current price is {price}.",
-+     "range": "Price from {minValue} to {maxValue}."
-+   }
-  },
-  "GiftCertificates": {
-```
\ No newline at end of file
diff --git a/.changeset/two-years-flow.md b/.changeset/two-years-flow.md
deleted file mode 100644
index 9699fcb78c..0000000000
--- a/.changeset/two-years-flow.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-"@bigcommerce/catalyst-core": patch
----
-
-Minor UX improvements for the Reviews section:
-- Show `totalCount` for reviews.
-- Show `averageRating` up to the first decimal.
-- Hide `averageRating` next to rating stars when there are no reviews.
diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md
index cb03390eb1..d8a1caf114 100644
--- a/core/CHANGELOG.md
+++ b/core/CHANGELOG.md
@@ -1,5 +1,1070 @@
 # Changelog
 
+## 1.4.1
+
+### Patch Changes
+
+- [#2827](https://github.com/bigcommerce/catalyst/pull/2827) [`49b1097`](https://github.com/bigcommerce/catalyst/commit/49b1097c5d4f56b8c3a8d3d97181b09cb79a4070) Thanks [@jorgemoya](https://github.com/jorgemoya)! - Filter out child cart items (items with `parentEntityId`) from cart and cart analytics to prevent duplicate line items when products have parent-child relationships, such as product bundles.
+
+  ## Migration steps
+
+  ### Step 1: GraphQL Fragment Updates
+
+  The `parentEntityId` field has been added to both physical and digital cart item fragments to identify child items.
+
+  Update `core/app/[locale]/(default)/cart/page-data.ts`:
+
+  ```diff
+    export const PhysicalItemFragment = graphql(`
+      fragment PhysicalItemFragment on CartPhysicalItem {
+        entityId
+        quantity
+        productEntityId
+        variantEntityId
+  +     parentEntityId
+        listPrice {
+          currencyCode
+          value
+        }
+      }
+    `);
+
+    export const DigitalItemFragment = graphql(`
+      fragment DigitalItemFragment on CartDigitalItem {
+        entityId
+        quantity
+        productEntityId
+        variantEntityId
+  +     parentEntityId
+        listPrice {
+          currencyCode
+          value
+        }
+      }
+    `);
+  ```
+
+  ### Step 2: Cart Display Filtering
+
+  Cart line items are now filtered to exclude child items when displaying the cart.
+
+  Update `core/app/[locale]/(default)/cart/page.tsx`:
+
+  ```diff
+    const lineItems = [
+      ...cart.lineItems.giftCertificates,
+      ...cart.lineItems.physicalItems,
+      ...cart.lineItems.digitalItems,
+  - ];
+  + ].filter((item) => !('parentEntityId' in item) || !item.parentEntityId);
+  ```
+
+  ### Step 3: Analytics Data Filtering
+
+  Analytics data collection now only includes top-level items to prevent duplicate tracking.
+
+  Update `core/app/[locale]/(default)/cart/page.tsx` in the `getAnalyticsData` function:
+
+  ```diff
+  - const lineItems = [...cart.lineItems.physicalItems, ...cart.lineItems.digitalItems];
+  + const lineItems = [...cart.lineItems.physicalItems, ...cart.lineItems.digitalItems].filter(
+  +   (item) => !item.parentEntityId, // Only include top-level items
+  + );
+  ```
+
+  ### Step 4: Styling Update
+
+  Cart subtitle text color has been updated for improved contrast.
+
+  Update `core/vibes/soul/sections/cart/client.tsx`:
+
+  ```diff
+  -                  <span className="text-[var(--cart-subtext-text,hsl(var(--contrast-300)))] contrast-more:text-[var(--cart-subtitle-text,hsl(var(--contrast-500)))]">
+  +                  <span className="text-[var(--cart-subtext-text,hsl(var(--contrast-400)))] contrast-more:text-[var(--cart-subtitle-text,hsl(var(--contrast-500)))]">
+                       {lineItem.subtitle}
+                     </span>
+  ```
+
+- [#2811](https://github.com/bigcommerce/catalyst/pull/2811) [`b57bffa`](https://github.com/bigcommerce/catalyst/commit/b57bffaf28b8c9714f99f7af581871f6e9f6f944) Thanks [@chanceaclark](https://github.com/chanceaclark)! - Fix pagination cursor persistence when changing sort order. The `before` and `after` query parameters are now cleared when the sort option changes, preventing stale pagination cursors from causing incorrect results or empty pages.
+
+- [#2833](https://github.com/bigcommerce/catalyst/pull/2833) [`a520dbc`](https://github.com/bigcommerce/catalyst/commit/a520dbcf14e78b54e10a38c05e11f427b30431c1) Thanks [@jamesqquick](https://github.com/jamesqquick)! - Add placeholders for gift certificate inputs and remove redundant placeholders in the gift certificate purchase form.
+
+- [#2818](https://github.com/bigcommerce/catalyst/pull/2818) [`74e4dd1`](https://github.com/bigcommerce/catalyst/commit/74e4dd11ebf00c312695013c86aab29930fd7a53) Thanks [@jordanarldt](https://github.com/jordanarldt)! - Disable product filters that are no longer available based on the selection.
+
+  ## Migration steps
+
+  ### Step 1
+
+  Update the `facetsTransformer` function in `core/data-transformers/facets-transformer.ts` to handle disabled filters:
+
+  ```diff
+    return allFacets.map((facet) => {
+      const refinedFacet = refinedFacets.find((f) => f.displayName === facet.displayName);
+
+  +    if (refinedFacet == null) {
+  +      return null;
+  +    }
+  +
+      if (facet.__typename === 'CategorySearchFilter') {
+        const refinedCategorySearchFilter =
+  -        refinedFacet?.__typename === 'CategorySearchFilter' ? refinedFacet : null;
+  +        refinedFacet.__typename === 'CategorySearchFilter' ? refinedFacet : null;
+
+        return {
+          type: 'toggle-group' as const,
+          paramName: 'categoryIn',
+          label: facet.displayName,
+          defaultCollapsed: facet.isCollapsedByDefault,
+          options: facet.categories.map((category) => {
+            const refinedCategory = refinedCategorySearchFilter?.categories.find(
+              (c) => c.entityId === category.entityId,
+            );
+            const isSelected = filters.categoryEntityIds?.includes(category.entityId) === true;
+  +          const disabled = refinedCategory == null && !isSelected;
+  +          const productCountLabel = disabled ? '' : ` (${category.productCount})`;
+  +          const label = facet.displayProductCount
+  +            ? `${category.name}${productCountLabel}`
+  +            : category.name;
+
+            return {
+  -            label: facet.displayProductCount
+  -              ? `${category.name} (${category.productCount})`
+  -              : category.name,
+  +            label,
+              value: category.entityId.toString(),
+  -            disabled: refinedCategory == null && !isSelected,
+  +            disabled,
+            };
+          }),
+        };
+      }
+
+      if (facet.__typename === 'BrandSearchFilter') {
+        const refinedBrandSearchFilter =
+  -        refinedFacet?.__typename === 'BrandSearchFilter' ? refinedFacet : null;
+  +        refinedFacet.__typename === 'BrandSearchFilter' ? refinedFacet : null;
+
+        return {
+          type: 'toggle-group' as const,
+          paramName: 'brand',
+          label: facet.displayName,
+          defaultCollapsed: facet.isCollapsedByDefault,
+          options: facet.brands.map((brand) => {
+            const refinedBrand = refinedBrandSearchFilter?.brands.find(
+              (b) => b.entityId === brand.entityId,
+            );
+            const isSelected = filters.brandEntityIds?.includes(brand.entityId) === true;
+  +          const disabled = refinedBrand == null && !isSelected;
+  +          const productCountLabel = disabled ? '' : ` (${brand.productCount})`;
+  +          const label = facet.displayProductCount
+  +            ? `${brand.name}${productCountLabel}`
+  +            : brand.name;
+
+            return {
+  -            label: facet.displayProductCount ? `${brand.name} (${brand.productCount})` : brand.name,
+  +            label,
+              value: brand.entityId.toString(),
+  -            disabled: refinedBrand == null && !isSelected,
+  +            disabled,
+            };
+          }),
+        };
+      }
+
+      if (facet.__typename === 'ProductAttributeSearchFilter') {
+        const refinedProductAttributeSearchFilter =
+  -        refinedFacet?.__typename === 'ProductAttributeSearchFilter' ? refinedFacet : null;
+  +        refinedFacet.__typename === 'ProductAttributeSearchFilter' ? refinedFacet : null;
+
+        return {
+          type: 'toggle-group' as const,
+          paramName: `attr_${facet.filterKey}`,
+          label: facet.displayName,
+          defaultCollapsed: facet.isCollapsedByDefault,
+          options: facet.attributes.map((attribute) => {
+            const refinedAttribute = refinedProductAttributeSearchFilter?.attributes.find(
+              (a) => a.value === attribute.value,
+            );
+
+            const isSelected =
+              filters.productAttributes?.some((attr) => attr.values.includes(attribute.value)) ===
+              true;
+
+  +          const disabled = refinedAttribute == null && !isSelected;
+  +          const productCountLabel = disabled ? '' : ` (${attribute.productCount})`;
+  +          const label = facet.displayProductCount
+  +            ? `${attribute.value}${productCountLabel}`
+  +            : attribute.value;
+  +
+            return {
+  -            label: facet.displayProductCount
+  -              ? `${attribute.value} (${attribute.productCount})`
+  -              : attribute.value,
+  +            label,
+              value: attribute.value,
+  -            disabled: refinedAttribute == null && !isSelected,
+  +            disabled,
+            };
+          }),
+        };
+      }
+
+      if (facet.__typename === 'RatingSearchFilter') {
+        const refinedRatingSearchFilter =
+  -        refinedFacet?.__typename === 'RatingSearchFilter' ? refinedFacet : null;
+  +        refinedFacet.__typename === 'RatingSearchFilter' ? refinedFacet : null;
+        const isSelected = filters.rating?.minRating != null;
+
+        return {
+          type: 'rating' as const,
+          paramName: 'minRating',
+          label: facet.displayName,
+          disabled: refinedRatingSearchFilter == null && !isSelected,
+          defaultCollapsed: facet.isCollapsedByDefault,
+        };
+      }
+
+      if (facet.__typename === 'PriceSearchFilter') {
+        const refinedPriceSearchFilter =
+  -        refinedFacet?.__typename === 'PriceSearchFilter' ? refinedFacet : null;
+  +        refinedFacet.__typename === 'PriceSearchFilter' ? refinedFacet : null;
+        const isSelected = filters.price?.minPrice != null || filters.price?.maxPrice != null;
+
+        return {
+          type: 'range' as const,
+          minParamName: 'minPrice',
+          maxParamName: 'maxPrice',
+          label: facet.displayName,
+          min: facet.selected?.minPrice ?? undefined,
+          max: facet.selected?.maxPrice ?? undefined,
+          disabled: refinedPriceSearchFilter == null && !isSelected,
+          defaultCollapsed: facet.isCollapsedByDefault,
+        };
+      }
+
+      if (facet.freeShipping) {
+        const refinedFreeShippingSearchFilter =
+  -        refinedFacet?.__typename === 'OtherSearchFilter' && refinedFacet.freeShipping
+  +        refinedFacet.__typename === 'OtherSearchFilter' && refinedFacet.freeShipping
+            ? refinedFacet
+            : null;
+        const isSelected = filters.isFreeShipping === true;
+
+        return {
+          type: 'toggle-group' as const,
+          paramName: `shipping`,
+          label: t('freeShippingLabel'),
+          defaultCollapsed: facet.isCollapsedByDefault,
+          options: [
+            {
+              label: t('freeShippingLabel'),
+              value: 'free_shipping',
+              disabled: refinedFreeShippingSearchFilter == null && !isSelected,
+            },
+          ],
+        };
+      }
+
+      if (facet.isFeatured) {
+        const refinedIsFeaturedSearchFilter =
+  -        refinedFacet?.__typename === 'OtherSearchFilter' && refinedFacet.isFeatured
+  +        refinedFacet.__typename === 'OtherSearchFilter' && refinedFacet.isFeatured
+            ? refinedFacet
+            : null;
+        const isSelected = filters.isFeatured === true;
+
+        return {
+          type: 'toggle-group' as const,
+          paramName: `isFeatured`,
+          label: t('isFeaturedLabel'),
+          defaultCollapsed: facet.isCollapsedByDefault,
+          options: [
+            {
+              label: t('isFeaturedLabel'),
+              value: 'on',
+              disabled: refinedIsFeaturedSearchFilter == null && !isSelected,
+            },
+          ],
+        };
+      }
+
+      if (facet.isInStock) {
+        const refinedIsInStockSearchFilter =
+  -        refinedFacet?.__typename === 'OtherSearchFilter' && refinedFacet.isInStock
+  +        refinedFacet.__typename === 'OtherSearchFilter' && refinedFacet.isInStock
+            ? refinedFacet
+            : null;
+        const isSelected = filters.hideOutOfStock === true;
+
+        return {
+          type: 'toggle-group' as const,
+          paramName: `stock`,
+          label: t('inStockLabel'),
+          defaultCollapsed: facet.isCollapsedByDefault,
+          options: [
+            {
+              label: t('inStockLabel'),
+              value: 'in_stock',
+              disabled: refinedIsInStockSearchFilter == null && !isSelected,
+            },
+          ],
+        };
+      }
+
+      return null;
+    });
+  ```
+
+  ### Step 2
+
+  Fix the disabled state CSS classes in `core/vibes/soul/form/toggle-group/index.tsx`:
+
+  ```diff
+            <ToggleGroupPrimitive.Item
+              aria-label={option.label}
+              className={clsx(
+  -              'data-disabled:pointer-events-none data-disabled:opacity-50 h-12 whitespace-nowrap rounded-full border px-4 font-body text-sm font-normal leading-normal transition-colors focus-visible:outline-0 focus-visible:ring-2',
+  +              'h-12 whitespace-nowrap rounded-full border px-4 font-body text-sm font-normal leading-normal transition-colors focus-visible:outline-0 focus-visible:ring-2 data-[disabled]:pointer-events-none data-[disabled]:opacity-50',
+                {
+                  light:
+                    'border-[var(--toggle-group-light-border,hsl(var(--contrast-100)))] ring-[var(--toggle-group-light-focus,hsl(var(--primary)))] data-[state=on]:border-[var(--toggle-group-light-on-border,hsl(var(--foreground)))] data-[state=off]:bg-[var(--toggle-group-light-off-background,hsl(var(--background)))] data-[state=on]:bg-[var(--toggle-group-light-on-background,hsl(var(--foreground)))] data-[state=off]:text-[var(--toggle-group-light-off-text,hsl(var(--foreground)))] data-[state=on]:text-[var(--toggle-group-light-on-text,hsl(var(--background)))] data-[state=off]:hover:border-[var(--toggle-group-light-off-border-hover,hsl(var(--contrast-200)))] data-[state=off]:hover:bg-[var(--toggle-group-light-off-background-hover,hsl(var(--contrast-100)))]',
+  ```
+
+  ### Step 3
+
+  Update the FiltersPanel component in `core/vibes/soul/sections/products-list-section/filters-panel.tsx`
+
+  ```diff
+  import { clsx } from 'clsx';
+  import { parseAsString, useQueryStates } from 'nuqs';
+  -import { Suspense, useOptimistic, useState, useTransition } from 'react';
+  +import { useOptimistic, useState, useTransition } from 'react';
+
+  import { Checkbox } from '@/vibes/soul/form/checkbox';
+  import { RangeInput } from '@/vibes/soul/form/range-input';
+  import { ToggleGroup } from '@/vibes/soul/form/toggle-group';
+  -import { Streamable, useStreamable } from '@/vibes/soul/lib/streamable';
+  +import { Stream, Streamable, useStreamable } from '@/vibes/soul/lib/streamable';
+  import { Accordion, AccordionItem } from '@/vibes/soul/primitives/accordion';
+  import { Button } from '@/vibes/soul/primitives/button';
+  import { CursorPaginationInfo } from '@/vibes/soul/primitives/cursor-pagination';
+  import { Rating } from '@/vibes/soul/primitives/rating';
+  import { Link } from '~/components/link';
+
+  import { getFilterParsers } from './filter-parsers';
+  ```
+
+  ```diff
+    rangeFilterApplyLabel?: Streamable<string>;
+  }
+
+  +type InnerProps = Props & { filters: Filter[] };
+  +
+  function getParamCountLabel(params: Record<string, string | null | string[]>, key: string) {
+    const value = params[key];
+
+    if (Array.isArray(value) && value.length > 0) return `(${value.length})`;
+
+    return '';
+  }
+
+  export function FiltersPanel({
+    className,
+  -  filters,
+  +  filters: streamableFilters,
+    resetFiltersLabel,
+    rangeFilterApplyLabel,
+  }: Props) {
+    return (
+  -    <Suspense fallback={<FiltersSkeleton />}>
+  -      <FiltersPanelInner
+  -        className={className}
+  -        filters={filters}
+  -        rangeFilterApplyLabel={rangeFilterApplyLabel}
+  -        resetFiltersLabel={resetFiltersLabel}
+  -      />
+  -    </Suspense>
+  +    <Stream fallback={<FiltersSkeleton />} value={streamableFilters}>
+  +      {(filters) => (
+  +        <FiltersPanelInner
+  +          className={className}
+  +          filters={filters}
+  +          rangeFilterApplyLabel={rangeFilterApplyLabel}
+  +          resetFiltersLabel={resetFiltersLabel}
+  +        />
+  +      )}
+  +    </Stream>
+    );
+  }
+
+  export function FiltersPanelInner({
+    className,
+  -  filters: streamableFilters,
+  +  filters,
+    resetFiltersLabel: streamableResetFiltersLabel,
+    rangeFilterApplyLabel: streamableRangeFilterApplyLabel,
+    paginationInfo: streamablePaginationInfo,
+  -}: Props) {
+  -  const filters = useStreamable(streamableFilters);
+  +}: InnerProps) {
+    const resetFiltersLabel = useStreamable(streamableResetFiltersLabel) ?? 'Reset filters';
+    const rangeFilterApplyLabel = useStreamable(streamableRangeFilterApplyLabel);
+    const paginationInfo = useStreamable(streamablePaginationInfo);
+    const startCursorParamName = paginationInfo?.startCursorParamName ?? 'before';
+    const endCursorParamName = paginationInfo?.endCursorParamName ?? 'after';
+    const [params, setParams] = useQueryStates(
+      {
+        ...getFilterParsers(filters),
+        [startCursorParamName]: parseAsString,
+        [endCursorParamName]: parseAsString,
+      },
+      {
+        shallow: false,
+        history: 'push',
+      },
+    );
+    const [isPending, startTransition] = useTransition();
+    const [optimisticParams, setOptimisticParams] = useOptimistic(params);
+  -  const [accordionItems, setAccordionItems] = useState(() =>
+  +  const [expandedItems, setExpandedItems] = useState(() => {
+  +    const initial = new Set<string>();
+  +
+      filters
+        .filter((filter) => filter.type !== 'link-group')
+  -      .map((filter, index) => ({
+  -        key: index.toString(),
+  -        value: index.toString(),
+  +      .slice(0, 3)
+  +      .forEach((filter) => {
+  +        initial.add(filter.label.toLowerCase());
+  +      });
+  +
+  +    return initial;
+  +  });
+  +
+  +  const accordionItems = filters
+  +    .filter((filter) => filter.type !== 'link-group')
+  +    .map((filter) => {
+  +      return {
+  +        key: filter.label.toLowerCase(),
+  +        value: filter.label.toLowerCase(),
+          filter,
+  -        expanded: index < 3,
+  -      })),
+  -  );
+  +        expanded: expandedItems.has(filter.label.toLowerCase()),
+  +      };
+  +    });
+
+    if (filters.length === 0) return null;
+
+    const linkGroupFilters = filters.filter(
+      (filter): filter is LinkGroupFilter => filter.type === 'link-group',
+    );
+  ```
+
+  ```diff
+        ))}
+        <Accordion
+  -        onValueChange={(items) =>
+  -          setAccordionItems((prevItems) =>
+  -            prevItems.map((prevItem) => ({
+  -              ...prevItem,
+  -              expanded: items.includes(prevItem.value),
+  -            })),
+  -          )
+  -        }
+  +        onValueChange={(items) => {
+  +          setExpandedItems(new Set(items));
+  +        }}
+          type="multiple"
+          value={accordionItems.filter((item) => item.expanded).map((item) => item.value)}
+        >
+  ```
+
+- [#2822](https://github.com/bigcommerce/catalyst/pull/2822) [`5c3e4d2`](https://github.com/bigcommerce/catalyst/commit/5c3e4d25c2d929af2b86cee3e4133838e5f3987b) Thanks [@jordanarldt](https://github.com/jordanarldt)! - Run E2E tests on PRs, add 'required' prop to cart shipping calculator
+
+  ## Migration
+
+  Add `required` prop to the Country selector and Country input fields in `core/vibes/soul/sections/cart/shipping-form/index.tsx` on lines 280 and 289.
+
+- [#2813](https://github.com/bigcommerce/catalyst/pull/2813) [`ea9d633`](https://github.com/bigcommerce/catalyst/commit/ea9d6337d2bb8e5c166cb1de3385631e12fea4a3) Thanks [@jorgemoya](https://github.com/jorgemoya)! - Delete duplicate Select component.
+
+- [#2823](https://github.com/bigcommerce/catalyst/pull/2823) [`dcad856`](https://github.com/bigcommerce/catalyst/commit/dcad8565d5eb835a5a68785f59811a67149d0137) Thanks [@jorgemoya](https://github.com/jorgemoya)! - Refactor DynamicForm actions to decouple fields and passwordComplexity from state, passing them as separate arguments instead. This reduces state payload size by removing fields from state objects and stripping options from fields before passing them to actions (options are only needed for rendering, not processing). All form actions now accept a `DynamicFormActionArgs` object as the first parameter containing fields and optional passwordComplexity, followed by the previous state and formData.
+
+  ## Migration steps
+
+  ### Step 1: Changes to DynamicForm component
+
+  The `DynamicForm` component and related utilities have been updated to support the new action signature pattern:
+
+  **`core/vibes/soul/form/dynamic-form/index.tsx`**:
+  - Added `DynamicFormActionArgs<F>` interface that contains `fields` and optional `passwordComplexity`
+  - Updated `DynamicFormAction<F>` type to accept `DynamicFormActionArgs<F>` as the first parameter
+  - Removed `fields` and `passwordComplexity` from the `State` interface
+  - Added automatic removal of `options` from fields before passing to actions (options are only needed for rendering)
+  - Updated action binding to use `action.bind(null, { fields: fieldsWithoutOptions, passwordComplexity })`
+
+  **`core/vibes/soul/form/dynamic-form/utils.ts`** (new file):
+  - Added `removeOptionsFromFields()` utility function that strips the `options` property from field definitions before passing them to actions, reducing the state payload size
+
+  ```diff
+  + export interface DynamicFormActionArgs<F extends Field> {
+  +   fields: Array<F | FieldGroup<F>>;
+  +   passwordComplexity?: PasswordComplexitySettings | null;
+  + }
+  +
+  + type Action<F extends Field, S, P> = (
+  +   args: DynamicFormActionArgs<F>,
+  +   state: Awaited<S>,
+  +   payload: P,
+  + ) => S | Promise<S>;
+  +
+    interface State {
+      lastResult: SubmissionResult | null;
+  -   fields: Array<F | FieldGroup<F>>;
+  -   passwordComplexity?: PasswordComplexitySettings | null;
+    }
+  ```
+
+  ### Step 2: Update DynamicForm action signatures
+
+  All form actions that use `DynamicForm` must be updated to accept `DynamicFormActionArgs<F>` as the first parameter instead of including fields in the state.
+
+  Update your form action function signature:
+
+  ```diff
+  + import { DynamicFormActionArgs } from '@/vibes/soul/form/dynamic-form';
+    import { Field, FieldGroup, schema } from '@/vibes/soul/form/dynamic-form/schema';
+
+  - export async function myFormAction<F extends Field>(
+  -   prevState: {
+  -     lastResult: SubmissionResult | null;
+  -     fields: Array<F | FieldGroup<F>>;
+  -     passwordComplexity?: PasswordComplexitySettings | null;
+  -   },
+  -   formData: FormData,
+  - ) {
+  + export async function myFormAction<F extends Field>(
+  +   { fields, passwordComplexity }: DynamicFormActionArgs<F>,
+  +   _prevState: {
+  +     lastResult: SubmissionResult | null;
+  +   },
+  +   formData: FormData,
+  + ) {
+  ```
+
+  ### Step 2: Remove fields and passwordComplexity from state interfaces
+
+  Update state interfaces to remove fields and passwordComplexity properties:
+
+  ```diff
+    interface State {
+      lastResult: SubmissionResult | null;
+  -   fields: Array<Field | FieldGroup<Field>>;
+  -   passwordComplexity?: PasswordComplexitySettings | null;
+    }
+  ```
+
+  ### Step 3: Update action implementations
+
+  Remove references to `prevState.fields` and `prevState.passwordComplexity` in action implementations:
+
+  ```diff
+    const submission = parseWithZod(formData, {
+  -   schema: schema(prevState.fields, prevState.passwordComplexity),
+  +   schema: schema(fields, passwordComplexity),
+    });
+
+    if (submission.status !== 'success') {
+      return {
+        lastResult: submission.reply(),
+  -     fields: prevState.fields,
+  -     passwordComplexity: prevState.passwordComplexity,
+      };
+    }
+  ```
+
+  ### Step 4: Update action calls in components
+
+  For actions used with `AddressListSection`, update the action signature to accept fields as the first parameter:
+
+  ```diff
+  - export async function addressAction(
+  -   prevState: Awaited<State>,
+  -   formData: FormData,
+  - ): Promise<State> {
+  + export async function addressAction(
+  +   fields: Array<Field | FieldGroup<Field>>,
+  +   prevState: Awaited<State>,
+  +   formData: FormData,
+  + ): Promise<State> {
+  ```
+
+  ### Step 5: Update DynamicForm usage
+
+  No changes needed to `DynamicForm` component usage. The component automatically handles binding fields and passwordComplexity to actions. The `DynamicForm` component now:
+  - Automatically removes options from fields before passing them to actions (reducing payload size)
+  - Binds fields and passwordComplexity to the action using `action.bind()`
+  - Maintains the same props interface, so existing usage continues to work
+
+  ### Affected files
+
+  The following files were updated in this refactor:
+  - `core/vibes/soul/form/dynamic-form/index.tsx` - Added `DynamicFormActionArgs` type and updated action binding
+  - `core/vibes/soul/form/dynamic-form/utils.ts` - Added `removeOptionsFromFields` utility function
+  - `core/app/[locale]/(default)/(auth)/register/_actions/register-customer.ts`
+  - `core/app/[locale]/(default)/account/addresses/_actions/address-action.ts`
+  - `core/app/[locale]/(default)/account/addresses/_actions/create-address.ts`
+  - `core/app/[locale]/(default)/account/addresses/_actions/update-address.ts`
+  - `core/app/[locale]/(default)/account/addresses/_actions/delete-address.ts`
+  - `core/app/[locale]/(default)/gift-certificates/purchase/_actions/add-to-cart.tsx`
+  - `core/app/[locale]/(default)/webpages/[id]/contact/_actions/submit-contact-form.ts`
+  - `core/vibes/soul/sections/address-list-section/index.tsx`
+
+- [#2816](https://github.com/bigcommerce/catalyst/pull/2816) [`b4b87a3`](https://github.com/bigcommerce/catalyst/commit/b4b87a361790bf2edd7614bab1d97490d91ed22f) Thanks [@chanceaclark](https://github.com/chanceaclark)! - Add support for additional HTML attributes on script tags. The scripts transformer now extracts and passes through attributes like `async`, `defer`, `crossorigin`, and `data-*` attributes from BigCommerce script tags to the C15T consent manager, ensuring scripts load with their intended behavior.
+
+- [#2817](https://github.com/bigcommerce/catalyst/pull/2817) [`d469078`](https://github.com/bigcommerce/catalyst/commit/d4690786b17a7d05ef32f8941e4090101980f8bc) Thanks [@jorgemoya](https://github.com/jorgemoya)! - Persist the checkbox product modifier since it can modify pricing and other product data. By persisting this and tracking in the url, this will trigger a product refetch when added or removed. Incidentally, now we manually control what fields are persisted, since `option.isVariantOption` doesn't apply to `checkbox`, additionally multi options modifiers that are not variant options can also modify price and other product data.
+
+  ## Migration
+
+  ### Step 1
+
+  Update `product-options-transformer.ts` to manually track persisted fields:
+
+  ```ts
+  case 'DropdownList': {
+      return {
+          // before
+          // persist: option.isVariantOption,
+          // after (manually persist)
+          persist: true,
+          type: 'select',
+          label: option.displayName,
+          required: option.isRequired,
+          name: option.entityId.toString(),
+          defaultValue: values.find((value) => value.isDefault)?.entityId.toString(),
+          options: values.map((value) => ({
+          label: value.label,
+          value: value.entityId.toString(),
+          })),
+      };
+  }
+  ```
+
+  Fields that persist and can affect product pricing when selected:
+  - Swatch
+  - RectangleBoxes
+  - RadioButtons
+  - ProductPickList
+  - ProductPickListWithImages
+  - CheckboxOption
+
+  ### Step 2
+
+  Remove `isVariantOption` from GQL query since we no longer use it:
+
+  ```ts
+  export const ProductOptionsFragment = graphql(
+    `
+      fragment ProductOptionsFragment on Product {
+        entityId
+        productOptions(first: 50) {
+          edges {
+            node {
+              __typename
+              entityId
+              displayName
+              isRequired
+              isVariantOption // remove this
+              ...MultipleChoiceFieldFragment
+              ...CheckboxFieldFragment
+              ...NumberFieldFragment
+              ...TextFieldFragment
+              ...MultiLineTextFieldFragment
+              ...DateFieldFragment
+            }
+          }
+        }
+      }
+    `,
+    [
+      MultipleChoiceFieldFragment,
+      CheckboxFieldFragment,
+      NumberFieldFragment,
+      TextFieldFragment,
+      MultiLineTextFieldFragment,
+      DateFieldFragment,
+    ],
+  );
+  ```
+
+  ### Step 3
+
+  Update `product-detail-form.tsx` to include separate handing of the checkbox field:
+
+  ```ts
+  const defaultValue = fields.reduce<{
+    [Key in keyof SchemaRawShape]?: z.infer<SchemaRawShape[Key]>;
+  }>(
+    (acc, field) => {
+      // Checkbox field has to be handled separately because we want to convert checked or unchecked value to true or undefined respectively.
+      // This is because the form expects a boolean value, but we want to store the checked or unchecked value in the query params.
+      if (field.type === 'checkbox') {
+        if (params[field.name] === field.checkedValue) {
+          return {
+            ...acc,
+            [field.name]: 'true',
+          };
+        }
+
+        if (params[field.name] === field.uncheckedValue) {
+          return {
+            ...acc,
+            [field.name]: undefined,
+          };
+        }
+
+        return {
+          ...acc,
+          [field.name]: field.defaultValue, // Default value is either 'true' or undefined
+        };
+      }
+
+      return {
+        ...acc,
+        [field.name]: params[field.name] ?? field.defaultValue,
+      };
+    },
+    { quantity: minQuantity ?? 1 },
+  );
+
+  ...
+
+  const handleChange = useCallback(
+    (value: string) => {
+      // Checkbox field has to be handled separately because we want to convert 'true' or '' to the checked or unchecked value respectively.
+      if (field.type === 'checkbox') {
+        void setParams({ [field.name]: value ? field.checkedValue : field.uncheckedValue });
+      } else {
+        void setParams({ [field.name]: value || null }); // Passing `null` to remove the value from the query params if fieldValue is falsey
+      }
+
+      controls.change(value || ''); // If fieldValue is falsey, we set it to an empty string
+    },
+    [setParams, field, controls],
+  );
+  ```
+
+  ### Step 4
+
+  Update schema in `core/vibes/soul/sections/product-detail/schema.ts`:
+
+  ```ts
+  type CheckboxField = {
+    type: 'checkbox';
+    defaultValue?: string;
+    checkedValue: string; // add
+    uncheckedValue: string; // add
+  } & FormField;
+  ```
+
+- [#2820](https://github.com/bigcommerce/catalyst/pull/2820) [`a50fa6f`](https://github.com/bigcommerce/catalyst/commit/a50fa6fda64cbb1370862f43d272b0069f6d6307) Thanks [@jordanarldt](https://github.com/jordanarldt)! - Fix WishlistDetails page from exceeding GraphQL complexity limit, and fix wishlist e2e tests.
+
+  Additionally, add the `required` prop to `core/components/wishlist/modals/new.tsx` and `core/components/wishlist/modals/rename.tsx`
+
+  ## Migration
+
+  ### Step 1: Update wishlist GraphQL fragments
+
+  In `core/components/wishlist/fragment.ts`, replace the `WishlistItemProductFragment` to use explicit fields instead of `ProductCardFragment`:
+
+  ```typescript
+  export const WishlistItemProductFragment = graphql(
+    `
+      fragment WishlistItemProductFragment on Product {
+        entityId
+        name
+        defaultImage {
+          altText
+          url: urlTemplate(lossy: true)
+        }
+        path
+        brand {
+          name
+          path
+        }
+        reviewSummary {
+          numberOfReviews
+          averageRating
+        }
+        sku
+        showCartAction
+        inventory {
+          isInStock
+        }
+        availabilityV2 {
+          status
+        }
+        ...PricingFragment
+      }
+    `,
+    [PricingFragment],
+  );
+  ```
+
+  Remove `ProductCardFragment` from all fragment dependencies in the same file.
+
+  ### Step 2: Update product card transformer
+
+  In `core/data-transformers/product-card-transformer.ts`:
+  1. Import the `WishlistItemProductFragment`:
+     ```typescript
+     import { WishlistItemProductFragment } from '~/components/wishlist/fragment';
+     ```
+  2. Update the `singleProductCardTransformer` function signature to accept both fragment types:
+     ```typescript
+     product: ResultOf<typeof ProductCardFragment | typeof WishlistItemProductFragment>;
+     ```
+  3. Add a conditional check for the `inventoryMessage` field:
+     ```typescript
+     inventoryMessage:
+       'variants' in product
+         ? getInventoryMessage(product, outOfStockMessage, showBackorderMessage)
+         : undefined,
+     ```
+  4. Update the `productCardTransformer` function signature similarly:
+     ```typescript
+     products: Array<ResultOf<typeof ProductCardFragment | typeof WishlistItemProductFragment>>;
+     ```
+
+  ### Step 3: Fix wishlist e2e tests
+
+  In `core/tests/ui/e2e/account/wishlists.spec.ts`, update label selectors to use `{ exact: true }` for specificity:
+
+  Update all locators for the wishlist name input selectors:
+
+  ```diff
+  - page.getByLabel(t('Form.nameLabel'))
+  + page.getByLabel(t('Form.nameLabel'), { exact: true })
+  ```
+
+  ### Step 4: Fix mobile wishlist e2e tests
+
+  In `core/tests/ui/e2e/account/wishlists.mobile.spec.ts`, update translation calls to use namespace prefixes:
+  1. Update the translation initialization:
+
+  ```diff
+  - const t = await getTranslations('Account.Wishlist');
+  + const t = await getTranslations();
+  ```
+
+  2. Update all translation keys to include the namespace:
+
+  ```diff
+  - await locator.getByRole('button', { name: t('actionsTitle') }).click();
+  - await page.getByRole('menuitem', { name: t('share') }).click();
+  + await locator.getByRole('button', { name: t('Wishlist.actionsTitle') }).click();
+  + await page.getByRole('menuitem', { name: t('Wishlist.share') }).click();
+  ```
+
+  ```diff
+  - await expect(page.getByText(t('shareSuccess'))).toBeVisible();
+  + await expect(page.getByText(t('Wishlist.shareSuccess'))).toBeVisible();
+  ```
+
+  ### Step 5: Add `required` prop to wishlist modals
+
+  Update the modal forms to include the `required` prop on the name input field:
+
+  In `core/components/wishlist/modals/new.tsx`:
+
+  ```diff
+        <Input
+          {...getInputProps(fields.wishlistName, { type: 'text' })}
+          defaultValue={defaultValue.current}
+          errors={fields.wishlistName.errors}
+          key={fields.wishlistName.id}
+          label={nameLabel}
+          onChange={(e) => {
+            defaultValue.current = e.target.value;
+          }}
+  +       required
+        />
+  ```
+
+  In `core/components/wishlist/modals/rename.tsx`:
+
+  ```diff
+        <Input
+          {...getInputProps(fields.wishlistName, { type: 'text' })}
+          defaultValue={defaultValue.current}
+          errors={fields.wishlistName.errors}
+          key={fields.wishlistName.id}
+          label={nameLabel}
+          onChange={(e) => {
+            defaultValue.current = e.target.value;
+          }}
+  +       required
+        />
+  ```
+
+- [#2814](https://github.com/bigcommerce/catalyst/pull/2814) [`fcb946e`](https://github.com/bigcommerce/catalyst/commit/fcb946e47aafc8be2e63bf3fe776ec6caab1fa72) Thanks [@matthewvolk](https://github.com/matthewvolk)! - Shoppers will now see the store's actual password complexity requirements in the tooltip on the new customer registration form, preventing confusion and failed registration attempts. The schema() function in core/vibes/soul/form/dynamic-form/schema.ts now accepts an optional second parameter passwordComplexity to enable dynamic password validation. The DynamicForm, DynamicFormSection components and their associated server actions also accept an optional passwordComplexity prop that flows through to the schema. Action Required: If you have custom registration or password forms and want to use store-specific password complexity settings, fetch passwordComplexitySettings from the GraphQL API (under site.settings.customers.passwordComplexitySettings) and pass it to your DynamicFormSection component and maintain it in your server action's state. If you don't pass it, password validation defaults to: minimum 8 characters, at least one number, and at least one special character. Conflict Resolution: If merging into custom forms, ensure the passwordComplexity prop is threaded through: Page → DynamicFormSection → DynamicForm → useActionState → schema(). In server actions, add passwordComplexity?: Parameters<typeof schema>[1] to your state type and include it in all return statements to maintain state consistency.
+
+- [#2821](https://github.com/bigcommerce/catalyst/pull/2821) [`e5a03f6`](https://github.com/bigcommerce/catalyst/commit/e5a03f6a73fe16da55b96b75de70d3bbd846dfba) Thanks [@jordanarldt](https://github.com/jordanarldt)! - Fix data-disabled class selectors in UI components
+
+  ## Migration
+
+  Updated Tailwind CSS class selectors from `data-disabled:` to `data-[disabled]:` in the following components:
+  - `vibes/soul/form/button-radio-group/index.tsx`
+  - `vibes/soul/form/card-radio-group/index.tsx`
+  - `vibes/soul/form/radio-group/index.tsx`
+  - `vibes/soul/form/rating-radio-group/index.tsx`
+  - `vibes/soul/form/swatch-radio-group/index.tsx`
+  - `vibes/soul/form/switch/index.tsx`
+  - `vibes/soul/primitives/dropdown-menu/index.tsx`
+
+  If you have customized any of these components, update your class names:
+
+  ```diff
+  - data-disabled:pointer-events-none data-disabled:opacity-50
+  + data-[disabled]:pointer-events-none data-[disabled]:opacity-50
+  ```
+
+  This change ensures proper styling of disabled states using the correct Tailwind CSS data attribute syntax.
+
+- [#2819](https://github.com/bigcommerce/catalyst/pull/2819) [`a1f1ed8`](https://github.com/bigcommerce/catalyst/commit/a1f1ed857eab954e085ba67956a954fb2b63882a) Thanks [@jamesqquick](https://github.com/jamesqquick)! - The login form input data will no longer reset on a failed login attempt.
+
+- [#2836](https://github.com/bigcommerce/catalyst/pull/2836) [`06fd9aa`](https://github.com/bigcommerce/catalyst/commit/06fd9aa921ad2c4b8b60706e114a9f425f049d40) Thanks [@bc-svc-local](https://github.com/bc-svc-local)! - Update translations.
+
+- [#2826](https://github.com/bigcommerce/catalyst/pull/2826) [`b5f460c`](https://github.com/bigcommerce/catalyst/commit/b5f460c0a5fa5161c853884e18816796b9ea73d9) Thanks [@bc-svc-local](https://github.com/bc-svc-local)! - Update translations.
+
+- [#2815](https://github.com/bigcommerce/catalyst/pull/2815) [`52ee85e`](https://github.com/bigcommerce/catalyst/commit/52ee85ef1b08fc6114aa953f7a7e67c11876e7e2) Thanks [@jamesqquick](https://github.com/jamesqquick)! - Add default optional text to form input labels for inputs that are not required.
+
+  ## Migration
+
+  The new required props are optional, so they are backwards compatible. However, this does mean that the `(optional)` text will now show up on fields that aren't explicitly marked as required by passing the required prop to the Label component.
+
+- [#2829](https://github.com/bigcommerce/catalyst/pull/2829) [`8096cc5`](https://github.com/bigcommerce/catalyst/commit/8096cc5ebaf983431f06bd2bd94a9a81899c2b29) Thanks [@jorgemoya](https://github.com/jorgemoya)! - Improve accessibility for price displays by adding screen reader announcements for original prices, sale prices, and price ranges. Visual price elements are hidden from assistive technologies using `aria-hidden="true"` to prevent duplicate announcements, while visually hidden text provides context about pricing information.
+
+  ## Migration steps
+
+  ### Step 1: Update Cart Price Display
+
+  Update `core/vibes/soul/sections/cart/client.tsx` to add accessibility labels for sale prices:
+
+  ```diff
+          {lineItem.salePrice && lineItem.salePrice !== lineItem.price ? (
+            <span className="font-medium @xl:ml-auto">
+  -           <span className="line-through">{lineItem.price}</span> {lineItem.salePrice}
+  +           <span className="sr-only">{t('originalPrice', { price: lineItem.price })}</span>
+  +           <span aria-hidden="true" className="line-through">
+  +             {lineItem.price}
+  +           </span>{' '}
+  +           <span className="sr-only">{t('currentPrice', { price: lineItem.salePrice })}</span>
+  +           <span aria-hidden="true">{lineItem.salePrice}</span>
+            </span>
+          ) : (
+            <span className="font-medium @xl:ml-auto">{lineItem.price}</span>
+          )}
+  ```
+
+  ### Step 2: Update PriceLabel Component
+
+  Update `core/vibes/soul/primitives/price-label/index.tsx` to add accessibility improvements for sale prices and price ranges:
+
+  ```diff
+    import { clsx } from 'clsx';
+  + import { useTranslations } from 'next-intl';
+
+    export function PriceLabel({ className, colorScheme = 'light', price }: Props) {
+  +   const t = useTranslations('Components.Price');
+
+      if (typeof price === 'string') {
+        return (
+          ...
+        );
+      }
+
+      switch (price.type) {
+        case 'range':
+          return (
+            <span ...>
+  -           {price.minValue}
+  -           &nbsp;&ndash;&nbsp;
+  -           {price.maxValue}
+  +           <span className="sr-only">
+  +             {t('range', { minValue: price.minValue, maxValue: price.maxValue })}
+  +           </span>
+  +           <span aria-hidden="true">
+  +             {price.minValue} - {price.maxValue}
+  +           </span>
+            </span>
+          );
+
+        case 'sale':
+          return (
+            <span className={clsx('block font-semibold', className)}>
+  +           <span className="sr-only">{t('originalPrice', { price: price.previousValue })}</span>
+              <span
+  +             aria-hidden="true"
+                className={clsx(
+                  'font-normal line-through opacity-50',
+                  ...
+                )}
+              >
+                {price.previousValue}
+              </span>{' '}
+  +           <span className="sr-only">{t('currentPrice', { price: price.currentValue })}</span>
+              <span
+  +             aria-hidden="true"
+                className={clsx(
+                  ...
+                )}
+              >
+                {price.currentValue}
+              </span>
+            </span>
+          );
+      }
+    }
+  ```
+
+  ### Step 3: Add Translation Keys
+
+  Update `core/messages/en.json` to include new translation keys for price accessibility:
+
+  ```diff
+    "Cart": {
+      "title": "Cart",
+      "heading": "Your cart",
+      "proceedToCheckout": "Proceed to checkout",
+      "increment": "Increase quantity",
+      "decrement": "Decrease quantity",
+      "removeItem": "Remove item",
+      "cartCombined": "We noticed you had items saved in a previous cart, so we've added them to your current cart for you.",
+      "cartRestored": "You started a cart on another device, and we've restored it here so you can pick up where you left off.",
+      "cartUpdateInProgress": "You have a cart update in progress. Are you sure you want to leave this page? Your changes may be lost.",
+  +   "originalPrice": "Original price was {price}.",
+  +   "currentPrice": "Current price is {price}.",
+  ```
+
+  ```diff
+      },
+  +   "Price": {
+  +     "originalPrice": "Original price was {price}.",
+  +     "currentPrice": "Current price is {price}.",
+  +     "range": "Price from {minValue} to {maxValue}."
+  +   }
+    },
+    "GiftCertificates": {
+  ```
+
+- [#2809](https://github.com/bigcommerce/catalyst/pull/2809) [`dd559b2`](https://github.com/bigcommerce/catalyst/commit/dd559b2d9f354387e19d7c81a809eed97bfc9be3) Thanks [@jorgemoya](https://github.com/jorgemoya)! - Minor UX improvements for the Reviews section:
+  - Show `totalCount` for reviews.
+  - Show `averageRating` up to the first decimal.
+  - Hide `averageRating` next to rating stars when there are no reviews.
+
 ## 1.4.0
 
 ### Minor Changes
diff --git a/core/package.json b/core/package.json
index 3330a33aa0..e5a692c3de 100644
--- a/core/package.json
+++ b/core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@bigcommerce/catalyst-core",
   "description": "BigCommerce Catalyst is a Next.js starter kit for building headless BigCommerce storefronts.",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "private": true,
   "scripts": {
     "dev": "npm run generate && next dev",

From aaf5f4676fa851486f13ce954872e0ea565eaa36 Mon Sep 17 00:00:00 2001
From: Jorge Moya <jorge.moya@bigcommerce.com>
Date: Mon, 26 Jan 2026 16:54:41 -0600
Subject: [PATCH 25/69] chore: revert version

---
 core/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/package.json b/core/package.json
index 45157f13c6..569c349b87 100644
--- a/core/package.json
+++ b/core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@bigcommerce/catalyst-makeswift",
   "description": "BigCommerce Catalyst is a Next.js starter kit for building headless BigCommerce storefronts.",
-  "version": "1.4.1",
+  "version": "1.4.0",
   "private": true,
   "scripts": {
     "dev": "npm run generate && next dev",

From 9529c3e681bfad8f0a3b11798a287f52cbe61885 Mon Sep 17 00:00:00 2001
From: Jorge Moya <jorge.moya@bigcommerce.com>
Date: Tue, 27 Jan 2026 10:12:59 -0600
Subject: [PATCH 26/69] chore: remove changelog changes

---
 core/CHANGELOG.md | 1065 ---------------------------------------------
 1 file changed, 1065 deletions(-)

diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md
index a95eb68eb1..25dd1c0cc6 100644
--- a/core/CHANGELOG.md
+++ b/core/CHANGELOG.md
@@ -1,1070 +1,5 @@
 # Changelog
 
-## 1.4.1
-
-### Patch Changes
-
-- [#2827](https://github.com/bigcommerce/catalyst/pull/2827) [`49b1097`](https://github.com/bigcommerce/catalyst/commit/49b1097c5d4f56b8c3a8d3d97181b09cb79a4070) Thanks [@jorgemoya](https://github.com/jorgemoya)! - Filter out child cart items (items with `parentEntityId`) from cart and cart analytics to prevent duplicate line items when products have parent-child relationships, such as product bundles.
-
-  ## Migration steps
-
-  ### Step 1: GraphQL Fragment Updates
-
-  The `parentEntityId` field has been added to both physical and digital cart item fragments to identify child items.
-
-  Update `core/app/[locale]/(default)/cart/page-data.ts`:
-
-  ```diff
-    export const PhysicalItemFragment = graphql(`
-      fragment PhysicalItemFragment on CartPhysicalItem {
-        entityId
-        quantity
-        productEntityId
-        variantEntityId
-  +     parentEntityId
-        listPrice {
-          currencyCode
-          value
-        }
-      }
-    `);
-
-    export const DigitalItemFragment = graphql(`
-      fragment DigitalItemFragment on CartDigitalItem {
-        entityId
-        quantity
-        productEntityId
-        variantEntityId
-  +     parentEntityId
-        listPrice {
-          currencyCode
-          value
-        }
-      }
-    `);
-  ```
-
-  ### Step 2: Cart Display Filtering
-
-  Cart line items are now filtered to exclude child items when displaying the cart.
-
-  Update `core/app/[locale]/(default)/cart/page.tsx`:
-
-  ```diff
-    const lineItems = [
-      ...cart.lineItems.giftCertificates,
-      ...cart.lineItems.physicalItems,
-      ...cart.lineItems.digitalItems,
-  - ];
-  + ].filter((item) => !('parentEntityId' in item) || !item.parentEntityId);
-  ```
-
-  ### Step 3: Analytics Data Filtering
-
-  Analytics data collection now only includes top-level items to prevent duplicate tracking.
-
-  Update `core/app/[locale]/(default)/cart/page.tsx` in the `getAnalyticsData` function:
-
-  ```diff
-  - const lineItems = [...cart.lineItems.physicalItems, ...cart.lineItems.digitalItems];
-  + const lineItems = [...cart.lineItems.physicalItems, ...cart.lineItems.digitalItems].filter(
-  +   (item) => !item.parentEntityId, // Only include top-level items
-  + );
-  ```
-
-  ### Step 4: Styling Update
-
-  Cart subtitle text color has been updated for improved contrast.
-
-  Update `core/vibes/soul/sections/cart/client.tsx`:
-
-  ```diff
-  -                  <span className="text-[var(--cart-subtext-text,hsl(var(--contrast-300)))] contrast-more:text-[var(--cart-subtitle-text,hsl(var(--contrast-500)))]">
-  +                  <span className="text-[var(--cart-subtext-text,hsl(var(--contrast-400)))] contrast-more:text-[var(--cart-subtitle-text,hsl(var(--contrast-500)))]">
-                       {lineItem.subtitle}
-                     </span>
-  ```
-
-- [#2811](https://github.com/bigcommerce/catalyst/pull/2811) [`b57bffa`](https://github.com/bigcommerce/catalyst/commit/b57bffaf28b8c9714f99f7af581871f6e9f6f944) Thanks [@chanceaclark](https://github.com/chanceaclark)! - Fix pagination cursor persistence when changing sort order. The `before` and `after` query parameters are now cleared when the sort option changes, preventing stale pagination cursors from causing incorrect results or empty pages.
-
-- [#2833](https://github.com/bigcommerce/catalyst/pull/2833) [`a520dbc`](https://github.com/bigcommerce/catalyst/commit/a520dbcf14e78b54e10a38c05e11f427b30431c1) Thanks [@jamesqquick](https://github.com/jamesqquick)! - Add placeholders for gift certificate inputs and remove redundant placeholders in the gift certificate purchase form.
-
-- [#2818](https://github.com/bigcommerce/catalyst/pull/2818) [`74e4dd1`](https://github.com/bigcommerce/catalyst/commit/74e4dd11ebf00c312695013c86aab29930fd7a53) Thanks [@jordanarldt](https://github.com/jordanarldt)! - Disable product filters that are no longer available based on the selection.
-
-  ## Migration steps
-
-  ### Step 1
-
-  Update the `facetsTransformer` function in `core/data-transformers/facets-transformer.ts` to handle disabled filters:
-
-  ```diff
-    return allFacets.map((facet) => {
-      const refinedFacet = refinedFacets.find((f) => f.displayName === facet.displayName);
-
-  +    if (refinedFacet == null) {
-  +      return null;
-  +    }
-  +
-      if (facet.__typename === 'CategorySearchFilter') {
-        const refinedCategorySearchFilter =
-  -        refinedFacet?.__typename === 'CategorySearchFilter' ? refinedFacet : null;
-  +        refinedFacet.__typename === 'CategorySearchFilter' ? refinedFacet : null;
-
-        return {
-          type: 'toggle-group' as const,
-          paramName: 'categoryIn',
-          label: facet.displayName,
-          defaultCollapsed: facet.isCollapsedByDefault,
-          options: facet.categories.map((category) => {
-            const refinedCategory = refinedCategorySearchFilter?.categories.find(
-              (c) => c.entityId === category.entityId,
-            );
-            const isSelected = filters.categoryEntityIds?.includes(category.entityId) === true;
-  +          const disabled = refinedCategory == null && !isSelected;
-  +          const productCountLabel = disabled ? '' : ` (${category.productCount})`;
-  +          const label = facet.displayProductCount
-  +            ? `${category.name}${productCountLabel}`
-  +            : category.name;
-
-            return {
-  -            label: facet.displayProductCount
-  -              ? `${category.name} (${category.productCount})`
-  -              : category.name,
-  +            label,
-              value: category.entityId.toString(),
-  -            disabled: refinedCategory == null && !isSelected,
-  +            disabled,
-            };
-          }),
-        };
-      }
-
-      if (facet.__typename === 'BrandSearchFilter') {
-        const refinedBrandSearchFilter =
-  -        refinedFacet?.__typename === 'BrandSearchFilter' ? refinedFacet : null;
-  +        refinedFacet.__typename === 'BrandSearchFilter' ? refinedFacet : null;
-
-        return {
-          type: 'toggle-group' as const,
-          paramName: 'brand',
-          label: facet.displayName,
-          defaultCollapsed: facet.isCollapsedByDefault,
-          options: facet.brands.map((brand) => {
-            const refinedBrand = refinedBrandSearchFilter?.brands.find(
-              (b) => b.entityId === brand.entityId,
-            );
-            const isSelected = filters.brandEntityIds?.includes(brand.entityId) === true;
-  +          const disabled = refinedBrand == null && !isSelected;
-  +          const productCountLabel = disabled ? '' : ` (${brand.productCount})`;
-  +          const label = facet.displayProductCount
-  +            ? `${brand.name}${productCountLabel}`
-  +            : brand.name;
-
-            return {
-  -            label: facet.displayProductCount ? `${brand.name} (${brand.productCount})` : brand.name,
-  +            label,
-              value: brand.entityId.toString(),
-  -            disabled: refinedBrand == null && !isSelected,
-  +            disabled,
-            };
-          }),
-        };
-      }
-
-      if (facet.__typename === 'ProductAttributeSearchFilter') {
-        const refinedProductAttributeSearchFilter =
-  -        refinedFacet?.__typename === 'ProductAttributeSearchFilter' ? refinedFacet : null;
-  +        refinedFacet.__typename === 'ProductAttributeSearchFilter' ? refinedFacet : null;
-
-        return {
-          type: 'toggle-group' as const,
-          paramName: `attr_${facet.filterKey}`,
-          label: facet.displayName,
-          defaultCollapsed: facet.isCollapsedByDefault,
-          options: facet.attributes.map((attribute) => {
-            const refinedAttribute = refinedProductAttributeSearchFilter?.attributes.find(
-              (a) => a.value === attribute.value,
-            );
-
-            const isSelected =
-              filters.productAttributes?.some((attr) => attr.values.includes(attribute.value)) ===
-              true;
-
-  +          const disabled = refinedAttribute == null && !isSelected;
-  +          const productCountLabel = disabled ? '' : ` (${attribute.productCount})`;
-  +          const label = facet.displayProductCount
-  +            ? `${attribute.value}${productCountLabel}`
-  +            : attribute.value;
-  +
-            return {
-  -            label: facet.displayProductCount
-  -              ? `${attribute.value} (${attribute.productCount})`
-  -              : attribute.value,
-  +            label,
-              value: attribute.value,
-  -            disabled: refinedAttribute == null && !isSelected,
-  +            disabled,
-            };
-          }),
-        };
-      }
-
-      if (facet.__typename === 'RatingSearchFilter') {
-        const refinedRatingSearchFilter =
-  -        refinedFacet?.__typename === 'RatingSearchFilter' ? refinedFacet : null;
-  +        refinedFacet.__typename === 'RatingSearchFilter' ? refinedFacet : null;
-        const isSelected = filters.rating?.minRating != null;
-
-        return {
-          type: 'rating' as const,
-          paramName: 'minRating',
-          label: facet.displayName,
-          disabled: refinedRatingSearchFilter == null && !isSelected,
-          defaultCollapsed: facet.isCollapsedByDefault,
-        };
-      }
-
-      if (facet.__typename === 'PriceSearchFilter') {
-        const refinedPriceSearchFilter =
-  -        refinedFacet?.__typename === 'PriceSearchFilter' ? refinedFacet : null;
-  +        refinedFacet.__typename === 'PriceSearchFilter' ? refinedFacet : null;
-        const isSelected = filters.price?.minPrice != null || filters.price?.maxPrice != null;
-
-        return {
-          type: 'range' as const,
-          minParamName: 'minPrice',
-          maxParamName: 'maxPrice',
-          label: facet.displayName,
-          min: facet.selected?.minPrice ?? undefined,
-          max: facet.selected?.maxPrice ?? undefined,
-          disabled: refinedPriceSearchFilter == null && !isSelected,
-          defaultCollapsed: facet.isCollapsedByDefault,
-        };
-      }
-
-      if (facet.freeShipping) {
-        const refinedFreeShippingSearchFilter =
-  -        refinedFacet?.__typename === 'OtherSearchFilter' && refinedFacet.freeShipping
-  +        refinedFacet.__typename === 'OtherSearchFilter' && refinedFacet.freeShipping
-            ? refinedFacet
-            : null;
-        const isSelected = filters.isFreeShipping === true;
-
-        return {
-          type: 'toggle-group' as const,
-          paramName: `shipping`,
-          label: t('freeShippingLabel'),
-          defaultCollapsed: facet.isCollapsedByDefault,
-          options: [
-            {
-              label: t('freeShippingLabel'),
-              value: 'free_shipping',
-              disabled: refinedFreeShippingSearchFilter == null && !isSelected,
-            },
-          ],
-        };
-      }
-
-      if (facet.isFeatured) {
-        const refinedIsFeaturedSearchFilter =
-  -        refinedFacet?.__typename === 'OtherSearchFilter' && refinedFacet.isFeatured
-  +        refinedFacet.__typename === 'OtherSearchFilter' && refinedFacet.isFeatured
-            ? refinedFacet
-            : null;
-        const isSelected = filters.isFeatured === true;
-
-        return {
-          type: 'toggle-group' as const,
-          paramName: `isFeatured`,
-          label: t('isFeaturedLabel'),
-          defaultCollapsed: facet.isCollapsedByDefault,
-          options: [
-            {
-              label: t('isFeaturedLabel'),
-              value: 'on',
-              disabled: refinedIsFeaturedSearchFilter == null && !isSelected,
-            },
-          ],
-        };
-      }
-
-      if (facet.isInStock) {
-        const refinedIsInStockSearchFilter =
-  -        refinedFacet?.__typename === 'OtherSearchFilter' && refinedFacet.isInStock
-  +        refinedFacet.__typename === 'OtherSearchFilter' && refinedFacet.isInStock
-            ? refinedFacet
-            : null;
-        const isSelected = filters.hideOutOfStock === true;
-
-        return {
-          type: 'toggle-group' as const,
-          paramName: `stock`,
-          label: t('inStockLabel'),
-          defaultCollapsed: facet.isCollapsedByDefault,
-          options: [
-            {
-              label: t('inStockLabel'),
-              value: 'in_stock',
-              disabled: refinedIsInStockSearchFilter == null && !isSelected,
-            },
-          ],
-        };
-      }
-
-      return null;
-    });
-  ```
-
-  ### Step 2
-
-  Fix the disabled state CSS classes in `core/vibes/soul/form/toggle-group/index.tsx`:
-
-  ```diff
-            <ToggleGroupPrimitive.Item
-              aria-label={option.label}
-              className={clsx(
-  -              'data-disabled:pointer-events-none data-disabled:opacity-50 h-12 whitespace-nowrap rounded-full border px-4 font-body text-sm font-normal leading-normal transition-colors focus-visible:outline-0 focus-visible:ring-2',
-  +              'h-12 whitespace-nowrap rounded-full border px-4 font-body text-sm font-normal leading-normal transition-colors focus-visible:outline-0 focus-visible:ring-2 data-[disabled]:pointer-events-none data-[disabled]:opacity-50',
-                {
-                  light:
-                    'border-[var(--toggle-group-light-border,hsl(var(--contrast-100)))] ring-[var(--toggle-group-light-focus,hsl(var(--primary)))] data-[state=on]:border-[var(--toggle-group-light-on-border,hsl(var(--foreground)))] data-[state=off]:bg-[var(--toggle-group-light-off-background,hsl(var(--background)))] data-[state=on]:bg-[var(--toggle-group-light-on-background,hsl(var(--foreground)))] data-[state=off]:text-[var(--toggle-group-light-off-text,hsl(var(--foreground)))] data-[state=on]:text-[var(--toggle-group-light-on-text,hsl(var(--background)))] data-[state=off]:hover:border-[var(--toggle-group-light-off-border-hover,hsl(var(--contrast-200)))] data-[state=off]:hover:bg-[var(--toggle-group-light-off-background-hover,hsl(var(--contrast-100)))]',
-  ```
-
-  ### Step 3
-
-  Update the FiltersPanel component in `core/vibes/soul/sections/products-list-section/filters-panel.tsx`
-
-  ```diff
-  import { clsx } from 'clsx';
-  import { parseAsString, useQueryStates } from 'nuqs';
-  -import { Suspense, useOptimistic, useState, useTransition } from 'react';
-  +import { useOptimistic, useState, useTransition } from 'react';
-
-  import { Checkbox } from '@/vibes/soul/form/checkbox';
-  import { RangeInput } from '@/vibes/soul/form/range-input';
-  import { ToggleGroup } from '@/vibes/soul/form/toggle-group';
-  -import { Streamable, useStreamable } from '@/vibes/soul/lib/streamable';
-  +import { Stream, Streamable, useStreamable } from '@/vibes/soul/lib/streamable';
-  import { Accordion, AccordionItem } from '@/vibes/soul/primitives/accordion';
-  import { Button } from '@/vibes/soul/primitives/button';
-  import { CursorPaginationInfo } from '@/vibes/soul/primitives/cursor-pagination';
-  import { Rating } from '@/vibes/soul/primitives/rating';
-  import { Link } from '~/components/link';
-
-  import { getFilterParsers } from './filter-parsers';
-  ```
-
-  ```diff
-    rangeFilterApplyLabel?: Streamable<string>;
-  }
-
-  +type InnerProps = Props & { filters: Filter[] };
-  +
-  function getParamCountLabel(params: Record<string, string | null | string[]>, key: string) {
-    const value = params[key];
-
-    if (Array.isArray(value) && value.length > 0) return `(${value.length})`;
-
-    return '';
-  }
-
-  export function FiltersPanel({
-    className,
-  -  filters,
-  +  filters: streamableFilters,
-    resetFiltersLabel,
-    rangeFilterApplyLabel,
-  }: Props) {
-    return (
-  -    <Suspense fallback={<FiltersSkeleton />}>
-  -      <FiltersPanelInner
-  -        className={className}
-  -        filters={filters}
-  -        rangeFilterApplyLabel={rangeFilterApplyLabel}
-  -        resetFiltersLabel={resetFiltersLabel}
-  -      />
-  -    </Suspense>
-  +    <Stream fallback={<FiltersSkeleton />} value={streamableFilters}>
-  +      {(filters) => (
-  +        <FiltersPanelInner
-  +          className={className}
-  +          filters={filters}
-  +          rangeFilterApplyLabel={rangeFilterApplyLabel}
-  +          resetFiltersLabel={resetFiltersLabel}
-  +        />
-  +      )}
-  +    </Stream>
-    );
-  }
-
-  export function FiltersPanelInner({
-    className,
-  -  filters: streamableFilters,
-  +  filters,
-    resetFiltersLabel: streamableResetFiltersLabel,
-    rangeFilterApplyLabel: streamableRangeFilterApplyLabel,
-    paginationInfo: streamablePaginationInfo,
-  -}: Props) {
-  -  const filters = useStreamable(streamableFilters);
-  +}: InnerProps) {
-    const resetFiltersLabel = useStreamable(streamableResetFiltersLabel) ?? 'Reset filters';
-    const rangeFilterApplyLabel = useStreamable(streamableRangeFilterApplyLabel);
-    const paginationInfo = useStreamable(streamablePaginationInfo);
-    const startCursorParamName = paginationInfo?.startCursorParamName ?? 'before';
-    const endCursorParamName = paginationInfo?.endCursorParamName ?? 'after';
-    const [params, setParams] = useQueryStates(
-      {
-        ...getFilterParsers(filters),
-        [startCursorParamName]: parseAsString,
-        [endCursorParamName]: parseAsString,
-      },
-      {
-        shallow: false,
-        history: 'push',
-      },
-    );
-    const [isPending, startTransition] = useTransition();
-    const [optimisticParams, setOptimisticParams] = useOptimistic(params);
-  -  const [accordionItems, setAccordionItems] = useState(() =>
-  +  const [expandedItems, setExpandedItems] = useState(() => {
-  +    const initial = new Set<string>();
-  +
-      filters
-        .filter((filter) => filter.type !== 'link-group')
-  -      .map((filter, index) => ({
-  -        key: index.toString(),
-  -        value: index.toString(),
-  +      .slice(0, 3)
-  +      .forEach((filter) => {
-  +        initial.add(filter.label.toLowerCase());
-  +      });
-  +
-  +    return initial;
-  +  });
-  +
-  +  const accordionItems = filters
-  +    .filter((filter) => filter.type !== 'link-group')
-  +    .map((filter) => {
-  +      return {
-  +        key: filter.label.toLowerCase(),
-  +        value: filter.label.toLowerCase(),
-          filter,
-  -        expanded: index < 3,
-  -      })),
-  -  );
-  +        expanded: expandedItems.has(filter.label.toLowerCase()),
-  +      };
-  +    });
-
-    if (filters.length === 0) return null;
-
-    const linkGroupFilters = filters.filter(
-      (filter): filter is LinkGroupFilter => filter.type === 'link-group',
-    );
-  ```
-
-  ```diff
-        ))}
-        <Accordion
-  -        onValueChange={(items) =>
-  -          setAccordionItems((prevItems) =>
-  -            prevItems.map((prevItem) => ({
-  -              ...prevItem,
-  -              expanded: items.includes(prevItem.value),
-  -            })),
-  -          )
-  -        }
-  +        onValueChange={(items) => {
-  +          setExpandedItems(new Set(items));
-  +        }}
-          type="multiple"
-          value={accordionItems.filter((item) => item.expanded).map((item) => item.value)}
-        >
-  ```
-
-- [#2822](https://github.com/bigcommerce/catalyst/pull/2822) [`5c3e4d2`](https://github.com/bigcommerce/catalyst/commit/5c3e4d25c2d929af2b86cee3e4133838e5f3987b) Thanks [@jordanarldt](https://github.com/jordanarldt)! - Run E2E tests on PRs, add 'required' prop to cart shipping calculator
-
-  ## Migration
-
-  Add `required` prop to the Country selector and Country input fields in `core/vibes/soul/sections/cart/shipping-form/index.tsx` on lines 280 and 289.
-
-- [#2813](https://github.com/bigcommerce/catalyst/pull/2813) [`ea9d633`](https://github.com/bigcommerce/catalyst/commit/ea9d6337d2bb8e5c166cb1de3385631e12fea4a3) Thanks [@jorgemoya](https://github.com/jorgemoya)! - Delete duplicate Select component.
-
-- [#2823](https://github.com/bigcommerce/catalyst/pull/2823) [`dcad856`](https://github.com/bigcommerce/catalyst/commit/dcad8565d5eb835a5a68785f59811a67149d0137) Thanks [@jorgemoya](https://github.com/jorgemoya)! - Refactor DynamicForm actions to decouple fields and passwordComplexity from state, passing them as separate arguments instead. This reduces state payload size by removing fields from state objects and stripping options from fields before passing them to actions (options are only needed for rendering, not processing). All form actions now accept a `DynamicFormActionArgs` object as the first parameter containing fields and optional passwordComplexity, followed by the previous state and formData.
-
-  ## Migration steps
-
-  ### Step 1: Changes to DynamicForm component
-
-  The `DynamicForm` component and related utilities have been updated to support the new action signature pattern:
-
-  **`core/vibes/soul/form/dynamic-form/index.tsx`**:
-  - Added `DynamicFormActionArgs<F>` interface that contains `fields` and optional `passwordComplexity`
-  - Updated `DynamicFormAction<F>` type to accept `DynamicFormActionArgs<F>` as the first parameter
-  - Removed `fields` and `passwordComplexity` from the `State` interface
-  - Added automatic removal of `options` from fields before passing to actions (options are only needed for rendering)
-  - Updated action binding to use `action.bind(null, { fields: fieldsWithoutOptions, passwordComplexity })`
-
-  **`core/vibes/soul/form/dynamic-form/utils.ts`** (new file):
-  - Added `removeOptionsFromFields()` utility function that strips the `options` property from field definitions before passing them to actions, reducing the state payload size
-
-  ```diff
-  + export interface DynamicFormActionArgs<F extends Field> {
-  +   fields: Array<F | FieldGroup<F>>;
-  +   passwordComplexity?: PasswordComplexitySettings | null;
-  + }
-  +
-  + type Action<F extends Field, S, P> = (
-  +   args: DynamicFormActionArgs<F>,
-  +   state: Awaited<S>,
-  +   payload: P,
-  + ) => S | Promise<S>;
-  +
-    interface State {
-      lastResult: SubmissionResult | null;
-  -   fields: Array<F | FieldGroup<F>>;
-  -   passwordComplexity?: PasswordComplexitySettings | null;
-    }
-  ```
-
-  ### Step 2: Update DynamicForm action signatures
-
-  All form actions that use `DynamicForm` must be updated to accept `DynamicFormActionArgs<F>` as the first parameter instead of including fields in the state.
-
-  Update your form action function signature:
-
-  ```diff
-  + import { DynamicFormActionArgs } from '@/vibes/soul/form/dynamic-form';
-    import { Field, FieldGroup, schema } from '@/vibes/soul/form/dynamic-form/schema';
-
-  - export async function myFormAction<F extends Field>(
-  -   prevState: {
-  -     lastResult: SubmissionResult | null;
-  -     fields: Array<F | FieldGroup<F>>;
-  -     passwordComplexity?: PasswordComplexitySettings | null;
-  -   },
-  -   formData: FormData,
-  - ) {
-  + export async function myFormAction<F extends Field>(
-  +   { fields, passwordComplexity }: DynamicFormActionArgs<F>,
-  +   _prevState: {
-  +     lastResult: SubmissionResult | null;
-  +   },
-  +   formData: FormData,
-  + ) {
-  ```
-
-  ### Step 2: Remove fields and passwordComplexity from state interfaces
-
-  Update state interfaces to remove fields and passwordComplexity properties:
-
-  ```diff
-    interface State {
-      lastResult: SubmissionResult | null;
-  -   fields: Array<Field | FieldGroup<Field>>;
-  -   passwordComplexity?: PasswordComplexitySettings | null;
-    }
-  ```
-
-  ### Step 3: Update action implementations
-
-  Remove references to `prevState.fields` and `prevState.passwordComplexity` in action implementations:
-
-  ```diff
-    const submission = parseWithZod(formData, {
-  -   schema: schema(prevState.fields, prevState.passwordComplexity),
-  +   schema: schema(fields, passwordComplexity),
-    });
-
-    if (submission.status !== 'success') {
-      return {
-        lastResult: submission.reply(),
-  -     fields: prevState.fields,
-  -     passwordComplexity: prevState.passwordComplexity,
-      };
-    }
-  ```
-
-  ### Step 4: Update action calls in components
-
-  For actions used with `AddressListSection`, update the action signature to accept fields as the first parameter:
-
-  ```diff
-  - export async function addressAction(
-  -   prevState: Awaited<State>,
-  -   formData: FormData,
-  - ): Promise<State> {
-  + export async function addressAction(
-  +   fields: Array<Field | FieldGroup<Field>>,
-  +   prevState: Awaited<State>,
-  +   formData: FormData,
-  + ): Promise<State> {
-  ```
-
-  ### Step 5: Update DynamicForm usage
-
-  No changes needed to `DynamicForm` component usage. The component automatically handles binding fields and passwordComplexity to actions. The `DynamicForm` component now:
-  - Automatically removes options from fields before passing them to actions (reducing payload size)
-  - Binds fields and passwordComplexity to the action using `action.bind()`
-  - Maintains the same props interface, so existing usage continues to work
-
-  ### Affected files
-
-  The following files were updated in this refactor:
-  - `core/vibes/soul/form/dynamic-form/index.tsx` - Added `DynamicFormActionArgs` type and updated action binding
-  - `core/vibes/soul/form/dynamic-form/utils.ts` - Added `removeOptionsFromFields` utility function
-  - `core/app/[locale]/(default)/(auth)/register/_actions/register-customer.ts`
-  - `core/app/[locale]/(default)/account/addresses/_actions/address-action.ts`
-  - `core/app/[locale]/(default)/account/addresses/_actions/create-address.ts`
-  - `core/app/[locale]/(default)/account/addresses/_actions/update-address.ts`
-  - `core/app/[locale]/(default)/account/addresses/_actions/delete-address.ts`
-  - `core/app/[locale]/(default)/gift-certificates/purchase/_actions/add-to-cart.tsx`
-  - `core/app/[locale]/(default)/webpages/[id]/contact/_actions/submit-contact-form.ts`
-  - `core/vibes/soul/sections/address-list-section/index.tsx`
-
-- [#2816](https://github.com/bigcommerce/catalyst/pull/2816) [`b4b87a3`](https://github.com/bigcommerce/catalyst/commit/b4b87a361790bf2edd7614bab1d97490d91ed22f) Thanks [@chanceaclark](https://github.com/chanceaclark)! - Add support for additional HTML attributes on script tags. The scripts transformer now extracts and passes through attributes like `async`, `defer`, `crossorigin`, and `data-*` attributes from BigCommerce script tags to the C15T consent manager, ensuring scripts load with their intended behavior.
-
-- [#2817](https://github.com/bigcommerce/catalyst/pull/2817) [`d469078`](https://github.com/bigcommerce/catalyst/commit/d4690786b17a7d05ef32f8941e4090101980f8bc) Thanks [@jorgemoya](https://github.com/jorgemoya)! - Persist the checkbox product modifier since it can modify pricing and other product data. By persisting this and tracking in the url, this will trigger a product refetch when added or removed. Incidentally, now we manually control what fields are persisted, since `option.isVariantOption` doesn't apply to `checkbox`, additionally multi options modifiers that are not variant options can also modify price and other product data.
-
-  ## Migration
-
-  ### Step 1
-
-  Update `product-options-transformer.ts` to manually track persisted fields:
-
-  ```ts
-  case 'DropdownList': {
-      return {
-          // before
-          // persist: option.isVariantOption,
-          // after (manually persist)
-          persist: true,
-          type: 'select',
-          label: option.displayName,
-          required: option.isRequired,
-          name: option.entityId.toString(),
-          defaultValue: values.find((value) => value.isDefault)?.entityId.toString(),
-          options: values.map((value) => ({
-          label: value.label,
-          value: value.entityId.toString(),
-          })),
-      };
-  }
-  ```
-
-  Fields that persist and can affect product pricing when selected:
-  - Swatch
-  - RectangleBoxes
-  - RadioButtons
-  - ProductPickList
-  - ProductPickListWithImages
-  - CheckboxOption
-
-  ### Step 2
-
-  Remove `isVariantOption` from GQL query since we no longer use it:
-
-  ```ts
-  export const ProductOptionsFragment = graphql(
-    `
-      fragment ProductOptionsFragment on Product {
-        entityId
-        productOptions(first: 50) {
-          edges {
-            node {
-              __typename
-              entityId
-              displayName
-              isRequired
-              isVariantOption // remove this
-              ...MultipleChoiceFieldFragment
-              ...CheckboxFieldFragment
-              ...NumberFieldFragment
-              ...TextFieldFragment
-              ...MultiLineTextFieldFragment
-              ...DateFieldFragment
-            }
-          }
-        }
-      }
-    `,
-    [
-      MultipleChoiceFieldFragment,
-      CheckboxFieldFragment,
-      NumberFieldFragment,
-      TextFieldFragment,
-      MultiLineTextFieldFragment,
-      DateFieldFragment,
-    ],
-  );
-  ```
-
-  ### Step 3
-
-  Update `product-detail-form.tsx` to include separate handing of the checkbox field:
-
-  ```ts
-  const defaultValue = fields.reduce<{
-    [Key in keyof SchemaRawShape]?: z.infer<SchemaRawShape[Key]>;
-  }>(
-    (acc, field) => {
-      // Checkbox field has to be handled separately because we want to convert checked or unchecked value to true or undefined respectively.
-      // This is because the form expects a boolean value, but we want to store the checked or unchecked value in the query params.
-      if (field.type === 'checkbox') {
-        if (params[field.name] === field.checkedValue) {
-          return {
-            ...acc,
-            [field.name]: 'true',
-          };
-        }
-
-        if (params[field.name] === field.uncheckedValue) {
-          return {
-            ...acc,
-            [field.name]: undefined,
-          };
-        }
-
-        return {
-          ...acc,
-          [field.name]: field.defaultValue, // Default value is either 'true' or undefined
-        };
-      }
-
-      return {
-        ...acc,
-        [field.name]: params[field.name] ?? field.defaultValue,
-      };
-    },
-    { quantity: minQuantity ?? 1 },
-  );
-
-  ...
-
-  const handleChange = useCallback(
-    (value: string) => {
-      // Checkbox field has to be handled separately because we want to convert 'true' or '' to the checked or unchecked value respectively.
-      if (field.type === 'checkbox') {
-        void setParams({ [field.name]: value ? field.checkedValue : field.uncheckedValue });
-      } else {
-        void setParams({ [field.name]: value || null }); // Passing `null` to remove the value from the query params if fieldValue is falsey
-      }
-
-      controls.change(value || ''); // If fieldValue is falsey, we set it to an empty string
-    },
-    [setParams, field, controls],
-  );
-  ```
-
-  ### Step 4
-
-  Update schema in `core/vibes/soul/sections/product-detail/schema.ts`:
-
-  ```ts
-  type CheckboxField = {
-    type: 'checkbox';
-    defaultValue?: string;
-    checkedValue: string; // add
-    uncheckedValue: string; // add
-  } & FormField;
-  ```
-
-- [#2820](https://github.com/bigcommerce/catalyst/pull/2820) [`a50fa6f`](https://github.com/bigcommerce/catalyst/commit/a50fa6fda64cbb1370862f43d272b0069f6d6307) Thanks [@jordanarldt](https://github.com/jordanarldt)! - Fix WishlistDetails page from exceeding GraphQL complexity limit, and fix wishlist e2e tests.
-
-  Additionally, add the `required` prop to `core/components/wishlist/modals/new.tsx` and `core/components/wishlist/modals/rename.tsx`
-
-  ## Migration
-
-  ### Step 1: Update wishlist GraphQL fragments
-
-  In `core/components/wishlist/fragment.ts`, replace the `WishlistItemProductFragment` to use explicit fields instead of `ProductCardFragment`:
-
-  ```typescript
-  export const WishlistItemProductFragment = graphql(
-    `
-      fragment WishlistItemProductFragment on Product {
-        entityId
-        name
-        defaultImage {
-          altText
-          url: urlTemplate(lossy: true)
-        }
-        path
-        brand {
-          name
-          path
-        }
-        reviewSummary {
-          numberOfReviews
-          averageRating
-        }
-        sku
-        showCartAction
-        inventory {
-          isInStock
-        }
-        availabilityV2 {
-          status
-        }
-        ...PricingFragment
-      }
-    `,
-    [PricingFragment],
-  );
-  ```
-
-  Remove `ProductCardFragment` from all fragment dependencies in the same file.
-
-  ### Step 2: Update product card transformer
-
-  In `core/data-transformers/product-card-transformer.ts`:
-  1. Import the `WishlistItemProductFragment`:
-     ```typescript
-     import { WishlistItemProductFragment } from '~/components/wishlist/fragment';
-     ```
-  2. Update the `singleProductCardTransformer` function signature to accept both fragment types:
-     ```typescript
-     product: ResultOf<typeof ProductCardFragment | typeof WishlistItemProductFragment>;
-     ```
-  3. Add a conditional check for the `inventoryMessage` field:
-     ```typescript
-     inventoryMessage:
-       'variants' in product
-         ? getInventoryMessage(product, outOfStockMessage, showBackorderMessage)
-         : undefined,
-     ```
-  4. Update the `productCardTransformer` function signature similarly:
-     ```typescript
-     products: Array<ResultOf<typeof ProductCardFragment | typeof WishlistItemProductFragment>>;
-     ```
-
-  ### Step 3: Fix wishlist e2e tests
-
-  In `core/tests/ui/e2e/account/wishlists.spec.ts`, update label selectors to use `{ exact: true }` for specificity:
-
-  Update all locators for the wishlist name input selectors:
-
-  ```diff
-  - page.getByLabel(t('Form.nameLabel'))
-  + page.getByLabel(t('Form.nameLabel'), { exact: true })
-  ```
-
-  ### Step 4: Fix mobile wishlist e2e tests
-
-  In `core/tests/ui/e2e/account/wishlists.mobile.spec.ts`, update translation calls to use namespace prefixes:
-  1. Update the translation initialization:
-
-  ```diff
-  - const t = await getTranslations('Account.Wishlist');
-  + const t = await getTranslations();
-  ```
-
-  2. Update all translation keys to include the namespace:
-
-  ```diff
-  - await locator.getByRole('button', { name: t('actionsTitle') }).click();
-  - await page.getByRole('menuitem', { name: t('share') }).click();
-  + await locator.getByRole('button', { name: t('Wishlist.actionsTitle') }).click();
-  + await page.getByRole('menuitem', { name: t('Wishlist.share') }).click();
-  ```
-
-  ```diff
-  - await expect(page.getByText(t('shareSuccess'))).toBeVisible();
-  + await expect(page.getByText(t('Wishlist.shareSuccess'))).toBeVisible();
-  ```
-
-  ### Step 5: Add `required` prop to wishlist modals
-
-  Update the modal forms to include the `required` prop on the name input field:
-
-  In `core/components/wishlist/modals/new.tsx`:
-
-  ```diff
-        <Input
-          {...getInputProps(fields.wishlistName, { type: 'text' })}
-          defaultValue={defaultValue.current}
-          errors={fields.wishlistName.errors}
-          key={fields.wishlistName.id}
-          label={nameLabel}
-          onChange={(e) => {
-            defaultValue.current = e.target.value;
-          }}
-  +       required
-        />
-  ```
-
-  In `core/components/wishlist/modals/rename.tsx`:
-
-  ```diff
-        <Input
-          {...getInputProps(fields.wishlistName, { type: 'text' })}
-          defaultValue={defaultValue.current}
-          errors={fields.wishlistName.errors}
-          key={fields.wishlistName.id}
-          label={nameLabel}
-          onChange={(e) => {
-            defaultValue.current = e.target.value;
-          }}
-  +       required
-        />
-  ```
-
-- [#2814](https://github.com/bigcommerce/catalyst/pull/2814) [`fcb946e`](https://github.com/bigcommerce/catalyst/commit/fcb946e47aafc8be2e63bf3fe776ec6caab1fa72) Thanks [@matthewvolk](https://github.com/matthewvolk)! - Shoppers will now see the store's actual password complexity requirements in the tooltip on the new customer registration form, preventing confusion and failed registration attempts. The schema() function in core/vibes/soul/form/dynamic-form/schema.ts now accepts an optional second parameter passwordComplexity to enable dynamic password validation. The DynamicForm, DynamicFormSection components and their associated server actions also accept an optional passwordComplexity prop that flows through to the schema. Action Required: If you have custom registration or password forms and want to use store-specific password complexity settings, fetch passwordComplexitySettings from the GraphQL API (under site.settings.customers.passwordComplexitySettings) and pass it to your DynamicFormSection component and maintain it in your server action's state. If you don't pass it, password validation defaults to: minimum 8 characters, at least one number, and at least one special character. Conflict Resolution: If merging into custom forms, ensure the passwordComplexity prop is threaded through: Page → DynamicFormSection → DynamicForm → useActionState → schema(). In server actions, add passwordComplexity?: Parameters<typeof schema>[1] to your state type and include it in all return statements to maintain state consistency.
-
-- [#2821](https://github.com/bigcommerce/catalyst/pull/2821) [`e5a03f6`](https://github.com/bigcommerce/catalyst/commit/e5a03f6a73fe16da55b96b75de70d3bbd846dfba) Thanks [@jordanarldt](https://github.com/jordanarldt)! - Fix data-disabled class selectors in UI components
-
-  ## Migration
-
-  Updated Tailwind CSS class selectors from `data-disabled:` to `data-[disabled]:` in the following components:
-  - `vibes/soul/form/button-radio-group/index.tsx`
-  - `vibes/soul/form/card-radio-group/index.tsx`
-  - `vibes/soul/form/radio-group/index.tsx`
-  - `vibes/soul/form/rating-radio-group/index.tsx`
-  - `vibes/soul/form/swatch-radio-group/index.tsx`
-  - `vibes/soul/form/switch/index.tsx`
-  - `vibes/soul/primitives/dropdown-menu/index.tsx`
-
-  If you have customized any of these components, update your class names:
-
-  ```diff
-  - data-disabled:pointer-events-none data-disabled:opacity-50
-  + data-[disabled]:pointer-events-none data-[disabled]:opacity-50
-  ```
-
-  This change ensures proper styling of disabled states using the correct Tailwind CSS data attribute syntax.
-
-- [#2819](https://github.com/bigcommerce/catalyst/pull/2819) [`a1f1ed8`](https://github.com/bigcommerce/catalyst/commit/a1f1ed857eab954e085ba67956a954fb2b63882a) Thanks [@jamesqquick](https://github.com/jamesqquick)! - The login form input data will no longer reset on a failed login attempt.
-
-- [#2836](https://github.com/bigcommerce/catalyst/pull/2836) [`06fd9aa`](https://github.com/bigcommerce/catalyst/commit/06fd9aa921ad2c4b8b60706e114a9f425f049d40) Thanks [@bc-svc-local](https://github.com/bc-svc-local)! - Update translations.
-
-- [#2826](https://github.com/bigcommerce/catalyst/pull/2826) [`b5f460c`](https://github.com/bigcommerce/catalyst/commit/b5f460c0a5fa5161c853884e18816796b9ea73d9) Thanks [@bc-svc-local](https://github.com/bc-svc-local)! - Update translations.
-
-- [#2815](https://github.com/bigcommerce/catalyst/pull/2815) [`52ee85e`](https://github.com/bigcommerce/catalyst/commit/52ee85ef1b08fc6114aa953f7a7e67c11876e7e2) Thanks [@jamesqquick](https://github.com/jamesqquick)! - Add default optional text to form input labels for inputs that are not required.
-
-  ## Migration
-
-  The new required props are optional, so they are backwards compatible. However, this does mean that the `(optional)` text will now show up on fields that aren't explicitly marked as required by passing the required prop to the Label component.
-
-- [#2829](https://github.com/bigcommerce/catalyst/pull/2829) [`8096cc5`](https://github.com/bigcommerce/catalyst/commit/8096cc5ebaf983431f06bd2bd94a9a81899c2b29) Thanks [@jorgemoya](https://github.com/jorgemoya)! - Improve accessibility for price displays by adding screen reader announcements for original prices, sale prices, and price ranges. Visual price elements are hidden from assistive technologies using `aria-hidden="true"` to prevent duplicate announcements, while visually hidden text provides context about pricing information.
-
-  ## Migration steps
-
-  ### Step 1: Update Cart Price Display
-
-  Update `core/vibes/soul/sections/cart/client.tsx` to add accessibility labels for sale prices:
-
-  ```diff
-          {lineItem.salePrice && lineItem.salePrice !== lineItem.price ? (
-            <span className="font-medium @xl:ml-auto">
-  -           <span className="line-through">{lineItem.price}</span> {lineItem.salePrice}
-  +           <span className="sr-only">{t('originalPrice', { price: lineItem.price })}</span>
-  +           <span aria-hidden="true" className="line-through">
-  +             {lineItem.price}
-  +           </span>{' '}
-  +           <span className="sr-only">{t('currentPrice', { price: lineItem.salePrice })}</span>
-  +           <span aria-hidden="true">{lineItem.salePrice}</span>
-            </span>
-          ) : (
-            <span className="font-medium @xl:ml-auto">{lineItem.price}</span>
-          )}
-  ```
-
-  ### Step 2: Update PriceLabel Component
-
-  Update `core/vibes/soul/primitives/price-label/index.tsx` to add accessibility improvements for sale prices and price ranges:
-
-  ```diff
-    import { clsx } from 'clsx';
-  + import { useTranslations } from 'next-intl';
-
-    export function PriceLabel({ className, colorScheme = 'light', price }: Props) {
-  +   const t = useTranslations('Components.Price');
-
-      if (typeof price === 'string') {
-        return (
-          ...
-        );
-      }
-
-      switch (price.type) {
-        case 'range':
-          return (
-            <span ...>
-  -           {price.minValue}
-  -           &nbsp;&ndash;&nbsp;
-  -           {price.maxValue}
-  +           <span className="sr-only">
-  +             {t('range', { minValue: price.minValue, maxValue: price.maxValue })}
-  +           </span>
-  +           <span aria-hidden="true">
-  +             {price.minValue} - {price.maxValue}
-  +           </span>
-            </span>
-          );
-
-        case 'sale':
-          return (
-            <span className={clsx('block font-semibold', className)}>
-  +           <span className="sr-only">{t('originalPrice', { price: price.previousValue })}</span>
-              <span
-  +             aria-hidden="true"
-                className={clsx(
-                  'font-normal line-through opacity-50',
-                  ...
-                )}
-              >
-                {price.previousValue}
-              </span>{' '}
-  +           <span className="sr-only">{t('currentPrice', { price: price.currentValue })}</span>
-              <span
-  +             aria-hidden="true"
-                className={clsx(
-                  ...
-                )}
-              >
-                {price.currentValue}
-              </span>
-            </span>
-          );
-      }
-    }
-  ```
-
-  ### Step 3: Add Translation Keys
-
-  Update `core/messages/en.json` to include new translation keys for price accessibility:
-
-  ```diff
-    "Cart": {
-      "title": "Cart",
-      "heading": "Your cart",
-      "proceedToCheckout": "Proceed to checkout",
-      "increment": "Increase quantity",
-      "decrement": "Decrease quantity",
-      "removeItem": "Remove item",
-      "cartCombined": "We noticed you had items saved in a previous cart, so we've added them to your current cart for you.",
-      "cartRestored": "You started a cart on another device, and we've restored it here so you can pick up where you left off.",
-      "cartUpdateInProgress": "You have a cart update in progress. Are you sure you want to leave this page? Your changes may be lost.",
-  +   "originalPrice": "Original price was {price}.",
-  +   "currentPrice": "Current price is {price}.",
-  ```
-
-  ```diff
-      },
-  +   "Price": {
-  +     "originalPrice": "Original price was {price}.",
-  +     "currentPrice": "Current price is {price}.",
-  +     "range": "Price from {minValue} to {maxValue}."
-  +   }
-    },
-    "GiftCertificates": {
-  ```
-
-- [#2809](https://github.com/bigcommerce/catalyst/pull/2809) [`dd559b2`](https://github.com/bigcommerce/catalyst/commit/dd559b2d9f354387e19d7c81a809eed97bfc9be3) Thanks [@jorgemoya](https://github.com/jorgemoya)! - Minor UX improvements for the Reviews section:
-  - Show `totalCount` for reviews.
-  - Show `averageRating` up to the first decimal.
-  - Hide `averageRating` next to rating stars when there are no reviews.
-
 ## 1.4.0
 
 ### Minor Changes

From db27c0f6761786acce3fa1ce9b509a526a47a931 Mon Sep 17 00:00:00 2001
From: Jorge Moya <jorge.moya@bigcommerce.com>
Date: Tue, 27 Jan 2026 10:53:04 -0600
Subject: [PATCH 27/69] chore: generate changeset for 1.4.1 release

---
 .changeset/blue-bees-mate.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/blue-bees-mate.md

diff --git a/.changeset/blue-bees-mate.md b/.changeset/blue-bees-mate.md
new file mode 100644
index 0000000000..e7eaab7c7f
--- /dev/null
+++ b/.changeset/blue-bees-mate.md
@@ -0,0 +1,5 @@
+---
+"@bigcommerce/catalyst-makeswift": patch
+---
+
+Pulls in changes from the `@bigcommerce/catalyst-core@1.4.1` patch.

From d3e8bb58fdf09f6406c55493194e7ef2d78ff05a Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 27 Jan 2026 17:08:21 +0000
Subject: [PATCH 28/69] Version Packages (`integrations/makeswift`)

---
 .changeset/blue-bees-mate.md | 5 -----
 core/CHANGELOG.md            | 6 ++++++
 core/package.json            | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)
 delete mode 100644 .changeset/blue-bees-mate.md

diff --git a/.changeset/blue-bees-mate.md b/.changeset/blue-bees-mate.md
deleted file mode 100644
index e7eaab7c7f..0000000000
--- a/.changeset/blue-bees-mate.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@bigcommerce/catalyst-makeswift": patch
----
-
-Pulls in changes from the `@bigcommerce/catalyst-core@1.4.1` patch.
diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md
index 25dd1c0cc6..af46d7d876 100644
--- a/core/CHANGELOG.md
+++ b/core/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.4.1
+
+### Patch Changes
+
+- [#2839](https://github.com/bigcommerce/catalyst/pull/2839) [`db27c0f`](https://github.com/bigcommerce/catalyst/commit/db27c0f6761786acce3fa1ce9b509a526a47a931) Thanks [@jorgemoya](https://github.com/jorgemoya)! - Pulls in changes from the `@bigcommerce/catalyst-core@1.4.1` patch.
+
 ## 1.4.0
 
 ### Minor Changes
diff --git a/core/package.json b/core/package.json
index 569c349b87..45157f13c6 100644
--- a/core/package.json
+++ b/core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@bigcommerce/catalyst-makeswift",
   "description": "BigCommerce Catalyst is a Next.js starter kit for building headless BigCommerce storefronts.",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "private": true,
   "scripts": {
     "dev": "npm run generate && next dev",

From aadc1e35533733905e7ce9ada457c2679995a727 Mon Sep 17 00:00:00 2001
From: Chancellor Clark <chancellor.clark@bigcommerce.com>
Date: Tue, 27 Jan 2026 11:40:12 -0700
Subject: [PATCH 29/69] chore(deps): update next and react to address CVE
 (#2842)

---
 .changeset/shaggy-clubs-make.md |   5 +
 core/package.json               |  10 +-
 pnpm-lock.yaml                  | 953 ++++++++++++++++----------------
 3 files changed, 487 insertions(+), 481 deletions(-)
 create mode 100644 .changeset/shaggy-clubs-make.md

diff --git a/.changeset/shaggy-clubs-make.md b/.changeset/shaggy-clubs-make.md
new file mode 100644
index 0000000000..8c7c938700
--- /dev/null
+++ b/.changeset/shaggy-clubs-make.md
@@ -0,0 +1,5 @@
+---
+"@bigcommerce/catalyst-core": patch
+---
+
+Addresses https://vercel.com/changelog/summary-of-cve-2026-23864 by bumping React and Next.js
diff --git a/core/package.json b/core/package.json
index e5a692c3de..4ab5496907 100644
--- a/core/package.json
+++ b/core/package.json
@@ -57,14 +57,14 @@
     "lodash.debounce": "^4.0.8",
     "lru-cache": "^11.1.0",
     "lucide-react": "^0.474.0",
-    "next": "15.5.9",
+    "next": "15.5.10",
     "next-auth": "5.0.0-beta.30",
     "next-intl": "^4.1.0",
     "nuqs": "^2.4.3",
     "p-lazy": "^5.0.0",
-    "react": "19.1.4",
+    "react": "19.1.5",
     "react-day-picker": "^9.7.0",
-    "react-dom": "19.1.4",
+    "react-dom": "19.1.5",
     "react-headroom": "^3.2.1",
     "schema-dts": "^1.1.5",
     "server-only": "^0.0.1",
@@ -79,7 +79,7 @@
     "@bigcommerce/eslint-config-catalyst": "workspace:^",
     "@faker-js/faker": "^9.8.0",
     "@gql.tada/cli-utils": "^1.6.3",
-    "@next/bundle-analyzer": "15.5.9",
+    "@next/bundle-analyzer": "15.5.10",
     "@playwright/test": "^1.52.0",
     "@tailwindcss/container-queries": "^0.1.1",
     "@tailwindcss/typography": "^0.5.16",
@@ -94,7 +94,7 @@
     "dotenv": "^16.5.0",
     "dotenv-cli": "^8.0.0",
     "eslint": "^8.57.1",
-    "eslint-config-next": "15.5.8",
+    "eslint-config-next": "15.5.10",
     "postcss": "^8.5.4",
     "postcss-preset-env": "^10.2.1",
     "prettier": "^3.6.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 960181c124..6a329e0923 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -40,16 +40,16 @@ importers:
         version: link:../packages/client
       '@c15t/nextjs':
         specifier: ^1.8.2
-        version: 1.8.2(@opentelemetry/api@1.9.0)(@opentelemetry/instrumentation@0.208.0(@opentelemetry/api@1.9.0))(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(@upstash/redis@1.35.0)(crossws@0.3.5)(next@15.5.9(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.4(react@19.1.4))(react@19.1.4))(react-dom@19.1.4(react@19.1.4))(react@19.1.4)(typeorm@0.3.27(reflect-metadata@0.2.2)(ts-node@10.9.2(@swc/core@1.11.31)(@types/node@22.15.30)(typescript@5.8.3)))(ws@8.18.2)
+        version: 1.8.2(@opentelemetry/api@1.9.0)(@opentelemetry/instrumentation@0.208.0(@opentelemetry/api@1.9.0))(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(@upstash/redis@1.35.0)(crossws@0.3.5)(next@15.5.10(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5))(react-dom@19.1.5(react@19.1.5))(react@19.1.5)(typeorm@0.3.27(reflect-metadata@0.2.2)(ts-node@10.9.2(@swc/core@1.11.31)(@types/node@22.15.30)(typescript@5.8.3)))(ws@8.18.2)
       '@conform-to/react':
         specifier: ^1.6.1
-        version: 1.6.1(react@19.1.4)
+        version: 1.6.1(react@19.1.5)
       '@conform-to/zod':
         specifier: ^1.6.1
         version: 1.6.1(zod@3.25.51)
       '@icons-pack/react-simple-icons':
         specifier: ^11.2.0
-        version: 11.2.0(react@19.1.4)
+        version: 11.2.0(react@19.1.5)
       '@opentelemetry/api':
         specifier: ^1.9.0
         version: 1.9.0
@@ -64,46 +64,46 @@ importers:
         version: 0.208.0(@opentelemetry/api@1.9.0)
       '@radix-ui/react-accordion':
         specifier: ^1.2.11
-        version: 1.2.11(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
+        version: 1.2.11(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
       '@radix-ui/react-checkbox':
         specifier: ^1.3.2
-        version: 1.3.2(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
+        version: 1.3.2(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
       '@radix-ui/react-dialog':
         specifier: ^1.1.14
-        version: 1.1.14(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
+        version: 1.1.14(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
       '@radix-ui/react-dropdown-menu':
         specifier: ^2.1.15
-        version: 2.1.15(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
+        version: 2.1.15(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
       '@radix-ui/react-label':
         specifier: ^2.1.7
-        version: 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
+        version: 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
       '@radix-ui/react-navigation-menu':
         specifier: ^1.2.13
-        version: 1.2.13(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
+        version: 1.2.13(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
       '@radix-ui/react-popover':
         specifier: ^1.1.14
-        version: 1.1.14(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
+        version: 1.1.14(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
       '@radix-ui/react-portal':
         specifier: ^1.1.9
-        version: 1.1.9(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
+        version: 1.1.9(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
       '@radix-ui/react-radio-group':
         specifier: ^1.3.7
-        version: 1.3.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
+        version: 1.3.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
       '@radix-ui/react-select':
         specifier: ^2.2.5
-        version: 2.2.5(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
+        version: 2.2.5(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
       '@radix-ui/react-switch':
         specifier: ^1.2.5
-        version: 1.2.5(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
+        version: 1.2.5(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
       '@radix-ui/react-toggle':
         specifier: ^1.1.9
-        version: 1.1.9(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
+        version: 1.1.9(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
       '@radix-ui/react-toggle-group':
         specifier: ^1.1.10
-        version: 1.1.10(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
+        version: 1.1.10(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
       '@radix-ui/react-tooltip':
         specifier: ^1.2.7
-        version: 1.2.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
+        version: 1.2.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
       '@t3-oss/env-core':
         specifier: ^0.13.6
         version: 0.13.6(typescript@5.8.3)(zod@3.25.51)
@@ -112,7 +112,7 @@ importers:
         version: 1.35.0
       '@vercel/analytics':
         specifier: ^1.5.0
-        version: 1.5.0(next@15.5.9(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.4(react@19.1.4))(react@19.1.4))(react@19.1.4)(svelte@5.1.15)(vue@3.5.16(typescript@5.8.3))
+        version: 1.5.0(next@15.5.10(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5))(react@19.1.5)(svelte@5.1.15)(vue@3.5.16(typescript@5.8.3))
       '@vercel/functions':
         specifier: ^2.2.12
         version: 2.2.12(@aws-sdk/credential-provider-web-identity@3.864.0)
@@ -121,7 +121,7 @@ importers:
         version: 2.1.0(@opentelemetry/api-logs@0.208.0)(@opentelemetry/api@1.9.0)(@opentelemetry/instrumentation@0.208.0(@opentelemetry/api@1.9.0))(@opentelemetry/resources@2.2.0(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-logs@0.208.0(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-metrics@2.0.1(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@2.2.0(@opentelemetry/api@1.9.0))
       '@vercel/speed-insights':
         specifier: ^1.2.0
-        version: 1.2.0(next@15.5.9(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.4(react@19.1.4))(react@19.1.4))(react@19.1.4)(svelte@5.1.15)(vue@3.5.16(typescript@5.8.3))
+        version: 1.2.0(next@15.5.10(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5))(react@19.1.5)(svelte@5.1.15)(vue@3.5.16(typescript@5.8.3))
       clsx:
         specifier: ^2.1.1
         version: 2.1.1
@@ -142,7 +142,7 @@ importers:
         version: 8.5.2(embla-carousel@8.5.2)
       embla-carousel-react:
         specifier: 8.5.2
-        version: 8.5.2(react@19.1.4)
+        version: 8.5.2(react@19.1.5)
       gql.tada:
         specifier: ^1.8.10
         version: 1.8.10(graphql@16.11.0)(typescript@5.8.3)
@@ -163,34 +163,34 @@ importers:
         version: 11.1.0
       lucide-react:
         specifier: ^0.474.0
-        version: 0.474.0(react@19.1.4)
+        version: 0.474.0(react@19.1.5)
       next:
-        specifier: 15.5.9
-        version: 15.5.9(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
+        specifier: 15.5.10
+        version: 15.5.10(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
       next-auth:
         specifier: 5.0.0-beta.30
-        version: 5.0.0-beta.30(next@15.5.9(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.4(react@19.1.4))(react@19.1.4))(react@19.1.4)
+        version: 5.0.0-beta.30(next@15.5.10(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5))(react@19.1.5)
       next-intl:
         specifier: ^4.1.0
-        version: 4.1.0(next@15.5.9(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.4(react@19.1.4))(react@19.1.4))(react@19.1.4)(typescript@5.8.3)
+        version: 4.1.0(next@15.5.10(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5))(react@19.1.5)(typescript@5.8.3)
       nuqs:
         specifier: ^2.4.3
-        version: 2.4.3(next@15.5.9(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.4(react@19.1.4))(react@19.1.4))(react@19.1.4)
+        version: 2.4.3(next@15.5.10(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5))(react@19.1.5)
       p-lazy:
         specifier: ^5.0.0
         version: 5.0.0
       react:
-        specifier: 19.1.4
-        version: 19.1.4
+        specifier: 19.1.5
+        version: 19.1.5
       react-day-picker:
         specifier: ^9.7.0
-        version: 9.7.0(react@19.1.4)
+        version: 9.7.0(react@19.1.5)
       react-dom:
-        specifier: 19.1.4
-        version: 19.1.4(react@19.1.4)
+        specifier: 19.1.5
+        version: 19.1.5(react@19.1.5)
       react-headroom:
         specifier: ^3.2.1
-        version: 3.2.1(react@19.1.4)
+        version: 3.2.1(react@19.1.5)
       schema-dts:
         specifier: ^1.1.5
         version: 1.1.5
@@ -199,7 +199,7 @@ importers:
         version: 0.0.1
       sonner:
         specifier: ^1.7.4
-        version: 1.7.4(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
+        version: 1.7.4(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
       tailwindcss-radix:
         specifier: ^3.0.5
         version: 3.0.5(tailwindcss@3.4.17(ts-node@10.9.2(@swc/core@1.11.31)(@types/node@22.15.30)(typescript@5.8.3)))
@@ -226,8 +226,8 @@ importers:
         specifier: ^1.6.3
         version: 1.6.3(@0no-co/graphqlsp@1.12.16(graphql@16.11.0)(typescript@5.8.3))(graphql@16.11.0)(typescript@5.8.3)
       '@next/bundle-analyzer':
-        specifier: 15.5.9
-        version: 15.5.9
+        specifier: 15.5.10
+        version: 15.5.10
       '@playwright/test':
         specifier: ^1.52.0
         version: 1.52.0
@@ -271,8 +271,8 @@ importers:
         specifier: ^8.57.1
         version: 8.57.1
       eslint-config-next:
-        specifier: 15.5.8
-        version: 15.5.8(eslint@8.57.1)(typescript@5.8.3)
+        specifier: 15.5.10
+        version: 15.5.10(eslint@8.57.1)(typescript@5.8.3)
       postcss:
         specifier: ^8.5.4
         version: 8.5.6
@@ -2467,17 +2467,17 @@ packages:
   '@napi-rs/wasm-runtime@0.2.7':
     resolution: {integrity: sha512-5yximcFK5FNompXfJFoWanu5l8v1hNGqNHh9du1xETp9HWk/B/PzvchX55WYOPaIeNglG8++68AAiauBAtbnzw==}
 
-  '@next/bundle-analyzer@15.5.9':
-    resolution: {integrity: sha512-lT1EBpFyGVN9u8M43f2jE78DsCu0A5KPA5OkF5PdIHrKDo4oTJ4lUQKciA9T2u9gccSXIPQcZb5TYkHF4f8iiw==}
+  '@next/bundle-analyzer@15.5.10':
+    resolution: {integrity: sha512-yQk9mNbVtxZhVdaPlw42vOMl8lc7Xfr05SyhzhXsyI1tWjKaG5EWe1ASXyeSG2MQic2YTLrcJrX4UBCx2xHgNQ==}
 
-  '@next/env@15.5.9':
-    resolution: {integrity: sha512-4GlTZ+EJM7WaW2HEZcyU317tIQDjkQIyENDLxYJfSWlfqguN+dHkZgyQTV/7ykvobU7yEH5gKvreNrH4B6QgIg==}
+  '@next/env@15.5.10':
+    resolution: {integrity: sha512-plg+9A/KoZcTS26fe15LHg+QxReTazrIOoKKUC3Uz4leGGeNPgLHdevVraAAOX0snnUs3WkRx3eUQpj9mreG6A==}
 
   '@next/eslint-plugin-next@15.3.3':
     resolution: {integrity: sha512-VKZJEiEdpKkfBmcokGjHu0vGDG+8CehGs90tBEy/IDoDDKGngeyIStt2MmE5FYNyU9BhgR7tybNWTAJY/30u+Q==}
 
-  '@next/eslint-plugin-next@15.5.8':
-    resolution: {integrity: sha512-PBv6j6YxyC9cFgZKSGFlFydQ+lzzR3Fs1GBr9Z2YzoZK7dH/K8ebRtZiN4pV+b8MbSJiHjZYTKVPKF/UzNgrOA==}
+  '@next/eslint-plugin-next@15.5.10':
+    resolution: {integrity: sha512-fDpxcy6G7Il4lQVVsaJD0fdC2/+SmuBGTF+edRLlsR4ZFOE3W2VyzrrGYdg/pHW8TydeAdSVM+mIzITGtZ3yWA==}
 
   '@next/swc-darwin-arm64@15.5.7':
     resolution: {integrity: sha512-IZwtxCEpI91HVU/rAUOOobWSZv4P2DeTtNaCdHqLcTJU4wdNXgAySvKa/qJCgR5m6KI8UsKDXtO2B31jcaw1Yw==}
@@ -6145,8 +6145,8 @@ packages:
     engines: {node: '>=6.0'}
     hasBin: true
 
-  eslint-config-next@15.5.8:
-    resolution: {integrity: sha512-FU2nFCVYt3z60EH8upds4frThuIAiSt81zUtQI/9fIc25VVVT3yaKsFwGIY6BIDT/I0X/Dam+RR7xzTRZMyArQ==}
+  eslint-config-next@15.5.10:
+    resolution: {integrity: sha512-AeYOVGiSbIfH4KXFT3d0fIDm7yTslR/AWGoHLdsXQ99MH0zFWmkRIin1H7I9SFlkKgf4PKm9ncsyWHq1aAfHBA==}
     peerDependencies:
       eslint: ^7.23.0 || ^8.0.0 || ^9.0.0
       typescript: '>=3.3.1'
@@ -7923,8 +7923,8 @@ packages:
       typescript:
         optional: true
 
-  next@15.5.9:
-    resolution: {integrity: sha512-agNLK89seZEtC5zUHwtut0+tNrc0Xw4FT/Dg+B/VLEo9pAcS9rtTKpek3V6kVcVwsB2YlqMaHdfZL4eLEVYuCg==}
+  next@15.5.10:
+    resolution: {integrity: sha512-r0X65PNwyDDyOrWNKpQoZvOatw7BcsTPRKdwEqtc9cj3wv7mbBIk9tKed4klRaFXJdX0rugpuMTHslDrAU1bBg==}
     engines: {node: ^18.18.0 || ^19.8.0 || >= 20.0.0}
     hasBin: true
     peerDependencies:
@@ -8705,6 +8705,7 @@ packages:
   puppeteer@24.10.0:
     resolution: {integrity: sha512-Oua9VkGpj0S2psYu5e6mCer6W9AU9POEQh22wRgSXnLXASGH+MwLUVWgLCLeP9QPHHcJ7tySUlg4Sa9OJmaLpw==}
     engines: {node: '>=18'}
+    deprecated: < 24.15.0 is no longer supported
     hasBin: true
 
   pure-rand@6.1.0:
@@ -8758,10 +8759,10 @@ packages:
     peerDependencies:
       react: '>=16.8.0'
 
-  react-dom@19.1.4:
-    resolution: {integrity: sha512-s2868ab/xo2SI6H4106A7aFI8Mrqa4xC6HZT/pBzYyQ3cBLqa88hu47xYD8xf+uECleN698Awn7RCWlkTiKnqQ==}
+  react-dom@19.1.5:
+    resolution: {integrity: sha512-tvMijysf97vcHla1PNI/aU2apv7f4r0ct0OBk3i3QOBfsVhZzHEuPBLemClkfuw8LroE4FH6kXcQOftf2ntPHQ==}
     peerDependencies:
-      react: ^19.1.4
+      react: ^19.1.5
 
   react-headroom@3.2.1:
     resolution: {integrity: sha512-C+7bmTwmHWIOjU1r5aSLm4tAQKjmqW4PB65tHllE/D6h+If1+V3gy83BOvp46OCo25LtJJlLa/HDs7Eq5OPFgA==}
@@ -8804,8 +8805,8 @@ packages:
       '@types/react':
         optional: true
 
-  react@19.1.4:
-    resolution: {integrity: sha512-DHINL3PAmPUiK1uszfbKiXqfE03eszdt5BpVSuEAHb5nfmNPwnsy7g39h2t8aXFc/Bv99GH81s+j8dobtD+jOw==}
+  react@19.1.5:
+    resolution: {integrity: sha512-lCX00zqONdNfcnJYEL91LuNYzyWFU70vKhApUR08Y1Fi/Y5FGw6l6hAWtlkq+k/vnx463XLm/5dyQp5HAJCw6Q==}
     engines: {node: '>=0.10.0'}
 
   read-cache@1.0.0:
@@ -11478,9 +11479,9 @@ snapshots:
       '@typescript-eslint/parser': 8.28.0(eslint@8.57.1)(typescript@5.8.3)
       eslint: 8.57.1
       eslint-config-prettier: 9.1.0(eslint@8.57.1)
-      eslint-import-resolver-typescript: 3.9.1(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1))(eslint@8.57.1)
+      eslint-import-resolver-typescript: 3.9.1(eslint-plugin-import@2.31.0)(eslint@8.57.1)
       eslint-plugin-gettext: 1.2.0
-      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint-import-resolver-typescript@3.9.1(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1)
+      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint-import-resolver-typescript@3.9.1)(eslint@8.57.1)
       eslint-plugin-jest: 28.11.0(@typescript-eslint/eslint-plugin@8.28.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1)(jest@29.7.0(@types/node@22.15.30)(ts-node@10.9.2(@swc/core@1.11.31)(@types/node@22.15.30)(typescript@5.8.3)))(typescript@5.8.3)
       eslint-plugin-jest-dom: 5.5.0(eslint@8.57.1)
       eslint-plugin-jest-formatting: 3.1.0(eslint@8.57.1)
@@ -11585,13 +11586,13 @@ snapshots:
       neverthrow: 8.2.0
       picocolors: 1.1.1
 
-  '@c15t/nextjs@1.8.2(@opentelemetry/api@1.9.0)(@opentelemetry/instrumentation@0.208.0(@opentelemetry/api@1.9.0))(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(@upstash/redis@1.35.0)(crossws@0.3.5)(next@15.5.9(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.4(react@19.1.4))(react@19.1.4))(react-dom@19.1.4(react@19.1.4))(react@19.1.4)(typeorm@0.3.27(reflect-metadata@0.2.2)(ts-node@10.9.2(@swc/core@1.11.31)(@types/node@22.15.30)(typescript@5.8.3)))(ws@8.18.2)':
+  '@c15t/nextjs@1.8.2(@opentelemetry/api@1.9.0)(@opentelemetry/instrumentation@0.208.0(@opentelemetry/api@1.9.0))(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(@upstash/redis@1.35.0)(crossws@0.3.5)(next@15.5.10(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5))(react-dom@19.1.5(react@19.1.5))(react@19.1.5)(typeorm@0.3.27(reflect-metadata@0.2.2)(ts-node@10.9.2(@swc/core@1.11.31)(@types/node@22.15.30)(typescript@5.8.3)))(ws@8.18.2)':
     dependencies:
-      '@c15t/react': 1.8.2(@opentelemetry/api@1.9.0)(@opentelemetry/instrumentation@0.208.0(@opentelemetry/api@1.9.0))(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(@upstash/redis@1.35.0)(crossws@0.3.5)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)(typeorm@0.3.27(reflect-metadata@0.2.2)(ts-node@10.9.2(@swc/core@1.11.31)(@types/node@22.15.30)(typescript@5.8.3)))(ws@8.18.2)
+      '@c15t/react': 1.8.2(@opentelemetry/api@1.9.0)(@opentelemetry/instrumentation@0.208.0(@opentelemetry/api@1.9.0))(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(@upstash/redis@1.35.0)(crossws@0.3.5)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)(typeorm@0.3.27(reflect-metadata@0.2.2)(ts-node@10.9.2(@swc/core@1.11.31)(@types/node@22.15.30)(typescript@5.8.3)))(ws@8.18.2)
       '@c15t/translations': 1.8.0
-      next: 15.5.9(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      react: 19.1.4
-      react-dom: 19.1.4(react@19.1.4)
+      next: 15.5.10(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      react: 19.1.5
+      react-dom: 19.1.5(react@19.1.5)
     transitivePeerDependencies:
       - '@aws-sdk/client-rds-data'
       - '@cloudflare/workers-types'
@@ -11633,16 +11634,16 @@ snapshots:
       - use-sync-external-store
       - ws
 
-  '@c15t/react@1.8.2(@opentelemetry/api@1.9.0)(@opentelemetry/instrumentation@0.208.0(@opentelemetry/api@1.9.0))(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(@upstash/redis@1.35.0)(crossws@0.3.5)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)(typeorm@0.3.27(reflect-metadata@0.2.2)(ts-node@10.9.2(@swc/core@1.11.31)(@types/node@22.15.30)(typescript@5.8.3)))(ws@8.18.2)':
+  '@c15t/react@1.8.2(@opentelemetry/api@1.9.0)(@opentelemetry/instrumentation@0.208.0(@opentelemetry/api@1.9.0))(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(@upstash/redis@1.35.0)(crossws@0.3.5)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)(typeorm@0.3.27(reflect-metadata@0.2.2)(ts-node@10.9.2(@swc/core@1.11.31)(@types/node@22.15.30)(typescript@5.8.3)))(ws@8.18.2)':
     dependencies:
-      '@radix-ui/react-accordion': 1.2.4(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-slot': 1.2.0(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-switch': 1.1.4(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      c15t: 1.8.2(@opentelemetry/api@1.9.0)(@opentelemetry/instrumentation@0.208.0(@opentelemetry/api@1.9.0))(@types/react@19.2.7)(@upstash/redis@1.35.0)(crossws@0.3.5)(react@19.1.4)(typeorm@0.3.27(reflect-metadata@0.2.2)(ts-node@10.9.2(@swc/core@1.11.31)(@types/node@22.15.30)(typescript@5.8.3)))(ws@8.18.2)
+      '@radix-ui/react-accordion': 1.2.4(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-slot': 1.2.0(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-switch': 1.1.4(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      c15t: 1.8.2(@opentelemetry/api@1.9.0)(@opentelemetry/instrumentation@0.208.0(@opentelemetry/api@1.9.0))(@types/react@19.2.7)(@upstash/redis@1.35.0)(crossws@0.3.5)(react@19.1.5)(typeorm@0.3.27(reflect-metadata@0.2.2)(ts-node@10.9.2(@swc/core@1.11.31)(@types/node@22.15.30)(typescript@5.8.3)))(ws@8.18.2)
       clsx: 2.1.1
-      react: 19.1.4
-      react-dom: 19.1.4(react@19.1.4)
-      zustand: 5.0.8(@types/react@19.2.7)(react@19.1.4)
+      react: 19.1.5
+      react-dom: 19.1.5(react@19.1.5)
+      zustand: 5.0.8(@types/react@19.2.7)(react@19.1.5)
     transitivePeerDependencies:
       - '@aws-sdk/client-rds-data'
       - '@cloudflare/workers-types'
@@ -11885,10 +11886,10 @@ snapshots:
 
   '@conform-to/dom@1.6.1': {}
 
-  '@conform-to/react@1.6.1(react@19.1.4)':
+  '@conform-to/react@1.6.1(react@19.1.5)':
     dependencies:
       '@conform-to/dom': 1.6.1
-      react: 19.1.4
+      react: 19.1.5
 
   '@conform-to/zod@1.6.1(zod@3.25.51)':
     dependencies:
@@ -12389,11 +12390,11 @@ snapshots:
       '@floating-ui/core': 1.7.1
       '@floating-ui/utils': 0.2.9
 
-  '@floating-ui/react-dom@2.1.3(react-dom@19.1.4(react@19.1.4))(react@19.1.4)':
+  '@floating-ui/react-dom@2.1.3(react-dom@19.1.5(react@19.1.5))(react@19.1.5)':
     dependencies:
       '@floating-ui/dom': 1.7.1
-      react: 19.1.4
-      react-dom: 19.1.4(react@19.1.4)
+      react: 19.1.5
+      react-dom: 19.1.5(react@19.1.5)
 
   '@floating-ui/utils@0.2.9': {}
 
@@ -12471,9 +12472,9 @@ snapshots:
 
   '@iarna/toml@2.2.5': {}
 
-  '@icons-pack/react-simple-icons@11.2.0(react@19.1.4)':
+  '@icons-pack/react-simple-icons@11.2.0(react@19.1.5)':
     dependencies:
-      react: 19.1.4
+      react: 19.1.5
 
   '@img/sharp-darwin-arm64@0.33.5':
     optionalDependencies:
@@ -13033,20 +13034,20 @@ snapshots:
       '@tybys/wasm-util': 0.9.0
     optional: true
 
-  '@next/bundle-analyzer@15.5.9':
+  '@next/bundle-analyzer@15.5.10':
     dependencies:
       webpack-bundle-analyzer: 4.10.1
     transitivePeerDependencies:
       - bufferutil
       - utf-8-validate
 
-  '@next/env@15.5.9': {}
+  '@next/env@15.5.10': {}
 
   '@next/eslint-plugin-next@15.3.3':
     dependencies:
       fast-glob: 3.3.1
 
-  '@next/eslint-plugin-next@15.5.8':
+  '@next/eslint-plugin-next@15.5.10':
     dependencies:
       fast-glob: 3.3.1
 
@@ -13730,579 +13731,579 @@ snapshots:
 
   '@radix-ui/primitive@1.1.2': {}
 
-  '@radix-ui/react-accordion@1.2.11(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)':
+  '@radix-ui/react-accordion@1.2.11(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)':
     dependencies:
       '@radix-ui/primitive': 1.1.2
-      '@radix-ui/react-collapsible': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-collection': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-id': 1.1.1(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.7)(react@19.1.4)
-      react: 19.1.4
-      react-dom: 19.1.4(react@19.1.4)
+      '@radix-ui/react-collapsible': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-collection': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-id': 1.1.1(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.7)(react@19.1.5)
+      react: 19.1.5
+      react-dom: 19.1.5(react@19.1.5)
     optionalDependencies:
       '@types/react': 19.2.7
       '@types/react-dom': 19.2.3(@types/react@19.2.7)
 
-  '@radix-ui/react-accordion@1.2.4(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)':
+  '@radix-ui/react-accordion@1.2.4(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)':
     dependencies:
       '@radix-ui/primitive': 1.1.2
-      '@radix-ui/react-collapsible': 1.1.4(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-collection': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-id': 1.1.1(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-use-controllable-state': 1.1.1(@types/react@19.2.7)(react@19.1.4)
-      react: 19.1.4
-      react-dom: 19.1.4(react@19.1.4)
+      '@radix-ui/react-collapsible': 1.1.4(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-collection': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-id': 1.1.1(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-use-controllable-state': 1.1.1(@types/react@19.2.7)(react@19.1.5)
+      react: 19.1.5
+      react-dom: 19.1.5(react@19.1.5)
     optionalDependencies:
       '@types/react': 19.2.7
       '@types/react-dom': 19.2.3(@types/react@19.2.7)
 
-  '@radix-ui/react-arrow@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)':
+  '@radix-ui/react-arrow@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)':
     dependencies:
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      react: 19.1.4
-      react-dom: 19.1.4(react@19.1.4)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      react: 19.1.5
+      react-dom: 19.1.5(react@19.1.5)
     optionalDependencies:
       '@types/react': 19.2.7
       '@types/react-dom': 19.2.3(@types/react@19.2.7)
 
-  '@radix-ui/react-checkbox@1.3.2(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)':
+  '@radix-ui/react-checkbox@1.3.2(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)':
     dependencies:
       '@radix-ui/primitive': 1.1.2
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-presence': 1.1.4(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-use-previous': 1.1.1(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-use-size': 1.1.1(@types/react@19.2.7)(react@19.1.4)
-      react: 19.1.4
-      react-dom: 19.1.4(react@19.1.4)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-presence': 1.1.4(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-use-previous': 1.1.1(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-use-size': 1.1.1(@types/react@19.2.7)(react@19.1.5)
+      react: 19.1.5
+      react-dom: 19.1.5(react@19.1.5)
     optionalDependencies:
       '@types/react': 19.2.7
       '@types/react-dom': 19.2.3(@types/react@19.2.7)
 
-  '@radix-ui/react-collapsible@1.1.11(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)':
+  '@radix-ui/react-collapsible@1.1.11(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)':
     dependencies:
       '@radix-ui/primitive': 1.1.2
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-id': 1.1.1(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-presence': 1.1.4(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.7)(react@19.1.4)
-      react: 19.1.4
-      react-dom: 19.1.4(react@19.1.4)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-id': 1.1.1(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-presence': 1.1.4(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.7)(react@19.1.5)
+      react: 19.1.5
+      react-dom: 19.1.5(react@19.1.5)
     optionalDependencies:
       '@types/react': 19.2.7
       '@types/react-dom': 19.2.3(@types/react@19.2.7)
 
-  '@radix-ui/react-collapsible@1.1.4(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)':
+  '@radix-ui/react-collapsible@1.1.4(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)':
     dependencies:
       '@radix-ui/primitive': 1.1.2
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-id': 1.1.1(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-presence': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-use-controllable-state': 1.1.1(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.7)(react@19.1.4)
-      react: 19.1.4
-      react-dom: 19.1.4(react@19.1.4)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-id': 1.1.1(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-presence': 1.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-use-controllable-state': 1.1.1(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.7)(react@19.1.5)
+      react: 19.1.5
+      react-dom: 19.1.5(react@19.1.5)
     optionalDependencies:
       '@types/react': 19.2.7
       '@types/react-dom': 19.2.3(@types/react@19.2.7)
 
-  '@radix-ui/react-collection@1.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)':
+  '@radix-ui/react-collection@1.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)':
     dependencies:
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-slot': 1.2.0(@types/react@19.2.7)(react@19.1.4)
-      react: 19.1.4
-      react-dom: 19.1.4(react@19.1.4)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-slot': 1.2.0(@types/react@19.2.7)(react@19.1.5)
+      react: 19.1.5
+      react-dom: 19.1.5(react@19.1.5)
     optionalDependencies:
       '@types/react': 19.2.7
       '@types/react-dom': 19.2.3(@types/react@19.2.7)
 
-  '@radix-ui/react-collection@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)':
+  '@radix-ui/react-collection@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)':
     dependencies:
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.7)(react@19.1.4)
-      react: 19.1.4
-      react-dom: 19.1.4(react@19.1.4)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.7)(react@19.1.5)
+      react: 19.1.5
+      react-dom: 19.1.5(react@19.1.5)
     optionalDependencies:
       '@types/react': 19.2.7
       '@types/react-dom': 19.2.3(@types/react@19.2.7)
 
-  '@radix-ui/react-compose-refs@1.1.2(@types/react@19.2.7)(react@19.1.4)':
+  '@radix-ui/react-compose-refs@1.1.2(@types/react@19.2.7)(react@19.1.5)':
     dependencies:
-      react: 19.1.4
+      react: 19.1.5
     optionalDependencies:
       '@types/react': 19.2.7
 
-  '@radix-ui/react-context@1.1.2(@types/react@19.2.7)(react@19.1.4)':
+  '@radix-ui/react-context@1.1.2(@types/react@19.2.7)(react@19.1.5)':
     dependencies:
-      react: 19.1.4
+      react: 19.1.5
     optionalDependencies:
       '@types/react': 19.2.7
 
-  '@radix-ui/react-dialog@1.1.14(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)':
+  '@radix-ui/react-dialog@1.1.14(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)':
     dependencies:
       '@radix-ui/primitive': 1.1.2
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-dismissable-layer': 1.1.10(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-focus-guards': 1.1.2(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-focus-scope': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-id': 1.1.1(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-portal': 1.1.9(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-presence': 1.1.4(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.7)(react@19.1.4)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-dismissable-layer': 1.1.10(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-focus-guards': 1.1.2(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-focus-scope': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-id': 1.1.1(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-portal': 1.1.9(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-presence': 1.1.4(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.7)(react@19.1.5)
       aria-hidden: 1.2.6
-      react: 19.1.4
-      react-dom: 19.1.4(react@19.1.4)
-      react-remove-scroll: 2.7.1(@types/react@19.2.7)(react@19.1.4)
+      react: 19.1.5
+      react-dom: 19.1.5(react@19.1.5)
+      react-remove-scroll: 2.7.1(@types/react@19.2.7)(react@19.1.5)
     optionalDependencies:
       '@types/react': 19.2.7
       '@types/react-dom': 19.2.3(@types/react@19.2.7)
 
-  '@radix-ui/react-direction@1.1.1(@types/react@19.2.7)(react@19.1.4)':
+  '@radix-ui/react-direction@1.1.1(@types/react@19.2.7)(react@19.1.5)':
     dependencies:
-      react: 19.1.4
+      react: 19.1.5
     optionalDependencies:
       '@types/react': 19.2.7
 
-  '@radix-ui/react-dismissable-layer@1.1.10(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)':
+  '@radix-ui/react-dismissable-layer@1.1.10(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)':
     dependencies:
       '@radix-ui/primitive': 1.1.2
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-use-escape-keydown': 1.1.1(@types/react@19.2.7)(react@19.1.4)
-      react: 19.1.4
-      react-dom: 19.1.4(react@19.1.4)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-use-escape-keydown': 1.1.1(@types/react@19.2.7)(react@19.1.5)
+      react: 19.1.5
+      react-dom: 19.1.5(react@19.1.5)
     optionalDependencies:
       '@types/react': 19.2.7
       '@types/react-dom': 19.2.3(@types/react@19.2.7)
 
-  '@radix-ui/react-dropdown-menu@2.1.15(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)':
+  '@radix-ui/react-dropdown-menu@2.1.15(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)':
     dependencies:
       '@radix-ui/primitive': 1.1.2
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-id': 1.1.1(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-menu': 2.1.15(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.7)(react@19.1.4)
-      react: 19.1.4
-      react-dom: 19.1.4(react@19.1.4)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-id': 1.1.1(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-menu': 2.1.15(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.7)(react@19.1.5)
+      react: 19.1.5
+      react-dom: 19.1.5(react@19.1.5)
     optionalDependencies:
       '@types/react': 19.2.7
       '@types/react-dom': 19.2.3(@types/react@19.2.7)
 
-  '@radix-ui/react-focus-guards@1.1.2(@types/react@19.2.7)(react@19.1.4)':
+  '@radix-ui/react-focus-guards@1.1.2(@types/react@19.2.7)(react@19.1.5)':
     dependencies:
-      react: 19.1.4
+      react: 19.1.5
     optionalDependencies:
       '@types/react': 19.2.7
 
-  '@radix-ui/react-focus-scope@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)':
+  '@radix-ui/react-focus-scope@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)':
     dependencies:
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.7)(react@19.1.4)
-      react: 19.1.4
-      react-dom: 19.1.4(react@19.1.4)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.7)(react@19.1.5)
+      react: 19.1.5
+      react-dom: 19.1.5(react@19.1.5)
     optionalDependencies:
       '@types/react': 19.2.7
       '@types/react-dom': 19.2.3(@types/react@19.2.7)
 
-  '@radix-ui/react-id@1.1.1(@types/react@19.2.7)(react@19.1.4)':
+  '@radix-ui/react-id@1.1.1(@types/react@19.2.7)(react@19.1.5)':
     dependencies:
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.7)(react@19.1.4)
-      react: 19.1.4
+      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.7)(react@19.1.5)
+      react: 19.1.5
     optionalDependencies:
       '@types/react': 19.2.7
 
-  '@radix-ui/react-label@2.1.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)':
+  '@radix-ui/react-label@2.1.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)':
     dependencies:
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      react: 19.1.4
-      react-dom: 19.1.4(react@19.1.4)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      react: 19.1.5
+      react-dom: 19.1.5(react@19.1.5)
     optionalDependencies:
       '@types/react': 19.2.7
       '@types/react-dom': 19.2.3(@types/react@19.2.7)
 
-  '@radix-ui/react-menu@2.1.15(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)':
+  '@radix-ui/react-menu@2.1.15(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)':
     dependencies:
       '@radix-ui/primitive': 1.1.2
-      '@radix-ui/react-collection': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-dismissable-layer': 1.1.10(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-focus-guards': 1.1.2(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-focus-scope': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-id': 1.1.1(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-popper': 1.2.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-portal': 1.1.9(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-presence': 1.1.4(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-roving-focus': 1.1.10(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.7)(react@19.1.4)
+      '@radix-ui/react-collection': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-dismissable-layer': 1.1.10(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-focus-guards': 1.1.2(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-focus-scope': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-id': 1.1.1(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-popper': 1.2.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-portal': 1.1.9(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-presence': 1.1.4(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-roving-focus': 1.1.10(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.7)(react@19.1.5)
       aria-hidden: 1.2.6
-      react: 19.1.4
-      react-dom: 19.1.4(react@19.1.4)
-      react-remove-scroll: 2.7.1(@types/react@19.2.7)(react@19.1.4)
+      react: 19.1.5
+      react-dom: 19.1.5(react@19.1.5)
+      react-remove-scroll: 2.7.1(@types/react@19.2.7)(react@19.1.5)
     optionalDependencies:
       '@types/react': 19.2.7
       '@types/react-dom': 19.2.3(@types/react@19.2.7)
 
-  '@radix-ui/react-navigation-menu@1.2.13(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)':
+  '@radix-ui/react-navigation-menu@1.2.13(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)':
     dependencies:
       '@radix-ui/primitive': 1.1.2
-      '@radix-ui/react-collection': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-dismissable-layer': 1.1.10(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-id': 1.1.1(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-presence': 1.1.4(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-use-previous': 1.1.1(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-visually-hidden': 1.2.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      react: 19.1.4
-      react-dom: 19.1.4(react@19.1.4)
+      '@radix-ui/react-collection': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-dismissable-layer': 1.1.10(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-id': 1.1.1(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-presence': 1.1.4(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-use-previous': 1.1.1(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-visually-hidden': 1.2.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      react: 19.1.5
+      react-dom: 19.1.5(react@19.1.5)
     optionalDependencies:
       '@types/react': 19.2.7
       '@types/react-dom': 19.2.3(@types/react@19.2.7)
 
-  '@radix-ui/react-popover@1.1.14(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)':
+  '@radix-ui/react-popover@1.1.14(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)':
     dependencies:
       '@radix-ui/primitive': 1.1.2
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-dismissable-layer': 1.1.10(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-focus-guards': 1.1.2(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-focus-scope': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-id': 1.1.1(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-popper': 1.2.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-portal': 1.1.9(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-presence': 1.1.4(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.7)(react@19.1.4)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-dismissable-layer': 1.1.10(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-focus-guards': 1.1.2(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-focus-scope': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-id': 1.1.1(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-popper': 1.2.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-portal': 1.1.9(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-presence': 1.1.4(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.7)(react@19.1.5)
       aria-hidden: 1.2.6
-      react: 19.1.4
-      react-dom: 19.1.4(react@19.1.4)
-      react-remove-scroll: 2.7.1(@types/react@19.2.7)(react@19.1.4)
+      react: 19.1.5
+      react-dom: 19.1.5(react@19.1.5)
+      react-remove-scroll: 2.7.1(@types/react@19.2.7)(react@19.1.5)
     optionalDependencies:
       '@types/react': 19.2.7
       '@types/react-dom': 19.2.3(@types/react@19.2.7)
 
-  '@radix-ui/react-popper@1.2.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)':
-    dependencies:
-      '@floating-ui/react-dom': 2.1.3(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-arrow': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-use-rect': 1.1.1(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-use-size': 1.1.1(@types/react@19.2.7)(react@19.1.4)
+  '@radix-ui/react-popper@1.2.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)':
+    dependencies:
+      '@floating-ui/react-dom': 2.1.3(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-arrow': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-use-rect': 1.1.1(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-use-size': 1.1.1(@types/react@19.2.7)(react@19.1.5)
       '@radix-ui/rect': 1.1.1
-      react: 19.1.4
-      react-dom: 19.1.4(react@19.1.4)
+      react: 19.1.5
+      react-dom: 19.1.5(react@19.1.5)
     optionalDependencies:
       '@types/react': 19.2.7
       '@types/react-dom': 19.2.3(@types/react@19.2.7)
 
-  '@radix-ui/react-portal@1.1.9(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)':
+  '@radix-ui/react-portal@1.1.9(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)':
     dependencies:
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.7)(react@19.1.4)
-      react: 19.1.4
-      react-dom: 19.1.4(react@19.1.4)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.7)(react@19.1.5)
+      react: 19.1.5
+      react-dom: 19.1.5(react@19.1.5)
     optionalDependencies:
       '@types/react': 19.2.7
       '@types/react-dom': 19.2.3(@types/react@19.2.7)
 
-  '@radix-ui/react-presence@1.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)':
+  '@radix-ui/react-presence@1.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)':
     dependencies:
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.7)(react@19.1.4)
-      react: 19.1.4
-      react-dom: 19.1.4(react@19.1.4)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.7)(react@19.1.5)
+      react: 19.1.5
+      react-dom: 19.1.5(react@19.1.5)
     optionalDependencies:
       '@types/react': 19.2.7
       '@types/react-dom': 19.2.3(@types/react@19.2.7)
 
-  '@radix-ui/react-presence@1.1.4(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)':
+  '@radix-ui/react-presence@1.1.4(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)':
     dependencies:
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.7)(react@19.1.4)
-      react: 19.1.4
-      react-dom: 19.1.4(react@19.1.4)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.7)(react@19.1.5)
+      react: 19.1.5
+      react-dom: 19.1.5(react@19.1.5)
     optionalDependencies:
       '@types/react': 19.2.7
       '@types/react-dom': 19.2.3(@types/react@19.2.7)
 
-  '@radix-ui/react-primitive@2.0.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)':
+  '@radix-ui/react-primitive@2.0.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)':
     dependencies:
-      '@radix-ui/react-slot': 1.2.0(@types/react@19.2.7)(react@19.1.4)
-      react: 19.1.4
-      react-dom: 19.1.4(react@19.1.4)
+      '@radix-ui/react-slot': 1.2.0(@types/react@19.2.7)(react@19.1.5)
+      react: 19.1.5
+      react-dom: 19.1.5(react@19.1.5)
     optionalDependencies:
       '@types/react': 19.2.7
       '@types/react-dom': 19.2.3(@types/react@19.2.7)
 
-  '@radix-ui/react-primitive@2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)':
+  '@radix-ui/react-primitive@2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)':
     dependencies:
-      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.7)(react@19.1.4)
-      react: 19.1.4
-      react-dom: 19.1.4(react@19.1.4)
+      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.7)(react@19.1.5)
+      react: 19.1.5
+      react-dom: 19.1.5(react@19.1.5)
     optionalDependencies:
       '@types/react': 19.2.7
       '@types/react-dom': 19.2.3(@types/react@19.2.7)
 
-  '@radix-ui/react-radio-group@1.3.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)':
+  '@radix-ui/react-radio-group@1.3.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)':
     dependencies:
       '@radix-ui/primitive': 1.1.2
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-presence': 1.1.4(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-roving-focus': 1.1.10(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-use-previous': 1.1.1(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-use-size': 1.1.1(@types/react@19.2.7)(react@19.1.4)
-      react: 19.1.4
-      react-dom: 19.1.4(react@19.1.4)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-presence': 1.1.4(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-roving-focus': 1.1.10(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-use-previous': 1.1.1(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-use-size': 1.1.1(@types/react@19.2.7)(react@19.1.5)
+      react: 19.1.5
+      react-dom: 19.1.5(react@19.1.5)
     optionalDependencies:
       '@types/react': 19.2.7
       '@types/react-dom': 19.2.3(@types/react@19.2.7)
 
-  '@radix-ui/react-roving-focus@1.1.10(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)':
+  '@radix-ui/react-roving-focus@1.1.10(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)':
     dependencies:
       '@radix-ui/primitive': 1.1.2
-      '@radix-ui/react-collection': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-id': 1.1.1(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.7)(react@19.1.4)
-      react: 19.1.4
-      react-dom: 19.1.4(react@19.1.4)
+      '@radix-ui/react-collection': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-id': 1.1.1(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.7)(react@19.1.5)
+      react: 19.1.5
+      react-dom: 19.1.5(react@19.1.5)
     optionalDependencies:
       '@types/react': 19.2.7
       '@types/react-dom': 19.2.3(@types/react@19.2.7)
 
-  '@radix-ui/react-select@2.2.5(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)':
+  '@radix-ui/react-select@2.2.5(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)':
     dependencies:
       '@radix-ui/number': 1.1.1
       '@radix-ui/primitive': 1.1.2
-      '@radix-ui/react-collection': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-dismissable-layer': 1.1.10(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-focus-guards': 1.1.2(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-focus-scope': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-id': 1.1.1(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-popper': 1.2.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-portal': 1.1.9(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-use-previous': 1.1.1(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-visually-hidden': 1.2.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
+      '@radix-ui/react-collection': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-dismissable-layer': 1.1.10(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-focus-guards': 1.1.2(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-focus-scope': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-id': 1.1.1(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-popper': 1.2.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-portal': 1.1.9(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-use-previous': 1.1.1(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-visually-hidden': 1.2.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
       aria-hidden: 1.2.6
-      react: 19.1.4
-      react-dom: 19.1.4(react@19.1.4)
-      react-remove-scroll: 2.7.1(@types/react@19.2.7)(react@19.1.4)
+      react: 19.1.5
+      react-dom: 19.1.5(react@19.1.5)
+      react-remove-scroll: 2.7.1(@types/react@19.2.7)(react@19.1.5)
     optionalDependencies:
       '@types/react': 19.2.7
       '@types/react-dom': 19.2.3(@types/react@19.2.7)
 
-  '@radix-ui/react-slot@1.2.0(@types/react@19.2.7)(react@19.1.4)':
+  '@radix-ui/react-slot@1.2.0(@types/react@19.2.7)(react@19.1.5)':
     dependencies:
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.1.4)
-      react: 19.1.4
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.1.5)
+      react: 19.1.5
     optionalDependencies:
       '@types/react': 19.2.7
 
-  '@radix-ui/react-slot@1.2.3(@types/react@19.2.7)(react@19.1.4)':
+  '@radix-ui/react-slot@1.2.3(@types/react@19.2.7)(react@19.1.5)':
     dependencies:
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.1.4)
-      react: 19.1.4
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.1.5)
+      react: 19.1.5
     optionalDependencies:
       '@types/react': 19.2.7
 
-  '@radix-ui/react-switch@1.1.4(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)':
+  '@radix-ui/react-switch@1.1.4(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)':
     dependencies:
       '@radix-ui/primitive': 1.1.2
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-use-controllable-state': 1.1.1(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-use-previous': 1.1.1(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-use-size': 1.1.1(@types/react@19.2.7)(react@19.1.4)
-      react: 19.1.4
-      react-dom: 19.1.4(react@19.1.4)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-primitive': 2.0.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-use-controllable-state': 1.1.1(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-use-previous': 1.1.1(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-use-size': 1.1.1(@types/react@19.2.7)(react@19.1.5)
+      react: 19.1.5
+      react-dom: 19.1.5(react@19.1.5)
     optionalDependencies:
       '@types/react': 19.2.7
       '@types/react-dom': 19.2.3(@types/react@19.2.7)
 
-  '@radix-ui/react-switch@1.2.5(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)':
+  '@radix-ui/react-switch@1.2.5(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)':
     dependencies:
       '@radix-ui/primitive': 1.1.2
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-use-previous': 1.1.1(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-use-size': 1.1.1(@types/react@19.2.7)(react@19.1.4)
-      react: 19.1.4
-      react-dom: 19.1.4(react@19.1.4)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-use-previous': 1.1.1(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-use-size': 1.1.1(@types/react@19.2.7)(react@19.1.5)
+      react: 19.1.5
+      react-dom: 19.1.5(react@19.1.5)
     optionalDependencies:
       '@types/react': 19.2.7
       '@types/react-dom': 19.2.3(@types/react@19.2.7)
 
-  '@radix-ui/react-toggle-group@1.1.10(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)':
+  '@radix-ui/react-toggle-group@1.1.10(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)':
     dependencies:
       '@radix-ui/primitive': 1.1.2
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-roving-focus': 1.1.10(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-toggle': 1.1.9(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.7)(react@19.1.4)
-      react: 19.1.4
-      react-dom: 19.1.4(react@19.1.4)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-roving-focus': 1.1.10(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-toggle': 1.1.9(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.7)(react@19.1.5)
+      react: 19.1.5
+      react-dom: 19.1.5(react@19.1.5)
     optionalDependencies:
       '@types/react': 19.2.7
       '@types/react-dom': 19.2.3(@types/react@19.2.7)
 
-  '@radix-ui/react-toggle@1.1.9(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)':
+  '@radix-ui/react-toggle@1.1.9(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)':
     dependencies:
       '@radix-ui/primitive': 1.1.2
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.7)(react@19.1.4)
-      react: 19.1.4
-      react-dom: 19.1.4(react@19.1.4)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.7)(react@19.1.5)
+      react: 19.1.5
+      react-dom: 19.1.5(react@19.1.5)
     optionalDependencies:
       '@types/react': 19.2.7
       '@types/react-dom': 19.2.3(@types/react@19.2.7)
 
-  '@radix-ui/react-tooltip@1.2.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)':
+  '@radix-ui/react-tooltip@1.2.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)':
     dependencies:
       '@radix-ui/primitive': 1.1.2
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-dismissable-layer': 1.1.10(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-id': 1.1.1(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-popper': 1.2.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-portal': 1.1.9(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-presence': 1.1.4(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-visually-hidden': 1.2.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      react: 19.1.4
-      react-dom: 19.1.4(react@19.1.4)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-dismissable-layer': 1.1.10(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-id': 1.1.1(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-popper': 1.2.7(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-portal': 1.1.9(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-presence': 1.1.4(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-visually-hidden': 1.2.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      react: 19.1.5
+      react-dom: 19.1.5(react@19.1.5)
     optionalDependencies:
       '@types/react': 19.2.7
       '@types/react-dom': 19.2.3(@types/react@19.2.7)
 
-  '@radix-ui/react-use-callback-ref@1.1.1(@types/react@19.2.7)(react@19.1.4)':
+  '@radix-ui/react-use-callback-ref@1.1.1(@types/react@19.2.7)(react@19.1.5)':
     dependencies:
-      react: 19.1.4
+      react: 19.1.5
     optionalDependencies:
       '@types/react': 19.2.7
 
-  '@radix-ui/react-use-controllable-state@1.1.1(@types/react@19.2.7)(react@19.1.4)':
+  '@radix-ui/react-use-controllable-state@1.1.1(@types/react@19.2.7)(react@19.1.5)':
     dependencies:
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.7)(react@19.1.4)
-      react: 19.1.4
+      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.7)(react@19.1.5)
+      react: 19.1.5
     optionalDependencies:
       '@types/react': 19.2.7
 
-  '@radix-ui/react-use-controllable-state@1.2.2(@types/react@19.2.7)(react@19.1.4)':
+  '@radix-ui/react-use-controllable-state@1.2.2(@types/react@19.2.7)(react@19.1.5)':
     dependencies:
-      '@radix-ui/react-use-effect-event': 0.0.2(@types/react@19.2.7)(react@19.1.4)
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.7)(react@19.1.4)
-      react: 19.1.4
+      '@radix-ui/react-use-effect-event': 0.0.2(@types/react@19.2.7)(react@19.1.5)
+      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.7)(react@19.1.5)
+      react: 19.1.5
     optionalDependencies:
       '@types/react': 19.2.7
 
-  '@radix-ui/react-use-effect-event@0.0.2(@types/react@19.2.7)(react@19.1.4)':
+  '@radix-ui/react-use-effect-event@0.0.2(@types/react@19.2.7)(react@19.1.5)':
     dependencies:
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.7)(react@19.1.4)
-      react: 19.1.4
+      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.7)(react@19.1.5)
+      react: 19.1.5
     optionalDependencies:
       '@types/react': 19.2.7
 
-  '@radix-ui/react-use-escape-keydown@1.1.1(@types/react@19.2.7)(react@19.1.4)':
+  '@radix-ui/react-use-escape-keydown@1.1.1(@types/react@19.2.7)(react@19.1.5)':
     dependencies:
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.7)(react@19.1.4)
-      react: 19.1.4
+      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.7)(react@19.1.5)
+      react: 19.1.5
     optionalDependencies:
       '@types/react': 19.2.7
 
-  '@radix-ui/react-use-layout-effect@1.1.1(@types/react@19.2.7)(react@19.1.4)':
+  '@radix-ui/react-use-layout-effect@1.1.1(@types/react@19.2.7)(react@19.1.5)':
     dependencies:
-      react: 19.1.4
+      react: 19.1.5
     optionalDependencies:
       '@types/react': 19.2.7
 
-  '@radix-ui/react-use-previous@1.1.1(@types/react@19.2.7)(react@19.1.4)':
+  '@radix-ui/react-use-previous@1.1.1(@types/react@19.2.7)(react@19.1.5)':
     dependencies:
-      react: 19.1.4
+      react: 19.1.5
     optionalDependencies:
       '@types/react': 19.2.7
 
-  '@radix-ui/react-use-rect@1.1.1(@types/react@19.2.7)(react@19.1.4)':
+  '@radix-ui/react-use-rect@1.1.1(@types/react@19.2.7)(react@19.1.5)':
     dependencies:
       '@radix-ui/rect': 1.1.1
-      react: 19.1.4
+      react: 19.1.5
     optionalDependencies:
       '@types/react': 19.2.7
 
-  '@radix-ui/react-use-size@1.1.1(@types/react@19.2.7)(react@19.1.4)':
+  '@radix-ui/react-use-size@1.1.1(@types/react@19.2.7)(react@19.1.5)':
     dependencies:
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.7)(react@19.1.4)
-      react: 19.1.4
+      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.7)(react@19.1.5)
+      react: 19.1.5
     optionalDependencies:
       '@types/react': 19.2.7
 
-  '@radix-ui/react-visually-hidden@1.2.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)':
+  '@radix-ui/react-visually-hidden@1.2.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)':
     dependencies:
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      react: 19.1.4
-      react-dom: 19.1.4(react@19.1.4)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      react: 19.1.5
+      react-dom: 19.1.5(react@19.1.5)
     optionalDependencies:
       '@types/react': 19.2.7
       '@types/react-dom': 19.2.3(@types/react@19.2.7)
@@ -15893,10 +15894,10 @@ snapshots:
     dependencies:
       uncrypto: 0.1.3
 
-  '@vercel/analytics@1.5.0(next@15.5.9(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.4(react@19.1.4))(react@19.1.4))(react@19.1.4)(svelte@5.1.15)(vue@3.5.16(typescript@5.8.3))':
+  '@vercel/analytics@1.5.0(next@15.5.10(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5))(react@19.1.5)(svelte@5.1.15)(vue@3.5.16(typescript@5.8.3))':
     optionalDependencies:
-      next: 15.5.9(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      react: 19.1.4
+      next: 15.5.10(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      react: 19.1.5
       svelte: 5.1.15
       vue: 3.5.16(typescript@5.8.3)
 
@@ -15921,10 +15922,10 @@ snapshots:
       '@opentelemetry/sdk-metrics': 2.0.1(@opentelemetry/api@1.9.0)
       '@opentelemetry/sdk-trace-base': 2.2.0(@opentelemetry/api@1.9.0)
 
-  '@vercel/speed-insights@1.2.0(next@15.5.9(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.4(react@19.1.4))(react@19.1.4))(react@19.1.4)(svelte@5.1.15)(vue@3.5.16(typescript@5.8.3))':
+  '@vercel/speed-insights@1.2.0(next@15.5.10(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5))(react@19.1.5)(svelte@5.1.15)(vue@3.5.16(typescript@5.8.3))':
     optionalDependencies:
-      next: 15.5.9(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      react: 19.1.4
+      next: 15.5.10(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      react: 19.1.5
       svelte: 5.1.15
       vue: 3.5.16(typescript@5.8.3)
 
@@ -16474,13 +16475,13 @@ snapshots:
     optionalDependencies:
       magicast: 0.3.5
 
-  c15t@1.8.2(@opentelemetry/api@1.9.0)(@opentelemetry/instrumentation@0.208.0(@opentelemetry/api@1.9.0))(@types/react@19.2.7)(@upstash/redis@1.35.0)(crossws@0.3.5)(react@19.1.4)(typeorm@0.3.27(reflect-metadata@0.2.2)(ts-node@10.9.2(@swc/core@1.11.31)(@types/node@22.15.30)(typescript@5.8.3)))(ws@8.18.2):
+  c15t@1.8.2(@opentelemetry/api@1.9.0)(@opentelemetry/instrumentation@0.208.0(@opentelemetry/api@1.9.0))(@types/react@19.2.7)(@upstash/redis@1.35.0)(crossws@0.3.5)(react@19.1.5)(typeorm@0.3.27(reflect-metadata@0.2.2)(ts-node@10.9.2(@swc/core@1.11.31)(@types/node@22.15.30)(typescript@5.8.3)))(ws@8.18.2):
     dependencies:
       '@c15t/backend': 1.8.0(@opentelemetry/instrumentation@0.208.0(@opentelemetry/api@1.9.0))(@upstash/redis@1.35.0)(crossws@0.3.5)(typeorm@0.3.27(reflect-metadata@0.2.2)(ts-node@10.9.2(@swc/core@1.11.31)(@types/node@22.15.30)(typescript@5.8.3)))(ws@8.18.2)
       '@c15t/translations': 1.8.0
       '@orpc/client': 1.8.1(@opentelemetry/api@1.9.0)
       '@orpc/server': 1.8.1(@opentelemetry/api@1.9.0)(crossws@0.3.5)(ws@8.18.2)
-      zustand: 5.0.8(@types/react@19.2.7)(react@19.1.4)
+      zustand: 5.0.8(@types/react@19.2.7)(react@19.1.5)
     transitivePeerDependencies:
       - '@aws-sdk/client-rds-data'
       - '@cloudflare/workers-types'
@@ -17130,11 +17131,11 @@ snapshots:
     dependencies:
       embla-carousel: 8.5.2
 
-  embla-carousel-react@8.5.2(react@19.1.4):
+  embla-carousel-react@8.5.2(react@19.1.5):
     dependencies:
       embla-carousel: 8.5.2
       embla-carousel-reactive-utils: 8.5.2(embla-carousel@8.5.2)
-      react: 19.1.4
+      react: 19.1.5
 
   embla-carousel-reactive-utils@8.5.2(embla-carousel@8.5.2):
     dependencies:
@@ -17361,16 +17362,16 @@ snapshots:
     optionalDependencies:
       source-map: 0.6.1
 
-  eslint-config-next@15.5.8(eslint@8.57.1)(typescript@5.8.3):
+  eslint-config-next@15.5.10(eslint@8.57.1)(typescript@5.8.3):
     dependencies:
-      '@next/eslint-plugin-next': 15.5.8
+      '@next/eslint-plugin-next': 15.5.10
       '@rushstack/eslint-patch': 1.11.0
       '@typescript-eslint/eslint-plugin': 8.28.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1)(typescript@5.8.3)
       '@typescript-eslint/parser': 8.28.0(eslint@8.57.1)(typescript@5.8.3)
       eslint: 8.57.1
       eslint-import-resolver-node: 0.3.9
-      eslint-import-resolver-typescript: 3.9.1(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1))(eslint@8.57.1)
-      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint-import-resolver-typescript@3.9.1(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1)
+      eslint-import-resolver-typescript: 3.9.1(eslint-plugin-import@2.31.0)(eslint@8.57.1)
+      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint-import-resolver-typescript@3.9.1)(eslint@8.57.1)
       eslint-plugin-jsx-a11y: 6.10.2(eslint@8.57.1)
       eslint-plugin-react: 7.37.4(eslint@8.57.1)
       eslint-plugin-react-hooks: 5.2.0(eslint@8.57.1)
@@ -17397,7 +17398,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  eslint-import-resolver-typescript@3.9.1(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1))(eslint@8.57.1):
+  eslint-import-resolver-typescript@3.9.1(eslint-plugin-import@2.31.0)(eslint@8.57.1):
     dependencies:
       '@nolyfill/is-core-module': 1.0.39
       debug: 4.4.1
@@ -17408,7 +17409,7 @@ snapshots:
       stable-hash: 0.0.5
       tinyglobby: 0.2.14
     optionalDependencies:
-      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint-import-resolver-typescript@3.9.1(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1)
+      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint-import-resolver-typescript@3.9.1)(eslint@8.57.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -17419,7 +17420,7 @@ snapshots:
       '@typescript-eslint/parser': 8.28.0(eslint@8.57.1)(typescript@5.8.3)
       eslint: 8.57.1
       eslint-import-resolver-node: 0.3.9
-      eslint-import-resolver-typescript: 3.9.1(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1))(eslint@8.57.1)
+      eslint-import-resolver-typescript: 3.9.1(eslint-plugin-import@2.31.0)(eslint@8.57.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -17433,7 +17434,7 @@ snapshots:
     dependencies:
       gettext-parser: 4.2.0
 
-  eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint-import-resolver-typescript@3.9.1(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1):
+  eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint-import-resolver-typescript@3.9.1)(eslint@8.57.1):
     dependencies:
       '@rtsao/scc': 1.1.0
       array-includes: 3.1.8
@@ -19328,9 +19329,9 @@ snapshots:
 
   lru_map@0.3.3: {}
 
-  lucide-react@0.474.0(react@19.1.4):
+  lucide-react@0.474.0(react@19.1.5):
     dependencies:
-      react: 19.1.4
+      react: 19.1.5
 
   magic-string@0.30.17:
     dependencies:
@@ -19532,31 +19533,31 @@ snapshots:
     optionalDependencies:
       '@rollup/rollup-linux-x64-gnu': 4.44.2
 
-  next-auth@5.0.0-beta.30(next@15.5.9(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.4(react@19.1.4))(react@19.1.4))(react@19.1.4):
+  next-auth@5.0.0-beta.30(next@15.5.10(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5))(react@19.1.5):
     dependencies:
       '@auth/core': 0.41.0
-      next: 15.5.9(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      react: 19.1.4
+      next: 15.5.10(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      react: 19.1.5
 
-  next-intl@4.1.0(next@15.5.9(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.4(react@19.1.4))(react@19.1.4))(react@19.1.4)(typescript@5.8.3):
+  next-intl@4.1.0(next@15.5.10(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5))(react@19.1.5)(typescript@5.8.3):
     dependencies:
       '@formatjs/intl-localematcher': 0.5.10
       negotiator: 1.0.0
-      next: 15.5.9(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
-      react: 19.1.4
-      use-intl: 4.1.0(react@19.1.4)
+      next: 15.5.10(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      react: 19.1.5
+      use-intl: 4.1.0(react@19.1.5)
     optionalDependencies:
       typescript: 5.8.3
 
-  next@15.5.9(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.4(react@19.1.4))(react@19.1.4):
+  next@15.5.10(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5):
     dependencies:
-      '@next/env': 15.5.9
+      '@next/env': 15.5.10
       '@swc/helpers': 0.5.15
       caniuse-lite: 1.0.30001721
       postcss: 8.4.31
-      react: 19.1.4
-      react-dom: 19.1.4(react@19.1.4)
-      styled-jsx: 5.1.6(@babel/core@7.27.4)(react@19.1.4)
+      react: 19.1.5
+      react-dom: 19.1.5(react@19.1.5)
+      styled-jsx: 5.1.6(@babel/core@7.27.4)(react@19.1.5)
     optionalDependencies:
       '@next/swc-darwin-arm64': 15.5.7
       '@next/swc-darwin-x64': 15.5.7
@@ -19616,12 +19617,12 @@ snapshots:
     dependencies:
       boolbase: 1.0.0
 
-  nuqs@2.4.3(next@15.5.9(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.4(react@19.1.4))(react@19.1.4))(react@19.1.4):
+  nuqs@2.4.3(next@15.5.10(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5))(react@19.1.5):
     dependencies:
       mitt: 3.0.1
-      react: 19.1.4
+      react: 19.1.5
     optionalDependencies:
-      next: 15.5.9(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.4(react@19.1.4))(react@19.1.4)
+      next: 15.5.10(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
 
   nwsapi@2.2.20: {}
 
@@ -20390,57 +20391,57 @@ snapshots:
       defu: 6.1.4
       destr: 2.0.5
 
-  react-day-picker@9.7.0(react@19.1.4):
+  react-day-picker@9.7.0(react@19.1.5):
     dependencies:
       '@date-fns/tz': 1.2.0
       date-fns: 4.1.0
       date-fns-jalali: 4.1.0-0
-      react: 19.1.4
+      react: 19.1.5
 
-  react-dom@19.1.4(react@19.1.4):
+  react-dom@19.1.5(react@19.1.5):
     dependencies:
-      react: 19.1.4
+      react: 19.1.5
       scheduler: 0.26.0
 
-  react-headroom@3.2.1(react@19.1.4):
+  react-headroom@3.2.1(react@19.1.5):
     dependencies:
       prop-types: 15.8.1
       raf: 3.4.1
-      react: 19.1.4
+      react: 19.1.5
       shallowequal: 1.1.0
 
   react-is@16.13.1: {}
 
   react-is@18.3.1: {}
 
-  react-remove-scroll-bar@2.3.8(@types/react@19.2.7)(react@19.1.4):
+  react-remove-scroll-bar@2.3.8(@types/react@19.2.7)(react@19.1.5):
     dependencies:
-      react: 19.1.4
-      react-style-singleton: 2.2.3(@types/react@19.2.7)(react@19.1.4)
+      react: 19.1.5
+      react-style-singleton: 2.2.3(@types/react@19.2.7)(react@19.1.5)
       tslib: 2.8.1
     optionalDependencies:
       '@types/react': 19.2.7
 
-  react-remove-scroll@2.7.1(@types/react@19.2.7)(react@19.1.4):
+  react-remove-scroll@2.7.1(@types/react@19.2.7)(react@19.1.5):
     dependencies:
-      react: 19.1.4
-      react-remove-scroll-bar: 2.3.8(@types/react@19.2.7)(react@19.1.4)
-      react-style-singleton: 2.2.3(@types/react@19.2.7)(react@19.1.4)
+      react: 19.1.5
+      react-remove-scroll-bar: 2.3.8(@types/react@19.2.7)(react@19.1.5)
+      react-style-singleton: 2.2.3(@types/react@19.2.7)(react@19.1.5)
       tslib: 2.8.1
-      use-callback-ref: 1.3.3(@types/react@19.2.7)(react@19.1.4)
-      use-sidecar: 1.1.3(@types/react@19.2.7)(react@19.1.4)
+      use-callback-ref: 1.3.3(@types/react@19.2.7)(react@19.1.5)
+      use-sidecar: 1.1.3(@types/react@19.2.7)(react@19.1.5)
     optionalDependencies:
       '@types/react': 19.2.7
 
-  react-style-singleton@2.2.3(@types/react@19.2.7)(react@19.1.4):
+  react-style-singleton@2.2.3(@types/react@19.2.7)(react@19.1.5):
     dependencies:
       get-nonce: 1.0.1
-      react: 19.1.4
+      react: 19.1.5
       tslib: 2.8.1
     optionalDependencies:
       '@types/react': 19.2.7
 
-  react@19.1.4: {}
+  react@19.1.5: {}
 
   read-cache@1.0.0:
     dependencies:
@@ -20865,10 +20866,10 @@ snapshots:
       ip-address: 9.0.5
       smart-buffer: 4.2.0
 
-  sonner@1.7.4(react-dom@19.1.4(react@19.1.4))(react@19.1.4):
+  sonner@1.7.4(react-dom@19.1.5(react@19.1.5))(react@19.1.5):
     dependencies:
-      react: 19.1.4
-      react-dom: 19.1.4(react@19.1.4)
+      react: 19.1.5
+      react-dom: 19.1.5(react@19.1.5)
 
   source-map-js@1.2.1: {}
 
@@ -21050,10 +21051,10 @@ snapshots:
 
   stubborn-fs@1.2.5: {}
 
-  styled-jsx@5.1.6(@babel/core@7.27.4)(react@19.1.4):
+  styled-jsx@5.1.6(@babel/core@7.27.4)(react@19.1.5):
     dependencies:
       client-only: 0.0.1
-      react: 19.1.4
+      react: 19.1.5
     optionalDependencies:
       '@babel/core': 7.27.4
 
@@ -21628,24 +21629,24 @@ snapshots:
 
   urlpattern-polyfill@10.0.0: {}
 
-  use-callback-ref@1.3.3(@types/react@19.2.7)(react@19.1.4):
+  use-callback-ref@1.3.3(@types/react@19.2.7)(react@19.1.5):
     dependencies:
-      react: 19.1.4
+      react: 19.1.5
       tslib: 2.8.1
     optionalDependencies:
       '@types/react': 19.2.7
 
-  use-intl@4.1.0(react@19.1.4):
+  use-intl@4.1.0(react@19.1.5):
     dependencies:
       '@formatjs/fast-memoize': 2.2.7
       '@schummar/icu-type-parser': 1.21.5
       intl-messageformat: 10.7.16
-      react: 19.1.4
+      react: 19.1.5
 
-  use-sidecar@1.1.3(@types/react@19.2.7)(react@19.1.4):
+  use-sidecar@1.1.3(@types/react@19.2.7)(react@19.1.5):
     dependencies:
       detect-node-es: 1.1.0
-      react: 19.1.4
+      react: 19.1.5
       tslib: 2.8.1
     optionalDependencies:
       '@types/react': 19.2.7
@@ -22036,7 +22037,7 @@ snapshots:
 
   zod@4.1.12: {}
 
-  zustand@5.0.8(@types/react@19.2.7)(react@19.1.4):
+  zustand@5.0.8(@types/react@19.2.7)(react@19.1.5):
     optionalDependencies:
       '@types/react': 19.2.7
-      react: 19.1.4
+      react: 19.1.5

From b435d3c67bb37fd4ed412f451d2fb4f9177a787c Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 27 Jan 2026 12:03:03 -0700
Subject: [PATCH 30/69] Version Packages (`canary`) (#2843)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/shaggy-clubs-make.md | 5 -----
 core/CHANGELOG.md               | 6 ++++++
 core/package.json               | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)
 delete mode 100644 .changeset/shaggy-clubs-make.md

diff --git a/.changeset/shaggy-clubs-make.md b/.changeset/shaggy-clubs-make.md
deleted file mode 100644
index 8c7c938700..0000000000
--- a/.changeset/shaggy-clubs-make.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@bigcommerce/catalyst-core": patch
----
-
-Addresses https://vercel.com/changelog/summary-of-cve-2026-23864 by bumping React and Next.js
diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md
index d8a1caf114..1baf2df611 100644
--- a/core/CHANGELOG.md
+++ b/core/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.4.2
+
+### Patch Changes
+
+- [#2842](https://github.com/bigcommerce/catalyst/pull/2842) [`aadc1e3`](https://github.com/bigcommerce/catalyst/commit/aadc1e35533733905e7ce9ada457c2679995a727) Thanks [@chanceaclark](https://github.com/chanceaclark)! - Addresses https://vercel.com/changelog/summary-of-cve-2026-23864 by bumping React and Next.js
+
 ## 1.4.1
 
 ### Patch Changes
diff --git a/core/package.json b/core/package.json
index 4ab5496907..c1e19d8256 100644
--- a/core/package.json
+++ b/core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@bigcommerce/catalyst-core",
   "description": "BigCommerce Catalyst is a Next.js starter kit for building headless BigCommerce storefronts.",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "private": true,
   "scripts": {
     "dev": "npm run generate && next dev",

From 7f82903074ec9831c48246aa748748aede51fe1a Mon Sep 17 00:00:00 2001
From: Chancellor Clark <chancellor.clark@bigcommerce.com>
Date: Tue, 27 Jan 2026 12:31:21 -0700
Subject: [PATCH 31/69] chore: add changeset for 1.4.2 release

---
 .changeset/seven-owls-listen.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/seven-owls-listen.md

diff --git a/.changeset/seven-owls-listen.md b/.changeset/seven-owls-listen.md
new file mode 100644
index 0000000000..9e8bf5701e
--- /dev/null
+++ b/.changeset/seven-owls-listen.md
@@ -0,0 +1,5 @@
+---
+"@bigcommerce/catalyst-makeswift": patch
+---
+
+Pulls in changes from the `@bigcommerce/catalyst-core@1.4.2` patch.

From bbe96bbc8d55a5c3b30d1293b8abe8a7ee060d69 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 27 Jan 2026 20:21:36 +0000
Subject: [PATCH 32/69] Version Packages (`integrations/makeswift`)

---
 .changeset/seven-owls-listen.md | 5 -----
 core/CHANGELOG.md               | 6 ++++++
 core/package.json               | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)
 delete mode 100644 .changeset/seven-owls-listen.md

diff --git a/.changeset/seven-owls-listen.md b/.changeset/seven-owls-listen.md
deleted file mode 100644
index 9e8bf5701e..0000000000
--- a/.changeset/seven-owls-listen.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@bigcommerce/catalyst-makeswift": patch
----
-
-Pulls in changes from the `@bigcommerce/catalyst-core@1.4.2` patch.
diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md
index af46d7d876..2c92860ff7 100644
--- a/core/CHANGELOG.md
+++ b/core/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.4.2
+
+### Patch Changes
+
+- [#2845](https://github.com/bigcommerce/catalyst/pull/2845) [`7f82903`](https://github.com/bigcommerce/catalyst/commit/7f82903074ec9831c48246aa748748aede51fe1a) Thanks [@chanceaclark](https://github.com/chanceaclark)! - Pulls in changes from the `@bigcommerce/catalyst-core@1.4.2` patch.
+
 ## 1.4.1
 
 ### Patch Changes
diff --git a/core/package.json b/core/package.json
index ff916e4135..2f558ffd64 100644
--- a/core/package.json
+++ b/core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@bigcommerce/catalyst-makeswift",
   "description": "BigCommerce Catalyst is a Next.js starter kit for building headless BigCommerce storefronts.",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "private": true,
   "scripts": {
     "dev": "npm run generate && next dev",

From ac390faff218ee8da325ebcb150226c4cba3567c Mon Sep 17 00:00:00 2001
From: Matthew Volk <matt.volk@bigcommerce.com>
Date: Tue, 27 Jan 2026 16:17:34 -0600
Subject: [PATCH 33/69] chore(ci): add --scope to vercel deploy and alias
 commands (#2847)

---
 .github/workflows/deploy.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 9039e24adb..2e8edf081e 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -70,7 +70,7 @@ jobs:
                     DEPLOY_ARGS+=(--env BIGCOMMERCE_ACCESS_TOKEN="$BIGCOMMERCE_ACCESS_TOKEN")
                   fi
 
-                  DEPLOYMENT_URL=$(vercel deploy "${DEPLOY_ARGS[@]}")
+                  DEPLOYMENT_URL=$(vercel deploy --scope="${{ vars.VERCEL_TEAM_SLUG }}" "${DEPLOY_ARGS[@]}")
                   echo "deployment_url=$DEPLOYMENT_URL" >> $GITHUB_OUTPUT
 
             - name: Set Vercel Domain Alias
@@ -78,4 +78,4 @@ jobs:
               env:
                   VERCEL_TOKEN: ${{ secrets.VERCEL_TOKEN }}
               run: |
-                  vercel alias ${{ steps.deploy.outputs.deployment_url }} $DOMAIN --token="$VERCEL_TOKEN"
+                  vercel alias ${{ steps.deploy.outputs.deployment_url }} $DOMAIN --scope="${{ vars.VERCEL_TEAM_SLUG }}" --token="$VERCEL_TOKEN"

From 925934849f3ebc9f352380f8318911278b02c183 Mon Sep 17 00:00:00 2001
From: Jorge Moya <jorge.moya@bigcommerce.com>
Date: Tue, 27 Jan 2026 18:01:26 -0600
Subject: [PATCH 34/69] chore: update contributing file with some notes from
 latest release (#2841)

* chore: update contributing file with some notes from latest release

* chore: add info about pushing tags

* fix: remove duplicate line
---
 CONTRIBUTING.md | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d69b24dfdb..7d91bd6bda 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -60,6 +60,7 @@ In order to complete the following steps, you will need to have met the followin
 >
 > - The `name` field in `core/package.json` should remain `@bigcommerce/catalyst-makeswift`
 > - The `version` field in `core/package.json` should remain whatever the latest published `@bigcommerce/catalyst-makeswift` version was
+> - The latest release in `core/CHANGELOG.md` should remain whatever the latest published `@bigcommerce/catalyst-makeswift` version was
 
 4. After resolving any merge conflicts, open a new PR in GitHub to merge your `sync-integrations-makeswift` into `integrations/makeswift`. This PR should be code reviewed and approved before the next steps.
 
@@ -104,14 +105,35 @@ This ensures `integrations/makeswift` remains a faithful mirror of `canary` whil
    - From this new `bump-version` branch, run `pnpm changeset`
    - Select `@bigcommerce/catalyst-makeswift`
    - For choosing between a `patch/minor/major` bump, you should copy the bump from Stage 1. (e.g., if `@bigcommerce/catalyst-core` went from `1.1.0` to `1.2.0`, choose `minor`)
+     - Example changeset:
+
+     ```
+     ---
+     "@bigcommerce/catalyst-makeswift": patch
+     ---
+
+     Pulls in changes from the `@bigcommerce/catalyst-core@1.4.1` patch.
+     ```
+
    - Commit the generated changeset file and open a PR to merge this branch into `integrations/makeswift`
    - Once merged, you can proceed to the next step
 
 4. Merge the **Version Packages (`integrations/makeswift`)** PR: Changesets will open another PR (similar to Stage 1) bumping `@bigcommerce/catalyst-makeswift`. Merge it following the same process. This cuts a new release of the Makeswift variant.
 
+5. **Tags and Releases:** Confirm tags exist for both `@bigcommerce/catalyst-core` and `@bigcommerce/catalyst-makeswift`. If needed, update `latest` tags in GitHub manually.
+
+- Push manually:
+  ```
+  git checkout canary
+  # Make sure you have the latest code
+  git fetch origin
+  git pull
+  git tag @bigcommerce/catalyst-core@latest -f
+  git push origin @bigcommerce/catalyst-core@latest -f
+  ```
+
 ### Additional Notes
 
-- **Tags and Releases:** Confirm tags exist for both `@bigcommerce/catalyst-core` and `@bigcommerce/catalyst-makeswift`. If needed, update `latest` tags in GitHub manually.
 - **Release cadence:** Teams typically review on Wednesdays whether to cut a release, but you may cut releases more frequently as needed.
 
 ## Other Ways to Contribute

From 207ee86f2f43048074f02d22393f9f01c8ca6adc Mon Sep 17 00:00:00 2001
From: Matthew Volk <matt.volk@bigcommerce.com>
Date: Wed, 28 Jan 2026 10:55:04 -0600
Subject: [PATCH 35/69] chore(ci): extract e2e tests to separate workflow
 (#2848)

skip e2e on push to canary/integrations, only run on PRs, no merge queue
---
 .github/workflows/basic.yml |  85 -----------------------------
 .github/workflows/e2e.yml   | 104 ++++++++++++++++++++++++++++++++++++
 2 files changed, 104 insertions(+), 85 deletions(-)
 create mode 100644 .github/workflows/e2e.yml

diff --git a/.github/workflows/basic.yml b/.github/workflows/basic.yml
index 154de2b562..1bd4d8228b 100644
--- a/.github/workflows/basic.yml
+++ b/.github/workflows/basic.yml
@@ -85,88 +85,3 @@ jobs:
 
       - name: Run Tests
         run: pnpm run test
-
-  e2e-tests:
-    name: E2E Functional Tests (${{ matrix.name }})
-
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        include:
-          - name: default
-            browsers: chromium webkit
-            test-filter: tests/ui/e2e
-            trailing-slash: true
-            locale-var: TESTS_LOCALE
-            artifact-name: playwright-report
-          - name: TRAILING_SLASH=false
-            browsers: chromium
-            test-filter: tests/ui/e2e --grep @no-trailing-slash
-            trailing-slash: false
-            locale-var: TESTS_LOCALE
-            artifact-name: playwright-report-no-trailing
-          - name: alternate locale
-            browsers: chromium
-            test-filter: tests/ui/e2e --grep @alternate-locale
-            trailing-slash: true
-            locale-var: TESTS_ALTERNATE_LOCALE
-            artifact-name: playwright-report-alternate-locale
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 2
-
-      - uses: pnpm/action-setup@v3
-
-      - name: Use Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: ".nvmrc"
-          cache: "pnpm"
-
-      - name: Install dependencies
-        run: pnpm install --frozen-lockfile
-
-      - name: Install Playwright browsers
-        run: pnpm exec playwright install --with-deps ${{ matrix.browsers }}
-        working-directory: ./core
-
-      # - name: Build catalyst-client
-      #   run: pnpm --filter @bigcommerce/catalyst-client build
-
-      # - name: Build catalyst-core
-      #   run: pnpm --filter @bigcommerce/catalyst-core build
-
-      - name: Build catalyst
-        run: pnpm build
-
-      - name: Start server
-        run: |
-          pnpm start &
-          npx wait-on http://localhost:3000 --timeout 60000
-        working-directory: ./core
-        env:
-          PORT: 3000
-          AUTH_SECRET: ${{ secrets.TESTS_AUTH_SECRET }}
-          AUTH_TRUST_HOST: ${{ vars.TESTS_AUTH_TRUST_HOST }}
-          BIGCOMMERCE_TRUSTED_PROXY_SECRET: ${{ secrets.BIGCOMMERCE_TRUSTED_PROXY_SECRET }}
-          TESTS_LOCALE: ${{ vars[matrix.locale-var] }}
-          TRAILING_SLASH: ${{ matrix.trailing-slash }}
-          DEFAULT_REVALIDATE_TARGET: ${{ matrix.name == 'default' && '1' || '' }}
-
-      - name: Run E2E tests
-        run: pnpm exec playwright test ${{ matrix.test-filter }}
-        working-directory: ./core
-        env:
-          PLAYWRIGHT_TEST_BASE_URL: http://localhost:3000
-
-      - name: Upload test results
-        if: ${{ !cancelled() }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ matrix.artifact-name }}
-          path: ./core/.tests/reports/
-          retention-days: 3
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
new file mode 100644
index 0000000000..64ca9b3dfc
--- /dev/null
+++ b/.github/workflows/e2e.yml
@@ -0,0 +1,104 @@
+name: E2E Tests
+
+on:
+  pull_request:
+    types: [opened, synchronize]
+    branches: [canary, integrations/makeswift, integrations/b2b-makeswift]
+
+env:
+  TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
+  TURBO_TEAM: ${{ vars.TURBO_TEAM }}
+  TURBO_REMOTE_CACHE_SIGNATURE_KEY: ${{ secrets.TURBO_REMOTE_CACHE_SIGNATURE_KEY }}
+  BIGCOMMERCE_STORE_HASH: ${{ vars.BIGCOMMERCE_STORE_HASH }}
+  BIGCOMMERCE_CHANNEL_ID: ${{ vars.BIGCOMMERCE_CHANNEL_ID }}
+  BIGCOMMERCE_CLIENT_ID: ${{ secrets.BIGCOMMERCE_CLIENT_ID }}
+  BIGCOMMERCE_CLIENT_SECRET: ${{ secrets.BIGCOMMERCE_CLIENT_SECRET }}
+  BIGCOMMERCE_STOREFRONT_TOKEN: ${{ secrets.BIGCOMMERCE_STOREFRONT_TOKEN }}
+  BIGCOMMERCE_ACCESS_TOKEN: ${{ secrets.BIGCOMMERCE_ACCESS_TOKEN }}
+  TEST_CUSTOMER_ID: ${{ vars.TEST_CUSTOMER_ID }}
+  TEST_CUSTOMER_EMAIL: ${{ vars.TEST_CUSTOMER_EMAIL }}
+  TEST_CUSTOMER_PASSWORD: ${{ secrets.TEST_CUSTOMER_PASSWORD }}
+  TESTS_FALLBACK_LOCALE: ${{ vars.TESTS_FALLBACK_LOCALE }}
+  TESTS_READ_ONLY: ${{ vars.TESTS_READ_ONLY }}
+  DEFAULT_PRODUCT_ID: ${{ vars.DEFAULT_PRODUCT_ID }}
+  DEFAULT_COMPLEX_PRODUCT_ID: ${{ vars.DEFAULT_COMPLEX_PRODUCT_ID }}
+
+jobs:
+  e2e-tests:
+    name: E2E Functional Tests (${{ matrix.name }})
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        include:
+          - name: default
+            browsers: chromium webkit
+            test-filter: tests/ui/e2e
+            trailing-slash: true
+            locale-var: TESTS_LOCALE
+            artifact-name: playwright-report
+          - name: TRAILING_SLASH=false
+            browsers: chromium
+            test-filter: tests/ui/e2e --grep @no-trailing-slash
+            trailing-slash: false
+            locale-var: TESTS_LOCALE
+            artifact-name: playwright-report-no-trailing
+          - name: alternate locale
+            browsers: chromium
+            test-filter: tests/ui/e2e --grep @alternate-locale
+            trailing-slash: true
+            locale-var: TESTS_ALTERNATE_LOCALE
+            artifact-name: playwright-report-alternate-locale
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 2
+
+      - uses: pnpm/action-setup@v3
+
+      - name: Use Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: ".nvmrc"
+          cache: "pnpm"
+
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Install Playwright browsers
+        run: pnpm exec playwright install --with-deps ${{ matrix.browsers }}
+        working-directory: ./core
+
+      - name: Build catalyst
+        run: pnpm build
+
+      - name: Start server
+        run: |
+          pnpm start &
+          npx wait-on http://localhost:3000 --timeout 60000
+        working-directory: ./core
+        env:
+          PORT: 3000
+          AUTH_SECRET: ${{ secrets.TESTS_AUTH_SECRET }}
+          AUTH_TRUST_HOST: ${{ vars.TESTS_AUTH_TRUST_HOST }}
+          BIGCOMMERCE_TRUSTED_PROXY_SECRET: ${{ secrets.BIGCOMMERCE_TRUSTED_PROXY_SECRET }}
+          TESTS_LOCALE: ${{ vars[matrix.locale-var] }}
+          TRAILING_SLASH: ${{ matrix.trailing-slash }}
+          DEFAULT_REVALIDATE_TARGET: ${{ matrix.name == 'default' && '1' || '' }}
+
+      - name: Run E2E tests
+        run: pnpm exec playwright test ${{ matrix.test-filter }}
+        working-directory: ./core
+        env:
+          PLAYWRIGHT_TEST_BASE_URL: http://localhost:3000
+
+      - name: Upload test results
+        if: ${{ !cancelled() }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.artifact-name }}
+          path: ./core/.tests/reports/
+          retention-days: 3

From a7395f1a6778fe93080e8fcb05dce423cbc3acc0 Mon Sep 17 00:00:00 2001
From: Chancellor Clark <chancellor.clark@bigcommerce.com>
Date: Thu, 29 Jan 2026 14:54:19 -0700
Subject: [PATCH 36/69] chore: use dompurify instead of isomorphic version
 (#2852)

---
 .changeset/gentle-badgers-dress.md            | 22 ++++++
 .../product-review-schema.tsx                 |  5 +-
 core/package.json                             |  2 +-
 pnpm-lock.yaml                                | 74 ++++++++++---------
 4 files changed, 66 insertions(+), 37 deletions(-)
 create mode 100644 .changeset/gentle-badgers-dress.md

diff --git a/.changeset/gentle-badgers-dress.md b/.changeset/gentle-badgers-dress.md
new file mode 100644
index 0000000000..5b28203762
--- /dev/null
+++ b/.changeset/gentle-badgers-dress.md
@@ -0,0 +1,22 @@
+---
+"@bigcommerce/catalyst-core": patch
+---
+
+Uses regular `dompurify` (DP) instead of `isomorphic-dompurify` (IDP), because IDP requires JSDOM. JSDOM doesn't work in edge-runtime environments even with nodejs compatibility. We only need it on the client anyways for the JSON-LD schema, so it doesn't need the isomorphic aspect of it. This also changes `core/app/[locale]/(default)/product/[slug]/_components/product-review-schema/product-review-schema.tsx` to be a client-component to enable `dompurify to work correctly.
+
+## Migration
+
+1. Remove the old dependency and add the new:
+```bash
+pnpm rm isomorphic-dompurify
+pnpm add dompurify -S
+```
+
+2. Change the import in `core/app/[locale]/(default)/product/[slug]/_components/product-review-schema/product-review-schema.tsx`:
+```diff
+- import DOMPurify from 'isomorphic-dompurify';
++// eslint-disable-next-line import/no-named-as-default
++import DOMPurify from 'dompurify';
+```
+
+3. Add the `'use client';` directive to the top of `core/app/[locale]/(default)/product/[slug]/_components/product-review-schema/product-review-schema.tsx`.
\ No newline at end of file
diff --git a/core/app/[locale]/(default)/product/[slug]/_components/product-review-schema/product-review-schema.tsx b/core/app/[locale]/(default)/product/[slug]/_components/product-review-schema/product-review-schema.tsx
index 15f1cd00c4..21917a35e8 100644
--- a/core/app/[locale]/(default)/product/[slug]/_components/product-review-schema/product-review-schema.tsx
+++ b/core/app/[locale]/(default)/product/[slug]/_components/product-review-schema/product-review-schema.tsx
@@ -1,4 +1,7 @@
-import DOMPurify from 'isomorphic-dompurify';
+'use client';
+
+// eslint-disable-next-line import/no-named-as-default
+import DOMPurify from 'dompurify';
 import { useFormatter } from 'next-intl';
 import { Product as ProductSchemaType, WithContext } from 'schema-dts';
 
diff --git a/core/package.json b/core/package.json
index c1e19d8256..3ada39fa58 100644
--- a/core/package.json
+++ b/core/package.json
@@ -52,7 +52,7 @@
     "embla-carousel-react": "8.5.2",
     "gql.tada": "^1.8.10",
     "graphql": "^16.11.0",
-    "isomorphic-dompurify": "^2.25.0",
+    "dompurify": "^3.3.1",
     "jose": "^5.10.0",
     "lodash.debounce": "^4.0.8",
     "lru-cache": "^11.1.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6a329e0923..dbc27dcfcd 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -131,6 +131,9 @@ importers:
       deepmerge:
         specifier: ^4.3.1
         version: 4.3.1
+      dompurify:
+        specifier: ^3.3.1
+        version: 3.3.1
       embla-carousel:
         specifier: 8.5.2
         version: 8.5.2
@@ -149,9 +152,6 @@ importers:
       graphql:
         specifier: ^16.11.0
         version: 16.11.0
-      isomorphic-dompurify:
-        specifier: ^2.25.0
-        version: 2.25.0
       jose:
         specifier: ^5.10.0
         version: 5.10.0
@@ -5847,8 +5847,8 @@ packages:
     resolution: {integrity: sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==}
     engines: {node: '>= 4'}
 
-  dompurify@3.2.6:
-    resolution: {integrity: sha512-/2GogDQlohXPZe6D6NOgQvXLPSYBqIWMnZ8zzOhn09REE4eyAzb+Hed3jhoM9OkuaJ8P6ZGTTVWQKAi8ieIzfQ==}
+  dompurify@3.3.1:
+    resolution: {integrity: sha512-qkdCKzLNtrgPFP1Vo+98FRzJnBRGe4ffyCea9IwHB1fyxPOeNTHpLKYGd4Uk9xvNoH0ZoOjwZxNptyMwqrId1Q==}
 
   domutils@3.2.2:
     resolution: {integrity: sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==}
@@ -7157,10 +7157,6 @@ packages:
     resolution: {integrity: sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==}
     engines: {node: '>=16'}
 
-  isomorphic-dompurify@2.25.0:
-    resolution: {integrity: sha512-bcpJzu9DOjN21qaCVpcoCwUX1ytpvA6EFqCK5RNtPg5+F0Jz9PX50jl6jbEicBNeO87eDDfC7XtPs4zjDClZJg==}
-    engines: {node: '>=18'}
-
   isomorphic-fetch@3.0.0:
     resolution: {integrity: sha512-qvUtwJ3j6qwsF3jLxkZ72qCgjMysPzDfeV240JHiGZsANBYd+EEuu35v7dfrJ9Up0Ak07D7GGSkGhCHTqg/5wA==}
 
@@ -10268,6 +10264,7 @@ snapshots:
       '@csstools/css-parser-algorithms': 3.0.5(@csstools/css-tokenizer@3.0.4)
       '@csstools/css-tokenizer': 3.0.4
       lru-cache: 10.4.3
+    optional: true
 
   '@ast-grep/napi-darwin-arm64@0.35.0':
     optional: true
@@ -11479,9 +11476,9 @@ snapshots:
       '@typescript-eslint/parser': 8.28.0(eslint@8.57.1)(typescript@5.8.3)
       eslint: 8.57.1
       eslint-config-prettier: 9.1.0(eslint@8.57.1)
-      eslint-import-resolver-typescript: 3.9.1(eslint-plugin-import@2.31.0)(eslint@8.57.1)
+      eslint-import-resolver-typescript: 3.9.1(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1))(eslint@8.57.1)
       eslint-plugin-gettext: 1.2.0
-      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint-import-resolver-typescript@3.9.1)(eslint@8.57.1)
+      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint-import-resolver-typescript@3.9.1(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1)
       eslint-plugin-jest: 28.11.0(@typescript-eslint/eslint-plugin@8.28.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1)(jest@29.7.0(@types/node@22.15.30)(ts-node@10.9.2(@swc/core@1.11.31)(@types/node@22.15.30)(typescript@5.8.3)))(typescript@5.8.3)
       eslint-plugin-jest-dom: 5.5.0(eslint@8.57.1)
       eslint-plugin-jest-formatting: 3.1.0(eslint@8.57.1)
@@ -16891,6 +16888,7 @@ snapshots:
     dependencies:
       '@asamuzakjp/css-color': 3.2.0
       rrweb-cssom: 0.8.0
+    optional: true
 
   csstype@3.2.3: {}
 
@@ -16902,6 +16900,7 @@ snapshots:
     dependencies:
       whatwg-mimetype: 4.0.0
       whatwg-url: 14.2.0
+    optional: true
 
   data-view-buffer@1.0.2:
     dependencies:
@@ -17061,7 +17060,7 @@ snapshots:
     dependencies:
       domelementtype: 2.3.0
 
-  dompurify@3.2.6:
+  dompurify@3.3.1:
     optionalDependencies:
       '@types/trusted-types': 2.0.7
 
@@ -17370,8 +17369,8 @@ snapshots:
       '@typescript-eslint/parser': 8.28.0(eslint@8.57.1)(typescript@5.8.3)
       eslint: 8.57.1
       eslint-import-resolver-node: 0.3.9
-      eslint-import-resolver-typescript: 3.9.1(eslint-plugin-import@2.31.0)(eslint@8.57.1)
-      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint-import-resolver-typescript@3.9.1)(eslint@8.57.1)
+      eslint-import-resolver-typescript: 3.9.1(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1))(eslint@8.57.1)
+      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint-import-resolver-typescript@3.9.1(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1)
       eslint-plugin-jsx-a11y: 6.10.2(eslint@8.57.1)
       eslint-plugin-react: 7.37.4(eslint@8.57.1)
       eslint-plugin-react-hooks: 5.2.0(eslint@8.57.1)
@@ -17398,7 +17397,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  eslint-import-resolver-typescript@3.9.1(eslint-plugin-import@2.31.0)(eslint@8.57.1):
+  eslint-import-resolver-typescript@3.9.1(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1))(eslint@8.57.1):
     dependencies:
       '@nolyfill/is-core-module': 1.0.39
       debug: 4.4.1
@@ -17409,7 +17408,7 @@ snapshots:
       stable-hash: 0.0.5
       tinyglobby: 0.2.14
     optionalDependencies:
-      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint-import-resolver-typescript@3.9.1)(eslint@8.57.1)
+      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint-import-resolver-typescript@3.9.1(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -17420,7 +17419,7 @@ snapshots:
       '@typescript-eslint/parser': 8.28.0(eslint@8.57.1)(typescript@5.8.3)
       eslint: 8.57.1
       eslint-import-resolver-node: 0.3.9
-      eslint-import-resolver-typescript: 3.9.1(eslint-plugin-import@2.31.0)(eslint@8.57.1)
+      eslint-import-resolver-typescript: 3.9.1(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1))(eslint@8.57.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -17434,7 +17433,7 @@ snapshots:
     dependencies:
       gettext-parser: 4.2.0
 
-  eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint-import-resolver-typescript@3.9.1)(eslint@8.57.1):
+  eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint-import-resolver-typescript@3.9.1(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1):
     dependencies:
       '@rtsao/scc': 1.1.0
       array-includes: 3.1.8
@@ -18236,6 +18235,7 @@ snapshots:
   html-encoding-sniffer@4.0.0:
     dependencies:
       whatwg-encoding: 3.1.1
+    optional: true
 
   html-escaper@2.0.2: {}
 
@@ -18475,7 +18475,8 @@ snapshots:
 
   is-plain-object@5.0.0: {}
 
-  is-potential-custom-element-name@1.0.1: {}
+  is-potential-custom-element-name@1.0.1:
+    optional: true
 
   is-promise@4.0.0: {}
 
@@ -18561,16 +18562,6 @@ snapshots:
 
   isexe@3.1.1: {}
 
-  isomorphic-dompurify@2.25.0:
-    dependencies:
-      dompurify: 3.2.6
-      jsdom: 26.1.0
-    transitivePeerDependencies:
-      - bufferutil
-      - canvas
-      - supports-color
-      - utf-8-validate
-
   isomorphic-fetch@3.0.0(encoding@0.1.13):
     dependencies:
       node-fetch: 2.7.0(encoding@0.1.13)
@@ -19012,6 +19003,7 @@ snapshots:
       - bufferutil
       - supports-color
       - utf-8-validate
+    optional: true
 
   jsesc@3.1.0: {}
 
@@ -19624,7 +19616,8 @@ snapshots:
     optionalDependencies:
       next: 15.5.10(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
 
-  nwsapi@2.2.20: {}
+  nwsapi@2.2.20:
+    optional: true
 
   nypm@0.5.4:
     dependencies:
@@ -20596,7 +20589,8 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  rrweb-cssom@0.8.0: {}
+  rrweb-cssom@0.8.0:
+    optional: true
 
   rspack-resolver@1.2.2:
     optionalDependencies:
@@ -20648,6 +20642,7 @@ snapshots:
   saxes@6.0.0:
     dependencies:
       xmlchars: 2.2.0
+    optional: true
 
   scheduler@0.26.0: {}
 
@@ -21101,7 +21096,8 @@ snapshots:
       zimmerframe: 1.1.4
     optional: true
 
-  symbol-tree@3.2.4: {}
+  symbol-tree@3.2.4:
+    optional: true
 
   synckit@0.11.8:
     dependencies:
@@ -21243,6 +21239,7 @@ snapshots:
   tldts@6.1.86:
     dependencies:
       tldts-core: 6.1.86
+    optional: true
 
   tmp@0.0.33:
     dependencies:
@@ -21274,6 +21271,7 @@ snapshots:
   tough-cookie@5.1.2:
     dependencies:
       tldts: 6.1.86
+    optional: true
 
   tr46@0.0.3: {}
 
@@ -21284,6 +21282,7 @@ snapshots:
   tr46@5.1.1:
     dependencies:
       punycode: 2.3.1
+    optional: true
 
   tree-kill@1.2.2: {}
 
@@ -21765,6 +21764,7 @@ snapshots:
   w3c-xmlserializer@5.0.0:
     dependencies:
       xml-name-validator: 5.0.0
+    optional: true
 
   walker@1.0.8:
     dependencies:
@@ -21776,7 +21776,8 @@ snapshots:
 
   webidl-conversions@4.0.2: {}
 
-  webidl-conversions@7.0.0: {}
+  webidl-conversions@7.0.0:
+    optional: true
 
   webpack-bundle-analyzer@4.10.1:
     dependencies:
@@ -21811,6 +21812,7 @@ snapshots:
     dependencies:
       tr46: 5.1.1
       webidl-conversions: 7.0.0
+    optional: true
 
   whatwg-url@5.0.0:
     dependencies:
@@ -21952,9 +21954,11 @@ snapshots:
 
   xdg-basedir@4.0.0: {}
 
-  xml-name-validator@5.0.0: {}
+  xml-name-validator@5.0.0:
+    optional: true
 
-  xmlchars@2.2.0: {}
+  xmlchars@2.2.0:
+    optional: true
 
   y18n@5.0.8: {}
 

From 74dee6e6cafc57ea0e6eea94aafc4b38063352b1 Mon Sep 17 00:00:00 2001
From: Jordan Arldt <jordan.arldt@bigcommerce.com>
Date: Fri, 30 Jan 2026 13:02:05 -0600
Subject: [PATCH 37/69] chore(catalyst): CATALYST-1267 Translate form field
 errors (#2844)

* chore(catalyst): CATALYST-1267 Translate form field errors

* chore(catalyst): CATALYST-1267 Output nextJS logs in test report folder

* chore(catalyst): CATALYST-1267 Update forgot-password test translation
---
 .changeset/hot-files-start.md                 |  13 ++
 .github/workflows/e2e.yml                     |   3 +-
 .../_actions/change-password.ts               |   6 +-
 .../(auth)/change-password/page-data.ts       |  39 ++++
 .../(default)/(auth)/change-password/page.tsx |   4 +
 .../(default)/(auth)/register/page.tsx        |  43 +++++
 .../settings/_actions/change-password.ts      |  10 +-
 .../(default)/account/settings/page-data.tsx  |  14 ++
 .../(default)/account/settings/page.tsx       |   1 +
 .../cart/_actions/update-shipping-info.ts     |   2 +-
 .../purchase/_actions/add-to-cart.tsx         |   2 +-
 .../gift-certificates/purchase/page.tsx       |  16 +-
 .../subscribe/_actions/subscribe.ts           |   7 +-
 core/i18n/utils.ts                            |  29 +++
 core/messages/en.json                         | 109 +++++++++--
 .../tests/ui/e2e/auth/forgot-password.spec.ts |   3 +-
 core/vibes/soul/form/dynamic-form/index.tsx   |  38 +++-
 core/vibes/soul/form/dynamic-form/schema.ts   | 174 +++++++++++-------
 .../primitives/inline-email-form/index.tsx    |   9 +-
 .../primitives/inline-email-form/schema.ts    |  13 +-
 .../account-settings/change-password-form.tsx |  16 +-
 .../soul/sections/account-settings/index.tsx  |   5 +
 .../soul/sections/account-settings/schema.ts  | 102 +++++++---
 .../account-settings/update-account-form.tsx  |  18 +-
 .../sections/address-list-section/index.tsx   |   7 +-
 .../sections/address-list-section/schema.ts   |  30 +++
 .../sections/cart/coupon-code-form/index.tsx  |  13 +-
 .../cart/gift-certificate-code-form/index.tsx |   8 +-
 core/vibes/soul/sections/cart/schema.ts       |  31 ++--
 .../sections/cart/shipping-form/index.tsx     |  11 +-
 .../sections/dynamic-form-section/index.tsx   |   4 +
 .../forgot-password-form.tsx                  |  10 +-
 .../forgot-password-section/schema.ts         |  15 +-
 .../index.tsx                                 |  33 +++-
 .../sections/reset-password-section/index.tsx |   5 +
 .../reset-password-form.tsx                   |  14 +-
 .../sections/reset-password-section/schema.ts |  75 +++++---
 core/vibes/soul/sections/reviews/index.tsx    |   6 +
 .../soul/sections/reviews/review-form.tsx     |  14 +-
 core/vibes/soul/sections/reviews/schema.ts    |  27 +++
 .../soul/sections/sign-in-section/schema.ts   |  16 ++
 .../sections/sign-in-section/sign-in-form.tsx |  10 +-
 42 files changed, 803 insertions(+), 202 deletions(-)
 create mode 100644 .changeset/hot-files-start.md
 create mode 100644 core/app/[locale]/(default)/(auth)/change-password/page-data.ts
 create mode 100644 core/i18n/utils.ts

diff --git a/.changeset/hot-files-start.md b/.changeset/hot-files-start.md
new file mode 100644
index 0000000000..26b01586dd
--- /dev/null
+++ b/.changeset/hot-files-start.md
@@ -0,0 +1,13 @@
+---
+"@bigcommerce/catalyst-core": patch
+---
+
+Update forms to translate the form field validation errors
+
+## Migration
+
+Due to the amount of changes, it is recommended to just use the PR as a reference for migration.
+
+Detailed migration steps can be found on the PR here: 
+https://github.com/bigcommerce/catalyst/pull/2844
+
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 64ca9b3dfc..657f562574 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -77,7 +77,8 @@ jobs:
 
       - name: Start server
         run: |
-          pnpm start &
+          mkdir -p ./.tests/reports/
+          pnpm start > ./.tests/reports/nextjs.app.log 2>&1 &
           npx wait-on http://localhost:3000 --timeout 60000
         working-directory: ./core
         env:
diff --git a/core/app/[locale]/(default)/(auth)/change-password/_actions/change-password.ts b/core/app/[locale]/(default)/(auth)/change-password/_actions/change-password.ts
index 128b2e3b8e..12bbaf3883 100644
--- a/core/app/[locale]/(default)/(auth)/change-password/_actions/change-password.ts
+++ b/core/app/[locale]/(default)/(auth)/change-password/_actions/change-password.ts
@@ -4,8 +4,8 @@ import { BigCommerceGQLError } from '@bigcommerce/catalyst-client';
 import { SubmissionResult } from '@conform-to/react';
 import { parseWithZod } from '@conform-to/zod';
 import { getTranslations } from 'next-intl/server';
+import { z } from 'zod';
 
-import { schema } from '@/vibes/soul/sections/reset-password-section/schema';
 import { client } from '~/client';
 import { graphql } from '~/client/graphql';
 
@@ -25,6 +25,10 @@ const ChangePasswordMutation = graphql(`
   }
 `);
 
+const schema = z.object({
+  password: z.string(),
+});
+
 export async function changePassword(
   { token, customerEntityId }: { token: string; customerEntityId: string },
   _prevState: { lastResult: SubmissionResult | null; successMessage?: string },
diff --git a/core/app/[locale]/(default)/(auth)/change-password/page-data.ts b/core/app/[locale]/(default)/(auth)/change-password/page-data.ts
new file mode 100644
index 0000000000..43a72f2d3a
--- /dev/null
+++ b/core/app/[locale]/(default)/(auth)/change-password/page-data.ts
@@ -0,0 +1,39 @@
+import { cache } from 'react';
+
+import { client } from '~/client';
+import { graphql } from '~/client/graphql';
+import { revalidate } from '~/client/revalidate-target';
+
+const ChangePasswordQuery = graphql(`
+  query ChangePasswordQuery {
+    site {
+      settings {
+        customers {
+          passwordComplexitySettings {
+            minimumNumbers
+            minimumPasswordLength
+            minimumSpecialCharacters
+            requireLowerCase
+            requireNumbers
+            requireSpecialCharacters
+            requireUpperCase
+          }
+        }
+      }
+    }
+  }
+`);
+
+export const getChangePasswordQuery = cache(async () => {
+  const response = await client.fetch({
+    document: ChangePasswordQuery,
+    fetchOptions: { next: { revalidate } },
+  });
+
+  const passwordComplexitySettings =
+    response.data.site.settings?.customers?.passwordComplexitySettings;
+
+  return {
+    passwordComplexitySettings,
+  };
+});
diff --git a/core/app/[locale]/(default)/(auth)/change-password/page.tsx b/core/app/[locale]/(default)/(auth)/change-password/page.tsx
index 944f091c6c..1e7e251a6a 100644
--- a/core/app/[locale]/(default)/(auth)/change-password/page.tsx
+++ b/core/app/[locale]/(default)/(auth)/change-password/page.tsx
@@ -3,6 +3,7 @@ import { Metadata } from 'next';
 import { getTranslations, setRequestLocale } from 'next-intl/server';
 
 import { ResetPasswordSection } from '@/vibes/soul/sections/reset-password-section';
+import { getChangePasswordQuery } from '~/app/[locale]/(default)/(auth)/change-password/page-data';
 import { redirect } from '~/i18n/routing';
 
 import { changePassword } from './_actions/change-password';
@@ -37,11 +38,14 @@ export default async function ChangePassword({ params, searchParams }: Props) {
     return redirect({ href: '/login', locale });
   }
 
+  const { passwordComplexitySettings } = await getChangePasswordQuery();
+
   return (
     <ResetPasswordSection
       action={changePassword.bind(null, { customerEntityId, token })}
       confirmPasswordLabel={t('confirmPassword')}
       newPasswordLabel={t('newPassword')}
+      passwordComplexitySettings={passwordComplexitySettings}
       title={t('title')}
     />
   );
diff --git a/core/app/[locale]/(default)/(auth)/register/page.tsx b/core/app/[locale]/(default)/(auth)/register/page.tsx
index 1aeaeb9b58..bf8ebf1357 100644
--- a/core/app/[locale]/(default)/(auth)/register/page.tsx
+++ b/core/app/[locale]/(default)/(auth)/register/page.tsx
@@ -109,6 +109,49 @@ export default async function Register({ params }: Props) {
   return (
     <DynamicFormSection
       action={registerCustomer}
+      errorTranslations={{
+        firstName: {
+          invalid_type: t('FieldErrors.firstNameRequired'),
+        },
+        lastName: {
+          invalid_type: t('FieldErrors.lastNameRequired'),
+        },
+        email: {
+          invalid_type: t('FieldErrors.emailRequired'),
+          invalid_string: t('FieldErrors.emailInvalid'),
+        },
+        password: {
+          invalid_type: t('FieldErrors.passwordRequired'),
+          too_small: t('FieldErrors.passwordTooSmall', {
+            minLength: passwordComplexitySettings?.minimumPasswordLength ?? 0,
+          }),
+          lowercase_required: t('FieldErrors.passwordLowercaseRequired'),
+          uppercase_required: t('FieldErrors.passwordUppercaseRequired'),
+          number_required: t('FieldErrors.passwordNumberRequired', {
+            minNumbers: passwordComplexitySettings?.minimumNumbers ?? 1,
+          }),
+          special_character_required: t('FieldErrors.passwordSpecialCharacterRequired'),
+          passwords_must_match: t('FieldErrors.passwordsMustMatch'),
+        },
+        confirmPassword: {
+          invalid_type: t('FieldErrors.passwordRequired'),
+        },
+        address1: {
+          invalid_type: t('FieldErrors.addressLine1Required'),
+        },
+        city: {
+          invalid_type: t('FieldErrors.cityRequired'),
+        },
+        countryCode: {
+          invalid_type: t('FieldErrors.countryRequired'),
+        },
+        stateOrProvince: {
+          invalid_type: t('FieldErrors.stateRequired'),
+        },
+        postalCode: {
+          invalid_type: t('FieldErrors.postalCodeRequired'),
+        },
+      }}
       fields={fields}
       passwordComplexity={passwordComplexitySettings}
       submitLabel={t('cta')}
diff --git a/core/app/[locale]/(default)/account/settings/_actions/change-password.ts b/core/app/[locale]/(default)/account/settings/_actions/change-password.ts
index 3a5df942d9..e781cc140b 100644
--- a/core/app/[locale]/(default)/account/settings/_actions/change-password.ts
+++ b/core/app/[locale]/(default)/account/settings/_actions/change-password.ts
@@ -3,9 +3,9 @@
 import { BigCommerceGQLError } from '@bigcommerce/catalyst-client';
 import { parseWithZod } from '@conform-to/zod';
 import { getTranslations } from 'next-intl/server';
+import { z } from 'zod';
 
 import { ChangePasswordAction } from '@/vibes/soul/sections/account-settings/change-password-form';
-import { changePasswordSchema } from '@/vibes/soul/sections/account-settings/schema';
 import { getSessionCustomerAccessToken } from '~/auth';
 import { client } from '~/client';
 import { graphql } from '~/client/graphql';
@@ -34,11 +34,15 @@ const CustomerChangePasswordMutation = graphql(`
   }
 `);
 
+const schema = z.object({
+  currentPassword: z.string().trim(),
+  password: z.string(),
+});
+
 export const changePassword: ChangePasswordAction = async (prevState, formData) => {
   const t = await getTranslations('Account.Settings');
   const customerAccessToken = await getSessionCustomerAccessToken();
-
-  const submission = parseWithZod(formData, { schema: changePasswordSchema });
+  const submission = parseWithZod(formData, { schema });
 
   if (submission.status !== 'success') {
     return { lastResult: submission.reply() };
diff --git a/core/app/[locale]/(default)/account/settings/page-data.tsx b/core/app/[locale]/(default)/account/settings/page-data.tsx
index f0db7b0f6a..136ef5c991 100644
--- a/core/app/[locale]/(default)/account/settings/page-data.tsx
+++ b/core/app/[locale]/(default)/account/settings/page-data.tsx
@@ -35,6 +35,17 @@ const AccountSettingsQuery = graphql(
           newsletter {
             showNewsletterSignup
           }
+          customers {
+            passwordComplexitySettings {
+              minimumNumbers
+              minimumPasswordLength
+              minimumSpecialCharacters
+              requireLowerCase
+              requireNumbers
+              requireSpecialCharacters
+              requireUpperCase
+            }
+          }
         }
       }
     }
@@ -75,6 +86,8 @@ export const getAccountSettingsQuery = cache(async ({ address, customer }: Props
   const customerFields = response.data.site.settings?.formFields.customer;
   const customerInfo = response.data.customer;
   const newsletterSettings = response.data.site.settings?.newsletter;
+  const passwordComplexitySettings =
+    response.data.site.settings?.customers?.passwordComplexitySettings;
 
   if (!addressFields || !customerFields || !customerInfo) {
     return null;
@@ -85,5 +98,6 @@ export const getAccountSettingsQuery = cache(async ({ address, customer }: Props
     customerFields,
     customerInfo,
     newsletterSettings,
+    passwordComplexitySettings,
   };
 });
diff --git a/core/app/[locale]/(default)/account/settings/page.tsx b/core/app/[locale]/(default)/account/settings/page.tsx
index 6d074e9431..cad145dc6f 100644
--- a/core/app/[locale]/(default)/account/settings/page.tsx
+++ b/core/app/[locale]/(default)/account/settings/page.tsx
@@ -61,6 +61,7 @@ export default async function Settings({ params }: Props) {
       newsletterSubscriptionEnabled={newsletterSubscriptionEnabled}
       newsletterSubscriptionLabel={t('NewsletterSubscription.label')}
       newsletterSubscriptionTitle={t('NewsletterSubscription.title')}
+      passwordComplexitySettings={accountSettings.passwordComplexitySettings}
       title={t('title')}
       updateAccountAction={updateCustomer}
       updateAccountSubmitLabel={t('cta')}
diff --git a/core/app/[locale]/(default)/cart/_actions/update-shipping-info.ts b/core/app/[locale]/(default)/cart/_actions/update-shipping-info.ts
index bb1c1d34a0..662ba0f7a6 100644
--- a/core/app/[locale]/(default)/cart/_actions/update-shipping-info.ts
+++ b/core/app/[locale]/(default)/cart/_actions/update-shipping-info.ts
@@ -23,7 +23,7 @@ export const updateShippingInfo = async (
   const t = await getTranslations('Cart.CheckoutSummary.Shipping');
 
   const submission = parseWithZod(formData, {
-    schema: shippingActionFormDataSchema,
+    schema: shippingActionFormDataSchema({ required_error: t('countryRequired') }),
   });
 
   const cartId = await getCartId();
diff --git a/core/app/[locale]/(default)/gift-certificates/purchase/_actions/add-to-cart.tsx b/core/app/[locale]/(default)/gift-certificates/purchase/_actions/add-to-cart.tsx
index 10f05d1782..49047ba143 100644
--- a/core/app/[locale]/(default)/gift-certificates/purchase/_actions/add-to-cart.tsx
+++ b/core/app/[locale]/(default)/gift-certificates/purchase/_actions/add-to-cart.tsx
@@ -41,7 +41,7 @@ const GiftCertificateSettingsQuery = graphql(
 
 const schema = (
   giftCertificateSettings: ResultOf<typeof GiftCertificateSettingsFragment> | undefined,
-  t: ExistingResultType<typeof getTranslations>,
+  t: ExistingResultType<typeof getTranslations<'GiftCertificates.Purchase'>>,
 ) => {
   return z
     .object({
diff --git a/core/app/[locale]/(default)/gift-certificates/purchase/page.tsx b/core/app/[locale]/(default)/gift-certificates/purchase/page.tsx
index 07edaab6a9..74f60684fe 100644
--- a/core/app/[locale]/(default)/gift-certificates/purchase/page.tsx
+++ b/core/app/[locale]/(default)/gift-certificates/purchase/page.tsx
@@ -18,20 +18,20 @@ interface Props {
 function getFields(
   giftCertificateSettings: ResultOf<typeof GiftCertificateSettingsFragment>,
   expiresAt: string | undefined,
-  t: ExistingResultType<typeof getTranslations>,
+  t: ExistingResultType<typeof getTranslations<'GiftCertificates'>>,
 ): Array<Field | FieldGroup<Field>> {
   const baseFields: Array<Field | FieldGroup<Field>> = [
     [
       {
         type: 'text',
         name: 'senderName',
-        label: `${t('Purchase.Form.senderNameLabel')} *`,
+        label: t('Purchase.Form.senderNameLabel'),
         required: true,
       },
       {
         type: 'email',
         name: 'senderEmail',
-        label: `${t('Purchase.Form.senderEmailLabel')} *`,
+        label: t('Purchase.Form.senderEmailLabel'),
         required: true,
       },
     ],
@@ -39,13 +39,13 @@ function getFields(
       {
         type: 'text',
         name: 'recipientName',
-        label: `${t('Purchase.Form.recipientNameLabel')} *`,
+        label: t('Purchase.Form.recipientNameLabel'),
         required: true,
       },
       {
         type: 'email',
         name: 'recipientEmail',
-        label: `${t('Purchase.Form.recipientEmailLabel')} *`,
+        label: t('Purchase.Form.recipientEmailLabel'),
         required: true,
       },
     ],
@@ -78,10 +78,10 @@ function getFields(
           {
             type: 'text',
             name: 'amount',
-            label: `${t('Purchase.Form.customAmountLabel', {
+            label: t('Purchase.Form.customAmountLabel', {
               minAmount: String(giftCertificateSettings.minimumAmount.value),
               maxAmount: String(giftCertificateSettings.maximumAmount.value),
-            })} *`,
+            }),
             pattern: '^[0-9]*\\.?[0-9]+$',
             required: true,
           },
@@ -90,7 +90,7 @@ function getFields(
           {
             type: 'select',
             name: 'amount',
-            label: `${t('Purchase.Form.amountLabel')} *`,
+            label: t('Purchase.Form.amountLabel'),
             defaultValue: '0',
             options: [
               {
diff --git a/core/components/subscribe/_actions/subscribe.ts b/core/components/subscribe/_actions/subscribe.ts
index 62a82ec774..f4470c138d 100644
--- a/core/components/subscribe/_actions/subscribe.ts
+++ b/core/components/subscribe/_actions/subscribe.ts
@@ -35,8 +35,11 @@ export const subscribe = async (
   formData: FormData,
 ) => {
   const t = await getTranslations('Components.Subscribe');
-
-  const submission = parseWithZod(formData, { schema });
+  const subscribeSchema = schema({
+    requiredMessage: t('Errors.emailRequired'),
+    invalidMessage: t('Errors.invalidEmail'),
+  });
+  const submission = parseWithZod(formData, { schema: subscribeSchema });
 
   if (submission.status !== 'success') {
     return { lastResult: submission.reply() };
diff --git a/core/i18n/utils.ts b/core/i18n/utils.ts
new file mode 100644
index 0000000000..a395d5c41c
--- /dev/null
+++ b/core/i18n/utils.ts
@@ -0,0 +1,29 @@
+import { parseWithZod as conformParseWithZod } from '@conform-to/zod';
+import { z, ZodIssueOptionalMessage } from 'zod';
+
+import { FormErrorTranslationMap } from '@/vibes/soul/form/dynamic-form/schema';
+
+export function createErrorMap(errorTranslations?: FormErrorTranslationMap) {
+  return (issue: ZodIssueOptionalMessage) => {
+    const field = issue.path[0];
+    const fieldKey = typeof field === 'string' ? field : '';
+    const errorMessage = errorTranslations?.[fieldKey]?.[issue.code];
+
+    return { message: errorMessage ?? issue.message ?? 'Invalid input' };
+  };
+}
+
+export function parseWithZodTranslatedErrors<Schema extends z.ZodType>(
+  formData: FormData,
+  options: {
+    schema: Schema;
+    errorTranslations?: FormErrorTranslationMap;
+  },
+) {
+  const errorMap = createErrorMap(options.errorTranslations);
+
+  return conformParseWithZod(formData, {
+    schema: options.schema,
+    errorMap,
+  });
+}
diff --git a/core/messages/en.json b/core/messages/en.json
index 640f4216a3..303e03f422 100644
--- a/core/messages/en.json
+++ b/core/messages/en.json
@@ -43,7 +43,17 @@
       "newPassword": "New password",
       "confirmPassword": "Confirm password",
       "passwordUpdated": "Password has been updated successfully!",
-      "somethingWentWrong": "Something went wrong. Please try again later."
+      "somethingWentWrong": "Something went wrong. Please try again later.",
+      "FieldErrors": {
+        "passwordRequired": "Password is required",
+        "passwordTooSmall": "Password must be at least {minLength, plural, =1 {1 character} other {# characters}} long",
+        "passwordLowercaseRequired": "Password must contain at least one lowercase letter",
+        "passwordUppercaseRequired": "Password must contain at least one uppercase letter",
+        "passwordNumberRequired": "Password must contain at least {minNumbers, plural, =1 {one number} other {# numbers}}",
+        "passwordSpecialCharacterRequired": "Password must contain at least one special character",
+        "passwordsMustMatch": "The passwords do not match",
+        "confirmPasswordRequired": "Please confirm your password"
+      }
     },
     "Login": {
       "title": "Login",
@@ -56,6 +66,12 @@
       "somethingWentWrong": "Something went wrong. Please try again later.",
       "passwordResetRequired": "Password reset required. Please check your email for instructions to reset your password.",
       "invalidToken": "Your login link is invalid or has expired. Please try logging in again.",
+      "FieldErrors": {
+        "emailRequired": "Email is required",
+        "emailInvalid": "Please enter a valid email address",
+        "passwordRequired": "Password is required",
+        "invalidInput": "Please check your input and try again."
+      },
       "CreateAccount": {
         "title": "New customer?",
         "accountBenefits": "Create an account with us and you'll be able to:",
@@ -70,14 +86,36 @@
         "title": "Forgot password",
         "subtitle": "Enter the email associated with your account below. We'll send you instructions to reset your password.",
         "confirmResetPassword": "If the email address {email} is linked to an account in our store, we have sent you a password reset email. Please check your inbox and spam folder if you don't see it.",
-        "somethingWentWrong": "Something went wrong. Please try again later."
+        "somethingWentWrong": "Something went wrong. Please try again later.",
+        "FieldErrors": {
+          "emailRequired": "Email is required",
+          "emailInvalid": "Please enter a valid email address"
+        }
       }
     },
     "Register": {
       "title": "Register account",
       "heading": "New account",
       "cta": "Create account",
-      "somethingWentWrong": "Something went wrong. Please try again later."
+      "somethingWentWrong": "Something went wrong. Please try again later.",
+      "FieldErrors": {
+        "firstNameRequired": "First name is required",
+        "lastNameRequired": "Last name is required",
+        "emailRequired": "Email is required",
+        "emailInvalid": "Please enter a valid email address",
+        "passwordRequired": "Password is required",
+        "passwordTooSmall": "Password must be at least {minLength, plural, =1 {1 character} other {# characters}} long",
+        "passwordLowercaseRequired": "Password must contain at least one lowercase letter",
+        "passwordUppercaseRequired": "Password must contain at least one uppercase letter",
+        "passwordNumberRequired": "Password must contain at least {minNumbers, plural, =1 {one number} other {# numbers}}",
+        "passwordSpecialCharacterRequired": "Password must contain at least one special character",
+        "passwordsMustMatch": "The passwords do not match",
+        "addressLine1Required": "Address line 1 is required",
+        "cityRequired": "City is required",
+        "countryRequired": "Country is required",
+        "stateRequired": "State/Province is required",
+        "postalCodeRequired": "Postal code is required"
+      }
     }
   },
   "Faceted": {
@@ -188,6 +226,15 @@
       "somethingWentWrong": "Something went wrong. Please try again later.",
       "EmptyState": {
         "title": "You don't have any addresses"
+      },
+      "FieldErrors": {
+        "firstNameRequired": "First name is required",
+        "lastNameRequired": "Last name is required",
+        "addressLine1Required": "Address line 1 is required",
+        "cityRequired": "City is required",
+        "countryRequired": "Country is required",
+        "stateRequired": "State/Province is required",
+        "postalCodeRequired": "Postal code is required"
       }
     },
     "Settings": {
@@ -205,6 +252,23 @@
         "label": "Subscribe to our newsletter.",
         "marketingPreferencesUpdated": "Marketing preferences have been updated successfully!",
         "somethingWentWrong": "Something went wrong. Please try again later."
+      },
+      "FieldErrors": {
+        "firstNameRequired": "First name is required",
+        "firstNameTooSmall": "First name must be at least 2 characters long",
+        "lastNameRequired": "Last name is required",
+        "lastNameTooSmall": "Last name must be at least 2 characters long",
+        "emailRequired": "Email is required",
+        "emailInvalid": "Please enter a valid email address",
+        "currentPasswordRequired": "Current password is required",
+        "passwordRequired": "Password is required",
+        "passwordTooSmall": "Password must be at least {minLength, plural, =1 {1 character} other {# characters}} long",
+        "passwordLowercaseRequired": "Password must contain at least one lowercase letter",
+        "passwordUppercaseRequired": "Password must contain at least one uppercase letter",
+        "passwordNumberRequired": "Password must contain at least {minNumbers, plural, =1 {one number} other {# numbers}}",
+        "passwordSpecialCharacterRequired": "Password must contain at least one special character",
+        "passwordsMustMatch": "The passwords do not match",
+        "confirmPasswordRequired": "Please confirm your password"
       }
     }
   },
@@ -335,7 +399,8 @@
         "updateShipping": "Update shipping",
         "addShipping": "Add shipping",
         "cartNotFound": "An error occurred when retrieving your cart",
-        "noShippingOptions": "There are no shipping options available for your address"
+        "noShippingOptions": "There are no shipping options available for your address",
+        "countryRequired": "Country is required"
       }
     },
     "GiftCertificate": {
@@ -427,13 +492,24 @@
         "button": "Write a review",
         "title": "Write a review",
         "submit": "Submit",
+        "cancel": "Cancel",
         "ratingLabel": "Rating",
         "titleLabel": "Title",
         "reviewLabel": "Review",
         "nameLabel": "Name",
         "emailLabel": "Email",
         "successMessage": "Your review has been submitted successfully!",
-        "somethingWentWrong": "Something went wrong. Please try again later."
+        "somethingWentWrong": "Something went wrong. Please try again later.",
+        "FieldErrors": {
+          "titleRequired": "Title is required",
+          "authorRequired": "Name is required",
+          "emailRequired": "Email is required",
+          "emailInvalid": "Please enter a valid email address",
+          "textRequired": "Review is required",
+          "ratingRequired": "Rating is required",
+          "ratingTooSmall": "Rating must be at least 1",
+          "ratingTooLarge": "Rating must be at most 5"
+        }
       }
     }
   },
@@ -515,7 +591,8 @@
       "description": "Stay up to date with the latest news and offers from our store.",
       "subscribedToNewsletter": "You have been subscribed to our newsletter!",
       "Errors": {
-        "invalidEmail": "Please enter a valid email address.",
+        "emailRequired": "Email is required",
+        "invalidEmail": "Please enter a valid email address",
         "somethingWentWrong": "Something went wrong. Please try again later."
       }
     },
@@ -607,15 +684,25 @@
         "expiryCheckboxLabel": "I acknowledge that this Gift Certificate will expire on {expiryDate}",
         "ctaLabel": "Add to cart",
         "Errors": {
-          "amountRequired": "Please select or enter a gift certificate amount.",
-          "amountInvalid": "Please select a valid gift certificate amount.",
-          "amountOutOfRange": "Please enter an amount between {minAmount} and {maxAmount}.",
-          "unexpectedSettingsError": "An unexpected error occurred while retrieving gift certificate settings. Please try again later."
+          "amountRequired": "Please select or enter a gift certificate amount",
+          "amountInvalid": "Please select a valid gift certificate amount",
+          "amountOutOfRange": "Please enter an amount between {minAmount} and {maxAmount}",
+          "unexpectedSettingsError": "An unexpected error occurred while retrieving gift certificate settings. Please try again later.",
+          "senderNameRequired": "Your name is required",
+          "senderEmailRequired": "Your email is required",
+          "recipientNameRequired": "Recipient's name is required",
+          "recipientEmailRequired": "Recipient's email is required",
+          "emailInvalid": "Please enter a valid email address",
+          "checkboxRequired": "You must check this box to continue"
         }
       }
     }
   },
   "Form": {
-    "optional": "optional"
+    "optional": "optional",
+    "Errors": {
+      "invalidInput": "Please check your input and try again",
+      "invalidFormat": "The value entered does not match the required format"
+    }
   }
 }
diff --git a/core/tests/ui/e2e/auth/forgot-password.spec.ts b/core/tests/ui/e2e/auth/forgot-password.spec.ts
index a8a68faed6..32cafede58 100644
--- a/core/tests/ui/e2e/auth/forgot-password.spec.ts
+++ b/core/tests/ui/e2e/auth/forgot-password.spec.ts
@@ -26,6 +26,5 @@ test('Forgot password form displays error if email is not valid', async ({ page
   await page.getByLabel('Email').fill('not-an-email');
   await page.getByRole('button', { name: 'Reset password' }).click();
 
-  // TODO: Forgot password form error message needs to be translated
-  await expect(page.getByText('Please enter a valid email.')).toBeVisible();
+  await expect(page.getByText(t('FieldErrors.emailInvalid'))).toBeVisible();
 });
diff --git a/core/vibes/soul/form/dynamic-form/index.tsx b/core/vibes/soul/form/dynamic-form/index.tsx
index 620dff9d0c..53c21b1d57 100644
--- a/core/vibes/soul/form/dynamic-form/index.tsx
+++ b/core/vibes/soul/form/dynamic-form/index.tsx
@@ -11,6 +11,7 @@ import {
   useInputControl,
 } from '@conform-to/react';
 import { getZodConstraint, parseWithZod } from '@conform-to/zod';
+import { useTranslations } from 'next-intl';
 import {
   FormEvent,
   MouseEvent,
@@ -36,7 +37,13 @@ import { SwatchRadioGroup } from '@/vibes/soul/form/swatch-radio-group';
 import { Textarea } from '@/vibes/soul/form/textarea';
 import { Button, ButtonProps } from '@/vibes/soul/primitives/button';
 
-import { Field, FieldGroup, PasswordComplexitySettings, schema } from './schema';
+import {
+  Field,
+  FieldGroup,
+  FormErrorTranslationMap,
+  PasswordComplexitySettings,
+  schema,
+} from './schema';
 import { removeOptionsFromFields } from './utils';
 
 export interface DynamicFormActionArgs<F extends Field> {
@@ -69,6 +76,7 @@ export interface DynamicFormProps<F extends Field> {
   onChange?: (e: FormEvent<HTMLFormElement>) => void;
   onSuccess?: (lastResult: SubmissionResult, successMessage: ReactNode) => void;
   passwordComplexity?: PasswordComplexitySettings | null;
+  errorTranslations?: FormErrorTranslationMap;
 }
 
 export function DynamicForm<F extends Field>({
@@ -83,7 +91,9 @@ export function DynamicForm<F extends Field>({
   onChange,
   onSuccess,
   passwordComplexity,
+  errorTranslations,
 }: DynamicFormProps<F>) {
+  const t = useTranslations('Form');
   // Remove options from fields before passing to action to reduce payload size
   // Options are only needed for rendering, not for processing form submissions
   // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
@@ -94,7 +104,7 @@ export function DynamicForm<F extends Field>({
     lastResult: null,
   });
 
-  const dynamicSchema = schema(fields, passwordComplexity);
+  const dynamicSchema = schema(fields, passwordComplexity, errorTranslations);
   const defaultValue = fields
     .flatMap((f) => (Array.isArray(f) ? f : [f]))
     .reduce<z.infer<typeof dynamicSchema>>(
@@ -104,11 +114,33 @@ export function DynamicForm<F extends Field>({
       }),
       {},
     );
+
   const [form, formFields] = useForm({
     lastResult,
     constraint: getZodConstraint(dynamicSchema),
     onValidate({ formData }) {
-      return parseWithZod(formData, { schema: dynamicSchema });
+      return parseWithZod(formData, {
+        schema: dynamicSchema,
+        errorMap: (issue) => {
+          if (
+            !errorTranslations &&
+            issue.code === z.ZodIssueCode.invalid_string &&
+            issue.validation === 'regex'
+          ) {
+            return { message: t('Errors.invalidFormat') };
+          }
+
+          if (!errorTranslations) {
+            return { message: issue.message ?? t('Errors.invalidInput') };
+          }
+
+          const field = issue.path[0];
+          const fieldKey = typeof field === 'string' ? field : '';
+          const errorMessage = errorTranslations[fieldKey]?.[issue.code];
+
+          return { message: errorMessage ?? issue.message ?? t('Errors.invalidInput') };
+        },
+      });
     },
     defaultValue,
     shouldValidate: 'onSubmit',
diff --git a/core/vibes/soul/form/dynamic-form/schema.ts b/core/vibes/soul/form/dynamic-form/schema.ts
index 4b92f5d2b0..f14f19a76b 100644
--- a/core/vibes/soul/form/dynamic-form/schema.ts
+++ b/core/vibes/soul/form/dynamic-form/schema.ts
@@ -10,6 +10,21 @@ export interface PasswordComplexitySettings {
   requireUpperCase?: boolean | null;
 }
 
+export type FormErrorTranslationMap = Record<
+  string,
+  Partial<
+    Record<
+      | z.ZodIssueCode
+      | 'lowercase_required'
+      | 'uppercase_required'
+      | 'number_required'
+      | 'special_character_required'
+      | 'passwords_must_match',
+      string
+    >
+  >
+>;
+
 interface FormField {
   name: string;
   label?: string;
@@ -159,17 +174,94 @@ export type SchemaRawShape = Record<
   | z.ZodOptional<z.ZodNumber>
   | z.ZodArray<z.ZodString>
   | z.ZodOptional<z.ZodArray<z.ZodString>>
+  | z.ZodLiteral<'true'>
+  | z.ZodEnum<['true', 'false']>
+  | z.ZodOptional<z.ZodEnum<['true', 'false']>>
 >;
 
 // eslint-disable-next-line complexity
-function getFieldSchema(field: Field, passwordComplexity?: PasswordComplexitySettings | null) {
+export function getPasswordSchema(
+  passwordComplexity?: PasswordComplexitySettings | null,
+  errorTranslations?: FormErrorTranslationMap,
+) {
+  const minLength = passwordComplexity?.minimumPasswordLength ?? 8;
+  const minNumbers = passwordComplexity?.minimumNumbers ?? 0;
+  const minSpecialChars = passwordComplexity?.minimumSpecialCharacters ?? 0;
+  const requireLowerCase = passwordComplexity?.requireLowerCase ?? false;
+  const requireUpperCase = passwordComplexity?.requireUpperCase ?? false;
+  const requireNumbers = passwordComplexity?.requireNumbers ?? true;
+  const requireSpecialChars = passwordComplexity?.requireSpecialCharacters ?? true;
+
+  let fieldSchema = z.string().trim();
+
+  fieldSchema = fieldSchema.min(minLength);
+
+  if (requireLowerCase) {
+    fieldSchema = fieldSchema.regex(/[a-z]/, {
+      message:
+        errorTranslations?.password?.lowercase_required ?? 'Contain at least one lowercase letter',
+    });
+  }
+
+  if (requireUpperCase) {
+    fieldSchema = fieldSchema.regex(/[A-Z]/, {
+      message:
+        errorTranslations?.password?.uppercase_required ?? 'Contain at least one uppercase letter',
+    });
+  }
+
+  if (requireNumbers && minNumbers > 0) {
+    const numberRegex = new RegExp(`(.*[0-9]){${minNumbers},}`);
+
+    fieldSchema = fieldSchema.regex(numberRegex, {
+      message:
+        errorTranslations?.password?.number_required ??
+        (minNumbers === 1
+          ? 'Contain at least one number'
+          : `Contain at least ${minNumbers} numbers`),
+    });
+  } else if (requireNumbers) {
+    fieldSchema = fieldSchema.regex(/[0-9]/, {
+      message: errorTranslations?.password?.number_required ?? 'Contain at least one number',
+    });
+  }
+
+  if (requireSpecialChars && minSpecialChars > 0) {
+    const specialCharRegex = new RegExp(`(.*[^a-zA-Z0-9]){${minSpecialChars},}`);
+
+    fieldSchema = fieldSchema.regex(specialCharRegex, {
+      message:
+        errorTranslations?.password?.special_character_required ??
+        (minSpecialChars === 1
+          ? 'Contain at least one special character'
+          : `Contain at least ${minSpecialChars} special characters`),
+    });
+  } else if (requireSpecialChars) {
+    fieldSchema = fieldSchema.regex(/[^a-zA-Z0-9]/, {
+      message:
+        errorTranslations?.password?.special_character_required ??
+        'Contain at least one special character',
+    });
+  }
+
+  return fieldSchema;
+}
+
+function getFieldSchema(
+  field: Field,
+  passwordComplexity?: PasswordComplexitySettings | null,
+  errorTranslations?: FormErrorTranslationMap,
+) {
   let fieldSchema:
     | z.ZodString
     | z.ZodNumber
+    | z.ZodLiteral<'true'>
     | z.ZodOptional<z.ZodString>
     | z.ZodOptional<z.ZodNumber>
+    | z.ZodOptional<z.ZodLiteral<'true'>>
     | z.ZodArray<z.ZodString, 'atleastone' | 'many'>
-    | z.ZodOptional<z.ZodArray<z.ZodString, 'atleastone' | 'many'>>;
+    | z.ZodOptional<z.ZodArray<z.ZodString, 'atleastone' | 'many'>>
+    | z.ZodOptional<z.ZodEnum<['true', 'false']>>;
 
   switch (field.type) {
     case 'number':
@@ -185,9 +277,7 @@ function getFieldSchema(field: Field, passwordComplexity?: PasswordComplexitySet
       fieldSchema = z.string();
 
       if (field.pattern != null) {
-        fieldSchema = fieldSchema.regex(new RegExp(field.pattern), {
-          message: 'Invalid format.',
-        });
+        fieldSchema = fieldSchema.regex(new RegExp(field.pattern));
       }
 
       if (field.required !== true) fieldSchema = fieldSchema.optional();
@@ -195,61 +285,7 @@ function getFieldSchema(field: Field, passwordComplexity?: PasswordComplexitySet
       break;
 
     case 'password': {
-      const minLength = passwordComplexity?.minimumPasswordLength ?? 8;
-      const minNumbers = passwordComplexity?.minimumNumbers ?? 0;
-      const minSpecialChars = passwordComplexity?.minimumSpecialCharacters ?? 0;
-      const requireLowerCase = passwordComplexity?.requireLowerCase ?? false;
-      const requireUpperCase = passwordComplexity?.requireUpperCase ?? false;
-      const requireNumbers = passwordComplexity?.requireNumbers ?? true;
-      const requireSpecialChars = passwordComplexity?.requireSpecialCharacters ?? true;
-
-      fieldSchema = z.string().trim();
-
-      fieldSchema = fieldSchema.min(minLength, {
-        message: `Be at least ${minLength} character${minLength !== 1 ? 's' : ''} long`,
-      });
-
-      if (requireLowerCase) {
-        fieldSchema = fieldSchema.regex(/[a-z]/, {
-          message: 'Contain at least one lowercase letter.',
-        });
-      }
-
-      if (requireUpperCase) {
-        fieldSchema = fieldSchema.regex(/[A-Z]/, {
-          message: 'Contain at least one uppercase letter.',
-        });
-      }
-
-      if (requireNumbers && minNumbers > 0) {
-        const numberRegex = new RegExp(`(.*[0-9]){${minNumbers},}`);
-
-        fieldSchema = fieldSchema.regex(numberRegex, {
-          message:
-            minNumbers === 1
-              ? 'Contain at least one number.'
-              : `Contain at least ${minNumbers} numbers.`,
-        });
-      } else if (requireNumbers) {
-        fieldSchema = fieldSchema.regex(/[0-9]/, {
-          message: 'Contain at least one number.',
-        });
-      }
-
-      if (requireSpecialChars && minSpecialChars > 0) {
-        const specialCharRegex = new RegExp(`(.*[^a-zA-Z0-9]){${minSpecialChars},}`);
-
-        fieldSchema = fieldSchema.regex(specialCharRegex, {
-          message:
-            minSpecialChars === 1
-              ? 'Contain at least one special character.'
-              : `Contain at least ${minSpecialChars} special characters.`,
-        });
-      } else if (requireSpecialChars) {
-        fieldSchema = fieldSchema.regex(/[^a-zA-Z0-9]/, {
-          message: 'Contain at least one special character.',
-        });
-      }
+      fieldSchema = getPasswordSchema(passwordComplexity, errorTranslations);
 
       if (field.required !== true) fieldSchema = fieldSchema.optional();
 
@@ -257,7 +293,7 @@ function getFieldSchema(field: Field, passwordComplexity?: PasswordComplexitySet
     }
 
     case 'email':
-      fieldSchema = z.string().email({ message: 'Please enter a valid email.' }).trim();
+      fieldSchema = z.string().email().trim();
 
       if (field.required !== true) fieldSchema = fieldSchema.optional();
 
@@ -270,6 +306,15 @@ function getFieldSchema(field: Field, passwordComplexity?: PasswordComplexitySet
 
       break;
 
+    case 'checkbox':
+      if (field.required === true) {
+        fieldSchema = z.literal('true');
+      } else {
+        fieldSchema = z.enum(['true', 'false']).optional();
+      }
+
+      break;
+
     default:
       fieldSchema = z.string();
 
@@ -282,6 +327,7 @@ function getFieldSchema(field: Field, passwordComplexity?: PasswordComplexitySet
 export function schema(
   fields: Array<Field | FieldGroup<Field>>,
   passwordComplexity?: PasswordComplexitySettings | null,
+  errorTranslations?: FormErrorTranslationMap,
 ) {
   const shape: SchemaRawShape = {};
   let passwordFieldName: string | undefined;
@@ -290,13 +336,13 @@ export function schema(
   fields.forEach((field) => {
     if (Array.isArray(field)) {
       field.forEach((f) => {
-        shape[f.name] = getFieldSchema(f, passwordComplexity);
+        shape[f.name] = getFieldSchema(f, passwordComplexity, errorTranslations);
 
         if (f.type === 'password') passwordFieldName = f.name;
         if (f.type === 'confirm-password') confirmPasswordFieldName = f.name;
       });
     } else {
-      shape[field.name] = getFieldSchema(field, passwordComplexity);
+      shape[field.name] = getFieldSchema(field, passwordComplexity, errorTranslations);
 
       if (field.type === 'password') passwordFieldName = field.name;
       if (field.type === 'confirm-password') confirmPasswordFieldName = field.name;
@@ -311,7 +357,7 @@ export function schema(
     ) {
       ctx.addIssue({
         code: 'custom',
-        message: 'The passwords did not match',
+        message: errorTranslations?.password?.passwords_must_match ?? 'The passwords do not match',
         path: [confirmPasswordFieldName],
       });
     }
diff --git a/core/vibes/soul/primitives/inline-email-form/index.tsx b/core/vibes/soul/primitives/inline-email-form/index.tsx
index b6f848ce58..9124585fde 100644
--- a/core/vibes/soul/primitives/inline-email-form/index.tsx
+++ b/core/vibes/soul/primitives/inline-email-form/index.tsx
@@ -4,6 +4,7 @@ import { getFormProps, getInputProps, SubmissionResult, useForm } from '@conform
 import { parseWithZod } from '@conform-to/zod';
 import { clsx } from 'clsx';
 import { ArrowRight } from 'lucide-react';
+import { useTranslations } from 'next-intl';
 import { useActionState } from 'react';
 
 import { FieldError } from '@/vibes/soul/form/field-error';
@@ -28,6 +29,12 @@ export function InlineEmailForm({
   submitLabel?: string;
   action: Action<{ lastResult: SubmissionResult | null; successMessage?: string }, FormData>;
 }) {
+  const t = useTranslations('Components.Subscribe');
+  const subscribeSchema = schema({
+    requiredMessage: t('Errors.emailRequired'),
+    invalidMessage: t('Errors.invalidEmail'),
+  });
+
   const [{ lastResult, successMessage }, formAction, isPending] = useActionState(action, {
     lastResult: null,
   });
@@ -35,7 +42,7 @@ export function InlineEmailForm({
   const [form, fields] = useForm({
     lastResult,
     onValidate({ formData }) {
-      return parseWithZod(formData, { schema });
+      return parseWithZod(formData, { schema: subscribeSchema });
     },
     shouldValidate: 'onSubmit',
     shouldRevalidate: 'onInput',
diff --git a/core/vibes/soul/primitives/inline-email-form/schema.ts b/core/vibes/soul/primitives/inline-email-form/schema.ts
index 00c2c70420..57aa5f018c 100644
--- a/core/vibes/soul/primitives/inline-email-form/schema.ts
+++ b/core/vibes/soul/primitives/inline-email-form/schema.ts
@@ -1,5 +1,12 @@
 import { z } from 'zod';
 
-export const schema = z.object({
-  email: z.string().email(),
-});
+export const schema = ({
+  requiredMessage = 'Email is required',
+  invalidMessage = 'Please enter a valid email address',
+}: {
+  requiredMessage: string;
+  invalidMessage: string;
+}) =>
+  z.object({
+    email: z.string({ required_error: requiredMessage }).email({ message: invalidMessage }),
+  });
diff --git a/core/vibes/soul/sections/account-settings/change-password-form.tsx b/core/vibes/soul/sections/account-settings/change-password-form.tsx
index c2323516d1..809a01e64f 100644
--- a/core/vibes/soul/sections/account-settings/change-password-form.tsx
+++ b/core/vibes/soul/sections/account-settings/change-password-form.tsx
@@ -1,15 +1,18 @@
 'use client';
 
 import { getFormProps, getInputProps, SubmissionResult, useForm } from '@conform-to/react';
-import { getZodConstraint, parseWithZod } from '@conform-to/zod';
+import { getZodConstraint } from '@conform-to/zod';
+import { useTranslations } from 'next-intl';
 import { ReactNode, useActionState, useEffect } from 'react';
 import { useFormStatus } from 'react-dom';
 
+import { PasswordComplexitySettings } from '@/vibes/soul/form/dynamic-form/schema';
 import { Input } from '@/vibes/soul/form/input';
 import { Button } from '@/vibes/soul/primitives/button';
 import { toast } from '@/vibes/soul/primitives/toaster';
+import { parseWithZodTranslatedErrors } from '~/i18n/utils';
 
-import { changePasswordSchema } from './schema';
+import { changePasswordErrorTranslations, changePasswordSchema } from './schema';
 
 type Action<S, P> = (state: Awaited<S>, payload: P) => S | Promise<S>;
 
@@ -26,6 +29,7 @@ export interface ChangePasswordFormProps {
   newPasswordLabel?: string;
   confirmPasswordLabel?: string;
   submitLabel?: string;
+  passwordComplexitySettings?: PasswordComplexitySettings | null;
 }
 
 export function ChangePasswordForm({
@@ -34,14 +38,18 @@ export function ChangePasswordForm({
   newPasswordLabel = 'New password',
   confirmPasswordLabel = 'Confirm password',
   submitLabel = 'Update',
+  passwordComplexitySettings,
 }: ChangePasswordFormProps) {
+  const t = useTranslations('Account.Settings');
+  const errorTranslations = changePasswordErrorTranslations(t, passwordComplexitySettings);
+  const schema = changePasswordSchema(passwordComplexitySettings, errorTranslations);
   const [state, formAction] = useActionState(action, { lastResult: null });
   const [form, fields] = useForm({
-    constraint: getZodConstraint(changePasswordSchema),
+    constraint: getZodConstraint(schema),
     shouldValidate: 'onBlur',
     shouldRevalidate: 'onInput',
     onValidate({ formData }) {
-      return parseWithZod(formData, { schema: changePasswordSchema });
+      return parseWithZodTranslatedErrors(formData, { schema, errorTranslations });
     },
   });
 
diff --git a/core/vibes/soul/sections/account-settings/index.tsx b/core/vibes/soul/sections/account-settings/index.tsx
index 8c6377d621..d8e52712c4 100644
--- a/core/vibes/soul/sections/account-settings/index.tsx
+++ b/core/vibes/soul/sections/account-settings/index.tsx
@@ -1,3 +1,5 @@
+import { PasswordComplexitySettings } from '@/vibes/soul/form/dynamic-form/schema';
+
 import { ChangePasswordAction, ChangePasswordForm } from './change-password-form';
 import {
   NewsletterSubscriptionForm,
@@ -22,6 +24,7 @@ export interface AccountSettingsSectionProps {
   newsletterSubscriptionLabel?: string;
   newsletterSubscriptionCtaLabel?: string;
   updateNewsletterSubscriptionAction?: UpdateNewsletterSubscriptionAction;
+  passwordComplexitySettings?: PasswordComplexitySettings | null;
 }
 
 // eslint-disable-next-line valid-jsdoc
@@ -55,6 +58,7 @@ export function AccountSettingsSection({
   newsletterSubscriptionLabel = 'Opt-in to receive emails about new products and promotions.',
   newsletterSubscriptionCtaLabel = 'Save preferences',
   updateNewsletterSubscriptionAction,
+  passwordComplexitySettings,
 }: AccountSettingsSectionProps) {
   return (
     <section className="w-full @container">
@@ -81,6 +85,7 @@ export function AccountSettingsSection({
               confirmPasswordLabel={confirmPasswordLabel}
               currentPasswordLabel={currentPasswordLabel}
               newPasswordLabel={newPasswordLabel}
+              passwordComplexitySettings={passwordComplexitySettings}
               submitLabel={changePasswordSubmitLabel}
             />
           </div>
diff --git a/core/vibes/soul/sections/account-settings/schema.ts b/core/vibes/soul/sections/account-settings/schema.ts
index 7ce11b8112..5fe66feea2 100644
--- a/core/vibes/soul/sections/account-settings/schema.ts
+++ b/core/vibes/soul/sections/account-settings/schema.ts
@@ -1,32 +1,82 @@
+import { getTranslations } from 'next-intl/server';
 import { z } from 'zod';
 
+import {
+  FormErrorTranslationMap,
+  getPasswordSchema,
+  PasswordComplexitySettings,
+} from '@/vibes/soul/form/dynamic-form/schema';
+import { ExistingResultType } from '~/client/util';
+
 export const updateAccountSchema = z.object({
-  firstName: z.string().min(2, { message: 'Name must be at least 2 characters long.' }).trim(),
-  lastName: z.string().min(2, { message: 'Name must be at least 2 characters long.' }).trim(),
-  email: z.string().email({ message: 'Please enter a valid email.' }).trim(),
+  firstName: z.string().min(2).trim(),
+  lastName: z.string().min(2).trim(),
+  email: z.string().email().trim(),
   company: z.string().trim().optional(),
 });
 
-export const changePasswordSchema = z
-  .object({
-    currentPassword: z.string().trim(),
-    password: z
-      .string()
-      .min(8, { message: 'Be at least 8 characters long' })
-      .regex(/[a-zA-Z]/, { message: 'Contain at least one letter.' })
-      .regex(/[0-9]/, { message: 'Contain at least one number.' })
-      .regex(/[^a-zA-Z0-9]/, {
-        message: 'Contain at least one special character.',
-      })
-      .trim(),
-    confirmPassword: z.string(),
-  })
-  .superRefine(({ confirmPassword, password }, ctx) => {
-    if (confirmPassword !== password) {
-      ctx.addIssue({
-        code: 'custom',
-        message: 'The passwords did not match',
-        path: ['confirmPassword'],
-      });
-    }
-  });
+export const updateAccountErrorTranslations = (
+  t: ExistingResultType<typeof getTranslations<'Account.Settings'>>,
+): FormErrorTranslationMap => ({
+  firstName: {
+    invalid_type: t('FieldErrors.firstNameRequired'),
+    too_small: t('FieldErrors.firstNameTooSmall'),
+  },
+  lastName: {
+    invalid_type: t('FieldErrors.lastNameRequired'),
+    too_small: t('FieldErrors.lastNameTooSmall'),
+  },
+  email: {
+    invalid_type: t('FieldErrors.emailRequired'),
+    invalid_string: t('FieldErrors.emailInvalid'),
+  },
+});
+
+export const changePasswordErrorTranslations = (
+  t: ExistingResultType<typeof getTranslations<'Account.Settings'>>,
+  passwordComplexity?: PasswordComplexitySettings | null,
+): FormErrorTranslationMap => ({
+  currentPassword: {
+    invalid_type: t('FieldErrors.currentPasswordRequired'),
+  },
+  password: {
+    invalid_type: t('FieldErrors.passwordRequired'),
+    too_small: t('FieldErrors.passwordTooSmall', {
+      minLength: passwordComplexity?.minimumPasswordLength ?? 0,
+    }),
+    lowercase_required: t('FieldErrors.passwordLowercaseRequired'),
+    uppercase_required: t('FieldErrors.passwordUppercaseRequired'),
+    number_required: t('FieldErrors.passwordNumberRequired', {
+      minNumbers: passwordComplexity?.minimumNumbers ?? 1,
+    }),
+    special_character_required: t('FieldErrors.passwordSpecialCharacterRequired'),
+    passwords_must_match: t('FieldErrors.passwordsMustMatch'),
+  },
+  confirmPassword: {
+    invalid_type: t('FieldErrors.confirmPasswordRequired'),
+  },
+});
+
+export const changePasswordSchema = (
+  passwordComplexity?: PasswordComplexitySettings | null,
+  errorTranslations?: FormErrorTranslationMap,
+) => {
+  const passwordSchema = getPasswordSchema(passwordComplexity, errorTranslations);
+
+  return z
+    .object({
+      currentPassword: z.string().trim(),
+      password: passwordSchema,
+      confirmPassword: z.string(),
+    })
+    .superRefine(({ confirmPassword, password }, ctx) => {
+      if (confirmPassword !== password) {
+        ctx.addIssue({
+          code: 'custom',
+          message:
+            errorTranslations?.password?.passwords_must_match ?? 'The passwords do not match',
+          path: ['confirmPassword'],
+        });
+      }
+    });
+};
diff --git a/core/vibes/soul/sections/account-settings/update-account-form.tsx b/core/vibes/soul/sections/account-settings/update-account-form.tsx
index 3e7f9bf58f..44bfb6bd39 100644
--- a/core/vibes/soul/sections/account-settings/update-account-form.tsx
+++ b/core/vibes/soul/sections/account-settings/update-account-form.tsx
@@ -1,15 +1,17 @@
 'use client';
 
 import { getFormProps, getInputProps, SubmissionResult, useForm } from '@conform-to/react';
-import { getZodConstraint, parseWithZod } from '@conform-to/zod';
+import { getZodConstraint } from '@conform-to/zod';
+import { useTranslations } from 'next-intl';
 import { useActionState, useEffect, useOptimistic, useTransition } from 'react';
 import { z } from 'zod';
 
 import { Input } from '@/vibes/soul/form/input';
 import { Button } from '@/vibes/soul/primitives/button';
 import { toast } from '@/vibes/soul/primitives/toaster';
+import { parseWithZodTranslatedErrors } from '~/i18n/utils';
 
-import { updateAccountSchema } from './schema';
+import { updateAccountErrorTranslations, updateAccountSchema } from './schema';
 
 type Action<S, P> = (state: Awaited<S>, payload: P) => S | Promise<S>;
 
@@ -42,6 +44,8 @@ export function UpdateAccountForm({
   companyLabel = 'Company',
   submitLabel = 'Update',
 }: UpdateAccountFormProps) {
+  const t = useTranslations('Account.Settings');
+  const errorTranslations = updateAccountErrorTranslations(t);
   const [state, formAction] = useActionState(action, { account, lastResult: null });
   const [pending, startTransition] = useTransition();
 
@@ -49,7 +53,10 @@ export function UpdateAccountForm({
     state,
     (prevState, formData) => {
       const intent = formData.get('intent');
-      const submission = parseWithZod(formData, { schema: updateAccountSchema });
+      const submission = parseWithZodTranslatedErrors(formData, {
+        schema: updateAccountSchema,
+        errorTranslations,
+      });
 
       if (submission.status !== 'success') return prevState;
 
@@ -74,7 +81,10 @@ export function UpdateAccountForm({
     shouldValidate: 'onBlur',
     shouldRevalidate: 'onInput',
     onValidate({ formData }) {
-      return parseWithZod(formData, { schema: updateAccountSchema });
+      return parseWithZodTranslatedErrors(formData, {
+        schema: updateAccountSchema,
+        errorTranslations,
+      });
     },
   });
 
diff --git a/core/vibes/soul/sections/address-list-section/index.tsx b/core/vibes/soul/sections/address-list-section/index.tsx
index a16189e619..0f4cc92a60 100644
--- a/core/vibes/soul/sections/address-list-section/index.tsx
+++ b/core/vibes/soul/sections/address-list-section/index.tsx
@@ -2,6 +2,7 @@
 
 import { getFormProps, getInputProps, SubmissionResult, useForm } from '@conform-to/react';
 import { getZodConstraint, parseWithZod } from '@conform-to/zod';
+import { useTranslations } from 'next-intl';
 import {
   ComponentProps,
   ReactNode,
@@ -21,7 +22,7 @@ import { Button } from '@/vibes/soul/primitives/button';
 import { Spinner } from '@/vibes/soul/primitives/spinner';
 import { toast } from '@/vibes/soul/primitives/toaster';
 
-import { schema } from './schema';
+import { addressFormErrorTranslations, schema } from './schema';
 
 export type Address = z.infer<typeof schema>;
 
@@ -96,6 +97,8 @@ export function AddressListSection<A extends Address, F extends Field>({
   setDefaultLabel = 'Set as default',
   emptyStateTitle = "You don't have any addresses",
 }: AddressListSectionProps<A, F>) {
+  const t = useTranslations('Account.Addresses');
+  const errorTranslations = addressFormErrorTranslations(t);
   const actionWithFields = addressAction.bind(null, fields);
 
   const [state, formAction] = useActionState(actionWithFields, {
@@ -194,6 +197,7 @@ export function AddressListSection<A extends Address, F extends Field>({
                 }}
                 buttonSize="small"
                 cancelLabel={cancelLabel}
+                errorTranslations={errorTranslations}
                 fields={fields.map((field) => {
                   if ('name' in field && field.name === 'id') {
                     return {
@@ -253,6 +257,7 @@ export function AddressListSection<A extends Address, F extends Field>({
                       }}
                       buttonSize="small"
                       cancelLabel={cancelLabel}
+                      errorTranslations={errorTranslations}
                       fields={addressFields}
                       onCancel={() =>
                         setActiveAddressIds((prev) => prev.filter((id) => id !== address.id))
diff --git a/core/vibes/soul/sections/address-list-section/schema.ts b/core/vibes/soul/sections/address-list-section/schema.ts
index 906e2a8ae6..eef829ef97 100644
--- a/core/vibes/soul/sections/address-list-section/schema.ts
+++ b/core/vibes/soul/sections/address-list-section/schema.ts
@@ -1,5 +1,35 @@
+import { getTranslations } from 'next-intl/server';
 import { z } from 'zod';
 
+import { FormErrorTranslationMap } from '@/vibes/soul/form/dynamic-form/schema';
+import { ExistingResultType } from '~/client/util';
+
+export const addressFormErrorTranslations = (
+  t: ExistingResultType<typeof getTranslations<'Account.Addresses'>>,
+): FormErrorTranslationMap => ({
+  firstName: {
+    invalid_type: t('FieldErrors.firstNameRequired'),
+  },
+  lastName: {
+    invalid_type: t('FieldErrors.lastNameRequired'),
+  },
+  address1: {
+    invalid_type: t('FieldErrors.addressLine1Required'),
+  },
+  city: {
+    invalid_type: t('FieldErrors.cityRequired'),
+  },
+  countryCode: {
+    invalid_type: t('FieldErrors.countryRequired'),
+  },
+  stateOrProvince: {
+    invalid_type: t('FieldErrors.stateRequired'),
+  },
+  postalCode: {
+    invalid_type: t('FieldErrors.postalCodeRequired'),
+  },
+});
+
 export const schema = z
   .object({
     id: z.string(),
diff --git a/core/vibes/soul/sections/cart/coupon-code-form/index.tsx b/core/vibes/soul/sections/cart/coupon-code-form/index.tsx
index 8b16625778..f00d7f0660 100644
--- a/core/vibes/soul/sections/cart/coupon-code-form/index.tsx
+++ b/core/vibes/soul/sections/cart/coupon-code-form/index.tsx
@@ -2,6 +2,7 @@
 
 import { getFormProps, getInputProps, SubmissionResult, useForm } from '@conform-to/react';
 import { parseWithZod } from '@conform-to/zod';
+import { useTranslations } from 'next-intl';
 import { startTransition, useActionState, useOptimistic } from 'react';
 import { useFormStatus } from 'react-dom';
 
@@ -28,7 +29,6 @@ export interface CouponCodeFormProps {
   label?: string;
   placeholder?: string;
   removeLabel?: string;
-  requiredErrorMessage?: string;
 }
 
 export function CouponCodeForm({
@@ -39,8 +39,9 @@ export function CouponCodeForm({
   label = 'Promo code',
   placeholder,
   removeLabel,
-  requiredErrorMessage,
 }: CouponCodeFormProps) {
+  const t = useTranslations('Cart.CheckoutSummary.CouponCode');
+  const schema = couponCodeActionFormDataSchema({ required_error: t('invalidCouponCode') });
   const [state, formAction] = useActionState(action, {
     couponCodes: couponCodes ?? [],
     lastResult: null,
@@ -49,9 +50,7 @@ export function CouponCodeForm({
   const [optimisticCouponCodes, setOptimisticCouponCodes] = useOptimistic<string[], FormData>(
     state.couponCodes,
     (prevState, formData) => {
-      const submission = parseWithZod(formData, {
-        schema: couponCodeActionFormDataSchema({ required_error: requiredErrorMessage }),
-      });
+      const submission = parseWithZod(formData, { schema });
 
       if (submission.status !== 'success') return prevState;
 
@@ -73,9 +72,7 @@ export function CouponCodeForm({
     shouldValidate: 'onBlur',
     shouldRevalidate: 'onInput',
     onValidate({ formData }) {
-      return parseWithZod(formData, {
-        schema: couponCodeActionFormDataSchema({ required_error: requiredErrorMessage }),
-      });
+      return parseWithZod(formData, { schema });
     },
     onSubmit(event, { formData }) {
       event.preventDefault();
diff --git a/core/vibes/soul/sections/cart/gift-certificate-code-form/index.tsx b/core/vibes/soul/sections/cart/gift-certificate-code-form/index.tsx
index 8c39d9107f..bbbadffe08 100644
--- a/core/vibes/soul/sections/cart/gift-certificate-code-form/index.tsx
+++ b/core/vibes/soul/sections/cart/gift-certificate-code-form/index.tsx
@@ -2,6 +2,7 @@
 
 import { getFormProps, getInputProps, SubmissionResult, useForm } from '@conform-to/react';
 import { parseWithZod } from '@conform-to/zod';
+import { useTranslations } from 'next-intl';
 import { startTransition, useActionState, useOptimistic } from 'react';
 import { useFormStatus } from 'react-dom';
 
@@ -28,7 +29,6 @@ export interface GiftCertificateCodeFormProps {
   label?: string;
   placeholder?: string;
   removeLabel?: string;
-  requiredErrorMessage?: string;
 }
 
 export function GiftCertificateCodeForm({
@@ -39,14 +39,16 @@ export function GiftCertificateCodeForm({
   label = 'Gift certificate code',
   placeholder,
   removeLabel,
-  requiredErrorMessage,
 }: GiftCertificateCodeFormProps) {
+  const t = useTranslations('Cart.GiftCertificate');
   const [state, formAction] = useActionState(action, {
     giftCertificateCodes: giftCertificateCodes ?? [],
     lastResult: null,
   });
 
-  const schema = giftCertificateCodeActionFormDataSchema({ required_error: requiredErrorMessage });
+  const schema = giftCertificateCodeActionFormDataSchema({
+    required_error: t('invalidGiftCertificate'),
+  });
 
   const [optimisticGiftCertificateCodes, setOptimisticGiftCertificateCodes] = useOptimistic<
     string[],
diff --git a/core/vibes/soul/sections/cart/schema.ts b/core/vibes/soul/sections/cart/schema.ts
index e67a525020..50d35712e1 100644
--- a/core/vibes/soul/sections/cart/schema.ts
+++ b/core/vibes/soul/sections/cart/schema.ts
@@ -47,16 +47,21 @@ export const giftCertificateCodeActionFormDataSchema = ({
     }),
   ]);
 
-export const shippingActionFormDataSchema = z.discriminatedUnion('intent', [
-  z.object({
-    intent: z.literal('add-address'),
-    country: z.string(),
-    city: z.string().optional(),
-    state: z.string().optional(),
-    postalCode: z.string().optional(),
-  }),
-  z.object({
-    intent: z.literal('add-shipping'),
-    shippingOption: z.string(),
-  }),
-]);
+export const shippingActionFormDataSchema = ({
+  required_error = 'Country is required',
+}: {
+  required_error?: string;
+}) =>
+  z.discriminatedUnion('intent', [
+    z.object({
+      intent: z.literal('add-address'),
+      country: z.string({ required_error }),
+      city: z.string().optional(),
+      state: z.string().optional(),
+      postalCode: z.string().optional(),
+    }),
+    z.object({
+      intent: z.literal('add-shipping'),
+      shippingOption: z.string(),
+    }),
+  ]);
diff --git a/core/vibes/soul/sections/cart/shipping-form/index.tsx b/core/vibes/soul/sections/cart/shipping-form/index.tsx
index 5fc786474b..554f92d4df 100644
--- a/core/vibes/soul/sections/cart/shipping-form/index.tsx
+++ b/core/vibes/soul/sections/cart/shipping-form/index.tsx
@@ -9,6 +9,7 @@ import {
 } from '@conform-to/react';
 import { getZodConstraint, parseWithZod } from '@conform-to/zod';
 import { clsx } from 'clsx';
+import { useTranslations } from 'next-intl';
 import { startTransition, useActionState, useEffect, useMemo, useState } from 'react';
 import { useFormStatus } from 'react-dom';
 
@@ -106,6 +107,8 @@ export function ShippingForm({
   showShippingForm = false,
   noShippingOptionsLabel = 'There are no shipping options available for your address',
 }: Props) {
+  const t = useTranslations('Cart.CheckoutSummary.Shipping');
+  const schema = shippingActionFormDataSchema({ required_error: t('countryRequired') });
   const [showForms, setShowForms] = useState(showShippingForm);
   const [showAddressForm, setShowAddressForm] = useState(!address);
 
@@ -119,7 +122,7 @@ export function ShippingForm({
 
   const [addressForm, addressFields] = useForm({
     lastResult: state.form === 'address' ? state.lastResult : null,
-    constraint: getZodConstraint(shippingActionFormDataSchema),
+    constraint: getZodConstraint(schema),
     shouldValidate: 'onBlur',
     shouldRevalidate: 'onInput',
     defaultValue: {
@@ -129,7 +132,7 @@ export function ShippingForm({
       postalCode: state.address?.postalCode,
     },
     onValidate({ formData }) {
-      return parseWithZod(formData, { schema: shippingActionFormDataSchema });
+      return parseWithZod(formData, { schema });
     },
     onSubmit(event, { formData }) {
       event.preventDefault();
@@ -143,14 +146,14 @@ export function ShippingForm({
 
   const [shippingOptionsForm, shippingOptionsFields] = useForm({
     lastResult: state.form === 'shipping' ? state.lastResult : null,
-    constraint: getZodConstraint(shippingActionFormDataSchema),
+    constraint: getZodConstraint(schema),
     shouldValidate: 'onBlur',
     shouldRevalidate: 'onInput',
     defaultValue: {
       shippingOption: state.shippingOption?.value,
     },
     onValidate({ formData }) {
-      return parseWithZod(formData, { schema: shippingActionFormDataSchema });
+      return parseWithZod(formData, { schema });
     },
     onSubmit(event, { formData }) {
       event.preventDefault();
diff --git a/core/vibes/soul/sections/dynamic-form-section/index.tsx b/core/vibes/soul/sections/dynamic-form-section/index.tsx
index 2a0aa8d775..3de3df6b35 100644
--- a/core/vibes/soul/sections/dynamic-form-section/index.tsx
+++ b/core/vibes/soul/sections/dynamic-form-section/index.tsx
@@ -4,6 +4,7 @@ import { DynamicForm, DynamicFormAction } from '@/vibes/soul/form/dynamic-form';
 import {
   Field,
   FieldGroup,
+  FormErrorTranslationMap,
   PasswordComplexitySettings,
 } from '@/vibes/soul/form/dynamic-form/schema';
 import { SectionLayout } from '@/vibes/soul/sections/section-layout';
@@ -16,6 +17,7 @@ interface Props<F extends Field> {
   submitLabel?: string;
   className?: string;
   passwordComplexity?: PasswordComplexitySettings | null;
+  errorTranslations?: FormErrorTranslationMap;
 }
 
 export function DynamicFormSection<F extends Field>({
@@ -26,6 +28,7 @@ export function DynamicFormSection<F extends Field>({
   submitLabel,
   action,
   passwordComplexity,
+  errorTranslations,
 }: Props<F>) {
   return (
     <SectionLayout className={clsx('mx-auto w-full max-w-4xl', className)} containerSize="lg">
@@ -41,6 +44,7 @@ export function DynamicFormSection<F extends Field>({
       )}
       <DynamicForm
         action={action}
+        errorTranslations={errorTranslations}
         fields={fields}
         passwordComplexity={passwordComplexity}
         submitLabel={submitLabel}
diff --git a/core/vibes/soul/sections/forgot-password-section/forgot-password-form.tsx b/core/vibes/soul/sections/forgot-password-section/forgot-password-form.tsx
index 2230db995d..5e9d63b49a 100644
--- a/core/vibes/soul/sections/forgot-password-section/forgot-password-form.tsx
+++ b/core/vibes/soul/sections/forgot-password-section/forgot-password-form.tsx
@@ -1,15 +1,17 @@
 'use client';
 
 import { getFormProps, getInputProps, SubmissionResult, useForm } from '@conform-to/react';
-import { getZodConstraint, parseWithZod } from '@conform-to/zod';
+import { getZodConstraint } from '@conform-to/zod';
+import { useTranslations } from 'next-intl';
 import { useActionState } from 'react';
 import { useFormStatus } from 'react-dom';
 
 import { FormStatus } from '@/vibes/soul/form/form-status';
 import { Input } from '@/vibes/soul/form/input';
 import { Button } from '@/vibes/soul/primitives/button';
+import { parseWithZodTranslatedErrors } from '~/i18n/utils';
 
-import { schema } from './schema';
+import { forgotPasswordErrorTranslations, schema } from './schema';
 
 type Action<State, Payload> = (state: Awaited<State>, payload: Payload) => State | Promise<State>;
 
@@ -29,6 +31,8 @@ export function ForgotPasswordForm({
   emailLabel = 'Email',
   submitLabel = 'Reset password',
 }: Props) {
+  const t = useTranslations('Auth.Login.ForgotPassword');
+  const errorTranslations = forgotPasswordErrorTranslations(t);
   const [{ lastResult, successMessage }, formAction] = useActionState(action, { lastResult: null });
   const [form, fields] = useForm({
     lastResult,
@@ -36,7 +40,7 @@ export function ForgotPasswordForm({
     shouldValidate: 'onBlur',
     shouldRevalidate: 'onInput',
     onValidate({ formData }) {
-      return parseWithZod(formData, { schema });
+      return parseWithZodTranslatedErrors(formData, { schema, errorTranslations });
     },
   });
 
diff --git a/core/vibes/soul/sections/forgot-password-section/schema.ts b/core/vibes/soul/sections/forgot-password-section/schema.ts
index c777b6589b..d685b379b8 100644
--- a/core/vibes/soul/sections/forgot-password-section/schema.ts
+++ b/core/vibes/soul/sections/forgot-password-section/schema.ts
@@ -1,5 +1,18 @@
+import { getTranslations } from 'next-intl/server';
 import { z } from 'zod';
 
+import { FormErrorTranslationMap } from '@/vibes/soul/form/dynamic-form/schema';
+import { ExistingResultType } from '~/client/util';
+
+export const forgotPasswordErrorTranslations = (
+  t: ExistingResultType<typeof getTranslations<'Auth.Login.ForgotPassword'>>,
+): FormErrorTranslationMap => ({
+  email: {
+    invalid_type: t('FieldErrors.emailRequired'),
+    invalid_string: t('FieldErrors.emailInvalid'),
+  },
+});
+
 export const schema = z.object({
-  email: z.string().email({ message: 'Please enter a valid email.' }).trim(),
+  email: z.string().email().trim(),
 });
diff --git a/core/vibes/soul/sections/gift-certificate-purchase-section/index.tsx b/core/vibes/soul/sections/gift-certificate-purchase-section/index.tsx
index 71a6104159..8617d55834 100644
--- a/core/vibes/soul/sections/gift-certificate-purchase-section/index.tsx
+++ b/core/vibes/soul/sections/gift-certificate-purchase-section/index.tsx
@@ -2,11 +2,11 @@
 
 import { SubmissionResult } from '@conform-to/react';
 import { clsx } from 'clsx';
-import { useFormatter } from 'next-intl';
+import { useFormatter, useTranslations } from 'next-intl';
 import { ReactNode, useCallback, useState } from 'react';
 
 import { DynamicForm, DynamicFormAction } from '@/vibes/soul/form/dynamic-form';
-import { Field, FieldGroup } from '@/vibes/soul/form/dynamic-form/schema';
+import { Field, FieldGroup, FormErrorTranslationMap } from '@/vibes/soul/form/dynamic-form/schema';
 import { Streamable } from '@/vibes/soul/lib/streamable';
 import { GiftCertificateCard } from '@/vibes/soul/primitives/gift-certificate-card';
 import { toast } from '@/vibes/soul/primitives/toaster';
@@ -58,8 +58,36 @@ export function GiftCertificatePurchaseSection({
   expiresAtLabel,
   ctaLabel = 'Add to cart',
 }: Props) {
+  const t = useTranslations('GiftCertificates.Purchase');
   const format = useFormatter();
   const [formattedAmount, setFormattedAmount] = useState<string | undefined>(undefined);
+  const errorTranslations: FormErrorTranslationMap = {
+    amount: {
+      invalid_type: t('Form.Errors.amountRequired'),
+      invalid_string: t('Form.Errors.amountInvalid'),
+    },
+    senderName: {
+      invalid_type: t('Form.Errors.senderNameRequired'),
+    },
+    senderEmail: {
+      invalid_type: t('Form.Errors.senderEmailRequired'),
+      invalid_string: t('Form.Errors.emailInvalid'),
+    },
+    recipientName: {
+      invalid_type: t('Form.Errors.recipientNameRequired'),
+    },
+    recipientEmail: {
+      invalid_type: t('Form.Errors.recipientEmailRequired'),
+      invalid_string: t('Form.Errors.emailInvalid'),
+    },
+    nonRefundable: {
+      invalid_literal: t('Form.Errors.checkboxRequired'),
+    },
+    expirationConsent: {
+      invalid_literal: t('Form.Errors.checkboxRequired'),
+    },
+  };
+
   const handleFormChange = (e: React.FormEvent<HTMLFormElement>) => {
     if (!(e.target instanceof HTMLInputElement || e.target instanceof HTMLSelectElement)) {
       return;
@@ -156,6 +184,7 @@ export function GiftCertificatePurchaseSection({
           </div>
           <DynamicForm
             action={action}
+            errorTranslations={errorTranslations}
             fields={formFields}
             key={JSON.stringify(formFields)}
             onChange={handleFormChange}
diff --git a/core/vibes/soul/sections/reset-password-section/index.tsx b/core/vibes/soul/sections/reset-password-section/index.tsx
index 2a7df803a2..614cbd1ee6 100644
--- a/core/vibes/soul/sections/reset-password-section/index.tsx
+++ b/core/vibes/soul/sections/reset-password-section/index.tsx
@@ -1,3 +1,5 @@
+import { PasswordComplexitySettings } from '@/vibes/soul/form/dynamic-form/schema';
+
 import { ResetPasswordAction, ResetPasswordForm } from './reset-password-form';
 
 interface Props {
@@ -7,6 +9,7 @@ interface Props {
   submitLabel?: string;
   newPasswordLabel?: string;
   confirmPasswordLabel?: string;
+  passwordComplexitySettings?: PasswordComplexitySettings | null;
 }
 
 export function ResetPasswordSection({
@@ -15,6 +18,7 @@ export function ResetPasswordSection({
   submitLabel,
   newPasswordLabel,
   confirmPasswordLabel,
+  passwordComplexitySettings,
   action,
 }: Props) {
   return (
@@ -27,6 +31,7 @@ export function ResetPasswordSection({
             action={action}
             confirmPasswordLabel={confirmPasswordLabel}
             newPasswordLabel={newPasswordLabel}
+            passwordComplexitySettings={passwordComplexitySettings}
             submitLabel={submitLabel}
           />
         </div>
diff --git a/core/vibes/soul/sections/reset-password-section/reset-password-form.tsx b/core/vibes/soul/sections/reset-password-section/reset-password-form.tsx
index 5e553b82ce..0557e13279 100644
--- a/core/vibes/soul/sections/reset-password-section/reset-password-form.tsx
+++ b/core/vibes/soul/sections/reset-password-section/reset-password-form.tsx
@@ -1,14 +1,17 @@
 'use client';
 
 import { getFormProps, getInputProps, SubmissionResult, useForm } from '@conform-to/react';
-import { getZodConstraint, parseWithZod } from '@conform-to/zod';
+import { getZodConstraint } from '@conform-to/zod';
+import { useTranslations } from 'next-intl';
 import { useActionState } from 'react';
 
+import { PasswordComplexitySettings } from '@/vibes/soul/form/dynamic-form/schema';
 import { FormStatus } from '@/vibes/soul/form/form-status';
 import { Input } from '@/vibes/soul/form/input';
 import { Button } from '@/vibes/soul/primitives/button';
+import { parseWithZodTranslatedErrors } from '~/i18n/utils';
 
-import { schema } from './schema';
+import { resetPasswordErrorTranslations, resetPasswordSchema } from './schema';
 
 type Action<State, Payload> = (state: Awaited<State>, payload: Payload) => State | Promise<State>;
 
@@ -22,6 +25,7 @@ interface Props {
   submitLabel?: string;
   newPasswordLabel?: string;
   confirmPasswordLabel?: string;
+  passwordComplexitySettings?: PasswordComplexitySettings | null;
 }
 
 export function ResetPasswordForm({
@@ -29,7 +33,11 @@ export function ResetPasswordForm({
   newPasswordLabel = 'New password',
   confirmPasswordLabel = 'Confirm Password',
   submitLabel = 'Update',
+  passwordComplexitySettings,
 }: Props) {
+  const t = useTranslations('Auth.ChangePassword');
+  const errorTranslations = resetPasswordErrorTranslations(t, passwordComplexitySettings);
+  const schema = resetPasswordSchema(passwordComplexitySettings, errorTranslations);
   const [{ lastResult, successMessage }, formAction, isPending] = useActionState(action, {
     lastResult: null,
   });
@@ -39,7 +47,7 @@ export function ResetPasswordForm({
     shouldValidate: 'onBlur',
     shouldRevalidate: 'onInput',
     onValidate({ formData }) {
-      return parseWithZod(formData, { schema });
+      return parseWithZodTranslatedErrors(formData, { schema, errorTranslations });
     },
   });
 
diff --git a/core/vibes/soul/sections/reset-password-section/schema.ts b/core/vibes/soul/sections/reset-password-section/schema.ts
index 441f15484e..4146bfd340 100644
--- a/core/vibes/soul/sections/reset-password-section/schema.ts
+++ b/core/vibes/soul/sections/reset-password-section/schema.ts
@@ -1,24 +1,55 @@
+import { getTranslations } from 'next-intl/server';
 import { z } from 'zod';
 
-export const schema = z
-  .object({
-    password: z
-      .string()
-      .min(8, { message: 'Be at least 8 characters long' })
-      .regex(/[a-zA-Z]/, { message: 'Contain at least one letter.' })
-      .regex(/[0-9]/, { message: 'Contain at least one number.' })
-      .regex(/[^a-zA-Z0-9]/, {
-        message: 'Contain at least one special character.',
-      })
-      .trim(),
-    confirmPassword: z.string(),
-  })
-  .superRefine(({ confirmPassword, password }, ctx) => {
-    if (confirmPassword !== password) {
-      ctx.addIssue({
-        code: 'custom',
-        message: 'The passwords did not match',
-        path: ['confirmPassword'],
-      });
-    }
-  });
+import {
+  FormErrorTranslationMap,
+  getPasswordSchema,
+  PasswordComplexitySettings,
+} from '@/vibes/soul/form/dynamic-form/schema';
+import { ExistingResultType } from '~/client/util';
+
+export const resetPasswordErrorTranslations = (
+  t: ExistingResultType<typeof getTranslations<'Auth.ChangePassword'>>,
+  passwordComplexity?: PasswordComplexitySettings | null,
+): FormErrorTranslationMap => ({
+  password: {
+    invalid_type: t('FieldErrors.passwordRequired'),
+    too_small: t('FieldErrors.passwordTooSmall', {
+      minLength: passwordComplexity?.minimumPasswordLength ?? 0,
+    }),
+    lowercase_required: t('FieldErrors.passwordLowercaseRequired'),
+    uppercase_required: t('FieldErrors.passwordUppercaseRequired'),
+    number_required: t('FieldErrors.passwordNumberRequired', {
+      minNumbers: passwordComplexity?.minimumNumbers ?? 1,
+    }),
+    special_character_required: t('FieldErrors.passwordSpecialCharacterRequired'),
+    passwords_must_match: t('FieldErrors.passwordsMustMatch'),
+  },
+  confirmPassword: {
+    invalid_type: t('FieldErrors.passwordRequired'),
+  },
+});
+
+export const resetPasswordSchema = (
+  passwordComplexity?: PasswordComplexitySettings | null,
+  errorTranslations?: FormErrorTranslationMap,
+) => {
+  const passwordSchema = getPasswordSchema(passwordComplexity, errorTranslations);
+
+  return z
+    .object({
+      currentPassword: z.string().trim(),
+      password: passwordSchema,
+      confirmPassword: z.string(),
+    })
+    .superRefine(({ confirmPassword, password }, ctx) => {
+      if (confirmPassword !== password) {
+        ctx.addIssue({
+          code: 'custom',
+          message:
+            errorTranslations?.password?.passwords_must_match ?? 'The passwords do not match',
+          path: ['confirmPassword'],
+        });
+      }
+    });
+};
diff --git a/core/vibes/soul/sections/reviews/index.tsx b/core/vibes/soul/sections/reviews/index.tsx
index a56b61d583..d248f66f29 100644
--- a/core/vibes/soul/sections/reviews/index.tsx
+++ b/core/vibes/soul/sections/reviews/index.tsx
@@ -28,6 +28,7 @@ interface Props {
   formButtonLabel?: string;
   formModalTitle?: string;
   formSubmitLabel?: string;
+  formCancelLabel?: string;
   formRatingLabel?: string;
   formTitleLabel?: string;
   formReviewLabel?: string;
@@ -52,6 +53,7 @@ export function Reviews({
   formButtonLabel = 'Write a review',
   formModalTitle,
   formSubmitLabel,
+  formCancelLabel,
   formRatingLabel,
   formTitleLabel,
   formReviewLabel,
@@ -69,6 +71,7 @@ export function Reviews({
             <ReviewsEmptyState
               action={action}
               formButtonLabel={formButtonLabel}
+              formCancelLabel={formCancelLabel}
               formEmailLabel={formEmailLabel}
               formModalTitle={formModalTitle}
               formNameLabel={formNameLabel}
@@ -186,6 +189,7 @@ export function ReviewsEmptyState({
   formButtonLabel = 'Write a review',
   formModalTitle,
   formSubmitLabel,
+  formCancelLabel,
   formRatingLabel,
   formTitleLabel,
   formReviewLabel,
@@ -202,6 +206,7 @@ export function ReviewsEmptyState({
   formButtonLabel?: string;
   formModalTitle?: string;
   formSubmitLabel?: string;
+  formCancelLabel?: string;
   formRatingLabel?: string;
   formTitleLabel?: string;
   formReviewLabel?: string;
@@ -230,6 +235,7 @@ export function ReviewsEmptyState({
         <p className="text-center">{message}</p>
         <ReviewForm
           action={action}
+          formCancelLabel={formCancelLabel}
           formEmailLabel={formEmailLabel}
           formModalTitle={formModalTitle}
           formNameLabel={formNameLabel}
diff --git a/core/vibes/soul/sections/reviews/review-form.tsx b/core/vibes/soul/sections/reviews/review-form.tsx
index 3e9d2033a9..1f72c818bf 100644
--- a/core/vibes/soul/sections/reviews/review-form.tsx
+++ b/core/vibes/soul/sections/reviews/review-form.tsx
@@ -1,7 +1,8 @@
 'use client';
 
 import { getFormProps, SubmissionResult, useForm, useInputControl } from '@conform-to/react';
-import { getZodConstraint, parseWithZod } from '@conform-to/zod';
+import { getZodConstraint } from '@conform-to/zod';
+import { useTranslations } from 'next-intl';
 import { startTransition, useActionState, useEffect, useRef, useState } from 'react';
 import { useFormStatus } from 'react-dom';
 
@@ -14,8 +15,9 @@ import { Button } from '@/vibes/soul/primitives/button';
 import { Modal } from '@/vibes/soul/primitives/modal';
 import { toast } from '@/vibes/soul/primitives/toaster';
 import { Image } from '~/components/image';
+import { parseWithZodTranslatedErrors } from '~/i18n/utils';
 
-import { schema } from './schema';
+import { reviewFormErrorTranslations, schema } from './schema';
 
 type Action<S, P> = (state: Awaited<S>, payload: P) => S | Promise<S>;
 
@@ -30,6 +32,7 @@ interface Props {
   trigger: React.ReactNode;
   formModalTitle?: string;
   formSubmitLabel?: string;
+  formCancelLabel?: string;
   formRatingLabel?: string;
   formTitleLabel?: string;
   formReviewLabel?: string;
@@ -46,6 +49,7 @@ export const ReviewForm = ({
   trigger,
   formModalTitle = 'Write a review',
   formSubmitLabel = 'Submit',
+  formCancelLabel = 'Cancel',
   formRatingLabel = 'Rating',
   formTitleLabel = 'Title',
   formReviewLabel = 'Review',
@@ -55,6 +59,8 @@ export const ReviewForm = ({
   streamableImages,
   streamableUser,
 }: Props) => {
+  const t = useTranslations('Product.Reviews.Form');
+  const errorTranslations = reviewFormErrorTranslations(t);
   const [isOpen, setIsOpen] = useState(false);
   const [{ lastResult, successMessage }, formAction] = useActionState(action, {
     lastResult: null,
@@ -73,7 +79,7 @@ export const ReviewForm = ({
       author: user.name,
     },
     onValidate({ formData }) {
-      return parseWithZod(formData, { schema });
+      return parseWithZodTranslatedErrors(formData, { schema, errorTranslations });
     },
     onSubmit(event, { formData }) {
       event.preventDefault();
@@ -213,7 +219,7 @@ export const ReviewForm = ({
             ))}
             <div className="mt-auto flex justify-end gap-3">
               <Button onClick={() => setIsOpen(false)} size="small" type="button" variant="ghost">
-                Cancel
+                {formCancelLabel}
               </Button>
               <SubmitButton>{formSubmitLabel}</SubmitButton>
             </div>
diff --git a/core/vibes/soul/sections/reviews/schema.ts b/core/vibes/soul/sections/reviews/schema.ts
index 51f422639b..75519a6c96 100644
--- a/core/vibes/soul/sections/reviews/schema.ts
+++ b/core/vibes/soul/sections/reviews/schema.ts
@@ -1,5 +1,32 @@
+import { getTranslations } from 'next-intl/server';
 import { z } from 'zod';
 
+import { FormErrorTranslationMap } from '@/vibes/soul/form/dynamic-form/schema';
+import { ExistingResultType } from '~/client/util';
+
+export const reviewFormErrorTranslations = (
+  t: ExistingResultType<typeof getTranslations<'Product.Reviews.Form'>>,
+): FormErrorTranslationMap => ({
+  title: {
+    invalid_type: t('FieldErrors.titleRequired'),
+  },
+  author: {
+    invalid_type: t('FieldErrors.authorRequired'),
+  },
+  email: {
+    invalid_type: t('FieldErrors.emailRequired'),
+    invalid_string: t('FieldErrors.emailInvalid'),
+  },
+  text: {
+    invalid_type: t('FieldErrors.textRequired'),
+  },
+  rating: {
+    invalid_type: t('FieldErrors.ratingRequired'),
+    too_small: t('FieldErrors.ratingTooSmall'),
+    too_big: t('FieldErrors.ratingTooLarge'),
+  },
+});
+
 export const schema = z.object({
   productEntityId: z.number(),
   title: z.string().min(1),
diff --git a/core/vibes/soul/sections/sign-in-section/schema.ts b/core/vibes/soul/sections/sign-in-section/schema.ts
index 5a7ed0f12b..6e746ff97a 100644
--- a/core/vibes/soul/sections/sign-in-section/schema.ts
+++ b/core/vibes/soul/sections/sign-in-section/schema.ts
@@ -1,5 +1,21 @@
+import { getTranslations } from 'next-intl/server';
 import { z } from 'zod';
 
+import { FormErrorTranslationMap } from '@/vibes/soul/form/dynamic-form/schema';
+import { ExistingResultType } from '~/client/util';
+
+export const loginErrorTranslations = (
+  t: ExistingResultType<typeof getTranslations<'Auth.Login'>>,
+): FormErrorTranslationMap => ({
+  email: {
+    invalid_type: t('FieldErrors.emailRequired'),
+    invalid_string: t('FieldErrors.emailInvalid'),
+  },
+  password: {
+    invalid_type: t('FieldErrors.passwordRequired'),
+  },
+});
+
 export const schema = z.object({
   email: z.string().email(),
   password: z.string(),
diff --git a/core/vibes/soul/sections/sign-in-section/sign-in-form.tsx b/core/vibes/soul/sections/sign-in-section/sign-in-form.tsx
index 9c0a902836..26c31ae731 100644
--- a/core/vibes/soul/sections/sign-in-section/sign-in-form.tsx
+++ b/core/vibes/soul/sections/sign-in-section/sign-in-form.tsx
@@ -1,15 +1,17 @@
 'use client';
 
 import { getFormProps, getInputProps, SubmissionResult, useForm } from '@conform-to/react';
-import { getZodConstraint, parseWithZod } from '@conform-to/zod';
+import { getZodConstraint } from '@conform-to/zod';
+import { useTranslations } from 'next-intl';
 import { startTransition, useActionState, useEffect } from 'react';
 import { useFormStatus } from 'react-dom';
 
 import { FormStatus } from '@/vibes/soul/form/form-status';
 import { Input } from '@/vibes/soul/form/input';
 import { Button } from '@/vibes/soul/primitives/button';
+import { parseWithZodTranslatedErrors } from '~/i18n/utils';
 
-import { schema } from './schema';
+import { loginErrorTranslations, schema } from './schema';
 
 type Action<State, Payload> = (state: Awaited<State>, payload: Payload) => State | Promise<State>;
 
@@ -30,6 +32,8 @@ export function SignInForm({
   submitLabel = 'Sign in',
   error,
 }: Props) {
+  const t = useTranslations('Auth.Login');
+  const errorTranslations = loginErrorTranslations(t);
   const [lastResult, formAction] = useActionState(action, null);
   const [form, fields] = useForm({
     lastResult,
@@ -44,7 +48,7 @@ export function SignInForm({
       });
     },
     onValidate({ formData }) {
-      return parseWithZod(formData, { schema });
+      return parseWithZodTranslatedErrors(formData, { schema, errorTranslations });
     },
   });
 

From 06336122585db5021de9028ed88e2bc48c6faede Mon Sep 17 00:00:00 2001
From: Jorge Moya <jorge.moya@bigcommerce.com>
Date: Tue, 3 Feb 2026 12:50:07 -0600
Subject: [PATCH 38/69] fix(core): use state abbreviation instead of entityId
 for shipping form (#2858)

---
 .changeset/legal-adults-look.md           | 53 +++++++++++++++++++++++
 core/app/[locale]/(default)/cart/page.tsx | 19 ++++++--
 2 files changed, 68 insertions(+), 4 deletions(-)
 create mode 100644 .changeset/legal-adults-look.md

diff --git a/.changeset/legal-adults-look.md b/.changeset/legal-adults-look.md
new file mode 100644
index 0000000000..27d8b1d0cd
--- /dev/null
+++ b/.changeset/legal-adults-look.md
@@ -0,0 +1,53 @@
+---
+"@bigcommerce/catalyst-core": patch
+---
+
+Use state abbreviation instead of entityId for cart shipping form state values. The shipping API expects state abbreviations, and using entityId caused form submissions to fail. Additionally, certain US military states that share the same abbreviation (AE) are now filtered out to prevent duplicate key issues and ambiguous submissions.
+
+## Migration steps
+
+### Step 1: Add blacklist for states with duplicate abbreviations
+
+Certain US states share the same abbreviation (AE), which causes issues with the shipping API and React select dropdowns. Add a blacklist to filter these out.
+
+Update `core/app/[locale]/(default)/cart/page.tsx`:
+
+```diff
+  const countries = shippingCountries.map((country) => ({
+    value: country.code,
+    label: country.name,
+  }));
+
++ // These US states share the same abbreviation (AE), which causes issues:
++ // 1. The shipping API uses abbreviations, so it can't distinguish between them
++ // 2. React select dropdowns require unique keys, causing duplicate key warnings
++ const blacklistedUSStates = new Set([
++   'Armed Forces Africa',
++   'Armed Forces Canada',
++   'Armed Forces Middle East',
++ ]);
+
+  const statesOrProvinces = shippingCountries.map((country) => ({
+```
+
+### Step 2: Use state abbreviation instead of entityId
+
+Update the state mapping to use `abbreviation` instead of `entityId`, and apply the blacklist filter for US states.
+
+Update `core/app/[locale]/(default)/cart/page.tsx`:
+
+```diff
+  const statesOrProvinces = shippingCountries.map((country) => ({
+    country: country.code,
+-   states: country.statesOrProvinces.map((state) => ({
+-     value: state.entityId.toString(),
+-     label: state.name,
+-   })),
++   states: country.statesOrProvinces
++     .filter((state) => country.code !== 'US' || !blacklistedUSStates.has(state.name))
++     .map((state) => ({
++       value: state.abbreviation,
++       label: state.name,
++     })),
+  }));
+```
diff --git a/core/app/[locale]/(default)/cart/page.tsx b/core/app/[locale]/(default)/cart/page.tsx
index 677f74523e..f78ad90763 100644
--- a/core/app/[locale]/(default)/cart/page.tsx
+++ b/core/app/[locale]/(default)/cart/page.tsx
@@ -192,12 +192,23 @@ export default async function Cart({ params }: Props) {
     label: country.name,
   }));
 
+  // These US states share the same abbreviation (AE), which causes issues:
+  // 1. The shipping API uses abbreviations, so it can't distinguish between them
+  // 2. React select dropdowns require unique keys, causing duplicate key warnings
+  const blacklistedUSStates = new Set([
+    'Armed Forces Africa',
+    'Armed Forces Canada',
+    'Armed Forces Middle East',
+  ]);
+
   const statesOrProvinces = shippingCountries.map((country) => ({
     country: country.code,
-    states: country.statesOrProvinces.map((state) => ({
-      value: state.entityId.toString(),
-      label: state.name,
-    })),
+    states: country.statesOrProvinces
+      .filter((state) => country.code !== 'US' || !blacklistedUSStates.has(state.name))
+      .map((state) => ({
+        value: state.abbreviation,
+        label: state.name,
+      })),
   }));
 
   const showShippingForm =

From 52207b69c50f58027400f716bf18c53cac82189b Mon Sep 17 00:00:00 2001
From: Codeseph <lukemirejoseph@gmail.com>
Date: Wed, 19 Nov 2025 11:18:21 -0500
Subject: [PATCH 39/69] fix: handle OPTIONS requests via MakeswiftApiHandler

---
 .changeset/heavy-cups-train.md                 | 5 +++++
 core/app/api/makeswift/[...makeswift]/route.ts | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/heavy-cups-train.md

diff --git a/.changeset/heavy-cups-train.md b/.changeset/heavy-cups-train.md
new file mode 100644
index 0000000000..926d6ae2e9
--- /dev/null
+++ b/.changeset/heavy-cups-train.md
@@ -0,0 +1,5 @@
+---
+"@bigcommerce/catalyst-makeswift": patch
+---
+
+fix: handle OPTIONS requests via MakeswiftApiHandler
diff --git a/core/app/api/makeswift/[...makeswift]/route.ts b/core/app/api/makeswift/[...makeswift]/route.ts
index 3ef7bc1f62..375dc590ef 100644
--- a/core/app/api/makeswift/[...makeswift]/route.ts
+++ b/core/app/api/makeswift/[...makeswift]/route.ts
@@ -47,4 +47,4 @@ const handler = MakeswiftApiHandler(process.env.MAKESWIFT_SITE_API_KEY, {
   },
 });
 
-export { handler as GET, handler as POST };
+export { handler as GET, handler as POST, handler as OPTIONS };

From 6d0d52b9c7fe2adceb1fab03add7286eb4024a36 Mon Sep 17 00:00:00 2001
From: James Q Quick <james.q.quick@gmail.com>
Date: Wed, 4 Feb 2026 10:08:07 -0500
Subject: [PATCH 40/69] [CATALYST-1686] Clarify REST Management API in
 Contributing (#2861)

* Update contributing doc to clarify not accepting PRs to integrate REST Management API

* update broken links and text
---
 CONTRIBUTING.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 7d91bd6bda..29c9e04c6f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -12,6 +12,12 @@ The default branch for this repository is called `canary`. This is the primary d
 
 To contribute to the `canary` branch, you can create a new branch off of `canary` and submit a PR against that branch.
 
+## API Scope
+
+Catalyst is intended to work with the [BigCommerce Storefront GraphQL API](https://developer.bigcommerce.com/docs/storefront/graphql) and not directly integrate out of the box with the [REST Management API](https://developer.bigcommerce.com/docs/rest-management).
+
+You're welcome to integrate the REST Management API in your own fork, but we will not accept pull requests that incorporate or depend on the REST Management API. If your contribution requires Management API functionality, it is out of scope for this project.
+
 ## Makeswift Integration
 
 In addition to `canary`, we also maintain the `integrations/makeswift` branch, which contains additional code required to integrate with [Makeswift](https://www.makeswift.com).

From 5097034e93a9135b646f53445c83c8716fbeb76f Mon Sep 17 00:00:00 2001
From: Jorge Moya <jorge.moya@bigcommerce.com>
Date: Tue, 3 Feb 2026 11:06:10 -0600
Subject: [PATCH 41/69] feat: add explicit Makeswift SEO  metadata support

---
 .changeset/wild-bears-open.md                 | 82 +++++++++++++++++++
 .../(faceted)/brand/[slug]/page-data.ts       |  1 +
 .../(default)/(faceted)/brand/[slug]/page.tsx |  9 +-
 .../(faceted)/category/[slug]/page-data.ts    |  1 +
 .../(faceted)/category/[slug]/page.tsx        |  9 +-
 .../(default)/(faceted)/search/page.tsx       |  5 +-
 .../app/[locale]/(default)/[...rest]/page.tsx | 16 +++-
 .../(default)/blog/[blogId]/page-data.ts      |  1 +
 .../[locale]/(default)/blog/[blogId]/page.tsx |  8 +-
 core/app/[locale]/(default)/blog/page.tsx     |  9 +-
 core/app/[locale]/(default)/cart/page.tsx     |  5 +-
 core/app/[locale]/(default)/compare/page.tsx  |  5 +-
 .../gift-certificates/balance/page.tsx        |  5 +-
 .../(default)/gift-certificates/page.tsx      |  5 +-
 core/app/[locale]/(default)/page.tsx          | 19 +++--
 .../(default)/product/[slug]/page-data.ts     |  1 +
 .../(default)/product/[slug]/page.tsx         | 12 ++-
 .../webpages/[id]/_components/web-page.tsx    |  1 +
 .../(default)/webpages/[id]/contact/page.tsx  |  9 +-
 .../webpages/[id]/normal/page-data.ts         |  1 +
 .../(default)/webpages/[id]/normal/page.tsx   |  9 +-
 core/lib/makeswift/client.ts                  | 15 ++++
 core/lib/makeswift/index.ts                   |  2 +-
 core/lib/makeswift/page.tsx                   |  2 +-
 24 files changed, 197 insertions(+), 35 deletions(-)
 create mode 100644 .changeset/wild-bears-open.md

diff --git a/.changeset/wild-bears-open.md b/.changeset/wild-bears-open.md
new file mode 100644
index 0000000000..eea397f60d
--- /dev/null
+++ b/.changeset/wild-bears-open.md
@@ -0,0 +1,82 @@
+---
+"@bigcommerce/catalyst-makeswift": patch
+---
+
+Add explicit Makeswift SEO metadata support to public-facing pages. When configured in Makeswift, the SEO title and description will take priority over the default values from BigCommerce or static translations.
+
+The following pages now support Makeswift SEO metadata:
+
+- Home page (`/`)
+- Catch-all page (`/[...rest]`)
+- Product page (`/product/[slug]`)
+- Brand page (`/brand/[slug]`)
+- Category page (`/category/[slug]`)
+- Blog list page (`/blog`)
+- Blog post page (`/blog/[blogId]`)
+- Search page (`/search`)
+- Cart page (`/cart`)
+- Compare page (`/compare`)
+- Gift certificates page (`/gift-certificates`)
+- Gift certificates balance page (`/gift-certificates/balance`)
+- Contact webpage (`/webpages/[id]/contact`)
+- Normal webpage (`/webpages/[id]/normal`)
+
+## Migration steps
+
+### Step 1: Add `getPageMetadata` function
+
+Add the `getPageMetadata` function to `core/lib/makeswift/client.ts`:
+
+```diff
++ export async function getPageMetadata({ path, locale }: { path: string; locale: string }) {
++   const snapshot = await getPageSnapshot({ path, locale });
++
++   if (snapshot == null) {
++     return null;
++   }
++
++   const { meta } = snapshot.document;
++
++   return {
++     ...(meta.title && { title: meta.title }),
++     ...(meta.description && { description: meta.description }),
++   };
++ }
+```
+
+Export the function from `core/lib/makeswift/index.ts`:
+
+```diff
+  export { Page } from './page';
+- export { client } from './client';
++ export { client, getPageMetadata } from './client';
+```
+
+### Step 2: Update page metadata
+
+Each page's `generateMetadata` function has been updated to fetch Makeswift metadata and use it as the primary source, falling back to existing values. Here's an example using the cart page:
+
+Update `core/app/[locale]/(default)/cart/page.tsx`:
+
+```diff
+  import { getPreferredCurrencyCode } from '~/lib/currency';
++ import { getPageMetadata } from '~/lib/makeswift';
+  import { Slot } from '~/lib/makeswift/slot';
+```
+
+```diff
+  export async function generateMetadata({ params }: Props): Promise<Metadata> {
+    const { locale } = await params;
+
+    const t = await getTranslations({ locale, namespace: 'Cart' });
++   const makeswiftMetadata = await getPageMetadata({ path: '/cart', locale });
+
+    return {
+-     title: t('title'),
++     title: makeswiftMetadata?.title || t('title'),
++     description: makeswiftMetadata?.description || undefined,
+    };
+  }
+```
+
+Apply the same pattern to the other pages listed above, using the appropriate path for each page (e.g., `/blog`, `/search`, `/compare`, etc.).
diff --git a/core/app/[locale]/(default)/(faceted)/brand/[slug]/page-data.ts b/core/app/[locale]/(default)/(faceted)/brand/[slug]/page-data.ts
index 918affdedf..9bb605d215 100644
--- a/core/app/[locale]/(default)/(faceted)/brand/[slug]/page-data.ts
+++ b/core/app/[locale]/(default)/(faceted)/brand/[slug]/page-data.ts
@@ -9,6 +9,7 @@ const BrandPageQuery = graphql(`
     site {
       brand(entityId: $entityId) {
         name
+        path
         seo {
           pageTitle
           metaDescription
diff --git a/core/app/[locale]/(default)/(faceted)/brand/[slug]/page.tsx b/core/app/[locale]/(default)/(faceted)/brand/[slug]/page.tsx
index 407892f55a..4e8094d352 100644
--- a/core/app/[locale]/(default)/(faceted)/brand/[slug]/page.tsx
+++ b/core/app/[locale]/(default)/(faceted)/brand/[slug]/page.tsx
@@ -13,6 +13,7 @@ import { facetsTransformer } from '~/data-transformers/facets-transformer';
 import { pageInfoTransformer } from '~/data-transformers/page-info-transformer';
 import { productCardTransformer } from '~/data-transformers/product-card-transformer';
 import { getPreferredCurrencyCode } from '~/lib/currency';
+import { getPageMetadata } from '~/lib/makeswift';
 
 import { MAX_COMPARE_LIMIT } from '../../../compare/page-data';
 import { getCompareProducts as getCompareProductsData } from '../../fetch-compare-products';
@@ -67,7 +68,7 @@ interface Props {
 }
 
 export async function generateMetadata(props: Props): Promise<Metadata> {
-  const { slug } = await props.params;
+  const { slug, locale } = await props.params;
   const customerAccessToken = await getSessionCustomerAccessToken();
 
   const brandId = Number(slug);
@@ -78,11 +79,13 @@ export async function generateMetadata(props: Props): Promise<Metadata> {
     return notFound();
   }
 
+  const makeswiftMetadata = await getPageMetadata({ path: brand.path, locale });
+
   const { pageTitle, metaDescription, metaKeywords } = brand.seo;
 
   return {
-    title: pageTitle || brand.name,
-    description: metaDescription,
+    title: makeswiftMetadata?.title || pageTitle || brand.name,
+    description: makeswiftMetadata?.description || metaDescription,
     keywords: metaKeywords ? metaKeywords.split(',') : null,
   };
 }
diff --git a/core/app/[locale]/(default)/(faceted)/category/[slug]/page-data.ts b/core/app/[locale]/(default)/(faceted)/category/[slug]/page-data.ts
index 6c2c4633fe..3567a50247 100644
--- a/core/app/[locale]/(default)/(faceted)/category/[slug]/page-data.ts
+++ b/core/app/[locale]/(default)/(faceted)/category/[slug]/page-data.ts
@@ -12,6 +12,7 @@ const CategoryPageQuery = graphql(
         category(entityId: $entityId) {
           entityId
           name
+          path
           ...BreadcrumbsFragment
           seo {
             pageTitle
diff --git a/core/app/[locale]/(default)/(faceted)/category/[slug]/page.tsx b/core/app/[locale]/(default)/(faceted)/category/[slug]/page.tsx
index 05e607fe21..7d8778ce77 100644
--- a/core/app/[locale]/(default)/(faceted)/category/[slug]/page.tsx
+++ b/core/app/[locale]/(default)/(faceted)/category/[slug]/page.tsx
@@ -14,6 +14,7 @@ import { facetsTransformer } from '~/data-transformers/facets-transformer';
 import { pageInfoTransformer } from '~/data-transformers/page-info-transformer';
 import { productCardTransformer } from '~/data-transformers/product-card-transformer';
 import { getPreferredCurrencyCode } from '~/lib/currency';
+import { getPageMetadata } from '~/lib/makeswift';
 import { Slot } from '~/lib/makeswift/slot';
 
 import { MAX_COMPARE_LIMIT } from '../../../compare/page-data';
@@ -70,7 +71,7 @@ interface Props {
 }
 
 export async function generateMetadata(props: Props): Promise<Metadata> {
-  const { slug } = await props.params;
+  const { slug, locale } = await props.params;
   const customerAccessToken = await getSessionCustomerAccessToken();
 
   const categoryId = Number(slug);
@@ -81,11 +82,13 @@ export async function generateMetadata(props: Props): Promise<Metadata> {
     return notFound();
   }
 
+  const makeswiftMetadata = await getPageMetadata({ path: category.path, locale });
+
   const { pageTitle, metaDescription, metaKeywords } = category.seo;
 
   return {
-    title: pageTitle || category.name,
-    description: metaDescription,
+    title: makeswiftMetadata?.title || pageTitle || category.name,
+    description: makeswiftMetadata?.description || metaDescription,
     keywords: metaKeywords ? metaKeywords.split(',') : null,
   };
 }
diff --git a/core/app/[locale]/(default)/(faceted)/search/page.tsx b/core/app/[locale]/(default)/(faceted)/search/page.tsx
index bc86471c32..f36ac9d76f 100644
--- a/core/app/[locale]/(default)/(faceted)/search/page.tsx
+++ b/core/app/[locale]/(default)/(faceted)/search/page.tsx
@@ -12,6 +12,7 @@ import { facetsTransformer } from '~/data-transformers/facets-transformer';
 import { pageInfoTransformer } from '~/data-transformers/page-info-transformer';
 import { productCardTransformer } from '~/data-transformers/product-card-transformer';
 import { getPreferredCurrencyCode } from '~/lib/currency';
+import { getPageMetadata } from '~/lib/makeswift';
 
 import { MAX_COMPARE_LIMIT } from '../../compare/page-data';
 import { getCompareProducts as getCompareProductsData } from '../fetch-compare-products';
@@ -63,9 +64,11 @@ export async function generateMetadata({ params }: Props): Promise<Metadata> {
   const { locale } = await params;
 
   const t = await getTranslations({ locale, namespace: 'Faceted.Search' });
+  const makeswiftMetadata = await getPageMetadata({ path: '/search', locale });
 
   return {
-    title: t('title'),
+    title: makeswiftMetadata?.title || t('title'),
+    description: makeswiftMetadata?.description || undefined,
   };
 }
 
diff --git a/core/app/[locale]/(default)/[...rest]/page.tsx b/core/app/[locale]/(default)/[...rest]/page.tsx
index 695fc72a42..8f905265de 100644
--- a/core/app/[locale]/(default)/[...rest]/page.tsx
+++ b/core/app/[locale]/(default)/[...rest]/page.tsx
@@ -1,11 +1,25 @@
+import { Metadata } from 'next';
+
 import { defaultLocale, locales } from '~/i18n/locales';
-import { client, Page } from '~/lib/makeswift';
+import { client, getPageMetadata, Page } from '~/lib/makeswift';
 
 interface PageParams {
   locale: string;
   rest: string[];
 }
 
+export async function generateMetadata({
+  params,
+}: {
+  params: Promise<PageParams>;
+}): Promise<Metadata> {
+  const { rest, locale } = await params;
+  const path = `/${rest.join('/')}`;
+  const metadata = await getPageMetadata({ path, locale });
+
+  return metadata ?? {};
+}
+
 export async function generateStaticParams(): Promise<PageParams[]> {
   const pages = await client.getPages().toArray();
 
diff --git a/core/app/[locale]/(default)/blog/[blogId]/page-data.ts b/core/app/[locale]/(default)/blog/[blogId]/page-data.ts
index ec480d77b0..472c44059a 100644
--- a/core/app/[locale]/(default)/blog/[blogId]/page-data.ts
+++ b/core/app/[locale]/(default)/blog/[blogId]/page-data.ts
@@ -15,6 +15,7 @@ const BlogPageQuery = graphql(`
             author
             htmlBody
             name
+            path
             publishedDate {
               utc
             }
diff --git a/core/app/[locale]/(default)/blog/[blogId]/page.tsx b/core/app/[locale]/(default)/blog/[blogId]/page.tsx
index e6bda68e8e..5339a79a1f 100644
--- a/core/app/[locale]/(default)/blog/[blogId]/page.tsx
+++ b/core/app/[locale]/(default)/blog/[blogId]/page.tsx
@@ -5,6 +5,7 @@ import { cache } from 'react';
 
 import { BlogPostContent, BlogPostContentBlogPost } from '@/vibes/soul/sections/blog-post-content';
 import { Breadcrumb } from '@/vibes/soul/sections/breadcrumbs';
+import { getPageMetadata } from '~/lib/makeswift';
 
 import { getBlogPageData } from './page-data';
 
@@ -18,7 +19,7 @@ interface Props {
 }
 
 export async function generateMetadata({ params }: Props): Promise<Metadata> {
-  const { blogId } = await params;
+  const { blogId, locale } = await params;
 
   const variables = cachedBlogPageDataVariables(blogId);
 
@@ -29,11 +30,12 @@ export async function generateMetadata({ params }: Props): Promise<Metadata> {
     return {};
   }
 
+  const makeswiftMetadata = await getPageMetadata({ path: blogPost.path, locale });
   const { pageTitle, metaDescription, metaKeywords } = blogPost.seo;
 
   return {
-    title: pageTitle || blogPost.name,
-    description: metaDescription,
+    title: makeswiftMetadata?.title || pageTitle || blogPost.name,
+    description: makeswiftMetadata?.description || metaDescription,
     keywords: metaKeywords ? metaKeywords.split(',') : null,
   };
 }
diff --git a/core/app/[locale]/(default)/blog/page.tsx b/core/app/[locale]/(default)/blog/page.tsx
index b0756183f4..60e394a8bc 100644
--- a/core/app/[locale]/(default)/blog/page.tsx
+++ b/core/app/[locale]/(default)/blog/page.tsx
@@ -7,6 +7,7 @@ import { createSearchParamsCache, parseAsInteger, parseAsString } from 'nuqs/ser
 import { Streamable } from '@/vibes/soul/lib/streamable';
 import { FeaturedBlogPostList } from '@/vibes/soul/sections/featured-blog-post-list';
 import { defaultPageInfo, pageInfoTransformer } from '~/data-transformers/page-info-transformer';
+import { getPageMetadata } from '~/lib/makeswift';
 
 import { getBlog, getBlogPosts } from './page-data';
 
@@ -29,13 +30,15 @@ export async function generateMetadata({ params }: Props): Promise<Metadata> {
 
   const t = await getTranslations({ locale, namespace: 'Blog' });
   const blog = await getBlog();
+  const makeswiftMetadata = await getPageMetadata({ path: '/blog', locale });
 
   return {
-    title: blog?.name ?? t('title'),
+    title: makeswiftMetadata?.title || blog?.name || t('title'),
     description:
-      blog?.description && blog.description.length > 150
+      makeswiftMetadata?.description ||
+      (blog?.description && blog.description.length > 150
         ? `${blog.description.substring(0, 150)}...`
-        : blog?.description,
+        : blog?.description),
   };
 }
 
diff --git a/core/app/[locale]/(default)/cart/page.tsx b/core/app/[locale]/(default)/cart/page.tsx
index 97513901fb..b1fd07f310 100644
--- a/core/app/[locale]/(default)/cart/page.tsx
+++ b/core/app/[locale]/(default)/cart/page.tsx
@@ -6,6 +6,7 @@ import { Cart as CartComponent, CartEmptyState } from '@/vibes/soul/sections/car
 import { CartAnalyticsProvider } from '~/app/[locale]/(default)/cart/_components/cart-analytics-provider';
 import { getCartId } from '~/lib/cart';
 import { getPreferredCurrencyCode } from '~/lib/currency';
+import { getPageMetadata } from '~/lib/makeswift';
 import { Slot } from '~/lib/makeswift/slot';
 import { exists } from '~/lib/utils';
 
@@ -27,9 +28,11 @@ export async function generateMetadata({ params }: Props): Promise<Metadata> {
   const { locale } = await params;
 
   const t = await getTranslations({ locale, namespace: 'Cart' });
+  const makeswiftMetadata = await getPageMetadata({ path: '/cart', locale });
 
   return {
-    title: t('title'),
+    title: makeswiftMetadata?.title || t('title'),
+    description: makeswiftMetadata?.description || undefined,
   };
 }
 
diff --git a/core/app/[locale]/(default)/compare/page.tsx b/core/app/[locale]/(default)/compare/page.tsx
index 79ed057c0a..9d6bbcfd9c 100644
--- a/core/app/[locale]/(default)/compare/page.tsx
+++ b/core/app/[locale]/(default)/compare/page.tsx
@@ -8,6 +8,7 @@ import { CompareSection } from '@/vibes/soul/sections/compare-section';
 import { getSessionCustomerAccessToken } from '~/auth';
 import { pricesTransformer } from '~/data-transformers/prices-transformer';
 import { getPreferredCurrencyCode } from '~/lib/currency';
+import { getPageMetadata } from '~/lib/makeswift';
 
 import { addToCart } from './_actions/add-to-cart';
 import { CompareAnalyticsProvider } from './_components/compare-analytics-provider';
@@ -41,9 +42,11 @@ export async function generateMetadata({ params }: Props): Promise<Metadata> {
   const { locale } = await params;
 
   const t = await getTranslations({ locale, namespace: 'Compare' });
+  const makeswiftMetadata = await getPageMetadata({ path: '/compare', locale });
 
   return {
-    title: t('title'),
+    title: makeswiftMetadata?.title || t('title'),
+    description: makeswiftMetadata?.description || undefined,
   };
 }
 
diff --git a/core/app/[locale]/(default)/gift-certificates/balance/page.tsx b/core/app/[locale]/(default)/gift-certificates/balance/page.tsx
index d56106a6ee..d3e4327032 100644
--- a/core/app/[locale]/(default)/gift-certificates/balance/page.tsx
+++ b/core/app/[locale]/(default)/gift-certificates/balance/page.tsx
@@ -4,6 +4,7 @@ import { getTranslations, setRequestLocale } from 'next-intl/server';
 import { GiftCertificateCheckBalanceSection } from '@/vibes/soul/sections/gift-certificate-balance-section';
 import { redirect } from '~/i18n/routing';
 import { getPreferredCurrencyCode } from '~/lib/currency';
+import { getPageMetadata } from '~/lib/makeswift';
 
 import { getGiftCertificatesData } from '../page-data';
 
@@ -17,9 +18,11 @@ export async function generateMetadata({ params }: Props): Promise<Metadata> {
   const { locale } = await params;
 
   const t = await getTranslations({ locale, namespace: 'GiftCertificates' });
+  const makeswiftMetadata = await getPageMetadata({ path: '/gift-certificates/balance', locale });
 
   return {
-    title: t('title') || 'Gift certificates - Check balance',
+    title: makeswiftMetadata?.title || t('title') || 'Gift certificates - Check balance',
+    description: makeswiftMetadata?.description || undefined,
   };
 }
 
diff --git a/core/app/[locale]/(default)/gift-certificates/page.tsx b/core/app/[locale]/(default)/gift-certificates/page.tsx
index e0117c53f7..b165ef80e7 100644
--- a/core/app/[locale]/(default)/gift-certificates/page.tsx
+++ b/core/app/[locale]/(default)/gift-certificates/page.tsx
@@ -4,6 +4,7 @@ import { getFormatter, getTranslations, setRequestLocale } from 'next-intl/serve
 import { GiftCertificatesSection } from '@/vibes/soul/sections/gift-certificates-section';
 import { redirect } from '~/i18n/routing';
 import { getPreferredCurrencyCode } from '~/lib/currency';
+import { getPageMetadata } from '~/lib/makeswift';
 
 import { getGiftCertificatesData } from './page-data';
 
@@ -15,9 +16,11 @@ export async function generateMetadata({ params }: Props): Promise<Metadata> {
   const { locale } = await params;
 
   const t = await getTranslations({ locale, namespace: 'GiftCertificates' });
+  const makeswiftMetadata = await getPageMetadata({ path: '/gift-certificates', locale });
 
   return {
-    title: t('title') || 'Gift certificates',
+    title: makeswiftMetadata?.title || t('title') || 'Gift certificates',
+    description: makeswiftMetadata?.description || undefined,
   };
 }
 
diff --git a/core/app/[locale]/(default)/page.tsx b/core/app/[locale]/(default)/page.tsx
index 4612a77c9a..7fa08369e2 100644
--- a/core/app/[locale]/(default)/page.tsx
+++ b/core/app/[locale]/(default)/page.tsx
@@ -1,18 +1,27 @@
+import { Metadata } from 'next';
+
 import { locales } from '~/i18n/locales';
-import { Page as MakeswiftPage } from '~/lib/makeswift';
+import { getPageMetadata, Page as MakeswiftPage } from '~/lib/makeswift';
 
 interface Params {
   locale: string;
 }
 
-export function generateStaticParams(): Params[] {
-  return locales.map((locale) => ({ locale }));
-}
-
 interface Props {
   params: Promise<Params>;
 }
 
+export async function generateMetadata({ params }: Props): Promise<Metadata> {
+  const { locale } = await params;
+  const metadata = await getPageMetadata({ path: '/', locale });
+
+  return metadata ?? {};
+}
+
+export function generateStaticParams(): Params[] {
+  return locales.map((locale) => ({ locale }));
+}
+
 export default async function Home({ params }: Props) {
   const { locale } = await params;
 
diff --git a/core/app/[locale]/(default)/product/[slug]/page-data.ts b/core/app/[locale]/(default)/product/[slug]/page-data.ts
index 6a4b6a1670..abfcff0777 100644
--- a/core/app/[locale]/(default)/product/[slug]/page-data.ts
+++ b/core/app/[locale]/(default)/product/[slug]/page-data.ts
@@ -147,6 +147,7 @@ const ProductPageMetadataQuery = graphql(`
           metaDescription
           metaKeywords
         }
+        path
         plainTextDescription(characterLimit: 1200)
       }
     }
diff --git a/core/app/[locale]/(default)/product/[slug]/page.tsx b/core/app/[locale]/(default)/product/[slug]/page.tsx
index 8a9e65a2d4..7fca224af1 100644
--- a/core/app/[locale]/(default)/product/[slug]/page.tsx
+++ b/core/app/[locale]/(default)/product/[slug]/page.tsx
@@ -11,6 +11,7 @@ import { pricesTransformer } from '~/data-transformers/prices-transformer';
 import { productCardTransformer } from '~/data-transformers/product-card-transformer';
 import { productOptionsTransformer } from '~/data-transformers/product-options-transformer';
 import { getPreferredCurrencyCode } from '~/lib/currency';
+import { getPageMetadata } from '~/lib/makeswift';
 import { ProductDetail } from '~/lib/makeswift/components/product-detail';
 
 import { addToCart } from './_actions/add-to-cart';
@@ -36,7 +37,7 @@ interface Props {
 }
 
 export async function generateMetadata({ params }: Props): Promise<Metadata> {
-  const { slug } = await params;
+  const { slug, locale } = await params;
   const customerAccessToken = await getSessionCustomerAccessToken();
 
   const productId = Number(slug);
@@ -47,12 +48,17 @@ export async function generateMetadata({ params }: Props): Promise<Metadata> {
     return notFound();
   }
 
+  const makeswiftMetadata = await getPageMetadata({ path: product.path, locale });
+
   const { pageTitle, metaDescription, metaKeywords } = product.seo;
   const { url, altText: alt } = product.defaultImage || {};
 
   return {
-    title: pageTitle || product.name,
-    description: metaDescription || `${product.plainTextDescription.slice(0, 150)}...`,
+    title: makeswiftMetadata?.title || pageTitle || product.name,
+    description:
+      makeswiftMetadata?.description ||
+      metaDescription ||
+      `${product.plainTextDescription.slice(0, 150)}...`,
     keywords: metaKeywords ? metaKeywords.split(',') : null,
     openGraph: url
       ? {
diff --git a/core/app/[locale]/(default)/webpages/[id]/_components/web-page.tsx b/core/app/[locale]/(default)/webpages/[id]/_components/web-page.tsx
index cbf571880f..899000651b 100644
--- a/core/app/[locale]/(default)/webpages/[id]/_components/web-page.tsx
+++ b/core/app/[locale]/(default)/webpages/[id]/_components/web-page.tsx
@@ -5,6 +5,7 @@ export interface WebPage {
   title: string;
   content: string;
   breadcrumbs: Breadcrumb[];
+  path: string;
   seo: {
     pageTitle: string;
     metaDescription: string;
diff --git a/core/app/[locale]/(default)/webpages/[id]/contact/page.tsx b/core/app/[locale]/(default)/webpages/[id]/contact/page.tsx
index 144381f12a..38a7f99fb2 100644
--- a/core/app/[locale]/(default)/webpages/[id]/contact/page.tsx
+++ b/core/app/[locale]/(default)/webpages/[id]/contact/page.tsx
@@ -12,6 +12,7 @@ import {
   breadcrumbsTransformer,
   truncateBreadcrumbs,
 } from '~/data-transformers/breadcrumbs-transformer';
+import { getPageMetadata } from '~/lib/makeswift';
 
 import { WebPage, WebPageContent } from '../_components/web-page';
 
@@ -25,7 +26,6 @@ interface Props {
 
 interface ContactPage extends WebPage {
   entityId: number;
-  path: string;
   contactFields: string[];
 }
 
@@ -153,13 +153,14 @@ async function getContactFields(id: string) {
 }
 
 export async function generateMetadata({ params }: Props): Promise<Metadata> {
-  const { id } = await params;
+  const { id, locale } = await params;
   const webpage = await getWebPage(id);
+  const makeswiftMetadata = await getPageMetadata({ path: webpage.path, locale });
   const { pageTitle, metaDescription, metaKeywords } = webpage.seo;
 
   return {
-    title: pageTitle || webpage.title,
-    description: metaDescription,
+    title: makeswiftMetadata?.title || pageTitle || webpage.title,
+    description: makeswiftMetadata?.description || metaDescription,
     keywords: metaKeywords ? metaKeywords.split(',') : null,
   };
 }
diff --git a/core/app/[locale]/(default)/webpages/[id]/normal/page-data.ts b/core/app/[locale]/(default)/webpages/[id]/normal/page-data.ts
index eb87a7884d..2a7ace5701 100644
--- a/core/app/[locale]/(default)/webpages/[id]/normal/page-data.ts
+++ b/core/app/[locale]/(default)/webpages/[id]/normal/page-data.ts
@@ -12,6 +12,7 @@ const NormalPageQuery = graphql(
         ... on NormalPage {
           __typename
           name
+          path
           ...BreadcrumbsFragment
           htmlBody
           entityId
diff --git a/core/app/[locale]/(default)/webpages/[id]/normal/page.tsx b/core/app/[locale]/(default)/webpages/[id]/normal/page.tsx
index a923030446..6cac8a52b3 100644
--- a/core/app/[locale]/(default)/webpages/[id]/normal/page.tsx
+++ b/core/app/[locale]/(default)/webpages/[id]/normal/page.tsx
@@ -9,6 +9,7 @@ import {
   breadcrumbsTransformer,
   truncateBreadcrumbs,
 } from '~/data-transformers/breadcrumbs-transformer';
+import { getPageMetadata } from '~/lib/makeswift';
 
 import { WebPageContent, WebPage as WebPageData } from '../_components/web-page';
 
@@ -30,6 +31,7 @@ const getWebPage = cache(async (id: string): Promise<WebPageData> => {
 
   return {
     title: webpage.name,
+    path: webpage.path,
     breadcrumbs,
     content: webpage.htmlBody,
     seo: webpage.seo,
@@ -57,13 +59,14 @@ async function getWebPageBreadcrumbs(id: string): Promise<Breadcrumb[]> {
 }
 
 export async function generateMetadata({ params }: Props): Promise<Metadata> {
-  const { id } = await params;
+  const { id, locale } = await params;
   const webpage = await getWebPage(id);
+  const makeswiftMetadata = await getPageMetadata({ path: webpage.path, locale });
   const { pageTitle, metaDescription, metaKeywords } = webpage.seo;
 
   return {
-    title: pageTitle || webpage.title,
-    description: metaDescription,
+    title: makeswiftMetadata?.title || pageTitle || webpage.title,
+    description: makeswiftMetadata?.description || metaDescription,
     keywords: metaKeywords ? metaKeywords.split(',') : null,
   };
 }
diff --git a/core/lib/makeswift/client.ts b/core/lib/makeswift/client.ts
index 4565aca937..8ddeace99c 100644
--- a/core/lib/makeswift/client.ts
+++ b/core/lib/makeswift/client.ts
@@ -32,3 +32,18 @@ export const getComponentSnapshot = async (snapshotId: string) => {
 function normalizeLocale(locale: string): string | undefined {
   return locale === defaultLocale ? undefined : locale;
 }
+
+export async function getPageMetadata({ path, locale }: { path: string; locale: string }) {
+  const snapshot = await getPageSnapshot({ path, locale });
+
+  if (snapshot == null) {
+    return null;
+  }
+
+  const { meta } = snapshot.document;
+
+  return {
+    ...(meta.title && { title: meta.title }),
+    ...(meta.description && { description: meta.description }),
+  };
+}
diff --git a/core/lib/makeswift/index.ts b/core/lib/makeswift/index.ts
index 404cd5373f..aeacbdf456 100644
--- a/core/lib/makeswift/index.ts
+++ b/core/lib/makeswift/index.ts
@@ -1,2 +1,2 @@
 export { Page } from './page';
-export { client } from './client';
+export { client, getPageMetadata } from './client';
diff --git a/core/lib/makeswift/page.tsx b/core/lib/makeswift/page.tsx
index cd5903c2a6..c67538fb7d 100644
--- a/core/lib/makeswift/page.tsx
+++ b/core/lib/makeswift/page.tsx
@@ -14,5 +14,5 @@ export async function Page({ path, locale }: { path: string; locale: string }) {
     return notFound();
   }
 
-  return <MakeswiftPageShim snapshot={snapshot} />;
+  return <MakeswiftPageShim metadata={false} snapshot={snapshot} />;
 }

From a71be7418ea36dd3839e83dff185ae2a8c19c94f Mon Sep 17 00:00:00 2001
From: Jorge Moya <jorge.moya@bigcommerce.com>
Date: Wed, 4 Feb 2026 14:13:00 -0600
Subject: [PATCH 42/69] chore: rename getPageMetadata to
 getMakeswiftPageMetadata

---
 .changeset/wild-bears-open.md                        | 12 ++++++------
 .../(default)/(faceted)/brand/[slug]/page.tsx        |  4 ++--
 .../(default)/(faceted)/category/[slug]/page.tsx     |  4 ++--
 .../app/[locale]/(default)/(faceted)/search/page.tsx |  4 ++--
 core/app/[locale]/(default)/[...rest]/page.tsx       |  5 +++--
 core/app/[locale]/(default)/blog/[blogId]/page.tsx   |  4 ++--
 core/app/[locale]/(default)/blog/page.tsx            |  4 ++--
 core/app/[locale]/(default)/cart/page.tsx            |  4 ++--
 core/app/[locale]/(default)/compare/page.tsx         |  4 ++--
 .../(default)/gift-certificates/balance/page.tsx     |  4 ++--
 .../[locale]/(default)/gift-certificates/page.tsx    |  4 ++--
 core/app/[locale]/(default)/page.tsx                 |  4 ++--
 core/app/[locale]/(default)/product/[slug]/page.tsx  |  4 ++--
 .../(default)/webpages/[id]/contact/page.tsx         |  4 ++--
 .../[locale]/(default)/webpages/[id]/normal/page.tsx |  4 ++--
 core/lib/makeswift/client.ts                         |  2 +-
 core/lib/makeswift/index.ts                          |  2 +-
 17 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/.changeset/wild-bears-open.md b/.changeset/wild-bears-open.md
index eea397f60d..20c0b2568a 100644
--- a/.changeset/wild-bears-open.md
+++ b/.changeset/wild-bears-open.md
@@ -23,12 +23,12 @@ The following pages now support Makeswift SEO metadata:
 
 ## Migration steps
 
-### Step 1: Add `getPageMetadata` function
+### Step 1: Add `getMakeswiftPageMetadata` function
 
-Add the `getPageMetadata` function to `core/lib/makeswift/client.ts`:
+Add the `getMakeswiftPageMetadata` function to `core/lib/makeswift/client.ts`:
 
 ```diff
-+ export async function getPageMetadata({ path, locale }: { path: string; locale: string }) {
++ export async function getMakeswiftPageMetadata({ path, locale }: { path: string; locale: string }) {
 +   const snapshot = await getPageSnapshot({ path, locale });
 +
 +   if (snapshot == null) {
@@ -49,7 +49,7 @@ Export the function from `core/lib/makeswift/index.ts`:
 ```diff
   export { Page } from './page';
 - export { client } from './client';
-+ export { client, getPageMetadata } from './client';
++ export { client, getMakeswiftPageMetadata } from './client';
 ```
 
 ### Step 2: Update page metadata
@@ -60,7 +60,7 @@ Update `core/app/[locale]/(default)/cart/page.tsx`:
 
 ```diff
   import { getPreferredCurrencyCode } from '~/lib/currency';
-+ import { getPageMetadata } from '~/lib/makeswift';
++ import { getMakeswiftPageMetadata } from '~/lib/makeswift';
   import { Slot } from '~/lib/makeswift/slot';
 ```
 
@@ -69,7 +69,7 @@ Update `core/app/[locale]/(default)/cart/page.tsx`:
     const { locale } = await params;
 
     const t = await getTranslations({ locale, namespace: 'Cart' });
-+   const makeswiftMetadata = await getPageMetadata({ path: '/cart', locale });
++   const makeswiftMetadata = await getMakeswiftPageMetadata({ path: '/cart', locale });
 
     return {
 -     title: t('title'),
diff --git a/core/app/[locale]/(default)/(faceted)/brand/[slug]/page.tsx b/core/app/[locale]/(default)/(faceted)/brand/[slug]/page.tsx
index 4e8094d352..63fcfbcac0 100644
--- a/core/app/[locale]/(default)/(faceted)/brand/[slug]/page.tsx
+++ b/core/app/[locale]/(default)/(faceted)/brand/[slug]/page.tsx
@@ -13,7 +13,7 @@ import { facetsTransformer } from '~/data-transformers/facets-transformer';
 import { pageInfoTransformer } from '~/data-transformers/page-info-transformer';
 import { productCardTransformer } from '~/data-transformers/product-card-transformer';
 import { getPreferredCurrencyCode } from '~/lib/currency';
-import { getPageMetadata } from '~/lib/makeswift';
+import { getMakeswiftPageMetadata } from '~/lib/makeswift';
 
 import { MAX_COMPARE_LIMIT } from '../../../compare/page-data';
 import { getCompareProducts as getCompareProductsData } from '../../fetch-compare-products';
@@ -79,7 +79,7 @@ export async function generateMetadata(props: Props): Promise<Metadata> {
     return notFound();
   }
 
-  const makeswiftMetadata = await getPageMetadata({ path: brand.path, locale });
+  const makeswiftMetadata = await getMakeswiftPageMetadata({ path: brand.path, locale });
 
   const { pageTitle, metaDescription, metaKeywords } = brand.seo;
 
diff --git a/core/app/[locale]/(default)/(faceted)/category/[slug]/page.tsx b/core/app/[locale]/(default)/(faceted)/category/[slug]/page.tsx
index 7d8778ce77..62594fa3e4 100644
--- a/core/app/[locale]/(default)/(faceted)/category/[slug]/page.tsx
+++ b/core/app/[locale]/(default)/(faceted)/category/[slug]/page.tsx
@@ -14,7 +14,7 @@ import { facetsTransformer } from '~/data-transformers/facets-transformer';
 import { pageInfoTransformer } from '~/data-transformers/page-info-transformer';
 import { productCardTransformer } from '~/data-transformers/product-card-transformer';
 import { getPreferredCurrencyCode } from '~/lib/currency';
-import { getPageMetadata } from '~/lib/makeswift';
+import { getMakeswiftPageMetadata } from '~/lib/makeswift';
 import { Slot } from '~/lib/makeswift/slot';
 
 import { MAX_COMPARE_LIMIT } from '../../../compare/page-data';
@@ -82,7 +82,7 @@ export async function generateMetadata(props: Props): Promise<Metadata> {
     return notFound();
   }
 
-  const makeswiftMetadata = await getPageMetadata({ path: category.path, locale });
+  const makeswiftMetadata = await getMakeswiftPageMetadata({ path: category.path, locale });
 
   const { pageTitle, metaDescription, metaKeywords } = category.seo;
 
diff --git a/core/app/[locale]/(default)/(faceted)/search/page.tsx b/core/app/[locale]/(default)/(faceted)/search/page.tsx
index f36ac9d76f..c13ef0a71c 100644
--- a/core/app/[locale]/(default)/(faceted)/search/page.tsx
+++ b/core/app/[locale]/(default)/(faceted)/search/page.tsx
@@ -12,7 +12,7 @@ import { facetsTransformer } from '~/data-transformers/facets-transformer';
 import { pageInfoTransformer } from '~/data-transformers/page-info-transformer';
 import { productCardTransformer } from '~/data-transformers/product-card-transformer';
 import { getPreferredCurrencyCode } from '~/lib/currency';
-import { getPageMetadata } from '~/lib/makeswift';
+import { getMakeswiftPageMetadata } from '~/lib/makeswift';
 
 import { MAX_COMPARE_LIMIT } from '../../compare/page-data';
 import { getCompareProducts as getCompareProductsData } from '../fetch-compare-products';
@@ -64,7 +64,7 @@ export async function generateMetadata({ params }: Props): Promise<Metadata> {
   const { locale } = await params;
 
   const t = await getTranslations({ locale, namespace: 'Faceted.Search' });
-  const makeswiftMetadata = await getPageMetadata({ path: '/search', locale });
+  const makeswiftMetadata = await getMakeswiftPageMetadata({ path: '/search', locale });
 
   return {
     title: makeswiftMetadata?.title || t('title'),
diff --git a/core/app/[locale]/(default)/[...rest]/page.tsx b/core/app/[locale]/(default)/[...rest]/page.tsx
index 8f905265de..0382b82ac0 100644
--- a/core/app/[locale]/(default)/[...rest]/page.tsx
+++ b/core/app/[locale]/(default)/[...rest]/page.tsx
@@ -1,7 +1,7 @@
 import { Metadata } from 'next';
 
 import { defaultLocale, locales } from '~/i18n/locales';
-import { client, getPageMetadata, Page } from '~/lib/makeswift';
+import { client, getMakeswiftPageMetadata, Page } from '~/lib/makeswift';
 
 interface PageParams {
   locale: string;
@@ -15,7 +15,8 @@ export async function generateMetadata({
 }): Promise<Metadata> {
   const { rest, locale } = await params;
   const path = `/${rest.join('/')}`;
-  const metadata = await getPageMetadata({ path, locale });
+
+  const metadata = await getMakeswiftPageMetadata({ path, locale });
 
   return metadata ?? {};
 }
diff --git a/core/app/[locale]/(default)/blog/[blogId]/page.tsx b/core/app/[locale]/(default)/blog/[blogId]/page.tsx
index 5339a79a1f..a97945f9e3 100644
--- a/core/app/[locale]/(default)/blog/[blogId]/page.tsx
+++ b/core/app/[locale]/(default)/blog/[blogId]/page.tsx
@@ -5,7 +5,7 @@ import { cache } from 'react';
 
 import { BlogPostContent, BlogPostContentBlogPost } from '@/vibes/soul/sections/blog-post-content';
 import { Breadcrumb } from '@/vibes/soul/sections/breadcrumbs';
-import { getPageMetadata } from '~/lib/makeswift';
+import { getMakeswiftPageMetadata } from '~/lib/makeswift';
 
 import { getBlogPageData } from './page-data';
 
@@ -30,7 +30,7 @@ export async function generateMetadata({ params }: Props): Promise<Metadata> {
     return {};
   }
 
-  const makeswiftMetadata = await getPageMetadata({ path: blogPost.path, locale });
+  const makeswiftMetadata = await getMakeswiftPageMetadata({ path: blogPost.path, locale });
   const { pageTitle, metaDescription, metaKeywords } = blogPost.seo;
 
   return {
diff --git a/core/app/[locale]/(default)/blog/page.tsx b/core/app/[locale]/(default)/blog/page.tsx
index 60e394a8bc..551cb74134 100644
--- a/core/app/[locale]/(default)/blog/page.tsx
+++ b/core/app/[locale]/(default)/blog/page.tsx
@@ -7,7 +7,7 @@ import { createSearchParamsCache, parseAsInteger, parseAsString } from 'nuqs/ser
 import { Streamable } from '@/vibes/soul/lib/streamable';
 import { FeaturedBlogPostList } from '@/vibes/soul/sections/featured-blog-post-list';
 import { defaultPageInfo, pageInfoTransformer } from '~/data-transformers/page-info-transformer';
-import { getPageMetadata } from '~/lib/makeswift';
+import { getMakeswiftPageMetadata } from '~/lib/makeswift';
 
 import { getBlog, getBlogPosts } from './page-data';
 
@@ -30,7 +30,7 @@ export async function generateMetadata({ params }: Props): Promise<Metadata> {
 
   const t = await getTranslations({ locale, namespace: 'Blog' });
   const blog = await getBlog();
-  const makeswiftMetadata = await getPageMetadata({ path: '/blog', locale });
+  const makeswiftMetadata = await getMakeswiftPageMetadata({ path: '/blog', locale });
 
   return {
     title: makeswiftMetadata?.title || blog?.name || t('title'),
diff --git a/core/app/[locale]/(default)/cart/page.tsx b/core/app/[locale]/(default)/cart/page.tsx
index b1fd07f310..9f0568603d 100644
--- a/core/app/[locale]/(default)/cart/page.tsx
+++ b/core/app/[locale]/(default)/cart/page.tsx
@@ -6,7 +6,7 @@ import { Cart as CartComponent, CartEmptyState } from '@/vibes/soul/sections/car
 import { CartAnalyticsProvider } from '~/app/[locale]/(default)/cart/_components/cart-analytics-provider';
 import { getCartId } from '~/lib/cart';
 import { getPreferredCurrencyCode } from '~/lib/currency';
-import { getPageMetadata } from '~/lib/makeswift';
+import { getMakeswiftPageMetadata } from '~/lib/makeswift';
 import { Slot } from '~/lib/makeswift/slot';
 import { exists } from '~/lib/utils';
 
@@ -28,7 +28,7 @@ export async function generateMetadata({ params }: Props): Promise<Metadata> {
   const { locale } = await params;
 
   const t = await getTranslations({ locale, namespace: 'Cart' });
-  const makeswiftMetadata = await getPageMetadata({ path: '/cart', locale });
+  const makeswiftMetadata = await getMakeswiftPageMetadata({ path: '/cart', locale });
 
   return {
     title: makeswiftMetadata?.title || t('title'),
diff --git a/core/app/[locale]/(default)/compare/page.tsx b/core/app/[locale]/(default)/compare/page.tsx
index 9d6bbcfd9c..068645588f 100644
--- a/core/app/[locale]/(default)/compare/page.tsx
+++ b/core/app/[locale]/(default)/compare/page.tsx
@@ -8,7 +8,7 @@ import { CompareSection } from '@/vibes/soul/sections/compare-section';
 import { getSessionCustomerAccessToken } from '~/auth';
 import { pricesTransformer } from '~/data-transformers/prices-transformer';
 import { getPreferredCurrencyCode } from '~/lib/currency';
-import { getPageMetadata } from '~/lib/makeswift';
+import { getMakeswiftPageMetadata } from '~/lib/makeswift';
 
 import { addToCart } from './_actions/add-to-cart';
 import { CompareAnalyticsProvider } from './_components/compare-analytics-provider';
@@ -42,7 +42,7 @@ export async function generateMetadata({ params }: Props): Promise<Metadata> {
   const { locale } = await params;
 
   const t = await getTranslations({ locale, namespace: 'Compare' });
-  const makeswiftMetadata = await getPageMetadata({ path: '/compare', locale });
+  const makeswiftMetadata = await getMakeswiftPageMetadata({ path: '/compare', locale });
 
   return {
     title: makeswiftMetadata?.title || t('title'),
diff --git a/core/app/[locale]/(default)/gift-certificates/balance/page.tsx b/core/app/[locale]/(default)/gift-certificates/balance/page.tsx
index d3e4327032..5b63bdfcc2 100644
--- a/core/app/[locale]/(default)/gift-certificates/balance/page.tsx
+++ b/core/app/[locale]/(default)/gift-certificates/balance/page.tsx
@@ -4,7 +4,7 @@ import { getTranslations, setRequestLocale } from 'next-intl/server';
 import { GiftCertificateCheckBalanceSection } from '@/vibes/soul/sections/gift-certificate-balance-section';
 import { redirect } from '~/i18n/routing';
 import { getPreferredCurrencyCode } from '~/lib/currency';
-import { getPageMetadata } from '~/lib/makeswift';
+import { getMakeswiftPageMetadata } from '~/lib/makeswift';
 
 import { getGiftCertificatesData } from '../page-data';
 
@@ -18,7 +18,7 @@ export async function generateMetadata({ params }: Props): Promise<Metadata> {
   const { locale } = await params;
 
   const t = await getTranslations({ locale, namespace: 'GiftCertificates' });
-  const makeswiftMetadata = await getPageMetadata({ path: '/gift-certificates/balance', locale });
+  const makeswiftMetadata = await getMakeswiftPageMetadata({ path: '/gift-certificates/balance', locale });
 
   return {
     title: makeswiftMetadata?.title || t('title') || 'Gift certificates - Check balance',
diff --git a/core/app/[locale]/(default)/gift-certificates/page.tsx b/core/app/[locale]/(default)/gift-certificates/page.tsx
index b165ef80e7..5ea66db295 100644
--- a/core/app/[locale]/(default)/gift-certificates/page.tsx
+++ b/core/app/[locale]/(default)/gift-certificates/page.tsx
@@ -4,7 +4,7 @@ import { getFormatter, getTranslations, setRequestLocale } from 'next-intl/serve
 import { GiftCertificatesSection } from '@/vibes/soul/sections/gift-certificates-section';
 import { redirect } from '~/i18n/routing';
 import { getPreferredCurrencyCode } from '~/lib/currency';
-import { getPageMetadata } from '~/lib/makeswift';
+import { getMakeswiftPageMetadata } from '~/lib/makeswift';
 
 import { getGiftCertificatesData } from './page-data';
 
@@ -16,7 +16,7 @@ export async function generateMetadata({ params }: Props): Promise<Metadata> {
   const { locale } = await params;
 
   const t = await getTranslations({ locale, namespace: 'GiftCertificates' });
-  const makeswiftMetadata = await getPageMetadata({ path: '/gift-certificates', locale });
+  const makeswiftMetadata = await getMakeswiftPageMetadata({ path: '/gift-certificates', locale });
 
   return {
     title: makeswiftMetadata?.title || t('title') || 'Gift certificates',
diff --git a/core/app/[locale]/(default)/page.tsx b/core/app/[locale]/(default)/page.tsx
index 7fa08369e2..907f31fe06 100644
--- a/core/app/[locale]/(default)/page.tsx
+++ b/core/app/[locale]/(default)/page.tsx
@@ -1,7 +1,7 @@
 import { Metadata } from 'next';
 
 import { locales } from '~/i18n/locales';
-import { getPageMetadata, Page as MakeswiftPage } from '~/lib/makeswift';
+import { getMakeswiftPageMetadata, Page as MakeswiftPage } from '~/lib/makeswift';
 
 interface Params {
   locale: string;
@@ -13,7 +13,7 @@ interface Props {
 
 export async function generateMetadata({ params }: Props): Promise<Metadata> {
   const { locale } = await params;
-  const metadata = await getPageMetadata({ path: '/', locale });
+  const metadata = await getMakeswiftPageMetadata({ path: '/', locale });
 
   return metadata ?? {};
 }
diff --git a/core/app/[locale]/(default)/product/[slug]/page.tsx b/core/app/[locale]/(default)/product/[slug]/page.tsx
index 7fca224af1..14f4c820ab 100644
--- a/core/app/[locale]/(default)/product/[slug]/page.tsx
+++ b/core/app/[locale]/(default)/product/[slug]/page.tsx
@@ -11,7 +11,7 @@ import { pricesTransformer } from '~/data-transformers/prices-transformer';
 import { productCardTransformer } from '~/data-transformers/product-card-transformer';
 import { productOptionsTransformer } from '~/data-transformers/product-options-transformer';
 import { getPreferredCurrencyCode } from '~/lib/currency';
-import { getPageMetadata } from '~/lib/makeswift';
+import { getMakeswiftPageMetadata } from '~/lib/makeswift';
 import { ProductDetail } from '~/lib/makeswift/components/product-detail';
 
 import { addToCart } from './_actions/add-to-cart';
@@ -48,7 +48,7 @@ export async function generateMetadata({ params }: Props): Promise<Metadata> {
     return notFound();
   }
 
-  const makeswiftMetadata = await getPageMetadata({ path: product.path, locale });
+  const makeswiftMetadata = await getMakeswiftPageMetadata({ path: product.path, locale });
 
   const { pageTitle, metaDescription, metaKeywords } = product.seo;
   const { url, altText: alt } = product.defaultImage || {};
diff --git a/core/app/[locale]/(default)/webpages/[id]/contact/page.tsx b/core/app/[locale]/(default)/webpages/[id]/contact/page.tsx
index 38a7f99fb2..f9b167e630 100644
--- a/core/app/[locale]/(default)/webpages/[id]/contact/page.tsx
+++ b/core/app/[locale]/(default)/webpages/[id]/contact/page.tsx
@@ -12,7 +12,7 @@ import {
   breadcrumbsTransformer,
   truncateBreadcrumbs,
 } from '~/data-transformers/breadcrumbs-transformer';
-import { getPageMetadata } from '~/lib/makeswift';
+import { getMakeswiftPageMetadata } from '~/lib/makeswift';
 
 import { WebPage, WebPageContent } from '../_components/web-page';
 
@@ -155,7 +155,7 @@ async function getContactFields(id: string) {
 export async function generateMetadata({ params }: Props): Promise<Metadata> {
   const { id, locale } = await params;
   const webpage = await getWebPage(id);
-  const makeswiftMetadata = await getPageMetadata({ path: webpage.path, locale });
+  const makeswiftMetadata = await getMakeswiftPageMetadata({ path: webpage.path, locale });
   const { pageTitle, metaDescription, metaKeywords } = webpage.seo;
 
   return {
diff --git a/core/app/[locale]/(default)/webpages/[id]/normal/page.tsx b/core/app/[locale]/(default)/webpages/[id]/normal/page.tsx
index 6cac8a52b3..7e56fe021d 100644
--- a/core/app/[locale]/(default)/webpages/[id]/normal/page.tsx
+++ b/core/app/[locale]/(default)/webpages/[id]/normal/page.tsx
@@ -9,7 +9,7 @@ import {
   breadcrumbsTransformer,
   truncateBreadcrumbs,
 } from '~/data-transformers/breadcrumbs-transformer';
-import { getPageMetadata } from '~/lib/makeswift';
+import { getMakeswiftPageMetadata } from '~/lib/makeswift';
 
 import { WebPageContent, WebPage as WebPageData } from '../_components/web-page';
 
@@ -61,7 +61,7 @@ async function getWebPageBreadcrumbs(id: string): Promise<Breadcrumb[]> {
 export async function generateMetadata({ params }: Props): Promise<Metadata> {
   const { id, locale } = await params;
   const webpage = await getWebPage(id);
-  const makeswiftMetadata = await getPageMetadata({ path: webpage.path, locale });
+  const makeswiftMetadata = await getMakeswiftPageMetadata({ path: webpage.path, locale });
   const { pageTitle, metaDescription, metaKeywords } = webpage.seo;
 
   return {
diff --git a/core/lib/makeswift/client.ts b/core/lib/makeswift/client.ts
index 8ddeace99c..35c1a8ce6d 100644
--- a/core/lib/makeswift/client.ts
+++ b/core/lib/makeswift/client.ts
@@ -33,7 +33,7 @@ function normalizeLocale(locale: string): string | undefined {
   return locale === defaultLocale ? undefined : locale;
 }
 
-export async function getPageMetadata({ path, locale }: { path: string; locale: string }) {
+export async function getMakeswiftPageMetadata({ path, locale }: { path: string; locale: string }) {
   const snapshot = await getPageSnapshot({ path, locale });
 
   if (snapshot == null) {
diff --git a/core/lib/makeswift/index.ts b/core/lib/makeswift/index.ts
index aeacbdf456..198246e60d 100644
--- a/core/lib/makeswift/index.ts
+++ b/core/lib/makeswift/index.ts
@@ -1,2 +1,2 @@
 export { Page } from './page';
-export { client, getPageMetadata } from './client';
+export { client, getMakeswiftPageMetadata } from './client';

From 31f6cfe160d36c269d7e0b9d79be246f287a63e7 Mon Sep 17 00:00:00 2001
From: Jorge Moya <jorge.moya@bigcommerce.com>
Date: Wed, 4 Feb 2026 16:37:52 -0600
Subject: [PATCH 43/69] fix: lint issue in balances page

---
 .../[locale]/(default)/gift-certificates/balance/page.tsx    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/app/[locale]/(default)/gift-certificates/balance/page.tsx b/core/app/[locale]/(default)/gift-certificates/balance/page.tsx
index 5b63bdfcc2..2dde4fbee5 100644
--- a/core/app/[locale]/(default)/gift-certificates/balance/page.tsx
+++ b/core/app/[locale]/(default)/gift-certificates/balance/page.tsx
@@ -18,7 +18,10 @@ export async function generateMetadata({ params }: Props): Promise<Metadata> {
   const { locale } = await params;
 
   const t = await getTranslations({ locale, namespace: 'GiftCertificates' });
-  const makeswiftMetadata = await getMakeswiftPageMetadata({ path: '/gift-certificates/balance', locale });
+  const makeswiftMetadata = await getMakeswiftPageMetadata({
+    path: '/gift-certificates/balance',
+    locale,
+  });
 
   return {
     title: makeswiftMetadata?.title || t('title') || 'Gift certificates - Check balance',

From 18e871451bafa19bfb9fda56bce0b57efd816698 Mon Sep 17 00:00:00 2001
From: Jorge Moya <jorge.moya@bigcommerce.com>
Date: Fri, 6 Feb 2026 12:16:04 -0600
Subject: [PATCH 44/69] fix: use client.getPages intead of
 client.getPageSnapshot

---
 core/lib/makeswift/api.ts    | 57 ++++++++++++++++++++++++++++++++++++
 core/lib/makeswift/client.ts | 14 +++++----
 2 files changed, 66 insertions(+), 5 deletions(-)
 create mode 100644 core/lib/makeswift/api.ts

diff --git a/core/lib/makeswift/api.ts b/core/lib/makeswift/api.ts
new file mode 100644
index 0000000000..545bee5e4c
--- /dev/null
+++ b/core/lib/makeswift/api.ts
@@ -0,0 +1,57 @@
+import { getSiteVersion } from '@makeswift/runtime/next/server';
+import { strict } from 'assert';
+import { z } from 'zod';
+
+import { defaultLocale } from '~/i18n/locales';
+
+strict(process.env.MAKESWIFT_SITE_API_KEY, 'MAKESWIFT_SITE_API_KEY is required');
+
+const MAKESWIFT_SITE_API_KEY = process.env.MAKESWIFT_SITE_API_KEY;
+
+const MAKESWIFT_API_ORIGIN =
+  process.env.NEXT_PUBLIC_MAKESWIFT_API_ORIGIN ??
+  process.env.MAKESWIFT_API_ORIGIN ??
+  'https://api.makeswift.com';
+
+const MakeswiftPageResponseSchema = z.object({
+  title: z.string().nullable(),
+  description: z.string().nullable(),
+});
+
+function normalizeLocale(locale: string): string | undefined {
+  return locale === defaultLocale ? undefined : locale;
+}
+
+export async function getMakeswiftPageMetadata({ path, locale }: { path: string; locale: string }) {
+  const siteVersion = await getSiteVersion();
+
+  const versionRef = siteVersion?.version === 'Live' ? 'ref:live' : 'ref:draft';
+  const normalizedLocale = normalizeLocale(locale);
+
+  const url = new URL(`/v6/pages${path}`, MAKESWIFT_API_ORIGIN);
+
+  url.searchParams.set('versionRef', versionRef);
+  url.searchParams.set('siteId', 'MISSING SITE ID');
+
+  if (normalizedLocale) {
+    url.searchParams.set('locale', normalizedLocale);
+  }
+
+  const response = await fetch(url, {
+    headers: {
+      'x-api-key': MAKESWIFT_SITE_API_KEY,
+    },
+  });
+
+  if (!response.ok) {
+    return null;
+  }
+
+  const data: unknown = await response.json();
+  const page = MakeswiftPageResponseSchema.parse(data);
+
+  return {
+    ...(page.title && { title: page.title }),
+    ...(page.description && { description: page.description }),
+  };
+}
diff --git a/core/lib/makeswift/client.ts b/core/lib/makeswift/client.ts
index 35c1a8ce6d..9a637384ca 100644
--- a/core/lib/makeswift/client.ts
+++ b/core/lib/makeswift/client.ts
@@ -34,16 +34,20 @@ function normalizeLocale(locale: string): string | undefined {
 }
 
 export async function getMakeswiftPageMetadata({ path, locale }: { path: string; locale: string }) {
-  const snapshot = await getPageSnapshot({ path, locale });
+  const { data: pages } = await client.getPages({
+    pathPrefix: path,
+    locale: normalizeLocale(locale),
+    siteVersion: await getSiteVersion(),
+  });
 
-  if (snapshot == null) {
+  if (pages.length === 0 || !pages[0]) {
     return null;
   }
 
-  const { meta } = snapshot.document;
+  const { title, description } = pages[0];
 
   return {
-    ...(meta.title && { title: meta.title }),
-    ...(meta.description && { description: meta.description }),
+    ...(title && { title }),
+    ...(description && { description }),
   };
 }

From 5ca846b03500bcf0364fe1446a873bc1eef98524 Mon Sep 17 00:00:00 2001
From: Jorge Moya <jorge.moya@bigcommerce.com>
Date: Fri, 6 Feb 2026 12:21:41 -0600
Subject: [PATCH 45/69] chore: update changeset

---
 .changeset/wild-bears-open.md | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/.changeset/wild-bears-open.md b/.changeset/wild-bears-open.md
index 20c0b2568a..e65ca0bec0 100644
--- a/.changeset/wild-bears-open.md
+++ b/.changeset/wild-bears-open.md
@@ -29,17 +29,21 @@ Add the `getMakeswiftPageMetadata` function to `core/lib/makeswift/client.ts`:
 
 ```diff
 + export async function getMakeswiftPageMetadata({ path, locale }: { path: string; locale: string }) {
-+   const snapshot = await getPageSnapshot({ path, locale });
++   const { data: pages } = await client.getPages({
++     pathPrefix: path,
++     locale: normalizeLocale(locale),
++     siteVersion: await getSiteVersion(),
++   });
 +
-+   if (snapshot == null) {
++   if (pages.length === 0 || !pages[0]) {
 +     return null;
 +   }
 +
-+   const { meta } = snapshot.document;
++   const { title, description } = pages[0];
 +
 +   return {
-+     ...(meta.title && { title: meta.title }),
-+     ...(meta.description && { description: meta.description }),
++     ...(title && { title }),
++     ...(description && { description }),
 +   };
 + }
 ```

From 254dbc519e93a57ec5568776e6f34e3e6638eb92 Mon Sep 17 00:00:00 2001
From: James Q Quick <james.q.quick@gmail.com>
Date: Fri, 6 Feb 2026 15:10:12 -0500
Subject: [PATCH 46/69] [CATALYST-1743] - Create Project Commands (#2865)

* create project command with three nested commands (create, link, and list)

* updated error message in build command

* fix linting

* Update packages/catalyst/src/cli/commands/build.ts

Co-authored-by: Chancellor Clark <chancellor.clark@bigcommerce.com>

* merge link tests into project

* organize tests for project using describe

* fix linting

---------

Co-authored-by: Chancellor Clark <chancellor.clark@bigcommerce.com>
---
 packages/catalyst/src/cli/commands/build.ts   |   2 +-
 packages/catalyst/src/cli/commands/deploy.ts  |   2 +-
 .../catalyst/src/cli/commands/link.spec.ts    | 318 ------------
 packages/catalyst/src/cli/commands/link.ts    | 208 --------
 .../catalyst/src/cli/commands/project.spec.ts | 476 ++++++++++++++++++
 packages/catalyst/src/cli/commands/project.ts | 252 ++++++++++
 packages/catalyst/src/cli/index.spec.ts       |   8 +-
 packages/catalyst/src/cli/lib/project.ts      | 103 ++++
 packages/catalyst/src/cli/program.ts          |   4 +-
 9 files changed, 842 insertions(+), 531 deletions(-)
 delete mode 100644 packages/catalyst/src/cli/commands/link.spec.ts
 delete mode 100644 packages/catalyst/src/cli/commands/link.ts
 create mode 100644 packages/catalyst/src/cli/commands/project.spec.ts
 create mode 100644 packages/catalyst/src/cli/commands/project.ts
 create mode 100644 packages/catalyst/src/cli/lib/project.ts

diff --git a/packages/catalyst/src/cli/commands/build.ts b/packages/catalyst/src/cli/commands/build.ts
index 86e3be5292..94898ba888 100644
--- a/packages/catalyst/src/cli/commands/build.ts
+++ b/packages/catalyst/src/cli/commands/build.ts
@@ -60,7 +60,7 @@ export const build = new Command('build')
 
         if (!projectUuid) {
           throw new Error(
-            'Project UUID is required. Please run `link` or provide `--project-uuid`',
+            'Project UUID is required. Please run `catalyst project create` or `catalyst project link` or this command again with --project-uuid <uuid>.',
           );
         }
 
diff --git a/packages/catalyst/src/cli/commands/deploy.ts b/packages/catalyst/src/cli/commands/deploy.ts
index f1a40ae5de..eee50458f6 100644
--- a/packages/catalyst/src/cli/commands/deploy.ts
+++ b/packages/catalyst/src/cli/commands/deploy.ts
@@ -324,7 +324,7 @@ export const deploy = new Command('deploy')
 
       if (!projectUuid) {
         throw new Error(
-          'Project UUID is required. Please run either `bigcommerce link` or this command again with --project-uuid <uuid>.',
+          'Project UUID is required. Please run either `catalyst project link` or `catalyst project create` or this command again with --project-uuid <uuid>.',
         );
       }
 
diff --git a/packages/catalyst/src/cli/commands/link.spec.ts b/packages/catalyst/src/cli/commands/link.spec.ts
deleted file mode 100644
index b031df5699..0000000000
--- a/packages/catalyst/src/cli/commands/link.spec.ts
+++ /dev/null
@@ -1,318 +0,0 @@
-import { Command } from 'commander';
-import Conf from 'conf';
-import { http, HttpResponse } from 'msw';
-import { afterAll, afterEach, beforeAll, expect, MockInstance, test, vi } from 'vitest';
-
-import { server } from '../../../tests/mocks/node';
-import { consola } from '../lib/logger';
-import { mkTempDir } from '../lib/mk-temp-dir';
-import { getProjectConfig, ProjectConfigSchema } from '../lib/project-config';
-import { program } from '../program';
-
-import { link } from './link';
-
-let exitMock: MockInstance;
-
-let tmpDir: string;
-let cleanup: () => Promise<void>;
-let config: Conf<ProjectConfigSchema>;
-
-const { mockIdentify } = vi.hoisted(() => ({
-  mockIdentify: vi.fn(),
-}));
-
-const projectUuid1 = 'a23f5785-fd99-4a94-9fb3-945551623923';
-const projectUuid2 = 'b23f5785-fd99-4a94-9fb3-945551623924';
-const projectUuid3 = 'c23f5785-fd99-4a94-9fb3-945551623925';
-const storeHash = 'test-store';
-const accessToken = 'test-token';
-
-beforeAll(async () => {
-  consola.mockTypes(() => vi.fn());
-
-  vi.mock('../lib/telemetry', () => {
-    return {
-      Telemetry: vi.fn().mockImplementation(() => {
-        return {
-          identify: mockIdentify,
-          isEnabled: vi.fn(() => true),
-          track: vi.fn(),
-          analytics: {
-            closeAndFlush: vi.fn(),
-          },
-        };
-      }),
-    };
-  });
-
-  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-  exitMock = vi.spyOn(process, 'exit').mockImplementation(() => null as never);
-
-  [tmpDir, cleanup] = await mkTempDir();
-
-  config = getProjectConfig(tmpDir);
-});
-
-afterEach(() => {
-  vi.clearAllMocks();
-});
-
-afterAll(async () => {
-  vi.restoreAllMocks();
-  exitMock.mockRestore();
-
-  await cleanup();
-});
-
-test('properly configured Command instance', () => {
-  expect(link).toBeInstanceOf(Command);
-  expect(link.name()).toBe('link');
-  expect(link.description()).toBe(
-    'Link your local Catalyst project to a BigCommerce infrastructure project. You can provide a project UUID directly, or fetch and select from available projects using your store credentials.',
-  );
-  expect(link.options).toEqual(
-    expect.arrayContaining([
-      expect.objectContaining({ flags: '--store-hash <hash>' }),
-      expect.objectContaining({ flags: '--access-token <token>' }),
-      expect.objectContaining({ flags: '--api-host <host>', defaultValue: 'api.bigcommerce.com' }),
-      expect.objectContaining({ flags: '--project-uuid <uuid>' }),
-      expect.objectContaining({ flags: '--root-dir <path>', defaultValue: process.cwd() }),
-    ]),
-  );
-});
-
-test('sets projectUuid when called with --project-uuid', async () => {
-  await program.parseAsync([
-    'node',
-    'catalyst',
-    'link',
-    '--project-uuid',
-    projectUuid1,
-    '--root-dir',
-    tmpDir,
-  ]);
-
-  expect(consola.start).toHaveBeenCalledWith(
-    'Writing project UUID to .bigcommerce/project.json...',
-  );
-  expect(consola.success).toHaveBeenCalledWith(
-    'Project UUID written to .bigcommerce/project.json.',
-  );
-  expect(exitMock).toHaveBeenCalledWith(0);
-  expect(config.get('projectUuid')).toBe(projectUuid1);
-  expect(config.get('framework')).toBe('catalyst');
-});
-
-test('fetches projects and prompts user to select one', async () => {
-  const consolaPromptMock = vi
-    .spyOn(consola, 'prompt')
-    .mockImplementation(async (message, opts) => {
-      // Assert the prompt message and options
-      expect(message).toContain(
-        'Select a project or create a new project (Press <enter> to select).',
-      );
-
-      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-      const options = (opts as { options: Array<{ label: string; value: string }> }).options;
-
-      expect(options).toHaveLength(3);
-      expect(options[0]).toMatchObject({ label: 'Project One', value: projectUuid1 });
-      expect(options[1]).toMatchObject({
-        label: 'Project Two',
-        value: projectUuid2,
-      });
-      expect(options[2]).toMatchObject({ label: 'Create a new project', value: 'create' });
-
-      // Simulate selecting the second option
-      return new Promise((resolve) => resolve(projectUuid2));
-    });
-
-  await program.parseAsync([
-    'node',
-    'catalyst',
-    'link',
-    '--store-hash',
-    storeHash,
-    '--access-token',
-    accessToken,
-    '--root-dir',
-    tmpDir,
-  ]);
-
-  expect(mockIdentify).toHaveBeenCalledWith(storeHash);
-
-  expect(consola.start).toHaveBeenCalledWith('Fetching projects...');
-  expect(consola.success).toHaveBeenCalledWith('Projects fetched.');
-
-  expect(consola.start).toHaveBeenCalledWith(
-    'Writing project UUID to .bigcommerce/project.json...',
-  );
-  expect(consola.success).toHaveBeenCalledWith(
-    'Project UUID written to .bigcommerce/project.json.',
-  );
-
-  expect(exitMock).toHaveBeenCalledWith(0);
-
-  expect(config.get('projectUuid')).toBe(projectUuid2);
-  expect(config.get('framework')).toBe('catalyst');
-
-  consolaPromptMock.mockRestore();
-});
-
-test('prompts to create a new project', async () => {
-  const consolaPromptMock = vi
-    .spyOn(consola, 'prompt')
-    .mockImplementationOnce(async (message, opts) => {
-      // Assert the prompt message and options
-      expect(message).toContain(
-        'Select a project or create a new project (Press <enter> to select).',
-      );
-
-      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-      const options = (opts as { options: Array<{ label: string; value: string }> }).options;
-
-      expect(options).toHaveLength(3);
-      expect(options[0]).toMatchObject({ label: 'Project One', value: projectUuid1 });
-      expect(options[1]).toMatchObject({
-        label: 'Project Two',
-        value: projectUuid2,
-      });
-      expect(options[2]).toMatchObject({ label: 'Create a new project', value: 'create' });
-
-      // Simulate selecting the create option
-      return new Promise((resolve) => resolve('create'));
-    })
-    .mockImplementationOnce(async (message) => {
-      expect(message).toBe('Enter a name for the new project:');
-
-      return new Promise((resolve) => resolve('New Project'));
-    });
-
-  await program.parseAsync([
-    'node',
-    'catalyst',
-    'link',
-    '--store-hash',
-    storeHash,
-    '--access-token',
-    accessToken,
-    '--root-dir',
-    tmpDir,
-  ]);
-
-  expect(mockIdentify).toHaveBeenCalledWith(storeHash);
-
-  expect(consola.start).toHaveBeenCalledWith('Fetching projects...');
-  expect(consola.success).toHaveBeenCalledWith('Projects fetched.');
-
-  expect(consola.success).toHaveBeenCalledWith('Project "New Project" created successfully.');
-
-  expect(exitMock).toHaveBeenCalledWith(0);
-
-  expect(config.get('projectUuid')).toBe(projectUuid3);
-  expect(config.get('framework')).toBe('catalyst');
-
-  consolaPromptMock.mockRestore();
-});
-
-test('prompts to create a new project', async () => {
-  server.use(
-    http.post('https://:apiHost/stores/:storeHash/v3/infrastructure/projects', () =>
-      HttpResponse.json({}, { status: 502 }),
-    ),
-  );
-
-  const consolaPromptMock = vi
-    .spyOn(consola, 'prompt')
-    .mockImplementationOnce(async (message, opts) => {
-      // Assert the prompt message and options
-      expect(message).toContain(
-        'Select a project or create a new project (Press <enter> to select).',
-      );
-
-      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-      const options = (opts as { options: Array<{ label: string; value: string }> }).options;
-
-      expect(options).toHaveLength(3);
-      expect(options[0]).toMatchObject({ label: 'Project One', value: projectUuid1 });
-      expect(options[1]).toMatchObject({
-        label: 'Project Two',
-        value: projectUuid2,
-      });
-      expect(options[2]).toMatchObject({ label: 'Create a new project', value: 'create' });
-
-      // Simulate selecting the create option
-      return new Promise((resolve) => resolve('create'));
-    })
-    .mockImplementationOnce(async (message) => {
-      expect(message).toBe('Enter a name for the new project:');
-
-      return new Promise((resolve) => resolve('New Project'));
-    });
-
-  await program.parseAsync([
-    'node',
-    'catalyst',
-    'link',
-    '--store-hash',
-    storeHash,
-    '--access-token',
-    accessToken,
-    '--root-dir',
-    tmpDir,
-  ]);
-
-  expect(mockIdentify).toHaveBeenCalledWith(storeHash);
-
-  expect(consola.start).toHaveBeenCalledWith('Fetching projects...');
-  expect(consola.success).toHaveBeenCalledWith('Projects fetched.');
-
-  expect(consola.error).toHaveBeenCalledWith(
-    'Failed to create project, is the name already in use?',
-  );
-
-  expect(exitMock).toHaveBeenCalledWith(1);
-
-  consolaPromptMock.mockRestore();
-});
-
-test('errors when infrastructure projects API is not found', async () => {
-  server.use(
-    http.get('https://:apiHost/stores/:storeHash/v3/infrastructure/projects', () =>
-      HttpResponse.json({}, { status: 403 }),
-    ),
-  );
-
-  await program.parseAsync([
-    'node',
-    'catalyst',
-    'link',
-    '--store-hash',
-    storeHash,
-    '--access-token',
-    accessToken,
-    '--root-dir',
-    tmpDir,
-  ]);
-
-  expect(mockIdentify).toHaveBeenCalledWith(storeHash);
-
-  expect(consola.start).toHaveBeenCalledWith('Fetching projects...');
-  expect(consola.error).toHaveBeenCalledWith(
-    'Infrastructure Projects API not enabled. If you are part of the alpha, contact support@bigcommerce.com to enable it.',
-  );
-});
-
-test('errors when no projectUuid, storeHash, or accessToken are provided', async () => {
-  await program.parseAsync(['node', 'catalyst', 'link', '--root-dir', tmpDir]);
-
-  expect(consola.start).not.toHaveBeenCalled();
-  expect(consola.success).not.toHaveBeenCalled();
-  expect(consola.error).toHaveBeenCalledWith('Insufficient information to link a project.');
-  expect(consola.info).toHaveBeenCalledWith('Provide a project UUID with --project-uuid, or');
-  expect(consola.info).toHaveBeenCalledWith(
-    'Provide both --store-hash and --access-token to fetch and select a project.',
-  );
-
-  expect(exitMock).toHaveBeenCalledWith(1);
-});
diff --git a/packages/catalyst/src/cli/commands/link.ts b/packages/catalyst/src/cli/commands/link.ts
deleted file mode 100644
index b2cca62eda..0000000000
--- a/packages/catalyst/src/cli/commands/link.ts
+++ /dev/null
@@ -1,208 +0,0 @@
-import { Command, Option } from 'commander';
-import { z } from 'zod';
-
-import { consola } from '../lib/logger';
-import { getProjectConfig } from '../lib/project-config';
-import { Telemetry } from '../lib/telemetry';
-
-const telemetry = new Telemetry();
-
-const fetchProjectsSchema = z.object({
-  data: z.array(
-    z.object({
-      uuid: z.string(),
-      name: z.string(),
-    }),
-  ),
-});
-
-const createProjectSchema = z.object({
-  data: z.object({
-    uuid: z.string(),
-    name: z.string(),
-    date_created: z.coerce.date(),
-    date_modified: z.coerce.date(),
-  }),
-});
-
-async function fetchProjects(storeHash: string, accessToken: string, apiHost: string) {
-  const response = await fetch(
-    `https://${apiHost}/stores/${storeHash}/v3/infrastructure/projects`,
-    {
-      method: 'GET',
-      headers: {
-        'X-Auth-Token': accessToken,
-      },
-    },
-  );
-
-  if (response.status === 403) {
-    throw new Error(
-      'Infrastructure Projects API not enabled. If you are part of the alpha, contact support@bigcommerce.com to enable it.',
-    );
-  }
-
-  if (!response.ok) {
-    throw new Error(`Failed to fetch projects: ${response.statusText}`);
-  }
-
-  const res: unknown = await response.json();
-
-  const { data } = fetchProjectsSchema.parse(res);
-
-  return data;
-}
-
-async function createProject(
-  name: string,
-  storeHash: string,
-  accessToken: string,
-  apiHost: string,
-) {
-  const response = await fetch(
-    `https://${apiHost}/stores/${storeHash}/v3/infrastructure/projects`,
-    {
-      method: 'POST',
-      headers: {
-        'X-Auth-Token': accessToken,
-        Accept: 'application/json',
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify({ name }),
-    },
-  );
-
-  if (response.status === 502) {
-    throw new Error('Failed to create project, is the name already in use?');
-  }
-
-  if (response.status === 403) {
-    throw new Error(
-      'Infrastructure Projects API not enabled. If you are part of the alpha, contact support@bigcommerce.com to enable it.',
-    );
-  }
-
-  if (!response.ok) {
-    throw new Error(`Failed to create project: ${response.statusText}`);
-  }
-
-  const res: unknown = await response.json();
-
-  const { data } = createProjectSchema.parse(res);
-
-  return data;
-}
-
-export const link = new Command('link')
-  .description(
-    'Link your local Catalyst project to a BigCommerce infrastructure project. You can provide a project UUID directly, or fetch and select from available projects using your store credentials.',
-  )
-  .addOption(
-    new Option(
-      '--store-hash <hash>',
-      'BigCommerce store hash. Can be found in the URL of your store Control Panel.',
-    ).env('BIGCOMMERCE_STORE_HASH'),
-  )
-  .addOption(
-    new Option(
-      '--access-token <token>',
-      'BigCommerce access token. Can be found after creating a store-level API account.',
-    ).env('BIGCOMMERCE_ACCESS_TOKEN'),
-  )
-  .addOption(
-    new Option('--api-host <host>', 'BigCommerce API host. The default is api.bigcommerce.com.')
-      .env('BIGCOMMERCE_API_HOST')
-      .default('api.bigcommerce.com'),
-  )
-  .option(
-    '--project-uuid <uuid>',
-    'BigCommerce infrastructure project UUID. Can be found via the BigCommerce API (GET /v3/infrastructure/projects). Use this to link directly without fetching projects.',
-  )
-  .option(
-    '--root-dir <path>',
-    'Path to the root directory of your Catalyst project (default: current working directory).',
-    process.cwd(),
-  )
-  .action(async (options) => {
-    try {
-      const config = getProjectConfig(options.rootDir);
-
-      const writeProjectConfig = (uuid: string) => {
-        consola.start('Writing project UUID to .bigcommerce/project.json...');
-        config.set('projectUuid', uuid);
-        config.set('framework', 'catalyst');
-        consola.success('Project UUID written to .bigcommerce/project.json.');
-      };
-
-      if (options.projectUuid) {
-        writeProjectConfig(options.projectUuid);
-
-        process.exit(0);
-      }
-
-      if (options.storeHash && options.accessToken) {
-        await telemetry.identify(options.storeHash);
-
-        consola.start('Fetching projects...');
-
-        const projects = await fetchProjects(
-          options.storeHash,
-          options.accessToken,
-          options.apiHost,
-        );
-
-        consola.success('Projects fetched.');
-
-        const promptOptions = [
-          ...projects.map((project) => ({
-            label: project.name,
-            value: project.uuid,
-            hint: project.uuid,
-          })),
-          {
-            label: 'Create a new project',
-            value: 'create',
-            hint: 'Create a new infrastructure project for this BigCommerce store.',
-          },
-        ];
-
-        let projectUuid = await consola.prompt(
-          'Select a project or create a new project (Press <enter> to select).',
-          {
-            type: 'select',
-            options: promptOptions,
-            cancel: 'reject',
-          },
-        );
-
-        if (projectUuid === 'create') {
-          const newProjectName = await consola.prompt('Enter a name for the new project:', {
-            type: 'text',
-          });
-
-          const data = await createProject(
-            newProjectName,
-            options.storeHash,
-            options.accessToken,
-            options.apiHost,
-          );
-
-          projectUuid = data.uuid;
-
-          consola.success(`Project "${data.name}" created successfully.`);
-        }
-
-        writeProjectConfig(projectUuid);
-
-        process.exit(0);
-      }
-
-      consola.error('Insufficient information to link a project.');
-      consola.info('Provide a project UUID with --project-uuid, or');
-      consola.info('Provide both --store-hash and --access-token to fetch and select a project.');
-      process.exit(1);
-    } catch (error) {
-      consola.error(error instanceof Error ? error.message : error);
-      process.exit(1);
-    }
-  });
diff --git a/packages/catalyst/src/cli/commands/project.spec.ts b/packages/catalyst/src/cli/commands/project.spec.ts
new file mode 100644
index 0000000000..68a32cab57
--- /dev/null
+++ b/packages/catalyst/src/cli/commands/project.spec.ts
@@ -0,0 +1,476 @@
+import { Command } from 'commander';
+import Conf from 'conf';
+import { http, HttpResponse } from 'msw';
+import { afterAll, afterEach, beforeAll, describe, expect, MockInstance, test, vi } from 'vitest';
+
+import { server } from '../../../tests/mocks/node';
+import { consola } from '../lib/logger';
+import { mkTempDir } from '../lib/mk-temp-dir';
+import { getProjectConfig, ProjectConfigSchema } from '../lib/project-config';
+import { program } from '../program';
+
+import { link, project } from './project';
+
+let exitMock: MockInstance;
+
+let tmpDir: string;
+let cleanup: () => Promise<void>;
+let config: Conf<ProjectConfigSchema>;
+
+const { mockIdentify } = vi.hoisted(() => ({
+  mockIdentify: vi.fn(),
+}));
+
+const projectUuid1 = 'a23f5785-fd99-4a94-9fb3-945551623923';
+const projectUuid2 = 'b23f5785-fd99-4a94-9fb3-945551623924';
+const projectUuid3 = 'c23f5785-fd99-4a94-9fb3-945551623925';
+const storeHash = 'test-store';
+const accessToken = 'test-token';
+
+beforeAll(async () => {
+  consola.mockTypes(() => vi.fn());
+
+  vi.mock('../lib/telemetry', () => {
+    return {
+      Telemetry: vi.fn().mockImplementation(() => {
+        return {
+          identify: mockIdentify,
+          isEnabled: vi.fn(() => true),
+          track: vi.fn(),
+          analytics: {
+            closeAndFlush: vi.fn(),
+          },
+        };
+      }),
+    };
+  });
+
+  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+  exitMock = vi.spyOn(process, 'exit').mockImplementation(() => null as never);
+
+  [tmpDir, cleanup] = await mkTempDir();
+
+  config = getProjectConfig(tmpDir);
+});
+
+afterEach(() => {
+  vi.clearAllMocks();
+});
+
+afterAll(async () => {
+  vi.restoreAllMocks();
+  exitMock.mockRestore();
+
+  await cleanup();
+});
+
+describe('project', () => {
+  test('has create, link, and list subcommands', () => {
+    expect(project).toBeInstanceOf(Command);
+    expect(project.name()).toBe('project');
+    expect(project.description()).toBe('Manage your BigCommerce infrastructure project.');
+
+    const createCmd = project.commands.find((cmd) => cmd.name() === 'create');
+
+    expect(createCmd).toBeDefined();
+    expect(createCmd?.description()).toContain('Create a new BigCommerce infrastructure project');
+
+    const linkCmd = project.commands.find((cmd) => cmd.name() === 'link');
+
+    expect(linkCmd).toBeDefined();
+    expect(linkCmd?.description()).toContain(
+      'Link your local Catalyst project to a BigCommerce infrastructure project',
+    );
+
+    const listCmd = project.commands.find((cmd) => cmd.name() === 'list');
+
+    expect(listCmd).toBeDefined();
+    expect(listCmd?.description()).toContain('List BigCommerce infrastructure projects');
+  });
+});
+
+describe('project create', () => {
+  test('prompts for name and creates project', async () => {
+    const consolaPromptMock = vi.spyOn(consola, 'prompt').mockResolvedValue('My New Project');
+
+    await program.parseAsync([
+      'node',
+      'catalyst',
+      'project',
+      'create',
+      '--store-hash',
+      storeHash,
+      '--access-token',
+      accessToken,
+      '--root-dir',
+      tmpDir,
+    ]);
+
+    expect(mockIdentify).toHaveBeenCalledWith(storeHash);
+    expect(consolaPromptMock).toHaveBeenCalledWith(
+      'Enter a name for the new project:',
+      expect.any(Object),
+    );
+    expect(consola.success).toHaveBeenCalledWith('Project "New Project" created successfully.');
+    expect(consola.start).toHaveBeenCalledWith(
+      'Writing project UUID to .bigcommerce/project.json...',
+    );
+    expect(consola.success).toHaveBeenCalledWith(
+      'Project UUID written to .bigcommerce/project.json.',
+    );
+    expect(exitMock).toHaveBeenCalledWith(0);
+
+    expect(config.get('projectUuid')).toBe('c23f5785-fd99-4a94-9fb3-945551623925');
+    expect(config.get('framework')).toBe('catalyst');
+
+    consolaPromptMock.mockRestore();
+  });
+
+  test('with insufficient credentials exits with error', async () => {
+    // Unset env so Commander doesn't pick up BIGCOMMERCE_* and trigger the create flow (which would prompt for name)
+    const savedStoreHash = process.env.BIGCOMMERCE_STORE_HASH;
+    const savedAccessToken = process.env.BIGCOMMERCE_ACCESS_TOKEN;
+
+    delete process.env.BIGCOMMERCE_STORE_HASH;
+    delete process.env.BIGCOMMERCE_ACCESS_TOKEN;
+
+    await program.parseAsync(['node', 'catalyst', 'project', 'create', '--root-dir', tmpDir]);
+
+    if (savedStoreHash !== undefined) process.env.BIGCOMMERCE_STORE_HASH = savedStoreHash;
+    if (savedAccessToken !== undefined) process.env.BIGCOMMERCE_ACCESS_TOKEN = savedAccessToken;
+
+    expect(consola.error).toHaveBeenCalledWith('Insufficient information to create a project.');
+    expect(consola.info).toHaveBeenCalledWith(
+      'Provide both --store-hash and --access-token (or set BIGCOMMERCE_STORE_HASH and BIGCOMMERCE_ACCESS_TOKEN).',
+    );
+    expect(exitMock).toHaveBeenCalledWith(1);
+  });
+
+  test('propagates create project API errors', async () => {
+    server.use(
+      http.post('https://:apiHost/stores/:storeHash/v3/infrastructure/projects', () =>
+        HttpResponse.json({}, { status: 502 }),
+      ),
+    );
+
+    const promptMock = vi.spyOn(consola, 'prompt').mockResolvedValue('Duplicate');
+
+    await program.parseAsync([
+      'node',
+      'catalyst',
+      'project',
+      'create',
+      '--store-hash',
+      storeHash,
+      '--access-token',
+      accessToken,
+      '--root-dir',
+      tmpDir,
+    ]);
+
+    promptMock.mockRestore();
+
+    expect(consola.error).toHaveBeenCalledWith(
+      'Failed to create project, is the name already in use?',
+    );
+    expect(exitMock).toHaveBeenCalledWith(1);
+  });
+});
+
+describe('project list', () => {
+  test('fetches and displays projects', async () => {
+    await program.parseAsync([
+      'node',
+      'catalyst',
+      'project',
+      'list',
+      '--store-hash',
+      storeHash,
+      '--access-token',
+      accessToken,
+    ]);
+
+    expect(mockIdentify).toHaveBeenCalledWith(storeHash);
+    expect(consola.start).toHaveBeenCalledWith('Fetching projects...');
+    expect(consola.success).toHaveBeenCalledWith('Projects fetched.');
+    expect(consola.log).toHaveBeenCalledWith('Project One (a23f5785-fd99-4a94-9fb3-945551623923)');
+    expect(consola.log).toHaveBeenCalledWith('Project Two (b23f5785-fd99-4a94-9fb3-945551623924)');
+    expect(exitMock).toHaveBeenCalledWith(0);
+  });
+
+  test('with insufficient credentials exits with error', async () => {
+    const savedStoreHash = process.env.BIGCOMMERCE_STORE_HASH;
+    const savedAccessToken = process.env.BIGCOMMERCE_ACCESS_TOKEN;
+
+    delete process.env.BIGCOMMERCE_STORE_HASH;
+    delete process.env.BIGCOMMERCE_ACCESS_TOKEN;
+
+    await program.parseAsync(['node', 'catalyst', 'project', 'list']);
+
+    if (savedStoreHash !== undefined) process.env.BIGCOMMERCE_STORE_HASH = savedStoreHash;
+    if (savedAccessToken !== undefined) process.env.BIGCOMMERCE_ACCESS_TOKEN = savedAccessToken;
+
+    expect(consola.error).toHaveBeenCalledWith('Insufficient information to list projects.');
+    expect(consola.info).toHaveBeenCalledWith(
+      'Provide both --store-hash and --access-token (or set BIGCOMMERCE_STORE_HASH and BIGCOMMERCE_ACCESS_TOKEN).',
+    );
+    expect(exitMock).toHaveBeenCalledWith(1);
+  });
+});
+
+describe('project link', () => {
+  test('properly configured Command instance', () => {
+    expect(link).toBeInstanceOf(Command);
+    expect(link.name()).toBe('link');
+    expect(link.description()).toBe(
+      'Link your local Catalyst project to a BigCommerce infrastructure project. You can provide a project UUID directly, or fetch and select from available projects using your store credentials.',
+    );
+    expect(link.options).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({ flags: '--store-hash <hash>' }),
+        expect.objectContaining({ flags: '--access-token <token>' }),
+        expect.objectContaining({
+          flags: '--api-host <host>',
+          defaultValue: 'api.bigcommerce.com',
+        }),
+        expect.objectContaining({ flags: '--project-uuid <uuid>' }),
+        expect.objectContaining({ flags: '--root-dir <path>', defaultValue: process.cwd() }),
+      ]),
+    );
+  });
+
+  test('sets projectUuid when called with --project-uuid', async () => {
+    await program.parseAsync([
+      'node',
+      'catalyst',
+      'project',
+      'link',
+      '--project-uuid',
+      projectUuid1,
+      '--root-dir',
+      tmpDir,
+    ]);
+
+    expect(consola.start).toHaveBeenCalledWith(
+      'Writing project UUID to .bigcommerce/project.json...',
+    );
+    expect(consola.success).toHaveBeenCalledWith(
+      'Project UUID written to .bigcommerce/project.json.',
+    );
+    expect(exitMock).toHaveBeenCalledWith(0);
+    expect(config.get('projectUuid')).toBe(projectUuid1);
+    expect(config.get('framework')).toBe('catalyst');
+  });
+
+  test('fetches projects and prompts user to select one', async () => {
+    const consolaPromptMock = vi
+      .spyOn(consola, 'prompt')
+      .mockImplementation(async (message, opts) => {
+        expect(message).toContain(
+          'Select a project or create a new project (Press <enter> to select).',
+        );
+
+        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+        const options = (opts as { options: Array<{ label: string; value: string }> }).options;
+
+        expect(options).toHaveLength(3);
+        expect(options[0]).toMatchObject({ label: 'Project One', value: projectUuid1 });
+        expect(options[1]).toMatchObject({
+          label: 'Project Two',
+          value: projectUuid2,
+        });
+        expect(options[2]).toMatchObject({ label: 'Create a new project', value: 'create' });
+
+        return new Promise((resolve) => resolve(projectUuid2));
+      });
+
+    await program.parseAsync([
+      'node',
+      'catalyst',
+      'project',
+      'link',
+      '--store-hash',
+      storeHash,
+      '--access-token',
+      accessToken,
+      '--root-dir',
+      tmpDir,
+    ]);
+
+    expect(mockIdentify).toHaveBeenCalledWith(storeHash);
+
+    expect(consola.start).toHaveBeenCalledWith('Fetching projects...');
+    expect(consola.success).toHaveBeenCalledWith('Projects fetched.');
+
+    expect(consola.start).toHaveBeenCalledWith(
+      'Writing project UUID to .bigcommerce/project.json...',
+    );
+    expect(consola.success).toHaveBeenCalledWith(
+      'Project UUID written to .bigcommerce/project.json.',
+    );
+
+    expect(exitMock).toHaveBeenCalledWith(0);
+
+    expect(config.get('projectUuid')).toBe(projectUuid2);
+    expect(config.get('framework')).toBe('catalyst');
+
+    consolaPromptMock.mockRestore();
+  });
+
+  test('prompts to create a new project', async () => {
+    const consolaPromptMock = vi
+      .spyOn(consola, 'prompt')
+      .mockImplementationOnce(async (message, opts) => {
+        expect(message).toContain(
+          'Select a project or create a new project (Press <enter> to select).',
+        );
+
+        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+        const options = (opts as { options: Array<{ label: string; value: string }> }).options;
+
+        expect(options).toHaveLength(3);
+        expect(options[0]).toMatchObject({ label: 'Project One', value: projectUuid1 });
+        expect(options[1]).toMatchObject({
+          label: 'Project Two',
+          value: projectUuid2,
+        });
+        expect(options[2]).toMatchObject({ label: 'Create a new project', value: 'create' });
+
+        return new Promise((resolve) => resolve('create'));
+      })
+      .mockImplementationOnce(async (message) => {
+        expect(message).toBe('Enter a name for the new project:');
+
+        return new Promise((resolve) => resolve('New Project'));
+      });
+
+    await program.parseAsync([
+      'node',
+      'catalyst',
+      'project',
+      'link',
+      '--store-hash',
+      storeHash,
+      '--access-token',
+      accessToken,
+      '--root-dir',
+      tmpDir,
+    ]);
+
+    expect(mockIdentify).toHaveBeenCalledWith(storeHash);
+
+    expect(consola.start).toHaveBeenCalledWith('Fetching projects...');
+    expect(consola.success).toHaveBeenCalledWith('Projects fetched.');
+
+    expect(consola.success).toHaveBeenCalledWith('Project "New Project" created successfully.');
+
+    expect(exitMock).toHaveBeenCalledWith(0);
+
+    expect(config.get('projectUuid')).toBe(projectUuid3);
+    expect(config.get('framework')).toBe('catalyst');
+
+    consolaPromptMock.mockRestore();
+  });
+
+  test('errors when create project API fails', async () => {
+    server.use(
+      http.post('https://:apiHost/stores/:storeHash/v3/infrastructure/projects', () =>
+        HttpResponse.json({}, { status: 502 }),
+      ),
+    );
+
+    const consolaPromptMock = vi
+      .spyOn(consola, 'prompt')
+      .mockImplementationOnce(async (message, opts) => {
+        expect(message).toContain(
+          'Select a project or create a new project (Press <enter> to select).',
+        );
+
+        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+        const options = (opts as { options: Array<{ label: string; value: string }> }).options;
+
+        expect(options).toHaveLength(3);
+        expect(options[0]).toMatchObject({ label: 'Project One', value: projectUuid1 });
+        expect(options[1]).toMatchObject({
+          label: 'Project Two',
+          value: projectUuid2,
+        });
+        expect(options[2]).toMatchObject({ label: 'Create a new project', value: 'create' });
+
+        return new Promise((resolve) => resolve('create'));
+      })
+      .mockImplementationOnce(async (message) => {
+        expect(message).toBe('Enter a name for the new project:');
+
+        return new Promise((resolve) => resolve('New Project'));
+      });
+
+    await program.parseAsync([
+      'node',
+      'catalyst',
+      'project',
+      'link',
+      '--store-hash',
+      storeHash,
+      '--access-token',
+      accessToken,
+      '--root-dir',
+      tmpDir,
+    ]);
+
+    expect(mockIdentify).toHaveBeenCalledWith(storeHash);
+
+    expect(consola.start).toHaveBeenCalledWith('Fetching projects...');
+    expect(consola.success).toHaveBeenCalledWith('Projects fetched.');
+
+    expect(consola.error).toHaveBeenCalledWith(
+      'Failed to create project, is the name already in use?',
+    );
+
+    expect(exitMock).toHaveBeenCalledWith(1);
+
+    consolaPromptMock.mockRestore();
+  });
+
+  test('errors when infrastructure projects API is not found', async () => {
+    server.use(
+      http.get('https://:apiHost/stores/:storeHash/v3/infrastructure/projects', () =>
+        HttpResponse.json({}, { status: 403 }),
+      ),
+    );
+
+    await program.parseAsync([
+      'node',
+      'catalyst',
+      'project',
+      'link',
+      '--store-hash',
+      storeHash,
+      '--access-token',
+      accessToken,
+      '--root-dir',
+      tmpDir,
+    ]);
+
+    expect(mockIdentify).toHaveBeenCalledWith(storeHash);
+
+    expect(consola.start).toHaveBeenCalledWith('Fetching projects...');
+    expect(consola.error).toHaveBeenCalledWith(
+      'Infrastructure Projects API not enabled. If you are part of the alpha, contact support@bigcommerce.com to enable it.',
+    );
+  });
+
+  test('errors when no projectUuid, storeHash, or accessToken are provided', async () => {
+    await program.parseAsync(['node', 'catalyst', 'project', 'link', '--root-dir', tmpDir]);
+
+    expect(consola.start).not.toHaveBeenCalled();
+    expect(consola.success).not.toHaveBeenCalled();
+    expect(consola.error).toHaveBeenCalledWith('Insufficient information to link a project.');
+    expect(consola.info).toHaveBeenCalledWith('Provide a project UUID with --project-uuid, or');
+    expect(consola.info).toHaveBeenCalledWith(
+      'Provide both --store-hash and --access-token to fetch and select a project.',
+    );
+
+    expect(exitMock).toHaveBeenCalledWith(1);
+  });
+});
diff --git a/packages/catalyst/src/cli/commands/project.ts b/packages/catalyst/src/cli/commands/project.ts
new file mode 100644
index 0000000000..a97980e2e2
--- /dev/null
+++ b/packages/catalyst/src/cli/commands/project.ts
@@ -0,0 +1,252 @@
+import { Command, Option } from 'commander';
+
+import { consola } from '../lib/logger';
+import { createProject, fetchProjects } from '../lib/project';
+import { getProjectConfig } from '../lib/project-config';
+import { Telemetry } from '../lib/telemetry';
+
+const telemetry = new Telemetry();
+
+const list = new Command('list')
+  .description('List BigCommerce infrastructure projects for your store.')
+  .addOption(
+    new Option(
+      '--store-hash <hash>',
+      'BigCommerce store hash. Can be found in the URL of your store Control Panel.',
+    ).env('BIGCOMMERCE_STORE_HASH'),
+  )
+  .addOption(
+    new Option(
+      '--access-token <token>',
+      'BigCommerce access token. Can be found after creating a store-level API account.',
+    ).env('BIGCOMMERCE_ACCESS_TOKEN'),
+  )
+  .addOption(
+    new Option('--api-host <host>', 'BigCommerce API host. The default is api.bigcommerce.com.')
+      .env('BIGCOMMERCE_API_HOST')
+      .default('api.bigcommerce.com'),
+  )
+  .action(async (options) => {
+    try {
+      if (!options.storeHash || !options.accessToken) {
+        consola.error('Insufficient information to list projects.');
+        consola.info(
+          'Provide both --store-hash and --access-token (or set BIGCOMMERCE_STORE_HASH and BIGCOMMERCE_ACCESS_TOKEN).',
+        );
+        process.exit(1);
+
+        return;
+      }
+
+      await telemetry.identify(options.storeHash);
+
+      consola.start('Fetching projects...');
+
+      const projects = await fetchProjects(options.storeHash, options.accessToken, options.apiHost);
+
+      consola.success('Projects fetched.');
+
+      if (projects.length === 0) {
+        consola.info('No projects found.');
+        process.exit(0);
+
+        return;
+      }
+
+      projects.forEach((p) => {
+        consola.log(`${p.name} (${p.uuid})`);
+      });
+
+      process.exit(0);
+    } catch (error) {
+      consola.error(error instanceof Error ? error.message : error);
+      process.exit(1);
+    }
+  });
+
+const create = new Command('create')
+  .description(
+    'Create a new BigCommerce infrastructure project and link it to your local Catalyst project.',
+  )
+  .addOption(
+    new Option(
+      '--store-hash <hash>',
+      'BigCommerce store hash. Can be found in the URL of your store Control Panel.',
+    ).env('BIGCOMMERCE_STORE_HASH'),
+  )
+  .addOption(
+    new Option(
+      '--access-token <token>',
+      'BigCommerce access token. Can be found after creating a store-level API account.',
+    ).env('BIGCOMMERCE_ACCESS_TOKEN'),
+  )
+  .addOption(
+    new Option('--api-host <host>', 'BigCommerce API host. The default is api.bigcommerce.com.')
+      .env('BIGCOMMERCE_API_HOST')
+      .default('api.bigcommerce.com'),
+  )
+  .option(
+    '--root-dir <path>',
+    'Path to the root directory of your Catalyst project (default: current working directory).',
+    process.cwd(),
+  )
+  .action(async (options) => {
+    try {
+      if (!options.storeHash || !options.accessToken) {
+        consola.error('Insufficient information to create a project.');
+        consola.info(
+          'Provide both --store-hash and --access-token (or set BIGCOMMERCE_STORE_HASH and BIGCOMMERCE_ACCESS_TOKEN).',
+        );
+        process.exit(1);
+
+        return;
+      }
+
+      await telemetry.identify(options.storeHash);
+
+      const newProjectName = await consola.prompt('Enter a name for the new project:', {
+        type: 'text',
+      });
+
+      const data = await createProject(
+        newProjectName,
+        options.storeHash,
+        options.accessToken,
+        options.apiHost,
+      );
+
+      consola.success(`Project "${data.name}" created successfully.`);
+
+      const config = getProjectConfig(options.rootDir);
+
+      consola.start('Writing project UUID to .bigcommerce/project.json...');
+      config.set('projectUuid', data.uuid);
+      config.set('framework', 'catalyst');
+      consola.success('Project UUID written to .bigcommerce/project.json.');
+
+      process.exit(0);
+    } catch (error) {
+      consola.error(error instanceof Error ? error.message : error);
+      process.exit(1);
+    }
+  });
+
+export const link = new Command('link')
+  .description(
+    'Link your local Catalyst project to a BigCommerce infrastructure project. You can provide a project UUID directly, or fetch and select from available projects using your store credentials.',
+  )
+  .addOption(
+    new Option(
+      '--store-hash <hash>',
+      'BigCommerce store hash. Can be found in the URL of your store Control Panel.',
+    ).env('BIGCOMMERCE_STORE_HASH'),
+  )
+  .addOption(
+    new Option(
+      '--access-token <token>',
+      'BigCommerce access token. Can be found after creating a store-level API account.',
+    ).env('BIGCOMMERCE_ACCESS_TOKEN'),
+  )
+  .addOption(
+    new Option('--api-host <host>', 'BigCommerce API host. The default is api.bigcommerce.com.')
+      .env('BIGCOMMERCE_API_HOST')
+      .default('api.bigcommerce.com'),
+  )
+  .option(
+    '--project-uuid <uuid>',
+    'BigCommerce infrastructure project UUID. Can be found via the BigCommerce API (GET /v3/infrastructure/projects). Use this to link directly without fetching projects.',
+  )
+  .option(
+    '--root-dir <path>',
+    'Path to the root directory of your Catalyst project (default: current working directory).',
+    process.cwd(),
+  )
+  .action(async (options) => {
+    try {
+      const config = getProjectConfig(options.rootDir);
+
+      const writeProjectConfig = (uuid: string) => {
+        consola.start('Writing project UUID to .bigcommerce/project.json...');
+        config.set('projectUuid', uuid);
+        config.set('framework', 'catalyst');
+        consola.success('Project UUID written to .bigcommerce/project.json.');
+      };
+
+      if (options.projectUuid) {
+        writeProjectConfig(options.projectUuid);
+
+        process.exit(0);
+      }
+
+      if (options.storeHash && options.accessToken) {
+        await telemetry.identify(options.storeHash);
+
+        consola.start('Fetching projects...');
+
+        const projects = await fetchProjects(
+          options.storeHash,
+          options.accessToken,
+          options.apiHost,
+        );
+
+        consola.success('Projects fetched.');
+
+        const promptOptions = [
+          ...projects.map((proj) => ({
+            label: proj.name,
+            value: proj.uuid,
+            hint: proj.uuid,
+          })),
+          {
+            label: 'Create a new project',
+            value: 'create',
+            hint: 'Create a new infrastructure project for this BigCommerce store.',
+          },
+        ];
+
+        let projectUuid = await consola.prompt(
+          'Select a project or create a new project (Press <enter> to select).',
+          {
+            type: 'select',
+            options: promptOptions,
+            cancel: 'reject',
+          },
+        );
+
+        if (projectUuid === 'create') {
+          const newProjectName = await consola.prompt('Enter a name for the new project:', {
+            type: 'text',
+          });
+
+          const data = await createProject(
+            newProjectName,
+            options.storeHash,
+            options.accessToken,
+            options.apiHost,
+          );
+
+          projectUuid = data.uuid;
+
+          consola.success(`Project "${data.name}" created successfully.`);
+        }
+
+        writeProjectConfig(projectUuid);
+
+        process.exit(0);
+      }
+
+      consola.error('Insufficient information to link a project.');
+      consola.info('Provide a project UUID with --project-uuid, or');
+      consola.info('Provide both --store-hash and --access-token to fetch and select a project.');
+      process.exit(1);
+    } catch (error) {
+      consola.error(error instanceof Error ? error.message : error);
+      process.exit(1);
+    }
+  });
+
+export const project = new Command('project')
+  .description('Manage your BigCommerce infrastructure project.')
+  .addCommand(create)
+  .addCommand(list)
+  .addCommand(link);
diff --git a/packages/catalyst/src/cli/index.spec.ts b/packages/catalyst/src/cli/index.spec.ts
index 5759071df6..76f750de9b 100644
--- a/packages/catalyst/src/cli/index.spec.ts
+++ b/packages/catalyst/src/cli/index.spec.ts
@@ -25,7 +25,13 @@ describe('CLI program', () => {
     expect(commands).toContain('start');
     expect(commands).toContain('build');
     expect(commands).toContain('deploy');
-    expect(commands).toContain('link');
+    expect(commands).toContain('project');
+
+    const projectCmd = program.commands.find((cmd) => cmd.name() === 'project');
+
+    expect(projectCmd?.commands.map((c) => c.name())).toEqual(
+      expect.arrayContaining(['create', 'list', 'link']),
+    );
   });
 
   test('telemetry hooks are called when executing version command', async () => {
diff --git a/packages/catalyst/src/cli/lib/project.ts b/packages/catalyst/src/cli/lib/project.ts
new file mode 100644
index 0000000000..ffdb319902
--- /dev/null
+++ b/packages/catalyst/src/cli/lib/project.ts
@@ -0,0 +1,103 @@
+import { z } from 'zod';
+
+const fetchProjectsSchema = z.object({
+  data: z.array(
+    z.object({
+      uuid: z.string(),
+      name: z.string(),
+    }),
+  ),
+});
+
+export interface ProjectListItem {
+  uuid: string;
+  name: string;
+}
+
+export async function fetchProjects(
+  storeHash: string,
+  accessToken: string,
+  apiHost: string,
+): Promise<ProjectListItem[]> {
+  const response = await fetch(
+    `https://${apiHost}/stores/${storeHash}/v3/infrastructure/projects`,
+    {
+      method: 'GET',
+      headers: {
+        'X-Auth-Token': accessToken,
+      },
+    },
+  );
+
+  if (response.status === 403) {
+    throw new Error(
+      'Infrastructure Projects API not enabled. If you are part of the alpha, contact support@bigcommerce.com to enable it.',
+    );
+  }
+
+  if (!response.ok) {
+    throw new Error(`Failed to fetch projects: ${response.statusText}`);
+  }
+
+  const res: unknown = await response.json();
+
+  const { data } = fetchProjectsSchema.parse(res);
+
+  return data;
+}
+
+const createProjectSchema = z.object({
+  data: z.object({
+    uuid: z.string(),
+    name: z.string(),
+    date_created: z.coerce.date(),
+    date_modified: z.coerce.date(),
+  }),
+});
+
+export interface CreateProjectResult {
+  uuid: string;
+  name: string;
+  date_created: Date;
+  date_modified: Date;
+}
+
+export async function createProject(
+  name: string,
+  storeHash: string,
+  accessToken: string,
+  apiHost: string,
+): Promise<CreateProjectResult> {
+  const response = await fetch(
+    `https://${apiHost}/stores/${storeHash}/v3/infrastructure/projects`,
+    {
+      method: 'POST',
+      headers: {
+        'X-Auth-Token': accessToken,
+        Accept: 'application/json',
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify({ name }),
+    },
+  );
+
+  if (response.status === 502) {
+    throw new Error('Failed to create project, is the name already in use?');
+  }
+
+  if (response.status === 403) {
+    throw new Error(
+      'Infrastructure Projects API not enabled. If you are part of the alpha, contact support@bigcommerce.com to enable it.',
+    );
+  }
+
+  if (!response.ok) {
+    throw new Error(`Failed to create project: ${response.statusText}`);
+  }
+
+  const res: unknown = await response.json();
+
+  const { data } = createProjectSchema.parse(res);
+
+  return data;
+}
diff --git a/packages/catalyst/src/cli/program.ts b/packages/catalyst/src/cli/program.ts
index 8f8cd50bcb..4a99a17ac5 100644
--- a/packages/catalyst/src/cli/program.ts
+++ b/packages/catalyst/src/cli/program.ts
@@ -8,7 +8,7 @@ import PACKAGE_INFO from '../../package.json';
 import { build } from './commands/build';
 import { deploy } from './commands/deploy';
 import { dev } from './commands/dev';
-import { link } from './commands/link';
+import { project } from './commands/project';
 import { start } from './commands/start';
 import { telemetry } from './commands/telemetry';
 import { version } from './commands/version';
@@ -38,7 +38,7 @@ program
   .addCommand(start)
   .addCommand(build)
   .addCommand(deploy)
-  .addCommand(link)
+  .addCommand(project)
   .addCommand(telemetry)
   .hook('preAction', telemetryPreHook)
   .hook('postAction', telemetryPostHook);

From e40d29c1e9c6e35e7f9d15854a589c2e3d248570 Mon Sep 17 00:00:00 2001
From: Jorge Moya <jorge.moya@bigcommerce.com>
Date: Fri, 6 Feb 2026 15:33:58 -0600
Subject: [PATCH 47/69] fix: remove unecessary file

---
 core/lib/makeswift/api.ts | 57 ---------------------------------------
 1 file changed, 57 deletions(-)
 delete mode 100644 core/lib/makeswift/api.ts

diff --git a/core/lib/makeswift/api.ts b/core/lib/makeswift/api.ts
deleted file mode 100644
index 545bee5e4c..0000000000
--- a/core/lib/makeswift/api.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import { getSiteVersion } from '@makeswift/runtime/next/server';
-import { strict } from 'assert';
-import { z } from 'zod';
-
-import { defaultLocale } from '~/i18n/locales';
-
-strict(process.env.MAKESWIFT_SITE_API_KEY, 'MAKESWIFT_SITE_API_KEY is required');
-
-const MAKESWIFT_SITE_API_KEY = process.env.MAKESWIFT_SITE_API_KEY;
-
-const MAKESWIFT_API_ORIGIN =
-  process.env.NEXT_PUBLIC_MAKESWIFT_API_ORIGIN ??
-  process.env.MAKESWIFT_API_ORIGIN ??
-  'https://api.makeswift.com';
-
-const MakeswiftPageResponseSchema = z.object({
-  title: z.string().nullable(),
-  description: z.string().nullable(),
-});
-
-function normalizeLocale(locale: string): string | undefined {
-  return locale === defaultLocale ? undefined : locale;
-}
-
-export async function getMakeswiftPageMetadata({ path, locale }: { path: string; locale: string }) {
-  const siteVersion = await getSiteVersion();
-
-  const versionRef = siteVersion?.version === 'Live' ? 'ref:live' : 'ref:draft';
-  const normalizedLocale = normalizeLocale(locale);
-
-  const url = new URL(`/v6/pages${path}`, MAKESWIFT_API_ORIGIN);
-
-  url.searchParams.set('versionRef', versionRef);
-  url.searchParams.set('siteId', 'MISSING SITE ID');
-
-  if (normalizedLocale) {
-    url.searchParams.set('locale', normalizedLocale);
-  }
-
-  const response = await fetch(url, {
-    headers: {
-      'x-api-key': MAKESWIFT_SITE_API_KEY,
-    },
-  });
-
-  if (!response.ok) {
-    return null;
-  }
-
-  const data: unknown = await response.json();
-  const page = MakeswiftPageResponseSchema.parse(data);
-
-  return {
-    ...(page.title && { title: page.title }),
-    ...(page.description && { description: page.description }),
-  };
-}

From d78bc85fa4a6ae39d2b99a347a3f9fc56725826a Mon Sep 17 00:00:00 2001
From: Tharaa <36555311+Tharaae@users.noreply.github.com>
Date: Tue, 10 Feb 2026 09:46:18 +1100
Subject: [PATCH 48/69] feat: Add items stock/backorder messages to cart page
 (#2758)

* feat: Add items stock/backorder messages to cart page

* feat: Add items stock/backorder messages to cart page - Apply UI comments

* feat: Add items stock/backorder messages to cart page - Apply review comments
---
 .changeset/tender-toys-heal.md                |  15 ++
 core/app/[locale]/(default)/cart/page-data.ts |  13 ++
 core/app/[locale]/(default)/cart/page.tsx     |  42 +++++
 core/messages/en.json                         |   3 +
 core/vibes/soul/sections/cart/client.tsx      | 157 +++++++++++-------
 5 files changed, 174 insertions(+), 56 deletions(-)
 create mode 100644 .changeset/tender-toys-heal.md

diff --git a/.changeset/tender-toys-heal.md b/.changeset/tender-toys-heal.md
new file mode 100644
index 0000000000..d7296856f6
--- /dev/null
+++ b/.changeset/tender-toys-heal.md
@@ -0,0 +1,15 @@
+---
+"@bigcommerce/catalyst-core": minor
+---
+
+Add the following messages to each line item on cart page based on store inventory settings:
+- Fully/partially out-of-stock message if enabled on the store and the line item is currently out of stock
+- Ready-to-ship quantity if enabled on the store
+- Backordered quantity if enabled on the store
+
+## Migration
+For existing Catalyst stores, to get the newly added feature, simply rebase the existing code with the new release code. The files to be rebased for this change to be applied are:
+- core/app/[locale]/(default)/cart/page-data.ts
+- core/app/[locale]/(default)/cart/page.tsx
+- core/messages/en.json
+- core/vibes/soul/sections/cart/client.tsx
diff --git a/core/app/[locale]/(default)/cart/page-data.ts b/core/app/[locale]/(default)/cart/page-data.ts
index e1758e1a7e..c6e47636dc 100644
--- a/core/app/[locale]/(default)/cart/page-data.ts
+++ b/core/app/[locale]/(default)/cart/page-data.ts
@@ -56,6 +56,12 @@ export const PhysicalItemFragment = graphql(`
       }
     }
     url
+    stockPosition {
+      backorderMessage
+      quantityOnHand
+      quantityBackordered
+      quantityOutOfStock
+    }
   }
 `);
 
@@ -206,6 +212,13 @@ const CartPageQuery = graphql(
     query CartPageQuery($cartId: String, $currencyCode: currencyCode) {
       site {
         settings {
+          inventory {
+            defaultOutOfStockMessage
+            showOutOfStockMessage
+            showBackorderMessage
+            showQuantityOnBackorder
+            showQuantityOnHand
+          }
           url {
             checkoutUrl
           }
diff --git a/core/app/[locale]/(default)/cart/page.tsx b/core/app/[locale]/(default)/cart/page.tsx
index f78ad90763..bc07f3d473 100644
--- a/core/app/[locale]/(default)/cart/page.tsx
+++ b/core/app/[locale]/(default)/cart/page.tsx
@@ -125,6 +125,47 @@ export default async function Cart({ params }: Props) {
       };
     }
 
+    let inventoryMessages;
+
+    if (item.__typename === 'CartPhysicalItem') {
+      if (item.stockPosition?.quantityOutOfStock === item.quantity) {
+        inventoryMessages = {
+          outOfStockMessage: data.site.settings?.inventory?.showOutOfStockMessage
+            ? data.site.settings.inventory.defaultOutOfStockMessage
+            : undefined,
+        };
+      } else {
+        inventoryMessages = {
+          quantityReadyToShipMessage:
+            data.site.settings?.inventory?.showQuantityOnHand &&
+            !!item.stockPosition?.quantityOnHand
+              ? t('quantityReadyToShip', {
+                  quantity: Number(item.stockPosition.quantityOnHand),
+                })
+              : undefined,
+          quantityBackorderedMessage:
+            data.site.settings?.inventory?.showQuantityOnBackorder &&
+            !!item.stockPosition?.quantityBackordered
+              ? t('quantityOnBackorder', {
+                  quantity: Number(item.stockPosition.quantityBackordered),
+                })
+              : undefined,
+          quantityOutOfStockMessage:
+            data.site.settings?.inventory?.showOutOfStockMessage &&
+            !!item.stockPosition?.quantityOutOfStock
+              ? t('partiallyAvailable', {
+                  quantity: item.quantity - Number(item.stockPosition.quantityOutOfStock),
+                })
+              : undefined,
+          backorderMessage:
+            data.site.settings?.inventory?.showBackorderMessage &&
+            !!item.stockPosition?.quantityBackordered
+              ? (item.stockPosition.backorderMessage ?? undefined)
+              : undefined,
+        };
+      }
+    }
+
     return {
       typename: item.__typename,
       id: item.entityId,
@@ -165,6 +206,7 @@ export default async function Cart({ params }: Props) {
       selectedOptions: item.selectedOptions,
       productEntityId: item.productEntityId,
       variantEntityId: item.variantEntityId,
+      inventoryMessages,
     };
   });
 
diff --git a/core/messages/en.json b/core/messages/en.json
index 303e03f422..6c71464727 100644
--- a/core/messages/en.json
+++ b/core/messages/en.json
@@ -370,6 +370,9 @@
     "cartUpdateInProgress": "You have a cart update in progress. Are you sure you want to leave this page? Your changes may be lost.",
     "originalPrice": "Original price was {price}.",
     "currentPrice": "Current price is {price}.",
+    "quantityReadyToShip": "{quantity, number} ready to ship",
+    "quantityOnBackorder": "{quantity, number} will be backordered",
+    "partiallyAvailable": "Only {quantity, number} available",
     "CheckoutSummary": {
       "title": "Summary",
       "subTotal": "Subtotal",
diff --git a/core/vibes/soul/sections/cart/client.tsx b/core/vibes/soul/sections/cart/client.tsx
index cbe49988ec..8825d06b3b 100644
--- a/core/vibes/soul/sections/cart/client.tsx
+++ b/core/vibes/soul/sections/cart/client.tsx
@@ -34,6 +34,14 @@ import { CartEmptyState } from '.';
 
 type Action<State, Payload> = (state: Awaited<State>, payload: Payload) => State | Promise<State>;
 
+interface CartLineIteminventoryMessages {
+  outOfStockMessage?: string;
+  quantityReadyToShipMessage?: string;
+  quantityBackorderedMessage?: string;
+  quantityOutOfStockMessage?: string;
+  backorderMessage?: string;
+}
+
 export interface CartLineItem {
   typename: string;
   id: string;
@@ -44,6 +52,7 @@ export interface CartLineItem {
   price: string;
   salePrice?: string;
   href?: string;
+  inventoryMessages?: CartLineIteminventoryMessages;
 }
 
 export interface CartGiftCertificateLineItem extends CartLineItem {
@@ -563,7 +572,7 @@ function CounterForm({
       <input {...getInputProps(fields.id, { type: 'hidden' })} key={fields.id.id} />
       <div className="flex w-full flex-wrap items-center gap-x-5 gap-y-2">
         {lineItem.salePrice && lineItem.salePrice !== lineItem.price ? (
-          <span className="font-medium @xl:ml-auto">
+          <span className="mt-3 self-start font-medium @xl:ml-auto">
             <span className="sr-only">{t('originalPrice', { price: lineItem.price })}</span>
             <span aria-hidden="true" className="line-through">
               {lineItem.price}
@@ -572,65 +581,101 @@ function CounterForm({
             <span aria-hidden="true">{lineItem.salePrice}</span>
           </span>
         ) : (
-          <span className="font-medium @xl:ml-auto">{lineItem.price}</span>
+          <span className="mt-3 self-start font-medium @xl:ml-auto">{lineItem.price}</span>
         )}
-        {/* Counter */}
-        <div className="flex items-center rounded-lg border border-[var(--cart-counter-border,hsl(var(--contrast-100)))]">
-          <button
-            aria-label={decrementLabel}
-            className={clsx(
-              'group rounded-l-lg bg-[var(--cart-counter-background,hsl(var(--background)))] p-3 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--cart-focus,hsl(var(--primary)))] disabled:cursor-not-allowed',
-              lineItem.quantity === 1
-                ? 'opacity-50'
-                : 'hover:bg-[var(--cart-counter-background-hover,hsl(var(--contrast-100)/50%))]',
-            )}
-            disabled={lineItem.quantity === 1}
-            name="intent"
-            type="submit"
-            value="decrement"
-          >
-            <Minus
+        <div className="flex size-min flex-col gap-y-0">
+          <div className="mb-1 mt-1 flex items-center gap-x-5">
+            {/* Counter */}
+            <div
               className={clsx(
-                'text-[var(--cart-counter-icon,hsl(var(--contrast-300)))] transition-colors duration-300',
-                lineItem.quantity !== 1 &&
-                  'group-hover:text-[var(--cart-counter-icon-hover,hsl(var(--foreground)))]',
+                'flex items-center rounded-lg border border-[var(--cart-counter-border,hsl(var(--contrast-100)))]',
+                (lineItem.inventoryMessages?.outOfStockMessage != null ||
+                  lineItem.inventoryMessages?.quantityOutOfStockMessage != null) &&
+                  'border-red-500',
               )}
-              size={18}
-              strokeWidth={1.5}
-            />
-          </button>
-          <span className="flex w-8 select-none justify-center focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--cart-focus,hsl(var(--primary)))]">
-            {lineItem.quantity}
-          </span>
-          <button
-            aria-label={incrementLabel}
-            className={clsx(
-              'group rounded-r-lg bg-[var(--cart-counter-background,hsl(var(--background)))] p-3 transition-colors duration-300 hover:bg-[var(--cart-counter-background-hover,hsl(var(--contrast-100)/50%))] focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--cart-focus,hsl(var(--primary)))] disabled:cursor-not-allowed',
-            )}
-            name="intent"
-            type="submit"
-            value="increment"
-          >
-            <Plus
-              className="text-[var(--cart-counter-icon,hsl(var(--contrast-300)))] transition-colors duration-300 group-hover:text-[var(--cart-counter-icon-hover,hsl(var(--foreground)))]"
-              size={18}
-              strokeWidth={1.5}
-            />
-          </button>
+            >
+              <button
+                aria-label={decrementLabel}
+                className={clsx(
+                  'group rounded-l-lg bg-[var(--cart-counter-background,hsl(var(--background)))] p-3 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--cart-focus,hsl(var(--primary)))] disabled:cursor-not-allowed',
+                  lineItem.quantity === 1
+                    ? 'opacity-50'
+                    : 'hover:bg-[var(--cart-counter-background-hover,hsl(var(--contrast-100)/50%))]',
+                )}
+                disabled={lineItem.quantity === 1}
+                name="intent"
+                type="submit"
+                value="decrement"
+              >
+                <Minus
+                  className={clsx(
+                    'text-[var(--cart-counter-icon,hsl(var(--contrast-300)))] transition-colors duration-300',
+                    lineItem.quantity !== 1 &&
+                      'group-hover:text-[var(--cart-counter-icon-hover,hsl(var(--foreground)))]',
+                  )}
+                  size={18}
+                  strokeWidth={1.5}
+                />
+              </button>
+              <span className="flex w-8 select-none justify-center focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--cart-focus,hsl(var(--primary)))]">
+                {lineItem.quantity}
+              </span>
+              <button
+                aria-label={incrementLabel}
+                className={clsx(
+                  'group rounded-r-lg bg-[var(--cart-counter-background,hsl(var(--background)))] p-3 transition-colors duration-300 hover:bg-[var(--cart-counter-background-hover,hsl(var(--contrast-100)/50%))] focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--cart-focus,hsl(var(--primary)))] disabled:cursor-not-allowed',
+                )}
+                name="intent"
+                type="submit"
+                value="increment"
+              >
+                <Plus
+                  className="text-[var(--cart-counter-icon,hsl(var(--contrast-300)))] transition-colors duration-300 group-hover:text-[var(--cart-counter-icon-hover,hsl(var(--foreground)))]"
+                  size={18}
+                  strokeWidth={1.5}
+                />
+              </button>
+            </div>
+            <button
+              aria-label={deleteLabel}
+              className="group -ml-1 mt-1.5 flex h-8 w-8 shrink-0 items-center justify-center self-start rounded-full transition-colors duration-300 hover:bg-[var(--cart-button-background,hsl(var(--contrast-100)))] focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--cart-focus,hsl(var(--primary)))] focus-visible:ring-offset-4"
+              name="intent"
+              type="submit"
+              value="delete"
+            >
+              <Trash2
+                className="text-[var(--cart-icon,hsl(var(--contrast-300)))] group-hover:text-[var(--cart-icon-hover,hsl(var(--foreground)))]"
+                size={20}
+                strokeWidth={1}
+              />
+            </button>
+          </div>
+          {lineItem.inventoryMessages?.outOfStockMessage != null && (
+            <span className="text-xs/5 font-light text-red-500">
+              {lineItem.inventoryMessages.outOfStockMessage}
+            </span>
+          )}
+          {lineItem.inventoryMessages?.quantityOutOfStockMessage != null && (
+            <span className="mb-3 text-xs/5 font-light text-red-500">
+              {lineItem.inventoryMessages.quantityOutOfStockMessage}
+            </span>
+          )}
+          {lineItem.inventoryMessages?.quantityReadyToShipMessage != null && (
+            <span className="text-xs/5 font-light">
+              {lineItem.inventoryMessages.quantityReadyToShipMessage}
+            </span>
+          )}
+          {lineItem.inventoryMessages?.quantityBackorderedMessage != null && (
+            <span className="text-xs/5 font-light">
+              {lineItem.inventoryMessages.quantityBackorderedMessage}
+            </span>
+          )}
+          {lineItem.inventoryMessages?.backorderMessage != null && (
+            <span className="text-xs/5 font-light">
+              {lineItem.inventoryMessages.backorderMessage}
+            </span>
+          )}
         </div>
-        <button
-          aria-label={deleteLabel}
-          className="group -ml-1 flex h-8 w-8 shrink-0 items-center justify-center rounded-full transition-colors duration-300 hover:bg-[var(--cart-button-background,hsl(var(--contrast-100)))] focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--cart-focus,hsl(var(--primary)))] focus-visible:ring-offset-4"
-          name="intent"
-          type="submit"
-          value="delete"
-        >
-          <Trash2
-            className="text-[var(--cart-icon,hsl(var(--contrast-300)))] group-hover:text-[var(--cart-icon-hover,hsl(var(--foreground)))]"
-            size={20}
-            strokeWidth={1}
-          />
-        </button>
       </div>
     </form>
   );

From 6a23c90714b2218db45f17cebe395b21753157e7 Mon Sep 17 00:00:00 2001
From: Jorge Moya <jorge.moya@bigcommerce.com>
Date: Tue, 10 Feb 2026 15:22:27 -0600
Subject: [PATCH 49/69] feat(core): enable product image pagination (#2863)

* feat(core): enable product image pagination

* feat: infinite gallery, no thumbnail

* fix: infinite scroll in thumbnail scroll

* fix: retains scroll position

* fix: infinite scroll fix

* fix: change product image to 12 per page

* fix: remove label prop

* fix: update loading animation

* fix: add accessbility

* chore: update changeset

* fix: merge steamable functions

* fix: update changeset

* fix: remove @ts-expect-errors

* fix: non-nullable assertion
---
 .changeset/mighty-zebras-turn.md              |  20 ++
 .../[slug]/_actions/get-more-images.ts        |  54 ++++
 .../product/[slug]/_components/reviews.tsx    |   5 +-
 .../(default)/product/[slug]/page-data.ts     |   7 +-
 .../(default)/product/[slug]/page.tsx         |  11 +-
 core/messages/en.json                         |   2 +
 core/package.json                             |   8 +-
 core/vibes/soul/primitives/carousel/index.tsx |  22 +-
 .../soul/sections/product-detail/index.tsx    |  31 +-
 .../product-detail/product-gallery.tsx        | 267 +++++++++++++++---
 core/vibes/soul/sections/reviews/index.tsx    |  10 +-
 .../soul/sections/reviews/review-form.tsx     |   9 +-
 core/vibes/soul/sections/slideshow/index.tsx  |  12 +-
 pnpm-lock.yaml                                | 111 +++++---
 14 files changed, 456 insertions(+), 113 deletions(-)
 create mode 100644 .changeset/mighty-zebras-turn.md
 create mode 100644 core/app/[locale]/(default)/product/[slug]/_actions/get-more-images.ts

diff --git a/.changeset/mighty-zebras-turn.md b/.changeset/mighty-zebras-turn.md
new file mode 100644
index 0000000000..b7cefb1893
--- /dev/null
+++ b/.changeset/mighty-zebras-turn.md
@@ -0,0 +1,20 @@
+---
+"@bigcommerce/catalyst-core": minor
+---
+
+Add pagination support for the product gallery. When a product has more images than the initial page load, new images will load as batches once the user reaches the end of the existing thumbnails. Thumbnail images now will display in horizontal direction in all viewport sizes.
+
+## Migration
+
+1. Create the new server action file `core/app/[locale]/(default)/product/[slug]/_actions/get-more-images.ts` with a GraphQL query to fetch additional product images with pagination.
+
+2. Update the product page data fetching in `core/app/[locale]/(default)/product/[slug]/page-data.ts` to include `pageInfo` (with `hasNextPage` and `endCursor`) from the images query.
+
+3. Update `core/app/[locale]/(default)/product/[slug]/page.tsx` to pass the new pagination props (`pageInfo`, `productId`, `loadMoreAction`) to the `ProductDetail` component.
+
+4. The `ProductGallery` component now accepts optional props for pagination:
+   - `pageInfo?: { hasNextPage: boolean; endCursor: string | null }`
+   - `productId?: number`
+   - `loadMoreAction?: ProductGalleryLoadMoreAction`
+
+Due to the number of changes, it is recommended to use the PR as a reference for migration.
diff --git a/core/app/[locale]/(default)/product/[slug]/_actions/get-more-images.ts b/core/app/[locale]/(default)/product/[slug]/_actions/get-more-images.ts
new file mode 100644
index 0000000000..4d52edc9bd
--- /dev/null
+++ b/core/app/[locale]/(default)/product/[slug]/_actions/get-more-images.ts
@@ -0,0 +1,54 @@
+'use server';
+
+import { removeEdgesAndNodes } from '@bigcommerce/catalyst-client';
+
+import { getSessionCustomerAccessToken } from '~/auth';
+import { client } from '~/client';
+import { graphql } from '~/client/graphql';
+import { revalidate } from '~/client/revalidate-target';
+
+const MoreProductImagesQuery = graphql(`
+  query MoreProductImagesQuery($entityId: Int!, $first: Int!, $after: String!) {
+    site {
+      product(entityId: $entityId) {
+        images(first: $first, after: $after) {
+          pageInfo {
+            hasNextPage
+            endCursor
+          }
+          edges {
+            node {
+              altText
+              url: urlTemplate(lossy: true)
+            }
+          }
+        }
+      }
+    }
+  }
+`);
+
+export async function getMoreProductImages(
+  productId: number,
+  cursor: string,
+  limit = 12,
+): Promise<{
+  images: Array<{ src: string; alt: string }>;
+  pageInfo: { hasNextPage: boolean; endCursor: string | null };
+}> {
+  const customerAccessToken = await getSessionCustomerAccessToken();
+
+  const { data } = await client.fetch({
+    document: MoreProductImagesQuery,
+    variables: { entityId: productId, first: limit, after: cursor },
+    customerAccessToken,
+    fetchOptions: customerAccessToken ? { cache: 'no-store' } : { next: { revalidate } },
+  });
+
+  const images = removeEdgesAndNodes(data.site.product?.images ?? { edges: [] });
+
+  return {
+    images: images.map((img) => ({ src: img.url, alt: img.altText })),
+    pageInfo: data.site.product?.images.pageInfo ?? { hasNextPage: false, endCursor: null },
+  };
+}
diff --git a/core/app/[locale]/(default)/product/[slug]/_components/reviews.tsx b/core/app/[locale]/(default)/product/[slug]/_components/reviews.tsx
index 4bfc58e359..6429de74be 100644
--- a/core/app/[locale]/(default)/product/[slug]/_components/reviews.tsx
+++ b/core/app/[locale]/(default)/product/[slug]/_components/reviews.tsx
@@ -77,7 +77,10 @@ const getReviews = cache(async (productId: number, paginationArgs: object) => {
 interface Props {
   productId: number;
   searchParams: Promise<SearchParams>;
-  streamableImages: Streamable<Array<{ src: string; alt: string }>>;
+  streamableImages: Streamable<{
+    images: Array<{ src: string; alt: string }>;
+    pageInfo?: { hasNextPage: boolean; endCursor: string | null };
+  }>;
   streamableProduct: Streamable<Awaited<ReturnType<typeof getStreamableProduct>>>;
 }
 
diff --git a/core/app/[locale]/(default)/product/[slug]/page-data.ts b/core/app/[locale]/(default)/product/[slug]/page-data.ts
index 6a4b6a1670..0f7fccc2c4 100644
--- a/core/app/[locale]/(default)/product/[slug]/page-data.ts
+++ b/core/app/[locale]/(default)/product/[slug]/page-data.ts
@@ -274,7 +274,12 @@ const StreamableProductQuery = graphql(
           optionValueIds: $optionValueIds
           useDefaultOptionSelections: $useDefaultOptionSelections
         ) {
-          images {
+          entityId
+          images(first: 12) {
+            pageInfo {
+              hasNextPage
+              endCursor
+            }
             edges {
               node {
                 altText
diff --git a/core/app/[locale]/(default)/product/[slug]/page.tsx b/core/app/[locale]/(default)/product/[slug]/page.tsx
index bdde5b1230..b432679047 100644
--- a/core/app/[locale]/(default)/product/[slug]/page.tsx
+++ b/core/app/[locale]/(default)/product/[slug]/page.tsx
@@ -14,6 +14,7 @@ import { productOptionsTransformer } from '~/data-transformers/product-options-t
 import { getPreferredCurrencyCode } from '~/lib/currency';
 
 import { addToCart } from './_actions/add-to-cart';
+import { getMoreProductImages } from './_actions/get-more-images';
 import { submitReview } from './_actions/submit-review';
 import { ProductAnalyticsProvider } from './_components/product-analytics-provider';
 import { ProductSchema } from './_components/product-schema';
@@ -182,9 +183,12 @@ export default async function Product({ params, searchParams }: Props) {
         alt: image.altText,
       }));
 
-    return product.defaultImage
-      ? [{ src: product.defaultImage.url, alt: product.defaultImage.altText }, ...images]
-      : images;
+    return {
+      images: product.defaultImage
+        ? [{ src: product.defaultImage.url, alt: product.defaultImage.altText }, ...images]
+        : images,
+      pageInfo: product.images.pageInfo,
+    };
   });
 
   const streameableCtaLabel = Streamable.from(async () => {
@@ -546,6 +550,7 @@ export default async function Product({ params, searchParams }: Props) {
           emptySelectPlaceholder={t('ProductDetails.emptySelectPlaceholder')}
           fields={productOptionsTransformer(baseProduct.productOptions)}
           incrementLabel={t('ProductDetails.increaseQuantity')}
+          loadMoreImagesAction={getMoreProductImages}
           prefetch={true}
           product={{
             id: baseProduct.entityId.toString(),
diff --git a/core/messages/en.json b/core/messages/en.json
index 6c71464727..1f09a50589 100644
--- a/core/messages/en.json
+++ b/core/messages/en.json
@@ -463,6 +463,8 @@
       "additionalInformation": "Additional information",
       "currentStock": "{quantity, number} in stock",
       "backorderQuantity": "{quantity, number} will be on backorder",
+      "loadingMoreImages": "Loading more images",
+      "imagesLoaded": "{count, plural, =1 {1 more image loaded} other {# more images loaded}}",
       "Submit": {
         "addToCart": "Add to cart",
         "outOfStock": "Out of stock",
diff --git a/core/package.json b/core/package.json
index 3ada39fa58..30f5af80e5 100644
--- a/core/package.json
+++ b/core/package.json
@@ -46,10 +46,10 @@
     "clsx": "^2.1.1",
     "content-security-policy-builder": "^2.3.0",
     "deepmerge": "^4.3.1",
-    "embla-carousel": "8.5.2",
-    "embla-carousel-autoplay": "8.5.2",
-    "embla-carousel-fade": "8.5.2",
-    "embla-carousel-react": "8.5.2",
+    "embla-carousel": "9.0.0-rc01",
+    "embla-carousel-autoplay": "9.0.0-rc01",
+    "embla-carousel-fade": "9.0.0-rc01",
+    "embla-carousel-react": "9.0.0-rc01",
     "gql.tada": "^1.8.10",
     "graphql": "^16.11.0",
     "dompurify": "^3.3.1",
diff --git a/core/vibes/soul/primitives/carousel/index.tsx b/core/vibes/soul/primitives/carousel/index.tsx
index 701f766355..11e21f8044 100644
--- a/core/vibes/soul/primitives/carousel/index.tsx
+++ b/core/vibes/soul/primitives/carousel/index.tsx
@@ -58,13 +58,13 @@ function Carousel({
   const onSelect = React.useCallback((api: CarouselApi) => {
     if (!api) return;
 
-    setCanScrollPrev(api.canScrollPrev());
-    setCanScrollNext(api.canScrollNext());
+    setCanScrollPrev(api.canGoToPrev());
+    setCanScrollNext(api.canGoToNext());
   }, []);
 
-  const scrollPrev = useCallback(() => api?.scrollPrev(), [api]);
+  const scrollPrev = useCallback(() => api?.goToPrev(), [api]);
 
-  const scrollNext = useCallback(() => api?.scrollNext(), [api]);
+  const scrollNext = useCallback(() => api?.goToNext(), [api]);
 
   const handleKeyDown = useCallback(
     (event: React.KeyboardEvent<HTMLDivElement>) => {
@@ -89,7 +89,7 @@ function Carousel({
     if (!api) return;
 
     onSelect(api);
-    api.on('reInit', onSelect);
+    api.on('reinit', onSelect);
     api.on('select', onSelect);
 
     return () => {
@@ -225,7 +225,7 @@ function CarouselScrollbar({
       if (!api) return 0;
 
       const point = nextProgress / 100;
-      const snapList = api.scrollSnapList();
+      const snapList = api.snapList();
 
       if (snapList.length === 0) return -1;
 
@@ -241,14 +241,14 @@ function CarouselScrollbar({
   useEffect(() => {
     if (!api) return;
 
-    const snapList = api.scrollSnapList();
+    const snapList = api.snapList();
     const closestSnapIndex = findClosestSnap(progress);
     const scrollbarWidth = 100 / snapList.length;
     const scrollbarLeft = (closestSnapIndex / snapList.length) * 100;
 
     setScrollbarPosition({ width: scrollbarWidth, left: scrollbarLeft });
 
-    api.scrollTo(closestSnapIndex);
+    api.goTo(closestSnapIndex);
   }, [progress, api, findClosestSnap]);
 
   useEffect(() => {
@@ -258,17 +258,17 @@ function CarouselScrollbar({
       if (!api) return;
 
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      setProgress(api.scrollSnapList()[api.selectedScrollSnap()]! * 100);
+      setProgress(api.snapList()[api.selectedSnap()]! * 100);
     }
 
     api.on('select', onScroll);
     api.on('scroll', onScroll);
-    api.on('reInit', onScroll);
+    api.on('reinit', onScroll);
 
     return () => {
       api.off('select', onScroll);
       api.off('scroll', onScroll);
-      api.off('reInit', onScroll);
+      api.off('reinit', onScroll);
     };
   }, [api]);
 
diff --git a/core/vibes/soul/sections/product-detail/index.tsx b/core/vibes/soul/sections/product-detail/index.tsx
index ffa219b17f..fe08e3e78e 100644
--- a/core/vibes/soul/sections/product-detail/index.tsx
+++ b/core/vibes/soul/sections/product-detail/index.tsx
@@ -6,7 +6,10 @@ import { AnimatedUnderline } from '@/vibes/soul/primitives/animated-underline';
 import { Price, PriceLabel } from '@/vibes/soul/primitives/price-label';
 import * as Skeleton from '@/vibes/soul/primitives/skeleton';
 import { type Breadcrumb, Breadcrumbs } from '@/vibes/soul/sections/breadcrumbs';
-import { ProductGallery } from '@/vibes/soul/sections/product-detail/product-gallery';
+import {
+  ProductGallery,
+  ProductGalleryLoadMoreAction,
+} from '@/vibes/soul/sections/product-detail/product-gallery';
 import { ReviewForm, SubmitReviewAction } from '@/vibes/soul/sections/reviews/review-form';
 
 import {
@@ -22,7 +25,10 @@ interface ProductDetailProduct {
   id: string;
   title: string;
   href: string;
-  images: Streamable<Array<{ src: string; alt: string }>>;
+  images: Streamable<{
+    images: Array<{ src: string; alt: string }>;
+    pageInfo?: { hasNextPage: boolean; endCursor: string | null };
+  }>;
   price?: Streamable<Price | null>;
   subtitle?: string;
   badge?: string;
@@ -68,6 +74,7 @@ export interface ProductDetailProps<F extends Field> {
   reviewFormTitleLabel?: string;
   reviewFormAction: SubmitReviewAction;
   user: Streamable<{ email: string; name: string }>;
+  loadMoreImagesAction?: ProductGalleryLoadMoreAction;
 }
 
 // eslint-disable-next-line valid-jsdoc
@@ -109,6 +116,7 @@ export function ProductDetail<F extends Field>({
   reviewFormTitleLabel,
   reviewFormAction,
   user,
+  loadMoreImagesAction,
 }: ProductDetailProps<F>) {
   return (
     <section className="@container">
@@ -124,7 +132,14 @@ export function ProductDetail<F extends Field>({
               <div className="grid grid-cols-1 items-stretch gap-x-8 gap-y-8 @2xl:grid-cols-2 @5xl:gap-x-12">
                 <div className="group/product-gallery hidden @2xl:block">
                   <Stream fallback={<ProductGallerySkeleton />} value={product.images}>
-                    {(images) => <ProductGallery images={images} />}
+                    {(imagesData) => (
+                      <ProductGallery
+                        images={imagesData.images}
+                        loadMoreAction={loadMoreImagesAction}
+                        pageInfo={imagesData.pageInfo}
+                        productId={Number(product.id)}
+                      />
+                    )}
                   </Stream>
                 </div>
                 {/* Product Details */}
@@ -185,8 +200,14 @@ export function ProductDetail<F extends Field>({
                   </div>
                   <div className="group/product-gallery mb-8 @2xl:hidden">
                     <Stream fallback={<ProductGallerySkeleton />} value={product.images}>
-                      {(images) => (
-                        <ProductGallery images={images} thumbnailLabel={thumbnailLabel} />
+                      {(imagesData) => (
+                        <ProductGallery
+                          images={imagesData.images}
+                          loadMoreAction={loadMoreImagesAction}
+                          pageInfo={imagesData.pageInfo}
+                          productId={Number(product.id)}
+                          thumbnailLabel={thumbnailLabel}
+                        />
                       )}
                     </Stream>
                   </div>
diff --git a/core/vibes/soul/sections/product-detail/product-gallery.tsx b/core/vibes/soul/sections/product-detail/product-gallery.tsx
index 4567bc5b80..be9d0db905 100644
--- a/core/vibes/soul/sections/product-detail/product-gallery.tsx
+++ b/core/vibes/soul/sections/product-detail/product-gallery.tsx
@@ -1,11 +1,23 @@
 'use client';
 
 import { clsx } from 'clsx';
+import { EmblaCarouselType, EngineType } from 'embla-carousel';
 import useEmblaCarousel from 'embla-carousel-react';
-import { useEffect, useState } from 'react';
+import { useTranslations } from 'next-intl';
+import { startTransition, useCallback, useEffect, useRef, useState } from 'react';
 
+import * as Skeleton from '@/vibes/soul/primitives/skeleton';
 import { Image } from '~/components/image';
 
+export type ProductGalleryLoadMoreAction = (
+  productId: number,
+  cursor: string,
+  limit?: number,
+) => Promise<{
+  images: Array<{ src: string; alt: string }>;
+  pageInfo: { hasNextPage: boolean; endCursor: string | null };
+}>;
+
 export interface ProductGalleryProps {
   images: Array<{ alt: string; src: string }>;
   className?: string;
@@ -23,6 +35,9 @@ export interface ProductGalleryProps {
     | '5:6'
     | '6:5';
   fit?: 'contain' | 'cover';
+  pageInfo?: { hasNextPage: boolean; endCursor: string | null };
+  productId?: number;
+  loadMoreAction?: ProductGalleryLoadMoreAction;
 }
 
 // eslint-disable-next-line valid-jsdoc
@@ -36,42 +51,193 @@ export interface ProductGalleryProps {
  *   --product-gallery-image-background: hsl(var(--contrast-100));
  *   --product-gallery-image-border: hsl(var(--contrast-100));
  *   --product-gallery-image-border-active: hsl(var(--foreground));
+ *   --product-gallery-load-more: hsl(var(--foreground));
  * }
  * ```
  */
 export function ProductGallery({
-  images,
+  images: initialImages,
   className,
   thumbnailLabel = 'View image number',
   aspectRatio = '4:5',
   fit = 'contain',
+  pageInfo: initialPageInfo,
+  productId,
+  loadMoreAction,
 }: ProductGalleryProps) {
-  const [previewImage, setPreviewImage] = useState(0);
+  const t = useTranslations('Product.ProductDetails');
+
+  const [images, setImages] = useState(initialImages);
+  const [pageInfo, setPageInfo] = useState(initialPageInfo);
+  const [hasMoreToLoad, setHasMoreToLoad] = useState(initialPageInfo?.hasNextPage ?? false);
+  const [selectedIndex, setSelectedIndex] = useState(0);
+  const [isLoading, setIsLoading] = useState(false);
+  const [loadingStatus, setLoadingStatus] = useState('');
+
+  const scrollListenerRef = useRef<() => void>(() => undefined);
+  const listenForScrollRef = useRef(true);
+  const hasMoreToLoadRef = useRef(hasMoreToLoad);
+
   const [emblaRef, emblaApi] = useEmblaCarousel();
+  const [emblaThumbsRef, emblaThumbsApi] = useEmblaCarousel({
+    containScroll: 'keepSnaps',
+    dragFree: true,
+  });
 
+  // Keep ref in sync with state
   useEffect(() => {
-    if (!emblaApi) return;
+    hasMoreToLoadRef.current = hasMoreToLoad;
+  }, [hasMoreToLoad]);
+
+  const onThumbClick = useCallback(
+    (index: number) => {
+      if (!emblaApi || !emblaThumbsApi) return;
+      emblaApi.goTo(index);
+    },
+    [emblaApi, emblaThumbsApi],
+  );
+
+  const onSelect = useCallback(() => {
+    if (!emblaApi || !emblaThumbsApi) return;
+    setSelectedIndex(emblaApi.selectedSnap());
 
-    const onSelect = () => setPreviewImage(emblaApi.selectedScrollSnap());
+    emblaThumbsApi.goTo(emblaApi.selectedSnap());
+  }, [emblaApi, emblaThumbsApi]);
 
+  useEffect(() => {
+    if (!emblaApi) return;
+    onSelect();
     emblaApi.on('select', onSelect);
 
     return () => {
       emblaApi.off('select', onSelect);
     };
-  }, [emblaApi]);
+  }, [emblaApi, onSelect]);
+
+  const onSlideChanges = useCallback((carouselApi: EmblaCarouselType) => {
+    const reloadEmbla = (): void => {
+      const oldEngine = carouselApi.internalEngine();
+
+      carouselApi.reInit();
+
+      const newEngine = carouselApi.internalEngine();
+      const copyEngineModules: Array<keyof EngineType> = [
+        'scrollBody',
+        'location',
+        'offsetLocation',
+        'previousLocation',
+        'target',
+      ];
+
+      copyEngineModules.forEach((engineModule) => {
+        Object.assign(newEngine[engineModule], oldEngine[engineModule]);
+      });
+
+      newEngine.translate.to(oldEngine.location.get());
+
+      const { index } = newEngine.scrollTarget.byDistance(0, false);
+
+      newEngine.indexCurrent.set(index);
+      newEngine.animation.start();
+
+      listenForScrollRef.current = true;
+    };
+
+    const reloadAfterPointerUp = (): void => {
+      carouselApi.off('pointerup', reloadAfterPointerUp);
+      reloadEmbla();
+    };
+
+    const engine = carouselApi.internalEngine();
+
+    if (hasMoreToLoadRef.current && engine.dragHandler.pointerDown()) {
+      const boundsActive = engine.limit.pastMaxBound(engine.target.get());
+
+      engine.scrollBounds.toggleActive(boundsActive);
+      carouselApi.on('pointerup', reloadAfterPointerUp);
+    } else {
+      reloadEmbla();
+    }
+  }, []);
+
+  const loadMore = useCallback(
+    (thumbsApi: EmblaCarouselType) => {
+      const endCursor = pageInfo?.endCursor;
+
+      if (!loadMoreAction || !productId || !endCursor || isLoading) return;
+
+      listenForScrollRef.current = false;
+      setIsLoading(true);
+      setLoadingStatus(t('loadingMoreImages'));
+
+      startTransition(async () => {
+        const result = await loadMoreAction(productId, endCursor);
+
+        if (!result.pageInfo.hasNextPage) {
+          setHasMoreToLoad(false);
+          thumbsApi.off('scroll', scrollListenerRef.current);
+        }
+
+        setImages((prev) => [...prev, ...result.images]);
+        setPageInfo(result.pageInfo);
+        setIsLoading(false);
+        setLoadingStatus(t('imagesLoaded', { count: result.images.length }));
+      });
+    },
+    [loadMoreAction, productId, pageInfo?.endCursor, isLoading, t],
+  );
+
+  const onThumbsScroll = useCallback(
+    (thumbsApi: EmblaCarouselType) => {
+      if (!listenForScrollRef.current) return;
+
+      const slideCount = thumbsApi.slideNodes().length;
+      const lastSlideIndex = slideCount - 1;
+      const secondLastSlideIndex = slideCount - 2;
+      const slidesInView = thumbsApi.slidesInView();
+
+      // Trigger when last or second-to-last thumbnail is in view
+      const shouldLoadMore =
+        slidesInView.includes(lastSlideIndex) || slidesInView.includes(secondLastSlideIndex);
+
+      if (shouldLoadMore) {
+        loadMore(thumbsApi);
+      }
+    },
+    [loadMore],
+  );
+
+  const addThumbsScrollListener = useCallback(
+    (thumbsApi: EmblaCarouselType) => {
+      scrollListenerRef.current = () => onThumbsScroll(thumbsApi);
+      thumbsApi.on('scroll', scrollListenerRef.current);
+    },
+    [onThumbsScroll],
+  );
 
-  const selectImage = (index: number) => {
-    setPreviewImage(index);
-    if (emblaApi) emblaApi.scrollTo(index);
-  };
+  useEffect(() => {
+    if (!emblaThumbsApi) return;
+
+    addThumbsScrollListener(emblaThumbsApi);
+
+    const onResize = () => emblaThumbsApi.reInit();
+
+    window.addEventListener('resize', onResize);
+    emblaThumbsApi.on('destroy', () => window.removeEventListener('resize', onResize));
+    emblaThumbsApi.on('slideschanged', onSlideChanges);
+
+    return () => {
+      emblaThumbsApi.off('scroll', scrollListenerRef.current);
+      emblaThumbsApi.off('slideschanged', onSlideChanges);
+    };
+  }, [emblaThumbsApi, addThumbsScrollListener, onSlideChanges]);
 
   return (
-    <div className={clsx('sticky top-4 flex flex-col gap-2 @2xl:flex-row', className)}>
-      <div
-        className="w-full overflow-hidden rounded-xl @xl:rounded-2xl @2xl:order-2"
-        ref={emblaRef}
-      >
+    <div className={clsx('sticky top-4 flex flex-col gap-2', className)}>
+      <div aria-live="polite" className="sr-only" role="status">
+        {loadingStatus}
+      </div>
+      <div className="w-full overflow-hidden rounded-xl @xl:rounded-2xl" ref={emblaRef}>
         <div className="flex">
           {images.map((image, idx) => (
             <div
@@ -111,35 +277,50 @@ export function ProductGallery({
           ))}
         </div>
       </div>
-      <div className="flex max-w-full shrink-0 flex-row gap-2 overflow-x-auto p-1 @2xl:order-1 @2xl:flex-col">
-        {images.map((image, index) => (
-          <button
-            aria-label={`${thumbnailLabel} ${index + 1}`}
-            className={clsx(
-              'relative h-12 w-12 shrink-0 overflow-hidden rounded-lg border transition-all duration-300 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--product-gallery-focus,hsl(var(--primary)))] focus-visible:ring-offset-2 @md:h-16 @md:w-16',
-              index === previewImage
-                ? 'border-[var(--product-gallery-image-border-active,hsl(var(--foreground)))]'
-                : 'border-transparent',
+
+      <div className="flex max-w-full shrink-0 flex-col gap-2">
+        <div className="overflow-hidden" ref={emblaThumbsRef}>
+          <div className="flex flex-row gap-2 p-1">
+            {images.map((image, index) => (
+              <button
+                aria-label={`${thumbnailLabel} ${index + 1}`}
+                className={clsx(
+                  'relative h-12 w-12 shrink-0 overflow-hidden rounded-lg border transition-all duration-300 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--product-gallery-focus,hsl(var(--primary)))] focus-visible:ring-offset-2 @md:h-16 @md:w-16',
+                  index === selectedIndex
+                    ? 'border-[var(--product-gallery-image-border-active,hsl(var(--foreground)))]'
+                    : 'border-transparent',
+                )}
+                key={index}
+                onClick={() => onThumbClick(index)}
+                type="button"
+              >
+                <div
+                  className={clsx(
+                    index === selectedIndex ? 'opacity-100' : 'opacity-50',
+                    'transition-all duration-300 hover:opacity-100',
+                  )}
+                >
+                  <Image
+                    alt={image.alt}
+                    className="bg-[var(--product-gallery-image-background,hsl(var(--contrast-100)))] object-cover"
+                    fill
+                    sizes="(min-width: 28rem) 4rem, 3rem"
+                    src={image.src}
+                  />
+                </div>
+              </button>
+            ))}
+            {hasMoreToLoad && (
+              <div className="flex animate-pulse gap-2">
+                <Skeleton.Box className="h-12 w-12 shrink-0 rounded-lg @md:h-16 @md:w-16" />
+                <Skeleton.Box className="h-12 w-12 shrink-0 rounded-lg @md:h-16 @md:w-16" />
+                <Skeleton.Box className="h-12 w-12 shrink-0 rounded-lg @md:h-16 @md:w-16" />
+                <Skeleton.Box className="h-12 w-12 shrink-0 rounded-lg @md:h-16 @md:w-16" />
+                <Skeleton.Box className="h-12 w-12 shrink-0 rounded-lg @md:h-16 @md:w-16" />
+              </div>
             )}
-            key={index}
-            onClick={() => selectImage(index)}
-          >
-            <div
-              className={clsx(
-                index === previewImage ? 'opacity-100' : 'opacity-50',
-                'transition-all duration-300 hover:opacity-100',
-              )}
-            >
-              <Image
-                alt={image.alt}
-                className="bg-[var(--product-gallery-image-background,hsl(var(--contrast-100)))] object-cover"
-                fill
-                sizes="(min-width: 28rem) 4rem, 3rem"
-                src={image.src}
-              />
-            </div>
-          </button>
-        ))}
+          </div>
+        </div>
       </div>
     </div>
   );
diff --git a/core/vibes/soul/sections/reviews/index.tsx b/core/vibes/soul/sections/reviews/index.tsx
index d248f66f29..b27c75f97d 100644
--- a/core/vibes/soul/sections/reviews/index.tsx
+++ b/core/vibes/soul/sections/reviews/index.tsx
@@ -34,7 +34,10 @@ interface Props {
   formReviewLabel?: string;
   formNameLabel?: string;
   formEmailLabel?: string;
-  streamableImages: Streamable<Array<{ src: string; alt: string }>>;
+  streamableImages: Streamable<{
+    images: Array<{ src: string; alt: string }>;
+    pageInfo?: { hasNextPage: boolean; endCursor: string | null };
+  }>;
   streamableProduct: Streamable<{ name: string }>;
   streamableUser: Streamable<{ email: string; name: string }>;
 }
@@ -212,7 +215,10 @@ export function ReviewsEmptyState({
   formReviewLabel?: string;
   formNameLabel?: string;
   formEmailLabel?: string;
-  streamableImages: Streamable<Array<{ src: string; alt: string }>>;
+  streamableImages: Streamable<{
+    images: Array<{ src: string; alt: string }>;
+    pageInfo?: { hasNextPage: boolean; endCursor: string | null };
+  }>;
   streamableProduct: Streamable<{ name: string }>;
   streamableUser: Streamable<{ email: string; name: string }>;
 }) {
diff --git a/core/vibes/soul/sections/reviews/review-form.tsx b/core/vibes/soul/sections/reviews/review-form.tsx
index 1f72c818bf..49e263c845 100644
--- a/core/vibes/soul/sections/reviews/review-form.tsx
+++ b/core/vibes/soul/sections/reviews/review-form.tsx
@@ -38,7 +38,10 @@ interface Props {
   formReviewLabel?: string;
   formNameLabel?: string;
   formEmailLabel?: string;
-  streamableImages: Streamable<Array<{ src: string; alt: string }>>;
+  streamableImages: Streamable<{
+    images: Array<{ src: string; alt: string }>;
+    pageInfo?: { hasNextPage: boolean; endCursor: string | null };
+  }>;
   streamableProduct: Streamable<{ name: string }>;
   streamableUser: Streamable<{ email: string; name: string }>;
 }
@@ -126,8 +129,8 @@ export const ReviewForm = ({
             }
             value={Streamable.all([streamableProduct, streamableImages])}
           >
-            {([product, images]) => {
-              const firstImage = images[0];
+            {([product, imagesData]) => {
+              const firstImage = imagesData.images[0];
 
               return (
                 <>
diff --git a/core/vibes/soul/sections/slideshow/index.tsx b/core/vibes/soul/sections/slideshow/index.tsx
index 80594992dc..f98a1c5fa3 100644
--- a/core/vibes/soul/sections/slideshow/index.tsx
+++ b/core/vibes/soul/sections/slideshow/index.tsx
@@ -51,18 +51,18 @@ const useProgressButton = (
   const onProgressButtonClick = useCallback(
     (index: number) => {
       if (!emblaApi) return;
-      emblaApi.scrollTo(index);
+      emblaApi.goTo(index);
       if (onButtonClick) onButtonClick(emblaApi);
     },
     [emblaApi, onButtonClick],
   );
 
   const onInit = useCallback((emblaAPI: EmblaCarouselType) => {
-    setScrollSnaps(emblaAPI.scrollSnapList());
+    setScrollSnaps(emblaAPI.snapList());
   }, []);
 
   const onSelect = useCallback((emblaAPI: EmblaCarouselType) => {
-    setSelectedIndex(emblaAPI.selectedScrollSnap());
+    setSelectedIndex(emblaAPI.selectedSnap());
   }, []);
 
   useEffect(() => {
@@ -71,7 +71,7 @@ const useProgressButton = (
     onInit(emblaApi);
     onSelect(emblaApi);
 
-    emblaApi.on('reInit', onInit).on('reInit', onSelect).on('select', onSelect);
+    emblaApi.on('reinit', onInit).on('reinit', onSelect).on('select', onSelect);
   }, [emblaApi, onInit, onSelect]);
 
   return {
@@ -106,7 +106,7 @@ const useProgressButton = (
  */
 export function Slideshow({ slides, playOnInit = true, interval = 5000, className }: Props) {
   const [emblaRef, emblaApi] = useEmblaCarousel({ loop: true, duration: 20 }, [
-    Autoplay({ delay: interval, playOnInit }),
+    Autoplay({ delay: interval, active: playOnInit }),
     Fade(),
   ]);
   const { selectedIndex, scrollSnaps, onProgressButtonClick } = useProgressButton(emblaApi);
@@ -145,7 +145,7 @@ export function Slideshow({ slides, playOnInit = true, interval = 5000, classNam
       .on('autoplay:stop', () => {
         setIsPlaying(false);
       })
-      .on('reInit', () => {
+      .on('reinit', () => {
         setIsPlaying(autoplay.isPlaying());
       });
   }, [emblaApi, playCount]);
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index dbc27dcfcd..9c69467826 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -135,17 +135,17 @@ importers:
         specifier: ^3.3.1
         version: 3.3.1
       embla-carousel:
-        specifier: 8.5.2
-        version: 8.5.2
+        specifier: 9.0.0-rc01
+        version: 9.0.0-rc01
       embla-carousel-autoplay:
-        specifier: 8.5.2
-        version: 8.5.2(embla-carousel@8.5.2)
+        specifier: 9.0.0-rc01
+        version: 9.0.0-rc01(embla-carousel@9.0.0-rc01)
       embla-carousel-fade:
-        specifier: 8.5.2
-        version: 8.5.2(embla-carousel@8.5.2)
+        specifier: 9.0.0-rc01
+        version: 9.0.0-rc01(embla-carousel@9.0.0-rc01)
       embla-carousel-react:
-        specifier: 8.5.2
-        version: 8.5.2(react@19.1.5)
+        specifier: 9.0.0-rc01
+        version: 9.0.0-rc01(react@19.1.5)
       gql.tada:
         specifier: ^1.8.10
         version: 1.8.10(graphql@16.11.0)(typescript@5.8.3)
@@ -5997,28 +5997,28 @@ packages:
   electron-to-chromium@1.5.165:
     resolution: {integrity: sha512-naiMx1Z6Nb2TxPU6fiFrUrDTjyPMLdTtaOd2oLmG8zVSg2hCWGkhPyxwk+qRmZ1ytwVqUv0u7ZcDA5+ALhaUtw==}
 
-  embla-carousel-autoplay@8.5.2:
-    resolution: {integrity: sha512-27emJ0px3q/c0kCHCjwRrEbYcyYUPfGO3g5IBWF1i7714TTzE6L9P81V6PHLoSMAKJ1aHoT2e7YFOsuFKCbyag==}
+  embla-carousel-autoplay@9.0.0-rc01:
+    resolution: {integrity: sha512-gl7jUe0X9xd5v7IiyFF2FCR+KTBesnutM0gQ3S75oo9EizZi5tJMNdVaFwvzepz6kGzDkkSbKMWitQvAbFVfdQ==}
     peerDependencies:
-      embla-carousel: 8.5.2
+      embla-carousel: 9.0.0-rc01
 
-  embla-carousel-fade@8.5.2:
-    resolution: {integrity: sha512-QJ46Xy+mpijjquQeIY0d0sPSy34XduREUnz7tn1K20hcKyZYTONNIXQZu3GGNwG59cvhMqYJMw9ki92Rjd14YA==}
+  embla-carousel-fade@9.0.0-rc01:
+    resolution: {integrity: sha512-sIpJaJmcrp7+vm5r/XHEqDcCo5Fg29DdL/2Za5FQ2k//ePqapnPPzfUeG018uPT/6ylBjhn007s4sRkilbu2GA==}
     peerDependencies:
-      embla-carousel: 8.5.2
+      embla-carousel: 9.0.0-rc01
 
-  embla-carousel-react@8.5.2:
-    resolution: {integrity: sha512-Tmx+uY3MqseIGdwp0ScyUuxpBgx5jX1f7od4Cm5mDwg/dptEiTKf9xp6tw0lZN2VA9JbnVMl/aikmbc53c6QFA==}
+  embla-carousel-react@9.0.0-rc01:
+    resolution: {integrity: sha512-2ik9QtVm3UXJWkVdEEm6bInmxNSmxq9Z2q5GWuJx3v2vZvujmlDzcrIE6bvh+wWgPmDn6jekJCRHm1eEl/N0SA==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.1 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc
 
-  embla-carousel-reactive-utils@8.5.2:
-    resolution: {integrity: sha512-QC8/hYSK/pEmqEdU1IO5O+XNc/Ptmmq7uCB44vKplgLKhB/l0+yvYx0+Cv0sF6Ena8Srld5vUErZkT+yTahtDg==}
+  embla-carousel-reactive-utils@9.0.0-rc01:
+    resolution: {integrity: sha512-RnW0NMrL7wVAQb9jro+l96hLI2JairyFHS2Jv+fvXakveD/c5aD9aoNH94YRbTmi0G7PxrKSxydmCpTy5eFmrA==}
     peerDependencies:
-      embla-carousel: 8.5.2
+      embla-carousel: 9.0.0-rc01
 
-  embla-carousel@8.5.2:
-    resolution: {integrity: sha512-xQ9oVLrun/eCG/7ru3R+I5bJ7shsD8fFwLEY7yPe27/+fDHCNj0OT5EoG5ZbFyOxOcG6yTwW8oTz/dWyFnyGpg==}
+  embla-carousel@9.0.0-rc01:
+    resolution: {integrity: sha512-4BTERU1gAXgg4Vl0m7hQ1GzePGLNNfM2j030ww8i9idiPXumyRUpaNUDfT2zx1Hv8um1Ew7QKBy/HdNPz8L30g==}
 
   emittery@0.13.1:
     resolution: {integrity: sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==}
@@ -8701,7 +8701,6 @@ packages:
   puppeteer@24.10.0:
     resolution: {integrity: sha512-Oua9VkGpj0S2psYu5e6mCer6W9AU9POEQh22wRgSXnLXASGH+MwLUVWgLCLeP9QPHHcJ7tySUlg4Sa9OJmaLpw==}
     engines: {node: '>=18'}
-    deprecated: < 24.15.0 is no longer supported
     hasBin: true
 
   pure-rand@6.1.0:
@@ -17122,25 +17121,25 @@ snapshots:
 
   electron-to-chromium@1.5.165: {}
 
-  embla-carousel-autoplay@8.5.2(embla-carousel@8.5.2):
+  embla-carousel-autoplay@9.0.0-rc01(embla-carousel@9.0.0-rc01):
     dependencies:
-      embla-carousel: 8.5.2
+      embla-carousel: 9.0.0-rc01
 
-  embla-carousel-fade@8.5.2(embla-carousel@8.5.2):
+  embla-carousel-fade@9.0.0-rc01(embla-carousel@9.0.0-rc01):
     dependencies:
-      embla-carousel: 8.5.2
+      embla-carousel: 9.0.0-rc01
 
-  embla-carousel-react@8.5.2(react@19.1.5):
+  embla-carousel-react@9.0.0-rc01(react@19.1.5):
     dependencies:
-      embla-carousel: 8.5.2
-      embla-carousel-reactive-utils: 8.5.2(embla-carousel@8.5.2)
+      embla-carousel: 9.0.0-rc01
+      embla-carousel-reactive-utils: 9.0.0-rc01(embla-carousel@9.0.0-rc01)
       react: 19.1.5
 
-  embla-carousel-reactive-utils@8.5.2(embla-carousel@8.5.2):
+  embla-carousel-reactive-utils@9.0.0-rc01(embla-carousel@9.0.0-rc01):
     dependencies:
-      embla-carousel: 8.5.2
+      embla-carousel: 9.0.0-rc01
 
-  embla-carousel@8.5.2: {}
+  embla-carousel@9.0.0-rc01: {}
 
   emittery@0.13.1: {}
 
@@ -17369,8 +17368,8 @@ snapshots:
       '@typescript-eslint/parser': 8.28.0(eslint@8.57.1)(typescript@5.8.3)
       eslint: 8.57.1
       eslint-import-resolver-node: 0.3.9
-      eslint-import-resolver-typescript: 3.9.1(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1))(eslint@8.57.1)
-      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint-import-resolver-typescript@3.9.1(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1)
+      eslint-import-resolver-typescript: 3.9.1(eslint-plugin-import@2.31.0)(eslint@8.57.1)
+      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1)
       eslint-plugin-jsx-a11y: 6.10.2(eslint@8.57.1)
       eslint-plugin-react: 7.37.4(eslint@8.57.1)
       eslint-plugin-react-hooks: 5.2.0(eslint@8.57.1)
@@ -17412,6 +17411,21 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  eslint-import-resolver-typescript@3.9.1(eslint-plugin-import@2.31.0)(eslint@8.57.1):
+    dependencies:
+      '@nolyfill/is-core-module': 1.0.39
+      debug: 4.4.1
+      eslint: 8.57.1
+      get-tsconfig: 4.10.0
+      is-bun-module: 1.3.0
+      rspack-resolver: 1.2.2
+      stable-hash: 0.0.5
+      tinyglobby: 0.2.14
+    optionalDependencies:
+      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1)
+    transitivePeerDependencies:
+      - supports-color
+
   eslint-module-utils@2.12.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.9.1(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1):
     dependencies:
       debug: 3.2.7
@@ -17462,6 +17476,35 @@ snapshots:
       - eslint-import-resolver-webpack
       - supports-color
 
+  eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1):
+    dependencies:
+      '@rtsao/scc': 1.1.0
+      array-includes: 3.1.8
+      array.prototype.findlastindex: 1.2.6
+      array.prototype.flat: 1.3.3
+      array.prototype.flatmap: 1.3.3
+      debug: 3.2.7
+      doctrine: 2.1.0
+      eslint: 8.57.1
+      eslint-import-resolver-node: 0.3.9
+      eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.9.1(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1)
+      hasown: 2.0.2
+      is-core-module: 2.16.1
+      is-glob: 4.0.3
+      minimatch: 3.1.2
+      object.fromentries: 2.0.8
+      object.groupby: 1.0.3
+      object.values: 1.2.1
+      semver: 6.3.1
+      string.prototype.trimend: 1.0.9
+      tsconfig-paths: 3.15.0
+    optionalDependencies:
+      '@typescript-eslint/parser': 8.28.0(eslint@8.57.1)(typescript@5.8.3)
+    transitivePeerDependencies:
+      - eslint-import-resolver-typescript
+      - eslint-import-resolver-webpack
+      - supports-color
+
   eslint-plugin-jest-dom@5.5.0(eslint@8.57.1):
     dependencies:
       '@babel/runtime': 7.26.7

From f5330c7248b2e3a32b2bfbb8e3bc6c11742a5d27 Mon Sep 17 00:00:00 2001
From: Jorge Moya <jorge.moya@bigcommerce.com>
Date: Wed, 11 Feb 2026 13:34:33 -0600
Subject: [PATCH 50/69] feat(core): add canonical URLs and hreflang alternates
 for SEO (#2856)

* feat(core): add canonical URLs and hreflang alternates for SEO

* feat(core): add canonical URLs to additional pages

Add canonical meta tags to gift certificates, contact, public wishlist,
and compare pages. Update changeset with migration steps for all pages.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

* fix(core): resolve eslint errors in canonical utility

- Add JSDoc param and returns type annotations
- Replace for...of loop with reduce for array iteration

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

* fix: fetch vanity url

* chore: update changeset

* fix: use URL

---------

Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
---
 .changeset/new-onions-flash.md                | 200 ++++++++++++++++++
 .../(faceted)/brand/[slug]/page-data.ts       |   1 +
 .../(default)/(faceted)/brand/[slug]/page.tsx |   4 +-
 .../(faceted)/category/[slug]/page.tsx        |   9 +-
 .../(default)/blog/[blogId]/page-data.ts      |   1 +
 .../[locale]/(default)/blog/[blogId]/page.tsx |   6 +-
 core/app/[locale]/(default)/blog/page.tsx     |   2 +
 core/app/[locale]/(default)/compare/page.tsx  |   2 +
 .../gift-certificates/balance/page.tsx        |   2 +
 .../(default)/gift-certificates/page.tsx      |   2 +
 .../gift-certificates/purchase/page.tsx       |  13 ++
 core/app/[locale]/(default)/page.tsx          |  10 +
 .../(default)/product/[slug]/page-data.ts     |   1 +
 .../(default)/product/[slug]/page.tsx         |   4 +-
 .../(default)/webpages/[id]/contact/page.tsx  |   4 +-
 .../(default)/webpages/[id]/normal/page.tsx   |   7 +-
 .../(default)/wishlist/[token]/page.tsx       |   2 +
 core/app/[locale]/layout.tsx                  |   6 +
 core/lib/seo/canonical.ts                     |  99 +++++++++
 19 files changed, 369 insertions(+), 6 deletions(-)
 create mode 100644 .changeset/new-onions-flash.md
 create mode 100644 core/lib/seo/canonical.ts

diff --git a/.changeset/new-onions-flash.md b/.changeset/new-onions-flash.md
new file mode 100644
index 0000000000..7bc9afcce9
--- /dev/null
+++ b/.changeset/new-onions-flash.md
@@ -0,0 +1,200 @@
+---
+"@bigcommerce/catalyst-core": patch
+---
+
+Add canonical URLs and hreflang alternates for SEO. Pages now set `alternates.canonical` and `alternates.languages` in `generateMetadata` via the new `getMetadataAlternates` helper in `core/lib/seo/canonical.ts`. The helper fetches the vanity URL via GraphQL (`site.settings.url.vanityUrl`) and is cached per request. The default locale uses no path prefix; other locales use `/{locale}/path`. The root locale layout sets `metadataBase` to the configured vanity URL so canonical URLs resolve correctly.
+
+## Migration steps
+
+### Step 1: Root layout metadata base
+
+The root locale layout now sets `metadataBase` from the vanity URL fetched via GraphQL. This is already included in the `RootLayoutMetadataQuery`.
+
+Update `core/app/[locale]/layout.tsx`:
+
+```diff
++ const vanityUrl = data.site.settings?.url.vanityUrl;
++
+  return {
++   metadataBase: vanityUrl ? new URL(vanityUrl) : undefined,
+    title: {
+```
+
+### Step 2: GraphQL fragment updates
+
+Add the `path` field to brand, blog post, and product queries so metadata can build canonical URLs.
+
+Update `core/app/[locale]/(default)/(faceted)/brand/[slug]/page-data.ts`:
+
+```diff
+  site {
+    brand(entityId: $entityId) {
+      name
++     path
+      seo {
+```
+
+Update `core/app/[locale]/(default)/blog/[blogId]/page-data.ts`:
+
+```diff
+  author
+  htmlBody
+  name
++ path
+  publishedDate {
+```
+
+Update `core/app/[locale]/(default)/product/[slug]/page-data.ts` (in the metadata query):
+
+```diff
+  site {
+    product(entityId: $entityId) {
+      name
++     path
+      defaultImage {
+```
+
+### Step 3: Page metadata alternates
+
+Add the `getMetadataAlternates` import and set `alternates` in `generateMetadata` for each page. The function is async and must be awaited. Ensure `core/lib/seo/canonical.ts` exists (it is included in this release).
+
+Update `core/app/[locale]/(default)/page.tsx` (home):
+
+```diff
++ import { Metadata } from 'next';
+  import { getFormatter, getTranslations, setRequestLocale } from 'next-intl/server';
+  ...
++ import { getMetadataAlternates } from '~/lib/seo/canonical';
+  ...
++ export async function generateMetadata({ params }: Props): Promise<Metadata> {
++   const { locale } = await params;
++   return {
++     alternates: await getMetadataAlternates({ path: '/', locale }),
++   };
++ }
++
+  export default async function Home({ params }: Props) {
+```
+
+For entity pages (product, category, brand, blog, blog post, webpage), add the import and include `alternates` in the existing `generateMetadata` return value using the entity `path` (or breadcrumb-derived path for category and webpage). Example for a brand page:
+
+```diff
++ import { getMetadataAlternates } from '~/lib/seo/canonical';
+  ...
+  export async function generateMetadata(props: Props): Promise<Metadata> {
+-   const { slug } = await props.params;
++   const { slug, locale } = await props.params;
+    ...
+    return {
+      title: pageTitle || brand.name,
+      description: metaDescription,
+      keywords: metaKeywords ? metaKeywords.split(',') : null,
++     alternates: await getMetadataAlternates({ path: brand.path, locale }),
+    };
+  }
+```
+
+### Step 4: Gift certificates pages
+
+Update `core/app/[locale]/(default)/gift-certificates/page.tsx`:
+
+```diff
++ import { getMetadataAlternates } from '~/lib/seo/canonical';
+  ...
+  export async function generateMetadata({ params }: Props): Promise<Metadata> {
+    const { locale } = await params;
+    const t = await getTranslations({ locale, namespace: 'GiftCertificates' });
+
+    return {
+      title: t('title') || 'Gift certificates',
++     alternates: await getMetadataAlternates({ path: '/gift-certificates', locale }),
+    };
+  }
+```
+
+Update `core/app/[locale]/(default)/gift-certificates/balance/page.tsx`:
+
+```diff
++ import { getMetadataAlternates } from '~/lib/seo/canonical';
+  ...
+    return {
+      title: t('title') || 'Gift certificates - Check balance',
++     alternates: await getMetadataAlternates({ path: '/gift-certificates/balance', locale }),
+    };
+```
+
+Add `generateMetadata` to `core/app/[locale]/(default)/gift-certificates/purchase/page.tsx`:
+
+```diff
++ import { Metadata } from 'next';
+  import { getFormatter, getTranslations } from 'next-intl/server';
+  ...
++ import { getMetadataAlternates } from '~/lib/seo/canonical';
+  ...
++ export async function generateMetadata({ params }: Props): Promise<Metadata> {
++   const { locale } = await params;
++   const t = await getTranslations({ locale, namespace: 'GiftCertificates' });
++
++   return {
++     title: t('Purchase.title'),
++     alternates: await getMetadataAlternates({ path: '/gift-certificates/purchase', locale }),
++   };
++ }
+```
+
+### Step 5: Contact page
+
+Update `core/app/[locale]/(default)/webpages/[id]/contact/page.tsx`:
+
+```diff
++ import { getMetadataAlternates } from '~/lib/seo/canonical';
+  ...
+  export async function generateMetadata({ params }: Props): Promise<Metadata> {
+-   const { id } = await params;
++   const { id, locale } = await params;
+    const webpage = await getWebPage(id);
+    const { pageTitle, metaDescription, metaKeywords } = webpage.seo;
+
+    return {
+      title: pageTitle || webpage.title,
+      description: metaDescription,
+      keywords: metaKeywords ? metaKeywords.split(',') : null,
++     alternates: await getMetadataAlternates({ path: webpage.path, locale }),
+    };
+  }
+```
+
+### Step 6: Public wishlist page
+
+Update `core/app/[locale]/(default)/wishlist/[token]/page.tsx`:
+
+```diff
++ import { getMetadataAlternates } from '~/lib/seo/canonical';
+  ...
+  export async function generateMetadata({ params, searchParams }: Props): Promise<Metadata> {
+    const { locale, token } = await params;
+    ...
+    return {
+      title: wishlist?.name ?? t('title'),
++     alternates: await getMetadataAlternates({ path: `/wishlist/${token}`, locale }),
+    };
+  }
+```
+
+### Step 7: Compare page
+
+Update `core/app/[locale]/(default)/compare/page.tsx`:
+
+```diff
++ import { getMetadataAlternates } from '~/lib/seo/canonical';
+  ...
+  export async function generateMetadata({ params }: Props): Promise<Metadata> {
+    const { locale } = await params;
+    const t = await getTranslations({ locale, namespace: 'Compare' });
+
+    return {
+      title: t('title'),
++     alternates: await getMetadataAlternates({ path: '/compare', locale }),
+    };
+  }
+```
diff --git a/core/app/[locale]/(default)/(faceted)/brand/[slug]/page-data.ts b/core/app/[locale]/(default)/(faceted)/brand/[slug]/page-data.ts
index 918affdedf..9bb605d215 100644
--- a/core/app/[locale]/(default)/(faceted)/brand/[slug]/page-data.ts
+++ b/core/app/[locale]/(default)/(faceted)/brand/[slug]/page-data.ts
@@ -9,6 +9,7 @@ const BrandPageQuery = graphql(`
     site {
       brand(entityId: $entityId) {
         name
+        path
         seo {
           pageTitle
           metaDescription
diff --git a/core/app/[locale]/(default)/(faceted)/brand/[slug]/page.tsx b/core/app/[locale]/(default)/(faceted)/brand/[slug]/page.tsx
index 407892f55a..1634194933 100644
--- a/core/app/[locale]/(default)/(faceted)/brand/[slug]/page.tsx
+++ b/core/app/[locale]/(default)/(faceted)/brand/[slug]/page.tsx
@@ -13,6 +13,7 @@ import { facetsTransformer } from '~/data-transformers/facets-transformer';
 import { pageInfoTransformer } from '~/data-transformers/page-info-transformer';
 import { productCardTransformer } from '~/data-transformers/product-card-transformer';
 import { getPreferredCurrencyCode } from '~/lib/currency';
+import { getMetadataAlternates } from '~/lib/seo/canonical';
 
 import { MAX_COMPARE_LIMIT } from '../../../compare/page-data';
 import { getCompareProducts as getCompareProductsData } from '../../fetch-compare-products';
@@ -67,7 +68,7 @@ interface Props {
 }
 
 export async function generateMetadata(props: Props): Promise<Metadata> {
-  const { slug } = await props.params;
+  const { slug, locale } = await props.params;
   const customerAccessToken = await getSessionCustomerAccessToken();
 
   const brandId = Number(slug);
@@ -84,6 +85,7 @@ export async function generateMetadata(props: Props): Promise<Metadata> {
     title: pageTitle || brand.name,
     description: metaDescription,
     keywords: metaKeywords ? metaKeywords.split(',') : null,
+    alternates: await getMetadataAlternates({ path: brand.path, locale }),
   };
 }
 
diff --git a/core/app/[locale]/(default)/(faceted)/category/[slug]/page.tsx b/core/app/[locale]/(default)/(faceted)/category/[slug]/page.tsx
index e09abcf7b1..3471282dd6 100644
--- a/core/app/[locale]/(default)/(faceted)/category/[slug]/page.tsx
+++ b/core/app/[locale]/(default)/(faceted)/category/[slug]/page.tsx
@@ -14,6 +14,7 @@ import { facetsTransformer } from '~/data-transformers/facets-transformer';
 import { pageInfoTransformer } from '~/data-transformers/page-info-transformer';
 import { productCardTransformer } from '~/data-transformers/product-card-transformer';
 import { getPreferredCurrencyCode } from '~/lib/currency';
+import { getMetadataAlternates } from '~/lib/seo/canonical';
 
 import { MAX_COMPARE_LIMIT } from '../../../compare/page-data';
 import { getCompareProducts } from '../../fetch-compare-products';
@@ -69,7 +70,7 @@ interface Props {
 }
 
 export async function generateMetadata(props: Props): Promise<Metadata> {
-  const { slug } = await props.params;
+  const { slug, locale } = await props.params;
   const customerAccessToken = await getSessionCustomerAccessToken();
 
   const categoryId = Number(slug);
@@ -82,10 +83,16 @@ export async function generateMetadata(props: Props): Promise<Metadata> {
 
   const { pageTitle, metaDescription, metaKeywords } = category.seo;
 
+  const breadcrumbs = removeEdgesAndNodes(category.breadcrumbs);
+  const categoryPath = breadcrumbs[breadcrumbs.length - 1]?.path;
+
   return {
     title: pageTitle || category.name,
     description: metaDescription,
     keywords: metaKeywords ? metaKeywords.split(',') : null,
+    ...(categoryPath && {
+      alternates: await getMetadataAlternates({ path: categoryPath, locale }),
+    }),
   };
 }
 
diff --git a/core/app/[locale]/(default)/blog/[blogId]/page-data.ts b/core/app/[locale]/(default)/blog/[blogId]/page-data.ts
index ec480d77b0..472c44059a 100644
--- a/core/app/[locale]/(default)/blog/[blogId]/page-data.ts
+++ b/core/app/[locale]/(default)/blog/[blogId]/page-data.ts
@@ -15,6 +15,7 @@ const BlogPageQuery = graphql(`
             author
             htmlBody
             name
+            path
             publishedDate {
               utc
             }
diff --git a/core/app/[locale]/(default)/blog/[blogId]/page.tsx b/core/app/[locale]/(default)/blog/[blogId]/page.tsx
index e6bda68e8e..35ba4ffa96 100644
--- a/core/app/[locale]/(default)/blog/[blogId]/page.tsx
+++ b/core/app/[locale]/(default)/blog/[blogId]/page.tsx
@@ -5,6 +5,7 @@ import { cache } from 'react';
 
 import { BlogPostContent, BlogPostContentBlogPost } from '@/vibes/soul/sections/blog-post-content';
 import { Breadcrumb } from '@/vibes/soul/sections/breadcrumbs';
+import { getMetadataAlternates } from '~/lib/seo/canonical';
 
 import { getBlogPageData } from './page-data';
 
@@ -18,7 +19,7 @@ interface Props {
 }
 
 export async function generateMetadata({ params }: Props): Promise<Metadata> {
-  const { blogId } = await params;
+  const { blogId, locale } = await params;
 
   const variables = cachedBlogPageDataVariables(blogId);
 
@@ -35,6 +36,9 @@ export async function generateMetadata({ params }: Props): Promise<Metadata> {
     title: pageTitle || blogPost.name,
     description: metaDescription,
     keywords: metaKeywords ? metaKeywords.split(',') : null,
+    ...(blogPost.path && {
+      alternates: await getMetadataAlternates({ path: blogPost.path, locale }),
+    }),
   };
 }
 
diff --git a/core/app/[locale]/(default)/blog/page.tsx b/core/app/[locale]/(default)/blog/page.tsx
index b0756183f4..e960967c51 100644
--- a/core/app/[locale]/(default)/blog/page.tsx
+++ b/core/app/[locale]/(default)/blog/page.tsx
@@ -7,6 +7,7 @@ import { createSearchParamsCache, parseAsInteger, parseAsString } from 'nuqs/ser
 import { Streamable } from '@/vibes/soul/lib/streamable';
 import { FeaturedBlogPostList } from '@/vibes/soul/sections/featured-blog-post-list';
 import { defaultPageInfo, pageInfoTransformer } from '~/data-transformers/page-info-transformer';
+import { getMetadataAlternates } from '~/lib/seo/canonical';
 
 import { getBlog, getBlogPosts } from './page-data';
 
@@ -36,6 +37,7 @@ export async function generateMetadata({ params }: Props): Promise<Metadata> {
       blog?.description && blog.description.length > 150
         ? `${blog.description.substring(0, 150)}...`
         : blog?.description,
+    ...(blog?.path && { alternates: await getMetadataAlternates({ path: blog.path, locale }) }),
   };
 }
 
diff --git a/core/app/[locale]/(default)/compare/page.tsx b/core/app/[locale]/(default)/compare/page.tsx
index 79ed057c0a..ac851ddb1a 100644
--- a/core/app/[locale]/(default)/compare/page.tsx
+++ b/core/app/[locale]/(default)/compare/page.tsx
@@ -8,6 +8,7 @@ import { CompareSection } from '@/vibes/soul/sections/compare-section';
 import { getSessionCustomerAccessToken } from '~/auth';
 import { pricesTransformer } from '~/data-transformers/prices-transformer';
 import { getPreferredCurrencyCode } from '~/lib/currency';
+import { getMetadataAlternates } from '~/lib/seo/canonical';
 
 import { addToCart } from './_actions/add-to-cart';
 import { CompareAnalyticsProvider } from './_components/compare-analytics-provider';
@@ -44,6 +45,7 @@ export async function generateMetadata({ params }: Props): Promise<Metadata> {
 
   return {
     title: t('title'),
+    alternates: await getMetadataAlternates({ path: '/compare', locale }),
   };
 }
 
diff --git a/core/app/[locale]/(default)/gift-certificates/balance/page.tsx b/core/app/[locale]/(default)/gift-certificates/balance/page.tsx
index d56106a6ee..0320e48acb 100644
--- a/core/app/[locale]/(default)/gift-certificates/balance/page.tsx
+++ b/core/app/[locale]/(default)/gift-certificates/balance/page.tsx
@@ -4,6 +4,7 @@ import { getTranslations, setRequestLocale } from 'next-intl/server';
 import { GiftCertificateCheckBalanceSection } from '@/vibes/soul/sections/gift-certificate-balance-section';
 import { redirect } from '~/i18n/routing';
 import { getPreferredCurrencyCode } from '~/lib/currency';
+import { getMetadataAlternates } from '~/lib/seo/canonical';
 
 import { getGiftCertificatesData } from '../page-data';
 
@@ -20,6 +21,7 @@ export async function generateMetadata({ params }: Props): Promise<Metadata> {
 
   return {
     title: t('title') || 'Gift certificates - Check balance',
+    alternates: await getMetadataAlternates({ path: '/gift-certificates/balance', locale }),
   };
 }
 
diff --git a/core/app/[locale]/(default)/gift-certificates/page.tsx b/core/app/[locale]/(default)/gift-certificates/page.tsx
index e0117c53f7..5c50984fb3 100644
--- a/core/app/[locale]/(default)/gift-certificates/page.tsx
+++ b/core/app/[locale]/(default)/gift-certificates/page.tsx
@@ -4,6 +4,7 @@ import { getFormatter, getTranslations, setRequestLocale } from 'next-intl/serve
 import { GiftCertificatesSection } from '@/vibes/soul/sections/gift-certificates-section';
 import { redirect } from '~/i18n/routing';
 import { getPreferredCurrencyCode } from '~/lib/currency';
+import { getMetadataAlternates } from '~/lib/seo/canonical';
 
 import { getGiftCertificatesData } from './page-data';
 
@@ -18,6 +19,7 @@ export async function generateMetadata({ params }: Props): Promise<Metadata> {
 
   return {
     title: t('title') || 'Gift certificates',
+    alternates: await getMetadataAlternates({ path: '/gift-certificates', locale }),
   };
 }
 
diff --git a/core/app/[locale]/(default)/gift-certificates/purchase/page.tsx b/core/app/[locale]/(default)/gift-certificates/purchase/page.tsx
index 74f60684fe..29e4158c75 100644
--- a/core/app/[locale]/(default)/gift-certificates/purchase/page.tsx
+++ b/core/app/[locale]/(default)/gift-certificates/purchase/page.tsx
@@ -1,4 +1,5 @@
 import { ResultOf } from 'gql.tada';
+import { Metadata } from 'next';
 import { getFormatter, getTranslations } from 'next-intl/server';
 
 import { Field, FieldGroup } from '@/vibes/soul/form/dynamic-form/schema';
@@ -7,6 +8,7 @@ import { GiftCertificateSettingsFragment } from '~/app/[locale]/(default)/gift-c
 import { ExistingResultType } from '~/client/util';
 import { redirect } from '~/i18n/routing';
 import { getPreferredCurrencyCode } from '~/lib/currency';
+import { getMetadataAlternates } from '~/lib/seo/canonical';
 
 import { addGiftCertificateToCart } from './_actions/add-to-cart';
 import { getGiftCertificatePurchaseData } from './page-data';
@@ -15,6 +17,17 @@ interface Props {
   params: Promise<{ locale: string }>;
 }
 
+export async function generateMetadata({ params }: Props): Promise<Metadata> {
+  const { locale } = await params;
+
+  const t = await getTranslations({ locale, namespace: 'GiftCertificates' });
+
+  return {
+    title: t('Purchase.title'),
+    alternates: await getMetadataAlternates({ path: '/gift-certificates/purchase', locale }),
+  };
+}
+
 function getFields(
   giftCertificateSettings: ResultOf<typeof GiftCertificateSettingsFragment>,
   expiresAt: string | undefined,
diff --git a/core/app/[locale]/(default)/page.tsx b/core/app/[locale]/(default)/page.tsx
index 0e34bc75a0..77cf4db613 100644
--- a/core/app/[locale]/(default)/page.tsx
+++ b/core/app/[locale]/(default)/page.tsx
@@ -1,4 +1,5 @@
 import { removeEdgesAndNodes } from '@bigcommerce/catalyst-client';
+import { Metadata } from 'next';
 import { getFormatter, getTranslations, setRequestLocale } from 'next-intl/server';
 
 import { Stream, Streamable } from '@/vibes/soul/lib/streamable';
@@ -8,6 +9,7 @@ import { getSessionCustomerAccessToken } from '~/auth';
 import { Subscribe } from '~/components/subscribe';
 import { productCardTransformer } from '~/data-transformers/product-card-transformer';
 import { getPreferredCurrencyCode } from '~/lib/currency';
+import { getMetadataAlternates } from '~/lib/seo/canonical';
 
 import { Slideshow } from './_components/slideshow';
 import { getPageData } from './page-data';
@@ -16,6 +18,14 @@ interface Props {
   params: Promise<{ locale: string }>;
 }
 
+export async function generateMetadata({ params }: Props): Promise<Metadata> {
+  const { locale } = await params;
+
+  return {
+    alternates: await getMetadataAlternates({ path: '/', locale }),
+  };
+}
+
 export default async function Home({ params }: Props) {
   const { locale } = await params;
 
diff --git a/core/app/[locale]/(default)/product/[slug]/page-data.ts b/core/app/[locale]/(default)/product/[slug]/page-data.ts
index 0f7fccc2c4..0e1931e183 100644
--- a/core/app/[locale]/(default)/product/[slug]/page-data.ts
+++ b/core/app/[locale]/(default)/product/[slug]/page-data.ts
@@ -138,6 +138,7 @@ const ProductPageMetadataQuery = graphql(`
     site {
       product(entityId: $entityId) {
         name
+        path
         defaultImage {
           altText
           url: urlTemplate(lossy: true)
diff --git a/core/app/[locale]/(default)/product/[slug]/page.tsx b/core/app/[locale]/(default)/product/[slug]/page.tsx
index b432679047..e29496cd4a 100644
--- a/core/app/[locale]/(default)/product/[slug]/page.tsx
+++ b/core/app/[locale]/(default)/product/[slug]/page.tsx
@@ -12,6 +12,7 @@ import { pricesTransformer } from '~/data-transformers/prices-transformer';
 import { productCardTransformer } from '~/data-transformers/product-card-transformer';
 import { productOptionsTransformer } from '~/data-transformers/product-options-transformer';
 import { getPreferredCurrencyCode } from '~/lib/currency';
+import { getMetadataAlternates } from '~/lib/seo/canonical';
 
 import { addToCart } from './_actions/add-to-cart';
 import { getMoreProductImages } from './_actions/get-more-images';
@@ -37,7 +38,7 @@ interface Props {
 }
 
 export async function generateMetadata({ params }: Props): Promise<Metadata> {
-  const { slug } = await params;
+  const { slug, locale } = await params;
   const customerAccessToken = await getSessionCustomerAccessToken();
 
   const productId = Number(slug);
@@ -55,6 +56,7 @@ export async function generateMetadata({ params }: Props): Promise<Metadata> {
     title: pageTitle || product.name,
     description: metaDescription || `${product.plainTextDescription.slice(0, 150)}...`,
     keywords: metaKeywords ? metaKeywords.split(',') : null,
+    alternates: await getMetadataAlternates({ path: product.path, locale }),
     openGraph: url
       ? {
           images: [
diff --git a/core/app/[locale]/(default)/webpages/[id]/contact/page.tsx b/core/app/[locale]/(default)/webpages/[id]/contact/page.tsx
index 144381f12a..e053978dba 100644
--- a/core/app/[locale]/(default)/webpages/[id]/contact/page.tsx
+++ b/core/app/[locale]/(default)/webpages/[id]/contact/page.tsx
@@ -12,6 +12,7 @@ import {
   breadcrumbsTransformer,
   truncateBreadcrumbs,
 } from '~/data-transformers/breadcrumbs-transformer';
+import { getMetadataAlternates } from '~/lib/seo/canonical';
 
 import { WebPage, WebPageContent } from '../_components/web-page';
 
@@ -153,7 +154,7 @@ async function getContactFields(id: string) {
 }
 
 export async function generateMetadata({ params }: Props): Promise<Metadata> {
-  const { id } = await params;
+  const { id, locale } = await params;
   const webpage = await getWebPage(id);
   const { pageTitle, metaDescription, metaKeywords } = webpage.seo;
 
@@ -161,6 +162,7 @@ export async function generateMetadata({ params }: Props): Promise<Metadata> {
     title: pageTitle || webpage.title,
     description: metaDescription,
     keywords: metaKeywords ? metaKeywords.split(',') : null,
+    alternates: await getMetadataAlternates({ path: webpage.path, locale }),
   };
 }
 
diff --git a/core/app/[locale]/(default)/webpages/[id]/normal/page.tsx b/core/app/[locale]/(default)/webpages/[id]/normal/page.tsx
index a923030446..6406c381d0 100644
--- a/core/app/[locale]/(default)/webpages/[id]/normal/page.tsx
+++ b/core/app/[locale]/(default)/webpages/[id]/normal/page.tsx
@@ -9,6 +9,7 @@ import {
   breadcrumbsTransformer,
   truncateBreadcrumbs,
 } from '~/data-transformers/breadcrumbs-transformer';
+import { getMetadataAlternates } from '~/lib/seo/canonical';
 
 import { WebPageContent, WebPage as WebPageData } from '../_components/web-page';
 
@@ -57,14 +58,18 @@ async function getWebPageBreadcrumbs(id: string): Promise<Breadcrumb[]> {
 }
 
 export async function generateMetadata({ params }: Props): Promise<Metadata> {
-  const { id } = await params;
+  const { id, locale } = await params;
   const webpage = await getWebPage(id);
   const { pageTitle, metaDescription, metaKeywords } = webpage.seo;
 
+  // Get the path from the last breadcrumb
+  const pagePath = webpage.breadcrumbs[webpage.breadcrumbs.length - 1]?.href;
+
   return {
     title: pageTitle || webpage.title,
     description: metaDescription,
     keywords: metaKeywords ? metaKeywords.split(',') : null,
+    ...(pagePath && { alternates: await getMetadataAlternates({ path: pagePath, locale }) }),
   };
 }
 
diff --git a/core/app/[locale]/(default)/wishlist/[token]/page.tsx b/core/app/[locale]/(default)/wishlist/[token]/page.tsx
index 0ee9fc40bc..e6fe52378f 100644
--- a/core/app/[locale]/(default)/wishlist/[token]/page.tsx
+++ b/core/app/[locale]/(default)/wishlist/[token]/page.tsx
@@ -19,6 +19,7 @@ import {
 } from '~/components/wishlist/share-button';
 import { defaultPageInfo, pageInfoTransformer } from '~/data-transformers/page-info-transformer';
 import { publicWishlistDetailsTransformer } from '~/data-transformers/wishlists-transformer';
+import { getMetadataAlternates } from '~/lib/seo/canonical';
 import { isMobileUser } from '~/lib/user-agent';
 
 import { getPublicWishlist } from './page-data';
@@ -73,6 +74,7 @@ export async function generateMetadata({ params, searchParams }: Props): Promise
 
   return {
     title: wishlist?.name ?? t('title'),
+    alternates: await getMetadataAlternates({ path: `/wishlist/${token}`, locale }),
   };
 }
 
diff --git a/core/app/[locale]/layout.tsx b/core/app/[locale]/layout.tsx
index 14fc07ce5f..ae7642bd3e 100644
--- a/core/app/[locale]/layout.tsx
+++ b/core/app/[locale]/layout.tsx
@@ -30,6 +30,9 @@ const RootLayoutMetadataQuery = graphql(
     query RootLayoutMetadataQuery {
       site {
         settings {
+          url {
+            vanityUrl
+          }
           privacy {
             cookieConsentEnabled
             privacyPolicyUrl
@@ -68,7 +71,10 @@ export async function generateMetadata(): Promise<Metadata> {
 
   const { pageTitle, metaDescription, metaKeywords } = data.site.settings?.seo || {};
 
+  const vanityUrl = data.site.settings?.url.vanityUrl;
+
   return {
+    metadataBase: vanityUrl ? new URL(vanityUrl) : undefined,
     title: {
       template: `%s - ${storeName}`,
       default: pageTitle || storeName,
diff --git a/core/lib/seo/canonical.ts b/core/lib/seo/canonical.ts
new file mode 100644
index 0000000000..03f9cac3f8
--- /dev/null
+++ b/core/lib/seo/canonical.ts
@@ -0,0 +1,99 @@
+import { cache } from 'react';
+
+import { client } from '~/client';
+import { graphql } from '~/client/graphql';
+import { revalidate } from '~/client/revalidate-target';
+import { defaultLocale, locales } from '~/i18n/locales';
+
+interface CanonicalUrlOptions {
+  /**
+   * The path from BigCommerce (e.g., product.path, category.path)
+   * or a manually constructed path for static pages (e.g., '/')
+   */
+  path: string;
+  /**
+   * Current locale from params
+   */
+  locale: string;
+  /**
+   * Whether to include hreflang alternates for all locales
+   * @default true
+   */
+  includeAlternates?: boolean;
+}
+
+/**
+ * Generates metadata alternates object for Next.js Metadata API
+ *
+ * Rules:
+ * - Default locale: no prefix (e.g., https://example.com/product/)
+ * - Other locales: with prefix (e.g., https://example.com/fr/product/)
+ * - Respects TRAILING_SLASH environment variable
+ *
+ * @param {CanonicalUrlOptions} options - The options for generating canonical URLs
+ * @returns {object} The metadata alternates object with canonical URL and optional language alternates
+ */
+const VanityUrlQuery = graphql(`
+  query VanityUrlQuery {
+    site {
+      settings {
+        url {
+          vanityUrl
+        }
+      }
+    }
+  }
+`);
+
+const getVanityUrl = cache(async () => {
+  const { data } = await client.fetch({
+    document: VanityUrlQuery,
+    fetchOptions: { next: { revalidate } },
+  });
+
+  const vanityUrl = data.site.settings?.url.vanityUrl;
+
+  if (!vanityUrl) {
+    throw new Error('Vanity URL not found in site settings');
+  }
+
+  return vanityUrl;
+});
+
+export async function getMetadataAlternates(options: CanonicalUrlOptions) {
+  const { path, locale, includeAlternates = true } = options;
+
+  const baseUrl = await getVanityUrl();
+
+  const canonical = buildLocalizedUrl(baseUrl, path, locale);
+
+  if (!includeAlternates) {
+    return { canonical };
+  }
+
+  const languages = locales.reduce<Record<string, string>>((acc, loc) => {
+    acc[loc] = buildLocalizedUrl(baseUrl, path, loc);
+
+    return acc;
+  }, {});
+
+  languages['x-default'] = buildLocalizedUrl(baseUrl, path, defaultLocale);
+
+  return { canonical, languages };
+}
+
+function buildLocalizedUrl(baseUrl: string, pathname: string, locale: string): string {
+  const trailingSlash = process.env.TRAILING_SLASH !== 'false';
+
+  const url = new URL(pathname, baseUrl);
+
+  url.pathname = locale === defaultLocale ? url.pathname : `/${locale}${url.pathname}`;
+
+  if (trailingSlash && !url.pathname.endsWith('/')) {
+    url.pathname += '/';
+  } else if (!trailingSlash && url.pathname.endsWith('/') && url.pathname !== '/') {
+    url.pathname = url.pathname.slice(0, -1);
+  }
+
+  return url.href;
+}

From 18cfdc8ca018c33ea49b462ecb6f055a153cd4ab Mon Sep 17 00:00:00 2001
From: Tharaa <36555311+Tharaae@users.noreply.github.com>
Date: Thu, 12 Feb 2026 07:06:33 +1100
Subject: [PATCH 51/69] feat: Remove caching on fetching product inventory data
 (#2801)

* feat: Remove caching on fetching product inventory data

* feat: Remove caching on fetching product inventory data - Apply comments
---
 .changeset/eager-nails-bake.md                | 10 ++++
 .../(default)/product/[slug]/page-data.ts     | 56 ++++++++++++++-----
 .../(default)/product/[slug]/page.tsx         | 35 ++++++++----
 3 files changed, 77 insertions(+), 24 deletions(-)
 create mode 100644 .changeset/eager-nails-bake.md

diff --git a/.changeset/eager-nails-bake.md b/.changeset/eager-nails-bake.md
new file mode 100644
index 0000000000..cce2f53695
--- /dev/null
+++ b/.changeset/eager-nails-bake.md
@@ -0,0 +1,10 @@
+---
+"@bigcommerce/catalyst-core": minor
+---
+
+Fetch product inventory data with a separate GQL query with no caching
+
+## Migration
+The files to be rebased for this change to be applied are:
+- core/app/[locale]/(default)/product/[slug]/page-data.ts
+- core/app/[locale]/(default)/product/[slug]/page.tsx
\ No newline at end of file
diff --git a/core/app/[locale]/(default)/product/[slug]/page-data.ts b/core/app/[locale]/(default)/product/[slug]/page-data.ts
index 0e1931e183..02a8293735 100644
--- a/core/app/[locale]/(default)/product/[slug]/page-data.ts
+++ b/core/app/[locale]/(default)/product/[slug]/page-data.ts
@@ -211,7 +211,7 @@ export const getProduct = cache(async (entityId: number, customerAccessToken?: s
   return data.site;
 });
 
-const StreamableProductVariantBySkuQuery = graphql(`
+const StreamableProductVariantInventoryBySkuQuery = graphql(`
   query ProductVariantBySkuQuery($productId: Int!, $sku: String!) {
     site {
       product(entityId: $productId) {
@@ -247,15 +247,15 @@ const StreamableProductVariantBySkuQuery = graphql(`
   }
 `);
 
-type VariantVariables = VariablesOf<typeof StreamableProductVariantBySkuQuery>;
+type VariantInventoryVariables = VariablesOf<typeof StreamableProductVariantInventoryBySkuQuery>;
 
-export const getStreamableProductVariant = cache(
-  async (variables: VariantVariables, customerAccessToken?: string) => {
+export const getStreamableProductVariantInventory = cache(
+  async (variables: VariantInventoryVariables, customerAccessToken?: string) => {
     const { data } = await client.fetch({
-      document: StreamableProductVariantBySkuQuery,
+      document: StreamableProductVariantInventoryBySkuQuery,
       variables,
       customerAccessToken,
-      fetchOptions: customerAccessToken ? { cache: 'no-store' } : { next: { revalidate } },
+      fetchOptions: customerAccessToken ? { cache: 'no-store' } : { next: { revalidate: 60 } },
     });
 
     return data.site.product?.variants;
@@ -311,6 +311,36 @@ const StreamableProductQuery = graphql(
           minPurchaseQuantity
           maxPurchaseQuantity
           warranty
+          ...ProductViewedFragment
+          ...ProductSchemaFragment
+        }
+      }
+    }
+  `,
+  [ProductViewedFragment, ProductSchemaFragment],
+);
+
+type Variables = VariablesOf<typeof StreamableProductQuery>;
+
+export const getStreamableProduct = cache(
+  async (variables: Variables, customerAccessToken?: string) => {
+    const { data } = await client.fetch({
+      document: StreamableProductQuery,
+      variables,
+      customerAccessToken,
+      fetchOptions: customerAccessToken ? { cache: 'no-store' } : { next: { revalidate } },
+    });
+
+    return data.site.product;
+  },
+);
+
+const StreamableProductInventoryQuery = graphql(
+  `
+    query StreamableProductInventoryQuery($entityId: Int!) {
+      site {
+        product(entityId: $entityId) {
+          sku
           inventory {
             hasVariantInventory
             isInStock
@@ -325,25 +355,23 @@ const StreamableProductQuery = graphql(
           availabilityV2 {
             status
           }
-          ...ProductViewedFragment
           ...ProductVariantsInventoryFragment
-          ...ProductSchemaFragment
         }
       }
     }
   `,
-  [ProductViewedFragment, ProductSchemaFragment, ProductVariantsInventoryFragment],
+  [ProductVariantsInventoryFragment],
 );
 
-type Variables = VariablesOf<typeof StreamableProductQuery>;
+type ProductInventoryVariables = VariablesOf<typeof StreamableProductQuery>;
 
-export const getStreamableProduct = cache(
-  async (variables: Variables, customerAccessToken?: string) => {
+export const getStreamableProductInventory = cache(
+  async (variables: ProductInventoryVariables, customerAccessToken?: string) => {
     const { data } = await client.fetch({
-      document: StreamableProductQuery,
+      document: StreamableProductInventoryQuery,
       variables,
       customerAccessToken,
-      fetchOptions: customerAccessToken ? { cache: 'no-store' } : { next: { revalidate } },
+      fetchOptions: customerAccessToken ? { cache: 'no-store' } : { next: { revalidate: 60 } },
     });
 
     return data.site.product;
diff --git a/core/app/[locale]/(default)/product/[slug]/page.tsx b/core/app/[locale]/(default)/product/[slug]/page.tsx
index e29496cd4a..5f31e4dada 100644
--- a/core/app/[locale]/(default)/product/[slug]/page.tsx
+++ b/core/app/[locale]/(default)/product/[slug]/page.tsx
@@ -29,7 +29,8 @@ import {
   getProductPricingAndRelatedProducts,
   getStreamableInventorySettingsQuery,
   getStreamableProduct,
-  getStreamableProductVariant,
+  getStreamableProductInventory,
+  getStreamableProductVariantInventory,
 } from './page-data';
 
 interface Props {
@@ -120,8 +121,22 @@ export default async function Product({ params, searchParams }: Props) {
 
   const streamableProductSku = Streamable.from(async () => (await streamableProduct).sku);
 
-  const streamableProductVariant = Streamable.from(async () => {
-    const product = await streamableProduct;
+  const streamableProductInventory = Streamable.from(async () => {
+    const variables = {
+      entityId: Number(productId),
+    };
+
+    const product = await getStreamableProductInventory(variables, customerAccessToken);
+
+    if (!product) {
+      return notFound();
+    }
+
+    return product;
+  });
+
+  const streamableProductVariantInventory = Streamable.from(async () => {
+    const product = await streamableProductInventory;
 
     if (!product.inventory.hasVariantInventory) {
       return undefined;
@@ -132,7 +147,7 @@ export default async function Product({ params, searchParams }: Props) {
       sku: product.sku,
     };
 
-    const variants = await getStreamableProductVariant(variables, customerAccessToken);
+    const variants = await getStreamableProductVariantInventory(variables, customerAccessToken);
 
     if (!variants) {
       return undefined;
@@ -194,7 +209,7 @@ export default async function Product({ params, searchParams }: Props) {
   });
 
   const streameableCtaLabel = Streamable.from(async () => {
-    const product = await streamableProduct;
+    const product = await streamableProductInventory;
 
     if (product.availabilityV2.status === 'Unavailable') {
       return t('ProductDetails.Submit.unavailable');
@@ -212,7 +227,7 @@ export default async function Product({ params, searchParams }: Props) {
   });
 
   const streameableCtaDisabled = Streamable.from(async () => {
-    const product = await streamableProduct;
+    const product = await streamableProductInventory;
 
     if (product.availabilityV2.status === 'Unavailable') {
       return true;
@@ -259,8 +274,8 @@ export default async function Product({ params, searchParams }: Props) {
 
   const streamableStockDisplayData = Streamable.from(async () => {
     const [product, variant, inventorySetting] = await Streamable.all([
-      streamableProduct,
-      streamableProductVariant,
+      streamableProductInventory,
+      streamableProductVariantInventory,
       streamableInventorySettings,
     ]);
 
@@ -349,8 +364,8 @@ export default async function Product({ params, searchParams }: Props) {
 
   const streamableBackorderDisplayData = Streamable.from(async () => {
     const [product, variant, inventorySetting] = await Streamable.all([
-      streamableProduct,
-      streamableProductVariant,
+      streamableProductInventory,
+      streamableProductVariantInventory,
       streamableInventorySettings,
     ]);
 

From 169cbb5719ba49cbe11bcd9fa3de30a01c8edfb9 Mon Sep 17 00:00:00 2001
From: Ivan Shcherbak <funivan@users.noreply.github.com>
Date: Wed, 18 Feb 2026 20:02:28 +0200
Subject: [PATCH 52/69] feat(other): LOCAL-1444 delivery translation (#2886)

Co-authored-by: funivan <xxx@example.com>
---
 core/messages/da.json     | 126 +++++++++++++++++++++++++++++++++-----
 core/messages/de.json     | 126 +++++++++++++++++++++++++++++++++-----
 core/messages/es-419.json | 124 ++++++++++++++++++++++++++++++++-----
 core/messages/es-AR.json  | 124 ++++++++++++++++++++++++++++++++-----
 core/messages/es-CL.json  | 124 ++++++++++++++++++++++++++++++++-----
 core/messages/es-CO.json  | 124 ++++++++++++++++++++++++++++++++-----
 core/messages/es-LA.json  | 124 ++++++++++++++++++++++++++++++++-----
 core/messages/es-MX.json  | 124 ++++++++++++++++++++++++++++++++-----
 core/messages/es-PE.json  | 124 ++++++++++++++++++++++++++++++++-----
 core/messages/es.json     | 126 +++++++++++++++++++++++++++++++++-----
 core/messages/fr.json     | 126 +++++++++++++++++++++++++++++++++-----
 core/messages/it.json     | 126 +++++++++++++++++++++++++++++++++-----
 core/messages/ja.json     | 124 ++++++++++++++++++++++++++++++++-----
 core/messages/nl.json     | 126 +++++++++++++++++++++++++++++++++-----
 core/messages/no.json     | 126 +++++++++++++++++++++++++++++++++-----
 core/messages/pl.json     | 114 ++++++++++++++++++++++++++++++----
 core/messages/pt-BR.json  | 114 ++++++++++++++++++++++++++++++----
 core/messages/pt.json     | 114 ++++++++++++++++++++++++++++++----
 core/messages/sv.json     | 126 +++++++++++++++++++++++++++++++++-----
 19 files changed, 2045 insertions(+), 297 deletions(-)

diff --git a/core/messages/da.json b/core/messages/da.json
index 33755c849e..0f571c362f 100644
--- a/core/messages/da.json
+++ b/core/messages/da.json
@@ -43,7 +43,17 @@
             "newPassword": "Den nye adgangskode",
             "confirmPassword": "Bekræft adgangskode",
             "passwordUpdated": "Adgangskoden er blevet opdateret.",
-            "somethingWentWrong": "Noget gik galt. Prøv igen senere."
+            "somethingWentWrong": "Noget gik galt. Prøv igen senere.",
+            "FieldErrors": {
+                "passwordRequired": "Adgangskode er påkrævet",
+                "passwordTooSmall": "Adgangskoden skal være på mindst {minLength, plural, =1 {1 character} other {# characters}}",
+                "passwordLowercaseRequired": "Adgangskoden skal indeholde mindst ét lille bogstav",
+                "passwordUppercaseRequired": "Adgangskoden skal indeholde mindst ét stort bogstav",
+                "passwordNumberRequired": "Adgangskoden skal indeholde mindst {minNumbers, plural, =1 {one number} other {# numbers}}",
+                "passwordSpecialCharacterRequired": "Adgangskoden skal indeholde mindst ét specialtegn",
+                "passwordsMustMatch": "Adgangskoderne stemmer ikke overens",
+                "confirmPasswordRequired": "Bekræft din adgangskode"
+            }
         },
         "Login": {
             "title": "Log på",
@@ -56,6 +66,12 @@
             "somethingWentWrong": "Noget gik galt. Prøv igen senere.",
             "passwordResetRequired": "Nulstilling af adgangskode påkrævet. Kontrollér din e-mail for instruktioner til at nulstille din adgangskode.",
             "invalidToken": "Dit login-link er ugyldigt eller udløbet. Prøv at logge ind igen.",
+            "FieldErrors": {
+                "emailRequired": "E-mail er påkrævet",
+                "emailInvalid": "Indtast en gyldig e-mailadresse",
+                "passwordRequired": "Adgangskode er påkrævet",
+                "invalidInput": "Tjek din indtastning, og prøv igen."
+            },
             "CreateAccount": {
                 "title": "Ny kunde?",
                 "accountBenefits": "Opret en konto hos os, og du vil kunne:",
@@ -70,14 +86,36 @@
                 "title": "Glemt adgangskode",
                 "subtitle": "Indtast den e-mail, der er knyttet til din konto, nedenfor. Vi sender dig instruktioner til nulstilling af din adgangskode.",
                 "confirmResetPassword": "Hvis e-mailadressen {email} er knyttet til en konto i vores butik, har vi sendt dig en e-mail til nulstilling af adgangskode. Tjek din indbakke og spam-mappe, hvis du ikke kan se den.",
-                "somethingWentWrong": "Noget gik galt. Prøv igen senere."
+                "somethingWentWrong": "Noget gik galt. Prøv igen senere.",
+                "FieldErrors": {
+                    "emailRequired": "E-mail er påkrævet",
+                    "emailInvalid": "Indtast en gyldig e-mailadresse"
+                }
             }
         },
         "Register": {
             "title": "Registrer konto",
             "heading": "Ny konto",
             "cta": "Opret konto",
-            "somethingWentWrong": "Noget gik galt. Prøv igen senere."
+            "somethingWentWrong": "Noget gik galt. Prøv igen senere.",
+            "FieldErrors": {
+                "firstNameRequired": "Fornavnet er påkrævet",
+                "lastNameRequired": "Efternavnet er påkrævet",
+                "emailRequired": "E-mail er påkrævet",
+                "emailInvalid": "Indtast en gyldig e-mailadresse",
+                "passwordRequired": "Adgangskode er påkrævet",
+                "passwordTooSmall": "Adgangskoden skal være på mindst {minLength, plural, =1 {1 character} other {# characters}}",
+                "passwordLowercaseRequired": "Adgangskoden skal indeholde mindst ét lille bogstav",
+                "passwordUppercaseRequired": "Adgangskoden skal indeholde mindst ét stort bogstav",
+                "passwordNumberRequired": "Adgangskoden skal indeholde mindst {minNumbers, plural, =1 {one number} other {# numbers}}",
+                "passwordSpecialCharacterRequired": "Adgangskoden skal indeholde mindst ét specialtegn",
+                "passwordsMustMatch": "Adgangskoderne stemmer ikke overens",
+                "addressLine1Required": "Adresselinje 1 er påkrævet",
+                "cityRequired": "Byen er påkrævet",
+                "countryRequired": "Landet er påkrævet",
+                "stateRequired": "Stat/region er påkrævet",
+                "postalCodeRequired": "Postnummeret er påkrævet"
+            }
         }
     },
     "Faceted": {
@@ -188,6 +226,15 @@
             "somethingWentWrong": "Noget gik galt. Prøv igen senere.",
             "EmptyState": {
                 "title": "Du har ingen adresser"
+            },
+            "FieldErrors": {
+                "firstNameRequired": "Fornavnet er påkrævet",
+                "lastNameRequired": "Efternavnet er påkrævet",
+                "addressLine1Required": "Adresselinje 1 er påkrævet",
+                "cityRequired": "Byen er påkrævet",
+                "countryRequired": "Landet er påkrævet",
+                "stateRequired": "Stat/region er påkrævet",
+                "postalCodeRequired": "Postnummeret er påkrævet"
             }
         },
         "Settings": {
@@ -205,6 +252,23 @@
                 "label": "Abonner på vores nyhedsbrev.",
                 "marketingPreferencesUpdated": "Markedsføringspræferencerne er blevet opdateret!",
                 "somethingWentWrong": "Noget gik galt. Prøv igen senere."
+            },
+            "FieldErrors": {
+                "firstNameRequired": "Fornavnet er påkrævet",
+                "firstNameTooSmall": "Fornavnet skal være på mindst 2 tegn",
+                "lastNameRequired": "Efternavnet er påkrævet",
+                "lastNameTooSmall": "Efternavnet skal være på mindst 2 tegn",
+                "emailRequired": "E-mail er påkrævet",
+                "emailInvalid": "Indtast en gyldig e-mailadresse",
+                "currentPasswordRequired": "Aktuel adgangskode er påkrævet",
+                "passwordRequired": "Adgangskode er påkrævet",
+                "passwordTooSmall": "Adgangskoden skal være på mindst {minLength, plural, =1 {1 character} other {# characters}}",
+                "passwordLowercaseRequired": "Adgangskoden skal indeholde mindst ét lille bogstav",
+                "passwordUppercaseRequired": "Adgangskoden skal indeholde mindst ét stort bogstav",
+                "passwordNumberRequired": "Adgangskoden skal indeholde mindst {minNumbers, plural, =1 {one number} other {# numbers}}",
+                "passwordSpecialCharacterRequired": "Adgangskoden skal indeholde mindst ét specialtegn",
+                "passwordsMustMatch": "Adgangskoderne stemmer ikke overens",
+                "confirmPasswordRequired": "Bekræft din adgangskode"
             }
         }
     },
@@ -304,8 +368,11 @@
         "cartCombined": "Vi bemærkede, at du havde gemt varer i en tidligere indkøbskurv, så vi har føjet dem til din nuværende indkøbskurv for dig.",
         "cartRestored": "Du startede en indkøbskurv på en anden enhed, og vi har gendannet den her, så du kan fortsætte, hvor du slap.",
         "cartUpdateInProgress": "Du har en igangværende opdatering af din indkøbskurv. Er du sikker på, at du vil forlade denne side? Dine ændringer kan gå tabt.",
-        "originalPrice": "Original price was {price}.",
-        "currentPrice": "Current price is {price}.",
+        "originalPrice": "Den oprindelige pris var {price}.",
+        "currentPrice": "Den aktuelle pris er {price}.",
+        "quantityReadyToShip": "{quantity, number} klar til forsendelse",
+        "quantityOnBackorder": "{antal, number} vil være i restordre",
+        "partiallyAvailable": "Kun {quantity, number} tilgængelig(e)",
         "CheckoutSummary": {
             "title": "Oversigt",
             "subTotal": "Subtotal",
@@ -335,7 +402,8 @@
                 "updateShipping": "Opdater forsendelse",
                 "addShipping": "Tilføj forsendelse",
                 "cartNotFound": "Der opstod en fejl ved hentning af din indkøbskurv",
-                "noShippingOptions": "Der er ingen tilgængelige forsendelsesmuligheder for din adresse"
+                "noShippingOptions": "Der er ingen tilgængelige forsendelsesmuligheder for din adresse",
+                "countryRequired": "Landet er påkrævet"
             }
         },
         "GiftCertificate": {
@@ -395,6 +463,8 @@
             "additionalInformation": "Yderligere oplysninger",
             "currentStock": "{antal, number} på lager",
             "backorderQuantity": "{antal, number} vil være i restordre",
+            "loadingMoreImages": "Loading more images",
+            "imagesLoaded": "{count, plural, =1 {1 more image loaded} other {# more images loaded}}",
             "Submit": {
                 "addToCart": "Føj til kurv",
                 "outOfStock": "Udsolgt",
@@ -427,13 +497,24 @@
                 "button": "Skriv en anmeldelse",
                 "title": "Skriv en anmeldelse",
                 "submit": "Indsend",
+                "cancel": "Annuller",
                 "ratingLabel": "Bedømmelse",
                 "titleLabel": "Titel",
                 "reviewLabel": "Anmeldelse",
                 "nameLabel": "Navn",
                 "emailLabel": "E-mail",
                 "successMessage": "Din anmeldelse er blevet indsendt!",
-                "somethingWentWrong": "Noget gik galt. Prøv igen senere."
+                "somethingWentWrong": "Noget gik galt. Prøv igen senere.",
+                "FieldErrors": {
+                    "titleRequired": "Titel er påkrævet",
+                    "authorRequired": "Navn er påkrævet",
+                    "emailRequired": "E-mail er påkrævet",
+                    "emailInvalid": "Indtast en gyldig e-mailadresse",
+                    "textRequired": "Anmeldelse er påkrævet",
+                    "ratingRequired": "Bedømmelse er påkrævet",
+                    "ratingTooSmall": "Bedømmelsen skal være mindst 1",
+                    "ratingTooLarge": "Bedømmelsen må højst være 5"
+                }
             }
         }
     },
@@ -515,7 +596,8 @@
             "description": "Hold dig opdateret med de seneste nyheder og tilbud fra vores butik.",
             "subscribedToNewsletter": "Du er blevet tilmeldt vores nyhedsbrev!",
             "Errors": {
-                "invalidEmail": "Indtast en gyldig e-mailadresse.",
+                "emailRequired": "E-mail er påkrævet",
+                "invalidEmail": "Indtast en gyldig e-mailadresse",
                 "somethingWentWrong": "Noget gik galt. Prøv igen senere."
             }
         },
@@ -559,9 +641,9 @@
             }
         },
         "Price": {
-            "originalPrice": "Original price was {price}.",
-            "currentPrice": "Current price is {price}.",
-            "range": "Price from {minValue} to {maxValue}."
+            "originalPrice": "Den oprindelige pris var {price}.",
+            "currentPrice": "Den aktuelle pris er {price}.",
+            "range": "Pris fra {minValue} til {maxValue}."
         }
     },
     "GiftCertificates": {
@@ -574,7 +656,7 @@
             "title": "Tjek saldo",
             "description": "Du kan tjekke saldoen og få oplysninger om dit gavekort ved at indtaste koden i feltet nedenfor.",
             "inputLabel": "Kode",
-            "inputPlaceholder": "xxx-xxx-xxx-xxx",
+            "inputPlaceholder": "XXX-XXX-XXX-XXX",
             "purchasedDateLabel": "Købt",
             "senderLabel": "Fra",
             "Errors": {
@@ -607,15 +689,25 @@
                 "expiryCheckboxLabel": "Jeg accepterer, at dette gavekort udløber den {expiryDate}",
                 "ctaLabel": "Føj til kurv",
                 "Errors": {
-                    "amountRequired": "Vælg eller indtast et gavekortbeløb.",
-                    "amountInvalid": "Vælg et gyldigt gavekortbeløb.",
-                    "amountOutOfRange": "Indtast et beløb mellem {minAmount} og {maxAmount}.",
-                    "unexpectedSettingsError": "Der opstod en uventet fejl under hentning af indstillingerne for gavekort. Prøv igen senere."
+                    "amountRequired": "Vælg eller indtast et gavekortbeløb",
+                    "amountInvalid": "Vælg et gyldigt gavekortbeløb",
+                    "amountOutOfRange": "Indtast et beløb mellem {minAmount} og {maxAmount}",
+                    "unexpectedSettingsError": "Der opstod en uventet fejl under hentning af indstillingerne for gavekort. Prøv igen senere.",
+                    "senderNameRequired": "Dit navn er påkrævet",
+                    "senderEmailRequired": "Din e-mailadresse er påkrævet",
+                    "recipientNameRequired": "Modtagerens navn er påkrævet",
+                    "recipientEmailRequired": "Modtagerens e-mailadresse er påkrævet",
+                    "emailInvalid": "Indtast en gyldig e-mailadresse",
+                    "checkboxRequired": "Du skal sætte kryds i dette felt for at fortsætte"
                 }
             }
         }
     },
     "Form": {
-        "optional": "Valgfrit"
+        "optional": "Valgfrit",
+        "Errors": {
+            "invalidInput": "Tjek din indtastning, og prøv igen",
+            "invalidFormat": "Den indtastede værdi stemmer ikke overens med det krævede format"
+        }
     }
 }
diff --git a/core/messages/de.json b/core/messages/de.json
index 317deae029..8a7db06ad7 100644
--- a/core/messages/de.json
+++ b/core/messages/de.json
@@ -43,7 +43,17 @@
             "newPassword": "Neues Passwort",
             "confirmPassword": "Passwort bestätigen",
             "passwordUpdated": "Passwort wurde erfolgreich aktualisiert!",
-            "somethingWentWrong": "Es ist etwas schiefgegangen Bitte versuchen Sie es später erneut."
+            "somethingWentWrong": "Es ist etwas schiefgegangen Bitte versuchen Sie es später erneut.",
+            "FieldErrors": {
+                "passwordRequired": "Es muss ein Passwort angegeben werden",
+                "passwordTooSmall": "Das Passwort muss mindestens {minLength, plural, =1 {1 Zeichen} other {# Zeichen}} lang sein",
+                "passwordLowercaseRequired": "Das Passwort muss mindestens einen Kleinbuchstaben enthalten",
+                "passwordUppercaseRequired": "Das Passwort muss mindestens einen Großbuchstaben enthalten",
+                "passwordNumberRequired": "Das Passwort muss mindestens {minNumbers, plural, =1 {eine Zahl} other {# Zahlen}} enthalten",
+                "passwordSpecialCharacterRequired": "Das Passwort muss mindestens ein Sonderzeichen enthalten",
+                "passwordsMustMatch": "Die Passwörter stimmen nicht überein",
+                "confirmPasswordRequired": "Bitte bestätigen Sie Ihr Passwort"
+            }
         },
         "Login": {
             "title": "Anmelden",
@@ -56,6 +66,12 @@
             "somethingWentWrong": "Es ist etwas schiefgegangen Bitte versuchen Sie es später erneut.",
             "passwordResetRequired": "Passwortzurücksetzung erforderlich. Bitte überprüfen Sie Ihre E-Mails für die Anleitung zum Zurücksetzen Ihres Passworts.",
             "invalidToken": "Ihr Anmeldelink ist ungültig oder abgelaufen. Bitte versuchen Sie erneut, sich anzumelden.",
+            "FieldErrors": {
+                "emailRequired": "Die E-Mail-Adresse muss angegeben werden",
+                "emailInvalid": "Bitte geben Sie eine gültige E-Mail-Adresse an",
+                "passwordRequired": "Es muss ein Passwort angegeben werden",
+                "invalidInput": "Bitte überprüfen Sie Ihre Eingabe und versuchen Sie es erneut"
+            },
             "CreateAccount": {
                 "title": "Neuer Kunde?",
                 "accountBenefits": "Wenn Sie ein Konto bei uns erstellen, haben Sie folgende Möglichkeiten:",
@@ -70,14 +86,36 @@
                 "title": "Passwort vergessen",
                 "subtitle": "Geben Sie unten die mit Ihrem Konto verknüpfte E-Mail-Adresse ein. Wir senden Ihnen Anweisungen zum Zurücksetzen Ihres Passworts.",
                 "confirmResetPassword": "Wenn die E-Mail-Adresse {email} mit einem Konto in unserem Geschäft verknüpft ist, haben wir Ihnen eine E-Mail zum Zurücksetzen des Passworts gesendet. Bitte überprüfen Sie Ihren Posteingang und Spam-Ordner, wenn Sie sie nicht sehen.",
-                "somethingWentWrong": "Es ist etwas schiefgegangen Bitte versuchen Sie es später erneut."
+                "somethingWentWrong": "Es ist etwas schiefgegangen Bitte versuchen Sie es später erneut.",
+                "FieldErrors": {
+                    "emailRequired": "Die E-Mail-Adresse muss angegeben werden",
+                    "emailInvalid": "Bitte geben Sie eine gültige E-Mail-Adresse an"
+                }
             }
         },
         "Register": {
             "title": "Konto registrieren",
             "heading": "Neues Konto",
             "cta": "Konto erstellen",
-            "somethingWentWrong": "Es ist etwas schiefgegangen Bitte versuchen Sie es später erneut."
+            "somethingWentWrong": "Es ist etwas schiefgegangen Bitte versuchen Sie es später erneut.",
+            "FieldErrors": {
+                "firstNameRequired": "Es muss ein Vorname angegeben werden",
+                "lastNameRequired": "Es muss ein Nachname angegeben werden",
+                "emailRequired": "Die E-Mail-Adresse muss angegeben werden",
+                "emailInvalid": "Bitte geben Sie eine gültige E-Mail-Adresse an",
+                "passwordRequired": "Es muss ein Passwort angegeben werden",
+                "passwordTooSmall": "Das Passwort muss mindestens {minLength, plural, =1 {1 Zeichen} other {# Zeichen}} lang sein",
+                "passwordLowercaseRequired": "Das Passwort muss mindestens einen Kleinbuchstaben enthalten",
+                "passwordUppercaseRequired": "Das Passwort muss mindestens einen Großbuchstaben enthalten",
+                "passwordNumberRequired": "Das Passwort muss mindestens {minNumbers, plural, =1 {eine Zahl} other {# Zahlen}} enthalten",
+                "passwordSpecialCharacterRequired": "Das Passwort muss mindestens ein Sonderzeichen enthalten",
+                "passwordsMustMatch": "Die Passwörter stimmen nicht überein",
+                "addressLine1Required": "Adresszeile 1 ist eine Pflichtangabe",
+                "cityRequired": "Ort ist eine Pflichtangabe",
+                "countryRequired": "Land ist eine Pflichtangabe",
+                "stateRequired": "Bundesstaat/Provinz ist eine Pflichtangabe",
+                "postalCodeRequired": "Postleitzahl ist erforderlich"
+            }
         }
     },
     "Faceted": {
@@ -188,6 +226,15 @@
             "somethingWentWrong": "Es ist etwas schiefgegangen Bitte versuchen Sie es später erneut.",
             "EmptyState": {
                 "title": "Sie haben keine Adressen"
+            },
+            "FieldErrors": {
+                "firstNameRequired": "Es muss ein Vorname angegeben werden",
+                "lastNameRequired": "Es muss ein Nachname angegeben werden",
+                "addressLine1Required": "Adresszeile 1 ist eine Pflichtangabe",
+                "cityRequired": "Ort ist eine Pflichtangabe",
+                "countryRequired": "Land ist eine Pflichtangabe",
+                "stateRequired": "Bundesstaat/Provinz ist eine Pflichtangabe",
+                "postalCodeRequired": "Postleitzahl ist erforderlich"
             }
         },
         "Settings": {
@@ -205,6 +252,23 @@
                 "label": "Abonnieren Sie unseren Newsletter.",
                 "marketingPreferencesUpdated": "Marketingeinstellungen wurden erfolgreich aktualisiert!",
                 "somethingWentWrong": "Es ist etwas schiefgegangen Bitte versuchen Sie es später erneut."
+            },
+            "FieldErrors": {
+                "firstNameRequired": "Es muss ein Vorname angegeben werden",
+                "firstNameTooSmall": "„Vorname“ muss mindestens 2 Zeichen lang sei",
+                "lastNameRequired": "Es muss ein Nachname angegeben werden",
+                "lastNameTooSmall": "„Nachname“ muss mindestens 2 Zeichen lang sein",
+                "emailRequired": "Die E-Mail-Adresse muss angegeben werden",
+                "emailInvalid": "Bitte geben Sie eine gültige E-Mail-Adresse an",
+                "currentPasswordRequired": "Aktuelles Passwort ist erforderlich",
+                "passwordRequired": "Es muss ein Passwort angegeben werden",
+                "passwordTooSmall": "Das Passwort muss mindestens {minLength, plural, =1 {1 Zeichen} other {# Zeichen}} lang sein",
+                "passwordLowercaseRequired": "Das Passwort muss mindestens einen Kleinbuchstaben enthalten",
+                "passwordUppercaseRequired": "Das Passwort muss mindestens einen Großbuchstaben enthalten",
+                "passwordNumberRequired": "Das Passwort muss mindestens {minNumbers, plural, =1 {eine Zahl} other {# Zahlen}} enthalten",
+                "passwordSpecialCharacterRequired": "Das Passwort muss mindestens ein Sonderzeichen enthalten",
+                "passwordsMustMatch": "Die Passwörter stimmen nicht überein",
+                "confirmPasswordRequired": "Bitte bestätigen Sie Ihr Passwort"
             }
         }
     },
@@ -304,8 +368,11 @@
         "cartCombined": "Wir haben festgestellt, dass Sie Artikel in einem früheren Warenkorb gespeichert hatten, also haben wir diese Ihrem aktuellen Warenkorb hinzugefügt.",
         "cartRestored": "Sie haben einen Warenkorb auf einem anderen Gerät angelegt, und wir haben ihn hier wiederhergestellt, damit Sie dort weitermachen können, wo Sie aufgehört haben.",
         "cartUpdateInProgress": "Sie führen derzeit eine Aktualisierung Ihres Warenkorbs durch. Sind Sie sicher, dass Sie diese Seite verlassen möchten? Ihre Änderungen könnten verloren gehen.",
-        "originalPrice": "Original price was {price}.",
-        "currentPrice": "Current price is {price}.",
+        "originalPrice": "Der ursprüngliche Preis war {price}.",
+        "currentPrice": "Der aktuelle Preis beträgt {price}.",
+        "quantityReadyToShip": "{quantity, number} bereit zum Versand",
+        "quantityOnBackorder": "{quantity, number} wird nachbestellt",
+        "partiallyAvailable": "Nur {quantity, number} verfügbar",
         "CheckoutSummary": {
             "title": "Übersicht",
             "subTotal": "Zwischensumme",
@@ -335,7 +402,8 @@
                 "updateShipping": "Versand aktualisieren",
                 "addShipping": "Versand hinzufügen",
                 "cartNotFound": "Beim Abrufen des Warenkorbs ist ein Fehler aufgetreten",
-                "noShippingOptions": "Für Ihre Adresse sind keine Versandoptionen verfügbar"
+                "noShippingOptions": "Für Ihre Adresse sind keine Versandoptionen verfügbar",
+                "countryRequired": "Land ist eine Pflichtangabe"
             }
         },
         "GiftCertificate": {
@@ -395,6 +463,8 @@
             "additionalInformation": "Weitere Informationen",
             "currentStock": "{quantity, number} auf Lager",
             "backorderQuantity": "{quantity, number} wird nachbestellt",
+            "loadingMoreImages": "Loading more images",
+            "imagesLoaded": "{count, plural, =1 {1 more image loaded} other {# more images loaded}}",
             "Submit": {
                 "addToCart": "Zum Warenkorb hinzufügen",
                 "outOfStock": "Kein Lagerbestand",
@@ -427,13 +497,24 @@
                 "button": "Eine Bewertung schreiben",
                 "title": "Eine Bewertung schreiben",
                 "submit": "Einreichen",
+                "cancel": "Abbrechen",
                 "ratingLabel": "Bewertung",
                 "titleLabel": "Titel",
                 "reviewLabel": "Bewertung",
                 "nameLabel": "Name",
                 "emailLabel": "E-Mail",
                 "successMessage": "Ihre Bewertung wurde erfolgreich übermittelt!",
-                "somethingWentWrong": "Es ist etwas schiefgegangen Bitte versuchen Sie es später erneut."
+                "somethingWentWrong": "Es ist etwas schiefgegangen Bitte versuchen Sie es später erneut.",
+                "FieldErrors": {
+                    "titleRequired": "Titel ist erforderlich",
+                    "authorRequired": "Es muss ein Name angegeben werden",
+                    "emailRequired": "Die E-Mail-Adresse muss angegeben werden",
+                    "emailInvalid": "Bitte geben Sie eine gültige E-Mail-Adresse an",
+                    "textRequired": "Überprüfung ist erforderlich",
+                    "ratingRequired": "Bewertung ist erforderlich.",
+                    "ratingTooSmall": "Die Bewertung muss mindestens 1 betragen",
+                    "ratingTooLarge": "Die Bewertung darf höchstens 5 betragen"
+                }
             }
         }
     },
@@ -515,7 +596,8 @@
             "description": "Bleiben Sie auf dem Laufenden über die aktuellen Neuigkeiten und Angebote in unserem Shop.",
             "subscribedToNewsletter": "Sie haben unseren Newsletter abonniert!",
             "Errors": {
-                "invalidEmail": "Bitte geben Sie eine gültige E-Mail-Adresse an.",
+                "emailRequired": "Die E-Mail-Adresse muss angegeben werden",
+                "invalidEmail": "Bitte geben Sie eine gültige E-Mail-Adresse an",
                 "somethingWentWrong": "Es ist etwas schiefgegangen Bitte versuchen Sie es später erneut."
             }
         },
@@ -559,9 +641,9 @@
             }
         },
         "Price": {
-            "originalPrice": "Original price was {price}.",
-            "currentPrice": "Current price is {price}.",
-            "range": "Price from {minValue} to {maxValue}."
+            "originalPrice": "Der ursprüngliche Preis war {price}.",
+            "currentPrice": "Der aktuelle Preis beträgt {price}.",
+            "range": "Preis von {minValue} bis {maxValue}."
         }
     },
     "GiftCertificates": {
@@ -574,7 +656,7 @@
             "title": "Guthaben abfragen",
             "description": "Sie können das Guthaben überprüfen und Informationen zu Ihrem Geschenkgutschein erhalten, indem Sie den Code in das Feld unten eingeben.",
             "inputLabel": "Code",
-            "inputPlaceholder": "xxx-xxx-xxx-xxx",
+            "inputPlaceholder": "XXX-XXX-XXX-XXX",
             "purchasedDateLabel": "Gekauft",
             "senderLabel": "Von",
             "Errors": {
@@ -607,15 +689,25 @@
                 "expiryCheckboxLabel": "Ich bestätige, dass dieser Geschenkgutschein am {expiryDate} abläuft.",
                 "ctaLabel": "Zum Warenkorb hinzufügen",
                 "Errors": {
-                    "amountRequired": "Bitte wählen Sie einen Geschenkgutscheinbetrag aus oder geben Sie ihn ein.",
-                    "amountInvalid": "Bitte wählen Sie einen gültigen Betrag für diesen Geschenkgutschein aus.",
-                    "amountOutOfRange": "Bitte geben Sie einen Betrag zwischen {minAmount} und {maxAmount} ein.",
-                    "unexpectedSettingsError": "Beim Abrufen der Geschenkgutscheineinstellungen ist ein unerwarteter Fehler aufgetreten. Bitte versuchen Sie es später erneut."
+                    "amountRequired": "Bitte wählen Sie einen Geschenkgutscheinbetrag aus oder geben Sie ihn ein",
+                    "amountInvalid": "Bitte wählen Sie einen gültigen Betrag für diesen Geschenkgutschein aus",
+                    "amountOutOfRange": "Bitte geben Sie einen Betrag zwischen {minAmount} und {maxAmount} ein",
+                    "unexpectedSettingsError": "Beim Abrufen der Geschenkgutscheineinstellungen ist ein unerwarteter Fehler aufgetreten. Bitte versuchen Sie es später erneut.",
+                    "senderNameRequired": "Ihr Name ist erforderlich",
+                    "senderEmailRequired": "Ihre E-Mail-Adresse ist erforderlich",
+                    "recipientNameRequired": "Der Name des Empfängers ist erforderlich",
+                    "recipientEmailRequired": "Die E-Mail-Adresse des Empfängers ist erforderlich",
+                    "emailInvalid": "Bitte geben Sie eine gültige E-Mail-Adresse an",
+                    "checkboxRequired": "Sie müssen dieses Feld ankreuzen, um fortzufahren"
                 }
             }
         }
     },
     "Form": {
-        "optional": "optional"
+        "optional": "optional",
+        "Errors": {
+            "invalidInput": "Bitte überprüfen Sie Ihre Eingabe und versuchen Sie es erneut",
+            "invalidFormat": "Der eingegebene Wert entspricht nicht dem erforderlichen Format"
+        }
     }
 }
diff --git a/core/messages/es-419.json b/core/messages/es-419.json
index f98234073b..93e4940194 100644
--- a/core/messages/es-419.json
+++ b/core/messages/es-419.json
@@ -43,7 +43,17 @@
             "newPassword": "Nueva contraseña",
             "confirmPassword": "Confirmar contraseña",
             "passwordUpdated": "¡La contraseña se actualizó correctamente!",
-            "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde."
+            "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
+            "FieldErrors": {
+                "passwordRequired": "Se requiere la contraseña",
+                "passwordTooSmall": "La contraseña debe ser al menos {minLength, plural, =1 {1 carácter} other {# caracteres}} longitud",
+                "passwordLowercaseRequired": "La contraseña debe contener al menos una letra minúscula",
+                "passwordUppercaseRequired": "La contraseña debe contener al menos una letra mayúscula",
+                "passwordNumberRequired": "La contraseña debe contener al menos {minNumbers, plural, =1 {un número} other {# números}}",
+                "passwordSpecialCharacterRequired": "La contraseña debe contener al menos un carácter especial",
+                "passwordsMustMatch": "Las contraseñas no coinciden",
+                "confirmPasswordRequired": "Por favor, confirme tu contraseña"
+            }
         },
         "Login": {
             "title": "Inicio de sesión",
@@ -56,6 +66,12 @@
             "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
             "passwordResetRequired": "Se requiere restablecimiento de contraseña. Por favor, revisa tu email para ver instrucciones para restablecer tu contraseña.",
             "invalidToken": "Tu enlace de acceso es inválido o caducó. Por favor, intenta iniciar sesión de nuevo.",
+            "FieldErrors": {
+                "emailRequired": "El campo de correo electrónico es obligatorio",
+                "emailInvalid": "Por favor, introduzca una dirección de email válida",
+                "passwordRequired": "Se requiere la contraseña",
+                "invalidInput": "Por favor, revisa tu opinión y vuelve a intentarlo."
+            },
             "CreateAccount": {
                 "title": "¿Nuevo cliente?",
                 "accountBenefits": "Crea una cuenta con nosotros y podrás:",
@@ -70,14 +86,36 @@
                 "title": "Olvidé la contraseña",
                 "subtitle": "A continuación, ingresa el correo electrónico asociado a tu cuenta. Te enviaremos instrucciones para restablecer tu contraseña.",
                 "confirmResetPassword": "Si la dirección de correo electrónico {email} está vinculada a una cuenta en nuestra tienda, te hemos enviado un correo electrónico de restablecimiento de contraseña. Revisa tu bandeja de entrada y tu carpeta de correo no deseado si no lo ves.",
-                "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde."
+                "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
+                "FieldErrors": {
+                    "emailRequired": "El campo de correo electrónico es obligatorio",
+                    "emailInvalid": "Por favor, introduzca una dirección de email válida"
+                }
             }
         },
         "Register": {
             "title": "Registrar cuenta",
             "heading": "Cuenta nueva",
             "cta": "Crear cuenta",
-            "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde."
+            "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
+            "FieldErrors": {
+                "firstNameRequired": "El campo Nombre es obligatorio.",
+                "lastNameRequired": "El campo Apellido es obligatorio.",
+                "emailRequired": "El campo de correo electrónico es obligatorio",
+                "emailInvalid": "Por favor, introduzca una dirección de email válida",
+                "passwordRequired": "Se requiere la contraseña",
+                "passwordTooSmall": "La contraseña debe ser al menos {minLength, plural, =1 {1 carácter} other {# caracteres}} longitud",
+                "passwordLowercaseRequired": "La contraseña debe contener al menos una letra minúscula",
+                "passwordUppercaseRequired": "La contraseña debe contener al menos una letra mayúscula",
+                "passwordNumberRequired": "La contraseña debe contener al menos {minNumbers, plural, =1 {un número} other {# números}}",
+                "passwordSpecialCharacterRequired": "La contraseña debe contener al menos un carácter especial",
+                "passwordsMustMatch": "Las contraseñas no coinciden",
+                "addressLine1Required": "La línea 1 es obligatoria",
+                "cityRequired": "La ciudad es obligatoria",
+                "countryRequired": "País es un campo obligatorio",
+                "stateRequired": "Estado/Provincia es un campo obligatorio.",
+                "postalCodeRequired": "El campo Código postal es obligatorio."
+            }
         }
     },
     "Faceted": {
@@ -188,6 +226,15 @@
             "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
             "EmptyState": {
                 "title": "No tienes ninguna dirección"
+            },
+            "FieldErrors": {
+                "firstNameRequired": "El campo Nombre es obligatorio.",
+                "lastNameRequired": "El campo Apellido es obligatorio.",
+                "addressLine1Required": "La línea 1 es obligatoria",
+                "cityRequired": "La ciudad es obligatoria",
+                "countryRequired": "País es un campo obligatorio",
+                "stateRequired": "Estado/Provincia es un campo obligatorio.",
+                "postalCodeRequired": "El campo Código postal es obligatorio."
             }
         },
         "Settings": {
@@ -205,6 +252,23 @@
                 "label": "Suscríbete a nuestro boletín informativo.",
                 "marketingPreferencesUpdated": "¡Las preferencias de marketing se actualizaron con éxito!",
                 "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde."
+            },
+            "FieldErrors": {
+                "firstNameRequired": "El campo Nombre es obligatorio.",
+                "firstNameTooSmall": "El nombre de pila debe tener al menos 2 caracteres",
+                "lastNameRequired": "El campo Apellido es obligatorio.",
+                "lastNameTooSmall": "El apellido debe tener al menos 2 caracteres",
+                "emailRequired": "El campo de correo electrónico es obligatorio",
+                "emailInvalid": "Por favor, introduzca una dirección de email válida",
+                "currentPasswordRequired": "La contraseña actual es obligatoria",
+                "passwordRequired": "Se requiere la contraseña",
+                "passwordTooSmall": "La contraseña debe ser al menos {minLength, plural, =1 {1 carácter} other {# caracteres}} longitud",
+                "passwordLowercaseRequired": "La contraseña debe contener al menos una letra minúscula",
+                "passwordUppercaseRequired": "La contraseña debe contener al menos una letra mayúscula",
+                "passwordNumberRequired": "La contraseña debe contener al menos {minNumbers, plural, =1 {un número} other {# números}}",
+                "passwordSpecialCharacterRequired": "La contraseña debe contener al menos un carácter especial",
+                "passwordsMustMatch": "Las contraseñas no coinciden",
+                "confirmPasswordRequired": "Por favor, confirme tu contraseña"
             }
         }
     },
@@ -304,8 +368,11 @@
         "cartCombined": "Notamos que tenías artículos guardados en un carrito anterior, así que los hemos agregado a tu carrito actual.",
         "cartRestored": "Iniciaste un carrito en otro dispositivo y lo hemos restaurado aquí para que puedas continuar desde donde lo dejaste.",
         "cartUpdateInProgress": "Tiene una actualización de carrito en proceso. ¿Estás seguro de que quieres salir de esta página? Es posible que se pierdan sus cambios.",
-        "originalPrice": "Original price was {price}.",
-        "currentPrice": "Current price is {price}.",
+        "originalPrice": "El precio original era {price}.",
+        "currentPrice": "El precio actual es {price}.",
+        "quantityReadyToShip": "{cantidad, número} listo para enviar",
+        "quantityOnBackorder": "{cantidad, número} estará en pedido pendiente",
+        "partiallyAvailable": "Solo {cantidad, número} disponible",
         "CheckoutSummary": {
             "title": "Resumen",
             "subTotal": "Subtotal",
@@ -335,7 +402,8 @@
                 "updateShipping": "Actualizar envío",
                 "addShipping": "Agregar envío",
                 "cartNotFound": "Se produjo un error al recuperar su carrito",
-                "noShippingOptions": "No hay opciones de envío disponibles para tu dirección"
+                "noShippingOptions": "No hay opciones de envío disponibles para tu dirección",
+                "countryRequired": "País es un campo obligatorio"
             }
         },
         "GiftCertificate": {
@@ -395,6 +463,8 @@
             "additionalInformation": "Información adicional",
             "currentStock": "{cantidad, número} en stock",
             "backorderQuantity": "{cantidad, número} estará en espera",
+            "loadingMoreImages": "Loading more images",
+            "imagesLoaded": "{count, plural, =1 {1 more image loaded} other {# more images loaded}}",
             "Submit": {
                 "addToCart": "Agregar al carrito",
                 "outOfStock": "Agotado/a",
@@ -427,13 +497,24 @@
                 "button": "Escribe una opinión",
                 "title": "Escribe una opinión",
                 "submit": "Enviar",
+                "cancel": "Cancelar",
                 "ratingLabel": "Calificación",
                 "titleLabel": "Título",
                 "reviewLabel": "Revisar",
                 "nameLabel": "Nombre",
                 "emailLabel": "Correo electrónico",
                 "successMessage": "¡Tu reseña fue enviada con éxito!",
-                "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde."
+                "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
+                "FieldErrors": {
+                    "titleRequired": "Se requiere título",
+                    "authorRequired": "El campo Nombre es obligatorio",
+                    "emailRequired": "El campo de correo electrónico es obligatorio",
+                    "emailInvalid": "Por favor, introduzca una dirección de email válida",
+                    "textRequired": "Es necesario revisar",
+                    "ratingRequired": "Se requiere una calificación",
+                    "ratingTooSmall": "La puntuación debe ser al menos 1",
+                    "ratingTooLarge": "El puntaje debe ser como máximo 5"
+                }
             }
         }
     },
@@ -515,7 +596,8 @@
             "description": "Mantente al día con las últimas noticias y ofertas de nuestra tienda.",
             "subscribedToNewsletter": "¡Te suscribiste a nuestro boletín!",
             "Errors": {
-                "invalidEmail": "Ingrese una dirección de correo electrónico válida.",
+                "emailRequired": "El campo de correo electrónico es obligatorio",
+                "invalidEmail": "Por favor, introduzca una dirección de email válida",
                 "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde."
             }
         },
@@ -559,9 +641,9 @@
             }
         },
         "Price": {
-            "originalPrice": "Original price was {price}.",
-            "currentPrice": "Current price is {price}.",
-            "range": "Price from {minValue} to {maxValue}."
+            "originalPrice": "El precio original era {price}.",
+            "currentPrice": "El precio actual es {price}.",
+            "range": "Precio de {minValue} a {maxValue}."
         }
     },
     "GiftCertificates": {
@@ -607,15 +689,25 @@
                 "expiryCheckboxLabel": "Reconozco que este Certificado de Regalo caducará el {expiryDate}",
                 "ctaLabel": "Agregar al carrito",
                 "Errors": {
-                    "amountRequired": "Seleccione o ingrese el monto de un certificado de regalo.",
-                    "amountInvalid": "Seleccione un monto de certificado de regalo válido.",
-                    "amountOutOfRange": "Ingrese una cantidad entre {minAmount} y {maxAmount}.",
-                    "unexpectedSettingsError": "Se produjo un error inesperado al recuperar la configuración del certificado de regalo. Intente de nuevo más tarde."
+                    "amountRequired": "Por favor, selecciona o introduce el importe de un vale regalo",
+                    "amountInvalid": "Por favor, seleccione un importe válido de un certificado regalo",
+                    "amountOutOfRange": "Por favor, introduzca una cantidad entre {minAmount} y {maxAmount}",
+                    "unexpectedSettingsError": "Se produjo un error inesperado al recuperar la configuración del certificado de regalo. Intente de nuevo más tarde.",
+                    "senderNameRequired": "Tu nombre es obligatorio",
+                    "senderEmailRequired": "Tu correo electrónico es obligatorio",
+                    "recipientNameRequired": "Se requiere el nombre del destinatario",
+                    "recipientEmailRequired": "Se requiere el email del destinatario",
+                    "emailInvalid": "Por favor, introduzca una dirección de email válida",
+                    "checkboxRequired": "Debes marcar esta casilla para continuar"
                 }
             }
         }
     },
     "Form": {
-        "optional": "Opcional"
+        "optional": "Opcional",
+        "Errors": {
+            "invalidInput": "Por favor, revisa tu opinión y vuelve a intentarlo",
+            "invalidFormat": "El valor introducido no coincide con el formato requerido"
+        }
     }
 }
diff --git a/core/messages/es-AR.json b/core/messages/es-AR.json
index f98234073b..93e4940194 100644
--- a/core/messages/es-AR.json
+++ b/core/messages/es-AR.json
@@ -43,7 +43,17 @@
             "newPassword": "Nueva contraseña",
             "confirmPassword": "Confirmar contraseña",
             "passwordUpdated": "¡La contraseña se actualizó correctamente!",
-            "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde."
+            "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
+            "FieldErrors": {
+                "passwordRequired": "Se requiere la contraseña",
+                "passwordTooSmall": "La contraseña debe ser al menos {minLength, plural, =1 {1 carácter} other {# caracteres}} longitud",
+                "passwordLowercaseRequired": "La contraseña debe contener al menos una letra minúscula",
+                "passwordUppercaseRequired": "La contraseña debe contener al menos una letra mayúscula",
+                "passwordNumberRequired": "La contraseña debe contener al menos {minNumbers, plural, =1 {un número} other {# números}}",
+                "passwordSpecialCharacterRequired": "La contraseña debe contener al menos un carácter especial",
+                "passwordsMustMatch": "Las contraseñas no coinciden",
+                "confirmPasswordRequired": "Por favor, confirme tu contraseña"
+            }
         },
         "Login": {
             "title": "Inicio de sesión",
@@ -56,6 +66,12 @@
             "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
             "passwordResetRequired": "Se requiere restablecimiento de contraseña. Por favor, revisa tu email para ver instrucciones para restablecer tu contraseña.",
             "invalidToken": "Tu enlace de acceso es inválido o caducó. Por favor, intenta iniciar sesión de nuevo.",
+            "FieldErrors": {
+                "emailRequired": "El campo de correo electrónico es obligatorio",
+                "emailInvalid": "Por favor, introduzca una dirección de email válida",
+                "passwordRequired": "Se requiere la contraseña",
+                "invalidInput": "Por favor, revisa tu opinión y vuelve a intentarlo."
+            },
             "CreateAccount": {
                 "title": "¿Nuevo cliente?",
                 "accountBenefits": "Crea una cuenta con nosotros y podrás:",
@@ -70,14 +86,36 @@
                 "title": "Olvidé la contraseña",
                 "subtitle": "A continuación, ingresa el correo electrónico asociado a tu cuenta. Te enviaremos instrucciones para restablecer tu contraseña.",
                 "confirmResetPassword": "Si la dirección de correo electrónico {email} está vinculada a una cuenta en nuestra tienda, te hemos enviado un correo electrónico de restablecimiento de contraseña. Revisa tu bandeja de entrada y tu carpeta de correo no deseado si no lo ves.",
-                "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde."
+                "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
+                "FieldErrors": {
+                    "emailRequired": "El campo de correo electrónico es obligatorio",
+                    "emailInvalid": "Por favor, introduzca una dirección de email válida"
+                }
             }
         },
         "Register": {
             "title": "Registrar cuenta",
             "heading": "Cuenta nueva",
             "cta": "Crear cuenta",
-            "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde."
+            "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
+            "FieldErrors": {
+                "firstNameRequired": "El campo Nombre es obligatorio.",
+                "lastNameRequired": "El campo Apellido es obligatorio.",
+                "emailRequired": "El campo de correo electrónico es obligatorio",
+                "emailInvalid": "Por favor, introduzca una dirección de email válida",
+                "passwordRequired": "Se requiere la contraseña",
+                "passwordTooSmall": "La contraseña debe ser al menos {minLength, plural, =1 {1 carácter} other {# caracteres}} longitud",
+                "passwordLowercaseRequired": "La contraseña debe contener al menos una letra minúscula",
+                "passwordUppercaseRequired": "La contraseña debe contener al menos una letra mayúscula",
+                "passwordNumberRequired": "La contraseña debe contener al menos {minNumbers, plural, =1 {un número} other {# números}}",
+                "passwordSpecialCharacterRequired": "La contraseña debe contener al menos un carácter especial",
+                "passwordsMustMatch": "Las contraseñas no coinciden",
+                "addressLine1Required": "La línea 1 es obligatoria",
+                "cityRequired": "La ciudad es obligatoria",
+                "countryRequired": "País es un campo obligatorio",
+                "stateRequired": "Estado/Provincia es un campo obligatorio.",
+                "postalCodeRequired": "El campo Código postal es obligatorio."
+            }
         }
     },
     "Faceted": {
@@ -188,6 +226,15 @@
             "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
             "EmptyState": {
                 "title": "No tienes ninguna dirección"
+            },
+            "FieldErrors": {
+                "firstNameRequired": "El campo Nombre es obligatorio.",
+                "lastNameRequired": "El campo Apellido es obligatorio.",
+                "addressLine1Required": "La línea 1 es obligatoria",
+                "cityRequired": "La ciudad es obligatoria",
+                "countryRequired": "País es un campo obligatorio",
+                "stateRequired": "Estado/Provincia es un campo obligatorio.",
+                "postalCodeRequired": "El campo Código postal es obligatorio."
             }
         },
         "Settings": {
@@ -205,6 +252,23 @@
                 "label": "Suscríbete a nuestro boletín informativo.",
                 "marketingPreferencesUpdated": "¡Las preferencias de marketing se actualizaron con éxito!",
                 "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde."
+            },
+            "FieldErrors": {
+                "firstNameRequired": "El campo Nombre es obligatorio.",
+                "firstNameTooSmall": "El nombre de pila debe tener al menos 2 caracteres",
+                "lastNameRequired": "El campo Apellido es obligatorio.",
+                "lastNameTooSmall": "El apellido debe tener al menos 2 caracteres",
+                "emailRequired": "El campo de correo electrónico es obligatorio",
+                "emailInvalid": "Por favor, introduzca una dirección de email válida",
+                "currentPasswordRequired": "La contraseña actual es obligatoria",
+                "passwordRequired": "Se requiere la contraseña",
+                "passwordTooSmall": "La contraseña debe ser al menos {minLength, plural, =1 {1 carácter} other {# caracteres}} longitud",
+                "passwordLowercaseRequired": "La contraseña debe contener al menos una letra minúscula",
+                "passwordUppercaseRequired": "La contraseña debe contener al menos una letra mayúscula",
+                "passwordNumberRequired": "La contraseña debe contener al menos {minNumbers, plural, =1 {un número} other {# números}}",
+                "passwordSpecialCharacterRequired": "La contraseña debe contener al menos un carácter especial",
+                "passwordsMustMatch": "Las contraseñas no coinciden",
+                "confirmPasswordRequired": "Por favor, confirme tu contraseña"
             }
         }
     },
@@ -304,8 +368,11 @@
         "cartCombined": "Notamos que tenías artículos guardados en un carrito anterior, así que los hemos agregado a tu carrito actual.",
         "cartRestored": "Iniciaste un carrito en otro dispositivo y lo hemos restaurado aquí para que puedas continuar desde donde lo dejaste.",
         "cartUpdateInProgress": "Tiene una actualización de carrito en proceso. ¿Estás seguro de que quieres salir de esta página? Es posible que se pierdan sus cambios.",
-        "originalPrice": "Original price was {price}.",
-        "currentPrice": "Current price is {price}.",
+        "originalPrice": "El precio original era {price}.",
+        "currentPrice": "El precio actual es {price}.",
+        "quantityReadyToShip": "{cantidad, número} listo para enviar",
+        "quantityOnBackorder": "{cantidad, número} estará en pedido pendiente",
+        "partiallyAvailable": "Solo {cantidad, número} disponible",
         "CheckoutSummary": {
             "title": "Resumen",
             "subTotal": "Subtotal",
@@ -335,7 +402,8 @@
                 "updateShipping": "Actualizar envío",
                 "addShipping": "Agregar envío",
                 "cartNotFound": "Se produjo un error al recuperar su carrito",
-                "noShippingOptions": "No hay opciones de envío disponibles para tu dirección"
+                "noShippingOptions": "No hay opciones de envío disponibles para tu dirección",
+                "countryRequired": "País es un campo obligatorio"
             }
         },
         "GiftCertificate": {
@@ -395,6 +463,8 @@
             "additionalInformation": "Información adicional",
             "currentStock": "{cantidad, número} en stock",
             "backorderQuantity": "{cantidad, número} estará en espera",
+            "loadingMoreImages": "Loading more images",
+            "imagesLoaded": "{count, plural, =1 {1 more image loaded} other {# more images loaded}}",
             "Submit": {
                 "addToCart": "Agregar al carrito",
                 "outOfStock": "Agotado/a",
@@ -427,13 +497,24 @@
                 "button": "Escribe una opinión",
                 "title": "Escribe una opinión",
                 "submit": "Enviar",
+                "cancel": "Cancelar",
                 "ratingLabel": "Calificación",
                 "titleLabel": "Título",
                 "reviewLabel": "Revisar",
                 "nameLabel": "Nombre",
                 "emailLabel": "Correo electrónico",
                 "successMessage": "¡Tu reseña fue enviada con éxito!",
-                "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde."
+                "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
+                "FieldErrors": {
+                    "titleRequired": "Se requiere título",
+                    "authorRequired": "El campo Nombre es obligatorio",
+                    "emailRequired": "El campo de correo electrónico es obligatorio",
+                    "emailInvalid": "Por favor, introduzca una dirección de email válida",
+                    "textRequired": "Es necesario revisar",
+                    "ratingRequired": "Se requiere una calificación",
+                    "ratingTooSmall": "La puntuación debe ser al menos 1",
+                    "ratingTooLarge": "El puntaje debe ser como máximo 5"
+                }
             }
         }
     },
@@ -515,7 +596,8 @@
             "description": "Mantente al día con las últimas noticias y ofertas de nuestra tienda.",
             "subscribedToNewsletter": "¡Te suscribiste a nuestro boletín!",
             "Errors": {
-                "invalidEmail": "Ingrese una dirección de correo electrónico válida.",
+                "emailRequired": "El campo de correo electrónico es obligatorio",
+                "invalidEmail": "Por favor, introduzca una dirección de email válida",
                 "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde."
             }
         },
@@ -559,9 +641,9 @@
             }
         },
         "Price": {
-            "originalPrice": "Original price was {price}.",
-            "currentPrice": "Current price is {price}.",
-            "range": "Price from {minValue} to {maxValue}."
+            "originalPrice": "El precio original era {price}.",
+            "currentPrice": "El precio actual es {price}.",
+            "range": "Precio de {minValue} a {maxValue}."
         }
     },
     "GiftCertificates": {
@@ -607,15 +689,25 @@
                 "expiryCheckboxLabel": "Reconozco que este Certificado de Regalo caducará el {expiryDate}",
                 "ctaLabel": "Agregar al carrito",
                 "Errors": {
-                    "amountRequired": "Seleccione o ingrese el monto de un certificado de regalo.",
-                    "amountInvalid": "Seleccione un monto de certificado de regalo válido.",
-                    "amountOutOfRange": "Ingrese una cantidad entre {minAmount} y {maxAmount}.",
-                    "unexpectedSettingsError": "Se produjo un error inesperado al recuperar la configuración del certificado de regalo. Intente de nuevo más tarde."
+                    "amountRequired": "Por favor, selecciona o introduce el importe de un vale regalo",
+                    "amountInvalid": "Por favor, seleccione un importe válido de un certificado regalo",
+                    "amountOutOfRange": "Por favor, introduzca una cantidad entre {minAmount} y {maxAmount}",
+                    "unexpectedSettingsError": "Se produjo un error inesperado al recuperar la configuración del certificado de regalo. Intente de nuevo más tarde.",
+                    "senderNameRequired": "Tu nombre es obligatorio",
+                    "senderEmailRequired": "Tu correo electrónico es obligatorio",
+                    "recipientNameRequired": "Se requiere el nombre del destinatario",
+                    "recipientEmailRequired": "Se requiere el email del destinatario",
+                    "emailInvalid": "Por favor, introduzca una dirección de email válida",
+                    "checkboxRequired": "Debes marcar esta casilla para continuar"
                 }
             }
         }
     },
     "Form": {
-        "optional": "Opcional"
+        "optional": "Opcional",
+        "Errors": {
+            "invalidInput": "Por favor, revisa tu opinión y vuelve a intentarlo",
+            "invalidFormat": "El valor introducido no coincide con el formato requerido"
+        }
     }
 }
diff --git a/core/messages/es-CL.json b/core/messages/es-CL.json
index f98234073b..93e4940194 100644
--- a/core/messages/es-CL.json
+++ b/core/messages/es-CL.json
@@ -43,7 +43,17 @@
             "newPassword": "Nueva contraseña",
             "confirmPassword": "Confirmar contraseña",
             "passwordUpdated": "¡La contraseña se actualizó correctamente!",
-            "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde."
+            "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
+            "FieldErrors": {
+                "passwordRequired": "Se requiere la contraseña",
+                "passwordTooSmall": "La contraseña debe ser al menos {minLength, plural, =1 {1 carácter} other {# caracteres}} longitud",
+                "passwordLowercaseRequired": "La contraseña debe contener al menos una letra minúscula",
+                "passwordUppercaseRequired": "La contraseña debe contener al menos una letra mayúscula",
+                "passwordNumberRequired": "La contraseña debe contener al menos {minNumbers, plural, =1 {un número} other {# números}}",
+                "passwordSpecialCharacterRequired": "La contraseña debe contener al menos un carácter especial",
+                "passwordsMustMatch": "Las contraseñas no coinciden",
+                "confirmPasswordRequired": "Por favor, confirme tu contraseña"
+            }
         },
         "Login": {
             "title": "Inicio de sesión",
@@ -56,6 +66,12 @@
             "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
             "passwordResetRequired": "Se requiere restablecimiento de contraseña. Por favor, revisa tu email para ver instrucciones para restablecer tu contraseña.",
             "invalidToken": "Tu enlace de acceso es inválido o caducó. Por favor, intenta iniciar sesión de nuevo.",
+            "FieldErrors": {
+                "emailRequired": "El campo de correo electrónico es obligatorio",
+                "emailInvalid": "Por favor, introduzca una dirección de email válida",
+                "passwordRequired": "Se requiere la contraseña",
+                "invalidInput": "Por favor, revisa tu opinión y vuelve a intentarlo."
+            },
             "CreateAccount": {
                 "title": "¿Nuevo cliente?",
                 "accountBenefits": "Crea una cuenta con nosotros y podrás:",
@@ -70,14 +86,36 @@
                 "title": "Olvidé la contraseña",
                 "subtitle": "A continuación, ingresa el correo electrónico asociado a tu cuenta. Te enviaremos instrucciones para restablecer tu contraseña.",
                 "confirmResetPassword": "Si la dirección de correo electrónico {email} está vinculada a una cuenta en nuestra tienda, te hemos enviado un correo electrónico de restablecimiento de contraseña. Revisa tu bandeja de entrada y tu carpeta de correo no deseado si no lo ves.",
-                "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde."
+                "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
+                "FieldErrors": {
+                    "emailRequired": "El campo de correo electrónico es obligatorio",
+                    "emailInvalid": "Por favor, introduzca una dirección de email válida"
+                }
             }
         },
         "Register": {
             "title": "Registrar cuenta",
             "heading": "Cuenta nueva",
             "cta": "Crear cuenta",
-            "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde."
+            "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
+            "FieldErrors": {
+                "firstNameRequired": "El campo Nombre es obligatorio.",
+                "lastNameRequired": "El campo Apellido es obligatorio.",
+                "emailRequired": "El campo de correo electrónico es obligatorio",
+                "emailInvalid": "Por favor, introduzca una dirección de email válida",
+                "passwordRequired": "Se requiere la contraseña",
+                "passwordTooSmall": "La contraseña debe ser al menos {minLength, plural, =1 {1 carácter} other {# caracteres}} longitud",
+                "passwordLowercaseRequired": "La contraseña debe contener al menos una letra minúscula",
+                "passwordUppercaseRequired": "La contraseña debe contener al menos una letra mayúscula",
+                "passwordNumberRequired": "La contraseña debe contener al menos {minNumbers, plural, =1 {un número} other {# números}}",
+                "passwordSpecialCharacterRequired": "La contraseña debe contener al menos un carácter especial",
+                "passwordsMustMatch": "Las contraseñas no coinciden",
+                "addressLine1Required": "La línea 1 es obligatoria",
+                "cityRequired": "La ciudad es obligatoria",
+                "countryRequired": "País es un campo obligatorio",
+                "stateRequired": "Estado/Provincia es un campo obligatorio.",
+                "postalCodeRequired": "El campo Código postal es obligatorio."
+            }
         }
     },
     "Faceted": {
@@ -188,6 +226,15 @@
             "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
             "EmptyState": {
                 "title": "No tienes ninguna dirección"
+            },
+            "FieldErrors": {
+                "firstNameRequired": "El campo Nombre es obligatorio.",
+                "lastNameRequired": "El campo Apellido es obligatorio.",
+                "addressLine1Required": "La línea 1 es obligatoria",
+                "cityRequired": "La ciudad es obligatoria",
+                "countryRequired": "País es un campo obligatorio",
+                "stateRequired": "Estado/Provincia es un campo obligatorio.",
+                "postalCodeRequired": "El campo Código postal es obligatorio."
             }
         },
         "Settings": {
@@ -205,6 +252,23 @@
                 "label": "Suscríbete a nuestro boletín informativo.",
                 "marketingPreferencesUpdated": "¡Las preferencias de marketing se actualizaron con éxito!",
                 "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde."
+            },
+            "FieldErrors": {
+                "firstNameRequired": "El campo Nombre es obligatorio.",
+                "firstNameTooSmall": "El nombre de pila debe tener al menos 2 caracteres",
+                "lastNameRequired": "El campo Apellido es obligatorio.",
+                "lastNameTooSmall": "El apellido debe tener al menos 2 caracteres",
+                "emailRequired": "El campo de correo electrónico es obligatorio",
+                "emailInvalid": "Por favor, introduzca una dirección de email válida",
+                "currentPasswordRequired": "La contraseña actual es obligatoria",
+                "passwordRequired": "Se requiere la contraseña",
+                "passwordTooSmall": "La contraseña debe ser al menos {minLength, plural, =1 {1 carácter} other {# caracteres}} longitud",
+                "passwordLowercaseRequired": "La contraseña debe contener al menos una letra minúscula",
+                "passwordUppercaseRequired": "La contraseña debe contener al menos una letra mayúscula",
+                "passwordNumberRequired": "La contraseña debe contener al menos {minNumbers, plural, =1 {un número} other {# números}}",
+                "passwordSpecialCharacterRequired": "La contraseña debe contener al menos un carácter especial",
+                "passwordsMustMatch": "Las contraseñas no coinciden",
+                "confirmPasswordRequired": "Por favor, confirme tu contraseña"
             }
         }
     },
@@ -304,8 +368,11 @@
         "cartCombined": "Notamos que tenías artículos guardados en un carrito anterior, así que los hemos agregado a tu carrito actual.",
         "cartRestored": "Iniciaste un carrito en otro dispositivo y lo hemos restaurado aquí para que puedas continuar desde donde lo dejaste.",
         "cartUpdateInProgress": "Tiene una actualización de carrito en proceso. ¿Estás seguro de que quieres salir de esta página? Es posible que se pierdan sus cambios.",
-        "originalPrice": "Original price was {price}.",
-        "currentPrice": "Current price is {price}.",
+        "originalPrice": "El precio original era {price}.",
+        "currentPrice": "El precio actual es {price}.",
+        "quantityReadyToShip": "{cantidad, número} listo para enviar",
+        "quantityOnBackorder": "{cantidad, número} estará en pedido pendiente",
+        "partiallyAvailable": "Solo {cantidad, número} disponible",
         "CheckoutSummary": {
             "title": "Resumen",
             "subTotal": "Subtotal",
@@ -335,7 +402,8 @@
                 "updateShipping": "Actualizar envío",
                 "addShipping": "Agregar envío",
                 "cartNotFound": "Se produjo un error al recuperar su carrito",
-                "noShippingOptions": "No hay opciones de envío disponibles para tu dirección"
+                "noShippingOptions": "No hay opciones de envío disponibles para tu dirección",
+                "countryRequired": "País es un campo obligatorio"
             }
         },
         "GiftCertificate": {
@@ -395,6 +463,8 @@
             "additionalInformation": "Información adicional",
             "currentStock": "{cantidad, número} en stock",
             "backorderQuantity": "{cantidad, número} estará en espera",
+            "loadingMoreImages": "Loading more images",
+            "imagesLoaded": "{count, plural, =1 {1 more image loaded} other {# more images loaded}}",
             "Submit": {
                 "addToCart": "Agregar al carrito",
                 "outOfStock": "Agotado/a",
@@ -427,13 +497,24 @@
                 "button": "Escribe una opinión",
                 "title": "Escribe una opinión",
                 "submit": "Enviar",
+                "cancel": "Cancelar",
                 "ratingLabel": "Calificación",
                 "titleLabel": "Título",
                 "reviewLabel": "Revisar",
                 "nameLabel": "Nombre",
                 "emailLabel": "Correo electrónico",
                 "successMessage": "¡Tu reseña fue enviada con éxito!",
-                "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde."
+                "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
+                "FieldErrors": {
+                    "titleRequired": "Se requiere título",
+                    "authorRequired": "El campo Nombre es obligatorio",
+                    "emailRequired": "El campo de correo electrónico es obligatorio",
+                    "emailInvalid": "Por favor, introduzca una dirección de email válida",
+                    "textRequired": "Es necesario revisar",
+                    "ratingRequired": "Se requiere una calificación",
+                    "ratingTooSmall": "La puntuación debe ser al menos 1",
+                    "ratingTooLarge": "El puntaje debe ser como máximo 5"
+                }
             }
         }
     },
@@ -515,7 +596,8 @@
             "description": "Mantente al día con las últimas noticias y ofertas de nuestra tienda.",
             "subscribedToNewsletter": "¡Te suscribiste a nuestro boletín!",
             "Errors": {
-                "invalidEmail": "Ingrese una dirección de correo electrónico válida.",
+                "emailRequired": "El campo de correo electrónico es obligatorio",
+                "invalidEmail": "Por favor, introduzca una dirección de email válida",
                 "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde."
             }
         },
@@ -559,9 +641,9 @@
             }
         },
         "Price": {
-            "originalPrice": "Original price was {price}.",
-            "currentPrice": "Current price is {price}.",
-            "range": "Price from {minValue} to {maxValue}."
+            "originalPrice": "El precio original era {price}.",
+            "currentPrice": "El precio actual es {price}.",
+            "range": "Precio de {minValue} a {maxValue}."
         }
     },
     "GiftCertificates": {
@@ -607,15 +689,25 @@
                 "expiryCheckboxLabel": "Reconozco que este Certificado de Regalo caducará el {expiryDate}",
                 "ctaLabel": "Agregar al carrito",
                 "Errors": {
-                    "amountRequired": "Seleccione o ingrese el monto de un certificado de regalo.",
-                    "amountInvalid": "Seleccione un monto de certificado de regalo válido.",
-                    "amountOutOfRange": "Ingrese una cantidad entre {minAmount} y {maxAmount}.",
-                    "unexpectedSettingsError": "Se produjo un error inesperado al recuperar la configuración del certificado de regalo. Intente de nuevo más tarde."
+                    "amountRequired": "Por favor, selecciona o introduce el importe de un vale regalo",
+                    "amountInvalid": "Por favor, seleccione un importe válido de un certificado regalo",
+                    "amountOutOfRange": "Por favor, introduzca una cantidad entre {minAmount} y {maxAmount}",
+                    "unexpectedSettingsError": "Se produjo un error inesperado al recuperar la configuración del certificado de regalo. Intente de nuevo más tarde.",
+                    "senderNameRequired": "Tu nombre es obligatorio",
+                    "senderEmailRequired": "Tu correo electrónico es obligatorio",
+                    "recipientNameRequired": "Se requiere el nombre del destinatario",
+                    "recipientEmailRequired": "Se requiere el email del destinatario",
+                    "emailInvalid": "Por favor, introduzca una dirección de email válida",
+                    "checkboxRequired": "Debes marcar esta casilla para continuar"
                 }
             }
         }
     },
     "Form": {
-        "optional": "Opcional"
+        "optional": "Opcional",
+        "Errors": {
+            "invalidInput": "Por favor, revisa tu opinión y vuelve a intentarlo",
+            "invalidFormat": "El valor introducido no coincide con el formato requerido"
+        }
     }
 }
diff --git a/core/messages/es-CO.json b/core/messages/es-CO.json
index f98234073b..93e4940194 100644
--- a/core/messages/es-CO.json
+++ b/core/messages/es-CO.json
@@ -43,7 +43,17 @@
             "newPassword": "Nueva contraseña",
             "confirmPassword": "Confirmar contraseña",
             "passwordUpdated": "¡La contraseña se actualizó correctamente!",
-            "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde."
+            "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
+            "FieldErrors": {
+                "passwordRequired": "Se requiere la contraseña",
+                "passwordTooSmall": "La contraseña debe ser al menos {minLength, plural, =1 {1 carácter} other {# caracteres}} longitud",
+                "passwordLowercaseRequired": "La contraseña debe contener al menos una letra minúscula",
+                "passwordUppercaseRequired": "La contraseña debe contener al menos una letra mayúscula",
+                "passwordNumberRequired": "La contraseña debe contener al menos {minNumbers, plural, =1 {un número} other {# números}}",
+                "passwordSpecialCharacterRequired": "La contraseña debe contener al menos un carácter especial",
+                "passwordsMustMatch": "Las contraseñas no coinciden",
+                "confirmPasswordRequired": "Por favor, confirme tu contraseña"
+            }
         },
         "Login": {
             "title": "Inicio de sesión",
@@ -56,6 +66,12 @@
             "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
             "passwordResetRequired": "Se requiere restablecimiento de contraseña. Por favor, revisa tu email para ver instrucciones para restablecer tu contraseña.",
             "invalidToken": "Tu enlace de acceso es inválido o caducó. Por favor, intenta iniciar sesión de nuevo.",
+            "FieldErrors": {
+                "emailRequired": "El campo de correo electrónico es obligatorio",
+                "emailInvalid": "Por favor, introduzca una dirección de email válida",
+                "passwordRequired": "Se requiere la contraseña",
+                "invalidInput": "Por favor, revisa tu opinión y vuelve a intentarlo."
+            },
             "CreateAccount": {
                 "title": "¿Nuevo cliente?",
                 "accountBenefits": "Crea una cuenta con nosotros y podrás:",
@@ -70,14 +86,36 @@
                 "title": "Olvidé la contraseña",
                 "subtitle": "A continuación, ingresa el correo electrónico asociado a tu cuenta. Te enviaremos instrucciones para restablecer tu contraseña.",
                 "confirmResetPassword": "Si la dirección de correo electrónico {email} está vinculada a una cuenta en nuestra tienda, te hemos enviado un correo electrónico de restablecimiento de contraseña. Revisa tu bandeja de entrada y tu carpeta de correo no deseado si no lo ves.",
-                "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde."
+                "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
+                "FieldErrors": {
+                    "emailRequired": "El campo de correo electrónico es obligatorio",
+                    "emailInvalid": "Por favor, introduzca una dirección de email válida"
+                }
             }
         },
         "Register": {
             "title": "Registrar cuenta",
             "heading": "Cuenta nueva",
             "cta": "Crear cuenta",
-            "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde."
+            "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
+            "FieldErrors": {
+                "firstNameRequired": "El campo Nombre es obligatorio.",
+                "lastNameRequired": "El campo Apellido es obligatorio.",
+                "emailRequired": "El campo de correo electrónico es obligatorio",
+                "emailInvalid": "Por favor, introduzca una dirección de email válida",
+                "passwordRequired": "Se requiere la contraseña",
+                "passwordTooSmall": "La contraseña debe ser al menos {minLength, plural, =1 {1 carácter} other {# caracteres}} longitud",
+                "passwordLowercaseRequired": "La contraseña debe contener al menos una letra minúscula",
+                "passwordUppercaseRequired": "La contraseña debe contener al menos una letra mayúscula",
+                "passwordNumberRequired": "La contraseña debe contener al menos {minNumbers, plural, =1 {un número} other {# números}}",
+                "passwordSpecialCharacterRequired": "La contraseña debe contener al menos un carácter especial",
+                "passwordsMustMatch": "Las contraseñas no coinciden",
+                "addressLine1Required": "La línea 1 es obligatoria",
+                "cityRequired": "La ciudad es obligatoria",
+                "countryRequired": "País es un campo obligatorio",
+                "stateRequired": "Estado/Provincia es un campo obligatorio.",
+                "postalCodeRequired": "El campo Código postal es obligatorio."
+            }
         }
     },
     "Faceted": {
@@ -188,6 +226,15 @@
             "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
             "EmptyState": {
                 "title": "No tienes ninguna dirección"
+            },
+            "FieldErrors": {
+                "firstNameRequired": "El campo Nombre es obligatorio.",
+                "lastNameRequired": "El campo Apellido es obligatorio.",
+                "addressLine1Required": "La línea 1 es obligatoria",
+                "cityRequired": "La ciudad es obligatoria",
+                "countryRequired": "País es un campo obligatorio",
+                "stateRequired": "Estado/Provincia es un campo obligatorio.",
+                "postalCodeRequired": "El campo Código postal es obligatorio."
             }
         },
         "Settings": {
@@ -205,6 +252,23 @@
                 "label": "Suscríbete a nuestro boletín informativo.",
                 "marketingPreferencesUpdated": "¡Las preferencias de marketing se actualizaron con éxito!",
                 "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde."
+            },
+            "FieldErrors": {
+                "firstNameRequired": "El campo Nombre es obligatorio.",
+                "firstNameTooSmall": "El nombre de pila debe tener al menos 2 caracteres",
+                "lastNameRequired": "El campo Apellido es obligatorio.",
+                "lastNameTooSmall": "El apellido debe tener al menos 2 caracteres",
+                "emailRequired": "El campo de correo electrónico es obligatorio",
+                "emailInvalid": "Por favor, introduzca una dirección de email válida",
+                "currentPasswordRequired": "La contraseña actual es obligatoria",
+                "passwordRequired": "Se requiere la contraseña",
+                "passwordTooSmall": "La contraseña debe ser al menos {minLength, plural, =1 {1 carácter} other {# caracteres}} longitud",
+                "passwordLowercaseRequired": "La contraseña debe contener al menos una letra minúscula",
+                "passwordUppercaseRequired": "La contraseña debe contener al menos una letra mayúscula",
+                "passwordNumberRequired": "La contraseña debe contener al menos {minNumbers, plural, =1 {un número} other {# números}}",
+                "passwordSpecialCharacterRequired": "La contraseña debe contener al menos un carácter especial",
+                "passwordsMustMatch": "Las contraseñas no coinciden",
+                "confirmPasswordRequired": "Por favor, confirme tu contraseña"
             }
         }
     },
@@ -304,8 +368,11 @@
         "cartCombined": "Notamos que tenías artículos guardados en un carrito anterior, así que los hemos agregado a tu carrito actual.",
         "cartRestored": "Iniciaste un carrito en otro dispositivo y lo hemos restaurado aquí para que puedas continuar desde donde lo dejaste.",
         "cartUpdateInProgress": "Tiene una actualización de carrito en proceso. ¿Estás seguro de que quieres salir de esta página? Es posible que se pierdan sus cambios.",
-        "originalPrice": "Original price was {price}.",
-        "currentPrice": "Current price is {price}.",
+        "originalPrice": "El precio original era {price}.",
+        "currentPrice": "El precio actual es {price}.",
+        "quantityReadyToShip": "{cantidad, número} listo para enviar",
+        "quantityOnBackorder": "{cantidad, número} estará en pedido pendiente",
+        "partiallyAvailable": "Solo {cantidad, número} disponible",
         "CheckoutSummary": {
             "title": "Resumen",
             "subTotal": "Subtotal",
@@ -335,7 +402,8 @@
                 "updateShipping": "Actualizar envío",
                 "addShipping": "Agregar envío",
                 "cartNotFound": "Se produjo un error al recuperar su carrito",
-                "noShippingOptions": "No hay opciones de envío disponibles para tu dirección"
+                "noShippingOptions": "No hay opciones de envío disponibles para tu dirección",
+                "countryRequired": "País es un campo obligatorio"
             }
         },
         "GiftCertificate": {
@@ -395,6 +463,8 @@
             "additionalInformation": "Información adicional",
             "currentStock": "{cantidad, número} en stock",
             "backorderQuantity": "{cantidad, número} estará en espera",
+            "loadingMoreImages": "Loading more images",
+            "imagesLoaded": "{count, plural, =1 {1 more image loaded} other {# more images loaded}}",
             "Submit": {
                 "addToCart": "Agregar al carrito",
                 "outOfStock": "Agotado/a",
@@ -427,13 +497,24 @@
                 "button": "Escribe una opinión",
                 "title": "Escribe una opinión",
                 "submit": "Enviar",
+                "cancel": "Cancelar",
                 "ratingLabel": "Calificación",
                 "titleLabel": "Título",
                 "reviewLabel": "Revisar",
                 "nameLabel": "Nombre",
                 "emailLabel": "Correo electrónico",
                 "successMessage": "¡Tu reseña fue enviada con éxito!",
-                "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde."
+                "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
+                "FieldErrors": {
+                    "titleRequired": "Se requiere título",
+                    "authorRequired": "El campo Nombre es obligatorio",
+                    "emailRequired": "El campo de correo electrónico es obligatorio",
+                    "emailInvalid": "Por favor, introduzca una dirección de email válida",
+                    "textRequired": "Es necesario revisar",
+                    "ratingRequired": "Se requiere una calificación",
+                    "ratingTooSmall": "La puntuación debe ser al menos 1",
+                    "ratingTooLarge": "El puntaje debe ser como máximo 5"
+                }
             }
         }
     },
@@ -515,7 +596,8 @@
             "description": "Mantente al día con las últimas noticias y ofertas de nuestra tienda.",
             "subscribedToNewsletter": "¡Te suscribiste a nuestro boletín!",
             "Errors": {
-                "invalidEmail": "Ingrese una dirección de correo electrónico válida.",
+                "emailRequired": "El campo de correo electrónico es obligatorio",
+                "invalidEmail": "Por favor, introduzca una dirección de email válida",
                 "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde."
             }
         },
@@ -559,9 +641,9 @@
             }
         },
         "Price": {
-            "originalPrice": "Original price was {price}.",
-            "currentPrice": "Current price is {price}.",
-            "range": "Price from {minValue} to {maxValue}."
+            "originalPrice": "El precio original era {price}.",
+            "currentPrice": "El precio actual es {price}.",
+            "range": "Precio de {minValue} a {maxValue}."
         }
     },
     "GiftCertificates": {
@@ -607,15 +689,25 @@
                 "expiryCheckboxLabel": "Reconozco que este Certificado de Regalo caducará el {expiryDate}",
                 "ctaLabel": "Agregar al carrito",
                 "Errors": {
-                    "amountRequired": "Seleccione o ingrese el monto de un certificado de regalo.",
-                    "amountInvalid": "Seleccione un monto de certificado de regalo válido.",
-                    "amountOutOfRange": "Ingrese una cantidad entre {minAmount} y {maxAmount}.",
-                    "unexpectedSettingsError": "Se produjo un error inesperado al recuperar la configuración del certificado de regalo. Intente de nuevo más tarde."
+                    "amountRequired": "Por favor, selecciona o introduce el importe de un vale regalo",
+                    "amountInvalid": "Por favor, seleccione un importe válido de un certificado regalo",
+                    "amountOutOfRange": "Por favor, introduzca una cantidad entre {minAmount} y {maxAmount}",
+                    "unexpectedSettingsError": "Se produjo un error inesperado al recuperar la configuración del certificado de regalo. Intente de nuevo más tarde.",
+                    "senderNameRequired": "Tu nombre es obligatorio",
+                    "senderEmailRequired": "Tu correo electrónico es obligatorio",
+                    "recipientNameRequired": "Se requiere el nombre del destinatario",
+                    "recipientEmailRequired": "Se requiere el email del destinatario",
+                    "emailInvalid": "Por favor, introduzca una dirección de email válida",
+                    "checkboxRequired": "Debes marcar esta casilla para continuar"
                 }
             }
         }
     },
     "Form": {
-        "optional": "Opcional"
+        "optional": "Opcional",
+        "Errors": {
+            "invalidInput": "Por favor, revisa tu opinión y vuelve a intentarlo",
+            "invalidFormat": "El valor introducido no coincide con el formato requerido"
+        }
     }
 }
diff --git a/core/messages/es-LA.json b/core/messages/es-LA.json
index f98234073b..93e4940194 100644
--- a/core/messages/es-LA.json
+++ b/core/messages/es-LA.json
@@ -43,7 +43,17 @@
             "newPassword": "Nueva contraseña",
             "confirmPassword": "Confirmar contraseña",
             "passwordUpdated": "¡La contraseña se actualizó correctamente!",
-            "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde."
+            "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
+            "FieldErrors": {
+                "passwordRequired": "Se requiere la contraseña",
+                "passwordTooSmall": "La contraseña debe ser al menos {minLength, plural, =1 {1 carácter} other {# caracteres}} longitud",
+                "passwordLowercaseRequired": "La contraseña debe contener al menos una letra minúscula",
+                "passwordUppercaseRequired": "La contraseña debe contener al menos una letra mayúscula",
+                "passwordNumberRequired": "La contraseña debe contener al menos {minNumbers, plural, =1 {un número} other {# números}}",
+                "passwordSpecialCharacterRequired": "La contraseña debe contener al menos un carácter especial",
+                "passwordsMustMatch": "Las contraseñas no coinciden",
+                "confirmPasswordRequired": "Por favor, confirme tu contraseña"
+            }
         },
         "Login": {
             "title": "Inicio de sesión",
@@ -56,6 +66,12 @@
             "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
             "passwordResetRequired": "Se requiere restablecimiento de contraseña. Por favor, revisa tu email para ver instrucciones para restablecer tu contraseña.",
             "invalidToken": "Tu enlace de acceso es inválido o caducó. Por favor, intenta iniciar sesión de nuevo.",
+            "FieldErrors": {
+                "emailRequired": "El campo de correo electrónico es obligatorio",
+                "emailInvalid": "Por favor, introduzca una dirección de email válida",
+                "passwordRequired": "Se requiere la contraseña",
+                "invalidInput": "Por favor, revisa tu opinión y vuelve a intentarlo."
+            },
             "CreateAccount": {
                 "title": "¿Nuevo cliente?",
                 "accountBenefits": "Crea una cuenta con nosotros y podrás:",
@@ -70,14 +86,36 @@
                 "title": "Olvidé la contraseña",
                 "subtitle": "A continuación, ingresa el correo electrónico asociado a tu cuenta. Te enviaremos instrucciones para restablecer tu contraseña.",
                 "confirmResetPassword": "Si la dirección de correo electrónico {email} está vinculada a una cuenta en nuestra tienda, te hemos enviado un correo electrónico de restablecimiento de contraseña. Revisa tu bandeja de entrada y tu carpeta de correo no deseado si no lo ves.",
-                "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde."
+                "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
+                "FieldErrors": {
+                    "emailRequired": "El campo de correo electrónico es obligatorio",
+                    "emailInvalid": "Por favor, introduzca una dirección de email válida"
+                }
             }
         },
         "Register": {
             "title": "Registrar cuenta",
             "heading": "Cuenta nueva",
             "cta": "Crear cuenta",
-            "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde."
+            "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
+            "FieldErrors": {
+                "firstNameRequired": "El campo Nombre es obligatorio.",
+                "lastNameRequired": "El campo Apellido es obligatorio.",
+                "emailRequired": "El campo de correo electrónico es obligatorio",
+                "emailInvalid": "Por favor, introduzca una dirección de email válida",
+                "passwordRequired": "Se requiere la contraseña",
+                "passwordTooSmall": "La contraseña debe ser al menos {minLength, plural, =1 {1 carácter} other {# caracteres}} longitud",
+                "passwordLowercaseRequired": "La contraseña debe contener al menos una letra minúscula",
+                "passwordUppercaseRequired": "La contraseña debe contener al menos una letra mayúscula",
+                "passwordNumberRequired": "La contraseña debe contener al menos {minNumbers, plural, =1 {un número} other {# números}}",
+                "passwordSpecialCharacterRequired": "La contraseña debe contener al menos un carácter especial",
+                "passwordsMustMatch": "Las contraseñas no coinciden",
+                "addressLine1Required": "La línea 1 es obligatoria",
+                "cityRequired": "La ciudad es obligatoria",
+                "countryRequired": "País es un campo obligatorio",
+                "stateRequired": "Estado/Provincia es un campo obligatorio.",
+                "postalCodeRequired": "El campo Código postal es obligatorio."
+            }
         }
     },
     "Faceted": {
@@ -188,6 +226,15 @@
             "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
             "EmptyState": {
                 "title": "No tienes ninguna dirección"
+            },
+            "FieldErrors": {
+                "firstNameRequired": "El campo Nombre es obligatorio.",
+                "lastNameRequired": "El campo Apellido es obligatorio.",
+                "addressLine1Required": "La línea 1 es obligatoria",
+                "cityRequired": "La ciudad es obligatoria",
+                "countryRequired": "País es un campo obligatorio",
+                "stateRequired": "Estado/Provincia es un campo obligatorio.",
+                "postalCodeRequired": "El campo Código postal es obligatorio."
             }
         },
         "Settings": {
@@ -205,6 +252,23 @@
                 "label": "Suscríbete a nuestro boletín informativo.",
                 "marketingPreferencesUpdated": "¡Las preferencias de marketing se actualizaron con éxito!",
                 "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde."
+            },
+            "FieldErrors": {
+                "firstNameRequired": "El campo Nombre es obligatorio.",
+                "firstNameTooSmall": "El nombre de pila debe tener al menos 2 caracteres",
+                "lastNameRequired": "El campo Apellido es obligatorio.",
+                "lastNameTooSmall": "El apellido debe tener al menos 2 caracteres",
+                "emailRequired": "El campo de correo electrónico es obligatorio",
+                "emailInvalid": "Por favor, introduzca una dirección de email válida",
+                "currentPasswordRequired": "La contraseña actual es obligatoria",
+                "passwordRequired": "Se requiere la contraseña",
+                "passwordTooSmall": "La contraseña debe ser al menos {minLength, plural, =1 {1 carácter} other {# caracteres}} longitud",
+                "passwordLowercaseRequired": "La contraseña debe contener al menos una letra minúscula",
+                "passwordUppercaseRequired": "La contraseña debe contener al menos una letra mayúscula",
+                "passwordNumberRequired": "La contraseña debe contener al menos {minNumbers, plural, =1 {un número} other {# números}}",
+                "passwordSpecialCharacterRequired": "La contraseña debe contener al menos un carácter especial",
+                "passwordsMustMatch": "Las contraseñas no coinciden",
+                "confirmPasswordRequired": "Por favor, confirme tu contraseña"
             }
         }
     },
@@ -304,8 +368,11 @@
         "cartCombined": "Notamos que tenías artículos guardados en un carrito anterior, así que los hemos agregado a tu carrito actual.",
         "cartRestored": "Iniciaste un carrito en otro dispositivo y lo hemos restaurado aquí para que puedas continuar desde donde lo dejaste.",
         "cartUpdateInProgress": "Tiene una actualización de carrito en proceso. ¿Estás seguro de que quieres salir de esta página? Es posible que se pierdan sus cambios.",
-        "originalPrice": "Original price was {price}.",
-        "currentPrice": "Current price is {price}.",
+        "originalPrice": "El precio original era {price}.",
+        "currentPrice": "El precio actual es {price}.",
+        "quantityReadyToShip": "{cantidad, número} listo para enviar",
+        "quantityOnBackorder": "{cantidad, número} estará en pedido pendiente",
+        "partiallyAvailable": "Solo {cantidad, número} disponible",
         "CheckoutSummary": {
             "title": "Resumen",
             "subTotal": "Subtotal",
@@ -335,7 +402,8 @@
                 "updateShipping": "Actualizar envío",
                 "addShipping": "Agregar envío",
                 "cartNotFound": "Se produjo un error al recuperar su carrito",
-                "noShippingOptions": "No hay opciones de envío disponibles para tu dirección"
+                "noShippingOptions": "No hay opciones de envío disponibles para tu dirección",
+                "countryRequired": "País es un campo obligatorio"
             }
         },
         "GiftCertificate": {
@@ -395,6 +463,8 @@
             "additionalInformation": "Información adicional",
             "currentStock": "{cantidad, número} en stock",
             "backorderQuantity": "{cantidad, número} estará en espera",
+            "loadingMoreImages": "Loading more images",
+            "imagesLoaded": "{count, plural, =1 {1 more image loaded} other {# more images loaded}}",
             "Submit": {
                 "addToCart": "Agregar al carrito",
                 "outOfStock": "Agotado/a",
@@ -427,13 +497,24 @@
                 "button": "Escribe una opinión",
                 "title": "Escribe una opinión",
                 "submit": "Enviar",
+                "cancel": "Cancelar",
                 "ratingLabel": "Calificación",
                 "titleLabel": "Título",
                 "reviewLabel": "Revisar",
                 "nameLabel": "Nombre",
                 "emailLabel": "Correo electrónico",
                 "successMessage": "¡Tu reseña fue enviada con éxito!",
-                "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde."
+                "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
+                "FieldErrors": {
+                    "titleRequired": "Se requiere título",
+                    "authorRequired": "El campo Nombre es obligatorio",
+                    "emailRequired": "El campo de correo electrónico es obligatorio",
+                    "emailInvalid": "Por favor, introduzca una dirección de email válida",
+                    "textRequired": "Es necesario revisar",
+                    "ratingRequired": "Se requiere una calificación",
+                    "ratingTooSmall": "La puntuación debe ser al menos 1",
+                    "ratingTooLarge": "El puntaje debe ser como máximo 5"
+                }
             }
         }
     },
@@ -515,7 +596,8 @@
             "description": "Mantente al día con las últimas noticias y ofertas de nuestra tienda.",
             "subscribedToNewsletter": "¡Te suscribiste a nuestro boletín!",
             "Errors": {
-                "invalidEmail": "Ingrese una dirección de correo electrónico válida.",
+                "emailRequired": "El campo de correo electrónico es obligatorio",
+                "invalidEmail": "Por favor, introduzca una dirección de email válida",
                 "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde."
             }
         },
@@ -559,9 +641,9 @@
             }
         },
         "Price": {
-            "originalPrice": "Original price was {price}.",
-            "currentPrice": "Current price is {price}.",
-            "range": "Price from {minValue} to {maxValue}."
+            "originalPrice": "El precio original era {price}.",
+            "currentPrice": "El precio actual es {price}.",
+            "range": "Precio de {minValue} a {maxValue}."
         }
     },
     "GiftCertificates": {
@@ -607,15 +689,25 @@
                 "expiryCheckboxLabel": "Reconozco que este Certificado de Regalo caducará el {expiryDate}",
                 "ctaLabel": "Agregar al carrito",
                 "Errors": {
-                    "amountRequired": "Seleccione o ingrese el monto de un certificado de regalo.",
-                    "amountInvalid": "Seleccione un monto de certificado de regalo válido.",
-                    "amountOutOfRange": "Ingrese una cantidad entre {minAmount} y {maxAmount}.",
-                    "unexpectedSettingsError": "Se produjo un error inesperado al recuperar la configuración del certificado de regalo. Intente de nuevo más tarde."
+                    "amountRequired": "Por favor, selecciona o introduce el importe de un vale regalo",
+                    "amountInvalid": "Por favor, seleccione un importe válido de un certificado regalo",
+                    "amountOutOfRange": "Por favor, introduzca una cantidad entre {minAmount} y {maxAmount}",
+                    "unexpectedSettingsError": "Se produjo un error inesperado al recuperar la configuración del certificado de regalo. Intente de nuevo más tarde.",
+                    "senderNameRequired": "Tu nombre es obligatorio",
+                    "senderEmailRequired": "Tu correo electrónico es obligatorio",
+                    "recipientNameRequired": "Se requiere el nombre del destinatario",
+                    "recipientEmailRequired": "Se requiere el email del destinatario",
+                    "emailInvalid": "Por favor, introduzca una dirección de email válida",
+                    "checkboxRequired": "Debes marcar esta casilla para continuar"
                 }
             }
         }
     },
     "Form": {
-        "optional": "Opcional"
+        "optional": "Opcional",
+        "Errors": {
+            "invalidInput": "Por favor, revisa tu opinión y vuelve a intentarlo",
+            "invalidFormat": "El valor introducido no coincide con el formato requerido"
+        }
     }
 }
diff --git a/core/messages/es-MX.json b/core/messages/es-MX.json
index f98234073b..93e4940194 100644
--- a/core/messages/es-MX.json
+++ b/core/messages/es-MX.json
@@ -43,7 +43,17 @@
             "newPassword": "Nueva contraseña",
             "confirmPassword": "Confirmar contraseña",
             "passwordUpdated": "¡La contraseña se actualizó correctamente!",
-            "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde."
+            "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
+            "FieldErrors": {
+                "passwordRequired": "Se requiere la contraseña",
+                "passwordTooSmall": "La contraseña debe ser al menos {minLength, plural, =1 {1 carácter} other {# caracteres}} longitud",
+                "passwordLowercaseRequired": "La contraseña debe contener al menos una letra minúscula",
+                "passwordUppercaseRequired": "La contraseña debe contener al menos una letra mayúscula",
+                "passwordNumberRequired": "La contraseña debe contener al menos {minNumbers, plural, =1 {un número} other {# números}}",
+                "passwordSpecialCharacterRequired": "La contraseña debe contener al menos un carácter especial",
+                "passwordsMustMatch": "Las contraseñas no coinciden",
+                "confirmPasswordRequired": "Por favor, confirme tu contraseña"
+            }
         },
         "Login": {
             "title": "Inicio de sesión",
@@ -56,6 +66,12 @@
             "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
             "passwordResetRequired": "Se requiere restablecimiento de contraseña. Por favor, revisa tu email para ver instrucciones para restablecer tu contraseña.",
             "invalidToken": "Tu enlace de acceso es inválido o caducó. Por favor, intenta iniciar sesión de nuevo.",
+            "FieldErrors": {
+                "emailRequired": "El campo de correo electrónico es obligatorio",
+                "emailInvalid": "Por favor, introduzca una dirección de email válida",
+                "passwordRequired": "Se requiere la contraseña",
+                "invalidInput": "Por favor, revisa tu opinión y vuelve a intentarlo."
+            },
             "CreateAccount": {
                 "title": "¿Nuevo cliente?",
                 "accountBenefits": "Crea una cuenta con nosotros y podrás:",
@@ -70,14 +86,36 @@
                 "title": "Olvidé la contraseña",
                 "subtitle": "A continuación, ingresa el correo electrónico asociado a tu cuenta. Te enviaremos instrucciones para restablecer tu contraseña.",
                 "confirmResetPassword": "Si la dirección de correo electrónico {email} está vinculada a una cuenta en nuestra tienda, te hemos enviado un correo electrónico de restablecimiento de contraseña. Revisa tu bandeja de entrada y tu carpeta de correo no deseado si no lo ves.",
-                "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde."
+                "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
+                "FieldErrors": {
+                    "emailRequired": "El campo de correo electrónico es obligatorio",
+                    "emailInvalid": "Por favor, introduzca una dirección de email válida"
+                }
             }
         },
         "Register": {
             "title": "Registrar cuenta",
             "heading": "Cuenta nueva",
             "cta": "Crear cuenta",
-            "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde."
+            "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
+            "FieldErrors": {
+                "firstNameRequired": "El campo Nombre es obligatorio.",
+                "lastNameRequired": "El campo Apellido es obligatorio.",
+                "emailRequired": "El campo de correo electrónico es obligatorio",
+                "emailInvalid": "Por favor, introduzca una dirección de email válida",
+                "passwordRequired": "Se requiere la contraseña",
+                "passwordTooSmall": "La contraseña debe ser al menos {minLength, plural, =1 {1 carácter} other {# caracteres}} longitud",
+                "passwordLowercaseRequired": "La contraseña debe contener al menos una letra minúscula",
+                "passwordUppercaseRequired": "La contraseña debe contener al menos una letra mayúscula",
+                "passwordNumberRequired": "La contraseña debe contener al menos {minNumbers, plural, =1 {un número} other {# números}}",
+                "passwordSpecialCharacterRequired": "La contraseña debe contener al menos un carácter especial",
+                "passwordsMustMatch": "Las contraseñas no coinciden",
+                "addressLine1Required": "La línea 1 es obligatoria",
+                "cityRequired": "La ciudad es obligatoria",
+                "countryRequired": "País es un campo obligatorio",
+                "stateRequired": "Estado/Provincia es un campo obligatorio.",
+                "postalCodeRequired": "El campo Código postal es obligatorio."
+            }
         }
     },
     "Faceted": {
@@ -188,6 +226,15 @@
             "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
             "EmptyState": {
                 "title": "No tienes ninguna dirección"
+            },
+            "FieldErrors": {
+                "firstNameRequired": "El campo Nombre es obligatorio.",
+                "lastNameRequired": "El campo Apellido es obligatorio.",
+                "addressLine1Required": "La línea 1 es obligatoria",
+                "cityRequired": "La ciudad es obligatoria",
+                "countryRequired": "País es un campo obligatorio",
+                "stateRequired": "Estado/Provincia es un campo obligatorio.",
+                "postalCodeRequired": "El campo Código postal es obligatorio."
             }
         },
         "Settings": {
@@ -205,6 +252,23 @@
                 "label": "Suscríbete a nuestro boletín informativo.",
                 "marketingPreferencesUpdated": "¡Las preferencias de marketing se actualizaron con éxito!",
                 "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde."
+            },
+            "FieldErrors": {
+                "firstNameRequired": "El campo Nombre es obligatorio.",
+                "firstNameTooSmall": "El nombre de pila debe tener al menos 2 caracteres",
+                "lastNameRequired": "El campo Apellido es obligatorio.",
+                "lastNameTooSmall": "El apellido debe tener al menos 2 caracteres",
+                "emailRequired": "El campo de correo electrónico es obligatorio",
+                "emailInvalid": "Por favor, introduzca una dirección de email válida",
+                "currentPasswordRequired": "La contraseña actual es obligatoria",
+                "passwordRequired": "Se requiere la contraseña",
+                "passwordTooSmall": "La contraseña debe ser al menos {minLength, plural, =1 {1 carácter} other {# caracteres}} longitud",
+                "passwordLowercaseRequired": "La contraseña debe contener al menos una letra minúscula",
+                "passwordUppercaseRequired": "La contraseña debe contener al menos una letra mayúscula",
+                "passwordNumberRequired": "La contraseña debe contener al menos {minNumbers, plural, =1 {un número} other {# números}}",
+                "passwordSpecialCharacterRequired": "La contraseña debe contener al menos un carácter especial",
+                "passwordsMustMatch": "Las contraseñas no coinciden",
+                "confirmPasswordRequired": "Por favor, confirme tu contraseña"
             }
         }
     },
@@ -304,8 +368,11 @@
         "cartCombined": "Notamos que tenías artículos guardados en un carrito anterior, así que los hemos agregado a tu carrito actual.",
         "cartRestored": "Iniciaste un carrito en otro dispositivo y lo hemos restaurado aquí para que puedas continuar desde donde lo dejaste.",
         "cartUpdateInProgress": "Tiene una actualización de carrito en proceso. ¿Estás seguro de que quieres salir de esta página? Es posible que se pierdan sus cambios.",
-        "originalPrice": "Original price was {price}.",
-        "currentPrice": "Current price is {price}.",
+        "originalPrice": "El precio original era {price}.",
+        "currentPrice": "El precio actual es {price}.",
+        "quantityReadyToShip": "{cantidad, número} listo para enviar",
+        "quantityOnBackorder": "{cantidad, número} estará en pedido pendiente",
+        "partiallyAvailable": "Solo {cantidad, número} disponible",
         "CheckoutSummary": {
             "title": "Resumen",
             "subTotal": "Subtotal",
@@ -335,7 +402,8 @@
                 "updateShipping": "Actualizar envío",
                 "addShipping": "Agregar envío",
                 "cartNotFound": "Se produjo un error al recuperar su carrito",
-                "noShippingOptions": "No hay opciones de envío disponibles para tu dirección"
+                "noShippingOptions": "No hay opciones de envío disponibles para tu dirección",
+                "countryRequired": "País es un campo obligatorio"
             }
         },
         "GiftCertificate": {
@@ -395,6 +463,8 @@
             "additionalInformation": "Información adicional",
             "currentStock": "{cantidad, número} en stock",
             "backorderQuantity": "{cantidad, número} estará en espera",
+            "loadingMoreImages": "Loading more images",
+            "imagesLoaded": "{count, plural, =1 {1 more image loaded} other {# more images loaded}}",
             "Submit": {
                 "addToCart": "Agregar al carrito",
                 "outOfStock": "Agotado/a",
@@ -427,13 +497,24 @@
                 "button": "Escribe una opinión",
                 "title": "Escribe una opinión",
                 "submit": "Enviar",
+                "cancel": "Cancelar",
                 "ratingLabel": "Calificación",
                 "titleLabel": "Título",
                 "reviewLabel": "Revisar",
                 "nameLabel": "Nombre",
                 "emailLabel": "Correo electrónico",
                 "successMessage": "¡Tu reseña fue enviada con éxito!",
-                "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde."
+                "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
+                "FieldErrors": {
+                    "titleRequired": "Se requiere título",
+                    "authorRequired": "El campo Nombre es obligatorio",
+                    "emailRequired": "El campo de correo electrónico es obligatorio",
+                    "emailInvalid": "Por favor, introduzca una dirección de email válida",
+                    "textRequired": "Es necesario revisar",
+                    "ratingRequired": "Se requiere una calificación",
+                    "ratingTooSmall": "La puntuación debe ser al menos 1",
+                    "ratingTooLarge": "El puntaje debe ser como máximo 5"
+                }
             }
         }
     },
@@ -515,7 +596,8 @@
             "description": "Mantente al día con las últimas noticias y ofertas de nuestra tienda.",
             "subscribedToNewsletter": "¡Te suscribiste a nuestro boletín!",
             "Errors": {
-                "invalidEmail": "Ingrese una dirección de correo electrónico válida.",
+                "emailRequired": "El campo de correo electrónico es obligatorio",
+                "invalidEmail": "Por favor, introduzca una dirección de email válida",
                 "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde."
             }
         },
@@ -559,9 +641,9 @@
             }
         },
         "Price": {
-            "originalPrice": "Original price was {price}.",
-            "currentPrice": "Current price is {price}.",
-            "range": "Price from {minValue} to {maxValue}."
+            "originalPrice": "El precio original era {price}.",
+            "currentPrice": "El precio actual es {price}.",
+            "range": "Precio de {minValue} a {maxValue}."
         }
     },
     "GiftCertificates": {
@@ -607,15 +689,25 @@
                 "expiryCheckboxLabel": "Reconozco que este Certificado de Regalo caducará el {expiryDate}",
                 "ctaLabel": "Agregar al carrito",
                 "Errors": {
-                    "amountRequired": "Seleccione o ingrese el monto de un certificado de regalo.",
-                    "amountInvalid": "Seleccione un monto de certificado de regalo válido.",
-                    "amountOutOfRange": "Ingrese una cantidad entre {minAmount} y {maxAmount}.",
-                    "unexpectedSettingsError": "Se produjo un error inesperado al recuperar la configuración del certificado de regalo. Intente de nuevo más tarde."
+                    "amountRequired": "Por favor, selecciona o introduce el importe de un vale regalo",
+                    "amountInvalid": "Por favor, seleccione un importe válido de un certificado regalo",
+                    "amountOutOfRange": "Por favor, introduzca una cantidad entre {minAmount} y {maxAmount}",
+                    "unexpectedSettingsError": "Se produjo un error inesperado al recuperar la configuración del certificado de regalo. Intente de nuevo más tarde.",
+                    "senderNameRequired": "Tu nombre es obligatorio",
+                    "senderEmailRequired": "Tu correo electrónico es obligatorio",
+                    "recipientNameRequired": "Se requiere el nombre del destinatario",
+                    "recipientEmailRequired": "Se requiere el email del destinatario",
+                    "emailInvalid": "Por favor, introduzca una dirección de email válida",
+                    "checkboxRequired": "Debes marcar esta casilla para continuar"
                 }
             }
         }
     },
     "Form": {
-        "optional": "Opcional"
+        "optional": "Opcional",
+        "Errors": {
+            "invalidInput": "Por favor, revisa tu opinión y vuelve a intentarlo",
+            "invalidFormat": "El valor introducido no coincide con el formato requerido"
+        }
     }
 }
diff --git a/core/messages/es-PE.json b/core/messages/es-PE.json
index f98234073b..93e4940194 100644
--- a/core/messages/es-PE.json
+++ b/core/messages/es-PE.json
@@ -43,7 +43,17 @@
             "newPassword": "Nueva contraseña",
             "confirmPassword": "Confirmar contraseña",
             "passwordUpdated": "¡La contraseña se actualizó correctamente!",
-            "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde."
+            "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
+            "FieldErrors": {
+                "passwordRequired": "Se requiere la contraseña",
+                "passwordTooSmall": "La contraseña debe ser al menos {minLength, plural, =1 {1 carácter} other {# caracteres}} longitud",
+                "passwordLowercaseRequired": "La contraseña debe contener al menos una letra minúscula",
+                "passwordUppercaseRequired": "La contraseña debe contener al menos una letra mayúscula",
+                "passwordNumberRequired": "La contraseña debe contener al menos {minNumbers, plural, =1 {un número} other {# números}}",
+                "passwordSpecialCharacterRequired": "La contraseña debe contener al menos un carácter especial",
+                "passwordsMustMatch": "Las contraseñas no coinciden",
+                "confirmPasswordRequired": "Por favor, confirme tu contraseña"
+            }
         },
         "Login": {
             "title": "Inicio de sesión",
@@ -56,6 +66,12 @@
             "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
             "passwordResetRequired": "Se requiere restablecimiento de contraseña. Por favor, revisa tu email para ver instrucciones para restablecer tu contraseña.",
             "invalidToken": "Tu enlace de acceso es inválido o caducó. Por favor, intenta iniciar sesión de nuevo.",
+            "FieldErrors": {
+                "emailRequired": "El campo de correo electrónico es obligatorio",
+                "emailInvalid": "Por favor, introduzca una dirección de email válida",
+                "passwordRequired": "Se requiere la contraseña",
+                "invalidInput": "Por favor, revisa tu opinión y vuelve a intentarlo."
+            },
             "CreateAccount": {
                 "title": "¿Nuevo cliente?",
                 "accountBenefits": "Crea una cuenta con nosotros y podrás:",
@@ -70,14 +86,36 @@
                 "title": "Olvidé la contraseña",
                 "subtitle": "A continuación, ingresa el correo electrónico asociado a tu cuenta. Te enviaremos instrucciones para restablecer tu contraseña.",
                 "confirmResetPassword": "Si la dirección de correo electrónico {email} está vinculada a una cuenta en nuestra tienda, te hemos enviado un correo electrónico de restablecimiento de contraseña. Revisa tu bandeja de entrada y tu carpeta de correo no deseado si no lo ves.",
-                "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde."
+                "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
+                "FieldErrors": {
+                    "emailRequired": "El campo de correo electrónico es obligatorio",
+                    "emailInvalid": "Por favor, introduzca una dirección de email válida"
+                }
             }
         },
         "Register": {
             "title": "Registrar cuenta",
             "heading": "Cuenta nueva",
             "cta": "Crear cuenta",
-            "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde."
+            "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
+            "FieldErrors": {
+                "firstNameRequired": "El campo Nombre es obligatorio.",
+                "lastNameRequired": "El campo Apellido es obligatorio.",
+                "emailRequired": "El campo de correo electrónico es obligatorio",
+                "emailInvalid": "Por favor, introduzca una dirección de email válida",
+                "passwordRequired": "Se requiere la contraseña",
+                "passwordTooSmall": "La contraseña debe ser al menos {minLength, plural, =1 {1 carácter} other {# caracteres}} longitud",
+                "passwordLowercaseRequired": "La contraseña debe contener al menos una letra minúscula",
+                "passwordUppercaseRequired": "La contraseña debe contener al menos una letra mayúscula",
+                "passwordNumberRequired": "La contraseña debe contener al menos {minNumbers, plural, =1 {un número} other {# números}}",
+                "passwordSpecialCharacterRequired": "La contraseña debe contener al menos un carácter especial",
+                "passwordsMustMatch": "Las contraseñas no coinciden",
+                "addressLine1Required": "La línea 1 es obligatoria",
+                "cityRequired": "La ciudad es obligatoria",
+                "countryRequired": "País es un campo obligatorio",
+                "stateRequired": "Estado/Provincia es un campo obligatorio.",
+                "postalCodeRequired": "El campo Código postal es obligatorio."
+            }
         }
     },
     "Faceted": {
@@ -188,6 +226,15 @@
             "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
             "EmptyState": {
                 "title": "No tienes ninguna dirección"
+            },
+            "FieldErrors": {
+                "firstNameRequired": "El campo Nombre es obligatorio.",
+                "lastNameRequired": "El campo Apellido es obligatorio.",
+                "addressLine1Required": "La línea 1 es obligatoria",
+                "cityRequired": "La ciudad es obligatoria",
+                "countryRequired": "País es un campo obligatorio",
+                "stateRequired": "Estado/Provincia es un campo obligatorio.",
+                "postalCodeRequired": "El campo Código postal es obligatorio."
             }
         },
         "Settings": {
@@ -205,6 +252,23 @@
                 "label": "Suscríbete a nuestro boletín informativo.",
                 "marketingPreferencesUpdated": "¡Las preferencias de marketing se actualizaron con éxito!",
                 "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde."
+            },
+            "FieldErrors": {
+                "firstNameRequired": "El campo Nombre es obligatorio.",
+                "firstNameTooSmall": "El nombre de pila debe tener al menos 2 caracteres",
+                "lastNameRequired": "El campo Apellido es obligatorio.",
+                "lastNameTooSmall": "El apellido debe tener al menos 2 caracteres",
+                "emailRequired": "El campo de correo electrónico es obligatorio",
+                "emailInvalid": "Por favor, introduzca una dirección de email válida",
+                "currentPasswordRequired": "La contraseña actual es obligatoria",
+                "passwordRequired": "Se requiere la contraseña",
+                "passwordTooSmall": "La contraseña debe ser al menos {minLength, plural, =1 {1 carácter} other {# caracteres}} longitud",
+                "passwordLowercaseRequired": "La contraseña debe contener al menos una letra minúscula",
+                "passwordUppercaseRequired": "La contraseña debe contener al menos una letra mayúscula",
+                "passwordNumberRequired": "La contraseña debe contener al menos {minNumbers, plural, =1 {un número} other {# números}}",
+                "passwordSpecialCharacterRequired": "La contraseña debe contener al menos un carácter especial",
+                "passwordsMustMatch": "Las contraseñas no coinciden",
+                "confirmPasswordRequired": "Por favor, confirme tu contraseña"
             }
         }
     },
@@ -304,8 +368,11 @@
         "cartCombined": "Notamos que tenías artículos guardados en un carrito anterior, así que los hemos agregado a tu carrito actual.",
         "cartRestored": "Iniciaste un carrito en otro dispositivo y lo hemos restaurado aquí para que puedas continuar desde donde lo dejaste.",
         "cartUpdateInProgress": "Tiene una actualización de carrito en proceso. ¿Estás seguro de que quieres salir de esta página? Es posible que se pierdan sus cambios.",
-        "originalPrice": "Original price was {price}.",
-        "currentPrice": "Current price is {price}.",
+        "originalPrice": "El precio original era {price}.",
+        "currentPrice": "El precio actual es {price}.",
+        "quantityReadyToShip": "{cantidad, número} listo para enviar",
+        "quantityOnBackorder": "{cantidad, número} estará en pedido pendiente",
+        "partiallyAvailable": "Solo {cantidad, número} disponible",
         "CheckoutSummary": {
             "title": "Resumen",
             "subTotal": "Subtotal",
@@ -335,7 +402,8 @@
                 "updateShipping": "Actualizar envío",
                 "addShipping": "Agregar envío",
                 "cartNotFound": "Se produjo un error al recuperar su carrito",
-                "noShippingOptions": "No hay opciones de envío disponibles para tu dirección"
+                "noShippingOptions": "No hay opciones de envío disponibles para tu dirección",
+                "countryRequired": "País es un campo obligatorio"
             }
         },
         "GiftCertificate": {
@@ -395,6 +463,8 @@
             "additionalInformation": "Información adicional",
             "currentStock": "{cantidad, número} en stock",
             "backorderQuantity": "{cantidad, número} estará en espera",
+            "loadingMoreImages": "Loading more images",
+            "imagesLoaded": "{count, plural, =1 {1 more image loaded} other {# more images loaded}}",
             "Submit": {
                 "addToCart": "Agregar al carrito",
                 "outOfStock": "Agotado/a",
@@ -427,13 +497,24 @@
                 "button": "Escribe una opinión",
                 "title": "Escribe una opinión",
                 "submit": "Enviar",
+                "cancel": "Cancelar",
                 "ratingLabel": "Calificación",
                 "titleLabel": "Título",
                 "reviewLabel": "Revisar",
                 "nameLabel": "Nombre",
                 "emailLabel": "Correo electrónico",
                 "successMessage": "¡Tu reseña fue enviada con éxito!",
-                "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde."
+                "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
+                "FieldErrors": {
+                    "titleRequired": "Se requiere título",
+                    "authorRequired": "El campo Nombre es obligatorio",
+                    "emailRequired": "El campo de correo electrónico es obligatorio",
+                    "emailInvalid": "Por favor, introduzca una dirección de email válida",
+                    "textRequired": "Es necesario revisar",
+                    "ratingRequired": "Se requiere una calificación",
+                    "ratingTooSmall": "La puntuación debe ser al menos 1",
+                    "ratingTooLarge": "El puntaje debe ser como máximo 5"
+                }
             }
         }
     },
@@ -515,7 +596,8 @@
             "description": "Mantente al día con las últimas noticias y ofertas de nuestra tienda.",
             "subscribedToNewsletter": "¡Te suscribiste a nuestro boletín!",
             "Errors": {
-                "invalidEmail": "Ingrese una dirección de correo electrónico válida.",
+                "emailRequired": "El campo de correo electrónico es obligatorio",
+                "invalidEmail": "Por favor, introduzca una dirección de email válida",
                 "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde."
             }
         },
@@ -559,9 +641,9 @@
             }
         },
         "Price": {
-            "originalPrice": "Original price was {price}.",
-            "currentPrice": "Current price is {price}.",
-            "range": "Price from {minValue} to {maxValue}."
+            "originalPrice": "El precio original era {price}.",
+            "currentPrice": "El precio actual es {price}.",
+            "range": "Precio de {minValue} a {maxValue}."
         }
     },
     "GiftCertificates": {
@@ -607,15 +689,25 @@
                 "expiryCheckboxLabel": "Reconozco que este Certificado de Regalo caducará el {expiryDate}",
                 "ctaLabel": "Agregar al carrito",
                 "Errors": {
-                    "amountRequired": "Seleccione o ingrese el monto de un certificado de regalo.",
-                    "amountInvalid": "Seleccione un monto de certificado de regalo válido.",
-                    "amountOutOfRange": "Ingrese una cantidad entre {minAmount} y {maxAmount}.",
-                    "unexpectedSettingsError": "Se produjo un error inesperado al recuperar la configuración del certificado de regalo. Intente de nuevo más tarde."
+                    "amountRequired": "Por favor, selecciona o introduce el importe de un vale regalo",
+                    "amountInvalid": "Por favor, seleccione un importe válido de un certificado regalo",
+                    "amountOutOfRange": "Por favor, introduzca una cantidad entre {minAmount} y {maxAmount}",
+                    "unexpectedSettingsError": "Se produjo un error inesperado al recuperar la configuración del certificado de regalo. Intente de nuevo más tarde.",
+                    "senderNameRequired": "Tu nombre es obligatorio",
+                    "senderEmailRequired": "Tu correo electrónico es obligatorio",
+                    "recipientNameRequired": "Se requiere el nombre del destinatario",
+                    "recipientEmailRequired": "Se requiere el email del destinatario",
+                    "emailInvalid": "Por favor, introduzca una dirección de email válida",
+                    "checkboxRequired": "Debes marcar esta casilla para continuar"
                 }
             }
         }
     },
     "Form": {
-        "optional": "Opcional"
+        "optional": "Opcional",
+        "Errors": {
+            "invalidInput": "Por favor, revisa tu opinión y vuelve a intentarlo",
+            "invalidFormat": "El valor introducido no coincide con el formato requerido"
+        }
     }
 }
diff --git a/core/messages/es.json b/core/messages/es.json
index c21c783f28..507e02c4bd 100644
--- a/core/messages/es.json
+++ b/core/messages/es.json
@@ -43,7 +43,17 @@
             "newPassword": "Nueva contraseña",
             "confirmPassword": "Confirmar contraseña",
             "passwordUpdated": "La contraseña se ha actualizado correctamente.",
-            "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde."
+            "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
+            "FieldErrors": {
+                "passwordRequired": "Se requiere la contraseña",
+                "passwordTooSmall": "La contraseña debe tener al menos {minLength, plural, =1 {1 carácter} other {# caracteres}}",
+                "passwordLowercaseRequired": "La contraseña debe contener al menos una letra minúscula",
+                "passwordUppercaseRequired": "La contraseña debe contener al menos una letra mayúscula",
+                "passwordNumberRequired": "La contraseña debe contener al menos {minNumbers, plural, =1 {un número} other {# números}}",
+                "passwordSpecialCharacterRequired": "La contraseña debe contener al menos un carácter especial",
+                "passwordsMustMatch": "Las contraseñas no coinciden",
+                "confirmPasswordRequired": "Confirma tu contraseña"
+            }
         },
         "Login": {
             "title": "Iniciar sesión",
@@ -56,6 +66,12 @@
             "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
             "passwordResetRequired": "Es necesario restablecer la contraseña. Consulta tu correo electrónico para recibir instrucciones sobre cómo restablecer tu contraseña.",
             "invalidToken": "Tu enlace de inicio de sesión no es válido o ha caducado. Intenta conectarte de nuevo.",
+            "FieldErrors": {
+                "emailRequired": "Se requiere un correo electrónico",
+                "emailInvalid": "Introduce una dirección de correo electrónico válida",
+                "passwordRequired": "Se requiere la contraseña",
+                "invalidInput": "Comprueba lo que has escrito e inténtalo de nuevo."
+            },
             "CreateAccount": {
                 "title": "¿Cliente nuevo?",
                 "accountBenefits": "Cree una cuenta con nosotros y podrá:",
@@ -70,14 +86,36 @@
                 "title": "Olvidé mi contraseña",
                 "subtitle": "Introduce a continuación la dirección de correo electrónico asociada a tu cuenta. Te enviaremos instrucciones para restablecer tu contraseña.",
                 "confirmResetPassword": "Si la dirección de correo electrónico {email} está vinculada a una cuenta en nuestra tienda, te hemos enviado un correo electrónico de restablecimiento de contraseña. Comprueba tu bandeja de entrada y tu carpeta de correo no deseado si no lo ves.",
-                "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde."
+                "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
+                "FieldErrors": {
+                    "emailRequired": "Se requiere un correo electrónico",
+                    "emailInvalid": "Introduce una dirección de correo electrónico válida"
+                }
             }
         },
         "Register": {
             "title": "Registrar cuenta",
             "heading": "Cuenta nueva",
             "cta": "Crear cuenta",
-            "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde."
+            "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
+            "FieldErrors": {
+                "firstNameRequired": "El campo Nombre es obligatorio.",
+                "lastNameRequired": "El campo Apellido(s) es obligatorio.",
+                "emailRequired": "Se requiere un correo electrónico",
+                "emailInvalid": "Introduce una dirección de correo electrónico válida",
+                "passwordRequired": "Se requiere la contraseña",
+                "passwordTooSmall": "La contraseña debe tener al menos {minLength, plural, =1 {1 carácter} other {# caracteres}}",
+                "passwordLowercaseRequired": "La contraseña debe contener al menos una letra minúscula",
+                "passwordUppercaseRequired": "La contraseña debe contener al menos una letra mayúscula",
+                "passwordNumberRequired": "La contraseña debe contener al menos {minNumbers, plural, =1 {un número} other {# números}}",
+                "passwordSpecialCharacterRequired": "La contraseña debe contener al menos un carácter especial",
+                "passwordsMustMatch": "Las contraseñas no coinciden",
+                "addressLine1Required": "El campo Línea de dirección 1 es obligatorio",
+                "cityRequired": "El campo Ciudad es obligatorio",
+                "countryRequired": "El campo de país es obligatorio.",
+                "stateRequired": "El campo de Estado/Provincia es obligatorio",
+                "postalCodeRequired": "El campo Código postal es obligatorio"
+            }
         }
     },
     "Faceted": {
@@ -188,6 +226,15 @@
             "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
             "EmptyState": {
                 "title": "No tienes ninguna dirección"
+            },
+            "FieldErrors": {
+                "firstNameRequired": "El campo Nombre es obligatorio.",
+                "lastNameRequired": "El campo Apellido(s) es obligatorio.",
+                "addressLine1Required": "El campo Línea de dirección 1 es obligatorio",
+                "cityRequired": "El campo Ciudad es obligatorio",
+                "countryRequired": "El campo de país es obligatorio.",
+                "stateRequired": "El campo de Estado/Provincia es obligatorio",
+                "postalCodeRequired": "El campo Código postal es obligatorio"
             }
         },
         "Settings": {
@@ -205,6 +252,23 @@
                 "label": "Suscríbase a nuestro boletín.",
                 "marketingPreferencesUpdated": "¡Las preferencias de marketing se han actualizado correctamente!",
                 "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde."
+            },
+            "FieldErrors": {
+                "firstNameRequired": "El campo Nombre es obligatorio.",
+                "firstNameTooSmall": "El nombre debe tener al menos 2 caracteres",
+                "lastNameRequired": "El campo Apellido(s) es obligatorio.",
+                "lastNameTooSmall": "El apellido debe tener al menos 2 caracteres",
+                "emailRequired": "Se requiere un correo electrónico",
+                "emailInvalid": "Introduce una dirección de correo electrónico válida",
+                "currentPasswordRequired": "Es obligatorio indicar la contraseña actual",
+                "passwordRequired": "Se requiere la contraseña",
+                "passwordTooSmall": "La contraseña debe tener al menos {minLength, plural, =1 {1 carácter} other {# caracteres}}",
+                "passwordLowercaseRequired": "La contraseña debe contener al menos una letra minúscula",
+                "passwordUppercaseRequired": "La contraseña debe contener al menos una letra mayúscula",
+                "passwordNumberRequired": "La contraseña debe contener al menos {minNumbers, plural, =1 {un número} other {# números}}",
+                "passwordSpecialCharacterRequired": "La contraseña debe contener al menos un carácter especial",
+                "passwordsMustMatch": "Las contraseñas no coinciden",
+                "confirmPasswordRequired": "Confirma tu contraseña"
             }
         }
     },
@@ -304,8 +368,11 @@
         "cartCombined": "Nos hemos dado cuenta de que tenías artículos guardados en un carrito anterior, así que los hemos añadido a tu carrito actual.",
         "cartRestored": "Empezaste a llenar un carrito en otro dispositivo y lo hemos restaurado aquí para que puedas seguir donde lo dejaste.",
         "cartUpdateInProgress": "Tienes una actualización del carrito en curso. ¿Seguro que quieres abandonar esta página? Es posible que se pierdan los cambios.",
-        "originalPrice": "Original price was {price}.",
-        "currentPrice": "Current price is {price}.",
+        "originalPrice": "El precio original era {price}.",
+        "currentPrice": "El precio actual es {price}.",
+        "quantityReadyToShip": "{quantity, number} listo para enviar",
+        "quantityOnBackorder": "Cantidad que se añadirá a pedidos pendientes: {quantity, number}",
+        "partiallyAvailable": "Cantidad disponible: {quantity, number}",
         "CheckoutSummary": {
             "title": "Resumen",
             "subTotal": "Subtotal",
@@ -335,7 +402,8 @@
                 "updateShipping": "Actualizar envío",
                 "addShipping": "Añadir envío",
                 "cartNotFound": "Se ha producido un error al recuperar tu carrito",
-                "noShippingOptions": "No hay opciones de envío disponibles para tu dirección"
+                "noShippingOptions": "No hay opciones de envío disponibles para tu dirección",
+                "countryRequired": "El campo de país es obligatorio."
             }
         },
         "GiftCertificate": {
@@ -395,6 +463,8 @@
             "additionalInformation": "Información adicional",
             "currentStock": "{cantidad, número} en existencias",
             "backorderQuantity": "{cantidad, número} en pedidos pendientes",
+            "loadingMoreImages": "Loading more images",
+            "imagesLoaded": "{count, plural, =1 {1 more image loaded} other {# more images loaded}}",
             "Submit": {
                 "addToCart": "Añadir al carrito",
                 "outOfStock": "Sin existencias",
@@ -427,13 +497,24 @@
                 "button": "Escribir una reseña",
                 "title": "Escribir una reseña",
                 "submit": "Enviar",
+                "cancel": "Cancelar",
                 "ratingLabel": "Calificación",
                 "titleLabel": "Título",
                 "reviewLabel": "Reseña",
                 "nameLabel": "Nombre",
                 "emailLabel": "Correo electrónico",
                 "successMessage": "¡Tu reseña se ha enviado correctamente!",
-                "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde."
+                "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
+                "FieldErrors": {
+                    "titleRequired": "El título es obligatorio",
+                    "authorRequired": "El campo Nombre es obligatorio",
+                    "emailRequired": "Se requiere un correo electrónico",
+                    "emailInvalid": "Introduce una dirección de correo electrónico válida",
+                    "textRequired": "La revisión es obligatoria",
+                    "ratingRequired": "La calificación es obligatoria",
+                    "ratingTooSmall": "La puntuación debe ser como mínimo 1",
+                    "ratingTooLarge": "La puntuación debe ser como máximo 5"
+                }
             }
         }
     },
@@ -515,7 +596,8 @@
             "description": "Entérate de todas las novedades y ofertas de nuestra tienda.",
             "subscribedToNewsletter": "¡Te has suscrito a nuestro boletín!",
             "Errors": {
-                "invalidEmail": "Ingrese una dirección de correo electrónico válida.",
+                "emailRequired": "Se requiere un correo electrónico",
+                "invalidEmail": "Introduce una dirección de correo electrónico válida",
                 "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde."
             }
         },
@@ -559,9 +641,9 @@
             }
         },
         "Price": {
-            "originalPrice": "Original price was {price}.",
-            "currentPrice": "Current price is {price}.",
-            "range": "Price from {minValue} to {maxValue}."
+            "originalPrice": "El precio original era {price}.",
+            "currentPrice": "El precio actual es {price}.",
+            "range": "Precios entre {minValue} y {maxValue}."
         }
     },
     "GiftCertificates": {
@@ -574,7 +656,7 @@
             "title": "Verificar saldo",
             "description": "Puedes comprobar el saldo y obtener la información sobre tu cupón de regalo escribiendo el código en la casilla de abajo.",
             "inputLabel": "Código",
-            "inputPlaceholder": "xxx-xxx-xxx-xxx",
+            "inputPlaceholder": "XXX-XXX-XXX-XXX",
             "purchasedDateLabel": "Comprado",
             "senderLabel": "de",
             "Errors": {
@@ -607,15 +689,25 @@
                 "expiryCheckboxLabel": "Reconozco que este vale de regalo caducará el {expiryDate}",
                 "ctaLabel": "Añadir al carrito",
                 "Errors": {
-                    "amountRequired": "Selecciona o introduce el importe de un certificado de regalo.",
-                    "amountInvalid": "Selecciona un importe de certificado de regalo válido.",
-                    "amountOutOfRange": "Introduce una cantidad entre {minAmount} y {maxAmount}.",
-                    "unexpectedSettingsError": "Se ha producido un error inesperado al recuperar la configuración del cupón de regalo. Vuelve a intentarlo más tarde."
+                    "amountRequired": "Selecciona o introduce un importe para el cupón de regalo",
+                    "amountInvalid": "Selecciona un importe válido para el cupón de regalo",
+                    "amountOutOfRange": "Introduce una cantidad entre {minAmount} y {maxAmount}",
+                    "unexpectedSettingsError": "Se ha producido un error inesperado al recuperar la configuración del cupón de regalo. Vuelve a intentarlo más tarde.",
+                    "senderNameRequired": "Tu nombre es obligatorio",
+                    "senderEmailRequired": "Tu correo electrónico es obligatorio",
+                    "recipientNameRequired": "El nombre del destinatario es obligatorio",
+                    "recipientEmailRequired": "El correo electrónico del destinatario es obligatorio",
+                    "emailInvalid": "Introduce una dirección de correo electrónico válida",
+                    "checkboxRequired": "Debes marcar esta casilla para continuar"
                 }
             }
         }
     },
     "Form": {
-        "optional": "Opcional"
+        "optional": "Opcional",
+        "Errors": {
+            "invalidInput": "Comprueba lo que has escrito e inténtalo de nuevo",
+            "invalidFormat": "El valor introducido no coincide con el formato requerido"
+        }
     }
 }
diff --git a/core/messages/fr.json b/core/messages/fr.json
index cc1171ace4..9e3ba28a74 100644
--- a/core/messages/fr.json
+++ b/core/messages/fr.json
@@ -43,7 +43,17 @@
             "newPassword": "Nouveau mot de passe",
             "confirmPassword": "Confirmer le mot de passe",
             "passwordUpdated": "Le mot de passe a bien été mis à jour !",
-            "somethingWentWrong": "Une erreur s'est produite. Veuillez réessayer plus tard."
+            "somethingWentWrong": "Une erreur s'est produite. Veuillez réessayer plus tard.",
+            "FieldErrors": {
+                "passwordRequired": "Un mot de passe est requis",
+                "passwordTooSmall": "Le mot de passe doit comporter au moins {minLength, plural, =1 {1 character} other {# characters}} caractères",
+                "passwordLowercaseRequired": "Le mot de passe doit comporter au moins une lettre minuscule",
+                "passwordUppercaseRequired": "Le mot de passe doit comporter au moins une lettre majuscule",
+                "passwordNumberRequired": "Le mot de passe doit comporter au moins {minNumbers, plural, =1 {one number} other {# numbers}} chiffres",
+                "passwordSpecialCharacterRequired": "Le mot de passe doit comporter au moins un caractère spécial",
+                "passwordsMustMatch": "Les mots de passe ne correspondent pas",
+                "confirmPasswordRequired": "Veuillez confirmer votre mot de passe"
+            }
         },
         "Login": {
             "title": "Connexion",
@@ -56,6 +66,12 @@
             "somethingWentWrong": "Une erreur s'est produite. Veuillez réessayer plus tard.",
             "passwordResetRequired": "Réinitialisation du mot de passe requise. Veuillez consulter votre e-mail pour les instructions de réinitialisation de votre mot de passe.",
             "invalidToken": "Votre lien de connexion n'est pas valide ou a expiré. Veuillez réessayer de vous connecter.",
+            "FieldErrors": {
+                "emailRequired": "L'adresse e-mail est requise",
+                "emailInvalid": "Veuillez saisir une adresse e-mail valide",
+                "passwordRequired": "Un mot de passe est requis",
+                "invalidInput": "Veuillez vérifier votre saisie et réessayer."
+            },
             "CreateAccount": {
                 "title": "Nouveau client ?",
                 "accountBenefits": "Créez un compte sur notre site et vous pourrez :",
@@ -70,14 +86,36 @@
                 "title": "Mot de passe oublié",
                 "subtitle": "Veuillez saisir ci-dessous l'adresse e-mail associée à votre compte. Nous vous enverrons des instructions pour réinitialiser votre mot de passe.",
                 "confirmResetPassword": "Si l'adresse e-mail {email} est liée à un compte dans notre boutique, vous recevrez un e-mail pour réinitialiser votre mot de passe. Veuillez consulter votre boîte de réception, ainsi que votre dossier de courrier indésirable si vous ne trouvez pas cet e-mail.",
-                "somethingWentWrong": "Une erreur s'est produite. Veuillez réessayer plus tard."
+                "somethingWentWrong": "Une erreur s'est produite. Veuillez réessayer plus tard.",
+                "FieldErrors": {
+                    "emailRequired": "L'adresse e-mail est requise",
+                    "emailInvalid": "Veuillez saisir une adresse e-mail valide"
+                }
             }
         },
         "Register": {
             "title": "Enregistrer un compte",
             "heading": "Nouveau compte",
             "cta": "Créer un compte",
-            "somethingWentWrong": "Une erreur s'est produite. Veuillez réessayer plus tard."
+            "somethingWentWrong": "Une erreur s'est produite. Veuillez réessayer plus tard.",
+            "FieldErrors": {
+                "firstNameRequired": "Le prénom est requis",
+                "lastNameRequired": "Le nom de famille est requis",
+                "emailRequired": "L'adresse e-mail est requise",
+                "emailInvalid": "Veuillez saisir une adresse e-mail valide",
+                "passwordRequired": "Un mot de passe est requis",
+                "passwordTooSmall": "Le mot de passe doit comporter au moins {minLength, plural, =1 {1 character} other {# characters}} caractères",
+                "passwordLowercaseRequired": "Le mot de passe doit comporter au moins une lettre minuscule",
+                "passwordUppercaseRequired": "Le mot de passe doit comporter au moins une lettre majuscule",
+                "passwordNumberRequired": "Le mot de passe doit comporter au moins {minNumbers, plural, =1 {one number} other {# numbers}} chiffres",
+                "passwordSpecialCharacterRequired": "Le mot de passe doit comporter au moins un caractère spécial",
+                "passwordsMustMatch": "Les mots de passe ne correspondent pas",
+                "addressLine1Required": "Ligne d'adresse 1 est requise",
+                "cityRequired": "La ville est requise",
+                "countryRequired": "Le pays est requis",
+                "stateRequired": "État/province est requis",
+                "postalCodeRequired": "Le code postal est requis"
+            }
         }
     },
     "Faceted": {
@@ -188,6 +226,15 @@
             "somethingWentWrong": "Une erreur s'est produite. Veuillez réessayer plus tard.",
             "EmptyState": {
                 "title": "Vous n'avez pas d'adresse"
+            },
+            "FieldErrors": {
+                "firstNameRequired": "Le prénom est requis",
+                "lastNameRequired": "Le nom de famille est requis",
+                "addressLine1Required": "Ligne d'adresse 1 est requise",
+                "cityRequired": "La ville est requise",
+                "countryRequired": "Le pays est requis",
+                "stateRequired": "État/province est requis",
+                "postalCodeRequired": "Le code postal est requis"
             }
         },
         "Settings": {
@@ -205,6 +252,23 @@
                 "label": "Abonnez-vous à notre newsletter.",
                 "marketingPreferencesUpdated": "Les préférences marketing ont bien été mises à jour.",
                 "somethingWentWrong": "Une erreur s'est produite. Veuillez réessayer plus tard."
+            },
+            "FieldErrors": {
+                "firstNameRequired": "Le prénom est requis",
+                "firstNameTooSmall": "Le prénom doit comporter au moins 2 caractères",
+                "lastNameRequired": "Le nom de famille est requis",
+                "lastNameTooSmall": "Le nom de famille doit comporter au moins 2 caractères",
+                "emailRequired": "L'adresse e-mail est requise",
+                "emailInvalid": "Veuillez saisir une adresse e-mail valide",
+                "currentPasswordRequired": "Vous devez saisir le mot de passe actuel",
+                "passwordRequired": "Un mot de passe est requis",
+                "passwordTooSmall": "Le mot de passe doit comporter au moins {minLength, plural, =1 {1 character} other {# characters}} caractères",
+                "passwordLowercaseRequired": "Le mot de passe doit comporter au moins une lettre minuscule",
+                "passwordUppercaseRequired": "Le mot de passe doit comporter au moins une lettre majuscule",
+                "passwordNumberRequired": "Le mot de passe doit comporter au moins {minNumbers, plural, =1 {one number} other {# numbers}} chiffres",
+                "passwordSpecialCharacterRequired": "Le mot de passe doit comporter au moins un caractère spécial",
+                "passwordsMustMatch": "Les mots de passe ne correspondent pas",
+                "confirmPasswordRequired": "Veuillez confirmer votre mot de passe"
             }
         }
     },
@@ -304,8 +368,11 @@
         "cartCombined": "Nous avons remarqué que votre panier précédent contenait des articles enregistrés. Nous avons donc ajouté ces articles à votre panier actuel.",
         "cartRestored": "Vous avez débuté vos achats sur un autre appareil. Nous avons restauré votre panier ici pour que vous puissiez reprendre là où vous en étiez.",
         "cartUpdateInProgress": "Une mise à jour de votre panier est en cours. Voulez-vous vraiment quitter cette page ? Vos modifications pourraient être perdues.",
-        "originalPrice": "Original price was {price}.",
-        "currentPrice": "Current price is {price}.",
+        "originalPrice": "Le prix initial était de {price}.",
+        "currentPrice": "Le prix actuel est de {price}.",
+        "quantityReadyToShip": "{quantity, number} prêts à être expédiés",
+        "quantityOnBackorder": "{quantity, number} seront en attente de réapprovisionnement",
+        "partiallyAvailable": "Seulement {quantity, number} disponibles",
         "CheckoutSummary": {
             "title": "Récapitulatif",
             "subTotal": "Sous-total",
@@ -335,7 +402,8 @@
                 "updateShipping": "Mettre à jour l’expédition",
                 "addShipping": "Ajouter l’expédition",
                 "cartNotFound": "Une erreur s’est produite lors de la récupération de votre panier",
-                "noShippingOptions": "Aucune option de livraison n'est disponible pour votre adresse"
+                "noShippingOptions": "Aucune option de livraison n'est disponible pour votre adresse",
+                "countryRequired": "Le pays est requis"
             }
         },
         "GiftCertificate": {
@@ -395,6 +463,8 @@
             "additionalInformation": "Informations supplémentaires",
             "currentStock": "{quantity, number} en stock",
             "backorderQuantity": "{quantité, nombre} en attente de réapprovisionnement",
+            "loadingMoreImages": "Loading more images",
+            "imagesLoaded": "{count, plural, =1 {1 more image loaded} other {# more images loaded}}",
             "Submit": {
                 "addToCart": "Ajouter au panier",
                 "outOfStock": "En rupture de stock",
@@ -427,13 +497,24 @@
                 "button": "Rédiger un avis",
                 "title": "Rédiger un avis",
                 "submit": "Envoyer",
+                "cancel": "Annuler",
                 "ratingLabel": "Note",
                 "titleLabel": "Titre",
                 "reviewLabel": "Avis",
                 "nameLabel": "Nom",
                 "emailLabel": "E-mail",
                 "successMessage": "Votre avis a bien été envoyé !",
-                "somethingWentWrong": "Une erreur s'est produite. Veuillez réessayer plus tard."
+                "somethingWentWrong": "Une erreur s'est produite. Veuillez réessayer plus tard.",
+                "FieldErrors": {
+                    "titleRequired": "Le titre est obligatoire",
+                    "authorRequired": "Le nom doit être renseigné",
+                    "emailRequired": "L'adresse e-mail est requise",
+                    "emailInvalid": "Veuillez saisir une adresse e-mail valide",
+                    "textRequired": "Une révision est requise",
+                    "ratingRequired": "La note est requise",
+                    "ratingTooSmall": "La note doit être supérieure ou égale à 1",
+                    "ratingTooLarge": "La note doit être au maximum de 5"
+                }
             }
         }
     },
@@ -515,7 +596,8 @@
             "description": "Restez informé des dernières nouvelles et offres de notre magasin.",
             "subscribedToNewsletter": "Votre abonnement à la newsletter a bien été pris en compte !",
             "Errors": {
-                "invalidEmail": "Veuillez saisir une adresse e-mail valide.",
+                "emailRequired": "L'adresse e-mail est requise",
+                "invalidEmail": "Veuillez saisir une adresse e-mail valide",
                 "somethingWentWrong": "Une erreur s'est produite. Veuillez réessayer plus tard."
             }
         },
@@ -559,9 +641,9 @@
             }
         },
         "Price": {
-            "originalPrice": "Original price was {price}.",
-            "currentPrice": "Current price is {price}.",
-            "range": "Price from {minValue} to {maxValue}."
+            "originalPrice": "Le prix initial était de {price}.",
+            "currentPrice": "Le prix actuel est de {price}.",
+            "range": "Prix de {minValue} à {maxValue}."
         }
     },
     "GiftCertificates": {
@@ -574,7 +656,7 @@
             "title": "Vérifier le solde",
             "description": "Vous pouvez vérifier le solde et obtenir des informations sur votre chèque-cadeau en saisissant le code dans la case ci-dessous.",
             "inputLabel": "Code",
-            "inputPlaceholder": "xxx-xxx-xxx-xxx",
+            "inputPlaceholder": "XXX-XXX-XXX-XXX",
             "purchasedDateLabel": "Acheté(s",
             "senderLabel": "De",
             "Errors": {
@@ -607,15 +689,25 @@
                 "expiryCheckboxLabel": "Je reconnais que ce chèque-cadeau expirera le {expiryDate}",
                 "ctaLabel": "Ajouter au panier",
                 "Errors": {
-                    "amountRequired": "Veuillez sélectionner ou saisir un montant de chèque-cadeau.",
-                    "amountInvalid": "Veuillez sélectionner un montant de chèque-cadeau valide.",
-                    "amountOutOfRange": "Veuillez saisir un montant entre {minAmount} et {maxAmount}.",
-                    "unexpectedSettingsError": "Une erreur inattendue s’est produite lors de la récupération des paramètres du chèque-cadeau. Veuillez réessayer plus tard."
+                    "amountRequired": "Veuillez sélectionner ou saisir un montant de chèque-cadeau",
+                    "amountInvalid": "Veuillez sélectionner un montant de chèque-cadeau valide",
+                    "amountOutOfRange": "Veuillez saisir un montant entre {minAmount} et {maxAmount}",
+                    "unexpectedSettingsError": "Une erreur inattendue s’est produite lors de la récupération des paramètres du chèque-cadeau. Veuillez réessayer plus tard.",
+                    "senderNameRequired": "Votre nom est requis",
+                    "senderEmailRequired": "Votre adresse e-mail est requise",
+                    "recipientNameRequired": "Le nom du destinataire est obligatoire",
+                    "recipientEmailRequired": "L’adresse e-mail du destinataire est obligatoire",
+                    "emailInvalid": "Veuillez saisir une adresse e-mail valide",
+                    "checkboxRequired": "Vous devez cocher cette case pour continuer"
                 }
             }
         }
     },
     "Form": {
-        "optional": "facultatif"
+        "optional": "facultatif",
+        "Errors": {
+            "invalidInput": "Veuillez vérifier votre saisie et réessayer",
+            "invalidFormat": "La valeur saisie ne correspond pas au format requis"
+        }
     }
 }
diff --git a/core/messages/it.json b/core/messages/it.json
index 3f319e8458..9d49e830c0 100644
--- a/core/messages/it.json
+++ b/core/messages/it.json
@@ -43,7 +43,17 @@
             "newPassword": "Nuova password",
             "confirmPassword": "Conferma password",
             "passwordUpdated": "La password è stata aggiornata!",
-            "somethingWentWrong": "Si è verificato un errore. Riprova più tardi."
+            "somethingWentWrong": "Si è verificato un errore. Riprova più tardi.",
+            "FieldErrors": {
+                "passwordRequired": "La password è obbligatoria",
+                "passwordTooSmall": "La password deve essere lunga almeno {minLength, plural, =1 {1 carattere} other {# caratteri}}",
+                "passwordLowercaseRequired": "La password deve contenere almeno una lettera minuscola",
+                "passwordUppercaseRequired": "La password deve contenere almeno una lettera maiuscola",
+                "passwordNumberRequired": "La password deve contenere almeno {minNumbers, plural, =1 {un numero} other {# numeri}}",
+                "passwordSpecialCharacterRequired": "La password deve contenere almeno un carattere speciale",
+                "passwordsMustMatch": "Le password non corrispondono",
+                "confirmPasswordRequired": "Conferma la tua password"
+            }
         },
         "Login": {
             "title": "Accedi",
@@ -56,6 +66,12 @@
             "somethingWentWrong": "Si è verificato un errore. Riprova più tardi.",
             "passwordResetRequired": "È necessario reimpostare la password. Controlla la tua email per le istruzioni su come reimpostare la password.",
             "invalidToken": "Il tuo link di accesso non è valido o è scaduto. Riprova ad accedere.",
+            "FieldErrors": {
+                "emailRequired": "L'indirizzo email è obbligatorio",
+                "emailInvalid": "Inserisci un indirizzo e-mail valido",
+                "passwordRequired": "La password è obbligatoria",
+                "invalidInput": "Controlla i dati inseriti e riprova."
+            },
             "CreateAccount": {
                 "title": "Nuovo cliente?",
                 "accountBenefits": "Crea un account con noi e sarai in grado di:",
@@ -70,14 +86,36 @@
                 "title": "Password dimenticata",
                 "subtitle": "Inserisci di seguito l'e-mail associata al tuo account. Ti invieremo le istruzioni per reimpostare la password.",
                 "confirmResetPassword": "Se l'indirizzo e-mail {email} è collegato a un account nel nostro negozio, ti abbiamo inviato un'e-mail per reimpostare la password. Se non la trovi, controlla le cartelle di posta in arrivo e indesiderata.",
-                "somethingWentWrong": "Si è verificato un errore. Riprova più tardi."
+                "somethingWentWrong": "Si è verificato un errore. Riprova più tardi.",
+                "FieldErrors": {
+                    "emailRequired": "L'indirizzo email è obbligatorio",
+                    "emailInvalid": "Inserisci un indirizzo e-mail valido"
+                }
             }
         },
         "Register": {
             "title": "Registra un account",
             "heading": "Nuovo account",
             "cta": "Crea account",
-            "somethingWentWrong": "Si è verificato un errore. Riprova più tardi."
+            "somethingWentWrong": "Si è verificato un errore. Riprova più tardi.",
+            "FieldErrors": {
+                "firstNameRequired": "Il nome è obbligatorio",
+                "lastNameRequired": "Il cognome è obbligatorio",
+                "emailRequired": "L'indirizzo email è obbligatorio",
+                "emailInvalid": "Inserisci un indirizzo e-mail valido",
+                "passwordRequired": "La password è obbligatoria",
+                "passwordTooSmall": "La password deve essere lunga almeno {minLength, plural, =1 {1 carattere} other {# caratteri}}",
+                "passwordLowercaseRequired": "La password deve contenere almeno una lettera minuscola",
+                "passwordUppercaseRequired": "La password deve contenere almeno una lettera maiuscola",
+                "passwordNumberRequired": "La password deve contenere almeno {minNumbers, plural, =1 {un numero} other {# numeri}}",
+                "passwordSpecialCharacterRequired": "La password deve contenere almeno un carattere speciale",
+                "passwordsMustMatch": "Le password non corrispondono",
+                "addressLine1Required": "La riga 1 dell'indirizzo è obbligatoria",
+                "cityRequired": "La Città è necessaria",
+                "countryRequired": "Il paese è obbligatorio",
+                "stateRequired": "Lo Stato/Provincia è obbligatorio",
+                "postalCodeRequired": "Il CAP è necessario"
+            }
         }
     },
     "Faceted": {
@@ -188,6 +226,15 @@
             "somethingWentWrong": "Si è verificato un errore. Riprova più tardi.",
             "EmptyState": {
                 "title": "Non hai indirizzi"
+            },
+            "FieldErrors": {
+                "firstNameRequired": "Il nome è obbligatorio",
+                "lastNameRequired": "Il cognome è obbligatorio",
+                "addressLine1Required": "La riga 1 dell'indirizzo è obbligatoria",
+                "cityRequired": "La Città è necessaria",
+                "countryRequired": "Il paese è obbligatorio",
+                "stateRequired": "Lo Stato/Provincia è obbligatorio",
+                "postalCodeRequired": "Il CAP è necessario"
             }
         },
         "Settings": {
@@ -205,6 +252,23 @@
                 "label": "Iscriviti alla nostra newsletter.",
                 "marketingPreferencesUpdated": "Le preferenze di marketing sono state aggiornate.",
                 "somethingWentWrong": "Si è verificato un errore. Riprova più tardi."
+            },
+            "FieldErrors": {
+                "firstNameRequired": "Il nome è obbligatorio",
+                "firstNameTooSmall": "Il nome deve essere lungo almeno 2 caratteri",
+                "lastNameRequired": "Il cognome è obbligatorio",
+                "lastNameTooSmall": "Il cognome deve essere lungo almeno 2 caratteri",
+                "emailRequired": "L'indirizzo email è obbligatorio",
+                "emailInvalid": "Inserisci un indirizzo e-mail valido",
+                "currentPasswordRequired": "È necessario inserire la password attuale",
+                "passwordRequired": "La password è obbligatoria",
+                "passwordTooSmall": "La password deve essere lunga almeno {minLength, plural, =1 {1 carattere} other {# caratteri}}",
+                "passwordLowercaseRequired": "La password deve contenere almeno una lettera minuscola",
+                "passwordUppercaseRequired": "La password deve contenere almeno una lettera maiuscola",
+                "passwordNumberRequired": "La password deve contenere almeno {minNumbers, plural, =1 {un numero} other {# numeri}}",
+                "passwordSpecialCharacterRequired": "La password deve contenere almeno un carattere speciale",
+                "passwordsMustMatch": "Le password non corrispondono",
+                "confirmPasswordRequired": "Conferma la tua password"
             }
         }
     },
@@ -304,8 +368,11 @@
         "cartCombined": "Abbiamo notato che avevi salvato degli articoli in un carrello precedente, quindi li abbiamo aggiunti al carrello attuale.",
         "cartRestored": "Hai avviato un carrello su un altro dispositivo e lo abbiamo ripristinato qui, così puoi riprendere da dove avevi lasciato.",
         "cartUpdateInProgress": "Hai un aggiornamento del carrello attivo in corso. Uscire dalla pagina? Le modifiche potrebbero andare perse.",
-        "originalPrice": "Original price was {price}.",
-        "currentPrice": "Current price is {price}.",
+        "originalPrice": "Il prezzo originale era {price}.",
+        "currentPrice": "Il prezzo corrente è {price}.",
+        "quantityReadyToShip": "{quantity, number} pronto per la spedizione",
+        "quantityOnBackorder": "{quantity, number} sarà in arretrato",
+        "partiallyAvailable": "Solo {quantity, number} disponibili",
         "CheckoutSummary": {
             "title": "Riepilogo",
             "subTotal": "Subtotale",
@@ -335,7 +402,8 @@
                 "updateShipping": "Aggiorna la spedizione",
                 "addShipping": "Aggiungi spedizione",
                 "cartNotFound": "Si è verificato un errore durante il recupero del carrello",
-                "noShippingOptions": "Non ci sono opzioni di spedizione disponibili per il tuo indirizzo"
+                "noShippingOptions": "Non ci sono opzioni di spedizione disponibili per il tuo indirizzo",
+                "countryRequired": "Il paese è obbligatorio"
             }
         },
         "GiftCertificate": {
@@ -395,6 +463,8 @@
             "additionalInformation": "Informazioni aggiuntive",
             "currentStock": "{quantità, numero} in magazzino",
             "backorderQuantity": "{quantity, number} sarà in arretrato",
+            "loadingMoreImages": "Loading more images",
+            "imagesLoaded": "{count, plural, =1 {1 more image loaded} other {# more images loaded}}",
             "Submit": {
                 "addToCart": "Aggiungi al carrello",
                 "outOfStock": "Esaurito",
@@ -427,13 +497,24 @@
                 "button": "Scrivi una recensione",
                 "title": "Scrivi una recensione",
                 "submit": "Invia",
+                "cancel": "Annulla",
                 "ratingLabel": "Valutazione",
                 "titleLabel": "Titolo",
                 "reviewLabel": "Recensione",
                 "nameLabel": "Nome",
                 "emailLabel": "E-mail",
                 "successMessage": "La tua recensione è stata inviata correttamente.",
-                "somethingWentWrong": "Si è verificato un errore. Riprova più tardi."
+                "somethingWentWrong": "Si è verificato un errore. Riprova più tardi.",
+                "FieldErrors": {
+                    "titleRequired": "Il titolo è obbligatorio",
+                    "authorRequired": "Il nome è obbligatorio",
+                    "emailRequired": "L'indirizzo email è obbligatorio",
+                    "emailInvalid": "Inserisci un indirizzo e-mail valido",
+                    "textRequired": "La revisione è obbligatoria",
+                    "ratingRequired": "La valutazione è obbligatoria",
+                    "ratingTooSmall": "Il punteggio deve essere almeno 1",
+                    "ratingTooLarge": "Il punteggio deve essere al massimo 5"
+                }
             }
         }
     },
@@ -515,7 +596,8 @@
             "description": "Ricevi aggiornamenti sulle ultime novità e offerte dal nostro negozio.",
             "subscribedToNewsletter": "Hai effettuato l'iscrizione alla nostra newsletter.",
             "Errors": {
-                "invalidEmail": "Inserisci un indirizzo e-mail valido.",
+                "emailRequired": "L'indirizzo email è obbligatorio",
+                "invalidEmail": "Inserisci un indirizzo e-mail valido",
                 "somethingWentWrong": "Si è verificato un errore. Riprova più tardi."
             }
         },
@@ -559,9 +641,9 @@
             }
         },
         "Price": {
-            "originalPrice": "Original price was {price}.",
-            "currentPrice": "Current price is {price}.",
-            "range": "Price from {minValue} to {maxValue}."
+            "originalPrice": "Il prezzo originale era {price}.",
+            "currentPrice": "Il prezzo corrente è {price}.",
+            "range": "Prezzo da {minValue} a {maxValue}."
         }
     },
     "GiftCertificates": {
@@ -574,7 +656,7 @@
             "title": "Controlla il saldo",
             "description": "Puoi controllare il saldo e ottenere informazioni sul tuo buono regalo inserendo il codice nella casella sottostante.",
             "inputLabel": "Codice",
-            "inputPlaceholder": "xxx-xxx-xxx-xxx",
+            "inputPlaceholder": "XXX-XXX-XXX-XXX",
             "purchasedDateLabel": "Acquistato",
             "senderLabel": "Da",
             "Errors": {
@@ -607,15 +689,25 @@
                 "expiryCheckboxLabel": "Riconosco che questo buono regalo scadrà il {expiryDate}",
                 "ctaLabel": "Aggiungi al carrello",
                 "Errors": {
-                    "amountRequired": "Seleziona o inserisci un importo del buono regalo.",
-                    "amountInvalid": "Seleziona un importo valido per il buono regalo.",
-                    "amountOutOfRange": "Inserisci un importo compreso tra {minAmount} e {maxAmount}.",
-                    "unexpectedSettingsError": "Si è verificato un errore imprevisto durante il recupero delle impostazioni del buono regalo. Riprova più tardi."
+                    "amountRequired": "Seleziona o inserisci un importo del buono regalo",
+                    "amountInvalid": "Seleziona un importo valido per il buono regalo",
+                    "amountOutOfRange": "Inserisci un importo compreso tra {minAmount} e {maxAmount}",
+                    "unexpectedSettingsError": "Si è verificato un errore imprevisto durante il recupero delle impostazioni del buono regalo. Riprova più tardi.",
+                    "senderNameRequired": "Il tuo nome è obbligatorio",
+                    "senderEmailRequired": "La tua e-mail è obbligatoria",
+                    "recipientNameRequired": "Il nome del destinatario è obbligatorio",
+                    "recipientEmailRequired": "L'e-mail del destinatario è obbligatoria",
+                    "emailInvalid": "Inserisci un indirizzo e-mail valido",
+                    "checkboxRequired": "Devi spuntare questa casella per continuare"
                 }
             }
         }
     },
     "Form": {
-        "optional": "facoltativo"
+        "optional": "facoltativo",
+        "Errors": {
+            "invalidInput": "Controlla i dati inseriti e riprova",
+            "invalidFormat": "Il valore inserito non corrisponde al formato richiesto"
+        }
     }
 }
diff --git a/core/messages/ja.json b/core/messages/ja.json
index 08ae0cd1b6..ff94c4325e 100644
--- a/core/messages/ja.json
+++ b/core/messages/ja.json
@@ -43,7 +43,17 @@
             "newPassword": "新しいパスワード",
             "confirmPassword": "パスワード確認",
             "passwordUpdated": "パスワードが正常に更新されました！",
-            "somethingWentWrong": "何か問題が発生しました。後でもう一度やり直してください。"
+            "somethingWentWrong": "何か問題が発生しました。後でもう一度やり直してください。",
+            "FieldErrors": {
+                "passwordRequired": "パスワードが必要です",
+                "passwordTooSmall": "パスワードは少なくとも {minLength, plural, =1 {1 character } other {# characters }}の長さである必要があります",
+                "passwordLowercaseRequired": "パスワードには少なくとも1つの小文字を含める必要があります",
+                "passwordUppercaseRequired": "パスワードには少なくとも1つの大文字を含める必要があります",
+                "passwordNumberRequired": "パスワードには少なくとも {minNumbers, plural, =1 {one number } other {#個の数字}}が含まれている必要があります",
+                "passwordSpecialCharacterRequired": "パスワードには少なくとも1つの特殊文字を含める必要があります",
+                "passwordsMustMatch": "パスワードが一致しません",
+                "confirmPasswordRequired": "パスワードを確認してください"
+            }
         },
         "Login": {
             "title": "ログイン",
@@ -56,6 +66,12 @@
             "somethingWentWrong": "何か問題が発生しました。後でもう一度やり直してください。",
             "passwordResetRequired": "パスワードのリセットが必要です。パスワードをリセットするための手順については、メールを確認してください。",
             "invalidToken": "ログインリンクが無効または期限切れです。もう一度ログインしてください。",
+            "FieldErrors": {
+                "emailRequired": "メールアドレスは必須です",
+                "emailInvalid": "有効なメールアドレスを入力してください",
+                "passwordRequired": "パスワードが必要です",
+                "invalidInput": "入力内容を確認して、もう一度お試しください。"
+            },
             "CreateAccount": {
                 "title": "新規のお客様ですか？",
                 "accountBenefits": "アカウントを作成すると、次のことができるようになります:",
@@ -70,14 +86,36 @@
                 "title": "パスワードをお忘れですか",
                 "subtitle": "アカウントに関連付けられたメールアドレスを以下に入力してください。パスワードをリセットするための手順をお送りいたします。",
                 "confirmResetPassword": "メールアドレス {email} が当社のアカウントにリンクされている場合、パスワードリセットのメールが送信されました。受信トレイをご確認ください。見つからない場合は、スパムフォルダもご確認ください。",
-                "somethingWentWrong": "何か問題が発生しました。後でもう一度やり直してください。"
+                "somethingWentWrong": "何か問題が発生しました。後でもう一度やり直してください。",
+                "FieldErrors": {
+                    "emailRequired": "メールアドレスは必須です",
+                    "emailInvalid": "有効なメールアドレスを入力してください"
+                }
             }
         },
         "Register": {
             "title": "アカウントを登録",
             "heading": "新しいアカウント",
             "cta": "アカウント作成",
-            "somethingWentWrong": "何か問題が発生しました。後でもう一度やり直してください。"
+            "somethingWentWrong": "何か問題が発生しました。後でもう一度やり直してください。",
+            "FieldErrors": {
+                "firstNameRequired": "名は必須です",
+                "lastNameRequired": "姓は必須です",
+                "emailRequired": "メールアドレスは必須です",
+                "emailInvalid": "有効なメールアドレスを入力してください",
+                "passwordRequired": "パスワードが必要です",
+                "passwordTooSmall": "パスワードは少なくとも {minLength, plural, =1 {1 character } other {# characters }}の長さである必要があります",
+                "passwordLowercaseRequired": "パスワードには少なくとも1つの小文字を含める必要があります",
+                "passwordUppercaseRequired": "パスワードには少なくとも1つの大文字を含める必要があります",
+                "passwordNumberRequired": "パスワードには少なくとも {minNumbers, plural, =1 {one number } other {#個の数字}}が含まれている必要があります",
+                "passwordSpecialCharacterRequired": "パスワードには少なくとも1つの特殊文字を含める必要があります",
+                "passwordsMustMatch": "パスワードが一致しません",
+                "addressLine1Required": "住所1行目は必須です",
+                "cityRequired": "市区町村が必要です",
+                "countryRequired": "国名コードが必要です",
+                "stateRequired": "都道府県が必要です",
+                "postalCodeRequired": "郵便番号は必要です"
+            }
         }
     },
     "Faceted": {
@@ -188,6 +226,15 @@
             "somethingWentWrong": "何か問題が発生しました。後でもう一度やり直してください。",
             "EmptyState": {
                 "title": "アドレスがありません"
+            },
+            "FieldErrors": {
+                "firstNameRequired": "名は必須です",
+                "lastNameRequired": "姓は必須です",
+                "addressLine1Required": "住所1行目は必須です",
+                "cityRequired": "市区町村が必要です",
+                "countryRequired": "国名コードが必要です",
+                "stateRequired": "都道府県が必要です",
+                "postalCodeRequired": "郵便番号は必要です"
             }
         },
         "Settings": {
@@ -205,6 +252,23 @@
                 "label": "ニュースレターに登録してください。",
                 "marketingPreferencesUpdated": "マーケティング設定が正常に更新されました。",
                 "somethingWentWrong": "何か問題が発生しました。後でもう一度やり直してください。"
+            },
+            "FieldErrors": {
+                "firstNameRequired": "名は必須です",
+                "firstNameTooSmall": "名は2文字以上でなければなりません",
+                "lastNameRequired": "姓は必須です",
+                "lastNameTooSmall": "姓は2文字以上でなければなりません",
+                "emailRequired": "メールアドレスは必須です",
+                "emailInvalid": "有効なメールアドレスを入力してください",
+                "currentPasswordRequired": "現在のパスワードは必須です",
+                "passwordRequired": "パスワードが必要です",
+                "passwordTooSmall": "パスワードは少なくとも {minLength, plural, =1 {1 character } other {# characters }}の長さである必要があります",
+                "passwordLowercaseRequired": "パスワードには少なくとも1つの小文字を含める必要があります",
+                "passwordUppercaseRequired": "パスワードには少なくとも1つの大文字を含める必要があります",
+                "passwordNumberRequired": "パスワードには少なくとも {minNumbers, plural, =1 {one number } other {#個の数字}}が含まれている必要があります",
+                "passwordSpecialCharacterRequired": "パスワードには少なくとも1つの特殊文字を含める必要があります",
+                "passwordsMustMatch": "パスワードが一致しません",
+                "confirmPasswordRequired": "パスワードを確認してください"
             }
         }
     },
@@ -304,8 +368,11 @@
         "cartCombined": "以前のカートに商品が保存されていたので、それを現在のカートに追加しました。",
         "cartRestored": "別のデバイスでカートに商品が追加されていたため、中断されたところからお買い物を再開できるよう、こちらにカートの内容を復元しました。",
         "cartUpdateInProgress": "カートの更新が進行中です。このページを離れてもよろしいですか?変更内容が失われる可能性があります。",
-        "originalPrice": "Original price was {price}.",
-        "currentPrice": "Current price is {price}.",
+        "originalPrice": "元の価格は{price}でした。",
+        "currentPrice": "現在の価格は{price}です。",
+        "quantityReadyToShip": "{quantity, number} 個、発送準備完了",
+        "quantityOnBackorder": "{quantity, number} はバックオーダーになります",
+        "partiallyAvailable": "{quantity, number} 個のみ在庫あり",
         "CheckoutSummary": {
             "title": "要約",
             "subTotal": "小計",
@@ -335,7 +402,8 @@
                 "updateShipping": "配送情報を更新",
                 "addShipping": "配送を追加",
                 "cartNotFound": "カートの取得中にエラーが発生しました",
-                "noShippingOptions": "ご指定の住所で利用できる配送オプションはありません"
+                "noShippingOptions": "ご指定の住所で利用できる配送オプションはありません",
+                "countryRequired": "国名コードが必要です"
             }
         },
         "GiftCertificate": {
@@ -395,6 +463,8 @@
             "additionalInformation": "追加情報",
             "currentStock": "{quantity, number} 個の在庫あり",
             "backorderQuantity": "{quantity, number} はバックオーダーになります",
+            "loadingMoreImages": "Loading more images",
+            "imagesLoaded": "{count, plural, =1 {1 more image loaded} other {# more images loaded}}",
             "Submit": {
                 "addToCart": "カートに追加",
                 "outOfStock": "品切れ",
@@ -427,13 +497,24 @@
                 "button": "レビューを書く",
                 "title": "レビューを書く",
                 "submit": "提出",
+                "cancel": "キャンセル",
                 "ratingLabel": "評価",
                 "titleLabel": "タイトル",
                 "reviewLabel": "レビュー",
                 "nameLabel": "名前",
                 "emailLabel": "Eメール",
                 "successMessage": "レビューは正常に送信されました。",
-                "somethingWentWrong": "何か問題が発生しました。後でもう一度やり直してください。"
+                "somethingWentWrong": "何か問題が発生しました。後でもう一度やり直してください。",
+                "FieldErrors": {
+                    "titleRequired": "タイトルは必須です",
+                    "authorRequired": "商品名は必須です",
+                    "emailRequired": "メールアドレスは必須です",
+                    "emailInvalid": "有効なメールアドレスを入力してください",
+                    "textRequired": "レビューが必要です",
+                    "ratingRequired": "評価は必須です",
+                    "ratingTooSmall": "評価は1以上である必要があります",
+                    "ratingTooLarge": "評価は5以下でなければなりません"
+                }
             }
         }
     },
@@ -515,7 +596,8 @@
             "description": "当店の最新ニュースやオファーをぜひチェックしてください。",
             "subscribedToNewsletter": "ニュースレターを購読されました。",
             "Errors": {
-                "invalidEmail": "有効なメールアドレスを入力してください。",
+                "emailRequired": "メールアドレスは必須です",
+                "invalidEmail": "有効なメールアドレスを入力してください",
                 "somethingWentWrong": "何か問題が発生しました。後でもう一度やり直してください。"
             }
         },
@@ -559,9 +641,9 @@
             }
         },
         "Price": {
-            "originalPrice": "Original price was {price}.",
-            "currentPrice": "Current price is {price}.",
-            "range": "Price from {minValue} to {maxValue}."
+            "originalPrice": "元の価格は{price}でした。",
+            "currentPrice": "現在の価格は{price}です。",
+            "range": "価格は{minValue}から{maxValue}までです。"
         }
     },
     "GiftCertificates": {
@@ -607,15 +689,25 @@
                 "expiryCheckboxLabel": "このギフト券は{expiryDate}に有効期限が切れることに同意します。",
                 "ctaLabel": "カートに追加",
                 "Errors": {
-                    "amountRequired": "ギフト券の金額を選択または入力してください。",
-                    "amountInvalid": "有効なギフト券の金額を選択してください。",
-                    "amountOutOfRange": "{minAmount}から{maxAmount}の間の金額を入力してください。",
-                    "unexpectedSettingsError": "ギフト券設定の取得中に予期しないエラーが発生しました。しばらくしてから再度お試しください"
+                    "amountRequired": "ギフト券の金額を選択または入力してください",
+                    "amountInvalid": "有効なギフト券の金額を選択してください",
+                    "amountOutOfRange": "{minAmount}から{maxAmount}の間の金額を入力してください",
+                    "unexpectedSettingsError": "ギフト券設定の取得中に予期しないエラーが発生しました。しばらくしてから再度お試しください",
+                    "senderNameRequired": "お名前は必須です",
+                    "senderEmailRequired": "メールアドレスは必須です",
+                    "recipientNameRequired": "受取人の名前は必須です",
+                    "recipientEmailRequired": "受信者のメールアドレスは必須です",
+                    "emailInvalid": "有効なメールアドレスを入力してください",
+                    "checkboxRequired": "続行するにはこのボックスにチェックを入れてください"
                 }
             }
         }
     },
     "Form": {
-        "optional": "オプション"
+        "optional": "オプション",
+        "Errors": {
+            "invalidInput": "入力内容を確認してもう一度お試しください",
+            "invalidFormat": "入力された値は必要な形式と一致しません"
+        }
     }
 }
diff --git a/core/messages/nl.json b/core/messages/nl.json
index 99a55d121b..fc30faaa68 100644
--- a/core/messages/nl.json
+++ b/core/messages/nl.json
@@ -43,7 +43,17 @@
             "newPassword": "Nieuw wachtwoord",
             "confirmPassword": "Wachtwoord bevestigen",
             "passwordUpdated": "Wachtwoord is succesvol bijgewerkt!",
-            "somethingWentWrong": "Er is iets fout gegaan. Probeer het later opnieuw."
+            "somethingWentWrong": "Er is iets fout gegaan. Probeer het later opnieuw.",
+            "FieldErrors": {
+                "passwordRequired": "Wachtwoord is vereist",
+                "passwordTooSmall": "Het wachtwoord moet minimaal {minLength, plural, =1 {1 teken} other {# tekens}} lang zijn",
+                "passwordLowercaseRequired": "Het wachtwoord moet minstens één kleine letter bevatten",
+                "passwordUppercaseRequired": "Het wachtwoord moet minimaal één hoofdletter bevatten",
+                "passwordNumberRequired": "Het wachtwoord moet minimaal {minNumbers, plural, =1 {één cijfer} other {# cijfers}} bevatten",
+                "passwordSpecialCharacterRequired": "Het wachtwoord moet minimaal één speciaal teken bevatten",
+                "passwordsMustMatch": "De wachtwoorden komen niet overeen",
+                "confirmPasswordRequired": "Bevestig je wachtwoord"
+            }
         },
         "Login": {
             "title": "Inloggen",
@@ -56,6 +66,12 @@
             "somethingWentWrong": "Er is iets fout gegaan. Probeer het later opnieuw.",
             "passwordResetRequired": "Wachtwoord opnieuw instellen is vereist. Controleer uw e-mail voor instructies om uw wachtwoord opnieuw in te stellen.",
             "invalidToken": "Je aanmeldingslink is ongeldig of verlopen. Probeer opnieuw in te loggen.",
+            "FieldErrors": {
+                "emailRequired": "E-mailadres is vereist",
+                "emailInvalid": "Voer een geldig e-mailadres in",
+                "passwordRequired": "Wachtwoord is vereist",
+                "invalidInput": "Controleer uw invoer en probeer het opnieuw."
+            },
             "CreateAccount": {
                 "title": "Nieuwe klant?",
                 "accountBenefits": "Maak een account aan bij ons om:",
@@ -70,14 +86,36 @@
                 "title": "Wachtwoord vergeten",
                 "subtitle": "Voer hieronder het e-mailadres in dat aan je account is gekoppeld. We sturen je instructies om je wachtwoord opnieuw in te stellen.",
                 "confirmResetPassword": "Als het e-mailadres {email} is gekoppeld aan een account in onze winkel, hebben we je een e-mail gestuurd om je wachtwoord opnieuw in te stellen. Controleer je inbox en spammap als je de e-mail niet ziet.",
-                "somethingWentWrong": "Er is iets fout gegaan. Probeer het later opnieuw."
+                "somethingWentWrong": "Er is iets fout gegaan. Probeer het later opnieuw.",
+                "FieldErrors": {
+                    "emailRequired": "E-mailadres is vereist",
+                    "emailInvalid": "Voer een geldig e-mailadres in"
+                }
             }
         },
         "Register": {
             "title": "Account registreren",
             "heading": "Nieuw account",
             "cta": "Account aanmaken",
-            "somethingWentWrong": "Er is iets fout gegaan. Probeer het later opnieuw."
+            "somethingWentWrong": "Er is iets fout gegaan. Probeer het later opnieuw.",
+            "FieldErrors": {
+                "firstNameRequired": "Voornaam is vereist",
+                "lastNameRequired": "Achternaam is vereist",
+                "emailRequired": "E-mailadres is vereist",
+                "emailInvalid": "Voer een geldig e-mailadres in",
+                "passwordRequired": "Wachtwoord is vereist",
+                "passwordTooSmall": "Het wachtwoord moet minimaal {minLength, plural, =1 {1 teken} other {# tekens}} lang zijn",
+                "passwordLowercaseRequired": "Het wachtwoord moet minstens één kleine letter bevatten",
+                "passwordUppercaseRequired": "Het wachtwoord moet minimaal één hoofdletter bevatten",
+                "passwordNumberRequired": "Het wachtwoord moet minimaal {minNumbers, plural, =1 {één cijfer} other {# cijfers}} bevatten",
+                "passwordSpecialCharacterRequired": "Het wachtwoord moet minimaal één speciaal teken bevatten",
+                "passwordsMustMatch": "De wachtwoorden komen niet overeen",
+                "addressLine1Required": "Adresregel 1 is vereist",
+                "cityRequired": "Plaats is vereist",
+                "countryRequired": "Land is vereist",
+                "stateRequired": "Staat/provincie is vereist",
+                "postalCodeRequired": "Postcode is vereist"
+            }
         }
     },
     "Faceted": {
@@ -188,6 +226,15 @@
             "somethingWentWrong": "Er is iets fout gegaan. Probeer het later opnieuw.",
             "EmptyState": {
                 "title": "Je hebt geen adressen"
+            },
+            "FieldErrors": {
+                "firstNameRequired": "Voornaam is vereist",
+                "lastNameRequired": "Achternaam is vereist",
+                "addressLine1Required": "Adresregel 1 is vereist",
+                "cityRequired": "Plaats is vereist",
+                "countryRequired": "Land is vereist",
+                "stateRequired": "Staat/provincie is vereist",
+                "postalCodeRequired": "Postcode is vereist"
             }
         },
         "Settings": {
@@ -205,6 +252,23 @@
                 "label": "Meld u aan voor onze nieuwsbrief.",
                 "marketingPreferencesUpdated": "Marketingvoorkeuren zijn bijgewerkt!",
                 "somethingWentWrong": "Er is iets fout gegaan. Probeer het later opnieuw."
+            },
+            "FieldErrors": {
+                "firstNameRequired": "Voornaam is vereist",
+                "firstNameTooSmall": "De voornaam moet minimaal 2 tekens lang zijn",
+                "lastNameRequired": "Achternaam is vereist",
+                "lastNameTooSmall": "De achternaam moet minimaal 2 tekens lang zijn",
+                "emailRequired": "E-mailadres is vereist",
+                "emailInvalid": "Voer een geldig e-mailadres in",
+                "currentPasswordRequired": "Huidig wachtwoord is vereist",
+                "passwordRequired": "Wachtwoord is vereist",
+                "passwordTooSmall": "Het wachtwoord moet minimaal {minLength, plural, =1 {1 teken} other {# tekens}} lang zijn",
+                "passwordLowercaseRequired": "Het wachtwoord moet minstens één kleine letter bevatten",
+                "passwordUppercaseRequired": "Het wachtwoord moet minimaal één hoofdletter bevatten",
+                "passwordNumberRequired": "Het wachtwoord moet minimaal {minNumbers, plural, =1 {één cijfer} other {# cijfers}} bevatten",
+                "passwordSpecialCharacterRequired": "Het wachtwoord moet minimaal één speciaal teken bevatten",
+                "passwordsMustMatch": "De wachtwoorden komen niet overeen",
+                "confirmPasswordRequired": "Bevestig je wachtwoord"
             }
         }
     },
@@ -304,8 +368,11 @@
         "cartCombined": "We hebben gezien dat je artikelen in een eerder winkelmandje had opgeslagen, dus we hebben ze voor je aan je huidige winkelmandje toegevoegd.",
         "cartRestored": "Je bent een winkelmandje begonnen op een ander apparaat en we hebben het hier hersteld, zodat je verder kunt gaan waar je was gebleven.",
         "cartUpdateInProgress": "Je winkelwagentje wordt bijgewerkt. Weet je zeker dat je deze pagina wilt verlaten? Je wijzigingen kunnen verloren gaan.",
-        "originalPrice": "Original price was {price}.",
-        "currentPrice": "Current price is {price}.",
+        "originalPrice": "De oorspronkelijke prijs was {price}.",
+        "currentPrice": "De huidige prijs is {price}.",
+        "quantityReadyToShip": "{quantity, number} klaar voor verzending",
+        "quantityOnBackorder": "{quantity, number} staat in backorder",
+        "partiallyAvailable": "Slechts {quantity, number} beschikbaar",
         "CheckoutSummary": {
             "title": "Overzicht",
             "subTotal": "Subtotaal",
@@ -335,7 +402,8 @@
                 "updateShipping": "Verzending bijwerken",
                 "addShipping": "Verzending toevoegen",
                 "cartNotFound": "Er is een fout opgetreden bij het ophalen van je winkelwagen",
-                "noShippingOptions": "Er zijn geen verzendopties beschikbaar voor je adres"
+                "noShippingOptions": "Er zijn geen verzendopties beschikbaar voor je adres",
+                "countryRequired": "Land is vereist"
             }
         },
         "GiftCertificate": {
@@ -395,6 +463,8 @@
             "additionalInformation": "Aanvullende informatie",
             "currentStock": "{quantity, number} op voorraad",
             "backorderQuantity": "{hoeveelheid, aantal} staat in backorder",
+            "loadingMoreImages": "Loading more images",
+            "imagesLoaded": "{count, plural, =1 {1 more image loaded} other {# more images loaded}}",
             "Submit": {
                 "addToCart": "Toevoegen aan winkelmandje",
                 "outOfStock": "Niet op voorraad",
@@ -427,13 +497,24 @@
                 "button": "Schrijf een beoordeling",
                 "title": "Schrijf een beoordeling",
                 "submit": "Verzenden",
+                "cancel": "Annuleren",
                 "ratingLabel": "Beoordeling",
                 "titleLabel": "Titel",
                 "reviewLabel": "Beoordelen",
                 "nameLabel": "Naam",
                 "emailLabel": "E-mailadres",
                 "successMessage": "Je beoordeling is succesvol ingediend!",
-                "somethingWentWrong": "Er is iets fout gegaan. Probeer het later opnieuw."
+                "somethingWentWrong": "Er is iets fout gegaan. Probeer het later opnieuw.",
+                "FieldErrors": {
+                    "titleRequired": "Titel is vereist",
+                    "authorRequired": "Naam is verplicht",
+                    "emailRequired": "E-mailadres is vereist",
+                    "emailInvalid": "Voer een geldig e-mailadres in",
+                    "textRequired": "Beoordeling is vereist",
+                    "ratingRequired": "Beoordeling is vereist",
+                    "ratingTooSmall": "De beoordeling moet minimaal 1 zijn",
+                    "ratingTooLarge": "De beoordeling moet maximaal 5 zijn"
+                }
             }
         }
     },
@@ -515,7 +596,8 @@
             "description": "Blijf op de hoogte van het laatste nieuws en aanbiedingen van onze winkel.",
             "subscribedToNewsletter": "Je bent nu geabonneerd op onze nieuwsbrief!",
             "Errors": {
-                "invalidEmail": "Voer een geldig e-mailadres in.",
+                "emailRequired": "E-mailadres is vereist",
+                "invalidEmail": "Voer een geldig e-mailadres in",
                 "somethingWentWrong": "Er is iets fout gegaan. Probeer het later opnieuw."
             }
         },
@@ -559,9 +641,9 @@
             }
         },
         "Price": {
-            "originalPrice": "Original price was {price}.",
-            "currentPrice": "Current price is {price}.",
-            "range": "Price from {minValue} to {maxValue}."
+            "originalPrice": "De oorspronkelijke prijs was {price}.",
+            "currentPrice": "De huidige prijs is {price}.",
+            "range": "Prijs van {minValue} tot {maxValue}."
         }
     },
     "GiftCertificates": {
@@ -574,7 +656,7 @@
             "title": "Saldo controleren",
             "description": "Je kunt het saldo controleren en de informatie over je cadeaubon opvragen door de code in het vak hieronder in te voeren.",
             "inputLabel": "Code",
-            "inputPlaceholder": "xxx-xxx-xxx-xxx",
+            "inputPlaceholder": "XXX-XXX-XXX-XXX",
             "purchasedDateLabel": "Gekocht",
             "senderLabel": "Van",
             "Errors": {
@@ -607,15 +689,25 @@
                 "expiryCheckboxLabel": "Ik erken dat deze cadeaubon vervalt op {expiryDate}",
                 "ctaLabel": "Toevoegen aan winkelmandje",
                 "Errors": {
-                    "amountRequired": "Selecteer of voer een cadeaubonbedrag in.",
-                    "amountInvalid": "Selecteer een geldig cadeaubonbedrag.",
-                    "amountOutOfRange": "Voer een bedrag in tussen {minAmount} en {maxAmount}.",
-                    "unexpectedSettingsError": "Er is een onverwachte fout opgetreden bij het ophalen van de instellingen voor de cadeaubon. Probeer het later opnieuw."
+                    "amountRequired": "Selecteer of voer een cadeaubonbedrag in",
+                    "amountInvalid": "Selecteer een geldig cadeaubonbedrag",
+                    "amountOutOfRange": "Voer een bedrag in tussen {minAmount} en {maxAmount}",
+                    "unexpectedSettingsError": "Er is een onverwachte fout opgetreden bij het ophalen van de instellingen voor de cadeaubon. Probeer het later opnieuw.",
+                    "senderNameRequired": "Uw naam is verplicht",
+                    "senderEmailRequired": "Uw e-mailadres is vereist",
+                    "recipientNameRequired": "De naam van de ontvanger is vereist",
+                    "recipientEmailRequired": "Het e-mailadres van de ontvanger is vereist",
+                    "emailInvalid": "Voer een geldig e-mailadres in",
+                    "checkboxRequired": "U moet dit vakje aanvinken om door te gaan"
                 }
             }
         }
     },
     "Form": {
-        "optional": "optioneel"
+        "optional": "optioneel",
+        "Errors": {
+            "invalidInput": "Controleer uw invoer en probeer het opnieuw",
+            "invalidFormat": "De ingevoerde waarde komt niet overeen met het vereiste formaat"
+        }
     }
 }
diff --git a/core/messages/no.json b/core/messages/no.json
index 7cc6eecc7b..99b29e9466 100644
--- a/core/messages/no.json
+++ b/core/messages/no.json
@@ -43,7 +43,17 @@
             "newPassword": "Nytt passord",
             "confirmPassword": "Bekreft passord",
             "passwordUpdated": "Passordet er oppdatert!",
-            "somethingWentWrong": "Noe gikk galt. Prøv igjen senere."
+            "somethingWentWrong": "Noe gikk galt. Prøv igjen senere.",
+            "FieldErrors": {
+                "passwordRequired": "Passord er påkrevd",
+                "passwordTooSmall": "Passordet må være minst {minLength, plural, =1 {1 character} other {# tegn}} langt",
+                "passwordLowercaseRequired": "Passordet må inneholde minst én liten bokstav",
+                "passwordUppercaseRequired": "Passordet må inneholde minst én stor bokstav",
+                "passwordNumberRequired": "Passordet må inneholde minst  {minNumbers, plural, =1 {ett tall} other {# tall}}",
+                "passwordSpecialCharacterRequired": "Passordet må inneholde minst ett spesialtegn",
+                "passwordsMustMatch": "Passordene stemmer ikke overens",
+                "confirmPasswordRequired": "Bekreft passordet ditt"
+            }
         },
         "Login": {
             "title": "Logg inn",
@@ -56,6 +66,12 @@
             "somethingWentWrong": "Noe gikk galt. Prøv igjen senere.",
             "passwordResetRequired": "Krever tilbakestilling av passord. Kontroller e-posten din for instruksjoner om hvordan du tilbakestiller passordet.",
             "invalidToken": "Innloggingskoblingen din er ugyldig eller har utløpt. Prøv å logge inn igjen.",
+            "FieldErrors": {
+                "emailRequired": "E-post er påkrevd",
+                "emailInvalid": "Skriv inn en gyldig e-postadresse",
+                "passwordRequired": "Passord er påkrevd",
+                "invalidInput": "Sjekk inndataene dine og prøv igjen."
+            },
             "CreateAccount": {
                 "title": "Ny kunde?",
                 "accountBenefits": "Opprett en konto hos oss, så kan du:",
@@ -70,14 +86,36 @@
                 "title": "Glemt passord",
                 "subtitle": "Skriv inn e-posten som er knyttet til kontoen din nedenfor. Vi sender deg instruksjoner for å tilbakestille passordet ditt.",
                 "confirmResetPassword": "Hvis e-postadressen {email} er koblet til en konto i butikken vår, har vi sendt deg en e-post for tilbakestilling av passord. Sjekk innboksen og søppelpostmappen hvis du ikke ser den.",
-                "somethingWentWrong": "Noe gikk galt. Prøv igjen senere."
+                "somethingWentWrong": "Noe gikk galt. Prøv igjen senere.",
+                "FieldErrors": {
+                    "emailRequired": "E-post er påkrevd",
+                    "emailInvalid": "Skriv inn en gyldig e-postadresse"
+                }
             }
         },
         "Register": {
             "title": "Registrer deg for en konto",
             "heading": "Ny konto",
             "cta": "Opprett konto",
-            "somethingWentWrong": "Noe gikk galt. Prøv igjen senere."
+            "somethingWentWrong": "Noe gikk galt. Prøv igjen senere.",
+            "FieldErrors": {
+                "firstNameRequired": "Fornavn er påkrevd",
+                "lastNameRequired": "Etternavn er påkrevd",
+                "emailRequired": "E-post er påkrevd",
+                "emailInvalid": "Skriv inn en gyldig e-postadresse",
+                "passwordRequired": "Passord er påkrevd",
+                "passwordTooSmall": "Passordet må være minst {minLength, plural, =1 {1 character} other {# tegn}} langt",
+                "passwordLowercaseRequired": "Passordet må inneholde minst én liten bokstav",
+                "passwordUppercaseRequired": "Passordet må inneholde minst én stor bokstav",
+                "passwordNumberRequired": "Passordet må inneholde minst  {minNumbers, plural, =1 {ett tall} other {# tall}}",
+                "passwordSpecialCharacterRequired": "Passordet må inneholde minst ett spesialtegn",
+                "passwordsMustMatch": "Passordene stemmer ikke overens",
+                "addressLine1Required": "Adresselinje 1 er påkrevd",
+                "cityRequired": "By er påkrevd",
+                "countryRequired": "Land er påkrevd",
+                "stateRequired": "Delstat/provins er påkrevd",
+                "postalCodeRequired": "Postnummer er påkrevd"
+            }
         }
     },
     "Faceted": {
@@ -188,6 +226,15 @@
             "somethingWentWrong": "Noe gikk galt. Prøv igjen senere.",
             "EmptyState": {
                 "title": "Du har ingen adresser"
+            },
+            "FieldErrors": {
+                "firstNameRequired": "Fornavn er påkrevd",
+                "lastNameRequired": "Etternavn er påkrevd",
+                "addressLine1Required": "Adresselinje 1 er påkrevd",
+                "cityRequired": "By er påkrevd",
+                "countryRequired": "Land er påkrevd",
+                "stateRequired": "Delstat/provins er påkrevd",
+                "postalCodeRequired": "Postnummer er påkrevd"
             }
         },
         "Settings": {
@@ -205,6 +252,23 @@
                 "label": "Abonner på nyhetsbrevet vårt.",
                 "marketingPreferencesUpdated": "Markedsføringsinnstillingene er oppdatert!",
                 "somethingWentWrong": "Noe gikk galt. Prøv igjen senere."
+            },
+            "FieldErrors": {
+                "firstNameRequired": "Fornavn er påkrevd",
+                "firstNameTooSmall": "Fornavnet må være minst 2 tegn langt",
+                "lastNameRequired": "Etternavn er påkrevd",
+                "lastNameTooSmall": "Etternavnet må være minst 2 tegn langt",
+                "emailRequired": "E-post er påkrevd",
+                "emailInvalid": "Skriv inn en gyldig e-postadresse",
+                "currentPasswordRequired": "Gjeldende passord kreves",
+                "passwordRequired": "Passord er påkrevd",
+                "passwordTooSmall": "Passordet må være minst {minLength, plural, =1 {1 character} other {# tegn}} langt",
+                "passwordLowercaseRequired": "Passordet må inneholde minst én liten bokstav",
+                "passwordUppercaseRequired": "Passordet må inneholde minst én stor bokstav",
+                "passwordNumberRequired": "Passordet må inneholde minst  {minNumbers, plural, =1 {ett tall} other {# tall}}",
+                "passwordSpecialCharacterRequired": "Passordet må inneholde minst ett spesialtegn",
+                "passwordsMustMatch": "Passordene stemmer ikke overens",
+                "confirmPasswordRequired": "Bekreft passordet ditt"
             }
         }
     },
@@ -304,8 +368,11 @@
         "cartCombined": "Vi la merke til at du hadde varer lagret i en tidligere handlekurv, så vi har lagt dem til i din nåværende handlekurv for deg.",
         "cartRestored": "Du startet en handlekurv på en annen enhet, og vi har gjenopprettet den her, slik at du kan fortsette der du slapp.",
         "cartUpdateInProgress": "Du har en handlekurvoppdatering i gang. Er du sikker på at du vil forlate denne siden? Endringene kan gå tapt.",
-        "originalPrice": "Original price was {price}.",
-        "currentPrice": "Current price is {price}.",
+        "originalPrice": "Opprinnelig pris var {price}.",
+        "currentPrice": "Nåværende pris er {price}.",
+        "quantityReadyToShip": "{antall, number} klar til sending",
+        "quantityOnBackorder": "{antall, nummer} vil være restordre",
+        "partiallyAvailable": "Kun {antall, number} tilgjengelig",
         "CheckoutSummary": {
             "title": "Sammendrag",
             "subTotal": "Delsum",
@@ -335,7 +402,8 @@
                 "updateShipping": "Oppdater forsendelse",
                 "addShipping": "Legg til forsendelse",
                 "cartNotFound": "Det oppsto en feil da du hentet handlekurven din",
-                "noShippingOptions": "Det finnes ingen tilgjengelige forsendelsesalternativer for adressen din"
+                "noShippingOptions": "Det finnes ingen tilgjengelige forsendelsesalternativer for adressen din",
+                "countryRequired": "Land er påkrevd"
             }
         },
         "GiftCertificate": {
@@ -395,6 +463,8 @@
             "additionalInformation": "Mer informasjon",
             "currentStock": "{antall, nummer} på lager",
             "backorderQuantity": "{antall, nummer} vil være restordre",
+            "loadingMoreImages": "Loading more images",
+            "imagesLoaded": "{count, plural, =1 {1 more image loaded} other {# more images loaded}}",
             "Submit": {
                 "addToCart": "Legg i handlekurv",
                 "outOfStock": "Utsolgt",
@@ -427,13 +497,24 @@
                 "button": "Skriv en anmeldelse",
                 "title": "Skriv en anmeldelse",
                 "submit": "Send inn",
+                "cancel": "Avbryt",
                 "ratingLabel": "Vurdering",
                 "titleLabel": "Tittel",
                 "reviewLabel": "Anmeldelse",
                 "nameLabel": "Navn",
                 "emailLabel": "E-post",
                 "successMessage": "Din anmeldelse er sendt inn!",
-                "somethingWentWrong": "Noe gikk galt. Prøv igjen senere."
+                "somethingWentWrong": "Noe gikk galt. Prøv igjen senere.",
+                "FieldErrors": {
+                    "titleRequired": "Tittel er påkrevd",
+                    "authorRequired": "Navn er påkrevd",
+                    "emailRequired": "E-post er påkrevd",
+                    "emailInvalid": "Skriv inn en gyldig e-postadresse",
+                    "textRequired": "Gjennomgang er nødvendig",
+                    "ratingRequired": "Vurdering er påkrevd",
+                    "ratingTooSmall": "Vurderingen må være minst 1",
+                    "ratingTooLarge": "Vurderingen må være maksimalt 5"
+                }
             }
         }
     },
@@ -515,7 +596,8 @@
             "description": "Hold deg oppdatert med de siste nyhetene og tilbudene fra butikken vår.",
             "subscribedToNewsletter": "Du har abonnert på nyhetsbrevet vårt.",
             "Errors": {
-                "invalidEmail": "Skriv inn en gyldig e-postadresse.",
+                "emailRequired": "E-post er påkrevd",
+                "invalidEmail": "Skriv inn en gyldig e-postadresse",
                 "somethingWentWrong": "Noe gikk galt. Prøv igjen senere."
             }
         },
@@ -559,9 +641,9 @@
             }
         },
         "Price": {
-            "originalPrice": "Original price was {price}.",
-            "currentPrice": "Current price is {price}.",
-            "range": "Price from {minValue} to {maxValue}."
+            "originalPrice": "Opprinnelig pris var {price}.",
+            "currentPrice": "Nåværende pris er {price}.",
+            "range": "Pris fra {minValue} til {maxValue}."
         }
     },
     "GiftCertificates": {
@@ -574,7 +656,7 @@
             "title": "Sjekk saldo",
             "description": "Du kan sjekke saldoen og få informasjon om gavekortet ved å skrive inn koden i boksen nedenfor.",
             "inputLabel": "Kode",
-            "inputPlaceholder": "xxx-xxx-xxx-xxx",
+            "inputPlaceholder": "XXX-XXX-XXX-XXX",
             "purchasedDateLabel": "Kjøpt",
             "senderLabel": "Fra",
             "Errors": {
@@ -607,15 +689,25 @@
                 "expiryCheckboxLabel": "Jeg erkjenner at dette gavekortet utløper {expiryDate}",
                 "ctaLabel": "Legg i handlekurv",
                 "Errors": {
-                    "amountRequired": "Velg eller skriv inn et beløp for gavekortet.",
-                    "amountInvalid": "Velg et gyldig gavekortbeløp.",
-                    "amountOutOfRange": "Skriv inn et beløp mellom {minAmount} og {maxAmount}.",
-                    "unexpectedSettingsError": "Det oppstod en uventet feil under henting av innstillinger for gavekort. Prøv på nytt senere."
+                    "amountRequired": "Velg eller skriv inn et gavekortbeløp",
+                    "amountInvalid": "Velg et gyldig gavekortbeløp",
+                    "amountOutOfRange": "Skriv inn et beløp mellom {minAmount} og {maxAmount}",
+                    "unexpectedSettingsError": "Det oppstod en uventet feil under henting av innstillinger for gavekort. Prøv på nytt senere.",
+                    "senderNameRequired": "Ditt navn er påkrevd",
+                    "senderEmailRequired": "Din e-postadresse er påkrevd",
+                    "recipientNameRequired": "Mottakerens navn er obligatorisk",
+                    "recipientEmailRequired": "Mottakerens e-postadresse er obligatorisk",
+                    "emailInvalid": "Skriv inn en gyldig e-postadresse",
+                    "checkboxRequired": "Du må krysse av i denne boksen for å fortsette"
                 }
             }
         }
     },
     "Form": {
-        "optional": "valgfri"
+        "optional": "valgfri",
+        "Errors": {
+            "invalidInput": "Sjekk inndataene dine og prøv igjen",
+            "invalidFormat": "Den angitte verdien samsvarer ikke med det nødvendige formatet"
+        }
     }
 }
diff --git a/core/messages/pl.json b/core/messages/pl.json
index 61dbadc8a1..07320b139f 100644
--- a/core/messages/pl.json
+++ b/core/messages/pl.json
@@ -43,7 +43,17 @@
             "newPassword": "Nowe hasło",
             "confirmPassword": "Potwierdź hasło",
             "passwordUpdated": "Hasło zostało pomyślnie zaktualizowane!",
-            "somethingWentWrong": "Coś poszło nie tak. Proszę spróbować później."
+            "somethingWentWrong": "Coś poszło nie tak. Proszę spróbować później.",
+            "FieldErrors": {
+                "passwordRequired": "Hasło jest wymagane",
+                "passwordTooSmall": "Password must be at least {minLength, plural, =1 {1 character} other {# characters}} long",
+                "passwordLowercaseRequired": "Password must contain at least one lowercase letter",
+                "passwordUppercaseRequired": "Password must contain at least one uppercase letter",
+                "passwordNumberRequired": "Password must contain at least {minNumbers, plural, =1 {one number} other {# numbers}}",
+                "passwordSpecialCharacterRequired": "Password must contain at least one special character",
+                "passwordsMustMatch": "The passwords do not match",
+                "confirmPasswordRequired": "Please confirm your password"
+            }
         },
         "Login": {
             "title": "Zaloguj się",
@@ -56,6 +66,12 @@
             "somethingWentWrong": "Coś poszło nie tak. Proszę spróbować później.",
             "passwordResetRequired": "Password reset required. Please check your email for instructions to reset your password.",
             "invalidToken": "Your login link is invalid or has expired. Please try logging in again.",
+            "FieldErrors": {
+                "emailRequired": "Email is required",
+                "emailInvalid": "Please enter a valid email address",
+                "passwordRequired": "Hasło jest wymagane",
+                "invalidInput": "Please check your input and try again."
+            },
             "CreateAccount": {
                 "title": "Nowy klient?",
                 "accountBenefits": "Załóż u nas konto, a będziesz mógł:",
@@ -70,14 +86,36 @@
                 "title": "Nie pamiętam hasła",
                 "subtitle": "Podaj poniżej adres e-mail powiązany z Twoim kontem. Wyślemy Ci instrukcje resetowania hasła.",
                 "confirmResetPassword": "Jeśli adres e-mail {email} jest powiązany z kontem w naszym sklepie, otrzymasz wiadomość e-mail umożliwiającą zresetowanie hasła. Jeśli jej nie widzisz, sprawdź skrzynkę odbiorczą i folder ze spamem.",
-                "somethingWentWrong": "Coś poszło nie tak. Proszę spróbować później."
+                "somethingWentWrong": "Coś poszło nie tak. Proszę spróbować później.",
+                "FieldErrors": {
+                    "emailRequired": "Email is required",
+                    "emailInvalid": "Please enter a valid email address"
+                }
             }
         },
         "Register": {
             "title": "Zarejestruj konto",
             "heading": "Nowe konto",
             "cta": "Utwórz konto",
-            "somethingWentWrong": "Coś poszło nie tak. Proszę spróbować później."
+            "somethingWentWrong": "Coś poszło nie tak. Proszę spróbować później.",
+            "FieldErrors": {
+                "firstNameRequired": "Imię jest wymagane",
+                "lastNameRequired": "Nazwisko jest wymagane",
+                "emailRequired": "Email is required",
+                "emailInvalid": "Please enter a valid email address",
+                "passwordRequired": "Hasło jest wymagane",
+                "passwordTooSmall": "Password must be at least {minLength, plural, =1 {1 character} other {# characters}} long",
+                "passwordLowercaseRequired": "Password must contain at least one lowercase letter",
+                "passwordUppercaseRequired": "Password must contain at least one uppercase letter",
+                "passwordNumberRequired": "Password must contain at least {minNumbers, plural, =1 {one number} other {# numbers}}",
+                "passwordSpecialCharacterRequired": "Password must contain at least one special character",
+                "passwordsMustMatch": "The passwords do not match",
+                "addressLine1Required": "Address line 1 is required",
+                "cityRequired": "Miasto jest wymagane",
+                "countryRequired": "Wymagany jest kraj",
+                "stateRequired": "Wymagany jest stan/prowincja",
+                "postalCodeRequired": "Kod pocztowy jest wymagany"
+            }
         }
     },
     "Faceted": {
@@ -188,6 +226,15 @@
             "somethingWentWrong": "Coś poszło nie tak. Proszę spróbować później.",
             "EmptyState": {
                 "title": "You don't have any addresses"
+            },
+            "FieldErrors": {
+                "firstNameRequired": "Imię jest wymagane",
+                "lastNameRequired": "Nazwisko jest wymagane",
+                "addressLine1Required": "Address line 1 is required",
+                "cityRequired": "Miasto jest wymagane",
+                "countryRequired": "Wymagany jest kraj",
+                "stateRequired": "Wymagany jest stan/prowincja",
+                "postalCodeRequired": "Kod pocztowy jest wymagany"
             }
         },
         "Settings": {
@@ -205,6 +252,23 @@
                 "label": "Zapisz się do naszego newslettera.",
                 "marketingPreferencesUpdated": "Marketing preferences have been updated successfully!",
                 "somethingWentWrong": "Coś poszło nie tak. Proszę spróbować później."
+            },
+            "FieldErrors": {
+                "firstNameRequired": "Imię jest wymagane",
+                "firstNameTooSmall": "First name must be at least 2 characters long",
+                "lastNameRequired": "Nazwisko jest wymagane",
+                "lastNameTooSmall": "Last name must be at least 2 characters long",
+                "emailRequired": "Email is required",
+                "emailInvalid": "Please enter a valid email address",
+                "currentPasswordRequired": "Wymagane jest aktualne hasło",
+                "passwordRequired": "Hasło jest wymagane",
+                "passwordTooSmall": "Password must be at least {minLength, plural, =1 {1 character} other {# characters}} long",
+                "passwordLowercaseRequired": "Password must contain at least one lowercase letter",
+                "passwordUppercaseRequired": "Password must contain at least one uppercase letter",
+                "passwordNumberRequired": "Password must contain at least {minNumbers, plural, =1 {one number} other {# numbers}}",
+                "passwordSpecialCharacterRequired": "Password must contain at least one special character",
+                "passwordsMustMatch": "The passwords do not match",
+                "confirmPasswordRequired": "Please confirm your password"
             }
         }
     },
@@ -306,6 +370,9 @@
         "cartUpdateInProgress": "You have a cart update in progress. Are you sure you want to leave this page? Your changes may be lost.",
         "originalPrice": "Original price was {price}.",
         "currentPrice": "Current price is {price}.",
+        "quantityReadyToShip": "{quantity, number} ready to ship",
+        "quantityOnBackorder": "{quantity, number} will be backordered",
+        "partiallyAvailable": "Only {quantity, number} available",
         "CheckoutSummary": {
             "title": "Podsumowanie",
             "subTotal": "Suma cząstkowa",
@@ -335,7 +402,8 @@
                 "updateShipping": "Zaktualizuj wysyłkę",
                 "addShipping": "Dodaj wysyłkę",
                 "cartNotFound": "An error occurred when retrieving your cart",
-                "noShippingOptions": "Brak dostępnych opcji wysyłki dla Państwa adresu"
+                "noShippingOptions": "Brak dostępnych opcji wysyłki dla Państwa adresu",
+                "countryRequired": "Wymagany jest kraj"
             }
         },
         "GiftCertificate": {
@@ -395,6 +463,8 @@
             "additionalInformation": "Informacje dodatkowe",
             "currentStock": "{quantity, number} in stock",
             "backorderQuantity": "{quantity, number} will be on backorder",
+            "loadingMoreImages": "Loading more images",
+            "imagesLoaded": "{count, plural, =1 {1 more image loaded} other {# more images loaded}}",
             "Submit": {
                 "addToCart": "Dodaj do koszyka",
                 "outOfStock": "Brak w magazynie",
@@ -427,13 +497,24 @@
                 "button": "Write a review",
                 "title": "Write a review",
                 "submit": "Wyślij",
+                "cancel": "Anuluj",
                 "ratingLabel": "Ocena",
                 "titleLabel": "Tytuł",
                 "reviewLabel": "Przegląd",
                 "nameLabel": "Nazwa",
                 "emailLabel": "Email",
                 "successMessage": "Your review has been submitted successfully!",
-                "somethingWentWrong": "Coś poszło nie tak. Proszę spróbować później."
+                "somethingWentWrong": "Coś poszło nie tak. Proszę spróbować później.",
+                "FieldErrors": {
+                    "titleRequired": "Title is required",
+                    "authorRequired": "Nazwa jest wymagana",
+                    "emailRequired": "Email is required",
+                    "emailInvalid": "Please enter a valid email address",
+                    "textRequired": "Review is required",
+                    "ratingRequired": "Rating is required",
+                    "ratingTooSmall": "Rating must be at least 1",
+                    "ratingTooLarge": "Rating must be at most 5"
+                }
             }
         }
     },
@@ -515,7 +596,8 @@
             "description": "Bądź na bieżąco z najnowszymi informacjami i ofertami naszego sklepu.",
             "subscribedToNewsletter": "You have been subscribed to our newsletter!",
             "Errors": {
-                "invalidEmail": "Wpisz prawidłowy adres e-mail.",
+                "emailRequired": "Email is required",
+                "invalidEmail": "Please enter a valid email address",
                 "somethingWentWrong": "Coś poszło nie tak. Proszę spróbować później."
             }
         },
@@ -607,15 +689,25 @@
                 "expiryCheckboxLabel": "I acknowledge that this Gift Certificate will expire on {expiryDate}",
                 "ctaLabel": "Dodaj do koszyka",
                 "Errors": {
-                    "amountRequired": "Please select or enter a gift certificate amount.",
-                    "amountInvalid": "Please select a valid gift certificate amount.",
-                    "amountOutOfRange": "Please enter an amount between {minAmount} and {maxAmount}.",
-                    "unexpectedSettingsError": "An unexpected error occurred while retrieving gift certificate settings. Please try again later."
+                    "amountRequired": "Please select or enter a gift certificate amount",
+                    "amountInvalid": "Please select a valid gift certificate amount",
+                    "amountOutOfRange": "Please enter an amount between {minAmount} and {maxAmount}",
+                    "unexpectedSettingsError": "An unexpected error occurred while retrieving gift certificate settings. Please try again later.",
+                    "senderNameRequired": "Your name is required",
+                    "senderEmailRequired": "Your email is required",
+                    "recipientNameRequired": "Recipient's name is required",
+                    "recipientEmailRequired": "Recipient's email is required",
+                    "emailInvalid": "Please enter a valid email address",
+                    "checkboxRequired": "You must check this box to continue"
                 }
             }
         }
     },
     "Form": {
-        "optional": "opcjonalne"
+        "optional": "opcjonalne",
+        "Errors": {
+            "invalidInput": "Please check your input and try again",
+            "invalidFormat": "The value entered does not match the required format"
+        }
     }
 }
diff --git a/core/messages/pt-BR.json b/core/messages/pt-BR.json
index dd7f7f5b99..5675ebd3ea 100644
--- a/core/messages/pt-BR.json
+++ b/core/messages/pt-BR.json
@@ -43,7 +43,17 @@
             "newPassword": "Nova senha",
             "confirmPassword": "Confirmar senha",
             "passwordUpdated": "A senha foi atualizada com sucesso!",
-            "somethingWentWrong": "Ocorreu um erro. Tente novamente mais tarde."
+            "somethingWentWrong": "Ocorreu um erro. Tente novamente mais tarde.",
+            "FieldErrors": {
+                "passwordRequired": "A senha é obrigatória",
+                "passwordTooSmall": "Password must be at least {minLength, plural, =1 {1 character} other {# characters}} long",
+                "passwordLowercaseRequired": "Password must contain at least one lowercase letter",
+                "passwordUppercaseRequired": "Password must contain at least one uppercase letter",
+                "passwordNumberRequired": "Password must contain at least {minNumbers, plural, =1 {one number} other {# numbers}}",
+                "passwordSpecialCharacterRequired": "Password must contain at least one special character",
+                "passwordsMustMatch": "The passwords do not match",
+                "confirmPasswordRequired": "Please confirm your password"
+            }
         },
         "Login": {
             "title": "Acesso",
@@ -56,6 +66,12 @@
             "somethingWentWrong": "Ocorreu um erro. Tente novamente mais tarde.",
             "passwordResetRequired": "Password reset required. Please check your email for instructions to reset your password.",
             "invalidToken": "Your login link is invalid or has expired. Please try logging in again.",
+            "FieldErrors": {
+                "emailRequired": "Email is required",
+                "emailInvalid": "Please enter a valid email address",
+                "passwordRequired": "A senha é obrigatória",
+                "invalidInput": "Please check your input and try again."
+            },
             "CreateAccount": {
                 "title": "Cliente novo?",
                 "accountBenefits": "Crie uma conta conosco para poder:",
@@ -70,14 +86,36 @@
                 "title": "Esqueci a senha",
                 "subtitle": "Insira abaixo o e-mail associado à sua conta. Enviaremos instruções para redefinir sua senha.",
                 "confirmResetPassword": "Se o endereço de e-mail {email} está vinculado a uma conta na nossa loja, enviamos um e-mail de redefinição de senha. Verifique sua caixa de entrada e, caso não encontre, confira a pasta de spam.",
-                "somethingWentWrong": "Ocorreu um erro. Tente novamente mais tarde."
+                "somethingWentWrong": "Ocorreu um erro. Tente novamente mais tarde.",
+                "FieldErrors": {
+                    "emailRequired": "Email is required",
+                    "emailInvalid": "Please enter a valid email address"
+                }
             }
         },
         "Register": {
             "title": "Registrar conta",
             "heading": "Nova conta",
             "cta": "Criar conta",
-            "somethingWentWrong": "Ocorreu um erro. Tente novamente mais tarde."
+            "somethingWentWrong": "Ocorreu um erro. Tente novamente mais tarde.",
+            "FieldErrors": {
+                "firstNameRequired": "O primeiro nome é obrigatório",
+                "lastNameRequired": "O sobrenome é obrigatório",
+                "emailRequired": "Email is required",
+                "emailInvalid": "Please enter a valid email address",
+                "passwordRequired": "A senha é obrigatória",
+                "passwordTooSmall": "Password must be at least {minLength, plural, =1 {1 character} other {# characters}} long",
+                "passwordLowercaseRequired": "Password must contain at least one lowercase letter",
+                "passwordUppercaseRequired": "Password must contain at least one uppercase letter",
+                "passwordNumberRequired": "Password must contain at least {minNumbers, plural, =1 {one number} other {# numbers}}",
+                "passwordSpecialCharacterRequired": "Password must contain at least one special character",
+                "passwordsMustMatch": "The passwords do not match",
+                "addressLine1Required": "Address line 1 is required",
+                "cityRequired": "É obrigatório informar a cidade",
+                "countryRequired": "O país é obrigatório",
+                "stateRequired": "Estado/Província é obrigatório",
+                "postalCodeRequired": "O código postal é obrigatório"
+            }
         }
     },
     "Faceted": {
@@ -188,6 +226,15 @@
             "somethingWentWrong": "Ocorreu um erro. Tente novamente mais tarde.",
             "EmptyState": {
                 "title": "You don't have any addresses"
+            },
+            "FieldErrors": {
+                "firstNameRequired": "O primeiro nome é obrigatório",
+                "lastNameRequired": "O sobrenome é obrigatório",
+                "addressLine1Required": "Address line 1 is required",
+                "cityRequired": "É obrigatório informar a cidade",
+                "countryRequired": "O país é obrigatório",
+                "stateRequired": "Estado/Província é obrigatório",
+                "postalCodeRequired": "O código postal é obrigatório"
             }
         },
         "Settings": {
@@ -205,6 +252,23 @@
                 "label": "Inscreva-se no nosso boletim informativo.",
                 "marketingPreferencesUpdated": "Marketing preferences have been updated successfully!",
                 "somethingWentWrong": "Ocorreu um erro. Tente novamente mais tarde."
+            },
+            "FieldErrors": {
+                "firstNameRequired": "O primeiro nome é obrigatório",
+                "firstNameTooSmall": "First name must be at least 2 characters long",
+                "lastNameRequired": "O sobrenome é obrigatório",
+                "lastNameTooSmall": "Last name must be at least 2 characters long",
+                "emailRequired": "Email is required",
+                "emailInvalid": "Please enter a valid email address",
+                "currentPasswordRequired": "A senha atual é obrigatória",
+                "passwordRequired": "A senha é obrigatória",
+                "passwordTooSmall": "Password must be at least {minLength, plural, =1 {1 character} other {# characters}} long",
+                "passwordLowercaseRequired": "Password must contain at least one lowercase letter",
+                "passwordUppercaseRequired": "Password must contain at least one uppercase letter",
+                "passwordNumberRequired": "Password must contain at least {minNumbers, plural, =1 {one number} other {# numbers}}",
+                "passwordSpecialCharacterRequired": "Password must contain at least one special character",
+                "passwordsMustMatch": "The passwords do not match",
+                "confirmPasswordRequired": "Please confirm your password"
             }
         }
     },
@@ -306,6 +370,9 @@
         "cartUpdateInProgress": "You have a cart update in progress. Are you sure you want to leave this page? Your changes may be lost.",
         "originalPrice": "Original price was {price}.",
         "currentPrice": "Current price is {price}.",
+        "quantityReadyToShip": "{quantity, number} ready to ship",
+        "quantityOnBackorder": "{quantity, number} will be backordered",
+        "partiallyAvailable": "Only {quantity, number} available",
         "CheckoutSummary": {
             "title": "Resumo",
             "subTotal": "Subtotal",
@@ -335,7 +402,8 @@
                 "updateShipping": "Atualizar envio",
                 "addShipping": "Adicionar envio",
                 "cartNotFound": "An error occurred when retrieving your cart",
-                "noShippingOptions": "Não há opções de envio disponíveis para o seu endereço"
+                "noShippingOptions": "Não há opções de envio disponíveis para o seu endereço",
+                "countryRequired": "O país é obrigatório"
             }
         },
         "GiftCertificate": {
@@ -395,6 +463,8 @@
             "additionalInformation": "Outras informações",
             "currentStock": "{quantity, number} in stock",
             "backorderQuantity": "{quantity, number} will be on backorder",
+            "loadingMoreImages": "Loading more images",
+            "imagesLoaded": "{count, plural, =1 {1 more image loaded} other {# more images loaded}}",
             "Submit": {
                 "addToCart": "Adicionar ao carrinho",
                 "outOfStock": "Fora do estoque",
@@ -427,13 +497,24 @@
                 "button": "Write a review",
                 "title": "Write a review",
                 "submit": "Enviar",
+                "cancel": "Cancelar",
                 "ratingLabel": "Taxa",
                 "titleLabel": "Título",
                 "reviewLabel": "Avaliação",
                 "nameLabel": "Nome",
                 "emailLabel": "Email",
                 "successMessage": "Your review has been submitted successfully!",
-                "somethingWentWrong": "Ocorreu um erro. Tente novamente mais tarde."
+                "somethingWentWrong": "Ocorreu um erro. Tente novamente mais tarde.",
+                "FieldErrors": {
+                    "titleRequired": "Title is required",
+                    "authorRequired": "O nome é obrigatório",
+                    "emailRequired": "Email is required",
+                    "emailInvalid": "Please enter a valid email address",
+                    "textRequired": "Review is required",
+                    "ratingRequired": "Rating is required",
+                    "ratingTooSmall": "Rating must be at least 1",
+                    "ratingTooLarge": "Rating must be at most 5"
+                }
             }
         }
     },
@@ -515,7 +596,8 @@
             "description": "Fique por dentro das últimas novidades e ofertas da nossa loja.",
             "subscribedToNewsletter": "You have been subscribed to our newsletter!",
             "Errors": {
-                "invalidEmail": "Informe um endereço de email válido.",
+                "emailRequired": "Email is required",
+                "invalidEmail": "Please enter a valid email address",
                 "somethingWentWrong": "Ocorreu um erro. Tente novamente mais tarde."
             }
         },
@@ -607,15 +689,25 @@
                 "expiryCheckboxLabel": "I acknowledge that this Gift Certificate will expire on {expiryDate}",
                 "ctaLabel": "Adicionar ao carrinho",
                 "Errors": {
-                    "amountRequired": "Please select or enter a gift certificate amount.",
-                    "amountInvalid": "Please select a valid gift certificate amount.",
-                    "amountOutOfRange": "Please enter an amount between {minAmount} and {maxAmount}.",
-                    "unexpectedSettingsError": "An unexpected error occurred while retrieving gift certificate settings. Please try again later."
+                    "amountRequired": "Please select or enter a gift certificate amount",
+                    "amountInvalid": "Please select a valid gift certificate amount",
+                    "amountOutOfRange": "Please enter an amount between {minAmount} and {maxAmount}",
+                    "unexpectedSettingsError": "An unexpected error occurred while retrieving gift certificate settings. Please try again later.",
+                    "senderNameRequired": "Your name is required",
+                    "senderEmailRequired": "Your email is required",
+                    "recipientNameRequired": "Recipient's name is required",
+                    "recipientEmailRequired": "Recipient's email is required",
+                    "emailInvalid": "Please enter a valid email address",
+                    "checkboxRequired": "You must check this box to continue"
                 }
             }
         }
     },
     "Form": {
-        "optional": "Opcional"
+        "optional": "Opcional",
+        "Errors": {
+            "invalidInput": "Please check your input and try again",
+            "invalidFormat": "The value entered does not match the required format"
+        }
     }
 }
diff --git a/core/messages/pt.json b/core/messages/pt.json
index dd7f7f5b99..5675ebd3ea 100644
--- a/core/messages/pt.json
+++ b/core/messages/pt.json
@@ -43,7 +43,17 @@
             "newPassword": "Nova senha",
             "confirmPassword": "Confirmar senha",
             "passwordUpdated": "A senha foi atualizada com sucesso!",
-            "somethingWentWrong": "Ocorreu um erro. Tente novamente mais tarde."
+            "somethingWentWrong": "Ocorreu um erro. Tente novamente mais tarde.",
+            "FieldErrors": {
+                "passwordRequired": "A senha é obrigatória",
+                "passwordTooSmall": "Password must be at least {minLength, plural, =1 {1 character} other {# characters}} long",
+                "passwordLowercaseRequired": "Password must contain at least one lowercase letter",
+                "passwordUppercaseRequired": "Password must contain at least one uppercase letter",
+                "passwordNumberRequired": "Password must contain at least {minNumbers, plural, =1 {one number} other {# numbers}}",
+                "passwordSpecialCharacterRequired": "Password must contain at least one special character",
+                "passwordsMustMatch": "The passwords do not match",
+                "confirmPasswordRequired": "Please confirm your password"
+            }
         },
         "Login": {
             "title": "Acesso",
@@ -56,6 +66,12 @@
             "somethingWentWrong": "Ocorreu um erro. Tente novamente mais tarde.",
             "passwordResetRequired": "Password reset required. Please check your email for instructions to reset your password.",
             "invalidToken": "Your login link is invalid or has expired. Please try logging in again.",
+            "FieldErrors": {
+                "emailRequired": "Email is required",
+                "emailInvalid": "Please enter a valid email address",
+                "passwordRequired": "A senha é obrigatória",
+                "invalidInput": "Please check your input and try again."
+            },
             "CreateAccount": {
                 "title": "Cliente novo?",
                 "accountBenefits": "Crie uma conta conosco para poder:",
@@ -70,14 +86,36 @@
                 "title": "Esqueci a senha",
                 "subtitle": "Insira abaixo o e-mail associado à sua conta. Enviaremos instruções para redefinir sua senha.",
                 "confirmResetPassword": "Se o endereço de e-mail {email} está vinculado a uma conta na nossa loja, enviamos um e-mail de redefinição de senha. Verifique sua caixa de entrada e, caso não encontre, confira a pasta de spam.",
-                "somethingWentWrong": "Ocorreu um erro. Tente novamente mais tarde."
+                "somethingWentWrong": "Ocorreu um erro. Tente novamente mais tarde.",
+                "FieldErrors": {
+                    "emailRequired": "Email is required",
+                    "emailInvalid": "Please enter a valid email address"
+                }
             }
         },
         "Register": {
             "title": "Registrar conta",
             "heading": "Nova conta",
             "cta": "Criar conta",
-            "somethingWentWrong": "Ocorreu um erro. Tente novamente mais tarde."
+            "somethingWentWrong": "Ocorreu um erro. Tente novamente mais tarde.",
+            "FieldErrors": {
+                "firstNameRequired": "O primeiro nome é obrigatório",
+                "lastNameRequired": "O sobrenome é obrigatório",
+                "emailRequired": "Email is required",
+                "emailInvalid": "Please enter a valid email address",
+                "passwordRequired": "A senha é obrigatória",
+                "passwordTooSmall": "Password must be at least {minLength, plural, =1 {1 character} other {# characters}} long",
+                "passwordLowercaseRequired": "Password must contain at least one lowercase letter",
+                "passwordUppercaseRequired": "Password must contain at least one uppercase letter",
+                "passwordNumberRequired": "Password must contain at least {minNumbers, plural, =1 {one number} other {# numbers}}",
+                "passwordSpecialCharacterRequired": "Password must contain at least one special character",
+                "passwordsMustMatch": "The passwords do not match",
+                "addressLine1Required": "Address line 1 is required",
+                "cityRequired": "É obrigatório informar a cidade",
+                "countryRequired": "O país é obrigatório",
+                "stateRequired": "Estado/Província é obrigatório",
+                "postalCodeRequired": "O código postal é obrigatório"
+            }
         }
     },
     "Faceted": {
@@ -188,6 +226,15 @@
             "somethingWentWrong": "Ocorreu um erro. Tente novamente mais tarde.",
             "EmptyState": {
                 "title": "You don't have any addresses"
+            },
+            "FieldErrors": {
+                "firstNameRequired": "O primeiro nome é obrigatório",
+                "lastNameRequired": "O sobrenome é obrigatório",
+                "addressLine1Required": "Address line 1 is required",
+                "cityRequired": "É obrigatório informar a cidade",
+                "countryRequired": "O país é obrigatório",
+                "stateRequired": "Estado/Província é obrigatório",
+                "postalCodeRequired": "O código postal é obrigatório"
             }
         },
         "Settings": {
@@ -205,6 +252,23 @@
                 "label": "Inscreva-se no nosso boletim informativo.",
                 "marketingPreferencesUpdated": "Marketing preferences have been updated successfully!",
                 "somethingWentWrong": "Ocorreu um erro. Tente novamente mais tarde."
+            },
+            "FieldErrors": {
+                "firstNameRequired": "O primeiro nome é obrigatório",
+                "firstNameTooSmall": "First name must be at least 2 characters long",
+                "lastNameRequired": "O sobrenome é obrigatório",
+                "lastNameTooSmall": "Last name must be at least 2 characters long",
+                "emailRequired": "Email is required",
+                "emailInvalid": "Please enter a valid email address",
+                "currentPasswordRequired": "A senha atual é obrigatória",
+                "passwordRequired": "A senha é obrigatória",
+                "passwordTooSmall": "Password must be at least {minLength, plural, =1 {1 character} other {# characters}} long",
+                "passwordLowercaseRequired": "Password must contain at least one lowercase letter",
+                "passwordUppercaseRequired": "Password must contain at least one uppercase letter",
+                "passwordNumberRequired": "Password must contain at least {minNumbers, plural, =1 {one number} other {# numbers}}",
+                "passwordSpecialCharacterRequired": "Password must contain at least one special character",
+                "passwordsMustMatch": "The passwords do not match",
+                "confirmPasswordRequired": "Please confirm your password"
             }
         }
     },
@@ -306,6 +370,9 @@
         "cartUpdateInProgress": "You have a cart update in progress. Are you sure you want to leave this page? Your changes may be lost.",
         "originalPrice": "Original price was {price}.",
         "currentPrice": "Current price is {price}.",
+        "quantityReadyToShip": "{quantity, number} ready to ship",
+        "quantityOnBackorder": "{quantity, number} will be backordered",
+        "partiallyAvailable": "Only {quantity, number} available",
         "CheckoutSummary": {
             "title": "Resumo",
             "subTotal": "Subtotal",
@@ -335,7 +402,8 @@
                 "updateShipping": "Atualizar envio",
                 "addShipping": "Adicionar envio",
                 "cartNotFound": "An error occurred when retrieving your cart",
-                "noShippingOptions": "Não há opções de envio disponíveis para o seu endereço"
+                "noShippingOptions": "Não há opções de envio disponíveis para o seu endereço",
+                "countryRequired": "O país é obrigatório"
             }
         },
         "GiftCertificate": {
@@ -395,6 +463,8 @@
             "additionalInformation": "Outras informações",
             "currentStock": "{quantity, number} in stock",
             "backorderQuantity": "{quantity, number} will be on backorder",
+            "loadingMoreImages": "Loading more images",
+            "imagesLoaded": "{count, plural, =1 {1 more image loaded} other {# more images loaded}}",
             "Submit": {
                 "addToCart": "Adicionar ao carrinho",
                 "outOfStock": "Fora do estoque",
@@ -427,13 +497,24 @@
                 "button": "Write a review",
                 "title": "Write a review",
                 "submit": "Enviar",
+                "cancel": "Cancelar",
                 "ratingLabel": "Taxa",
                 "titleLabel": "Título",
                 "reviewLabel": "Avaliação",
                 "nameLabel": "Nome",
                 "emailLabel": "Email",
                 "successMessage": "Your review has been submitted successfully!",
-                "somethingWentWrong": "Ocorreu um erro. Tente novamente mais tarde."
+                "somethingWentWrong": "Ocorreu um erro. Tente novamente mais tarde.",
+                "FieldErrors": {
+                    "titleRequired": "Title is required",
+                    "authorRequired": "O nome é obrigatório",
+                    "emailRequired": "Email is required",
+                    "emailInvalid": "Please enter a valid email address",
+                    "textRequired": "Review is required",
+                    "ratingRequired": "Rating is required",
+                    "ratingTooSmall": "Rating must be at least 1",
+                    "ratingTooLarge": "Rating must be at most 5"
+                }
             }
         }
     },
@@ -515,7 +596,8 @@
             "description": "Fique por dentro das últimas novidades e ofertas da nossa loja.",
             "subscribedToNewsletter": "You have been subscribed to our newsletter!",
             "Errors": {
-                "invalidEmail": "Informe um endereço de email válido.",
+                "emailRequired": "Email is required",
+                "invalidEmail": "Please enter a valid email address",
                 "somethingWentWrong": "Ocorreu um erro. Tente novamente mais tarde."
             }
         },
@@ -607,15 +689,25 @@
                 "expiryCheckboxLabel": "I acknowledge that this Gift Certificate will expire on {expiryDate}",
                 "ctaLabel": "Adicionar ao carrinho",
                 "Errors": {
-                    "amountRequired": "Please select or enter a gift certificate amount.",
-                    "amountInvalid": "Please select a valid gift certificate amount.",
-                    "amountOutOfRange": "Please enter an amount between {minAmount} and {maxAmount}.",
-                    "unexpectedSettingsError": "An unexpected error occurred while retrieving gift certificate settings. Please try again later."
+                    "amountRequired": "Please select or enter a gift certificate amount",
+                    "amountInvalid": "Please select a valid gift certificate amount",
+                    "amountOutOfRange": "Please enter an amount between {minAmount} and {maxAmount}",
+                    "unexpectedSettingsError": "An unexpected error occurred while retrieving gift certificate settings. Please try again later.",
+                    "senderNameRequired": "Your name is required",
+                    "senderEmailRequired": "Your email is required",
+                    "recipientNameRequired": "Recipient's name is required",
+                    "recipientEmailRequired": "Recipient's email is required",
+                    "emailInvalid": "Please enter a valid email address",
+                    "checkboxRequired": "You must check this box to continue"
                 }
             }
         }
     },
     "Form": {
-        "optional": "Opcional"
+        "optional": "Opcional",
+        "Errors": {
+            "invalidInput": "Please check your input and try again",
+            "invalidFormat": "The value entered does not match the required format"
+        }
     }
 }
diff --git a/core/messages/sv.json b/core/messages/sv.json
index 4c7e300bba..539cab0665 100644
--- a/core/messages/sv.json
+++ b/core/messages/sv.json
@@ -43,7 +43,17 @@
             "newPassword": "Nytt lösenord",
             "confirmPassword": "Bekräfta lösenord",
             "passwordUpdated": "Lösenordet har uppdaterats!",
-            "somethingWentWrong": "Någonting gick fel. Vänligen försök igen senare."
+            "somethingWentWrong": "Någonting gick fel. Vänligen försök igen senare.",
+            "FieldErrors": {
+                "passwordRequired": "Lösenord krävs",
+                "passwordTooSmall": "Lösenordet måste vara minst {minLength, plural, =1 {1 tecken} other {# tecken}} långt",
+                "passwordLowercaseRequired": "Lösenordet måste innehålla minst en liten bokstav",
+                "passwordUppercaseRequired": "Lösenordet måste innehålla minst en stor bokstav",
+                "passwordNumberRequired": "Lösenordet måste innehålla minst {minNumbers, plural, =1 {ett nummer} other {# nummer}}",
+                "passwordSpecialCharacterRequired": "Lösenordet måste innehålla minst ett specialtecken",
+                "passwordsMustMatch": "Lösenorden stämmer inte överens",
+                "confirmPasswordRequired": "Bekräfta ditt lösenord"
+            }
         },
         "Login": {
             "title": "Logga in",
@@ -56,6 +66,12 @@
             "somethingWentWrong": "Någonting gick fel. Vänligen försök igen senare.",
             "passwordResetRequired": "Återställning av lösenord krävs. Kontrollera din e-post för instruktioner om hur du återställer ditt lösenord.",
             "invalidToken": "Din inloggningslänk är ogiltig eller har löpt ut. Försök logga in igen.",
+            "FieldErrors": {
+                "emailRequired": "E-postadress krävs",
+                "emailInvalid": "Ange en giltig e-postadress",
+                "passwordRequired": "Lösenord krävs",
+                "invalidInput": "Kontrollera din inmatning och försök igen."
+            },
             "CreateAccount": {
                 "title": "Nya kunder?",
                 "accountBenefits": "Skapa ett konto hos oss, så kan du:",
@@ -70,14 +86,36 @@
                 "title": "Glömt ditt lösenord",
                 "subtitle": "Ange e-postadressen som är kopplad till ditt konto nedan. Vi skickar instruktioner för att återställa ditt lösenord.",
                 "confirmResetPassword": "Om e-postadressen {email} är kopplad till ett konto i vår butik har vi skickat ett e-postmeddelande om återställning av lösenord. Kontrollera din inkorg och skräppostmapp om du inte ser meddelandet.",
-                "somethingWentWrong": "Någonting gick fel. Vänligen försök igen senare."
+                "somethingWentWrong": "Någonting gick fel. Vänligen försök igen senare.",
+                "FieldErrors": {
+                    "emailRequired": "E-postadress krävs",
+                    "emailInvalid": "Ange en giltig e-postadress"
+                }
             }
         },
         "Register": {
             "title": "Registrera konto",
             "heading": "Nytt konto",
             "cta": "Skapa konto",
-            "somethingWentWrong": "Någonting gick fel. Vänligen försök igen senare."
+            "somethingWentWrong": "Någonting gick fel. Vänligen försök igen senare.",
+            "FieldErrors": {
+                "firstNameRequired": "Förnamn krävs",
+                "lastNameRequired": "Efternamn krävs",
+                "emailRequired": "E-postadress krävs",
+                "emailInvalid": "Ange en giltig e-postadress",
+                "passwordRequired": "Lösenord krävs",
+                "passwordTooSmall": "Lösenordet måste vara minst {minLength, plural, =1 {1 tecken} other {# tecken}} långt",
+                "passwordLowercaseRequired": "Lösenordet måste innehålla minst en liten bokstav",
+                "passwordUppercaseRequired": "Lösenordet måste innehålla minst en stor bokstav",
+                "passwordNumberRequired": "Lösenordet måste innehålla minst {minNumbers, plural, =1 {ett nummer} other {# nummer}}",
+                "passwordSpecialCharacterRequired": "Lösenordet måste innehålla minst ett specialtecken",
+                "passwordsMustMatch": "Lösenorden stämmer inte överens",
+                "addressLine1Required": "Adresslinje 1 krävs",
+                "cityRequired": "Stad krävs",
+                "countryRequired": "Land krävs",
+                "stateRequired": "Stat/provins krävs",
+                "postalCodeRequired": "Postnummer krävs"
+            }
         }
     },
     "Faceted": {
@@ -188,6 +226,15 @@
             "somethingWentWrong": "Någonting gick fel. Vänligen försök igen senare.",
             "EmptyState": {
                 "title": "Du har inga adresser"
+            },
+            "FieldErrors": {
+                "firstNameRequired": "Förnamn krävs",
+                "lastNameRequired": "Efternamn krävs",
+                "addressLine1Required": "Adresslinje 1 krävs",
+                "cityRequired": "Stad krävs",
+                "countryRequired": "Land krävs",
+                "stateRequired": "Stat/provins krävs",
+                "postalCodeRequired": "Postnummer krävs"
             }
         },
         "Settings": {
@@ -205,6 +252,23 @@
                 "label": "Prenumerera på vårt nyhetsbrev.",
                 "marketingPreferencesUpdated": "Marknadsföringsinställningarna har uppdaterats framgångsrikt!",
                 "somethingWentWrong": "Någonting gick fel. Vänligen försök igen senare."
+            },
+            "FieldErrors": {
+                "firstNameRequired": "Förnamn krävs",
+                "firstNameTooSmall": "Förnamnet måste vara minst 2 tecken långt",
+                "lastNameRequired": "Efternamn krävs",
+                "lastNameTooSmall": "Efternamnet måste vara minst två tecken långt",
+                "emailRequired": "E-postadress krävs",
+                "emailInvalid": "Ange en giltig e-postadress",
+                "currentPasswordRequired": "Nuvarande lösenord krävs",
+                "passwordRequired": "Lösenord krävs",
+                "passwordTooSmall": "Lösenordet måste vara minst {minLength, plural, =1 {1 tecken} other {# tecken}} långt",
+                "passwordLowercaseRequired": "Lösenordet måste innehålla minst en liten bokstav",
+                "passwordUppercaseRequired": "Lösenordet måste innehålla minst en stor bokstav",
+                "passwordNumberRequired": "Lösenordet måste innehålla minst {minNumbers, plural, =1 {ett nummer} other {# nummer}}",
+                "passwordSpecialCharacterRequired": "Lösenordet måste innehålla minst ett specialtecken",
+                "passwordsMustMatch": "Lösenorden stämmer inte överens",
+                "confirmPasswordRequired": "Bekräfta ditt lösenord"
             }
         }
     },
@@ -304,8 +368,11 @@
         "cartCombined": "Vi märkte att du hade varor sparade i en tidigare kundvagn, så vi har lagt till dem i din nuvarande kundvagn åt dig.",
         "cartRestored": "Du startade en kundvagn på en annan enhet, och vi har återställt den här så att du kan fortsätta där du slutade.",
         "cartUpdateInProgress": "Du har en pågående kundvagnsuppdatering. Är du säker på att du vill lämna den här sidan? Dina ändringar kan gå förlorade.",
-        "originalPrice": "Original price was {price}.",
-        "currentPrice": "Current price is {price}.",
+        "originalPrice": "Ursprungligt pris var {price}.",
+        "currentPrice": "Nuvarande pris är {price}.",
+        "quantityReadyToShip": "{quantity, number} klara för leverans",
+        "quantityOnBackorder": "{quantity, number} kommer att vara restnoterade",
+        "partiallyAvailable": "Endast {quantity, number} tillgängligt",
         "CheckoutSummary": {
             "title": "Summering",
             "subTotal": "Delsumma",
@@ -335,7 +402,8 @@
                 "updateShipping": "Uppdatera frakt",
                 "addShipping": "Lägg till frakt",
                 "cartNotFound": "Ett fel uppstod när er varukorg hämtades",
-                "noShippingOptions": "Det finns inga tillgängliga fraktalternativ för din adress"
+                "noShippingOptions": "Det finns inga tillgängliga fraktalternativ för din adress",
+                "countryRequired": "Land krävs"
             }
         },
         "GiftCertificate": {
@@ -395,6 +463,8 @@
             "additionalInformation": "Ytterligare information",
             "currentStock": "{quantity, number} i lager",
             "backorderQuantity": "{quantity, number} kommer att vara restnoterade",
+            "loadingMoreImages": "Loading more images",
+            "imagesLoaded": "{count, plural, =1 {1 more image loaded} other {# more images loaded}}",
             "Submit": {
                 "addToCart": "Lägg till i kundvagn",
                 "outOfStock": "Ej i lager",
@@ -427,13 +497,24 @@
                 "button": "Skriva en recension",
                 "title": "Skriva en recension",
                 "submit": "Skicka in",
+                "cancel": "Annullera",
                 "ratingLabel": "Bedömning",
                 "titleLabel": "Rubrik",
                 "reviewLabel": "Recension",
                 "nameLabel": "Namn",
                 "emailLabel": "E-post",
                 "successMessage": "Din recension har skickats in!",
-                "somethingWentWrong": "Någonting gick fel. Vänligen försök igen senare."
+                "somethingWentWrong": "Någonting gick fel. Vänligen försök igen senare.",
+                "FieldErrors": {
+                    "titleRequired": "Rubrik krävs",
+                    "authorRequired": "Namn krävs",
+                    "emailRequired": "E-postadress krävs",
+                    "emailInvalid": "Ange en giltig e-postadress",
+                    "textRequired": "Granskning krävs",
+                    "ratingRequired": "Betyg krävs",
+                    "ratingTooSmall": "Betyget måste vara minst 1",
+                    "ratingTooLarge": "Betyget får vara högst 5"
+                }
             }
         }
     },
@@ -515,7 +596,8 @@
             "description": "Håll dig uppdaterad med de senaste nyheterna och erbjudandena från vår butik.",
             "subscribedToNewsletter": "Du prenumererar nu på vårt nyhetsbrev!",
             "Errors": {
-                "invalidEmail": "Vänligen ange en giltig e-postadress",
+                "emailRequired": "E-postadress krävs",
+                "invalidEmail": "Ange en giltig e-postadress",
                 "somethingWentWrong": "Någonting gick fel. Vänligen försök igen senare."
             }
         },
@@ -559,9 +641,9 @@
             }
         },
         "Price": {
-            "originalPrice": "Original price was {price}.",
-            "currentPrice": "Current price is {price}.",
-            "range": "Price from {minValue} to {maxValue}."
+            "originalPrice": "Ursprungligt pris var {price}.",
+            "currentPrice": "Nuvarande pris är {price}.",
+            "range": "Pris från {minValue} till {maxValue}."
         }
     },
     "GiftCertificates": {
@@ -574,7 +656,7 @@
             "title": "Kontrollera saldot",
             "description": "Du kan kontrollera saldot och få information om ditt presentkort genom att skriva in koden i rutan nedan.",
             "inputLabel": "Kod",
-            "inputPlaceholder": "xxx-xxx-xxx-xxx",
+            "inputPlaceholder": "XXX-XXX-XXX-XXX",
             "purchasedDateLabel": "Köpt",
             "senderLabel": "Från",
             "Errors": {
@@ -607,15 +689,25 @@
                 "expiryCheckboxLabel": "Jag bekräftar att detta presentkort kommer att upphöra att gälla den {expiryDate}",
                 "ctaLabel": "Lägg till i kundvagn",
                 "Errors": {
-                    "amountRequired": "Var god välj eller ange ett presentkortsbelopp.",
-                    "amountInvalid": "Var god välj ett giltigt presentkortsbelopp.",
-                    "amountOutOfRange": "Ange ett belopp mellan {minAmount} och {maxAmount}.",
-                    "unexpectedSettingsError": "Ett oväntat fel inträffade när presentkortets inställningar hämtades. Försök igen senare."
+                    "amountRequired": "Var god välj eller ange ett presentkortsbelopp",
+                    "amountInvalid": "Välj ett giltigt presentkortsbelopp.",
+                    "amountOutOfRange": "Ange ett belopp mellan {minAmount} och {maxAmount}",
+                    "unexpectedSettingsError": "Ett oväntat fel inträffade när presentkortets inställningar hämtades. Försök igen senare.",
+                    "senderNameRequired": "Ditt namn krävs",
+                    "senderEmailRequired": "Din e-postadress krävs",
+                    "recipientNameRequired": "Mottagarens namn är obligatoriskt",
+                    "recipientEmailRequired": "Mottagarens e-postadress krävs",
+                    "emailInvalid": "Ange en giltig e-postadress",
+                    "checkboxRequired": "Du måste markera den här rutan för att fortsätta"
                 }
             }
         }
     },
     "Form": {
-        "optional": "frivillig"
+        "optional": "frivillig",
+        "Errors": {
+            "invalidInput": "Kontrollera det som angetts och försök igen",
+            "invalidFormat": "Det inmatade värdet stämmer inte överens med det format som krävs"
+        }
     }
 }

From 7889cfa9cf937e1bf80f0c443efbfb16010b137e Mon Sep 17 00:00:00 2001
From: Jorge Moya <jorge.moya@bigcommerce.com>
Date: Wed, 18 Feb 2026 12:25:42 -0600
Subject: [PATCH 53/69] fix(core): preview deployments now use correct
 metadataBase (#2890)

* fix(core): preview deployments now use correct metadataBase

* fix: lint issue

* fix: use URL.canParse

* chore: update changeset
---
 .changeset/new-onions-flash.md | 46 +++++++++++++++++++++++++++-------
 core/app/[locale]/layout.tsx   | 13 +++++++++-
 core/lib/seo/canonical.ts      |  5 +++-
 3 files changed, 53 insertions(+), 11 deletions(-)

diff --git a/.changeset/new-onions-flash.md b/.changeset/new-onions-flash.md
index 7bc9afcce9..15e0f6ec6e 100644
--- a/.changeset/new-onions-flash.md
+++ b/.changeset/new-onions-flash.md
@@ -2,25 +2,53 @@
 "@bigcommerce/catalyst-core": patch
 ---
 
-Add canonical URLs and hreflang alternates for SEO. Pages now set `alternates.canonical` and `alternates.languages` in `generateMetadata` via the new `getMetadataAlternates` helper in `core/lib/seo/canonical.ts`. The helper fetches the vanity URL via GraphQL (`site.settings.url.vanityUrl`) and is cached per request. The default locale uses no path prefix; other locales use `/{locale}/path`. The root locale layout sets `metadataBase` to the configured vanity URL so canonical URLs resolve correctly.
+Add canonical URLs and hreflang alternates for SEO. Pages now set `alternates.canonical` and `alternates.languages` in `generateMetadata` via the new `getMetadataAlternates` helper in `core/lib/seo/canonical.ts`. The helper fetches the vanity URL via GraphQL (`site.settings.url.vanityUrl`) and is cached per request. The default locale uses no path prefix; other locales use `/{locale}/path`. The root locale layout sets `metadataBase` to the configured vanity URL so canonical URLs resolve correctly. On Vercel preview deployments (`VERCEL_ENV=preview`), `metadataBase` and canonical/hreflang URLs use `VERCEL_URL` instead of the production vanity URL to prevent preview environments from generating SEO metadata pointing to production.
 
 ## Migration steps
 
 ### Step 1: Root layout metadata base
 
-The root locale layout now sets `metadataBase` from the vanity URL fetched via GraphQL. This is already included in the `RootLayoutMetadataQuery`.
+The root locale layout now sets `metadataBase` from the vanity URL fetched via GraphQL. On Vercel preview deployments, `VERCEL_URL` is used instead so preview environments don't point to production. `URL.canParse` guards against malformed URLs.
 
 Update `core/app/[locale]/layout.tsx`:
 
 ```diff
 + const vanityUrl = data.site.settings?.url.vanityUrl;
++
++ // Use preview deployment URL so metadataBase (canonical, og:url) points at the preview, not production.
++ let baseUrl: URL | undefined;
++ const previewUrl =
++   process.env.VERCEL_ENV === 'preview' ? `https://${process.env.VERCEL_URL}` : undefined;
++
++ if (previewUrl && URL.canParse(previewUrl)) {
++   baseUrl = new URL(previewUrl);
++ } else if (vanityUrl && URL.canParse(vanityUrl)) {
++   baseUrl = new URL(vanityUrl);
++ }
 +
   return {
-+   metadataBase: vanityUrl ? new URL(vanityUrl) : undefined,
++   metadataBase: baseUrl,
     title: {
 ```
 
-### Step 2: GraphQL fragment updates
+### Step 2: Canonical/hreflang base URL for preview environments
+
+The `getMetadataAlternates` function in `core/lib/seo/canonical.ts` now checks for a Vercel preview URL before falling back to the GraphQL vanity URL. `URL.canParse` guards against malformed URLs.
+
+Update `core/lib/seo/canonical.ts`:
+
+```diff
+ export async function getMetadataAlternates(options: CanonicalUrlOptions) {
+   const { path, locale, includeAlternates = true } = options;
+
+-  const baseUrl = await getVanityUrl();
++  // Use preview deployment URL so canonical/hreflang URLs point at the preview, not production.
++  const previewUrl =
++    process.env.VERCEL_ENV === 'preview' ? `https://${process.env.VERCEL_URL}` : undefined;
++  const baseUrl = previewUrl && URL.canParse(previewUrl) ? previewUrl : await getVanityUrl();
+```
+
+### Step 3: GraphQL fragment updates
 
 Add the `path` field to brand, blog post, and product queries so metadata can build canonical URLs.
 
@@ -54,7 +82,7 @@ Update `core/app/[locale]/(default)/product/[slug]/page-data.ts` (in the metadat
       defaultImage {
 ```
 
-### Step 3: Page metadata alternates
+### Step 4: Page metadata alternates
 
 Add the `getMetadataAlternates` import and set `alternates` in `generateMetadata` for each page. The function is async and must be awaited. Ensure `core/lib/seo/canonical.ts` exists (it is included in this release).
 
@@ -94,7 +122,7 @@ For entity pages (product, category, brand, blog, blog post, webpage), add the i
   }
 ```
 
-### Step 4: Gift certificates pages
+### Step 5: Gift certificates pages
 
 Update `core/app/[locale]/(default)/gift-certificates/page.tsx`:
 
@@ -142,7 +170,7 @@ Add `generateMetadata` to `core/app/[locale]/(default)/gift-certificates/purchas
 + }
 ```
 
-### Step 5: Contact page
+### Step 6: Contact page
 
 Update `core/app/[locale]/(default)/webpages/[id]/contact/page.tsx`:
 
@@ -164,7 +192,7 @@ Update `core/app/[locale]/(default)/webpages/[id]/contact/page.tsx`:
   }
 ```
 
-### Step 6: Public wishlist page
+### Step 7: Public wishlist page
 
 Update `core/app/[locale]/(default)/wishlist/[token]/page.tsx`:
 
@@ -181,7 +209,7 @@ Update `core/app/[locale]/(default)/wishlist/[token]/page.tsx`:
   }
 ```
 
-### Step 7: Compare page
+### Step 8: Compare page
 
 Update `core/app/[locale]/(default)/compare/page.tsx`:
 
diff --git a/core/app/[locale]/layout.tsx b/core/app/[locale]/layout.tsx
index ae7642bd3e..f0a08d7f3f 100644
--- a/core/app/[locale]/layout.tsx
+++ b/core/app/[locale]/layout.tsx
@@ -73,8 +73,19 @@ export async function generateMetadata(): Promise<Metadata> {
 
   const vanityUrl = data.site.settings?.url.vanityUrl;
 
+  // Use preview deployment URL so metadataBase (canonical, og:url) points at the preview, not production.
+  let baseUrl: URL | undefined;
+  const previewUrl =
+    process.env.VERCEL_ENV === 'preview' ? `https://${process.env.VERCEL_URL}` : undefined;
+
+  if (previewUrl && URL.canParse(previewUrl)) {
+    baseUrl = new URL(previewUrl);
+  } else if (vanityUrl && URL.canParse(vanityUrl)) {
+    baseUrl = new URL(vanityUrl);
+  }
+
   return {
-    metadataBase: vanityUrl ? new URL(vanityUrl) : undefined,
+    metadataBase: baseUrl,
     title: {
       template: `%s - ${storeName}`,
       default: pageTitle || storeName,
diff --git a/core/lib/seo/canonical.ts b/core/lib/seo/canonical.ts
index 03f9cac3f8..dd1573947a 100644
--- a/core/lib/seo/canonical.ts
+++ b/core/lib/seo/canonical.ts
@@ -63,7 +63,10 @@ const getVanityUrl = cache(async () => {
 export async function getMetadataAlternates(options: CanonicalUrlOptions) {
   const { path, locale, includeAlternates = true } = options;
 
-  const baseUrl = await getVanityUrl();
+  // Use preview deployment URL so canonical/hreflang URLs point at the preview, not production.
+  const previewUrl =
+    process.env.VERCEL_ENV === 'preview' ? `https://${process.env.VERCEL_URL}` : undefined;
+  const baseUrl = previewUrl && URL.canParse(previewUrl) ? previewUrl : await getVanityUrl();
 
   const canonical = buildLocalizedUrl(baseUrl, path, locale);
 

From a161583fee1b6e7e3f718c2e6f705ea822865025 Mon Sep 17 00:00:00 2001
From: Jorge Moya <jorge.moya@bigcommerce.com>
Date: Wed, 18 Feb 2026 13:59:18 -0600
Subject: [PATCH 54/69] feat(ci): enable unlighthouse performance audits for
 vercel (#2882)

* feat(ci): enable unlighthouse performance audits for vercel

Re-enable the performance category in Unlighthouse with mitigations for
hardware throttling: maxConcurrency=1 and samples=5 (median smoothing
absorbs cold start outliers across all discovered pages without needing
an explicit warm-up step). Rename artifacts with a "vercel" label for
future cross-platform comparison.

CATALYST-1768

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* chore: revert samples to 3

* chore: add concurrency to speed tests

* fix: target specific PLP and PDP pages to prevent wasted runtime

* fix: change PLP category to bath

* fix: expand report

* chore: test concurrency and all routes

* fix: fixed paths, multiple samples, with concurrency

* fix: run all pages, concurrency enabled, 1 sample size

* fix: add sample size of 3

* feat: add dynamic sampling

* fix: split brands and categories

* fix: update excluded routes

* fix: excluded paths

* fix: exclude other sites

* fix: disable throttling

* chore: update dynamic sampling

* fix: remove brands from custom sampling since it should be picked up automatically

* chore: limit concurrency

* chore: remove concurrency limit, no visible change

---------

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
---
 .github/workflows/regression-tests.yml |  2 +-
 unlighthouse.config.ts                 | 48 +++++++++++++++++++-------
 2 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/regression-tests.yml b/.github/workflows/regression-tests.yml
index ef81ebc18e..3b4e8d4c19 100644
--- a/.github/workflows/regression-tests.yml
+++ b/.github/workflows/regression-tests.yml
@@ -38,6 +38,6 @@ jobs:
         if: failure() || success()
         uses: actions/upload-artifact@v4
         with:
-          name: unlighthouse-${{ matrix.device }}-report
+          name: unlighthouse-vercel-${{ matrix.device }}-report
           path: './.unlighthouse/'
           include-hidden-files: 'true'
diff --git a/unlighthouse.config.ts b/unlighthouse.config.ts
index e323a87b54..796466a4c9 100644
--- a/unlighthouse.config.ts
+++ b/unlighthouse.config.ts
@@ -1,27 +1,51 @@
-
-import type { UserConfig } from 'unlighthouse';
+import type { UserConfig } from "unlighthouse";
 
 export default {
   ci: {
     buildStatic: true,
-    // Disabling the budget so we can audit and fix the issues first
+    reporter: "jsonExpanded",
     budget: {
       // "best-practices": 100,
       // "accessibility": 100,
       // "seo": 100,
+      // performance: 80,
+    },
+  },
+  scanner: {
+    // Run each page multiple times and use the median to absorb cold start
+    // outliers across all discovered pages.
+    samples: 3,
+    dynamicSampling: 5,
+    exclude: [
+      "/bundleb2b/",
+      "/invoices/",
+      "/bath/*/*",
+      "/garden/*/*",
+      "/kitchen/*/*",
+      "/publications/*/*",
+      "/early-access/*/*",
+      "/digital-test-product/",
+      "/blog/\\?tag=*",
+    ],
+    customSampling: {
+      "/smith-journal-13/|/dustpan-brush/|/utility-caddy/|/canvas-laundry-cart/|/laundry-detergent/|/tiered-wire-basket/|/oak-cheese-grater/|/1-l-le-parfait-jar/|/chemex-coffeemaker-3-cup/|/sample-able-brewing-system/|/orbit-terrarium-small/|/orbit-terrarium-large/|/fog-linen-chambray-towel-beige-stripe/|/zz-plant/":
+        { name: "PDP" },
+      "/shop-all/|/bath/|/garden/|/kitchen/|/publications/|/early-access/": {
+        name: "PLP",
+      },
     },
-  }, 
+    // Disable throttling to avoid issues with cold start and cold cache.
+    throttle: false,
+  },
   lighthouseOptions: {
-    // Disabling performance tests because lighthouse utilizes hardware throttling. This affects concurrently running tests which might lead to false positives.
-    // The best way to truly measure performance is to use real user metrics – Vercel's Speed Insights is a great tool for that.
-    onlyCategories: ['best-practices', 'accessibility', 'seo'],
+    onlyCategories: ["best-practices", "accessibility", "seo", "performance"],
     skipAudits: [
       // Disabling `is-crawlable` as it's more relevant for production sites.
-      'is-crawlable',
+      "is-crawlable",
       // Disabling third-party cookies because the only third-party cookies we have is provided through Cloudflare for our CDN, which is not relevant for our audits.
-      'third-party-cookies',
+      "third-party-cookies",
       // Disabling inspector issues as it's only providing third-party cookie issues, which are not relevant for our audits.
-      'inspector-issues',
-    ]
-  }
+      "inspector-issues",
+    ],
+  },
 } satisfies UserConfig;

From 46ee3de640f030be56111c668102bbeeb961b4a4 Mon Sep 17 00:00:00 2001
From: Jorge Moya <jorge.moya@bigcommerce.com>
Date: Wed, 25 Feb 2026 09:02:07 -0600
Subject: [PATCH 55/69] fix(core): conditionally include optional SEO metadata
 (#2898)

* fix(core): conditionally include optional SEO metadata

* fix: remove new line in product meta description
---
 .changeset/quiet-tags-spread.md               | 77 +++++++++++++++++++
 .../(default)/(faceted)/brand/[slug]/page.tsx |  6 +-
 .../(faceted)/category/[slug]/page.tsx        |  4 +-
 .../[locale]/(default)/blog/[blogId]/page.tsx |  4 +-
 core/app/[locale]/(default)/blog/page.tsx     | 10 ++-
 .../(default)/product/[slug]/page.tsx         | 17 ++--
 .../(default)/webpages/[id]/contact/page.tsx  |  8 +-
 .../(default)/webpages/[id]/normal/page.tsx   |  4 +-
 8 files changed, 102 insertions(+), 28 deletions(-)
 create mode 100644 .changeset/quiet-tags-spread.md

diff --git a/.changeset/quiet-tags-spread.md b/.changeset/quiet-tags-spread.md
new file mode 100644
index 0000000000..7a3a75f8fe
--- /dev/null
+++ b/.changeset/quiet-tags-spread.md
@@ -0,0 +1,77 @@
+---
+"@bigcommerce/catalyst-core": patch
+---
+
+Conditionally include optional SEO metadata fields in `generateMetadata` across page files. Fields `description`, `keywords`, `alternates`, and `openGraph` are now only included in the returned metadata object when they have a value, using spread syntax (`...(value && { key: value })`). Previously, these fields were always set — potentially assigning `null` or an empty string — which could cause Next.js to render empty `<meta>` tags.
+
+## Migration steps
+
+Update `generateMetadata` in the following pages to use conditional spread syntax for optional metadata fields:
+
+### brand, category, webpages (contact + normal)
+
+```diff
+  return {
+    title: pageTitle || entity.name,
+-   description: metaDescription,
+-   keywords: metaKeywords ? metaKeywords.split(',') : null,
++   ...(metaDescription && { description: metaDescription }),
++   ...(metaKeywords && { keywords: metaKeywords.split(',') }),
+  };
+```
+
+For `brand/[slug]/page.tsx`, also guard the `alternates` field:
+
+```diff
+-   alternates: await getMetadataAlternates({ path: brand.path, locale }),
++   ...(brand.path && { alternates: await getMetadataAlternates({ path: brand.path, locale }) }),
+```
+
+### blog/[blogId]/page.tsx
+
+```diff
+  return {
+    title: pageTitle || blogPost.name,
+-   description: metaDescription,
+-   keywords: metaKeywords ? metaKeywords.split(',') : null,
++   ...(metaDescription && { description: metaDescription }),
++   ...(metaKeywords && { keywords: metaKeywords.split(',') }),
+    ...(blogPost.path && {
+      alternates: await getMetadataAlternates({ path: blogPost.path, locale }),
+    }),
+  };
+```
+
+### product/[slug]/page.tsx
+
+```diff
+- keywords: metaKeywords ? metaKeywords.split(',') : null,
++ ...(metaKeywords && { keywords: metaKeywords.split(',') }),
+- openGraph: url
+-   ? {
+-       images: [{ url, alt }],
+-     }
+-   : null,
++ ...(url && { openGraph: { images: [{ url, alt }] } }),
+```
+
+### blog/page.tsx
+
+Extract the description to a variable and spread conditionally:
+
+```diff
++ const description =
++   blog?.description && blog.description.length > 150
++     ? `${blog.description.substring(0, 150)}...`
++     : blog?.description;
++
+  return {
+    title: blog?.name ?? t('title'),
+-   description:
+-     blog?.description && blog.description.length > 150
+-       ? `${blog.description.substring(0, 150)}...`
+-       : blog?.description,
++   ...(description && { description }),
+    ...(blog?.path && { alternates: await getMetadataAlternates({ path: blog.path, locale }) }),
+  };
+```
diff --git a/core/app/[locale]/(default)/(faceted)/brand/[slug]/page.tsx b/core/app/[locale]/(default)/(faceted)/brand/[slug]/page.tsx
index 1634194933..4278def31c 100644
--- a/core/app/[locale]/(default)/(faceted)/brand/[slug]/page.tsx
+++ b/core/app/[locale]/(default)/(faceted)/brand/[slug]/page.tsx
@@ -83,9 +83,9 @@ export async function generateMetadata(props: Props): Promise<Metadata> {
 
   return {
     title: pageTitle || brand.name,
-    description: metaDescription,
-    keywords: metaKeywords ? metaKeywords.split(',') : null,
-    alternates: await getMetadataAlternates({ path: brand.path, locale }),
+    ...(metaDescription && { description: metaDescription }),
+    ...(metaKeywords && { keywords: metaKeywords.split(',') }),
+    ...(brand.path && { alternates: await getMetadataAlternates({ path: brand.path, locale }) }),
   };
 }
 
diff --git a/core/app/[locale]/(default)/(faceted)/category/[slug]/page.tsx b/core/app/[locale]/(default)/(faceted)/category/[slug]/page.tsx
index 3471282dd6..ee143281b5 100644
--- a/core/app/[locale]/(default)/(faceted)/category/[slug]/page.tsx
+++ b/core/app/[locale]/(default)/(faceted)/category/[slug]/page.tsx
@@ -88,8 +88,8 @@ export async function generateMetadata(props: Props): Promise<Metadata> {
 
   return {
     title: pageTitle || category.name,
-    description: metaDescription,
-    keywords: metaKeywords ? metaKeywords.split(',') : null,
+    ...(metaDescription && { description: metaDescription }),
+    ...(metaKeywords && { keywords: metaKeywords.split(',') }),
     ...(categoryPath && {
       alternates: await getMetadataAlternates({ path: categoryPath, locale }),
     }),
diff --git a/core/app/[locale]/(default)/blog/[blogId]/page.tsx b/core/app/[locale]/(default)/blog/[blogId]/page.tsx
index 35ba4ffa96..6b8da45019 100644
--- a/core/app/[locale]/(default)/blog/[blogId]/page.tsx
+++ b/core/app/[locale]/(default)/blog/[blogId]/page.tsx
@@ -34,8 +34,8 @@ export async function generateMetadata({ params }: Props): Promise<Metadata> {
 
   return {
     title: pageTitle || blogPost.name,
-    description: metaDescription,
-    keywords: metaKeywords ? metaKeywords.split(',') : null,
+    ...(metaDescription && { description: metaDescription }),
+    ...(metaKeywords && { keywords: metaKeywords.split(',') }),
     ...(blogPost.path && {
       alternates: await getMetadataAlternates({ path: blogPost.path, locale }),
     }),
diff --git a/core/app/[locale]/(default)/blog/page.tsx b/core/app/[locale]/(default)/blog/page.tsx
index e960967c51..1b8d90cf91 100644
--- a/core/app/[locale]/(default)/blog/page.tsx
+++ b/core/app/[locale]/(default)/blog/page.tsx
@@ -31,12 +31,14 @@ export async function generateMetadata({ params }: Props): Promise<Metadata> {
   const t = await getTranslations({ locale, namespace: 'Blog' });
   const blog = await getBlog();
 
+  const description =
+    blog?.description && blog.description.length > 150
+      ? `${blog.description.substring(0, 150)}...`
+      : blog?.description;
+
   return {
     title: blog?.name ?? t('title'),
-    description:
-      blog?.description && blog.description.length > 150
-        ? `${blog.description.substring(0, 150)}...`
-        : blog?.description,
+    ...(description && { description }),
     ...(blog?.path && { alternates: await getMetadataAlternates({ path: blog.path, locale }) }),
   };
 }
diff --git a/core/app/[locale]/(default)/product/[slug]/page.tsx b/core/app/[locale]/(default)/product/[slug]/page.tsx
index 5f31e4dada..c1e8a96bf7 100644
--- a/core/app/[locale]/(default)/product/[slug]/page.tsx
+++ b/core/app/[locale]/(default)/product/[slug]/page.tsx
@@ -55,19 +55,12 @@ export async function generateMetadata({ params }: Props): Promise<Metadata> {
 
   return {
     title: pageTitle || product.name,
-    description: metaDescription || `${product.plainTextDescription.slice(0, 150)}...`,
-    keywords: metaKeywords ? metaKeywords.split(',') : null,
+    description:
+      metaDescription ||
+      `${product.plainTextDescription.replaceAll(/\s+/g, ' ').trim().slice(0, 150)}...`,
+    ...(metaKeywords && { keywords: metaKeywords.split(',') }),
     alternates: await getMetadataAlternates({ path: product.path, locale }),
-    openGraph: url
-      ? {
-          images: [
-            {
-              url,
-              alt,
-            },
-          ],
-        }
-      : null,
+    ...(url && { openGraph: { images: [{ url, alt }] } }),
   };
 }
 
diff --git a/core/app/[locale]/(default)/webpages/[id]/contact/page.tsx b/core/app/[locale]/(default)/webpages/[id]/contact/page.tsx
index e053978dba..b8d1f2e759 100644
--- a/core/app/[locale]/(default)/webpages/[id]/contact/page.tsx
+++ b/core/app/[locale]/(default)/webpages/[id]/contact/page.tsx
@@ -160,9 +160,11 @@ export async function generateMetadata({ params }: Props): Promise<Metadata> {
 
   return {
     title: pageTitle || webpage.title,
-    description: metaDescription,
-    keywords: metaKeywords ? metaKeywords.split(',') : null,
-    alternates: await getMetadataAlternates({ path: webpage.path, locale }),
+    ...(metaDescription && { description: metaDescription }),
+    ...(metaKeywords && { keywords: metaKeywords.split(',') }),
+    ...(webpage.path && {
+      alternates: await getMetadataAlternates({ path: webpage.path, locale }),
+    }),
   };
 }
 
diff --git a/core/app/[locale]/(default)/webpages/[id]/normal/page.tsx b/core/app/[locale]/(default)/webpages/[id]/normal/page.tsx
index 6406c381d0..a222ea18c8 100644
--- a/core/app/[locale]/(default)/webpages/[id]/normal/page.tsx
+++ b/core/app/[locale]/(default)/webpages/[id]/normal/page.tsx
@@ -67,8 +67,8 @@ export async function generateMetadata({ params }: Props): Promise<Metadata> {
 
   return {
     title: pageTitle || webpage.title,
-    description: metaDescription,
-    keywords: metaKeywords ? metaKeywords.split(',') : null,
+    ...(metaDescription && { description: metaDescription }),
+    ...(metaKeywords && { keywords: metaKeywords.split(',') }),
     ...(pagePath && { alternates: await getMetadataAlternates({ path: pagePath, locale }) }),
   };
 }

From 8d128fc75006ef8ab330e3597bfcf15cdc70da71 Mon Sep 17 00:00:00 2001
From: bc-svc-local <102379007+bc-svc-local@users.noreply.github.com>
Date: Wed, 25 Feb 2026 16:19:41 +0100
Subject: [PATCH 56/69] Update translations (#2897)

* feat(other): LOCAL-1444 delivery translation

* chore(core): create translations patch

---------

Co-authored-by: bc-svc-local <bc-svc-local@users.noreply.github.com>
---
 .changeset/translations-patch-2487e2ac.md | 5 +++++
 core/messages/da.json                     | 4 ++--
 core/messages/de.json                     | 4 ++--
 core/messages/es-419.json                 | 4 ++--
 core/messages/es-AR.json                  | 4 ++--
 core/messages/es-CL.json                  | 4 ++--
 core/messages/es-CO.json                  | 4 ++--
 core/messages/es-LA.json                  | 4 ++--
 core/messages/es-MX.json                  | 4 ++--
 core/messages/es-PE.json                  | 4 ++--
 core/messages/es.json                     | 4 ++--
 core/messages/fr.json                     | 4 ++--
 core/messages/it.json                     | 4 ++--
 core/messages/ja.json                     | 4 ++--
 core/messages/nl.json                     | 4 ++--
 core/messages/no.json                     | 4 ++--
 core/messages/sv.json                     | 4 ++--
 17 files changed, 37 insertions(+), 32 deletions(-)
 create mode 100644 .changeset/translations-patch-2487e2ac.md

diff --git a/.changeset/translations-patch-2487e2ac.md b/.changeset/translations-patch-2487e2ac.md
new file mode 100644
index 0000000000..ad17b2636a
--- /dev/null
+++ b/.changeset/translations-patch-2487e2ac.md
@@ -0,0 +1,5 @@
+---
+"@bigcommerce/catalyst-core": patch
+---
+
+Update translations.
diff --git a/core/messages/da.json b/core/messages/da.json
index 0f571c362f..8bd50c7279 100644
--- a/core/messages/da.json
+++ b/core/messages/da.json
@@ -463,8 +463,8 @@
             "additionalInformation": "Yderligere oplysninger",
             "currentStock": "{antal, number} på lager",
             "backorderQuantity": "{antal, number} vil være i restordre",
-            "loadingMoreImages": "Loading more images",
-            "imagesLoaded": "{count, plural, =1 {1 more image loaded} other {# more images loaded}}",
+            "loadingMoreImages": "Indlæser flere billeder",
+            "imagesLoaded": "{count, plural, =1 {1 yderligere billede indlæst} other {# yderligere billeder indlæst}}",
             "Submit": {
                 "addToCart": "Føj til kurv",
                 "outOfStock": "Udsolgt",
diff --git a/core/messages/de.json b/core/messages/de.json
index 8a7db06ad7..1a83921ca4 100644
--- a/core/messages/de.json
+++ b/core/messages/de.json
@@ -463,8 +463,8 @@
             "additionalInformation": "Weitere Informationen",
             "currentStock": "{quantity, number} auf Lager",
             "backorderQuantity": "{quantity, number} wird nachbestellt",
-            "loadingMoreImages": "Loading more images",
-            "imagesLoaded": "{count, plural, =1 {1 more image loaded} other {# more images loaded}}",
+            "loadingMoreImages": "Weitere Bilder werden geladen",
+            "imagesLoaded": "{count, plural, =1 {1 weiteres Bild geladen, } other {# weitere Bilder geladen, }}",
             "Submit": {
                 "addToCart": "Zum Warenkorb hinzufügen",
                 "outOfStock": "Kein Lagerbestand",
diff --git a/core/messages/es-419.json b/core/messages/es-419.json
index 93e4940194..43924c4450 100644
--- a/core/messages/es-419.json
+++ b/core/messages/es-419.json
@@ -463,8 +463,8 @@
             "additionalInformation": "Información adicional",
             "currentStock": "{cantidad, número} en stock",
             "backorderQuantity": "{cantidad, número} estará en espera",
-            "loadingMoreImages": "Loading more images",
-            "imagesLoaded": "{count, plural, =1 {1 more image loaded} other {# more images loaded}}",
+            "loadingMoreImages": "Cargando más imágenes",
+            "imagesLoaded": "{count, plural, =1 {1 imagen más cargada} other {# más imágenes cargadas}}",
             "Submit": {
                 "addToCart": "Agregar al carrito",
                 "outOfStock": "Agotado/a",
diff --git a/core/messages/es-AR.json b/core/messages/es-AR.json
index 93e4940194..43924c4450 100644
--- a/core/messages/es-AR.json
+++ b/core/messages/es-AR.json
@@ -463,8 +463,8 @@
             "additionalInformation": "Información adicional",
             "currentStock": "{cantidad, número} en stock",
             "backorderQuantity": "{cantidad, número} estará en espera",
-            "loadingMoreImages": "Loading more images",
-            "imagesLoaded": "{count, plural, =1 {1 more image loaded} other {# more images loaded}}",
+            "loadingMoreImages": "Cargando más imágenes",
+            "imagesLoaded": "{count, plural, =1 {1 imagen más cargada} other {# más imágenes cargadas}}",
             "Submit": {
                 "addToCart": "Agregar al carrito",
                 "outOfStock": "Agotado/a",
diff --git a/core/messages/es-CL.json b/core/messages/es-CL.json
index 93e4940194..43924c4450 100644
--- a/core/messages/es-CL.json
+++ b/core/messages/es-CL.json
@@ -463,8 +463,8 @@
             "additionalInformation": "Información adicional",
             "currentStock": "{cantidad, número} en stock",
             "backorderQuantity": "{cantidad, número} estará en espera",
-            "loadingMoreImages": "Loading more images",
-            "imagesLoaded": "{count, plural, =1 {1 more image loaded} other {# more images loaded}}",
+            "loadingMoreImages": "Cargando más imágenes",
+            "imagesLoaded": "{count, plural, =1 {1 imagen más cargada} other {# más imágenes cargadas}}",
             "Submit": {
                 "addToCart": "Agregar al carrito",
                 "outOfStock": "Agotado/a",
diff --git a/core/messages/es-CO.json b/core/messages/es-CO.json
index 93e4940194..43924c4450 100644
--- a/core/messages/es-CO.json
+++ b/core/messages/es-CO.json
@@ -463,8 +463,8 @@
             "additionalInformation": "Información adicional",
             "currentStock": "{cantidad, número} en stock",
             "backorderQuantity": "{cantidad, número} estará en espera",
-            "loadingMoreImages": "Loading more images",
-            "imagesLoaded": "{count, plural, =1 {1 more image loaded} other {# more images loaded}}",
+            "loadingMoreImages": "Cargando más imágenes",
+            "imagesLoaded": "{count, plural, =1 {1 imagen más cargada} other {# más imágenes cargadas}}",
             "Submit": {
                 "addToCart": "Agregar al carrito",
                 "outOfStock": "Agotado/a",
diff --git a/core/messages/es-LA.json b/core/messages/es-LA.json
index 93e4940194..43924c4450 100644
--- a/core/messages/es-LA.json
+++ b/core/messages/es-LA.json
@@ -463,8 +463,8 @@
             "additionalInformation": "Información adicional",
             "currentStock": "{cantidad, número} en stock",
             "backorderQuantity": "{cantidad, número} estará en espera",
-            "loadingMoreImages": "Loading more images",
-            "imagesLoaded": "{count, plural, =1 {1 more image loaded} other {# more images loaded}}",
+            "loadingMoreImages": "Cargando más imágenes",
+            "imagesLoaded": "{count, plural, =1 {1 imagen más cargada} other {# más imágenes cargadas}}",
             "Submit": {
                 "addToCart": "Agregar al carrito",
                 "outOfStock": "Agotado/a",
diff --git a/core/messages/es-MX.json b/core/messages/es-MX.json
index 93e4940194..43924c4450 100644
--- a/core/messages/es-MX.json
+++ b/core/messages/es-MX.json
@@ -463,8 +463,8 @@
             "additionalInformation": "Información adicional",
             "currentStock": "{cantidad, número} en stock",
             "backorderQuantity": "{cantidad, número} estará en espera",
-            "loadingMoreImages": "Loading more images",
-            "imagesLoaded": "{count, plural, =1 {1 more image loaded} other {# more images loaded}}",
+            "loadingMoreImages": "Cargando más imágenes",
+            "imagesLoaded": "{count, plural, =1 {1 imagen más cargada} other {# más imágenes cargadas}}",
             "Submit": {
                 "addToCart": "Agregar al carrito",
                 "outOfStock": "Agotado/a",
diff --git a/core/messages/es-PE.json b/core/messages/es-PE.json
index 93e4940194..43924c4450 100644
--- a/core/messages/es-PE.json
+++ b/core/messages/es-PE.json
@@ -463,8 +463,8 @@
             "additionalInformation": "Información adicional",
             "currentStock": "{cantidad, número} en stock",
             "backorderQuantity": "{cantidad, número} estará en espera",
-            "loadingMoreImages": "Loading more images",
-            "imagesLoaded": "{count, plural, =1 {1 more image loaded} other {# more images loaded}}",
+            "loadingMoreImages": "Cargando más imágenes",
+            "imagesLoaded": "{count, plural, =1 {1 imagen más cargada} other {# más imágenes cargadas}}",
             "Submit": {
                 "addToCart": "Agregar al carrito",
                 "outOfStock": "Agotado/a",
diff --git a/core/messages/es.json b/core/messages/es.json
index 507e02c4bd..edd2b00ab9 100644
--- a/core/messages/es.json
+++ b/core/messages/es.json
@@ -463,8 +463,8 @@
             "additionalInformation": "Información adicional",
             "currentStock": "{cantidad, número} en existencias",
             "backorderQuantity": "{cantidad, número} en pedidos pendientes",
-            "loadingMoreImages": "Loading more images",
-            "imagesLoaded": "{count, plural, =1 {1 more image loaded} other {# more images loaded}}",
+            "loadingMoreImages": "Cargando más imágenes",
+            "imagesLoaded": "{count, plural, =1 {1 imagen más cargada} other {# imágenes más cargadas}}",
             "Submit": {
                 "addToCart": "Añadir al carrito",
                 "outOfStock": "Sin existencias",
diff --git a/core/messages/fr.json b/core/messages/fr.json
index 9e3ba28a74..cc4aea4b51 100644
--- a/core/messages/fr.json
+++ b/core/messages/fr.json
@@ -463,8 +463,8 @@
             "additionalInformation": "Informations supplémentaires",
             "currentStock": "{quantity, number} en stock",
             "backorderQuantity": "{quantité, nombre} en attente de réapprovisionnement",
-            "loadingMoreImages": "Loading more images",
-            "imagesLoaded": "{count, plural, =1 {1 more image loaded} other {# more images loaded}}",
+            "loadingMoreImages": "Chargement de plus d'images",
+            "imagesLoaded": "{count, plural, =1 {1 image supplémentaire chargée} other {# images supplémentaires chargées}}",
             "Submit": {
                 "addToCart": "Ajouter au panier",
                 "outOfStock": "En rupture de stock",
diff --git a/core/messages/it.json b/core/messages/it.json
index 9d49e830c0..e47aa82c02 100644
--- a/core/messages/it.json
+++ b/core/messages/it.json
@@ -463,8 +463,8 @@
             "additionalInformation": "Informazioni aggiuntive",
             "currentStock": "{quantità, numero} in magazzino",
             "backorderQuantity": "{quantity, number} sarà in arretrato",
-            "loadingMoreImages": "Loading more images",
-            "imagesLoaded": "{count, plural, =1 {1 more image loaded} other {# more images loaded}}",
+            "loadingMoreImages": "Caricamento di altre immagini",
+            "imagesLoaded": "{count, plural, =1 {1 altra immagine caricata} other {# altre immagini caricate}}",
             "Submit": {
                 "addToCart": "Aggiungi al carrello",
                 "outOfStock": "Esaurito",
diff --git a/core/messages/ja.json b/core/messages/ja.json
index ff94c4325e..5a2fa86d4f 100644
--- a/core/messages/ja.json
+++ b/core/messages/ja.json
@@ -463,8 +463,8 @@
             "additionalInformation": "追加情報",
             "currentStock": "{quantity, number} 個の在庫あり",
             "backorderQuantity": "{quantity, number} はバックオーダーになります",
-            "loadingMoreImages": "Loading more images",
-            "imagesLoaded": "{count, plural, =1 {1 more image loaded} other {# more images loaded}}",
+            "loadingMoreImages": "さらに画像を読み込んでいます",
+            "imagesLoaded": "{count, plural, =1 {1 枚の画像が読み込まれました} other {#枚の画像が読み込まれました}}",
             "Submit": {
                 "addToCart": "カートに追加",
                 "outOfStock": "品切れ",
diff --git a/core/messages/nl.json b/core/messages/nl.json
index fc30faaa68..61bca344e1 100644
--- a/core/messages/nl.json
+++ b/core/messages/nl.json
@@ -463,8 +463,8 @@
             "additionalInformation": "Aanvullende informatie",
             "currentStock": "{quantity, number} op voorraad",
             "backorderQuantity": "{hoeveelheid, aantal} staat in backorder",
-            "loadingMoreImages": "Loading more images",
-            "imagesLoaded": "{count, plural, =1 {1 more image loaded} other {# more images loaded}}",
+            "loadingMoreImages": "Meer afbeeldingen laden",
+            "imagesLoaded": "{count, plural, =1 {1 afbeelding geladen} other {# afbeeldingen geladen}}",
             "Submit": {
                 "addToCart": "Toevoegen aan winkelmandje",
                 "outOfStock": "Niet op voorraad",
diff --git a/core/messages/no.json b/core/messages/no.json
index 99b29e9466..1197c07cfd 100644
--- a/core/messages/no.json
+++ b/core/messages/no.json
@@ -463,8 +463,8 @@
             "additionalInformation": "Mer informasjon",
             "currentStock": "{antall, nummer} på lager",
             "backorderQuantity": "{antall, nummer} vil være restordre",
-            "loadingMoreImages": "Loading more images",
-            "imagesLoaded": "{count, plural, =1 {1 more image loaded} other {# more images loaded}}",
+            "loadingMoreImages": "Laster inn flere bilder",
+            "imagesLoaded": "{antall, flertall, =1 {1 bilde til ble lastet inn} other {# flere bilder ble lastet inn}}",
             "Submit": {
                 "addToCart": "Legg i handlekurv",
                 "outOfStock": "Utsolgt",
diff --git a/core/messages/sv.json b/core/messages/sv.json
index 539cab0665..d16362d17e 100644
--- a/core/messages/sv.json
+++ b/core/messages/sv.json
@@ -463,8 +463,8 @@
             "additionalInformation": "Ytterligare information",
             "currentStock": "{quantity, number} i lager",
             "backorderQuantity": "{quantity, number} kommer att vara restnoterade",
-            "loadingMoreImages": "Loading more images",
-            "imagesLoaded": "{count, plural, =1 {1 more image loaded} other {# more images loaded}}",
+            "loadingMoreImages": "Laddar fler bilder",
+            "imagesLoaded": "{count, plural, =1 {1 till bild har laddats} other {# till bilder har laddats}}",
             "Submit": {
                 "addToCart": "Lägg till i kundvagn",
                 "outOfStock": "Ej i lager",

From 8cb17e055d17f8a1724e491a41fc59af696d4300 Mon Sep 17 00:00:00 2001
From: Jorge Moya <jorge.moya@bigcommerce.com>
Date: Wed, 25 Feb 2026 15:03:55 -0600
Subject: [PATCH 57/69] feat: report bundle size delta (#2891)

* feat: report bundle size delta

* fix: add missing env vars

* fix: update reporting to hide no changes and visibly show updates

* feat: update bundle baseline when merged to canary

* fix: include integrations/makeswift

* chore: add comments

* fix: use parseArgs, split script from workflow

* chore: remove indicators

* feat: compare reports of live canary/makeswift branch instead of baseline

* fix: add --dir arg to use the script file in the PR to generate reports

* fix: split workflows to run in parallel

* fix: filter out 0% delta changes

* fix: use .at(0) and update resolve

* fix: add tests for scripts

* fix: use typescript and change PR comment report
---
 .../scripts/__tests__/bundle-size.test.mts    | 719 ++++++++++++++++++
 .../__tests__/post-bundle-comment.test.mts    | 189 +++++
 .github/scripts/bundle-size.mts               | 490 ++++++++++++
 .github/scripts/post-bundle-comment.js        |  30 +
 .github/workflows/bundle-size.yml             | 141 ++++
 .github/workflows/regression-tests.yml        |   8 +-
 package.json                                  |   2 +
 pnpm-lock.yaml                                |  65 +-
 8 files changed, 1589 insertions(+), 55 deletions(-)
 create mode 100644 .github/scripts/__tests__/bundle-size.test.mts
 create mode 100644 .github/scripts/__tests__/post-bundle-comment.test.mts
 create mode 100644 .github/scripts/bundle-size.mts
 create mode 100644 .github/scripts/post-bundle-comment.js
 create mode 100644 .github/workflows/bundle-size.yml

diff --git a/.github/scripts/__tests__/bundle-size.test.mts b/.github/scripts/__tests__/bundle-size.test.mts
new file mode 100644
index 0000000000..44f689ecd0
--- /dev/null
+++ b/.github/scripts/__tests__/bundle-size.test.mts
@@ -0,0 +1,719 @@
+import { describe, it, after, beforeEach } from 'node:test';
+import assert from 'node:assert/strict';
+import { writeFileSync, mkdirSync, rmSync, unlinkSync } from 'node:fs';
+import { join } from 'node:path';
+import { tmpdir } from 'node:os';
+
+import {
+  round1,
+  getGzipSize,
+  parseManifestEntries,
+  computeRootLayout,
+  computeRouteMetrics,
+  compareReport,
+  clearSizeCache,
+} from '../bundle-size.mts';
+
+// ---------------------------------------------------------------------------
+// Shared temp directory with fixture chunk files.
+// Initialized at module load time so testDir is set before any test runs.
+// Files are large enough (varied content) to produce measurable gzip sizes.
+// ---------------------------------------------------------------------------
+
+const testDir = join(tmpdir(), `bundle-size-test-${Date.now()}`);
+
+mkdirSync(testDir, { recursive: true });
+
+// Each file gets unique, varied content so gzip produces a non-trivial size.
+const makeJs = (prefix: string) =>
+  Array.from(
+    { length: 30 },
+    (_, i) => `export const ${prefix}_${i} = ${JSON.stringify(`${prefix}_v${i}_pad${i * 37 + 13}`)};`,
+  ).join('\n') + '\n';
+
+const makeCss = (prefix: string) =>
+  Array.from(
+    { length: 20 },
+    (_, i) => `.${prefix}-class-${i} { color: hsl(${i * 17}, 50%, 50%); margin: ${i}px; }`,
+  ).join('\n') + '\n';
+
+writeFileSync(join(testDir, 'route.js'), makeJs('route'));
+writeFileSync(join(testDir, 'shared.js'), makeJs('shared'));
+writeFileSync(join(testDir, 'root-layout.js'), makeJs('root_layout'));
+writeFileSync(join(testDir, 'product-layout.js'), makeJs('product_layout'));
+writeFileSync(join(testDir, 'route.css'), makeCss('route'));
+
+after(() => {
+  rmSync(testDir, { recursive: true, force: true });
+});
+
+// ---------------------------------------------------------------------------
+// round1
+// ---------------------------------------------------------------------------
+
+describe('round1', () => {
+  it('rounds up at .05', () => {
+    assert.equal(round1(1.25), 1.3);
+  });
+
+  it('rounds down below .05', () => {
+    assert.equal(round1(1.24), 1.2);
+  });
+
+  it('returns 0 unchanged', () => {
+    assert.equal(round1(0), 0);
+  });
+
+  it('handles negative values', () => {
+    assert.equal(round1(-1.25), -1.2);
+  });
+});
+
+// ---------------------------------------------------------------------------
+// parseManifestEntries
+// ---------------------------------------------------------------------------
+
+describe('parseManifestEntries', () => {
+  it('routes /layout entries to layouts', () => {
+    const { layouts, pages } = parseManifestEntries({
+      '/app/layout': ['a.js'],
+      '/app/about/page': ['b.js'],
+    });
+
+    assert.deepEqual(Object.keys(layouts), ['/app/layout']);
+    assert.deepEqual(Object.keys(pages), ['/app/about/page']);
+  });
+
+  it('routes /page entries to pages', () => {
+    const { pages } = parseManifestEntries({ '/app/contact/page': ['c.js'] });
+
+    assert.deepEqual(Object.keys(pages), ['/app/contact/page']);
+  });
+
+  it('ignores entries ending in neither /layout nor /page', () => {
+    const { layouts, pages } = parseManifestEntries({
+      '/app/route': ['d.js'],
+      '/api/handler': [],
+      '/app/loading': ['e.js'],
+    });
+
+    assert.deepEqual(Object.keys(layouts), []);
+    assert.deepEqual(Object.keys(pages), []);
+  });
+
+  it('returns empty objects for empty input', () => {
+    const { layouts, pages } = parseManifestEntries({});
+
+    assert.deepEqual(layouts, {});
+    assert.deepEqual(pages, {});
+  });
+
+  it('handles multiple layouts and pages together', () => {
+    const { layouts, pages } = parseManifestEntries({
+      '/app/layout': ['a.js'],
+      '/app/products/layout': ['b.js'],
+      '/app/page': ['c.js'],
+      '/app/products/page': ['d.js'],
+    });
+
+    assert.deepEqual(Object.keys(layouts).sort(), ['/app/layout', '/app/products/layout']);
+    assert.deepEqual(Object.keys(pages).sort(), ['/app/page', '/app/products/page']);
+  });
+});
+
+// ---------------------------------------------------------------------------
+// computeRootLayout
+// ---------------------------------------------------------------------------
+
+describe('computeRootLayout', () => {
+  beforeEach(() => clearSizeCache());
+
+  it('selects shortest path as root when multiple layouts exist', () => {
+    const layouts = {
+      '/[locale]/products/layout': [],
+      '/[locale]/layout': [],
+      '/[locale]/about/deep/layout': [],
+    };
+    const { rootLayoutPath } = computeRootLayout(
+      Object.keys(layouts),
+      layouts,
+      new Set(),
+      testDir,
+    );
+
+    assert.equal(rootLayoutPath, '/[locale]/layout');
+  });
+
+  it('returns null rootLayoutPath when layoutPaths is empty', () => {
+    const { rootLayoutPath, rootLayoutChunks, rootLayoutJs, rootLayoutCss } = computeRootLayout(
+      [],
+      {},
+      new Set(),
+      testDir,
+    );
+
+    assert.equal(rootLayoutPath, null);
+    assert.equal(rootLayoutChunks.size, 0);
+    assert.equal(rootLayoutJs, 0);
+    assert.equal(rootLayoutCss, 0);
+  });
+
+  it('excludes sharedChunks from rootLayoutChunks', () => {
+    const layouts = { '/layout': ['shared.js', 'root-layout.js'] };
+    const sharedChunks = new Set(['shared.js']);
+    const { rootLayoutChunks } = computeRootLayout(
+      ['/layout'],
+      layouts,
+      sharedChunks,
+      testDir,
+    );
+
+    assert.ok(!rootLayoutChunks.has('shared.js'), 'shared.js should be excluded');
+    assert.ok(rootLayoutChunks.has('root-layout.js'), 'root-layout.js should be included');
+  });
+
+  it('rootLayoutChunks contains all non-shared layout chunks', () => {
+    const layouts = { '/layout': ['root-layout.js', 'route.js'] };
+    const { rootLayoutChunks } = computeRootLayout(
+      ['/layout'],
+      layouts,
+      new Set(),
+      testDir,
+    );
+
+    assert.ok(rootLayoutChunks.has('root-layout.js'));
+    assert.ok(rootLayoutChunks.has('route.js'));
+    assert.equal(rootLayoutChunks.size, 2);
+  });
+
+  it('computes non-zero sizes when real files exist', () => {
+    const layouts = { '/layout': ['root-layout.js'] };
+    const { rootLayoutJs } = computeRootLayout(
+      ['/layout'],
+      layouts,
+      new Set(),
+      testDir,
+    );
+
+    assert.ok(rootLayoutJs > 0, `Expected rootLayoutJs > 0, got ${rootLayoutJs}`);
+  });
+});
+
+// ---------------------------------------------------------------------------
+// computeRouteMetrics
+// ---------------------------------------------------------------------------
+
+describe('computeRouteMetrics', () => {
+  beforeEach(() => clearSizeCache());
+
+  it('firstLoadJs equals firstLoadJs arg when all chunks are non-existent', () => {
+    const pages = { '/app/page': [] };
+    const routes = computeRouteMetrics(
+      pages,
+      {},
+      new Set(),
+      null,
+      new Set(),
+      100,
+      testDir,
+    );
+
+    assert.equal(routes['/app/page'].firstLoadJs, 100);
+  });
+
+  it('firstLoadJs is greater than firstLoadJs arg when real chunk files exist', () => {
+    const pages = { '/app/page': ['route.js', 'route.css'] };
+    const routes = computeRouteMetrics(
+      pages,
+      {},
+      new Set(),
+      null,
+      new Set(),
+      0,
+      testDir,
+    );
+
+    const { js, css, firstLoadJs } = routes['/app/page'];
+
+    assert.ok(js > 0, `js should be > 0 (real file exists), got ${js}`);
+    assert.ok(css > 0, `css should be > 0 (real file exists), got ${css}`);
+    assert.ok(firstLoadJs > 0, `firstLoadJs should be > 0, got ${firstLoadJs}`);
+  });
+
+  it('excludes sharedChunks from route chunk set', () => {
+    const pages = { '/app/page': ['shared.js', 'route.js'] };
+
+    // With both chunks in sharedChunks, routeChunks is empty -> js = 0
+    const routesAllExcluded = computeRouteMetrics(
+      pages,
+      {},
+      new Set(['shared.js', 'route.js']),
+      null,
+      new Set(),
+      0,
+      testDir,
+    );
+
+    assert.equal(routesAllExcluded['/app/page'].js, 0, 'All shared chunks excluded -> js = 0');
+
+    clearSizeCache();
+
+    // With no exclusions, real files contribute -> js > 0
+    const routesNoneExcluded = computeRouteMetrics(
+      pages,
+      {},
+      new Set(),
+      null,
+      new Set(),
+      0,
+      testDir,
+    );
+
+    assert.ok(routesNoneExcluded['/app/page'].js > 0, 'No exclusions -> js > 0');
+  });
+
+  it('excludes rootLayoutChunks from route chunk set', () => {
+    const pages = { '/app/page': ['root-layout.js', 'route.js'] };
+
+    // With both chunks in rootLayoutChunks, routeChunks is empty -> js = 0
+    const routesAllExcluded = computeRouteMetrics(
+      pages,
+      {},
+      new Set(),
+      null,
+      new Set(['root-layout.js', 'route.js']),
+      0,
+      testDir,
+    );
+
+    assert.equal(routesAllExcluded['/app/page'].js, 0, 'All rootLayout chunks excluded -> js = 0');
+
+    clearSizeCache();
+
+    // With no rootLayoutChunks excluded, real files contribute -> js > 0
+    const routesNoneExcluded = computeRouteMetrics(
+      pages,
+      {},
+      new Set(),
+      null,
+      new Set(),
+      0,
+      testDir,
+    );
+
+    assert.ok(routesNoneExcluded['/app/page'].js > 0, 'No exclusions -> js > 0');
+  });
+
+  it('includes non-root ancestor layout chunks in route size', () => {
+    // Page has no own chunks; non-root ancestor layout contributes product-layout.js
+    const pages = { '/[locale]/products/page': [] };
+    const layouts = {
+      '/[locale]/layout': ['root-layout.js'],
+      '/[locale]/products/layout': ['product-layout.js'],
+    };
+    const rootLayoutChunks = new Set(['root-layout.js']);
+
+    const routes = computeRouteMetrics(
+      pages,
+      layouts,
+      new Set(),
+      '/[locale]/layout',
+      rootLayoutChunks,
+      0,
+      testDir,
+    );
+
+    assert.ok(
+      routes['/[locale]/products/page'].js > 0,
+      'Non-root ancestor layout chunk should contribute to route js',
+    );
+  });
+
+  it('does not include root ancestor layout chunks in route size', () => {
+    // Page has no own chunks; root layout has root-layout.js (should be excluded)
+    const pages = { '/[locale]/page': [] };
+    const layouts = {
+      '/[locale]/layout': ['root-layout.js'],
+    };
+    const rootLayoutChunks = new Set(['root-layout.js']);
+
+    const routes = computeRouteMetrics(
+      pages,
+      layouts,
+      new Set(),
+      '/[locale]/layout',
+      rootLayoutChunks,
+      0,
+      testDir,
+    );
+
+    assert.equal(
+      routes['/[locale]/page'].js,
+      0,
+      'Root ancestor layout chunks should NOT contribute to route js',
+    );
+  });
+
+  it('applies round1 to all output values', () => {
+    const pages = { '/app/page': [] };
+    const routes = computeRouteMetrics(
+      pages,
+      {},
+      new Set(),
+      null,
+      new Set(),
+      1.25,
+      testDir,
+    );
+
+    // firstLoadJs = round1(1.25 + 0 + 0) = 1.3
+    assert.equal(routes['/app/page'].firstLoadJs, 1.3);
+    assert.equal(routes['/app/page'].js, 0);
+    assert.equal(routes['/app/page'].css, 0);
+  });
+});
+
+// ---------------------------------------------------------------------------
+// compareReport
+// The warning sign in the report output is U+26A0 U+FE0F (warning emoji).
+// Warning table rows end with "| warning-emoji |" while the footer contains
+// the same emoji in a sentence. Use "warning-emoji |" to match only table cells.
+// ---------------------------------------------------------------------------
+
+const WARN_EMOJI = '\u26a0\ufe0f'; // ⚠️
+const WARN_IN_ROW = `${WARN_EMOJI} |`; // appears only in warning table cells
+
+describe('compareReport', () => {
+  function makeReport(overrides = {}) {
+    return {
+      commitSha: 'abc123',
+      updatedAt: '2024-01-01',
+      firstLoadJs: 100,
+      totalJs: 200,
+      totalCss: 10,
+      routes: {},
+      ...overrides,
+    };
+  }
+
+  it('shows "No bundle size changes detected." when nothing changed', () => {
+    const baseline = makeReport();
+    const current = makeReport();
+    const report = compareReport(baseline, current);
+
+    assert.ok(report.includes('No bundle size changes detected.'));
+    assert.ok(!report.includes('_No route changes detected._'));
+    assert.ok(!report.includes('### Per-Route First Load JS'));
+  });
+
+  it('shows "No route changes detected." when only global metrics changed', () => {
+    // Global metric differs (Case 2) but routes are identical → section shown, no threshold
+    const baseline = makeReport({ firstLoadJs: 100, routes: { '/app/page': { firstLoadJs: 100, js: 50, css: 5 } } });
+    const current = makeReport({ firstLoadJs: 110, routes: { '/app/page': { firstLoadJs: 100, js: 50, css: 5 } } });
+    const report = compareReport(baseline, current);
+
+    assert.ok(report.includes('_No route changes detected._'));
+    assert.ok(!report.includes(`Threshold:`));
+  });
+
+  it('does not show global metrics table when global metrics are unchanged', () => {
+    const baseline = makeReport();
+    const current = makeReport();
+    const report = compareReport(baseline, current);
+
+    assert.ok(!report.includes('| Metric |'));
+  });
+
+  it('shows global metrics table only when metrics changed', () => {
+    const baseline = makeReport({ firstLoadJs: 100 });
+    const current = makeReport({ firstLoadJs: 115 });
+    const report = compareReport(baseline, current);
+
+    assert.ok(report.includes('| Metric |'));
+    assert.ok(report.includes('First Load JS'));
+  });
+
+  it('shows only the changed global metrics', () => {
+    const baseline = makeReport({ firstLoadJs: 100, totalJs: 200, totalCss: 10 });
+    const current = makeReport({ firstLoadJs: 100, totalJs: 210, totalCss: 10 });
+    const report = compareReport(baseline, current);
+
+    // Use pipe-delimited patterns to match table rows only (not the section header)
+    assert.ok(report.includes('| Total JS |'));
+    assert.ok(!report.includes('| First Load JS |'));
+    assert.ok(!report.includes('| Total CSS |'));
+  });
+
+  it('shows NEW row for added route', () => {
+    const baseline = makeReport({ routes: {} });
+    const current = makeReport({
+      routes: { '/app/new/page': { firstLoadJs: 120, js: 60, css: 5 } },
+    });
+    const report = compareReport(baseline, current);
+
+    assert.ok(report.includes('NEW'));
+    assert.ok(report.includes('120 kB'));
+  });
+
+  it('shows REMOVED row for deleted route', () => {
+    const baseline = makeReport({
+      routes: { '/app/old/page': { firstLoadJs: 120, js: 60, css: 5 } },
+    });
+    const current = makeReport({ routes: {} });
+    const report = compareReport(baseline, current);
+
+    assert.ok(report.includes('REMOVED'));
+    assert.ok(report.includes('120 kB'));
+  });
+
+  it('does not show warning for increase under threshold', () => {
+    // delta=3kB, pct=3% < 5% threshold: no warning row
+    const baseline = makeReport({ routes: { '/app/page': { firstLoadJs: 100, js: 50, css: 5 } } });
+    const current = makeReport({ routes: { '/app/page': { firstLoadJs: 103, js: 53, css: 5 } } });
+    const report = compareReport(baseline, current);
+
+    assert.ok(!report.includes(WARN_IN_ROW), 'Should not have a warning table cell');
+  });
+
+  it('shows warning for increase over threshold (over 1kB AND over threshold percent)', () => {
+    // delta=10kB, pct=10% > 5% threshold: warning row present
+    const baseline = makeReport({ routes: { '/app/page': { firstLoadJs: 100, js: 50, css: 5 } } });
+    const current = makeReport({ routes: { '/app/page': { firstLoadJs: 110, js: 60, css: 5 } } });
+    const report = compareReport(baseline, current);
+
+    assert.ok(report.includes(WARN_IN_ROW), 'Should have a warning table cell');
+  });
+
+  it('does not warn when delta is over threshold percent but 1kB or less', () => {
+    // delta=0.5kB = 50% but <=1kB: no warning
+    const baseline = makeReport({ routes: { '/app/page': { firstLoadJs: 1, js: 1, css: 0 } } });
+    const current = makeReport({ routes: { '/app/page': { firstLoadJs: 1.5, js: 1.5, css: 0 } } });
+    const report = compareReport(baseline, current);
+
+    assert.ok(!report.includes(WARN_IN_ROW));
+  });
+
+  it('does not warn when delta is over 1kB but at or under threshold percent', () => {
+    // delta=2kB = 1% < 5% threshold: no warning
+    const baseline = makeReport({ routes: { '/app/page': { firstLoadJs: 200, js: 200, css: 0 } } });
+    const current = makeReport({ routes: { '/app/page': { firstLoadJs: 202, js: 202, css: 0 } } });
+    const report = compareReport(baseline, current);
+
+    assert.ok(!report.includes(WARN_IN_ROW));
+  });
+
+  it('respects custom threshold: no warning when under', () => {
+    // delta=8kB = 8%, threshold=10: no warning
+    const baseline = makeReport({ routes: { '/app/page': { firstLoadJs: 100, js: 50, css: 5 } } });
+    const current = makeReport({ routes: { '/app/page': { firstLoadJs: 108, js: 58, css: 5 } } });
+    const report = compareReport(baseline, current, { threshold: 10 });
+
+    assert.ok(!report.includes(WARN_IN_ROW));
+  });
+
+  it('respects custom threshold: warning when over', () => {
+    // delta=8kB = 8%, threshold=3: warning
+    const baseline = makeReport({ routes: { '/app/page': { firstLoadJs: 100, js: 50, css: 5 } } });
+    const current = makeReport({ routes: { '/app/page': { firstLoadJs: 108, js: 58, css: 5 } } });
+    const report = compareReport(baseline, current, { threshold: 3 });
+
+    assert.ok(report.includes(WARN_IN_ROW));
+  });
+
+  it('uses default threshold of 5 percent when not specified', () => {
+    // delta=6kB = 6% > 5%: warning with default
+    const baseline = makeReport({ routes: { '/app/page': { firstLoadJs: 100, js: 100, css: 0 } } });
+    const current = makeReport({ routes: { '/app/page': { firstLoadJs: 106, js: 106, css: 0 } } });
+    const report = compareReport(baseline, current);
+
+    assert.ok(report.includes(WARN_IN_ROW));
+    assert.ok(report.includes('Threshold: 5%'));
+  });
+
+  it('shows threshold in footer only when route changes are present', () => {
+    // Route changed: threshold callout shown
+    const baseline = makeReport({ routes: { '/app/page': { firstLoadJs: 100, js: 50, css: 5 } } });
+    const current = makeReport({ routes: { '/app/page': { firstLoadJs: 110, js: 60, css: 5 } } });
+    const report = compareReport(baseline, current, { threshold: 7 });
+
+    assert.ok(report.includes('Threshold: 7%'));
+  });
+
+  it('omits threshold footer when there are no route changes', () => {
+    // Global metrics differ but routes are identical — no threshold callout
+    const baseline = makeReport({ firstLoadJs: 100 });
+    const current = makeReport({ firstLoadJs: 115 });
+    const report = compareReport(baseline, current);
+
+    assert.ok(!report.includes('Threshold:'));
+  });
+
+  it('formats positive delta with + sign and percent', () => {
+    const baseline = makeReport({ routes: { '/app/page': { firstLoadJs: 100, js: 50, css: 5 } } });
+    const current = makeReport({ routes: { '/app/page': { firstLoadJs: 110, js: 60, css: 5 } } });
+    const report = compareReport(baseline, current);
+
+    assert.ok(report.includes('+10 kB'));
+    assert.ok(report.includes('+10%'));
+  });
+
+  it('formats negative delta with minus sign and percent', () => {
+    const baseline = makeReport({ routes: { '/app/page': { firstLoadJs: 100, js: 50, css: 5 } } });
+    const current = makeReport({ routes: { '/app/page': { firstLoadJs: 90, js: 40, css: 5 } } });
+    const report = compareReport(baseline, current);
+
+    assert.ok(report.includes('-10 kB'));
+    assert.ok(report.includes('-10%'));
+  });
+
+  it('sorts routes alphabetically', () => {
+    const makeRoute = (v: number) => ({ firstLoadJs: v, js: v, css: 0 });
+    const baseline = makeReport({
+      routes: {
+        '/z/page': makeRoute(100),
+        '/a/page': makeRoute(100),
+        '/m/page': makeRoute(100),
+      },
+    });
+    const current = makeReport({
+      routes: {
+        '/z/page': makeRoute(110),
+        '/a/page': makeRoute(110),
+        '/m/page': makeRoute(110),
+      },
+    });
+    const report = compareReport(baseline, current);
+
+    const aIdx = report.indexOf('/a/page');
+    const mIdx = report.indexOf('/m/page');
+    const zIdx = report.indexOf('/z/page');
+
+    assert.ok(aIdx < mIdx, '/a should appear before /m');
+    assert.ok(mIdx < zIdx, '/m should appear before /z');
+  });
+
+  it('strips the /[locale] prefix from display names', () => {
+    const baseline = makeReport({ routes: {} });
+    const current = makeReport({
+      routes: { '/[locale]/products/page': { firstLoadJs: 120, js: 60, css: 5 } },
+    });
+    const report = compareReport(baseline, current);
+
+    assert.ok(report.includes('/products/page'), 'Should show /products/page (locale stripped)');
+    assert.ok(
+      !report.includes('/[locale]/products/page'),
+      'Should not show /[locale] prefix',
+    );
+  });
+
+  it('omits near-zero deltas that round to 0.0', () => {
+    // 0.04kB delta rounds to 0.0: treated as no change
+    const baseline = makeReport({
+      routes: { '/app/page': { firstLoadJs: 100.04, js: 50, css: 5 } },
+    });
+    const current = makeReport({
+      routes: { '/app/page': { firstLoadJs: 100.04, js: 50, css: 5 } },
+    });
+    const report = compareReport(baseline, current);
+
+    assert.ok(report.includes('No bundle size changes detected.'));
+  });
+
+  it('shows Per-Route First Load JS section when there are route changes', () => {
+    const baseline = makeReport({ routes: { '/app/page': { firstLoadJs: 100, js: 50, css: 0 } } });
+    const current = makeReport({ routes: { '/app/page': { firstLoadJs: 110, js: 60, css: 0 } } });
+    const report = compareReport(baseline, current);
+
+    assert.ok(report.includes('### Per-Route First Load JS'));
+  });
+
+  it('omits Per-Route First Load JS section when nothing changed', () => {
+    const baseline = makeReport();
+    const current = makeReport();
+    const report = compareReport(baseline, current);
+
+    assert.ok(!report.includes('### Per-Route First Load JS'));
+  });
+
+  it('shows header with baseline commitSha and updatedAt', () => {
+    const baseline = makeReport({ commitSha: 'deadbeef', updatedAt: '2024-06-15' });
+    const current = makeReport();
+    const report = compareReport(baseline, current);
+
+    assert.ok(report.includes('`deadbeef`'));
+    assert.ok(report.includes('2024-06-15'));
+  });
+
+  it('shows "No bundle size changes detected." for empty routes in both reports', () => {
+    const baseline = makeReport({ routes: {} });
+    const current = makeReport({ routes: {} });
+    const report = compareReport(baseline, current);
+
+    assert.ok(report.includes('No bundle size changes detected.'));
+  });
+
+  it('shows table header when routes have changes', () => {
+    const baseline = makeReport({ routes: { '/app/page': { firstLoadJs: 100, js: 50, css: 0 } } });
+    const current = makeReport({ routes: { '/app/page': { firstLoadJs: 110, js: 60, css: 0 } } });
+    const report = compareReport(baseline, current);
+
+    assert.ok(report.includes('| Route |'));
+    assert.ok(report.includes('| Baseline |'));
+    assert.ok(report.includes('| Current |'));
+  });
+});
+
+// ---------------------------------------------------------------------------
+// getGzipSize
+// ---------------------------------------------------------------------------
+
+describe('getGzipSize', () => {
+  beforeEach(() => clearSizeCache());
+
+  it('returns 0 when file does not exist', () => {
+    const result = getGzipSize(join(testDir, 'nonexistent-file-xyz.js'));
+
+    assert.equal(result, 0);
+  });
+
+  it('returns a positive number for an existing file', () => {
+    const result = getGzipSize(join(testDir, 'route.js'));
+
+    assert.ok(result > 0, `Expected positive size, got ${result}`);
+  });
+
+  it('caches results and returns same value on second call', () => {
+    const filePath = join(testDir, `cache-test-${Date.now()}.js`);
+
+    writeFileSync(filePath, makeJs('cached'));
+
+    const firstResult = getGzipSize(filePath);
+
+    assert.ok(firstResult > 0);
+
+    // Delete the file — the cached value should still be returned
+    unlinkSync(filePath);
+
+    const secondResult = getGzipSize(filePath);
+
+    assert.equal(secondResult, firstResult, 'Should return cached value after file deletion');
+  });
+
+  it('clearSizeCache resets the cache', () => {
+    const filePath = join(testDir, `clear-test-${Date.now()}.js`);
+
+    writeFileSync(filePath, makeJs('cleared'));
+
+    const sizeBeforeDelete = getGzipSize(filePath);
+
+    assert.ok(sizeBeforeDelete > 0);
+
+    unlinkSync(filePath);
+    clearSizeCache();
+
+    // After clearing cache, file is gone so size should be 0
+    const sizeAfterClear = getGzipSize(filePath);
+
+    assert.equal(sizeAfterClear, 0, 'Should return 0 after cache cleared and file deleted');
+  });
+});
diff --git a/.github/scripts/__tests__/post-bundle-comment.test.mts b/.github/scripts/__tests__/post-bundle-comment.test.mts
new file mode 100644
index 0000000000..8a11c4eb9e
--- /dev/null
+++ b/.github/scripts/__tests__/post-bundle-comment.test.mts
@@ -0,0 +1,189 @@
+import { describe, it, beforeEach } from 'node:test';
+import assert from 'node:assert/strict';
+import { writeFileSync, mkdirSync, rmSync } from 'node:fs';
+import { join } from 'node:path';
+import { tmpdir } from 'node:os';
+import { createRequire } from 'node:module';
+
+const require = createRequire(import.meta.url);
+const postBundleComment = require('../post-bundle-comment.js') as (args: {
+  github: ReturnType<typeof makeGithub>['github'];
+  context: ReturnType<typeof makeContext>;
+  reportPath?: string;
+}) => Promise<void>;
+
+const marker = '<!-- bundle-size-report -->';
+
+let tmpDir: string;
+let reportPath: string;
+
+beforeEach(() => {
+  tmpDir = join(tmpdir(), `post-bundle-test-${Date.now()}`);
+  mkdirSync(tmpDir, { recursive: true });
+  reportPath = join(tmpDir, 'report.md');
+  writeFileSync(reportPath, '## Bundle Size Report\n\nSome content here.');
+});
+
+interface Comment {
+  id: number;
+  body: string;
+}
+
+interface GithubCalls {
+  create: object[];
+  update: object[];
+  list: object[];
+}
+
+// Helper to create a mock github object and record calls
+function makeGithub(existingComments: Comment[] = []) {
+  const calls: GithubCalls = { create: [], update: [], list: [] };
+  const github = {
+    rest: {
+      issues: {
+        listComments: async (args: object) => {
+          calls.list.push(args);
+          return { data: existingComments };
+        },
+        createComment: async (args: object) => {
+          calls.create.push(args);
+        },
+        updateComment: async (args: object) => {
+          calls.update.push(args);
+        },
+      },
+    },
+  };
+  return { github, calls };
+}
+
+function makeContext({ owner = 'test-owner', repo = 'test-repo', number = 42 } = {}) {
+  return {
+    repo: { owner, repo },
+    issue: { number },
+  };
+}
+
+describe('post-bundle-comment', () => {
+  it('creates a new comment when no existing comment contains the marker', async () => {
+    const { github, calls } = makeGithub([]);
+    await postBundleComment({ github, context: makeContext(), reportPath });
+
+    assert.equal(calls.create.length, 1, 'Should create exactly one comment');
+    assert.equal(calls.update.length, 0, 'Should not update any comment');
+  });
+
+  it('updates existing comment when marker found', async () => {
+    const existing = { id: 99, body: `${marker}\nOld content` };
+    const { github, calls } = makeGithub([existing]);
+    await postBundleComment({ github, context: makeContext(), reportPath });
+
+    assert.equal(calls.update.length, 1, 'Should update exactly one comment');
+    assert.equal(calls.create.length, 0, 'Should not create a new comment');
+    assert.equal((calls.update[0] as { comment_id: number }).comment_id, 99, 'Should update the correct comment by id');
+  });
+
+  it('body always starts with marker and newline', async () => {
+    const { github, calls } = makeGithub([]);
+    await postBundleComment({ github, context: makeContext(), reportPath });
+
+    const body = (calls.create[0] as { body: string }).body;
+
+    assert.ok(body.startsWith(`${marker}\n`), `Body should start with marker, got: ${body.slice(0, 50)}`);
+  });
+
+  it('updated comment body also starts with marker and newline', async () => {
+    const existing = { id: 7, body: `${marker}\nStale content` };
+    const { github, calls } = makeGithub([existing]);
+    await postBundleComment({ github, context: makeContext(), reportPath });
+
+    const body = (calls.update[0] as { body: string }).body;
+
+    assert.ok(body.startsWith(`${marker}\n`));
+  });
+
+  it('includes report file content in the comment body', async () => {
+    const { github, calls } = makeGithub([]);
+    await postBundleComment({ github, context: makeContext(), reportPath });
+
+    const body = (calls.create[0] as { body: string }).body;
+
+    assert.ok(body.includes('## Bundle Size Report'), 'Should include report heading');
+    assert.ok(body.includes('Some content here.'), 'Should include report body content');
+  });
+
+  it('reads report from a custom reportPath', async () => {
+    const customPath = join(tmpDir, 'custom.md');
+
+    writeFileSync(customPath, 'Custom report content for testing!');
+
+    const { github, calls } = makeGithub([]);
+    await postBundleComment({ github, context: makeContext(), reportPath: customPath });
+
+    assert.ok((calls.create[0] as { body: string }).body.includes('Custom report content for testing!'));
+  });
+
+  it('passes correct owner, repo, issue_number from context to listComments', async () => {
+    const { github, calls } = makeGithub([]);
+    await postBundleComment({
+      github,
+      context: makeContext({ owner: 'my-org', repo: 'my-repo', number: 123 }),
+      reportPath,
+    });
+
+    assert.equal((calls.list[0] as { owner: string }).owner, 'my-org');
+    assert.equal((calls.list[0] as { repo: string }).repo, 'my-repo');
+    assert.equal((calls.list[0] as { issue_number: number }).issue_number, 123);
+  });
+
+  it('passes correct owner, repo, issue_number from context to createComment', async () => {
+    const { github, calls } = makeGithub([]);
+    await postBundleComment({
+      github,
+      context: makeContext({ owner: 'my-org', repo: 'my-repo', number: 123 }),
+      reportPath,
+    });
+
+    assert.equal((calls.create[0] as { owner: string }).owner, 'my-org');
+    assert.equal((calls.create[0] as { repo: string }).repo, 'my-repo');
+    assert.equal((calls.create[0] as { issue_number: number }).issue_number, 123);
+  });
+
+  it('passes correct owner and repo to updateComment', async () => {
+    const existing = { id: 55, body: `${marker}\nOld` };
+    const { github, calls } = makeGithub([existing]);
+    await postBundleComment({
+      github,
+      context: makeContext({ owner: 'org2', repo: 'repo2', number: 7 }),
+      reportPath,
+    });
+
+    assert.equal((calls.update[0] as { owner: string }).owner, 'org2');
+    assert.equal((calls.update[0] as { repo: string }).repo, 'repo2');
+  });
+
+  it('uses the first comment that contains the marker (not just exact match)', async () => {
+    const comments = [
+      { id: 1, body: 'Just a regular comment' },
+      { id: 2, body: `${marker}\nFirst bundle report` },
+      { id: 3, body: `${marker}\nSecond bundle report` },
+    ];
+    const { github, calls } = makeGithub(comments);
+    await postBundleComment({ github, context: makeContext(), reportPath });
+
+    assert.equal(calls.update.length, 1);
+    assert.equal((calls.update[0] as { comment_id: number }).comment_id, 2, 'Should update the first matching comment');
+  });
+
+  it('creates comment when existing comments do not contain the marker', async () => {
+    const comments = [
+      { id: 10, body: 'No marker here' },
+      { id: 11, body: 'Also no marker' },
+    ];
+    const { github, calls } = makeGithub(comments);
+    await postBundleComment({ github, context: makeContext(), reportPath });
+
+    assert.equal(calls.create.length, 1);
+    assert.equal(calls.update.length, 0);
+  });
+});
diff --git a/.github/scripts/bundle-size.mts b/.github/scripts/bundle-size.mts
new file mode 100644
index 0000000000..1d7286a3f2
--- /dev/null
+++ b/.github/scripts/bundle-size.mts
@@ -0,0 +1,490 @@
+#!/usr/bin/env node
+/* eslint-disable no-console, no-restricted-syntax, no-plusplus, no-continue */
+
+import { existsSync, readFileSync, writeFileSync } from "node:fs";
+import { dirname, join, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+import { parseArgs } from "node:util";
+import { gzipSync } from "node:zlib";
+
+// eslint-disable-next-line no-underscore-dangle
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const CORE_DIR = resolve(__dirname, "..", "..", "core");
+
+interface ChunkSizes {
+  js: number;
+  css: number;
+}
+
+interface RouteMetric {
+  js: number;
+  css: number;
+  firstLoadJs: number;
+}
+
+interface BundleReport {
+  commitSha: string;
+  updatedAt: string;
+  firstLoadJs: number;
+  totalJs: number;
+  totalCss: number;
+  shared?: { js: number; css: number };
+  routes?: Record<string, RouteMetric>;
+}
+
+interface CompareOptions {
+  threshold?: number;
+}
+
+function round1(n: number): number {
+  return Math.round(n * 10) / 10;
+}
+
+const sizeCache = new Map<string, number>();
+
+function clearSizeCache(): void {
+  sizeCache.clear();
+}
+
+function getGzipSize(filePath: string): number {
+  if (sizeCache.has(filePath)) return sizeCache.get(filePath)!;
+
+  if (!existsSync(filePath)) {
+    sizeCache.set(filePath, 0);
+
+    return 0;
+  }
+
+  const data = readFileSync(filePath);
+  const gzipped = gzipSync(data, { level: 6 });
+  const sizeKb = gzipped.length / 1024;
+
+  sizeCache.set(filePath, sizeKb);
+
+  return sizeKb;
+}
+
+function sumChunkSizes(chunks: Iterable<string>, dir: string): ChunkSizes {
+  let js = 0;
+  let css = 0;
+
+  for (const chunk of chunks) {
+    const size = getGzipSize(join(dir, chunk));
+
+    if (chunk.endsWith(".css")) {
+      css += size;
+    } else {
+      js += size;
+    }
+  }
+
+  return { js, css };
+}
+
+function parseManifestEntries(entries: Record<string, string[]>): {
+  layouts: Record<string, string[]>;
+  pages: Record<string, string[]>;
+} {
+  const layouts: Record<string, string[]> = {};
+  const pages: Record<string, string[]> = {};
+
+  for (const [route, chunks] of Object.entries(entries)) {
+    if (route.endsWith("/layout")) {
+      layouts[route] = chunks;
+    } else if (route.endsWith("/page")) {
+      pages[route] = chunks;
+    }
+  }
+
+  return { layouts, pages };
+}
+
+function computeRootLayout(
+  layoutPaths: string[],
+  layouts: Record<string, string[]>,
+  sharedChunks: Set<string>,
+  nextDir: string,
+): {
+  rootLayoutPath: string | null;
+  rootLayoutChunks: Set<string>;
+  rootLayoutJs: number;
+  rootLayoutCss: number;
+} {
+  const sorted = [...layoutPaths].sort(
+    (a, b) => a.split("/").length - b.split("/").length,
+  );
+  const rootLayoutPath = sorted[0] ?? null;
+  const rootLayoutChunks = new Set<string>();
+  let rootLayoutJs = 0;
+  let rootLayoutCss = 0;
+
+  if (rootLayoutPath) {
+    const uniqueChunks = layouts[rootLayoutPath].filter(
+      (c) => !sharedChunks.has(c),
+    );
+    const sizes = sumChunkSizes(uniqueChunks, nextDir);
+
+    rootLayoutJs = sizes.js;
+    rootLayoutCss = sizes.css;
+    uniqueChunks.forEach((c) => rootLayoutChunks.add(c));
+  }
+
+  return { rootLayoutPath, rootLayoutChunks, rootLayoutJs, rootLayoutCss };
+}
+
+function computeRouteMetrics(
+  pages: Record<string, string[]>,
+  layouts: Record<string, string[]>,
+  sharedChunks: Set<string>,
+  rootLayoutPath: string | null,
+  rootLayoutChunks: Set<string>,
+  firstLoadJs: number,
+  nextDir: string,
+): Record<string, RouteMetric> {
+  const routes: Record<string, RouteMetric> = {};
+
+  for (const [route, chunks] of Object.entries(pages)) {
+    const segments = route.split("/");
+
+    segments.pop(); // remove 'page'
+
+    const ancestorLayouts: string[] = [];
+
+    for (let i = segments.length; i >= 1; i--) {
+      const parentPath = `${segments.slice(0, i).join("/")}/layout`;
+
+      if (layouts[parentPath]) {
+        ancestorLayouts.push(parentPath);
+      }
+    }
+
+    const routeChunks = new Set<string>();
+
+    for (const chunk of chunks.filter((c) => !sharedChunks.has(c))) {
+      if (!rootLayoutChunks.has(chunk)) {
+        routeChunks.add(chunk);
+      }
+    }
+
+    for (const layoutPath of ancestorLayouts) {
+      if (layoutPath === rootLayoutPath) continue;
+
+      for (const chunk of layouts[layoutPath].filter(
+        (c) => !sharedChunks.has(c),
+      )) {
+        if (!rootLayoutChunks.has(chunk)) {
+          routeChunks.add(chunk);
+        }
+      }
+    }
+
+    const sizes = sumChunkSizes(routeChunks, nextDir);
+
+    routes[route] = {
+      js: round1(sizes.js),
+      css: round1(sizes.css),
+      firstLoadJs: round1(firstLoadJs + sizes.js + sizes.css),
+    };
+  }
+
+  return routes;
+}
+
+function compareReport(
+  baseline: BundleReport,
+  current: BundleReport,
+  { threshold = 5 }: CompareOptions = {},
+): string {
+  function hasChanged(base: number, curr: number): boolean {
+    if (round1(curr - base) === 0) return false;
+    const pct = base > 0 ? ((curr - base) / base) * 100 : null;
+    if (pct !== null && round1(pct) === 0) return false;
+    return true;
+  }
+
+  function formatDelta(base: number, curr: number): string {
+    const delta = curr - base;
+    const rounded = round1(delta);
+    const sign = delta >= 0 ? "+" : "";
+    const pct = base > 0 ? (delta / base) * 100 : 0;
+    const pctStr = base > 0 ? ` (${sign}${round1(pct)}%)` : "";
+    return `${sign}${rounded} kB${pctStr}`;
+  }
+
+  function isWarning(base: number, curr: number): boolean {
+    const delta = curr - base;
+    const pct = base > 0 ? (delta / base) * 100 : 0;
+
+    return delta > 1 && pct > threshold;
+  }
+
+  function displayRoute(route: string): string {
+    return route.replace(/^\/\[locale\]/, "");
+  }
+
+  const lines: string[] = [];
+
+  lines.push("## Bundle Size Report");
+  lines.push("");
+  lines.push(
+    `Comparing against baseline from \`${baseline.commitSha}\` (${baseline.updatedAt}).`,
+  );
+  lines.push("");
+
+  const changedMetrics = [
+    {
+      name: "First Load JS",
+      base: baseline.firstLoadJs,
+      curr: current.firstLoadJs,
+    },
+    { name: "Total JS", base: baseline.totalJs, curr: current.totalJs },
+    { name: "Total CSS", base: baseline.totalCss, curr: current.totalCss },
+  ].filter((m) => hasChanged(m.base, m.curr));
+
+  const allRoutes = new Set([
+    ...Object.keys(baseline.routes ?? {}),
+    ...Object.keys(current.routes ?? {}),
+  ]);
+
+  const sortedRoutes = [...allRoutes].sort();
+  const routeLines: string[] = [];
+
+  for (const route of sortedRoutes) {
+    const display = displayRoute(route);
+    const base = baseline.routes?.[route];
+    const curr = current.routes?.[route];
+
+    if (!base && curr) {
+      routeLines.push(
+        `| ${display} | -- | ${round1(curr.firstLoadJs)} kB | ✨ NEW | |`,
+      );
+    } else if (base && !curr) {
+      routeLines.push(
+        `| ${display} | ${round1(base.firstLoadJs)} kB | -- | REMOVED | |`,
+      );
+    } else if (base && curr && hasChanged(base.firstLoadJs, curr.firstLoadJs)) {
+      const d = formatDelta(base.firstLoadJs, curr.firstLoadJs);
+      const warn = isWarning(base.firstLoadJs, curr.firstLoadJs) ? " ⚠️" : "";
+
+      routeLines.push(
+        `| ${display} | ${round1(base.firstLoadJs)} kB | ${round1(curr.firstLoadJs)} kB | ${d} |${warn} |`,
+      );
+    }
+  }
+
+  if (changedMetrics.length === 0 && routeLines.length === 0) {
+    lines.push("No bundle size changes detected.");
+    lines.push("");
+    return lines.join("\n");
+  }
+
+  if (changedMetrics.length > 0) {
+    lines.push("| Metric | Baseline | Current | Delta | |");
+    lines.push("|:-------|:---------|:--------|:------|:-|");
+
+    for (const m of changedMetrics) {
+      const d = formatDelta(m.base, m.curr);
+      const warn = isWarning(m.base, m.curr) ? " ⚠️" : "";
+
+      lines.push(
+        `| ${m.name} | ${round1(m.base)} kB | ${round1(m.curr)} kB | ${d} |${warn} |`,
+      );
+    }
+
+    lines.push("");
+  }
+
+  lines.push("### Per-Route First Load JS");
+  lines.push("");
+
+  if (routeLines.length > 0) {
+    lines.push("| Route | Baseline | Current | Delta | |");
+    lines.push("|:------|:---------|:--------|:------|:-|");
+    lines.push(...routeLines);
+    lines.push("");
+    lines.push(
+      `> Threshold: ${threshold}% increase. Routes with ⚠️ exceed the threshold.`,
+    );
+  } else {
+    lines.push("_No route changes detected._");
+  }
+
+  lines.push("");
+
+  return lines.join("\n");
+}
+
+function generate(
+  nextDir: string,
+  values: Record<string, string | undefined>,
+): void {
+  const appManifestPath = join(nextDir, "app-build-manifest.json");
+  const buildManifestPath = join(nextDir, "build-manifest.json");
+
+  if (!existsSync(appManifestPath)) {
+    console.error(
+      "Error: .next/app-build-manifest.json not found. Run `next build` first.",
+    );
+    process.exit(1);
+  }
+
+  const appManifest = JSON.parse(readFileSync(appManifestPath, "utf-8")) as {
+    pages?: Record<string, string[]>;
+  };
+  const buildManifest = JSON.parse(
+    readFileSync(buildManifestPath, "utf-8"),
+  ) as {
+    rootMainFiles?: string[];
+    polyfillFiles?: string[];
+  };
+
+  const rootMainFiles = new Set(buildManifest.rootMainFiles ?? []);
+  const polyfillFiles = new Set(buildManifest.polyfillFiles ?? []);
+  const sharedChunks = new Set([...rootMainFiles, ...polyfillFiles]);
+
+  const entries = appManifest.pages ?? {};
+  const { layouts, pages } = parseManifestEntries(entries);
+
+  // Shared JS = sum of rootMainFiles gzipped sizes
+  const sharedSizes = sumChunkSizes(rootMainFiles, nextDir);
+  const sharedJs = round1(sharedSizes.js);
+
+  // Root layout
+  const { rootLayoutPath, rootLayoutChunks, rootLayoutJs, rootLayoutCss } =
+    computeRootLayout(Object.keys(layouts), layouts, sharedChunks, nextDir);
+
+  const sharedCss = round1(rootLayoutCss);
+  const firstLoadJs = round1(sharedJs + rootLayoutJs + rootLayoutCss);
+
+  // Total JS and CSS across all unique chunks
+  const allChunksSet = new Set<string>();
+
+  for (const chunks of Object.values(entries)) {
+    for (const chunk of chunks) {
+      allChunksSet.add(chunk);
+    }
+  }
+
+  const totals = sumChunkSizes(allChunksSet, nextDir);
+  const totalJs = round1(totals.js);
+  const totalCss = round1(totals.css);
+
+  // Per-route metrics
+  const routes = computeRouteMetrics(
+    pages,
+    layouts,
+    sharedChunks,
+    rootLayoutPath,
+    rootLayoutChunks,
+    firstLoadJs,
+    nextDir,
+  );
+
+  const result: BundleReport = {
+    commitSha: values.sha ?? "unknown",
+    updatedAt: new Date().toISOString().split("T")[0],
+    firstLoadJs,
+    shared: { js: sharedJs, css: sharedCss },
+    routes,
+    totalJs,
+    totalCss,
+  };
+
+  const output = values.output ?? null;
+  const json = `${JSON.stringify(result, null, 2)}\n`;
+
+  if (output) {
+    writeFileSync(resolve(output), json);
+    console.error(`Bundle size report written to ${output}`);
+  } else {
+    process.stdout.write(json);
+  }
+}
+
+function compare(
+  nextDir: string,
+  values: Record<string, string | undefined>,
+): void {
+  const baselinePath = resolve(
+    values.baseline ?? join(CORE_DIR, "bundle-baseline.json"),
+  );
+  const currentPath = resolve(values.current ?? "");
+  const threshold = Number(values.threshold ?? "5");
+
+  if (!currentPath || !existsSync(currentPath)) {
+    console.error("Error: --current <path> is required and must exist");
+    process.exit(1);
+  }
+
+  if (!existsSync(baselinePath)) {
+    console.error(`Error: baseline not found at ${baselinePath}`);
+    process.exit(1);
+  }
+
+  const baseline = JSON.parse(
+    readFileSync(baselinePath, "utf-8"),
+  ) as BundleReport;
+  const current = JSON.parse(
+    readFileSync(currentPath, "utf-8"),
+  ) as BundleReport;
+
+  process.stdout.write(compareReport(baseline, current, { threshold }));
+}
+
+export {
+  round1,
+  getGzipSize,
+  sumChunkSizes,
+  parseManifestEntries,
+  computeRootLayout,
+  computeRouteMetrics,
+  compareReport,
+  clearSizeCache,
+};
+
+export type { BundleReport, RouteMetric, ChunkSizes, CompareOptions };
+
+const isMain = process.argv[1] === fileURLToPath(import.meta.url);
+
+if (isMain) {
+  const { values, positionals } = parseArgs({
+    allowPositionals: true,
+    options: {
+      output: { type: "string" },
+      baseline: { type: "string" },
+      current: { type: "string" },
+      threshold: { type: "string" },
+      sha: { type: "string" },
+      dir: { type: "string" },
+    },
+  });
+
+  const NEXT_DIR = values.dir ? resolve(values.dir) : join(CORE_DIR, ".next");
+  const command = positionals.at(0);
+
+  if (command === "generate") {
+    generate(NEXT_DIR, values);
+  } else if (command === "compare") {
+    compare(NEXT_DIR, values);
+  } else {
+    console.error("Usage: bundle-size.mts <generate|compare> [options]");
+    console.error("");
+    console.error("Commands:");
+    console.error(
+      "  generate  Analyze .next/ build output and produce bundle size JSON",
+    );
+    console.error("    --output <path>  Write JSON to file instead of stdout");
+    console.error("");
+    console.error("  compare   Compare current bundle against a baseline");
+    console.error(
+      "    --baseline <path>  Path to baseline JSON (default: ./bundle-baseline.json)",
+    );
+    console.error(
+      "    --current <path>   Path to current bundle JSON (required)",
+    );
+    console.error(
+      "    --threshold <n>    Warning threshold percentage (default: 5)",
+    );
+    process.exit(1);
+  }
+}
diff --git a/.github/scripts/post-bundle-comment.js b/.github/scripts/post-bundle-comment.js
new file mode 100644
index 0000000000..43832a5a60
--- /dev/null
+++ b/.github/scripts/post-bundle-comment.js
@@ -0,0 +1,30 @@
+const fs = require('fs');
+
+module.exports = async ({ github, context, reportPath = '/tmp/bundle-report.md' }) => {
+  const marker = '<!-- bundle-size-report -->';
+  const body = marker + '\n' + fs.readFileSync(reportPath, 'utf-8');
+
+  const { data: comments } = await github.rest.issues.listComments({
+    owner: context.repo.owner,
+    repo: context.repo.repo,
+    issue_number: context.issue.number,
+  });
+
+  const existing = comments.find(c => c.body.includes(marker));
+
+  if (existing) {
+    await github.rest.issues.updateComment({
+      owner: context.repo.owner,
+      repo: context.repo.repo,
+      comment_id: existing.id,
+      body,
+    });
+  } else {
+    await github.rest.issues.createComment({
+      owner: context.repo.owner,
+      repo: context.repo.repo,
+      issue_number: context.issue.number,
+      body,
+    });
+  }
+};
diff --git a/.github/workflows/bundle-size.yml b/.github/workflows/bundle-size.yml
new file mode 100644
index 0000000000..2e640f18ad
--- /dev/null
+++ b/.github/workflows/bundle-size.yml
@@ -0,0 +1,141 @@
+name: Bundle Size
+# Reports the bundle size impact of a PR by comparing the current build against
+# a live build of the base branch (canary or integrations/makeswift).
+#
+# build-pr and build-baseline run in parallel, each uploading a JSON artifact.
+# compare downloads both artifacts, runs the comparison, and posts the PR comment.
+
+on:
+  pull_request:
+    types: [opened, synchronize]
+
+env:
+  TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
+  TURBO_TEAM: ${{ vars.TURBO_TEAM }}
+  TURBO_REMOTE_CACHE_SIGNATURE_KEY: ${{ secrets.TURBO_REMOTE_CACHE_SIGNATURE_KEY }}
+  BIGCOMMERCE_STORE_HASH: ${{ vars.BIGCOMMERCE_STORE_HASH }}
+  BIGCOMMERCE_CHANNEL_ID: ${{ vars.BIGCOMMERCE_CHANNEL_ID }}
+  BIGCOMMERCE_CLIENT_ID: ${{ secrets.BIGCOMMERCE_CLIENT_ID }}
+  BIGCOMMERCE_CLIENT_SECRET: ${{ secrets.BIGCOMMERCE_CLIENT_SECRET }}
+  BIGCOMMERCE_STOREFRONT_TOKEN: ${{ secrets.BIGCOMMERCE_STOREFRONT_TOKEN }}
+  BIGCOMMERCE_ACCESS_TOKEN: ${{ secrets.BIGCOMMERCE_ACCESS_TOKEN }}
+
+jobs:
+  build-pr:
+    name: Build & Measure PR Bundle
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          path: pr
+
+      - uses: pnpm/action-setup@v4
+        with:
+          package_json_file: pr/package.json
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version-file: pr/.nvmrc
+          cache: pnpm
+          cache-dependency-path: pr/pnpm-lock.yaml
+
+      - run: pnpm install --frozen-lockfile
+        working-directory: pr
+
+      - run: pnpm build
+        working-directory: pr
+
+      - run: node .github/scripts/bundle-size.mts generate --output /tmp/bundle-current.json --sha ${{ github.sha }}
+        working-directory: pr
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: bundle-current
+          path: /tmp/bundle-current.json
+
+  build-baseline:
+    name: Build & Measure Baseline Bundle
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          path: pr
+
+      - name: Detect baseline branch
+        id: baseline
+        run: |
+          PKG_NAME=$(node -p "require('./pr/core/package.json').name")
+          if [ "$PKG_NAME" = "@bigcommerce/catalyst-makeswift" ]; then
+            echo "branch=integrations/makeswift" >> $GITHUB_OUTPUT
+          else
+            echo "branch=canary" >> $GITHUB_OUTPUT
+          fi
+
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ steps.baseline.outputs.branch }}
+          path: baseline
+
+      - uses: pnpm/action-setup@v4
+        with:
+          package_json_file: pr/package.json
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version-file: pr/.nvmrc
+          cache: pnpm
+          cache-dependency-path: baseline/pnpm-lock.yaml
+
+      - run: pnpm install --frozen-lockfile
+        working-directory: baseline
+
+      - run: pnpm build
+        working-directory: baseline
+
+      - name: Generate baseline bundle size
+        run: |
+          SHA=$(git -C $GITHUB_WORKSPACE/baseline rev-parse --short HEAD)
+          node .github/scripts/bundle-size.mts generate --dir $GITHUB_WORKSPACE/baseline/core/.next --output /tmp/bundle-baseline.json --sha $SHA
+        working-directory: pr
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: bundle-baseline
+          path: /tmp/bundle-baseline.json
+
+  compare:
+    name: Compare Bundles & Post Report
+    needs: [build-pr, build-baseline]
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: write
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          path: pr
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version-file: pr/.nvmrc
+
+      - uses: actions/download-artifact@v4
+        with:
+          pattern: bundle-*
+          path: /tmp
+          merge-multiple: true
+
+      - run: node .github/scripts/bundle-size.mts compare --baseline /tmp/bundle-baseline.json --current /tmp/bundle-current.json > /tmp/bundle-report.md
+        working-directory: pr
+
+      - run: cat /tmp/bundle-report.md >> "$GITHUB_STEP_SUMMARY"
+
+      - uses: actions/github-script@v7
+        with:
+          script: |
+            const postComment = require('./pr/.github/scripts/post-bundle-comment.js')
+            await postComment({ github, context })
diff --git a/.github/workflows/regression-tests.yml b/.github/workflows/regression-tests.yml
index 3b4e8d4c19..7442510925 100644
--- a/.github/workflows/regression-tests.yml
+++ b/.github/workflows/regression-tests.yml
@@ -2,7 +2,7 @@ name: Regression Tests
 
 on:
   deployment_status:
-    states: ['success']
+    states: ["success"]
 
 env:
   VERCEL_PROTECTION_BYPASS: ${{ secrets.VERCEL_AUTOMATION_BYPASS_SECRET }}
@@ -18,7 +18,7 @@ jobs:
     strategy:
       matrix:
         device: [desktop, mobile]
-    concurrency: 
+    concurrency:
       group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event.deployment_status.target_url }}-${{ matrix.device }}
       cancel-in-progress: true
 
@@ -39,5 +39,5 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: unlighthouse-vercel-${{ matrix.device }}-report
-          path: './.unlighthouse/'
-          include-hidden-files: 'true'
+          path: "./.unlighthouse/"
+          include-hidden-files: "true"
diff --git a/package.json b/package.json
index c234d41183..a1d0fc6f70 100644
--- a/package.json
+++ b/package.json
@@ -18,11 +18,13 @@
     "build": "dotenv -e .env.local -- turbo run build",
     "lint": "dotenv -e .env.local -- turbo lint",
     "test": "turbo run test",
+    "test:scripts": "node --test .github/scripts/__tests__/*.test.mjs",
     "typecheck": "turbo typecheck"
   },
   "devDependencies": {
     "@changesets/changelog-github": "^0.5.1",
     "@changesets/cli": "^2.29.4",
+    "@types/node": "^22.15.30",
     "dotenv-cli": "^8.0.0",
     "prettier": "^3.6.2",
     "prettier-plugin-tailwindcss": "^0.6.12",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9c69467826..f7dd24ad67 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -14,6 +14,9 @@ importers:
       '@changesets/cli':
         specifier: ^2.29.4
         version: 2.29.4
+      '@types/node':
+        specifier: ^22.15.30
+        version: 22.15.30
       dotenv-cli:
         specifier: ^8.0.0
         version: 8.0.0
@@ -6704,20 +6707,23 @@ packages:
 
   glob@10.4.5:
     resolution: {integrity: sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==}
+    deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me
     hasBin: true
 
   glob@11.0.3:
     resolution: {integrity: sha512-2Nim7dha1KVkaiF4q6Dj+ngPPMdfvLJEOpZk/jKiUAkqKebpGAWQXAq9z1xu9HKu5lWfqw/FASuccEjyznjPaA==}
     engines: {node: 20 || >=22}
+    deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me
     hasBin: true
 
   glob@7.2.3:
     resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
-    deprecated: Glob versions prior to v9 are no longer supported
+    deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me
 
   glob@9.3.5:
     resolution: {integrity: sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q==}
     engines: {node: '>=16 || 14 >=14.17'}
+    deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me
 
   globals@11.12.0:
     resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==}
@@ -9983,6 +9989,7 @@ packages:
   whatwg-encoding@3.1.1:
     resolution: {integrity: sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==}
     engines: {node: '>=18'}
+    deprecated: Use @exodus/bytes instead for a more spec-conformant and faster implementation
 
   whatwg-fetch@3.6.20:
     resolution: {integrity: sha512-EqhiFU6daOA8kpjOWTL0olhVOF3i7OrFzSYiGsEMB8GcXS+RrzauAERX65xMeNWVqxA6HXH2m69Z9LaKKdisfg==}
@@ -11475,9 +11482,9 @@ snapshots:
       '@typescript-eslint/parser': 8.28.0(eslint@8.57.1)(typescript@5.8.3)
       eslint: 8.57.1
       eslint-config-prettier: 9.1.0(eslint@8.57.1)
-      eslint-import-resolver-typescript: 3.9.1(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1))(eslint@8.57.1)
+      eslint-import-resolver-typescript: 3.9.1(eslint-plugin-import@2.31.0)(eslint@8.57.1)
       eslint-plugin-gettext: 1.2.0
-      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint-import-resolver-typescript@3.9.1(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1)
+      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint-import-resolver-typescript@3.9.1)(eslint@8.57.1)
       eslint-plugin-jest: 28.11.0(@typescript-eslint/eslint-plugin@8.28.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1)(jest@29.7.0(@types/node@22.15.30)(ts-node@10.9.2(@swc/core@1.11.31)(@types/node@22.15.30)(typescript@5.8.3)))(typescript@5.8.3)
       eslint-plugin-jest-dom: 5.5.0(eslint@8.57.1)
       eslint-plugin-jest-formatting: 3.1.0(eslint@8.57.1)
@@ -17369,7 +17376,7 @@ snapshots:
       eslint: 8.57.1
       eslint-import-resolver-node: 0.3.9
       eslint-import-resolver-typescript: 3.9.1(eslint-plugin-import@2.31.0)(eslint@8.57.1)
-      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1)
+      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint-import-resolver-typescript@3.9.1)(eslint@8.57.1)
       eslint-plugin-jsx-a11y: 6.10.2(eslint@8.57.1)
       eslint-plugin-react: 7.37.4(eslint@8.57.1)
       eslint-plugin-react-hooks: 5.2.0(eslint@8.57.1)
@@ -17396,21 +17403,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  eslint-import-resolver-typescript@3.9.1(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1))(eslint@8.57.1):
-    dependencies:
-      '@nolyfill/is-core-module': 1.0.39
-      debug: 4.4.1
-      eslint: 8.57.1
-      get-tsconfig: 4.10.0
-      is-bun-module: 1.3.0
-      rspack-resolver: 1.2.2
-      stable-hash: 0.0.5
-      tinyglobby: 0.2.14
-    optionalDependencies:
-      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint-import-resolver-typescript@3.9.1(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1)
-    transitivePeerDependencies:
-      - supports-color
-
   eslint-import-resolver-typescript@3.9.1(eslint-plugin-import@2.31.0)(eslint@8.57.1):
     dependencies:
       '@nolyfill/is-core-module': 1.0.39
@@ -17422,7 +17414,7 @@ snapshots:
       stable-hash: 0.0.5
       tinyglobby: 0.2.14
     optionalDependencies:
-      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1)
+      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint-import-resolver-typescript@3.9.1)(eslint@8.57.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -17433,7 +17425,7 @@ snapshots:
       '@typescript-eslint/parser': 8.28.0(eslint@8.57.1)(typescript@5.8.3)
       eslint: 8.57.1
       eslint-import-resolver-node: 0.3.9
-      eslint-import-resolver-typescript: 3.9.1(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1))(eslint@8.57.1)
+      eslint-import-resolver-typescript: 3.9.1(eslint-plugin-import@2.31.0)(eslint@8.57.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -17447,36 +17439,7 @@ snapshots:
     dependencies:
       gettext-parser: 4.2.0
 
-  eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint-import-resolver-typescript@3.9.1(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1):
-    dependencies:
-      '@rtsao/scc': 1.1.0
-      array-includes: 3.1.8
-      array.prototype.findlastindex: 1.2.6
-      array.prototype.flat: 1.3.3
-      array.prototype.flatmap: 1.3.3
-      debug: 3.2.7
-      doctrine: 2.1.0
-      eslint: 8.57.1
-      eslint-import-resolver-node: 0.3.9
-      eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.9.1(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1)
-      hasown: 2.0.2
-      is-core-module: 2.16.1
-      is-glob: 4.0.3
-      minimatch: 3.1.2
-      object.fromentries: 2.0.8
-      object.groupby: 1.0.3
-      object.values: 1.2.1
-      semver: 6.3.1
-      string.prototype.trimend: 1.0.9
-      tsconfig-paths: 3.15.0
-    optionalDependencies:
-      '@typescript-eslint/parser': 8.28.0(eslint@8.57.1)(typescript@5.8.3)
-    transitivePeerDependencies:
-      - eslint-import-resolver-typescript
-      - eslint-import-resolver-webpack
-      - supports-color
-
-  eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1):
+  eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint-import-resolver-typescript@3.9.1)(eslint@8.57.1):
     dependencies:
       '@rtsao/scc': 1.1.0
       array-includes: 3.1.8

From 8b5fee6a1f396f000748d3e9bb65e44383148eb4 Mon Sep 17 00:00:00 2001
From: Jordan Arldt <jordan.arldt@bigcommerce.com>
Date: Wed, 25 Feb 2026 16:47:28 -0600
Subject: [PATCH 58/69] fix(core) - Update gift certificate amount change
 handler to include amount_display (#2901)

The form change handler only checked for inputs named 'amount', but the
select element for predefined gift certificate amounts uses the name
'amount_display'. This caused the GiftCertificateCard preview to not
update when selecting a new amount from the dropdown.
---
 .changeset/kind-gifts-update.md                              | 5 +++++
 .../sections/gift-certificate-purchase-section/index.tsx     | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/kind-gifts-update.md

diff --git a/.changeset/kind-gifts-update.md b/.changeset/kind-gifts-update.md
new file mode 100644
index 0000000000..de04c862d9
--- /dev/null
+++ b/.changeset/kind-gifts-update.md
@@ -0,0 +1,5 @@
+---
+"@bigcommerce/catalyst-core": patch
+---
+
+Fix GiftCertificateCard not updating when selecting a new amount on the gift certificate purchase form
diff --git a/core/vibes/soul/sections/gift-certificate-purchase-section/index.tsx b/core/vibes/soul/sections/gift-certificate-purchase-section/index.tsx
index 8617d55834..728c4e4e09 100644
--- a/core/vibes/soul/sections/gift-certificate-purchase-section/index.tsx
+++ b/core/vibes/soul/sections/gift-certificate-purchase-section/index.tsx
@@ -93,7 +93,7 @@ export function GiftCertificatePurchaseSection({
       return;
     }
 
-    if (e.target.name !== 'amount') {
+    if (e.target.name !== 'amount' && e.target.name !== 'amount_display') {
       return;
     }
 

From 6f788e95dbf6e21bd025a32173f5e2c8e81aee46 Mon Sep 17 00:00:00 2001
From: Matthew Volk <matt.volk@bigcommerce.com>
Date: Mon, 9 Mar 2026 13:44:08 -0500
Subject: [PATCH 59/69] refactor(core): use dynamic imports in client to avoid
 AsyncLocalStorage poisoning (#2905)

Replace static imports of next/headers, next/navigation, and next-intl/server
with dynamic import() calls inside the hooks that use them. Static imports
cause these modules to be evaluated during module graph resolution when
next.config.ts imports this file, poisoning the process-wide AsyncLocalStorage
context. Dynamic imports defer module loading to call time, after Next.js has
fully initialized.
---
 .changeset/dynamic-imports-client.md |  5 +++++
 core/client/index.ts                 | 25 ++++++++++++++++++-------
 2 files changed, 23 insertions(+), 7 deletions(-)
 create mode 100644 .changeset/dynamic-imports-client.md

diff --git a/.changeset/dynamic-imports-client.md b/.changeset/dynamic-imports-client.md
new file mode 100644
index 0000000000..041473e9ed
--- /dev/null
+++ b/.changeset/dynamic-imports-client.md
@@ -0,0 +1,5 @@
+---
+"@bigcommerce/catalyst-core": minor
+---
+
+Use dynamic imports for next/headers, next/navigation, and next-intl/server in the client module to avoid AsyncLocalStorage poisoning during next.config.ts resolution
diff --git a/core/client/index.ts b/core/client/index.ts
index d0b059b994..51020b0053 100644
--- a/core/client/index.ts
+++ b/core/client/index.ts
@@ -1,22 +1,30 @@
 import { BigCommerceAuthError, createClient } from '@bigcommerce/catalyst-client';
-import { headers } from 'next/headers';
-// eslint-disable-next-line @typescript-eslint/no-restricted-imports
-import { redirect } from 'next/navigation';
-import { getLocale as getServerLocale } from 'next-intl/server';
 
 import { getChannelIdFromLocale } from '../channels.config';
 import { backendUserAgent } from '../user-agent';
 
+// next/headers, next/navigation, and next-intl/server are imported dynamically
+// (via `import()`) rather than statically. Static imports cause these modules to
+// be evaluated during module graph resolution when next.config.ts imports this
+// file, which poisons the process-wide AsyncLocalStorage context (pnpm symlinks
+// create two separate singleton instances of next/headers). Dynamic imports
+// defer module loading to call time, after Next.js has fully initialized.
+//
+// During config resolution, the dynamic import of next-intl/server succeeds but
+// getLocale() throws ("not supported in Client Components") — the try/catch
+// below absorbs this gracefully, and getChannelId falls back to defaultChannelId.
+
 const getLocale = async () => {
   try {
-    const locale = await getServerLocale();
+    const { getLocale: getServerLocale } = await import('next-intl/server');
 
-    return locale;
+    return await getServerLocale();
   } catch {
     /**
      * Next-intl `getLocale` only works on the server, and when middleware has run.
      *
      * Instances when `getLocale` will not work:
+     * - Requests during next.config.ts resolution
      * - Requests in middlewares
      * - Requests in `generateStaticParams`
      * - Request in api routes
@@ -45,6 +53,7 @@ export const client = createClient({
     const locale = await getLocale();
 
     if (fetchOptions?.cache && ['no-store', 'no-cache'].includes(fetchOptions.cache)) {
+      const { headers } = await import('next/headers');
       const ipAddress = (await headers()).get('X-Forwarded-For');
 
       if (ipAddress) {
@@ -61,8 +70,10 @@ export const client = createClient({
       headers: requestHeaders,
     };
   },
-  onError: (error, queryType) => {
+  onError: async (error, queryType) => {
     if (error instanceof BigCommerceAuthError && queryType === 'query') {
+      const { redirect } = await import('next/navigation');
+
       redirect('/api/auth/signout');
     }
   },

From 35adccb0429f462efaa5bfb4cabf4d51b4a62522 Mon Sep 17 00:00:00 2001
From: Matthew Volk <matt.volk@bigcommerce.com>
Date: Mon, 9 Mar 2026 14:12:52 -0500
Subject: [PATCH 60/69] chore(core): upgrade Next.js to 16 (#2907)

* chore(core): bump next.js to 16 and align peer deps

Upgrade next, @next/bundle-analyzer, eslint-config-next to ^16.1.0 and
@next/eslint-plugin-next to ^16.1.0. React 19.1.5 is already compatible.

* refactor(core): replace unstable_expireTag with revalidateTag

* refactor(core): replace unstable_expirePath with revalidatePath

* chore(core): update tsconfig for next.js 16

Change jsx from "preserve" to "react-jsx" and add .next/dev/types to
the include array for generated dev types.

* fix(core): resolve Next.js 16 deprecation lint errors

Replace `NextMiddleware` with `NextProxy` and `priority` with `preload`
on Image components per Next.js 16 API changes.

* chore(core): add changeset for Next.js 16 upgrade
---
 .changeset/upgrade-nextjs-16.md               |   12 +
 .../addresses/_actions/create-address.ts      |    4 +-
 .../addresses/_actions/delete-address.ts      |    4 +-
 .../addresses/_actions/update-address.ts      |    4 +-
 .../settings/_actions/update-customer.ts      |    4 +-
 .../update-newsletter-subscription.ts         |    4 +-
 .../_actions/change-wishlist-visibility.ts    |    2 +-
 .../wishlists/_actions/delete-wishlist.ts     |    2 +-
 .../wishlists/_actions/new-wishlist.ts        |    2 +-
 .../_actions/remove-wishlist-item.ts          |    2 +-
 .../wishlists/_actions/rename-wishlist.ts     |    2 +-
 .../cart/_actions/add-shipping-cost.ts        |    2 +-
 .../cart/_actions/add-shipping-info.ts        |    4 +-
 .../cart/_actions/apply-coupon-code.ts        |    2 +-
 .../cart/_actions/apply-gift-certificate.ts   |    2 +-
 .../cart/_actions/remove-coupon-code.ts       |    2 +-
 .../cart/_actions/remove-gift-certificate.ts  |    2 +-
 .../(default)/cart/_actions/remove-item.ts    |    4 +-
 .../cart/_actions/update-quantity.ts          |    4 +-
 .../[slug]/_actions/wishlist-action.ts        |    2 +-
 .../header/_actions/switch-currency.ts        |    2 +-
 core/lib/cart/index.ts                        |    6 +-
 core/middlewares/compose-middlewares.ts       |    6 +-
 core/package.json                             |    6 +-
 core/tsconfig.json                            |    3 +-
 .../soul/primitives/product-card/index.tsx    |    2 +-
 .../product-detail/actions/revalidate-cart.ts |    2 +-
 .../product-detail/product-gallery.tsx        |    2 +-
 core/vibes/soul/sections/slideshow/index.tsx  |    2 +-
 pnpm-lock.yaml                                | 1417 ++++++++++++++---
 30 files changed, 1214 insertions(+), 300 deletions(-)
 create mode 100644 .changeset/upgrade-nextjs-16.md

diff --git a/.changeset/upgrade-nextjs-16.md b/.changeset/upgrade-nextjs-16.md
new file mode 100644
index 0000000000..b03e07327e
--- /dev/null
+++ b/.changeset/upgrade-nextjs-16.md
@@ -0,0 +1,12 @@
+---
+"@bigcommerce/catalyst-core": minor
+---
+
+Upgrade Next.js to v16 and align peer dependencies.
+
+To migrate your Catalyst storefront to Next.js 16:
+
+- Update `next` to `^16.0.0` in your `package.json` and install dependencies.
+- Replace any usage of `unstable_expireTag` with `revalidateTag` and `unstable_expirePath` with `revalidatePath` from `next/cache`.
+- Update `tsconfig.json` to use `"moduleResolution": "bundler"` and `"module": "nodenext"` as required by Next.js 16.
+- Address Next.js 16 deprecation lint errors (e.g. legacy `<img>` elements, missing `rel="noopener noreferrer"` on external links).
diff --git a/core/app/[locale]/(default)/account/addresses/_actions/create-address.ts b/core/app/[locale]/(default)/account/addresses/_actions/create-address.ts
index e6f67f0cea..6d7df51ab1 100644
--- a/core/app/[locale]/(default)/account/addresses/_actions/create-address.ts
+++ b/core/app/[locale]/(default)/account/addresses/_actions/create-address.ts
@@ -1,6 +1,6 @@
 import { BigCommerceAPIError, BigCommerceGQLError } from '@bigcommerce/catalyst-client';
 import { parseWithZod } from '@conform-to/zod';
-import { unstable_expireTag as expireTag } from 'next/cache';
+import { revalidateTag } from 'next/cache';
 import { getTranslations } from 'next-intl/server';
 import { z } from 'zod';
 
@@ -234,7 +234,7 @@ export async function createAddress(
       };
     }
 
-    expireTag(TAGS.customer);
+    revalidateTag(TAGS.customer, { expire: 0 });
 
     return {
       addresses: [
diff --git a/core/app/[locale]/(default)/account/addresses/_actions/delete-address.ts b/core/app/[locale]/(default)/account/addresses/_actions/delete-address.ts
index 4760fb1668..f1b1a1314e 100644
--- a/core/app/[locale]/(default)/account/addresses/_actions/delete-address.ts
+++ b/core/app/[locale]/(default)/account/addresses/_actions/delete-address.ts
@@ -1,6 +1,6 @@
 import { BigCommerceGQLError } from '@bigcommerce/catalyst-client';
 import { parseWithZod } from '@conform-to/zod';
-import { unstable_expireTag as expireTag } from 'next/cache';
+import { revalidateTag } from 'next/cache';
 import { getTranslations } from 'next-intl/server';
 import { z } from 'zod';
 
@@ -78,7 +78,7 @@ export async function deleteAddress(prevState: Awaited<State>, formData: FormDat
       };
     }
 
-    expireTag(TAGS.customer);
+    revalidateTag(TAGS.customer, { expire: 0 });
 
     return {
       addresses: prevState.addresses.filter(
diff --git a/core/app/[locale]/(default)/account/addresses/_actions/update-address.ts b/core/app/[locale]/(default)/account/addresses/_actions/update-address.ts
index 8547f4d7b1..0435290bae 100644
--- a/core/app/[locale]/(default)/account/addresses/_actions/update-address.ts
+++ b/core/app/[locale]/(default)/account/addresses/_actions/update-address.ts
@@ -1,6 +1,6 @@
 import { BigCommerceGQLError } from '@bigcommerce/catalyst-client';
 import { parseWithZod } from '@conform-to/zod';
-import { unstable_expireTag as expireTag } from 'next/cache';
+import { revalidateTag } from 'next/cache';
 import { getTranslations } from 'next-intl/server';
 import { z } from 'zod';
 
@@ -247,7 +247,7 @@ export async function updateAddress(
       };
     }
 
-    expireTag(TAGS.customer);
+    revalidateTag(TAGS.customer, { expire: 0 });
 
     return {
       addresses: prevState.addresses.map((address) =>
diff --git a/core/app/[locale]/(default)/account/settings/_actions/update-customer.ts b/core/app/[locale]/(default)/account/settings/_actions/update-customer.ts
index 8d678d562c..90f673bd55 100644
--- a/core/app/[locale]/(default)/account/settings/_actions/update-customer.ts
+++ b/core/app/[locale]/(default)/account/settings/_actions/update-customer.ts
@@ -2,7 +2,7 @@
 
 import { BigCommerceGQLError } from '@bigcommerce/catalyst-client';
 import { parseWithZod } from '@conform-to/zod';
-import { unstable_expireTag } from 'next/cache';
+import { revalidateTag } from 'next/cache';
 import { getTranslations } from 'next-intl/server';
 
 import { updateAccountSchema } from '@/vibes/soul/sections/account-settings/schema';
@@ -75,7 +75,7 @@ export const updateCustomer: UpdateAccountAction = async (prevState, formData) =
       };
     }
 
-    unstable_expireTag(TAGS.customer);
+    revalidateTag(TAGS.customer, { expire: 0 });
 
     return {
       account: submission.value,
diff --git a/core/app/[locale]/(default)/account/settings/_actions/update-newsletter-subscription.ts b/core/app/[locale]/(default)/account/settings/_actions/update-newsletter-subscription.ts
index b984b53601..2ecf52d63c 100644
--- a/core/app/[locale]/(default)/account/settings/_actions/update-newsletter-subscription.ts
+++ b/core/app/[locale]/(default)/account/settings/_actions/update-newsletter-subscription.ts
@@ -3,7 +3,7 @@
 import { BigCommerceGQLError } from '@bigcommerce/catalyst-client';
 import { SubmissionResult } from '@conform-to/react';
 import { parseWithZod } from '@conform-to/zod';
-import { unstable_expireTag } from 'next/cache';
+import { revalidateTag } from 'next/cache';
 import { getTranslations } from 'next-intl/server';
 import { z } from 'zod';
 
@@ -120,7 +120,7 @@ export const updateNewsletterSubscription = async (
       };
     }
 
-    unstable_expireTag(TAGS.customer);
+    revalidateTag(TAGS.customer, { expire: 0 });
 
     return {
       lastResult: submission.reply(),
diff --git a/core/app/[locale]/(default)/account/wishlists/_actions/change-wishlist-visibility.ts b/core/app/[locale]/(default)/account/wishlists/_actions/change-wishlist-visibility.ts
index 46ff104696..3f8f8547da 100644
--- a/core/app/[locale]/(default)/account/wishlists/_actions/change-wishlist-visibility.ts
+++ b/core/app/[locale]/(default)/account/wishlists/_actions/change-wishlist-visibility.ts
@@ -63,7 +63,7 @@ export async function toggleWishlistVisibility(
       };
     }
 
-    revalidateTag(TAGS.customer);
+    revalidateTag(TAGS.customer, { expire: 0 });
 
     return {
       lastResult: submission.reply(),
diff --git a/core/app/[locale]/(default)/account/wishlists/_actions/delete-wishlist.ts b/core/app/[locale]/(default)/account/wishlists/_actions/delete-wishlist.ts
index b63ec01a89..8a5498671e 100644
--- a/core/app/[locale]/(default)/account/wishlists/_actions/delete-wishlist.ts
+++ b/core/app/[locale]/(default)/account/wishlists/_actions/delete-wishlist.ts
@@ -60,7 +60,7 @@ export async function deleteWishlist(
       };
     }
 
-    revalidateTag(TAGS.customer);
+    revalidateTag(TAGS.customer, { expire: 0 });
 
     // Server toast has to be used here since the item is being deleted. When revalidateTag is called,
     // the wishlist items will update, and the element node containing the useEffect will be removed.
diff --git a/core/app/[locale]/(default)/account/wishlists/_actions/new-wishlist.ts b/core/app/[locale]/(default)/account/wishlists/_actions/new-wishlist.ts
index 1df54efdc6..dbf86eb612 100644
--- a/core/app/[locale]/(default)/account/wishlists/_actions/new-wishlist.ts
+++ b/core/app/[locale]/(default)/account/wishlists/_actions/new-wishlist.ts
@@ -58,7 +58,7 @@ export async function newWishlist(prevState: Awaited<State>, formData: FormData)
       };
     }
 
-    revalidateTag(TAGS.customer);
+    revalidateTag(TAGS.customer, { expire: 0 });
 
     return {
       lastResult: submission.reply(),
diff --git a/core/app/[locale]/(default)/account/wishlists/_actions/remove-wishlist-item.ts b/core/app/[locale]/(default)/account/wishlists/_actions/remove-wishlist-item.ts
index 5bee617081..39fcad84da 100644
--- a/core/app/[locale]/(default)/account/wishlists/_actions/remove-wishlist-item.ts
+++ b/core/app/[locale]/(default)/account/wishlists/_actions/remove-wishlist-item.ts
@@ -63,7 +63,7 @@ export async function removeWishlistItem(
       };
     }
 
-    revalidateTag(TAGS.customer);
+    revalidateTag(TAGS.customer, { expire: 0 });
 
     // Server toast has to be used here since the item is being deleted. When revalidateTag is called,
     // the wishlist items will update, and the element node containing the useEffect will be removed.
diff --git a/core/app/[locale]/(default)/account/wishlists/_actions/rename-wishlist.ts b/core/app/[locale]/(default)/account/wishlists/_actions/rename-wishlist.ts
index 0446c4e6b0..33d7c45ecd 100644
--- a/core/app/[locale]/(default)/account/wishlists/_actions/rename-wishlist.ts
+++ b/core/app/[locale]/(default)/account/wishlists/_actions/rename-wishlist.ts
@@ -60,7 +60,7 @@ export async function renameWishlist(
       };
     }
 
-    revalidateTag(TAGS.customer);
+    revalidateTag(TAGS.customer, { expire: 0 });
 
     return {
       lastResult: submission.reply(),
diff --git a/core/app/[locale]/(default)/cart/_actions/add-shipping-cost.ts b/core/app/[locale]/(default)/cart/_actions/add-shipping-cost.ts
index cd6566f838..5550033fb9 100644
--- a/core/app/[locale]/(default)/cart/_actions/add-shipping-cost.ts
+++ b/core/app/[locale]/(default)/cart/_actions/add-shipping-cost.ts
@@ -49,7 +49,7 @@ export const addShippingCost = async ({
 
   const result = response.data.checkout.selectCheckoutShippingOption?.checkout;
 
-  revalidateTag(TAGS.checkout);
+  revalidateTag(TAGS.checkout, { expire: 0 });
 
   return result;
 };
diff --git a/core/app/[locale]/(default)/cart/_actions/add-shipping-info.ts b/core/app/[locale]/(default)/cart/_actions/add-shipping-info.ts
index 87200afc1f..fd29033f17 100644
--- a/core/app/[locale]/(default)/cart/_actions/add-shipping-info.ts
+++ b/core/app/[locale]/(default)/cart/_actions/add-shipping-info.ts
@@ -68,7 +68,7 @@ export const addCheckoutShippingConsignments = async ({
     fetchOptions: { cache: 'no-store' },
   });
 
-  revalidateTag(TAGS.checkout);
+  revalidateTag(TAGS.checkout, { expire: 0 });
 
   return response.data.checkout.addCheckoutShippingConsignments?.checkout;
 };
@@ -135,7 +135,7 @@ export const updateCheckoutShippingConsignment = async ({
     fetchOptions: { cache: 'no-store' },
   });
 
-  revalidateTag(TAGS.checkout);
+  revalidateTag(TAGS.checkout, { expire: 0 });
 
   return response.data.checkout.updateCheckoutShippingConsignment?.checkout;
 };
diff --git a/core/app/[locale]/(default)/cart/_actions/apply-coupon-code.ts b/core/app/[locale]/(default)/cart/_actions/apply-coupon-code.ts
index 604e9e3d5c..ed0347eb3c 100644
--- a/core/app/[locale]/(default)/cart/_actions/apply-coupon-code.ts
+++ b/core/app/[locale]/(default)/cart/_actions/apply-coupon-code.ts
@@ -45,7 +45,7 @@ export const applyCouponCode = async ({ checkoutEntityId, couponCode }: Props) =
 
   const checkout = response.data.checkout.applyCheckoutCoupon?.checkout;
 
-  revalidateTag(TAGS.checkout);
+  revalidateTag(TAGS.checkout, { expire: 0 });
 
   return checkout;
 };
diff --git a/core/app/[locale]/(default)/cart/_actions/apply-gift-certificate.ts b/core/app/[locale]/(default)/cart/_actions/apply-gift-certificate.ts
index b2133c65c6..23113eef8b 100644
--- a/core/app/[locale]/(default)/cart/_actions/apply-gift-certificate.ts
+++ b/core/app/[locale]/(default)/cart/_actions/apply-gift-certificate.ts
@@ -47,7 +47,7 @@ export const applyGiftCertificate = async ({ checkoutEntityId, giftCertificateCo
 
   const checkout = response.data.checkout.applyCheckoutGiftCertificate?.checkout;
 
-  revalidateTag(TAGS.checkout);
+  revalidateTag(TAGS.checkout, { expire: 0 });
 
   return checkout;
 };
diff --git a/core/app/[locale]/(default)/cart/_actions/remove-coupon-code.ts b/core/app/[locale]/(default)/cart/_actions/remove-coupon-code.ts
index 9d0ef45efa..b27a956fdd 100644
--- a/core/app/[locale]/(default)/cart/_actions/remove-coupon-code.ts
+++ b/core/app/[locale]/(default)/cart/_actions/remove-coupon-code.ts
@@ -45,7 +45,7 @@ export const removeCouponCode = async ({ checkoutEntityId, couponCode }: Props)
 
   const checkout = response.data.checkout.unapplyCheckoutCoupon?.checkout;
 
-  revalidateTag(TAGS.checkout);
+  revalidateTag(TAGS.checkout, { expire: 0 });
 
   return checkout;
 };
diff --git a/core/app/[locale]/(default)/cart/_actions/remove-gift-certificate.ts b/core/app/[locale]/(default)/cart/_actions/remove-gift-certificate.ts
index 1d358ae1a9..040d97a1fc 100644
--- a/core/app/[locale]/(default)/cart/_actions/remove-gift-certificate.ts
+++ b/core/app/[locale]/(default)/cart/_actions/remove-gift-certificate.ts
@@ -47,7 +47,7 @@ export const removeGiftCertificate = async ({ checkoutEntityId, giftCertificateC
 
   const checkout = response.data.checkout.unapplyCheckoutGiftCertificate?.checkout;
 
-  revalidateTag(TAGS.checkout);
+  revalidateTag(TAGS.checkout, { expire: 0 });
 
   return checkout;
 };
diff --git a/core/app/[locale]/(default)/cart/_actions/remove-item.ts b/core/app/[locale]/(default)/cart/_actions/remove-item.ts
index f02a24dd66..fd4ee07fe8 100644
--- a/core/app/[locale]/(default)/cart/_actions/remove-item.ts
+++ b/core/app/[locale]/(default)/cart/_actions/remove-item.ts
@@ -1,6 +1,6 @@
 'use server';
 
-import { unstable_expireTag } from 'next/cache';
+import { revalidateTag } from 'next/cache';
 import { getTranslations } from 'next-intl/server';
 
 import { getSessionCustomerAccessToken } from '~/auth';
@@ -62,7 +62,7 @@ export async function removeItem({
     await clearCartId();
   }
 
-  unstable_expireTag(TAGS.cart);
+  revalidateTag(TAGS.cart, { expire: 0 });
 
   return cart;
 }
diff --git a/core/app/[locale]/(default)/cart/_actions/update-quantity.ts b/core/app/[locale]/(default)/cart/_actions/update-quantity.ts
index 6a36c88c60..ebae4492ed 100644
--- a/core/app/[locale]/(default)/cart/_actions/update-quantity.ts
+++ b/core/app/[locale]/(default)/cart/_actions/update-quantity.ts
@@ -1,6 +1,6 @@
 'use server';
 
-import { unstable_expirePath } from 'next/cache';
+import { revalidatePath } from 'next/cache';
 import { getTranslations } from 'next-intl/server';
 
 import { getSessionCustomerAccessToken } from '~/auth';
@@ -87,7 +87,7 @@ export const updateQuantity = async ({
     throw new Error(t('failedToUpdateQuantity'));
   }
 
-  unstable_expirePath('/cart');
+  revalidatePath('/cart');
 
   return cart;
 };
diff --git a/core/app/[locale]/(default)/product/[slug]/_actions/wishlist-action.ts b/core/app/[locale]/(default)/product/[slug]/_actions/wishlist-action.ts
index faa4368e3d..385ab2d74f 100644
--- a/core/app/[locale]/(default)/product/[slug]/_actions/wishlist-action.ts
+++ b/core/app/[locale]/(default)/product/[slug]/_actions/wishlist-action.ts
@@ -235,7 +235,7 @@ export async function wishlistAction(payload: FormData): Promise<void> {
       }
     }
 
-    revalidateTag(TAGS.customer);
+    revalidateTag(TAGS.customer, { expire: 0 });
   } catch (error) {
     // eslint-disable-next-line no-console
     console.error(error);
diff --git a/core/components/header/_actions/switch-currency.ts b/core/components/header/_actions/switch-currency.ts
index 93cbec4f80..b15b87d72f 100644
--- a/core/components/header/_actions/switch-currency.ts
+++ b/core/components/header/_actions/switch-currency.ts
@@ -64,7 +64,7 @@ export const switchCurrency = async (_prevState: SubmissionResult | null, payloa
   if (cartId) {
     await updateCartCurrency(cartId, submission.value.id)
       .then(() => {
-        revalidateTag(TAGS.cart);
+        revalidateTag(TAGS.cart, { expire: 0 });
       })
       .catch((error: unknown) => {
         // eslint-disable-next-line no-console
diff --git a/core/lib/cart/index.ts b/core/lib/cart/index.ts
index 8e1c74d1c7..876f9a56c0 100644
--- a/core/lib/cart/index.ts
+++ b/core/lib/cart/index.ts
@@ -1,6 +1,6 @@
 'use server';
 
-import { unstable_expireTag } from 'next/cache';
+import { revalidateTag } from 'next/cache';
 
 import { auth, getAnonymousSession, updateAnonymousSession, updateSession } from '~/auth';
 import { TAGS } from '~/client/tags';
@@ -59,7 +59,7 @@ export async function addToOrCreateCart(
       throw new MissingCartError();
     }
 
-    unstable_expireTag(TAGS.cart);
+    revalidateTag(TAGS.cart, { expire: 0 });
 
     return;
   }
@@ -72,5 +72,5 @@ export async function addToOrCreateCart(
 
   await setCartId(createResponse.data.cart.createCart.cart.entityId);
 
-  unstable_expireTag(TAGS.cart);
+  revalidateTag(TAGS.cart, { expire: 0 });
 }
diff --git a/core/middlewares/compose-middlewares.ts b/core/middlewares/compose-middlewares.ts
index ebcd8daae5..14eb0f7f65 100644
--- a/core/middlewares/compose-middlewares.ts
+++ b/core/middlewares/compose-middlewares.ts
@@ -1,11 +1,11 @@
-import { type NextMiddleware, NextResponse } from 'next/server';
+import { type NextProxy, NextResponse } from 'next/server';
 
-export type MiddlewareFactory = (middleware: NextMiddleware) => NextMiddleware;
+export type MiddlewareFactory = (middleware: NextProxy) => NextProxy;
 
 export const composeMiddlewares = (
   firstMiddlewareWrapper: MiddlewareFactory,
   ...otherMiddlewareWrappers: MiddlewareFactory[]
-): NextMiddleware => {
+): NextProxy => {
   const middlewares = otherMiddlewareWrappers.reduce(
     (accumulatedMiddlewares, nextMiddleware) => (middleware) =>
       accumulatedMiddlewares(nextMiddleware(middleware)),
diff --git a/core/package.json b/core/package.json
index 30f5af80e5..35723752a1 100644
--- a/core/package.json
+++ b/core/package.json
@@ -57,9 +57,9 @@
     "lodash.debounce": "^4.0.8",
     "lru-cache": "^11.1.0",
     "lucide-react": "^0.474.0",
-    "next": "15.5.10",
+    "next": "^16.1.6",
     "next-auth": "5.0.0-beta.30",
-    "next-intl": "^4.1.0",
+    "next-intl": "^4.6.1",
     "nuqs": "^2.4.3",
     "p-lazy": "^5.0.0",
     "react": "19.1.5",
@@ -79,7 +79,7 @@
     "@bigcommerce/eslint-config-catalyst": "workspace:^",
     "@faker-js/faker": "^9.8.0",
     "@gql.tada/cli-utils": "^1.6.3",
-    "@next/bundle-analyzer": "15.5.10",
+    "@next/bundle-analyzer": "^16.1.6",
     "@playwright/test": "^1.52.0",
     "@tailwindcss/container-queries": "^0.1.1",
     "@tailwindcss/typography": "^0.5.16",
diff --git a/core/tsconfig.json b/core/tsconfig.json
index ba1c5882a1..ebee1d5204 100644
--- a/core/tsconfig.json
+++ b/core/tsconfig.json
@@ -14,7 +14,7 @@
     "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "isolatedModules": true,
-    "jsx": "preserve",
+    "jsx": "react-jsx",
     "incremental": true,
     "plugins": [
       {
@@ -48,6 +48,7 @@
     "**/*.ts",
     "**/*.tsx",
     ".next/types/**/*.ts",
+    ".next/dev/types/**/*.ts",
     "tests/**/*"
   ],
   "exclude": ["node_modules", ".next"]
diff --git a/core/vibes/soul/primitives/product-card/index.tsx b/core/vibes/soul/primitives/product-card/index.tsx
index 5a87d88725..1571440471 100644
--- a/core/vibes/soul/primitives/product-card/index.tsx
+++ b/core/vibes/soul/primitives/product-card/index.tsx
@@ -114,7 +114,7 @@ export function ProductCard({
                 }[colorScheme],
               )}
               fill
-              priority={imagePriority}
+              preload={imagePriority}
               sizes={imageSizes}
               src={image.src}
             />
diff --git a/core/vibes/soul/sections/product-detail/actions/revalidate-cart.ts b/core/vibes/soul/sections/product-detail/actions/revalidate-cart.ts
index ea59472e80..c5e199ad1c 100644
--- a/core/vibes/soul/sections/product-detail/actions/revalidate-cart.ts
+++ b/core/vibes/soul/sections/product-detail/actions/revalidate-cart.ts
@@ -5,4 +5,4 @@ import { revalidateTag } from 'next/cache';
 import { TAGS } from '~/client/tags';
 
 // eslint-disable-next-line @typescript-eslint/require-await
-export const revalidateCart = async () => revalidateTag(TAGS.cart);
+export const revalidateCart = async () => revalidateTag(TAGS.cart, { expire: 0 });
diff --git a/core/vibes/soul/sections/product-detail/product-gallery.tsx b/core/vibes/soul/sections/product-detail/product-gallery.tsx
index be9d0db905..b11c42cea3 100644
--- a/core/vibes/soul/sections/product-detail/product-gallery.tsx
+++ b/core/vibes/soul/sections/product-detail/product-gallery.tsx
@@ -269,7 +269,7 @@ export function ProductGallery({
                   }[fit],
                 )}
                 fill
-                priority={idx === 0}
+                preload={idx === 0}
                 sizes="(min-width: 42rem) 50vw, 100vw"
                 src={image.src}
               />
diff --git a/core/vibes/soul/sections/slideshow/index.tsx b/core/vibes/soul/sections/slideshow/index.tsx
index f98a1c5fa3..708572965d 100644
--- a/core/vibes/soul/sections/slideshow/index.tsx
+++ b/core/vibes/soul/sections/slideshow/index.tsx
@@ -199,7 +199,7 @@ export function Slideshow({ slides, playOnInit = true, interval = 5000, classNam
                       placeholder={
                         image.blurDataUrl != null && image.blurDataUrl !== '' ? 'blur' : 'empty'
                       }
-                      priority={idx === 0}
+                      preload={idx === 0}
                       sizes="100vw"
                       src={image.src}
                     />
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f7dd24ad67..554b841cac 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -43,7 +43,7 @@ importers:
         version: link:../packages/client
       '@c15t/nextjs':
         specifier: ^1.8.2
-        version: 1.8.2(@opentelemetry/api@1.9.0)(@opentelemetry/instrumentation@0.208.0(@opentelemetry/api@1.9.0))(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(@upstash/redis@1.35.0)(crossws@0.3.5)(next@15.5.10(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5))(react-dom@19.1.5(react@19.1.5))(react@19.1.5)(typeorm@0.3.27(reflect-metadata@0.2.2)(ts-node@10.9.2(@swc/core@1.11.31)(@types/node@22.15.30)(typescript@5.8.3)))(ws@8.18.2)
+        version: 1.8.2(@opentelemetry/api@1.9.0)(@opentelemetry/instrumentation@0.208.0(@opentelemetry/api@1.9.0))(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(@upstash/redis@1.35.0)(crossws@0.3.5)(next@16.1.6(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5))(react-dom@19.1.5(react@19.1.5))(react@19.1.5)(typeorm@0.3.27(reflect-metadata@0.2.2)(ts-node@10.9.2(@swc/core@1.15.18)(@types/node@22.15.30)(typescript@5.8.3)))(ws@8.18.2)
       '@conform-to/react':
         specifier: ^1.6.1
         version: 1.6.1(react@19.1.5)
@@ -115,7 +115,7 @@ importers:
         version: 1.35.0
       '@vercel/analytics':
         specifier: ^1.5.0
-        version: 1.5.0(next@15.5.10(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5))(react@19.1.5)(svelte@5.1.15)(vue@3.5.16(typescript@5.8.3))
+        version: 1.5.0(next@16.1.6(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5))(react@19.1.5)(svelte@5.1.15)(vue@3.5.16(typescript@5.8.3))
       '@vercel/functions':
         specifier: ^2.2.12
         version: 2.2.12(@aws-sdk/credential-provider-web-identity@3.864.0)
@@ -124,7 +124,7 @@ importers:
         version: 2.1.0(@opentelemetry/api-logs@0.208.0)(@opentelemetry/api@1.9.0)(@opentelemetry/instrumentation@0.208.0(@opentelemetry/api@1.9.0))(@opentelemetry/resources@2.2.0(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-logs@0.208.0(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-metrics@2.0.1(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@2.2.0(@opentelemetry/api@1.9.0))
       '@vercel/speed-insights':
         specifier: ^1.2.0
-        version: 1.2.0(next@15.5.10(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5))(react@19.1.5)(svelte@5.1.15)(vue@3.5.16(typescript@5.8.3))
+        version: 1.2.0(next@16.1.6(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5))(react@19.1.5)(svelte@5.1.15)(vue@3.5.16(typescript@5.8.3))
       clsx:
         specifier: ^2.1.1
         version: 2.1.1
@@ -168,17 +168,17 @@ importers:
         specifier: ^0.474.0
         version: 0.474.0(react@19.1.5)
       next:
-        specifier: 15.5.10
-        version: 15.5.10(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+        specifier: ^16.1.6
+        version: 16.1.6(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
       next-auth:
         specifier: 5.0.0-beta.30
-        version: 5.0.0-beta.30(next@15.5.10(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5))(react@19.1.5)
+        version: 5.0.0-beta.30(next@16.1.6(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5))(react@19.1.5)
       next-intl:
-        specifier: ^4.1.0
-        version: 4.1.0(next@15.5.10(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5))(react@19.1.5)(typescript@5.8.3)
+        specifier: ^4.6.1
+        version: 4.8.3(next@16.1.6(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5))(react@19.1.5)(typescript@5.8.3)
       nuqs:
         specifier: ^2.4.3
-        version: 2.4.3(next@15.5.10(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5))(react@19.1.5)
+        version: 2.4.3(next@16.1.6(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5))(react@19.1.5)
       p-lazy:
         specifier: ^5.0.0
         version: 5.0.0
@@ -205,7 +205,7 @@ importers:
         version: 1.7.4(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
       tailwindcss-radix:
         specifier: ^3.0.5
-        version: 3.0.5(tailwindcss@3.4.17(ts-node@10.9.2(@swc/core@1.11.31)(@types/node@22.15.30)(typescript@5.8.3)))
+        version: 3.0.5(tailwindcss@3.4.17(ts-node@10.9.2(@swc/core@1.15.18)(@types/node@22.15.30)(typescript@5.8.3)))
       uuid:
         specifier: ^11.1.0
         version: 11.1.0
@@ -218,7 +218,7 @@ importers:
         version: 1.12.16(graphql@16.11.0)(typescript@5.8.3)
       '@bigcommerce/eslint-config':
         specifier: ^2.11.0
-        version: 2.11.0(@types/eslint@9.6.1)(eslint@8.57.1)(jest@29.7.0(@types/node@22.15.30)(ts-node@10.9.2(@swc/core@1.11.31)(@types/node@22.15.30)(typescript@5.8.3)))(typescript@5.8.3)
+        version: 2.11.0(@types/eslint@9.6.1)(eslint@8.57.1)(jest@29.7.0(@types/node@22.15.30)(ts-node@10.9.2(@swc/core@1.15.18)(@types/node@22.15.30)(typescript@5.8.3)))(typescript@5.8.3)
       '@bigcommerce/eslint-config-catalyst':
         specifier: workspace:^
         version: link:../packages/eslint-config-catalyst
@@ -229,17 +229,17 @@ importers:
         specifier: ^1.6.3
         version: 1.6.3(@0no-co/graphqlsp@1.12.16(graphql@16.11.0)(typescript@5.8.3))(graphql@16.11.0)(typescript@5.8.3)
       '@next/bundle-analyzer':
-        specifier: 15.5.10
-        version: 15.5.10
+        specifier: ^16.1.6
+        version: 16.1.6
       '@playwright/test':
         specifier: ^1.52.0
         version: 1.52.0
       '@tailwindcss/container-queries':
         specifier: ^0.1.1
-        version: 0.1.1(tailwindcss@3.4.17(ts-node@10.9.2(@swc/core@1.11.31)(@types/node@22.15.30)(typescript@5.8.3)))
+        version: 0.1.1(tailwindcss@3.4.17(ts-node@10.9.2(@swc/core@1.15.18)(@types/node@22.15.30)(typescript@5.8.3)))
       '@tailwindcss/typography':
         specifier: ^0.5.16
-        version: 0.5.16(tailwindcss@3.4.17(ts-node@10.9.2(@swc/core@1.11.31)(@types/node@22.15.30)(typescript@5.8.3)))
+        version: 0.5.16(tailwindcss@3.4.17(ts-node@10.9.2(@swc/core@1.15.18)(@types/node@22.15.30)(typescript@5.8.3)))
       '@types/gtag.js':
         specifier: ^0.0.20
         version: 0.0.20
@@ -290,10 +290,10 @@ importers:
         version: 0.6.12(prettier@3.6.2)
       tailwindcss:
         specifier: ^3.4.17
-        version: 3.4.17(ts-node@10.9.2(@swc/core@1.11.31)(@types/node@22.15.30)(typescript@5.8.3))
+        version: 3.4.17(ts-node@10.9.2(@swc/core@1.15.18)(@types/node@22.15.30)(typescript@5.8.3))
       tailwindcss-animate:
         specifier: 1.0.7
-        version: 1.0.7(tailwindcss@3.4.17(ts-node@10.9.2(@swc/core@1.11.31)(@types/node@22.15.30)(typescript@5.8.3)))
+        version: 1.0.7(tailwindcss@3.4.17(ts-node@10.9.2(@swc/core@1.15.18)(@types/node@22.15.30)(typescript@5.8.3)))
       typescript:
         specifier: ^5.8.3
         version: 5.8.3
@@ -333,7 +333,7 @@ importers:
     devDependencies:
       '@bigcommerce/eslint-config':
         specifier: ^2.11.0
-        version: 2.11.0(@types/eslint@9.6.1)(eslint@8.57.1)(jest@29.7.0(@types/node@22.15.30)(ts-node@10.9.2(@swc/core@1.11.31)(@types/node@22.15.30)(typescript@5.8.3)))(typescript@5.8.3)
+        version: 2.11.0(@types/eslint@9.6.1)(eslint@8.57.1)(jest@29.7.0(@types/node@22.15.30)(ts-node@10.9.2(@swc/core@1.15.18)(@types/node@22.15.30)(typescript@5.8.3)))(typescript@5.8.3)
       '@bigcommerce/eslint-config-catalyst':
         specifier: workspace:^
         version: link:../eslint-config-catalyst
@@ -363,7 +363,7 @@ importers:
         version: 3.6.2
       tsup:
         specifier: ^8.5.0
-        version: 8.5.0(@swc/core@1.11.31)(jiti@2.4.2)(postcss@8.5.6)(typescript@5.8.3)(yaml@2.8.1)
+        version: 8.5.0(@swc/core@1.15.18)(jiti@2.4.2)(postcss@8.5.6)(typescript@5.8.3)(yaml@2.8.1)
       typescript:
         specifier: ^5.8.3
         version: 5.8.3
@@ -382,7 +382,7 @@ importers:
     devDependencies:
       '@bigcommerce/eslint-config':
         specifier: ^2.11.0
-        version: 2.11.0(@types/eslint@9.6.1)(eslint@8.57.1)(jest@29.7.0(@types/node@22.15.30)(ts-node@10.9.2(@swc/core@1.11.31)(@types/node@22.15.30)(typescript@5.8.3)))(typescript@5.8.3)
+        version: 2.11.0(@types/eslint@9.6.1)(eslint@8.57.1)(jest@29.7.0(@types/node@22.15.30)(ts-node@10.9.2(@swc/core@1.15.18)(@types/node@22.15.30)(typescript@5.8.3)))(typescript@5.8.3)
       '@bigcommerce/eslint-config-catalyst':
         specifier: workspace:^
         version: link:../eslint-config-catalyst
@@ -400,7 +400,7 @@ importers:
         version: 3.6.2
       tsup:
         specifier: ^8.5.0
-        version: 8.5.0(@swc/core@1.11.31)(jiti@2.4.2)(postcss@8.5.6)(typescript@5.8.3)(yaml@2.8.1)
+        version: 8.5.0(@swc/core@1.15.18)(jiti@2.4.2)(postcss@8.5.6)(typescript@5.8.3)(yaml@2.8.1)
       typescript:
         specifier: ^5.8.3
         version: 5.8.3
@@ -533,10 +533,10 @@ importers:
     dependencies:
       '@bigcommerce/eslint-config':
         specifier: ^2.11.0
-        version: 2.11.0(@types/eslint@9.6.1)(eslint@8.57.1)(jest@29.7.0(@types/node@22.15.30)(ts-node@10.9.2(@swc/core@1.11.31)(@types/node@22.15.30)(typescript@5.8.3)))(typescript@5.8.3)
+        version: 2.11.0(@types/eslint@9.6.1)(eslint@8.57.1)(jest@29.7.0(@types/node@22.15.30)(ts-node@10.9.2(@swc/core@1.15.18)(@types/node@22.15.30)(typescript@5.8.3)))(typescript@5.8.3)
       '@next/eslint-plugin-next':
         specifier: ^15.3.3
-        version: 15.3.3
+        version: 15.5.12
       eslint-config-prettier:
         specifier: ^10.1.5
         version: 10.1.5(eslint@8.57.1)
@@ -1553,6 +1553,9 @@ packages:
   '@emnapi/runtime@1.4.5':
     resolution: {integrity: sha512-++LApOtY0pEEz1zrd9vy1/zXVaVJJ/EbAF3u0fXIzPJEDtnITsBGbbK0EkM72amhl/R5b+5xx0Y/QhcVOpuulg==}
 
+  '@emnapi/runtime@1.8.1':
+    resolution: {integrity: sha512-mehfKSMWjjNol8659Z8KxEMrdSJDDot5SXMq00dM8BN4o+CLNXQ0xH2V7EchNHV4RmbZLmmPdEaXZc5H2FXmDg==}
+
   '@emnapi/wasi-threads@1.0.1':
     resolution: {integrity: sha512-iIBu7mwkq4UQGeMEM8bLwNK962nXdhodeScX4slfQnRhEMMzvYivHhutCIk8uojvmASXXPC2WNEjwxFWk72Oqw==}
 
@@ -1872,10 +1875,20 @@ packages:
     peerDependencies:
       eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
 
+  '@eslint-community/eslint-utils@4.9.1':
+    resolution: {integrity: sha512-phrYmNiYppR7znFEdqgfWHXR6NCkZEK7hwWDHZUjit/2/U0r6XvkDl0SYnoM51Hq7FhCGdLDT6zxCCOY1hexsQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
+
   '@eslint-community/regexpp@4.12.1':
     resolution: {integrity: sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==}
     engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
 
+  '@eslint-community/regexpp@4.12.2':
+    resolution: {integrity: sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==}
+    engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
+
   '@eslint/eslintrc@2.1.4':
     resolution: {integrity: sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -1906,21 +1919,33 @@ packages:
   '@formatjs/ecma402-abstract@2.3.4':
     resolution: {integrity: sha512-qrycXDeaORzIqNhBOx0btnhpD1c+/qFIHAN9znofuMJX6QBwtbrmlpWfD4oiUUD2vJUOIYFA/gYtg2KAMGG7sA==}
 
+  '@formatjs/ecma402-abstract@3.1.1':
+    resolution: {integrity: sha512-jhZbTwda+2tcNrs4kKvxrPLPjx8QsBCLCUgrrJ/S+G9YrGHWLhAyFMMBHJBnBoOwuLHd7L14FgYudviKaxkO2Q==}
+
   '@formatjs/fast-memoize@2.2.7':
     resolution: {integrity: sha512-Yabmi9nSvyOMrlSeGGWDiH7rf3a7sIwplbvo/dlz9WCIjzIQAfy1RMf4S0X3yG724n5Ghu2GmEl5NJIV6O9sZQ==}
 
+  '@formatjs/fast-memoize@3.1.0':
+    resolution: {integrity: sha512-b5mvSWCI+XVKiz5WhnBCY3RJ4ZwfjAidU0yVlKa3d3MSgKmH1hC3tBGEAtYyN5mqL7N0G5x0BOUYyO8CEupWgg==}
+
   '@formatjs/icu-messageformat-parser@2.11.2':
     resolution: {integrity: sha512-AfiMi5NOSo2TQImsYAg8UYddsNJ/vUEv/HaNqiFjnI3ZFfWihUtD5QtuX6kHl8+H+d3qvnE/3HZrfzgdWpsLNA==}
 
+  '@formatjs/icu-messageformat-parser@3.5.1':
+    resolution: {integrity: sha512-sSDmSvmmoVQ92XqWb499KrIhv/vLisJU8ITFrx7T7NZHUmMY7EL9xgRowAosaljhqnj/5iufG24QrdzB6X3ItA==}
+
   '@formatjs/icu-skeleton-parser@1.8.14':
     resolution: {integrity: sha512-i4q4V4qslThK4Ig8SxyD76cp3+QJ3sAqr7f6q9VVfeGtxG9OhiAk3y9XF6Q41OymsKzsGQ6OQQoJNY4/lI8TcQ==}
 
-  '@formatjs/intl-localematcher@0.5.10':
-    resolution: {integrity: sha512-af3qATX+m4Rnd9+wHcjJ4w2ijq+rAVP3CCinJQvFv1kgSu1W6jypUmvleJxcewdxmutM8dmIRZFxO/IQBZmP2Q==}
+  '@formatjs/icu-skeleton-parser@2.1.1':
+    resolution: {integrity: sha512-PSFABlcNefjI6yyk8f7nyX1DC7NHmq6WaCHZLySEXBrXuLOB2f935YsnzuPjlz+ibhb9yWTdPeVX1OVcj24w2Q==}
 
   '@formatjs/intl-localematcher@0.6.1':
     resolution: {integrity: sha512-ePEgLgVCqi2BBFnTMWPfIghu6FkbZnnBVhO2sSxvLfrdFw7wCHAHiDoM2h4NRgjbaY7+B7HgOLZGkK187pZTZg==}
 
+  '@formatjs/intl-localematcher@0.8.1':
+    resolution: {integrity: sha512-xwEuwQFdtSq1UKtQnyTZWC+eHdv7Uygoa+H2k/9uzBVQjDyp9r20LNDNKedWXll7FssT3GRHvqsdJGYSUWqYFA==}
+
   '@gql.tada/cli-utils@1.6.3':
     resolution: {integrity: sha512-jFFSY8OxYeBxdKi58UzeMXG1tdm4FVjXa8WHIi66Gzu9JWtCE6mqom3a8xkmSw+mVaybFW5EN2WXf1WztJVNyQ==}
     peerDependencies:
@@ -1977,14 +2002,18 @@ packages:
     peerDependencies:
       react: ^16.13 || ^17 || ^18 || ^19
 
+  '@img/colour@1.0.0':
+    resolution: {integrity: sha512-A5P/LfWGFSl6nsckYtjw9da+19jB8hkJ6ACTGcDfEJ0aE+l2n2El7dsVM7UVHZQ9s2lmYMWlrS21YLy2IR1LUw==}
+    engines: {node: '>=18'}
+
   '@img/sharp-darwin-arm64@0.33.5':
     resolution: {integrity: sha512-UT4p+iz/2H4twwAoLCqfA9UH5pI6DggwKEGuaPy7nCVQ8ZsiY5PIcrRvD1DzuY3qYL07NtIQcWnBSY/heikIFQ==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [arm64]
     os: [darwin]
 
-  '@img/sharp-darwin-arm64@0.34.3':
-    resolution: {integrity: sha512-ryFMfvxxpQRsgZJqBd4wsttYQbCxsJksrv9Lw/v798JcQ8+w84mBWuXwl+TT0WJ/WrYOLaYpwQXi3sA9nTIaIg==}
+  '@img/sharp-darwin-arm64@0.34.5':
+    resolution: {integrity: sha512-imtQ3WMJXbMY4fxb/Ndp6HBTNVtWCUI0WdobyheGf5+ad6xX8VIDO8u2xE4qc/fr08CKG/7dDseFtn6M6g/r3w==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [arm64]
     os: [darwin]
@@ -1995,8 +2024,8 @@ packages:
     cpu: [x64]
     os: [darwin]
 
-  '@img/sharp-darwin-x64@0.34.3':
-    resolution: {integrity: sha512-yHpJYynROAj12TA6qil58hmPmAwxKKC7reUqtGLzsOHfP7/rniNGTL8tjWX6L3CTV4+5P4ypcS7Pp+7OB+8ihA==}
+  '@img/sharp-darwin-x64@0.34.5':
+    resolution: {integrity: sha512-YNEFAF/4KQ/PeW0N+r+aVVsoIY0/qxxikF2SWdp+NRkmMB7y9LBZAVqQ4yhGCm/H3H270OSykqmQMKLBhBJDEw==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [x64]
     os: [darwin]
@@ -2006,8 +2035,8 @@ packages:
     cpu: [arm64]
     os: [darwin]
 
-  '@img/sharp-libvips-darwin-arm64@1.2.0':
-    resolution: {integrity: sha512-sBZmpwmxqwlqG9ueWFXtockhsxefaV6O84BMOrhtg/YqbTaRdqDE7hxraVE3y6gVM4eExmfzW4a8el9ArLeEiQ==}
+  '@img/sharp-libvips-darwin-arm64@1.2.4':
+    resolution: {integrity: sha512-zqjjo7RatFfFoP0MkQ51jfuFZBnVE2pRiaydKJ1G/rHZvnsrHAOcQALIi9sA5co5xenQdTugCvtb1cuf78Vf4g==}
     cpu: [arm64]
     os: [darwin]
 
@@ -2016,8 +2045,8 @@ packages:
     cpu: [x64]
     os: [darwin]
 
-  '@img/sharp-libvips-darwin-x64@1.2.0':
-    resolution: {integrity: sha512-M64XVuL94OgiNHa5/m2YvEQI5q2cl9d/wk0qFTDVXcYzi43lxuiFTftMR1tOnFQovVXNZJ5TURSDK2pNe9Yzqg==}
+  '@img/sharp-libvips-darwin-x64@1.2.4':
+    resolution: {integrity: sha512-1IOd5xfVhlGwX+zXv2N93k0yMONvUlANylbJw1eTah8K/Jtpi15KC+WSiaX/nBmbm2HxRM1gZ0nSdjSsrZbGKg==}
     cpu: [x64]
     os: [darwin]
 
@@ -2026,8 +2055,8 @@ packages:
     cpu: [arm64]
     os: [linux]
 
-  '@img/sharp-libvips-linux-arm64@1.2.0':
-    resolution: {integrity: sha512-RXwd0CgG+uPRX5YYrkzKyalt2OJYRiJQ8ED/fi1tq9WQW2jsQIn0tqrlR5l5dr/rjqq6AHAxURhj2DVjyQWSOA==}
+  '@img/sharp-libvips-linux-arm64@1.2.4':
+    resolution: {integrity: sha512-excjX8DfsIcJ10x1Kzr4RcWe1edC9PquDRRPx3YVCvQv+U5p7Yin2s32ftzikXojb1PIFc/9Mt28/y+iRklkrw==}
     cpu: [arm64]
     os: [linux]
 
@@ -2036,23 +2065,28 @@ packages:
     cpu: [arm]
     os: [linux]
 
-  '@img/sharp-libvips-linux-arm@1.2.0':
-    resolution: {integrity: sha512-mWd2uWvDtL/nvIzThLq3fr2nnGfyr/XMXlq8ZJ9WMR6PXijHlC3ksp0IpuhK6bougvQrchUAfzRLnbsen0Cqvw==}
+  '@img/sharp-libvips-linux-arm@1.2.4':
+    resolution: {integrity: sha512-bFI7xcKFELdiNCVov8e44Ia4u2byA+l3XtsAj+Q8tfCwO6BQ8iDojYdvoPMqsKDkuoOo+X6HZA0s0q11ANMQ8A==}
     cpu: [arm]
     os: [linux]
 
-  '@img/sharp-libvips-linux-ppc64@1.2.0':
-    resolution: {integrity: sha512-Xod/7KaDDHkYu2phxxfeEPXfVXFKx70EAFZ0qyUdOjCcxbjqyJOEUpDe6RIyaunGxT34Anf9ue/wuWOqBW2WcQ==}
+  '@img/sharp-libvips-linux-ppc64@1.2.4':
+    resolution: {integrity: sha512-FMuvGijLDYG6lW+b/UvyilUWu5Ayu+3r2d1S8notiGCIyYU/76eig1UfMmkZ7vwgOrzKzlQbFSuQfgm7GYUPpA==}
     cpu: [ppc64]
     os: [linux]
 
+  '@img/sharp-libvips-linux-riscv64@1.2.4':
+    resolution: {integrity: sha512-oVDbcR4zUC0ce82teubSm+x6ETixtKZBh/qbREIOcI3cULzDyb18Sr/Wcyx7NRQeQzOiHTNbZFF1UwPS2scyGA==}
+    cpu: [riscv64]
+    os: [linux]
+
   '@img/sharp-libvips-linux-s390x@1.0.4':
     resolution: {integrity: sha512-u7Wz6ntiSSgGSGcjZ55im6uvTrOxSIS8/dgoVMoiGE9I6JAfU50yH5BoDlYA1tcuGS7g/QNtetJnxA6QEsCVTA==}
     cpu: [s390x]
     os: [linux]
 
-  '@img/sharp-libvips-linux-s390x@1.2.0':
-    resolution: {integrity: sha512-eMKfzDxLGT8mnmPJTNMcjfO33fLiTDsrMlUVcp6b96ETbnJmd4uvZxVJSKPQfS+odwfVaGifhsB07J1LynFehw==}
+  '@img/sharp-libvips-linux-s390x@1.2.4':
+    resolution: {integrity: sha512-qmp9VrzgPgMoGZyPvrQHqk02uyjA0/QrTO26Tqk6l4ZV0MPWIW6LTkqOIov+J1yEu7MbFQaDpwdwJKhbJvuRxQ==}
     cpu: [s390x]
     os: [linux]
 
@@ -2061,8 +2095,8 @@ packages:
     cpu: [x64]
     os: [linux]
 
-  '@img/sharp-libvips-linux-x64@1.2.0':
-    resolution: {integrity: sha512-ZW3FPWIc7K1sH9E3nxIGB3y3dZkpJlMnkk7z5tu1nSkBoCgw2nSRTFHI5pB/3CQaJM0pdzMF3paf9ckKMSE9Tg==}
+  '@img/sharp-libvips-linux-x64@1.2.4':
+    resolution: {integrity: sha512-tJxiiLsmHc9Ax1bz3oaOYBURTXGIRDODBqhveVHonrHJ9/+k89qbLl0bcJns+e4t4rvaNBxaEZsFtSfAdquPrw==}
     cpu: [x64]
     os: [linux]
 
@@ -2071,8 +2105,8 @@ packages:
     cpu: [arm64]
     os: [linux]
 
-  '@img/sharp-libvips-linuxmusl-arm64@1.2.0':
-    resolution: {integrity: sha512-UG+LqQJbf5VJ8NWJ5Z3tdIe/HXjuIdo4JeVNADXBFuG7z9zjoegpzzGIyV5zQKi4zaJjnAd2+g2nna8TZvuW9Q==}
+  '@img/sharp-libvips-linuxmusl-arm64@1.2.4':
+    resolution: {integrity: sha512-FVQHuwx1IIuNow9QAbYUzJ+En8KcVm9Lk5+uGUQJHaZmMECZmOlix9HnH7n1TRkXMS0pGxIJokIVB9SuqZGGXw==}
     cpu: [arm64]
     os: [linux]
 
@@ -2081,8 +2115,8 @@ packages:
     cpu: [x64]
     os: [linux]
 
-  '@img/sharp-libvips-linuxmusl-x64@1.2.0':
-    resolution: {integrity: sha512-SRYOLR7CXPgNze8akZwjoGBoN1ThNZoqpOgfnOxmWsklTGVfJiGJoC/Lod7aNMGA1jSsKWM1+HRX43OP6p9+6Q==}
+  '@img/sharp-libvips-linuxmusl-x64@1.2.4':
+    resolution: {integrity: sha512-+LpyBk7L44ZIXwz/VYfglaX/okxezESc6UxDSoyo2Ks6Jxc4Y7sGjpgU9s4PMgqgjj1gZCylTieNamqA1MF7Dg==}
     cpu: [x64]
     os: [linux]
 
@@ -2092,8 +2126,8 @@ packages:
     cpu: [arm64]
     os: [linux]
 
-  '@img/sharp-linux-arm64@0.34.3':
-    resolution: {integrity: sha512-QdrKe3EvQrqwkDrtuTIjI0bu6YEJHTgEeqdzI3uWJOH6G1O8Nl1iEeVYRGdj1h5I21CqxSvQp1Yv7xeU3ZewbA==}
+  '@img/sharp-linux-arm64@0.34.5':
+    resolution: {integrity: sha512-bKQzaJRY/bkPOXyKx5EVup7qkaojECG6NLYswgktOZjaXecSAeCWiZwwiFf3/Y+O1HrauiE3FVsGxFg8c24rZg==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [arm64]
     os: [linux]
@@ -2104,26 +2138,32 @@ packages:
     cpu: [arm]
     os: [linux]
 
-  '@img/sharp-linux-arm@0.34.3':
-    resolution: {integrity: sha512-oBK9l+h6KBN0i3dC8rYntLiVfW8D8wH+NPNT3O/WBHeW0OQWCjfWksLUaPidsrDKpJgXp3G3/hkmhptAW0I3+A==}
+  '@img/sharp-linux-arm@0.34.5':
+    resolution: {integrity: sha512-9dLqsvwtg1uuXBGZKsxem9595+ujv0sJ6Vi8wcTANSFpwV/GONat5eCkzQo/1O6zRIkh0m/8+5BjrRr7jDUSZw==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [arm]
     os: [linux]
 
-  '@img/sharp-linux-ppc64@0.34.3':
-    resolution: {integrity: sha512-GLtbLQMCNC5nxuImPR2+RgrviwKwVql28FWZIW1zWruy6zLgA5/x2ZXk3mxj58X/tszVF69KK0Is83V8YgWhLA==}
+  '@img/sharp-linux-ppc64@0.34.5':
+    resolution: {integrity: sha512-7zznwNaqW6YtsfrGGDA6BRkISKAAE1Jo0QdpNYXNMHu2+0dTrPflTLNkpc8l7MUP5M16ZJcUvysVWWrMefZquA==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [ppc64]
     os: [linux]
 
+  '@img/sharp-linux-riscv64@0.34.5':
+    resolution: {integrity: sha512-51gJuLPTKa7piYPaVs8GmByo7/U7/7TZOq+cnXJIHZKavIRHAP77e3N2HEl3dgiqdD/w0yUfiJnII77PuDDFdw==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [riscv64]
+    os: [linux]
+
   '@img/sharp-linux-s390x@0.33.5':
     resolution: {integrity: sha512-y/5PCd+mP4CA/sPDKl2961b+C9d+vPAveS33s6Z3zfASk2j5upL6fXVPZi7ztePZ5CuH+1kW8JtvxgbuXHRa4Q==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [s390x]
     os: [linux]
 
-  '@img/sharp-linux-s390x@0.34.3':
-    resolution: {integrity: sha512-3gahT+A6c4cdc2edhsLHmIOXMb17ltffJlxR0aC2VPZfwKoTGZec6u5GrFgdR7ciJSsHT27BD3TIuGcuRT0KmQ==}
+  '@img/sharp-linux-s390x@0.34.5':
+    resolution: {integrity: sha512-nQtCk0PdKfho3eC5MrbQoigJ2gd1CgddUMkabUj+rBevs8tZ2cULOx46E7oyX+04WGfABgIwmMC0VqieTiR4jg==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [s390x]
     os: [linux]
@@ -2134,8 +2174,8 @@ packages:
     cpu: [x64]
     os: [linux]
 
-  '@img/sharp-linux-x64@0.34.3':
-    resolution: {integrity: sha512-8kYso8d806ypnSq3/Ly0QEw90V5ZoHh10yH0HnrzOCr6DKAPI6QVHvwleqMkVQ0m+fc7EH8ah0BB0QPuWY6zJQ==}
+  '@img/sharp-linux-x64@0.34.5':
+    resolution: {integrity: sha512-MEzd8HPKxVxVenwAa+JRPwEC7QFjoPWuS5NZnBt6B3pu7EG2Ge0id1oLHZpPJdn3OQK+BQDiw9zStiHBTJQQQQ==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [x64]
     os: [linux]
@@ -2146,8 +2186,8 @@ packages:
     cpu: [arm64]
     os: [linux]
 
-  '@img/sharp-linuxmusl-arm64@0.34.3':
-    resolution: {integrity: sha512-vAjbHDlr4izEiXM1OTggpCcPg9tn4YriK5vAjowJsHwdBIdx0fYRsURkxLG2RLm9gyBq66gwtWI8Gx0/ov+JKQ==}
+  '@img/sharp-linuxmusl-arm64@0.34.5':
+    resolution: {integrity: sha512-fprJR6GtRsMt6Kyfq44IsChVZeGN97gTD331weR1ex1c1rypDEABN6Tm2xa1wE6lYb5DdEnk03NZPqA7Id21yg==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [arm64]
     os: [linux]
@@ -2158,8 +2198,8 @@ packages:
     cpu: [x64]
     os: [linux]
 
-  '@img/sharp-linuxmusl-x64@0.34.3':
-    resolution: {integrity: sha512-gCWUn9547K5bwvOn9l5XGAEjVTTRji4aPTqLzGXHvIr6bIDZKNTA34seMPgM0WmSf+RYBH411VavCejp3PkOeQ==}
+  '@img/sharp-linuxmusl-x64@0.34.5':
+    resolution: {integrity: sha512-Jg8wNT1MUzIvhBFxViqrEhWDGzqymo3sV7z7ZsaWbZNDLXRJZoRGrjulp60YYtV4wfY8VIKcWidjojlLcWrd8Q==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [x64]
     os: [linux]
@@ -2169,13 +2209,13 @@ packages:
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [wasm32]
 
-  '@img/sharp-wasm32@0.34.3':
-    resolution: {integrity: sha512-+CyRcpagHMGteySaWos8IbnXcHgfDn7pO2fiC2slJxvNq9gDipYBN42/RagzctVRKgxATmfqOSulgZv5e1RdMg==}
+  '@img/sharp-wasm32@0.34.5':
+    resolution: {integrity: sha512-OdWTEiVkY2PHwqkbBI8frFxQQFekHaSSkUIJkwzclWZe64O1X4UlUjqqqLaPbUpMOQk6FBu/HtlGXNblIs0huw==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [wasm32]
 
-  '@img/sharp-win32-arm64@0.34.3':
-    resolution: {integrity: sha512-MjnHPnbqMXNC2UgeLJtX4XqoVHHlZNd+nPt1kRPmj63wURegwBhZlApELdtxM2OIZDRv/DFtLcNhVbd1z8GYXQ==}
+  '@img/sharp-win32-arm64@0.34.5':
+    resolution: {integrity: sha512-WQ3AgWCWYSb2yt+IG8mnC6Jdk9Whs7O0gxphblsLvdhSpSTtmu69ZG1Gkb6NuvxsNACwiPV6cNSZNzt0KPsw7g==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [arm64]
     os: [win32]
@@ -2186,8 +2226,8 @@ packages:
     cpu: [ia32]
     os: [win32]
 
-  '@img/sharp-win32-ia32@0.34.3':
-    resolution: {integrity: sha512-xuCdhH44WxuXgOM714hn4amodJMZl3OEvf0GVTm0BEyMeA2to+8HEdRPShH0SLYptJY1uBw+SCFP9WVQi1Q/cw==}
+  '@img/sharp-win32-ia32@0.34.5':
+    resolution: {integrity: sha512-FV9m/7NmeCmSHDD5j4+4pNI8Cp3aW+JvLoXcTUo0IqyjSfAZJ8dIUmijx1qaJsIiU+Hosw6xM5KijAWRJCSgNg==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [ia32]
     os: [win32]
@@ -2198,8 +2238,8 @@ packages:
     cpu: [x64]
     os: [win32]
 
-  '@img/sharp-win32-x64@0.34.3':
-    resolution: {integrity: sha512-OWwz05d++TxzLEv4VnsTz5CmZ6mI6S05sfQGEMrNrQcOEERbX46332IvE7pO/EUiw7jUrrS40z/M7kPyjfl04g==}
+  '@img/sharp-win32-x64@0.34.5':
+    resolution: {integrity: sha512-+29YMsqY2/9eFEiW93eqWnuLcWcufowXewwSNIT6UwZdUUCrM3oFjMWH/Z6/TMmb4hlFenmfAVbpWeup2jryCw==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [x64]
     os: [win32]
@@ -2470,62 +2510,62 @@ packages:
   '@napi-rs/wasm-runtime@0.2.7':
     resolution: {integrity: sha512-5yximcFK5FNompXfJFoWanu5l8v1hNGqNHh9du1xETp9HWk/B/PzvchX55WYOPaIeNglG8++68AAiauBAtbnzw==}
 
-  '@next/bundle-analyzer@15.5.10':
-    resolution: {integrity: sha512-yQk9mNbVtxZhVdaPlw42vOMl8lc7Xfr05SyhzhXsyI1tWjKaG5EWe1ASXyeSG2MQic2YTLrcJrX4UBCx2xHgNQ==}
+  '@next/bundle-analyzer@16.1.6':
+    resolution: {integrity: sha512-ee2kagdTaeEWPlotgdTOqFHYcD3e2m2bbE3I9Rq2i6ABYi5OgopmtEUe8NM23viaYxLV2tDH/2nd5+qKoEr6cw==}
 
-  '@next/env@15.5.10':
-    resolution: {integrity: sha512-plg+9A/KoZcTS26fe15LHg+QxReTazrIOoKKUC3Uz4leGGeNPgLHdevVraAAOX0snnUs3WkRx3eUQpj9mreG6A==}
-
-  '@next/eslint-plugin-next@15.3.3':
-    resolution: {integrity: sha512-VKZJEiEdpKkfBmcokGjHu0vGDG+8CehGs90tBEy/IDoDDKGngeyIStt2MmE5FYNyU9BhgR7tybNWTAJY/30u+Q==}
+  '@next/env@16.1.6':
+    resolution: {integrity: sha512-N1ySLuZjnAtN3kFnwhAwPvZah8RJxKasD7x1f8shFqhncnWZn4JMfg37diLNuoHsLAlrDfM3g4mawVdtAG8XLQ==}
 
   '@next/eslint-plugin-next@15.5.10':
     resolution: {integrity: sha512-fDpxcy6G7Il4lQVVsaJD0fdC2/+SmuBGTF+edRLlsR4ZFOE3W2VyzrrGYdg/pHW8TydeAdSVM+mIzITGtZ3yWA==}
 
-  '@next/swc-darwin-arm64@15.5.7':
-    resolution: {integrity: sha512-IZwtxCEpI91HVU/rAUOOobWSZv4P2DeTtNaCdHqLcTJU4wdNXgAySvKa/qJCgR5m6KI8UsKDXtO2B31jcaw1Yw==}
+  '@next/eslint-plugin-next@15.5.12':
+    resolution: {integrity: sha512-+ZRSDFTv4aC96aMb5E41rMjysx8ApkryevnvEYZvPZO52KvkqP5rNExLUXJFr9P4s0f3oqNQR6vopCZsPWKDcQ==}
+
+  '@next/swc-darwin-arm64@16.1.6':
+    resolution: {integrity: sha512-wTzYulosJr/6nFnqGW7FrG3jfUUlEf8UjGA0/pyypJl42ExdVgC6xJgcXQ+V8QFn6niSG2Pb8+MIG1mZr2vczw==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [darwin]
 
-  '@next/swc-darwin-x64@15.5.7':
-    resolution: {integrity: sha512-UP6CaDBcqaCBuiq/gfCEJw7sPEoX1aIjZHnBWN9v9qYHQdMKvCKcAVs4OX1vIjeE+tC5EIuwDTVIoXpUes29lg==}
+  '@next/swc-darwin-x64@16.1.6':
+    resolution: {integrity: sha512-BLFPYPDO+MNJsiDWbeVzqvYd4NyuRrEYVB5k2N3JfWncuHAy2IVwMAOlVQDFjj+krkWzhY2apvmekMkfQR0CUQ==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [darwin]
 
-  '@next/swc-linux-arm64-gnu@15.5.7':
-    resolution: {integrity: sha512-NCslw3GrNIw7OgmRBxHtdWFQYhexoUCq+0oS2ccjyYLtcn1SzGzeM54jpTFonIMUjNbHmpKpziXnpxhSWLcmBA==}
+  '@next/swc-linux-arm64-gnu@16.1.6':
+    resolution: {integrity: sha512-OJYkCd5pj/QloBvoEcJ2XiMnlJkRv9idWA/j0ugSuA34gMT6f5b7vOiCQHVRpvStoZUknhl6/UxOXL4OwtdaBw==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [linux]
 
-  '@next/swc-linux-arm64-musl@15.5.7':
-    resolution: {integrity: sha512-nfymt+SE5cvtTrG9u1wdoxBr9bVB7mtKTcj0ltRn6gkP/2Nu1zM5ei8rwP9qKQP0Y//umK+TtkKgNtfboBxRrw==}
+  '@next/swc-linux-arm64-musl@16.1.6':
+    resolution: {integrity: sha512-S4J2v+8tT3NIO9u2q+S0G5KdvNDjXfAv06OhfOzNDaBn5rw84DGXWndOEB7d5/x852A20sW1M56vhC/tRVbccQ==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [linux]
 
-  '@next/swc-linux-x64-gnu@15.5.7':
-    resolution: {integrity: sha512-hvXcZvCaaEbCZcVzcY7E1uXN9xWZfFvkNHwbe/n4OkRhFWrs1J1QV+4U1BN06tXLdaS4DazEGXwgqnu/VMcmqw==}
+  '@next/swc-linux-x64-gnu@16.1.6':
+    resolution: {integrity: sha512-2eEBDkFlMMNQnkTyPBhQOAyn2qMxyG2eE7GPH2WIDGEpEILcBPI/jdSv4t6xupSP+ot/jkfrCShLAa7+ZUPcJQ==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [linux]
 
-  '@next/swc-linux-x64-musl@15.5.7':
-    resolution: {integrity: sha512-4IUO539b8FmF0odY6/SqANJdgwn1xs1GkPO5doZugwZ3ETF6JUdckk7RGmsfSf7ws8Qb2YB5It33mvNL/0acqA==}
+  '@next/swc-linux-x64-musl@16.1.6':
+    resolution: {integrity: sha512-oicJwRlyOoZXVlxmIMaTq7f8pN9QNbdes0q2FXfRsPhfCi8n8JmOZJm5oo1pwDaFbnnD421rVU409M3evFbIqg==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [linux]
 
-  '@next/swc-win32-arm64-msvc@15.5.7':
-    resolution: {integrity: sha512-CpJVTkYI3ZajQkC5vajM7/ApKJUOlm6uP4BknM3XKvJ7VXAvCqSjSLmM0LKdYzn6nBJVSjdclx8nYJSa3xlTgQ==}
+  '@next/swc-win32-arm64-msvc@16.1.6':
+    resolution: {integrity: sha512-gQmm8izDTPgs+DCWH22kcDmuUp7NyiJgEl18bcr8irXA5N2m2O+JQIr6f3ct42GOs9c0h8QF3L5SzIxcYAAXXw==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [win32]
 
-  '@next/swc-win32-x64-msvc@15.5.7':
-    resolution: {integrity: sha512-gMzgBX164I6DN+9/PGA+9dQiwmTkE4TloBNx8Kv9UiGARsr9Nba7IpcBRA1iTV9vwlYnrE3Uy6I7Aj6qLjQuqw==}
+  '@next/swc-win32-x64-msvc@16.1.6':
+    resolution: {integrity: sha512-NRfO39AIrzBnixKbjuo2YiYhB6o9d8v/ymU9m/Xk8cyVk+k7XylniXkHwjs4s70wedVffc6bQNbufk5v0xEm0A==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [win32]
@@ -4324,60 +4364,120 @@ packages:
     cpu: [arm64]
     os: [darwin]
 
+  '@swc/core-darwin-arm64@1.15.18':
+    resolution: {integrity: sha512-+mIv7uBuSaywN3C9LNuWaX1jJJ3SKfiJuE6Lr3bd+/1Iv8oMU7oLBjYMluX1UrEPzwN2qCdY6Io0yVicABoCwQ==}
+    engines: {node: '>=10'}
+    cpu: [arm64]
+    os: [darwin]
+
   '@swc/core-darwin-x64@1.11.31':
     resolution: {integrity: sha512-THSGaSwT96JwXDwuXQ6yFBbn+xDMdyw7OmBpnweAWsh5DhZmQkALEm1DgdQO3+rrE99MkmzwAfclc0UmYro/OA==}
     engines: {node: '>=10'}
     cpu: [x64]
     os: [darwin]
 
+  '@swc/core-darwin-x64@1.15.18':
+    resolution: {integrity: sha512-wZle0eaQhnzxWX5V/2kEOI6Z9vl/lTFEC6V4EWcn+5pDjhemCpQv9e/TDJ0GIoiClX8EDWRvuZwh+Z3dhL1NAg==}
+    engines: {node: '>=10'}
+    cpu: [x64]
+    os: [darwin]
+
   '@swc/core-linux-arm-gnueabihf@1.11.31':
     resolution: {integrity: sha512-laKtQFnW7KHgE57Hx32os2SNAogcuIDxYE+3DYIOmDMqD7/1DCfJe6Rln2N9WcOw6HuDbDpyQavIwZNfSAa8vQ==}
     engines: {node: '>=10'}
     cpu: [arm]
     os: [linux]
 
+  '@swc/core-linux-arm-gnueabihf@1.15.18':
+    resolution: {integrity: sha512-ao61HGXVqrJFHAcPtF4/DegmwEkVCo4HApnotLU8ognfmU8x589z7+tcf3hU+qBiU1WOXV5fQX6W9Nzs6hjxDw==}
+    engines: {node: '>=10'}
+    cpu: [arm]
+    os: [linux]
+
   '@swc/core-linux-arm64-gnu@1.11.31':
     resolution: {integrity: sha512-T+vGw9aPE1YVyRxRr1n7NAdkbgzBzrXCCJ95xAZc/0+WUwmL77Z+js0J5v1KKTRxw4FvrslNCOXzMWrSLdwPSA==}
     engines: {node: '>=10'}
     cpu: [arm64]
     os: [linux]
 
+  '@swc/core-linux-arm64-gnu@1.15.18':
+    resolution: {integrity: sha512-3xnctOBLIq3kj8PxOCgPrGjBLP/kNOddr6f5gukYt/1IZxsITQaU9TDyjeX6jG+FiCIHjCuWuffsyQDL5Ew1bg==}
+    engines: {node: '>=10'}
+    cpu: [arm64]
+    os: [linux]
+
   '@swc/core-linux-arm64-musl@1.11.31':
     resolution: {integrity: sha512-Mztp5NZkyd5MrOAG+kl+QSn0lL4Uawd4CK4J7wm97Hs44N9DHGIG5nOz7Qve1KZo407Y25lTxi/PqzPKHo61zQ==}
     engines: {node: '>=10'}
     cpu: [arm64]
     os: [linux]
 
+  '@swc/core-linux-arm64-musl@1.15.18':
+    resolution: {integrity: sha512-0a+Lix+FSSHBSBOA0XznCcHo5/1nA6oLLjcnocvzXeqtdjnPb+SvchItHI+lfeiuj1sClYPDvPMLSLyXFaiIKw==}
+    engines: {node: '>=10'}
+    cpu: [arm64]
+    os: [linux]
+
   '@swc/core-linux-x64-gnu@1.11.31':
     resolution: {integrity: sha512-DDVE0LZcXOWwOqFU1Xi7gdtiUg3FHA0vbGb3trjWCuI1ZtDZHEQYL4M3/2FjqKZtIwASrDvO96w91okZbXhvMg==}
     engines: {node: '>=10'}
     cpu: [x64]
     os: [linux]
 
+  '@swc/core-linux-x64-gnu@1.15.18':
+    resolution: {integrity: sha512-wG9J8vReUlpaHz4KOD/5UE1AUgirimU4UFT9oZmupUDEofxJKYb1mTA/DrMj0s78bkBiNI+7Fo2EgPuvOJfuAA==}
+    engines: {node: '>=10'}
+    cpu: [x64]
+    os: [linux]
+
   '@swc/core-linux-x64-musl@1.11.31':
     resolution: {integrity: sha512-mJA1MzPPRIfaBUHZi0xJQ4vwL09MNWDeFtxXb0r4Yzpf0v5Lue9ymumcBPmw/h6TKWms+Non4+TDquAsweuKSw==}
     engines: {node: '>=10'}
     cpu: [x64]
     os: [linux]
 
+  '@swc/core-linux-x64-musl@1.15.18':
+    resolution: {integrity: sha512-4nwbVvCphKzicwNWRmvD5iBaZj8JYsRGa4xOxJmOyHlMDpsvvJ2OR2cODlvWyGFH6BYL1MfIAK3qph3hp0Az6g==}
+    engines: {node: '>=10'}
+    cpu: [x64]
+    os: [linux]
+
   '@swc/core-win32-arm64-msvc@1.11.31':
     resolution: {integrity: sha512-RdtakUkNVAb/FFIMw3LnfNdlH1/ep6KgiPDRlmyUfd0WdIQ3OACmeBegEFNFTzi7gEuzy2Yxg4LWf4IUVk8/bg==}
     engines: {node: '>=10'}
     cpu: [arm64]
     os: [win32]
 
+  '@swc/core-win32-arm64-msvc@1.15.18':
+    resolution: {integrity: sha512-zk0RYO+LjiBCat2RTMHzAWaMky0cra9loH4oRrLKLLNuL+jarxKLFDA8xTZWEkCPLjUTwlRN7d28eDLLMgtUcQ==}
+    engines: {node: '>=10'}
+    cpu: [arm64]
+    os: [win32]
+
   '@swc/core-win32-ia32-msvc@1.11.31':
     resolution: {integrity: sha512-hErXdCGsg7swWdG1fossuL8542I59xV+all751mYlBoZ8kOghLSKObGQTkBbuNvc0sUKWfWg1X0iBuIhAYar+w==}
     engines: {node: '>=10'}
     cpu: [ia32]
     os: [win32]
 
+  '@swc/core-win32-ia32-msvc@1.15.18':
+    resolution: {integrity: sha512-yVuTrZ0RccD5+PEkpcLOBAuPbYBXS6rslENvIXfvJGXSdX5QGi1ehC4BjAMl5FkKLiam4kJECUI0l7Hq7T1vwg==}
+    engines: {node: '>=10'}
+    cpu: [ia32]
+    os: [win32]
+
   '@swc/core-win32-x64-msvc@1.11.31':
     resolution: {integrity: sha512-5t7SGjUBMMhF9b5j17ml/f/498kiBJNf4vZFNM421UGUEETdtjPN9jZIuQrowBkoFGJTCVL/ECM4YRtTH30u/A==}
     engines: {node: '>=10'}
     cpu: [x64]
     os: [win32]
 
+  '@swc/core-win32-x64-msvc@1.15.18':
+    resolution: {integrity: sha512-7NRmE4hmUQNCbYU3Hn9Tz57mK9Qq4c97ZS+YlamlK6qG9Fb5g/BB3gPDe0iLlJkns/sYv2VWSkm8c3NmbEGjbg==}
+    engines: {node: '>=10'}
+    cpu: [x64]
+    os: [win32]
+
   '@swc/core@1.11.31':
     resolution: {integrity: sha512-mAby9aUnKRjMEA7v8cVZS9Ah4duoRBnX7X6r5qrhTxErx+68MoY1TPrVwj/66/SWN3Bl+jijqAqoB8Qx0QE34A==}
     engines: {node: '>=10'}
@@ -4387,6 +4487,15 @@ packages:
       '@swc/helpers':
         optional: true
 
+  '@swc/core@1.15.18':
+    resolution: {integrity: sha512-z87aF9GphWp//fnkRsqvtY+inMVPgYW3zSlXH1kJFvRT5H/wiAn+G32qW5l3oEk63KSF1x3Ov0BfHCObAmT8RA==}
+    engines: {node: '>=10'}
+    peerDependencies:
+      '@swc/helpers': '>=0.5.17'
+    peerDependenciesMeta:
+      '@swc/helpers':
+        optional: true
+
   '@swc/counter@0.1.3':
     resolution: {integrity: sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==}
 
@@ -4402,6 +4511,9 @@ packages:
   '@swc/types@0.1.21':
     resolution: {integrity: sha512-2YEtj5HJVbKivud9N4bpPBAyZhj4S2Ipe5LkUG94alTpr7in/GU/EARgPAd3BwU+YOmFVJC2+kjqhGRi3r0ZpQ==}
 
+  '@swc/types@0.1.25':
+    resolution: {integrity: sha512-iAoY/qRhNH8a/hBvm3zKj9qQ4oc2+3w1unPJa2XvTK3XjeLXtzcCingVPw/9e5mn1+0yPqxcBGp9Jf0pkfMb1g==}
+
   '@szmarczak/http-timer@4.0.6':
     resolution: {integrity: sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==}
     engines: {node: '>=10'}
@@ -4613,6 +4725,14 @@ packages:
       eslint: ^8.57.0 || ^9.0.0
       typescript: '>=4.8.4 <5.9.0'
 
+  '@typescript-eslint/eslint-plugin@8.56.1':
+    resolution: {integrity: sha512-Jz9ZztpB37dNC+HU2HI28Bs9QXpzCz+y/twHOwhyrIRdbuVDxSytJNDl6z/aAKlaRIwC7y8wJdkBv7FxYGgi0A==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      '@typescript-eslint/parser': ^8.56.1
+      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
+      typescript: '>=4.8.4 <6.0.0'
+
   '@typescript-eslint/parser@8.28.0':
     resolution: {integrity: sha512-LPcw1yHD3ToaDEoljFEfQ9j2xShY367h7FZ1sq5NJT9I3yj4LHer1Xd1yRSOdYy9BpsrxU7R+eoDokChYM53lQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -4620,10 +4740,33 @@ packages:
       eslint: ^8.57.0 || ^9.0.0
       typescript: '>=4.8.4 <5.9.0'
 
+  '@typescript-eslint/parser@8.56.1':
+    resolution: {integrity: sha512-klQbnPAAiGYFyI02+znpBRLyjL4/BrBd0nyWkdC0s/6xFLkXYQ8OoRrSkqacS1ddVxf/LDyODIKbQ5TgKAf/Fg==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
+      typescript: '>=4.8.4 <6.0.0'
+
+  '@typescript-eslint/project-service@8.56.1':
+    resolution: {integrity: sha512-TAdqQTzHNNvlVFfR+hu2PDJrURiwKsUvxFn1M0h95BB8ah5jejas08jUWG4dBA68jDMI988IvtfdAI53JzEHOQ==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      typescript: '>=4.8.4 <6.0.0'
+
   '@typescript-eslint/scope-manager@8.28.0':
     resolution: {integrity: sha512-u2oITX3BJwzWCapoZ/pXw6BCOl8rJP4Ij/3wPoGvY8XwvXflOzd1kLrDUUUAIEdJSFh+ASwdTHqtan9xSg8buw==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
+  '@typescript-eslint/scope-manager@8.56.1':
+    resolution: {integrity: sha512-YAi4VDKcIZp0O4tz/haYKhmIDZFEUPOreKbfdAN3SzUDMcPhJ8QI99xQXqX+HoUVq8cs85eRKnD+rne2UAnj2w==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  '@typescript-eslint/tsconfig-utils@8.56.1':
+    resolution: {integrity: sha512-qOtCYzKEeyr3aR9f28mPJqBty7+DBqsdd63eO0yyDwc6vgThj2UjWfJIcsFeSucYydqcuudMOprZ+x1SpF3ZuQ==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      typescript: '>=4.8.4 <6.0.0'
+
   '@typescript-eslint/type-utils@8.28.0':
     resolution: {integrity: sha512-oRoXu2v0Rsy/VoOGhtWrOKDiIehvI+YNrDk5Oqj40Mwm0Yt01FC/Q7nFqg088d3yAsR1ZcZFVfPCTTFCe/KPwg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -4631,16 +4774,33 @@ packages:
       eslint: ^8.57.0 || ^9.0.0
       typescript: '>=4.8.4 <5.9.0'
 
+  '@typescript-eslint/type-utils@8.56.1':
+    resolution: {integrity: sha512-yB/7dxi7MgTtGhZdaHCemf7PuwrHMenHjmzgUW1aJpO+bBU43OycnM3Wn+DdvDO/8zzA9HlhaJ0AUGuvri4oGg==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
+      typescript: '>=4.8.4 <6.0.0'
+
   '@typescript-eslint/types@8.28.0':
     resolution: {integrity: sha512-bn4WS1bkKEjx7HqiwG2JNB3YJdC1q6Ue7GyGlwPHyt0TnVq6TtD/hiOdTZt71sq0s7UzqBFXD8t8o2e63tXgwA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
+  '@typescript-eslint/types@8.56.1':
+    resolution: {integrity: sha512-dbMkdIUkIkchgGDIv7KLUpa0Mda4IYjo4IAMJUZ+3xNoUXxMsk9YtKpTHSChRS85o+H9ftm51gsK1dZReY9CVw==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
   '@typescript-eslint/typescript-estree@8.28.0':
     resolution: {integrity: sha512-H74nHEeBGeklctAVUvmDkxB1mk+PAZ9FiOMPFncdqeRBXxk1lWSYraHw8V12b7aa6Sg9HOBNbGdSHobBPuQSuA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       typescript: '>=4.8.4 <5.9.0'
 
+  '@typescript-eslint/typescript-estree@8.56.1':
+    resolution: {integrity: sha512-qzUL1qgalIvKWAf9C1HpvBjif+Vm6rcT5wZd4VoMb9+Km3iS3Cv9DY6dMRMDtPnwRAFyAi7YXJpTIEXLvdfPxg==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      typescript: '>=4.8.4 <6.0.0'
+
   '@typescript-eslint/utils@8.28.0':
     resolution: {integrity: sha512-OELa9hbTYciYITqgurT1u/SzpQVtDLmQMFzy/N8pQE+tefOyCWT79jHsav294aTqV1q1u+VzqDGbuujvRYaeSQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -4648,10 +4808,21 @@ packages:
       eslint: ^8.57.0 || ^9.0.0
       typescript: '>=4.8.4 <5.9.0'
 
+  '@typescript-eslint/utils@8.56.1':
+    resolution: {integrity: sha512-HPAVNIME3tABJ61siYlHzSWCGtOoeP2RTIaHXFMPqjrQKCGB9OgUVdiNgH7TJS2JNIQ5qQ4RsAUDuGaGme/KOA==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
+      typescript: '>=4.8.4 <6.0.0'
+
   '@typescript-eslint/visitor-keys@8.28.0':
     resolution: {integrity: sha512-hbn8SZ8w4u2pRwgQ1GlUrPKE+t2XvcCW5tTRF7j6SMYIuYG37XuzIW44JCZPa36evi0Oy2SnM664BlIaAuQcvg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
+  '@typescript-eslint/visitor-keys@8.56.1':
+    resolution: {integrity: sha512-KiROIzYdEV85YygXw6BI/Dx4fnBlFQu6Mq4QE4MOH9fFnhohw6wX/OAvDY2/C+ut0I3RSPKenvZJIVYqJNkhEw==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
   '@ungap/structured-clone@1.2.0':
     resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==}
 
@@ -5042,6 +5213,10 @@ packages:
     resolution: {integrity: sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==}
     engines: {node: '>= 0.4'}
 
+  array-includes@3.1.9:
+    resolution: {integrity: sha512-FmeCCAenzH0KH381SPT5FZmiA/TmpndpcaShhfgEN9eCVjnFBqq3l1xrI42y8+PPLI6hypzou4GXw00WHmPBLQ==}
+    engines: {node: '>= 0.4'}
+
   array-union@2.1.0:
     resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==}
     engines: {node: '>=8'}
@@ -5150,6 +5325,10 @@ packages:
   balanced-match@1.0.2:
     resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
 
+  balanced-match@4.0.4:
+    resolution: {integrity: sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==}
+    engines: {node: 18 || 20 || >=22}
+
   bare-events@2.5.4:
     resolution: {integrity: sha512-+gFfDkR8pj4/TrWCGUGWmJIkBwuxPS5F+a5yWjOHQt2hHvNZd5YLzadjmDUtFmMM4y429bnKLa8bYBMHcYdnQA==}
 
@@ -5186,6 +5365,11 @@ packages:
   base64-js@1.5.1:
     resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
 
+  baseline-browser-mapping@2.10.0:
+    resolution: {integrity: sha512-lIyg0szRfYbiy67j9KN8IyeD7q7hcmqnJ1ddWmNt19ItGpNN64mnllmxUNFIOdOm6by97jlL6wfpTTJrmnjWAA==}
+    engines: {node: '>=6.0.0'}
+    hasBin: true
+
   basic-ftp@5.0.5:
     resolution: {integrity: sha512-4Bcg1P8xhUuqcii/S0Z9wiHIrQVPMermM1any+MX5GeGD7faD3/msQUDGLol9wOcz4/jbg/WJnGqoJF6LiBdtg==}
     engines: {node: '>=10.0.0'}
@@ -5224,6 +5408,10 @@ packages:
   brace-expansion@2.0.1:
     resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==}
 
+  brace-expansion@5.0.3:
+    resolution: {integrity: sha512-fy6KJm2RawA5RcHkLa1z/ScpBeA762UF9KmZQxwIbDtRJrgLzM10depAiEQ+CXYcoiqW1/m96OAAoke2nE9EeA==}
+    engines: {node: 18 || 20 || >=22}
+
   braces@3.0.3:
     resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
     engines: {node: '>=8'}
@@ -5708,6 +5896,9 @@ packages:
   decimal.js@10.5.0:
     resolution: {integrity: sha512-8vDa8Qxvr/+d94hSh5P3IJwI5t8/c0KsMp+g8bNw9cY2icONa5aPfvKeieW1WlG0WQYwwhJ7mjui2xtiePQSXw==}
 
+  decimal.js@10.6.0:
+    resolution: {integrity: sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg==}
+
   decompress-response@6.0.0:
     resolution: {integrity: sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==}
     engines: {node: '>=10'}
@@ -6083,6 +6274,10 @@ packages:
     resolution: {integrity: sha512-py07lI0wjxAC/DcfK1S6G7iANonniZwTISvdPzk9hzeH0IZIshbuuFxLIU96OyF89Yb9hiqWn8M/bY83KY5vzA==}
     engines: {node: '>= 0.4'}
 
+  es-abstract@1.24.1:
+    resolution: {integrity: sha512-zHXBLhP+QehSSbsS9Pt23Gg964240DPd6QCf8WpkqEXxQ7fhdZzYsocOr5u7apWonsS5EjZDmTF+/slGMyasvw==}
+    engines: {node: '>= 0.4'}
+
   es-define-property@1.0.1:
     resolution: {integrity: sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==}
     engines: {node: '>= 0.4'}
@@ -6206,6 +6401,27 @@ packages:
       eslint-import-resolver-webpack:
         optional: true
 
+  eslint-module-utils@2.12.1:
+    resolution: {integrity: sha512-L8jSWTze7K2mTg0vos/RuLRS5soomksDPoJLXIslC7c8Wmut3bx7CPpJijDcBZtxQ5lrbUdM+s0OlNbz0DCDNw==}
+    engines: {node: '>=4'}
+    peerDependencies:
+      '@typescript-eslint/parser': '*'
+      eslint: '*'
+      eslint-import-resolver-node: '*'
+      eslint-import-resolver-typescript: '*'
+      eslint-import-resolver-webpack: '*'
+    peerDependenciesMeta:
+      '@typescript-eslint/parser':
+        optional: true
+      eslint:
+        optional: true
+      eslint-import-resolver-node:
+        optional: true
+      eslint-import-resolver-typescript:
+        optional: true
+      eslint-import-resolver-webpack:
+        optional: true
+
   eslint-plugin-check-file@2.8.0:
     resolution: {integrity: sha512-FvvafMTam2WJYH9uj+FuMxQ1y+7jY3Z6P9T4j2214cH0FBxNzTcmeCiGTj1Lxp3mI6kbbgsXvmgewvf+llKYyw==}
     engines: {node: '>=18'}
@@ -6226,6 +6442,16 @@ packages:
       '@typescript-eslint/parser':
         optional: true
 
+  eslint-plugin-import@2.32.0:
+    resolution: {integrity: sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==}
+    engines: {node: '>=4'}
+    peerDependencies:
+      '@typescript-eslint/parser': '*'
+      eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9
+    peerDependenciesMeta:
+      '@typescript-eslint/parser':
+        optional: true
+
   eslint-plugin-jest-dom@5.5.0:
     resolution: {integrity: sha512-CRlXfchTr7EgC3tDI7MGHY6QjdJU5Vv2RPaeeGtkXUHnKZf04kgzMPIJUXt4qKCvYWVVIEo9ut9Oq1vgXAykEA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0, npm: '>=6', yarn: '>=1'}
@@ -6315,6 +6541,10 @@ packages:
     resolution: {integrity: sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
+  eslint-visitor-keys@5.0.1:
+    resolution: {integrity: sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==}
+    engines: {node: ^20.19.0 || ^22.13.0 || >=24}
+
   eslint@8.57.1:
     resolution: {integrity: sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -6478,6 +6708,15 @@ packages:
       picomatch:
         optional: true
 
+  fdir@6.5.0:
+    resolution: {integrity: sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==}
+    engines: {node: '>=12.0.0'}
+    peerDependencies:
+      picomatch: ^3 || ^4
+    peerDependenciesMeta:
+      picomatch:
+        optional: true
+
   fflate@0.8.2:
     resolution: {integrity: sha512-cPJU47OaAoCbg0pBvzsgpTPhmhqI5eJjh/JIu8tPj5q+T7iLvW/JAYUqmE7KOB4R1ZyEhzBaIQpQpardBF5z8A==}
 
@@ -6528,6 +6767,10 @@ packages:
     resolution: {integrity: sha512-kKaIINnFpzW6ffJNDjjyjrk21BkDx38c0xa/klsT8VzLCaMEefv4ZTacrcVR4DmgTeBra++jMDAfS/tS799YDw==}
     engines: {node: '>= 0.4'}
 
+  for-each@0.3.5:
+    resolution: {integrity: sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==}
+    engines: {node: '>= 0.4'}
+
   foreground-child@3.3.0:
     resolution: {integrity: sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==}
     engines: {node: '>=14'}
@@ -6707,23 +6950,20 @@ packages:
 
   glob@10.4.5:
     resolution: {integrity: sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==}
-    deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me
     hasBin: true
 
   glob@11.0.3:
     resolution: {integrity: sha512-2Nim7dha1KVkaiF4q6Dj+ngPPMdfvLJEOpZk/jKiUAkqKebpGAWQXAq9z1xu9HKu5lWfqw/FASuccEjyznjPaA==}
     engines: {node: 20 || >=22}
-    deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me
     hasBin: true
 
   glob@7.2.3:
     resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
-    deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me
+    deprecated: Glob versions prior to v9 are no longer supported
 
   glob@9.3.5:
     resolution: {integrity: sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q==}
     engines: {node: '>=16 || 14 >=14.17'}
-    deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me
 
   globals@11.12.0:
     resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==}
@@ -6877,6 +7117,9 @@ packages:
     resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==}
     engines: {node: '>=0.10.0'}
 
+  icu-minify@4.8.3:
+    resolution: {integrity: sha512-65Av7FLosNk7bPbmQx5z5XG2Y3T2GFppcjiXh4z1idHeVgQxlDpAmkGoYI0eFzAvrOnjpWTL5FmPDhsdfRMPEA==}
+
   ieee754@1.2.1:
     resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
 
@@ -6927,6 +7170,9 @@ packages:
   intl-messageformat@10.7.16:
     resolution: {integrity: sha512-UmdmHUmp5CIKKjSoE10la5yfU+AYJAaiYLsodbjL4lji83JNvgOQUjGaGhGrpFCb0Uh7sl7qfP1IyILa8Z40ug==}
 
+  intl-messageformat@11.1.2:
+    resolution: {integrity: sha512-ucSrQmZGAxfiBHfBRXW/k7UC8MaGFlEj4Ry1tKiDcmgwQm1y3EDl40u+4VNHYomxJQMJi9NEI3riDRlth96jKg==}
+
   ip-address@9.0.5:
     resolution: {integrity: sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==}
     engines: {node: '>= 12'}
@@ -7034,6 +7280,10 @@ packages:
     resolution: {integrity: sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==}
     engines: {node: '>= 0.4'}
 
+  is-negative-zero@2.0.3:
+    resolution: {integrity: sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==}
+    engines: {node: '>= 0.4'}
+
   is-node-process@1.2.0:
     resolution: {integrity: sha512-Vg4o6/fqPxIjtxgUH5QLJhwZ7gW5diGCVlXpuUfELC62CuxM1iHcRe51f2W1FDy04Ai4KJkagKjx3XaqyfRKXw==}
 
@@ -7129,6 +7379,10 @@ packages:
     resolution: {integrity: sha512-SXM8Nwyys6nT5WP6pltOwKytLV7FqQ4UiibxVmW+EIosHcmCqkkjViTb5SNssDlkCiEYRP1/pdWUKVvZBmsR2Q==}
     engines: {node: '>= 0.4'}
 
+  is-weakref@1.1.1:
+    resolution: {integrity: sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==}
+    engines: {node: '>= 0.4'}
+
   is-weakset@2.0.3:
     resolution: {integrity: sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ==}
     engines: {node: '>= 0.4'}
@@ -7790,6 +8044,10 @@ packages:
     resolution: {integrity: sha512-IPZ167aShDZZUMdRk66cyQAW3qr0WzbHkPdMYa8bzZhlHhO3jALbKdxcaak7W9FfT2rZNpQuUu4Od7ILEpXSaw==}
     engines: {node: 20 || >=22}
 
+  minimatch@10.2.2:
+    resolution: {integrity: sha512-+G4CpNBxa5MprY+04MbgOw1v7So6n5JY166pFi9KfYwT78fxScCeSNQSNzp6dpPSW2rONOps6Ocam1wFhCgoVw==}
+    engines: {node: 18 || 20 || >=22}
+
   minimatch@3.1.2:
     resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
 
@@ -7915,19 +8173,22 @@ packages:
       nodemailer:
         optional: true
 
-  next-intl@4.1.0:
-    resolution: {integrity: sha512-JNJRjc7sdnfUxhZmGcvzDszZ60tQKrygV/VLsgzXhnJDxQPn1cN2rVpc53adA1SvBJwPK2O6Sc6b4gYSILjCzw==}
+  next-intl-swc-plugin-extractor@4.8.3:
+    resolution: {integrity: sha512-YcaT+R9z69XkGhpDarVFWUprrCMbxgIQYPUaXoE6LGVnLjGdo8hu3gL6bramDVjNKViYY8a/pXPy7Bna0mXORg==}
+
+  next-intl@4.8.3:
+    resolution: {integrity: sha512-PvdBDWg+Leh7BR7GJUQbCDVVaBRn37GwDBWc9sv0rVQOJDQ5JU1rVzx9EEGuOGYo0DHAl70++9LQ7HxTawdL7w==}
     peerDependencies:
-      next: ^12.0.0 || ^13.0.0 || ^14.0.0 || ^15.0.0
+      next: ^12.0.0 || ^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0
       react: ^16.8.0 || ^17.0.0 || ^18.0.0 || >=19.0.0-rc <19.0.0 || ^19.0.0
       typescript: ^5.0.0
     peerDependenciesMeta:
       typescript:
         optional: true
 
-  next@15.5.10:
-    resolution: {integrity: sha512-r0X65PNwyDDyOrWNKpQoZvOatw7BcsTPRKdwEqtc9cj3wv7mbBIk9tKed4klRaFXJdX0rugpuMTHslDrAU1bBg==}
-    engines: {node: ^18.18.0 || ^19.8.0 || >= 20.0.0}
+  next@16.1.6:
+    resolution: {integrity: sha512-hkyRkcu5x/41KoqnROkfTm2pZVbKxvbZRuNvKXLRXxs3VfyO0WhY50TQS40EuKO9SW3rBj/sF3WbVwDACeMZyw==}
+    engines: {node: '>=20.9.0'}
     hasBin: true
     peerDependencies:
       '@opentelemetry/api': ^1.1.0
@@ -8052,6 +8313,10 @@ packages:
     resolution: {integrity: sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==}
     engines: {node: '>= 0.4'}
 
+  object-inspect@1.13.4:
+    resolution: {integrity: sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==}
+    engines: {node: '>= 0.4'}
+
   object-keys@1.1.1:
     resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==}
     engines: {node: '>= 0.4'}
@@ -8306,6 +8571,10 @@ packages:
     resolution: {integrity: sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==}
     engines: {node: '>=12'}
 
+  picomatch@4.0.3:
+    resolution: {integrity: sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==}
+    engines: {node: '>=12'}
+
   pify@2.3.0:
     resolution: {integrity: sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==}
     engines: {node: '>=0.10.0'}
@@ -8338,6 +8607,9 @@ packages:
     engines: {node: '>=18'}
     hasBin: true
 
+  po-parser@2.1.1:
+    resolution: {integrity: sha512-ECF4zHLbUItpUgE3OTtLKlPjeBN+fKEczj2zYjDfCGOzicNs0GK3Vg2IoAYwx7LH/XYw43fZQP6xnZ4TkNxSLQ==}
+
   possible-typed-array-names@1.0.0:
     resolution: {integrity: sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==}
     engines: {node: '>= 0.4'}
@@ -8994,6 +9266,11 @@ packages:
     engines: {node: '>=10'}
     hasBin: true
 
+  semver@7.7.4:
+    resolution: {integrity: sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==}
+    engines: {node: '>=10'}
+    hasBin: true
+
   send@1.2.0:
     resolution: {integrity: sha512-uaW0WwXKpL9blXE2o0bRhoL2EGXIrZxQ2ZQ4mgcfoBxdFmQold+qWsD2jLrfZ0trjKL6vOw0j//eAwcALFjKSw==}
     engines: {node: '>= 18'}
@@ -9032,8 +9309,8 @@ packages:
     resolution: {integrity: sha512-haPVm1EkS9pgvHrQ/F3Xy+hgcuMV0Wm9vfIBSiwZ05k+xgb0PkBQpGsAA/oWdDobNaZTH5ppvHtzCFbnSEwHVw==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
 
-  sharp@0.34.3:
-    resolution: {integrity: sha512-eX2IQ6nFohW4DbvHIOLRB3MHFpYqaqvXd3Tp5e/T/dSH83fxaNJQRvDMhASmkNTsNTVF2/OOopzRCt7xokgPfg==}
+  sharp@0.34.5:
+    resolution: {integrity: sha512-Ou9I5Ft9WNcCbXrU9cMgPBcCK8LiwLqcbywW3t4oDV37n1pzpuNLsYiAV8eODnjbtQlSDwZ2cUEeQz4E54Hltg==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
 
   shebang-command@2.0.0:
@@ -9191,6 +9468,10 @@ packages:
     resolution: {integrity: sha512-UhDfHmA92YAlNnCfhmq0VeNL5bDbiZGg7sZ2IvPsXubGkiNa9EC+tUTsjBRsYUAz87btI6/1wf4XoVvQ3uRnmQ==}
     engines: {node: '>=18'}
 
+  stop-iteration-iterator@1.1.0:
+    resolution: {integrity: sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==}
+    engines: {node: '>= 0.4'}
+
   stoppable@1.1.0:
     resolution: {integrity: sha512-KXDYZ9dszj6bzvnEMRYvxgeTHU74QBFL54XKtP3nyMuJ81CFYtABZ3bAzL2EdFUaEwJOBOgENyFj3R7oTzDyyw==}
     engines: {node: '>=4', npm: '>=6'}
@@ -9429,6 +9710,10 @@ packages:
     resolution: {integrity: sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ==}
     engines: {node: '>=12.0.0'}
 
+  tinyglobby@0.2.15:
+    resolution: {integrity: sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==}
+    engines: {node: '>=12.0.0'}
+
   tinypool@1.1.1:
     resolution: {integrity: sha512-Zba82s87IFq9A9XmjiX5uZA/ARWDrB03OHlq+Vw1fSdt0I+4/Kutwy8BP4Y/y/aORMo61FQ0vIb5j44vSo5Pkg==}
     engines: {node: ^18.0.0 || >=20.0.0}
@@ -9505,6 +9790,12 @@ packages:
     peerDependencies:
       typescript: '>=4.8.4'
 
+  ts-api-utils@2.4.0:
+    resolution: {integrity: sha512-3TaVTaAv2gTiMB35i3FiGJaRfwb3Pyn/j3m/bfAvGe8FB7CF6u+LMYqYlDh7reQf7UNvoTvdfAqHGmPGOSsPmA==}
+    engines: {node: '>=18.12'}
+    peerDependencies:
+      typescript: '>=4.8.4'
+
   ts-interface-checker@0.1.13:
     resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==}
 
@@ -9832,8 +10123,8 @@ packages:
       '@types/react':
         optional: true
 
-  use-intl@4.1.0:
-    resolution: {integrity: sha512-mQvDYFvoGn+bm/PWvlQOtluKCknsQ5a9F1Cj0hMfBjMBVTwnOqLPd6srhjvVdEQEQFVyHM1PfyifKqKYb11M9Q==}
+  use-intl@4.8.3:
+    resolution: {integrity: sha512-nLxlC/RH+le6g3amA508Itnn/00mE+J22ui21QhOWo5V9hCEC43+WtnRAITbJW0ztVZphev5X9gvOf2/Dk9PLA==}
     peerDependencies:
       react: ^17.0.0 || ^18.0.0 || >=19.0.0-rc <19.0.0 || ^19.0.0
 
@@ -9989,7 +10280,6 @@ packages:
   whatwg-encoding@3.1.1:
     resolution: {integrity: sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==}
     engines: {node: '>=18'}
-    deprecated: Use @exodus/bytes instead for a more spec-conformant and faster implementation
 
   whatwg-fetch@3.6.20:
     resolution: {integrity: sha512-EqhiFU6daOA8kpjOWTL0olhVOF3i7OrFzSYiGsEMB8GcXS+RrzauAERX65xMeNWVqxA6HXH2m69Z9LaKKdisfg==}
@@ -10027,6 +10317,10 @@ packages:
     resolution: {integrity: sha512-qEcY+KJYlWyLH9vNbsr6/5j59AXk5ni5aakf8ldzBvGde6Iz4sxZGkJyWSAueTG7QhOvNRYb1lDdFmL5Td0QKA==}
     engines: {node: '>= 0.4'}
 
+  which-typed-array@1.1.20:
+    resolution: {integrity: sha512-LYfpUkmqwl0h9A2HL09Mms427Q1RZWuOHsukfVcKRq9q95iQxdw0ix1JQrqbcDR9PH1QDwf5Qo8OZb5lksZ8Xg==}
+    engines: {node: '>= 0.4'}
+
   which@2.0.2:
     resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==}
     engines: {node: '>= 8'}
@@ -11506,6 +11800,39 @@ snapshots:
       - jest
       - supports-color
 
+  '@bigcommerce/eslint-config@2.11.0(@types/eslint@9.6.1)(eslint@8.57.1)(jest@29.7.0(@types/node@22.15.30)(ts-node@10.9.2(@swc/core@1.15.18)(@types/node@22.15.30)(typescript@5.8.3)))(typescript@5.8.3)':
+    dependencies:
+      '@bigcommerce/eslint-plugin': 1.4.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1)(typescript@5.8.3)
+      '@rushstack/eslint-patch': 1.11.0
+      '@stylistic/eslint-plugin': 2.7.2(eslint@8.57.1)(typescript@5.8.3)
+      '@typescript-eslint/eslint-plugin': 8.28.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1)(typescript@5.8.3)
+      '@typescript-eslint/parser': 8.28.0(eslint@8.57.1)(typescript@5.8.3)
+      eslint: 8.57.1
+      eslint-config-prettier: 9.1.0(eslint@8.57.1)
+      eslint-import-resolver-typescript: 3.9.1(eslint-plugin-import@2.31.0)(eslint@8.57.1)
+      eslint-plugin-gettext: 1.2.0
+      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint-import-resolver-typescript@3.9.1)(eslint@8.57.1)
+      eslint-plugin-jest: 28.11.0(@typescript-eslint/eslint-plugin@8.28.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1)(jest@29.7.0(@types/node@22.15.30)(ts-node@10.9.2(@swc/core@1.15.18)(@types/node@22.15.30)(typescript@5.8.3)))(typescript@5.8.3)
+      eslint-plugin-jest-dom: 5.5.0(eslint@8.57.1)
+      eslint-plugin-jest-formatting: 3.1.0(eslint@8.57.1)
+      eslint-plugin-jsdoc: 50.6.9(eslint@8.57.1)
+      eslint-plugin-jsx-a11y: 6.10.2(eslint@8.57.1)
+      eslint-plugin-prettier: 5.4.1(@types/eslint@9.6.1)(eslint-config-prettier@9.1.0(eslint@8.57.1))(eslint@8.57.1)(prettier@3.6.2)
+      eslint-plugin-react: 7.37.4(eslint@8.57.1)
+      eslint-plugin-react-hooks: 5.2.0(eslint@8.57.1)
+      eslint-plugin-switch-case: 1.1.2
+      eslint-plugin-testing-library: 7.1.1(eslint@8.57.1)(typescript@5.8.3)
+      prettier: 3.6.2
+    optionalDependencies:
+      typescript: 5.8.3
+    transitivePeerDependencies:
+      - '@testing-library/dom'
+      - '@types/eslint'
+      - eslint-import-resolver-webpack
+      - eslint-plugin-import-x
+      - jest
+      - supports-color
+
   '@bigcommerce/eslint-plugin@1.4.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1)(typescript@5.8.3)':
     dependencies:
       '@typescript-eslint/parser': 8.28.0(eslint@8.57.1)(typescript@5.8.3)
@@ -11526,7 +11853,7 @@ snapshots:
       '@types/tough-cookie': 4.0.5
       tough-cookie: 4.1.4
 
-  '@c15t/backend@1.8.0(@opentelemetry/instrumentation@0.208.0(@opentelemetry/api@1.9.0))(@upstash/redis@1.35.0)(crossws@0.3.5)(typeorm@0.3.27(reflect-metadata@0.2.2)(ts-node@10.9.2(@swc/core@1.11.31)(@types/node@22.15.30)(typescript@5.8.3)))(ws@8.18.2)':
+  '@c15t/backend@1.8.0(@opentelemetry/instrumentation@0.208.0(@opentelemetry/api@1.9.0))(@upstash/redis@1.35.0)(crossws@0.3.5)(typeorm@0.3.27(reflect-metadata@0.2.2)(ts-node@10.9.2(@swc/core@1.15.18)(@types/node@22.15.30)(typescript@5.8.3)))(ws@8.18.2)':
     dependencies:
       '@c15t/logger': 1.0.1
       '@c15t/translations': 1.8.0
@@ -11542,7 +11869,7 @@ snapshots:
       base-x: 5.0.1
       defu: 6.1.4
       drizzle-orm: 0.44.7(@opentelemetry/api@1.9.0)(@upstash/redis@1.35.0)(kysely@0.27.6)
-      fumadb: 0.1.1(drizzle-orm@0.44.7(@opentelemetry/api@1.9.0)(@upstash/redis@1.35.0)(kysely@0.27.6))(typeorm@0.3.27(reflect-metadata@0.2.2)(ts-node@10.9.2(@swc/core@1.11.31)(@types/node@22.15.30)(typescript@5.8.3)))
+      fumadb: 0.1.1(drizzle-orm@0.44.7(@opentelemetry/api@1.9.0)(@upstash/redis@1.35.0)(kysely@0.27.6))(typeorm@0.3.27(reflect-metadata@0.2.2)(ts-node@10.9.2(@swc/core@1.15.18)(@types/node@22.15.30)(typescript@5.8.3)))
       kysely: 0.27.6
       neverthrow: 8.2.0
       superjson: 2.2.2
@@ -11589,11 +11916,11 @@ snapshots:
       neverthrow: 8.2.0
       picocolors: 1.1.1
 
-  '@c15t/nextjs@1.8.2(@opentelemetry/api@1.9.0)(@opentelemetry/instrumentation@0.208.0(@opentelemetry/api@1.9.0))(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(@upstash/redis@1.35.0)(crossws@0.3.5)(next@15.5.10(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5))(react-dom@19.1.5(react@19.1.5))(react@19.1.5)(typeorm@0.3.27(reflect-metadata@0.2.2)(ts-node@10.9.2(@swc/core@1.11.31)(@types/node@22.15.30)(typescript@5.8.3)))(ws@8.18.2)':
+  '@c15t/nextjs@1.8.2(@opentelemetry/api@1.9.0)(@opentelemetry/instrumentation@0.208.0(@opentelemetry/api@1.9.0))(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(@upstash/redis@1.35.0)(crossws@0.3.5)(next@16.1.6(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5))(react-dom@19.1.5(react@19.1.5))(react@19.1.5)(typeorm@0.3.27(reflect-metadata@0.2.2)(ts-node@10.9.2(@swc/core@1.15.18)(@types/node@22.15.30)(typescript@5.8.3)))(ws@8.18.2)':
     dependencies:
-      '@c15t/react': 1.8.2(@opentelemetry/api@1.9.0)(@opentelemetry/instrumentation@0.208.0(@opentelemetry/api@1.9.0))(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(@upstash/redis@1.35.0)(crossws@0.3.5)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)(typeorm@0.3.27(reflect-metadata@0.2.2)(ts-node@10.9.2(@swc/core@1.11.31)(@types/node@22.15.30)(typescript@5.8.3)))(ws@8.18.2)
+      '@c15t/react': 1.8.2(@opentelemetry/api@1.9.0)(@opentelemetry/instrumentation@0.208.0(@opentelemetry/api@1.9.0))(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(@upstash/redis@1.35.0)(crossws@0.3.5)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)(typeorm@0.3.27(reflect-metadata@0.2.2)(ts-node@10.9.2(@swc/core@1.15.18)(@types/node@22.15.30)(typescript@5.8.3)))(ws@8.18.2)
       '@c15t/translations': 1.8.0
-      next: 15.5.10(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      next: 16.1.6(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
       react: 19.1.5
       react-dom: 19.1.5(react@19.1.5)
     transitivePeerDependencies:
@@ -11637,12 +11964,12 @@ snapshots:
       - use-sync-external-store
       - ws
 
-  '@c15t/react@1.8.2(@opentelemetry/api@1.9.0)(@opentelemetry/instrumentation@0.208.0(@opentelemetry/api@1.9.0))(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(@upstash/redis@1.35.0)(crossws@0.3.5)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)(typeorm@0.3.27(reflect-metadata@0.2.2)(ts-node@10.9.2(@swc/core@1.11.31)(@types/node@22.15.30)(typescript@5.8.3)))(ws@8.18.2)':
+  '@c15t/react@1.8.2(@opentelemetry/api@1.9.0)(@opentelemetry/instrumentation@0.208.0(@opentelemetry/api@1.9.0))(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(@upstash/redis@1.35.0)(crossws@0.3.5)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)(typeorm@0.3.27(reflect-metadata@0.2.2)(ts-node@10.9.2(@swc/core@1.15.18)(@types/node@22.15.30)(typescript@5.8.3)))(ws@8.18.2)':
     dependencies:
       '@radix-ui/react-accordion': 1.2.4(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
       '@radix-ui/react-slot': 1.2.0(@types/react@19.2.7)(react@19.1.5)
       '@radix-ui/react-switch': 1.1.4(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
-      c15t: 1.8.2(@opentelemetry/api@1.9.0)(@opentelemetry/instrumentation@0.208.0(@opentelemetry/api@1.9.0))(@types/react@19.2.7)(@upstash/redis@1.35.0)(crossws@0.3.5)(react@19.1.5)(typeorm@0.3.27(reflect-metadata@0.2.2)(ts-node@10.9.2(@swc/core@1.11.31)(@types/node@22.15.30)(typescript@5.8.3)))(ws@8.18.2)
+      c15t: 1.8.2(@opentelemetry/api@1.9.0)(@opentelemetry/instrumentation@0.208.0(@opentelemetry/api@1.9.0))(@types/react@19.2.7)(@upstash/redis@1.35.0)(crossws@0.3.5)(react@19.1.5)(typeorm@0.3.27(reflect-metadata@0.2.2)(ts-node@10.9.2(@swc/core@1.15.18)(@types/node@22.15.30)(typescript@5.8.3)))(ws@8.18.2)
       clsx: 2.1.1
       react: 19.1.5
       react-dom: 19.1.5(react@19.1.5)
@@ -12195,6 +12522,11 @@ snapshots:
       tslib: 2.8.1
     optional: true
 
+  '@emnapi/runtime@1.8.1':
+    dependencies:
+      tslib: 2.8.1
+    optional: true
+
   '@emnapi/wasi-threads@1.0.1':
     dependencies:
       tslib: 2.8.1
@@ -12364,8 +12696,15 @@ snapshots:
       eslint: 8.57.1
       eslint-visitor-keys: 3.4.3
 
+  '@eslint-community/eslint-utils@4.9.1(eslint@8.57.1)':
+    dependencies:
+      eslint: 8.57.1
+      eslint-visitor-keys: 3.4.3
+
   '@eslint-community/regexpp@4.12.1': {}
 
+  '@eslint-community/regexpp@4.12.2': {}
+
   '@eslint/eslintrc@2.1.4':
     dependencies:
       ajv: 6.12.6
@@ -12408,29 +12747,52 @@ snapshots:
       decimal.js: 10.5.0
       tslib: 2.8.1
 
+  '@formatjs/ecma402-abstract@3.1.1':
+    dependencies:
+      '@formatjs/fast-memoize': 3.1.0
+      '@formatjs/intl-localematcher': 0.8.1
+      decimal.js: 10.6.0
+      tslib: 2.8.1
+
   '@formatjs/fast-memoize@2.2.7':
     dependencies:
       tslib: 2.8.1
 
+  '@formatjs/fast-memoize@3.1.0':
+    dependencies:
+      tslib: 2.8.1
+
   '@formatjs/icu-messageformat-parser@2.11.2':
     dependencies:
       '@formatjs/ecma402-abstract': 2.3.4
       '@formatjs/icu-skeleton-parser': 1.8.14
       tslib: 2.8.1
 
+  '@formatjs/icu-messageformat-parser@3.5.1':
+    dependencies:
+      '@formatjs/ecma402-abstract': 3.1.1
+      '@formatjs/icu-skeleton-parser': 2.1.1
+      tslib: 2.8.1
+
   '@formatjs/icu-skeleton-parser@1.8.14':
     dependencies:
       '@formatjs/ecma402-abstract': 2.3.4
       tslib: 2.8.1
 
-  '@formatjs/intl-localematcher@0.5.10':
+  '@formatjs/icu-skeleton-parser@2.1.1':
     dependencies:
+      '@formatjs/ecma402-abstract': 3.1.1
       tslib: 2.8.1
 
   '@formatjs/intl-localematcher@0.6.1':
     dependencies:
       tslib: 2.8.1
 
+  '@formatjs/intl-localematcher@0.8.1':
+    dependencies:
+      '@formatjs/fast-memoize': 3.1.0
+      tslib: 2.8.1
+
   '@gql.tada/cli-utils@1.6.3(@0no-co/graphqlsp@1.12.16(graphql@16.11.0)(typescript@5.8.3))(graphql@16.11.0)(typescript@5.8.3)':
     dependencies:
       '@0no-co/graphqlsp': 1.12.16(graphql@16.11.0)(typescript@5.8.3)
@@ -12479,14 +12841,17 @@ snapshots:
     dependencies:
       react: 19.1.5
 
+  '@img/colour@1.0.0':
+    optional: true
+
   '@img/sharp-darwin-arm64@0.33.5':
     optionalDependencies:
       '@img/sharp-libvips-darwin-arm64': 1.0.4
     optional: true
 
-  '@img/sharp-darwin-arm64@0.34.3':
+  '@img/sharp-darwin-arm64@0.34.5':
     optionalDependencies:
-      '@img/sharp-libvips-darwin-arm64': 1.2.0
+      '@img/sharp-libvips-darwin-arm64': 1.2.4
     optional: true
 
   '@img/sharp-darwin-x64@0.33.5':
@@ -12494,60 +12859,63 @@ snapshots:
       '@img/sharp-libvips-darwin-x64': 1.0.4
     optional: true
 
-  '@img/sharp-darwin-x64@0.34.3':
+  '@img/sharp-darwin-x64@0.34.5':
     optionalDependencies:
-      '@img/sharp-libvips-darwin-x64': 1.2.0
+      '@img/sharp-libvips-darwin-x64': 1.2.4
     optional: true
 
   '@img/sharp-libvips-darwin-arm64@1.0.4':
     optional: true
 
-  '@img/sharp-libvips-darwin-arm64@1.2.0':
+  '@img/sharp-libvips-darwin-arm64@1.2.4':
     optional: true
 
   '@img/sharp-libvips-darwin-x64@1.0.4':
     optional: true
 
-  '@img/sharp-libvips-darwin-x64@1.2.0':
+  '@img/sharp-libvips-darwin-x64@1.2.4':
     optional: true
 
   '@img/sharp-libvips-linux-arm64@1.0.4':
     optional: true
 
-  '@img/sharp-libvips-linux-arm64@1.2.0':
+  '@img/sharp-libvips-linux-arm64@1.2.4':
     optional: true
 
   '@img/sharp-libvips-linux-arm@1.0.5':
     optional: true
 
-  '@img/sharp-libvips-linux-arm@1.2.0':
+  '@img/sharp-libvips-linux-arm@1.2.4':
     optional: true
 
-  '@img/sharp-libvips-linux-ppc64@1.2.0':
+  '@img/sharp-libvips-linux-ppc64@1.2.4':
+    optional: true
+
+  '@img/sharp-libvips-linux-riscv64@1.2.4':
     optional: true
 
   '@img/sharp-libvips-linux-s390x@1.0.4':
     optional: true
 
-  '@img/sharp-libvips-linux-s390x@1.2.0':
+  '@img/sharp-libvips-linux-s390x@1.2.4':
     optional: true
 
   '@img/sharp-libvips-linux-x64@1.0.4':
     optional: true
 
-  '@img/sharp-libvips-linux-x64@1.2.0':
+  '@img/sharp-libvips-linux-x64@1.2.4':
     optional: true
 
   '@img/sharp-libvips-linuxmusl-arm64@1.0.4':
     optional: true
 
-  '@img/sharp-libvips-linuxmusl-arm64@1.2.0':
+  '@img/sharp-libvips-linuxmusl-arm64@1.2.4':
     optional: true
 
   '@img/sharp-libvips-linuxmusl-x64@1.0.4':
     optional: true
 
-  '@img/sharp-libvips-linuxmusl-x64@1.2.0':
+  '@img/sharp-libvips-linuxmusl-x64@1.2.4':
     optional: true
 
   '@img/sharp-linux-arm64@0.33.5':
@@ -12555,9 +12923,9 @@ snapshots:
       '@img/sharp-libvips-linux-arm64': 1.0.4
     optional: true
 
-  '@img/sharp-linux-arm64@0.34.3':
+  '@img/sharp-linux-arm64@0.34.5':
     optionalDependencies:
-      '@img/sharp-libvips-linux-arm64': 1.2.0
+      '@img/sharp-libvips-linux-arm64': 1.2.4
     optional: true
 
   '@img/sharp-linux-arm@0.33.5':
@@ -12565,14 +12933,19 @@ snapshots:
       '@img/sharp-libvips-linux-arm': 1.0.5
     optional: true
 
-  '@img/sharp-linux-arm@0.34.3':
+  '@img/sharp-linux-arm@0.34.5':
+    optionalDependencies:
+      '@img/sharp-libvips-linux-arm': 1.2.4
+    optional: true
+
+  '@img/sharp-linux-ppc64@0.34.5':
     optionalDependencies:
-      '@img/sharp-libvips-linux-arm': 1.2.0
+      '@img/sharp-libvips-linux-ppc64': 1.2.4
     optional: true
 
-  '@img/sharp-linux-ppc64@0.34.3':
+  '@img/sharp-linux-riscv64@0.34.5':
     optionalDependencies:
-      '@img/sharp-libvips-linux-ppc64': 1.2.0
+      '@img/sharp-libvips-linux-riscv64': 1.2.4
     optional: true
 
   '@img/sharp-linux-s390x@0.33.5':
@@ -12580,9 +12953,9 @@ snapshots:
       '@img/sharp-libvips-linux-s390x': 1.0.4
     optional: true
 
-  '@img/sharp-linux-s390x@0.34.3':
+  '@img/sharp-linux-s390x@0.34.5':
     optionalDependencies:
-      '@img/sharp-libvips-linux-s390x': 1.2.0
+      '@img/sharp-libvips-linux-s390x': 1.2.4
     optional: true
 
   '@img/sharp-linux-x64@0.33.5':
@@ -12590,9 +12963,9 @@ snapshots:
       '@img/sharp-libvips-linux-x64': 1.0.4
     optional: true
 
-  '@img/sharp-linux-x64@0.34.3':
+  '@img/sharp-linux-x64@0.34.5':
     optionalDependencies:
-      '@img/sharp-libvips-linux-x64': 1.2.0
+      '@img/sharp-libvips-linux-x64': 1.2.4
     optional: true
 
   '@img/sharp-linuxmusl-arm64@0.33.5':
@@ -12600,9 +12973,9 @@ snapshots:
       '@img/sharp-libvips-linuxmusl-arm64': 1.0.4
     optional: true
 
-  '@img/sharp-linuxmusl-arm64@0.34.3':
+  '@img/sharp-linuxmusl-arm64@0.34.5':
     optionalDependencies:
-      '@img/sharp-libvips-linuxmusl-arm64': 1.2.0
+      '@img/sharp-libvips-linuxmusl-arm64': 1.2.4
     optional: true
 
   '@img/sharp-linuxmusl-x64@0.33.5':
@@ -12610,34 +12983,34 @@ snapshots:
       '@img/sharp-libvips-linuxmusl-x64': 1.0.4
     optional: true
 
-  '@img/sharp-linuxmusl-x64@0.34.3':
+  '@img/sharp-linuxmusl-x64@0.34.5':
     optionalDependencies:
-      '@img/sharp-libvips-linuxmusl-x64': 1.2.0
+      '@img/sharp-libvips-linuxmusl-x64': 1.2.4
     optional: true
 
   '@img/sharp-wasm32@0.33.5':
     dependencies:
-      '@emnapi/runtime': 1.4.5
+      '@emnapi/runtime': 1.8.1
     optional: true
 
-  '@img/sharp-wasm32@0.34.3':
+  '@img/sharp-wasm32@0.34.5':
     dependencies:
-      '@emnapi/runtime': 1.4.5
+      '@emnapi/runtime': 1.8.1
     optional: true
 
-  '@img/sharp-win32-arm64@0.34.3':
+  '@img/sharp-win32-arm64@0.34.5':
     optional: true
 
   '@img/sharp-win32-ia32@0.33.5':
     optional: true
 
-  '@img/sharp-win32-ia32@0.34.3':
+  '@img/sharp-win32-ia32@0.34.5':
     optional: true
 
   '@img/sharp-win32-x64@0.33.5':
     optional: true
 
-  '@img/sharp-win32-x64@0.34.3':
+  '@img/sharp-win32-x64@0.34.5':
     optional: true
 
   '@inquirer/checkbox@4.1.8(@types/node@22.15.30)':
@@ -12825,22 +13198,58 @@ snapshots:
       - supports-color
       - ts-node
 
-  '@jest/create-cache-key-function@29.7.0':
-    dependencies:
-      '@jest/types': 29.6.3
-
-  '@jest/environment@29.7.0':
+  '@jest/core@29.7.0(ts-node@10.9.2(@swc/core@1.15.18)(@types/node@22.15.30)(typescript@5.8.3))':
     dependencies:
-      '@jest/fake-timers': 29.7.0
+      '@jest/console': 29.7.0
+      '@jest/reporters': 29.7.0
+      '@jest/test-result': 29.7.0
+      '@jest/transform': 29.7.0
       '@jest/types': 29.6.3
       '@types/node': 22.15.30
-      jest-mock: 29.7.0
-
-  '@jest/expect-utils@29.7.0':
-    dependencies:
-      jest-get-type: 29.6.3
-
-  '@jest/expect@29.7.0':
+      ansi-escapes: 4.3.2
+      chalk: 4.1.2
+      ci-info: 3.9.0
+      exit: 0.1.2
+      graceful-fs: 4.2.11
+      jest-changed-files: 29.7.0
+      jest-config: 29.7.0(@types/node@22.15.30)(ts-node@10.9.2(@swc/core@1.15.18)(@types/node@22.15.30)(typescript@5.8.3))
+      jest-haste-map: 29.7.0
+      jest-message-util: 29.7.0
+      jest-regex-util: 29.6.3
+      jest-resolve: 29.7.0
+      jest-resolve-dependencies: 29.7.0
+      jest-runner: 29.7.0
+      jest-runtime: 29.7.0
+      jest-snapshot: 29.7.0
+      jest-util: 29.7.0
+      jest-validate: 29.7.0
+      jest-watcher: 29.7.0
+      micromatch: 4.0.8
+      pretty-format: 29.7.0
+      slash: 3.0.0
+      strip-ansi: 6.0.1
+    transitivePeerDependencies:
+      - babel-plugin-macros
+      - supports-color
+      - ts-node
+    optional: true
+
+  '@jest/create-cache-key-function@29.7.0':
+    dependencies:
+      '@jest/types': 29.6.3
+
+  '@jest/environment@29.7.0':
+    dependencies:
+      '@jest/fake-timers': 29.7.0
+      '@jest/types': 29.6.3
+      '@types/node': 22.15.30
+      jest-mock: 29.7.0
+
+  '@jest/expect-utils@29.7.0':
+    dependencies:
+      jest-get-type: 29.6.3
+
+  '@jest/expect@29.7.0':
     dependencies:
       expect: 29.7.0
       jest-snapshot: 29.7.0
@@ -13037,45 +13446,45 @@ snapshots:
       '@tybys/wasm-util': 0.9.0
     optional: true
 
-  '@next/bundle-analyzer@15.5.10':
+  '@next/bundle-analyzer@16.1.6':
     dependencies:
       webpack-bundle-analyzer: 4.10.1
     transitivePeerDependencies:
       - bufferutil
       - utf-8-validate
 
-  '@next/env@15.5.10': {}
+  '@next/env@16.1.6': {}
 
-  '@next/eslint-plugin-next@15.3.3':
+  '@next/eslint-plugin-next@15.5.10':
     dependencies:
       fast-glob: 3.3.1
 
-  '@next/eslint-plugin-next@15.5.10':
+  '@next/eslint-plugin-next@15.5.12':
     dependencies:
       fast-glob: 3.3.1
 
-  '@next/swc-darwin-arm64@15.5.7':
+  '@next/swc-darwin-arm64@16.1.6':
     optional: true
 
-  '@next/swc-darwin-x64@15.5.7':
+  '@next/swc-darwin-x64@16.1.6':
     optional: true
 
-  '@next/swc-linux-arm64-gnu@15.5.7':
+  '@next/swc-linux-arm64-gnu@16.1.6':
     optional: true
 
-  '@next/swc-linux-arm64-musl@15.5.7':
+  '@next/swc-linux-arm64-musl@16.1.6':
     optional: true
 
-  '@next/swc-linux-x64-gnu@15.5.7':
+  '@next/swc-linux-x64-gnu@16.1.6':
     optional: true
 
-  '@next/swc-linux-x64-musl@15.5.7':
+  '@next/swc-linux-x64-musl@16.1.6':
     optional: true
 
-  '@next/swc-win32-arm64-msvc@15.5.7':
+  '@next/swc-win32-arm64-msvc@16.1.6':
     optional: true
 
-  '@next/swc-win32-x64-msvc@15.5.7':
+  '@next/swc-win32-x64-msvc@16.1.6':
     optional: true
 
   '@noble/ciphers@1.3.0': {}
@@ -13718,7 +14127,7 @@ snapshots:
       extract-zip: 2.0.1
       progress: 2.0.3
       proxy-agent: 6.5.0
-      semver: 7.7.2
+      semver: 7.7.4
       tar-fs: 3.0.9
       unbzip2-stream: 1.4.3
       yargs: 17.7.2
@@ -15350,33 +15759,63 @@ snapshots:
   '@swc/core-darwin-arm64@1.11.31':
     optional: true
 
+  '@swc/core-darwin-arm64@1.15.18':
+    optional: true
+
   '@swc/core-darwin-x64@1.11.31':
     optional: true
 
+  '@swc/core-darwin-x64@1.15.18':
+    optional: true
+
   '@swc/core-linux-arm-gnueabihf@1.11.31':
     optional: true
 
+  '@swc/core-linux-arm-gnueabihf@1.15.18':
+    optional: true
+
   '@swc/core-linux-arm64-gnu@1.11.31':
     optional: true
 
+  '@swc/core-linux-arm64-gnu@1.15.18':
+    optional: true
+
   '@swc/core-linux-arm64-musl@1.11.31':
     optional: true
 
+  '@swc/core-linux-arm64-musl@1.15.18':
+    optional: true
+
   '@swc/core-linux-x64-gnu@1.11.31':
     optional: true
 
+  '@swc/core-linux-x64-gnu@1.15.18':
+    optional: true
+
   '@swc/core-linux-x64-musl@1.11.31':
     optional: true
 
+  '@swc/core-linux-x64-musl@1.15.18':
+    optional: true
+
   '@swc/core-win32-arm64-msvc@1.11.31':
     optional: true
 
+  '@swc/core-win32-arm64-msvc@1.15.18':
+    optional: true
+
   '@swc/core-win32-ia32-msvc@1.11.31':
     optional: true
 
+  '@swc/core-win32-ia32-msvc@1.15.18':
+    optional: true
+
   '@swc/core-win32-x64-msvc@1.11.31':
     optional: true
 
+  '@swc/core-win32-x64-msvc@1.15.18':
+    optional: true
+
   '@swc/core@1.11.31':
     dependencies:
       '@swc/counter': 0.1.3
@@ -15393,6 +15832,22 @@ snapshots:
       '@swc/core-win32-ia32-msvc': 1.11.31
       '@swc/core-win32-x64-msvc': 1.11.31
 
+  '@swc/core@1.15.18':
+    dependencies:
+      '@swc/counter': 0.1.3
+      '@swc/types': 0.1.25
+    optionalDependencies:
+      '@swc/core-darwin-arm64': 1.15.18
+      '@swc/core-darwin-x64': 1.15.18
+      '@swc/core-linux-arm-gnueabihf': 1.15.18
+      '@swc/core-linux-arm64-gnu': 1.15.18
+      '@swc/core-linux-arm64-musl': 1.15.18
+      '@swc/core-linux-x64-gnu': 1.15.18
+      '@swc/core-linux-x64-musl': 1.15.18
+      '@swc/core-win32-arm64-msvc': 1.15.18
+      '@swc/core-win32-ia32-msvc': 1.15.18
+      '@swc/core-win32-x64-msvc': 1.15.18
+
   '@swc/counter@0.1.3': {}
 
   '@swc/helpers@0.5.15':
@@ -15410,6 +15865,10 @@ snapshots:
     dependencies:
       '@swc/counter': 0.1.3
 
+  '@swc/types@0.1.25':
+    dependencies:
+      '@swc/counter': 0.1.3
+
   '@szmarczak/http-timer@4.0.6':
     dependencies:
       defer-to-connect: 2.0.1
@@ -15419,17 +15878,17 @@ snapshots:
       typescript: 5.8.3
       zod: 3.25.51
 
-  '@tailwindcss/container-queries@0.1.1(tailwindcss@3.4.17(ts-node@10.9.2(@swc/core@1.11.31)(@types/node@22.15.30)(typescript@5.8.3)))':
+  '@tailwindcss/container-queries@0.1.1(tailwindcss@3.4.17(ts-node@10.9.2(@swc/core@1.15.18)(@types/node@22.15.30)(typescript@5.8.3)))':
     dependencies:
-      tailwindcss: 3.4.17(ts-node@10.9.2(@swc/core@1.11.31)(@types/node@22.15.30)(typescript@5.8.3))
+      tailwindcss: 3.4.17(ts-node@10.9.2(@swc/core@1.15.18)(@types/node@22.15.30)(typescript@5.8.3))
 
-  '@tailwindcss/typography@0.5.16(tailwindcss@3.4.17(ts-node@10.9.2(@swc/core@1.11.31)(@types/node@22.15.30)(typescript@5.8.3)))':
+  '@tailwindcss/typography@0.5.16(tailwindcss@3.4.17(ts-node@10.9.2(@swc/core@1.15.18)(@types/node@22.15.30)(typescript@5.8.3)))':
     dependencies:
       lodash.castarray: 4.4.0
       lodash.isplainobject: 4.0.6
       lodash.merge: 4.6.2
       postcss-selector-parser: 6.0.10
-      tailwindcss: 3.4.17(ts-node@10.9.2(@swc/core@1.11.31)(@types/node@22.15.30)(typescript@5.8.3))
+      tailwindcss: 3.4.17(ts-node@10.9.2(@swc/core@1.15.18)(@types/node@22.15.30)(typescript@5.8.3))
 
   '@tanstack/virtual-core@3.13.9': {}
 
@@ -15641,6 +16100,22 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@typescript-eslint/eslint-plugin@8.56.1(@typescript-eslint/parser@8.56.1(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1)(typescript@5.8.3)':
+    dependencies:
+      '@eslint-community/regexpp': 4.12.2
+      '@typescript-eslint/parser': 8.56.1(eslint@8.57.1)(typescript@5.8.3)
+      '@typescript-eslint/scope-manager': 8.56.1
+      '@typescript-eslint/type-utils': 8.56.1(eslint@8.57.1)(typescript@5.8.3)
+      '@typescript-eslint/utils': 8.56.1(eslint@8.57.1)(typescript@5.8.3)
+      '@typescript-eslint/visitor-keys': 8.56.1
+      eslint: 8.57.1
+      ignore: 7.0.5
+      natural-compare: 1.4.0
+      ts-api-utils: 2.4.0(typescript@5.8.3)
+      typescript: 5.8.3
+    transitivePeerDependencies:
+      - supports-color
+
   '@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3)':
     dependencies:
       '@typescript-eslint/scope-manager': 8.28.0
@@ -15653,11 +16128,41 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@typescript-eslint/parser@8.56.1(eslint@8.57.1)(typescript@5.8.3)':
+    dependencies:
+      '@typescript-eslint/scope-manager': 8.56.1
+      '@typescript-eslint/types': 8.56.1
+      '@typescript-eslint/typescript-estree': 8.56.1(typescript@5.8.3)
+      '@typescript-eslint/visitor-keys': 8.56.1
+      debug: 4.4.3
+      eslint: 8.57.1
+      typescript: 5.8.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@typescript-eslint/project-service@8.56.1(typescript@5.8.3)':
+    dependencies:
+      '@typescript-eslint/tsconfig-utils': 8.56.1(typescript@5.8.3)
+      '@typescript-eslint/types': 8.56.1
+      debug: 4.4.3
+      typescript: 5.8.3
+    transitivePeerDependencies:
+      - supports-color
+
   '@typescript-eslint/scope-manager@8.28.0':
     dependencies:
       '@typescript-eslint/types': 8.28.0
       '@typescript-eslint/visitor-keys': 8.28.0
 
+  '@typescript-eslint/scope-manager@8.56.1':
+    dependencies:
+      '@typescript-eslint/types': 8.56.1
+      '@typescript-eslint/visitor-keys': 8.56.1
+
+  '@typescript-eslint/tsconfig-utils@8.56.1(typescript@5.8.3)':
+    dependencies:
+      typescript: 5.8.3
+
   '@typescript-eslint/type-utils@8.28.0(eslint@8.57.1)(typescript@5.8.3)':
     dependencies:
       '@typescript-eslint/typescript-estree': 8.28.0(typescript@5.8.3)
@@ -15669,8 +16174,22 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@typescript-eslint/type-utils@8.56.1(eslint@8.57.1)(typescript@5.8.3)':
+    dependencies:
+      '@typescript-eslint/types': 8.56.1
+      '@typescript-eslint/typescript-estree': 8.56.1(typescript@5.8.3)
+      '@typescript-eslint/utils': 8.56.1(eslint@8.57.1)(typescript@5.8.3)
+      debug: 4.4.3
+      eslint: 8.57.1
+      ts-api-utils: 2.4.0(typescript@5.8.3)
+      typescript: 5.8.3
+    transitivePeerDependencies:
+      - supports-color
+
   '@typescript-eslint/types@8.28.0': {}
 
+  '@typescript-eslint/types@8.56.1': {}
+
   '@typescript-eslint/typescript-estree@8.28.0(typescript@5.8.3)':
     dependencies:
       '@typescript-eslint/types': 8.28.0
@@ -15679,12 +16198,27 @@ snapshots:
       fast-glob: 3.3.3
       is-glob: 4.0.3
       minimatch: 9.0.5
-      semver: 7.7.2
+      semver: 7.7.4
       ts-api-utils: 2.1.0(typescript@5.8.3)
       typescript: 5.8.3
     transitivePeerDependencies:
       - supports-color
 
+  '@typescript-eslint/typescript-estree@8.56.1(typescript@5.8.3)':
+    dependencies:
+      '@typescript-eslint/project-service': 8.56.1(typescript@5.8.3)
+      '@typescript-eslint/tsconfig-utils': 8.56.1(typescript@5.8.3)
+      '@typescript-eslint/types': 8.56.1
+      '@typescript-eslint/visitor-keys': 8.56.1
+      debug: 4.4.3
+      minimatch: 10.2.2
+      semver: 7.7.4
+      tinyglobby: 0.2.15
+      ts-api-utils: 2.4.0(typescript@5.8.3)
+      typescript: 5.8.3
+    transitivePeerDependencies:
+      - supports-color
+
   '@typescript-eslint/utils@8.28.0(eslint@8.57.1)(typescript@5.8.3)':
     dependencies:
       '@eslint-community/eslint-utils': 4.5.1(eslint@8.57.1)
@@ -15696,11 +16230,27 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@typescript-eslint/utils@8.56.1(eslint@8.57.1)(typescript@5.8.3)':
+    dependencies:
+      '@eslint-community/eslint-utils': 4.9.1(eslint@8.57.1)
+      '@typescript-eslint/scope-manager': 8.56.1
+      '@typescript-eslint/types': 8.56.1
+      '@typescript-eslint/typescript-estree': 8.56.1(typescript@5.8.3)
+      eslint: 8.57.1
+      typescript: 5.8.3
+    transitivePeerDependencies:
+      - supports-color
+
   '@typescript-eslint/visitor-keys@8.28.0':
     dependencies:
       '@typescript-eslint/types': 8.28.0
       eslint-visitor-keys: 4.2.0
 
+  '@typescript-eslint/visitor-keys@8.56.1':
+    dependencies:
+      '@typescript-eslint/types': 8.56.1
+      eslint-visitor-keys: 5.0.1
+
   '@ungap/structured-clone@1.2.0': {}
 
   '@unlighthouse/cli@0.16.3(encoding@0.1.13)(magicast@0.3.5)(puppeteer@24.10.0(typescript@5.8.3))(rollup@4.44.2)(typescript@5.8.3)':
@@ -15897,9 +16447,9 @@ snapshots:
     dependencies:
       uncrypto: 0.1.3
 
-  '@vercel/analytics@1.5.0(next@15.5.10(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5))(react@19.1.5)(svelte@5.1.15)(vue@3.5.16(typescript@5.8.3))':
+  '@vercel/analytics@1.5.0(next@16.1.6(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5))(react@19.1.5)(svelte@5.1.15)(vue@3.5.16(typescript@5.8.3))':
     optionalDependencies:
-      next: 15.5.10(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      next: 16.1.6(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
       react: 19.1.5
       svelte: 5.1.15
       vue: 3.5.16(typescript@5.8.3)
@@ -15925,9 +16475,9 @@ snapshots:
       '@opentelemetry/sdk-metrics': 2.0.1(@opentelemetry/api@1.9.0)
       '@opentelemetry/sdk-trace-base': 2.2.0(@opentelemetry/api@1.9.0)
 
-  '@vercel/speed-insights@1.2.0(next@15.5.10(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5))(react@19.1.5)(svelte@5.1.15)(vue@3.5.16(typescript@5.8.3))':
+  '@vercel/speed-insights@1.2.0(next@16.1.6(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5))(react@19.1.5)(svelte@5.1.15)(vue@3.5.16(typescript@5.8.3))':
     optionalDependencies:
-      next: 15.5.10(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      next: 16.1.6(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
       react: 19.1.5
       svelte: 5.1.15
       vue: 3.5.16(typescript@5.8.3)
@@ -16189,6 +16739,17 @@ snapshots:
       get-intrinsic: 1.3.0
       is-string: 1.1.1
 
+  array-includes@3.1.9:
+    dependencies:
+      call-bind: 1.0.8
+      call-bound: 1.0.4
+      define-properties: 1.2.1
+      es-abstract: 1.24.1
+      es-object-atoms: 1.1.1
+      get-intrinsic: 1.3.0
+      is-string: 1.1.1
+      math-intrinsics: 1.1.0
+
   array-union@2.1.0: {}
 
   array.prototype.findlast@1.2.5:
@@ -16349,6 +16910,8 @@ snapshots:
 
   balanced-match@1.0.2: {}
 
+  balanced-match@4.0.4: {}
+
   bare-events@2.5.4:
     optional: true
 
@@ -16378,6 +16941,8 @@ snapshots:
 
   base64-js@1.5.1: {}
 
+  baseline-browser-mapping@2.10.0: {}
+
   basic-ftp@5.0.5: {}
 
   better-opn@3.0.2:
@@ -16421,6 +16986,10 @@ snapshots:
     dependencies:
       balanced-match: 1.0.2
 
+  brace-expansion@5.0.3:
+    dependencies:
+      balanced-match: 4.0.4
+
   braces@3.0.3:
     dependencies:
       fill-range: 7.1.1
@@ -16478,9 +17047,9 @@ snapshots:
     optionalDependencies:
       magicast: 0.3.5
 
-  c15t@1.8.2(@opentelemetry/api@1.9.0)(@opentelemetry/instrumentation@0.208.0(@opentelemetry/api@1.9.0))(@types/react@19.2.7)(@upstash/redis@1.35.0)(crossws@0.3.5)(react@19.1.5)(typeorm@0.3.27(reflect-metadata@0.2.2)(ts-node@10.9.2(@swc/core@1.11.31)(@types/node@22.15.30)(typescript@5.8.3)))(ws@8.18.2):
+  c15t@1.8.2(@opentelemetry/api@1.9.0)(@opentelemetry/instrumentation@0.208.0(@opentelemetry/api@1.9.0))(@types/react@19.2.7)(@upstash/redis@1.35.0)(crossws@0.3.5)(react@19.1.5)(typeorm@0.3.27(reflect-metadata@0.2.2)(ts-node@10.9.2(@swc/core@1.15.18)(@types/node@22.15.30)(typescript@5.8.3)))(ws@8.18.2):
     dependencies:
-      '@c15t/backend': 1.8.0(@opentelemetry/instrumentation@0.208.0(@opentelemetry/api@1.9.0))(@upstash/redis@1.35.0)(crossws@0.3.5)(typeorm@0.3.27(reflect-metadata@0.2.2)(ts-node@10.9.2(@swc/core@1.11.31)(@types/node@22.15.30)(typescript@5.8.3)))(ws@8.18.2)
+      '@c15t/backend': 1.8.0(@opentelemetry/instrumentation@0.208.0(@opentelemetry/api@1.9.0))(@upstash/redis@1.35.0)(crossws@0.3.5)(typeorm@0.3.27(reflect-metadata@0.2.2)(ts-node@10.9.2(@swc/core@1.15.18)(@types/node@22.15.30)(typescript@5.8.3)))(ws@8.18.2)
       '@c15t/translations': 1.8.0
       '@orpc/client': 1.8.1(@opentelemetry/api@1.9.0)
       '@orpc/server': 1.8.1(@opentelemetry/api@1.9.0)(crossws@0.3.5)(ws@8.18.2)
@@ -16841,6 +17410,22 @@ snapshots:
       - supports-color
       - ts-node
 
+  create-jest@29.7.0(@types/node@22.15.30)(ts-node@10.9.2(@swc/core@1.15.18)(@types/node@22.15.30)(typescript@5.8.3)):
+    dependencies:
+      '@jest/types': 29.6.3
+      chalk: 4.1.2
+      exit: 0.1.2
+      graceful-fs: 4.2.11
+      jest-config: 29.7.0(@types/node@22.15.30)(ts-node@10.9.2(@swc/core@1.15.18)(@types/node@22.15.30)(typescript@5.8.3))
+      jest-util: 29.7.0
+      prompts: 2.4.2
+    transitivePeerDependencies:
+      - '@types/node'
+      - babel-plugin-macros
+      - supports-color
+      - ts-node
+    optional: true
+
   create-require@1.1.1:
     optional: true
 
@@ -16964,6 +17549,8 @@ snapshots:
 
   decimal.js@10.5.0: {}
 
+  decimal.js@10.6.0: {}
+
   decompress-response@6.0.0:
     dependencies:
       mimic-response: 3.1.0
@@ -17246,6 +17833,63 @@ snapshots:
       unbox-primitive: 1.1.0
       which-typed-array: 1.1.18
 
+  es-abstract@1.24.1:
+    dependencies:
+      array-buffer-byte-length: 1.0.2
+      arraybuffer.prototype.slice: 1.0.4
+      available-typed-arrays: 1.0.7
+      call-bind: 1.0.8
+      call-bound: 1.0.4
+      data-view-buffer: 1.0.2
+      data-view-byte-length: 1.0.2
+      data-view-byte-offset: 1.0.1
+      es-define-property: 1.0.1
+      es-errors: 1.3.0
+      es-object-atoms: 1.1.1
+      es-set-tostringtag: 2.1.0
+      es-to-primitive: 1.3.0
+      function.prototype.name: 1.1.8
+      get-intrinsic: 1.3.0
+      get-proto: 1.0.1
+      get-symbol-description: 1.1.0
+      globalthis: 1.0.4
+      gopd: 1.2.0
+      has-property-descriptors: 1.0.2
+      has-proto: 1.2.0
+      has-symbols: 1.1.0
+      hasown: 2.0.2
+      internal-slot: 1.1.0
+      is-array-buffer: 3.0.5
+      is-callable: 1.2.7
+      is-data-view: 1.0.2
+      is-negative-zero: 2.0.3
+      is-regex: 1.2.1
+      is-set: 2.0.3
+      is-shared-array-buffer: 1.0.4
+      is-string: 1.1.1
+      is-typed-array: 1.1.15
+      is-weakref: 1.1.1
+      math-intrinsics: 1.1.0
+      object-inspect: 1.13.4
+      object-keys: 1.1.1
+      object.assign: 4.1.7
+      own-keys: 1.0.1
+      regexp.prototype.flags: 1.5.4
+      safe-array-concat: 1.1.3
+      safe-push-apply: 1.0.0
+      safe-regex-test: 1.1.0
+      set-proto: 1.0.0
+      stop-iteration-iterator: 1.1.0
+      string.prototype.trim: 1.2.10
+      string.prototype.trimend: 1.0.9
+      string.prototype.trimstart: 1.0.8
+      typed-array-buffer: 1.0.3
+      typed-array-byte-length: 1.0.3
+      typed-array-byte-offset: 1.0.4
+      typed-array-length: 1.0.7
+      unbox-primitive: 1.1.0
+      which-typed-array: 1.1.20
+
   es-define-property@1.0.1: {}
 
   es-errors@1.3.0: {}
@@ -17371,12 +18015,12 @@ snapshots:
     dependencies:
       '@next/eslint-plugin-next': 15.5.10
       '@rushstack/eslint-patch': 1.11.0
-      '@typescript-eslint/eslint-plugin': 8.28.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1)(typescript@5.8.3)
-      '@typescript-eslint/parser': 8.28.0(eslint@8.57.1)(typescript@5.8.3)
+      '@typescript-eslint/eslint-plugin': 8.56.1(@typescript-eslint/parser@8.56.1(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1)(typescript@5.8.3)
+      '@typescript-eslint/parser': 8.56.1(eslint@8.57.1)(typescript@5.8.3)
       eslint: 8.57.1
       eslint-import-resolver-node: 0.3.9
-      eslint-import-resolver-typescript: 3.9.1(eslint-plugin-import@2.31.0)(eslint@8.57.1)
-      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint-import-resolver-typescript@3.9.1)(eslint@8.57.1)
+      eslint-import-resolver-typescript: 3.9.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.56.1(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1))(eslint@8.57.1)
+      eslint-plugin-import: 2.32.0(@typescript-eslint/parser@8.56.1(eslint@8.57.1)(typescript@5.8.3))(eslint-import-resolver-typescript@3.9.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.56.1(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1)
       eslint-plugin-jsx-a11y: 6.10.2(eslint@8.57.1)
       eslint-plugin-react: 7.37.4(eslint@8.57.1)
       eslint-plugin-react-hooks: 5.2.0(eslint@8.57.1)
@@ -17418,7 +18062,22 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  eslint-module-utils@2.12.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.9.1(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1):
+  eslint-import-resolver-typescript@3.9.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.56.1(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1))(eslint@8.57.1):
+    dependencies:
+      '@nolyfill/is-core-module': 1.0.39
+      debug: 4.4.1
+      eslint: 8.57.1
+      get-tsconfig: 4.10.0
+      is-bun-module: 1.3.0
+      rspack-resolver: 1.2.2
+      stable-hash: 0.0.5
+      tinyglobby: 0.2.14
+    optionalDependencies:
+      eslint-plugin-import: 2.32.0(@typescript-eslint/parser@8.56.1(eslint@8.57.1)(typescript@5.8.3))(eslint-import-resolver-typescript@3.9.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.56.1(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1)
+    transitivePeerDependencies:
+      - supports-color
+
+  eslint-module-utils@2.12.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.9.1)(eslint@8.57.1):
     dependencies:
       debug: 3.2.7
     optionalDependencies:
@@ -17429,6 +18088,17 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  eslint-module-utils@2.12.1(@typescript-eslint/parser@8.56.1(eslint@8.57.1)(typescript@5.8.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.9.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.56.1(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1):
+    dependencies:
+      debug: 3.2.7
+    optionalDependencies:
+      '@typescript-eslint/parser': 8.56.1(eslint@8.57.1)(typescript@5.8.3)
+      eslint: 8.57.1
+      eslint-import-resolver-node: 0.3.9
+      eslint-import-resolver-typescript: 3.9.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.56.1(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1))(eslint@8.57.1)
+    transitivePeerDependencies:
+      - supports-color
+
   eslint-plugin-check-file@2.8.0(eslint@8.57.1):
     dependencies:
       eslint: 8.57.1
@@ -17450,7 +18120,7 @@ snapshots:
       doctrine: 2.1.0
       eslint: 8.57.1
       eslint-import-resolver-node: 0.3.9
-      eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.9.1(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1)
+      eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.9.1)(eslint@8.57.1)
       hasown: 2.0.2
       is-core-module: 2.16.1
       is-glob: 4.0.3
@@ -17468,6 +18138,35 @@ snapshots:
       - eslint-import-resolver-webpack
       - supports-color
 
+  eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.56.1(eslint@8.57.1)(typescript@5.8.3))(eslint-import-resolver-typescript@3.9.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.56.1(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1):
+    dependencies:
+      '@rtsao/scc': 1.1.0
+      array-includes: 3.1.9
+      array.prototype.findlastindex: 1.2.6
+      array.prototype.flat: 1.3.3
+      array.prototype.flatmap: 1.3.3
+      debug: 3.2.7
+      doctrine: 2.1.0
+      eslint: 8.57.1
+      eslint-import-resolver-node: 0.3.9
+      eslint-module-utils: 2.12.1(@typescript-eslint/parser@8.56.1(eslint@8.57.1)(typescript@5.8.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.9.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.56.1(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1)
+      hasown: 2.0.2
+      is-core-module: 2.16.1
+      is-glob: 4.0.3
+      minimatch: 3.1.2
+      object.fromentries: 2.0.8
+      object.groupby: 1.0.3
+      object.values: 1.2.1
+      semver: 6.3.1
+      string.prototype.trimend: 1.0.9
+      tsconfig-paths: 3.15.0
+    optionalDependencies:
+      '@typescript-eslint/parser': 8.56.1(eslint@8.57.1)(typescript@5.8.3)
+    transitivePeerDependencies:
+      - eslint-import-resolver-typescript
+      - eslint-import-resolver-webpack
+      - supports-color
+
   eslint-plugin-jest-dom@5.5.0(eslint@8.57.1):
     dependencies:
       '@babel/runtime': 7.26.7
@@ -17489,6 +18188,17 @@ snapshots:
       - supports-color
       - typescript
 
+  eslint-plugin-jest@28.11.0(@typescript-eslint/eslint-plugin@8.28.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1)(jest@29.7.0(@types/node@22.15.30)(ts-node@10.9.2(@swc/core@1.15.18)(@types/node@22.15.30)(typescript@5.8.3)))(typescript@5.8.3):
+    dependencies:
+      '@typescript-eslint/utils': 8.28.0(eslint@8.57.1)(typescript@5.8.3)
+      eslint: 8.57.1
+    optionalDependencies:
+      '@typescript-eslint/eslint-plugin': 8.28.0(@typescript-eslint/parser@8.28.0(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1)(typescript@5.8.3)
+      jest: 29.7.0(@types/node@22.15.30)(ts-node@10.9.2(@swc/core@1.15.18)(@types/node@22.15.30)(typescript@5.8.3))
+    transitivePeerDependencies:
+      - supports-color
+      - typescript
+
   eslint-plugin-jsdoc@50.6.9(eslint@8.57.1):
     dependencies:
       '@es-joy/jsdoccomment': 0.49.0
@@ -17594,6 +18304,8 @@ snapshots:
 
   eslint-visitor-keys@4.2.0: {}
 
+  eslint-visitor-keys@5.0.1: {}
+
   eslint@8.57.1:
     dependencies:
       '@eslint-community/eslint-utils': 4.5.1(eslint@8.57.1)
@@ -17851,6 +18563,10 @@ snapshots:
     optionalDependencies:
       picomatch: 4.0.2
 
+  fdir@6.5.0(picomatch@4.0.3):
+    optionalDependencies:
+      picomatch: 4.0.3
+
   fflate@0.8.2: {}
 
   figures@6.1.0:
@@ -17906,6 +18622,10 @@ snapshots:
     dependencies:
       is-callable: 1.2.7
 
+  for-each@0.3.5:
+    dependencies:
+      is-callable: 1.2.7
+
   foreground-child@3.3.0:
     dependencies:
       cross-spawn: 7.0.6
@@ -17974,18 +18694,18 @@ snapshots:
   fsevents@2.3.3:
     optional: true
 
-  fumadb@0.1.1(drizzle-orm@0.44.7(@opentelemetry/api@1.9.0)(@upstash/redis@1.35.0)(kysely@0.27.6))(typeorm@0.3.27(reflect-metadata@0.2.2)(ts-node@10.9.2(@swc/core@1.11.31)(@types/node@22.15.30)(typescript@5.8.3))):
+  fumadb@0.1.1(drizzle-orm@0.44.7(@opentelemetry/api@1.9.0)(@upstash/redis@1.35.0)(kysely@0.27.6))(typeorm@0.3.27(reflect-metadata@0.2.2)(ts-node@10.9.2(@swc/core@1.15.18)(@types/node@22.15.30)(typescript@5.8.3))):
     dependencies:
       '@clack/prompts': 0.11.0
       '@paralleldrive/cuid2': 2.2.2
       commander: 14.0.0
       kysely: 0.28.8
-      kysely-typeorm: 0.3.0(kysely@0.28.8)(typeorm@0.3.27(reflect-metadata@0.2.2)(ts-node@10.9.2(@swc/core@1.11.31)(@types/node@22.15.30)(typescript@5.8.3)))
-      semver: 7.7.2
+      kysely-typeorm: 0.3.0(kysely@0.28.8)(typeorm@0.3.27(reflect-metadata@0.2.2)(ts-node@10.9.2(@swc/core@1.15.18)(@types/node@22.15.30)(typescript@5.8.3)))
+      semver: 7.7.4
       zod: 4.1.12
     optionalDependencies:
       drizzle-orm: 0.44.7(@opentelemetry/api@1.9.0)(@upstash/redis@1.35.0)(kysely@0.27.6)
-      typeorm: 0.3.27(reflect-metadata@0.2.2)(ts-node@10.9.2(@swc/core@1.11.31)(@types/node@22.15.30)(typescript@5.8.3))
+      typeorm: 0.3.27(reflect-metadata@0.2.2)(ts-node@10.9.2(@swc/core@1.15.18)(@types/node@22.15.30)(typescript@5.8.3))
 
   function-bind@1.1.2: {}
 
@@ -18312,6 +19032,10 @@ snapshots:
     dependencies:
       safer-buffer: 2.1.2
 
+  icu-minify@4.8.3:
+    dependencies:
+      '@formatjs/icu-messageformat-parser': 3.5.1
+
   ieee754@1.2.1: {}
 
   ignore@5.3.2: {}
@@ -18368,6 +19092,13 @@ snapshots:
       '@formatjs/icu-messageformat-parser': 2.11.2
       tslib: 2.8.1
 
+  intl-messageformat@11.1.2:
+    dependencies:
+      '@formatjs/ecma402-abstract': 3.1.1
+      '@formatjs/fast-memoize': 3.1.0
+      '@formatjs/icu-messageformat-parser': 3.5.1
+      tslib: 2.8.1
+
   ip-address@9.0.5:
     dependencies:
       jsbn: 1.1.0
@@ -18464,6 +19195,8 @@ snapshots:
 
   is-map@2.0.3: {}
 
+  is-negative-zero@2.0.3: {}
+
   is-node-process@1.2.0: {}
 
   is-number-object@1.1.1:
@@ -18541,6 +19274,10 @@ snapshots:
     dependencies:
       call-bound: 1.0.4
 
+  is-weakref@1.1.1:
+    dependencies:
+      call-bound: 1.0.4
+
   is-weakset@2.0.3:
     dependencies:
       call-bind: 1.0.8
@@ -18593,7 +19330,7 @@ snapshots:
       '@babel/parser': 7.28.0
       '@istanbuljs/schema': 0.1.3
       istanbul-lib-coverage: 3.2.2
-      semver: 7.7.2
+      semver: 7.7.4
     transitivePeerDependencies:
       - supports-color
 
@@ -18694,6 +19431,26 @@ snapshots:
       - supports-color
       - ts-node
 
+  jest-cli@29.7.0(@types/node@22.15.30)(ts-node@10.9.2(@swc/core@1.15.18)(@types/node@22.15.30)(typescript@5.8.3)):
+    dependencies:
+      '@jest/core': 29.7.0(ts-node@10.9.2(@swc/core@1.15.18)(@types/node@22.15.30)(typescript@5.8.3))
+      '@jest/test-result': 29.7.0
+      '@jest/types': 29.6.3
+      chalk: 4.1.2
+      create-jest: 29.7.0(@types/node@22.15.30)(ts-node@10.9.2(@swc/core@1.15.18)(@types/node@22.15.30)(typescript@5.8.3))
+      exit: 0.1.2
+      import-local: 3.1.0
+      jest-config: 29.7.0(@types/node@22.15.30)(ts-node@10.9.2(@swc/core@1.15.18)(@types/node@22.15.30)(typescript@5.8.3))
+      jest-util: 29.7.0
+      jest-validate: 29.7.0
+      yargs: 17.7.2
+    transitivePeerDependencies:
+      - '@types/node'
+      - babel-plugin-macros
+      - supports-color
+      - ts-node
+    optional: true
+
   jest-config@29.7.0(@types/node@22.15.30)(ts-node@10.9.2(@swc/core@1.11.31)(@types/node@22.15.30)(typescript@5.8.3)):
     dependencies:
       '@babel/core': 7.27.4
@@ -18725,6 +19482,38 @@ snapshots:
       - babel-plugin-macros
       - supports-color
 
+  jest-config@29.7.0(@types/node@22.15.30)(ts-node@10.9.2(@swc/core@1.15.18)(@types/node@22.15.30)(typescript@5.8.3)):
+    dependencies:
+      '@babel/core': 7.27.4
+      '@jest/test-sequencer': 29.7.0
+      '@jest/types': 29.6.3
+      babel-jest: 29.7.0(@babel/core@7.27.4)
+      chalk: 4.1.2
+      ci-info: 3.9.0
+      deepmerge: 4.3.1
+      glob: 7.2.3
+      graceful-fs: 4.2.11
+      jest-circus: 29.7.0
+      jest-environment-node: 29.7.0
+      jest-get-type: 29.6.3
+      jest-regex-util: 29.6.3
+      jest-resolve: 29.7.0
+      jest-runner: 29.7.0
+      jest-util: 29.7.0
+      jest-validate: 29.7.0
+      micromatch: 4.0.8
+      parse-json: 5.2.0
+      pretty-format: 29.7.0
+      slash: 3.0.0
+      strip-json-comments: 3.1.1
+    optionalDependencies:
+      '@types/node': 22.15.30
+      ts-node: 10.9.2(@swc/core@1.15.18)(@types/node@22.15.30)(typescript@5.8.3)
+    transitivePeerDependencies:
+      - babel-plugin-macros
+      - supports-color
+    optional: true
+
   jest-diff@29.7.0:
     dependencies:
       chalk: 4.1.2
@@ -18900,7 +19689,7 @@ snapshots:
       jest-util: 29.7.0
       natural-compare: 1.4.0
       pretty-format: 29.7.0
-      semver: 7.7.2
+      semver: 7.7.4
     transitivePeerDependencies:
       - supports-color
 
@@ -18952,6 +19741,19 @@ snapshots:
       - supports-color
       - ts-node
 
+  jest@29.7.0(@types/node@22.15.30)(ts-node@10.9.2(@swc/core@1.15.18)(@types/node@22.15.30)(typescript@5.8.3)):
+    dependencies:
+      '@jest/core': 29.7.0(ts-node@10.9.2(@swc/core@1.15.18)(@types/node@22.15.30)(typescript@5.8.3))
+      '@jest/types': 29.6.3
+      import-local: 3.1.0
+      jest-cli: 29.7.0(@types/node@22.15.30)(ts-node@10.9.2(@swc/core@1.15.18)(@types/node@22.15.30)(typescript@5.8.3))
+    transitivePeerDependencies:
+      - '@types/node'
+      - babel-plugin-macros
+      - supports-color
+      - ts-node
+    optional: true
+
   jiti@1.21.7: {}
 
   jiti@2.4.2: {}
@@ -19060,10 +19862,10 @@ snapshots:
 
   knitwork@1.2.0: {}
 
-  kysely-typeorm@0.3.0(kysely@0.28.8)(typeorm@0.3.27(reflect-metadata@0.2.2)(ts-node@10.9.2(@swc/core@1.11.31)(@types/node@22.15.30)(typescript@5.8.3))):
+  kysely-typeorm@0.3.0(kysely@0.28.8)(typeorm@0.3.27(reflect-metadata@0.2.2)(ts-node@10.9.2(@swc/core@1.15.18)(@types/node@22.15.30)(typescript@5.8.3))):
     dependencies:
       kysely: 0.28.8
-      typeorm: 0.3.27(reflect-metadata@0.2.2)(ts-node@10.9.2(@swc/core@1.11.31)(@types/node@22.15.30)(typescript@5.8.3))
+      typeorm: 0.3.27(reflect-metadata@0.2.2)(ts-node@10.9.2(@swc/core@1.15.18)(@types/node@22.15.30)(typescript@5.8.3))
 
   kysely@0.27.6: {}
 
@@ -19352,7 +20154,7 @@ snapshots:
 
   make-dir@4.0.0:
     dependencies:
-      semver: 7.7.2
+      semver: 7.7.4
 
   make-error@1.3.6:
     optional: true
@@ -19428,6 +20230,10 @@ snapshots:
     dependencies:
       '@isaacs/brace-expansion': 5.0.0
 
+  minimatch@10.2.2:
+    dependencies:
+      brace-expansion: 5.0.3
+
   minimatch@3.1.2:
     dependencies:
       brace-expansion: 1.1.11
@@ -19531,43 +20337,53 @@ snapshots:
     optionalDependencies:
       '@rollup/rollup-linux-x64-gnu': 4.44.2
 
-  next-auth@5.0.0-beta.30(next@15.5.10(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5))(react@19.1.5):
+  next-auth@5.0.0-beta.30(next@16.1.6(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5))(react@19.1.5):
     dependencies:
       '@auth/core': 0.41.0
-      next: 15.5.10(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      next: 16.1.6(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
       react: 19.1.5
 
-  next-intl@4.1.0(next@15.5.10(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5))(react@19.1.5)(typescript@5.8.3):
+  next-intl-swc-plugin-extractor@4.8.3: {}
+
+  next-intl@4.8.3(next@16.1.6(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5))(react@19.1.5)(typescript@5.8.3):
     dependencies:
-      '@formatjs/intl-localematcher': 0.5.10
+      '@formatjs/intl-localematcher': 0.8.1
+      '@parcel/watcher': 2.5.1
+      '@swc/core': 1.15.18
+      icu-minify: 4.8.3
       negotiator: 1.0.0
-      next: 15.5.10(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      next: 16.1.6(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      next-intl-swc-plugin-extractor: 4.8.3
+      po-parser: 2.1.1
       react: 19.1.5
-      use-intl: 4.1.0(react@19.1.5)
+      use-intl: 4.8.3(react@19.1.5)
     optionalDependencies:
       typescript: 5.8.3
+    transitivePeerDependencies:
+      - '@swc/helpers'
 
-  next@15.5.10(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5):
+  next@16.1.6(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5):
     dependencies:
-      '@next/env': 15.5.10
+      '@next/env': 16.1.6
       '@swc/helpers': 0.5.15
+      baseline-browser-mapping: 2.10.0
       caniuse-lite: 1.0.30001721
       postcss: 8.4.31
       react: 19.1.5
       react-dom: 19.1.5(react@19.1.5)
       styled-jsx: 5.1.6(@babel/core@7.27.4)(react@19.1.5)
     optionalDependencies:
-      '@next/swc-darwin-arm64': 15.5.7
-      '@next/swc-darwin-x64': 15.5.7
-      '@next/swc-linux-arm64-gnu': 15.5.7
-      '@next/swc-linux-arm64-musl': 15.5.7
-      '@next/swc-linux-x64-gnu': 15.5.7
-      '@next/swc-linux-x64-musl': 15.5.7
-      '@next/swc-win32-arm64-msvc': 15.5.7
-      '@next/swc-win32-x64-msvc': 15.5.7
+      '@next/swc-darwin-arm64': 16.1.6
+      '@next/swc-darwin-x64': 16.1.6
+      '@next/swc-linux-arm64-gnu': 16.1.6
+      '@next/swc-linux-arm64-musl': 16.1.6
+      '@next/swc-linux-x64-gnu': 16.1.6
+      '@next/swc-linux-x64-musl': 16.1.6
+      '@next/swc-win32-arm64-msvc': 16.1.6
+      '@next/swc-win32-x64-msvc': 16.1.6
       '@opentelemetry/api': 1.9.0
       '@playwright/test': 1.52.0
-      sharp: 0.34.3
+      sharp: 0.34.5
     transitivePeerDependencies:
       - '@babel/core'
       - babel-plugin-macros
@@ -19615,12 +20431,12 @@ snapshots:
     dependencies:
       boolbase: 1.0.0
 
-  nuqs@2.4.3(next@15.5.10(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5))(react@19.1.5):
+  nuqs@2.4.3(next@16.1.6(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5))(react@19.1.5):
     dependencies:
       mitt: 3.0.1
       react: 19.1.5
     optionalDependencies:
-      next: 15.5.10(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
+      next: 16.1.6(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
 
   nwsapi@2.2.20:
     optional: true
@@ -19650,6 +20466,8 @@ snapshots:
 
   object-inspect@1.13.3: {}
 
+  object-inspect@1.13.4: {}
+
   object-keys@1.1.1: {}
 
   object-treeify@1.1.33: {}
@@ -19905,6 +20723,8 @@ snapshots:
 
   picomatch@4.0.2: {}
 
+  picomatch@4.0.3: {}
+
   pify@2.3.0: {}
 
   pify@4.0.1: {}
@@ -19935,6 +20755,8 @@ snapshots:
     optionalDependencies:
       fsevents: 2.3.2
 
+  po-parser@2.1.1: {}
+
   possible-typed-array-names@1.0.0: {}
 
   postcss-attribute-case-insensitive@7.0.1(postcss@8.5.6):
@@ -20050,13 +20872,13 @@ snapshots:
       '@csstools/utilities': 2.0.0(postcss@8.5.6)
       postcss: 8.5.6
 
-  postcss-load-config@4.0.2(postcss@8.5.6)(ts-node@10.9.2(@swc/core@1.11.31)(@types/node@22.15.30)(typescript@5.8.3)):
+  postcss-load-config@4.0.2(postcss@8.5.6)(ts-node@10.9.2(@swc/core@1.15.18)(@types/node@22.15.30)(typescript@5.8.3)):
     dependencies:
       lilconfig: 3.1.3
       yaml: 2.6.0
     optionalDependencies:
       postcss: 8.5.6
-      ts-node: 10.9.2(@swc/core@1.11.31)(@types/node@22.15.30)(typescript@5.8.3)
+      ts-node: 10.9.2(@swc/core@1.15.18)(@types/node@22.15.30)(typescript@5.8.3)
 
   postcss-load-config@6.0.1(jiti@2.4.2)(postcss@8.5.6)(yaml@2.8.1):
     dependencies:
@@ -20662,6 +21484,8 @@ snapshots:
 
   semver@7.7.2: {}
 
+  semver@7.7.4: {}
+
   send@1.2.0:
     dependencies:
       debug: 4.4.3
@@ -20725,7 +21549,7 @@ snapshots:
     dependencies:
       color: 4.2.3
       detect-libc: 2.1.2
-      semver: 7.7.2
+      semver: 7.7.4
     optionalDependencies:
       '@img/sharp-darwin-arm64': 0.33.5
       '@img/sharp-darwin-x64': 0.33.5
@@ -20747,34 +21571,36 @@ snapshots:
       '@img/sharp-win32-ia32': 0.33.5
       '@img/sharp-win32-x64': 0.33.5
 
-  sharp@0.34.3:
+  sharp@0.34.5:
     dependencies:
-      color: 4.2.3
+      '@img/colour': 1.0.0
       detect-libc: 2.1.2
-      semver: 7.7.2
+      semver: 7.7.4
     optionalDependencies:
-      '@img/sharp-darwin-arm64': 0.34.3
-      '@img/sharp-darwin-x64': 0.34.3
-      '@img/sharp-libvips-darwin-arm64': 1.2.0
-      '@img/sharp-libvips-darwin-x64': 1.2.0
-      '@img/sharp-libvips-linux-arm': 1.2.0
-      '@img/sharp-libvips-linux-arm64': 1.2.0
-      '@img/sharp-libvips-linux-ppc64': 1.2.0
-      '@img/sharp-libvips-linux-s390x': 1.2.0
-      '@img/sharp-libvips-linux-x64': 1.2.0
-      '@img/sharp-libvips-linuxmusl-arm64': 1.2.0
-      '@img/sharp-libvips-linuxmusl-x64': 1.2.0
-      '@img/sharp-linux-arm': 0.34.3
-      '@img/sharp-linux-arm64': 0.34.3
-      '@img/sharp-linux-ppc64': 0.34.3
-      '@img/sharp-linux-s390x': 0.34.3
-      '@img/sharp-linux-x64': 0.34.3
-      '@img/sharp-linuxmusl-arm64': 0.34.3
-      '@img/sharp-linuxmusl-x64': 0.34.3
-      '@img/sharp-wasm32': 0.34.3
-      '@img/sharp-win32-arm64': 0.34.3
-      '@img/sharp-win32-ia32': 0.34.3
-      '@img/sharp-win32-x64': 0.34.3
+      '@img/sharp-darwin-arm64': 0.34.5
+      '@img/sharp-darwin-x64': 0.34.5
+      '@img/sharp-libvips-darwin-arm64': 1.2.4
+      '@img/sharp-libvips-darwin-x64': 1.2.4
+      '@img/sharp-libvips-linux-arm': 1.2.4
+      '@img/sharp-libvips-linux-arm64': 1.2.4
+      '@img/sharp-libvips-linux-ppc64': 1.2.4
+      '@img/sharp-libvips-linux-riscv64': 1.2.4
+      '@img/sharp-libvips-linux-s390x': 1.2.4
+      '@img/sharp-libvips-linux-x64': 1.2.4
+      '@img/sharp-libvips-linuxmusl-arm64': 1.2.4
+      '@img/sharp-libvips-linuxmusl-x64': 1.2.4
+      '@img/sharp-linux-arm': 0.34.5
+      '@img/sharp-linux-arm64': 0.34.5
+      '@img/sharp-linux-ppc64': 0.34.5
+      '@img/sharp-linux-riscv64': 0.34.5
+      '@img/sharp-linux-s390x': 0.34.5
+      '@img/sharp-linux-x64': 0.34.5
+      '@img/sharp-linuxmusl-arm64': 0.34.5
+      '@img/sharp-linuxmusl-x64': 0.34.5
+      '@img/sharp-wasm32': 0.34.5
+      '@img/sharp-win32-arm64': 0.34.5
+      '@img/sharp-win32-ia32': 0.34.5
+      '@img/sharp-win32-x64': 0.34.5
     optional: true
 
   shebang-command@2.0.0:
@@ -20930,6 +21756,11 @@ snapshots:
 
   stdin-discarder@0.2.2: {}
 
+  stop-iteration-iterator@1.1.0:
+    dependencies:
+      es-errors: 1.3.0
+      internal-slot: 1.1.0
+
   stoppable@1.1.0: {}
 
   streamx@2.22.1:
@@ -21118,15 +21949,15 @@ snapshots:
 
   tagged-tag@1.0.0: {}
 
-  tailwindcss-animate@1.0.7(tailwindcss@3.4.17(ts-node@10.9.2(@swc/core@1.11.31)(@types/node@22.15.30)(typescript@5.8.3))):
+  tailwindcss-animate@1.0.7(tailwindcss@3.4.17(ts-node@10.9.2(@swc/core@1.15.18)(@types/node@22.15.30)(typescript@5.8.3))):
     dependencies:
-      tailwindcss: 3.4.17(ts-node@10.9.2(@swc/core@1.11.31)(@types/node@22.15.30)(typescript@5.8.3))
+      tailwindcss: 3.4.17(ts-node@10.9.2(@swc/core@1.15.18)(@types/node@22.15.30)(typescript@5.8.3))
 
-  tailwindcss-radix@3.0.5(tailwindcss@3.4.17(ts-node@10.9.2(@swc/core@1.11.31)(@types/node@22.15.30)(typescript@5.8.3))):
+  tailwindcss-radix@3.0.5(tailwindcss@3.4.17(ts-node@10.9.2(@swc/core@1.15.18)(@types/node@22.15.30)(typescript@5.8.3))):
     dependencies:
-      tailwindcss: 3.4.17(ts-node@10.9.2(@swc/core@1.11.31)(@types/node@22.15.30)(typescript@5.8.3))
+      tailwindcss: 3.4.17(ts-node@10.9.2(@swc/core@1.15.18)(@types/node@22.15.30)(typescript@5.8.3))
 
-  tailwindcss@3.4.17(ts-node@10.9.2(@swc/core@1.11.31)(@types/node@22.15.30)(typescript@5.8.3)):
+  tailwindcss@3.4.17(ts-node@10.9.2(@swc/core@1.15.18)(@types/node@22.15.30)(typescript@5.8.3)):
     dependencies:
       '@alloc/quick-lru': 5.2.0
       arg: 5.0.2
@@ -21145,7 +21976,7 @@ snapshots:
       postcss: 8.5.6
       postcss-import: 15.1.0(postcss@8.5.6)
       postcss-js: 4.0.1(postcss@8.5.6)
-      postcss-load-config: 4.0.2(postcss@8.5.6)(ts-node@10.9.2(@swc/core@1.11.31)(@types/node@22.15.30)(typescript@5.8.3))
+      postcss-load-config: 4.0.2(postcss@8.5.6)(ts-node@10.9.2(@swc/core@1.15.18)(@types/node@22.15.30)(typescript@5.8.3))
       postcss-nested: 6.2.0(postcss@8.5.6)
       postcss-selector-parser: 6.1.2
       resolve: 1.22.10
@@ -21230,6 +22061,11 @@ snapshots:
       fdir: 6.4.6(picomatch@4.0.2)
       picomatch: 4.0.2
 
+  tinyglobby@0.2.15:
+    dependencies:
+      fdir: 6.5.0(picomatch@4.0.3)
+      picomatch: 4.0.3
+
   tinypool@1.1.1: {}
 
   tinyrainbow@2.0.0: {}
@@ -21300,6 +22136,10 @@ snapshots:
     dependencies:
       typescript: 5.8.3
 
+  ts-api-utils@2.4.0(typescript@5.8.3):
+    dependencies:
+      typescript: 5.8.3
+
   ts-interface-checker@0.1.13: {}
 
   ts-node@10.9.2(@swc/core@1.11.31)(@types/node@22.15.30)(typescript@5.8.3):
@@ -21323,6 +22163,27 @@ snapshots:
       '@swc/core': 1.11.31
     optional: true
 
+  ts-node@10.9.2(@swc/core@1.15.18)(@types/node@22.15.30)(typescript@5.8.3):
+    dependencies:
+      '@cspotcode/source-map-support': 0.8.1
+      '@tsconfig/node10': 1.0.11
+      '@tsconfig/node12': 1.0.11
+      '@tsconfig/node14': 1.0.3
+      '@tsconfig/node16': 1.0.4
+      '@types/node': 22.15.30
+      acorn: 8.15.0
+      acorn-walk: 8.3.4
+      arg: 4.1.3
+      create-require: 1.1.1
+      diff: 4.0.2
+      make-error: 1.3.6
+      typescript: 5.8.3
+      v8-compile-cache-lib: 3.0.1
+      yn: 3.1.1
+    optionalDependencies:
+      '@swc/core': 1.15.18
+    optional: true
+
   ts-tqdm@0.8.6: {}
 
   tsconfig-paths@3.15.0:
@@ -21365,6 +22226,35 @@ snapshots:
       - tsx
       - yaml
 
+  tsup@8.5.0(@swc/core@1.15.18)(jiti@2.4.2)(postcss@8.5.6)(typescript@5.8.3)(yaml@2.8.1):
+    dependencies:
+      bundle-require: 5.1.0(esbuild@0.25.6)
+      cac: 6.7.14
+      chokidar: 4.0.3
+      consola: 3.4.2
+      debug: 4.4.1
+      esbuild: 0.25.6
+      fix-dts-default-cjs-exports: 1.0.1
+      joycon: 3.1.1
+      picocolors: 1.1.1
+      postcss-load-config: 6.0.1(jiti@2.4.2)(postcss@8.5.6)(yaml@2.8.1)
+      resolve-from: 5.0.0
+      rollup: 4.44.2
+      source-map: 0.8.0-beta.0
+      sucrase: 3.35.0
+      tinyexec: 0.3.2
+      tinyglobby: 0.2.14
+      tree-kill: 1.2.2
+    optionalDependencies:
+      '@swc/core': 1.15.18
+      postcss: 8.5.6
+      typescript: 5.8.3
+    transitivePeerDependencies:
+      - jiti
+      - supports-color
+      - tsx
+      - yaml
+
   tsutils@3.21.0(typescript@5.8.3):
     dependencies:
       tslib: 1.14.1
@@ -21460,7 +22350,7 @@ snapshots:
     dependencies:
       is-typedarray: 1.0.0
 
-  typeorm@0.3.27(reflect-metadata@0.2.2)(ts-node@10.9.2(@swc/core@1.11.31)(@types/node@22.15.30)(typescript@5.8.3)):
+  typeorm@0.3.27(reflect-metadata@0.2.2)(ts-node@10.9.2(@swc/core@1.15.18)(@types/node@22.15.30)(typescript@5.8.3)):
     dependencies:
       '@sqltools/formatter': 1.2.5
       ansis: 3.17.0
@@ -21478,7 +22368,7 @@ snapshots:
       uuid: 11.1.0
       yargs: 17.7.2
     optionalDependencies:
-      ts-node: 10.9.2(@swc/core@1.11.31)(@types/node@22.15.30)(typescript@5.8.3)
+      ts-node: 10.9.2(@swc/core@1.15.18)(@types/node@22.15.30)(typescript@5.8.3)
     transitivePeerDependencies:
       - babel-plugin-macros
       - supports-color
@@ -21641,11 +22531,12 @@ snapshots:
     optionalDependencies:
       '@types/react': 19.2.7
 
-  use-intl@4.1.0(react@19.1.5):
+  use-intl@4.8.3(react@19.1.5):
     dependencies:
-      '@formatjs/fast-memoize': 2.2.7
+      '@formatjs/fast-memoize': 3.1.0
       '@schummar/icu-type-parser': 1.21.5
-      intl-messageformat: 10.7.16
+      icu-minify: 4.8.3
+      intl-messageformat: 11.1.2
       react: 19.1.5
 
   use-sidecar@1.1.3(@types/react@19.2.7)(react@19.1.5):
@@ -21873,6 +22764,16 @@ snapshots:
       gopd: 1.2.0
       has-tostringtag: 1.0.2
 
+  which-typed-array@1.1.20:
+    dependencies:
+      available-typed-arrays: 1.0.7
+      call-bind: 1.0.8
+      call-bound: 1.0.4
+      for-each: 0.3.5
+      get-proto: 1.0.1
+      gopd: 1.2.0
+      has-tostringtag: 1.0.2
+
   which@2.0.2:
     dependencies:
       isexe: 2.0.0

From a81ddeef09dc1bb27f8e0d4c9d69f8f797d59d91 Mon Sep 17 00:00:00 2001
From: Parth Shah <48393781+parthshahp@users.noreply.github.com>
Date: Mon, 9 Mar 2026 17:30:24 -0400
Subject: [PATCH 61/69] chore: update CODEOWNERS to use team-trac (#2911)

---
 .github/CODEOWNERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index eaea5b59cd..a2c300d73d 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1 @@
-* @bigcommerce/team-catalyst
+* @bigcommerce/team-trac

From 0bc63b2e811739f3092d6f9798ca47af99e65bfb Mon Sep 17 00:00:00 2001
From: Jorge Moya <jorge.moya@bigcommerce.com>
Date: Mon, 9 Mar 2026 17:51:58 -0500
Subject: [PATCH 62/69] fix: bundle-size workflow with Next 16 (#2914)

---
 .../scripts/__tests__/bundle-size.test.mts    | 147 ++++++++++++++++++
 .github/scripts/bundle-size.mts               |  79 +++++++++-
 package.json                                  |   2 +-
 3 files changed, 220 insertions(+), 8 deletions(-)

diff --git a/.github/scripts/__tests__/bundle-size.test.mts b/.github/scripts/__tests__/bundle-size.test.mts
index 44f689ecd0..2eb7737a05 100644
--- a/.github/scripts/__tests__/bundle-size.test.mts
+++ b/.github/scripts/__tests__/bundle-size.test.mts
@@ -12,6 +12,7 @@ import {
   computeRouteMetrics,
   compareReport,
   clearSizeCache,
+  readTurbopackEntries,
 } from '../bundle-size.mts';
 
 // ---------------------------------------------------------------------------
@@ -663,6 +664,152 @@ describe('compareReport', () => {
   });
 });
 
+// ---------------------------------------------------------------------------
+// readTurbopackEntries
+// ---------------------------------------------------------------------------
+
+describe('readTurbopackEntries', () => {
+  // Helper: create a minimal _client-reference-manifest.js fixture
+  function makeManifestContent(
+    routes: Record<string, Record<string, { chunks: string[] }>>,
+  ): string {
+    const manifest: Record<string, { clientModules: Record<string, { chunks: string[] }> }> = {};
+
+    for (const [routeKey, modules] of Object.entries(routes)) {
+      manifest[routeKey] = { clientModules: modules };
+    }
+
+    return `globalThis.__RSC_MANIFEST = ${JSON.stringify(manifest)};`;
+  }
+
+  it('reads chunk paths from a single manifest and normalizes /_next/ prefix', () => {
+    const dir = join(testDir, `turbopack-basic-${Date.now()}`);
+
+    mkdirSync(dir, { recursive: true });
+    writeFileSync(
+      join(dir, 'page_client-reference-manifest.js'),
+      makeManifestContent({
+        '/products/page': {
+          'mod-a': { chunks: ['/_next/static/chunks/a.js'] },
+          'mod-b': { chunks: ['/_next/static/chunks/b.js'] },
+        },
+      }),
+    );
+
+    const entries = readTurbopackEntries(dir);
+
+    assert.ok(entries['/products/page'], 'should have /products/page entry');
+    assert.ok(entries['/products/page'].includes('static/chunks/a.js'), 'should normalize /_next/ prefix');
+    assert.ok(entries['/products/page'].includes('static/chunks/b.js'));
+    assert.ok(!entries['/products/page'].some((c) => c.startsWith('/_next/')), 'no chunk should start with /_next/');
+  });
+
+  it('filters out non-/page routes (layouts, route handlers)', () => {
+    const dir = join(testDir, `turbopack-filter-${Date.now()}`);
+
+    mkdirSync(dir, { recursive: true });
+    writeFileSync(
+      join(dir, 'page_client-reference-manifest.js'),
+      makeManifestContent({
+        '/app/layout': { 'mod-a': { chunks: ['/_next/static/chunks/layout.js'] } },
+        '/app/route': { 'mod-b': { chunks: ['/_next/static/chunks/route.js'] } },
+        '/app/page': { 'mod-c': { chunks: ['/_next/static/chunks/page.js'] } },
+      }),
+    );
+
+    const entries = readTurbopackEntries(dir);
+
+    assert.ok(entries['/app/page'], 'should include /page route');
+    assert.ok(!entries['/app/layout'], 'should exclude /layout route');
+    assert.ok(!entries['/app/route'], 'should exclude /route handler');
+  });
+
+  it('deduplicates chunks appearing in multiple modules', () => {
+    const dir = join(testDir, `turbopack-dedup-${Date.now()}`);
+
+    mkdirSync(dir, { recursive: true });
+    writeFileSync(
+      join(dir, 'page_client-reference-manifest.js'),
+      makeManifestContent({
+        '/shop/page': {
+          'mod-a': { chunks: ['/_next/static/chunks/shared.js', '/_next/static/chunks/a.js'] },
+          'mod-b': { chunks: ['/_next/static/chunks/shared.js', '/_next/static/chunks/b.js'] },
+        },
+      }),
+    );
+
+    const entries = readTurbopackEntries(dir);
+    const chunks = entries['/shop/page'];
+
+    assert.ok(chunks, 'should have /shop/page entry');
+
+    const sharedCount = chunks.filter((c) => c === 'static/chunks/shared.js').length;
+
+    assert.equal(sharedCount, 1, 'shared chunk should appear exactly once');
+    assert.equal(chunks.length, 3, 'should have 3 unique chunks');
+  });
+
+  it('scans subdirectories recursively', () => {
+    const dir = join(testDir, `turbopack-recursive-${Date.now()}`);
+
+    mkdirSync(join(dir, 'nested', 'deep'), { recursive: true });
+    writeFileSync(
+      join(dir, 'nested', 'deep', 'page_client-reference-manifest.js'),
+      makeManifestContent({
+        '/nested/deep/page': { 'mod-a': { chunks: ['/_next/static/chunks/deep.js'] } },
+      }),
+    );
+
+    const entries = readTurbopackEntries(dir);
+
+    assert.ok(entries['/nested/deep/page'], 'should find manifest in nested directory');
+  });
+
+  it('skips malformed manifest files gracefully', () => {
+    const dir = join(testDir, `turbopack-malformed-${Date.now()}`);
+
+    mkdirSync(dir, { recursive: true });
+    writeFileSync(join(dir, 'bad_client-reference-manifest.js'), 'this is not valid JS {{{');
+    writeFileSync(
+      join(dir, 'good_client-reference-manifest.js'),
+      makeManifestContent({
+        '/valid/page': { 'mod-a': { chunks: ['/_next/static/chunks/valid.js'] } },
+      }),
+    );
+
+    // Should not throw, and should still return valid entries
+    assert.doesNotThrow(() => readTurbopackEntries(dir));
+
+    const entries = readTurbopackEntries(dir);
+
+    assert.ok(entries['/valid/page'], 'should return valid entries even when another file is malformed');
+  });
+
+  it('returns empty object when no manifest files exist', () => {
+    const dir = join(testDir, `turbopack-empty-${Date.now()}`);
+
+    mkdirSync(dir, { recursive: true });
+
+    const entries = readTurbopackEntries(dir);
+
+    assert.deepEqual(entries, {});
+  });
+
+  it('returns empty object when manifests have no __RSC_MANIFEST', () => {
+    const dir = join(testDir, `turbopack-no-rsc-${Date.now()}`);
+
+    mkdirSync(dir, { recursive: true });
+    writeFileSync(
+      join(dir, 'page_client-reference-manifest.js'),
+      'globalThis.somethingElse = {};',
+    );
+
+    const entries = readTurbopackEntries(dir);
+
+    assert.deepEqual(entries, {});
+  });
+});
+
 // ---------------------------------------------------------------------------
 // getGzipSize
 // ---------------------------------------------------------------------------
diff --git a/.github/scripts/bundle-size.mts b/.github/scripts/bundle-size.mts
index 1d7286a3f2..ee1961b592 100644
--- a/.github/scripts/bundle-size.mts
+++ b/.github/scripts/bundle-size.mts
@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 /* eslint-disable no-console, no-restricted-syntax, no-plusplus, no-continue */
 
-import { existsSync, readFileSync, writeFileSync } from "node:fs";
+import { existsSync, readFileSync, readdirSync, writeFileSync } from "node:fs";
 import { dirname, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import { parseArgs } from "node:util";
@@ -190,6 +190,59 @@ function computeRouteMetrics(
   return routes;
 }
 
+function readTurbopackEntries(serverAppDir: string): Record<string, string[]> {
+  const entries: Record<string, string[]> = {};
+
+  function scanDir(dir: string): void {
+    const items = readdirSync(dir, { withFileTypes: true });
+
+    for (const item of items) {
+      const fullPath = join(dir, item.name);
+
+      if (item.isDirectory()) {
+        scanDir(fullPath);
+      } else if (item.name.endsWith("_client-reference-manifest.js")) {
+        try {
+          const content = readFileSync(fullPath, "utf-8");
+          const g: Record<string, unknown> = {};
+          // eslint-disable-next-line no-new-func
+          const fn = new Function("globalThis", "self", `${content}\nreturn globalThis;`);
+          const result = fn(g, g) as {
+            __RSC_MANIFEST?: Record<
+              string,
+              { clientModules?: Record<string, { chunks?: string[] }> }
+            >;
+          };
+          const manifest = result.__RSC_MANIFEST;
+
+          if (!manifest) continue;
+
+          for (const [routeKey, entry] of Object.entries(manifest)) {
+            if (!routeKey.endsWith("/page")) continue;
+
+            const chunks = new Set<string>();
+
+            for (const mod of Object.values(entry.clientModules ?? {})) {
+              for (const chunk of mod.chunks ?? []) {
+                // Normalize: "/_next/static/chunks/xxx.js" → "static/chunks/xxx.js"
+                chunks.add(chunk.replace(/^\/_next\//, ""));
+              }
+            }
+
+            entries[routeKey] = [...chunks];
+          }
+        } catch {
+          // Skip malformed manifest files
+        }
+      }
+    }
+  }
+
+  scanDir(serverAppDir);
+
+  return entries;
+}
+
 function compareReport(
   baseline: BundleReport,
   current: BundleReport,
@@ -320,17 +373,18 @@ function generate(
 ): void {
   const appManifestPath = join(nextDir, "app-build-manifest.json");
   const buildManifestPath = join(nextDir, "build-manifest.json");
+  const serverAppDir = join(nextDir, "server", "app");
 
-  if (!existsSync(appManifestPath)) {
+  const isWebpack = existsSync(appManifestPath);
+  const isTurbopack = !isWebpack && existsSync(serverAppDir);
+
+  if (!isWebpack && !isTurbopack) {
     console.error(
-      "Error: .next/app-build-manifest.json not found. Run `next build` first.",
+      "Error: No build output found (.next/app-build-manifest.json or .next/server/app/). Run `next build` first.",
     );
     process.exit(1);
   }
 
-  const appManifest = JSON.parse(readFileSync(appManifestPath, "utf-8")) as {
-    pages?: Record<string, string[]>;
-  };
   const buildManifest = JSON.parse(
     readFileSync(buildManifestPath, "utf-8"),
   ) as {
@@ -342,7 +396,17 @@ function generate(
   const polyfillFiles = new Set(buildManifest.polyfillFiles ?? []);
   const sharedChunks = new Set([...rootMainFiles, ...polyfillFiles]);
 
-  const entries = appManifest.pages ?? {};
+  let entries: Record<string, string[]>;
+
+  if (isWebpack) {
+    const appManifest = JSON.parse(readFileSync(appManifestPath, "utf-8")) as {
+      pages?: Record<string, string[]>;
+    };
+
+    entries = appManifest.pages ?? {};
+  } else {
+    entries = readTurbopackEntries(serverAppDir);
+  }
   const { layouts, pages } = parseManifestEntries(entries);
 
   // Shared JS = sum of rootMainFiles gzipped sizes
@@ -440,6 +504,7 @@ export {
   computeRouteMetrics,
   compareReport,
   clearSizeCache,
+  readTurbopackEntries,
 };
 
 export type { BundleReport, RouteMetric, ChunkSizes, CompareOptions };
diff --git a/package.json b/package.json
index a1d0fc6f70..74e3ef7161 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
     "build": "dotenv -e .env.local -- turbo run build",
     "lint": "dotenv -e .env.local -- turbo lint",
     "test": "turbo run test",
-    "test:scripts": "node --test .github/scripts/__tests__/*.test.mjs",
+    "test:scripts": "node --test .github/scripts/__tests__/*.test.mts",
     "typecheck": "turbo typecheck"
   },
   "devDependencies": {

From 5dcf35bfb7ee864a7a0068903d202c52a96135cb Mon Sep 17 00:00:00 2001
From: Jorge Moya <jorge.moya@bigcommerce.com>
Date: Mon, 9 Mar 2026 20:19:33 -0500
Subject: [PATCH 63/69] chore: compare unlighthouse reports preview vs
 production (#2904)

* chore: compare unlighthouse reports preview vs production

* fix: update labels and show scores from 0 to 100

* chore: add tests
---
 .../__tests__/compare-unlighthouse.test.mts   | 285 ++++++++++++++++++
 .../post-unlighthouse-comment.test.mts        | 273 +++++++++++++++++
 .github/scripts/compare-unlighthouse.mts      | 257 ++++++++++++++++
 .github/scripts/post-unlighthouse-comment.js  |  52 ++++
 .github/workflows/regression-tests.yml        | 159 +++++++++-
 5 files changed, 1018 insertions(+), 8 deletions(-)
 create mode 100644 .github/scripts/__tests__/compare-unlighthouse.test.mts
 create mode 100644 .github/scripts/__tests__/post-unlighthouse-comment.test.mts
 create mode 100644 .github/scripts/compare-unlighthouse.mts
 create mode 100644 .github/scripts/post-unlighthouse-comment.js

diff --git a/.github/scripts/__tests__/compare-unlighthouse.test.mts b/.github/scripts/__tests__/compare-unlighthouse.test.mts
new file mode 100644
index 0000000000..f09cd68db6
--- /dev/null
+++ b/.github/scripts/__tests__/compare-unlighthouse.test.mts
@@ -0,0 +1,285 @@
+import { describe, it } from 'node:test';
+import assert from 'node:assert/strict';
+
+import { compareResults } from '../compare-unlighthouse.mts';
+import type { CiResult } from '../compare-unlighthouse.mts';
+
+// ---------------------------------------------------------------------------
+// Fixtures
+// ---------------------------------------------------------------------------
+
+const DEFAULT_METRICS: CiResult['summary']['metrics'] = {
+  'largest-contentful-paint': { displayValue: '2.5 s' },
+  'cumulative-layout-shift': { displayValue: '0.01' },
+  'first-contentful-paint': { displayValue: '1.2 s' },
+  'total-blocking-time': { displayValue: '100 ms' },
+  'max-potential-fid': { displayValue: '200 ms' },
+  interactive: { displayValue: '3.5 s' },
+};
+
+function makeCiResult(overrides: {
+  score?: number;
+  performance?: number;
+  accessibility?: number;
+  'best-practices'?: number;
+  seo?: number;
+  metrics?: CiResult['summary']['metrics'];
+} = {}): CiResult {
+  return {
+    summary: {
+      score: overrides.score ?? 0.85,
+      categories: {
+        performance: { score: overrides.performance ?? 0.80 },
+        accessibility: { score: overrides.accessibility ?? 0.92 },
+        'best-practices': { score: overrides['best-practices'] ?? 1.0 },
+        seo: { score: overrides.seo ?? 0.90 },
+      },
+      metrics: overrides.metrics ?? { ...DEFAULT_METRICS },
+    },
+  };
+}
+
+const BASE = makeCiResult();
+
+// ---------------------------------------------------------------------------
+// hasChanges
+// ---------------------------------------------------------------------------
+
+describe('hasChanges', () => {
+  it('is false when all four results are identical', () => {
+    const { hasChanges } = compareResults(BASE, BASE, BASE, BASE, 1);
+
+    assert.equal(hasChanges, false);
+  });
+
+  it('is true when preview desktop summary score differs by exactly 1pp', () => {
+    const preview = makeCiResult({ score: 0.84 }); // 1pp below
+    const { hasChanges } = compareResults(BASE, BASE, preview, BASE, 1);
+
+    assert.equal(hasChanges, true);
+  });
+
+  it('is false when summary score differs by less than 1pp', () => {
+    const preview = makeCiResult({ score: 0.855 }); // 0.5pp above
+    const { hasChanges } = compareResults(BASE, BASE, preview, BASE, 1);
+
+    assert.equal(hasChanges, false);
+  });
+
+  it('is true when preview mobile summary score differs by >= 1pp', () => {
+    const previewMobile = makeCiResult({ score: 0.74 });
+    const { hasChanges } = compareResults(BASE, BASE, BASE, previewMobile, 1);
+
+    assert.equal(hasChanges, true);
+  });
+
+  it('is true when a category score differs by >= 1pp', () => {
+    const preview = makeCiResult({ performance: 0.79 }); // 1pp below 0.80
+    const { hasChanges } = compareResults(BASE, BASE, preview, BASE, 1);
+
+    assert.equal(hasChanges, true);
+  });
+
+  it('is false when category score differs by less than 1pp', () => {
+    const preview = makeCiResult({ performance: 0.805 }); // 0.5pp above
+    const { hasChanges } = compareResults(BASE, BASE, preview, BASE, 1);
+
+    assert.equal(hasChanges, false);
+  });
+
+  it('respects a custom threshold', () => {
+    // 2pp delta — true at threshold=1, false at threshold=3
+    const preview = makeCiResult({ score: 0.83 });
+
+    assert.equal(compareResults(BASE, BASE, preview, BASE, 1).hasChanges, true);
+    assert.equal(compareResults(BASE, BASE, preview, BASE, 3).hasChanges, false);
+  });
+});
+
+// ---------------------------------------------------------------------------
+// Report heading
+// ---------------------------------------------------------------------------
+
+describe('report heading', () => {
+  it('contains the comparison heading', () => {
+    const { markdown } = compareResults(BASE, BASE, BASE, BASE, 1);
+
+    assert.ok(
+      markdown.includes('## Unlighthouse Performance Comparison'),
+      'Missing main heading',
+    );
+  });
+
+  it('appends provider label when provider is given', () => {
+    const { markdown } = compareResults(BASE, BASE, BASE, BASE, 1, 'vercel');
+
+    assert.ok(
+      markdown.includes('## Unlighthouse Performance Comparison — Vercel'),
+      'Missing provider label in heading',
+    );
+  });
+
+  it('capitalises the provider label', () => {
+    const { markdown } = compareResults(BASE, BASE, BASE, BASE, 1, 'cloudflare');
+
+    assert.ok(markdown.includes('— Cloudflare'), 'Provider should be capitalised');
+  });
+
+  it('omits provider label when none provided', () => {
+    const { markdown } = compareResults(BASE, BASE, BASE, BASE, 1);
+
+    assert.ok(
+      !markdown.includes(' — '),
+      'Should not contain a provider label separator',
+    );
+  });
+
+  it('contains the description text', () => {
+    const { markdown } = compareResults(BASE, BASE, BASE, BASE, 1);
+
+    assert.ok(
+      markdown.includes(
+        'Comparing PR preview deployment Unlighthouse scores vs production Unlighthouse scores.',
+      ),
+    );
+  });
+});
+
+// ---------------------------------------------------------------------------
+// Summary Score section
+// ---------------------------------------------------------------------------
+
+describe('Summary Score section', () => {
+  it('contains the Summary Score heading', () => {
+    const { markdown } = compareResults(BASE, BASE, BASE, BASE, 1);
+
+    assert.ok(markdown.includes('### Summary Score'));
+  });
+
+  it('contains the aggregate score note', () => {
+    const { markdown } = compareResults(BASE, BASE, BASE, BASE, 1);
+
+    assert.ok(
+      markdown.includes(
+        'Aggregate score across all categories as reported by Unlighthouse.',
+      ),
+    );
+  });
+
+  it('renders scores as integers on a 1-100 scale', () => {
+    const prod = makeCiResult({ score: 0.85 });
+    const prev = makeCiResult({ score: 0.72 });
+    const { markdown } = compareResults(prod, prod, prev, prev, 1);
+
+    assert.ok(markdown.includes('| Score | 85 | 85 | 72 | 72 |'));
+  });
+
+  it('rounds fractional scores correctly', () => {
+    const prod = makeCiResult({ score: 0.856 }); // rounds to 86
+    const { markdown } = compareResults(prod, BASE, prod, BASE, 1);
+
+    assert.ok(markdown.includes('86'), 'Score 0.856 should round to 86');
+  });
+
+  it('contains the four-column header', () => {
+    const { markdown } = compareResults(BASE, BASE, BASE, BASE, 1);
+
+    assert.ok(
+      markdown.includes('| | Prod Desktop | Prod Mobile | Preview Desktop | Preview Mobile |'),
+    );
+  });
+});
+
+// ---------------------------------------------------------------------------
+// Category Scores section
+// ---------------------------------------------------------------------------
+
+describe('Category Scores section', () => {
+  it('contains the Category Scores heading', () => {
+    const { markdown } = compareResults(BASE, BASE, BASE, BASE, 1);
+
+    assert.ok(markdown.includes('### Category Scores'));
+  });
+
+  it('renders all four categories', () => {
+    const { markdown } = compareResults(BASE, BASE, BASE, BASE, 1);
+
+    assert.ok(markdown.includes('Performance'));
+    assert.ok(markdown.includes('Accessibility'));
+    assert.ok(markdown.includes('Best Practices'));
+    assert.ok(markdown.includes('SEO'));
+  });
+
+  it('renders category scores as integers on a 1-100 scale', () => {
+    const prod = makeCiResult({ performance: 0.80 });
+    const prev = makeCiResult({ performance: 0.93 });
+    const { markdown } = compareResults(prod, prod, prev, prev, 1);
+
+    assert.ok(
+      markdown.includes('| Performance | 80 | 80 | 93 | 93 |'),
+      'Performance row should contain all four scores as integers',
+    );
+  });
+
+  it('shows all four column values independently', () => {
+    const prodDesktop = makeCiResult({ seo: 0.88 });
+    const prodMobile = makeCiResult({ seo: 0.75 });
+    const prevDesktop = makeCiResult({ seo: 0.91 });
+    const prevMobile = makeCiResult({ seo: 0.82 });
+    const { markdown } = compareResults(prodDesktop, prodMobile, prevDesktop, prevMobile, 1);
+
+    assert.ok(markdown.includes('| SEO | 88 | 75 | 91 | 82 |'));
+  });
+});
+
+// ---------------------------------------------------------------------------
+// Core Web Vitals section
+// ---------------------------------------------------------------------------
+
+describe('Core Web Vitals section', () => {
+  it('contains the Core Web Vitals heading', () => {
+    const { markdown } = compareResults(BASE, BASE, BASE, BASE, 1);
+
+    assert.ok(markdown.includes('### Core Web Vitals'));
+  });
+
+  it('renders all six metrics', () => {
+    const { markdown } = compareResults(BASE, BASE, BASE, BASE, 1);
+
+    assert.ok(markdown.includes('LCP'));
+    assert.ok(markdown.includes('CLS'));
+    assert.ok(markdown.includes('FCP'));
+    assert.ok(markdown.includes('TBT'));
+    assert.ok(markdown.includes('Max Potential FID'));
+    assert.ok(markdown.includes('Time to Interactive'));
+  });
+
+  it('passes displayValue through unchanged', () => {
+    const ci = makeCiResult({
+      metrics: {
+        ...DEFAULT_METRICS,
+        'largest-contentful-paint': { displayValue: '4.8 s' },
+      },
+    });
+    const { markdown } = compareResults(ci, ci, ci, ci, 1);
+
+    assert.ok(markdown.includes('4.8 s'), 'displayValue should appear as-is');
+  });
+
+  it('shows — for a metric missing from a result', () => {
+    const ciMissingMetric = makeCiResult({ metrics: {} });
+    const { markdown } = compareResults(BASE, ciMissingMetric, BASE, BASE, 1);
+
+    assert.ok(markdown.includes('—'), 'Missing metric should show —');
+  });
+
+  it('shows four displayValues per metric row', () => {
+    const prodDesktop = makeCiResult({ metrics: { ...DEFAULT_METRICS, 'total-blocking-time': { displayValue: '80 ms' } } });
+    const prodMobile = makeCiResult({ metrics: { ...DEFAULT_METRICS, 'total-blocking-time': { displayValue: '320 ms' } } });
+    const prevDesktop = makeCiResult({ metrics: { ...DEFAULT_METRICS, 'total-blocking-time': { displayValue: '75 ms' } } });
+    const prevMobile = makeCiResult({ metrics: { ...DEFAULT_METRICS, 'total-blocking-time': { displayValue: '310 ms' } } });
+    const { markdown } = compareResults(prodDesktop, prodMobile, prevDesktop, prevMobile, 1);
+
+    assert.ok(markdown.includes('| TBT | 80 ms | 320 ms | 75 ms | 310 ms |'));
+  });
+});
diff --git a/.github/scripts/__tests__/post-unlighthouse-comment.test.mts b/.github/scripts/__tests__/post-unlighthouse-comment.test.mts
new file mode 100644
index 0000000000..e4b54db698
--- /dev/null
+++ b/.github/scripts/__tests__/post-unlighthouse-comment.test.mts
@@ -0,0 +1,273 @@
+import { describe, it, beforeEach } from 'node:test';
+import assert from 'node:assert/strict';
+import { writeFileSync, mkdirSync } from 'node:fs';
+import { join } from 'node:path';
+import { tmpdir } from 'node:os';
+import { createRequire } from 'node:module';
+
+const require = createRequire(import.meta.url);
+const postComment = require('../post-unlighthouse-comment.js') as (args: {
+  github: ReturnType<typeof makeGithub>['github'];
+  context: ReturnType<typeof makeContext>;
+  provider?: string;
+  reportPath?: string;
+  metaPath?: string;
+}) => Promise<void>;
+
+// ---------------------------------------------------------------------------
+// Helpers
+// ---------------------------------------------------------------------------
+
+interface Comment {
+  id: number;
+  body: string;
+}
+
+interface Calls {
+  listPrs: object[];
+  listComments: object[];
+  create: object[];
+  update: object[];
+}
+
+function makeGithub(opts: { prs?: { number: number }[]; comments?: Comment[] } = {}) {
+  const calls: Calls = { listPrs: [], listComments: [], create: [], update: [] };
+  const github = {
+    rest: {
+      repos: {
+        listPullRequestsAssociatedWithCommit: async (args: object) => {
+          calls.listPrs.push(args);
+          return { data: opts.prs ?? [{ number: 42 }] };
+        },
+      },
+      issues: {
+        listComments: async (args: object) => {
+          calls.listComments.push(args);
+          return { data: opts.comments ?? [] };
+        },
+        createComment: async (args: object) => {
+          calls.create.push(args);
+        },
+        updateComment: async (args: object) => {
+          calls.update.push(args);
+        },
+      },
+    },
+  };
+  return { github, calls };
+}
+
+function makeContext({
+  owner = 'test-owner',
+  repo = 'test-repo',
+  sha = 'abc123',
+  runId = 99,
+}: {
+  owner?: string;
+  repo?: string;
+  sha?: string;
+  runId?: number;
+} = {}) {
+  return {
+    repo: { owner, repo },
+    runId,
+    payload: {
+      deployment: { sha },
+    },
+  };
+}
+
+let tmpDir: string;
+let reportPath: string;
+let metaPath: string;
+
+beforeEach(() => {
+  tmpDir = join(tmpdir(), `post-unlighthouse-test-${Date.now()}`);
+  mkdirSync(tmpDir, { recursive: true });
+  reportPath = join(tmpDir, 'report.md');
+  metaPath = join(tmpDir, 'meta.json');
+  writeFileSync(reportPath, '## Unlighthouse Performance Comparison\n\nSome results.');
+  writeFileSync(metaPath, JSON.stringify({ hasChanges: true }));
+});
+
+// ---------------------------------------------------------------------------
+// Early exits
+// ---------------------------------------------------------------------------
+
+describe('early exits', () => {
+  it('does nothing when hasChanges is false', async () => {
+    writeFileSync(metaPath, JSON.stringify({ hasChanges: false }));
+    const { github, calls } = makeGithub();
+    await postComment({ github, context: makeContext(), reportPath, metaPath });
+
+    assert.equal(calls.create.length, 0);
+    assert.equal(calls.update.length, 0);
+  });
+
+  it('does nothing when deployment sha is missing', async () => {
+    const { github, calls } = makeGithub();
+    const context = { ...makeContext(), payload: {} };
+    await postComment({ github, context, reportPath, metaPath });
+
+    assert.equal(calls.create.length, 0);
+    assert.equal(calls.update.length, 0);
+  });
+
+  it('does nothing when no PR is associated with the sha', async () => {
+    const { github, calls } = makeGithub({ prs: [] });
+    await postComment({ github, context: makeContext(), reportPath, metaPath });
+
+    assert.equal(calls.create.length, 0);
+    assert.equal(calls.update.length, 0);
+  });
+});
+
+// ---------------------------------------------------------------------------
+// Comment creation
+// ---------------------------------------------------------------------------
+
+describe('comment creation', () => {
+  it('creates a comment when no existing comment has the marker', async () => {
+    const { github, calls } = makeGithub({ comments: [] });
+    await postComment({ github, context: makeContext(), reportPath, metaPath });
+
+    assert.equal(calls.create.length, 1);
+    assert.equal(calls.update.length, 0);
+  });
+
+  it('uses the PR number found from the commit sha', async () => {
+    const { github, calls } = makeGithub({ prs: [{ number: 77 }] });
+    await postComment({ github, context: makeContext(), reportPath, metaPath });
+
+    assert.equal((calls.create[0] as { issue_number: number }).issue_number, 77);
+  });
+
+  it('passes the correct owner and repo', async () => {
+    const { github, calls } = makeGithub();
+    await postComment({
+      github,
+      context: makeContext({ owner: 'my-org', repo: 'my-repo' }),
+      reportPath,
+      metaPath,
+    });
+
+    assert.equal((calls.create[0] as { owner: string }).owner, 'my-org');
+    assert.equal((calls.create[0] as { repo: string }).repo, 'my-repo');
+  });
+});
+
+// ---------------------------------------------------------------------------
+// Comment update
+// ---------------------------------------------------------------------------
+
+describe('comment update', () => {
+  it('updates an existing comment that contains the marker', async () => {
+    const marker = '<!-- unlighthouse-vercel-report -->';
+    const existing = { id: 55, body: `${marker}\nOld content` };
+    const { github, calls } = makeGithub({ comments: [existing] });
+    await postComment({ github, context: makeContext(), provider: 'vercel', reportPath, metaPath });
+
+    assert.equal(calls.update.length, 1);
+    assert.equal(calls.create.length, 0);
+    assert.equal((calls.update[0] as { comment_id: number }).comment_id, 55);
+  });
+
+  it('creates a new comment when existing comments do not contain the marker', async () => {
+    const comments = [
+      { id: 1, body: 'unrelated comment' },
+      { id: 2, body: '<!-- some-other-marker -->\nOther report' },
+    ];
+    const { github, calls } = makeGithub({ comments });
+    await postComment({ github, context: makeContext(), provider: 'vercel', reportPath, metaPath });
+
+    assert.equal(calls.create.length, 1);
+    assert.equal(calls.update.length, 0);
+  });
+});
+
+// ---------------------------------------------------------------------------
+// Comment body
+// ---------------------------------------------------------------------------
+
+describe('comment body', () => {
+  it('starts with the provider-specific marker', async () => {
+    const { github, calls } = makeGithub();
+    await postComment({ github, context: makeContext(), provider: 'vercel', reportPath, metaPath });
+
+    const body = (calls.create[0] as { body: string }).body;
+
+    assert.ok(
+      body.startsWith('<!-- unlighthouse-vercel-report -->\n'),
+      `Body should start with vercel marker, got: ${body.slice(0, 60)}`,
+    );
+  });
+
+  it('uses provider name in the marker', async () => {
+    const { github, calls } = makeGithub();
+    await postComment({ github, context: makeContext(), provider: 'cloudflare', reportPath, metaPath });
+
+    const body = (calls.create[0] as { body: string }).body;
+
+    assert.ok(body.includes('<!-- unlighthouse-cloudflare-report -->'));
+  });
+
+  it('includes the report file content', async () => {
+    const { github, calls } = makeGithub();
+    await postComment({ github, context: makeContext(), reportPath, metaPath });
+
+    const body = (calls.create[0] as { body: string }).body;
+
+    assert.ok(body.includes('## Unlighthouse Performance Comparison'));
+    assert.ok(body.includes('Some results.'));
+  });
+
+  it('includes the workflow run link', async () => {
+    const { github, calls } = makeGithub();
+    await postComment({
+      github,
+      context: makeContext({ owner: 'my-org', repo: 'my-repo', runId: 12345 }),
+      reportPath,
+      metaPath,
+    });
+
+    const body = (calls.create[0] as { body: string }).body;
+
+    assert.ok(
+      body.includes('https://github.com/my-org/my-repo/actions/runs/12345'),
+      'Body should contain the workflow run URL',
+    );
+  });
+
+  it('run link is not inside a table (preceded by a blank line)', async () => {
+    const { github, calls } = makeGithub();
+    await postComment({ github, context: makeContext(), reportPath, metaPath });
+
+    const body = (calls.create[0] as { body: string }).body;
+    const linkIndex = body.indexOf('[Full Unlighthouse report');
+
+    assert.ok(linkIndex > 0, 'Run link should be present');
+    // The character before the link text should be a newline (blank line separator)
+    assert.equal(body[linkIndex - 1], '\n', 'Run link should be preceded by a blank line');
+  });
+});
+
+// ---------------------------------------------------------------------------
+// Sha lookup
+// ---------------------------------------------------------------------------
+
+describe('sha lookup', () => {
+  it('passes the deployment sha to listPullRequestsAssociatedWithCommit', async () => {
+    const { github, calls } = makeGithub();
+    await postComment({
+      github,
+      context: makeContext({ sha: 'deadbeef' }),
+      reportPath,
+      metaPath,
+    });
+
+    assert.equal(
+      (calls.listPrs[0] as { commit_sha: string }).commit_sha,
+      'deadbeef',
+    );
+  });
+});
diff --git a/.github/scripts/compare-unlighthouse.mts b/.github/scripts/compare-unlighthouse.mts
new file mode 100644
index 0000000000..0b84ae2ec5
--- /dev/null
+++ b/.github/scripts/compare-unlighthouse.mts
@@ -0,0 +1,257 @@
+#!/usr/bin/env node
+/* eslint-disable no-console, no-restricted-syntax, no-plusplus, no-continue */
+
+import { existsSync, readFileSync, writeFileSync } from "node:fs";
+import { fileURLToPath } from "node:url";
+import { parseArgs } from "node:util";
+import { resolve } from "node:path";
+
+interface CiResult {
+  summary: {
+    score: number;
+    categories: Record<string, { score: number }>;
+    metrics: Record<string, { displayValue: string }>;
+  };
+}
+
+function loadCiResult(filePath: string): CiResult {
+  if (!existsSync(filePath)) {
+    console.error(`Error: file not found: ${filePath}`);
+    process.exit(1);
+  }
+
+  return JSON.parse(readFileSync(filePath, "utf-8")) as CiResult;
+}
+
+function score(value: number): string {
+  return String(Math.round(value * 100));
+}
+
+function row(
+  label: string,
+  prodDesktop: string,
+  prodMobile: string,
+  prevDesktop: string,
+  prevMobile: string,
+): string {
+  return `| ${label} | ${prodDesktop} | ${prodMobile} | ${prevDesktop} | ${prevMobile} |`;
+}
+
+const CATEGORY_ORDER = ["performance", "accessibility", "best-practices", "seo"];
+
+const CATEGORY_LABELS: Record<string, string> = {
+  performance: "Performance",
+  accessibility: "Accessibility",
+  "best-practices": "Best Practices",
+  seo: "SEO",
+};
+
+const METRIC_ORDER = [
+  "largest-contentful-paint",
+  "cumulative-layout-shift",
+  "first-contentful-paint",
+  "total-blocking-time",
+  "max-potential-fid",
+  "interactive",
+];
+
+const METRIC_LABELS: Record<string, string> = {
+  "largest-contentful-paint": "LCP",
+  "cumulative-layout-shift": "CLS",
+  "first-contentful-paint": "FCP",
+  "total-blocking-time": "TBT",
+  "max-potential-fid": "Max Potential FID",
+  interactive: "Time to Interactive",
+};
+
+const COL_HEADER =
+  "| | Prod Desktop | Prod Mobile | Preview Desktop | Preview Mobile |";
+const COL_SEP =
+  "|:-|:------------|:------------|:----------------|:---------------|";
+
+function compareResults(
+  productionDesktop: CiResult,
+  productionMobile: CiResult,
+  previewDesktop: CiResult,
+  previewMobile: CiResult,
+  threshold: number,
+  provider?: string,
+): { markdown: string; hasChanges: boolean } {
+  const thresholdDecimal = threshold / 100;
+
+  // hasChanges: any summary or category score pair differs by >= threshold
+  let hasChanges =
+    Math.abs(previewDesktop.summary.score - productionDesktop.summary.score) >=
+      thresholdDecimal ||
+    Math.abs(previewMobile.summary.score - productionMobile.summary.score) >=
+      thresholdDecimal;
+
+  if (!hasChanges) {
+    for (const id of CATEGORY_ORDER) {
+      const deltaDesktop = Math.abs(
+        (previewDesktop.summary.categories[id]?.score ?? 0) -
+          (productionDesktop.summary.categories[id]?.score ?? 0),
+      );
+      const deltaMobile = Math.abs(
+        (previewMobile.summary.categories[id]?.score ?? 0) -
+          (productionMobile.summary.categories[id]?.score ?? 0),
+      );
+
+      if (deltaDesktop >= thresholdDecimal || deltaMobile >= thresholdDecimal) {
+        hasChanges = true;
+        break;
+      }
+    }
+  }
+
+  const lines: string[] = [];
+
+  const providerLabel = provider
+    ? ` — ${provider.charAt(0).toUpperCase()}${provider.slice(1)}`
+    : "";
+
+  lines.push(`## Unlighthouse Performance Comparison${providerLabel}`);
+  lines.push(
+    "Comparing PR preview deployment Unlighthouse scores vs production Unlighthouse scores.",
+  );
+  lines.push("");
+
+  lines.push("### Summary Score");
+  lines.push(
+    "_Aggregate score across all categories as reported by Unlighthouse._",
+  );
+  lines.push("");
+  lines.push(COL_HEADER);
+  lines.push(COL_SEP);
+  lines.push(
+    row(
+      "Score",
+      score(productionDesktop.summary.score),
+      score(productionMobile.summary.score),
+      score(previewDesktop.summary.score),
+      score(previewMobile.summary.score),
+    ),
+  );
+  lines.push("");
+
+  lines.push("### Category Scores");
+  lines.push("");
+  lines.push(
+    "| Category | Prod Desktop | Prod Mobile | Preview Desktop | Preview Mobile |",
+  );
+  lines.push(
+    "|:---------|:------------|:------------|:----------------|:---------------|",
+  );
+
+  for (const id of CATEGORY_ORDER) {
+    lines.push(
+      row(
+        CATEGORY_LABELS[id] ?? id,
+        score(productionDesktop.summary.categories[id]?.score ?? 0),
+        score(productionMobile.summary.categories[id]?.score ?? 0),
+        score(previewDesktop.summary.categories[id]?.score ?? 0),
+        score(previewMobile.summary.categories[id]?.score ?? 0),
+      ),
+    );
+  }
+
+  lines.push("");
+
+  lines.push("### Core Web Vitals");
+  lines.push("");
+  lines.push(
+    "| Metric | Prod Desktop | Prod Mobile | Preview Desktop | Preview Mobile |",
+  );
+  lines.push(
+    "|:-------|:------------|:------------|:----------------|:---------------|",
+  );
+
+  for (const id of METRIC_ORDER) {
+    lines.push(
+      row(
+        METRIC_LABELS[id] ?? id,
+        productionDesktop.summary.metrics[id]?.displayValue ?? "—",
+        productionMobile.summary.metrics[id]?.displayValue ?? "—",
+        previewDesktop.summary.metrics[id]?.displayValue ?? "—",
+        previewMobile.summary.metrics[id]?.displayValue ?? "—",
+      ),
+    );
+  }
+
+  lines.push("");
+
+  return { markdown: lines.join("\n"), hasChanges };
+}
+
+export { compareResults };
+export type { CiResult };
+
+const isMain = process.argv[1] === fileURLToPath(import.meta.url);
+
+if (isMain) {
+  const { values } = parseArgs({
+    options: {
+      "preview-desktop": { type: "string" },
+      "preview-mobile": { type: "string" },
+      "production-desktop": { type: "string" },
+      "production-mobile": { type: "string" },
+      output: { type: "string" },
+      "meta-output": { type: "string" },
+      threshold: { type: "string" },
+      provider: { type: "string" },
+    },
+  });
+
+  const previewDesktopPath = values["preview-desktop"] ?? "";
+  const previewMobilePath = values["preview-mobile"] ?? "";
+  const productionDesktopPath = values["production-desktop"] ?? "";
+  const productionMobilePath = values["production-mobile"] ?? "";
+
+  if (
+    !previewDesktopPath ||
+    !previewMobilePath ||
+    !productionDesktopPath ||
+    !productionMobilePath
+  ) {
+    console.error(
+      "Usage: compare-unlighthouse.mts --preview-desktop <path> --preview-mobile <path> --production-desktop <path> --production-mobile <path> [--output <path>] [--meta-output <path>] [--threshold <n>] [--provider <name>]",
+    );
+    process.exit(1);
+  }
+
+  const threshold = Number(values.threshold ?? "1");
+
+  const previewDesktop = loadCiResult(resolve(previewDesktopPath));
+  const previewMobile = loadCiResult(resolve(previewMobilePath));
+  const productionDesktop = loadCiResult(resolve(productionDesktopPath));
+  const productionMobile = loadCiResult(resolve(productionMobilePath));
+
+  const { markdown, hasChanges } = compareResults(
+    productionDesktop,
+    productionMobile,
+    previewDesktop,
+    previewMobile,
+    threshold,
+    values.provider,
+  );
+
+  const outputPath = values.output ? resolve(values.output) : null;
+  const metaOutputPath = values["meta-output"]
+    ? resolve(values["meta-output"])
+    : null;
+
+  if (outputPath) {
+    writeFileSync(outputPath, markdown);
+    console.error(`Unlighthouse comparison report written to ${outputPath}`);
+  } else {
+    process.stdout.write(markdown);
+  }
+
+  if (metaOutputPath) {
+    writeFileSync(
+      metaOutputPath,
+      `${JSON.stringify({ hasChanges }, null, 2)}\n`,
+    );
+    console.error(`Meta output written to ${metaOutputPath}`);
+  }
+}
diff --git a/.github/scripts/post-unlighthouse-comment.js b/.github/scripts/post-unlighthouse-comment.js
new file mode 100644
index 0000000000..a71cc59437
--- /dev/null
+++ b/.github/scripts/post-unlighthouse-comment.js
@@ -0,0 +1,52 @@
+const fs = require('fs');
+
+module.exports = async ({ github, context, provider = 'unknown', reportPath = '/tmp/unlighthouse-report.md', metaPath = '/tmp/unlighthouse-meta.json' }) => {
+  // Exit early if no changes
+  const { hasChanges } = JSON.parse(fs.readFileSync(metaPath, 'utf-8'));
+
+  if (!hasChanges) return;
+
+  // Find PR from commit SHA (context.issue.number is 0 in deployment_status events;
+  // deployment.ref is also the SHA in Vercel deployments, not the branch name)
+  const sha = context.payload.deployment?.sha;
+
+  if (!sha) return;
+
+  const { data: prs } = await github.rest.repos.listPullRequestsAssociatedWithCommit({
+    owner: context.repo.owner,
+    repo: context.repo.repo,
+    commit_sha: sha,
+  });
+
+  const prNumber = prs[0]?.number;
+
+  if (!prNumber) return;
+
+  const runUrl = `https://github.com/${context.repo.owner}/${context.repo.repo}/actions/runs/${context.runId}`;
+  const marker = `<!-- unlighthouse-${provider}-report -->`;
+  const body = marker + '\n' + fs.readFileSync(reportPath, 'utf-8') + `\n[Full Unlighthouse report →](${runUrl})\n`;
+
+  const { data: comments } = await github.rest.issues.listComments({
+    owner: context.repo.owner,
+    repo: context.repo.repo,
+    issue_number: prNumber,
+  });
+
+  const existing = comments.find(c => c.body.includes(marker));
+
+  if (existing) {
+    await github.rest.issues.updateComment({
+      owner: context.repo.owner,
+      repo: context.repo.repo,
+      comment_id: existing.id,
+      body,
+    });
+  } else {
+    await github.rest.issues.createComment({
+      owner: context.repo.owner,
+      repo: context.repo.repo,
+      issue_number: prNumber,
+      body,
+    });
+  }
+};
diff --git a/.github/workflows/regression-tests.yml b/.github/workflows/regression-tests.yml
index 7442510925..327d7d5b49 100644
--- a/.github/workflows/regression-tests.yml
+++ b/.github/workflows/regression-tests.yml
@@ -12,8 +12,63 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  unlighthouse-audit:
-    name: Unlighthouse Audit - ${{ matrix.device }}
+  detect-provider:
+    name: Detect Deployment Provider
+    runs-on: ubuntu-latest
+    outputs:
+      provider: ${{ steps.detect.outputs.provider }}
+      is-preview: ${{ steps.detect.outputs.is-preview }}
+      production-url: ${{ steps.detect.outputs.production-url }}
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Detect provider and production URL
+        id: detect
+        run: |
+          CREATOR="${{ github.event.deployment_status.creator.login }}"
+          ENVIRONMENT="${{ github.event.deployment.environment }}"
+
+          if [[ "$CREATOR" == "vercel[bot]" ]]; then
+            echo "provider=vercel" >> $GITHUB_OUTPUT
+            if [[ "$ENVIRONMENT" == "Preview" ]]; then
+              echo "is-preview=true" >> $GITHUB_OUTPUT
+              PKG_NAME=$(node -p "require('./core/package.json').name")
+              case "$PKG_NAME" in
+                "@bigcommerce/catalyst-core")
+                  echo "production-url=https://canary.catalyst-demo.site/" >> $GITHUB_OUTPUT ;;
+                "@bigcommerce/catalyst-makeswift")
+                  echo "production-url=https://canary.makeswift.catalyst-demo.site" >> $GITHUB_OUTPUT ;;
+                *)
+                  echo "::warning::No production URL configured for package: $PKG_NAME. Skipping comparison."
+                  echo "production-url=" >> $GITHUB_OUTPUT ;;
+              esac
+            else
+              echo "is-preview=false" >> $GITHUB_OUTPUT
+              echo "production-url=" >> $GITHUB_OUTPUT
+            fi
+
+          elif [[ "$CREATOR" == "cloudflare-pages[bot]" ]]; then
+            echo "provider=cloudflare" >> $GITHUB_OUTPUT
+            if [[ "$ENVIRONMENT" == "Preview" ]]; then
+              echo "is-preview=true" >> $GITHUB_OUTPUT
+              echo "::warning::Cloudflare production URL not yet configured. Skipping comparison."
+              echo "production-url=" >> $GITHUB_OUTPUT
+            else
+              echo "is-preview=false" >> $GITHUB_OUTPUT
+              echo "production-url=" >> $GITHUB_OUTPUT
+            fi
+
+          else
+            echo "::warning::Unknown deployment provider: $CREATOR. Skipping audits."
+            echo "provider=unknown" >> $GITHUB_OUTPUT
+            echo "is-preview=false" >> $GITHUB_OUTPUT
+            echo "production-url=" >> $GITHUB_OUTPUT
+          fi
+
+  unlighthouse-audit-preview:
+    name: Unlighthouse Audit Preview (${{ needs.detect-provider.outputs.provider }}) - ${{ matrix.device }}
+    needs: [detect-provider]
+    if: needs.detect-provider.outputs.is-preview == 'true'
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -23,21 +78,109 @@ jobs:
       cancel-in-progress: true
 
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Install Dependencies
         run: npm install @unlighthouse/cli puppeteer -g
 
-      - name: Unlighthouse audit on ${{ matrix.device }}
-        run: unlighthouse-ci --site ${{ github.event.deployment_status.target_url }} --${{ matrix.device }} --disable-robots-txt --extra-headers x-vercel-protection-bypass=$VERCEL_PROTECTION_BYPASS,x-vercel-set-bypass-cookie=true
+      - name: Unlighthouse audit on ${{ matrix.device }} (preview)
+        env:
+          PROVIDER: ${{ needs.detect-provider.outputs.provider }}
+          PREVIEW_URL: ${{ github.event.deployment_status.target_url }}
+        run: |
+          if [[ "$PROVIDER" == "vercel" ]]; then
+            unlighthouse-ci --site "$PREVIEW_URL" --${{ matrix.device }} --disable-robots-txt \
+              --extra-headers "x-vercel-protection-bypass=$VERCEL_PROTECTION_BYPASS,x-vercel-set-bypass-cookie=true"
+          else
+            unlighthouse-ci --site "$PREVIEW_URL" --${{ matrix.device }} --disable-robots-txt
+          fi
 
-      - name: Upload ${{ matrix.device }} audit
+      - name: Upload ${{ matrix.device }} preview audit
         if: failure() || success()
         uses: actions/upload-artifact@v4
         with:
-          name: unlighthouse-vercel-${{ matrix.device }}-report
+          name: unlighthouse-preview-${{ matrix.device }}-report
           path: "./.unlighthouse/"
           include-hidden-files: "true"
+
+  unlighthouse-audit-production:
+    name: Unlighthouse Audit Production (${{ needs.detect-provider.outputs.provider }}) - ${{ matrix.device }}
+    needs: [detect-provider]
+    if: needs.detect-provider.outputs.is-preview == 'true' && needs.detect-provider.outputs.production-url != ''
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        device: [desktop, mobile]
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.ref }}-production-${{ matrix.device }}
+      cancel-in-progress: true
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install Dependencies
+        run: npm install @unlighthouse/cli puppeteer -g
+
+      - name: Unlighthouse audit on ${{ matrix.device }} (production)
+        env:
+          PRODUCTION_URL: ${{ needs.detect-provider.outputs.production-url }}
+        run: unlighthouse-ci --site "$PRODUCTION_URL" --${{ matrix.device }} --disable-robots-txt
+
+      - name: Upload ${{ matrix.device }} production audit
+        if: failure() || success()
+        uses: actions/upload-artifact@v4
+        with:
+          name: unlighthouse-production-${{ matrix.device }}-report
+          path: "./.unlighthouse/"
+          include-hidden-files: "true"
+
+  unlighthouse-compare:
+    name: Unlighthouse Compare & Comment (${{ needs.detect-provider.outputs.provider }})
+    needs: [detect-provider, unlighthouse-audit-preview, unlighthouse-audit-production]
+    if: needs.detect-provider.outputs.is-preview == 'true' && needs.detect-provider.outputs.production-url != ''
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version-file: ".nvmrc"
+
+      - name: Download all Unlighthouse artifacts
+        uses: actions/download-artifact@v4
+        with:
+          pattern: unlighthouse-*-report
+          path: /tmp/unlighthouse-artifacts
+          merge-multiple: false
+
+      - name: Compare audits
+        env:
+          PROVIDER: ${{ needs.detect-provider.outputs.provider }}
+        run: |
+          node .github/scripts/compare-unlighthouse.mts \
+            --preview-desktop    /tmp/unlighthouse-artifacts/unlighthouse-preview-desktop-report/ci-result.json \
+            --preview-mobile     /tmp/unlighthouse-artifacts/unlighthouse-preview-mobile-report/ci-result.json \
+            --production-desktop /tmp/unlighthouse-artifacts/unlighthouse-production-desktop-report/ci-result.json \
+            --production-mobile  /tmp/unlighthouse-artifacts/unlighthouse-production-mobile-report/ci-result.json \
+            --output /tmp/unlighthouse-report.md \
+            --meta-output /tmp/unlighthouse-meta.json \
+            --provider "$PROVIDER"
+          cat /tmp/unlighthouse-report.md >> "$GITHUB_STEP_SUMMARY"
+
+      - name: Post PR comment
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const postComment = require('./.github/scripts/post-unlighthouse-comment.js')
+            await postComment({
+              github,
+              context,
+              provider: '${{ needs.detect-provider.outputs.provider }}',
+              reportPath: '/tmp/unlighthouse-report.md',
+              metaPath: '/tmp/unlighthouse-meta.json',
+            })

From e3185b6f0612424af01b1515b440b6f43988da66 Mon Sep 17 00:00:00 2001
From: Chancellor Clark <chancellor.clark@bigcommerce.com>
Date: Tue, 10 Mar 2026 10:27:07 -0600
Subject: [PATCH 64/69] CATALYST-1532: fix(core) - Fix analytics visit count
 inflation (#2916)

Resolve inflated visitor counts caused by three issues:

- Visit cookie used a fixed TTL instead of a sliding window, creating
  new visits for users browsing longer than 30 minutes. Now refreshes
  the cookie TTL on every request.
- Prefetch and RSC requests triggered new visit and product view events.
  Now guards against Next-Router-Prefetch and RSC headers so only real
  navigations fire analytics mutations.
- Locale redirects from withIntl bypassed analytics entirely. Reorder
  middleware so withAnalyticsCookies runs before withIntl, ensuring
  cookies survive redirect responses.

Fixes CATALYST-1532

Co-authored-by: Claude <noreply@anthropic.com>
---
 .changeset/fix-analytics-visit-inflation.md |  5 ++++
 core/middleware.ts                          |  2 +-
 core/middlewares/with-analytics-cookies.ts  | 26 ++++++++++++++-------
 core/middlewares/with-routes.ts             |  7 +++++-
 4 files changed, 29 insertions(+), 11 deletions(-)
 create mode 100644 .changeset/fix-analytics-visit-inflation.md

diff --git a/.changeset/fix-analytics-visit-inflation.md b/.changeset/fix-analytics-visit-inflation.md
new file mode 100644
index 0000000000..c32fb63974
--- /dev/null
+++ b/.changeset/fix-analytics-visit-inflation.md
@@ -0,0 +1,5 @@
+---
+"@bigcommerce/catalyst-core": patch
+---
+
+Fix analytics visit count inflation by implementing a sliding window for the visit cookie TTL, guarding against prefetch/RSC requests creating spurious visits, and reordering middleware so analytics cookies survive locale redirects.
diff --git a/core/middleware.ts b/core/middleware.ts
index c068579f37..c810e2d9aa 100644
--- a/core/middleware.ts
+++ b/core/middleware.ts
@@ -7,8 +7,8 @@ import { withRoutes } from './middlewares/with-routes';
 
 export const middleware = composeMiddlewares(
   withAuth,
-  withIntl,
   withAnalyticsCookies,
+  withIntl,
   withChannelId,
   withRoutes,
 );
diff --git a/core/middlewares/with-analytics-cookies.ts b/core/middlewares/with-analytics-cookies.ts
index dc38e946a9..0d83a04243 100644
--- a/core/middlewares/with-analytics-cookies.ts
+++ b/core/middlewares/with-analytics-cookies.ts
@@ -12,22 +12,30 @@ import { MiddlewareFactory } from './compose-middlewares';
 
 export const withAnalyticsCookies: MiddlewareFactory = (next) => {
   return async (request, event) => {
-    let visitorId = await getVisitorIdCookie();
-    let visitId = await getVisitIdCookie();
+    const existingVisitorId = await getVisitorIdCookie();
+    const existingVisitId = await getVisitIdCookie();
 
-    if (!visitorId || !isUuid(visitorId)) {
-      visitorId = uuidv4();
-    }
+    const isPrefetch = request.headers.get('Next-Router-Prefetch') === '1';
+    const isRSC = request.headers.get('RSC') === '1';
+
+    const visitorId = existingVisitorId && isUuid(existingVisitorId) ? existingVisitorId : uuidv4();
 
-    // Update the visitorId cookie every time
     await setVisitorIdCookie(visitorId);
 
-    if (!visitId || !isUuid(visitId)) {
-      visitId = uuidv4();
-      await setVisitIdCookie(visitId);
+    const hasValidVisit = existingVisitId != null && isUuid(existingVisitId);
 
+    if (hasValidVisit) {
+      // Sliding window: refresh the TTL on every request
+      await setVisitIdCookie(existingVisitId);
+    } else if (!isPrefetch && !isRSC) {
+      // New visit on a real navigation: create cookie and fire event
+      const visitId = uuidv4();
+
+      await setVisitIdCookie(visitId);
       event.waitUntil(recordNewVisit(request, visitorId, visitId));
     }
+    // Prefetch/RSC with no valid visit: skip entirely so the
+    // subsequent real navigation properly detects a new visit.
 
     return next(request, event);
   };
diff --git a/core/middlewares/with-routes.ts b/core/middlewares/with-routes.ts
index 949f495ba7..4d0836d958 100644
--- a/core/middlewares/with-routes.ts
+++ b/core/middlewares/with-routes.ts
@@ -369,7 +369,12 @@ export const withRoutes: MiddlewareFactory = () => {
       case 'Product': {
         url = `/${locale}/product/${node.entityId}`;
 
-        event.waitUntil(recordProductVisit(request, node.entityId));
+        const isPrefetch = request.headers.get('Next-Router-Prefetch') === '1';
+        const isRSC = request.headers.get('RSC') === '1';
+
+        if (!isPrefetch && !isRSC) {
+          event.waitUntil(recordProductVisit(request, node.entityId));
+        }
 
         break;
       }

From a00e47467969e3f38c6034c804396d3160fc19ef Mon Sep 17 00:00:00 2001
From: Matthew Volk <matt.volk@bigcommerce.com>
Date: Tue, 10 Mar 2026 12:10:25 -0500
Subject: [PATCH 65/69] refactor(core): migrate middleware to proxy pattern
 (Next.js 16) (#2912)

Next.js 16 deprecates middleware.ts in favor of proxy.ts. This renames
the entry point, export, composition utilities, and directory to align
with the new convention.

Also enforces Node 24 via engines field in package.json, since proxy
runs on the Node.js runtime (not Edge).
---
 .changeset/upgrade-nextjs-16.md                |  2 ++
 core/AGENTS.md                                 | 12 ++++++------
 core/client/index.ts                           |  4 ++--
 core/middlewares/compose-middlewares.ts        | 18 ------------------
 core/package.json                              |  3 +++
 core/proxies/compose-proxies.ts                | 17 +++++++++++++++++
 .../with-analytics-cookies.ts                  |  4 ++--
 core/{middlewares => proxies}/with-auth.ts     |  6 +++---
 .../with-channel-id.ts                         |  4 ++--
 core/{middlewares => proxies}/with-intl.ts     |  6 +++---
 core/{middlewares => proxies}/with-routes.ts   |  4 ++--
 core/{middleware.ts => proxy.ts}               | 14 +++++++-------
 core/tests/ui/e2e/analytics-session.spec.ts    |  2 +-
 .../ui/e2e/auth/anonymous-session.spec.ts      |  4 ++--
 .../{middleware => proxy}/redirects.spec.ts    | 10 +++-------
 15 files changed, 55 insertions(+), 55 deletions(-)
 delete mode 100644 core/middlewares/compose-middlewares.ts
 create mode 100644 core/proxies/compose-proxies.ts
 rename core/{middlewares => proxies}/with-analytics-cookies.ts (92%)
 rename core/{middlewares => proxies}/with-auth.ts (90%)
 rename core/{middlewares => proxies}/with-channel-id.ts (71%)
 rename core/{middlewares => proxies}/with-intl.ts (84%)
 rename core/{middlewares => proxies}/with-routes.ts (99%)
 rename core/{middleware.ts => proxy.ts} (61%)
 rename core/tests/ui/e2e/{middleware => proxy}/redirects.spec.ts (89%)

diff --git a/.changeset/upgrade-nextjs-16.md b/.changeset/upgrade-nextjs-16.md
index b03e07327e..4db03eb9e8 100644
--- a/.changeset/upgrade-nextjs-16.md
+++ b/.changeset/upgrade-nextjs-16.md
@@ -10,3 +10,5 @@ To migrate your Catalyst storefront to Next.js 16:
 - Replace any usage of `unstable_expireTag` with `revalidateTag` and `unstable_expirePath` with `revalidatePath` from `next/cache`.
 - Update `tsconfig.json` to use `"moduleResolution": "bundler"` and `"module": "nodenext"` as required by Next.js 16.
 - Address Next.js 16 deprecation lint errors (e.g. legacy `<img>` elements, missing `rel="noopener noreferrer"` on external links).
+- Rename `middleware.ts` to `proxy.ts` and change `export const middleware` to `export const proxy` (Next.js 16 proxy pattern).
+- Ensure you are running Node.js 24+ (proxy runs on the Node.js runtime, not Edge).
diff --git a/core/AGENTS.md b/core/AGENTS.md
index 1d037c59bc..9c419ba898 100644
--- a/core/AGENTS.md
+++ b/core/AGENTS.md
@@ -10,13 +10,13 @@ This document provides guidance for Large Language Models (LLMs) working with th
 
 The main Next.js application is located in the `/core` directory, which contains the complete e-commerce storefront implementation. Other packages exist outside of `/core` but are not the primary focus for most development work.
 
-## Middleware Architecture
+## Proxy Architecture
 
-The application uses a composed middleware stack that significantly alters the default Next.js routing behavior. The middleware composition includes authentication, internationalization, analytics, channel handling, and most importantly, custom routing.
+The application uses the Next.js 16 proxy pattern (`proxy.ts`) with a composed proxy stack that significantly alters the default Next.js routing behavior. The proxy composition (in the `proxies/` directory) includes authentication, internationalization, analytics, channel handling, and most importantly, custom routing.
 
-### Custom Routing with `with-routes` Middleware
+### Custom Routing with `with-routes`
 
-The `with-routes` middleware is the most critical component that overrides Next.js's default path-based routing. Instead of relying on file-based routing, this middleware:
+The `with-routes` proxy is the most critical component that overrides Next.js's default path-based routing. Instead of relying on file-based routing, this proxy:
 
 1. **Queries the BigCommerce GraphQL API** to resolve incoming URL paths to specific entity types (products, categories, brands, blog posts, pages).
 
@@ -271,10 +271,10 @@ export default async function ProductPage({ params, searchParams }: Props) {
 3. **Progressive Enhancement**: Static content loads immediately with dynamic content streaming via PPR and Streamable
 4. **Vibes Separation**: Complete separation between data fetching (`page.tsx`) and presentation (`vibes/`) concerns
 5. **Centralized API Access**: All BigCommerce API interactions go through the configured GraphQL client
-6. **Middleware-First**: Critical functionality like routing, auth, and internationalization handled at the middleware layer
+6. **Proxy-First**: Critical functionality like routing, auth, and internationalization handled at the proxy layer
 
 ## Notes
 
-This codebase differs significantly from typical Next.js applications due to the custom routing middleware and e-commerce-specific patterns. The `with-routes` middleware essentially turns Next.js into a headless CMS router, where content structure is determined by the BigCommerce backend rather than the filesystem. Understanding this fundamental difference is crucial for working effectively with the codebase.
+This codebase differs significantly from typical Next.js applications due to the custom routing proxy and e-commerce-specific patterns. The `with-routes` proxy (composed within `proxy.ts`) essentially turns Next.js into a headless CMS router, where content structure is determined by the BigCommerce backend rather than the filesystem. Understanding this fundamental difference is crucial for working effectively with the codebase.
 
 The Streamable pattern and PPR integration provide excellent user experience through progressive loading, but require understanding of React's newer concurrent features like the `use()` hook and Suspense boundaries.
diff --git a/core/client/index.ts b/core/client/index.ts
index 51020b0053..d14bcb463b 100644
--- a/core/client/index.ts
+++ b/core/client/index.ts
@@ -21,11 +21,11 @@ const getLocale = async () => {
     return await getServerLocale();
   } catch {
     /**
-     * Next-intl `getLocale` only works on the server, and when middleware has run.
+     * Next-intl `getLocale` only works on the server, and when the proxy has run.
      *
      * Instances when `getLocale` will not work:
      * - Requests during next.config.ts resolution
-     * - Requests in middlewares
+     * - Requests in proxies
      * - Requests in `generateStaticParams`
      * - Request in api routes
      * - Requests in static sites without `setRequestLocale`
diff --git a/core/middlewares/compose-middlewares.ts b/core/middlewares/compose-middlewares.ts
deleted file mode 100644
index 14eb0f7f65..0000000000
--- a/core/middlewares/compose-middlewares.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { type NextProxy, NextResponse } from 'next/server';
-
-export type MiddlewareFactory = (middleware: NextProxy) => NextProxy;
-
-export const composeMiddlewares = (
-  firstMiddlewareWrapper: MiddlewareFactory,
-  ...otherMiddlewareWrappers: MiddlewareFactory[]
-): NextProxy => {
-  const middlewares = otherMiddlewareWrappers.reduce(
-    (accumulatedMiddlewares, nextMiddleware) => (middleware) =>
-      accumulatedMiddlewares(nextMiddleware(middleware)),
-    firstMiddlewareWrapper,
-  );
-
-  return middlewares(() => {
-    return NextResponse.next();
-  });
-};
diff --git a/core/package.json b/core/package.json
index 35723752a1..53f97be52a 100644
--- a/core/package.json
+++ b/core/package.json
@@ -3,6 +3,9 @@
   "description": "BigCommerce Catalyst is a Next.js starter kit for building headless BigCommerce storefronts.",
   "version": "1.4.2",
   "private": true,
+  "engines": {
+    "node": ">=24.0.0"
+  },
   "scripts": {
     "dev": "npm run generate && next dev",
     "generate": "dotenv -e .env.local -- node ./scripts/generate.cjs",
diff --git a/core/proxies/compose-proxies.ts b/core/proxies/compose-proxies.ts
new file mode 100644
index 0000000000..2085696ee3
--- /dev/null
+++ b/core/proxies/compose-proxies.ts
@@ -0,0 +1,17 @@
+import { type NextProxy, NextResponse } from 'next/server';
+
+export type ProxyFactory = (proxy: NextProxy) => NextProxy;
+
+export const composeProxies = (
+  firstProxyWrapper: ProxyFactory,
+  ...otherProxyWrappers: ProxyFactory[]
+): NextProxy => {
+  const proxies = otherProxyWrappers.reduce(
+    (accumulatedProxies, nextProxy) => (proxy) => accumulatedProxies(nextProxy(proxy)),
+    firstProxyWrapper,
+  );
+
+  return proxies(() => {
+    return NextResponse.next();
+  });
+};
diff --git a/core/middlewares/with-analytics-cookies.ts b/core/proxies/with-analytics-cookies.ts
similarity index 92%
rename from core/middlewares/with-analytics-cookies.ts
rename to core/proxies/with-analytics-cookies.ts
index 0d83a04243..f77e43b609 100644
--- a/core/middlewares/with-analytics-cookies.ts
+++ b/core/proxies/with-analytics-cookies.ts
@@ -8,9 +8,9 @@ import {
 } from '~/lib/analytics/bigcommerce';
 import { sendVisitStartedEvent } from '~/lib/analytics/bigcommerce/data-events';
 
-import { MiddlewareFactory } from './compose-middlewares';
+import { ProxyFactory } from './compose-proxies';
 
-export const withAnalyticsCookies: MiddlewareFactory = (next) => {
+export const withAnalyticsCookies: ProxyFactory = (next) => {
   return async (request, event) => {
     const existingVisitorId = await getVisitorIdCookie();
     const existingVisitId = await getVisitIdCookie();
diff --git a/core/middlewares/with-auth.ts b/core/proxies/with-auth.ts
similarity index 90%
rename from core/middlewares/with-auth.ts
rename to core/proxies/with-auth.ts
index d69f992a1e..2371adcffb 100644
--- a/core/middlewares/with-auth.ts
+++ b/core/proxies/with-auth.ts
@@ -2,7 +2,7 @@ import { NextResponse, URLPattern } from 'next/server';
 
 import { anonymousSignIn, auth, clearAnonymousSession, getAnonymousSession } from '~/auth';
 
-import { type MiddlewareFactory } from './compose-middlewares';
+import { type ProxyFactory } from './compose-proxies';
 
 // Path matcher for any routes that require authentication
 const protectedPathPattern = new URLPattern({ pathname: `{/:locale}?/(account)/*` });
@@ -11,7 +11,7 @@ function redirectToLogin(url: string) {
   return NextResponse.redirect(new URL('/login', url), { status: 302 });
 }
 
-export const withAuth: MiddlewareFactory = (next) => {
+export const withAuth: ProxyFactory = (next) => {
   return async (request, event) => {
     return auth(async (req) => {
       const anonymousSession = await getAnonymousSession();
@@ -42,7 +42,7 @@ export const withAuth: MiddlewareFactory = (next) => {
         return redirectToLogin(req.url);
       }
 
-      // Continue the middleware chain
+      // Continue the proxy chain
       return next(req, event);
     })(request, event);
   };
diff --git a/core/middlewares/with-channel-id.ts b/core/proxies/with-channel-id.ts
similarity index 71%
rename from core/middlewares/with-channel-id.ts
rename to core/proxies/with-channel-id.ts
index ec3e3cb1f6..2708526815 100644
--- a/core/middlewares/with-channel-id.ts
+++ b/core/proxies/with-channel-id.ts
@@ -1,8 +1,8 @@
 import { getChannelIdFromLocale } from '~/channels.config';
 
-import { type MiddlewareFactory } from './compose-middlewares';
+import { type ProxyFactory } from './compose-proxies';
 
-export const withChannelId: MiddlewareFactory = (next) => {
+export const withChannelId: ProxyFactory = (next) => {
   return (request, event) => {
     const locale = request.headers.get('x-bc-locale') ?? '';
     const channelId = getChannelIdFromLocale(locale) ?? '';
diff --git a/core/middlewares/with-intl.ts b/core/proxies/with-intl.ts
similarity index 84%
rename from core/middlewares/with-intl.ts
rename to core/proxies/with-intl.ts
index 64d58bb535..3859540914 100644
--- a/core/middlewares/with-intl.ts
+++ b/core/proxies/with-intl.ts
@@ -2,11 +2,11 @@ import createMiddleware from 'next-intl/middleware';
 
 import { routing } from '~/i18n/routing';
 
-import { type MiddlewareFactory } from './compose-middlewares';
+import { type ProxyFactory } from './compose-proxies';
 
 const intlMiddleware = createMiddleware(routing);
 
-export const withIntl: MiddlewareFactory = (next) => {
+export const withIntl: ProxyFactory = (next) => {
   return async (request, event) => {
     const intlResponse = intlMiddleware(request);
 
@@ -20,7 +20,7 @@ export const withIntl: MiddlewareFactory = (next) => {
 
     request.headers.set('x-bc-locale', locale);
 
-    // Continue the middleware chain
+    // Continue the proxy chain
     const response = await next(request, event);
 
     // Copy headers from intlResponse to response, excluding 'x-middleware-rewrite'
diff --git a/core/middlewares/with-routes.ts b/core/proxies/with-routes.ts
similarity index 99%
rename from core/middlewares/with-routes.ts
rename to core/proxies/with-routes.ts
index 4d0836d958..5e8d6901e1 100644
--- a/core/middlewares/with-routes.ts
+++ b/core/proxies/with-routes.ts
@@ -10,7 +10,7 @@ import { kvKey, STORE_STATUS_KEY } from '~/lib/kv/keys';
 
 import { kv } from '../lib/kv';
 
-import { type MiddlewareFactory } from './compose-middlewares';
+import { type ProxyFactory } from './compose-proxies';
 
 const trailingSlashDisabled = process.env.TRAILING_SLASH === 'false';
 
@@ -285,7 +285,7 @@ const getRouteInfo = async (request: NextRequest, event: NextFetchEvent) => {
   }
 };
 
-export const withRoutes: MiddlewareFactory = () => {
+export const withRoutes: ProxyFactory = () => {
   // eslint-disable-next-line complexity
   return async (request, event) => {
     const locale = request.headers.get('x-bc-locale') ?? '';
diff --git a/core/middleware.ts b/core/proxy.ts
similarity index 61%
rename from core/middleware.ts
rename to core/proxy.ts
index c810e2d9aa..1caaac78d5 100644
--- a/core/middleware.ts
+++ b/core/proxy.ts
@@ -1,11 +1,11 @@
-import { composeMiddlewares } from './middlewares/compose-middlewares';
-import { withAnalyticsCookies } from './middlewares/with-analytics-cookies';
-import { withAuth } from './middlewares/with-auth';
-import { withChannelId } from './middlewares/with-channel-id';
-import { withIntl } from './middlewares/with-intl';
-import { withRoutes } from './middlewares/with-routes';
+import { composeProxies } from './proxies/compose-proxies';
+import { withAnalyticsCookies } from './proxies/with-analytics-cookies';
+import { withAuth } from './proxies/with-auth';
+import { withChannelId } from './proxies/with-channel-id';
+import { withIntl } from './proxies/with-intl';
+import { withRoutes } from './proxies/with-routes';
 
-export const middleware = composeMiddlewares(
+export const proxy = composeProxies(
   withAuth,
   withAnalyticsCookies,
   withIntl,
diff --git a/core/tests/ui/e2e/analytics-session.spec.ts b/core/tests/ui/e2e/analytics-session.spec.ts
index 4ad25450bd..e2e37f9b76 100644
--- a/core/tests/ui/e2e/analytics-session.spec.ts
+++ b/core/tests/ui/e2e/analytics-session.spec.ts
@@ -8,7 +8,7 @@ const CookieSchema = z.object({
   expires: z.number().optional(),
 });
 
-test.describe('Analytics cookies middleware', () => {
+test.describe('Analytics cookies proxy', () => {
   test('sets visitorId and visitId cookies on first visit', async ({ page, context }) => {
     await page.goto('/');
 
diff --git a/core/tests/ui/e2e/auth/anonymous-session.spec.ts b/core/tests/ui/e2e/auth/anonymous-session.spec.ts
index f2b1eb00ed..cf7da1781c 100644
--- a/core/tests/ui/e2e/auth/anonymous-session.spec.ts
+++ b/core/tests/ui/e2e/auth/anonymous-session.spec.ts
@@ -1,6 +1,6 @@
 import { expect, test } from '~/tests/fixtures';
 
-test.describe('Anonymous session middleware', () => {
+test.describe('Anonymous session proxy', () => {
   test('handles invalid anonymous JWT cookie gracefully', async ({ page, context }) => {
     // Set an invalid anonymous JWT cookie to simulate the issue
     await context.addCookies([
@@ -23,7 +23,7 @@ test.describe('Anonymous session middleware', () => {
       }
     });
 
-    // Navigate to the homepage - this should trigger the middleware
+    // Navigate to the homepage - this should trigger the proxy
     await page.goto('/');
 
     // The page should load successfully despite the invalid cookie
diff --git a/core/tests/ui/e2e/middleware/redirects.spec.ts b/core/tests/ui/e2e/proxy/redirects.spec.ts
similarity index 89%
rename from core/tests/ui/e2e/middleware/redirects.spec.ts
rename to core/tests/ui/e2e/proxy/redirects.spec.ts
index 8d236551b8..1b7e6052d2 100644
--- a/core/tests/ui/e2e/middleware/redirects.spec.ts
+++ b/core/tests/ui/e2e/proxy/redirects.spec.ts
@@ -4,11 +4,7 @@ import { testEnv } from '~/tests/environment';
 import { expect, test } from '~/tests/fixtures';
 import { TAGS } from '~/tests/tags';
 
-test('Middleware follows a dynamic 301 redirect correctly', async ({
-  page,
-  catalog,
-  redirects,
-}) => {
+test('Proxy follows a dynamic 301 redirect correctly', async ({ page, catalog, redirects }) => {
   const redirectFrom = `/test-dynamic-redirect-${faker.string.alpha(6)}`;
   const product = await catalog.getDefaultOrCreateSimpleProduct();
 
@@ -24,7 +20,7 @@ test('Middleware follows a dynamic 301 redirect correctly', async ({
   await expect(page).toHaveURL(product.customUrl.url);
 });
 
-test('Middleware follows a manual redirect correctly', async ({ page, redirects }) => {
+test('Proxy follows a manual redirect correctly', async ({ page, redirects }) => {
   const fromPath = `/test-manual-redirect-${faker.string.alpha(6)}`;
   const toPath = `/test-manual-destination-${faker.string.alpha(6)}`;
 
@@ -41,7 +37,7 @@ test('Middleware follows a manual redirect correctly', async ({ page, redirects
   await expect(page).toHaveURL(toPath);
 });
 
-test('Middleware follows redirects in respect to capitalization', async ({ page, redirects }) => {
+test('Proxy follows redirects in respect to capitalization', async ({ page, redirects }) => {
   const fromPath = '/path-test';
   const toPath = '/path-TEST';
 

From 3bb96a6323bd44657bc063329093d54f29272af0 Mon Sep 17 00:00:00 2001
From: Matthew Volk <matt.volk@bigcommerce.com>
Date: Tue, 10 Mar 2026 14:45:53 -0500
Subject: [PATCH 66/69] ci: add MAKESWIFT_SITE_API_KEY to e2e and bundle-size
 workflows (#2918)

---
 .github/workflows/bundle-size.yml | 1 +
 .github/workflows/e2e.yml         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/bundle-size.yml b/.github/workflows/bundle-size.yml
index 2e640f18ad..9744ec6a74 100644
--- a/.github/workflows/bundle-size.yml
+++ b/.github/workflows/bundle-size.yml
@@ -19,6 +19,7 @@ env:
   BIGCOMMERCE_CLIENT_SECRET: ${{ secrets.BIGCOMMERCE_CLIENT_SECRET }}
   BIGCOMMERCE_STOREFRONT_TOKEN: ${{ secrets.BIGCOMMERCE_STOREFRONT_TOKEN }}
   BIGCOMMERCE_ACCESS_TOKEN: ${{ secrets.BIGCOMMERCE_ACCESS_TOKEN }}
+  MAKESWIFT_SITE_API_KEY: ${{ secrets.MAKESWIFT_SITE_API_KEY }}
 
 jobs:
   build-pr:
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 657f562574..51fe612489 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -22,6 +22,7 @@ env:
   TESTS_READ_ONLY: ${{ vars.TESTS_READ_ONLY }}
   DEFAULT_PRODUCT_ID: ${{ vars.DEFAULT_PRODUCT_ID }}
   DEFAULT_COMPLEX_PRODUCT_ID: ${{ vars.DEFAULT_COMPLEX_PRODUCT_ID }}
+  MAKESWIFT_SITE_API_KEY: ${{ secrets.MAKESWIFT_SITE_API_KEY }}
 
 jobs:
   e2e-tests:

From 32be6443457965467fb793e524347a9e43a9338e Mon Sep 17 00:00:00 2001
From: Matthew Volk <matt.volk@bigcommerce.com>
Date: Tue, 10 Mar 2026 17:01:47 -0500
Subject: [PATCH 67/69] fix(core): fix layout shift on makeswift page
 navigation

fix(core): fix layout shift on makeswift page navigation
---
 .changeset/fix-layout-shift.md | 5 +++++
 core/package.json              | 2 +-
 pnpm-lock.yaml                 | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/fix-layout-shift.md

diff --git a/.changeset/fix-layout-shift.md b/.changeset/fix-layout-shift.md
new file mode 100644
index 0000000000..8f31fc5b5b
--- /dev/null
+++ b/.changeset/fix-layout-shift.md
@@ -0,0 +1,5 @@
+---
+"@bigcommerce/catalyst-makeswift": patch
+---
+
+Upgrade `@makeswift/runtime` to `0.26.3`, which uses the `<Activity>` API instead of `<Suspense>`. This fixes layout shift both when loading a Makeswift page directly and when client-side navigating from a non-Makeswift page to a Makeswift page after a hard refresh.
diff --git a/core/package.json b/core/package.json
index 87df3b429e..687802f38c 100644
--- a/core/package.json
+++ b/core/package.json
@@ -22,7 +22,7 @@
     "@conform-to/react": "^1.6.1",
     "@conform-to/zod": "^1.6.1",
     "@icons-pack/react-simple-icons": "^11.2.0",
-    "@makeswift/runtime": "^0.26.0",
+    "@makeswift/runtime": "^0.26.3",
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/api-logs": "^0.208.0",
     "@opentelemetry/instrumentation": "^0.208.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index dc76102cbc..e3ef2cf648 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -54,7 +54,7 @@ importers:
         specifier: ^11.2.0
         version: 11.2.0(react@19.1.5)
       '@makeswift/runtime':
-        specifier: ^0.26.0
+        specifier: ^0.26.3
         version: 0.26.3(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(next@16.1.6(@babel/core@7.27.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(babel-plugin-macros@3.1.0)(react-dom@19.1.5(react@19.1.5))(react@19.1.5))(react-dom@19.1.5(react@19.1.5))(react@19.1.5)
       '@opentelemetry/api':
         specifier: ^1.9.0

From 0d951ab190c6bf1573ca7de925ecb0017d954cb7 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 13 Mar 2026 10:35:05 -0500
Subject: [PATCH 68/69] Version Packages (`canary`) (#2853)

* Version Packages (`canary`)

* chore: trigger CI

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Matthew Volk <matt.volk@bigcommerce.com>
---
 .changeset/dynamic-imports-client.md        |   5 -
 .changeset/eager-nails-bake.md              |  10 -
 .changeset/fix-analytics-visit-inflation.md |   5 -
 .changeset/gentle-badgers-dress.md          |  22 -
 .changeset/hot-files-start.md               |  13 -
 .changeset/kind-gifts-update.md             |   5 -
 .changeset/legal-adults-look.md             |  53 ---
 .changeset/mighty-zebras-turn.md            |  20 -
 .changeset/new-onions-flash.md              | 228 ----------
 .changeset/quiet-tags-spread.md             |  77 ----
 .changeset/tender-toys-heal.md              |  15 -
 .changeset/translations-patch-2487e2ac.md   |   5 -
 .changeset/upgrade-nextjs-16.md             |  14 -
 core/CHANGELOG.md                           | 436 ++++++++++++++++++++
 core/package.json                           |   2 +-
 15 files changed, 437 insertions(+), 473 deletions(-)
 delete mode 100644 .changeset/dynamic-imports-client.md
 delete mode 100644 .changeset/eager-nails-bake.md
 delete mode 100644 .changeset/fix-analytics-visit-inflation.md
 delete mode 100644 .changeset/gentle-badgers-dress.md
 delete mode 100644 .changeset/hot-files-start.md
 delete mode 100644 .changeset/kind-gifts-update.md
 delete mode 100644 .changeset/legal-adults-look.md
 delete mode 100644 .changeset/mighty-zebras-turn.md
 delete mode 100644 .changeset/new-onions-flash.md
 delete mode 100644 .changeset/quiet-tags-spread.md
 delete mode 100644 .changeset/tender-toys-heal.md
 delete mode 100644 .changeset/translations-patch-2487e2ac.md
 delete mode 100644 .changeset/upgrade-nextjs-16.md

diff --git a/.changeset/dynamic-imports-client.md b/.changeset/dynamic-imports-client.md
deleted file mode 100644
index 041473e9ed..0000000000
--- a/.changeset/dynamic-imports-client.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@bigcommerce/catalyst-core": minor
----
-
-Use dynamic imports for next/headers, next/navigation, and next-intl/server in the client module to avoid AsyncLocalStorage poisoning during next.config.ts resolution
diff --git a/.changeset/eager-nails-bake.md b/.changeset/eager-nails-bake.md
deleted file mode 100644
index cce2f53695..0000000000
--- a/.changeset/eager-nails-bake.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-"@bigcommerce/catalyst-core": minor
----
-
-Fetch product inventory data with a separate GQL query with no caching
-
-## Migration
-The files to be rebased for this change to be applied are:
-- core/app/[locale]/(default)/product/[slug]/page-data.ts
-- core/app/[locale]/(default)/product/[slug]/page.tsx
\ No newline at end of file
diff --git a/.changeset/fix-analytics-visit-inflation.md b/.changeset/fix-analytics-visit-inflation.md
deleted file mode 100644
index c32fb63974..0000000000
--- a/.changeset/fix-analytics-visit-inflation.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@bigcommerce/catalyst-core": patch
----
-
-Fix analytics visit count inflation by implementing a sliding window for the visit cookie TTL, guarding against prefetch/RSC requests creating spurious visits, and reordering middleware so analytics cookies survive locale redirects.
diff --git a/.changeset/gentle-badgers-dress.md b/.changeset/gentle-badgers-dress.md
deleted file mode 100644
index 5b28203762..0000000000
--- a/.changeset/gentle-badgers-dress.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-"@bigcommerce/catalyst-core": patch
----
-
-Uses regular `dompurify` (DP) instead of `isomorphic-dompurify` (IDP), because IDP requires JSDOM. JSDOM doesn't work in edge-runtime environments even with nodejs compatibility. We only need it on the client anyways for the JSON-LD schema, so it doesn't need the isomorphic aspect of it. This also changes `core/app/[locale]/(default)/product/[slug]/_components/product-review-schema/product-review-schema.tsx` to be a client-component to enable `dompurify to work correctly.
-
-## Migration
-
-1. Remove the old dependency and add the new:
-```bash
-pnpm rm isomorphic-dompurify
-pnpm add dompurify -S
-```
-
-2. Change the import in `core/app/[locale]/(default)/product/[slug]/_components/product-review-schema/product-review-schema.tsx`:
-```diff
-- import DOMPurify from 'isomorphic-dompurify';
-+// eslint-disable-next-line import/no-named-as-default
-+import DOMPurify from 'dompurify';
-```
-
-3. Add the `'use client';` directive to the top of `core/app/[locale]/(default)/product/[slug]/_components/product-review-schema/product-review-schema.tsx`.
\ No newline at end of file
diff --git a/.changeset/hot-files-start.md b/.changeset/hot-files-start.md
deleted file mode 100644
index 26b01586dd..0000000000
--- a/.changeset/hot-files-start.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-"@bigcommerce/catalyst-core": patch
----
-
-Update forms to translate the form field validation errors
-
-## Migration
-
-Due to the amount of changes, it is recommended to just use the PR as a reference for migration.
-
-Detailed migration steps can be found on the PR here: 
-https://github.com/bigcommerce/catalyst/pull/2844
-
diff --git a/.changeset/kind-gifts-update.md b/.changeset/kind-gifts-update.md
deleted file mode 100644
index de04c862d9..0000000000
--- a/.changeset/kind-gifts-update.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@bigcommerce/catalyst-core": patch
----
-
-Fix GiftCertificateCard not updating when selecting a new amount on the gift certificate purchase form
diff --git a/.changeset/legal-adults-look.md b/.changeset/legal-adults-look.md
deleted file mode 100644
index 27d8b1d0cd..0000000000
--- a/.changeset/legal-adults-look.md
+++ /dev/null
@@ -1,53 +0,0 @@
----
-"@bigcommerce/catalyst-core": patch
----
-
-Use state abbreviation instead of entityId for cart shipping form state values. The shipping API expects state abbreviations, and using entityId caused form submissions to fail. Additionally, certain US military states that share the same abbreviation (AE) are now filtered out to prevent duplicate key issues and ambiguous submissions.
-
-## Migration steps
-
-### Step 1: Add blacklist for states with duplicate abbreviations
-
-Certain US states share the same abbreviation (AE), which causes issues with the shipping API and React select dropdowns. Add a blacklist to filter these out.
-
-Update `core/app/[locale]/(default)/cart/page.tsx`:
-
-```diff
-  const countries = shippingCountries.map((country) => ({
-    value: country.code,
-    label: country.name,
-  }));
-
-+ // These US states share the same abbreviation (AE), which causes issues:
-+ // 1. The shipping API uses abbreviations, so it can't distinguish between them
-+ // 2. React select dropdowns require unique keys, causing duplicate key warnings
-+ const blacklistedUSStates = new Set([
-+   'Armed Forces Africa',
-+   'Armed Forces Canada',
-+   'Armed Forces Middle East',
-+ ]);
-
-  const statesOrProvinces = shippingCountries.map((country) => ({
-```
-
-### Step 2: Use state abbreviation instead of entityId
-
-Update the state mapping to use `abbreviation` instead of `entityId`, and apply the blacklist filter for US states.
-
-Update `core/app/[locale]/(default)/cart/page.tsx`:
-
-```diff
-  const statesOrProvinces = shippingCountries.map((country) => ({
-    country: country.code,
--   states: country.statesOrProvinces.map((state) => ({
--     value: state.entityId.toString(),
--     label: state.name,
--   })),
-+   states: country.statesOrProvinces
-+     .filter((state) => country.code !== 'US' || !blacklistedUSStates.has(state.name))
-+     .map((state) => ({
-+       value: state.abbreviation,
-+       label: state.name,
-+     })),
-  }));
-```
diff --git a/.changeset/mighty-zebras-turn.md b/.changeset/mighty-zebras-turn.md
deleted file mode 100644
index b7cefb1893..0000000000
--- a/.changeset/mighty-zebras-turn.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-"@bigcommerce/catalyst-core": minor
----
-
-Add pagination support for the product gallery. When a product has more images than the initial page load, new images will load as batches once the user reaches the end of the existing thumbnails. Thumbnail images now will display in horizontal direction in all viewport sizes.
-
-## Migration
-
-1. Create the new server action file `core/app/[locale]/(default)/product/[slug]/_actions/get-more-images.ts` with a GraphQL query to fetch additional product images with pagination.
-
-2. Update the product page data fetching in `core/app/[locale]/(default)/product/[slug]/page-data.ts` to include `pageInfo` (with `hasNextPage` and `endCursor`) from the images query.
-
-3. Update `core/app/[locale]/(default)/product/[slug]/page.tsx` to pass the new pagination props (`pageInfo`, `productId`, `loadMoreAction`) to the `ProductDetail` component.
-
-4. The `ProductGallery` component now accepts optional props for pagination:
-   - `pageInfo?: { hasNextPage: boolean; endCursor: string | null }`
-   - `productId?: number`
-   - `loadMoreAction?: ProductGalleryLoadMoreAction`
-
-Due to the number of changes, it is recommended to use the PR as a reference for migration.
diff --git a/.changeset/new-onions-flash.md b/.changeset/new-onions-flash.md
deleted file mode 100644
index 15e0f6ec6e..0000000000
--- a/.changeset/new-onions-flash.md
+++ /dev/null
@@ -1,228 +0,0 @@
----
-"@bigcommerce/catalyst-core": patch
----
-
-Add canonical URLs and hreflang alternates for SEO. Pages now set `alternates.canonical` and `alternates.languages` in `generateMetadata` via the new `getMetadataAlternates` helper in `core/lib/seo/canonical.ts`. The helper fetches the vanity URL via GraphQL (`site.settings.url.vanityUrl`) and is cached per request. The default locale uses no path prefix; other locales use `/{locale}/path`. The root locale layout sets `metadataBase` to the configured vanity URL so canonical URLs resolve correctly. On Vercel preview deployments (`VERCEL_ENV=preview`), `metadataBase` and canonical/hreflang URLs use `VERCEL_URL` instead of the production vanity URL to prevent preview environments from generating SEO metadata pointing to production.
-
-## Migration steps
-
-### Step 1: Root layout metadata base
-
-The root locale layout now sets `metadataBase` from the vanity URL fetched via GraphQL. On Vercel preview deployments, `VERCEL_URL` is used instead so preview environments don't point to production. `URL.canParse` guards against malformed URLs.
-
-Update `core/app/[locale]/layout.tsx`:
-
-```diff
-+ const vanityUrl = data.site.settings?.url.vanityUrl;
-+
-+ // Use preview deployment URL so metadataBase (canonical, og:url) points at the preview, not production.
-+ let baseUrl: URL | undefined;
-+ const previewUrl =
-+   process.env.VERCEL_ENV === 'preview' ? `https://${process.env.VERCEL_URL}` : undefined;
-+
-+ if (previewUrl && URL.canParse(previewUrl)) {
-+   baseUrl = new URL(previewUrl);
-+ } else if (vanityUrl && URL.canParse(vanityUrl)) {
-+   baseUrl = new URL(vanityUrl);
-+ }
-+
-  return {
-+   metadataBase: baseUrl,
-    title: {
-```
-
-### Step 2: Canonical/hreflang base URL for preview environments
-
-The `getMetadataAlternates` function in `core/lib/seo/canonical.ts` now checks for a Vercel preview URL before falling back to the GraphQL vanity URL. `URL.canParse` guards against malformed URLs.
-
-Update `core/lib/seo/canonical.ts`:
-
-```diff
- export async function getMetadataAlternates(options: CanonicalUrlOptions) {
-   const { path, locale, includeAlternates = true } = options;
-
--  const baseUrl = await getVanityUrl();
-+  // Use preview deployment URL so canonical/hreflang URLs point at the preview, not production.
-+  const previewUrl =
-+    process.env.VERCEL_ENV === 'preview' ? `https://${process.env.VERCEL_URL}` : undefined;
-+  const baseUrl = previewUrl && URL.canParse(previewUrl) ? previewUrl : await getVanityUrl();
-```
-
-### Step 3: GraphQL fragment updates
-
-Add the `path` field to brand, blog post, and product queries so metadata can build canonical URLs.
-
-Update `core/app/[locale]/(default)/(faceted)/brand/[slug]/page-data.ts`:
-
-```diff
-  site {
-    brand(entityId: $entityId) {
-      name
-+     path
-      seo {
-```
-
-Update `core/app/[locale]/(default)/blog/[blogId]/page-data.ts`:
-
-```diff
-  author
-  htmlBody
-  name
-+ path
-  publishedDate {
-```
-
-Update `core/app/[locale]/(default)/product/[slug]/page-data.ts` (in the metadata query):
-
-```diff
-  site {
-    product(entityId: $entityId) {
-      name
-+     path
-      defaultImage {
-```
-
-### Step 4: Page metadata alternates
-
-Add the `getMetadataAlternates` import and set `alternates` in `generateMetadata` for each page. The function is async and must be awaited. Ensure `core/lib/seo/canonical.ts` exists (it is included in this release).
-
-Update `core/app/[locale]/(default)/page.tsx` (home):
-
-```diff
-+ import { Metadata } from 'next';
-  import { getFormatter, getTranslations, setRequestLocale } from 'next-intl/server';
-  ...
-+ import { getMetadataAlternates } from '~/lib/seo/canonical';
-  ...
-+ export async function generateMetadata({ params }: Props): Promise<Metadata> {
-+   const { locale } = await params;
-+   return {
-+     alternates: await getMetadataAlternates({ path: '/', locale }),
-+   };
-+ }
-+
-  export default async function Home({ params }: Props) {
-```
-
-For entity pages (product, category, brand, blog, blog post, webpage), add the import and include `alternates` in the existing `generateMetadata` return value using the entity `path` (or breadcrumb-derived path for category and webpage). Example for a brand page:
-
-```diff
-+ import { getMetadataAlternates } from '~/lib/seo/canonical';
-  ...
-  export async function generateMetadata(props: Props): Promise<Metadata> {
--   const { slug } = await props.params;
-+   const { slug, locale } = await props.params;
-    ...
-    return {
-      title: pageTitle || brand.name,
-      description: metaDescription,
-      keywords: metaKeywords ? metaKeywords.split(',') : null,
-+     alternates: await getMetadataAlternates({ path: brand.path, locale }),
-    };
-  }
-```
-
-### Step 5: Gift certificates pages
-
-Update `core/app/[locale]/(default)/gift-certificates/page.tsx`:
-
-```diff
-+ import { getMetadataAlternates } from '~/lib/seo/canonical';
-  ...
-  export async function generateMetadata({ params }: Props): Promise<Metadata> {
-    const { locale } = await params;
-    const t = await getTranslations({ locale, namespace: 'GiftCertificates' });
-
-    return {
-      title: t('title') || 'Gift certificates',
-+     alternates: await getMetadataAlternates({ path: '/gift-certificates', locale }),
-    };
-  }
-```
-
-Update `core/app/[locale]/(default)/gift-certificates/balance/page.tsx`:
-
-```diff
-+ import { getMetadataAlternates } from '~/lib/seo/canonical';
-  ...
-    return {
-      title: t('title') || 'Gift certificates - Check balance',
-+     alternates: await getMetadataAlternates({ path: '/gift-certificates/balance', locale }),
-    };
-```
-
-Add `generateMetadata` to `core/app/[locale]/(default)/gift-certificates/purchase/page.tsx`:
-
-```diff
-+ import { Metadata } from 'next';
-  import { getFormatter, getTranslations } from 'next-intl/server';
-  ...
-+ import { getMetadataAlternates } from '~/lib/seo/canonical';
-  ...
-+ export async function generateMetadata({ params }: Props): Promise<Metadata> {
-+   const { locale } = await params;
-+   const t = await getTranslations({ locale, namespace: 'GiftCertificates' });
-+
-+   return {
-+     title: t('Purchase.title'),
-+     alternates: await getMetadataAlternates({ path: '/gift-certificates/purchase', locale }),
-+   };
-+ }
-```
-
-### Step 6: Contact page
-
-Update `core/app/[locale]/(default)/webpages/[id]/contact/page.tsx`:
-
-```diff
-+ import { getMetadataAlternates } from '~/lib/seo/canonical';
-  ...
-  export async function generateMetadata({ params }: Props): Promise<Metadata> {
--   const { id } = await params;
-+   const { id, locale } = await params;
-    const webpage = await getWebPage(id);
-    const { pageTitle, metaDescription, metaKeywords } = webpage.seo;
-
-    return {
-      title: pageTitle || webpage.title,
-      description: metaDescription,
-      keywords: metaKeywords ? metaKeywords.split(',') : null,
-+     alternates: await getMetadataAlternates({ path: webpage.path, locale }),
-    };
-  }
-```
-
-### Step 7: Public wishlist page
-
-Update `core/app/[locale]/(default)/wishlist/[token]/page.tsx`:
-
-```diff
-+ import { getMetadataAlternates } from '~/lib/seo/canonical';
-  ...
-  export async function generateMetadata({ params, searchParams }: Props): Promise<Metadata> {
-    const { locale, token } = await params;
-    ...
-    return {
-      title: wishlist?.name ?? t('title'),
-+     alternates: await getMetadataAlternates({ path: `/wishlist/${token}`, locale }),
-    };
-  }
-```
-
-### Step 8: Compare page
-
-Update `core/app/[locale]/(default)/compare/page.tsx`:
-
-```diff
-+ import { getMetadataAlternates } from '~/lib/seo/canonical';
-  ...
-  export async function generateMetadata({ params }: Props): Promise<Metadata> {
-    const { locale } = await params;
-    const t = await getTranslations({ locale, namespace: 'Compare' });
-
-    return {
-      title: t('title'),
-+     alternates: await getMetadataAlternates({ path: '/compare', locale }),
-    };
-  }
-```
diff --git a/.changeset/quiet-tags-spread.md b/.changeset/quiet-tags-spread.md
deleted file mode 100644
index 7a3a75f8fe..0000000000
--- a/.changeset/quiet-tags-spread.md
+++ /dev/null
@@ -1,77 +0,0 @@
----
-"@bigcommerce/catalyst-core": patch
----
-
-Conditionally include optional SEO metadata fields in `generateMetadata` across page files. Fields `description`, `keywords`, `alternates`, and `openGraph` are now only included in the returned metadata object when they have a value, using spread syntax (`...(value && { key: value })`). Previously, these fields were always set — potentially assigning `null` or an empty string — which could cause Next.js to render empty `<meta>` tags.
-
-## Migration steps
-
-Update `generateMetadata` in the following pages to use conditional spread syntax for optional metadata fields:
-
-### brand, category, webpages (contact + normal)
-
-```diff
-  return {
-    title: pageTitle || entity.name,
--   description: metaDescription,
--   keywords: metaKeywords ? metaKeywords.split(',') : null,
-+   ...(metaDescription && { description: metaDescription }),
-+   ...(metaKeywords && { keywords: metaKeywords.split(',') }),
-  };
-```
-
-For `brand/[slug]/page.tsx`, also guard the `alternates` field:
-
-```diff
--   alternates: await getMetadataAlternates({ path: brand.path, locale }),
-+   ...(brand.path && { alternates: await getMetadataAlternates({ path: brand.path, locale }) }),
-```
-
-### blog/[blogId]/page.tsx
-
-```diff
-  return {
-    title: pageTitle || blogPost.name,
--   description: metaDescription,
--   keywords: metaKeywords ? metaKeywords.split(',') : null,
-+   ...(metaDescription && { description: metaDescription }),
-+   ...(metaKeywords && { keywords: metaKeywords.split(',') }),
-    ...(blogPost.path && {
-      alternates: await getMetadataAlternates({ path: blogPost.path, locale }),
-    }),
-  };
-```
-
-### product/[slug]/page.tsx
-
-```diff
-- keywords: metaKeywords ? metaKeywords.split(',') : null,
-+ ...(metaKeywords && { keywords: metaKeywords.split(',') }),
-- openGraph: url
--   ? {
--       images: [{ url, alt }],
--     }
--   : null,
-+ ...(url && { openGraph: { images: [{ url, alt }] } }),
-```
-
-### blog/page.tsx
-
-Extract the description to a variable and spread conditionally:
-
-```diff
-+ const description =
-+   blog?.description && blog.description.length > 150
-+     ? `${blog.description.substring(0, 150)}...`
-+     : blog?.description;
-+
-  return {
-    title: blog?.name ?? t('title'),
--   description:
--     blog?.description && blog.description.length > 150
--       ? `${blog.description.substring(0, 150)}...`
--       : blog?.description,
-+   ...(description && { description }),
-    ...(blog?.path && { alternates: await getMetadataAlternates({ path: blog.path, locale }) }),
-  };
-```
diff --git a/.changeset/tender-toys-heal.md b/.changeset/tender-toys-heal.md
deleted file mode 100644
index d7296856f6..0000000000
--- a/.changeset/tender-toys-heal.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-"@bigcommerce/catalyst-core": minor
----
-
-Add the following messages to each line item on cart page based on store inventory settings:
-- Fully/partially out-of-stock message if enabled on the store and the line item is currently out of stock
-- Ready-to-ship quantity if enabled on the store
-- Backordered quantity if enabled on the store
-
-## Migration
-For existing Catalyst stores, to get the newly added feature, simply rebase the existing code with the new release code. The files to be rebased for this change to be applied are:
-- core/app/[locale]/(default)/cart/page-data.ts
-- core/app/[locale]/(default)/cart/page.tsx
-- core/messages/en.json
-- core/vibes/soul/sections/cart/client.tsx
diff --git a/.changeset/translations-patch-2487e2ac.md b/.changeset/translations-patch-2487e2ac.md
deleted file mode 100644
index ad17b2636a..0000000000
--- a/.changeset/translations-patch-2487e2ac.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@bigcommerce/catalyst-core": patch
----
-
-Update translations.
diff --git a/.changeset/upgrade-nextjs-16.md b/.changeset/upgrade-nextjs-16.md
deleted file mode 100644
index 4db03eb9e8..0000000000
--- a/.changeset/upgrade-nextjs-16.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-"@bigcommerce/catalyst-core": minor
----
-
-Upgrade Next.js to v16 and align peer dependencies.
-
-To migrate your Catalyst storefront to Next.js 16:
-
-- Update `next` to `^16.0.0` in your `package.json` and install dependencies.
-- Replace any usage of `unstable_expireTag` with `revalidateTag` and `unstable_expirePath` with `revalidatePath` from `next/cache`.
-- Update `tsconfig.json` to use `"moduleResolution": "bundler"` and `"module": "nodenext"` as required by Next.js 16.
-- Address Next.js 16 deprecation lint errors (e.g. legacy `<img>` elements, missing `rel="noopener noreferrer"` on external links).
-- Rename `middleware.ts` to `proxy.ts` and change `export const middleware` to `export const proxy` (Next.js 16 proxy pattern).
-- Ensure you are running Node.js 24+ (proxy runs on the Node.js runtime, not Edge).
diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md
index 1baf2df611..c32f0b2025 100644
--- a/core/CHANGELOG.md
+++ b/core/CHANGELOG.md
@@ -1,5 +1,441 @@
 # Changelog
 
+## 1.5.0
+
+### Minor Changes
+
+- [#2905](https://github.com/bigcommerce/catalyst/pull/2905) [`6f788e9`](https://github.com/bigcommerce/catalyst/commit/6f788e95dbf6e21bd025a32173f5e2c8e81aee46) Thanks [@matthewvolk](https://github.com/matthewvolk)! - Use dynamic imports for next/headers, next/navigation, and next-intl/server in the client module to avoid AsyncLocalStorage poisoning during next.config.ts resolution
+
+- [#2801](https://github.com/bigcommerce/catalyst/pull/2801) [`18cfdc8`](https://github.com/bigcommerce/catalyst/commit/18cfdc8ca018c33ea49b462ecb6f055a153cd4ab) Thanks [@Tharaae](https://github.com/Tharaae)! - Fetch product inventory data with a separate GQL query with no caching
+
+  ## Migration
+
+  The files to be rebased for this change to be applied are:
+  - core/app/[locale]/(default)/product/[slug]/page-data.ts
+  - core/app/[locale]/(default)/product/[slug]/page.tsx
+
+- [#2863](https://github.com/bigcommerce/catalyst/pull/2863) [`6a23c90`](https://github.com/bigcommerce/catalyst/commit/6a23c90714b2218db45f17cebe395b21753157e7) Thanks [@jorgemoya](https://github.com/jorgemoya)! - Add pagination support for the product gallery. When a product has more images than the initial page load, new images will load as batches once the user reaches the end of the existing thumbnails. Thumbnail images now will display in horizontal direction in all viewport sizes.
+
+  ## Migration
+  1. Create the new server action file `core/app/[locale]/(default)/product/[slug]/_actions/get-more-images.ts` with a GraphQL query to fetch additional product images with pagination.
+  2. Update the product page data fetching in `core/app/[locale]/(default)/product/[slug]/page-data.ts` to include `pageInfo` (with `hasNextPage` and `endCursor`) from the images query.
+  3. Update `core/app/[locale]/(default)/product/[slug]/page.tsx` to pass the new pagination props (`pageInfo`, `productId`, `loadMoreAction`) to the `ProductDetail` component.
+  4. The `ProductGallery` component now accepts optional props for pagination:
+     - `pageInfo?: { hasNextPage: boolean; endCursor: string | null }`
+     - `productId?: number`
+     - `loadMoreAction?: ProductGalleryLoadMoreAction`
+
+  Due to the number of changes, it is recommended to use the PR as a reference for migration.
+
+- [#2758](https://github.com/bigcommerce/catalyst/pull/2758) [`d78bc85`](https://github.com/bigcommerce/catalyst/commit/d78bc85fa4a6ae39d2b99a347a3f9fc56725826a) Thanks [@Tharaae](https://github.com/Tharaae)! - Add the following messages to each line item on cart page based on store inventory settings:
+  - Fully/partially out-of-stock message if enabled on the store and the line item is currently out of stock
+  - Ready-to-ship quantity if enabled on the store
+  - Backordered quantity if enabled on the store
+
+  ## Migration
+
+  For existing Catalyst stores, to get the newly added feature, simply rebase the existing code with the new release code. The files to be rebased for this change to be applied are:
+  - core/app/[locale]/(default)/cart/page-data.ts
+  - core/app/[locale]/(default)/cart/page.tsx
+  - core/messages/en.json
+  - core/vibes/soul/sections/cart/client.tsx
+
+- [#2907](https://github.com/bigcommerce/catalyst/pull/2907) [`35adccb`](https://github.com/bigcommerce/catalyst/commit/35adccb0429f462efaa5bfb4cabf4d51b4a62522) Thanks [@matthewvolk](https://github.com/matthewvolk)! - Upgrade Next.js to v16 and align peer dependencies.
+
+  To migrate your Catalyst storefront to Next.js 16:
+  - Update `next` to `^16.0.0` in your `package.json` and install dependencies.
+  - Replace any usage of `unstable_expireTag` with `revalidateTag` and `unstable_expirePath` with `revalidatePath` from `next/cache`.
+  - Update `tsconfig.json` to use `"moduleResolution": "bundler"` and `"module": "nodenext"` as required by Next.js 16.
+  - Address Next.js 16 deprecation lint errors (e.g. legacy `<img>` elements, missing `rel="noopener noreferrer"` on external links).
+  - Rename `middleware.ts` to `proxy.ts` and change `export const middleware` to `export const proxy` (Next.js 16 proxy pattern).
+  - Ensure you are running Node.js 24+ (proxy runs on the Node.js runtime, not Edge).
+
+### Patch Changes
+
+- [#2916](https://github.com/bigcommerce/catalyst/pull/2916) [`e3185b6`](https://github.com/bigcommerce/catalyst/commit/e3185b6f0612424af01b1515b440b6f43988da66) Thanks [@chanceaclark](https://github.com/chanceaclark)! - Fix analytics visit count inflation by implementing a sliding window for the visit cookie TTL, guarding against prefetch/RSC requests creating spurious visits, and reordering middleware so analytics cookies survive locale redirects.
+
+- [#2852](https://github.com/bigcommerce/catalyst/pull/2852) [`a7395f1`](https://github.com/bigcommerce/catalyst/commit/a7395f1a6778fe93080e8fcb05dce423cbc3acc0) Thanks [@chanceaclark](https://github.com/chanceaclark)! - Uses regular `dompurify` (DP) instead of `isomorphic-dompurify` (IDP), because IDP requires JSDOM. JSDOM doesn't work in edge-runtime environments even with nodejs compatibility. We only need it on the client anyways for the JSON-LD schema, so it doesn't need the isomorphic aspect of it. This also changes `core/app/[locale]/(default)/product/[slug]/_components/product-review-schema/product-review-schema.tsx` to be a client-component to enable `dompurify to work correctly.
+
+  ## Migration
+  1. Remove the old dependency and add the new:
+
+  ```bash
+  pnpm rm isomorphic-dompurify
+  pnpm add dompurify -S
+  ```
+
+  2. Change the import in `core/app/[locale]/(default)/product/[slug]/_components/product-review-schema/product-review-schema.tsx`:
+
+  ```diff
+  - import DOMPurify from 'isomorphic-dompurify';
+  +// eslint-disable-next-line import/no-named-as-default
+  +import DOMPurify from 'dompurify';
+  ```
+
+  3. Add the `'use client';` directive to the top of `core/app/[locale]/(default)/product/[slug]/_components/product-review-schema/product-review-schema.tsx`.
+
+- [#2844](https://github.com/bigcommerce/catalyst/pull/2844) [`74dee6e`](https://github.com/bigcommerce/catalyst/commit/74dee6e6cafc57ea0e6eea94aafc4b38063352b1) Thanks [@jordanarldt](https://github.com/jordanarldt)! - Update forms to translate the form field validation errors
+
+  ## Migration
+
+  Due to the amount of changes, it is recommended to just use the PR as a reference for migration.
+
+  Detailed migration steps can be found on the PR here:
+  https://github.com/bigcommerce/catalyst/pull/2844
+
+- [#2901](https://github.com/bigcommerce/catalyst/pull/2901) [`8b5fee6`](https://github.com/bigcommerce/catalyst/commit/8b5fee6a1f396f000748d3e9bb65e44383148eb4) Thanks [@jordanarldt](https://github.com/jordanarldt)! - Fix GiftCertificateCard not updating when selecting a new amount on the gift certificate purchase form
+
+- [#2858](https://github.com/bigcommerce/catalyst/pull/2858) [`0633612`](https://github.com/bigcommerce/catalyst/commit/06336122585db5021de9028ed88e2bc48c6faede) Thanks [@jorgemoya](https://github.com/jorgemoya)! - Use state abbreviation instead of entityId for cart shipping form state values. The shipping API expects state abbreviations, and using entityId caused form submissions to fail. Additionally, certain US military states that share the same abbreviation (AE) are now filtered out to prevent duplicate key issues and ambiguous submissions.
+
+  ## Migration steps
+
+  ### Step 1: Add blacklist for states with duplicate abbreviations
+
+  Certain US states share the same abbreviation (AE), which causes issues with the shipping API and React select dropdowns. Add a blacklist to filter these out.
+
+  Update `core/app/[locale]/(default)/cart/page.tsx`:
+
+  ```diff
+    const countries = shippingCountries.map((country) => ({
+      value: country.code,
+      label: country.name,
+    }));
+
+  + // These US states share the same abbreviation (AE), which causes issues:
+  + // 1. The shipping API uses abbreviations, so it can't distinguish between them
+  + // 2. React select dropdowns require unique keys, causing duplicate key warnings
+  + const blacklistedUSStates = new Set([
+  +   'Armed Forces Africa',
+  +   'Armed Forces Canada',
+  +   'Armed Forces Middle East',
+  + ]);
+
+    const statesOrProvinces = shippingCountries.map((country) => ({
+  ```
+
+  ### Step 2: Use state abbreviation instead of entityId
+
+  Update the state mapping to use `abbreviation` instead of `entityId`, and apply the blacklist filter for US states.
+
+  Update `core/app/[locale]/(default)/cart/page.tsx`:
+
+  ```diff
+    const statesOrProvinces = shippingCountries.map((country) => ({
+      country: country.code,
+  -   states: country.statesOrProvinces.map((state) => ({
+  -     value: state.entityId.toString(),
+  -     label: state.name,
+  -   })),
+  +   states: country.statesOrProvinces
+  +     .filter((state) => country.code !== 'US' || !blacklistedUSStates.has(state.name))
+  +     .map((state) => ({
+  +       value: state.abbreviation,
+  +       label: state.name,
+  +     })),
+    }));
+  ```
+
+- [#2856](https://github.com/bigcommerce/catalyst/pull/2856) [`f5330c7`](https://github.com/bigcommerce/catalyst/commit/f5330c7248b2e3a32b2bfbb8e3bc6c11742a5d27) Thanks [@jorgemoya](https://github.com/jorgemoya)! - Add canonical URLs and hreflang alternates for SEO. Pages now set `alternates.canonical` and `alternates.languages` in `generateMetadata` via the new `getMetadataAlternates` helper in `core/lib/seo/canonical.ts`. The helper fetches the vanity URL via GraphQL (`site.settings.url.vanityUrl`) and is cached per request. The default locale uses no path prefix; other locales use `/{locale}/path`. The root locale layout sets `metadataBase` to the configured vanity URL so canonical URLs resolve correctly. On Vercel preview deployments (`VERCEL_ENV=preview`), `metadataBase` and canonical/hreflang URLs use `VERCEL_URL` instead of the production vanity URL to prevent preview environments from generating SEO metadata pointing to production.
+
+  ## Migration steps
+
+  ### Step 1: Root layout metadata base
+
+  The root locale layout now sets `metadataBase` from the vanity URL fetched via GraphQL. On Vercel preview deployments, `VERCEL_URL` is used instead so preview environments don't point to production. `URL.canParse` guards against malformed URLs.
+
+  Update `core/app/[locale]/layout.tsx`:
+
+  ```diff
+  + const vanityUrl = data.site.settings?.url.vanityUrl;
+  +
+  + // Use preview deployment URL so metadataBase (canonical, og:url) points at the preview, not production.
+  + let baseUrl: URL | undefined;
+  + const previewUrl =
+  +   process.env.VERCEL_ENV === 'preview' ? `https://${process.env.VERCEL_URL}` : undefined;
+  +
+  + if (previewUrl && URL.canParse(previewUrl)) {
+  +   baseUrl = new URL(previewUrl);
+  + } else if (vanityUrl && URL.canParse(vanityUrl)) {
+  +   baseUrl = new URL(vanityUrl);
+  + }
+  +
+    return {
+  +   metadataBase: baseUrl,
+      title: {
+  ```
+
+  ### Step 2: Canonical/hreflang base URL for preview environments
+
+  The `getMetadataAlternates` function in `core/lib/seo/canonical.ts` now checks for a Vercel preview URL before falling back to the GraphQL vanity URL. `URL.canParse` guards against malformed URLs.
+
+  Update `core/lib/seo/canonical.ts`:
+
+  ```diff
+   export async function getMetadataAlternates(options: CanonicalUrlOptions) {
+     const { path, locale, includeAlternates = true } = options;
+
+  -  const baseUrl = await getVanityUrl();
+  +  // Use preview deployment URL so canonical/hreflang URLs point at the preview, not production.
+  +  const previewUrl =
+  +    process.env.VERCEL_ENV === 'preview' ? `https://${process.env.VERCEL_URL}` : undefined;
+  +  const baseUrl = previewUrl && URL.canParse(previewUrl) ? previewUrl : await getVanityUrl();
+  ```
+
+  ### Step 3: GraphQL fragment updates
+
+  Add the `path` field to brand, blog post, and product queries so metadata can build canonical URLs.
+
+  Update `core/app/[locale]/(default)/(faceted)/brand/[slug]/page-data.ts`:
+
+  ```diff
+    site {
+      brand(entityId: $entityId) {
+        name
+  +     path
+        seo {
+  ```
+
+  Update `core/app/[locale]/(default)/blog/[blogId]/page-data.ts`:
+
+  ```diff
+    author
+    htmlBody
+    name
+  + path
+    publishedDate {
+  ```
+
+  Update `core/app/[locale]/(default)/product/[slug]/page-data.ts` (in the metadata query):
+
+  ```diff
+    site {
+      product(entityId: $entityId) {
+        name
+  +     path
+        defaultImage {
+  ```
+
+  ### Step 4: Page metadata alternates
+
+  Add the `getMetadataAlternates` import and set `alternates` in `generateMetadata` for each page. The function is async and must be awaited. Ensure `core/lib/seo/canonical.ts` exists (it is included in this release).
+
+  Update `core/app/[locale]/(default)/page.tsx` (home):
+
+  ```diff
+  + import { Metadata } from 'next';
+    import { getFormatter, getTranslations, setRequestLocale } from 'next-intl/server';
+    ...
+  + import { getMetadataAlternates } from '~/lib/seo/canonical';
+    ...
+  + export async function generateMetadata({ params }: Props): Promise<Metadata> {
+  +   const { locale } = await params;
+  +   return {
+  +     alternates: await getMetadataAlternates({ path: '/', locale }),
+  +   };
+  + }
+  +
+    export default async function Home({ params }: Props) {
+  ```
+
+  For entity pages (product, category, brand, blog, blog post, webpage), add the import and include `alternates` in the existing `generateMetadata` return value using the entity `path` (or breadcrumb-derived path for category and webpage). Example for a brand page:
+
+  ```diff
+  + import { getMetadataAlternates } from '~/lib/seo/canonical';
+    ...
+    export async function generateMetadata(props: Props): Promise<Metadata> {
+  -   const { slug } = await props.params;
+  +   const { slug, locale } = await props.params;
+      ...
+      return {
+        title: pageTitle || brand.name,
+        description: metaDescription,
+        keywords: metaKeywords ? metaKeywords.split(',') : null,
+  +     alternates: await getMetadataAlternates({ path: brand.path, locale }),
+      };
+    }
+  ```
+
+  ### Step 5: Gift certificates pages
+
+  Update `core/app/[locale]/(default)/gift-certificates/page.tsx`:
+
+  ```diff
+  + import { getMetadataAlternates } from '~/lib/seo/canonical';
+    ...
+    export async function generateMetadata({ params }: Props): Promise<Metadata> {
+      const { locale } = await params;
+      const t = await getTranslations({ locale, namespace: 'GiftCertificates' });
+
+      return {
+        title: t('title') || 'Gift certificates',
+  +     alternates: await getMetadataAlternates({ path: '/gift-certificates', locale }),
+      };
+    }
+  ```
+
+  Update `core/app/[locale]/(default)/gift-certificates/balance/page.tsx`:
+
+  ```diff
+  + import { getMetadataAlternates } from '~/lib/seo/canonical';
+    ...
+      return {
+        title: t('title') || 'Gift certificates - Check balance',
+  +     alternates: await getMetadataAlternates({ path: '/gift-certificates/balance', locale }),
+      };
+  ```
+
+  Add `generateMetadata` to `core/app/[locale]/(default)/gift-certificates/purchase/page.tsx`:
+
+  ```diff
+  + import { Metadata } from 'next';
+    import { getFormatter, getTranslations } from 'next-intl/server';
+    ...
+  + import { getMetadataAlternates } from '~/lib/seo/canonical';
+    ...
+  + export async function generateMetadata({ params }: Props): Promise<Metadata> {
+  +   const { locale } = await params;
+  +   const t = await getTranslations({ locale, namespace: 'GiftCertificates' });
+  +
+  +   return {
+  +     title: t('Purchase.title'),
+  +     alternates: await getMetadataAlternates({ path: '/gift-certificates/purchase', locale }),
+  +   };
+  + }
+  ```
+
+  ### Step 6: Contact page
+
+  Update `core/app/[locale]/(default)/webpages/[id]/contact/page.tsx`:
+
+  ```diff
+  + import { getMetadataAlternates } from '~/lib/seo/canonical';
+    ...
+    export async function generateMetadata({ params }: Props): Promise<Metadata> {
+  -   const { id } = await params;
+  +   const { id, locale } = await params;
+      const webpage = await getWebPage(id);
+      const { pageTitle, metaDescription, metaKeywords } = webpage.seo;
+
+      return {
+        title: pageTitle || webpage.title,
+        description: metaDescription,
+        keywords: metaKeywords ? metaKeywords.split(',') : null,
+  +     alternates: await getMetadataAlternates({ path: webpage.path, locale }),
+      };
+    }
+  ```
+
+  ### Step 7: Public wishlist page
+
+  Update `core/app/[locale]/(default)/wishlist/[token]/page.tsx`:
+
+  ```diff
+  + import { getMetadataAlternates } from '~/lib/seo/canonical';
+    ...
+    export async function generateMetadata({ params, searchParams }: Props): Promise<Metadata> {
+      const { locale, token } = await params;
+      ...
+      return {
+        title: wishlist?.name ?? t('title'),
+  +     alternates: await getMetadataAlternates({ path: `/wishlist/${token}`, locale }),
+      };
+    }
+  ```
+
+  ### Step 8: Compare page
+
+  Update `core/app/[locale]/(default)/compare/page.tsx`:
+
+  ```diff
+  + import { getMetadataAlternates } from '~/lib/seo/canonical';
+    ...
+    export async function generateMetadata({ params }: Props): Promise<Metadata> {
+      const { locale } = await params;
+      const t = await getTranslations({ locale, namespace: 'Compare' });
+
+      return {
+        title: t('title'),
+  +     alternates: await getMetadataAlternates({ path: '/compare', locale }),
+      };
+    }
+  ```
+
+- [#2898](https://github.com/bigcommerce/catalyst/pull/2898) [`46ee3de`](https://github.com/bigcommerce/catalyst/commit/46ee3de640f030be56111c668102bbeeb961b4a4) Thanks [@jorgemoya](https://github.com/jorgemoya)! - Conditionally include optional SEO metadata fields in `generateMetadata` across page files. Fields `description`, `keywords`, `alternates`, and `openGraph` are now only included in the returned metadata object when they have a value, using spread syntax (`...(value && { key: value })`). Previously, these fields were always set — potentially assigning `null` or an empty string — which could cause Next.js to render empty `<meta>` tags.
+
+  ## Migration steps
+
+  Update `generateMetadata` in the following pages to use conditional spread syntax for optional metadata fields:
+
+  ### brand, category, webpages (contact + normal)
+
+  ```diff
+    return {
+      title: pageTitle || entity.name,
+  -   description: metaDescription,
+  -   keywords: metaKeywords ? metaKeywords.split(',') : null,
+  +   ...(metaDescription && { description: metaDescription }),
+  +   ...(metaKeywords && { keywords: metaKeywords.split(',') }),
+    };
+  ```
+
+  For `brand/[slug]/page.tsx`, also guard the `alternates` field:
+
+  ```diff
+  -   alternates: await getMetadataAlternates({ path: brand.path, locale }),
+  +   ...(brand.path && { alternates: await getMetadataAlternates({ path: brand.path, locale }) }),
+  ```
+
+  ### blog/[blogId]/page.tsx
+
+  ```diff
+    return {
+      title: pageTitle || blogPost.name,
+  -   description: metaDescription,
+  -   keywords: metaKeywords ? metaKeywords.split(',') : null,
+  +   ...(metaDescription && { description: metaDescription }),
+  +   ...(metaKeywords && { keywords: metaKeywords.split(',') }),
+      ...(blogPost.path && {
+        alternates: await getMetadataAlternates({ path: blogPost.path, locale }),
+      }),
+    };
+  ```
+
+  ### product/[slug]/page.tsx
+
+  ```diff
+  - keywords: metaKeywords ? metaKeywords.split(',') : null,
+  + ...(metaKeywords && { keywords: metaKeywords.split(',') }),
+  - openGraph: url
+  -   ? {
+  -       images: [{ url, alt }],
+  -     }
+  -   : null,
+  + ...(url && { openGraph: { images: [{ url, alt }] } }),
+  ```
+
+  ### blog/page.tsx
+
+  Extract the description to a variable and spread conditionally:
+
+  ```diff
+  + const description =
+  +   blog?.description && blog.description.length > 150
+  +     ? `${blog.description.substring(0, 150)}...`
+  +     : blog?.description;
+  +
+    return {
+      title: blog?.name ?? t('title'),
+  -   description:
+  -     blog?.description && blog.description.length > 150
+  -       ? `${blog.description.substring(0, 150)}...`
+  -       : blog?.description,
+  +   ...(description && { description }),
+      ...(blog?.path && { alternates: await getMetadataAlternates({ path: blog.path, locale }) }),
+    };
+  ```
+
+- [#2897](https://github.com/bigcommerce/catalyst/pull/2897) [`8d128fc`](https://github.com/bigcommerce/catalyst/commit/8d128fc75006ef8ab330e3597bfcf15cdc70da71) Thanks [@bc-svc-local](https://github.com/bc-svc-local)! - Update translations.
+
 ## 1.4.2
 
 ### Patch Changes
diff --git a/core/package.json b/core/package.json
index 53f97be52a..9315fb9988 100644
--- a/core/package.json
+++ b/core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@bigcommerce/catalyst-core",
   "description": "BigCommerce Catalyst is a Next.js starter kit for building headless BigCommerce storefronts.",
-  "version": "1.4.2",
+  "version": "1.5.0",
   "private": true,
   "engines": {
     "node": ">=24.0.0"

From 990727beba496c329879c1eab576fc3091dc04da Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 13 Mar 2026 13:27:40 -0500
Subject: [PATCH 69/69] Version Packages (`integrations/makeswift`) (#2864)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/fix-layout-shift.md  |  5 --
 .changeset/heavy-cups-train.md  |  5 --
 .changeset/sync-canary-1-5-0.md |  5 --
 .changeset/wild-bears-open.md   | 86 ------------------------------
 core/CHANGELOG.md               | 94 +++++++++++++++++++++++++++++++++
 core/package.json               |  2 +-
 6 files changed, 95 insertions(+), 102 deletions(-)
 delete mode 100644 .changeset/fix-layout-shift.md
 delete mode 100644 .changeset/heavy-cups-train.md
 delete mode 100644 .changeset/sync-canary-1-5-0.md
 delete mode 100644 .changeset/wild-bears-open.md

diff --git a/.changeset/fix-layout-shift.md b/.changeset/fix-layout-shift.md
deleted file mode 100644
index 8f31fc5b5b..0000000000
--- a/.changeset/fix-layout-shift.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@bigcommerce/catalyst-makeswift": patch
----
-
-Upgrade `@makeswift/runtime` to `0.26.3`, which uses the `<Activity>` API instead of `<Suspense>`. This fixes layout shift both when loading a Makeswift page directly and when client-side navigating from a non-Makeswift page to a Makeswift page after a hard refresh.
diff --git a/.changeset/heavy-cups-train.md b/.changeset/heavy-cups-train.md
deleted file mode 100644
index 926d6ae2e9..0000000000
--- a/.changeset/heavy-cups-train.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@bigcommerce/catalyst-makeswift": patch
----
-
-fix: handle OPTIONS requests via MakeswiftApiHandler
diff --git a/.changeset/sync-canary-1-5-0.md b/.changeset/sync-canary-1-5-0.md
deleted file mode 100644
index dc1d471135..0000000000
--- a/.changeset/sync-canary-1-5-0.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@bigcommerce/catalyst-makeswift": minor
----
-
-Pulls in changes from the `@bigcommerce/catalyst-core@1.5.0` release. For more information about what was included in the `@bigcommerce/catalyst-core@1.5.0` release, see the [changelog entry](https://github.com/bigcommerce/catalyst/blob/0d951ab190c6bf1573ca7de925ecb0017d954cb7/core/CHANGELOG.md#150).
diff --git a/.changeset/wild-bears-open.md b/.changeset/wild-bears-open.md
deleted file mode 100644
index e65ca0bec0..0000000000
--- a/.changeset/wild-bears-open.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-"@bigcommerce/catalyst-makeswift": patch
----
-
-Add explicit Makeswift SEO metadata support to public-facing pages. When configured in Makeswift, the SEO title and description will take priority over the default values from BigCommerce or static translations.
-
-The following pages now support Makeswift SEO metadata:
-
-- Home page (`/`)
-- Catch-all page (`/[...rest]`)
-- Product page (`/product/[slug]`)
-- Brand page (`/brand/[slug]`)
-- Category page (`/category/[slug]`)
-- Blog list page (`/blog`)
-- Blog post page (`/blog/[blogId]`)
-- Search page (`/search`)
-- Cart page (`/cart`)
-- Compare page (`/compare`)
-- Gift certificates page (`/gift-certificates`)
-- Gift certificates balance page (`/gift-certificates/balance`)
-- Contact webpage (`/webpages/[id]/contact`)
-- Normal webpage (`/webpages/[id]/normal`)
-
-## Migration steps
-
-### Step 1: Add `getMakeswiftPageMetadata` function
-
-Add the `getMakeswiftPageMetadata` function to `core/lib/makeswift/client.ts`:
-
-```diff
-+ export async function getMakeswiftPageMetadata({ path, locale }: { path: string; locale: string }) {
-+   const { data: pages } = await client.getPages({
-+     pathPrefix: path,
-+     locale: normalizeLocale(locale),
-+     siteVersion: await getSiteVersion(),
-+   });
-+
-+   if (pages.length === 0 || !pages[0]) {
-+     return null;
-+   }
-+
-+   const { title, description } = pages[0];
-+
-+   return {
-+     ...(title && { title }),
-+     ...(description && { description }),
-+   };
-+ }
-```
-
-Export the function from `core/lib/makeswift/index.ts`:
-
-```diff
-  export { Page } from './page';
-- export { client } from './client';
-+ export { client, getMakeswiftPageMetadata } from './client';
-```
-
-### Step 2: Update page metadata
-
-Each page's `generateMetadata` function has been updated to fetch Makeswift metadata and use it as the primary source, falling back to existing values. Here's an example using the cart page:
-
-Update `core/app/[locale]/(default)/cart/page.tsx`:
-
-```diff
-  import { getPreferredCurrencyCode } from '~/lib/currency';
-+ import { getMakeswiftPageMetadata } from '~/lib/makeswift';
-  import { Slot } from '~/lib/makeswift/slot';
-```
-
-```diff
-  export async function generateMetadata({ params }: Props): Promise<Metadata> {
-    const { locale } = await params;
-
-    const t = await getTranslations({ locale, namespace: 'Cart' });
-+   const makeswiftMetadata = await getMakeswiftPageMetadata({ path: '/cart', locale });
-
-    return {
--     title: t('title'),
-+     title: makeswiftMetadata?.title || t('title'),
-+     description: makeswiftMetadata?.description || undefined,
-    };
-  }
-```
-
-Apply the same pattern to the other pages listed above, using the appropriate path for each page (e.g., `/blog`, `/search`, `/compare`, etc.).
diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md
index 2c92860ff7..68c77560e3 100644
--- a/core/CHANGELOG.md
+++ b/core/CHANGELOG.md
@@ -1,5 +1,99 @@
 # Changelog
 
+## 1.5.0
+
+### Minor Changes
+
+- Pulls in changes from the `@bigcommerce/catalyst-core@1.5.0` release. For more information about what was included in the `@bigcommerce/catalyst-core@1.5.0` release, see the [changelog entry](https://github.com/bigcommerce/catalyst/blob/0d951ab190c6bf1573ca7de925ecb0017d954cb7/core/CHANGELOG.md#150).
+
+### Patch Changes
+
+- [#2919](https://github.com/bigcommerce/catalyst/pull/2919) [`32be644`](https://github.com/bigcommerce/catalyst/commit/32be6443457965467fb793e524347a9e43a9338e) Thanks [@matthewvolk](https://github.com/matthewvolk)! - Upgrade `@makeswift/runtime` to `0.26.3`, which uses the `<Activity>` API instead of `<Suspense>`. This fixes layout shift both when loading a Makeswift page directly and when client-side navigating from a non-Makeswift page to a Makeswift page after a hard refresh.
+
+- [#2862](https://github.com/bigcommerce/catalyst/pull/2862) [`52207b6`](https://github.com/bigcommerce/catalyst/commit/52207b69c50f58027400f716bf18c53cac82189b) Thanks [@Codeseph](https://github.com/Codeseph)! - fix: handle OPTIONS requests via MakeswiftApiHandler
+
+- [#2860](https://github.com/bigcommerce/catalyst/pull/2860) [`5097034`](https://github.com/bigcommerce/catalyst/commit/5097034e93a9135b646f53445c83c8716fbeb76f) Thanks [@jorgemoya](https://github.com/jorgemoya)! - Add explicit Makeswift SEO metadata support to public-facing pages. When configured in Makeswift, the SEO title and description will take priority over the default values from BigCommerce or static translations.
+
+  The following pages now support Makeswift SEO metadata:
+  - Home page (`/`)
+  - Catch-all page (`/[...rest]`)
+  - Product page (`/product/[slug]`)
+  - Brand page (`/brand/[slug]`)
+  - Category page (`/category/[slug]`)
+  - Blog list page (`/blog`)
+  - Blog post page (`/blog/[blogId]`)
+  - Search page (`/search`)
+  - Cart page (`/cart`)
+  - Compare page (`/compare`)
+  - Gift certificates page (`/gift-certificates`)
+  - Gift certificates balance page (`/gift-certificates/balance`)
+  - Contact webpage (`/webpages/[id]/contact`)
+  - Normal webpage (`/webpages/[id]/normal`)
+
+  ## Migration steps
+
+  ### Step 1: Add `getMakeswiftPageMetadata` function
+
+  Add the `getMakeswiftPageMetadata` function to `core/lib/makeswift/client.ts`:
+
+  ```diff
+  + export async function getMakeswiftPageMetadata({ path, locale }: { path: string; locale: string }) {
+  +   const { data: pages } = await client.getPages({
+  +     pathPrefix: path,
+  +     locale: normalizeLocale(locale),
+  +     siteVersion: await getSiteVersion(),
+  +   });
+  +
+  +   if (pages.length === 0 || !pages[0]) {
+  +     return null;
+  +   }
+  +
+  +   const { title, description } = pages[0];
+  +
+  +   return {
+  +     ...(title && { title }),
+  +     ...(description && { description }),
+  +   };
+  + }
+  ```
+
+  Export the function from `core/lib/makeswift/index.ts`:
+
+  ```diff
+    export { Page } from './page';
+  - export { client } from './client';
+  + export { client, getMakeswiftPageMetadata } from './client';
+  ```
+
+  ### Step 2: Update page metadata
+
+  Each page's `generateMetadata` function has been updated to fetch Makeswift metadata and use it as the primary source, falling back to existing values. Here's an example using the cart page:
+
+  Update `core/app/[locale]/(default)/cart/page.tsx`:
+
+  ```diff
+    import { getPreferredCurrencyCode } from '~/lib/currency';
+  + import { getMakeswiftPageMetadata } from '~/lib/makeswift';
+    import { Slot } from '~/lib/makeswift/slot';
+  ```
+
+  ```diff
+    export async function generateMetadata({ params }: Props): Promise<Metadata> {
+      const { locale } = await params;
+
+      const t = await getTranslations({ locale, namespace: 'Cart' });
+  +   const makeswiftMetadata = await getMakeswiftPageMetadata({ path: '/cart', locale });
+
+      return {
+  -     title: t('title'),
+  +     title: makeswiftMetadata?.title || t('title'),
+  +     description: makeswiftMetadata?.description || undefined,
+      };
+    }
+  ```
+
+  Apply the same pattern to the other pages listed above, using the appropriate path for each page (e.g., `/blog`, `/search`, `/compare`, etc.).
+
 ## 1.4.2
 
 ### Patch Changes
diff --git a/core/package.json b/core/package.json
index 687802f38c..ba89355646 100644
--- a/core/package.json
+++ b/core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@bigcommerce/catalyst-makeswift",
   "description": "BigCommerce Catalyst is a Next.js starter kit for building headless BigCommerce storefronts.",
-  "version": "1.4.2",
+  "version": "1.5.0",
   "private": true,
   "engines": {
     "node": ">=24.0.0"