fix(rsc): fix loadModuleDevProxy with @cloudflare/vite-plugin (#993)

Author: jamesopstad

packages/plugin-rsc/examples/react-router/package.json

@@ -18,7 +18,7 @@
     "react-router": "7.9.6"
   },
   "devDependencies": {
-    "@cloudflare/vite-plugin": "^1.14.2",
+    "@cloudflare/vite-plugin": "^1.15.3",
     "@tailwindcss/typography": "^0.5.19",
     "@tailwindcss/vite": "^4.1.17",
     "@types/react": "^19.2.7",
@@ -27,6 +27,6 @@
     "@vitejs/plugin-rsc": "latest",
     "tailwindcss": "^4.1.17",
     "vite": "^7.2.2",
-    "wrangler": "^4.47.0"
+    "wrangler": "^4.51.0"
   }
 }

packages/plugin-rsc/examples/starter-cf-single/package.json

@@ -15,12 +15,13 @@
     "react-dom": "^19.2.0"
   },
   "devDependencies": {
-    "@cloudflare/vite-plugin": "^1.14.2",
+    "@cloudflare/vite-plugin": "^1.15.3",
     "@types/react": "^19.2.7",
     "@types/react-dom": "^19.2.3",
     "@vitejs/plugin-react": "latest",
     "@vitejs/plugin-rsc": "latest",
     "rsc-html-stream": "^0.0.7",
-    "vite": "^7.2.2"
+    "vite": "^7.2.2",
+    "wrangler": "^4.51.0"
   }
 }

packages/plugin-rsc/src/plugin.ts

@@ -728,18 +728,7 @@ export default function vitePluginRsc(
             this.environment.mode === 'dev' &&
             rscPluginOptions.loadModuleDevProxy
           ) {
-            const origin = server.resolvedUrls?.local[0]
-            assert(origin, '[vite-rsc] no server for loadModueleDevProxy')
-            const endpoint =
-              origin +
-              '__vite_rsc_load_module_dev_proxy?' +
-              new URLSearchParams({ environmentName, entryName })
-            replacement = `__vite_rsc_rpc.createRpcClient(${JSON.stringify({
-              endpoint,
-            })})`
-            s.prepend(
-              `import * as __vite_rsc_rpc from "@vitejs/plugin-rsc/utils/rpc";`,
-            )
+            replacement = `import("virtual:vite-rsc/rpc-client").then((module) => module.createRpcClient(${JSON.stringify({ environmentName, entryName })}))`
           } else if (this.environment.mode === 'dev') {
             const environment = server.environments[environmentName]!
             const source = getEntrySource(environment.config, entryName)
@@ -851,6 +840,32 @@ export default function vitePluginRsc(
         })
       },
     },
+    {
+      name: 'rsc:virtual:vite-rsc/rpc-client',
+      resolveId(source) {
+        if (source === 'virtual:vite-rsc/rpc-client') {
+          return `\0${source}`
+        }
+      },
+      load(id) {
+        if (id === '\0virtual:vite-rsc/rpc-client') {
+          const { server } = manager
+          const origin = server.resolvedUrls?.local[0]
+          assert(origin, '[vite-rsc] no server for loadModuleDevProxy')
+
+          return `\
+import * as __vite_rsc_rpc from "@vitejs/plugin-rsc/utils/rpc";
+export function createRpcClient(params) {
+  const endpoint =
+    "${origin}" +
+    "__vite_rsc_load_module_dev_proxy?" +
+    new URLSearchParams(params);
+  return __vite_rsc_rpc.createRpcClient({ endpoint });
+}
+          `
+        }
+      },
+    },
     {
       name: 'rsc:virtual:vite-rsc/assets-manifest',
       resolveId(source) {