mirror of
https://github.com/supabase/supabase.git
synced 2026-10-05 01:15:03 +03:00
Moves the Studio TanStack Start build off the hand-rolled Vercel setup (an `api/server.js` function shim, rewrites in `vercel.ts`, a custom `?dpl=` skew-protection Vite plugin, and `scripts/serve.js` for self-hosted) and onto Nitro, which TanStack Start documents as its deployment path. Documents are served from the static SPA shell on the CDN; only `/api/*` and `/_serverFn/*` invoke the function. **Removed:** - `api/server.js`, `scripts/serve.js`, `scripts/smoke-server.mjs` - The `skewProtectionDpl` Vite plugin, `renderBuiltUrl`, and the `vite:preloadError` reload backstop in `router.tsx` (TanStack Router already reloads once on a failed lazy import) - Rewrites, `functions`, `outputDirectory`, and `cleanUrls` from `vercel.ts` (redirects and headers stay) - `magic-string` and `@jridgewell/remapping` devDependencies, the `preview` script **Added:** - `nitro` plugin in `vite.config.ts`. Preset is auto-detected: `.vercel/output` on Vercel, a self-contained node server in `.output` everywhere else. `vercel.immutableStaticFiles` puts hashed chunks under `/_vercel/immutable/` so tabs opened before a redeploy keep loading their chunks; `functions.maxDuration: 300` carries over the old function timeout - `scripts/vercel-spa-routes.ts`: Nitro module that rewrites the generated Build Output routes (documents -> `_shell.html`, allow-list -> `__server`, missing chunk -> 404, base-path prefixes), with a unit test - `server.ts`: TanStack Start server entry that initializes Sentry before the route tree loads and wraps the handler with `wrapFetchWithSentry` **Changed:** - `start:tanstack` runs `.output/server/index.mjs` directly with Node's `--env-file-if-exists` for the `.env` cascade. Node doesn't expand `$VAR` references, so `scripts/generateLocalEnv.js` now writes literal values into `.env.test` - Dockerfile's TanStack stage copies `.output` instead of running `pnpm deploy`; the `server.js` shim loads `.env` and imports the Nitro server - `NEXT_PUBLIC_BASE_PATH` (the platform's `/dashboard`) only sets the router basepath; Vite's `base` stays at the root so chunks can use the immutable store. The routes module emits prefixed rules for `/dashboard/api/*` and `/dashboard/_serverFn/*` and rewrites `public/` files requested under the prefix back to the root - Self-hosted security headers come from a Nitro `routeRules` entry; on Vercel they stay in `vercel.ts` - `tslib` is inlined for the build only: Nitro's dev runner has no interop for its CJS wrapper - Monaco's worker chunks follow the client assets dir so they land in the immutable store too Verified on the `studio-staging` preview (`STUDIO_FRAMEWORK=tanstack` is scoped to this branch there): documents come back as the static shell, `/dashboard/api/*` hits the function, `public/` files resolve under the prefix, a missing immutable chunk 404s. Across two deployments of this branch, the older deployment's chunks still load from the immutable store and requests carrying its `__vdpl` cookie are answered by that deployment. Self-hosted path covered by the TanStack E2E job and the Docker build job. ## To test - On the `studio-staging` preview: `/dashboard/project/<ref>` should show `content-disposition: inline; filename="_shell.html"` and a single-region `x-vercel-id`; `/dashboard/api/get-utc-time` a two-region id - Sign in and click through a few pages, including one that opens Monaco (SQL editor) so the worker chunks load - After the next deploy, a tab left open on the previous one should still navigate (lazy chunks) and call the API without errors - Self-hosted: `STUDIO_FRAMEWORK=tanstack pnpm --filter studio build && pnpm --filter studio start`, then check `/api/platform/profile` and that responses carry the security headers <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **New Features** * Production TanStack deployments now run on Nitro’s self-contained server output. * Vercel routing serves static pages first while directing API and server-function requests appropriately. * Server-function requests can include deployment identification for consistent handling. * Local environment generation now writes resolved configuration values. * **Bug Fixes** * Improved handling of missing static assets and SPA fallback routing. * Server-side error monitoring now captures request errors in the new runtime. * **Refactor** * Replaced the legacy production server and smoke-test workflow with Nitro-based startup. * Removed automatic reload handling for stale client assets. <!-- end of auto-generated comment: release notes by coderabbit.ai --> --------- Co-authored-by: Alaister Young <10985857+alaister@users.noreply.github.com>
103 lines
3.2 KiB
TypeScript
103 lines
3.2 KiB
TypeScript
import { IS_PLATFORM } from 'common'
|
|
import dayjs from 'dayjs'
|
|
import { useRouter } from 'next/router'
|
|
import { useEffect, useRef, useState } from 'react'
|
|
import { toast } from 'sonner'
|
|
import { Button, StatusIcon } from 'ui'
|
|
|
|
import { useDeploymentCommitQuery } from '@/data/utils/deployment-commit-query'
|
|
|
|
const DeployCheckToast = ({ id }: { id: string | number }) => {
|
|
const router = useRouter()
|
|
|
|
return (
|
|
<div className="flex gap-3 flex-col w-full">
|
|
<div className="flex gap-3 flex-row">
|
|
<StatusIcon variant="default" className="mt-0.5" />
|
|
<div className="flex w-full justify-between flex-col text-sm">
|
|
<p className="text-foreground">A new version of this page is available</p>
|
|
<p className="text-foreground-light">Refresh to see the latest changes.</p>
|
|
</div>
|
|
</div>
|
|
|
|
<div className="flex gap-5 justify-end">
|
|
<Button variant="outline" onClick={() => toast.dismiss(id)}>
|
|
Not now
|
|
</Button>
|
|
<Button
|
|
variant="primary"
|
|
onClick={() => {
|
|
// Vercel never pins document navigations to a deployment, so a
|
|
// plain reload lands on the latest one.
|
|
router.reload()
|
|
}}
|
|
>
|
|
Refresh
|
|
</Button>
|
|
</div>
|
|
</div>
|
|
)
|
|
}
|
|
|
|
// This hook checks if the user is using old Studio pages and shows a toast to refresh the page. It's only triggered if
|
|
// there's a new version of Studio is available, and the user has been on the old dashboard (based on commit) for more than 24 hours.
|
|
// [Joshen] K-Dog has a suggestion here to bring down the time period here by checking commits
|
|
export function useCheckLatestDeploy() {
|
|
const [currentCommitTime, setCurrentCommitTime] = useState('')
|
|
const [isToastShown, setIsToastShown] = useState(false)
|
|
|
|
const { data: commit } = useDeploymentCommitQuery({
|
|
enabled: IS_PLATFORM,
|
|
staleTime: 1000 * 60 * 10, // 10 minutes
|
|
})
|
|
|
|
const commitLoggedRef = useRef(false)
|
|
useEffect(() => {
|
|
if (commit && !commitLoggedRef.current) {
|
|
const commitTime =
|
|
commit.commitTime === 'unknown'
|
|
? 'unknown time'
|
|
: dayjs(commit.commitTime).format('YYYY-MM-DD HH:mm:ss Z')
|
|
console.log(
|
|
`Supabase Studio is running commit ${commit.commitSha} deployed at ${commitTime}.`
|
|
)
|
|
commitLoggedRef.current = true
|
|
}
|
|
}, [commit])
|
|
|
|
useEffect(() => {
|
|
if (!commit || commit.commitTime === 'unknown') {
|
|
return
|
|
}
|
|
|
|
// set the current commit on first load
|
|
if (!currentCommitTime) {
|
|
setCurrentCommitTime(commit.commitTime)
|
|
return
|
|
}
|
|
|
|
// if the current commit is the same as the fetched commit, do nothing
|
|
if (currentCommitTime === commit.commitTime) {
|
|
return
|
|
}
|
|
|
|
// prevent showing the toast again if user has already seen and dismissed it
|
|
if (isToastShown) {
|
|
return
|
|
}
|
|
|
|
// check if the time difference between commits is more than 24 hours
|
|
const hourDiff = dayjs(commit.commitTime).diff(dayjs(currentCommitTime), 'hour')
|
|
if (hourDiff < 24) {
|
|
return
|
|
}
|
|
|
|
// show the toast
|
|
toast.custom((id) => <DeployCheckToast id={id} />, {
|
|
duration: Infinity,
|
|
position: 'bottom-right',
|
|
})
|
|
setIsToastShown(true)
|
|
}, [commit, isToastShown, currentCommitTime])
|
|
}
|