Skip to content

Commit 58dcfbb

Browse files
committed
Merge branch 'release-next' into dev
2 parents cbb6ac3 + aef5c4a commit 58dcfbb

File tree

22 files changed

+159
-96
lines changed

22 files changed

+159
-96
lines changed

.changeset/clever-pumas-arrive.md

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

.changeset/heavy-lies-ring.md

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

.changeset/little-ghosts-give.md

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

.github/workflows/release-experimental.yml

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,28 @@
1-
name: 🚀 Release (experimental)
1+
name: 🧪 Experimental Release
2+
23
on:
3-
push:
4-
tags:
5-
- "v0.0.0-experimental*"
4+
workflow_dispatch:
5+
inputs:
6+
branch:
7+
required: true
68

79
concurrency: ${{ github.workflow }}-${{ github.ref }}
810

911
env:
1012
CI: true
1113

1214
jobs:
13-
release:
14-
name: 🧑‍🔬 Experimental Release
15-
if: |
16-
github.repository == 'remix-run/react-router' &&
17-
contains(github.ref, 'experimental')
15+
experimental:
16+
name: 🧪 Experimental Release
17+
if: github.repository == 'remix-run/react-router'
1818
runs-on: ubuntu-latest
1919
steps:
2020
- name: ⬇️ Checkout repo
2121
uses: actions/checkout@v4
2222
with:
23+
ref: ${{ github.event.inputs.branch }}
24+
# checkout using a custom token so that we can push later on
25+
token: ${{ secrets.GITHUB_TOKEN }}
2326
fetch-depth: 0
2427

2528
- name: 📦 Setup pnpm
@@ -28,12 +31,22 @@ jobs:
2831
- name: ⎔ Setup node
2932
uses: actions/setup-node@v4
3033
with:
31-
cache: pnpm
3234
node-version-file: ".nvmrc"
35+
cache: "pnpm"
3336

3437
- name: 📥 Install deps
3538
run: pnpm install --frozen-lockfile
3639

40+
- name: ⤴️ Update version
41+
run: |
42+
git config --local user.email "hello@remix.run"
43+
git config --local user.name "Remix Run Bot"
44+
SHORT_SHA=$(git rev-parse --short HEAD)
45+
NEXT_VERSION=0.0.0-experimental-${SHORT_SHA}
46+
git checkout -b experimental/${NEXT_VERSION}
47+
pnpm run version ${NEXT_VERSION}
48+
git push origin --tags
49+
3750
- name: 🏗 Build
3851
run: pnpm build
3952

CHANGELOG.md

Lines changed: 62 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -13,152 +13,154 @@ We manage release notes in this file instead of the paginated Github Releases Pa
1313
<summary>Table of Contents</summary>
1414

