8000 Merge pull request #60 from reactjs/sync-bbb08a5a · reactjs/lo.react.dev@da49563 · GitHub
[go: up one dir, main page]
Skip to content

Commit da49563

Browse files
TheBrownTheBrown
authored
Merge pull request #60 from reactjs/sync-bbb08a5a
Sync with react.dev @ bbb08a5
2 parents 32a9048 + 4456c35 commit da49563

File tree

5 files changed

+72
-10
lines changed

5 files changed

+72
-10
lines changed

‎src/content/community/conferences.md

+60-5
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,37 @@ Do you know of a local React.js conference? Add it here! (Please keep the list c
1313
### App.js Conf 2024 {/*appjs-conf-2024*/}
1414
May 22 - 24, 2024. In-person in Kraków, Poland + remote
1515

16+
17+
[Website](https://appjs.co) - [Twitter](https://twitter.com/appjsconf)
18+
19+
### Render(ATL) 2024 🍑 {/*renderatl-2024-*/}
20+
June 12 - June 14, 2024. Atlanta, GA, USA
21+
22+
[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#/)
23+
24+
### React India 2024 {/*react-india-2024*/}
25+
October 17 - 19, 2024. In-person in Goa, India (hybrid event) + Oct 15 2024 - remote day
26+
27+
[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)
28+
29+
## Past Conferences {/*past-conferences*/}
30+
31+
### React Day Berlin 2023 {/*react-day-berlin-2023*/}
32+
December 8 & 12, 2023. In-person in Berlin, Germany + remote first interactivity (hybrid event)
33+
34+
[Website](https://reactday.berlin) - [Twitter](https://twitter.com/reactdayberlin) - [Facebook](https://www.facebook.com/reactdayberlin/) - [Videos](https://portal.gitnation.org/events/react-day-berlin-2023)
35+
36+
### React Summit US 2023 {/*react-summit-us-2023*/}
37+
November 13 & 15, 2023. In-person in New York, US + remote first interactivity (hybrid event)
38+
39+
[Website](https://reactsummit.us) - [Twitter](https://twitter.com/reactsummit) - [Facebook](https://www.facebook.com/reactamsterdam) - [Videos](https://portal.gitnation.org/events/react-summit-us-2023)
40+
41+
### reactjsday 2023 {/*reactjsday-2023*/}
42+
October 27th 2023. In-person in Verona, Italy and online (hybrid event)
43+
44+
[Website](https://2023.reactjsday.it/) - [Twitter](https://twitter.com/reactjsday) - [Facebook](https://www.facebook.com/GrUSP/) - [YouTube](https://www.youtube.com/c/grusp)
45+
46+
1647
[Website](https://appjs.co) - [Twitter](https://twitter.com/appjsconf)
1748

1849
### Render(ATL) 2024 🍑 {/*renderatl-2024-*/}
@@ -34,7 +65,7 @@ December 8 & 12, 2023. In-person in Berlin, Germany + remote first interactivity
3465

3566
### React Summit US 2023 {/*react-summit-us-2023*/}
3667
November 13 & 15, 2023. In-person in New York, US + remote first interactivity (hybrid event)
37-
=======
68+
3869
### React Paris 2024 {/*react-paris-2024*/}
3970
March 22, 2024. In-person in Paris, France + Remote (hybrid)
4071

@@ -48,6 +79,7 @@ April 19 - 20, 2024. In-person in Miami, FL, USA
4879
### App.js Conf 2024 {/*appjs-conf-2024*/}
4980
May 22 - 24, 2024. In-person in Kraków, Poland + remote
5081

82+
5183
[Website](https://appjs.co) - [Twitter](https://twitter.com/appjsconf)
5284

5385
### Render(ATL) 2024 🍑 {/*renderatl-2024-*/}
@@ -66,10 +98,14 @@ October 17 - 19, 2024. In-person in Goa, India (hybrid event) + Oct 15 2024 - re
6698

6799
[Website](https://reactsummit.us) - [Twitter](https://twitter.com/reactsummit) - [Facebook](https://www.facebook.com/reactamsterdam) - [Videos](https://portal.gitnation.org/events/react-summit-us-2023)
68100

69-
### reactjsday 2023 {/*reactjsday-2023*/}
70-
October 27th 2023. In-person in Verona, Italy and online (hybrid event)
101+
### React Brussels 2023 {/*react-brussels-2023*/}
102+
October 13th 2023. In-person in Brussels, Belgium + Remote (hybrid)
103+
104+
[Website](https://www.react.brussels/) - [Twitter](https://twitter.com/BrusselsReact)
71105

72-
[Website](https://2023.reactjsday.it/) - [Twitter](https://twitter.com/reactjsday) - [Facebook](https://www.facebook.com/GrUSP/) - [YouTube](https://www.youtube.com/c/grusp)
106+
107+
### React India 2023 {/*react-india-2023*/}
108+
October 5 - 7, 2023. In-person in Goa, India (hybrid event) + Oct 3 2023 - remote day
73109

74110
## Past Conferences {/*past-conferences*/}
75111

@@ -81,7 +117,25 @@ December 8 & 12, 2023. In-person in Berlin, Germany + remote first interactivity
81117
### React Summit US 2023 {/*react-summit-us-2023*/}
82118
November 13 & 15, 2023. In-person in New York, US + remote first interactivity (hybrid event)
83119

84-
[Website](https://reactsummit.us) - [Twitter](https://twitter.com/reactsummit) - [Facebook](https://www.facebook.com/reactamsterdam) - [Videos](https://portal.gitnation.org/events/react-summit-us-2023)
120+
121+
[Website](https://www.reactindia.io) - [Twitter](https://x.com/react_india) - [Facebook](https://www.facebook.com/ReactJSIndia) - [Youtube](https://www.youtube.com/channel/UCaFbHCBkPvVv1bWs_jwYt3w)
122+
123+
124+
### RenderCon Kenya 2023 {/*rendercon-kenya-2023*/}
125+
September 29 - 30, 2023. Nairobi, Kenya
126+
127+
[Website](https://rendercon.org/) - [Twitter](https://twitter.com/renderconke) - [LinkedIn](https://www.linkedin.com/company/renderconke/) - [YouTube](https://www.youtube.com/channel/UC0bCcG8gHUL4njDOpQGcMIA)
128+
129+
### React Live 2023 {/*react-live-2023*/}
130+
September 29, 2023. Amsterdam, Netherlands
131+
132+
[Website](https://reactlive.nl/)
133+
134+
### React Alicante 2023 {/*react-alicante-2023*/}
135+
September 28 - 30, 2023. Alicante, Spain
136+
137+
[Website](https://reactalicante.es/) - [Twitter](https://twitter.com/reactalicante)
138+
85139

86140
### React Brussels 2023 {/*react-brussels-2023*/}
87141
October 13th 2023. In-person in Brussels, Belgium + Remote (hybrid)
@@ -138,6 +192,7 @@ September 28 - 30, 2023. Alicante, Spain
138192

139193
[Website](https://reactalicante.es/) - [Twitter](https://twitter.com/reactalicante)
140194

195+
141196
### RedwoodJS Conference 2023 {/*redwoodjs-conference-2023*/}
142197
September 26 - 29, 2023. Grants Pass, Oregon + remote (hybrid event)
143198

‎src/content/learn/conditional-rendering.md

+4
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,11 @@ export default function PackingList() {
626626
627627
ສັງເກດທ່ານຕ້ອງຂຽນ `importance > 0 && ...` ແທນທີ່ຈະເປັນ `importance && ...` ສະນັ້ນຫາກ `importance` ເປັນ `0`, ຜົນລັບຈະບໍ່ສະແດງ `0`!
628628
629+
<<<<<<< HEAD
629630
ໃນວິທີການນີ້, ຈະໃຊ້ເງື່ອນໄຂສອງເງື່ອນໄຂແຍກກັນເພື່ອໃສ່ຊ່ອງວ່າງລະຫວ່າງຊື່ ແລະ label. ອີກວິທີໜຶ່ງ, ທ່ານສາມາດໃຊ້ fragment ທີ່ມີຊ່ອງວ່າງນຳໜ້າ: `importance > 0 && <> <i>...</i></>` ຫຼື ເພີ່ມຊ່ອງວ່າງພາຍໃນ `importance > 0 && <> <i>...</i></>`.
631+
=======
632+
In this solution, two separate conditions are used to insert a space between the name and the importance label. Alternatively, you could use a Fragment with a leading space: `importance > 0 && <> <i>...</i></>` or add a space immediately inside the `<i>`: `importance > 0 && <i> ...</i>`.
633+
>>>>>>> bbb08a5a04b0221137e5d60472fc979747af2954
630634
631635
632636
</Solution>

‎src/content/learn/importing-and-exporting-components.md

+2
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ img { margin: 0 10px 10px 0; height: 90px; }
6868

6969
<Sandpack>
7070

71+
72+
7173
```js App.js
7274

7375
import Gallery from './Gallery.js';

‎src/content/learn/rendering-lists.md

+5
Original file line numberDiff line numberDiff line change
@@ -1153,6 +1153,7 @@ hr {
11531153

11541154

11551155

1156+
11561157
</Hint>
11571158

11581159
<Solution>
@@ -1214,9 +1215,11 @@ hr {
12141215

12151216
ການໃຊ້ index ແຖວເກົ່າເປັນ `key` ບໍ່ເຮັດວຽກອີກຕໍ່ໄປເພາະວ່າແຕ່ລະໂຕຂັ້ນ ແລະ ຫຍໍ້ໜ້າແຕ່ລະໂຕຢູ່ໃນ array ດຽວກັນ. ເຖິງຢ່າງໃດກໍຕາມ, ທ່ານສາມາດກຳນົດ key ທີ່ແຕກຕ່າງກັນໃຫ້ແຕ່ລະລາຍການໄດ້ໂດຍໃຊ້ຄຳຕໍ່ທ້າຍເຊັ່ນ `key={i + '-text'}`.
12161217

1218+
12171219
ອີກວິທີໜຶ່ງ, ທ່ານສາມາດສະແດງຜົນ collection ຂອງ fragment ທີ່ປະກອບມີ `<hr />` and `<p>...</p>`. ເຖິງຢ່າງໃດກໍຕາມ, syntax `<>...</>` ບໍ່ຮອງຮັບການສົ່ງຜ່ານ key, ດັ່ງນັ້ນທ່ານຕ້ອງໄດ້ຂຽນ `<Fragment>` ຢ່າງຊັດເຈນ:
12181220

12191221

1222+
12201223
<Sandpack>
12211224

12221225
```js
@@ -1261,11 +1264,13 @@ hr {
12611264

12621265
</Sandpack>
12631266

1267+
12641268
ຈື່ໄວ້ວ່າ, fragment (ມັກຂຽນເປັນ `<> </>`) ໃຫ້ທ່ານ group JSX node ໂດຍບໍ່ຕ້ອງເພີ່ມ `<div>`!
12651269

12661270

12671271

12681272

1273+
12691274
</Solution>
12701275

12711276
</Challenges>

‎src/content/learn/start-a-new-react-project.md

+1-5
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,8 @@ title: ເລີ່ມ Project React ໃໝ່
2424
npx create-next-app@latest
2525
</TerminalBlock>
2626

27-
<<<<<<< HEAD
28-
ຖ້າທ່ານຍັງໃໝ່ສຳລັບ Next.js, ເບິ່ງ [ຄູ່ມື Next.js .](https://nextjs.org/learn/foundations/about-nextjs)
29-
=======
30-
If you're new to Next.js, check out the [learn Next.js course.](https://nextjs.org/learn)
31-
>>>>>>> 303ecae3dd4c7b570cf18e0115b94188f6aad5a1
3227

28+
ຖ້າທ່ານຍັງໃໝ່ສຳລັບ Next.js, ເບິ່ງ [ຄູ່ມື Next.js .](https://nextjs.org/learn/foundations/about-nextjs)
3329

3430

3531
Next.js ດູແລໂດຍ [Vercel](https://vercel.com/). ທ່ານສາມາດ [deploy Next.js app](https://nextjs.org/docs/deployment) ໃສ່ໃນ Node.js ຫຼື serverless hosting, ຫຼື server ຂອງທ່ານເອງ. [Fully static Next.js apps](https://nextjs.org/docs/advanced-features/static-html-export) ສາມາດ deploy ໃສ່ໃນ static hosting ໃດກໍ່ໄດ້.

0 commit comments

Comments
 (0)
0