@react-router/dev 0.0.0-experimental-b98209dd9 → 0.0.0-experimental-6844c5934

package/CHANGELOG.md

@@ -1,4 +1,200 @@
-# `@remix-run/dev`
+# `@react-router/dev`
+
+## 7.1.1
+
+### Patch Changes
+
+- Fix for a crash when optional args are passed to the CLI ([`5b1ca202f`](https://github.com/remix-run/react-router/commit/5b1ca202f77ef342db0109c6b791d33188077cd0))
+- Updated dependencies:
+  - `react-router@7.1.1`
+  - `@react-router/node@7.1.1`
+  - `@react-router/serve@7.1.1`
+
+## 7.1.0
+
+### Minor Changes
+
+- Add support for Vite v6 ([#12469](https://github.com/remix-run/react-router/pull/12469))
+
+### Patch Changes
+
+- Properly initialize `NODE_ENV` if not already set for compatibility with React 19 ([#12578](https://github.com/remix-run/react-router/pull/12578))
+
+- Remove the leftover/unused `abortDelay` prop from `ServerRouter` and update the default `entry.server.tsx` to use the new `streamTimeout` value for Single Fetch ([#12478](https://github.com/remix-run/react-router/pull/12478))
+
+  - The `abortDelay` functionality was removed in v7 as it was coupled to the `defer` implementation from Remix v2, but this removal of this prop was missed
+  - If you were still using this prop in your `entry.server` file, it's likely your app is not aborting streams as you would expect and you will need to adopt the new [`streamTimeout`](https://reactrouter.com/explanation/special-files#streamtimeout) value introduced with Single Fetch
+
+- Updated dependencies:
+  - `react-router@7.1.0`
+  - `@react-router/node@7.1.0`
+  - `@react-router/serve@7.1.0`
+
+## 7.0.2
+
+### Patch Changes
+
+- Support `moduleResolution` `Node16` and `NodeNext` ([#12440](https://github.com/remix-run/react-router/pull/12440))
+
+- Generate wide `matches` and `params` types for current route and child routes ([#12397](https://github.com/remix-run/react-router/pull/12397))
+
+  At runtime, `matches` includes child route matches and `params` include child route path parameters.
+  But previously, we only generated types for parent routes in `matches`; for `params`, we only considered the parent routes and the current route.
+  To align our generated types more closely to the runtime behavior, we now generate more permissive, wider types when accessing child route information.
+
+- Updated dependencies:
+  - `react-router@7.0.2`
+  - `@react-router/node@7.0.2`
+  - `@react-router/serve@7.0.2`
+
+## 7.0.1
+
+### Patch Changes
+
+- Pass route error to ErrorBoundary as a prop ([#12338](https://github.com/remix-run/react-router/pull/12338))
+- 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/bin.js

@@ -1,2 +1,15 @@
 #!/usr/bin/env node
+let arg = require("arg");
+
+// Minimal replication of our actual parsing in `run.ts`.  If not already set,
+// default `NODE_ENV` so React loads the proper version in it's CJS entry script.
+// We have to do this before importing `run.ts` since that is what imports
+// `react` (indirectly via `react-router`)
+let args = arg({}, { argv: process.argv.slice(2), stopAtPositional: true });
+if (args._[0] === "dev") {
+  process.env.NODE_ENV = process.env.NODE_ENV ?? "development";
+} else {
+  process.env.NODE_ENV = process.env.NODE_ENV ?? "production";
+}
+
 require("./dist/cli/index");

package/dist/cli/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * @react-router/dev v0.0.0-experimental-b98209dd9
+ * @react-router/dev v0.0.0-experimental-6844c5934
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -100,11 +100,11 @@ async function createContext(viteConfig = {}) {
   const runner = new import_client.ViteNodeRunner({
     root: devServer.config.root,
     base: devServer.config.base,
-    fetchModule(id2) {
-      return server.fetchModule(id2);
+    fetchModule(id) {
+      return server.fetchModule(id);
     },
-    resolveId(id2, importer) {
-      return server.resolveId(id2, importer);
+    resolveId(id, importer) {
+      return server.resolveId(id, importer);
     }
   });
   return { devServer, server, runner };
@@ -160,24 +160,24 @@ ${message}`
 function configRoutesToRouteManifest(appDirectory, routes2, rootId = "root") {
   let routeManifest = {};
   function walk(route, parentId) {
-    let id2 = route.id || createRouteId(route.file);
+    let id = route.id || createRouteId(route.file);
     let manifestItem = {
-      id: id2,
+      id,
       parentId,
       file: Path.isAbsolute(route.file) ? Path.relative(appDirectory, route.file) : route.file,
       path: route.path,
       index: route.index,
       caseSensitive: route.caseSensitive
     };
-    if (routeManifest.hasOwnProperty(id2)) {
+    if (routeManifest.hasOwnProperty(id)) {
       throw new Error(
-        `Unable to define routes with duplicate route id: "${id2}"`
+        `Unable to define routes with duplicate route id: "${id}"`
       );
     }
-    routeManifest[id2] = manifestItem;
+    routeManifest[id] = manifestItem;
     if (route.children) {
       for (let child of route.children) {
-        walk(child, id2);
+        walk(child, id);
       }
     }
   }
@@ -600,7 +600,7 @@ function generate(ctx, route) {
     const indent = i === 0 ? "" : "  ".repeat(2);
     let source = noExtension(rel);
     if (!source.startsWith("../")) source = "./" + source;
-    return `${indent}import type { Info as Parent${i} } from "${source}"`;
+    return `${indent}import type { Info as Parent${i} } from "${source}.js"`;
   }).join("\n");
   return import_dedent.default`
     // React Router generated types for route:
@@ -610,14 +610,16 @@ function generate(ctx, route) {
 
     ${parentTypeImports}
 
-    type Module = typeof import("../${Pathe2.filename(route.file)}")
+    type Module = typeof import("../${Pathe2.filename(route.file)}.js")
 
     export type Info = {
       parents: [${parents.map((_, i) => `Parent${i}`).join(", ")}],
       id: "${route.id}"
       file: "${route.file}"
       path: "${route.path}"
-      params: {${formatParamProperties(urlpath)}}
+      params: {${formatParamProperties(
+    urlpath
+  )}} & { [key: string]: string | undefined }
       module: Module
       loaderData: T.CreateLoaderData<Module>
       actionData: T.CreateActionData<Module>
@@ -806,17 +808,24 @@ var init_styles = __esm({
     path3 = __toESM(require("path"));
     import_react_router = require("react-router");
     init_resolve_file_url();
+    init_import_vite_esm_sync();
     cssFileRegExp = /\.(css|less|sass|scss|styl|stylus|pcss|postcss|sss)(?:$|\?)/;
     cssModulesRegExp = new RegExp(`\\.module${cssFileRegExp.source}`);
   }
 });
 
-// vite/vmod.ts
-var id;
-var init_vmod = __esm({
-  "vite/vmod.ts"() {
+// vite/virtual-module.ts
+function create(name) {
+  let id = `virtual:react-router/${name}`;
+  return {
+    id,
+    resolvedId: `\0${id}`,
+    url: `/@id/__x00__${id}`
+  };
+}
+var init_virtual_module = __esm({
+  "vite/virtual-module.ts"() {
     "use strict";
-    id = (name) => `virtual:react-router/${name}`;
   }
 });
 
@@ -838,14 +847,14 @@ var init_remove_exports = __esm({
 });
 
 // vite/with-props.ts
-var import_dedent2, vmodId;
+var import_dedent2, vmod;
 var init_with_props = __esm({
   "vite/with-props.ts"() {
     "use strict";
     import_dedent2 = __toESM(require("dedent"));
     init_babel();
-    init_vmod();
-    vmodId = id("with-props");
+    init_virtual_module();
+    vmod = create("with-props");
   }
 });
 
@@ -910,7 +919,7 @@ function findConfig(dir, basename2, extensions) {
   }
   return void 0;
 }
-var import_node_crypto, path4, url, fse, babel, import_react_router2, import_es_module_lexer, import_jsesc, import_picocolors3, serverBuildId, serverManifestId, browserManifestId, hmrRuntimeId, injectHmrRuntimeId, getServerBuildDirectory, defaultEntriesDir, defaultEntries, REACT_REFRESH_HEADER, REACT_REFRESH_FOOTER;
+var import_node_crypto, path4, url, fse, babel, import_react_router2, import_es_module_lexer, import_jsesc, import_picocolors3, virtualHmrRuntime, virtualInjectHmrRuntime, virtual, getServerBuildDirectory, defaultEntriesDir, defaultEntries, REACT_REFRESH_HEADER, REACT_REFRESH_FOOTER;
 var init_plugin = __esm({
   "vite/plugin.ts"() {
     "use strict";
@@ -928,18 +937,20 @@ var init_plugin = __esm({
     init_babel();
     init_node_adapter();
     init_styles();
-    init_vmod();
+    init_virtual_module();
     init_resolve_file_url();
     init_combine_urls();
     init_remove_exports();
     init_import_vite_esm_sync();
     init_config();
     init_with_props();
-    serverBuildId = id("server-build");
-    serverManifestId = id("server-manifest");
-    browserManifestId = id("browser-manifest");
-    hmrRuntimeId = id("hmr-runtime");
-    injectHmrRuntimeId = id("inject-hmr-runtime");
+    virtualHmrRuntime = create("hmr-runtime");
+    virtualInjectHmrRuntime = create("inject-hmr-runtime");
+    virtual = {
+      serverBuild: create("server-build"),
+      serverManifest: create("server-manifest"),
+      browserManifest: create("browser-manifest")
+    };
     getServerBuildDirectory = (ctx) => path4.join(
       ctx.reactRouterConfig.buildDirectory,
       "server",
@@ -954,7 +965,7 @@ var init_plugin = __esm({
     defaultEntries = fse.readdirSync(defaultEntriesDir).map((filename3) => path4.join(defaultEntriesDir, filename3));
     invariant(defaultEntries.length > 0, "No default entries found");
     REACT_REFRESH_HEADER = `
-import RefreshRuntime from "${hmrRuntimeId}";
+import RefreshRuntime from "${virtualHmrRuntime.id}";
 
 const inWebWorker = typeof WorkerGlobalScope !== 'undefined' && self instanceof WorkerGlobalScope;
 let prevRefreshReg;
@@ -1037,8 +1048,8 @@ __export(build_exports, {
 });
 function getAddressableRoutes(routes2) {
   let nonAddressableIds = /* @__PURE__ */ new Set();
-  for (let id2 in routes2) {
-    let route = routes2[id2];
+  for (let id in routes2) {
+    let route = routes2[id];
     if (route.index) {
       invariant(
         route.parentId,
@@ -1047,7 +1058,7 @@ function getAddressableRoutes(routes2) {
       nonAddressableIds.add(route.parentId);
     }
     if (typeof route.path !== "string" && !route.index) {
-      nonAddressableIds.add(id2);
+      nonAddressableIds.add(id);
     }
   }
   return Object.values(routes2).filter(
@@ -1078,12 +1089,12 @@ async function getServerBuilds(ctx) {
   let { normalizePath } = await import("vite");
   let resolvedAppDirectory = import_node_path2.default.resolve(rootDirectory, appDirectory);
   let rootRelativeRoutes = Object.fromEntries(
-    Object.entries(routes2).map(([id2, route]) => {
+    Object.entries(routes2).map(([id, route]) => {
       let filePath = import_node_path2.default.join(resolvedAppDirectory, route.file);
       let rootRelativeFilePath = normalizePath(
         import_node_path2.default.relative(rootDirectory, filePath)
       );
-      return [id2, { ...route, file: rootRelativeFilePath }];
+      return [id, { ...route, file: rootRelativeFilePath }];
     })
   );
   let buildManifest = {

package/dist/config/defaults/entry.server.node.tsx

@@ -7,7 +7,7 @@ import { isbot } from "isbot";
 import type { RenderToPipeableStreamOptions } from "react-dom/server";
 import { renderToPipeableStream } from "react-dom/server";
 
-const ABORT_DELAY = 5_000;
+export const streamTimeout = 5_000;
 
 export default function handleRequest(
   request: Request,
@@ -28,11 +28,7 @@ export default function handleRequest(
         : "onShellReady";
 
     const { pipe, abort } = renderToPipeableStream(
-      <ServerRouter
-        context={routerContext}
-        url={request.url}
-        abortDelay={ABORT_DELAY}
-      />,
+      <ServerRouter context={routerContext} url={request.url} />,
       {
         [readyOption]() {
           shellRendered = true;
@@ -65,6 +61,8 @@ export default function handleRequest(
       }
     );
 
-    setTimeout(abort, ABORT_DELAY);
+    // Abort the rendering stream after the `streamTimeout` so it has tine to
+    // flush down the rejected boundaries
+    setTimeout(abort, streamTimeout + 1000);
   });
 }

package/dist/config.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-b98209dd9
+ * @react-router/dev v0.0.0-experimental-6844c5934
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-b98209dd9
+ * @react-router/dev v0.0.0-experimental-6844c5934
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/cloudflare.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-b98209dd9
+ * @react-router/dev v0.0.0-experimental-6844c5934
  *
  * Copyright (c) Remix Software Inc.
  *