refactor

Author: markdalgleish

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

@@ -100,7 +100,7 @@ async function createVirtualRouteModuleCode({
       }
     }
     if (viteCommand === "serve" && !hasClientExports) {
-      code += `export { __ensureClientRouteModuleForHmr } from "${clientModuleId}";\n`;
+      code += `export { __ensureClientRouteModuleForHMR } from "${clientModuleId}";\n`;
     }
   } else {
     for (const staticExport of staticExports) {
@@ -183,7 +183,7 @@ function createVirtualClientRouteModuleCode({
   }
 
   if (viteCommand === "serve" && isServerFirstRoute && !hasClientExports) {
-    generatorResult.code += `\nexport const __ensureClientRouteModuleForHmr = true;`;
+    generatorResult.code += `\nexport const __ensureClientRouteModuleForHMR = true;`;
   }
 
   return generatorResult;
@@ -198,9 +198,9 @@ export function parseRouteExports(code: string) {
   return {
     staticExports,
     isServerFirstRoute,
-    hasClientExports: isServerFirstRoute
-      ? staticExports.some(isClientNonComponentExport)
-      : staticExports.some(isClientRouteExport),
+    hasClientExports: staticExports.some(
+      isServerFirstRoute ? isClientNonComponentExport : isClientRouteExport,
+    ),
   };
 }
 

packages/react-router-dev/vite/static/rsc-refresh-utils.mjs

@@ -78,7 +78,7 @@ function validateRefreshBoundaryAndEnqueueUpdate(
     nextExports,
     (key, value) => {
       hasExports = true;
-      // Remix can handle Remix-specific exports (e.g. `meta` and `links`)
+      // React Router can handle additional exports (e.g. `meta` and `links`)
       if (acceptExports.includes(key)) return true;
       // React Fast Refresh can handle component exports
       if (exports.isLikelyComponentType(value)) return true;

packages/react-router/lib/rsc/server.rsc.ts

@@ -1111,11 +1111,11 @@ async function getRSCRouteMatch(
     pathnameBase: match.pathnameBase,
     shouldRevalidate: (match.route as any).shouldRevalidate,
     // Add an unused client-only export (if present) so HMR can support
-    // switching from server-first to client-only routes during development
-    ...((match.route as any).__ensureClientRouteModuleForHmr
+    // switching between server-first and client-only routes during development
+    ...((match.route as any).__ensureClientRouteModuleForHMR
       ? {
-          __ensureClientRouteModuleForHmr: (match.route as any)
-            .__ensureClientRouteModuleForHmr,
+          __ensureClientRouteModuleForHMR: (match.route as any)
+            .__ensureClientRouteModuleForHMR,
         }
       : {}),
   };