@react-router/dev 0.0.0-experimental-4b431ca46 → 0.0.0-experimental-171f8688e

package/CHANGELOG.md

@@ -1,232 +1,5 @@
 # `@remix-run/dev`
 
-## 7.0.0-pre.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:
-
-  ```js
-  import { reactRouter } from "@react-router/dev/vite";
-  import { writeFile } from "node:fs/promises";
-
-  export default {
-    plugins: [
-      reactRouter({
-        async buildEnd({ buildManifest }) {
-          await writeFile(
-            "build/manifest.json",
-            JSON.stringify(buildManifest, null, 2),
-            "utf-8"
-          );
-        },
-      }),
-    ],
-  };
-  ```
-
-- 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`
-
-- 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))
-- ### 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
-
-  These types are then used to create types for route export args and props:
-
-  - `LoaderArgs`
-  - `ClientLoaderArgs`
-  - `ActionArgs`
-  - `ClientActionArgs`
-  - `HydrateFallbackProps`
-  - `ComponentProps` (for the `default` export)
-  - `ErrorBoundaryProps`
-
-  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
-  ```
-
-  #### Setup
-
-  React Router will generate types into a `.react-router/` directory at the root of your app.
-  This directory is fully managed by React Router and is derived based on your route config (`routes.ts`).
-
-  👉 **Add `.react-router/` to `.gitignore`**
-
-  ```txt
-  .react-router
-  ```
-
-  You should also ensure that generated types for routes are always present before running typechecking,
-  especially for running typechecking in CI.
-
-  👉 **Add `react-router typegen` to your `typecheck` command in `package.json`**
-
-  ```json
-  {
-    "scripts": {
-      "typecheck": "react-router typegen && tsc"
-    }
-  }
-  ```
-
-  To get TypeScript to use those generated types, you'll need to add them to `include` in `tsconfig.json`.
-  And to be able to import them as if they files next to your route modules, you'll also need to configure `rootDirs`.
-
-  👉 **Configure `tsconfig.json` for generated types**
-
-  ```json
-  {
-    "include": [".react-router/types/**/*"],
-    "compilerOptions": {
-      "rootDirs": [".", "./.react-router/types"]
-    }
-  }
-  ```
-
-  #### `typegen` command
-
-  You can manually generate types with the new `typegen` command:
-
-  ```sh
-  react-router typegen
-  ```
-
-  However, manual type generation is tedious and types can get out of sync quickly if you ever forget to run `typegen`.
-  Instead, we recommend that you setup our new TypeScript plugin which will automatically generate fresh types whenever routes change.
-  That way, you'll always have up-to-date types.
-
-  #### TypeScript plugin
-
-  To get automatic type generation, you can use our new TypeScript plugin.
-
-  👉 **Add the TypeScript plugin to `tsconfig.json`**
-
-  ```json
-  {
-    "compilerOptions": {
-      "plugins": [{ "name": "@react-router/dev" }]
-    }
-  }
-  ```
-
-  We plan to add some other goodies to our TypeScript plugin soon, including:
-
-  - Automatic `jsdoc` for route exports that include links to official docs
-  - Autocomplete for route exports
-  - Warnings for non-HMR compliant exports
-
-  ##### VSCode
-
-  TypeScript looks for plugins registered in `tsconfig.json` in the local `node_modules/`,
-  but VSCode ships with its own copy of TypeScript that is installed outside of your project.
-  For TypeScript plugins to work, you'll need to tell VSCode to use the local workspace version of TypeScript.
-  For security reasons, [VSCode won't use the workspace version of TypeScript](https://code.visualstudio.com/docs/typescript/typescript-compiling#_using-the-workspace-version-of-typescript) until you manually opt-in.
-
-  Your project should have a `.vscode/settings.json` with the following settings:
-
-  ```json
-  {
-    "typescript.tsdk": "node_modules/typescript/lib",
-    "typescript.enablePromptUseWorkspaceTsdk": true
-  }
-  ```
-
-  That way [VSCode will ask you](https://code.visualstudio.com/updates/v1_45#_prompt-users-to-switch-to-the-workspace-version-of-typescript) if you want to use the workspace version of TypeScript the first time you open a TS file in that project.
-
-  > [!IMPORTANT]
-  > You'll need to install dependencies first so that the workspace version of TypeScript is available.
-
-  👉 **Select "Allow" when VSCode asks if you want to use the workspace version of TypeScript**
-
-  Otherwise, you can also manually opt-in to the workspace version:
-
-  1. Open up any TypeScript file in your project
-  2. Open up the VSCode Command Palette (<kbd>Cmd</kbd>+<kbd>Shift</kbd>+<kbd>P</kbd>)
-  3. Search for `Select TypeScript Version`
-  4. Choose `Use Workspace Version`
-  5. Quit and reopen VSCode
-
-  ##### Troubleshooting
-
-  In VSCode, open up any TypeScript file in your project and then use <kbd>CMD</kbd>+<kbd>SHIFT</kbd>+<kbd>P</kbd> to select `Open TS Server log`.
-  There should be a log for `[react-router] setup` that indicates that the plugin was resolved correctly.
-  Then look for any errors in the log.
-
-### Patch Changes
-
-- include root "react-dom" module for optimization ([#12060](https://github.com/remix-run/react-router/pull/12060))
-- Updated dependencies:
-  - `react-router@7.0.0-pre.0`
-  - `@react-router/serve@7.0.0-pre.0`
-  - `@react-router/node@7.0.0-pre.0`
-
 ## 2.9.0
 
 ### Minor Changes

package/README.md

@@ -1,13 +1,7 @@
-# Welcome to Remix!
+# @react-router/dev
 
-[Remix](https://remix.run) is a web framework that helps you build better websites with React.
-
-To get started, open a new shell and run:
+Dev tools and CLI for [React Router.](https://github.com/remix-run/react-router)
 
 ```sh
-npx create-remix@latest
+npm install @react-router/dev
 ```
-
-Then follow the prompts you see in your terminal.
-
-For more information about Remix, [visit remix.run](https://remix.run)!

package/dist/cli/commands.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4b431ca46
+ * @react-router/dev v0.0.0-experimental-171f8688e
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/cli/detectPackageManager.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4b431ca46
+ * @react-router/dev v0.0.0-experimental-171f8688e
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/cli/index.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4b431ca46
+ * @react-router/dev v0.0.0-experimental-171f8688e
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/cli/run.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4b431ca46
+ * @react-router/dev v0.0.0-experimental-171f8688e
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -98,8 +98,9 @@ ${colors.logoBlue("react-router")}
 async function run(argv = process.argv.slice(2)) {
   // Check the node version
   let versions = process.versions;
-  if (versions && versions.node && semver__default["default"].major(versions.node) < 18) {
-    throw new Error(`️🚨 Oops, Node v${versions.node} detected. react-router requires a Node version greater than 18.`);
+  let MINIMUM_NODE_VERSION = 20;
+  if (versions && versions.node && semver__default["default"].major(versions.node) < MINIMUM_NODE_VERSION) {
+    throw new Error(`️🚨 Oops, Node v${versions.node} detected. react-router requires ` + `a Node version greater than ${MINIMUM_NODE_VERSION}.`);
   }
   let isBooleanFlag = arg => {
     let index = argv.indexOf(arg);

package/dist/cli/useJavascript.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4b431ca46
+ * @react-router/dev v0.0.0-experimental-171f8688e
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/colors.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4b431ca46
+ * @react-router/dev v0.0.0-experimental-171f8688e
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/config/format.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4b431ca46
+ * @react-router/dev v0.0.0-experimental-171f8688e
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/config/routes.d.ts

@@ -91,35 +91,39 @@ type CreateRouteOptions = Pick<RouteConfigEntry, (typeof createConfigRouteOption
  * Helper function for creating a route config entry, for use within
  * `routes.ts`.
  */
-declare function createRoute(path: string | null | undefined, file: string, children?: RouteConfigEntry[]): RouteConfigEntry;
-declare function createRoute(path: string | null | undefined, file: string, options: CreateRouteOptions, children?: RouteConfigEntry[]): RouteConfigEntry;
+declare function route(path: string | null | undefined, file: string, children?: RouteConfigEntry[]): RouteConfigEntry;
+declare function route(path: string | null | undefined, file: string, options: CreateRouteOptions, children?: RouteConfigEntry[]): RouteConfigEntry;
 declare const createIndexOptionKeys: ["id"];
 type CreateIndexOptions = Pick<RouteConfigEntry, (typeof createIndexOptionKeys)[number]>;
 /**
  * Helper function for creating a route config entry for an index route, for use
  * within `routes.ts`.
  */
-declare function createIndex(file: string, options?: CreateIndexOptions): RouteConfigEntry;
+declare function index(file: string, options?: CreateIndexOptions): RouteConfigEntry;
 declare const createLayoutOptionKeys: ["id"];
 type CreateLayoutOptions = Pick<RouteConfigEntry, (typeof createLayoutOptionKeys)[number]>;
 /**
  * Helper function for creating a route config entry for a layout route, for use
  * within `routes.ts`.
  */
-declare function createLayout(file: string, children?: RouteConfigEntry[]): RouteConfigEntry;
-declare function createLayout(file: string, options: CreateLayoutOptions, children?: RouteConfigEntry[]): RouteConfigEntry;
-export declare const route: typeof createRoute;
-export declare const index: typeof createIndex;
-export declare const layout: typeof createLayout;
+declare function layout(file: string, children?: RouteConfigEntry[]): RouteConfigEntry;
+declare function layout(file: string, options: CreateLayoutOptions, children?: RouteConfigEntry[]): RouteConfigEntry;
 /**
- * Creates a set of route config helpers that resolve file paths relative to the
- * given directory, for use within `routes.ts`. This is designed to support
- * splitting route config into multiple files within different directories.
+ * Helper function for adding a path prefix to a set of routes without needing
+ * to introduce a parent route file, for use within `routes.ts`.
  */
-export declare function relative(directory: string): {
+declare function prefix(prefixPath: string, routes: RouteConfigEntry[]): RouteConfigEntry[];
+declare const helpers: {
     route: typeof route;
     index: typeof index;
     layout: typeof layout;
+    prefix: typeof prefix;
 };
+export { route, index, layout, prefix };
+/**
+ * Creates a set of route config helpers that resolve file paths relative to the
+ * given directory, for use within `routes.ts`. This is designed to support
+ * splitting route config into multiple files within different directories.
+ */
+export declare function relative(directory: string): typeof helpers;
 export declare function configRoutesToRouteManifest(routes: RouteConfigEntry[], rootId?: string): RouteManifest;
-export {};

package/dist/config/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4b431ca46
+ * @react-router/dev v0.0.0-experimental-171f8688e
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -97,7 +97,7 @@ function validateRouteConfig({
   };
 }
 const createConfigRouteOptionKeys = ["id", "index", "caseSensitive"];
-function createRoute(path, file, optionsOrChildren, children) {
+function route(path, file, optionsOrChildren, children) {
   let options = {};
   if (Array.isArray(optionsOrChildren) || !optionsOrChildren) {
     children = optionsOrChildren;
@@ -116,7 +116,7 @@ const createIndexOptionKeys = ["id"];
  * Helper function for creating a route config entry for an index route, for use
  * within `routes.ts`.
  */
-function createIndex(file, options) {
+function index(file, options) {
   return {
     file,
     index: true,
@@ -124,7 +124,7 @@ function createIndex(file, options) {
   };
 }
 const createLayoutOptionKeys = ["id"];
-function createLayout(file, optionsOrChildren, children) {
+function layout(file, optionsOrChildren, children) {
   let options = {};
   if (Array.isArray(optionsOrChildren) || !optionsOrChildren) {
     children = optionsOrChildren;
@@ -137,9 +137,27 @@ function createLayout(file, optionsOrChildren, children) {
     ...pick__default["default"](options, createLayoutOptionKeys)
   };
 }
-const route = createRoute;
-const index = createIndex;
-const layout = createLayout;
+/**
+ * Helper function for adding a path prefix to a set of routes without needing
+ * to introduce a parent route file, for use within `routes.ts`.
+ */
+function prefix(prefixPath, routes) {
+  return routes.map(route => {
+    if (route.index || typeof route.path === "string") {
+      return {
+        ...route,
+        path: route.path ? joinRoutePaths(prefixPath, route.path) : prefixPath,
+        children: route.children
+      };
+    } else if (route.children) {
+      return {
+        ...route,
+        children: prefix(prefixPath, route.children)
+      };
+    }
+    return route;
+  });
+}
 /**
  * Creates a set of route config helpers that resolve file paths relative to the
  * given directory, for use within `routes.ts`. This is designed to support
@@ -173,7 +191,10 @@ function relative(directory) {
      */
     layout: (file, ...rest) => {
       return layout(path.resolve(directory, file), ...rest);
-    }
+    },
+    // Passthrough of helper functions that don't need relative scoping so that
+    // a complete API is still provided.
+    prefix
   };
 }
 function configRoutesToRouteManifest(routes, rootId = "root") {
@@ -212,11 +233,18 @@ function normalizeSlashes(file) {
 function stripFileExtension(file) {
   return file.replace(/\.[a-z0-9]+$/i, "");
 }
+function joinRoutePaths(path1, path2) {
+  return [path1.replace(/\/+$/, ""),
+  // Remove trailing slashes
+  path2.replace(/^\/+/, "") // Remove leading slashes
+  ].join("/");
+}
 
 exports.configRoutesToRouteManifest = configRoutesToRouteManifest;
 exports.getAppDirectory = getAppDirectory;
 exports.index = index;
 exports.layout = layout;
+exports.prefix = prefix;
 exports.relative = relative;
 exports.resolvedRouteConfigSchema = resolvedRouteConfigSchema;
 exports.route = route;

package/dist/invariant.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4b431ca46
+ * @react-router/dev v0.0.0-experimental-171f8688e
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -12,7 +12,7 @@
 
 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");
+    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);
   }
 }

package/dist/routes.d.ts

@@ -1,2 +1,2 @@
 export type { RouteConfig, RouteConfigEntry } from "./config/routes";
-export { route, index, layout, relative, getAppDirectory, } from "./config/routes";
+export { route, index, layout, prefix, relative, getAppDirectory, } from "./config/routes";

package/dist/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4b431ca46
+ * @react-router/dev v0.0.0-experimental-171f8688e
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -19,5 +19,6 @@ var routes = require('./config/routes.js');
 exports.getAppDirectory = routes.getAppDirectory;
 exports.index = routes.index;
 exports.layout = routes.layout;
+exports.prefix = routes.prefix;
 exports.relative = routes.relative;
 exports.route = routes.route;

package/dist/typescript/plugin.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4b431ca46
+ * @react-router/dev v0.0.0-experimental-171f8688e
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/typescript/typegen.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4b431ca46
+ * @react-router/dev v0.0.0-experimental-171f8688e
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -74,10 +74,10 @@ async function watch(rootDirectory) {
     }
     routesViteNodeContext.devServer.moduleGraph.invalidateAll();
     routesViteNodeContext.runner.moduleCache.clear();
-    const result = await routesViteNodeContext.runner.executeFile(routesTsPath);
+    const routeConfig = (await routesViteNodeContext.runner.executeFile(routesTsPath)).routes;
     return {
       ...routes$1,
-      ...routes.configRoutesToRouteManifest(result.routes)
+      ...routes.configRoutesToRouteManifest(await routeConfig)
     };
   }
   const ctx = {

package/dist/vite/babel.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4b431ca46
+ * @react-router/dev v0.0.0-experimental-171f8688e
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/build.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4b431ca46
+ * @react-router/dev v0.0.0-experimental-171f8688e
  *
  * Copyright (c) Remix Software Inc.
  *

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

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4b431ca46
+ * @react-router/dev v0.0.0-experimental-171f8688e
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/cloudflare.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4b431ca46
+ * @react-router/dev v0.0.0-experimental-171f8688e
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/combine-urls.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4b431ca46
+ * @react-router/dev v0.0.0-experimental-171f8688e
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/config.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4b431ca46
+ * @react-router/dev v0.0.0-experimental-171f8688e
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/dev.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4b431ca46
+ * @react-router/dev v0.0.0-experimental-171f8688e
  *
  * Copyright (c) Remix Software Inc.
  *

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

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4b431ca46
+ * @react-router/dev v0.0.0-experimental-171f8688e
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/node-adapter.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4b431ca46
+ * @react-router/dev v0.0.0-experimental-171f8688e
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -41,12 +41,20 @@ function fromNodeRequest(nodeReq, nodeRes) {
   let url = new URL(nodeReq.originalUrl, origin);
   // Abort action/loaders once we can no longer write a response
   let controller = new AbortController();
-  nodeRes.on("close", () => controller.abort());
   let init = {
     method: nodeReq.method,
     headers: fromNodeHeaders(nodeReq.headers),
     signal: controller.signal
   };
+  // Abort action/loaders once we can no longer write a response iff we have
+  // not yet sent a response (i.e., `close` without `finish`)
+  // `finish` -> done rendering the response
+  // `close` -> response can no longer be written to
+  nodeRes.on("finish", () => controller = null);
+  nodeRes.on("close", () => {
+    var _controller;
+    return (_controller = controller) === null || _controller === void 0 ? void 0 : _controller.abort();
+  });
   if (nodeReq.method !== "GET" && nodeReq.method !== "HEAD") {
     init.body = node.createReadableStreamFromReadable(nodeReq);
     init.duplex = "half";

package/dist/vite/plugin.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4b431ca46
+ * @react-router/dev v0.0.0-experimental-171f8688e
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -1155,20 +1155,28 @@ async function handlePrerender(viteConfig, reactRouterConfig, serverBuildDirecto
   } else {
     routesToPrerender = reactRouterConfig.prerender || ["/"];
   }
-  let requestInit = {
-    headers: {
-      // Header that can be used in the loader to know if you're running at
-      // build time or runtime
-      "X-React-Router-Prerender": "yes"
-    }
+  let headers = {
+    // Header that can be used in the loader to know if you're running at
+    // build time or runtime
+    "X-React-Router-Prerender": "yes"
   };
   for (let path of routesToPrerender) {
     var _matchRoutes;
     let hasLoaders = (_matchRoutes = reactRouter.matchRoutes(routes, path)) === null || _matchRoutes === void 0 ? void 0 : _matchRoutes.some(m => m.route.loader);
+    let data;
     if (hasLoaders) {
-      await prerenderData(handler, path, clientBuildDirectory, reactRouterConfig, viteConfig, requestInit);
+      data = await prerenderData(handler, path, clientBuildDirectory, reactRouterConfig, viteConfig, {
+        headers
+      });
     }
-    await prerenderRoute(handler, path, clientBuildDirectory, reactRouterConfig, viteConfig, requestInit);
+    await prerenderRoute(handler, path, clientBuildDirectory, reactRouterConfig, viteConfig, data ? {
+      headers: {
+        ...headers,
+        "X-React-Router-Prerender-Data": data
+      }
+    } : {
+      headers
+    });
   }
   await prerenderManifest(build, clientBuildDirectory, reactRouterConfig, viteConfig);
 }
@@ -1194,8 +1202,8 @@ function determineStaticPrerenderRoutes(routes, viteConfig, isBooleanUsage = fal
     }
   }
   recurse(routes);
-  if (isBooleanUsage && paramRoutes) {
-    viteConfig.logger.warn("The following paths were not prerendered because Dynamic Param and Splat " + "routes cannot be prerendered when using `prerender:true`. You may want to " + "consider using the `prerender()` API if you wish to prerender slug and " + "splat routes.");
+  if (isBooleanUsage && paramRoutes.length > 0) {
+    viteConfig.logger.warn(["⚠️ Paths with dynamic/splat params cannot be prerendered when using `prerender: true`.", "You may want to use the `prerender()` API to prerender the following paths:", ...paramRoutes.map(p => "  - " + p)].join("\n"));
   }
   // Clean double slashes and remove trailing slashes
   return paths.map(p => p.replace(/\/\/+/g, "/").replace(/(.+)\/$/, "$1"));
@@ -1212,6 +1220,7 @@ async function prerenderData(handler, prerenderPath, clientBuildDirectory, react
   await fse__namespace.ensureDir(path__namespace.dirname(outfile));
   await fse__namespace.outputFile(outfile, data);
   viteConfig.logger.info(`Prerender: Generated ${colors__default["default"].bold(outfile)}`);
+  return data;
 }
 async function prerenderRoute(handler, prerenderPath, clientBuildDirectory, reactRouterConfig, viteConfig, requestInit) {
   let normalizedPath = `${reactRouterConfig.basename}${prerenderPath}/`.replace(/\/\/+/g, "/");
@@ -1252,11 +1261,13 @@ function validatePrerenderedHtml(html, prefix) {
 function groupRoutesByParentId(manifest) {
   let routes = {};
   Object.values(manifest).forEach(route => {
-    let parentId = route.parentId || "";
-    if (!routes[parentId]) {
-      routes[parentId] = [];
+    if (route) {
+      let parentId = route.parentId || "";
+      if (!routes[parentId]) {
+        routes[parentId] = [];
+      }
+      routes[parentId].push(route);
     }
-    routes[parentId].push(route);
   });
   return routes;
 }

package/dist/vite/profiler.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4b431ca46
+ * @react-router/dev v0.0.0-experimental-171f8688e
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/remove-exports.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4b431ca46
+ * @react-router/dev v0.0.0-experimental-171f8688e
  *
  * Copyright (c) Remix Software Inc.
  *

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

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4b431ca46
+ * @react-router/dev v0.0.0-experimental-171f8688e
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/static/refresh-utils.cjs

@@ -49,21 +49,21 @@ const enqueueUpdate = debounce(async () => {
         .map((route) => route.id)
     );
 
-    let routes = __reactRouterInstance.createRoutesForHMR(
+    let routes = __reactRouterDataRouter.createRoutesForHMR(
       needsRevalidation,
       manifest.routes,
       window.__reactRouterRouteModules,
       window.__reactRouterContext.future,
       window.__reactRouterContext.isSpaMode
     );
-    __reactRouterInstance._internalSetRoutes(routes);
+    __reactRouterDataRouter._internalSetRoutes(routes);
     routeUpdates.clear();
     window.__reactRouterRouteModuleUpdates.clear();
   }
 
   try {
     window.__reactRouterHdrActive = true;
-    await __reactRouterInstance.revalidate();
+    await __reactRouterDataRouter.revalidate();
   } finally {
     window.__reactRouterHdrActive = false;
   }

package/dist/vite/styles.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4b431ca46
+ * @react-router/dev v0.0.0-experimental-171f8688e
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -147,11 +147,13 @@ const findDeps = async (vite, node, deps) => {
 const groupRoutesByParentId = manifest => {
   let routes = {};
   Object.values(manifest).forEach(route => {
-    let parentId = route.parentId || "";
-    if (!routes[parentId]) {
-      routes[parentId] = [];
+    if (route) {
+      let parentId = route.parentId || "";
+      if (!routes[parentId]) {
+        routes[parentId] = [];
+      }
+      routes[parentId].push(route);
     }
-    routes[parentId].push(route);
   });
   return routes;
 };

package/dist/vite/vite-node.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4b431ca46
+ * @react-router/dev v0.0.0-experimental-171f8688e
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/vmod.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4b431ca46
+ * @react-router/dev v0.0.0-experimental-171f8688e
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/with-props.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4b431ca46
+ * @react-router/dev v0.0.0-experimental-171f8688e
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-4b431ca46
+ * @react-router/dev v0.0.0-experimental-171f8688e
  *
  * Copyright (c) Remix Software Inc.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/dev",
-  "version": "0.0.0-experimental-4b431ca46",
+  "version": "0.0.0-experimental-171f8688e",
   "description": "Dev tools and CLI for React Router",
   "homepage": "https://reactrouter.com",
   "bugs": {
@@ -61,7 +61,7 @@
     "set-cookie-parser": "^2.6.0",
     "valibot": "^0.41.0",
     "vite-node": "^1.6.0",
-    "@react-router/node": "0.0.0-experimental-4b431ca46"
+    "@react-router/node": "0.0.0-experimental-171f8688e"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -87,15 +87,15 @@
     "tiny-invariant": "^1.2.0",
     "vite": "^5.1.0",
     "wrangler": "^3.28.2",
-    "react-router": "^0.0.0-experimental-4b431ca46",
-    "@react-router/serve": "0.0.0-experimental-4b431ca46"
+    "@react-router/serve": "0.0.0-experimental-171f8688e",
+    "react-router": "^0.0.0-experimental-171f8688e"
   },
   "peerDependencies": {
     "typescript": "^5.1.0",
     "vite": "^5.1.0",
     "wrangler": "^3.28.2",
-    "@react-router/serve": "^0.0.0-experimental-4b431ca46",
-    "react-router": "^0.0.0-experimental-4b431ca46"
+    "react-router": "^0.0.0-experimental-171f8688e",
+    "@react-router/serve": "^0.0.0-experimental-171f8688e"
   },
   "peerDependenciesMeta": {
     "@react-router/serve": {
@@ -109,7 +109,7 @@
     }
   },
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=20.0.0"
   },
   "files": [
     "dist/",