@react-router/dev 0.0.0-experimental-795b50c5b → 0.0.0-experimental-4cf5bd08c

package/dist/cli/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * @react-router/dev v0.0.0-experimental-795b50c5b
+ * @react-router/dev v0.0.0-experimental-4cf5bd08c
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -217,7 +217,7 @@ function validateRouteConfig({
         `Route config in "${routeConfigFile}" is invalid.`,
         root ? `${root}` : [],
         nested ? Object.entries(nested).map(
-          ([path8, message]) => `Path: routes.${path8}
+          ([path9, message]) => `Path: routes.${path9}
 ${message}`
         ) : []
       ].flat().join("\n\n")
@@ -311,7 +311,8 @@ async function resolveConfig({
   root,
   viteNodeContext,
   reactRouterConfigFile,
-  skipRoutes
+  skipRoutes,
+  validateConfig
 }) {
   let reactRouterUserConfig = {};
   if (reactRouterConfigFile) {
@@ -329,6 +330,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}`);
     }
@@ -417,7 +424,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,
@@ -458,7 +465,7 @@ async function resolveConfig({
         {
           id: "root",
           path: "",
-          file: rootRouteFile,
+          file: import_pathe3.default.relative(appDirectory, rootRouteFile),
           children: result.routeConfig
         }
       ];
@@ -507,7 +514,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");
@@ -526,7 +534,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) {
@@ -548,11 +562,11 @@ async function createConfigLoader({
       if (!fsWatcher) {
         fsWatcher = import_chokidar.default.watch([root, appDirectory], {
           ignoreInitial: true,
-          ignored: (path8) => {
-            let dirname5 = import_pathe3.default.dirname(path8);
+          ignored: (path9) => {
+            let dirname5 = import_pathe3.default.dirname(path9);
             return !dirname5.startsWith(appDirectory) && // Ensure we're only watching files outside of the app directory
             // that are at the root level, not nested in subdirectories
-            path8 !== root && // Watch the root directory itself
+            path9 !== root && // Watch the root directory itself
             dirname5 !== root;
           }
         });
@@ -798,7 +812,8 @@ var init_profiler = __esm({
 async function createContext2({
   rootDirectory,
   watch: watch2,
-  mode
+  mode,
+  rsc
 }) {
   const configLoader = await createConfigLoader({ rootDirectory, mode, watch: watch2 });
   const configResult = await configLoader.getConfig();
@@ -809,7 +824,8 @@ async function createContext2({
   return {
     configLoader,
     rootDirectory,
-    config
+    config,
+    rsc
   };
 }
 var init_context = __esm({
@@ -876,7 +892,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((path8) => path8 !== void 0 && path8 !== "").join("/");
+  return "/" + lineage2.map((route2) => route2.path?.replace(/^\//, "")?.replace(/\/$/, "")).filter((path9) => path9 !== void 0 && path9 !== "").join("/");
 }
 var init_route = __esm({
   "typegen/route.ts"() {
@@ -897,7 +913,7 @@ function generateFuture(ctx) {
 
     declare module "react-router" {
       interface Future {
-        middleware: ${ctx.config.future.v8_middleware}
+        v8_middleware: ${ctx.config.future.v8_middleware}
       }
     }
   `;
@@ -1036,8 +1052,8 @@ function routeFilesType({
   );
 }
 function isInAppDirectory(ctx, routeFile) {
-  const path8 = Path3.resolve(ctx.config.appDirectory, routeFile);
-  return path8.startsWith(ctx.config.appDirectory);
+  const path9 = Path3.resolve(ctx.config.appDirectory, routeFile);
+  return path9.startsWith(ctx.config.appDirectory);
 }
 function getRouteAnnotations({
   ctx,
@@ -1102,7 +1118,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
@@ -1149,21 +1165,21 @@ function getRouteAnnotations({
   return { filename: filename2, content };
 }
 function relativeImportSource(from, to) {
-  let path8 = Path3.relative(Path3.dirname(from), to);
-  let extension = Path3.extname(path8);
-  path8 = Path3.join(Path3.dirname(path8), Pathe.filename(path8));
-  if (!path8.startsWith("../")) path8 = "./" + path8;
+  let path9 = Path3.relative(Path3.dirname(from), to);
+  let extension = Path3.extname(path9);
+  path9 = Path3.join(Path3.dirname(path9), Pathe.filename(path9));
+  if (!path9.startsWith("../")) path9 = "./" + path9;
   if (!extension || /\.(js|ts)x?$/.test(extension)) {
     extension = ".js";
   }
-  return path8 + extension;
+  return path9 + extension;
 }
 function rootDirsPath(ctx, typesPath) {
   const rel = Path3.relative(typesDirectory(ctx), typesPath);
   return Path3.join(ctx.rootDirectory, rel);
 }
-function paramsType(path8) {
-  const params = parse2(path8);
+function paramsType(path9) {
+  const params = parse2(path9);
   return t2.tsTypeLiteral(
     Object.entries(params).map(([param, isRequired]) => {
       const property = t2.tsPropertySignature(
@@ -1226,8 +1242,8 @@ async function write(...files) {
     })
   );
 }
-async function run(rootDirectory, { mode }) {
-  const ctx = await createContext2({ rootDirectory, mode, watch: false });
+async function run(rootDirectory, { mode, rsc }) {
+  const ctx = await createContext2({ rootDirectory, mode, rsc, watch: false });
   await import_promises.default.rm(typesDirectory(ctx), { recursive: true, force: true });
   await write(
     generateFuture(ctx),
@@ -1235,8 +1251,8 @@ async function run(rootDirectory, { mode }) {
     ...generateRoutes(ctx)
   );
 }
-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),
@@ -1284,6 +1300,36 @@ var init_typegen = __esm({
   }
 });
 
+// vite/has-rsc-plugin.ts
+async function hasReactRouterRscPlugin({
+  root,
+  viteBuildOptions: { config, logLevel, mode }
+}) {
+  const vite2 = await import("vite");
+  const viteConfig = await vite2.resolveConfig(
+    {
+      configFile: config,
+      logLevel,
+      mode: mode ?? "production",
+      root
+    },
+    "build",
+    // command
+    "production",
+    // default mode
+    "production"
+    // default NODE_ENV
+  );
+  return viteConfig.plugins.some(
+    (plugin) => plugin?.name === "react-router/rsc"
+  );
+}
+var init_has_rsc_plugin = __esm({
+  "vite/has-rsc-plugin.ts"() {
+    "use strict";
+  }
+});
+
 // vite/node-adapter.ts
 var import_node_events, import_node_tls, import_node_stream, import_set_cookie_parser, import_node;
 var init_node_adapter = __esm({
@@ -1337,6 +1383,16 @@ var init_virtual_module = __esm({
   }
 });
 
+// vite/resolve-relative-route-file-path.ts
+var import_pathe4;
+var init_resolve_relative_route_file_path = __esm({
+  "vite/resolve-relative-route-file-path.ts"() {
+    "use strict";
+    import_pathe4 = __toESM(require("pathe"));
+    init_vite();
+  }
+});
+
 // vite/combine-urls.ts
 var init_combine_urls = __esm({
   "vite/combine-urls.ts"() {
@@ -1354,6 +1410,13 @@ var init_remove_exports = __esm({
   }
 });
 
+// vite/has-dependency.ts
+var init_has_dependency = __esm({
+  "vite/has-dependency.ts"() {
+    "use strict";
+  }
+});
+
 // vite/cache.ts
 var init_cache = __esm({
   "vite/cache.ts"() {
@@ -1409,6 +1472,17 @@ var init_route_chunks = __esm({
   }
 });
 
+// vite/optimize-deps-entries.ts
+var import_tinyglobby;
+var init_optimize_deps_entries = __esm({
+  "vite/optimize-deps-entries.ts"() {
+    "use strict";
+    import_tinyglobby = require("tinyglobby");
+    init_resolve_relative_route_file_path();
+    init_vite();
+  }
+});
+
 // vite/with-props.ts
 var init_with_props = __esm({
   "vite/with-props.ts"() {
@@ -1417,6 +1491,13 @@ var init_with_props = __esm({
   }
 });
 
+// vite/load-dotenv.ts
+var init_load_dotenv = __esm({
+  "vite/load-dotenv.ts"() {
+    "use strict";
+  }
+});
+
 // vite/plugins/validate-plugin-order.ts
 var init_validate_plugin_order = __esm({
   "vite/plugins/validate-plugin-order.ts"() {
@@ -1424,6 +1505,16 @@ var init_validate_plugin_order = __esm({
   }
 });
 
+// vite/plugins/warn-on-client-source-maps.ts
+var import_picocolors4;
+var init_warn_on_client_source_maps = __esm({
+  "vite/plugins/warn-on-client-source-maps.ts"() {
+    "use strict";
+    import_picocolors4 = __toESM(require("picocolors"));
+    init_invariant();
+  }
+});
+
 // vite/plugin.ts
 async function resolveViteConfig({
   configFile,
@@ -1466,8 +1557,8 @@ function getServerBundleIds(ctx) {
 async function cleanBuildDirectory(viteConfig, ctx) {
   let buildDirectory = ctx.reactRouterConfig.buildDirectory;
   let isWithinRoot = () => {
-    let relativePath = path6.relative(ctx.rootDirectory, buildDirectory);
-    return !relativePath.startsWith("..") && !path6.isAbsolute(relativePath);
+    let relativePath = path7.relative(ctx.rootDirectory, buildDirectory);
+    return !relativePath.startsWith("..") && !path7.isAbsolute(relativePath);
   };
   if (viteConfig.build.emptyOutDir ?? isWithinRoot()) {
     await (0, import_promises2.rm)(buildDirectory, { force: true, recursive: true });
@@ -1478,7 +1569,7 @@ async function cleanViteManifests(environmentsOptions, ctx) {
     ([environmentName, options]) => {
       let outDir = options.build?.outDir;
       invariant(outDir, `Expected build.outDir for ${environmentName}`);
-      return path6.join(outDir, ".vite/manifest.json");
+      return path7.join(outDir, ".vite/manifest.json");
     }
   );
   await Promise.all(
@@ -1488,7 +1579,7 @@ async function cleanViteManifests(environmentsOptions, ctx) {
       if (!ctx.viteManifestEnabled) {
         await (0, import_promises2.rm)(viteManifestPath, { force: true, recursive: true });
       }
-      let viteDir = path6.dirname(viteManifestPath);
+      let viteDir = path7.dirname(viteManifestPath);
       let viteDirFiles = await (0, import_promises2.readdir)(viteDir, { recursive: true });
       if (viteDirFiles.length === 0) {
         await (0, import_promises2.rm)(viteDir, { force: true, recursive: true });
@@ -1505,10 +1596,10 @@ function mergeEnvironmentOptions(base, ...overrides) {
 }
 async function getEnvironmentOptionsResolvers(ctx, viteCommand) {
   let { serverBuildFile, serverModuleFormat } = ctx.reactRouterConfig;
-  let packageRoot = path6.dirname(
+  let packageRoot = path7.dirname(
     require.resolve("@react-router/dev/package.json")
   );
-  let { moduleSyncEnabled } = await import(`file:///${path6.join(packageRoot, "module-sync-enabled/index.mjs")}`);
+  let { moduleSyncEnabled } = await import(`file:///${path7.join(packageRoot, "module-sync-enabled/index.mjs")}`);
   let vite2 = getVite();
   function getBaseOptions({
     viteUserConfig
@@ -1587,7 +1678,7 @@ async function getEnvironmentOptionsResolvers(ctx, viteCommand) {
             ctx.entryClientFilePath,
             ...Object.values(ctx.reactRouterConfig.routes).flatMap(
               (route) => {
-                let routeFilePath = path6.resolve(
+                let routeFilePath = path7.resolve(
                   ctx.reactRouterConfig.appDirectory,
                   route.file
                 );
@@ -1611,7 +1702,7 @@ async function getEnvironmentOptionsResolvers(ctx, viteCommand) {
               ) : null;
               let routeChunkSuffix = routeChunkName ? `-${(0, import_kebabCase.default)(routeChunkName)}` : "";
               let assetsDir = (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi ? viteUserConfig?.environments?.client?.build?.assetsDir : null) ?? viteUserConfig?.build?.assetsDir ?? "assets";
-              return path6.posix.join(
+              return path7.posix.join(
                 assetsDir,
                 `[name]${routeChunkSuffix}-[hash].js`
               );
@@ -1661,22 +1752,21 @@ function resolveEnvironmentsOptions(environmentResolvers, resolverOptions) {
 function isNonNullable(x) {
   return x != null;
 }
-var import_node_crypto, import_node_fs3, import_promises2, path6, url, babel2, import_react_router2, import_es_module_lexer, import_tinyglobby, import_pick3, import_jsesc, import_picocolors4, import_kebabCase, CLIENT_NON_COMPONENT_EXPORTS, CLIENT_ROUTE_EXPORTS, BUILD_CLIENT_ROUTE_QUERY_STRING, SSR_BUNDLE_PREFIX, virtualHmrRuntime, virtualInjectHmrRuntime, virtual, getServerBuildDirectory, getClientBuildDirectory, defaultEntriesDir, defaultEntries, REACT_REFRESH_HEADER;
+var import_node_crypto, import_node_fs3, import_promises2, path7, url, babel2, import_react_router2, import_es_module_lexer, import_pick3, import_jsesc, import_picocolors5, import_kebabCase, CLIENT_NON_COMPONENT_EXPORTS, CLIENT_ROUTE_EXPORTS, BUILD_CLIENT_ROUTE_QUERY_STRING, SSR_BUNDLE_PREFIX, virtualHmrRuntime, virtualInjectHmrRuntime, virtual, getServerBuildDirectory, getClientBuildDirectory, defaultEntriesDir, defaultEntries, REACT_REFRESH_HEADER;
 var init_plugin = __esm({
   "vite/plugin.ts"() {
     "use strict";
     import_node_crypto = require("crypto");
     import_node_fs3 = require("fs");
     import_promises2 = require("fs/promises");
-    path6 = __toESM(require("path"));
+    path7 = __toESM(require("path"));
     url = __toESM(require("url"));
     babel2 = __toESM(require("@babel/core"));
     import_react_router2 = require("react-router");
     import_es_module_lexer = require("es-module-lexer");
-    import_tinyglobby = require("tinyglobby");
     import_pick3 = __toESM(require("lodash/pick"));
     import_jsesc = __toESM(require("jsesc"));
-    import_picocolors4 = __toESM(require("picocolors"));
+    import_picocolors5 = __toESM(require("picocolors"));
     import_kebabCase = __toESM(require("lodash/kebabCase"));
     init_typegen();
     init_invariant();
@@ -1685,14 +1775,19 @@ var init_plugin = __esm({
     init_styles();
     init_virtual_module();
     init_resolve_file_url();
+    init_resolve_relative_route_file_path();
     init_combine_urls();
     init_remove_exports();
     init_ssr_externals();
+    init_has_dependency();
     init_route_chunks();
     init_vite();
     init_config();
+    init_optimize_deps_entries();
     init_with_props();
+    init_load_dotenv();
     init_validate_plugin_order();
+    init_warn_on_client_source_maps();
     CLIENT_NON_COMPONENT_EXPORTS = [
       "clientAction",
       "clientLoader",
@@ -1718,20 +1813,20 @@ var init_plugin = __esm({
       serverManifest: create("server-manifest"),
       browserManifest: create("browser-manifest")
     };
-    getServerBuildDirectory = (reactRouterConfig, { serverBundleId } = {}) => path6.join(
+    getServerBuildDirectory = (reactRouterConfig, { serverBundleId } = {}) => path7.join(
       reactRouterConfig.buildDirectory,
       "server",
       ...serverBundleId ? [serverBundleId] : []
     );
-    getClientBuildDirectory = (reactRouterConfig) => path6.join(reactRouterConfig.buildDirectory, "client");
-    defaultEntriesDir = path6.resolve(
-      path6.dirname(require.resolve("@react-router/dev/package.json")),
+    getClientBuildDirectory = (reactRouterConfig) => path7.join(reactRouterConfig.buildDirectory, "client");
+    defaultEntriesDir = path7.resolve(
+      path7.dirname(require.resolve("@react-router/dev/package.json")),
       "dist",
       "config",
       "defaults"
     );
     defaultEntries = (0, import_node_fs3.readdirSync)(defaultEntriesDir).map(
-      (filename2) => path6.join(defaultEntriesDir, filename2)
+      (filename2) => path7.join(defaultEntriesDir, filename2)
     );
     invariant(defaultEntries.length > 0, "No default entries found");
     REACT_REFRESH_HEADER = `
@@ -1777,14 +1872,14 @@ async function build(root, viteBuildOptions) {
     throw new Error(configResult.error);
   }
   let config = configResult.value;
-  let unstable_viteEnvironmentApi = config.future.unstable_viteEnvironmentApi;
   let viteMajor = parseInt(vite2.version.split(".")[0], 10);
-  if (unstable_viteEnvironmentApi && viteMajor === 5) {
+  if (config.future.unstable_viteEnvironmentApi && viteMajor === 5) {
     throw new Error(
       "The future.unstable_viteEnvironmentApi option is not supported in Vite 5"
     );
   }
-  return await (unstable_viteEnvironmentApi ? viteAppBuild(root, viteBuildOptions) : viteBuild(root, viteBuildOptions));
+  const useViteEnvironmentApi = config.future.unstable_viteEnvironmentApi || await hasReactRouterRscPlugin({ root, viteBuildOptions });
+  return await (useViteEnvironmentApi ? viteAppBuild(root, viteBuildOptions) : viteBuild(root, viteBuildOptions));
 }
 async function viteAppBuild(root, {
   assetsInlineLimit,
@@ -1874,7 +1969,7 @@ async function viteBuild(root, {
   let ctx = extractPluginContext(viteConfig);
   if (!ctx) {
     console.error(
-      import_picocolors5.default.red("React Router Vite plugin not found in Vite config")
+      import_picocolors6.default.red("React Router Vite plugin not found in Vite config")
     );
     process.exit(1);
   }
@@ -1931,15 +2026,16 @@ async function viteBuild(root, {
     viteConfig
   });
 }
-var import_picocolors5;
+var import_picocolors6;
 var init_build = __esm({
   "vite/build.ts"() {
     "use strict";
-    import_picocolors5 = __toESM(require("picocolors"));
+    import_picocolors6 = __toESM(require("picocolors"));
     init_config();
     init_plugin();
     init_invariant();
     init_vite();
+    init_has_rsc_plugin();
   }
 });
 
@@ -1975,7 +2071,7 @@ async function dev(root, {
     (plugin) => plugin.name === "react-router" || plugin.name === "react-router/rsc"
   )) {
     console.error(
-      import_picocolors6.default.red("React Router Vite plugin not found in Vite config")
+      import_picocolors7.default.red("React Router Vite plugin not found in Vite config")
     );
     process.exit(1);
   }
@@ -1998,11 +2094,11 @@ async function dev(root, {
   ];
   server.bindCLIShortcuts({ print: true, customShortcuts });
 }
-var import_picocolors6;
+var import_picocolors7;
 var init_dev = __esm({
   "vite/dev.ts"() {
     "use strict";
-    import_picocolors6 = __toESM(require("picocolors"));
+    import_picocolors7 = __toESM(require("picocolors"));
     init_vite();
     init_profiler();
   }
@@ -2011,15 +2107,15 @@ var init_dev = __esm({
 // cli/run.ts
 var import_arg = __toESM(require("arg"));
 var import_semver = __toESM(require("semver"));
-var import_picocolors8 = __toESM(require("picocolors"));
+var import_picocolors9 = __toESM(require("picocolors"));
 
 // cli/commands.ts
 var import_node_fs4 = require("fs");
 var import_promises3 = require("fs/promises");
-var path7 = __toESM(require("path"));
+var path8 = __toESM(require("path"));
 var import_package_json2 = __toESM(require("@npmcli/package-json"));
 var import_exit_hook = __toESM(require("exit-hook"));
-var import_picocolors7 = __toESM(require("picocolors"));
+var import_picocolors8 = __toESM(require("picocolors"));
 var import_react_router3 = require("react-router");
 init_config();
 
@@ -2101,6 +2197,7 @@ async function transpile(tsx, options = {}) {
 init_profiler();
 init_typegen();
 init_vite();
+init_has_rsc_plugin();
 async function routes(rootDirectory, flags = {}) {
   rootDirectory = resolveRootDirectory(rootDirectory, flags);
   let configResult = await loadConfig({
@@ -2108,7 +2205,7 @@ async function routes(rootDirectory, flags = {}) {
     mode: flags.mode ?? "production"
   });
   if (!configResult.ok) {
-    console.error(import_picocolors7.default.red(configResult.error));
+    console.error(import_picocolors8.default.red(configResult.error));
     process.exit(1);
   }
   let format = flags.json ? "json" : "jsx";
@@ -2145,18 +2242,32 @@ var conjunctionListFormat = new Intl.ListFormat("en", {
   type: "conjunction"
 });
 async function generateEntry(entry, rootDirectory, flags = {}) {
+  rootDirectory = resolveRootDirectory(rootDirectory, flags);
+  if (await hasReactRouterRscPlugin({
+    root: rootDirectory,
+    viteBuildOptions: {
+      config: flags.config,
+      mode: flags.mode
+    }
+  })) {
+    console.error(
+      import_picocolors8.default.red(
+        `The reveal command is currently not supported in RSC Framework Mode.`
+      )
+    );
+    process.exit(1);
+  }
   if (!entry) {
     await generateEntry("entry.client", rootDirectory, flags);
     await generateEntry("entry.server", rootDirectory, flags);
     return;
   }
-  rootDirectory = resolveRootDirectory(rootDirectory, flags);
   let configResult = await loadConfig({
     rootDirectory,
     mode: flags.mode ?? "production"
   });
   if (!configResult.ok) {
-    console.error(import_picocolors7.default.red(configResult.error));
+    console.error(import_picocolors8.default.red(configResult.error));
     return;
   }
   let appDirectory = configResult.value.appDirectory;
@@ -2164,24 +2275,24 @@ async function generateEntry(entry, rootDirectory, flags = {}) {
     let entriesArray = Array.from(entries);
     let list = conjunctionListFormat.format(entriesArray);
     console.error(
-      import_picocolors7.default.red(`Invalid entry file. Valid entry files are ${list}`)
+      import_picocolors8.default.red(`Invalid entry file. Valid entry files are ${list}`)
     );
     return;
   }
   let pkgJson = await import_package_json2.default.load(rootDirectory);
   let deps = pkgJson.content.dependencies ?? {};
   if (!deps["@react-router/node"]) {
-    console.error(import_picocolors7.default.red(`No default server entry detected.`));
+    console.error(import_picocolors8.default.red(`No default server entry detected.`));
     return;
   }
-  let defaultsDirectory = path7.resolve(
-    path7.dirname(require.resolve("@react-router/dev/package.json")),
+  let defaultsDirectory = path8.resolve(
+    path8.dirname(require.resolve("@react-router/dev/package.json")),
     "dist",
     "config",
     "defaults"
   );
-  let defaultEntryClient = path7.resolve(defaultsDirectory, "entry.client.tsx");
-  let defaultEntryServer = path7.resolve(
+  let defaultEntryClient = path8.resolve(defaultsDirectory, "entry.client.tsx");
+  let defaultEntryServer = path8.resolve(
     defaultsDirectory,
     `entry.server.node.tsx`
   );
@@ -2190,7 +2301,7 @@ async function generateEntry(entry, rootDirectory, flags = {}) {
   let useTypeScript = flags.typescript ?? true;
   let outputExtension = useTypeScript ? "tsx" : "jsx";
   let outputEntry = `${entry}.${outputExtension}`;
-  let outputFile = path7.resolve(appDirectory, outputEntry);
+  let outputFile = path8.resolve(appDirectory, outputEntry);
   if (!useTypeScript) {
     let javascript = await transpile(contents, {
       cwd: rootDirectory,
@@ -2201,8 +2312,8 @@ async function generateEntry(entry, rootDirectory, flags = {}) {
     await (0, import_promises3.writeFile)(outputFile, contents, "utf-8");
   }
   console.log(
-    import_picocolors7.default.blue(
-      `Entry file ${entry} created at ${path7.relative(
+    import_picocolors8.default.blue(
+      `Entry file ${entry} created at ${path8.relative(
         rootDirectory,
         outputFile
       )}.`
@@ -2211,17 +2322,17 @@ async function generateEntry(entry, rootDirectory, flags = {}) {
 }
 function resolveRootDirectory(root, flags) {
   if (root) {
-    return path7.resolve(root);
+    return path8.resolve(root);
   }
-  return process.env.REACT_ROUTER_ROOT || (flags?.config ? path7.dirname(path7.resolve(flags.config)) : process.cwd());
+  return process.env.REACT_ROUTER_ROOT || (flags?.config ? path8.dirname(path8.resolve(flags.config)) : process.cwd());
 }
 async function checkForEntry(rootDirectory, appDirectory, entries2) {
   for (let entry of entries2) {
-    let entryPath = path7.resolve(appDirectory, entry);
+    let entryPath = path8.resolve(appDirectory, entry);
     let exists = (0, import_node_fs4.existsSync)(entryPath);
     if (exists) {
-      let relative7 = path7.relative(rootDirectory, entryPath);
-      console.error(import_picocolors7.default.red(`Entry file ${relative7} already exists.`));
+      let relative7 = path8.relative(rootDirectory, entryPath);
+      console.error(import_picocolors8.default.red(`Entry file ${relative7} already exists.`));
       return process.exit(1);
     }
   }
@@ -2238,12 +2349,20 @@ async function createClientEntry(rootDirectory, appDirectory, inputFile) {
 }
 async function typegen(root, flags) {
   root = resolveRootDirectory(root, flags);
+  const rsc = await hasReactRouterRscPlugin({
+    root,
+    viteBuildOptions: {
+      config: flags.config,
+      mode: flags.mode
+    }
+  });
   if (flags.watch) {
     await preloadVite();
     const vite2 = getVite();
     const logger = vite2.createLogger("info", { prefix: "[react-router]" });
     await watch(root, {
       mode: flags.mode ?? "development",
+      rsc,
       logger
     });
     await new Promise(() => {
@@ -2251,20 +2370,21 @@ async function typegen(root, flags) {
     return;
   }
   await run(root, {
-    mode: flags.mode ?? "production"
+    mode: flags.mode ?? "production",
+    rsc
   });
 }
 
 // cli/run.ts
 var helpText = `
-${import_picocolors8.default.blueBright("react-router")}
+${import_picocolors9.default.blueBright("react-router")}
 
-  ${import_picocolors8.default.underline("Usage")}:
-    $ react-router build [${import_picocolors8.default.yellowBright("projectDir")}]
-    $ react-router dev [${import_picocolors8.default.yellowBright("projectDir")}]
-    $ react-router routes [${import_picocolors8.default.yellowBright("projectDir")}]
+  ${import_picocolors9.default.underline("Usage")}:
+    $ react-router build [${import_picocolors9.default.yellowBright("projectDir")}]
+    $ react-router dev [${import_picocolors9.default.yellowBright("projectDir")}]
+    $ react-router routes [${import_picocolors9.default.yellowBright("projectDir")}]
 
-  ${import_picocolors8.default.underline("Options")}:
+  ${import_picocolors9.default.underline("Options")}:
     --help, -h          Print this help message and exit
     --version, -v       Print the CLI version and exit
     --no-color          Disable ANSI colors in console output
@@ -2300,22 +2420,22 @@ ${import_picocolors8.default.blueBright("react-router")}
   \`typegen\` Options:
     --watch             Automatically regenerate types whenever route config (\`routes.ts\`) or route modules change
 
-  ${import_picocolors8.default.underline("Build your project")}:
+  ${import_picocolors9.default.underline("Build your project")}:
 
     $ react-router build
 
-  ${import_picocolors8.default.underline("Run your project locally in development")}:
+  ${import_picocolors9.default.underline("Run your project locally in development")}:
 
     $ react-router dev
 
-  ${import_picocolors8.default.underline("Show all routes in your app")}:
+  ${import_picocolors9.default.underline("Show all routes in your app")}:
 
     $ react-router routes
     $ react-router routes my-app
     $ react-router routes --json
     $ react-router routes --config vite.react-router.config.ts
 
-  ${import_picocolors8.default.underline("Reveal the used entry point")}:
+  ${import_picocolors9.default.underline("Reveal the used entry point")}:
 
     $ react-router reveal entry.client
     $ react-router reveal entry.server
@@ -2323,7 +2443,7 @@ ${import_picocolors8.default.blueBright("react-router")}
     $ react-router reveal entry.server --no-typescript
     $ react-router reveal entry.server --config vite.react-router.config.ts
 
-  ${import_picocolors8.default.underline("Generate types for route modules")}:
+  ${import_picocolors9.default.underline("Generate types for route modules")}:
 
    $ react-router typegen
    $ react-router typegen --watch