Skip to content

Commit 06d6077

Browse files
committed
Merge branch 'dev' into brophdawg11/data-strategy-matches-take-2
2 parents b608685 + c63b509 commit 06d6077

File tree

222 files changed

+22779
-2345
lines changed

Some content is hidden

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

222 files changed

+22779
-2345
lines changed

.changeset/happy-spoons-watch.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
---
2+
"react-router": patch
3+
---
4+
5+
When using the object-based `route.lazy` API, the `HydrateFallback` and `hydrateFallbackElement` properties are now skipped when lazy loading routes after hydration.
6+
7+
If you move the code for these properties into a separate file, you can use this optimization to avoid downloading unused hydration code. For example:
8+
9+
```ts
10+
createBrowserRouter([
11+
{
12+
path: "/show/:showId",
13+
lazy: {
14+
loader: async () => (await import("./show.loader.js")).loader,
15+
Component: async () => (await import("./show.component.js")).Component,
16+
HydrateFallback: async () =>
17+
(await import("./show.hydrate-fallback.js")).HydrateFallback,
18+
},
19+
},
20+
]);
21+
```

.changeset/orange-sloths-tease.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+
Properly revalidate prerendered paths when param values change

.changeset/silver-peas-shop.md

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

.changeset/sixty-tigers-poke.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+
UNSTABLE: Add better error messaging when `getLoadContext` is not updated to return a `Map`"

.changeset/smart-ligers-lay.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"@react-router/dev": patch
3+
"react-router": patch
4+
---
5+
6+
Fix prerendering when a loader returns a redirect

.github/workflows/shared-build.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ jobs:
2222
node-version-file: ".nvmrc"
2323
cache: "pnpm"
2424

25-
- uses: google/wireit@setup-github-actions-caching/v2
25+
# TODO: Track and renable once this has been fixed: https://github.com/google/wireit/issues/1297
26+
# - uses: google/wireit@setup-github-actions-caching/v2
2627

2728
- name: Disable GitHub Actions Annotations
2829
run: |

.github/workflows/shared-integration.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ jobs:
4545
node-version: ${{ matrix.node }}
4646
cache: "pnpm"
4747

48-
- uses: google/wireit@setup-github-actions-caching/v2
48+
# TODO: Track and renable once this has been fixed: https://github.com/google/wireit/issues/1297
49+
# - uses: google/wireit@setup-github-actions-caching/v2
4950

5051
- name: Disable GitHub Actions Annotations
5152
run: |

.github/workflows/test.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ jobs:
4545
cache: pnpm
4646
check-latest: true
4747

48-
- uses: google/wireit@setup-github-actions-caching/v2
48+
# TODO: Track and renable once this has been fixed: https://github.com/google/wireit/issues/1297
49+
# - uses: google/wireit@setup-github-actions-caching/v2
4950

5051
- name: Disable GitHub Actions Annotations
5152
run: |

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
.DS_Store
22
npm-debug.log
33

4-
/docs/api/
54
/website/build/
65
node_modules/
76

0 commit comments

Comments
 (0)