@react-router/dev 0.0.0-experimental-3f102fccb → 0.0.0-experimental-89dc2043e

package/CHANGELOG.md

@@ -1,4 +1,152 @@
-# `@remix-run/dev`
+# `@react-router/dev`
+
+## 7.0.1
+
+### Patch Changes
+
+- Ensure typegen file watcher is cleaned up when Vite dev server restarts ([#12331](https://github.com/remix-run/react-router/pull/12331))
+- Updated dependencies:
+  - `react-router@7.0.1`
+  - `@react-router/node@7.0.1`
+  - `@react-router/serve@7.0.1`
+
+## 7.0.0
+
+### Major Changes
+
+- For Remix consumers migrating to React Router, the `vitePlugin` and `cloudflareDevProxyVitePlugin` exports have been renamed and moved. ([#11904](https://github.com/remix-run/react-router/pull/11904))
+
+  ```diff
+  -import {
+  -  vitePlugin as remix,
+  -  cloudflareDevProxyVitePlugin,
+  -} from "@remix/dev";
+
+  +import { reactRouter } from "@react-router/dev/vite";
+  +import { cloudflareDevProxy } from "@react-router/dev/vite/cloudflare";
+  ```
+
+- Remove single_fetch future flag. ([#11522](https://github.com/remix-run/react-router/pull/11522))
+
+- update minimum node version to 18 ([#11690](https://github.com/remix-run/react-router/pull/11690))
+
+- Add `exports` field to all packages ([#11675](https://github.com/remix-run/react-router/pull/11675))
+
+- node package no longer re-exports from react-router ([#11702](https://github.com/remix-run/react-router/pull/11702))
+
+- For Remix consumers migrating to React Router who used the Vite plugin's `buildEnd` hook, the resolved `reactRouterConfig` object no longer contains a `publicPath` property since this belongs to Vite, not React Router. ([#11575](https://github.com/remix-run/react-router/pull/11575))
+
+- For Remix consumers migrating to React Router, the Vite plugin's `manifest` option has been removed. ([#11573](https://github.com/remix-run/react-router/pull/11573))
+
+  The `manifest` option been superseded by the more powerful `buildEnd` hook since it's passed the `buildManifest` argument. You can still write the build manifest to disk if needed, but you'll most likely find it more convenient to write any logic depending on the build manifest within the `buildEnd` hook itself.
+
+  If you were using the `manifest` option, you can replace it with a `buildEnd` hook that writes the manifest to disk like this:
+
+  ```ts
+  // react-router.config.ts
+  import type { Config } from "@react-router/dev/config";
+  import { writeFile } from "node:fs/promises";
+
+  export default {
+    async buildEnd({ buildManifest }) {
+      await writeFile(
+        "build/manifest.json",
+        JSON.stringify(buildManifest, null, 2),
+        "utf-8"
+      );
+    },
+  } satisfies Config;
+  ```
+
+- Consolidate types previously duplicated across `@remix-run/router`, `@remix-run/server-runtime`, and `@remix-run/react` now that they all live in `react-router` ([#12177](https://github.com/remix-run/react-router/pull/12177))
+
+  - Examples: `LoaderFunction`, `LoaderFunctionArgs`, `ActionFunction`, `ActionFunctionArgs`, `DataFunctionArgs`, `RouteManifest`, `LinksFunction`, `Route`, `EntryRoute`
+  - The `RouteManifest` type used by the "remix" code is now slightly stricter because it is using the former `@remix-run/router` `RouteManifest`
+    - `Record<string, Route> -> Record<string, Route | undefined>`
+  - Removed `AppData` type in favor of inlining `unknown` in the few locations it was used
+  - Removed `ServerRuntimeMeta*` types in favor of the `Meta*` types they were duplicated from
+
+- Update default `isbot` version to v5 and drop support for `isbot@3` ([#11770](https://github.com/remix-run/react-router/pull/11770))
+
+  - If you have `isbot@4` or `isbot@5` in your `package.json`:
+    - You do not need to make any changes
+  - If you have `isbot@3` in your `package.json` and you have your own `entry.server.tsx` file in your repo
+    - You do not need to make any changes
+    - You can upgrade to `isbot@5` independent of the React Router v7 upgrade
+  - If you have `isbot@3` in your `package.json` and you do not have your own `entry.server.tsx` file in your repo
+    - You are using the internal default entry provided by React Router v7 and you will need to upgrade to `isbot@5` in your `package.json`
+
+- Drop support for Node 18, update minimum Node vestion to 20 ([#12171](https://github.com/remix-run/react-router/pull/12171))
+
+  - Remove `installGlobals()` as this should no longer be necessary
+
+- For Remix consumers migrating to React Router, Vite manifests (i.e. `.vite/manifest.json`) are now written within each build subdirectory, e.g. `build/client/.vite/manifest.json` and `build/server/.vite/manifest.json` instead of `build/.vite/client-manifest.json` and `build/.vite/server-manifest.json`. This means that the build output is now much closer to what you'd expect from a typical Vite project. ([#11573](https://github.com/remix-run/react-router/pull/11573))
+
+  Originally the Remix Vite plugin moved all Vite manifests to a root-level `build/.vite` directory to avoid accidentally serving them in production, particularly from the client build. This was later improved with additional logic that deleted these Vite manifest files at the end of the build process unless Vite's `build.manifest` had been enabled within the app's Vite config. This greatly reduced the risk of accidentally serving the Vite manifests in production since they're only present when explicitly asked for. As a result, we can now assume that consumers will know that they need to manage these additional files themselves, and React Router can safely generate a more standard Vite build output.
+
+### Minor Changes
+
+- Params, loader data, and action data as props for route component exports ([#11961](https://github.com/remix-run/react-router/pull/11961))
+
+  ```tsx
+  export default function Component({ params, loaderData, actionData }) {}
+
+  export function HydrateFallback({ params }) {}
+  export function ErrorBoundary({ params, loaderData, actionData }) {}
+  ```
+
+- Remove internal entry.server.spa.tsx implementation ([#11681](https://github.com/remix-run/react-router/pull/11681))
+
+- Add `prefix` route config helper to `@react-router/dev/routes` ([#12094](https://github.com/remix-run/react-router/pull/12094))
+
+- ### Typesafety improvements ([#12019](https://github.com/remix-run/react-router/pull/12019))
+
+  React Router now generates types for each of your route modules.
+  You can access those types by importing them from `./+types.<route filename without extension>`.
+  For example:
+
+  ```ts
+  // app/routes/product.tsx
+  import type * as Route from "./+types.product";
+
+  export function loader({ params }: Route.LoaderArgs) {}
+
+  export default function Component({ loaderData }: Route.ComponentProps) {}
+  ```
+
+  This initial implementation targets type inference for:
+
+  - `Params` : Path parameters from your routing config in `routes.ts` including file-based routing
+  - `LoaderData` : Loader data from `loader` and/or `clientLoader` within your route module
+  - `ActionData` : Action data from `action` and/or `clientAction` within your route module
+
+  In the future, we plan to add types for the rest of the route module exports: `meta`, `links`, `headers`, `shouldRevalidate`, etc.
+  We also plan to generate types for typesafe `Link`s:
+
+  ```tsx
+  <Link to="/products/:id" params={{ id: 1 }} />
+  //        ^^^^^^^^^^^^^          ^^^^^^^^^
+  // typesafe `to` and `params` based on the available routes in your app
+  ```
+
+  Check out our docs for more:
+
+  - [_Explanations > Type Safety_](https://reactrouter.com/dev/guides/explanation/type-safety)
+  - [_How-To > Setting up type safety_](https://reactrouter.com/dev/guides/how-to/setting-up-type-safety)
+
+### Patch Changes
+
+- Enable prerendering for resource routes ([#12200](https://github.com/remix-run/react-router/pull/12200))
+- chore: warn instead of error for min node version in CLI ([#12270](https://github.com/remix-run/react-router/pull/12270))
+- chore: re-enable development warnings through a `development` exports condition. ([#12269](https://github.com/remix-run/react-router/pull/12269))
+- include root "react-dom" module for optimization ([#12060](https://github.com/remix-run/react-router/pull/12060))
+- resolve config directory relative to flat output file structure ([#12187](https://github.com/remix-run/react-router/pull/12187))
+- if we are in SAP mode, always render the `index.html` for hydration ([#12268](https://github.com/remix-run/react-router/pull/12268))
+- fix(react-router): (v7) fix static prerender of non-ascii characters ([#12161](https://github.com/remix-run/react-router/pull/12161))
+- Updated dependencies:
+  - `react-router@7.0.0`
+  - `@react-router/serve@7.0.0`
+  - `@react-router/node@7.0.0`
 
 ## 2.9.0
 

package/dist/cli/dev.d.ts

@@ -0,0 +1,22 @@
+import * as Vite from 'vite';
+
+interface ViteDevOptions {
+    clearScreen?: boolean;
+    config?: string;
+    cors?: boolean;
+    force?: boolean;
+    host?: boolean | string;
+    logLevel?: Vite.LogLevel;
+    mode?: string;
+    open?: boolean | string;
+    port?: number;
+    strictPort?: boolean;
+    profile?: boolean;
+}
+
+type DevScriptArgs = {
+    root: string;
+    viteDevOptions: ViteDevOptions;
+};
+
+export type { DevScriptArgs };

package/dist/cli/dev.js

@@ -0,0 +1,155 @@
+/**
+ * @react-router/dev v0.0.0-experimental-89dc2043e
+ *
+ * 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 __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// cli/dev.ts
+var dev_exports = {};
+module.exports = __toCommonJS(dev_exports);
+var import_exit_hook = __toESM(require("exit-hook"));
+
+// vite/profiler.ts
+var import_node_fs = __toESM(require("fs"));
+var import_node_path = __toESM(require("path"));
+var import_picocolors = __toESM(require("picocolors"));
+var getSession = () => global.__reactRouter_profile_session;
+var start = async (callback) => {
+  let inspector = await import("inspector").then((r) => r.default);
+  let session = global.__reactRouter_profile_session = new inspector.Session();
+  session.connect();
+  session.post("Profiler.enable", () => {
+    session.post("Profiler.start", callback);
+  });
+};
+var profileCount = 0;
+var stop = (log) => {
+  let session = getSession();
+  if (!session) return;
+  return new Promise((res, rej) => {
+    session.post("Profiler.stop", (err, { profile }) => {
+      if (err) return rej(err);
+      let outPath = import_node_path.default.resolve(`./react-router-${profileCount++}.cpuprofile`);
+      import_node_fs.default.writeFileSync(outPath, JSON.stringify(profile));
+      log(
+        import_picocolors.default.yellow(
+          `CPU profile written to ${import_picocolors.default.white(import_picocolors.default.dim(outPath))}`
+        )
+      );
+      global.__reactRouter_profile_session = void 0;
+      res();
+    });
+  });
+};
+
+// vite/dev.ts
+var import_picocolors2 = __toESM(require("picocolors"));
+
+// invariant.ts
+function invariant(value, message) {
+  if (value === false || value === null || typeof value === "undefined") {
+    console.error(
+      "The following error is a bug in React Router; please open an issue! https://github.com/remix-run/react-router/issues/new/choose"
+    );
+    throw new Error(message);
+  }
+}
+
+// vite/import-vite-esm-sync.ts
+var vite;
+async function preloadViteEsm() {
+  vite = await import("vite");
+}
+
+// vite/dev.ts
+async function dev(root, {
+  clearScreen,
+  config: configFile,
+  cors,
+  force,
+  host,
+  logLevel,
+  mode,
+  open,
+  port,
+  strictPort
+}) {
+  await preloadViteEsm();
+  let vite2 = await import("vite");
+  let server = await vite2.createServer({
+    root,
+    mode,
+    configFile,
+    server: { open, cors, host, port, strictPort },
+    optimizeDeps: { force },
+    clearScreen,
+    logLevel
+  });
+  if (!server.config.plugins.find((plugin) => plugin.name === "react-router")) {
+    console.error(
+      import_picocolors2.default.red("React Router Vite plugin not found in Vite config")
+    );
+    process.exit(1);
+  }
+  await server.listen();
+  server.printUrls();
+  let customShortcuts = [
+    {
+      key: "p",
+      description: "start/stop the profiler",
+      async action(server2) {
+        if (getSession()) {
+          await stop(server2.config.logger.info);
+        } else {
+          await start(() => {
+            server2.config.logger.info("Profiler started");
+          });
+        }
+      }
+    }
+  ];
+  server.bindCLIShortcuts({ print: true, customShortcuts });
+}
+
+// cli/dev.ts
+async function dev2(root, options = {}) {
+  if (options.profile) {
+    await start();
+  }
+  (0, import_exit_hook.default)(() => stop(console.info));
+  await dev(root, options);
+}
+(async () => {
+  let args = JSON.parse(process.argv[2]);
+  invariant(typeof args === "object", "dev script args must be an object");
+  await dev2(args.root, args.viteDevOptions);
+})();

package/dist/cli/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * @react-router/dev v0.0.0-experimental-3f102fccb
+ * @react-router/dev v0.0.0-experimental-89dc2043e
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -991,45 +991,6 @@ if (import.meta.hot && !inWebWorker) {
   }
 });
 
-// vite/profiler.ts
-var import_node_fs3, import_node_path, import_picocolors4, getSession, start, profileCount, stop;
-var init_profiler = __esm({
-  "vite/profiler.ts"() {
-    "use strict";
-    import_node_fs3 = __toESM(require("fs"));
-    import_node_path = __toESM(require("path"));
-    import_picocolors4 = __toESM(require("picocolors"));
-    getSession = () => global.__reactRouter_profile_session;
-    start = async (callback) => {
-      let inspector = await import("inspector").then((r) => r.default);
-      let session = global.__reactRouter_profile_session = new inspector.Session();
-      session.connect();
-      session.post("Profiler.enable", () => {
-        session.post("Profiler.start", callback);
-      });
-    };
-    profileCount = 0;
-    stop = (log) => {
-      let session = getSession();
-      if (!session) return;
-      return new Promise((res, rej) => {
-        session.post("Profiler.stop", (err2, { profile }) => {
-          if (err2) return rej(err2);
-          let outPath = import_node_path.default.resolve(`./react-router-${profileCount++}.cpuprofile`);
-          import_node_fs3.default.writeFileSync(outPath, JSON.stringify(profile));
-          log(
-            import_picocolors4.default.yellow(
-              `CPU profile written to ${import_picocolors4.default.white(import_picocolors4.default.dim(outPath))}`
-            )
-          );
-          global.__reactRouter_profile_session = void 0;
-          res();
-        });
-      });
-    };
-  }
-});
-
 // vite/build.ts
 var build_exports = {};
 __export(build_exports, {
@@ -1255,80 +1216,18 @@ var init_build = __esm({
   }
 });
 
-// vite/dev.ts
-var dev_exports = {};
-__export(dev_exports, {
-  dev: () => dev
-});
-async function dev(root, {
-  clearScreen,
-  config: configFile,
-  cors,
-  force,
-  host,
-  logLevel,
-  mode,
-  open,
-  port,
-  strictPort
-}) {
-  await preloadViteEsm();
-  let vite2 = await import("vite");
-  let server = await vite2.createServer({
-    root,
-    mode,
-    configFile,
-    server: { open, cors, host, port, strictPort },
-    optimizeDeps: { force },
-    clearScreen,
-    logLevel
-  });
-  if (!server.config.plugins.find((plugin2) => plugin2.name === "react-router")) {
-    console.error(
-      import_picocolors6.default.red("React Router Vite plugin not found in Vite config")
-    );
-    process.exit(1);
-  }
-  await server.listen();
-  server.printUrls();
-  let customShortcuts = [
-    {
-      key: "p",
-      description: "start/stop the profiler",
-      async action(server2) {
-        if (getSession()) {
-          await stop(server2.config.logger.info);
-        } else {
-          await start(() => {
-            server2.config.logger.info("Profiler started");
-          });
-        }
-      }
-    }
-  ];
-  server.bindCLIShortcuts({ print: true, customShortcuts });
-}
-var import_picocolors6;
-var init_dev = __esm({
-  "vite/dev.ts"() {
-    "use strict";
-    import_picocolors6 = __toESM(require("picocolors"));
-    init_import_vite_esm_sync();
-    init_profiler();
-  }
-});
-
 // cli/run.ts
 var import_arg = __toESM(require("arg"));
 var import_semver = __toESM(require("semver"));
-var import_picocolors8 = __toESM(require("picocolors"));
+var import_picocolors7 = __toESM(require("picocolors"));
 
 // cli/commands.ts
 var path7 = __toESM(require("path"));
 var import_fs_extra2 = __toESM(require("fs-extra"));
 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_picocolors6 = __toESM(require("picocolors"));
+var import_execa = __toESM(require("execa"));
+init_invariant();
 
 // config/format.ts
 function formatRoutes(routeManifest, format) {
@@ -1407,8 +1306,40 @@ function transpile(tsx, options = {}) {
   return import_prettier.default.format(mjs.code, { parser: "babel" });
 }
 
+// vite/profiler.ts
+var import_node_fs3 = __toESM(require("fs"));
+var import_node_path = __toESM(require("path"));
+var import_picocolors4 = __toESM(require("picocolors"));
+var getSession = () => global.__reactRouter_profile_session;
+var start = async (callback) => {
+  let inspector = await import("inspector").then((r) => r.default);
+  let session = global.__reactRouter_profile_session = new inspector.Session();
+  session.connect();
+  session.post("Profiler.enable", () => {
+    session.post("Profiler.start", callback);
+  });
+};
+var profileCount = 0;
+var stop = (log) => {
+  let session = getSession();
+  if (!session) return;
+  return new Promise((res, rej) => {
+    session.post("Profiler.stop", (err2, { profile }) => {
+      if (err2) return rej(err2);
+      let outPath = import_node_path.default.resolve(`./react-router-${profileCount++}.cpuprofile`);
+      import_node_fs3.default.writeFileSync(outPath, JSON.stringify(profile));
+      log(
+        import_picocolors4.default.yellow(
+          `CPU profile written to ${import_picocolors4.default.white(import_picocolors4.default.dim(outPath))}`
+        )
+      );
+      global.__reactRouter_profile_session = void 0;
+      res();
+    });
+  });
+};
+
 // cli/commands.ts
-init_profiler();
 init_typegen();
 init_import_vite_esm_sync();
 async function routes(reactRouterRoot, flags = {}) {
@@ -1418,7 +1349,7 @@ async function routes(reactRouterRoot, flags = {}) {
   });
   if (!ctx) {
     console.error(
-      import_picocolors7.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);
   }
@@ -1439,13 +1370,23 @@ async function build2(root, options = {}) {
     await stop(console.info);
   }
 }
-async function dev2(root, options = {}) {
-  let { dev: dev3 } = await Promise.resolve().then(() => (init_dev(), dev_exports));
-  if (options.profile) {
-    await start();
-  }
-  (0, import_exit_hook.default)(() => stop(console.info));
-  await dev3(root, options);
+async function dev(root, viteDevOptions = {}) {
+  let devScriptPath = path7.resolve(__dirname, "./dev.js");
+  invariant(
+    import_fs_extra2.default.existsSync(devScriptPath),
+    `dev script not found at ${devScriptPath}`
+  );
+  let args = { root, viteDevOptions };
+  let { NODE_OPTIONS } = process.env;
+  if (!NODE_OPTIONS?.includes("--conditions")) {
+    NODE_OPTIONS = `${NODE_OPTIONS ?? ""} --conditions=development`.trim();
+  }
+  (0, import_execa.default)(process.execPath, [devScriptPath, JSON.stringify(args)], {
+    env: { ...process.env, NODE_OPTIONS },
+    stdin: "inherit",
+    stdout: "inherit",
+    stderr: "inherit"
+  });
   await new Promise(() => {
   });
 }
@@ -1472,14 +1413,14 @@ async function generateEntry(entry, reactRouterRoot, 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_picocolors6.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_picocolors6.default.red(`No default server entry detected.`));
     return;
   }
   let defaultsDirectory = path7.resolve(
@@ -1509,7 +1450,7 @@ async function generateEntry(entry, reactRouterRoot, flags = {}) {
     await import_fs_extra2.default.writeFile(outputFile2, contents, "utf-8");
   }
   console.log(
-    import_picocolors7.default.blue(
+    import_picocolors6.default.blue(
       `Entry file ${entry} created at ${path7.relative(
         rootDirectory,
         outputFile2
@@ -1523,7 +1464,7 @@ async function checkForEntry(rootDirectory, appDirectory, entries2) {
     let exists = await import_fs_extra2.default.pathExists(entryPath);
     if (exists) {
       let relative8 = path7.relative(rootDirectory, entryPath);
-      console.error(import_picocolors7.default.red(`Entry file ${relative8} already exists.`));
+      console.error(import_picocolors6.default.red(`Entry file ${relative8} already exists.`));
       return process.exit(1);
     }
   }
@@ -1554,14 +1495,14 @@ async function typegen(root, flags) {
 
 // cli/run.ts
 var helpText = `
-${import_picocolors8.default.blueBright("react-router")}
+${import_picocolors7.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_picocolors7.default.underline("Usage")}:
+    $ react-router build [${import_picocolors7.default.yellowBright("projectDir")}]
+    $ react-router dev [${import_picocolors7.default.yellowBright("projectDir")}]
+    $ react-router routes [${import_picocolors7.default.yellowBright("projectDir")}]
 
-  ${import_picocolors8.default.underline("Options")}:
+  ${import_picocolors7.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
@@ -1597,22 +1538,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_picocolors7.default.underline("Build your project")}:
 
     $ react-router build
 
-  ${import_picocolors8.default.underline("Run your project locally in development")}:
+  ${import_picocolors7.default.underline("Run your project locally in development")}:
 
     $ react-router dev
 
-  ${import_picocolors8.default.underline("Show all routes in your app")}:
+  ${import_picocolors7.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_picocolors7.default.underline("Reveal the used entry point")}:
 
     $ react-router reveal entry.client
     $ react-router reveal entry.server
@@ -1620,7 +1561,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_picocolors7.default.underline("Generate types for route modules")}:
 
    $ react-router typegen
    $ react-router typegen --watch
@@ -1706,13 +1647,13 @@ async function run2(argv = process.argv.slice(2)) {
       break;
     }
     case "dev":
-      await dev2(input[1], flags);
+      await dev(input[1], flags);
       break;
     case "typegen":
       await typegen(input[1], flags);
       break;
     default:
-      await dev2(input[0], flags);
+      await dev(input[0], flags);
   }
 }
 

package/dist/config.d.ts

@@ -45,6 +45,9 @@ type BuildEndHook = (args: {
     reactRouterConfig: ResolvedReactRouterConfig;
     viteConfig: Vite.ResolvedConfig;
 }) => void | Promise<void>;
+/**
+ * Config to be exported via the default export from `react-router.config.ts`.
+ */
 type ReactRouterConfig = {
     /**
      * The path to the `app` directory, relative to the root directory. Defaults

package/dist/config.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-3f102fccb
+ * @react-router/dev v0.0.0-experimental-89dc2043e
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-3f102fccb
+ * @react-router/dev v0.0.0-experimental-89dc2043e
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/cloudflare.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-3f102fccb
+ * @react-router/dev v0.0.0-experimental-89dc2043e
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-3f102fccb
+ * @react-router/dev v0.0.0-experimental-89dc2043e
  *
  * Copyright (c) Remix Software Inc.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/dev",
-  "version": "0.0.0-experimental-3f102fccb",
+  "version": "0.0.0-experimental-89dc2043e",
   "description": "Dev tools and CLI for React Router",
   "homepage": "https://reactrouter.com",
   "bugs": {
@@ -67,6 +67,7 @@
     "chokidar": "^4.0.0",
     "dedent": "^1.5.3",
     "es-module-lexer": "^1.3.1",
+    "execa": "5.1.1",
     "exit-hook": "2.2.1",
     "fs-extra": "^10.0.0",
     "gunzip-maybe": "^1.4.2",
@@ -81,7 +82,7 @@
     "set-cookie-parser": "^2.6.0",
     "valibot": "^0.41.0",
     "vite-node": "^1.6.0",
-    "@react-router/node": "0.0.0-experimental-3f102fccb"
+    "@react-router/node": "0.0.0-experimental-89dc2043e"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -100,7 +101,6 @@
     "@types/set-cookie-parser": "^2.4.1",
     "dotenv": "^16.0.0",
     "esbuild-register": "^3.3.2",
-    "execa": "5.1.1",
     "express": "^4.19.2",
     "fast-glob": "3.2.11",
     "strip-ansi": "^6.0.1",
@@ -110,15 +110,15 @@
     "vite": "^5.1.0",
     "wireit": "0.14.9",
     "wrangler": "^3.28.2",
-    "@react-router/serve": "0.0.0-experimental-3f102fccb",
-    "react-router": "^0.0.0-experimental-3f102fccb"
+    "@react-router/serve": "0.0.0-experimental-89dc2043e",
+    "react-router": "^0.0.0-experimental-89dc2043e"
   },
   "peerDependencies": {
     "typescript": "^5.1.0",
     "vite": "^5.1.0",
     "wrangler": "^3.28.2",
-    "@react-router/serve": "^0.0.0-experimental-3f102fccb",
-    "react-router": "^0.0.0-experimental-3f102fccb"
+    "@react-router/serve": "^0.0.0-experimental-89dc2043e",
+    "react-router": "^0.0.0-experimental-89dc2043e"
   },
   "peerDependenciesMeta": {
     "@react-router/serve": {