From b0a04d81d7f2c70a1691bd76d482947c0eae2c15 Mon Sep 17 00:00:00 2001
From: Tobbe Lundberg <tobbe@tlundberg.com>
Date: Wed, 9 Oct 2024 09:42:33 +0200
Subject: [PATCH] chore(rsc): Extract importRsdwServer() and move type
 assertions to utils (#11688)

---
 packages/router/src/rsc/clientSsr.ts | 22 +++-------------------
 packages/router/src/rsc/utils.ts     | 23 ++++++++++++++++++++---
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/packages/router/src/rsc/clientSsr.ts b/packages/router/src/rsc/clientSsr.ts
index 7de2c8b76fb3..2ab04859ed74 100644
--- a/packages/router/src/rsc/clientSsr.ts
+++ b/packages/router/src/rsc/clientSsr.ts
@@ -1,17 +1,11 @@
 import path from 'node:path'
 
-import type { default as RSDWClientModule } from 'react-server-dom-webpack/client.edge'
-import type { default as RSDWServerModule } from 'react-server-dom-webpack/server.edge'
-
 import { getPaths } from '@redwoodjs/project-config'
 
 import { moduleMap } from './ssrModuleMap.js'
-import { importRsdwClient, importReact } from './utils.js'
+import { importRsdwClient, importRsdwServer, importReact } from './utils.js'
 import { makeFilePath } from './utils.js'
 
-type RSDWClientType = typeof RSDWClientModule
-type RSDWServerType = typeof RSDWServerModule
-
 async function getEntries() {
   const entriesPath = getPaths().web.distRscEntries
   const entries = await import(makeFilePath(entriesPath))
@@ -110,17 +104,7 @@ export async function renderRoutesSsr(pathname: string) {
   )
 
   const { createElement } = await importReact()
-
-  // We need to do this weird import dance because we need to import a version
-  // of react-server-dom-webpack/server.edge that has been built with the
-  // `react-server` condition. If we just did a regular import, we'd get the
-  // generic version in node_modules, and it'd throw an error about not being
-  // run in an environment with the `react-server` condition.
-  const dynamicImport = ''
-  const { renderToReadableStream }: RSDWServerType = await import(
-    /* @vite-ignore */
-    dynamicImport + 'react-server-dom-webpack/server.edge'
-  )
+  const { renderToReadableStream } = await importRsdwServer()
 
   console.log('clientSsr.ts right before renderToReadableStream')
   // We're in clientSsr.ts, but we're supposed to be pretending we're in the
@@ -132,7 +116,7 @@ export async function renderRoutesSsr(pathname: string) {
   // react-server-dom-webpack/client.edge that uses the same bundled version
   // of React as all the client components. Also see comment in
   // streamHelpers.ts about the rd-server import for some more context
-  const { createFromReadableStream }: RSDWClientType = await importRsdwClient()
+  const { createFromReadableStream } = await importRsdwClient()
 
   // Here we use `createFromReadableStream`, which is equivalent to
   // `createFromFetch` as used in the browser
diff --git a/packages/router/src/rsc/utils.ts b/packages/router/src/rsc/utils.ts
index ee8db3708ef7..df4724d9ca0d 100644
--- a/packages/router/src/rsc/utils.ts
+++ b/packages/router/src/rsc/utils.ts
@@ -1,14 +1,19 @@
 import path from 'node:path'
 import { pathToFileURL } from 'node:url'
 
+import type { default as RSDWClientModule } from 'react-server-dom-webpack/client.edge'
+import type { default as RSDWServerModule } from 'react-server-dom-webpack/server.edge'
+
 import { getPaths } from '@redwoodjs/project-config'
 
+type RSDWClientType = typeof RSDWClientModule
+type RSDWServerType = typeof RSDWServerModule
+
 export function makeFilePath(path: string) {
   return pathToFileURL(path).href
 }
 
 /**
- *
  * See vite/streamHelpers.ts.
  *
  * This function ensures we load the same version of rsdw_client to prevent multiple instances of React
@@ -21,12 +26,11 @@ export async function importReact() {
 }
 
 /**
- *
  * See vite/streamHelpers.ts.
  *
  * This function ensures we load the same version of rsdw_client to prevent multiple instances of React
  */
-export async function importRsdwClient() {
+export async function importRsdwClient(): Promise<RSDWClientType> {
   const distSsr = getPaths().web.distSsr
   const rsdwClientPath = makeFilePath(
     path.join(distSsr, '__rwjs__rsdw-client.mjs'),
@@ -34,3 +38,16 @@ export async function importRsdwClient() {
 
   return (await import(rsdwClientPath)).default
 }
+
+export async function importRsdwServer(): Promise<RSDWServerType> {
+  // We need to do this weird import dance because we need to import a version
+  // of react-server-dom-webpack/server.edge that has been built with the
+  // `react-server` condition. If we just did a regular import, we'd get the
+  // generic version in node_modules, and it'd throw an error about not being
+  // run in an environment with the `react-server` condition.
+  const dynamicImport = ''
+  return import(
+    /* @vite-ignore */
+    dynamicImport + 'react-server-dom-webpack/server.edge'
+  )
+}