Use built-in dev request handler

Author: markdalgleish

integration/helpers/vite.ts

@@ -188,19 +188,6 @@ export const EXPRESS_SERVER = (args: {
                 },
               })
             );
-      
-      const requestListener =
-        viteDevServer
-          ? async (req, res) => {
-              // In dev mode, ensure we load a fresh request handler every request
-              const rscEntry = await viteDevServer.environments.rsc.runner.import(
-                "virtual:react-router/unstable_rsc/rsc-entry",
-              );
-              return createRequestListener(rscEntry.default)(req, res);
-            }
-          // In production, get the static request handler from the build output
-          : createRequestListener((await import("./build/server/index.js")).default);
-
       const app = express();      
 
       if (viteDevServer) {
@@ -210,6 +197,7 @@ export const EXPRESS_SERVER = (args: {
           "/assets",
           express.static("build/client/assets", { immutable: true, maxAge: "1y" })
         );
+        app.all("*", createRequestListener((await import("./build/server/index.js")).default));
       }
 
       ${args?.customLogic || ""}

integration/vite-basename-test.ts

@@ -116,20 +116,11 @@ const customServerFile = ({
               })
             );
 
-      const requestListener = viteDevServer
-        ? async (req, res) => {
-            // In dev mode, ensure we load a fresh request handler every request
-            const rscEntry = await viteDevServer.environments.rsc.runner.import(
-              "virtual:react-router/unstable_rsc/rsc-entry",
-            );
-            return createRequestListener(rscEntry.default)(req, res);
-          }
-        // In production, get the static request handler from the build output
-        : createRequestListener((await import("./build/server/index.js")).default);
-
       const app = express();
       app.use("${base}", viteDevServer?.middlewares || express.static("build/client"));
-      app.all("${basename}*", requestListener);
+      if (!viteDevServer) {
+        app.all("${basename}*", createRequestListener((await import("./build/server/index.js")).default));
+      }
       app.get("*", (_req, res) => {
         res.setHeader("content-type", "text/html")
         res.end('React Router app is at <a href="${basename}">${basename}</a>');

playground/rsc-vite-framework/start-vite-middleware.js

@@ -12,17 +12,6 @@ const viteDevServer =
         }),
       );
 
-const requestListener = viteDevServer
-  ? async (req, res) => {
-      // In dev mode, ensure we load a fresh request handler every request
-      const rscEntry = await viteDevServer.environments.rsc.runner.import(
-        "virtual:react-router/unstable_rsc/rsc-entry",
-      );
-      return createRequestListener(rscEntry.default)(req, res);
-    }
-  : // In production, get the static request handler from the build output
-    createRequestListener((await import("./build/server/index.js")).default);
-
 const app = express();
 
 if (viteDevServer) {
@@ -33,10 +22,12 @@ if (viteDevServer) {
     express.static("build/client/assets", { immutable: true, maxAge: "1y" }),
   );
   app.use(express.static("build/client"));
+  app.all(
+    "*",
+    createRequestListener((await import("./build/server/index.js")).default),
+  );
 }
 
-app.all("*", requestListener);
-
 const port = process.env.PORT || 3000;
 app.listen(port);
 console.log(`Server listening on port ${port} (http://localhost:${port})`);