Open-source status page, incident response and uptime monitoring
TypeScript alertingincident-managementmcpmcp-servermonitoringmonitoring-as-codeobservabilityon-callopen-sourcesrestatus-pagestatuspagesynthetic-monitoringterraformtinybirdtursouptimeuptime-checkeruptime-monitor
Revert "small prefetch (#2466)" (#2467)
Thibault Le Ouay82e166cb5e43
diff --git a/apps/dashboard/src/app/(dashboard)/chat/layout.tsx b/apps/dashboard/src/app/(dashboard)/chat/layout.tsxindex 62f13addf..dd3e9bab4 100644--- a/apps/dashboard/src/app/(dashboard)/chat/layout.tsx+++ b/apps/dashboard/src/app/(dashboard)/chat/layout.tsx@@ -11,7 +11,7 @@ import {RIGHT_SIDEBAR_COOKIE,getSidebarDefaultOpen,} from "@/lib/sidebar-cookie";-import { HydrateClient, prefetch, trpc } from "@/lib/trpc/server";+import { HydrateClient, getQueryClient, trpc } from "@/lib/trpc/server";import { Breadcrumb } from "./breadcrumb";import { NavActions } from "./nav-actions";@@ -23,7 +23,8 @@ export default async function Layout({children: React.ReactNode;}) {// Prefetch the conversation list so the right sidebar paints immediately.- prefetch(trpc.chatSession.list.queryOptions());+ const queryClient = getQueryClient();+ await queryClient.prefetchQuery(trpc.chatSession.list.queryOptions());const defaultOpen = await getSidebarDefaultOpen(RIGHT_SIDEBAR_COOKIE, false);return (diff --git a/apps/dashboard/src/app/(dashboard)/invite/page.tsx b/apps/dashboard/src/app/(dashboard)/invite/page.tsxindex 9117c1aa6..80673532f 100644--- a/apps/dashboard/src/app/(dashboard)/invite/page.tsx+++ b/apps/dashboard/src/app/(dashboard)/invite/page.tsx@@ -1,7 +1,7 @@import { redirect } from "next/navigation";import type { SearchParams } from "nuqs";-import { HydrateClient, prefetch, trpc } from "@/lib/trpc/server";+import { HydrateClient, getQueryClient, trpc } from "@/lib/trpc/server";import { Client } from "./client";import { searchParamsCache } from "./search-params";@@ -15,7 +15,8 @@ export default async function InvitePage(props: {return redirect("/overview");}- prefetch(trpc.invitation.get.queryOptions({ token }));+ const queryClient = getQueryClient();+ await queryClient.prefetchQuery(trpc.invitation.get.queryOptions({ token }));return (<HydrateClient>diff --git a/apps/dashboard/src/app/(dashboard)/layout.tsx b/apps/dashboard/src/app/(dashboard)/layout.tsxindex 090ede27c..499cac3c4 100644--- a/apps/dashboard/src/app/(dashboard)/layout.tsx+++ b/apps/dashboard/src/app/(dashboard)/layout.tsx@@ -12,7 +12,7 @@ import {LEFT_SIDEBAR_COOKIE,getSidebarDefaultOpen,} from "@/lib/sidebar-cookie";-import { HydrateClient, batchPrefetch, trpc } from "@/lib/trpc/server";+import { HydrateClient, getQueryClient, trpc } from "@/lib/trpc/server";export default async function Layout({children,@@ -44,13 +44,14 @@ export default async function Layout({);}-function HydrateSidebar({ children }: { children: React.ReactNode }) {- batchPrefetch([- trpc.page.list.queryOptions(),- trpc.monitor.list.queryOptions(),- trpc.workspace.get.queryOptions(),- trpc.workspace.list.queryOptions(),- trpc.user.get.queryOptions(),+async function HydrateSidebar({ children }: { children: React.ReactNode }) {+ const queryClient = getQueryClient();+ await Promise.all([+ queryClient.prefetchQuery(trpc.page.list.queryOptions()),+ queryClient.prefetchQuery(trpc.monitor.list.queryOptions()),+ queryClient.prefetchQuery(trpc.workspace.get.queryOptions()),+ queryClient.prefetchQuery(trpc.workspace.list.queryOptions()),+ queryClient.prefetchQuery(trpc.user.get.queryOptions()),]);return <HydrateClient>{children}</HydrateClient>;diff --git a/apps/dashboard/src/app/(dashboard)/loading.tsx b/apps/dashboard/src/app/(dashboard)/loading.tsxdeleted file mode 100644index 203a96e29..000000000--- a/apps/dashboard/src/app/(dashboard)/loading.tsx+++ /dev/null@@ -1,5 +0,0 @@-import { PageSkeleton } from "@/components/content/page-skeleton";--export default function Loading() {- return <PageSkeleton />;-}diff --git a/apps/dashboard/src/app/(dashboard)/monitors/(list)/page.tsx b/apps/dashboard/src/app/(dashboard)/monitors/(list)/page.tsxindex 9b0842967..d5ccaf94c 100644--- a/apps/dashboard/src/app/(dashboard)/monitors/(list)/page.tsx+++ b/apps/dashboard/src/app/(dashboard)/monitors/(list)/page.tsx@@ -1,6 +1,6 @@import type { SearchParams } from "nuqs";-import { HydrateClient, batchPrefetch, trpc } from "@/lib/trpc/server";+import { HydrateClient, getQueryClient, trpc } from "@/lib/trpc/server";import { Client } from "./client";import { searchParamsCache } from "./search-params";@@ -10,11 +10,13 @@ export default async function Page({}: {searchParams: Promise<SearchParams>;}) {- batchPrefetch([- trpc.monitor.list.queryOptions(),- trpc.monitorTag.list.queryOptions(),+ const queryClient = getQueryClient();++ await Promise.all([+ searchParamsCache.parse(searchParams),+ queryClient.prefetchQuery(trpc.monitor.list.queryOptions()),+ queryClient.prefetchQuery(trpc.monitorTag.list.queryOptions()),]);- await searchParamsCache.parse(searchParams);return (<HydrateClient>diff --git a/apps/dashboard/src/app/(dashboard)/monitors/[id]/edit/layout.tsx b/apps/dashboard/src/app/(dashboard)/monitors/[id]/edit/layout.tsxindex df3212620..7132fc6b9 100644--- a/apps/dashboard/src/app/(dashboard)/monitors/[id]/edit/layout.tsx+++ b/apps/dashboard/src/app/(dashboard)/monitors/[id]/edit/layout.tsx@@ -1,9 +1,14 @@-import { HydrateClient, batchPrefetch, trpc } from "@/lib/trpc/server";+import { HydrateClient, getQueryClient, trpc } from "@/lib/trpc/server";-export default function Layout({ children }: { children: React.ReactNode }) {- batchPrefetch([- trpc.monitorTag.list.queryOptions(),- trpc.privateLocation.list.queryOptions(),+export default async function Layout({+ children,+}: {+ children: React.ReactNode;+}) {+ const queryClient = getQueryClient();+ await Promise.all([+ queryClient.prefetchQuery(trpc.monitorTag.list.queryOptions()),+ queryClient.prefetchQuery(trpc.privateLocation.list.queryOptions()),]);return <HydrateClient>{children}</HydrateClient>;diff --git a/apps/dashboard/src/app/(dashboard)/monitors/[id]/incidents/layout.tsx b/apps/dashboard/src/app/(dashboard)/monitors/[id]/incidents/layout.tsxindex 84a4b98c1..5c93f0259 100644--- a/apps/dashboard/src/app/(dashboard)/monitors/[id]/incidents/layout.tsx+++ b/apps/dashboard/src/app/(dashboard)/monitors/[id]/incidents/layout.tsx@@ -4,7 +4,7 @@ import {RIGHT_SIDEBAR_COOKIE,getSidebarDefaultOpen,} from "@/lib/sidebar-cookie";-import { prefetch, trpc } from "@/lib/trpc/server";+import { getQueryClient, trpc } from "@/lib/trpc/server";import { Sidebar } from "../sidebar";@@ -15,8 +15,11 @@ export default async function Layout({children: React.ReactNode;params: Promise<{ id: string }>;}) {+ const queryClient = getQueryClient();const { id } = await params;- prefetch(trpc.incident.list.queryOptions({ monitorId: Number.parseInt(id) }));+ await queryClient.prefetchQuery(+ trpc.incident.list.queryOptions({ monitorId: Number.parseInt(id) }),+ );const defaultOpen = await getSidebarDefaultOpen(RIGHT_SIDEBAR_COOKIE, false);return (diff --git a/apps/dashboard/src/app/(dashboard)/monitors/[id]/layout.tsx b/apps/dashboard/src/app/(dashboard)/monitors/[id]/layout.tsxindex a020d2fb5..9bac32ea9 100644--- a/apps/dashboard/src/app/(dashboard)/monitors/[id]/layout.tsx+++ b/apps/dashboard/src/app/(dashboard)/monitors/[id]/layout.tsx@@ -6,8 +6,8 @@ import {import { AppSidebarTrigger } from "@/components/nav/app-sidebar";import {HydrateClient,- batchPrefetch,fetchQueryOrNotFound,+ getQueryClient,trpc,} from "@/lib/trpc/server";@@ -23,14 +23,15 @@ export default async function Layout({params: Promise<{ id: string }>;}) {const { id } = await params;+ const queryClient = getQueryClient();- batchPrefetch([- trpc.notification.list.queryOptions(),- trpc.privateLocation.list.queryOptions(),- ]);await fetchQueryOrNotFound(trpc.monitor.get.queryOptions({ id: Number.parseInt(id) }),);+ await Promise.all([+ queryClient.prefetchQuery(trpc.notification.list.queryOptions()),+ queryClient.prefetchQuery(trpc.privateLocation.list.queryOptions()),+ ]);return (<HydrateClient>diff --git a/apps/dashboard/src/app/(dashboard)/monitors/loading.tsx b/apps/dashboard/src/app/(dashboard)/monitors/loading.tsxdeleted file mode 100644index 7f2576455..000000000--- a/apps/dashboard/src/app/(dashboard)/monitors/loading.tsx+++ /dev/null@@ -1,6 +0,0 @@-import { PageSkeleton } from "@/components/content/page-skeleton";--// Sits above `[id]/layout.tsx`, whose `fetchQueryOrNotFound` gate suspends.-export default function Loading() {- return <PageSkeleton />;-}diff --git a/apps/dashboard/src/app/(dashboard)/notifications/layout.tsx b/apps/dashboard/src/app/(dashboard)/notifications/layout.tsxindex 52e77d102..dce979381 100644--- a/apps/dashboard/src/app/(dashboard)/notifications/layout.tsx+++ b/apps/dashboard/src/app/(dashboard)/notifications/layout.tsx@@ -4,13 +4,18 @@ import {AppHeaderContent,} from "@/components/nav/app-header";import { AppSidebarTrigger } from "@/components/nav/app-sidebar";-import { HydrateClient, prefetch, trpc } from "@/lib/trpc/server";+import { HydrateClient, getQueryClient, trpc } from "@/lib/trpc/server";import { Breadcrumb } from "./breadcrumb";import { NavActions } from "./nav-actions";-export default function Layout({ children }: { children: React.ReactNode }) {- prefetch(trpc.notification.list.queryOptions());+export default async function Layout({+ children,+}: {+ children: React.ReactNode;+}) {+ const queryClient = getQueryClient();+ await queryClient.prefetchQuery(trpc.notification.list.queryOptions());return (<HydrateClient><AppHeader>diff --git a/apps/dashboard/src/app/(dashboard)/overview/layout.tsx b/apps/dashboard/src/app/(dashboard)/overview/layout.tsxindex 0b74a203d..a26786793 100644--- a/apps/dashboard/src/app/(dashboard)/overview/layout.tsx+++ b/apps/dashboard/src/app/(dashboard)/overview/layout.tsx@@ -4,19 +4,25 @@ import {AppHeaderContent,} from "@/components/nav/app-header";import { AppSidebarTrigger } from "@/components/nav/app-sidebar";-import { HydrateClient, batchPrefetch, trpc } from "@/lib/trpc/server";+import { HydrateClient, getQueryClient, trpc } from "@/lib/trpc/server";import { Breadcrumb } from "./breadcrumb";import { NavActions } from "./nav-actions";-export default function Layout({ children }: { children: React.ReactNode }) {+export default async function Layout({+ children,+}: {+ children: React.ReactNode;+}) {+ const queryClient = getQueryClient();+// inputs must match page.tsx's queries exactly — a differing input misses the cache- batchPrefetch([- trpc.monitor.list.queryOptions(),- trpc.page.list.queryOptions(),- trpc.incident.list.queryOptions(),- trpc.statusReport.list.queryOptions({}),- trpc.maintenance.list.queryOptions(),+ await Promise.all([+ queryClient.prefetchQuery(trpc.monitor.list.queryOptions()),+ queryClient.prefetchQuery(trpc.page.list.queryOptions()),+ queryClient.prefetchQuery(trpc.incident.list.queryOptions()),+ queryClient.prefetchQuery(trpc.statusReport.list.queryOptions({})),+ queryClient.prefetchQuery(trpc.maintenance.list.queryOptions()),]);return (diff --git a/apps/dashboard/src/app/(dashboard)/settings/account/layout.tsx b/apps/dashboard/src/app/(dashboard)/settings/account/layout.tsxindex b919d8855..e69321a72 100644--- a/apps/dashboard/src/app/(dashboard)/settings/account/layout.tsx+++ b/apps/dashboard/src/app/(dashboard)/settings/account/layout.tsx@@ -4,14 +4,19 @@ import {AppHeaderContent,} from "@/components/nav/app-header";import { AppSidebarTrigger } from "@/components/nav/app-sidebar";-import { HydrateClient, prefetch, trpc } from "@/lib/trpc/server";+import { HydrateClient, getQueryClient, trpc } from "@/lib/trpc/server";import { Tabs } from "../tabs";import { Breadcrumb } from "./breadcrumb";import { NavActions } from "./nav-actions";-export default function Layout({ children }: { children: React.ReactNode }) {- prefetch(trpc.member.list.queryOptions());+export default async function Layout({+ children,+}: {+ children: React.ReactNode;+}) {+ const queryClient = getQueryClient();+ await queryClient.prefetchQuery(trpc.member.list.queryOptions());return (<HydrateClient>diff --git a/apps/dashboard/src/app/(dashboard)/settings/audit-logs/layout.tsx b/apps/dashboard/src/app/(dashboard)/settings/audit-logs/layout.tsxindex 079438964..9b7c7686d 100644--- a/apps/dashboard/src/app/(dashboard)/settings/audit-logs/layout.tsx+++ b/apps/dashboard/src/app/(dashboard)/settings/audit-logs/layout.tsx@@ -4,14 +4,19 @@ import {AppHeaderContent,} from "@/components/nav/app-header";import { AppSidebarTrigger } from "@/components/nav/app-sidebar";-import { HydrateClient, prefetch, trpc } from "@/lib/trpc/server";+import { HydrateClient, getQueryClient, trpc } from "@/lib/trpc/server";import { Tabs } from "../tabs";import { Breadcrumb } from "./breadcrumb";import { NavActions } from "./nav-actions";-export default function Layout({ children }: { children: React.ReactNode }) {- prefetch(trpc.auditLog.list.queryOptions({}));+export default async function Layout({+ children,+}: {+ children: React.ReactNode;+}) {+ const queryClient = getQueryClient();+ await queryClient.prefetchQuery(trpc.auditLog.list.queryOptions({}));return (<HydrateClient><div>diff --git a/apps/dashboard/src/app/(dashboard)/settings/general/layout.tsx b/apps/dashboard/src/app/(dashboard)/settings/general/layout.tsxindex 585028b63..bbbd8dd1d 100644--- a/apps/dashboard/src/app/(dashboard)/settings/general/layout.tsx+++ b/apps/dashboard/src/app/(dashboard)/settings/general/layout.tsx@@ -4,17 +4,22 @@ import {AppHeaderContent,} from "@/components/nav/app-header";import { AppSidebarTrigger } from "@/components/nav/app-sidebar";-import { HydrateClient, batchPrefetch, trpc } from "@/lib/trpc/server";+import { HydrateClient, getQueryClient, trpc } from "@/lib/trpc/server";import { Tabs } from "../tabs";import { Breadcrumb } from "./breadcrumb";import { NavActions } from "./nav-actions";-export default function Layout({ children }: { children: React.ReactNode }) {- batchPrefetch([- trpc.member.list.queryOptions(),- trpc.invitation.list.queryOptions(),- trpc.apiKey.list.queryOptions(),+export default async function Layout({+ children,+}: {+ children: React.ReactNode;+}) {+ const queryClient = getQueryClient();+ await Promise.all([+ queryClient.prefetchQuery(trpc.member.list.queryOptions()),+ queryClient.prefetchQuery(trpc.invitation.list.queryOptions()),+ queryClient.prefetchQuery(trpc.apiKey.list.queryOptions()),]);return (diff --git a/apps/dashboard/src/app/(dashboard)/settings/integrations/layout.tsx b/apps/dashboard/src/app/(dashboard)/settings/integrations/layout.tsxindex 2e1d0a8a5..dbc79ae90 100644--- a/apps/dashboard/src/app/(dashboard)/settings/integrations/layout.tsx+++ b/apps/dashboard/src/app/(dashboard)/settings/integrations/layout.tsx@@ -4,16 +4,21 @@ import {AppHeaderContent,} from "@/components/nav/app-header";import { AppSidebarTrigger } from "@/components/nav/app-sidebar";-import { HydrateClient, batchPrefetch, trpc } from "@/lib/trpc/server";+import { HydrateClient, getQueryClient, trpc } from "@/lib/trpc/server";import { Tabs } from "../tabs";import { Breadcrumb } from "./breadcrumb";import { NavActions } from "./nav-actions";-export default function Layout({ children }: { children: React.ReactNode }) {- batchPrefetch([- trpc.integrationRouter.list.queryOptions(),- trpc.workspace.get.queryOptions(),+export default async function Layout({+ children,+}: {+ children: React.ReactNode;+}) {+ const queryClient = getQueryClient();+ await Promise.all([+ queryClient.prefetchQuery(trpc.integrationRouter.list.queryOptions()),+ queryClient.prefetchQuery(trpc.workspace.get.queryOptions()),]);return (diff --git a/apps/dashboard/src/app/(dashboard)/settings/loading.tsx b/apps/dashboard/src/app/(dashboard)/settings/loading.tsxdeleted file mode 100644index 203a96e29..000000000--- a/apps/dashboard/src/app/(dashboard)/settings/loading.tsx+++ /dev/null@@ -1,5 +0,0 @@-import { PageSkeleton } from "@/components/content/page-skeleton";--export default function Loading() {- return <PageSkeleton />;-}diff --git a/apps/dashboard/src/app/(dashboard)/settings/private-locations/layout.tsx b/apps/dashboard/src/app/(dashboard)/settings/private-locations/layout.tsxindex 90064ba49..f33fb7f33 100644--- a/apps/dashboard/src/app/(dashboard)/settings/private-locations/layout.tsx+++ b/apps/dashboard/src/app/(dashboard)/settings/private-locations/layout.tsx@@ -4,16 +4,21 @@ import {AppHeaderContent,} from "@/components/nav/app-header";import { AppSidebarTrigger } from "@/components/nav/app-sidebar";-import { HydrateClient, batchPrefetch, trpc } from "@/lib/trpc/server";+import { HydrateClient, getQueryClient, trpc } from "@/lib/trpc/server";import { Tabs } from "../tabs";import { Breadcrumb } from "./breadcrumb";import { NavActions } from "./nav-actions";-export default function Layout({ children }: { children: React.ReactNode }) {- batchPrefetch([- trpc.notification.list.queryOptions(),- trpc.privateLocation.list.queryOptions(),+export default async function Layout({+ children,+}: {+ children: React.ReactNode;+}) {+ const queryClient = getQueryClient();+ await Promise.all([+ queryClient.prefetchQuery(trpc.notification.list.queryOptions()),+ queryClient.prefetchQuery(trpc.privateLocation.list.queryOptions()),]);return (<HydrateClient>diff --git a/apps/dashboard/src/app/(dashboard)/status-pages/(list)/page.tsx b/apps/dashboard/src/app/(dashboard)/status-pages/(list)/page.tsxindex 1a42164a8..fc3e62a68 100644--- a/apps/dashboard/src/app/(dashboard)/status-pages/(list)/page.tsx+++ b/apps/dashboard/src/app/(dashboard)/status-pages/(list)/page.tsx@@ -1,9 +1,11 @@-import { HydrateClient, prefetch, trpc } from "@/lib/trpc/server";+import { HydrateClient, getQueryClient, trpc } from "@/lib/trpc/server";import { Client } from "./client";-export default function Page() {- prefetch(trpc.page.list.queryOptions());+export default async function Page() {+ const queryClient = getQueryClient();++ await queryClient.prefetchQuery(trpc.page.list.queryOptions());return (<HydrateClient>diff --git a/apps/dashboard/src/app/(dashboard)/status-pages/[id]/components/layout.tsx b/apps/dashboard/src/app/(dashboard)/status-pages/[id]/components/layout.tsxindex d92a20473..9b18b101d 100644--- a/apps/dashboard/src/app/(dashboard)/status-pages/[id]/components/layout.tsx+++ b/apps/dashboard/src/app/(dashboard)/status-pages/[id]/components/layout.tsx@@ -4,7 +4,7 @@ import {RIGHT_SIDEBAR_COOKIE,getSidebarDefaultOpen,} from "@/lib/sidebar-cookie";-import { HydrateClient, batchPrefetch, trpc } from "@/lib/trpc/server";+import { HydrateClient, getQueryClient, trpc } from "@/lib/trpc/server";import { Sidebar } from "../sidebar";@@ -16,11 +16,16 @@ export default async function Layout({params: Promise<{ id: string }>;}) {const { id } = await params;+ const queryClient = getQueryClient();- batchPrefetch([- trpc.page.get.queryOptions({ id: Number.parseInt(id) }),- trpc.monitor.list.queryOptions(),- trpc.pageComponent.list.queryOptions({ pageId: Number.parseInt(id) }),+ await Promise.all([+ queryClient.prefetchQuery(+ trpc.page.get.queryOptions({ id: Number.parseInt(id) }),+ ),+ queryClient.prefetchQuery(trpc.monitor.list.queryOptions()),+ queryClient.prefetchQuery(+ trpc.pageComponent.list.queryOptions({ pageId: Number.parseInt(id) }),+ ),]);const defaultOpen = await getSidebarDefaultOpen(RIGHT_SIDEBAR_COOKIE, false);diff --git a/apps/dashboard/src/app/(dashboard)/status-pages/[id]/history/layout.tsx b/apps/dashboard/src/app/(dashboard)/status-pages/[id]/history/layout.tsxindex d92a20473..9b18b101d 100644--- a/apps/dashboard/src/app/(dashboard)/status-pages/[id]/history/layout.tsx+++ b/apps/dashboard/src/app/(dashboard)/status-pages/[id]/history/layout.tsx@@ -4,7 +4,7 @@ import {RIGHT_SIDEBAR_COOKIE,getSidebarDefaultOpen,} from "@/lib/sidebar-cookie";-import { HydrateClient, batchPrefetch, trpc } from "@/lib/trpc/server";+import { HydrateClient, getQueryClient, trpc } from "@/lib/trpc/server";import { Sidebar } from "../sidebar";@@ -16,11 +16,16 @@ export default async function Layout({params: Promise<{ id: string }>;}) {const { id } = await params;+ const queryClient = getQueryClient();- batchPrefetch([- trpc.page.get.queryOptions({ id: Number.parseInt(id) }),- trpc.monitor.list.queryOptions(),- trpc.pageComponent.list.queryOptions({ pageId: Number.parseInt(id) }),+ await Promise.all([+ queryClient.prefetchQuery(+ trpc.page.get.queryOptions({ id: Number.parseInt(id) }),+ ),+ queryClient.prefetchQuery(trpc.monitor.list.queryOptions()),+ queryClient.prefetchQuery(+ trpc.pageComponent.list.queryOptions({ pageId: Number.parseInt(id) }),+ ),]);const defaultOpen = await getSidebarDefaultOpen(RIGHT_SIDEBAR_COOKIE, false);diff --git a/apps/dashboard/src/app/(dashboard)/status-pages/[id]/history/page.tsx b/apps/dashboard/src/app/(dashboard)/status-pages/[id]/history/page.tsxindex 6b182ebff..706e19c50 100644--- a/apps/dashboard/src/app/(dashboard)/status-pages/[id]/history/page.tsx+++ b/apps/dashboard/src/app/(dashboard)/status-pages/[id]/history/page.tsx@@ -1,6 +1,6 @@import type { SearchParams } from "nuqs";-import { HydrateClient, prefetch, trpc } from "@/lib/trpc/server";+import { HydrateClient, getQueryClient, trpc } from "@/lib/trpc/server";import { Client } from "./client";import { searchParamsCache } from "./search-params";@@ -13,12 +13,13 @@ export default async function Page({searchParams: Promise<SearchParams>;}) {const { id } = await params;+ const queryClient = getQueryClient();- prefetch(- trpc.page.getUptimeHistory.queryOptions({ id: Number.parseInt(id) }),- );// NOTE: store in cache to avoid flicker on clients first renderawait searchParamsCache.parse(searchParams);+ await queryClient.prefetchQuery(+ trpc.page.getUptimeHistory.queryOptions({ id: Number.parseInt(id) }),+ );return (<HydrateClient>diff --git a/apps/dashboard/src/app/(dashboard)/status-pages/[id]/layout.tsx b/apps/dashboard/src/app/(dashboard)/status-pages/[id]/layout.tsxindex 56afef682..eb9eac213 100644--- a/apps/dashboard/src/app/(dashboard)/status-pages/[id]/layout.tsx+++ b/apps/dashboard/src/app/(dashboard)/status-pages/[id]/layout.tsx@@ -7,7 +7,7 @@ import { AppSidebarTrigger } from "@/components/nav/app-sidebar";import {HydrateClient,fetchQueryOrNotFound,- prefetch,+ getQueryClient,trpc,} from "@/lib/trpc/server";@@ -23,11 +23,12 @@ export default async function Layout({params: Promise<{ id: string }>;}) {const { id } = await params;+ const queryClient = getQueryClient();- prefetch(trpc.monitor.list.queryOptions());await fetchQueryOrNotFound(trpc.page.get.queryOptions({ id: Number.parseInt(id) }),);+ await queryClient.prefetchQuery(trpc.monitor.list.queryOptions());return (<HydrateClient>diff --git a/apps/dashboard/src/app/(dashboard)/status-pages/[id]/maintenances/layout.tsx b/apps/dashboard/src/app/(dashboard)/status-pages/[id]/maintenances/layout.tsxindex 66e9d39b2..3b65d74b6 100644--- a/apps/dashboard/src/app/(dashboard)/status-pages/[id]/maintenances/layout.tsx+++ b/apps/dashboard/src/app/(dashboard)/status-pages/[id]/maintenances/layout.tsx@@ -4,7 +4,7 @@ import {RIGHT_SIDEBAR_COOKIE,getSidebarDefaultOpen,} from "@/lib/sidebar-cookie";-import { HydrateClient, prefetch, trpc } from "@/lib/trpc/server";+import { HydrateClient, getQueryClient, trpc } from "@/lib/trpc/server";import { Sidebar } from "../sidebar";@@ -16,8 +16,9 @@ export default async function Layout({params: Promise<{ id: string }>;}) {const { id } = await params;+ const queryClient = getQueryClient();- prefetch(+ await queryClient.prefetchQuery(trpc.maintenance.list.queryOptions({pageId: Number.parseInt(id),}),diff --git a/apps/dashboard/src/app/(dashboard)/status-pages/[id]/status-reports/layout.tsx b/apps/dashboard/src/app/(dashboard)/status-pages/[id]/status-reports/layout.tsxindex 6118c550f..9a6eb9926 100644--- a/apps/dashboard/src/app/(dashboard)/status-pages/[id]/status-reports/layout.tsx+++ b/apps/dashboard/src/app/(dashboard)/status-pages/[id]/status-reports/layout.tsx@@ -4,7 +4,7 @@ import {RIGHT_SIDEBAR_COOKIE,getSidebarDefaultOpen,} from "@/lib/sidebar-cookie";-import { HydrateClient, prefetch, trpc } from "@/lib/trpc/server";+import { HydrateClient, getQueryClient, trpc } from "@/lib/trpc/server";import { Sidebar } from "../sidebar";@@ -15,8 +15,9 @@ export default async function Layout({children: React.ReactNode;params: Promise<{ id: string }>;}) {+ const queryClient = getQueryClient();const { id } = await params;- prefetch(+ await queryClient.prefetchQuery(trpc.statusReport.list.queryOptions({ pageId: Number.parseInt(id) }),);const defaultOpen = await getSidebarDefaultOpen(RIGHT_SIDEBAR_COOKIE, false);diff --git a/apps/dashboard/src/app/(dashboard)/status-pages/[id]/subscribers/layout.tsx b/apps/dashboard/src/app/(dashboard)/status-pages/[id]/subscribers/layout.tsxindex 1c642cc26..012f9e6c7 100644--- a/apps/dashboard/src/app/(dashboard)/status-pages/[id]/subscribers/layout.tsx+++ b/apps/dashboard/src/app/(dashboard)/status-pages/[id]/subscribers/layout.tsx@@ -1,4 +1,4 @@-import { HydrateClient, prefetch, trpc } from "@/lib/trpc/server";+import { HydrateClient, getQueryClient, trpc } from "@/lib/trpc/server";export default async function Layout({children,@@ -7,9 +7,10 @@ export default async function Layout({children: React.ReactNode;params: Promise<{ id: string }>;}) {+ const queryClient = getQueryClient();const { id } = await params;- prefetch(+ await queryClient.prefetchQuery(trpc.pageSubscriber.list.queryOptions({ pageId: Number.parseInt(id) }),);diff --git a/apps/dashboard/src/app/(dashboard)/status-pages/loading.tsx b/apps/dashboard/src/app/(dashboard)/status-pages/loading.tsxdeleted file mode 100644index 7f2576455..000000000--- a/apps/dashboard/src/app/(dashboard)/status-pages/loading.tsx+++ /dev/null@@ -1,6 +0,0 @@-import { PageSkeleton } from "@/components/content/page-skeleton";--// Sits above `[id]/layout.tsx`, whose `fetchQueryOrNotFound` gate suspends.-export default function Loading() {- return <PageSkeleton />;-}diff --git a/apps/dashboard/src/app/onboarding/layout.tsx b/apps/dashboard/src/app/onboarding/layout.tsxindex 4975f7354..74f5e77c1 100644--- a/apps/dashboard/src/app/onboarding/layout.tsx+++ b/apps/dashboard/src/app/onboarding/layout.tsx@@ -1,11 +1,16 @@-import { HydrateClient, batchPrefetch, trpc } from "@/lib/trpc/server";+import { HydrateClient, getQueryClient, trpc } from "@/lib/trpc/server";-export default function Layout({ children }: { children: React.ReactNode }) {- batchPrefetch([- trpc.workspace.get.queryOptions(),- trpc.user.get.queryOptions(),- trpc.monitor.list.queryOptions(),- trpc.page.list.queryOptions(),+export default async function Layout({+ children,+}: {+ children: React.ReactNode;+}) {+ const queryClient = getQueryClient();+ await Promise.all([+ queryClient.prefetchQuery(trpc.workspace.get.queryOptions()),+ queryClient.prefetchQuery(trpc.user.get.queryOptions()),+ queryClient.prefetchQuery(trpc.monitor.list.queryOptions()),+ queryClient.prefetchQuery(trpc.page.list.queryOptions()),]);return <HydrateClient>{children}</HydrateClient>;diff --git a/apps/dashboard/src/app/onboarding/page.tsx b/apps/dashboard/src/app/onboarding/page.tsxindex 143397fab..fbdbc731f 100644--- a/apps/dashboard/src/app/onboarding/page.tsx+++ b/apps/dashboard/src/app/onboarding/page.tsx@@ -2,12 +2,7 @@ import { cookies } from "next/headers";import { redirect } from "next/navigation";import type { SearchParams } from "nuqs";-import {- HydrateClient,- getQueryClient,- prefetch,- trpc,-} from "@/lib/trpc/server";+import { HydrateClient, getQueryClient, trpc } from "@/lib/trpc/server";import { Client } from "./client";import { searchParamsCache } from "./search-params";@@ -57,12 +52,10 @@ export default async function Page({}const queryClient = getQueryClient();- // only monitors/pages gate the step redirect below — the key list just needs- // to be in the dehydrated cache for the client- prefetch(trpc.apiKey.list.queryOptions());const [monitors, pages] = await Promise.all([queryClient.fetchQuery(trpc.monitor.list.queryOptions()),queryClient.fetchQuery(trpc.page.list.queryOptions()),+ queryClient.fetchQuery(trpc.apiKey.list.queryOptions()),]);const updates: {diff --git a/apps/dashboard/src/components/content/page-skeleton.tsx b/apps/dashboard/src/components/content/page-skeleton.tsxdeleted file mode 100644index 51fd6ed94..000000000--- a/apps/dashboard/src/components/content/page-skeleton.tsx+++ /dev/null@@ -1,35 +0,0 @@-import { Skeleton } from "@openstatus/ui/components/ui/skeleton";--import {- Section,- SectionGroup,- SectionHeader,-} from "@/components/content/section";-import { AppHeader, AppHeaderContent } from "@/components/nav/app-header";-import { AppSidebarTrigger } from "@/components/nav/app-sidebar";-import { DataTableSkeleton } from "@/components/ui/data-table/data-table-skeleton";--/** Route-level fallback for `loading.tsx`; mirrors the AppHeader + Section shell. */-export function PageSkeleton() {- return (- <div>- <AppHeader>- <AppHeaderContent>- <AppSidebarTrigger />- <Skeleton className="h-4 w-32" />- </AppHeaderContent>- </AppHeader>- <main className="w-full flex-1">- <SectionGroup>- <Section>- <SectionHeader>- <Skeleton className="h-6 w-40" />- <Skeleton className="h-4 w-64" />- </SectionHeader>- <DataTableSkeleton />- </Section>- </SectionGroup>- </main>- </div>- );-}diff --git a/apps/dashboard/src/lib/trpc/server.tsx b/apps/dashboard/src/lib/trpc/server.tsxindex 550eef9fa..2356eb073 100644--- a/apps/dashboard/src/lib/trpc/server.tsx+++ b/apps/dashboard/src/lib/trpc/server.tsx@@ -32,6 +32,11 @@ export const trpc = createTRPCOptionsProxy<AppRouter>({// tRPC's link will never invoke — cast the call-signature wrapper.fetch: (async (url, options) => {const cookieStore = await cookies();+ console.log("[dashboard trpc server] fetch", {+ hasSessionToken:+ !!cookieStore.get("__Secure-authjs.session-token")?.value ||+ !!cookieStore.get("authjs.session-token")?.value,+ });return fetch(url, {...options,credentials: "include",