Merge pull request #2546 from bigcommerce/runtime-0.25.0

bookernath · web-flow · commit f6196422ed52 · 2025-08-24T23:27:49.000-05:00
chore: update @makeswift/runtime to version 0.25.0 in package.json
diff --git a/.changeset/great-queens-joke.md b/.changeset/great-queens-joke.md
@@ -0,0 +1,5 @@
+---
+"@bigcommerce/catalyst-makeswift": minor
+---
+
+Bump Makeswift runtime to 0.25.0 for Next v15.5 compatibility
diff --git a/core/app/[locale]/layout.tsx b/core/app/[locale]/layout.tsx
@@ -1,8 +1,8 @@
+import { getSiteVersion } from '@makeswift/runtime/next/server';
 import { Analytics } from '@vercel/analytics/react';
 import { SpeedInsights } from '@vercel/speed-insights/next';
 import { clsx } from 'clsx';
 import type { Metadata } from 'next';
-import { draftMode } from 'next/headers';
 import { notFound } from 'next/navigation';
 import { NextIntlClientProvider } from 'next-intl';
 import { setRequestLocale } from 'next-intl/server';
@@ -108,6 +108,7 @@ export default async function RootLayout({ params, children }: Props) {
 
   const { data } = await fetchRootLayoutMetadata();
   const toastNotificationCookieData = await getToastNotification();
+  const siteVersion = await getSiteVersion();
 
   if (!routing.locales.includes(locale)) {
     notFound();
@@ -118,7 +119,7 @@ export default async function RootLayout({ params, children }: Props) {
   setRequestLocale(locale);
 
   return (
-    <MakeswiftProvider previewMode={(await draftMode()).isEnabled}>
+    <MakeswiftProvider siteVersion={siteVersion}>
       <html className={clsx(fonts.map((f) => f.variable))} lang={locale}>
         <head>
           <SiteTheme />
diff --git a/core/lib/makeswift/provider.tsx b/core/lib/makeswift/provider.tsx
@@ -1,19 +1,19 @@
 'use client';
 
-import { ReactRuntimeProvider, RootStyleRegistry } from '@makeswift/runtime/next';
+import { ReactRuntimeProvider, RootStyleRegistry, type SiteVersion } from '@makeswift/runtime/next';
 
 import { runtime } from '~/lib/makeswift/runtime';
 import '~/lib/makeswift/components';
 
 export function MakeswiftProvider({
   children,
-  previewMode,
+  siteVersion,
 }: {
   children: React.ReactNode;
-  previewMode: boolean;
+  siteVersion: SiteVersion | null;
 }) {
   return (
-    <ReactRuntimeProvider previewMode={previewMode} runtime={runtime}>
+    <ReactRuntimeProvider runtime={runtime} siteVersion={siteVersion}>
       <RootStyleRegistry enableCssReset={false}>{children}</RootStyleRegistry>
     </ReactRuntimeProvider>
   );
diff --git a/core/package.json b/core/package.json
@@ -17,7 +17,7 @@
     "@conform-to/react": "^1.6.1",
     "@conform-to/zod": "^1.6.1",
     "@icons-pack/react-simple-icons": "^11.2.0",
-    "@makeswift/runtime": "^0.24.6",
+    "@makeswift/runtime": "^0.25.0",
     "@radix-ui/react-accordion": "^1.2.11",
     "@radix-ui/react-checkbox": "^1.3.2",
     "@radix-ui/react-dialog": "^1.1.14",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"@bigcommerce/catalyst-makeswift": minor
 +---
++
 +Bump Makeswift runtime to 0.25.0 for Next v15.5 compatibility