RSC: Move loaders to worker thread (#9412)

redwoodjs · Nov 11, 2023 · df88574 · df88574
1 parent e2a90f8
commit df88574
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/packages/cli/src/commands/serveBothHandler.js b/packages/cli/src/commands/serveBothHandler.js
@@ -60,12 +60,7 @@ export const bothRscServerHandler = async (argv) => {
   // TODO (RSC) More gracefully handle Ctrl-C
   const fePromise = execa(
     'node',
-    [
-      // TODO (RSC): Do we need these on the worker thread?
-      '--experimental-loader @redwoodjs/vite/node-loader',
-      '--experimental-loader @redwoodjs/vite/react-node-loader',
-      './node_modules/@redwoodjs/vite/dist/runRscFeServer.js',
-    ],
+    ['./node_modules/@redwoodjs/vite/dist/runRscFeServer.js'],
     {
       cwd: getPaths().base,
       stdio: 'inherit',

diff --git a/packages/vite/src/rsc/rscWorkerCommunication.ts b/packages/vite/src/rsc/rscWorkerCommunication.ts
@@ -4,7 +4,14 @@ import type { Readable } from 'node:stream'
 import { Worker } from 'node:worker_threads'
 
 const worker = new Worker(path.join(__dirname, 'rscWorker.js'), {
-  execArgv: ['--conditions', 'react-server'],
+  execArgv: [
+    '--conditions',
+    'react-server',
+    '--experimental-loader',
+    '@redwoodjs/vite/node-loader',
+    '--experimental-loader',
+    '@redwoodjs/vite/react-node-loader',
+  ],
 })
 
 export type RenderInput<