fix: simplify load-rsc virtual

Author: hi-ogawa

packages/plugin-rsc/examples/browser-mode2/src/framework/entry.browser.tsx

@@ -8,12 +8,9 @@ import {
 } from '@vitejs/plugin-rsc/browser'
 import type { RscPayload } from './entry.rsc'
 
-let fetchRsc: (request: Request) => Promise<Response>
-
-export function initialize(options: {
-  fetchRsc: (request: Request) => Promise<Response>
-}) {
-  fetchRsc = options.fetchRsc
+async function fetchRsc(request: Request): Promise<Response> {
+  const module = await import('virtual:vite-rsc-browser-mode2/load-rsc')
+  return module.default.fetch(request)
 }
 
 export async function main() {

packages/plugin-rsc/examples/browser-mode2/src/framework/entry.rsc.tsx

@@ -15,7 +15,7 @@ export type RscPayload = {
   formState?: ReactFormState
 }
 
-export default async function handler(request: Request): Promise<Response> {
+async function handler(request: Request): Promise<Response> {
   const isAction = request.method === 'POST'
   let returnValue: unknown | undefined
   let formState: ReactFormState | undefined
@@ -51,6 +51,10 @@ export default async function handler(request: Request): Promise<Response> {
   })
 }
 
+export default {
+  fetch: handler,
+}
+
 if (import.meta.hot) {
   import.meta.hot.accept()
 }

packages/plugin-rsc/examples/browser-mode2/src/framework/load-rsc-dev.tsx

@@ -1,25 +1,32 @@
 import { ESModulesEvaluator, ModuleRunner } from 'vite/module-runner'
 
-export default async function loadRsc() {
-  const runner = new ModuleRunner(
-    {
-      sourcemapInterceptor: false,
-      transport: {
-        invoke: async (payload) => {
-          const response = await fetch(
-            '/@vite/invoke-rsc?' +
-              new URLSearchParams({
-                data: JSON.stringify(payload),
-              }),
-          )
-          return response.json()
-        },
+const runner = new ModuleRunner(
+  {
+    sourcemapInterceptor: false,
+    transport: {
+      invoke: async (payload) => {
+        const response = await fetch(
+          '/@vite/invoke-rsc?' +
+            new URLSearchParams({
+              data: JSON.stringify(payload),
+            }),
+        )
+        return response.json()
       },
-      hmr: false,
     },
-    new ESModulesEvaluator(),
-  )
-  return await runner.import<typeof import('./entry.rsc')>(
-    '/src/framework/entry.rsc.tsx',
-  )
-}
+    hmr: false,
+  },
+  new ESModulesEvaluator(),
+)
+
+export default new Proxy(
+  {},
+  {
+    get(_target, p, _receiver) {
+      return async (...args: any[]) => {
+        const module = await runner.import('/src/framework/entry.rsc.tsx')
+        return module.default[p](...args)
+      }
+    },
+  },
+)

packages/plugin-rsc/examples/browser-mode2/src/framework/main.tsx

@@ -1,10 +1,2 @@
-import * as client from './entry.browser'
-import loadRsc from 'virtual:vite-rsc-browser-mode2/load-rsc'
-
-async function main() {
-  const rsc = await loadRsc()
-  client.initialize({ fetchRsc: rsc.default })
-  await client.main()
-}
-
+import { main } from './entry.browser'
 main()

packages/plugin-rsc/examples/browser-mode2/src/framework/virtual.d.ts

@@ -1,4 +1,4 @@
 declare module 'virtual:vite-rsc-browser-mode2/load-rsc' {
-  const loadRsc: () => Promise<typeof import('./entry.rsc')>
-  export default loadRsc
+  const default_: typeof import('./entry.rsc.tsx').default
+  export default default_
 }