mirror of
https://github.com/MBombeck/HealthLog.git
synced 2026-11-13 22:32:04 +00:00
Keep the dashboard the server streamed
`/` runs its reads server-side and hands them to TanStack through a HydrationBoundary, so the first HTML already carries real tiles. React threw that away on every cold load. The app shell hydrates first and its mount answers `/api/auth/me`; the dashboard sits below `loading.tsx`, hydrates later, and its first client render therefore read an account the server never had. That disagreed with the streamed HTML, React reported #418 and re-rendered the whole page. The prefetch paid for its queries and delivered none of its paint. The account payload is now withheld from the hydration render wherever it is only rendered. `useAccountOnceMounted()` answers null until the component has mounted, which is what the server rendered, and hands the payload over on the next render. The dashboard page, the caregiver card, the getting-started checklist, the achievements tile and the unit labels read it that way. `useAuth` itself still reads the cache, because the document vault redirects off `user.modules` and a first render claiming "no account" bounces it to `/`. Two tiles disagreed without any account involved. A query reports `isLoading` true on the client's first render and false on the server, so both now gate on whether the cell holds an answer. Nothing in CI ran the shipped configuration: the suite's server turns the prefetch off so route mocks keep governing the dashboard. A second server runs it on, and one spec asserts that no hydration error is reported and that the tile node the server streamed is still the node in the DOM once the page settles. Measured over nine cold loads with the CPU throttled 4x: seven bailouts before and none after, median LCP 869 ms before and 145 ms after. FCP and the time to the first tile in the DOM are unchanged, because the streamed paint was never the problem. Keeping it was.
This commit is contained in:
1 parent
03877a0971
commit
675c70eba8
16 files changed
+468
-60
No files matched your search
@@ -18,8 +18,18 @@ let mockUser: { modules?: Record<string, boolean> } | null = {};
|
||||
|
||||
vi.mock("@/hooks/use-auth", () => ({
|
||||
useAuth: () => ({ isAuthenticated: true, user: mockUser }),
|
||||
useAccountOnceMounted: () => mockUser,
|
||||
}));
|
||||
|
||||
// The card paints its skeleton until it is mounted, because the achievements
|
||||
// cell is shared with `<AchievementUnlockNotifier>` in the app shell: on a
|
||||
// cold load of the dashboard that cell is often already full by the time this
|
||||
// card hydrates, where the server had nothing, and a content branch there is a
|
||||
// hydration mismatch that costs the whole streamed page. These cases are about
|
||||
// the MOUNTED render, so the flag is stubbed to what it answers from the first
|
||||
// client re-render on.
|
||||
vi.mock("@/hooks/use-mounted", () => ({ useMounted: () => true }));
|
||||
|
||||
let mockData:
|
||||
| {
|
||||
summary: unknown;
|
||||
|
||||
@@ -19,7 +19,8 @@ import {
|
||||
type LucideIcon,
|
||||
} from "lucide-react";
|
||||
import Link from "next/link";
|
||||
import { useAuth } from "@/hooks/use-auth";
|
||||
import { useAccountOnceMounted, useAuth } from "@/hooks/use-auth";
|
||||
import { useMounted } from "@/hooks/use-mounted";
|
||||
import { useTranslations } from "@/lib/i18n/context";
|
||||
import { formatDate } from "@/lib/format";
|
||||
import { useAchievementsQuery } from "@/lib/queries/use-achievements-query";
|
||||
@@ -83,7 +84,12 @@ const RECENT_LIMIT = 3;
|
||||
*/
|
||||
export function RecentAchievementsCard() {
|
||||
const { t } = useTranslations();
|
||||
const { user, isAuthenticated } = useAuth();
|
||||
const { isAuthenticated } = useAuth();
|
||||
// Withheld until mounted for the same reason the skeleton gate below is:
|
||||
// this card paints inside the dashboard's streamed boundary, and a module
|
||||
// gate that reads the account on the hydration render disagrees with the
|
||||
// server, which had none. See `useAccountOnceMounted`.
|
||||
const user = useAccountOnceMounted();
|
||||
|
||||
// v1.18.0 — the achievements module gate. When the account has the
|
||||
// module turned off the dashboard tile disappears entirely (the data
|
||||
@@ -102,6 +108,16 @@ export function RecentAchievementsCard() {
|
||||
enabled: isAuthenticated && achievementsEnabled,
|
||||
});
|
||||
|
||||
// The dashboard is a streamed Suspense boundary and hydrates after the app
|
||||
// shell. `<AchievementUnlockNotifier>` mounts with the shell and shares this
|
||||
// exact cache cell, so by the time this card replays its first render on the
|
||||
// client the payload is often already there — where the server had nothing
|
||||
// and painted the skeleton. Pinning the loading branch to the mount snapshot
|
||||
// keeps the hydration render identical to the server's; the unlocks land on
|
||||
// the re-render right after. See `useMounted`.
|
||||
const mounted = useMounted();
|
||||
const showSkeleton = !mounted || isPending;
|
||||
|
||||
const recent = pickRecentUnlocks(data?.achievements ?? [], RECENT_LIMIT);
|
||||
|
||||
// Module off ⇒ render nothing so the tile vanishes from the dashboard.
|
||||
@@ -132,7 +148,7 @@ export function RecentAchievementsCard() {
|
||||
}
|
||||
/>
|
||||
|
||||
{isPending ? (
|
||||
{showSkeleton ? (
|
||||
<ul
|
||||
data-slot="recent-achievements-skeleton"
|
||||
aria-hidden="true"
|
||||
|
||||
Reference in new issue
Block a user