feat: enables client-side navigation in Makeswift builder

agurtovoy · agurtovoy · commit 4f1d31a671a1 · 2026-03-09T11:34:15.000-05:00
Enabled by upgrading to the latest Makeswift runtime
diff --git a/core/app/[locale]/layout.tsx b/core/app/[locale]/layout.tsx
@@ -129,7 +129,7 @@ export default async function RootLayout({ params, children }: Props) {
   const privacyPolicyUrl = rootData.data.site.settings?.privacy?.privacyPolicyUrl;
 
   return (
-    <MakeswiftProvider siteVersion={siteVersion}>
+    <MakeswiftProvider siteVersion={siteVersion} locale={locale}>
       <html className={clsx(fonts.map((f) => f.variable))} lang={locale}>
         <head>
           <SiteTheme />
diff --git a/core/app/api/makeswift/[...makeswift]/route.ts b/core/app/api/makeswift/[...makeswift]/route.ts
@@ -24,8 +24,6 @@ const defaultVariants: Font['variants'] = [
 
 const handler = MakeswiftApiHandler(process.env.MAKESWIFT_SITE_API_KEY, {
   runtime,
-  apiOrigin: process.env.NEXT_PUBLIC_MAKESWIFT_API_ORIGIN ?? process.env.MAKESWIFT_API_ORIGIN,
-  appOrigin: process.env.NEXT_PUBLIC_MAKESWIFT_APP_ORIGIN ?? process.env.MAKESWIFT_APP_ORIGIN,
   getFonts() {
     return [
       {
diff --git a/core/lib/makeswift/client.ts b/core/lib/makeswift/client.ts
@@ -11,7 +11,6 @@ strict(process.env.MAKESWIFT_SITE_API_KEY, 'MAKESWIFT_SITE_API_KEY is required')
 
 export const client = new Makeswift(process.env.MAKESWIFT_SITE_API_KEY, {
   runtime,
-  apiOrigin: process.env.NEXT_PUBLIC_MAKESWIFT_API_ORIGIN ?? process.env.MAKESWIFT_API_ORIGIN,
 });
 
 export const getPageSnapshot = async ({ path, locale }: { path: string; locale: string }) =>
diff --git a/core/lib/makeswift/provider.tsx b/core/lib/makeswift/provider.tsx
@@ -7,18 +7,15 @@ import '~/lib/makeswift/components';
 
 export function MakeswiftProvider({
   children,
+  locale,
   siteVersion,
 }: {
   children: React.ReactNode;
+  locale: string;
   siteVersion: SiteVersion | null;
 }) {
   return (
-    <ReactRuntimeProvider
-      apiOrigin={process.env.NEXT_PUBLIC_MAKESWIFT_API_ORIGIN}
-      appOrigin={process.env.NEXT_PUBLIC_MAKESWIFT_APP_ORIGIN}
-      runtime={runtime}
-      siteVersion={siteVersion}
-    >
+    <ReactRuntimeProvider runtime={runtime} locale={locale} siteVersion={siteVersion}>
       <RootStyleRegistry enableCssReset={false}>{children}</RootStyleRegistry>
     </ReactRuntimeProvider>
   );
diff --git a/core/lib/makeswift/runtime.ts b/core/lib/makeswift/runtime.ts
@@ -8,14 +8,18 @@ import { registerSocialLinksComponent } from '@makeswift/runtime/react/builtins/
 import { registerTextComponent } from '@makeswift/runtime/react/builtins/text';
 import { registerVideoComponent } from '@makeswift/runtime/react/builtins/video';
 import { ReactRuntimeCore } from '@makeswift/runtime/react/core';
+import { fetch } from '@makeswift/runtime/next';
 
 const runtime = new ReactRuntimeCore({
+  apiOrigin: process.env.NEXT_PUBLIC_MAKESWIFT_API_ORIGIN,
+  appOrigin: process.env.NEXT_PUBLIC_MAKESWIFT_APP_ORIGIN,
   breakpoints: {
     small: { width: 640, viewport: 390, label: 'Small' },
     medium: { width: 768, viewport: 765, label: 'Medium' },
     large: { width: 1024, viewport: 1000, label: 'Large' },
     screen: { width: 1280, label: 'XL' },
   },
+  fetch,
 });
 
 // Only register necessary built-in components. Omitted components are:
diff --git a/core/package.json b/core/package.json
@@ -19,7 +19,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": "https://pkg.pr.new/makeswift/makeswift/@makeswift/runtime@1259",
     "@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

Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,6 @@ const defaultVariants: Font['variants'] = [`
`24`	`24`
`25`	`25`	`const handler = MakeswiftApiHandler(process.env.MAKESWIFT_SITE_API_KEY, {`
`26`	`26`	`runtime,`
`27`		`- apiOrigin: process.env.NEXT_PUBLIC_MAKESWIFT_API_ORIGIN ?? process.env.MAKESWIFT_API_ORIGIN,`
`28`		`- appOrigin: process.env.NEXT_PUBLIC_MAKESWIFT_APP_ORIGIN ?? process.env.MAKESWIFT_APP_ORIGIN,`
`29`	`27`	`getFonts() {`
`30`	`28`	`return [`
`31`	`29`	`{`