From c2ea888960d1941416568ed2c108d4ced534660b Mon Sep 17 00:00:00 2001
From: Tobbe Lundberg <tobbe@tlundberg.com>
Date: Thu, 29 Feb 2024 11:28:04 +0530
Subject: [PATCH] Logging

---
 packages/babel-config/src/web.ts                          | 2 ++
 packages/cli/src/commands/experimental/setupRscHandler.js | 2 --
 packages/vite/src/index.ts                                | 4 ----
 packages/vite/src/rsc/rscBuildAnalyze.ts                  | 4 ++++
 packages/vite/src/rsc/rscBuildClient.ts                   | 5 +++++
 packages/vite/src/rsc/rscBuildCopyCssAssets.ts            | 4 ++++
 packages/vite/src/rsc/rscBuildServer.ts                   | 6 +++++-
 7 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/packages/babel-config/src/web.ts b/packages/babel-config/src/web.ts
index 87924e84f01f..a36b3f23f132 100644
--- a/packages/babel-config/src/web.ts
+++ b/packages/babel-config/src/web.ts
@@ -150,6 +150,8 @@ export const getWebSideOverrides = (
     },
   ]
 
+  console.log('babel - How many times does this get called?')
+
   return overrides.filter(
     (override: false | TransformOptions): override is TransformOptions => {
       return !!override
diff --git a/packages/cli/src/commands/experimental/setupRscHandler.js b/packages/cli/src/commands/experimental/setupRscHandler.js
index 8a8f5fad08b1..19c6475043b1 100644
--- a/packages/cli/src/commands/experimental/setupRscHandler.js
+++ b/packages/cli/src/commands/experimental/setupRscHandler.js
@@ -326,8 +326,6 @@ export const handler = async ({ force, verbose }) => {
           )
         },
       },
-      // TODO (RSC): Remove this once we have a better way to handle routes.
-      // This is a total hack right now
       {
         title: 'Overwriting routes...',
         task: async () => {
diff --git a/packages/vite/src/index.ts b/packages/vite/src/index.ts
index b4665134b0a4..b827958d1bf0 100644
--- a/packages/vite/src/index.ts
+++ b/packages/vite/src/index.ts
@@ -254,10 +254,6 @@ export default function redwoodPluginVite(): PluginOption[] {
       babel: {
         ...getWebSideDefaultBabelConfig({
           forVite: true,
-          // @MARK: Potential issue in the future. We don't want to set react
-          // plugins in each build file because we should be able to trigger
-          // the builds from the vite CLI directly.
-          forRscClient: rwConfig.experimental.rsc?.enabled,
         }),
       },
     }),
diff --git a/packages/vite/src/rsc/rscBuildAnalyze.ts b/packages/vite/src/rsc/rscBuildAnalyze.ts
index d1da8a3bc234..d95d3a64f249 100644
--- a/packages/vite/src/rsc/rscBuildAnalyze.ts
+++ b/packages/vite/src/rsc/rscBuildAnalyze.ts
@@ -15,6 +15,10 @@ import { rscAnalyzePlugin } from './rscVitePlugins'
  * Doesn't output any files, only collects a list of RSCs and RSFs
  */
 export async function rscBuildAnalyze(viteConfigPath: string) {
+  console.log('\n')
+  console.log('1. rscBuildAnalyze')
+  console.log('==================\n')
+
   const rwPaths = getPaths()
   const clientEntryFileSet = new Set<string>()
   const serverEntryFileSet = new Set<string>()
diff --git a/packages/vite/src/rsc/rscBuildClient.ts b/packages/vite/src/rsc/rscBuildClient.ts
index f1e1b4ce4c13..24c0734f9f94 100644
--- a/packages/vite/src/rsc/rscBuildClient.ts
+++ b/packages/vite/src/rsc/rscBuildClient.ts
@@ -21,6 +21,10 @@ export async function rscBuildClient(
   webDist: string,
   clientEntryFiles: Record<string, string>
 ) {
+  console.log('\n')
+  console.log('2. rscBuildClient')
+  console.log('=================\n')
+
   const rwPaths = getPaths()
 
   const clientBuildOutput = await viteBuild({
@@ -35,6 +39,7 @@ export async function rscBuildClient(
         babel: {
           ...getWebSideDefaultBabelConfig({
             forVite: true,
+            forRscClient: true,
           }),
         },
       }),
diff --git a/packages/vite/src/rsc/rscBuildCopyCssAssets.ts b/packages/vite/src/rsc/rscBuildCopyCssAssets.ts
index 37bf0927246f..893369a1f8f0 100644
--- a/packages/vite/src/rsc/rscBuildCopyCssAssets.ts
+++ b/packages/vite/src/rsc/rscBuildCopyCssAssets.ts
@@ -12,6 +12,10 @@ export function rscBuildCopyCssAssets(
   webDist: string,
   webDistServer: string
 ) {
+  console.log('\n')
+  console.log('4. rscBuildCopyCssAssets')
+  console.log('========================\n')
+
   // TODO (RSC) Some css is now duplicated in two files (i.e. for client
   // components). Probably don't want that.
   // Also not sure if this works on "soft" rerenders (i.e. not a full page
diff --git a/packages/vite/src/rsc/rscBuildServer.ts b/packages/vite/src/rsc/rscBuildServer.ts
index af3003e08f10..28da442e08fe 100644
--- a/packages/vite/src/rsc/rscBuildServer.ts
+++ b/packages/vite/src/rsc/rscBuildServer.ts
@@ -22,6 +22,10 @@ export async function rscBuildServer(
   serverEntryFiles: Record<string, string>,
   customModules: Record<string, string>
 ) {
+  console.log('\n')
+  console.log('3. rscBuildServer')
+  console.log('=================\n')
+
   const input = {
     entries: entriesFile,
     ...clientEntryFiles,
@@ -41,7 +45,7 @@ export async function rscBuildServer(
 
   const serverBuildOutput = await viteBuild({
     // ...configFileConfig,
-    root: rwPaths.web.base,
+    root: rwPaths.web.src,
     envPrefix: 'REDWOOD_ENV_',
     publicDir: path.join(rwPaths.web.base, 'public'),
     envFile: false,