Skip to content

Commit 5dbae25

Browse files
authored
Merge branch 'main' into sync-bd87c394
2 parents 536af6a + 253b1e9 commit 5dbae25

File tree

9 files changed

+94
-50
lines changed

9 files changed

+94
-50
lines changed
168 KB
Loading

src/components/Layout/Page.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {useRouter} from 'next/router';
1515
import {SidebarNav} from './SidebarNav';
1616
import {Footer} from './Footer';
1717
import {Toc} from './Toc';
18-
// import SocialBanner from '../SocialBanner';
18+
import SocialBanner from '../SocialBanner';
1919
import {DocsPageFooter} from 'components/DocsFooter';
2020
import {Seo} from 'components/Seo';
2121
import PageHeading from 'components/PageHeading';

src/components/PageHeading.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ function PageHeading({
3434
tags = [],
3535
breadcrumbs,
3636
}: PageHeadingProps) {
37+
console.log('version', version);
3738
return (
3839
<div className="px-5 sm:px-12 pt-3.5">
3940
<div className="max-w-4xl ms-0 2xl:mx-auto">

src/content/community/conferences.md

Lines changed: 63 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ February 12-13, 2026. In-person in New Delhi, India
5959
### React Paris 2026 {/*react-paris-2026*/}
6060
March 26 - 27, 2026. In-person in Paris, France (hybrid event)
6161

62-
[Website](https://react.paris/) - [Twitter](https://x.com/BeJS_)
62+
[Website](https://www.reactuniverseconf.com/) - [Twitter](https://twitter.com/react_native_eu) - [LinkedIn](https://www.linkedin.com/events/reactuniverseconf7163919537074118657/)
6363

6464

6565
### CityJS London 2026 {/*cityjs-london-2026*/}
@@ -76,10 +76,69 @@ July 03 - 05, 2025. In-person in Bangalore, India
7676

7777
[Website](https://reactnexus.com/) - [Twitter](https://x.com/ReactNexus) - [Bluesky](https://bsky.app/profile/reactnexus.com) - [Linkedin](https://www.linkedin.com/company/react-nexus) - [YouTube](https://www.youtube.com/reactify_in)
7878

79-
### React Summit 2025 {/*react-summit-2025*/}
80-
June 13 - 17, 2025. In-person in Amsterdam, Netherlands + remote (hybrid event)
79+
[Website](https://reactsummit.us/) - [Twitter](https://x.com/reactsummit)
80+
81+
### React Advanced London 2025 {/*react-advanced-london-2025*/}
82+
November 28 & December 1, 2025. In-person in London, UK + online (hybrid event)
83+
84+
[Website](https://reactadvanced.com/) - [Twitter](https://x.com/reactadvanced)
85+
86+
### CityJS Singapore 2026 {/*cityjs-singapore-2026*/}
87+
February 4-6, 2026. In-person in Singapore
88+
89+
[Website](https://india.cityjsconf.org/) - [Twitter](https://x.com/cityjsconf) - [Bluesky](https://bsky.app/profile/cityjsconf.bsky.social)
90+
91+
### CityJS New Delhi 2026 {/*cityjs-newdelhi-2026*/}
92+
February 12-13, 2026. In-person in New Delhi, India
93+
94+
[Website](https://india.cityjsconf.org/) - [Twitter](https://x.com/cityjsconf) - [Bluesky](https://bsky.app/profile/cityjsconf.bsky.social)
95+
96+
97+
### React Paris 2026 {/*react-paris-2026*/}
98+
March 26 - 27, 2026. In-person in Paris, France (hybrid event)
99+
100+
[Website](https://www.reactuniverseconf.com/) - [Twitter](https://twitter.com/react_native_eu) - [LinkedIn](https://www.linkedin.com/events/reactuniverseconf7163919537074118657/)
101+
102+
103+
### CityJS London 2026 {/*cityjs-london-2026*/}
104+
April 14-17, 2026. In-person in London
105+
106+
[Website](https://india.cityjsconf.org/) - [Twitter](https://x.com/cityjsconf) - [Bluesky](https://bsky.app/profile/cityjsconf.bsky.social)
107+
108+
109+
## Past Conferences {/*past-conferences*/}
110+
111+
112+
### React Norway 2025 {/*react-norway-2025*/}
113+
June 13, 2025. In-person in Oslo, Norway + remote (virtual event)
114+
115+
[Website](https://reactnorway.com/) - [Twitter](https://x.com/ReactNorway)
116+
117+
### CityJS Athens 2025 {/*cityjs-athens*/}
118+
May 27 - 31, 2025. In-person in Athens, Greece
119+
120+
[Website](https://athens.cityjsconf.org/) - [Twitter](https://x.com/cityjsconf) - [Bluesky](https://bsky.app/profile/cityjsconf.bsky.social)
121+
122+
### App.js Conf 2025 {/*appjs-conf-2025*/}
123+
May 28 - 30, 2025. In-person in Kraków, Poland + remote
124+
125+
[Website](https://appjs.co) - [Twitter](https://twitter.com/appjsconf)
126+
127+
### CityJS London 2025 {/*cityjs-london*/}
128+
April 23 - 25, 2025. In-person in London, UK
129+
130+
[Website](https://london.cityjsconf.org/) - [Twitter](https://x.com/cityjsconf) - [Bluesky](https://bsky.app/profile/cityjsconf.bsky.social)
131+
132+
### React Paris 2025 {/*react-paris-2025*/}
133+
March 20 - 21, 2025. In-person in Paris, France (hybrid event)
134+
135+
[Website](https://react.paris/) - [Twitter](https://x.com/BeJS_) - [YouTube](https://www.youtube.com/playlist?list=PL53Z0yyYnpWitP8Zv01TSEQmKLvuRh_Dj)
136+
137+
### React Native Connection 2025 {/*react-native-connection-2025*/}
138+
April 3 (Reanimated Training) + April 4 (Conference), 2025. Paris, France.
139+
140+
[Website](https://reactnativeconnection.io/) - [X](https://x.com/reactnativeconn) - [Bluesky](https://bsky.app/profile/reactnativeconnect.bsky.social)
81141

82-
[Website](https://reactsummit.com/) - [Twitter](https://x.com/reactsummit)
83142

84143
### React Norway 2025 {/*react-norway-2025*/}
85144
June 13, 2025. In-person in Oslo, Norway + remote (virtual event)

src/content/learn/installation.md

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,57 @@
11
---
2-
title: Installation
2+
title: Ufungaji
33
---
44

55
<Intro>
66

7-
React has been designed from the start for gradual adoption. You can use as little or as much React as you need. Whether you want to get a taste of React, add some interactivity to an HTML page, or start a complex React-powered app, this section will help you get started.
7+
React imeundwa tangu mwanzo ili uweze kuitumia unapotaka. Unaweza kutumia React kidogo au nyingi kadri unavyohitaji. Iwe unataka kupata ladha ya React, ongeza mwingiliano fulani kwenye ukurasa wa HTML, au uanzishe programu changamano inayoendeshwa na React, sehemu hii itakusaidia kuanza.
88

99
</Intro>
1010

11-
## Try React {/*try-react*/}
11+
## Jaribu React {/*try-react*/}
1212

13-
You don't need to install anything to play with React. Try editing this sandbox!
13+
Huhitaji kusakinisha chochote ili kucheza na React. Jaribu kuhariri katika mazingira haya ya majaribio!
1414

1515
<Sandpack>
1616

1717
```js
1818
function Greeting({ name }) {
19-
return <h1>Hello, {name}</h1>;
19+
return <h1>Habari, {name}</h1>;
2020
}
2121

2222
export default function App() {
23-
return <Greeting name="world" />
23+
return <Greeting name="dunia" />
2424
}
2525
```
2626

2727
</Sandpack>
2828

29-
You can edit it directly or open it in a new tab by pressing the "Fork" button in the upper right corner.
29+
Unaweza kuihariri moja kwa moja au kuifungua kwenye kichupo kipya kwa kubonyeza kitufe cha "Fork" kwenye kona ya juu kilia.
3030

31-
Most pages in the React documentation contain sandboxes like this. Outside of the React documentation, there are many online sandboxes that support React: for example, [CodeSandbox](https://codesandbox.io/s/new), [StackBlitz](https://stackblitz.com/fork/react), or [CodePen.](https://codepen.io/pen?template=QWYVwWN)
31+
Kurasa nyingi katika hati za React zina mazingira ya majaribio kama hii. Nje ya hati za React, kuna mazingira ya majaribio mengi mtandaoni vinavyotumia React: kwa mfano, [CodeSandbox](https://codesandbox.io/s/new), [StackBlitz](https://stackblitz.com/fork/react), or [CodePen.](https://codepen.io/pen?template=QWYVwWN)
3232

33-
To try React locally on your computer, [download this HTML page.](https://gist.githubusercontent.com/gaearon/0275b1e1518599bbeafcde4722e79ed1/raw/db72dcbf3384ee1708c4a07d3be79860db04bff0/example.html) Open it in your editor and in your browser!
33+
Ili kujaribu React kwenye kompyuta yako [download this HTML page.](https://gist.githubusercontent.com/gaearon/0275b1e1518599bbeafcde4722e79ed1/raw/db72dcbf3384ee1708c4a07d3be79860db04bff0/example.html) Ifungue kwenye kihariri chako na kwenye kivinjari chako!
3434

35-
## Creating a React App {/*creating-a-react-app*/}
35+
## Kuunda Programu ya React {/*creating-a-react-app*/}
3636

37-
If you want to start a new React app, you can [create a React app](/learn/creating-a-react-app) using a recommended framework.
37+
Ikiwa ungependa kuanzisha programu mpya ya React, unaweza [kuunda programu ya React](/learn/creating-a-react-app) kwa kutumia mfumo uliopendekezwa.
3838

39-
## Build a React App from Scratch {/*build-a-react-app-from-scratch*/}
39+
## Unda Programu ya React kutoka Mwanzo {/*build-a-react-app-from-scratch*/}
4040

41-
If a framework is not a good fit for your project, you prefer to build your own framework, or you just want to learn the basics of a React app you can [build a React app from scratch](/learn/build-a-react-app-from-scratch).
41+
Ikiwa mfumo haufai mradi wako, unapendelea kuunda mfumo wako mwenyewe, au unataka tu kujifunza misingi ya programu ya React unayoweza [kuunda programu ya React kuanzia mwanzo](/learn/build-a-react-app-from-scratch).
4242

43-
## Add React to an existing project {/*add-react-to-an-existing-project*/}
44-
45-
If want to try using React in your existing app or a website, you can [add React to an existing project.](/learn/add-react-to-an-existing-project)
43+
## Ongeza React kwa mradi uliopo {/*add-react-to-an-existing-project*/}
4644

45+
Ikiwa ungependa kujaribu kutumia React katika programu yako iliyopo au tovuti, unaweza [kuongeza React kwa mradi uliopo.](/learn/add-react-to-an-existing-project)
4746

4847
<Note>
4948

50-
#### Should I use Create React App? {/*should-i-use-create-react-app*/}
49+
#### Nafaa kutumia Create React App {/*should-i-use-create-react-app*/}
5150

52-
No. Create React App has been deprecated. For more information, see [Sunsetting Create React App](/blog/2025/02/14/sunsetting-create-react-app).
51+
Hapana. Create React App imeacha kutumika. Kwa maelezo zaidi, angalia [Machweo Create React App](/blog/2025/02/14/sunsetting-create-react-app).
5352

5453
</Note>
5554

56-
## Next steps {/*next-steps*/}
57-
58-
Head to the [Quick Start](/learn) guide for a tour of the most important React concepts you will encounter every day.
55+
## Hatua zinazofuata {/*next-steps*/}
5956

57+
Nenda kwenye mwongozo wa [Kuanza Haraka](/learn) kwa ziara ya dhana muhimu zaidi za React utakazokutana nazo kila siku.

src/content/learn/tutorial-tic-tac-toe.md

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -283,15 +283,9 @@ Katika CodeSandbox utaona sehemu tatu kuu:
283283

284284
![CodeSandbox na msimbo wa mwanzo](../images/tutorial/react-starter-code-codesandbox.png)
285285

286-
<<<<<<< HEAD
287286
1. Sehemu ya _Files_ na orodha ya mafaili kama `App.js`, `index.js`, `styles.css` na folda inayoitwa `public`
288287
1. _Kihariri cha msimbo_ ambapo utaona msimbo wa chanzo wa faili uliyouchagua
289288
1. Sehemu ya _kivinjari_ ambapo utaona jinsi msimbo ulioandika utakavyonyeshwa
290-
=======
291-
1. The _Files_ section with a list of files like `App.js`, `index.js`, `styles.css` in `src` folder and a folder called `public`
292-
1. The _code editor_ where you'll see the source code of your selected file
293-
1. The _browser_ section where you'll see how the code you've written will be displayed
294-
>>>>>>> bd87c394dc1daf0e54759126f847fcfa927e5a75
295289

296290
Faili ya `App.js` inapaswa kuchaguliwa katika sehemu ya _Files_. Maudhui ya faili hiyo katika _mhariri wa msimbo_ yanapaswa kuwa:
297291

@@ -2253,11 +2247,7 @@ body {
22532247
22542248
</Sandpack>
22552249
2256-
<<<<<<< HEAD
22572250
Unapozunguka kupitia orodha ya `history` ndani ya function unayopitisha kwa `map`, hoja ya `squares` inapitia kila kipengele cha `history`, na hoja ya `move` inapitia kila kiashiria cha orodha: `0`, `1`, `2`, …. (Katika hali nyingi, ungehitaji vipengele halisi vya orodha, lakini ili kuonyesha orodha ya harakati utahitaji tu viashiria.)
2258-
=======
2259-
As you iterate through the `history` array inside the function you passed to `map`, the `squares` argument goes through each element of `history`, and the `move` argument goes through each array index: `0`, `1`, `2`, …. (In most cases, you'd need the actual array elements, but to render a list of moves you will only need indexes.)
2260-
>>>>>>> bd87c394dc1daf0e54759126f847fcfa927e5a75
22612251
22622252
Kwa kila harakati katika historia ya mchezo wa tic-tac-toe, unaunda kipengele cha orodha `<li>` kinachojumuisha kitufe `<button>`. Kitufe kinakuwa na kihariri cha `onClick` kinachoitwa function inayoitwa `jumpTo` (ambayo huja kuwa umeitekeleza bado).
22632253

src/content/reference/react/useEffectEvent.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -551,4 +551,4 @@ useEffect(() => {
551551
}, []);
552552
```
553553

554-
Effect Events are specifically designed to be used in Effects local to the component they're defined in. If you need a callback for event handlers or to pass to children, use a regular function or `useCallback` instead.
554+
Effect Events are specifically designed to be used in Effects local to the component they're defined in. If you need a callback for event handlers or to pass to children, use a regular function or `useCallback` instead.

src/sidebarReference.json

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,6 @@
177177
]
178178
},
179179
{
180-
<<<<<<< HEAD
181180
"title": "Directives",
182181
"path": "/reference/react/directives",
183182
"canary": true,
@@ -188,16 +187,13 @@
188187
"canary": true
189188
},
190189
{
191-
"title": "'use server'",
192-
"path": "/reference/react/use-server",
193-
"canary": true
194-
190+
"title": "unstable_addTransitionType",
191+
"path": "/reference/react/addTransitionType",
192+
"version": "experimental"
195193
}
196194
]
197195
},
198196
{
199-
=======
200-
>>>>>>> 9e1f5cd590fd066e72dda9022237bee30b499951
201197
"hasSectionHeader": true,
202198
"sectionHeader": "react-dom@{{version}}"
203199
},

yarn.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2939,9 +2939,9 @@ didyoumean@^1.2.2:
29392939
integrity sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==
29402940

29412941
diff@^5.0.0:
2942-
version "5.1.0"
2943-
resolved "https://registry.npmjs.org/diff/-/diff-5.1.0.tgz"
2944-
integrity sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==
2942+
version "5.2.2"
2943+
resolved "https://registry.yarnpkg.com/diff/-/diff-5.2.2.tgz#0a4742797281d09cfa699b79ea32d27723623bad"
2944+
integrity sha512-vtcDfH3TOjP8UekytvnHH1o1P4FcUdt4eQ1Y+Abap1tk/OB2MWQvcwS2ClCd1zuIhc3JKOx6p3kod8Vfys3E+A==
29452945

29462946
dir-glob@^3.0.1:
29472947
version "3.0.1"
@@ -4933,9 +4933,9 @@ lodash.truncate@^4.4.2:
49334933
integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=
49344934

49354935
lodash@^4.17.15, lodash@^4.17.20:
4936-
version "4.17.21"
4937-
resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"
4938-
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
4936+
version "4.17.23"
4937+
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.23.tgz#f113b0378386103be4f6893388c73d0bde7f2c5a"
4938+
integrity sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==
49394939

49404940
log-update@^4.0.0:
49414941
version "4.0.0"

0 commit comments

Comments
 (0)