@react-router/dev 0.0.0-experimental-795b50c5b → 0.0.0-experimental-ae6d61df4

package/dist/internal.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-795b50c5b
+ * @react-router/dev v0.0.0-experimental-ae6d61df4
  *
  * 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_picocolors4 = __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(
-          ([path5, message]) => `Path: routes.${path5}
+          ([path6, message]) => `Path: routes.${path6}
 ${message}`
         ) : []
       ].flat().join("\n\n")
@@ -344,7 +344,8 @@ async function resolveConfig({
   root,
   viteNodeContext,
   reactRouterConfigFile,
-  skipRoutes
+  skipRoutes,
+  validateConfig
 }) {
   let reactRouterUserConfig = {};
   if (reactRouterConfigFile) {
@@ -362,6 +363,12 @@ 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}`);
     }
@@ -450,7 +457,7 @@ async function resolveConfig({
   }
   let appDirectory = import_pathe3.default.resolve(root, userAppDirectory || "app");
   let buildDirectory = import_pathe3.default.resolve(root, userBuildDirectory);
-  let rootRouteFile = findEntry(appDirectory, "root");
+  let rootRouteFile = findEntry(appDirectory, "root", { absolute: true });
   if (!rootRouteFile) {
     let rootRouteDisplayPath = import_pathe3.default.relative(
       root,
@@ -491,7 +498,7 @@ async function resolveConfig({
         {
           id: "root",
           path: "",
-          file: rootRouteFile,
+          file: import_pathe3.default.relative(appDirectory, rootRouteFile),
           children: result.routeConfig
         }
       ];
@@ -529,6 +536,7 @@ async function resolveConfig({
     serverBundles,
     serverModuleFormat,
     ssr,
+    unstable_rootRouteFile: rootRouteFile,
     unstable_routeConfig: routeConfig
   });
   for (let preset of reactRouterUserConfig.presets ?? []) {
@@ -540,7 +548,8 @@ async function createConfigLoader({
   rootDirectory: root,
   watch: watch2,
   mode,
-  skipRoutes
+  skipRoutes,
+  validateConfig
 }) {
   root = import_pathe3.default.normalize(root ?? process.env.REACT_ROUTER_ROOT ?? process.cwd());
   let vite2 = await import("vite");
@@ -559,7 +568,13 @@ async function createConfigLoader({
     });
   };
   updateReactRouterConfigFile();
-  let getConfig = () => resolveConfig({ root, viteNodeContext, reactRouterConfigFile, skipRoutes });
+  let getConfig = () => resolveConfig({
+    root,
+    viteNodeContext,
+    reactRouterConfigFile,
+    skipRoutes,
+    validateConfig
+  });
   let appDirectory;
   let initialConfigResult = await getConfig();
   if (!initialConfigResult.ok) {
@@ -581,11 +596,11 @@ async function createConfigLoader({
       if (!fsWatcher) {
         fsWatcher = import_chokidar.default.watch([root, appDirectory], {
           ignoreInitial: true,
-          ignored: (path5) => {
-            let dirname4 = import_pathe3.default.dirname(path5);
+          ignored: (path6) => {
+            let dirname4 = import_pathe3.default.dirname(path6);
             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
-            path5 !== root && // Watch the root directory itself
+            path6 !== root && // Watch the root directory itself
             dirname4 !== root;
           }
         });
@@ -719,7 +734,8 @@ function isEntryFileDependency(moduleGraph, entryFilepath, filepath, visited = /
 async function createContext2({
   rootDirectory,
   watch: watch2,
-  mode
+  mode,
+  rsc
 }) {
   const configLoader = await createConfigLoader({ rootDirectory, mode, watch: watch2 });
   const configResult = await configLoader.getConfig();
@@ -730,7 +746,8 @@ async function createContext2({
   return {
     configLoader,
     rootDirectory,
-    config
+    config,
+    rsc
   };
 }
 
@@ -785,7 +802,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((path5) => path5 !== void 0 && path5 !== "").join("/");
+  return "/" + lineage2.map((route2) => route2.path?.replace(/^\//, "")?.replace(/\/$/, "")).filter((path6) => path6 !== void 0 && path6 !== "").join("/");
 }
 
 // typegen/generate.ts
@@ -941,8 +958,8 @@ function routeFilesType({
   );
 }
 function isInAppDirectory(ctx, routeFile) {
-  const path5 = Path3.resolve(ctx.config.appDirectory, routeFile);
-  return path5.startsWith(ctx.config.appDirectory);
+  const path6 = Path3.resolve(ctx.config.appDirectory, routeFile);
+  return path6.startsWith(ctx.config.appDirectory);
 }
 function getRouteAnnotations({
   ctx,
@@ -1007,7 +1024,7 @@ function getRouteAnnotations({
         module: Module
       }>
     ` + "\n\n" + generate(matchesType).code + "\n\n" + import_dedent.default`
-      type Annotations = GetAnnotations<Info & { module: Module, matches: Matches }>;
+      type Annotations = GetAnnotations<Info & { module: Module, matches: Matches }, ${ctx.rsc}>;
 
       export namespace Route {
         // links
@@ -1054,21 +1071,21 @@ function getRouteAnnotations({
   return { filename: filename2, content };
 }
 function relativeImportSource(from, to) {
-  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;
+  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;
   if (!extension || /\.(js|ts)x?$/.test(extension)) {
     extension = ".js";
   }
-  return path5 + extension;
+  return path6 + extension;
 }
 function rootDirsPath(ctx, typesPath) {
   const rel = Path3.relative(typesDirectory(ctx), typesPath);
   return Path3.join(ctx.rootDirectory, rel);
 }
-function paramsType(path5) {
-  const params = parse2(path5);
+function paramsType(path6) {
+  const params = parse2(path6);
   return t2.tsTypeLiteral(
     Object.entries(params).map(([param, isRequired]) => {
       const property = t2.tsPropertySignature(
@@ -1118,8 +1135,8 @@ async function write(...files) {
     })
   );
 }
-async function watch(rootDirectory, { mode, logger }) {
-  const ctx = await createContext2({ rootDirectory, mode, watch: true });
+async function watch(rootDirectory, { mode, logger, rsc }) {
+  const ctx = await createContext2({ rootDirectory, mode, rsc, watch: true });
   await import_promises.default.rm(typesDirectory(ctx), { recursive: true, force: true });
   await write(
     generateFuture(ctx),
@@ -1159,10 +1176,58 @@ async function watch(rootDirectory, { mode, logger }) {
 // vite/rsc/plugin.ts
 var import_fs = require("fs");
 var import_promises2 = require("fs/promises");
-var import_pathe5 = __toESM(require("pathe"));
+var import_pathe6 = __toESM(require("pathe"));
 
-// vite/rsc/virtual-route-config.ts
+// 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
+    )
+  );
+}
+
+// vite/rsc/virtual-route-config.ts
+var import_pathe5 = __toESM(require("pathe"));
 function createVirtualRouteConfig({
   appDirectory,
   routeConfig
@@ -1181,11 +1246,11 @@ function createVirtualRouteConfig({
       continue;
     }
     code += "{";
-    const routeFile = import_pathe4.default.resolve(appDirectory, route.file);
+    const routeFile = import_pathe5.default.resolve(appDirectory, route.file);
     const routeId = route.id || createRouteId2(route.file, appDirectory);
     routeIdByFile.set(routeFile, routeId);
     code += `lazy: () => import(${JSON.stringify(
-      `${routeFile}?route-module${routeId === "root" ? "&root-route=true" : ""}`
+      `${routeFile}?route-module`
     )}),`;
     code += `id: ${JSON.stringify(routeId)},`;
     if (typeof route.path === "string") {
@@ -1209,7 +1274,7 @@ function createVirtualRouteConfig({
   return { code, routeIdByFile };
 }
 function createRouteId2(file, appDirectory) {
-  return import_pathe4.default.relative(appDirectory, file).replace(/\\+/, "/").slice(0, -import_pathe4.default.extname(file).length);
+  return import_pathe5.default.relative(appDirectory, file).replace(/\\+/, "/").slice(0, -import_pathe5.default.extname(file).length);
 }
 
 // vite/rsc/virtual-route-modules.ts
@@ -1223,10 +1288,10 @@ var removeExports = (ast, exportsToRemove) => {
   let markedForRemoval = /* @__PURE__ */ new Set();
   let removedExportLocalNames = /* @__PURE__ */ new Set();
   traverse(ast, {
-    ExportDeclaration(path5) {
-      if (path5.node.type === "ExportNamedDeclaration") {
-        if (path5.node.specifiers.length) {
-          path5.node.specifiers = path5.node.specifiers.filter((specifier) => {
+    ExportDeclaration(path6) {
+      if (path6.node.type === "ExportNamedDeclaration") {
+        if (path6.node.specifiers.length) {
+          path6.node.specifiers = path6.node.specifiers.filter((specifier) => {
             if (specifier.type === "ExportSpecifier" && specifier.exported.type === "Identifier") {
               if (exportsToRemove.includes(specifier.exported.name)) {
                 exportsFiltered = true;
@@ -1238,12 +1303,12 @@ var removeExports = (ast, exportsToRemove) => {
             }
             return true;
           });
-          if (path5.node.specifiers.length === 0) {
-            markedForRemoval.add(path5);
+          if (path6.node.specifiers.length === 0) {
+            markedForRemoval.add(path6);
           }
         }
-        if (path5.node.declaration?.type === "VariableDeclaration") {
-          let declaration = path5.node.declaration;
+        if (path6.node.declaration?.type === "VariableDeclaration") {
+          let declaration = path6.node.declaration;
           declaration.declarations = declaration.declarations.filter(
             (declaration2) => {
               if (declaration2.id.type === "Identifier" && exportsToRemove.includes(declaration2.id.name)) {
@@ -1257,30 +1322,30 @@ var removeExports = (ast, exportsToRemove) => {
             }
           );
           if (declaration.declarations.length === 0) {
-            markedForRemoval.add(path5);
+            markedForRemoval.add(path6);
           }
         }
-        if (path5.node.declaration?.type === "FunctionDeclaration") {
-          let id = path5.node.declaration.id;
+        if (path6.node.declaration?.type === "FunctionDeclaration") {
+          let id = path6.node.declaration.id;
           if (id && exportsToRemove.includes(id.name)) {
-            markedForRemoval.add(path5);
+            markedForRemoval.add(path6);
           }
         }
-        if (path5.node.declaration?.type === "ClassDeclaration") {
-          let id = path5.node.declaration.id;
+        if (path6.node.declaration?.type === "ClassDeclaration") {
+          let id = path6.node.declaration.id;
           if (id && exportsToRemove.includes(id.name)) {
-            markedForRemoval.add(path5);
+            markedForRemoval.add(path6);
           }
         }
       }
-      if (path5.node.type === "ExportDefaultDeclaration") {
+      if (path6.node.type === "ExportDefaultDeclaration") {
         if (exportsToRemove.includes("default")) {
-          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);
+          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);
             }
           }
         }
@@ -1288,21 +1353,21 @@ var removeExports = (ast, exportsToRemove) => {
     }
   });
   traverse(ast, {
-    ExpressionStatement(path5) {
-      if (!path5.parentPath.isProgram()) {
+    ExpressionStatement(path6) {
+      if (!path6.parentPath.isProgram()) {
         return;
       }
-      if (path5.node.expression.type === "AssignmentExpression") {
-        const left = path5.node.expression.left;
+      if (path6.node.expression.type === "AssignmentExpression") {
+        const left = path6.node.expression.left;
         if (left.type === "MemberExpression" && left.object.type === "Identifier" && (exportsToRemove.includes(left.object.name) || removedExportLocalNames.has(left.object.name))) {
-          markedForRemoval.add(path5);
+          markedForRemoval.add(path6);
         }
       }
     }
   });
   if (markedForRemoval.size > 0 || exportsFiltered) {
-    for (let path5 of markedForRemoval) {
-      path5.remove();
+    for (let path6 of markedForRemoval) {
+      path6.remove();
     }
     (0, import_babel_dead_code_elimination.deadCodeElimination)(ast, previouslyReferencedIdentifiers);
   }
@@ -1421,26 +1486,38 @@ function transformVirtualRouteModules({
   code,
   viteCommand,
   routeIdByFile,
+  rootRouteFile,
   viteEnvironment
 }) {
   if (isVirtualRouteModuleId(id) || routeIdByFile.has(id)) {
     return createVirtualRouteModuleCode({
       id,
       code,
+      rootRouteFile,
       viteCommand,
       viteEnvironment
     });
   }
   if (isVirtualServerRouteModuleId(id)) {
-    return createVirtualServerRouteModuleCode({ id, code, viteEnvironment });
+    return createVirtualServerRouteModuleCode({
+      id,
+      code,
+      viteEnvironment
+    });
   }
   if (isVirtualClientRouteModuleId(id)) {
-    return createVirtualClientRouteModuleCode({ id, code, viteCommand });
+    return createVirtualClientRouteModuleCode({
+      id,
+      code,
+      rootRouteFile,
+      viteCommand
+    });
   }
 }
 async function createVirtualRouteModuleCode({
   id,
   code: routeSource,
+  rootRouteFile,
   viteCommand,
   viteEnvironment
 }) {
@@ -1500,7 +1577,7 @@ async function createVirtualRouteModuleCode({
       }
     }
   }
-  if (isRootRouteId(id) && !staticExports.includes("ErrorBoundary")) {
+  if (isRootRouteFile({ id, rootRouteFile }) && !staticExports.includes("ErrorBoundary")) {
     code += `export { ErrorBoundary } from "${clientModuleId}";
 `;
   }
@@ -1544,6 +1621,7 @@ function createVirtualServerRouteModuleCode({
 function createVirtualClientRouteModuleCode({
   id,
   code: routeSource,
+  rootRouteFile,
   viteCommand
 }) {
   const { staticExports, isServerFirstRoute, hasClientExports } = parseRouteExports(routeSource);
@@ -1554,7 +1632,7 @@ function createVirtualClientRouteModuleCode({
   removeExports(clientRouteModuleAst, exportsToRemove);
   const generatorResult = generate(clientRouteModuleAst);
   generatorResult.code = '"use client";' + generatorResult.code;
-  if (isRootRouteId(id) && !staticExports.includes("ErrorBoundary")) {
+  if (isRootRouteFile({ id, rootRouteFile }) && !staticExports.includes("ErrorBoundary")) {
     const hasRootLayout = staticExports.includes("Layout");
     generatorResult.code += `
 import { createElement as __rr_createElement } from "react";
@@ -1589,13 +1667,10 @@ function parseRouteExports(code) {
   };
 }
 function getVirtualClientModuleId(id) {
-  return `${id.split("?")[0]}?client-route-module${isRootRouteId(id) ? "&root-route=true" : ""}`;
+  return `${id.split("?")[0]}?client-route-module`;
 }
 function getVirtualServerModuleId(id) {
-  return `${id.split("?")[0]}?server-route-module${isRootRouteId(id) ? "&root-route=true" : ""}`;
-}
-function isRootRouteId(id) {
-  return /(\?|&)root-route=true(&|$)/.test(id);
+  return `${id.split("?")[0]}?server-route-module`;
 }
 function isVirtualRouteModuleId(id) {
   return /(\?|&)route-module(&|$)/.test(id);
@@ -1606,6 +1681,13 @@ function isVirtualClientRouteModuleId(id) {
 function isVirtualServerRouteModuleId(id) {
   return /(\?|&)server-route-module(&|$)/.test(id);
 }
+function isRootRouteFile({
+  id,
+  rootRouteFile
+}) {
+  const filePath = id.split("?")[0];
+  return filePath === rootRouteFile;
+}
 
 // vite/plugins/validate-plugin-order.ts
 function validatePluginOrder() {
@@ -1618,16 +1700,57 @@ function validatePluginOrder() {
           (plugin) => pluginName.includes(plugin.name)
         );
       };
-      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`
-          );
-        }
+      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`
+        );
+      }
+    }
+  };
+}
+
+// vite/plugins/warn-on-client-source-maps.ts
+var import_picocolors3 = __toESM(require("picocolors"));
+function warnOnClientSourceMaps() {
+  let viteConfig;
+  let viteCommand;
+  let logged = false;
+  return {
+    name: "react-router:warn-on-client-source-maps",
+    config(_, configEnv) {
+      viteCommand = configEnv.command;
+    },
+    configResolved(config) {
+      viteConfig = config;
+    },
+    buildStart() {
+      invariant(viteConfig);
+      if (!logged && viteCommand === "build" && viteConfig.mode === "production" && !viteConfig.build.ssr && (viteConfig.build.sourcemap || viteConfig.environments?.client?.build.sourcemap)) {
+        viteConfig.logger.warn(
+          import_picocolors3.default.yellow(
+            "\n" + import_picocolors3.default.bold("  \u26A0\uFE0F  Source maps are enabled in production\n") + [
+              "This makes your server code publicly",
+              "visible in the browser. This is highly",
+              "discouraged! If you insist, ensure that",
+              "you are using environment variables for",
+              "secrets and not hard-coding them in",
+              "your source code."
+            ].map((line) => "     " + line).join("\n") + "\n"
+          )
+        );
+        logged = true;
       }
     }
   };
@@ -1640,18 +1763,56 @@ 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 });
+        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")}
+`;
+            }
+          }
+        });
         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: [
@@ -1662,10 +1823,14 @@ function reactRouterRSCVitePlugin() {
               // You must render this element inside a <Remix> element`.
               "react-router",
               "react-router/dom",
-              "react-router-dom"
+              ...hasDependency({ name: "react-router-dom", rootDirectory }) ? ["react-router-dom"] : []
             ]
           },
           optimizeDeps: {
+            entries: getOptimizeDepsEntries({
+              entryClientFilePath: defaultEntries.client,
+              reactRouterConfig: config
+            }),
             esbuildOptions: {
               jsx: "automatic"
             },
@@ -1677,7 +1842,8 @@ function reactRouterRSCVitePlugin() {
               "react/jsx-runtime",
               "react/jsx-dev-runtime",
               "react-dom",
-              "react-dom/client"
+              "react-dom/client",
+              "react-router/internal/react-server-client"
             ]
           },
           esbuild: {
@@ -1687,17 +1853,47 @@ function reactRouterRSCVitePlugin() {
           environments: {
             client: {
               build: {
-                outDir: (0, import_pathe5.join)(config.buildDirectory, "client")
+                rollupOptions: {
+                  input: {
+                    index: defaultEntries.client
+                  }
+                },
+                outDir: (0, import_pathe6.join)(config.buildDirectory, "client")
               }
             },
             rsc: {
               build: {
-                outDir: (0, import_pathe5.join)(config.buildDirectory, "server")
+                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")
               }
             },
             ssr: {
               build: {
-                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")
               }
             }
           },
@@ -1724,6 +1920,35 @@ function reactRouterRSCVitePlugin() {
           }
         };
       },
+      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_picocolors4.default.green(message), {
+              clear: true,
+              timestamp: true
+            });
+            config = result.value;
+            if (configChanged || routeConfigChanged) {
+              invalidateVirtualModules(viteDevServer);
+            }
+          }
+        );
+      },
       async buildEnd() {
         await configLoader.close();
       }
@@ -1737,6 +1962,7 @@ function reactRouterRSCVitePlugin() {
             getRootDirectory(viteUserConfig),
             {
               mode,
+              rsc: true,
               // ignore `info` logs from typegen since they are
               // redundant when Vite plugin logs are active
               logger: vite2.createLogger("warn", {
@@ -1750,6 +1976,12 @@ function reactRouterRSCVitePlugin() {
         (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) {
@@ -1777,10 +2009,24 @@ function reactRouterRSCVitePlugin() {
           id,
           viteCommand,
           routeIdByFile,
+          rootRouteFile: config.unstable_rootRouteFile,
           viteEnvironment: this.environment
         });
       }
     },
+    {
+      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",
@@ -1808,10 +2054,10 @@ function reactRouterRSCVitePlugin() {
       },
       async load(id) {
         if (id !== virtual.hmrRuntime.resolvedId) return;
-        const reactRefreshDir = import_pathe5.default.dirname(
+        const reactRefreshDir = import_pathe6.default.dirname(
           require.resolve("react-refresh/package.json")
         );
-        const reactRefreshRuntimePath = import_pathe5.default.join(
+        const reactRefreshRuntimePath = import_pathe6.default.join(
           reactRefreshDir,
           "cjs/react-refresh-runtime.development.js"
         );
@@ -1877,7 +2123,7 @@ function reactRouterRSCVitePlugin() {
         );
         for (const mod of getModulesWithImporters(modules)) {
           if (!mod.file) continue;
-          const normalizedPath = import_pathe5.default.normalize(mod.file);
+          const normalizedPath = import_pathe6.default.normalize(mod.file);
           const routeId = routeIdByFile?.get(normalizedPath);
           if (routeId !== void 0) {
             const routeSource = await (0, import_promises2.readFile)(normalizedPath, "utf8");
@@ -1908,44 +2154,56 @@ function reactRouterRSCVitePlugin() {
       }
     },
     validatePluginOrder(),
-    (0, import_plugin_rsc.default)({ entries: getRscEntries() })
+    warnOnClientSourceMaps()
   ];
 }
 var virtual = {
   routeConfig: create("unstable_rsc/routes"),
   injectHmrRuntime: create("unstable_rsc/inject-hmr-runtime"),
-  hmrRuntime: create("unstable_rsc/runtime")
+  hmrRuntime: create("unstable_rsc/runtime"),
+  basename: create("unstable_rsc/basename"),
+  rscEntry: create("unstable_rsc/rsc-entry")
 };
+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_pathe5.dirname)(__dirname);
+  const currentDir = (0, import_pathe6.dirname)(__dirname);
   let dir = currentDir;
-  while (dir !== (0, import_pathe5.dirname)(dir)) {
+  while (dir !== (0, import_pathe6.dirname)(dir)) {
     try {
-      const packageJsonPath = (0, import_pathe5.join)(dir, "package.json");
+      const packageJsonPath = (0, import_pathe6.join)(dir, "package.json");
       (0, import_fs.readFileSync)(packageJsonPath, "utf-8");
       return dir;
     } catch {
-      dir = (0, import_pathe5.dirname)(dir);
+      dir = (0, import_pathe6.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();