fix: tweak entries

Author: hi-ogawa

packages/plugin-rsc/examples/react-router/cf/entry.rsc.tsx

@@ -7,7 +7,3 @@ export default {
     return fetchServer(request)
   },
 }
-
-if (import.meta.hot) {
-  import.meta.hot.accept()
-}

packages/plugin-rsc/examples/react-router/cf/entry.ssr.tsx

@@ -1,13 +1,9 @@
-import handler from '../react-router-vite/entry.ssr'
+import { generateHTML } from '../react-router-vite/entry.ssr'
 
 console.log('[debug:cf-ssr-entry]')
 
-// TODO:
-// shouldn't "entry.rsc.tsx" be the main server entry
-// and optionally call "entry.ssr.tsx" only for rendering html?
-
 export default {
   fetch(request: Request, env: any) {
-    return handler(request, (request) => env.RSC.fetch(request))
+    return generateHTML(request, (request) => env.RSC.fetch(request))
   },
 }

packages/plugin-rsc/examples/react-router/react-router-vite/entry.rsc.single.tsx

@@ -0,0 +1,10 @@
+import { fetchServer } from './entry.rsc'
+
+export default async function handler(request: Request) {
+  // Import the generateHTML function from the client environment
+  const ssr = await import.meta.viteRsc.loadModule<
+    typeof import('./entry.ssr')
+  >('ssr', 'index')
+
+  return ssr.generateHTML(request, fetchServer)
+}

packages/plugin-rsc/examples/react-router/react-router-vite/entry.rsc.tsx

@@ -32,15 +32,6 @@ export function fetchServer(request: Request) {
   })
 }
 
-export default async function handler(request: Request) {
-  // Import the generateHTML function from the client environment
-  const ssr = await import.meta.viteRsc.loadModule<
-    typeof import('./entry.ssr')
-  >('ssr', 'index')
-
-  return ssr.generateHTML(request, fetchServer)
-}
-
 if (import.meta.hot) {
   import.meta.hot.accept()
 }

packages/plugin-rsc/examples/react-router/react-router-vite/entry.ssr.single.tsx

@@ -36,10 +36,3 @@ export async function generateHTML(
     },
   })
 }
-
-export default async function handler(
-  request: Request,
-  fetchServer: (request: Request) => Promise<Response>,
-): Promise<Response> {
-  return generateHTML(request, fetchServer)
-}

packages/plugin-rsc/examples/react-router/react-router-vite/entry.ssr.tsx

@@ -17,13 +17,9 @@ export default defineConfig({
     rsc({
       entries: {
         client: './react-router-vite/entry.browser.tsx',
-        ssr: './react-router-vite/entry.ssr.single.tsx',
+        ssr: './react-router-vite/entry.ssr.tsx',
         rsc: './react-router-vite/entry.rsc.tsx',
       },
-      serverHandler: {
-        environmentName: 'ssr',
-        entryName: 'index',
-      },
     }),
     inspect(),
   ],

packages/plugin-rsc/examples/react-router/vite.config.ts

@@ -875,6 +875,7 @@ function getEntrySource(
       !Array.isArray(input) &&
       name in input &&
       typeof input[name] === 'string',
+    `[vite-rsc] expected 'build.rollupOptions.input' to be an object with a '${name}' property that is a string, but got ${JSON.stringify(input)}`,
   )
   return input[name]
 }