Skip to content

Commit b577dde

Browse files
committed
Merge remote-tracking branch 'upstream/dev' into mwilcox/skip-imported-route-typegen
* upstream/dev: (56 commits) chore: format feat: unstable_subResourceIntegrity (remix-run#13163) Add lazy route property API, use for loading middleware (remix-run#13294) Add `rolldown-vite` playground (remix-run#13333) chore: Update version for release (remix-run#13322) Exit prerelease mode Update release notes Remove `react-router:override-optimize-deps` plugin (remix-run#13317) chore: format Add Wrangler v4 to `@react-router/dev` peer dep range (remix-run#13258) update changelog Handle custom base for critical CSS with Vite Env API (remix-run#13305) chore: Update version for release (pre) (remix-run#13312) Enter prerelease mode chore: format host parse (remix-run#13309) Fix middleware return types (remix-run#13311) more data docs fix Location link (remix-run#13291) Also fix the meta link ...
2 parents d3be262 + b8cf1b6 commit b577dde

File tree

132 files changed

+17374
-1713
lines changed

Some content is hidden

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

132 files changed

+17374
-1713
lines changed

.changeset/clever-sheep-draw.md

-5
This file was deleted.

.changeset/cuddly-dots-hear.md

-5
This file was deleted.

.changeset/dull-hotels-battle.md

-5
This file was deleted.

.changeset/eleven-oranges-cheat.md

-5
This file was deleted.

.changeset/few-months-begin.md

-5
This file was deleted.

.changeset/four-ligers-search.md

-5
This file was deleted.

.changeset/late-falcons-sort.md

+6
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+
Introduce `unstable_subResourceIntegrity` future flag that enables generation of an importmap with integrity for the scripts that will be loaded by the browser.

.changeset/late-rings-confess.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@react-router/dev": patch
3+
---
4+
5+
Update optional Wrangler peer dependency range to support Wrangler v4

.changeset/plenty-jeans-lie.md

-5
This file was deleted.

.changeset/silver-peas-shop.md

-5
This file was deleted.

.changeset/six-mugs-scream.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@react-router/dev": patch
3+
---
4+
5+
When `future.unstable_viteEnvironmentApi` is enabled, ensure critical CSS in development works when using a custom Vite `base` has been configured

.changeset/spicy-lamps-look.md

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
---
2+
"react-router": minor
3+
---
4+
5+
Add granular object-based API for `route.lazy` to support lazy loading of individual route properties, for example:
6+
7+
```ts
8+
createBrowserRouter([
9+
{
10+
path: "/show/:showId",
11+
lazy: {
12+
loader: async () => (await import("./show.loader.js")).loader,
13+
action: async () => (await import("./show.action.js")).action,
14+
Component: async () => (await import("./show.component.js")).Component,
15+
},
16+
},
17+
]);
18+
```
19+
20+
**Breaking change for `route.unstable_lazyMiddleware` consumers**
21+
22+
The `route.unstable_lazyMiddleware` property is no longer supported. If you want to lazily load middleware, you must use the new object-based `route.lazy` API with `route.lazy.unstable_middleware`, for example:
23+
24+
```ts
25+
createBrowserRouter([
26+
{
27+
path: "/show/:showId",
28+
lazy: {
29+
unstable_middleware: async () =>
30+
(await import("./show.middleware.js")).middleware,
31+
// etc.
32+
},
33+
},
34+
]);
35+
```

.changeset/three-oranges-sort.md

-5
This file was deleted.

.changeset/unlucky-pumas-buy.md

-5
This file was deleted.

.changeset/wicked-birds-suffer.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@react-router/dev": patch
3+
---
4+
5+
Reinstate dependency optimization in the child compiler to fix `depsOptimizer is required in dev mode` errors when using `vite-plugin-cloudflare` and importing Node.js builtins

.github/workflows/shared-build.yml

+2-1
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

+2-1
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

+2-1
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

-1
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)