From 925aee444aea58a7a4a9bdab3b66aa4d4d256004 Mon Sep 17 00:00:00 2001
From: Hiroshi Ogawa <hi.ogawa.zz@gmail.com>
Date: Tue, 8 Jul 2025 16:05:12 +0900
Subject: [PATCH 1/4] test(rsc): tweak timeout + remove unused

---
 packages/plugin-rsc/e2e/helper.ts               | 17 +++++++----------
 .../examples/react-router/cf/vite.config.ts     | 13 -------------
 2 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/packages/plugin-rsc/e2e/helper.ts b/packages/plugin-rsc/e2e/helper.ts
index fdb366064..754d4de19 100644
--- a/packages/plugin-rsc/e2e/helper.ts
+++ b/packages/plugin-rsc/e2e/helper.ts
@@ -6,16 +6,13 @@ export const testNoJs = test.extend({
 
 export async function waitForHydration(page: Page) {
   await expect
-    .poll(
-      () =>
-        page
-          .locator('body')
-          .evaluate(
-            (el) =>
-              el &&
-              Object.keys(el).some((key) => key.startsWith('__reactFiber')),
-          ),
-      { timeout: 3000 },
+    .poll(() =>
+      page
+        .locator('body')
+        .evaluate(
+          (el) =>
+            el && Object.keys(el).some((key) => key.startsWith('__reactFiber')),
+        ),
     )
     .toBeTruthy()
 }
diff --git a/packages/plugin-rsc/examples/react-router/cf/vite.config.ts b/packages/plugin-rsc/examples/react-router/cf/vite.config.ts
index c4348cec7..8cf7a02f5 100644
--- a/packages/plugin-rsc/examples/react-router/cf/vite.config.ts
+++ b/packages/plugin-rsc/examples/react-router/cf/vite.config.ts
@@ -36,19 +36,6 @@ export default defineConfig({
         },
       ],
     }),
-    {
-      name: 'react-router-fixup',
-      transform(code) {
-        if (code.includes(`import { AsyncLocalStorage } from 'async_hooks';`)) {
-          code = code.replaceAll('async_hooks', 'node:async_hooks')
-          code = code.replaceAll(
-            `global.___reactRouterServerStorage___`,
-            `globalThis.___reactRouterServerStorage___`,
-          )
-          return code
-        }
-      },
-    },
   ],
   environments: {
     client: {

From 3b9e06bc9211d567a4333b5bdbb61311429ed99c Mon Sep 17 00:00:00 2001
From: Hiroshi Ogawa <hi.ogawa.zz@gmail.com>
Date: Tue, 8 Jul 2025 17:06:08 +0900
Subject: [PATCH 2/4] chore: cleanup

---
 packages/plugin-rsc/e2e/helper.ts | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/packages/plugin-rsc/e2e/helper.ts b/packages/plugin-rsc/e2e/helper.ts
index 754d4de19..fdb366064 100644
--- a/packages/plugin-rsc/e2e/helper.ts
+++ b/packages/plugin-rsc/e2e/helper.ts
@@ -6,13 +6,16 @@ export const testNoJs = test.extend({
 
 export async function waitForHydration(page: Page) {
   await expect
-    .poll(() =>
-      page
-        .locator('body')
-        .evaluate(
-          (el) =>
-            el && Object.keys(el).some((key) => key.startsWith('__reactFiber')),
-        ),
+    .poll(
+      () =>
+        page
+          .locator('body')
+          .evaluate(
+            (el) =>
+              el &&
+              Object.keys(el).some((key) => key.startsWith('__reactFiber')),
+          ),
+      { timeout: 3000 },
     )
     .toBeTruthy()
 }

From a863b979ccf37516b0464be8d5283fae74df4a32 Mon Sep 17 00:00:00 2001
From: Hiroshi Ogawa <hi.ogawa.zz@gmail.com>
Date: Tue, 8 Jul 2025 17:08:27 +0900
Subject: [PATCH 3/4] test: workers 1

---
 packages/plugin-rsc/playwright.config.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/plugin-rsc/playwright.config.ts b/packages/plugin-rsc/playwright.config.ts
index 29a7d0c6e..cea3a5506 100644
--- a/packages/plugin-rsc/playwright.config.ts
+++ b/packages/plugin-rsc/playwright.config.ts
@@ -26,6 +26,7 @@ export default defineConfig({
       use: devices['Desktop Safari'],
     },
   ],
+  workers: 1,
   forbidOnly: !!process.env.CI,
   retries: process.env.CI ? 2 : 0,
   reporter: ['list', process.env.CI && 'github']

From ad6370d2093ee08b59fdd618d1fe6838d50f7805 Mon Sep 17 00:00:00 2001
From: Hiroshi Ogawa <hi.ogawa.zz@gmail.com>
Date: Tue, 8 Jul 2025 17:39:52 +0900
Subject: [PATCH 4/4] Revert "test: workers 1"

This reverts commit a863b979ccf37516b0464be8d5283fae74df4a32.
---
 packages/plugin-rsc/playwright.config.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/plugin-rsc/playwright.config.ts b/packages/plugin-rsc/playwright.config.ts
index cea3a5506..29a7d0c6e 100644
--- a/packages/plugin-rsc/playwright.config.ts
+++ b/packages/plugin-rsc/playwright.config.ts
@@ -26,7 +26,6 @@ export default defineConfig({
       use: devices['Desktop Safari'],
     },
   ],
-  workers: 1,
   forbidOnly: !!process.env.CI,
   retries: process.env.CI ? 2 : 0,
   reporter: ['list', process.env.CI && 'github']