Skip to content

feat: enables client-side navigation in Makeswift builder #2913

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
agurtovoy wants to merge 1 commit into
base: integrations/makeswift
Choose a base branch
from
Open

feat: enables client-side navigation in Makeswift builder #2913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/shiny-cougars-drop.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@bigcommerce/catalyst-makeswift": minor
---

Enable interaction-mode site navigation in Makeswift builder
2 changes: 0 additions & 2 deletions core/app/api/makeswift/[...makeswift]/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 [
{
Expand Down
1 change: 0 additions & 1 deletion core/lib/makeswift/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }) =>
Expand Down
8 changes: 1 addition & 7 deletions core/lib/makeswift/provider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,7 @@ export function MakeswiftProvider({
siteVersion: SiteVersion | null;
}) {
return (
<ReactRuntimeProvider
apiOrigin={process.env.NEXT_PUBLIC_MAKESWIFT_API_ORIGIN}
appOrigin={process.env.NEXT_PUBLIC_MAKESWIFT_APP_ORIGIN}
locale={locale}
runtime={runtime}
siteVersion={siteVersion}
>
<ReactRuntimeProvider locale={locale} runtime={runtime} siteVersion={siteVersion}>
<RootStyleRegistry enableCssReset={false}>{children}</RootStyleRegistry>
</ReactRuntimeProvider>
);
Expand Down
4 changes: 4 additions & 0 deletions core/lib/makeswift/runtime.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { fetch } from '@makeswift/runtime/next';
import { registerBoxComponent } from '@makeswift/runtime/react/builtins/box';
import { registerDividerComponent } from '@makeswift/runtime/react/builtins/divider';
import { registerEmbedComponent } from '@makeswift/runtime/react/builtins/embed';
Expand All @@ -10,12 +11,15 @@ import { registerVideoComponent } from '@makeswift/runtime/react/builtins/video'
import { ReactRuntimeCore } from '@makeswift/runtime/react/core';

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:
Expand Down
2 changes: 1 addition & 1 deletion core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.4",
"@makeswift/runtime": "0.28.5",
Copy link
Copy Markdown
Contributor Author

@agurtovoy agurtovoy May 19, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makeswift upgrade guides for 0.26 -> 0.28 transition:

"@opentelemetry/api": "^1.9.0",
"@opentelemetry/api-logs": "^0.208.0",
"@opentelemetry/instrumentation": "^0.208.0",
Expand Down
36 changes: 18 additions & 18 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading