Skip to content

Commit f741f2c

Browse files
committed
Merge branch 'dev' into markdalgleish/routes-mode
2 parents 56da4a8 + 7afd95f commit f741f2c

Some content is hidden

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

68 files changed

+1450
-15737
lines changed

.changeset/angry-students-pay.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
---
2+
"@react-router/dev": minor
3+
"react-router": minor
4+
---
5+
6+
Added a new `react-router.config.ts` `routeDiscovery` option to configure Lazy Route Discovery behavior.
7+
8+
- By default, Lazy Route Discovery is enabled and makes manifest requests to the `/__manifest` path:
9+
- `routeDiscovery: { mode: "lazy", manifestPath: "/__manifest" }`
10+
- You can modify the manifest path used:
11+
- `routeDiscovery: { mode: "lazy", manifestPath: "/custom-manifest" }`
12+
- Or you can disable this feature entirely and include all routes in the manifest on initial document load:
13+
- `routeDiscovery: { mode: "initial" }`

.changeset/bright-experts-grab.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+
Support project root directories without a `package.json` if it exists in a parent directory

.changeset/cold-seals-count.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+
When providing a custom Vite config path via the CLI `--config`/`-c` flag, default the project root directory to the directory containing the Vite config when not explicitly provided

.changeset/forty-ants-teach.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+
Ensure consistent project root directory resolution logic in CLI commands

.changeset/pink-candles-allow.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+
Fix `handleError` `params` values on `.data` requests for routes with a dynamic param as the last URL segment

.changeset/silly-ligers-dress.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+
Don't trigger an `ErrorBoundary` UI before the reload when we detect a manifest verison mismatch in Lazy Route Discovery

0 commit comments

Comments
 (0)