Merge branch 'main' into patch-1

.changesets/11684.md

@@ -0,0 +1,5 @@
+- feat(rsc): dev server (#11684) by @Tobbe
+
+✅ Adds support for running `yarn rw dev` with RSC projects
+✅ Adds support for fast-refresh for client components
+❌ Adds support for HMR for server components

__fixtures__/test-project/web/package.json

@@ -27,6 +27,6 @@
     "postcss": "^8.4.47",
     "postcss-loader": "^8.1.1",
     "prettier-plugin-tailwindcss": "^0.5.12",
-    "tailwindcss": "^3.4.13"
+    "tailwindcss": "^3.4.14"
   }
 }

packages/router/ambient.d.ts

@@ -1,8 +1,12 @@
 /* eslint-disable no-var */
 /// <reference types="react/experimental" />
+import type { ViteRuntime } from 'vite/runtime'
 
 declare global {
   var __REDWOOD__PRERENDERING: boolean
+  var __rwjs__vite_ssr_runtime: ViteRuntime | undefined
+  var __rwjs__vite_rsc_runtime: ViteRuntime | undefined
+
   /**
    * URL or absolute path to the GraphQL serverless function, without the trailing slash.
    * Example: `./redwood/functions/graphql` or `https://api.redwoodjs.com/graphql`

packages/router/src/rsc/RscCache.ts

@@ -1,3 +1,15 @@
+class DummyWS {
+  readyState = WebSocket?.OPEN
+  addEventListener() {}
+  send() {}
+}
+
+if (typeof globalThis.WebSocket === 'undefined') {
+  // @ts-expect-error - We're just trying to make sure WebSocket is defined for
+  // when Vite analyzes this file during SSR
+  globalThis.WebSocket = DummyWS
+}
+
 export interface RscModel {
   __rwjs__Routes: [React.ReactElement]
   __rwjs__rsa_data?: unknown
@@ -114,7 +126,7 @@ export class RscCache {
     } else if (this.sendRetries >= 10) {
       console.error('Exhausted retries to send message to WebSocket server.')
     } else {
-      console.error('WebSocket connection is closed.')
+      console.error('RscCache: WebSocket connection is closed.')
     }
   }
 

packages/router/src/rsc/clientSsr.ts

@@ -3,16 +3,35 @@ import path from 'node:path'
 import { getPaths } from '@redwoodjs/project-config'
 
 import { moduleMap } from './ssrModuleMap.js'
-import { importRsdwClient, importRsdwServer, importReact } from './utils.js'
+import { importRsdwClient, importReact, importRsdwServer } from './utils.js'
 import { makeFilePath } from './utils.js'
 
 async function getEntries() {
+  if (globalThis.__rwjs__vite_ssr_runtime) {
+    return {
+      serverEntries: {
+        __rwjs__Routes: '../../src/Routes.tsx',
+      },
+      ssrEntries: {},
+    }
+  }
+
   const entriesPath = getPaths().web.distRscEntries
   const entries = await import(makeFilePath(entriesPath))
   return entries
 }
 
 async function getRoutesComponent(): Promise<React.FunctionComponent> {
+  // For SSR during dev
+  if (globalThis.__rwjs__vite_rsc_runtime) {
+    const routesMod = await globalThis.__rwjs__vite_rsc_runtime.executeUrl(
+      getPaths().web.routes,
+    )
+
+    return routesMod.default
+  }
+
+  // For SSR during prod
   const { serverEntries } = await getEntries()
   const entryPath = path.join(
     getPaths().web.distRsc,
@@ -69,6 +88,13 @@ function resolveClientEntryForProd(
 
 const rscCache = new Map<string, Thenable<React.ReactElement>>()
 
+/**
+ * Render the RW App's Routes.{tsx,jsx} component.
+ * In production, this function will read the Routes component from the App's
+ * dist directory.
+ * During dev, this function will use Vite to load the Routes component from
+ * the App's src directory.
+ */
 export async function renderRoutesSsr(pathname: string) {
   console.log('renderRoutesSsr pathname', pathname)
 
@@ -94,7 +120,9 @@ export async function renderRoutesSsr(pathname: string) {
         // filePath /Users/tobbe/tmp/test-project-rsc-kitchen-sink/web/dist/rsc/assets/rsc-AboutCounter.tsx-1.mjs
         // name AboutCounter
 
-        const id = resolveClientEntryForProd(filePath, clientEntries)
+        const id = globalThis.__rwjs__vite_ssr_runtime
+          ? filePath
+          : resolveClientEntryForProd(filePath, clientEntries)
 
         console.log('clientSsr.ts::Proxy id', id)
         // id /Users/tobbe/tmp/test-project-rsc-kitchen-sink/web/dist/browser/assets/rsc-AboutCounter.tsx-1-4kTKU8GC.mjs
@@ -110,7 +138,32 @@ export async function renderRoutesSsr(pathname: string) {
   // We're in clientSsr.ts, but we're supposed to be pretending we're in the
   // RSC server "world" and that `stream` comes from `fetch`. So this is us
   // emulating the reply (stream) you'd get from a fetch call.
-  const stream = renderToReadableStream(createElement(Routes), bundlerConfig)
+  const originalStream = renderToReadableStream(
+    createElement(Routes),
+    bundlerConfig,
+  )
+
+  // Clone and log the stream
+  const [streamForLogging, streamForRendering] = originalStream.tee()
+
+  // Log the stream content
+  ;(async () => {
+    const reader = streamForLogging.getReader()
+    const decoder = new TextDecoder()
+    let logContent = ''
+
+    while (true /* eslint-disable-line no-constant-condition */) {
+      const { done, value } = await reader.read()
+
+      if (done) {
+        break
+      }
+
+      logContent += decoder.decode(value, { stream: true })
+    }
+
+    console.log('Stream content:', logContent)
+  })()
 
   // We have to do this weird import thing because we need a version of
   // react-server-dom-webpack/client.edge that uses the same bundled version
@@ -120,7 +173,7 @@ export async function renderRoutesSsr(pathname: string) {
 
   // Here we use `createFromReadableStream`, which is equivalent to
   // `createFromFetch` as used in the browser
-  const data = createFromReadableStream(stream, {
+  const data = createFromReadableStream(streamForRendering, {
     ssrManifest: { moduleMap, moduleLoading: null },
   })
 

packages/router/src/rsc/utils.ts

@@ -16,9 +16,15 @@ export function makeFilePath(path: string) {
 /**
  * See vite/streamHelpers.ts.
  *
- * This function ensures we load the same version of rsdw_client to prevent multiple instances of React
+ * This function ensures we load the bundled version of React to prevent
+ * multiple instances of React
  */
 export async function importReact() {
+  if (globalThis.__rwjs__vite_ssr_runtime) {
+    const reactMod = await import('react')
+    return reactMod.default
+  }
+
   const distSsr = getPaths().web.distSsr
   const reactPath = makeFilePath(path.join(distSsr, '__rwjs__react.mjs'))
 
@@ -28,9 +34,15 @@ 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
+ * This function ensures we load the same version of rsdw_client everywhere to
+ * prevent multiple instances of React
  */
 export async function importRsdwClient(): Promise<RSDWClientType> {
+  if (globalThis.__rwjs__vite_ssr_runtime) {
+    const rsdwcMod = await import('react-server-dom-webpack/client.edge')
+    return rsdwcMod.default
+  }
+
   const distSsr = getPaths().web.distSsr
   const rsdwClientPath = makeFilePath(
     path.join(distSsr, '__rwjs__rsdw-client.mjs'),
@@ -40,14 +52,22 @@ export async function importRsdwClient(): Promise<RSDWClientType> {
 }
 
 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'
-  )
+  if (globalThis.__rwjs__vite_rsc_runtime) {
+    const rsdwServerMod = await globalThis.__rwjs__vite_rsc_runtime.executeUrl(
+      'react-server-dom-webpack/server.edge',
+    )
+
+    return rsdwServerMod.default
+  } else {
+    // 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'
+    )
+  }
 }

packages/vite/ambient.d.ts

@@ -1,6 +1,7 @@
 /* eslint-disable no-var */
 /// <reference types="react/experimental" />
 import type { HelmetServerState } from 'react-helmet-async'
+import type { ViteRuntime } from 'vite/runtime'
 
 declare global {
   // Provided by Vite.config
@@ -23,6 +24,9 @@ declare global {
   }
 
   var __REDWOOD__PRERENDER_PAGES: any
+  var __rwjs__vite_ssr_runtime: ViteRuntime | undefined
+  var __rwjs__vite_rsc_runtime: ViteRuntime | undefined
+  var __rwjs__client_references: Set<string> | undefined
 
   var __REDWOOD__HELMET_CONTEXT: { helmet?: HelmetServerState }