chore(rsc): Remove RSC-specific logic from our babel config (#11528)

redwoodjs · Sep 11, 2024 · 199218c · 199218c
1 parent b508121
commit 199218c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 13 deletions.
diff --git a/packages/babel-config/src/web.ts b/packages/babel-config/src/web.ts
@@ -19,7 +19,6 @@ import {
 export interface Flags {
   forJest?: boolean // will change the alias for module-resolver plugin
   forPrerender?: boolean // changes what babel-plugin-redwood-routes-auto-loader does
-  forRsc?: boolean
   forJavaScriptLinting?: boolean // will enable presets to supporting linting in the absence of typescript related presets/plugins/parsers
 }
 
@@ -117,10 +116,7 @@ export const getWebSideBabelPlugins = (
 }
 
 export const getWebSideOverrides = (
-  { forPrerender, forRsc }: Flags = {
-    forPrerender: false,
-    forRsc: false,
-  },
+  { forPrerender }: Flags = { forPrerender: false },
 ): TransformOptions[] => {
   // Have to use a readonly array here because of a limitation in TS
   // See https://stackoverflow.com/a/70763406/88106
@@ -131,9 +127,7 @@ export const getWebSideOverrides = (
     },
     // Automatically import files in `./web/src/pages/*` in to
     // the `./web/src/Routes.[ts|jsx]` file.
-    // We do not do this for RSC because there are differences between server and client
-    // so each specific build stage handles the auto-importing of routes
-    !forRsc && {
+    {
       test: /Routes.(js|tsx|jsx)$/,
       plugins: [
         [
@@ -143,6 +137,7 @@ export const getWebSideOverrides = (
           {
             forPrerender,
           } satisfies RoutesAutoLoaderOptions,
+          'babel-plugin-redwood-routes-auto-loader',
         ],
       ],
     },

diff --git a/packages/vite/src/index.ts b/packages/vite/src/index.ts
@@ -41,6 +41,24 @@ export default function redwoodPluginVite(): PluginOption[] {
   const streamingEnabled = rwConfig.experimental.streamingSsr.enabled
   const rscEnabled = rwConfig.experimental?.rsc?.enabled
 
+  const webSideDefaultBabelConfig = getWebSideDefaultBabelConfig()
+
+  const babelConfig = {
+    ...webSideDefaultBabelConfig,
+    // For RSC we don't want to include the routes auto-loader plugin as we
+    // handle that differently in each specific RSC build stage
+    overrides: rscEnabled
+      ? webSideDefaultBabelConfig.overrides.filter((override) => {
+          return !override.plugins?.some((plugin) => {
+            return (
+              Array.isArray(plugin) &&
+              plugin[2] === 'babel-plugin-redwood-routes-auto-loader'
+            )
+          })
+        })
+      : webSideDefaultBabelConfig.overrides,
+  }
+
   return [
     {
       name: 'redwood-plugin-vite-html-env',
@@ -153,11 +171,7 @@ export default function redwoodPluginVite(): PluginOption[] {
         },
       ]),
     react({
-      babel: {
-        ...getWebSideDefaultBabelConfig({
-          forRsc: rscEnabled,
-        }),
-      },
+      babel: babelConfig,
     }),
     // Only include the Buffer polyfill for non-rsc dev, for DevFatalErrorPage
     // Including the polyfill plugin in any form in RSC breaks