Merge branch 'main' into race-condition-e2e

Author: dai-shi

e2e/fixtures/router-client/src/components/skip-nav.tsx

@@ -0,0 +1,16 @@
+'use client';
+
+import { useRouter } from 'waku';
+
+export function SkipNavToBButton() {
+  const router = useRouter();
+  return (
+    <button
+      data-testid="skip-go-b"
+      onClick={() => router.push('/skip/b')}
+      type="button"
+    >
+      Go skip/b
+    </button>
+  );
+}

e2e/fixtures/router-client/src/pages/skip/_layout.tsx

@@ -0,0 +1,16 @@
+import type { ReactNode } from 'react';
+
+export default function SkipLayout({ children }: { children: ReactNode }) {
+  return (
+    <main>
+      <h2 data-testid="skip-static-layout-marker">SKIP_STATIC_LAYOUT_MARKER</h2>
+      {children}
+    </main>
+  );
+}
+
+export const getConfig = () => {
+  return {
+    render: 'static',
+  } as const;
+};

e2e/fixtures/router-client/src/pages/skip/a.tsx

@@ -0,0 +1,16 @@
+import { SkipNavToBButton } from '../../components/skip-nav.js';
+
+export default function SkipPageA() {
+  return (
+    <div>
+      <h1>SKIP_A_PAGE_MARKER</h1>
+      <SkipNavToBButton />
+    </div>
+  );
+}
+
+export const getConfig = () => {
+  return {
+    render: 'dynamic',
+  } as const;
+};

e2e/fixtures/router-client/src/pages/skip/b.tsx

@@ -0,0 +1,13 @@
+export default function SkipPageB() {
+  return (
+    <div>
+      <h1>SKIP_B_PAGE_MARKER</h1>
+    </div>
+  );
+}
+
+export const getConfig = () => {
+  return {
+    render: 'dynamic',
+  } as const;
+};

e2e/fixtures/waku-jotai-integration/package.json

@@ -14,7 +14,7 @@
     "react-dom": "~19.2.4",
     "react-server-dom-webpack": "~19.2.4",
     "waku": "latest",
-    "waku-jotai": "^0.2.1"
+    "waku-jotai": "https://pkg.pr.new/waku-jotai@8"
   },
   "devDependencies": {
     "@types/react": "^19.2.14",

e2e/router-client-no-404.spec.ts

@@ -31,6 +31,6 @@ test.describe('router-client-no-404', () => {
     await expect(page.getByRole('heading', { name: 'Custom 404' })).toHaveCount(
       0,
     );
-    await expect(page).toHaveURL(/\/start$/);
+    await expect(page).toHaveURL(/\/missing$/);
   });
 });

e2e/router-client.spec.ts

@@ -341,6 +341,49 @@ test.describe('router-client', () => {
     await expect(page.getByTestId('route-query')).toHaveText('x=1');
   });
 
+  test('skip header omits static layout payload on soft navigation', async ({
+    page,
+  }) => {
+    await page.goto(`http://localhost:${port}/skip/a`);
+    await waitForHydration(page);
+
+    await expect(page.getByTestId('skip-static-layout-marker')).toHaveText(
+      'SKIP_STATIC_LAYOUT_MARKER',
+    );
+    await expect(
+      page.getByRole('heading', { name: 'SKIP_A_PAGE_MARKER' }),
+    ).toBeVisible();
+
+    const rscResponsePromise = page.waitForResponse(
+      (response) =>
+        response.url().includes('/RSC/R/skip/b.txt') &&
+        response.request().method() === 'GET',
+    );
+
+    await page.getByTestId('skip-go-b').click();
+
+    const response = await rscResponsePromise;
+    const request = response.request();
+    const skipHeader = request.headers()['x-waku-router-skip'];
+
+    expect(skipHeader).toBeTruthy();
+    const skipIds = JSON.parse(skipHeader as string) as unknown;
+    expect(Array.isArray(skipIds)).toBe(true);
+    expect(skipIds).toContain('root');
+
+    const payload = await response.text();
+    expect(payload).toContain('SKIP_B_PAGE_MARKER');
+    expect(payload).not.toContain('SKIP_STATIC_LAYOUT_MARKER');
+    expect(payload).not.toContain('SKIP_A_PAGE_MARKER');
+
+    await expect(
+      page.getByRole('heading', { name: 'SKIP_B_PAGE_MARKER' }),
+    ).toBeVisible();
+    await expect(page.getByTestId('skip-static-layout-marker')).toHaveText(
+      'SKIP_STATIC_LAYOUT_MARKER',
+    );
+  });
+
   test('unstable_prefetchOnView triggers prefetch when link enters viewport', async ({
     page,
   }) => {
@@ -459,7 +502,7 @@ test.describe('router-client', () => {
       page.getByRole('heading', { name: 'Custom 404' }),
     ).toBeVisible();
     await expect(page.getByTestId('route-path')).toHaveText('/404');
-    await expect(page).toHaveURL(/\/start$/);
+    await expect(page).toHaveURL(/\/missing$/);
     consoleErrors = dropExpectedErrorFlowConsoleErrors(consoleErrors);
   });
 });

examples/08_jotai-demo/package.json

@@ -14,7 +14,7 @@
     "react-dom": "~19.2.4",
     "react-server-dom-webpack": "~19.2.4",
     "waku": "1.0.0-alpha.4",
-    "waku-jotai": "^0.2.1"
+    "waku-jotai": "https://pkg.pr.new/waku-jotai@8"
   },
   "devDependencies": {
     "@tailwindcss/vite": "^4.1.18",

examples/54_jotai/package.json

@@ -14,7 +14,7 @@
     "react-dom": "~19.2.4",
     "react-server-dom-webpack": "~19.2.4",
     "waku": "1.0.0-alpha.4",
-    "waku-jotai": "^0.2.1"
+    "waku-jotai": "https://pkg.pr.new/waku-jotai@8"
   },
   "devDependencies": {
     "@types/react": "^19.2.14",