sync integrations/makeswift with canary

.changeset/sync-canary-1-10-1.md

@@ -0,0 +1,5 @@
+---
+"@bigcommerce/catalyst-makeswift": patch
+---
+
+Pulls in changes from the `@bigcommerce/catalyst-core@1.10.1` release. For more information about what was included in the `@bigcommerce/catalyst-core@1.10.1` release, see the [changelog entry](https://github.com/bigcommerce/catalyst/blob/36f8fc85c484ab2446b404fa6dc170e986341e8d/core/CHANGELOG.md#1101).

.github/workflows/changesets-release.yml

@@ -5,6 +5,7 @@ on:
     branches:
       - canary
       - integrations/makeswift
+      - integrations/b2b-makeswift
 
 concurrency: ${{ github.workflow }}-${{ github.ref }}
 
@@ -72,6 +73,8 @@ jobs:
           PACKAGE_NAME="@bigcommerce/catalyst-core"
           if [ "${{ github.ref_name }}" = "integrations/makeswift" ]; then
             PACKAGE_NAME="@bigcommerce/catalyst-makeswift"
+          elif [ "${{ github.ref_name }}" = "integrations/b2b-makeswift" ]; then
+            PACKAGE_NAME="@bigcommerce/catalyst-b2b-makeswift"
           fi
           VERSION=$(echo '${{ steps.changesets.outputs.publishedPackages }}' | jq -r --arg name "$PACKAGE_NAME" '.[] | select(.name == $name) | .version')
           if [ -z "$VERSION" ]; then

core/app/[locale]/(default)/(faceted)/brand/[slug]/page.tsx

@@ -70,6 +70,9 @@ interface Props {
 
 export async function generateMetadata(props: Props): Promise<Metadata> {
   const { slug, locale } = await props.params;
+
+  setRequestLocale(locale);
+
   const customerAccessToken = await getSessionCustomerAccessToken();
 
   const brandId = Number(slug);

core/app/[locale]/(default)/(faceted)/category/[slug]/page.tsx

@@ -73,6 +73,9 @@ interface Props {
 
 export async function generateMetadata(props: Props): Promise<Metadata> {
   const { slug, locale } = await props.params;
+
+  setRequestLocale(locale);
+
   const customerAccessToken = await getSessionCustomerAccessToken();
 
   const categoryId = Number(slug);

core/app/[locale]/(default)/product/[slug]/page.tsx

@@ -44,6 +44,9 @@ interface Props {
 
 export async function generateMetadata({ params }: Props): Promise<Metadata> {
   const { slug, locale } = await params;
+
+  setRequestLocale(locale);
+
   const customerAccessToken = await getSessionCustomerAccessToken();
 
   const productId = Number(slug);

core/globals.css

@@ -1,3 +1,5 @@
+@import 'storefront-kit/styles';
+
 @tailwind base;
 @tailwind components;
 @tailwind utilities;

core/package.json

@@ -3,8 +3,8 @@
   "description": "BigCommerce Catalyst is a Next.js starter kit for building headless BigCommerce storefronts.",
   "version": "1.9.0",
   "catalyst": {
-    "version": "1.10.0",
-    "ref": "@bigcommerce/catalyst-core@1.10.0"
+    "version": "1.9.0",
+    "ref": "@bigcommerce/catalyst-makeswift@1.9.0"
   },
   "private": true,
   "engines": {
@@ -67,7 +67,7 @@
     "lodash.debounce": "^4.0.8",
     "lru-cache": "^11.1.0",
     "lucide-react": "^0.474.0",
-    "next": "~16.2.6",
+    "next": "~16.2.11",
     "next-auth": "5.0.0-beta.30",
     "next-intl": "^4.6.1",
     "nuqs": "^2.4.3",
@@ -82,7 +82,7 @@
     "set-cookie-parser": "^2.7.1",
     "sharp": "^0.33.5",
     "sonner": "^1.7.4",
-    "storefront-kit": "^0.24.0",
+    "storefront-kit": "^0.32.3",
     "swr": "^2.2.5",
     "tailwindcss-radix": "^3.0.5",
     "uuid": "^11.1.0",

core/tailwind.config.js

@@ -4,7 +4,7 @@ const config = {
     './app/**/*.{ts,tsx}',
     './components/**/*.{ts,tsx}',
     './vibes/**/*.{ts,tsx}',
-    '!./node_modules/**', // Exclude everything in node_modules to speed up builds
+    './node_modules/storefront-kit/dist/**/*.{js,mjs}',
   ],
   theme: {
     extend: {

core/vibes/soul/primitives/product-card/index.tsx

@@ -185,18 +185,12 @@ export function ProductCard({
             )}
             {promotions != null && promotions.length > 0 && (
               <div className="mt-1.5">
-                <CalloutRoot
-                  className="items-start rounded-md border border-yellow-300 bg-yellow-50 px-2.5 py-1.5"
-                  size="small"
-                  variant="warning"
-                >
+                <CalloutRoot size="small" variant="warning">
                   <CalloutContent>
                     <CalloutHeader>
-                      <CalloutTitle className="text-xs font-semibold leading-snug text-yellow-900">
-                        {promotions[0]?.text ?? ''}
-                      </CalloutTitle>
+                      <CalloutTitle>{promotions[0]?.text ?? ''}</CalloutTitle>
                       {promotions.length > 1 && (
-                        <CalloutDescription className="text-xs text-yellow-900/70">
+                        <CalloutDescription>
                           {t('moreOffers', { count: promotions.length - 1 })}
                         </CalloutDescription>
                       )}

core/vibes/soul/sections/product-detail/index.tsx

@@ -216,17 +216,10 @@ export function ProductDetail<F extends Field>({
                           callouts.length > 0 ? (
                             <div className="flex flex-col gap-2">
                               {callouts.map((callout) => (
-                                <CalloutRoot
-                                  className="items-start rounded-md border border-yellow-300 bg-yellow-50 px-2.5 py-1.5"
-                                  key={callout.id}
-                                  size="small"
-                                  variant="warning"
-                                >
+                                <CalloutRoot key={callout.id} size="small" variant="warning">
                                   <CalloutContent>
                                     <CalloutHeader>
-                                      <CalloutTitle className="text-xs font-semibold leading-snug text-yellow-900">
-                                        {callout.text}
-                                      </CalloutTitle>
+                                      <CalloutTitle>{callout.text}</CalloutTitle>
                                     </CalloutHeader>
                                   </CalloutContent>
                                 </CalloutRoot>