Inject import.meta.viteRsc.loadCss() into route server component

Author: markdalgleish

packages/react-router-dev/vite/rsc/virtual-route-modules.ts

@@ -94,7 +94,14 @@ async function createVirtualRouteModuleCode({
       if (isClientNonComponentExport(staticExport)) {
         code += `export { ${staticExport} } from "${clientModuleId}";\n`;
       } else if (staticExport === "ServerComponent") {
-        code += `export { ServerComponent as default } from "${serverModuleId}";\n`;
+        code += `import React from "react";\n`;
+        code += `import { ServerComponent } from "${serverModuleId}";\n`;
+        code += `export default function ServerComponentWithCss() {`;
+        code += `  return React.createElement(React.Fragment, null, [`;
+        code += `    import.meta.viteRsc.loadCss(),`;
+        code += `    React.createElement(ServerComponent, null),`;
+        code += `  ]);`;
+        code += `}`;
       } else {
         code += `export { ${staticExport} } from "${serverModuleId}";\n`;
       }

packages/react-router/lib/rsc/server.ssr.tsx

@@ -112,8 +112,6 @@ export async function routeRSCServerRequest({
     throw new Error("Missing body in server response");
   }
 
-  const detectRedirectResponse = serverResponse.clone();
-
   let serverResponseB: Response | null = null;
   if (hydrate) {
     serverResponseB = serverResponse.clone();
@@ -128,12 +126,7 @@ export async function routeRSCServerRequest({
   };
 
   try {
-    if (!detectRedirectResponse.body) {
-      throw new Error("Failed to clone server response");
-    }
-    const payload = (await createFromReadableStream(
-      detectRedirectResponse.body,
-    )) as RSCPayload;
+    const payload = await getPayload();
     if (
       serverResponse.status === SINGLE_FETCH_REDIRECT_STATUS &&
       payload.type === "redirect"