@react-router/dev 0.0.0-experimental-312bddb22 → 0.0.0-experimental-7de693505

package/dist/cli/commands.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-312bddb22
+ * @react-router/dev v0.0.0-experimental-7de693505
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/cli/detectPackageManager.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-312bddb22
+ * @react-router/dev v0.0.0-experimental-7de693505
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/cli/index.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-312bddb22
+ * @react-router/dev v0.0.0-experimental-7de693505
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/cli/run.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-312bddb22
+ * @react-router/dev v0.0.0-experimental-7de693505
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/cli/useJavascript.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-312bddb22
+ * @react-router/dev v0.0.0-experimental-7de693505
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/colors.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-312bddb22
+ * @react-router/dev v0.0.0-experimental-7de693505
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/config/format.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-312bddb22
+ * @react-router/dev v0.0.0-experimental-7de693505
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/config/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-312bddb22
+ * @react-router/dev v0.0.0-experimental-7de693505
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -49,7 +49,7 @@ function setAppDirectory(directory) {
  * This is designed to support resolving file system routes.
  */
 function getAppDirectory() {
-  invariant["default"](appDirectory);
+  invariant(appDirectory);
   return appDirectory;
 }
 const routeConfigEntrySchema = v__namespace.pipe(v__namespace.custom(value => {

package/dist/invariant.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-312bddb22
+ * @react-router/dev v0.0.0-experimental-7de693505
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -10,8 +10,6 @@
  */
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 function invariant(value, message) {
   if (value === false || value === null || typeof value === "undefined") {
     console.error("The following error is a bug in Remix; please open an issue! https://github.com/remix-run/remix/issues/new");
@@ -19,4 +17,4 @@ function invariant(value, message) {
   }
 }
 
-exports["default"] = invariant;
+module.exports = invariant;

package/dist/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-312bddb22
+ * @react-router/dev v0.0.0-experimental-7de693505
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/typescript/plugin.d.ts

@@ -0,0 +1,6 @@
+import type ts from "typescript/lib/tsserverlibrary";
+export default function init(modules: {
+    typescript: typeof ts;
+}): {
+    create: (info: ts.server.PluginCreateInfo) => ts.LanguageService;
+};

package/dist/typescript/plugin.js

@@ -0,0 +1,56 @@
+/**
+ * @react-router/dev v0.0.0-experimental-7de693505
+ *
+ * Copyright (c) Remix Software Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE.md file in the root directory of this source tree.
+ *
+ * @license MIT
+ */
+'use strict';
+
+var Path = require('pathe');
+var typegen = require('./typegen.js');
+
+function _interopNamespace(e) {
+    if (e && e.__esModule) return e;
+    var n = Object.create(null);
+    if (e) {
+        Object.keys(e).forEach(function (k) {
+            if (k !== 'default') {
+                var d = Object.getOwnPropertyDescriptor(e, k);
+                Object.defineProperty(n, k, d.get ? d : {
+                    enumerable: true,
+                    get: function () { return e[k]; }
+                });
+            }
+        });
+    }
+    n["default"] = e;
+    return Object.freeze(n);
+}
+
+var Path__namespace = /*#__PURE__*/_interopNamespace(Path);
+
+// For compatibility with the TS language service plugin API, this entrypoint:
+function init(modules) {
+  function create(info) {
+    const {
+      logger
+    } = info.project.projectService;
+    logger.info("[react-router] setup");
+    const rootDirectory = Path__namespace.normalize(info.project.getCurrentDirectory());
+    const ctx = {
+      rootDirectory,
+      appDirectory: Path__namespace.join(rootDirectory, "app")
+    };
+    typegen.watch(ctx);
+    return info.languageService;
+  }
+  return {
+    create
+  };
+}
+
+module.exports = init;

package/dist/typescript/typegen.d.ts

@@ -0,0 +1,9 @@
+import { type RouteManifest, type RouteManifestEntry } from "../config/routes";
+type Context = {
+    rootDirectory: string;
+    appDirectory: string;
+};
+export declare function getPath(ctx: Context, route: RouteManifestEntry): string;
+export declare function watch(ctx: Context): Promise<void>;
+export declare function typegenAll(ctx: Context, routes: RouteManifest): Promise<void>;
+export {};

package/dist/typescript/typegen.js

@@ -0,0 +1,165 @@
+/**
+ * @react-router/dev v0.0.0-experimental-7de693505
+ *
+ * Copyright (c) Remix Software Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE.md file in the root directory of this source tree.
+ *
+ * @license MIT
+ */
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var fs = require('node:fs');
+var Chokidar = require('chokidar');
+var dedent = require('dedent');
+var Path = require('pathe');
+var Pathe = require('pathe/utils');
+var routes = require('../config/routes.js');
+var viteNode = require('../vite/vite-node.js');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+function _interopNamespace(e) {
+  if (e && e.__esModule) return e;
+  var n = Object.create(null);
+  if (e) {
+    Object.keys(e).forEach(function (k) {
+      if (k !== 'default') {
+        var d = Object.getOwnPropertyDescriptor(e, k);
+        Object.defineProperty(n, k, d.get ? d : {
+          enumerable: true,
+          get: function () { return e[k]; }
+        });
+      }
+    });
+  }
+  n["default"] = e;
+  return Object.freeze(n);
+}
+
+var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
+var Chokidar__default = /*#__PURE__*/_interopDefaultLegacy(Chokidar);
+var dedent__default = /*#__PURE__*/_interopDefaultLegacy(dedent);
+var Path__namespace = /*#__PURE__*/_interopNamespace(Path);
+var Pathe__namespace = /*#__PURE__*/_interopNamespace(Pathe);
+
+function getDirectory(ctx) {
+  return Path__namespace.join(ctx.rootDirectory, ".react-router/types");
+}
+function getPath(ctx, route) {
+  return Path__namespace.join(getDirectory(ctx), "app", Path__namespace.dirname(route.file), "+types." + Path__namespace.basename(route.file));
+}
+async function watch(ctx) {
+  const appDirectory = Path__namespace.normalize(ctx.appDirectory);
+  const routesTsPath = Path__namespace.join(appDirectory, "routes.ts");
+  const routesViteNodeContext = await viteNode.createContext();
+  async function getRoutes() {
+    routesViteNodeContext.devServer.moduleGraph.invalidateAll();
+    routesViteNodeContext.runner.moduleCache.clear();
+    const result = await routesViteNodeContext.runner.executeFile(routesTsPath);
+    return routes.configRoutesToRouteManifest(result.routes);
+  }
+  const initialRoutes = await getRoutes();
+  await typegenAll(ctx, initialRoutes);
+  const watcher = Chokidar__default["default"].watch(appDirectory, {
+    ignoreInitial: true
+  });
+  watcher.on("all", async (event, path) => {
+    path = Path__namespace.normalize(path);
+    const routes = await getRoutes();
+    const routeConfigChanged = Boolean(routesViteNodeContext.devServer.moduleGraph.getModuleById(path));
+    if (routeConfigChanged) {
+      await typegenAll(ctx, routes);
+      return;
+    }
+    const isRoute = Object.values(routes).find(route => path === Path__namespace.join(ctx.appDirectory, route.file));
+    if (isRoute && (event === "add" || event === "unlink")) {
+      await typegenAll(ctx, routes);
+      return;
+    }
+  });
+}
+async function typegenAll(ctx, routes) {
+  fs__default["default"].rmSync(getDirectory(ctx), {
+    recursive: true,
+    force: true
+  });
+  Object.values(routes).forEach(route => {
+    const typesPath = getPath(ctx, route);
+    const content = getModule(routes, route);
+    fs__default["default"].mkdirSync(Path__namespace.dirname(typesPath), {
+      recursive: true
+    });
+    fs__default["default"].writeFileSync(typesPath, content);
+  });
+}
+function getModule(routes, route) {
+  return dedent__default["default"]`
+    // typegen: ${route.file}
+    import * as T from "react-router/types"
+
+    export type Params = {${formattedParamsProperties(routes, route)}}
+
+    type Route = typeof import("./${Pathe__namespace.filename(route.file)}")
+
+    export type LoaderData = T.LoaderData<Route>
+    export type ActionData = T.ActionData<Route>
+
+    export type LoaderArgs = T.ServerLoaderArgs<Params>
+    export type ClientLoaderArgs = T.ClientLoaderArgs<Params, Route>
+    export type ActionArgs = T.ServerActionArgs<Params>
+    export type ClientActionArgs = T.ClientActionArgs<Params, Route>
+
+    export type HydrateFallbackProps = T.HydrateFallbackProps<Params>
+    export type DefaultProps = T.DefaultProps<Params, LoaderData, ActionData>
+    export type ErrorBoundaryProps = T.ErrorBoundaryProps<Params, LoaderData, ActionData>
+  `;
+}
+function formattedParamsProperties(routes, route) {
+  const urlpath = routeLineage(routes, route).map(route => route.path).join("/");
+  const params = parseParams(urlpath);
+  const indent = "  ".repeat(3);
+  const properties = Object.entries(params).map(([name, values]) => {
+    if (values.length === 1) {
+      const isOptional = values[0];
+      return indent + (isOptional ? `${name}?: string` : `${name}: string`);
+    }
+    const items = values.map(isOptional => isOptional ? "string | undefined" : "string");
+    return indent + `${name}: [${items.join(", ")}]`;
+  });
+  // prettier-ignore
+  const body = properties.length === 0 ? "" : "\n" + properties.join("\n") + "\n";
+  return body;
+}
+function routeLineage(routes, route) {
+  const result = [];
+  while (route) {
+    result.push(route);
+    if (!route.parentId) break;
+    route = routes[route.parentId];
+  }
+  result.reverse();
+  return result;
+}
+function parseParams(urlpath) {
+  const result = {};
+  let segments = urlpath.split("/");
+  segments.filter(s => s.startsWith(":")).forEach(param => {
+    param = param.slice(1); // omit leading `:`
+    let isOptional = param.endsWith("?");
+    if (isOptional) {
+      param = param.slice(0, -1); // omit trailing `?`
+    }
+    result[param] ??= [];
+    result[param].push(isOptional);
+    return;
+  });
+  return result;
+}
+
+exports.getPath = getPath;
+exports.typegenAll = typegenAll;
+exports.watch = watch;

package/dist/vite/babel.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-312bddb22
+ * @react-router/dev v0.0.0-experimental-7de693505
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/build.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-312bddb22
+ * @react-router/dev v0.0.0-experimental-7de693505
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -32,7 +32,7 @@ function getAddressableRoutes(routes) {
     let route = routes[id];
     // We omit the parent route of index routes since the index route takes ownership of its parent's path
     if (route.index) {
-      invariant["default"](route.parentId, `Expected index route "${route.id}" to have "parentId" set`);
+      invariant(route.parentId, `Expected index route "${route.id}" to have "parentId" set`);
       nonAddressableIds.add(route.parentId);
     }
     // We omit pathless routes since they can only be addressed via descendant routes
@@ -47,7 +47,7 @@ function getRouteBranch(routes, routeId) {
   let currentRouteId = routeId;
   while (currentRouteId) {
     let route = routes[currentRouteId];
-    invariant["default"](route, `Missing route for ${currentRouteId}`);
+    invariant(route, `Missing route for ${currentRouteId}`);
     branch.push(route);
     currentRouteId = route.parentId;
   }

package/dist/vite/cloudflare-dev-proxy.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-312bddb22
+ * @react-router/dev v0.0.0-experimental-7de693505
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/cloudflare.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-312bddb22
+ * @react-router/dev v0.0.0-experimental-7de693505
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/combine-urls.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-312bddb22
+ * @react-router/dev v0.0.0-experimental-7de693505
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/config.d.ts

@@ -1,5 +1,5 @@
 import type * as Vite from "vite";
-import type { ViteNodeRunner } from "vite-node/client";
+import type * as ViteNode from "./vite-node";
 import { type RouteManifest, type RouteManifestEntry } from "../config/routes";
 declare const excludedConfigPresetKeys: readonly ["presets"];
 type ExcludedConfigPresetKey = (typeof excludedConfigPresetKeys)[number];
@@ -160,13 +160,13 @@ export type ResolvedReactRouterConfig = Readonly<{
     ssr: boolean;
 }>;
 export declare function resolvePublicPath(viteUserConfig: Vite.UserConfig): string;
-export declare function resolveReactRouterConfig({ rootDirectory, reactRouterUserConfig, routeConfigChanged, viteUserConfig, viteCommand, viteNodeRunner, }: {
+export declare function resolveReactRouterConfig({ rootDirectory, reactRouterUserConfig, routeConfigChanged, viteUserConfig, viteCommand, routesViteNodeContext, }: {
     rootDirectory: string;
     reactRouterUserConfig: ReactRouterConfig;
     routeConfigChanged: boolean;
     viteUserConfig: Vite.UserConfig;
     viteCommand: Vite.ConfigEnv["command"];
-    viteNodeRunner: ViteNodeRunner;
+    routesViteNodeContext: ViteNode.Context;
 }): Promise<Readonly<{
     /**
      * The absolute path to the application source directory.

package/dist/vite/config.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-312bddb22
+ * @react-router/dev v0.0.0-experimental-7de693505
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -84,7 +84,7 @@ async function resolveReactRouterConfig({
   routeConfigChanged,
   viteUserConfig,
   viteCommand,
-  viteNodeRunner
+  routesViteNodeContext
 }) {
   var _viteUserConfig$serve;
   let vite = importViteEsmSync.importViteEsmSync();
@@ -165,7 +165,7 @@ async function resolveReactRouterConfig({
       throw new FriendlyError(`Route config file not found at "${routeConfigDisplayPath}".`);
     }
     routes.setAppDirectory(appDirectory);
-    let routeConfigExport = (await viteNodeRunner.executeFile(path__default["default"].join(appDirectory, routeConfigFile))).routes;
+    let routeConfigExport = (await routesViteNodeContext.runner.executeFile(path__default["default"].join(appDirectory, routeConfigFile))).routes;
     let routeConfig = await routeConfigExport;
     let result = routes.validateRouteConfig({
       routeConfigFile,

package/dist/vite/dev.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-312bddb22
+ * @react-router/dev v0.0.0-experimental-7de693505
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/import-vite-esm-sync.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-312bddb22
+ * @react-router/dev v0.0.0-experimental-7de693505
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -20,7 +20,7 @@ async function preloadViteEsm() {
   vite = await import('vite');
 }
 function importViteEsmSync() {
-  invariant["default"](vite, "importViteEsmSync() called before preloadViteEsm()");
+  invariant(vite, "importViteEsmSync() called before preloadViteEsm()");
   return vite;
 }
 

package/dist/vite/node-adapter.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-312bddb22
+ * @react-router/dev v0.0.0-experimental-7de693505
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -37,7 +37,7 @@ function fromNodeHeaders(nodeHeaders) {
 function fromNodeRequest(nodeReq, nodeRes) {
   let origin = nodeReq.headers.origin && "null" !== nodeReq.headers.origin ? nodeReq.headers.origin : `http://${nodeReq.headers.host}`;
   // Use `req.originalUrl` so React Router is aware of the full path
-  invariant["default"](nodeReq.originalUrl, "Expected `nodeReq.originalUrl` to be defined");
+  invariant(nodeReq.originalUrl, "Expected `nodeReq.originalUrl` to be defined");
   let url = new URL(nodeReq.originalUrl, origin);
   // Abort action/loaders once we can no longer write a response
   let controller = new AbortController();

package/dist/vite/plugin.d.ts

@@ -6,7 +6,7 @@ export declare function resolveViteConfig({ configFile, mode, root, }: {
     configFile?: string;
     mode?: string;
     root: string;
-}): Promise<Readonly<Omit<Vite.UserConfig, "plugins" | "css" | "assetsInclude" | "optimizeDeps" | "worker" | "build"> & {
+}): Promise<Readonly<Omit<Vite.UserConfig, "optimizeDeps" | "plugins" | "css" | "assetsInclude" | "worker" | "build"> & {
     configFile: string | undefined;
     configFileDependencies: string[];
     inlineConfig: Vite.InlineConfig;

package/dist/vite/plugin.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-312bddb22
+ * @react-router/dev v0.0.0-experimental-7de693505
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -15,9 +15,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var node_crypto = require('node:crypto');
 var path = require('node:path');
 var url = require('node:url');
-var server = require('vite-node/server');
-var client = require('vite-node/client');
-var sourceMap = require('vite-node/source-map');
 var fse = require('fs-extra');
 var babel$1 = require('@babel/core');
 var reactRouter = require('react-router');
@@ -35,6 +32,7 @@ var removeExports = require('./remove-exports.js');
 var importViteEsmSync = require('./import-vite-esm-sync.js');
 var config = require('./config.js');
 var withProps = require('./with-props.js');
+var viteNode = require('./vite-node.js');
 var parser = require('@babel/parser');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -241,7 +239,7 @@ let getServerBuildDirectory = ctx => path__namespace.join(ctx.reactRouterConfig.
 let getClientBuildDirectory = reactRouterConfig => path__namespace.join(reactRouterConfig.buildDirectory, "client");
 let defaultEntriesDir = path__namespace.resolve(__dirname, "..", "config", "defaults");
 let defaultEntries = fse__namespace.readdirSync(defaultEntriesDir).map(filename => path__namespace.join(defaultEntriesDir, filename));
-invariant["default"](defaultEntries.length > 0, "No default entries found");
+invariant(defaultEntries.length > 0, "No default entries found");
 let reactRouterDevLoadContext = () => ({});
 // Inlined from https://github.com/jsdf/deep-freeze
 let deepFreeze = o => {
@@ -268,8 +266,7 @@ const reactRouterVitePlugin = _config => {
   let viteConfig;
   let cssModulesManifest = {};
   let viteChildCompiler = null;
-  let routeConfigViteServer = null;
-  let viteNodeRunner = null;
+  let routesViteNodeContext = null;
   let ssrExternals = isInReactRouterMonorepo() ? [
   // This is only needed within this repo because these packages
   // are linked to a directory outside of node_modules so Vite
@@ -286,14 +283,14 @@ const reactRouterVitePlugin = _config => {
   } = {}) => {
     var _viteUserConfig$build;
     let rootDirectory = viteUserConfig.root ?? process.env.REACT_ROUTER_ROOT ?? process.cwd();
-    invariant["default"](viteNodeRunner);
+    invariant(routesViteNodeContext);
     let reactRouterConfig = await config.resolveReactRouterConfig({
       rootDirectory,
       reactRouterUserConfig,
       routeConfigChanged,
       viteUserConfig,
       viteCommand,
-      viteNodeRunner
+      routesViteNodeContext
     });
     let {
       entryClientFilePath,
@@ -322,11 +319,11 @@ const reactRouterVitePlugin = _config => {
     };
   };
   let pluginIndex = pluginName => {
-    invariant["default"](viteConfig);
+    invariant(viteConfig);
     return viteConfig.plugins.findIndex(plugin => plugin.name === pluginName);
   };
   let getServerEntry = async () => {
-    invariant["default"](viteConfig, "viteconfig required to generate the server entry");
+    invariant(viteConfig, "viteconfig required to generate the server entry");
     let routes = ctx.serverBundleBuildConfig ?
     // For server bundle builds, the server build should only import the
     // routes for this bundle rather than importing all routes
@@ -381,7 +378,7 @@ const reactRouterVitePlugin = _config => {
     return new Set([...cssUrlPaths, ...chunkAssetPaths]);
   };
   let generateReactRouterManifestsForBuild = async () => {
-    invariant["default"](viteConfig);
+    invariant(viteConfig);
     let viteManifest = await loadViteManifest(getClientBuildDirectory(ctx.reactRouterConfig));
     let entry = getReactRouterManifestBuildAssets(ctx, viteManifest, ctx.entryClientFilePath);
     let browserRoutes = {};
@@ -489,36 +486,13 @@ const reactRouterVitePlugin = _config => {
       viteUserConfig = _viteUserConfig;
       viteConfigEnv = _viteConfigEnv;
       viteCommand = viteConfigEnv.command;
-      routeConfigViteServer = await vite.createServer({
+      routesViteNodeContext = await viteNode.createContext({
         mode: viteConfigEnv.mode,
         server: {
-          watch: viteCommand === "build" ? null : undefined,
-          preTransformRequests: false,
-          hmr: false
+          watch: viteCommand === "build" ? null : undefined
         },
         ssr: {
           external: ssrExternals
-        },
-        optimizeDeps: {
-          noDiscovery: true
-        },
-        configFile: false,
-        envFile: false,
-        plugins: []
-      });
-      await routeConfigViteServer.pluginContainer.buildStart({});
-      let viteNodeServer = new server.ViteNodeServer(routeConfigViteServer);
-      sourceMap.installSourcemapsSupport({
-        getSourceMap: source => viteNodeServer.getSourceMap(source)
-      });
-      viteNodeRunner = new client.ViteNodeRunner({
-        root: routeConfigViteServer.config.root,
-        base: routeConfigViteServer.config.base,
-        fetchModule(id) {
-          return viteNodeServer.fetchModule(id);
-        },
-        resolveId(id, importer) {
-          return viteNodeServer.resolveId(id, importer);
         }
       });
       await updatePluginContext();
@@ -630,7 +604,7 @@ const reactRouterVitePlugin = _config => {
     async configResolved(resolvedViteConfig) {
       await esModuleLexer.init;
       viteConfig = resolvedViteConfig;
-      invariant["default"](viteConfig);
+      invariant(viteConfig);
       // We load the same Vite config file again for the child compiler so
       // that both parent and child compiler's plugins have independent state.
       // If we re-used the `viteUserConfig.plugins` array for the child
@@ -648,7 +622,7 @@ const reactRouterVitePlugin = _config => {
         mode: viteConfig.mode,
         isSsrBuild: ctx.isSsrBuild
       }, viteConfig.configFile);
-      invariant["default"](childCompilerConfigFile, "Vite config file was unable to be resolved for React Router child compiler");
+      invariant(childCompilerConfigFile, "Vite config file was unable to be resolved for React Router child compiler");
       // Validate that commonly used Rollup plugins that need to run before
       // ours are in the correct order. This is because Rollup plugins can't
       // set `enforce: "pre"` like Vite plugins can. Explicitly validating
@@ -691,7 +665,7 @@ const reactRouterVitePlugin = _config => {
       }
     },
     buildStart() {
-      invariant["default"](viteConfig);
+      invariant(viteConfig);
       if (viteCommand === "build" && viteConfig.mode === "production" && !viteConfig.build.ssr && viteConfig.build.sourcemap) {
         viteConfig.logger.warn(colors__default["default"].yellow("\n" + colors__default["default"].bold("  ⚠️  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"));
       }
@@ -721,19 +695,19 @@ const reactRouterVitePlugin = _config => {
       });
       // Invalidate virtual modules and update cached plugin config via file watcher
       viteDevServer.watcher.on("all", async (eventName, rawFilepath) => {
-        var _viteConfig, _routeConfigViteServe;
+        var _viteConfig, _routesViteNodeContex, _routesViteNodeContex2;
         let {
           normalizePath
         } = importViteEsmSync.importViteEsmSync();
         let filepath = normalizePath(rawFilepath);
         let appFileAddedOrRemoved = (eventName === "add" || eventName === "unlink") && filepath.startsWith(normalizePath(ctx.reactRouterConfig.appDirectory));
-        invariant["default"]((_viteConfig = viteConfig) === null || _viteConfig === void 0 ? void 0 : _viteConfig.configFile);
+        invariant((_viteConfig = viteConfig) === null || _viteConfig === void 0 ? void 0 : _viteConfig.configFile);
         let viteConfigChanged = eventName === "change" && filepath === normalizePath(viteConfig.configFile);
-        let routeConfigChanged = Boolean((_routeConfigViteServe = routeConfigViteServer) === null || _routeConfigViteServe === void 0 ? void 0 : _routeConfigViteServe.moduleGraph.getModuleById(filepath));
+        let routeConfigChanged = Boolean((_routesViteNodeContex = routesViteNodeContext) === null || _routesViteNodeContex === void 0 ? void 0 : (_routesViteNodeContex2 = _routesViteNodeContex.devServer) === null || _routesViteNodeContex2 === void 0 ? void 0 : _routesViteNodeContex2.moduleGraph.getModuleById(filepath));
         if (routeConfigChanged || appFileAddedOrRemoved) {
-          var _routeConfigViteServe2, _viteNodeRunner;
-          (_routeConfigViteServe2 = routeConfigViteServer) === null || _routeConfigViteServe2 === void 0 ? void 0 : _routeConfigViteServe2.moduleGraph.invalidateAll();
-          (_viteNodeRunner = viteNodeRunner) === null || _viteNodeRunner === void 0 ? void 0 : _viteNodeRunner.moduleCache.clear();
+          var _routesViteNodeContex3, _routesViteNodeContex4, _routesViteNodeContex5, _routesViteNodeContex6;
+          (_routesViteNodeContex3 = routesViteNodeContext) === null || _routesViteNodeContex3 === void 0 ? void 0 : (_routesViteNodeContex4 = _routesViteNodeContex3.devServer) === null || _routesViteNodeContex4 === void 0 ? void 0 : _routesViteNodeContex4.moduleGraph.invalidateAll();
+          (_routesViteNodeContex5 = routesViteNodeContext) === null || _routesViteNodeContex5 === void 0 ? void 0 : (_routesViteNodeContex6 = _routesViteNodeContex5.runner) === null || _routesViteNodeContex6 === void 0 ? void 0 : _routesViteNodeContex6.moduleCache.clear();
         }
         if (appFileAddedOrRemoved || viteConfigChanged || routeConfigChanged) {
           let lastReactRouterConfig = ctx.reactRouterConfig;
@@ -773,7 +747,7 @@ const reactRouterVitePlugin = _config => {
         if (!ctx.isSsrBuild) {
           return;
         }
-        invariant["default"](viteConfig);
+        invariant(viteConfig);
         let clientBuildDirectory = getClientBuildDirectory(ctx.reactRouterConfig);
         let serverBuildDirectory = getServerBuildDirectory(ctx);
         let ssrViteManifest = await loadViteManifest(serverBuildDirectory);
@@ -819,9 +793,9 @@ const reactRouterVitePlugin = _config => {
       }
     },
     async buildEnd() {
-      var _viteChildCompiler, _routeConfigViteServe3;
+      var _viteChildCompiler, _routesViteNodeContex7, _routesViteNodeContex8;
       await ((_viteChildCompiler = viteChildCompiler) === null || _viteChildCompiler === void 0 ? void 0 : _viteChildCompiler.close());
-      await ((_routeConfigViteServe3 = routeConfigViteServer) === null || _routeConfigViteServe3 === void 0 ? void 0 : _routeConfigViteServe3.close());
+      await ((_routesViteNodeContex7 = routesViteNodeContext) === null || _routesViteNodeContex7 === void 0 ? void 0 : (_routesViteNodeContex8 = _routesViteNodeContex7.devServer) === null || _routesViteNodeContex8 === void 0 ? void 0 : _routesViteNodeContex8.close());
     }
   }, {
     name: "react-router-route-entry",
@@ -1170,7 +1144,7 @@ async function handlePrerender(viteConfig, reactRouterConfig, serverBuildDirecto
   let routes = createPrerenderRoutes(build.routes);
   let routesToPrerender;
   if (typeof reactRouterConfig.prerender === "boolean") {
-    invariant["default"](reactRouterConfig.prerender, "Expected prerender:true");
+    invariant(reactRouterConfig.prerender, "Expected prerender:true");
     routesToPrerender = determineStaticPrerenderRoutes(routes, viteConfig, true);
   } else if (typeof reactRouterConfig.prerender === "function") {
     routesToPrerender = await reactRouterConfig.prerender({

package/dist/vite/profiler.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-312bddb22
+ * @react-router/dev v0.0.0-experimental-7de693505
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/remove-exports.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-312bddb22
+ * @react-router/dev v0.0.0-experimental-7de693505
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/resolve-file-url.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-312bddb22
+ * @react-router/dev v0.0.0-experimental-7de693505
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/styles.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-312bddb22
+ * @react-router/dev v0.0.0-experimental-7de693505
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/vite-node.d.ts

@@ -0,0 +1,9 @@
+import { ViteNodeServer } from "vite-node/server";
+import { ViteNodeRunner } from "vite-node/client";
+import type * as Vite from "vite";
+export type Context = {
+    devServer: Vite.ViteDevServer;
+    server: ViteNodeServer;
+    runner: ViteNodeRunner;
+};
+export declare function createContext(viteConfig?: Vite.InlineConfig): Promise<Context>;

package/dist/vite/vite-node.js

@@ -0,0 +1,57 @@
+/**
+ * @react-router/dev v0.0.0-experimental-7de693505
+ *
+ * Copyright (c) Remix Software Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE.md file in the root directory of this source tree.
+ *
+ * @license MIT
+ */
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var server = require('vite-node/server');
+var client = require('vite-node/client');
+var sourceMap = require('vite-node/source-map');
+var importViteEsmSync = require('./import-vite-esm-sync.js');
+
+async function createContext(viteConfig = {}) {
+  await importViteEsmSync.preloadViteEsm();
+  const vite = importViteEsmSync.importViteEsmSync();
+  const devServer = await vite.createServer(vite.mergeConfig({
+    server: {
+      preTransformRequests: false,
+      hmr: false
+    },
+    optimizeDeps: {
+      noDiscovery: true
+    },
+    configFile: false,
+    envFile: false,
+    plugins: []
+  }, viteConfig));
+  await devServer.pluginContainer.buildStart({});
+  const server$1 = new server.ViteNodeServer(devServer);
+  sourceMap.installSourcemapsSupport({
+    getSourceMap: source => server$1.getSourceMap(source)
+  });
+  const runner = new client.ViteNodeRunner({
+    root: devServer.config.root,
+    base: devServer.config.base,
+    fetchModule(id) {
+      return server$1.fetchModule(id);
+    },
+    resolveId(id, importer) {
+      return server$1.resolveId(id, importer);
+    }
+  });
+  return {
+    devServer,
+    server: server$1,
+    runner
+  };
+}
+
+exports.createContext = createContext;

package/dist/vite/vmod.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-312bddb22
+ * @react-router/dev v0.0.0-experimental-7de693505
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/with-props.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-312bddb22
+ * @react-router/dev v0.0.0-experimental-7de693505
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-312bddb22
+ * @react-router/dev v0.0.0-experimental-7de693505
  *
  * Copyright (c) Remix Software Inc.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/dev",
-  "version": "0.0.0-experimental-312bddb22",
+  "version": "0.0.0-experimental-7de693505",
   "description": "Dev tools and CLI for React Router",
   "homepage": "https://reactrouter.com",
   "bugs": {
@@ -12,6 +12,7 @@
     "directory": "packages/react-router-dev"
   },
   "license": "MIT",
+  "main": "./dist/typescript/plugin.ts",
   "exports": {
     "./routes": {
       "types": "./dist/routes.d.ts",
@@ -43,6 +44,7 @@
     "arg": "^5.0.1",
     "babel-dead-code-elimination": "^1.0.6",
     "chalk": "^4.1.2",
+    "chokidar": "^4.0.0",
     "dedent": "^1.5.3",
     "es-module-lexer": "^1.3.1",
     "exit-hook": "2.2.1",
@@ -50,15 +52,16 @@
     "gunzip-maybe": "^1.4.2",
     "jsesc": "3.0.2",
     "lodash": "^4.17.21",
+    "pathe": "^1.1.2",
     "picocolors": "^1.0.0",
     "picomatch": "^2.3.1",
     "prettier": "^2.7.1",
     "react-refresh": "^0.14.0",
     "semver": "^7.3.7",
     "set-cookie-parser": "^2.6.0",
-    "vite-node": "^1.6.0",
     "valibot": "^0.41.0",
-    "@react-router/node": "0.0.0-experimental-312bddb22"
+    "vite-node": "^1.6.0",
+    "@react-router/node": "0.0.0-experimental-7de693505"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -84,15 +87,15 @@
     "tiny-invariant": "^1.2.0",
     "vite": "^5.1.0",
     "wrangler": "^3.28.2",
-    "@react-router/serve": "0.0.0-experimental-312bddb22",
-    "react-router": "^0.0.0-experimental-312bddb22"
+    "@react-router/serve": "0.0.0-experimental-7de693505",
+    "react-router": "^0.0.0-experimental-7de693505"
   },
   "peerDependencies": {
     "typescript": "^5.1.0",
     "vite": "^5.1.0",
     "wrangler": "^3.28.2",
-    "@react-router/serve": "^0.0.0-experimental-312bddb22",
-    "react-router": "^0.0.0-experimental-312bddb22"
+    "@react-router/serve": "^0.0.0-experimental-7de693505",
+    "react-router": "^0.0.0-experimental-7de693505"
   },
   "peerDependenciesMeta": {
     "@react-router/serve": {