Skip to content

Commit bf71c19

Browse files
committed
Merge branch 'dev' into markdalgleish/route-chunks
2 parents 2012d2f + b53855b commit bf71c19

File tree

315 files changed

+11820
-5780
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

315 files changed

+11820
-5780
lines changed

.changeset/eighty-dolls-juggle.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@react-router/dev": patch
3+
---
4+
5+
Enable prerendering for resource routes
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"react-router": patch
3+
---
4+
5+
[REMOVE] Changeset to bump pre.4 release

.changeset/little-cooks-pull.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"react-router": patch
3+
---
4+
5+
[PRERELEASE] Fix typegen for routes with a client loader but no server loader

.changeset/long-peas-doubt.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---
2+
"react-router": major
3+
---
4+
5+
Migrate Remix type generics to React Router
6+
7+
- These generics are provided for Remix v2 migration purposes
8+
- These generics and the APIs they exist on should be considered informally deprecated in favor of the new `Route.*` types
9+
- Anyone migrating from React Router v6 should probably not leverage these new generics and should migrate straight to the `Route.*` types
10+
- For React Router v6 users, these generics are new and should not impact your app, with one exception
11+
- `useFetcher` previously had an optional generic (used primarily by Remix v2) that expected the data type
12+
- This has been updated in v7 to expect the type of the function that generates the data (i.e., `typeof loader`/`typeof action`)
13+
- Therefore, you should update your usages:
14+
-`useFetcher<LoaderData>()`
15+
-`useFetcher<typeof loader>()`

.changeset/rare-plums-chew.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
"@react-router/serve": patch
3+
"@react-router/dev": patch
4+
"react-router": patch
5+
---
6+
7+
- [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
8+
- [PRERELEASE] Proxy prerendered loader data into prerender pass for HTML files to avoid double-invocations of the loader at build time

.changeset/serious-beds-approve.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@react-router/dev": patch
3+
---
4+
5+
resolve config directory relative to flat output file structure

.changeset/silver-cats-shave.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"react-router": patch
3+
---
4+
5+
Replace `substr` with `substring`

.changeset/sour-cycles-lie.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
"@react-router/dev": major
3+
"react-router": major
4+
---
5+
6+
- Consolidate types previously duplicated across `@remix-run/router`, `@remix-run/server-runtime`, and `@remix-run/react` now that they all live in `react-router`
7+
- Examples: `LoaderFunction`, `LoaderFunctionArgs`, `ActionFunction`, `ActionFunctionArgs`, `DataFunctionArgs`, `RouteManifest`, `LinksFunction`, `Route`, `EntryRoute`
8+
- The `RouteManifest` type used by the "remix" code is now slightly stricter because it is using the former `@remix-run/router` `RouteManifest`
9+
- `Record<string, Route> -> Record<string, Route | undefined>`
10+
- Removed `AppData` type in favor of inlining `unknown` in the few locations it was used
11+
- Removed `ServerRuntimeMeta*` types in favor of the `Meta*` types they were duplicated from

.changeset/strange-jeans-give.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"react-router": patch
3+
---
4+
5+
Remove the deprecated `json` utility
6+
7+
- 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/three-seals-play.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@react-router/dev": minor
3+
---
4+
5+
Add `prefix` route config helper to `@react-router/dev/routes`

0 commit comments

Comments
 (0)