Check module ID against resolved root route path

Author: markdalgleish

integration/vite-presets-test.ts

@@ -226,6 +226,7 @@ test.describe("Vite / presets", async () => {
         "serverBundles",
         "serverModuleFormat",
         "ssr",
+        "unstable_rootRouteFile",
         "unstable_routeConfig",
       ]);
 

packages/react-router-dev/config/config.ts

@@ -264,6 +264,10 @@ export type ResolvedReactRouterConfig = Readonly<{
    * SPA without server-rendering. Default's to `true`.
    */
   ssr: boolean;
+  /**
+   * The absolute path to the root route file.
+   */
+  unstable_rootRouteFile: string;
   /**
    * The resolved array of route config entries exported from `routes.ts`
    */
@@ -345,6 +349,8 @@ type Result<T> =
       error: string;
     };
 
+type ConfigResult = Result<ResolvedReactRouterConfig>;
+
 function ok<T>(value: T): Result<T> {
   return { ok: true, value };
 }
@@ -365,7 +371,7 @@ async function resolveConfig({
   reactRouterConfigFile?: string;
   skipRoutes?: boolean;
   validateConfig?: ValidateConfigFunction;
-}): Promise<Result<ResolvedReactRouterConfig>> {
+}): Promise<ConfigResult> {
   let reactRouterUserConfig: ReactRouterConfig = {};
 
   if (reactRouterConfigFile) {
@@ -506,7 +512,7 @@ async function resolveConfig({
   let appDirectory = Path.resolve(root, userAppDirectory || "app");
   let buildDirectory = Path.resolve(root, userBuildDirectory);
 
-  let rootRouteFile = findEntry(appDirectory, "root");
+  let rootRouteFile = findEntry(appDirectory, "root", { absolute: true });
   if (!rootRouteFile) {
     let rootRouteDisplayPath = Path.relative(
       root,
@@ -556,7 +562,7 @@ async function resolveConfig({
         {
           id: "root",
           path: "",
-          file: rootRouteFile,
+          file: Path.relative(appDirectory, rootRouteFile),
           children: result.routeConfig,
         },
       ];
@@ -609,6 +615,7 @@ async function resolveConfig({
     serverBundles,
     serverModuleFormat,
     ssr,
+    unstable_rootRouteFile: rootRouteFile,
     unstable_routeConfig: routeConfig,
   } satisfies ResolvedReactRouterConfig);
 
@@ -622,7 +629,7 @@ async function resolveConfig({
 type ChokidarEventName = ChokidarEmitArgs[0];
 
 type ChangeHandler = (args: {
-  result: Result<ResolvedReactRouterConfig>;
+  result: ConfigResult;
   configCodeChanged: boolean;
   routeConfigCodeChanged: boolean;
   configChanged: boolean;
@@ -632,7 +639,7 @@ type ChangeHandler = (args: {
 }) => void;
 
 export type ConfigLoader = {
-  getConfig: () => Promise<Result<ResolvedReactRouterConfig>>;
+  getConfig: () => Promise<ConfigResult>;
   onChange: (handler: ChangeHandler) => () => void;
   close: () => Promise<void>;
 };

packages/react-router-dev/vite/rsc/plugin.ts

@@ -309,12 +309,11 @@ export function reactRouterRSCVitePlugin(): Vite.PluginOption[] {
     {
       name: "react-router/rsc/virtual-route-modules",
       transform(code, id) {
-        if (!routeIdByFile) return;
         return transformVirtualRouteModules({
           code,
           id,
           viteCommand,
-          routeIdByFile,
+          rootRouteFile: config.unstable_rootRouteFile,
           viteEnvironment: this.environment,
         });
       },

packages/react-router-dev/vite/rsc/virtual-route-modules.ts

@@ -96,20 +96,20 @@ export function transformVirtualRouteModules({
   id,
   code,
   viteCommand,
-  routeIdByFile,
+  rootRouteFile,
   viteEnvironment,
 }: {
   id: string;
   code: string;
   viteCommand: ViteCommand;
-  routeIdByFile: Map<string, string>;
+  rootRouteFile: string;
   viteEnvironment: Vite.Environment;
 }) {
-  if (isVirtualRouteModuleId(id) || routeIdByFile.has(id)) {
+  if (isVirtualRouteModuleId(id)) {
     return createVirtualRouteModuleCode({
       id,
       code,
-      routeIdByFile,
+      rootRouteFile,
       viteCommand,
       viteEnvironment,
     });
@@ -127,7 +127,7 @@ export function transformVirtualRouteModules({
     return createVirtualClientRouteModuleCode({
       id,
       code,
-      routeIdByFile,
+      rootRouteFile,
       viteCommand,
     });
   }
@@ -136,13 +136,13 @@ export function transformVirtualRouteModules({
 async function createVirtualRouteModuleCode({
   id,
   code: routeSource,
-  routeIdByFile,
+  rootRouteFile,
   viteCommand,
   viteEnvironment,
 }: {
   id: string;
   code: string;
-  routeIdByFile: Map<string, string>;
+  rootRouteFile: string;
   viteCommand: ViteCommand;
   viteEnvironment: Vite.Environment;
 }) {
@@ -196,7 +196,7 @@ async function createVirtualRouteModuleCode({
   }
 
   if (
-    isRootRouteId({ id, routeIdByFile }) &&
+    isRootRouteFile({ id, rootRouteFile }) &&
     !staticExports.includes("ErrorBoundary")
   ) {
     code += `export { ErrorBoundary } from "${clientModuleId}";\n`;
@@ -251,12 +251,12 @@ function createVirtualServerRouteModuleCode({
 function createVirtualClientRouteModuleCode({
   id,
   code: routeSource,
-  routeIdByFile,
+  rootRouteFile,
   viteCommand,
 }: {
   id: string;
   code: string;
-  routeIdByFile: Map<string, string>;
+  rootRouteFile: string;
   viteCommand: ViteCommand;
 }) {
   const { staticExports, isServerFirstRoute, hasClientExports } =
@@ -274,7 +274,7 @@ function createVirtualClientRouteModuleCode({
   generatorResult.code = '"use client";' + generatorResult.code;
 
   if (
-    isRootRouteId({ id, routeIdByFile }) &&
+    isRootRouteFile({ id, rootRouteFile }) &&
     !staticExports.includes("ErrorBoundary")
   ) {
     const hasRootLayout = staticExports.includes("Layout");
@@ -327,12 +327,13 @@ function isVirtualServerRouteModuleId(id: string): boolean {
   return /(\?|&)server-route-module(&|$)/.test(id);
 }
 
-function isRootRouteId({
+function isRootRouteFile({
   id,
-  routeIdByFile,
+  rootRouteFile,
 }: {
   id: string;
-  routeIdByFile: Map<string, string>;
-}) {
-  return routeIdByFile.has(id.split("?")[0]);
+  rootRouteFile: string;
+}): boolean {
+  const filePath = id.split("?")[0];
+  return filePath === rootRouteFile;
 }