Skip to content

Commit 5b7f93d

Browse files
tddtdd
authored
Merge pull request #669 from reactjs/sync-2b2d0f23
Sync with react.dev @ 2b2d0f2
2 parents d7e86cd + 05c38ef commit 5b7f93d

38 files changed

+583
-487
lines changed

‎.github/workflows/analyze.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@ jobs:
1111
analyze:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v2
14+
- uses: actions/checkout@v3
1515

1616
- name: Set up node
17-
uses: actions/setup-node@v1
17+
uses: actions/setup-node@v3
1818
with:
1919
node-version: '20.x'
2020

2121
- name: Install dependencies
2222
uses: bahmutov/npm-install@v1.7.10
2323

2424
- name: Restore next build
25-
uses: actions/cache@v2
25+
uses: actions/cache@v3
2626
id: restore-build-cache
2727
env:
2828
cache-name: cache-next-build
@@ -41,7 +41,7 @@ jobs:
4141
run: npx -p nextjs-bundle-analysis@0.5.0 report
4242

4343
- name: Upload bundle
44-
uses: actions/upload-artifact@v2
44+
uses: actions/upload-artifact@v3
4545
with:
4646
path: .next/analyze/__bundle_analysis.json
4747
name: bundle_analysis.json
@@ -73,7 +73,7 @@ jobs:
7373
run: ls -laR .next/analyze/base && npx -p nextjs-bundle-analysis compare
7474

7575
- name: Upload analysis comment
76-
uses: actions/upload-artifact@v2
76+
uses: actions/upload-artifact@v3
7777
with:
7878
name: analysis_comment.txt
7979
path: .next/analyze/__bundle_analysis_comment.txt
@@ -82,7 +82,7 @@ jobs:
8282
run: echo ${{ github.event.number }} > ./pr_number
8383

