Skip to content

Commit 3469305

Browse files
Merge branch 'main' of https://github.com/reactjs/react.dev into sync-9467bc58
2 parents 371e799 + 9467bc5 commit 3469305

Some content is hidden

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

45 files changed

+1441
-1330
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/[email protected]
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 [email protected] 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
@@ -269,7 +269,7 @@ Use the conditional operator (`cond ? a : b`) to render a ❌ if `isPacked` isn
269269
function Item({ name, isPacked }) {
270270
return (
271271
<li className="item">
272-
{name} {isPacked && ''}
272+
{name} {isPacked && ''}
273273
</li>
274274
);
275275
}
@@ -307,7 +307,7 @@ export default function PackingList() {
307307
function Item({ name, isPacked }) {
308308
return (
309309
<li className="item">
310-
{name} {isPacked ? '' : ''}
310+
{name} {isPacked ? '' : ''}
311311
</li>
312312
);
313313
}

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
@@ -353,7 +353,7 @@ npm install react-shallow-renderer --save-dev
353353

354354
##### Please reconsider shallow rendering {/*please-reconsider-shallow-rendering*/}
355355

356-
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).
356+
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).
357357

358358
</Note>
359359

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

525525
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.
526526

527-
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.
527+
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.
528528

529529
## Notable changes {/*notable-changes*/}
530530

src/content/community/acknowledgements.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ We'd like to recognize a few people who have made significant contributions to R
5959

6060
This list is not exhaustive.
6161

62-
We'd like to give special thanks to [Tom Occhino](https://github.com/tomocchino) and [Adam Wolff](https://github.com/wolffiex) for their guidance and support over the years. We are also thankful to all the volunteers who [translated React into other languages.](https://translations.reactjs.org/)
62+
We'd like to give special thanks to [Tom Occhino](https://github.com/tomocchino) and [Adam Wolff](https://github.com/wolffiex) for their guidance and support over the years. We are also thankful to all the volunteers who [translated React into other languages.](https://translations.react.dev/)
6363

6464
## Additional Thanks {/*additional-thanks*/}
6565

src/content/community/conferences.md

Lines changed: 68 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -10,58 +10,97 @@ 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 Summit 2024 {/*react-summit-2024*/}
14-
June 14 & 18, 2024. In-person in Amsterdam, Netherlands + remote (hybrid event)
13+
### React Universe Conf 2024 {/*react-universe-conf-2024*/}
14+
September 5-6, 2024. Wrocław, Poland.
1515

