Skip to content

Commit f6cec75

Browse files
Merge branch 'main' of https://github.com/reactjs/react.dev into sync-383a1e92
2 parents 70fc510 + 383a1e9 commit f6cec75

6 files changed

Lines changed: 36 additions & 17 deletions

File tree

src/content/community/conferences.md

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,27 +10,41 @@ Do you know of a local React.js conference? Add it here! (Please keep the list c
1010

1111
## Upcoming Conferences {/*upcoming-conferences*/}
1212

13-
### React Paris 2026 {/*react-paris-2026*/}
14-
March 26 - 27, 2026. In-person in Paris, France (hybrid event)
13+
### ZurichJS Conf 2026 {/*zurichjs-conf-2026*/}
14+
September 10-11, 2026. In-person in Zurich, Switzerland
1515

16-
[Website](https://react.paris/) - [Twitter](https://x.com/BeJS_)
16+
[Website](https://conf.zurichjs.com?utm_campaign=ZurichJS_Conf&utm_source=referral&utm_content=reactjs_community_conferences) - [Twitter](https://x.com/zurichjs) - [LinkedIn](https://www.linkedin.com/company/zurichjs/)
1717

18-
### CityJS London 2026 {/*cityjs-london-2026*/}
19-
April 14-17, 2026. In-person in London
18+
### React Alicante 2026 {/*react-alicante-2026*/}
19+
Sep 24 - 26, 2026. In-person in Alicante
2020

21-
[Website](https://india.cityjsconf.org/) - [Twitter](https://x.com/cityjsconf) - [Bluesky](https://bsky.app/profile/cityjsconf.bsky.social)
21+
[Website](https://reactalicante.es//) - [Twitter](https://x.com/ReactAlicante)
2222

23-
### ZurichJS Conf 2026 {/*zurichjs-conf-2026*/}
24-
September 10-11, 2026. In-person in Zurich, Switzerland
23+
### CityJS Athens 2026 {/*cityjs-athens-2026*/}
24+
October 21-23, 2026. In-person in Athens
25+
26+
[Website](https://athens.cityjsconf.org/) - [Twitter](https://x.com/cityjsconf) - [Bluesky](https://bsky.app/profile/cityjsconf.bsky.social)
27+
28+
29+
## Past Conferences {/*past-conferences*/}
2530

26-
[Website](https://conf.zurichjs.com?utm_campaign=ZurichJS_Conf&utm_source=referral&utm_content=reactjs_community_conferences) - [Twitter](https://x.com/zurichjs) - [LinkedIn](https://www.linkedin.com/company/zurichjs/)
2731

2832
### React Conf Japan 2027 {/*react-conf-japan-2027*/}
2933
April 24, 2027. In-person in Tokyo, Japan
3034

3135
[Website](https://reactconf.jp/) - [Twitter](https://x.com/reactconfjp)
3236

33-
## Past Conferences {/*past-conferences*/}
37+
### CityJS London 2026 {/*cityjs-london-2026*/}
38+
April 14-17, 2026. In-person in London
39+
40+
[Website](https://india.cityjsconf.org/) - [Twitter](https://x.com/cityjsconf) - [Bluesky](https://bsky.app/profile/cityjsconf.bsky.social)
41+
42+
43+
### React Paris 2026 {/*react-paris-2026*/}
44+
March 26 - 27, 2026. In-person in Paris, France (hybrid event)
45+
46+
[Website](https://react.paris/) - [Twitter](https://x.com/BeJS_)
47+
3448

3549
### CityJS New Delhi 2026 {/*cityjs-newdelhi-2026*/}
3650
February 12-13, 2026. In-person in New Delhi, India

src/content/community/team.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ React work is organized into working groups, each responsible for an area of the
2626

2727
<TeamMember name="Moti Zilberman" permalink="moti-zilberman" photo="/images/team/gh-motiz88.jpg" github="motiz88" title="Engineer at Meta" group="DevX*" />
2828

29-
<TeamMember name="Nicola Corti" permalink="nicola-corti" photo="/images/team/gh-cortinico.jpg" github="cortinico" title="Engineer at Meta" group="React Native*, Docs & Community" />
29+
<TeamMember name="Nicola Corti" permalink="nicola-corti" photo="/images/team/gh-cortinico.jpg" github="cortinico" twitter="cortinico" title="Engineer at Meta" group="React Native*, Docs & Community" />
3030

3131
<TeamMember name="Rick Hanlon" permalink="rick-hanlon" photo="/images/team/rickhanlonii.jpg" github="rickhanlonii" twitter="rickyfm" threads="rickhanlonii" bsky="ricky.fm" title="Engineer at Meta" group="Docs & Community*, DOM, Fiber, Server, DevX">
3232
Ricky majored in theoretical math and somehow found himself on the React Native team for a couple years before joining the React team. When he's not programming you can find him snowboarding, biking, climbing, golfing, or closing GitHub issues that do not match the issue template.
@@ -38,7 +38,7 @@ React work is organized into working groups, each responsible for an area of the
3838

3939
## Working Group members {/*working-group-members*/}
4040

41-
<TeamMember name="Alex Hunt" permalink="alex-hunt" photo="/images/team/gh-huntie.jpg" github="huntie" title="Engineer at Meta" group="DevX, React Native" />
41+
<TeamMember name="Alex Hunt" permalink="alex-hunt" photo="/images/team/gh-huntie.jpg" github="huntie" twitter="huntie" title="Engineer at Meta" group="DevX, React Native" />
4242

4343
<TeamMember name="Aurora Scharff" permalink="aurora-scharff" photo="/images/team/gh-aurorascharff.jpg" github="aurorascharff" title="Engineer at Vercel" group="Docs & Community" />
4444

@@ -82,11 +82,11 @@ React work is organized into working groups, each responsible for an area of the
8282

8383
<TeamMember name="Pieter De Baets" permalink="pieter-de-baets" photo="/images/team/gh-javache.jpg" github="javache" title="Engineer at Meta" group="Compiler, Fiber, React Native" />
8484

85-
<TeamMember name="Riccardo Cipolleschi" permalink="riccardo-cipolleschi" photo="/images/team/gh-cipolleschi.png" github="cipolleschi" title="Engineer at Meta" group="Docs & Community, React Native" />
85+
<TeamMember name="Riccardo Cipolleschi" permalink="riccardo-cipolleschi" photo="/images/team/gh-cipolleschi.png" github="cipolleschi" twitter="CipolleschiR" title="Engineer at Meta" group="Docs & Community, React Native" />
8686

87-
<TeamMember name="Rob Hogan" permalink="rob-hogan" photo="/images/team/gh-rh389.jpg" github="rh389" title="Engineer at Meta" group="DevX" />
87+
<TeamMember name="Rob Hogan" permalink="rob-hogan" photo="/images/team/gh-robhogan.jpg" github="robhogan" twitter="robjhogan" title="Engineer at Meta" group="DevX" />
8888

89-
<TeamMember name="Rubén Norte" permalink="ruben-norte" photo="/images/team/gh-rubennorte.jpg" github="rubennorte" title="Engineer at Meta" group="Fiber" />
89+
<TeamMember name="Rubén Norte" permalink="ruben-norte" photo="/images/team/gh-rubennorte.jpg" github="rubennorte" title="Engineer at Meta" group="Fiber, React Native" />
9090

9191
<TeamMember name="Ruslan Lesiutin" permalink="ruslan-lesiutin" photo="/images/team/lesiutin.jpg" github="hoxyq" twitter="ruslanlesiutin" threads="lesiutin" title="Engineer at Meta" group="DOM, DevX">
9292
Ruslan's introduction to UI programming started when he was a kid by manually editing HTML templates for his custom gaming forums. Somehow, he ended up majoring in Computer Science. He enjoys music, games, and memes. Mostly memes.

src/content/reference/react/use.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -662,7 +662,7 @@ This cache pattern is the foundation for [re-fetching data](#re-fetching-data-in
662662
663663
<Pitfall>
664664
665-
Don't skip calling `use` based on whether a Promise is already settled.
665+
##### Don't skip calling `use` based on whether a Promise is already settled. {/*conditional-use*/}
666666
667667
Unlike other hooks, `use` can be called inside conditions and loops — but it must always be called for the Promise itself. Never read `promise.status` or `promise.value` directly to bypass `use`; always pass the Promise to `use` and let React handle it.
668668

src/content/reference/react/useDeferredValue.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ During updates, the <CodeStep step={2}>deferred value</CodeStep> will "lag behin
8888

8989
This example assumes you use a data source that [activates a Suspense boundary](/reference/react/Suspense#what-activates-a-suspense-boundary), such as a Promise you read with [`use`](/reference/react/use).
9090

91-
[Learn more about Suspense and its limitations.](/reference/react/Suspense)
91+
[Learn more about Suspense.](/reference/react/Suspense)
9292

9393
</Note>
9494

vercel.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,11 @@
174174
"destination": "/warnings/invalid-hook-call-warning#mismatching-versions-of-react-and-react-dom",
175175
"permanent": false
176176
},
177+
{
178+
"source": "/warnings/conditional-use-of-use",
179+
"destination": "/reference/react/use#conditional-use",
180+
"permanent": false
181+
},
177182
{
178183
"source": "/reference/react/directives",
179184
"destination": "/reference/rsc/directives",

0 commit comments

Comments
 (0)