Merge branch 'main' into canary-ci-2-fix-2

e2e/fixtures/hot-reload/src/pages/about.tsx

@@ -0,0 +1,18 @@
+import { Link } from 'waku';
+
+export default async function AboutPage() {
+  return (
+    <div>
+      <p>About Page</p>
+      <Link to="/" data-testid="home">
+        Return home
+      </Link>
+    </div>
+  );
+}
+
+export const getConfig = async () => {
+  return {
+    render: 'static',
+  } as const;
+};

e2e/fixtures/hot-reload/src/pages/index.tsx

@@ -1,10 +1,15 @@
+import { Link } from 'waku';
+
 import { Counter } from '../components/counter.js';
 
 export default async function HomePage() {
   return (
     <div>
       <p>Home Page</p>
       <Counter />
+      <Link to="/about" data-testid="about">
+        About
+      </Link>
     </div>
   );
 }

e2e/hot-reload.spec.ts

@@ -87,7 +87,7 @@ test.describe('hot reload', () => {
     });
   });
 
-  test('simple case', async ({ page }) => {
+  test('server and client', async ({ page }) => {
     const [port, pid] = await run();
     await page.goto(`http://localhost:${port}/`);
     await expect(page.getByText('Home Page')).toBeVisible();
@@ -115,6 +115,13 @@ test.describe('hot reload', () => {
     await expect(page.getByTestId('count')).toHaveText('3');
     await page.getByTestId('increment').click();
     await expect(page.getByTestId('count')).toHaveText('4');
+    // Jump to another page and back
+    await page.getByTestId('about').click();
+    await expect(page.getByText('About Page')).toBeVisible();
+    await modifyFile('src/pages/about.tsx', 'About Page', 'About2 Page');
+    await expect(page.getByText('About2 Page')).toBeVisible();
+    await page.getByTestId('home').click();
+    await expect(page.getByText('Edited Page')).toBeVisible();
     await terminate(pid!);
   });
 });

package.json

@@ -11,7 +11,7 @@
     "test": "prettier -c . && eslint . && tsc -b && tsc -b --noEmit `find examples -mindepth 1 -maxdepth 1 -type d ! -name '*_js'` && pnpm run --filter waku test",
     "test-vite-ecosystem-ci": "pnpm run --filter waku test && playwright test --project=chromium",
     "e2e": "playwright test",
-    "website:dev": "(cd packages/website && pnpm run dev)",
+    "website:dev": "cd packages/website && pnpm run dev",
     "website:build": "cd packages/website && pnpm run build",
     "website:vercel": "pnpm run compile && pnpm run website:build --with-vercel-static && mv packages/website/.vercel/output .vercel/",
     "website:prd": "pnpm run website:build && (cd packages/website && pnpm start)"

packages/waku/src/lib/plugins/vite-plugin-rsc-hmr.ts

@@ -124,6 +124,8 @@ export function rscHmrPlugin(): Plugin {
             `
 {
   const refetchRoute = () => {
+    cachedIdSet.clear();
+    staticPathSet.clear();
     const rscPath = encodeRoutePath(route.path);
     const rscParams = createRscParams(route.query, []);
     refetch(rscPath, rscParams);