Skip to content

The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.

fix(studio): mirror Vercel interstitial layout change into TanStack routes (#48024)

Ayaan Gazalibeb6d0135a9b
diff --git a/apps/studio/routes/integrations/vercel.tsx b/apps/studio/routes/integrations/vercel.tsx
index dc2607f0f38..e31fc665ab9 100644
--- a/apps/studio/routes/integrations/vercel.tsx
+++ b/apps/studio/routes/integrations/vercel.tsx
@@ -1,19 +1,14 @@
import { createFileRoute, Outlet } from '@tanstack/react-router'
-import VercelIntegrationWindowLayout from '@/components/layouts/IntegrationsLayout/VercelIntegrationWindowLayout'
-
export const Route = createFileRoute('/integrations/vercel')({
- component: VercelIntegrationShell,
+ component: VercelIntegrationPassthrough,
})
-// Placed at top-level rather than under _app — Next getLayout for all
-// three leaves only wraps in VercelIntegrationWindowLayout (no AppLayout
-// or DefaultLayout), so adding _app's chrome here would be a behaviour
-// change.
-function VercelIntegrationShell() {
- return (
- <VercelIntegrationWindowLayout>
- <Outlet />
- </VercelIntegrationWindowLayout>
- )
+// No shared layout here. Since #47623, the install and
+// marketplace/choose-project pages render their own InterstitialLayout and
+// have no Next getLayout, so the Next runtime shows them without any window
+// chrome. Only deploy-button/new-project still uses
+// VercelIntegrationWindowLayout, and its route wraps it at the leaf.
+function VercelIntegrationPassthrough() {
+ return <Outlet />
}
diff --git a/apps/studio/routes/integrations/vercel/$slug/deploy-button/new-project.tsx b/apps/studio/routes/integrations/vercel/$slug/deploy-button/new-project.tsx
index 11f685c8208..0b09a4cf7e9 100644
--- a/apps/studio/routes/integrations/vercel/$slug/deploy-button/new-project.tsx
+++ b/apps/studio/routes/integrations/vercel/$slug/deploy-button/new-project.tsx
@@ -1,11 +1,18 @@
import { createFileRoute } from '@tanstack/react-router'
+import VercelIntegrationWindowLayout from '@/components/layouts/IntegrationsLayout/VercelIntegrationWindowLayout'
import VercelIntegration from '@/pages/integrations/vercel/[slug]/deploy-button/new-project'
export const Route = createFileRoute('/integrations/vercel/$slug/deploy-button/new-project')({
component: VercelDeployButtonNewProjectRoute,
})
+// Mirrors the page's Next getLayout, which wraps this leaf (and only this
+// leaf) in VercelIntegrationWindowLayout.
function VercelDeployButtonNewProjectRoute() {
- return <VercelIntegration dehydratedState={undefined} />
+ return (
+ <VercelIntegrationWindowLayout>
+ <VercelIntegration dehydratedState={undefined} />
+ </VercelIntegrationWindowLayout>
+ )
}