16-
[Website](https://reactsummit.com/) - [Twitter](https://twitter.com/reactsummit) - [Videos](https://portal.gitnation.org/)
16+
[Website](https://www.reactuniverseconf.com/) - [Twitter](https://twitter.com/react_native_eu) - [LinkedIn](https://www.linkedin.com/events/reactuniverseconf7163919537074118657/)
1717

18-
### Render(ATL) 2024 🍑 {/*renderatl-2024-*/}
19-
June 12 - June 14, 2024. Atlanta, GA, USA
18+
### React Alicante 2024 {/*react-alicante-2024*/}
19+
September 19-21, 2024. Alicante, Spain.
2020

21-
[Website](https://renderatl.com) - [Discord](https://www.renderatl.com/discord) - [Twitter](https://twitter.com/renderATL) - [Instagram](https://www.instagram.com/renderatl/) - [Facebook](https://www.facebook.com/renderatl/) - [LinkedIn](https://www.linkedin.com/company/renderatl) - [Podcast](https://www.renderatl.com/culture-and-code#/)
21+
[Website](https://reactalicante.es/) - [Twitter](https://twitter.com/ReactAlicante) - [YouTube](https://www.youtube.com/channel/UCaSdUaITU1Cz6PvC97A7e0w)
2222

23-
### React Norway 2024 {/*react-norway-2024*/}
24-
June 14, 2024. In-person at Farris Bad Hotel in Larvik, Norway and online (hybrid event).
23+
### RenderCon Kenya 2024 {/*rendercon-kenya-2024*/}
24+
October 04 - 05, 2024. Nairobi, Kenya
2525

26-
[Website](https://reactnorway.com/) - [Twitter](https://twitter.com/ReactNorway)
26+
[Website](https://rendercon.org/) - [Twitter](https://twitter.com/renderconke) - [LinkedIn](https://www.linkedin.com/company/renderconke/) - [YouTube](https://www.youtube.com/channel/UC0bCcG8gHUL4njDOpQGcMIA)
2727

28-
### React Nexus 2024 {/*react-nexus-2024*/}
29-
July 04 & 05, 2024. Bangalore, India (In-person event)
28+
### React India 2024 {/*react-india-2024*/}
29+
October 17 - 19, 2024. In-person in Goa, India (hybrid event) + Oct 15 2024 - remote day
3030

31-
[Website](https://reactnexus.com/) - [Twitter](https://twitter.com/ReactNexus) - [Linkedin](https://www.linkedin.com/company/react-nexus) - [YouTube](https://www.youtube.com/reactify_in)
31+
[Website](https://www.reactindia.io) - [Twitter](https://twitter.com/react_india) - [Facebook](https://www.facebook.com/ReactJSIndia) - [Youtube](https://www.youtube.com/channel/UCaFbHCBkPvVv1bWs_jwYt3w)
3232

33-
### Chain React 2024 {/*chain-react-2024*/}
34-
July 17-19, 2024. In-person in Portland, OR, USA
33+
### React Brussels 2024 {/*react-brussels-2024*/}
34+
October 18, 2024. In-person in Brussels, Belgium (hybrid event)
3535

36-
[Website](https://chainreactconf.com) - [Twitter](https://twitter.com/ChainReactConf)
36+
[Website](https://www.react.brussels/) - [Twitter](https://x.com/BrusselsReact)
3737

38-
### The Geek Conf 2024 {/*the-geek-conf-2024*/}
39-
July 25, 2024. In-person in Berlin, Germany + remote (hybrid event)
38+
### reactjsday 2024 {/*reactjsday-2024*/}
39+
October 25, 2024. In-person in Verona, Italy + online (hybrid event)
4040

41-
[Website](https://thegeekconf.com) - [Twitter](https://twitter.com/thegeekconf)
41+
[Website](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+
[Website](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+
[Website](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+
[Website](https://reactsummit.us/) - [Twitter](https://twitter.com/reactsummit) - [Videos](https://portal.gitnation.org/)
57+
58+
### React Africa 2024 {/*react-africa-2024*/}
59+
November 29, 2024. In-person in Casablanca, Morocco (hybrid event)
60+
61+
[Website](https://react-africa.com/) - [Twitter](https://x.com/BeJS_)
62+
63+
### React Day Berlin 2024 {/*react-day-berlin-2024*/}
64+
December 13 & 16, 2024. In-person in Berlin, Germany + remote (hybrid event)
65+
66+
[Website](https://reactday.berlin/) - [Twitter](https://x.com/reactdayberlin)
67+
68+
## Past Conferences {/*past-conferences*/}
4269

4370
### React Rally 2024 🐙 {/*react-rally-2024*/}
4471
August 12-13, 2024. Park City, UT, USA
4572

4673
[Website](https://reactrally.com) - [Twitter](https://twitter.com/ReactRally) - [YouTube](https://www.youtube.com/channel/UCXBhQ05nu3L1abBUGeQ0ahw)
4774

48-
### React Universe Conf 2024 {/*react-universe-conf-2024*/}
49-
September 5-6, 2024. Wrocław, Poland.
75+
### The Geek Conf 2024 {/*the-geek-conf-2024*/}
76+
July 25, 2024. In-person in Berlin, Germany + remote (hybrid event)
5077

51-
[Website](https://www.reactuniverseconf.com/) - [Twitter](https://twitter.com/react_native_eu) - [LinkedIn](https://www.linkedin.com/events/reactuniverseconf7163919537074118657/)
78+
[Website](https://thegeekconf.com) - [Twitter](https://twitter.com/thegeekconf)
5279

53-
### React Alicante 2024 {/*react-alicante-2024*/}
54-
September 19-21, 2024. Alicante, Spain.
80+
### Chain React 2024 {/*chain-react-2024*/}
81+
July 17-19, 2024. In-person in Portland, OR, USA
5582

56-
[Website](https://reactalicante.es/) - [Twitter](https://twitter.com/ReactAlicante) - [YouTube](https://www.youtube.com/channel/UCaSdUaITU1Cz6PvC97A7e0w)
83+
[Website](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)
5787

88+
[Website](https://reactnexus.com/) - [Twitter](https://twitter.com/ReactNexus) - [Linkedin](https://www.linkedin.com/company/react-nexus) - [YouTube](https://www.youtube.com/reactify_in)
5889

59-
### React India 2024 {/*react-india-2024*/}
60-
October 17 - 19, 2024. In-person in Goa, India (hybrid event) + Oct 15 2024 - remote day
90+
### React Summit 2024 {/*react-summit-2024*/}
91+
June 14 & 18, 2024. In-person in Amsterdam, Netherlands + remote (hybrid event)
6192

62-
[Website](https://www.reactindia.io) - [Twitter](https://twitter.com/react_india) - [Facebook](https://www.facebook.com/ReactJSIndia) - [Youtube](https://www.youtube.com/channel/UCaFbHCBkPvVv1bWs_jwYt3w)
93+
[Website](https://reactsummit.com/) - [Twitter](https://twitter.com/reactsummit) - [Videos](https://portal.gitnation.org/)
6394

64-
## Past Conferences {/*past-conferences*/}
95+
### React Norway 2024 {/*react-norway-2024*/}
96+
June 14, 2024. In-person at Farris Bad Hotel in Larvik, Norway and online (hybrid event).
97+
98+
[Website](https://reactnorway.com/) - [Twitter](https://twitter.com/ReactNorway)
99+
100+
### Render(ATL) 2024 🍑 {/*renderatl-2024-*/}
101+
June 12 - June 14, 2024. Atlanta, GA, USA
102+
103+
[Website](https://renderatl.com) - [Discord](https://www.renderatl.com/discord) - [Twitter](https://twitter.com/renderATL) - [Instagram](https://www.instagram.com/renderatl/) - [Facebook](https://www.facebook.com/renderatl/) - [LinkedIn](https://www.linkedin.com/company/renderatl) - [Podcast](https://www.renderatl.com/culture-and-code#/)
65104

66105
### Frontend Nation 2024 {/*frontend-nation-2024*/}
67106
June 4 - 7, 2024. Online
@@ -96,7 +135,7 @@ April 10 - 11, 2024. In-person in Park City, UT, USA
96135
### React Paris 2024 {/*react-paris-2024*/}
97136
March 22, 2024. In-person in Paris, France + Remote (hybrid)
98137

99-
[Website](https://react.paris/) - [Twitter](https://twitter.com/BeJS_) - [LinkedIn](https://www.linkedin.com/events/7150816372074192900/comments/)
138+
[Website](https://react.paris/) - [Twitter](https://twitter.com/BeJS_) - [LinkedIn](https://www.linkedin.com/events/7150816372074192900/comments/) - [Videos](https://www.youtube.com/playlist?list=PL53Z0yyYnpWhUzgvr2Nys3kZBBLcY0TA7)
100139

101140
### React Day Berlin 2023 {/*react-day-berlin-2023*/}
102141
December 8 & 12, 2023. In-person in Berlin, Germany + remote first interactivity (hybrid event)

0 commit comments

Comments
 (0)