Skip to content

Commit 36d2b38

Browse files
committed
Merge branch 'release-next' into dev
2 parents cd7f118 + 1b28f4c commit 36d2b38

File tree

26 files changed

+432
-124
lines changed

26 files changed

+432
-124
lines changed

.changeset/happy-balloons-buy.md

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

.changeset/kind-dodos-shop.md

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

.changeset/new-taxis-stare.md

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

.changeset/pretty-kiwis-study.md

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

.changeset/thin-kids-eat.md

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

.changeset/violet-rules-rest.md

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

DEVELOPMENT.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ You may need to make changes to a pre-release prior to publishing a final stable
4343
- Convert the `[email protected]` tag to a Release on Github with the name `v6.x.y`
4444
- Copy the relevant changelog entries from all packages into the Release Notes and adjust accordingly, matching the format used by prior releases
4545

46+
### Hotfix releases
47+
48+
Hotfix releases follow the same process as standard releases above, but the `release-*` branch should be branched off latest `main` instead of `dev`. Once the stable hotfix is published, the `release-*` branch should be merged back into both `main` and `dev` just like a normal release.
49+
4650
### Experimental releases
4751

4852
Experimental releases and hot-fixes do not need to be branched off of `dev`. Experimental releases can be branched from anywhere as they are not intended for general use.

contributors.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
- abhi-kr-2100
33
- AchThomas
44
- adamdotjs
5+
- adil62
56
- afzalsayed96
67
- Ajayff4
78
- alany411
@@ -14,7 +15,9 @@
1415
- awreese
1516
- aymanemadidi
1617
- bavardage
18+
- BDomzalski
1719
- bhbs
20+
- bobziroll
1821
- BrianT1414
1922
- brockross
2023
- brophdawg11
@@ -113,6 +116,7 @@
113116
- p13i
114117
- parched
115118
- paulsmithkc
119+
- pavsoldatov
116120
- pcattori
117121
- petersendidit
118122
- promet99
@@ -147,6 +151,7 @@
147151
- vijaypushkin
148152
- vikingviolinist
149153
- vishwast03
154+
- WalkAlone0325
150155
- willemarcel
151156
- williamsdyyz
152157
- xavier-lc

docs/components/link.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ A relative `<Link to>` value (that does not begin with `/`) resolves relative to
5656

5757
## `relative`
5858

59-
By default, links are relative to the route hierarchy, so `..` will go up one `Route` level. Occasionally, you may find that you have matching URL patterns that do not make sense to be nested, and you're prefer to use relative _path_ routing. You can opt into this behavior with `relative`:
59+
By default, links are relative to the route hierarchy, so `..` will go up one `Route` level. Occasionally, you may find that you have matching URL patterns that do not make sense to be nested, and you'd prefer to use relative _path_ routing. You can opt into this behavior with `relative`:
6060

6161
```jsx
6262
// Contact and EditContact do not share additional UI layout

docs/guides/deferred.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ Let's take a dive into how to accomplish this.
6565

6666
Start by adding `<Await />` for your slow data requests where you'd rather render a fallback UI. Let's do that for our example above:
6767

68-
```jsx lines=[1,5,10,20-33]
68+
```jsx lines=[3,9,13,24-40]
6969
import {
7070
Await,
7171
defer,

0 commit comments

Comments
 (0)