fix: the theme belongs in a cookie, and the offline page in the shell
next/script rendered the theme script with a nonce, and browsers hide a nonce attribute from the DOM once they have parsed it, so the server sent nonce="" and the client read undefined. Every page load logged a hydration mismatch. The cookie is the fix rather than a workaround for it. The server reads it and stamps data-theme on the html element, so the first frame is already the right colour and there is no inline script at all. Chasing that turned up worse. /offline sat outside [locale], which made it a sibling of the root layout, so Next gave it a generated one: no stylesheet, no font, no theme, and a second html element. The phase 7 check asserted the text and a button and passed while the page was plainly broken. It is a normal screen now. The service worker keeps one offline copy per language the reader actually visits, learned from their own successful navigations, so no list of locales lives in the worker and a third language stays a catalog file. The e2e warm-up also asks for the dynamic routes, which cost a compile of their own and were being paid for by whichever test reached one first. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 5
parent
e4eb1617d1
commit
8c8463924f
@@ -6,9 +6,10 @@ import { setRequestLocale } from 'next-intl/server';
|
||||
import { getT } from '@/i18n/t';
|
||||
import { notFound } from 'next/navigation';
|
||||
import type { ReactNode } from 'react';
|
||||
import { cookies } from 'next/headers';
|
||||
import { Providers } from '@/components/providers';
|
||||
import { ThemeScript } from '@/components/theme-script';
|
||||
import { routing } from '@/i18n/routing';
|
||||
import { THEME_COOKIE } from '@/lib/theme';
|
||||
import '../globals.css';
|
||||
|
||||
// Self hosted by next/font: no third party font request at runtime, which keeps the
|
||||
@@ -55,11 +56,18 @@ export default async function LocaleLayout({
|
||||
if (!isLocale(locale)) notFound();
|
||||
setRequestLocale(locale);
|
||||
|
||||
// Read here rather than in a script the browser runs: the first frame is already the
|
||||
// right colour, and there is no inline script for a nonce policy to argue with.
|
||||
const stored = (await cookies()).get(THEME_COOKIE)?.value;
|
||||
const theme = stored === 'light' || stored === 'dark' ? stored : undefined;
|
||||
|
||||
return (
|
||||
<html lang={locale} className={inter.variable} suppressHydrationWarning>
|
||||
<head>
|
||||
<ThemeScript />
|
||||
</head>
|
||||
<html
|
||||
lang={locale}
|
||||
className={inter.variable}
|
||||
{...(theme ? { 'data-theme': theme } : {})}
|
||||
suppressHydrationWarning
|
||||
>
|
||||
<body className="min-h-dvh font-sans antialiased">
|
||||
<NextIntlClientProvider>
|
||||
<Providers>{children}</Providers>
|
||||
|
||||
Reference in New Issue
Block a user