Skip to content

Commit c3d0225

Browse files
committed
Merge branch 'dev' into markdalgleish/handle-new-config-file
2 parents df8d61c + 4037e51 commit c3d0225

File tree

294 files changed

+26885
-4303
lines changed

Some content is hidden

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

294 files changed

+26885
-4303
lines changed

.changeset/afraid-games-rush.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 `react-router` module augmentation for `NodeNext`

.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/curvy-queens-hug.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 hydration error if a server `loader` returned `undefined`

.changeset/dirty-balloons-stare.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"@react-router/dev": patch
3+
---
4+
5+
In a `routes.ts` context, ensure the `--mode` flag is respected for `import.meta.env.MODE`
6+
7+
Previously, `import.meta.env.MODE` within a `routes.ts` context was always `"development"` for the `dev` and `typegen --watch` commands, but otherwise resolved to `"production"`. These defaults are still in place, but if a `--mode` flag is provided, this will now take precedence.

.changeset/dull-hotels-battle.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/eleven-oranges-cheat.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.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/little-cups-deliver.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 executing `react-router.config.ts` and `routes.ts` with `vite-node`, ensure that PostCSS config files are ignored

0 commit comments

Comments
 (0)