Merge branch 'dev' into release-next

.changeset/little-cooks-pull.md

@@ -2,4 +2,4 @@
 "react-router": patch
 ---
 
-Fix typegen for routes with a client loader but no server loader
+[PRERELEASE] Fix typegen for routes with a client loader but no server loader

.changeset/long-peas-doubt.md

@@ -0,0 +1,15 @@
+---
+"react-router": major
+---
+
+Migrate Remix type generics to React Router
+
+- These generics are provided for Remix v2 migration purposes
+- These generics and the APIs they exist on should be considered informally deprecated in favor of the new `Route.*` types
+- Anyone migrating from React Router v6 should probably not leverage these new generics and should migrate straight to the `Route.*` types
+- For React Router v6 users, these generics are new and should not impact your app, with one exception
+  - `useFetcher` previously had an optional generic (used primarily by Remix v2) that expected the data type
+  - This has been updated in v7 to expect the type of the function that generates the data (i.e., `typeof loader`/`typeof action`)
+  - Therefore, you should update your usages:
+    - ❌ `useFetcher<LoaderData>()`
+    - ✅ `useFetcher<typeof loader>()`

.changeset/rare-plums-chew.md

@@ -4,5 +4,5 @@
 "react-router": patch
 ---
 
-- Fix `react-router-serve` handling of prerendered HTML files by removing the `redirect: false` option so it now falls back on the default `redirect: true` behavior of redirecting from `/folder` -> `/folder/` which will then pick up `/folder/index.html` from disk. See https://expressjs.com/en/resources/middleware/serve-static.html
-- Proxy prerendered loader data into prerender pass for HTML files to avoid double-invocations of the loader at build time
+- [PRERELEASE] Fix `react-router-serve` handling of prerendered HTML files by removing the `redirect: false` option so it now falls back on the default `redirect: true` behavior of redirecting from `/folder` -> `/folder/` which will then pick up `/folder/index.html` from disk. See https://expressjs.com/en/resources/middleware/serve-static.html
+- [PRERELEASE] Proxy prerendered loader data into prerender pass for HTML files to avoid double-invocations of the loader at build time

.changeset/silver-cats-shave.md

@@ -0,0 +1,5 @@
+---
+"react-router": patch
+---
+
+Replace `substr` with `substring`

.changeset/sour-cycles-lie.md

@@ -0,0 +1,11 @@
+---
+"@react-router/dev": major
+"react-router": major
+---
+
+- Consolidate types previously duplicated across `@remix-run/router`, `@remix-run/server-runtime`, and `@remix-run/react` now that they all live in `react-router`
+  - 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

.changeset/strange-jeans-give.md

@@ -0,0 +1,7 @@
+---
+"react-router": patch
+---
+
+Remove the deprecated `json` utility
+
+- You can use [`Response.json`](https://developer.mozilla.org/en-US/docs/Web/API/Response/json_static) if you still need to construct JSON responses in your app

.changeset/tidy-pens-help.md

@@ -0,0 +1,10 @@
+---
+"@react-router/express": major
+"@react-router/node": major
+"@react-router/dev": major
+"react-router": major
+---
+
+Drop support for Node 18, update minimum Node vestion to 20
+
+- Remove `installGlobals()` as this should no longer be necessary

.changeset/wet-actors-act.md

@@ -0,0 +1,5 @@
+---
+"react-router": major
+---
+
+Update `cookie` dependency to `^1.0.1` - please see the [release notes](https://github.com/jshttp/cookie/releases) for any breaking changes

.github/workflows/integration-full.yml

@@ -34,7 +34,7 @@ jobs:
     uses: ./.github/workflows/shared-integration.yml
     with:
       os: "ubuntu-latest"
-      node_version: "[18, 20]"
+      node_version: "[20, 22]"
       browser: '["chromium", "firefox"]'
 
   integration-windows:
@@ -43,7 +43,7 @@ jobs:
     uses: ./.github/workflows/shared-integration.yml
     with:
       os: "windows-latest"
-      node_version: "[18, 20]"
+      node_version: "[20, 22]"
       browser: '["msedge"]'
 
   integration-macos:
@@ -52,5 +52,5 @@ jobs:
     uses: ./.github/workflows/shared-integration.yml
     with:
       os: "macos-latest"
-      node_version: "[18, 20]"
+      node_version: "[20, 22]"
       browser: '["webkit"]'

.github/workflows/integration-pr-ubuntu.yml

@@ -31,5 +31,5 @@ jobs:
     uses: ./.github/workflows/shared-integration.yml
     with:
       os: "ubuntu-latest"
-      node_version: "[20]"
+      node_version: "[22]"
       browser: '["chromium"]'

.github/workflows/integration-pr-windows-macos.yml

@@ -21,7 +21,7 @@ jobs:
     uses: ./.github/workflows/shared-integration.yml
     with:
       os: "ubuntu-latest"
-      node_version: "[20]"
+      node_version: "[22]"
       browser: '["firefox"]'
 
   integration-msedge:
@@ -30,7 +30,7 @@ jobs:
     uses: ./.github/workflows/shared-integration.yml
     with:
       os: "windows-latest"
-      node_version: "[20]"
+      node_version: "[22]"
       browser: '["msedge"]'
 
   integration-webkit:
@@ -39,5 +39,5 @@ jobs:
     uses: ./.github/workflows/shared-integration.yml
     with:
       os: "macos-latest"
-      node_version: "[20]"
+      node_version: "[22]"
       browser: '["webkit"]'

.github/workflows/shared-integration.yml

@@ -9,7 +9,7 @@ on:
       node_version:
         required: true
         # this is limited to string | boolean | number (https://github.community/t/can-action-inputs-be-arrays/16457)
-        # but we want to pass an array (node_version: "[18, 20]"),
+        # but we want to pass an array (node_version: "[20, 22]"),
         # so we'll need to manually stringify it for now
         type: string
       browser:

.github/workflows/test.yml

@@ -26,8 +26,8 @@ jobs:
       fail-fast: false
       matrix:
         node:
-          - 18
           - 20
+          - 22
 
     runs-on: ubuntu-latest