8484
- name: Upload PR number
85-
uses: actions/upload-artifact@v2
85+
uses: actions/upload-artifact@v3
8686
with:
8787
name: pr_number
8888
path: ./pr_number

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
},
2525
"dependencies": {
2626
"@codesandbox/sandpack-react": "2.13.5",
27-
"@docsearch/css": "3.0.0-alpha.41",
28-
"@docsearch/react": "3.0.0-alpha.41",
27+
"@docsearch/css": "^3.6.1",
28+
"@docsearch/react": "^3.6.1",
2929
"@headlessui/react": "^1.7.0",
3030
"@radix-ui/react-context-menu": "^2.1.5",
3131
"body-scroll-lock": "^3.1.3",

‎src/components/Layout/Footer.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ export function Footer() {
283283
<div
284284
className="text-xs text-left rtl:text-right mt-2 pe-0.5"
285285
dir="ltr">
286-
&copy;{new Date().getFullYear()}
286+
Copyright &copy; Meta Platforms, Inc
287287
</div>
288288
<div
289289
className="uwu-visible text-xs cursor-pointer hover:text-link hover:dark:text-link-dark hover:underline"

‎src/components/MDX/Sandpack/Preview.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ export function Preview({
113113
/**
114114
* The spinner component transition might be longer than
115115
* the bundler loading, so we only show the spinner if
116-
* it takes more than 1s to load the bundler.
116+
* it takes more than 500s to load the bundler.
117117
*/
118118
timeout = setTimeout(() => {
119119
setShowLoading(true);

‎src/components/Search.tsx

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,17 @@ export function Search({
9494
onOpen,
9595
onClose,
9696
searchParameters = {
97-
hitsPerPage: 5,
97+
hitsPerPage: 30,
98+
attributesToHighlight: [
99+
'hierarchy.lvl0',
100+
'hierarchy.lvl1',
101+
'hierarchy.lvl2',
102+
'hierarchy.lvl3',
103+
'hierarchy.lvl4',
104+
'hierarchy.lvl5',
105+
'hierarchy.lvl6',
106+
'content',
107+
],
98108
},
99109
}: SearchProps) {
100110
useDocSearchKeyboardEvents({isOpen, onOpen, onClose});

‎src/content/blog/2023/03/16/introducing-react-dev.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ Utilisez l'opérateur conditionnel (`cond ? a : b`) pour afficher ❌ si `isPack
270270
function Item({ name, isPacked }) {
271271
return (
272272
<li className="item">
273-
{name} {isPacked && '✔'}
273+
{name} {isPacked && '✅'}
274274
</li>
275275
);
276276
}
@@ -308,7 +308,7 @@ export default function PackingList() {
308308
function Item({ name, isPacked }) {
309309
return (
310310
<li className="item">
311-
{name} {isPacked ? '✔' : '❌'}
311+
{name} {isPacked ? '✅' : '❌'}
312312
</li>
313313
);
314314
}

‎src/content/blog/2024/04/25/react-19-upgrade-guide.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ npm install react-shallow-renderer --save-dev
355355

356356
##### Please reconsider shallow rendering {/*please-reconsider-shallow-rendering*/}
357357

358-
Shallow rendering depends on React internals and can block you from future upgrades. We recommend migrating your tests to [@testing-library/react](https://testing-library.com/docs/react-testing-library/intro/) or [@testing-library/react-native](https://callstack.github.io/react-native-testing-library/docs/getting-started).
358+
Shallow rendering depends on React internals and can block you from future upgrades. We recommend migrating your tests to [@testing-library/react](https://testing-library.com/docs/react-testing-library/intro/) or [@testing-library/react-native](https://testing-library.com/docs/react-native-testing-library/intro).
359359

360360
</Note>
361361

@@ -526,7 +526,7 @@ We are deprecating `react-test-renderer` because it implements its own renderer
526526

527527
The test renderer was created before there were more viable testing strategies available like [React Testing Library](https://testing-library.com), and we now recommend using a modern testing library instead.
528528

529-
In React 19, `react-test-renderer` logs a deprecation warning, and has switched to concurrent rendering. We recommend migrating your tests to [@testing-library/react](https://testing-library.com/docs/react-testing-library/intro/) or [@testing-library/react-native](https://callstack.github.io/react-native-testing-library/docs/getting-started) for a modern and well supported testing experience.
529+
In React 19, `react-test-renderer` logs a deprecation warning, and has switched to concurrent rendering. We recommend migrating your tests to [@testing-library/react](https://testing-library.com/docs/react-testing-library/intro/) or [@testing-library/react-native](https://testing-library.com/docs/react-native-testing-library/intro) for a modern and well supported testing experience.
530530

531531
## Notable changes {/*notable-changes*/}
532532

‎src/content/community/conferences.md

Lines changed: 46 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,6 @@ Vous connaissez une conférence React.js locale ? Ajoutez-la ! (Merci de conse
1010

1111
## Conférences à venir {/*upcoming-conferences*/}
1212

13-
### React Nexus 2024 {/*react-nexus-2024*/}
14-
July 04 & 05, 2024. Bangalore, India (In-person event)
15-
16-
[Site web](https://reactnexus.com/) - [Twitter](https://twitter.com/ReactNexus) - [Linkedin](https://www.linkedin.com/company/react-nexus) - [YouTube](https://www.youtube.com/reactify_in)
17-
18-
### Chain React 2024 {/*chain-react-2024*/}
19-
July 17-19, 2024. In-person in Portland, OR, USA
20-
21-
[Site web](https://chainreactconf.com) - [Twitter](https://twitter.com/ChainReactConf)
22-
23-
### The Geek Conf 2024 {/*the-geek-conf-2024*/}
24-
July 25, 2024. In-person in Berlin, Germany + remote (hybrid event)
25-
26-
[Site web](https://thegeekconf.com) - [Twitter](https://twitter.com/thegeekconf)
27-
28-
### React Rally 2024 🐙 {/*react-rally-2024*/}
29-
August 12-13, 2024. Park City, UT, USA
30-
31-
[Site web](https://reactrally.com) - [Twitter](https://twitter.com/ReactRally) - [YouTube](https://www.youtube.com/channel/UCXBhQ05nu3L1abBUGeQ0ahw)
32-
3313
### React Universe Conf 2024 {/*react-universe-conf-2024*/}
3414
September 5-6, 2024. Wrocław, Poland.
3515

@@ -43,7 +23,7 @@ September 19-21, 2024. Alicante, Spain.
4323
### RenderCon Kenya 2024 {/*rendercon-kenya-2024*/}
4424
October 04 - 05, 2024. Nairobi, Kenya
4525

46-
[Website](https://rendercon.org/) - [Twitter](https://twitter.com/renderconke) - [LinkedIn](https://www.linkedin.com/company/renderconke/) - [YouTube](https://www.youtube.com/channel/UC0bCcG8gHUL4njDOpQGcMIA)
26+
[Site web](https://rendercon.org/) - [Twitter](https://twitter.com/renderconke) - [LinkedIn](https://www.linkedin.com/company/renderconke/) - [YouTube](https://www.youtube.com/channel/UC0bCcG8gHUL4njDOpQGcMIA)
4727

4828
### React India 2024 {/*react-india-2024*/}
4929
October 17 - 19, 2024. In-person in Goa, India (hybrid event) + Oct 15 2024 - remote day
@@ -55,13 +35,58 @@ October 18, 2024. In-person in Brussels, Belgium (hybrid event)
5535

5636
[Site web](https://www.react.brussels/) - [Twitter](https://x.com/BrusselsReact)
5737

38+
### reactjsday 2024 {/*reactjsday-2024*/}
39+
October 25, 2024. In-person in Verona, Italy + online (hybrid event)
40+
41+
[Site web](https://2024.reactjsday.it/) - [Twitter](https://x.com/reactjsday) - [Facebook](https://www.facebook.com/GrUSP/) - [YouTube](https://www.youtube.com/c/grusp)
42+
43+
### React Advanced London 2024 {/*react-advanced-london-2024*/}
44+
October 25 & 28, 2024. In-person in London, UK + online (hybrid event)
45+
46+
[Site web](https://reactadvanced.com/) - [Twitter](https://x.com/reactadvanced)
47+
48+
### React Native London Conf 2024 {/*react-native-london-2024*/}
49+
November 14 & 15, 2024. In-person in London, UK
50+
51+
[Site web](https://reactnativelondon.co.uk/) - [Twitter](https://x.com/RNLConf)
52+
53+
### React Summit US 2024 {/*react-summit-us-2024*/}
54+
November 19 & 22, 2024. In-person in New York, USA + online (hybrid event)
55+
56+
[Site web](https://reactsummit.us/) - [Twitter](https://twitter.com/reactsummit) - [Videos](https://portal.gitnation.org/)
57+
5858
### React Africa 2024 {/*react-africa-2024*/}
5959
November 29, 2024. In-person in Casablanca, Morocco (hybrid event)
6060

6161
[Site web](https://react-africa.com/) - [Twitter](https://x.com/BeJS_)
6262

63+
### React Day Berlin 2024 {/*react-day-berlin-2024*/}
64+
December 13 & 16, 2024. In-person in Berlin, Germany + remote (hybrid event)
65+
66+
[Site web](https://reactday.berlin/) - [Twitter](https://x.com/reactdayberlin)
67+
6368
## Conférences passées {/*past-conferences*/}
6469

70+
### React Rally 2024 🐙 {/*react-rally-2024*/}
71+
August 12-13, 2024. Park City, UT, USA
72+
73+
[Site web](https://reactrally.com) - [Twitter](https://twitter.com/ReactRally) - [YouTube](https://www.youtube.com/channel/UCXBhQ05nu3L1abBUGeQ0ahw)
74+
75+
### The Geek Conf 2024 {/*the-geek-conf-2024*/}
76+
July 25, 2024. In-person in Berlin, Germany + remote (hybrid event)
77+
78+
[Site web](https://thegeekconf.com) - [Twitter](https://twitter.com/thegeekconf)
79+
80+
### Chain React 2024 {/*chain-react-2024*/}
81+
July 17-19, 2024. In-person in Portland, OR, USA
82+
83+
[Site web](https://chainreactconf.com) - [Twitter](https://twitter.com/ChainReactConf)
84+
85+
### React Nexus 2024 {/*react-nexus-2024*/}
86+
July 04 & 05, 2024. Bangalore, India (In-person event)
87+
88+
[Site web](https://reactnexus.com/) - [Twitter](https://twitter.com/ReactNexus) - [Linkedin](https://www.linkedin.com/company/react-nexus) - [YouTube](https://www.youtube.com/reactify_in)
89+
6590
### React Summit 2024 {/*react-summit-2024*/}
6691
June 14 & 18, 2024. In-person in Amsterdam, Netherlands + remote (hybrid event)
6792

‎src/content/community/meetups.md

Lines changed: 5 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,8 @@ Vous connaissez un meetup React.js local ? Ajoutez-le ! (Merci de conserver un
4545
* [Belo Horizonte](https://www.meetup.com/reactbh/)
4646
* [Curitiba](https://www.meetup.com/pt-br/ReactJS-CWB/)
4747
* [Florianópolis](https://www.meetup.com/pt-br/ReactJS-Floripa/)
48-
* [Goiânia](https://www.meetup.com/pt-br/React-Goiania/)
4948
* [Joinville](https://www.meetup.com/pt-BR/React-Joinville/)
50-
* [Juiz de Fora](https://www.meetup.com/pt-br/React-Juiz-de-Fora/)
51-
* [Maringá](https://www.meetup.com/pt-BR/React-Maringa/)
52-
* [Porto Alegre](https://www.meetup.com/pt-BR/React-Porto-Alegre/)
53-
* [Rio de Janeiro](https://www.meetup.com/pt-BR/React-Rio-de-Janeiro/)
54-
* [Salvador](https://www.meetup.com/pt-BR/ReactSSA)
5549
* [São Paulo](https://www.meetup.com/pt-BR/ReactJS-SP/)
56-
* [Vila Velha](https://www.meetup.com/pt-BR/React-ES/)
5750

5851
## Bolivie {/*bolivia*/}
5952
* [Bolivia](https://www.meetup.com/ReactBolivia/)
@@ -66,16 +59,8 @@ Vous connaissez un meetup React.js local ? Ajoutez-le ! (Merci de conserver un
6659
* [Saskatoon, SK](https://www.meetup.com/saskatoon-react-meetup/)
6760
* [Toronto, ON](https://www.meetup.com/Toronto-React-Native/events/)
6861

69-
## Chili {/*chile*/}
70-
* [Santiago](https://www.meetup.com/es-ES/react-santiago/)
71-
72-
## Chine {/*china*/}
73-
* [Beijing](https://www.meetup.com/Beijing-ReactJS-Meetup/)
74-
7562
## Colombie {/*colombia*/}
76-
* [Bogotá](https://www.meetup.com/meetup-group-iHIeHykY/)
7763
* [Medellin](https://www.meetup.com/React-Medellin/)
78-
* [Cali](https://www.meetup.com/reactcali/)
7964

8065
## Danemark {/*denmark*/}
8166
* [Aalborg](https://www.meetup.com/Aalborg-React-React-Native-Meetup/)
@@ -84,15 +69,10 @@ Vous connaissez un meetup React.js local ? Ajoutez-le ! (Merci de conserver un
8469
## Écosse (R.-U.) {/*scotland-uk*/}
8570
* [Edinburgh](https://www.meetup.com/React-Scotland/)
8671

87-
## Égypte {/*egypt*/}
88-
* [Cairo](https://www.meetup.com/react-cairo/)
89-
9072
## Espagne {/*spain*/}
9173
* [Barcelona](https://www.meetup.com/ReactJS-Barcelona/)
92-
* [Canarias](https://www.meetup.com/React-Canarias/)
9374

9475
## États-Unis {/*us*/}
95-
* [Ann Arbor, MI - ReactJS](https://www.meetup.com/AnnArbor-jsx/)
9676
* [Atlanta, GA - ReactJS](https://www.meetup.com/React-ATL/)
9777
* [Austin, TX - ReactJS](https://www.meetup.com/ReactJS-Austin-Meetup/)
9878
* [Boston, MA - ReactJS](https://www.meetup.com/ReactJS-Boston/)
@@ -103,7 +83,6 @@ Vous connaissez un meetup React.js local ? Ajoutez-le ! (Merci de conserver un
10383
* [Cleveland, OH - ReactJS](https://www.meetup.com/Cleveland-React/)
10484
* [Columbus, OH - ReactJS](https://www.meetup.com/ReactJS-Columbus-meetup/)
10585
* [Dallas, TX - ReactJS](https://www.meetup.com/ReactDallas/)
106-
* [Dallas, TX - [Remote] React JS](https://www.meetup.com/React-JS-Group/)
10786
* [Detroit, MI - Detroit React User Group](https://www.meetup.com/Detroit-React-User-Group/)
10887
* [Indianapolis, IN - React.Indy](https://www.meetup.com/React-Indy)
10988
* [Irvine, CA - ReactJS](https://www.meetup.com/ReactJS-OC/)
@@ -113,49 +92,37 @@ Vous connaissez un meetup React.js local ? Ajoutez-le ! (Merci de conserver un
11392
* [Los Angeles, CA - ReactJS](https://www.meetup.com/socal-react/)
11493
* [Los Angeles, CA - React Native](https://www.meetup.com/React-Native-Los-Angeles/)
11594
* [Miami, FL - ReactJS](https://www.meetup.com/React-Miami/)
116-
* [Nashville, TN - ReactJS](https://www.meetup.com/NashReact-Meetup/)
11795
* [New York, NY - ReactJS](https://www.meetup.com/NYC-Javascript-React-Group/)
11896
* [New York, NY - React Ladies](https://www.meetup.com/React-Ladies/)
11997
* [New York, NY - React Native](https://www.meetup.com/React-Native-NYC/)
12098
* [New York, NY - useReactNYC](https://www.meetup.com/useReactNYC/)
12199
* [New York, NY - React.NYC](https://guild.host/react-nyc)
122-
* [Omaha, NE - ReactJS/React Native](https://www.meetup.com/omaha-react-meetup-group/)
123100
* [Palo Alto, CA - React Native](https://www.meetup.com/React-Native-Silicon-Valley/)
124-
* [Philadelphia, PA - ReactJS](https://www.meetup.com/Reactadelphia/)
125101
* [Phoenix, AZ - ReactJS](https://www.meetup.com/ReactJS-Phoenix/)
126-
* [Pittsburgh, PA - ReactJS/React Native](https://www.meetup.com/ReactPgh/)
127-
* [Portland, OR - ReactJS](https://www.meetup.com/Portland-ReactJS/)
128102
* [Provo, UT - ReactJS](https://www.meetup.com/ReactJS-Utah/)
129-
* [Sacramento, CA - ReactJS](https://www.meetup.com/Sacramento-ReactJS-Meetup/)
130103
* [San Diego, CA - San Diego JS](https://www.meetup.com/sandiegojs/)
131104
* [San Francisco - Real World React](https://www.meetup.com/Real-World-React)
132105
* [San Francisco - ReactJS](https://www.meetup.com/ReactJS-San-Francisco/)
133106
* [San Francisco, CA - React Native](https://www.meetup.com/React-Native-San-Francisco/)
134-
* [San Ramon, CA - TriValley Coders](https://www.meetup.com/trivalleycoders/)
135107
* [Santa Monica, CA - ReactJS](https://www.meetup.com/Los-Angeles-ReactJS-User-Group/)
136-
* [Seattle, WA - React Native](https://www.meetup.com/Seattle-React-Native-Meetup/)
137108
* [Seattle, WA - ReactJS](https://www.meetup.com/seattle-react-js/)
138109
* [Tampa, FL - ReactJS](https://www.meetup.com/ReactJS-Tampa-Bay/)
139110
* [Tucson, AZ - ReactJS](https://www.meetup.com/Tucson-ReactJS-Meetup/)
140111
* [Washington, DC - ReactJS](https://www.meetup.com/React-DC/)
141112

142113
## France {/*france*/}
143-
* [Nantes](https://www.meetup.com/React-Nantes/)
144114
* [Lille](https://www.meetup.com/ReactBeerLille/)
145115
* [Paris](https://www.meetup.com/ReactJS-Paris/)
146116

147117
## Grèce {/*greece*/}
148118
* [Athens](https://www.meetup.com/React-To-React-Athens-MeetUp/)
149119
* [Thessaloniki](https://www.meetup.com/Thessaloniki-ReactJS-Meetup/)
150120

151-
## Hongrie {/*hungary*/}
152-
* [Budapest](https://www.meetup.com/React-Budapest/)
153-
154121
## Inde {/*india*/}
155122
* [Ahmedabad](https://www.meetup.com/react-ahmedabad/)
156123
* [Bangalore (React)](https://www.meetup.com/ReactJS-Bangalore/)
157124
* [Bangalore (React Native)](https://www.meetup.com/React-Native-Bangalore-Meetup)
158-
* [Chennai](https://www.meetup.com/React-Chennai/)
125+
* [Chennai](https://www.linkedin.com/company/chennaireact)
159126
* [Delhi NCR](https://www.meetup.com/React-Delhi-NCR/)
160127
* [Mumbai](https://reactmumbai.dev)
161128
* [Pune](https://www.meetup.com/ReactJS-and-Friends/)
@@ -166,12 +133,15 @@ Vous connaissez un meetup React.js local ? Ajoutez-le ! (Merci de conserver un
166133
## Irlande {/*ireland*/}
167134
* [Dublin](https://guild.host/reactjs-dublin)
168135

169-
## Israël {/*israel*/}
136+
## Israel {/*israel*/}
170137
* [Tel Aviv](https://www.meetup.com/ReactJS-Israel/)
171138

172139
## Italie {/*italy*/}
173140
* [Milan](https://www.meetup.com/React-JS-Milano/)
174141

142+
## Japon {/*japan*/}
143+
* [Osaka](https://react-osaka.connpass.com/)
144+
175145
## Kenya {/*kenya*/}
176146
* [Nairobi - Reactdevske](https://kommunity.com/reactjs-developer-community-kenya-reactdevske)
177147

@@ -190,15 +160,9 @@ Vous connaissez un meetup React.js local ? Ajoutez-le ! (Merci de conserver un
190160
* [Karachi](https://www.facebook.com/groups/902678696597634/)
191161
* [Lahore](https://www.facebook.com/groups/ReactjsLahore/)
192162

193-
## Panama {/*panama*/}
194-
* [Panama](https://www.meetup.com/React-Panama/)
195-
196163
## Pays-Bas {/*netherlands*/}
197164
* [Amsterdam](https://guild.host/react-amsterdam)
198165

199-
## Pérou {/*peru*/}
200-
* [Lima](https://www.meetup.com/ReactJS-Peru/)
201-
202166
## Philippines {/*philippines*/}
203167
* [Manila](https://www.meetup.com/reactjs-developers-manila/)
204168
* [Manila - ReactJS PH](https://www.meetup.com/ReactJS-Philippines/)

0 commit comments

Comments
 (0)