sync: TRAC-1236 sync integrations/b2b-makeswift with integrations/makeswift@1.10.0

.changeset/sync-makeswift-1-10-0.md

@@ -0,0 +1,5 @@
+---
+"@bigcommerce/catalyst-b2b-makeswift": minor
+---
+
+Pulls in changes from the `@bigcommerce/catalyst-makeswift@1.10.0` release. For more information, see the [changelog entry](https://github.com/bigcommerce/catalyst/blob/85876866fdd785362ac260f3db892f23fc2a9707/core/CHANGELOG.md#1100).

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/messages/en.json

@@ -627,6 +627,9 @@
     "search": "Search"
   },
   "Components": {
+    "ProductCard": {
+      "moreOffers": "+{count, plural, =1 {# more offer} other {# more offers}}"
+    },
     "Header": {
       "home": "Home",
       "toggleNavigation": "Toggle navigation",

core/package.json

@@ -63,7 +63,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",
@@ -78,7 +78,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

@@ -1,4 +1,5 @@
 import { clsx } from 'clsx';
+import { useTranslations } from 'next-intl';
 import {
   Content as CalloutContent,
   Description as CalloutDescription,
@@ -40,7 +41,6 @@ export interface ProductCardProps {
   imageSizes?: string;
   compareLabel?: string;
   compareParamName?: string;
-  moreOffersLabel?: string;
   product: Product;
   showRating?: boolean;
 }
@@ -88,10 +88,11 @@ export function ProductCard({
   aspectRatio = '5:6',
   compareLabel,
   compareParamName,
-  moreOffersLabel = 'more offers',
   imagePriority = false,
   imageSizes = '(min-width: 80rem) 20vw, (min-width: 64rem) 25vw, (min-width: 42rem) 33vw, (min-width: 24rem) 50vw, 100vw',
 }: ProductCardProps) {
+  const t = useTranslations('Components.ProductCard');
+
   return (
     <article
       className={clsx(
@@ -184,19 +185,13 @@ 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">
-                          +{promotions.length - 1} {moreOffersLabel}
+                        <CalloutDescription>
+                          {t('moreOffers', { count: promotions.length - 1 })}
                         </CalloutDescription>
                       )}
                     </CalloutHeader>

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>

packages/catalyst/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @bigcommerce/catalyst
 
+## 1.1.1
+
+### Patch Changes
+
+- [#3119](https://github.com/bigcommerce/catalyst/pull/3119) [`bd72110`](https://github.com/bigcommerce/catalyst/commit/bd721106dbded48e823acad6548019d1210258f6) Thanks [@jordanarldt](https://github.com/jordanarldt)! - Add `store_v2_products`, `store_v2_content`, and `store_sites` OAuth scopes so `catalyst create` no longer errors when creating a new channel with sample data.
+
 ## 1.1.0
 
 ### Minor Changes

packages/catalyst/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bigcommerce/catalyst",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "type": "module",
   "repository": {
     "type": "git",

packages/catalyst/src/cli/lib/auth.ts

@@ -5,11 +5,16 @@ import { httpError } from './http-errors';
 export const DEVICE_OAUTH_CLIENT_ID = 'b8063bu6hhml4e0lqh22yut63atsbyv';
 export const DEVICE_OAUTH_SCOPES = [
   'store_v2_information',
+  'store_v2_products',
+  'store_v2_content',
+  'store_sites',
+  'store_storefront_api',
   'store_infrastructure_deployments_manage',
   'store_infrastructure_logs_read_only',
   'store_infrastructure_projects_manage',
   'store_channel_settings',
 ].join(' ');
+
 export const DEFAULT_LOGIN_URL = 'https://login.bigcommerce.com';
 
 export const DeviceCodeResponseSchema = z.object({

packages/create-catalyst/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 2.0.2
+
+### Patch Changes
+
+- Updated dependencies [[`bd72110`](https://github.com/bigcommerce/catalyst/commit/bd721106dbded48e823acad6548019d1210258f6)]:
+  - @bigcommerce/catalyst@1.1.1
+
 ## 2.0.1
 
 ### Patch Changes

packages/create-catalyst/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bigcommerce/create-catalyst",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/bigcommerce/catalyst",