@c0va23/react-router-dev 7.8.3-alpha.1 → 7.8.3-alpha.2

package/dist/internal.js

@@ -1,5 +1,5 @@
 /**
- * @c0va23/react-router-dev v7.8.3-alpha.1
+ * @c0va23/react-router-dev v7.8.3-alpha.2
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -45,9 +45,9 @@ __export(internal_exports, {
 module.exports = __toCommonJS(internal_exports);
 
 // vite/rsc/plugin.ts
+var import_plugin_rsc = __toESM(require("@vitejs/plugin-rsc"));
 var import_es_module_lexer2 = require("es-module-lexer");
 var babel = __toESM(require("@babel/core"));
-var import_picocolors3 = __toESM(require("picocolors"));
 
 // vite/virtual-module.ts
 function create(name) {
@@ -247,7 +247,7 @@ function validateRouteConfig({
         `Route config in "${routeConfigFile}" is invalid.`,
         root ? `${root}` : [],
         nested ? Object.entries(nested).map(
-          ([path6, message]) => `Path: routes.${path6}
+          ([path5, message]) => `Path: routes.${path5}
 ${message}`
         ) : []
       ].flat().join("\n\n")
@@ -344,8 +344,7 @@ async function resolveConfig({
   root,
   viteNodeContext,
   reactRouterConfigFile,
-  skipRoutes,
-  validateConfig
+  skipRoutes
 }) {
   let reactRouterUserConfig = {};
   if (reactRouterConfigFile) {
@@ -363,12 +362,6 @@ async function resolveConfig({
         return err(`${reactRouterConfigFile} must export a config`);
       }
       reactRouterUserConfig = configModule.default;
-      if (validateConfig) {
-        const error = validateConfig(reactRouterUserConfig);
-        if (error) {
-          return err(error);
-        }
-      }
     } catch (error) {
       return err(`Error loading ${reactRouterConfigFile}: ${error}`);
     }
@@ -517,7 +510,7 @@ async function resolveConfig({
     }
   }
   let future = {
-    v8_middleware: reactRouterUserConfig.future?.v8_middleware ?? false,
+    unstable_middleware: reactRouterUserConfig.future?.unstable_middleware ?? false,
     unstable_optimizeDeps: reactRouterUserConfig.future?.unstable_optimizeDeps ?? false,
     unstable_splitRouteModules: reactRouterUserConfig.future?.unstable_splitRouteModules ?? false,
     unstable_subResourceIntegrity: reactRouterUserConfig.future?.unstable_subResourceIntegrity ?? false,
@@ -547,8 +540,7 @@ async function createConfigLoader({
   rootDirectory: root,
   watch: watch2,
   mode,
-  skipRoutes,
-  validateConfig
+  skipRoutes
 }) {
   root = import_pathe3.default.normalize(root ?? process.env.REACT_ROUTER_ROOT ?? process.cwd());
   let vite2 = await import("vite");
@@ -567,13 +559,7 @@ async function createConfigLoader({
     });
   };
   updateReactRouterConfigFile();
-  let getConfig = () => resolveConfig({
-    root,
-    viteNodeContext,
-    reactRouterConfigFile,
-    skipRoutes,
-    validateConfig
-  });
+  let getConfig = () => resolveConfig({ root, viteNodeContext, reactRouterConfigFile, skipRoutes });
   let appDirectory;
   let initialConfigResult = await getConfig();
   if (!initialConfigResult.ok) {
@@ -595,11 +581,11 @@ async function createConfigLoader({
       if (!fsWatcher) {
         fsWatcher = import_chokidar.default.watch([root, appDirectory], {
           ignoreInitial: true,
-          ignored: (path6) => {
-            let dirname4 = import_pathe3.default.dirname(path6);
+          ignored: (path5) => {
+            let dirname4 = import_pathe3.default.dirname(path5);
             return !dirname4.startsWith(appDirectory) && // Ensure we're only watching files outside of the app directory
             // that are at the root level, not nested in subdirectories
-            path6 !== root && // Watch the root directory itself
+            path5 !== root && // Watch the root directory itself
             dirname4 !== root;
           }
         });
@@ -799,7 +785,7 @@ function fullpath(lineage2) {
   if (lineage2.length === 1 && route?.id === "root") return "/";
   const isLayout = route && route.index !== true && route.path === void 0;
   if (isLayout) return void 0;
-  return "/" + lineage2.map((route2) => route2.path?.replace(/^\//, "")?.replace(/\/$/, "")).filter((path6) => path6 !== void 0 && path6 !== "").join("/");
+  return "/" + lineage2.map((route2) => route2.path?.replace(/^\//, "")?.replace(/\/$/, "")).filter((path5) => path5 !== void 0 && path5 !== "").join("/");
 }
 
 // typegen/generate.ts
@@ -815,7 +801,7 @@ function generateFuture(ctx) {
 
     declare module "react-router" {
       interface Future {
-        middleware: ${ctx.config.future.v8_middleware}
+        unstable_middleware: ${ctx.config.future.unstable_middleware}
       }
     }
   `;
@@ -955,8 +941,8 @@ function routeFilesType({
   );
 }
 function isInAppDirectory(ctx, routeFile) {
-  const path6 = Path3.resolve(ctx.config.appDirectory, routeFile);
-  return path6.startsWith(ctx.config.appDirectory);
+  const path5 = Path3.resolve(ctx.config.appDirectory, routeFile);
+  return path5.startsWith(ctx.config.appDirectory);
 }
 function getRouteAnnotations({
   ctx,
@@ -1037,11 +1023,11 @@ function getRouteAnnotations({
         export type HeadersArgs = Annotations["HeadersArgs"];
         export type HeadersFunction = Annotations["HeadersFunction"];
 
-        // middleware
-        export type MiddlewareFunction = Annotations["MiddlewareFunction"];
+        // unstable_middleware
+        export type unstable_MiddlewareFunction = Annotations["unstable_MiddlewareFunction"];
 
-        // clientMiddleware
-        export type ClientMiddlewareFunction = Annotations["ClientMiddlewareFunction"];
+        // unstable_clientMiddleware
+        export type unstable_ClientMiddlewareFunction = Annotations["unstable_ClientMiddlewareFunction"];
 
         // loader
         export type LoaderArgs = Annotations["LoaderArgs"];
@@ -1068,21 +1054,21 @@ function getRouteAnnotations({
   return { filename: filename2, content };
 }
 function relativeImportSource(from, to) {
-  let path6 = Path3.relative(Path3.dirname(from), to);
-  let extension = Path3.extname(path6);
-  path6 = Path3.join(Path3.dirname(path6), Pathe.filename(path6));
-  if (!path6.startsWith("../")) path6 = "./" + path6;
+  let path5 = Path3.relative(Path3.dirname(from), to);
+  let extension = Path3.extname(path5);
+  path5 = Path3.join(Path3.dirname(path5), Pathe.filename(path5));
+  if (!path5.startsWith("../")) path5 = "./" + path5;
   if (!extension || /\.(js|ts)x?$/.test(extension)) {
     extension = ".js";
   }
-  return path6 + extension;
+  return path5 + extension;
 }
 function rootDirsPath(ctx, typesPath) {
   const rel = Path3.relative(typesDirectory(ctx), typesPath);
   return Path3.join(ctx.rootDirectory, rel);
 }
-function paramsType(path6) {
-  const params = parse2(path6);
+function paramsType(path5) {
+  const params = parse2(path5);
   return t2.tsTypeLiteral(
     Object.entries(params).map(([param, isRequired]) => {
       const property = t2.tsPropertySignature(
@@ -1173,58 +1159,10 @@ async function watch(rootDirectory, { mode, logger }) {
 // vite/rsc/plugin.ts
 var import_fs = require("fs");
 var import_promises2 = require("fs/promises");
-var import_pathe6 = __toESM(require("pathe"));
-
-// vite/has-dependency.ts
-function hasDependency({
-  name,
-  rootDirectory
-}) {
-  try {
-    return Boolean(require.resolve(name, { paths: [rootDirectory] }));
-  } catch (err2) {
-    return false;
-  }
-}
-
-// vite/optimize-deps-entries.ts
-var import_tinyglobby = require("tinyglobby");
-
-// vite/resolve-relative-route-file-path.ts
-var import_pathe4 = __toESM(require("pathe"));
-function resolveRelativeRouteFilePath(route, reactRouterConfig) {
-  let vite2 = getVite();
-  let file = route.file;
-  let fullPath = import_pathe4.default.resolve(reactRouterConfig.appDirectory, file);
-  return vite2.normalizePath(fullPath);
-}
-
-// vite/optimize-deps-entries.ts
-function getOptimizeDepsEntries({
-  entryClientFilePath,
-  reactRouterConfig
-}) {
-  if (!reactRouterConfig.future.unstable_optimizeDeps) {
-    return [];
-  }
-  const vite2 = getVite();
-  const viteMajorVersion = parseInt(vite2.version.split(".")[0], 10);
-  return [
-    vite2.normalizePath(entryClientFilePath),
-    ...Object.values(reactRouterConfig.routes).map(
-      (route) => resolveRelativeRouteFilePath(route, reactRouterConfig)
-    )
-  ].map(
-    (entry) => (
-      // In Vite 7, the `optimizeDeps.entries` option only accepts glob patterns.
-      // In prior versions, absolute file paths were treated differently.
-      viteMajorVersion >= 7 ? (0, import_tinyglobby.escapePath)(entry) : entry
-    )
-  );
-}
+var import_pathe5 = __toESM(require("pathe"));
 
 // vite/rsc/virtual-route-config.ts
-var import_pathe5 = __toESM(require("pathe"));
+var import_pathe4 = __toESM(require("pathe"));
 function createVirtualRouteConfig({
   appDirectory,
   routeConfig
@@ -1243,7 +1181,7 @@ function createVirtualRouteConfig({
       continue;
     }
     code += "{";
-    const routeFile = import_pathe5.default.resolve(appDirectory, route.file);
+    const routeFile = import_pathe4.default.resolve(appDirectory, route.file);
     const routeId = route.id || createRouteId2(route.file, appDirectory);
     routeIdByFile.set(routeFile, routeId);
     code += `lazy: () => import(${JSON.stringify(
@@ -1271,7 +1209,7 @@ function createVirtualRouteConfig({
   return { code, routeIdByFile };
 }
 function createRouteId2(file, appDirectory) {
-  return import_pathe5.default.relative(appDirectory, file).replace(/\\+/, "/").slice(0, -import_pathe5.default.extname(file).length);
+  return import_pathe4.default.relative(appDirectory, file).replace(/\\+/, "/").slice(0, -import_pathe4.default.extname(file).length);
 }
 
 // vite/rsc/virtual-route-modules.ts
@@ -1285,10 +1223,10 @@ var removeExports = (ast, exportsToRemove) => {
   let markedForRemoval = /* @__PURE__ */ new Set();
   let removedExportLocalNames = /* @__PURE__ */ new Set();
   traverse(ast, {
-    ExportDeclaration(path6) {
-      if (path6.node.type === "ExportNamedDeclaration") {
-        if (path6.node.specifiers.length) {
-          path6.node.specifiers = path6.node.specifiers.filter((specifier) => {
+    ExportDeclaration(path5) {
+      if (path5.node.type === "ExportNamedDeclaration") {
+        if (path5.node.specifiers.length) {
+          path5.node.specifiers = path5.node.specifiers.filter((specifier) => {
             if (specifier.type === "ExportSpecifier" && specifier.exported.type === "Identifier") {
               if (exportsToRemove.includes(specifier.exported.name)) {
                 exportsFiltered = true;
@@ -1300,12 +1238,12 @@ var removeExports = (ast, exportsToRemove) => {
             }
             return true;
           });
-          if (path6.node.specifiers.length === 0) {
-            markedForRemoval.add(path6);
+          if (path5.node.specifiers.length === 0) {
+            markedForRemoval.add(path5);
           }
         }
-        if (path6.node.declaration?.type === "VariableDeclaration") {
-          let declaration = path6.node.declaration;
+        if (path5.node.declaration?.type === "VariableDeclaration") {
+          let declaration = path5.node.declaration;
           declaration.declarations = declaration.declarations.filter(
             (declaration2) => {
               if (declaration2.id.type === "Identifier" && exportsToRemove.includes(declaration2.id.name)) {
@@ -1319,30 +1257,30 @@ var removeExports = (ast, exportsToRemove) => {
             }
           );
           if (declaration.declarations.length === 0) {
-            markedForRemoval.add(path6);
+            markedForRemoval.add(path5);
           }
         }
-        if (path6.node.declaration?.type === "FunctionDeclaration") {
-          let id = path6.node.declaration.id;
+        if (path5.node.declaration?.type === "FunctionDeclaration") {
+          let id = path5.node.declaration.id;
           if (id && exportsToRemove.includes(id.name)) {
-            markedForRemoval.add(path6);
+            markedForRemoval.add(path5);
           }
         }
-        if (path6.node.declaration?.type === "ClassDeclaration") {
-          let id = path6.node.declaration.id;
+        if (path5.node.declaration?.type === "ClassDeclaration") {
+          let id = path5.node.declaration.id;
           if (id && exportsToRemove.includes(id.name)) {
-            markedForRemoval.add(path6);
+            markedForRemoval.add(path5);
           }
         }
       }
-      if (path6.node.type === "ExportDefaultDeclaration") {
+      if (path5.node.type === "ExportDefaultDeclaration") {
         if (exportsToRemove.includes("default")) {
-          markedForRemoval.add(path6);
-          if (path6.node.declaration) {
-            if (path6.node.declaration.type === "Identifier") {
-              removedExportLocalNames.add(path6.node.declaration.name);
-            } else if ((path6.node.declaration.type === "FunctionDeclaration" || path6.node.declaration.type === "ClassDeclaration") && path6.node.declaration.id) {
-              removedExportLocalNames.add(path6.node.declaration.id.name);
+          markedForRemoval.add(path5);
+          if (path5.node.declaration) {
+            if (path5.node.declaration.type === "Identifier") {
+              removedExportLocalNames.add(path5.node.declaration.name);
+            } else if ((path5.node.declaration.type === "FunctionDeclaration" || path5.node.declaration.type === "ClassDeclaration") && path5.node.declaration.id) {
+              removedExportLocalNames.add(path5.node.declaration.id.name);
             }
           }
         }
@@ -1350,21 +1288,21 @@ var removeExports = (ast, exportsToRemove) => {
     }
   });
   traverse(ast, {
-    ExpressionStatement(path6) {
-      if (!path6.parentPath.isProgram()) {
+    ExpressionStatement(path5) {
+      if (!path5.parentPath.isProgram()) {
         return;
       }
-      if (path6.node.expression.type === "AssignmentExpression") {
-        const left = path6.node.expression.left;
+      if (path5.node.expression.type === "AssignmentExpression") {
+        const left = path5.node.expression.left;
         if (left.type === "MemberExpression" && left.object.type === "Identifier" && (exportsToRemove.includes(left.object.name) || removedExportLocalNames.has(left.object.name))) {
-          markedForRemoval.add(path6);
+          markedForRemoval.add(path5);
         }
       }
     }
   });
   if (markedForRemoval.size > 0 || exportsFiltered) {
-    for (let path6 of markedForRemoval) {
-      path6.remove();
+    for (let path5 of markedForRemoval) {
+      path5.remove();
     }
     (0, import_babel_dead_code_elimination.deadCodeElimination)(ast, previouslyReferencedIdentifiers);
   }
@@ -1415,7 +1353,7 @@ var SERVER_ONLY_ROUTE_EXPORTS = [
   ...SERVER_ONLY_COMPONENT_EXPORTS,
   "loader",
   "action",
-  "middleware",
+  "unstable_middleware",
   "headers"
 ];
 var SERVER_ONLY_ROUTE_EXPORTS_SET = new Set(SERVER_ONLY_ROUTE_EXPORTS);
@@ -1446,7 +1384,7 @@ var CLIENT_COMPONENT_EXPORTS = [
 var CLIENT_NON_COMPONENT_EXPORTS = [
   "clientAction",
   "clientLoader",
-  "clientMiddleware",
+  "unstable_clientMiddleware",
   "handle",
   "meta",
   "links",
@@ -1680,22 +1618,16 @@ function validatePluginOrder() {
           (plugin) => pluginName.includes(plugin.name)
         );
       };
-      let reactRouterRscPluginIndex = pluginIndex("react-router/rsc");
-      let viteRscPluginIndex = pluginIndex("rsc");
-      if (reactRouterRscPluginIndex >= 0 && viteRscPluginIndex >= 0 && reactRouterRscPluginIndex > viteRscPluginIndex) {
-        throw new Error(
-          `The "@vitejs/plugin-rsc" plugin should be placed after the React Router RSC plugin in your Vite config`
-        );
-      }
-      let reactRouterPluginIndex = pluginIndex([
-        "react-router",
-        "react-router/rsc"
-      ]);
-      let mdxPluginIndex = pluginIndex("@mdx-js/rollup");
-      if (mdxPluginIndex >= 0 && mdxPluginIndex > reactRouterPluginIndex) {
-        throw new Error(
-          `The "@mdx-js/rollup" plugin should be placed before the React Router plugin in your Vite config`
-        );
+      let rollupPrePlugins = [
+        { pluginName: "@mdx-js/rollup", displayName: "@mdx-js/rollup" }
+      ];
+      for (let prePlugin of rollupPrePlugins) {
+        let prePluginIndex = pluginIndex(prePlugin.pluginName);
+        if (prePluginIndex >= 0 && prePluginIndex > pluginIndex(["react-router", "react-router/rsc"])) {
+          throw new Error(
+            `The "${prePlugin.displayName}" plugin should be placed before the React Router plugin in your Vite config file`
+          );
+        }
       }
     }
   };
@@ -1708,56 +1640,18 @@ function reactRouterRSCVitePlugin() {
   let typegenWatcherPromise;
   let viteCommand;
   let routeIdByFile;
-  let logger;
-  const defaultEntries = getDefaultEntries();
   return [
     {
       name: "react-router/rsc",
       async config(viteUserConfig, { command, mode }) {
         await import_es_module_lexer2.init;
-        await preloadVite();
         viteCommand = command;
         const rootDirectory = getRootDirectory(viteUserConfig);
         const watch2 = command === "serve";
-        configLoader = await createConfigLoader({
-          rootDirectory,
-          mode,
-          watch: watch2,
-          validateConfig: (userConfig) => {
-            let errors = [];
-            if (userConfig.buildEnd) errors.push("buildEnd");
-            if (userConfig.prerender) errors.push("prerender");
-            if (userConfig.presets?.length) errors.push("presets");
-            if (userConfig.routeDiscovery) errors.push("routeDiscovery");
-            if (userConfig.serverBundles) errors.push("serverBundles");
-            if (userConfig.ssr === false) errors.push("ssr: false");
-            if (userConfig.future?.unstable_splitRouteModules)
-              errors.push("future.unstable_splitRouteModules");
-            if (userConfig.future?.unstable_viteEnvironmentApi === false)
-              errors.push("future.unstable_viteEnvironmentApi: false");
-            if (userConfig.future?.v8_middleware === false)
-              errors.push("future.v8_middleware: false");
-            if (userConfig.future?.unstable_subResourceIntegrity)
-              errors.push("future.unstable_subResourceIntegrity");
-            if (errors.length) {
-              return `RSC Framework Mode does not currently support the following React Router config:
-${errors.map((x) => ` - ${x}`).join("\n")}
-`;
-            }
-          }
-        });
+        configLoader = await createConfigLoader({ rootDirectory, mode, watch: watch2 });
         const configResult = await configLoader.getConfig();
         if (!configResult.ok) throw new Error(configResult.error);
         config = configResult.value;
-        if (viteUserConfig.base && config.basename !== "/" && viteCommand === "serve" && !viteUserConfig.server?.middlewareMode && !config.basename.startsWith(viteUserConfig.base)) {
-          throw new Error(
-            "When using the React Router `basename` and the Vite `base` config, the `basename` config must begin with `base` for the default Vite dev server."
-          );
-        }
-        const vite2 = await import("vite");
-        logger = vite2.createLogger(viteUserConfig.logLevel, {
-          prefix: "[react-router]"
-        });
         return {
           resolve: {
             dedupe: [
@@ -1768,14 +1662,10 @@ ${errors.map((x) => ` - ${x}`).join("\n")}
               // You must render this element inside a <Remix> element`.
               "react-router",
               "react-router/dom",
-              ...hasDependency({ name: "react-router-dom", rootDirectory }) ? ["react-router-dom"] : []
+              "react-router-dom"
             ]
           },
           optimizeDeps: {
-            entries: getOptimizeDepsEntries({
-              entryClientFilePath: defaultEntries.client,
-              reactRouterConfig: config
-            }),
             esbuildOptions: {
               jsx: "automatic"
             },
@@ -1787,8 +1677,7 @@ ${errors.map((x) => ` - ${x}`).join("\n")}
               "react/jsx-runtime",
               "react/jsx-dev-runtime",
               "react-dom",
-              "react-dom/client",
-              "react-router/internal/react-server-client"
+              "react-dom/client"
             ]
           },
           esbuild: {
@@ -1798,47 +1687,17 @@ ${errors.map((x) => ` - ${x}`).join("\n")}
           environments: {
             client: {
               build: {
-                rollupOptions: {
-                  input: {
-                    index: defaultEntries.client
-                  }
-                },
-                outDir: (0, import_pathe6.join)(config.buildDirectory, "client")
+                outDir: (0, import_pathe5.join)(config.buildDirectory, "client")
               }
             },
             rsc: {
               build: {
-                rollupOptions: {
-                  input: {
-                    // We use a virtual entry here so that consumers can import
-                    // it as `virtual:react-router/unstable_rsc/rsc-entry`
-                    // without needing to know the actual file path, which is
-                    // important when using the default entries.
-                    index: defaultEntries.rsc
-                  },
-                  output: {
-                    entryFileNames: config.serverBuildFile,
-                    format: config.serverModuleFormat
-                  }
-                },
-                outDir: (0, import_pathe6.join)(config.buildDirectory, "server")
+                outDir: (0, import_pathe5.join)(config.buildDirectory, "server")
               }
             },
             ssr: {
               build: {
-                rollupOptions: {
-                  input: {
-                    index: defaultEntries.ssr
-                  },
-                  output: {
-                    // Note: We don't set `entryFileNames` here because it's
-                    // considered private to the RSC environment build, and
-                    // @vitejs/plugin-rsc currently breaks if it's set to
-                    // something other than `index.js`.
-                    format: config.serverModuleFormat
-                  }
-                },
-                outDir: (0, import_pathe6.join)(config.buildDirectory, "server/__ssr_build")
+                outDir: (0, import_pathe5.join)(config.buildDirectory, "server/__ssr_build")
               }
             }
           },
@@ -1865,35 +1724,6 @@ ${errors.map((x) => ` - ${x}`).join("\n")}
           }
         };
       },
-      async configureServer(viteDevServer) {
-        configLoader.onChange(
-          async ({
-            result,
-            configCodeChanged,
-            routeConfigCodeChanged,
-            configChanged,
-            routeConfigChanged
-          }) => {
-            if (!result.ok) {
-              invalidateVirtualModules(viteDevServer);
-              logger.error(result.error, {
-                clear: true,
-                timestamp: true
-              });
-              return;
-            }
-            let message = configChanged ? "Config changed." : routeConfigChanged ? "Route config changed." : configCodeChanged ? "Config saved." : routeConfigCodeChanged ? " Route config saved." : "Config saved";
-            logger.info(import_picocolors3.default.green(message), {
-              clear: true,
-              timestamp: true
-            });
-            config = result.value;
-            if (configChanged || routeConfigChanged) {
-              invalidateVirtualModules(viteDevServer);
-            }
-          }
-        );
-      },
       async buildEnd() {
         await configLoader.close();
       }
@@ -1920,12 +1750,6 @@ ${errors.map((x) => ` - ${x}`).join("\n")}
         (await typegenWatcherPromise)?.close();
       }
     },
-    {
-      name: "react-router/rsc/virtual-rsc-entry",
-      resolveId(id) {
-        if (id === virtual.rscEntry.id) return defaultEntries.rsc;
-      }
-    },
     {
       name: "react-router/rsc/virtual-route-config",
       resolveId(id) {
@@ -1957,19 +1781,6 @@ ${errors.map((x) => ` - ${x}`).join("\n")}
         });
       }
     },
-    {
-      name: "react-router/rsc/virtual-basename",
-      resolveId(id) {
-        if (id === virtual.basename.id) {
-          return virtual.basename.resolvedId;
-        }
-      },
-      load(id) {
-        if (id === virtual.basename.resolvedId) {
-          return `export default ${JSON.stringify(config.basename)};`;
-        }
-      }
-    },
     {
       name: "react-router/rsc/hmr/inject-runtime",
       enforce: "pre",
@@ -1997,10 +1808,10 @@ ${errors.map((x) => ` - ${x}`).join("\n")}
       },
       async load(id) {
         if (id !== virtual.hmrRuntime.resolvedId) return;
-        const reactRefreshDir = import_pathe6.default.dirname(
+        const reactRefreshDir = import_pathe5.default.dirname(
           require.resolve("react-refresh/package.json")
         );
-        const reactRefreshRuntimePath = import_pathe6.default.join(
+        const reactRefreshRuntimePath = import_pathe5.default.join(
           reactRefreshDir,
           "cjs/react-refresh-runtime.development.js"
         );
@@ -2057,16 +1868,10 @@ ${errors.map((x) => ` - ${x}`).join("\n")}
       name: "react-router/rsc/hmr/updates",
       async hotUpdate({ server, file, modules }) {
         if (this.environment.name !== "rsc") return;
-        const clientModules = server.environments.client.moduleGraph.getModulesByFile(file);
-        const vite2 = await import("vite");
-        const isServerOnlyChange = !clientModules || clientModules.size === 0 || // Handle CSS injected from server-first routes (with ?direct query
-        // string) since the client graph has a reference to the CSS
-        vite2.isCSSRequest(file) && Array.from(clientModules).some(
-          (mod) => mod.id?.includes("?direct")
-        );
+        const isServerOnlyChange = (server.environments.client.moduleGraph.getModulesByFile(file)?.size ?? 0) === 0;
         for (const mod of getModulesWithImporters(modules)) {
           if (!mod.file) continue;
-          const normalizedPath = import_pathe6.default.normalize(mod.file);
+          const normalizedPath = import_pathe5.default.normalize(mod.file);
           const routeId = routeIdByFile?.get(normalizedPath);
           if (routeId !== void 0) {
             const routeSource = await (0, import_promises2.readFile)(normalizedPath, "utf8");
@@ -2096,56 +1901,45 @@ ${errors.map((x) => ` - ${x}`).join("\n")}
         return modules;
       }
     },
-    validatePluginOrder()
+    validatePluginOrder(),
+    (0, import_plugin_rsc.default)({ entries: getRscEntries() })
   ];
 }
 var virtual = {
   routeConfig: create("unstable_rsc/routes"),
   injectHmrRuntime: create("unstable_rsc/inject-hmr-runtime"),
-  hmrRuntime: create("unstable_rsc/runtime"),
-  basename: create("unstable_rsc/basename"),
-  rscEntry: create("unstable_rsc/rsc-entry")
+  hmrRuntime: create("unstable_rsc/runtime")
 };
-function invalidateVirtualModules(viteDevServer) {
-  for (const vmod of Object.values(virtual)) {
-    for (const env of Object.values(viteDevServer.environments)) {
-      const mod = env.moduleGraph.getModuleById(vmod.resolvedId);
-      if (mod) {
-        env.moduleGraph.invalidateModule(mod);
-      }
-    }
-  }
-}
 function getRootDirectory(viteUserConfig) {
   return viteUserConfig.root ?? process.env.REACT_ROUTER_ROOT ?? process.cwd();
 }
+function getRscEntries() {
+  const entriesDir = (0, import_pathe5.join)(
+    getDevPackageRoot(),
+    "dist",
+    "config",
+    "default-rsc-entries"
+  );
+  return {
+    client: (0, import_pathe5.join)(entriesDir, "entry.client.tsx"),
+    rsc: (0, import_pathe5.join)(entriesDir, "entry.rsc.tsx"),
+    ssr: (0, import_pathe5.join)(entriesDir, "entry.ssr.tsx")
+  };
+}
 function getDevPackageRoot() {
-  const currentDir = (0, import_pathe6.dirname)(__dirname);
+  const currentDir = (0, import_pathe5.dirname)(__dirname);
   let dir = currentDir;
-  while (dir !== (0, import_pathe6.dirname)(dir)) {
+  while (dir !== (0, import_pathe5.dirname)(dir)) {
     try {
-      const packageJsonPath = (0, import_pathe6.join)(dir, "package.json");
+      const packageJsonPath = (0, import_pathe5.join)(dir, "package.json");
       (0, import_fs.readFileSync)(packageJsonPath, "utf-8");
       return dir;
     } catch {
-      dir = (0, import_pathe6.dirname)(dir);
+      dir = (0, import_pathe5.dirname)(dir);
     }
   }
   throw new Error("Could not find package.json");
 }
-function getDefaultEntries() {
-  const defaultEntriesDir = (0, import_pathe6.join)(
-    getDevPackageRoot(),
-    "dist",
-    "config",
-    "default-rsc-entries"
-  );
-  return {
-    rsc: (0, import_pathe6.join)(defaultEntriesDir, "entry.rsc.tsx"),
-    ssr: (0, import_pathe6.join)(defaultEntriesDir, "entry.ssr.tsx"),
-    client: (0, import_pathe6.join)(defaultEntriesDir, "entry.client.tsx")
-  };
-}
 function getModulesWithImporters(modules) {
   const visited = /* @__PURE__ */ new Set();
   const result = /* @__PURE__ */ new Set();