Skip to content

Commit 175d4a7

Browse files
react-translations-botreact-translations-bot
committed
merging all conflicts
2 parents 6e98c10 + 1697ae8 commit 175d4a7

Some content is hidden

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

41 files changed

+1350
-1213
lines changed

‎.github/workflows/analyze.yml

+6-6
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

+2-2
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

+1-1
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

+1-1
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

+11-1
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

+2-2
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

+2-2
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

+1-1
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

+45-20
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,6 @@ 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 Nexus 2024 {/*react-nexus-2024*/}
14-
July 04 & 05, 2024. Bangalore, India (In-person event)
15-
16-
[Website](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-
[Website](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-
[Website](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-
[Website](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

@@ -55,13 +35,58 @@ October 18, 2024. In-person in Brussels, Belgium (hybrid event)
5535

5636
[Website](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+
[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+
5858
### React Africa 2024 {/*react-africa-2024*/}
5959
November 29, 2024. In-person in Casablanca, Morocco (hybrid event)
6060

6161
[Website](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+
[Website](https://reactday.berlin/) - [Twitter](https://x.com/reactdayberlin)
67+
6368
## Past Conferences {/*past-conferences*/}
6469

70+
### React Rally 2024 🐙 {/*react-rally-2024*/}
71+
August 12-13, 2024. Park City, UT, USA
72+
73+
[Website](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+
[Website](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+
[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)
87+
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)
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

+3-39
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,8 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
3030
* [Belo Horizonte](https://www.meetup.com/reactbh/)
3131
* [Curitiba](https://www.meetup.com/pt-br/ReactJS-CWB/)
3232
* [Florianópolis](https://www.meetup.com/pt-br/ReactJS-Floripa/)
33-
* [Goiânia](https://www.meetup.com/pt-br/React-Goiania/)
3433
* [Joinville](https://www.meetup.com/pt-BR/React-Joinville/)
35-
* [Juiz de Fora](https://www.meetup.com/pt-br/React-Juiz-de-Fora/)
36-
* [Maringá](https://www.meetup.com/pt-BR/React-Maringa/)
37-
* [Porto Alegre](https://www.meetup.com/pt-BR/React-Porto-Alegre/)
38-
* [Rio de Janeiro](https://www.meetup.com/pt-BR/React-Rio-de-Janeiro/)
39-
* [Salvador](https://www.meetup.com/pt-BR/ReactSSA)
4034
* [São Paulo](https://www.meetup.com/pt-BR/ReactJS-SP/)
41-
* [Vila Velha](https://www.meetup.com/pt-BR/React-ES/)
4235

4336
## Bolivia {/*bolivia*/}
4437
* [Bolivia](https://www.meetup.com/ReactBolivia/)
@@ -51,32 +44,20 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
5144
* [Saskatoon, SK](https://www.meetup.com/saskatoon-react-meetup/)
5245
* [Toronto, ON](https://www.meetup.com/Toronto-React-Native/events/)
5346

54-
## Chile {/*chile*/}
55-
* [Santiago](https://www.meetup.com/es-ES/react-santiago/)
56-
57-
## China {/*china*/}
58-
* [Beijing](https://www.meetup.com/Beijing-ReactJS-Meetup/)
59-
6047
## Colombia {/*colombia*/}
61-
* [Bogotá](https://www.meetup.com/meetup-group-iHIeHykY/)
6248
* [Medellin](https://www.meetup.com/React-Medellin/)
63-
* [Cali](https://www.meetup.com/reactcali/)
6449

6550
## Denmark {/*denmark*/}
6651
* [Aalborg](https://www.meetup.com/Aalborg-React-React-Native-Meetup/)
6752
* [Aarhus](https://www.meetup.com/Aarhus-ReactJS-Meetup/)
6853

69-
## Egypt {/*egypt*/}
70-
* [Cairo](https://www.meetup.com/react-cairo/)
71-
7254
## England (UK) {/*england-uk*/}
7355
* [Manchester](https://www.meetup.com/Manchester-React-User-Group/)
7456
* [React.JS Girls London](https://www.meetup.com/ReactJS-Girls-London/)
7557
* [React Advanced London](https://guild.host/react-advanced-london)
7658
* [React Native London](https://guild.host/RNLDN)
7759

7860
## France {/*france*/}
79-
* [Nantes](https://www.meetup.com/React-Nantes/)
8061
* [Lille](https://www.meetup.com/ReactBeerLille/)
8162
* [Paris](https://www.meetup.com/ReactJS-Paris/)
8263

@@ -93,9 +74,6 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
9374
* [Athens](https://www.meetup.com/React-To-React-Athens-MeetUp/)
9475
* [Thessaloniki](https://www.meetup.com/Thessaloniki-ReactJS-Meetup/)
9576

96-
## Hungary {/*hungary*/}
97-
* [Budapest](https://www.meetup.com/React-Budapest/)
98-
9977
## India {/*india*/}
10078
* [Ahmedabad](https://www.meetup.com/react-ahmedabad/)
10179
* [Bangalore (React)](https://www.meetup.com/ReactJS-Bangalore/)
@@ -117,6 +95,9 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
11795
## Italy {/*italy*/}
11896
* [Milan](https://www.meetup.com/React-JS-Milano/)
11997

98+
## Japan {/*japan*/}
99+
* [Osaka](https://react-osaka.connpass.com/)
100+
120101
## Kenya {/*kenya*/}
121102
* [Nairobi - Reactdevske](https://kommunity.com/reactjs-developer-community-kenya-reactdevske)
122103

@@ -138,12 +119,6 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
138119
* [Karachi](https://www.facebook.com/groups/902678696597634/)
139120
* [Lahore](https://www.facebook.com/groups/ReactjsLahore/)
140121

141-
## Panama {/*panama*/}
142-
* [Panama](https://www.meetup.com/React-Panama/)
143-
144-
## Peru {/*peru*/}
145-
* [Lima](https://www.meetup.com/ReactJS-Peru/)
146-
147122
## Philippines {/*philippines*/}
148123
* [Manila](https://www.meetup.com/reactjs-developers-manila/)
149124
* [Manila - ReactJS PH](https://www.meetup.com/ReactJS-Philippines/)
@@ -160,7 +135,6 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
160135

161136
## Spain {/*spain*/}
162137
* [Barcelona](https://www.meetup.com/ReactJS-Barcelona/)
163-
* [Canarias](https://www.meetup.com/React-Canarias/)
164138

165139
## Sweden {/*sweden*/}
166140
* [Goteborg](https://www.meetup.com/ReactJS-Goteborg/)
@@ -176,7 +150,6 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
176150
* [Kyiv](https://www.meetup.com/Kyiv-ReactJS-Meetup)
177151

178152
## US {/*us*/}
179-
* [Ann Arbor, MI - ReactJS](https://www.meetup.com/AnnArbor-jsx/)
180153
* [Atlanta, GA - ReactJS](https://www.meetup.com/React-ATL/)
181154
* [Austin, TX - ReactJS](https://www.meetup.com/ReactJS-Austin-Meetup/)
182155
* [Boston, MA - ReactJS](https://www.meetup.com/ReactJS-Boston/)
@@ -187,7 +160,6 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
187160
* [Cleveland, OH - ReactJS](https://www.meetup.com/Cleveland-React/)
188161
* [Columbus, OH - ReactJS](https://www.meetup.com/ReactJS-Columbus-meetup/)
189162
* [Dallas, TX - ReactJS](https://www.meetup.com/ReactDallas/)
190-
* [Dallas, TX - [Remote] React JS](https://www.meetup.com/React-JS-Group/)
191163
* [Detroit, MI - Detroit React User Group](https://www.meetup.com/Detroit-React-User-Group/)
192164
* [Indianapolis, IN - React.Indy](https://www.meetup.com/React-Indy)
193165
* [Irvine, CA - ReactJS](https://www.meetup.com/ReactJS-OC/)
@@ -197,27 +169,19 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
197169
* [Los Angeles, CA - ReactJS](https://www.meetup.com/socal-react/)
198170
* [Los Angeles, CA - React Native](https://www.meetup.com/React-Native-Los-Angeles/)
199171
* [Miami, FL - ReactJS](https://www.meetup.com/React-Miami/)
200-
* [Nashville, TN - ReactJS](https://www.meetup.com/NashReact-Meetup/)
201172
* [New York, NY - ReactJS](https://www.meetup.com/NYC-Javascript-React-Group/)
202173
* [New York, NY - React Ladies](https://www.meetup.com/React-Ladies/)
203174
* [New York, NY - React Native](https://www.meetup.com/React-Native-NYC/)
204175
* [New York, NY - useReactNYC](https://www.meetup.com/useReactNYC/)
205176
* [New York, NY - React.NYC](https://guild.host/react-nyc)
206-
* [Omaha, NE - ReactJS/React Native](https://www.meetup.com/omaha-react-meetup-group/)
207177
* [Palo Alto, CA - React Native](https://www.meetup.com/React-Native-Silicon-Valley/)
208-
* [Philadelphia, PA - ReactJS](https://www.meetup.com/Reactadelphia/)
209178
* [Phoenix, AZ - ReactJS](https://www.meetup.com/ReactJS-Phoenix/)
210-
* [Pittsburgh, PA - ReactJS/React Native](https://www.meetup.com/ReactPgh/)
211-
* [Portland, OR - ReactJS](https://www.meetup.com/Portland-ReactJS/)
212179
* [Provo, UT - ReactJS](https://www.meetup.com/ReactJS-Utah/)
213-
* [Sacramento, CA - ReactJS](https://www.meetup.com/Sacramento-ReactJS-Meetup/)
214180
* [San Diego, CA - San Diego JS](https://www.meetup.com/sandiegojs/)
215181
* [San Francisco - Real World React](https://www.meetup.com/Real-World-React)
216182
* [San Francisco - ReactJS](https://www.meetup.com/ReactJS-San-Francisco/)
217183
* [San Francisco, CA - React Native](https://www.meetup.com/React-Native-San-Francisco/)
218-
* [San Ramon, CA - TriValley Coders](https://www.meetup.com/trivalleycoders/)
219184
* [Santa Monica, CA - ReactJS](https://www.meetup.com/Los-Angeles-ReactJS-User-Group/)
220-
* [Seattle, WA - React Native](https://www.meetup.com/Seattle-React-Native-Meetup/)
221185
* [Seattle, WA - ReactJS](https://www.meetup.com/seattle-react-js/)
222186
* [Tampa, FL - ReactJS](https://www.meetup.com/ReactJS-Tampa-Bay/)
223187
* [Tucson, AZ - ReactJS](https://www.meetup.com/Tucson-ReactJS-Meetup/)

0 commit comments

Comments
 (0)