1515
- [React Router Releases](#react-router-releases)
16+
- [v6.23.1](#v6231)
17+
- [Patch Changes](#patch-changes)
1618
- [v6.23.0](#v6230)
1719
- [What's Changed](#whats-changed)
1820
- [Data Strategy (unstable)](#data-strategy-unstable)
1921
- [Skip Action Error Revalidation (unstable)](#skip-action-error-revalidation-unstable)
2022
- [Minor Changes](#minor-changes)
2123
- [v6.22.3](#v6223)
22-
- [Patch Changes](#patch-changes)
23-
- [v6.22.2](#v6222)
2424
- [Patch Changes](#patch-changes-1)
25-
- [v6.22.1](#v6221)
25+
- [v6.22.2](#v6222)
2626
- [Patch Changes](#patch-changes-2)
27+
- [v6.22.1](#v6221)
28+
- [Patch Changes](#patch-changes-3)
2729
- [v6.22.0](#v6220)
2830
- [What's Changed](#whats-changed-1)
2931
- [Core Web Vitals Technology Report Flag](#core-web-vitals-technology-report-flag)
3032
- [Minor Changes](#minor-changes-1)
31-
- [Patch Changes](#patch-changes-3)
32-
- [v6.21.3](#v6213)
3333
- [Patch Changes](#patch-changes-4)
34-
- [v6.21.2](#v6212)
34+
- [v6.21.3](#v6213)
3535
- [Patch Changes](#patch-changes-5)
36-
- [v6.21.1](#v6211)
36+
- [v6.21.2](#v6212)
3737
- [Patch Changes](#patch-changes-6)
38+
- [v6.21.1](#v6211)
39+
- [Patch Changes](#patch-changes-7)
3840
- [v6.21.0](#v6210)
3941
- [What's Changed](#whats-changed-2)
4042
- [`future.v7_relativeSplatPath`](#futurev7_relativesplatpath)
4143
- [Partial Hydration](#partial-hydration)
4244
- [Minor Changes](#minor-changes-2)
43-
- [Patch Changes](#patch-changes-7)
44-
- [v6.20.1](#v6201)
4545
- [Patch Changes](#patch-changes-8)
46+
- [v6.20.1](#v6201)
47+
- [Patch Changes](#patch-changes-9)
4648
- [v6.20.0](#v6200)
4749
- [Minor Changes](#minor-changes-3)
48-
- [Patch Changes](#patch-changes-9)
50+
- [Patch Changes](#patch-changes-10)
4951
- [v6.19.0](#v6190)
5052
- [What's Changed](#whats-changed-3)
5153
- [`unstable_flushSync` API](#unstable_flushsync-api)
5254
- [Minor Changes](#minor-changes-4)
53-
- [Patch Changes](#patch-changes-10)
55+
- [Patch Changes](#patch-changes-11)
5456
- [v6.18.0](#v6180)
5557
- [What's Changed](#whats-changed-4)
5658
- [New Fetcher APIs](#new-fetcher-apis)
5759
- [Persistence Future Flag (`future.v7_fetcherPersist`)](#persistence-future-flag-futurev7_fetcherpersist)
5860
- [Minor Changes](#minor-changes-5)
59-
- [Patch Changes](#patch-changes-11)
61+
- [Patch Changes](#patch-changes-12)
6062
- [v6.17.0](#v6170)
6163
- [What's Changed](#whats-changed-5)
6264
- [View Transitions 🚀](#view-transitions-)
6365
- [Minor Changes](#minor-changes-6)
64-
- [Patch Changes](#patch-changes-12)
66+
- [Patch Changes](#patch-changes-13)
6567
- [v6.16.0](#v6160)
6668
- [Minor Changes](#minor-changes-7)
67-
- [Patch Changes](#patch-changes-13)
69+
- [Patch Changes](#patch-changes-14)
6870
- [v6.15.0](#v6150)
6971
- [Minor Changes](#minor-changes-8)
70-
- [Patch Changes](#patch-changes-14)
71-
- [v6.14.2](#v6142)
7272
- [Patch Changes](#patch-changes-15)
73-
- [v6.14.1](#v6141)
73+
- [v6.14.2](#v6142)
7474
- [Patch Changes](#patch-changes-16)
75+
- [v6.14.1](#v6141)
76+
- [Patch Changes](#patch-changes-17)
7577
- [v6.14.0](#v6140)
7678
- [What's Changed](#whats-changed-6)
7779
- [JSON/Text Submissions](#jsontext-submissions)
7880
- [Minor Changes](#minor-changes-9)
79-
- [Patch Changes](#patch-changes-17)
81+
- [Patch Changes](#patch-changes-18)
8082
- [v6.13.0](#v6130)
8183
- [What's Changed](#whats-changed-7)
8284
- [Minor Changes](#minor-changes-10)
83-
- [Patch Changes](#patch-changes-18)
84-
- [v6.12.1](#v6121)
8585
- [Patch Changes](#patch-changes-19)
86+
- [v6.12.1](#v6121)
87+
- [Patch Changes](#patch-changes-20)
8688
- [v6.12.0](#v6120)
8789
- [What's Changed](#whats-changed-8)
8890
- [`React.startTransition` support](#reactstarttransition-support)
8991
- [Minor Changes](#minor-changes-11)
90-
- [Patch Changes](#patch-changes-20)
91-
- [v6.11.2](#v6112)
9292
- [Patch Changes](#patch-changes-21)
93-
- [v6.11.1](#v6111)
93+
- [v6.11.2](#v6112)
9494
- [Patch Changes](#patch-changes-22)
95+
- [v6.11.1](#v6111)
96+
- [Patch Changes](#patch-changes-23)
9597
- [v6.11.0](#v6110)
9698
- [Minor Changes](#minor-changes-12)
97-
- [Patch Changes](#patch-changes-23)
99+
- [Patch Changes](#patch-changes-24)
98100
- [v6.10.0](#v6100)
99101
- [What's Changed](#whats-changed-9)
100102
- [Minor Changes](#minor-changes-13)
101-
- [Patch Changes](#patch-changes-24)
103+
- [Patch Changes](#patch-changes-25)
102104
- [v6.9.0](#v690)
103105
- [What's Changed](#whats-changed-10)
104106
- [`Component`/`ErrorBoundary` route properties](#componenterrorboundary-route-properties)
105107
- [Introducing Lazy Route Modules](#introducing-lazy-route-modules)
106108
- [Minor Changes](#minor-changes-14)
107-
- [Patch Changes](#patch-changes-25)
108-
- [v6.8.2](#v682)
109109
- [Patch Changes](#patch-changes-26)
110-
- [v6.8.1](#v681)
110+
- [v6.8.2](#v682)
111111
- [Patch Changes](#patch-changes-27)
112+
- [v6.8.1](#v681)
113+
- [Patch Changes](#patch-changes-28)
112114
- [v6.8.0](#v680)
113115
- [Minor Changes](#minor-changes-15)
114-
- [Patch Changes](#patch-changes-28)
116+
- [Patch Changes](#patch-changes-29)
115117
- [v6.7.0](#v670)
116118
- [Minor Changes](#minor-changes-16)
117-
- [Patch Changes](#patch-changes-29)
118-
- [v6.6.2](#v662)
119119
- [Patch Changes](#patch-changes-30)
120-
- [v6.6.1](#v661)
120+
- [v6.6.2](#v662)
121121
- [Patch Changes](#patch-changes-31)
122+
- [v6.6.1](#v661)
123+
- [Patch Changes](#patch-changes-32)
122124
- [v6.6.0](#v660)
123125
- [What's Changed](#whats-changed-11)
124126
- [Minor Changes](#minor-changes-17)
125-
- [Patch Changes](#patch-changes-32)
127+
- [Patch Changes](#patch-changes-33)
126128
- [v6.5.0](#v650)
127129
- [What's Changed](#whats-changed-12)
128130
- [Minor Changes](#minor-changes-18)
129-
- [Patch Changes](#patch-changes-33)
130-
- [v6.4.5](#v645)
131131
- [Patch Changes](#patch-changes-34)
132-
- [v6.4.4](#v644)
132+
- [v6.4.5](#v645)
133133
- [Patch Changes](#patch-changes-35)
134-
- [v6.4.3](#v643)
134+
- [v6.4.4](#v644)
135135
- [Patch Changes](#patch-changes-36)
136-
- [v6.4.2](#v642)
136+
- [v6.4.3](#v643)
137137
- [Patch Changes](#patch-changes-37)
138-
- [v6.4.1](#v641)
138+
- [v6.4.2](#v642)
139139
- [Patch Changes](#patch-changes-38)
140+
- [v6.4.1](#v641)
141+
- [Patch Changes](#patch-changes-39)
140142
- [v6.4.0](#v640)
141143
- [What's Changed](#whats-changed-13)
142144
- [Remix Data APIs](#remix-data-apis)
143-
- [Patch Changes](#patch-changes-39)
145+
- [Patch Changes](#patch-changes-40)
144146
- [v6.3.0](#v630)
145147
- [Minor Changes](#minor-changes-19)
146148
- [v6.2.2](#v622)
147-
- [Patch Changes](#patch-changes-40)
148-
- [v6.2.1](#v621)
149149
- [Patch Changes](#patch-changes-41)
150+
- [v6.2.1](#v621)
151+
- [Patch Changes](#patch-changes-42)
150152
- [v6.2.0](#v620)
151153
- [Minor Changes](#minor-changes-20)
152-
- [Patch Changes](#patch-changes-42)
153-
- [v6.1.1](#v611)
154154
- [Patch Changes](#patch-changes-43)
155+
- [v6.1.1](#v611)
156+
- [Patch Changes](#patch-changes-44)
155157
- [v6.1.0](#v610)
156158
- [Minor Changes](#minor-changes-21)
157-
- [Patch Changes](#patch-changes-44)
158-
- [v6.0.2](#v602)
159159
- [Patch Changes](#patch-changes-45)
160-
- [v6.0.1](#v601)
160+
- [v6.0.2](#v602)
161161
- [Patch Changes](#patch-changes-46)
162+
- [v6.0.1](#v601)
163+
- [Patch Changes](#patch-changes-47)
162164
- [v6.0.0](#v600)
163165

164166
</details>
@@ -182,6 +184,19 @@ Date: YYYY-MM-DD
182184
**Full Changelog**: [`v6.X.Y...v6.X.Y`](https://github.com/remix-run/react-router/compare/react-router@6.X.Y...react-router@6.X.Y)
183185
-->
184186

187+
## v6.23.1
188+
189+
Date: 2024-05-10
190+
191+
### Patch Changes
192+
193+
- Allow `undefined` to be resolved through `<Await>` ([#11513](https://github.com/remix-run/react-router/pull/11513))
194+
- Add defensive `document` check when checking for `document.startViewTransition` availability ([#11544](https://github.com/remix-run/react-router/pull/11544))
195+
- Change the `react-router-dom/server` import back to `react-router-dom` instead of `index.ts` ([#11514](https://github.com/remix-run/react-router/pull/11514))
196+
- `@remix-run/router` - Support `unstable_dataStrategy` on `staticHandler.queryRoute` ([#11515](https://github.com/remix-run/react-router/pull/11515))
197+
198+
**Full Changelog**: [`v6.23.0...v6.23.1`](https://github.com/remix-run/react-router/compare/react-router@6.23.0...react-router@6.23.1)
199+
185200
## v6.23.0
186201

187202
Date: 2024-04-23

contributors.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
- chensokheng
5050
- chrisngobanh
5151
- christopherchudzicki
52+
- ChristophP
5253
- christowiz
5354
- codeape2
5455
- coryhouse
@@ -60,6 +61,7 @@
6061
- david-bezero
6162
- david-crespo
6263
- decadentsavant
64+
- dgrijuela
6365
- DigitalNaut
6466
- dmitrytarassov
6567
- dokeet
@@ -75,6 +77,7 @@
7577
- ericschn
7678
- faergeek
7779
- FilipJirsak
80+
- focusotter
7881
- frontsideair
7982
- fyzhu
8083
- fz6m
@@ -126,6 +129,8 @@
126129
- kachun333
127130
- Kakamotobi
128131
- kantuni
132+
- kapil-patel
133+
- kapilepatel
129134
- KaranRandhir
130135
- kark
131136
- KAROTT7
@@ -175,9 +180,11 @@
175180
- mikib0
176181
- minami-minami
177182
- minthulim
183+
- mlewando
178184
- modex98
179185
- morleytatro
180186
- ms10596
187+
- mtliendo
181188
- ned-park
182189
- nilubisan
183190
- Nismit
@@ -203,6 +210,7 @@
203210
- ryanflorence
204211
- ryanhiebert
205212
- sanketshah19
213+
- saul-atomrigs
206214
- sbolel
207215
- scarf005
208216
- senseibarni
@@ -234,6 +242,7 @@
234242
- tlinhart
235243
- tom-sherman
236244
- tomasr8
245+
- TooTallNate
237246
- triangularcube
238247
- trungpv1601
239248
- turansky

docs/components/link.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ function EditContact() {
9191
}
9292
```
9393

94-
Please note that `relative: "path"` only impacts the resolution of a relative path. It does not change the the "starting" location for that relative path resolution. This resolution is always relative to the current location in the Route hierarchy (i.e., the route `Link` is rendered in).
94+
Please note that `relative: "path"` only impacts the resolution of a relative path. It does not change the "starting" location for that relative path resolution. This resolution is always relative to the current location in the Route hierarchy (i.e., the route `Link` is rendered in).
9595

9696
If you wish to use path-relative routing against the current URL instead of the route hierarchy, you can do that with the current [`location`][use-location] and the `URL` constructor (note the trailing slash behavior):
9797

@@ -107,7 +107,7 @@ new URL("..", window.origin + location.pathname);
107107

108108
// With trailing slashes:
109109
new URL(".", window.origin + location.pathname + "/");
110-
// 'https://remix.run/docs/en/main/start/future-flags/'
110+
// 'https://remix.run/docs/en/main/start/quickstart/'
111111
new URL("..", window.origin + location.pathname + "/");
112112
// 'https://remix.run/docs/en/main/start/'
113113
```

docs/route/loader.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ Note that the APIs here are not React Router specific, but rather standard web o
8787

8888
## `loader.hydrate`
8989

90-
If you are [Server-Side Rendering][ssr] and leveraging the `fututre.v7_partialHydration` flag for [Partial Hydration][partialhydration], then you may wish to opt-into running a route `loader` on initial hydration _even though it has hydration data_ (for example, to let a user prime a cache with the hydration data). To force a `loader` to run on hydration in a partial hydration scenario, you can set a `hydrate` property on the `loader` function:
90+
If you are [Server-Side Rendering][ssr] and leveraging the `future.v7_partialHydration` flag for [Partial Hydration][partialhydration], then you may wish to opt-into running a route `loader` on initial hydration _even though it has hydration data_ (for example, to let a user prime a cache with the hydration data). To force a `loader` to run on hydration in a partial hydration scenario, you can set a `hydrate` property on the `loader` function:
9191

9292
## Returning Responses
9393

0 commit comments

Comments
 (0)