Skip to content

Commit 23f457d

Browse files
authored
Merge branch 'main' into sync-169d5c18
2 parents d212f5f + 3b8a6f3 commit 23f457d

10 files changed

Lines changed: 130 additions & 29 deletions

File tree

public/rss.xml

Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
1+
<?xml version="1.0" encoding="UTF-8"?><rss xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:atom="http://www.w3.org/2005/Atom" version="2.0">
2+
<channel>
3+
<title><![CDATA[React Blog]]></title>
4+
<description><![CDATA[This blog is the official source for the updates from the React team. Anything important, including release notes or deprecation notices, will be posted here first.]]></description>
5+
<link>https://react.dev/</link>
6+
<generator>react.dev rss module</generator>
7+
<lastBuildDate>Mon, 19 Aug 2024 13:10:21 GMT</lastBuildDate>
8+
<atom:link href="https://react.dev/rss.xml" rel="self" type="application/rss+xml"/>
9+
<pubDate>Mon, 19 Aug 2024 13:10:21 GMT</pubDate>
10+
<language><![CDATA[en]]></language>
11+
<item>
12+
<title><![CDATA[React Conf 2024 Recap]]></title>
13+
<description><![CDATA[Last week we hosted React Conf 2024, a two-day conference in Henderson, Nevada where 700+ attendees gathered in-person to discuss the latest in UI engineering. In this post, we'll summarize the talks and announcements from the event.]]></description>
14+
<link>https://react.dev/blog/2024/05/22/react-conf-2024-recap</link>
15+
<guid isPermaLink="true">https://react.dev/blog/2024/05/22/react-conf-2024-recap</guid>
16+
<dc:creator><![CDATA[Ricky Hanlon]]></dc:creator>
17+
<pubDate>Tue, 21 May 2024 19:00:00 GMT</pubDate>
18+
</item>
19+
<item>
20+
<title><![CDATA[React 19 RC]]></title>
21+
<description><![CDATA[React 19 RC is now available on npm! In this post, we'll give an overview of the new features in React 19, and how you can adopt them.]]></description>
22+
<link>https://react.dev/blog/2024/04/25/react-19</link>
23+
<guid isPermaLink="true">https://react.dev/blog/2024/04/25/react-19</guid>
24+
<dc:creator><![CDATA[The React Team]]></dc:creator>
25+
<pubDate>Wed, 24 Apr 2024 19:00:00 GMT</pubDate>
26+
</item>
27+
<item>
28+
<title><![CDATA[React 19 RC Upgrade Guide]]></title>
29+
<description><![CDATA[The improvements added to React 19 require some breaking changes, but we've worked to make the upgrade as smooth as possible and we don't expect the changes to impact most apps. In this post, we will guide you through the steps for upgrading apps and libraries to React 19.]]></description>
30+
<link>https://react.dev/blog/2024/04/25/react-19-upgrade-guide</link>
31+
<guid isPermaLink="true">https://react.dev/blog/2024/04/25/react-19-upgrade-guide</guid>
32+
<dc:creator><![CDATA[Ricky Hanlon]]></dc:creator>
33+
<pubDate>Wed, 24 Apr 2024 19:00:00 GMT</pubDate>
34+
</item>
35+
<item>
36+
<title><![CDATA[React Labs: What We've Been Working On – February 2024]]></title>
37+
<description><![CDATA[In React Labs posts, we write about projects in active research and development. We’ve made significant progress since our last update, and we’d like to share our progress.]]></description>
38+
<link>https://react.dev/blog/2024/02/15/react-labs-what-we-have-been-working-on-february-2024</link>
39+
<guid isPermaLink="true">https://react.dev/blog/2024/02/15/react-labs-what-we-have-been-working-on-february-2024</guid>
40+
<dc:creator><![CDATA[Joseph Savona, Ricky Hanlon, Andrew Clark, Matt Carroll, and Dan Abramov]]></dc:creator>
41+
<pubDate>Wed, 14 Feb 2024 18:00:00 GMT</pubDate>
42+
</item>
43+
<item>
44+
<title><![CDATA[React Canaries: Enabling Incremental Feature Rollout Outside Meta]]></title>
45+
<description><![CDATA[We'd like to offer the React community an option to adopt individual new features as soon as their design is close to final, before they're released in a stable version--similar to how Meta has long used bleeding-edge versions of React internally. We are introducing a new officially supported [Canary release channel](/community/versioning-policy#canary-channel). It lets curated setups like frameworks decouple adoption of individual React features from the React release schedule.]]></description>
46+
<link>https://react.dev/blog/2023/05/03/react-canaries</link>
47+
<guid isPermaLink="true">https://react.dev/blog/2023/05/03/react-canaries</guid>
48+
<dc:creator><![CDATA[Dan Abramov, Sophie Alpert, Rick Hanlon, Sebastian Markbage, and Andrew Clark]]></dc:creator>
49+
<pubDate>Tue, 02 May 2023 18:00:00 GMT</pubDate>
50+
</item>
51+
<item>
52+
<title><![CDATA[React Labs: What We've Been Working On – March 2023]]></title>
53+
<description><![CDATA[In React Labs posts, we write about projects in active research and development. We've made significant progress on them since our last update, and we'd like to share what we learned.]]></description>
54+
<link>https://react.dev/blog/2023/03/22/react-labs-what-we-have-been-working-on-march-2023</link>
55+
<guid isPermaLink="true">https://react.dev/blog/2023/03/22/react-labs-what-we-have-been-working-on-march-2023</guid>
56+
<dc:creator><![CDATA[Joseph Savona, Josh Story, Lauren Tan, Mengdi Chen, Samuel Susla, Sathya Gunasekaran, Sebastian Markbage, and Andrew Clark]]></dc:creator>
57+
<pubDate>Tue, 21 Mar 2023 18:00:00 GMT</pubDate>
58+
</item>
59+
<item>
60+
<title><![CDATA[Introducing react.dev]]></title>
61+
<description><![CDATA[Today we are thrilled to launch react.dev, the new home for React and its documentation. In this post, we would like to give you a tour of the new site.]]></description>
62+
<link>https://react.dev/blog/2023/03/16/introducing-react-dev</link>
63+
<guid isPermaLink="true">https://react.dev/blog/2023/03/16/introducing-react-dev</guid>
64+
<dc:creator><![CDATA[Dan Abramov and Rachel Nabors]]></dc:creator>
65+
<pubDate>Wed, 15 Mar 2023 18:00:00 GMT</pubDate>
66+
</item>
67+
<item>
68+
<title><![CDATA[React Labs: What We've Been Working On – June 2022]]></title>
69+
<description><![CDATA[React 18 was years in the making, and with it brought valuable lessons for the React team. Its release was the result of many years of research and exploring many paths. Some of those paths were successful; many more were dead-ends that led to new insights. One lesson we’ve learned is that it’s frustrating for the community to wait for new features without having insight into these paths that we’re exploring.]]></description>
70+
<link>https://react.dev/blog/2022/06/15/react-labs-what-we-have-been-working-on-june-2022</link>
71+
<guid isPermaLink="true">https://react.dev/blog/2022/06/15/react-labs-what-we-have-been-working-on-june-2022</guid>
72+
<dc:creator><![CDATA[Andrew Clark, Dan Abramov, Jan Kassens, Joseph Savona, Josh Story, Lauren Tan, Luna Ruan, Mengdi Chen, Rick Hanlon, Robert Zhang, Sathya Gunasekaran, Sebastian Markbage, and Xuan Huang]]></dc:creator>
73+
<pubDate>Tue, 14 Jun 2022 18:00:00 GMT</pubDate>
74+
</item>
75+
<item>
76+
<title><![CDATA[React v18.0]]></title>
77+
<description><![CDATA[React 18 is now available on npm! In our last post, we shared step-by-step instructions for upgrading your app to React 18. In this post, we'll give an overview of what's new in React 18, and what it means for the future.]]></description>
78+
<link>https://react.dev/blog/2022/03/29/react-v18</link>
79+
<guid isPermaLink="true">https://react.dev/blog/2022/03/29/react-v18</guid>
80+
<dc:creator><![CDATA[The React Team]]></dc:creator>
81+
<pubDate>Mon, 07 Mar 2022 18:00:00 GMT</pubDate>
82+
</item>
83+
<item>
84+
<title><![CDATA[How to Upgrade to React 18]]></title>
85+
<description><![CDATA[As we shared in the release post, React 18 introduces features powered by our new concurrent renderer, with a gradual adoption strategy for existing applications. In this post, we will guide you through the steps for upgrading to React 18.]]></description>
86+
<link>https://react.dev/blog/2022/03/08/react-18-upgrade-guide</link>
87+
<guid isPermaLink="true">https://react.dev/blog/2022/03/08/react-18-upgrade-guide</guid>
88+
<dc:creator><![CDATA[Rick Hanlon]]></dc:creator>
89+
<pubDate>Mon, 07 Mar 2022 18:00:00 GMT</pubDate>
90+
</item>
91+
<item>
92+
<title><![CDATA[React Conf 2021 Recap]]></title>
93+
<description><![CDATA[Last week we hosted our 6th React Conf. In previous years, we've used the React Conf stage to deliver industry changing announcements such as React Native and React Hooks. This year, we shared our multi-platform vision for React, starting with the release of React 18 and gradual adoption of concurrent features.]]></description>
94+
<link>https://react.dev/blog/2021/12/17/react-conf-2021-recap</link>
95+
<guid isPermaLink="true">https://react.dev/blog/2021/12/17/react-conf-2021-recap</guid>
96+
<dc:creator><![CDATA[Jesslyn Tannady and Rick Hanlon]]></dc:creator>
97+
<pubDate>Thu, 16 Dec 2021 18:00:00 GMT</pubDate>
98+
</item>
99+
<item>
100+
<title><![CDATA[The Plan for React 18]]></title>
101+
<description><![CDATA[The React team is excited to share a few updates. We’ve started work on the React 18 release, which will be our next major version. We’ve created a Working Group to prepare the community for gradual adoption of new features in React 18. We’ve published a React 18 Alpha so that library authors can try it and provide feedback...]]></description>
102+
<link>https://react.dev/blog/2021/06/08/the-plan-for-react-18</link>
103+
<guid isPermaLink="true">https://react.dev/blog/2021/06/08/the-plan-for-react-18</guid>
104+
<dc:creator><![CDATA[Andrew Clark, Brian Vaughn, Christine Abernathy, Dan Abramov, Rachel Nabors, Rick Hanlon, Sebastian Markbage, and Seth Webster]]></dc:creator>
105+
<pubDate>Mon, 07 Jun 2021 18:00:00 GMT</pubDate>
106+
</item>
107+
<item>
108+
<title><![CDATA[Introducing Zero-Bundle-Size React Server Components]]></title>
109+
<description><![CDATA[2020 has been a long year. As it comes to an end we wanted to share a special Holiday Update on our research into zero-bundle-size React Server Components.]]></description>
110+
<link>https://react.dev/blog/2020/12/21/data-fetching-with-react-server-components</link>
111+
<guid isPermaLink="true">https://react.dev/blog/2020/12/21/data-fetching-with-react-server-components</guid>
112+
<dc:creator><![CDATA[Dan Abramov, Lauren Tan, Joseph Savona, and Sebastian Markbage]]></dc:creator>
113+
<pubDate>Sun, 20 Dec 2020 18:00:00 GMT</pubDate>
114+
</item>
115+
</channel>
116+
</rss>

src/components/SocialBanner.tsx

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,9 @@ import {useRef, useEffect} from 'react';
77
import cn from 'classnames';
88
import {ExternalLink} from './ExternalLink';
99

10-
<<<<<<< HEAD
11-
const bannerText = 'Украинаны қолдаңыз 🇺🇦';
12-
const bannerLink = 'https://opensource.fb.com/support-ukraine';
13-
const bannerLinkText = 'Украинаға гуманитарлық көмек көрсетуге көмектесіңіз';
14-
=======
1510
const bannerText = 'Stream React Conf on May 15-16.';
1611
const bannerLink = 'https://conf.react.dev/';
1712
const bannerLinkText = 'Learn more.';
18-
>>>>>>> c3bc5affa0e7452e306c785af11798d16b4f6dd4
1913

2014
export default function SocialBanner() {
2115
const ref = useRef<HTMLDivElement | null>(null);

src/content/community/conferences.md

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,15 @@ 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-
<<<<<<< HEAD
1413
### React Paris 2024 {/*react-paris-2024*/}
1514
March 22, 2024. In-person in Paris, France + Remote (hybrid)
1615

1716
[Website](https://react.paris/) - [Twitter](https://twitter.com/BeJS_) - [LinkedIn](https://www.linkedin.com/events/7150816372074192900/comments/)
1817

19-
<<<<<<< HEAD
20-
=======
2118
### Epic Web Conf 2024 {/*epic-web-2024*/}
2219
April 10 - 11, 2024. In-person in Park City, UT, USA
2320

2421
[Website](https://www.epicweb.dev/conf) - [YouTube](https://www.youtube.com/@EpicWebDev)
25-
>>>>>>> c3bc5affa0e7452e306c785af11798d16b4f6dd4
2622

2723
### React Miami 2024 {/*react-miami-2024*/}
2824
April 19 - 20, 2024. In-person in Miami, FL, USA
@@ -49,13 +45,12 @@ May 22 - 24, 2024. In-person in Kraków, Poland + remote
4945

5046
[Website](https://appjs.co) - [Twitter](https://twitter.com/appjsconf)
5147

48+
5249
### Frontend Nation 2024 {/*frontend-nation-2024*/}
5350
June 4 - 7, 2024. Online
5451

5552
[Website](https://frontendnation.com/) - [Twitter](https://twitter.com/frontendnation)
5653

57-
=======
58-
>>>>>>> 169d5c1820cd1514429bfac2a923e51dd782d37e
5954
### React Summit 2024 {/*react-summit-2024*/}
6055
June 14 & 18, 2024. In-person in Amsterdam, Netherlands + remote (hybrid event)
6156

@@ -86,11 +81,6 @@ July 25, 2024. In-person in Berlin, Germany + remote (hybrid event)
8681

8782
[Website](https://thegeekconf.com) - [Twitter](https://twitter.com/thegeekconf)
8883

89-
### React Rally 2024 🐙 {/*react-rally-2024*/}
90-
August 12-13, 2024. Park City, UT, USA
91-
92-
[Website](https://reactrally.com) - [Twitter](https://twitter.com/ReactRally) - [YouTube](https://www.youtube.com/channel/UCXBhQ05nu3L1abBUGeQ0ahw)
93-
9484
### React Universe Conf 2024 {/*react-universe-conf-2024*/}
9585
September 5-6, 2024. Wrocław, Poland.
9686

src/content/community/meetups.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
100100
* [Ahmedabad](https://www.meetup.com/react-ahmedabad/)
101101
* [Bangalore (React)](https://www.meetup.com/ReactJS-Bangalore/)
102102
* [Bangalore (React Native)](https://www.meetup.com/React-Native-Bangalore-Meetup)
103-
* [Chennai](https://www.meetup.com/React-Chennai/)
103+
* [Chennai](https://www.linkedin.com/company/chennaireact)
104104
* [Delhi NCR](https://www.meetup.com/React-Delhi-NCR/)
105105
* [Mumbai](https://reactmumbai.dev)
106106
* [Pune](https://www.meetup.com/ReactJS-and-Friends/)

src/content/learn/editor-setup.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,7 @@ React қауымдастығында қолданылатын басқа тан
4040

4141
### Форматтау {/*formatting*/}
4242

43-
<<<<<<< HEAD
4443
Кодыңызды басқа адамдармен бөліскен кезде ең соңғы уайымдайтын нәрсе ол [табтар немесе бос орындар](https://www.google.com/search?q=tabs+vs+spaces)! Қуанышқа орай, [Prettier](https://prettier.io/) кодты алдын ала орнатылған ережелерге сәйкес форматтайды. Prettier-ді іске қосыңыз, сонда барлық қойған табтар, бос орындар, тырнақша түрі және т.б. конфигурацияға сәйкес келетіндей етіп өзгертіледі. Prettier файлды сақтаған кезде форматтауды іске қосылады, бұл сіздің жұмысынызды жеңілдетеді.
45-
=======
46-
The last thing you want to do when sharing your code with another contributor is get into a discussion about [tabs vs spaces](https://www.google.com/search?q=tabs+vs+spaces)! Fortunately, [Prettier](https://prettier.io/) will clean up your code by reformatting it to conform to preset, configurable rules. Run Prettier, and all your tabs will be converted to spaces—and your indentation, quotes, etc will also all be changed to conform to the configuration. In the ideal setup, Prettier will run when you save your file, quickly making these edits for you.
47-
>>>>>>> c3bc5affa0e7452e306c785af11798d16b4f6dd4
4844

4945
Мына қадамдарды орындау арқылы [VSCode ішінде Prettier кеңейтімін](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode) орнатуға болады:
5046

src/content/learn/installation.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,9 @@ export default function App() {
3737

3838
Дәл осы жерде код жазуға немесе жоғарғы оң жақ бұрыштағы «Fork» түймесін басу арқылы кодты жаңа табта ашуға болады.
3939

40-
<<<<<<< HEAD
4140
Мұндай құмжәшіктер React құжаттамасының беттерінің көпшілігінде қолжетімді. React құжаттамасынан басқа, React-ті қолдайтын көптеген онлайн құмжәшіктері бар: мысалы, [CodeSandbox](https://codesandbox.io/s/new), [StackBlitz](https://stackblitz.com/fork/react), немесе [CodePen.](https://codepen.io/pen?&editors=0010&layout=left&prefill_data_id=3f4569d1-1b11-4bce-bd46-89090eed5ddb)
42-
=======
41+
4342
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)
44-
>>>>>>> 169d5c1820cd1514429bfac2a923e51dd782d37e
4543

4644
### Локальде React-тi қолданып көріңіз {/*try-react-locally*/}
4745

src/content/learn/react-compiler.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,12 +351,20 @@ module.exports = reactCompilerLoader;
351351

352352
### Expo {/*usage-with-expo*/}
353353

354-
Expo uses Babel via Metro, so refer to the [Usage with Babel](#usage-with-babel) section for installation instructions.
354+
Please refer to [Expo's docs](https://docs.expo.dev/preview/react-compiler/) to enable and use the React Compiler in Expo apps.
355355

356356
### Metro (React Native) {/*usage-with-react-native-metro*/}
357357

358358
React Native uses Babel via Metro, so refer to the [Usage with Babel](#usage-with-babel) section for installation instructions.
359359

360+
### Rspack {/*usage-with-rspack*/}
361+
362+
Please refer to [Rspack's docs](https://rspack.dev/guide/tech/react#react-compiler) to enable and use the React Compiler in Rspack apps.
363+
364+
### Rsbuild {/*usage-with-rsbuild*/}
365+
366+
Please refer to [Rsbuild's docs](https://rsbuild.dev/guide/framework/react#react-compiler) to enable and use the React Compiler in Rsbuild apps.
367+
360368
## Troubleshooting {/*troubleshooting*/}
361369

362370
To report issues, please first create a minimal repro on the [React Compiler Playground](https://playground.react.dev/) and include it in your bug report. You can open issues in the [facebook/react](https://github.com/facebook/react/issues) repo.

src/content/learn/reusing-logic-with-custom-hooks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1899,7 +1899,7 @@ export default function Counter() {
18991899
}
19001900
```
19011901
1902-
You'll need to write your custom Hook in `useCounter.js` and import it into the `Counter.js` file.
1902+
You'll need to write your custom Hook in `useCounter.js` and import it into the `App.js` file.
19031903
19041904
<Sandpack>
19051905

src/pages/_document.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ const MyDocument = () => {
8787
}
8888
}
8989
const uwuQueryParam = checkQueryParam();
90-
console.log('uwuQueryParam', uwuQueryParam);
9190
if (uwuQueryParam != null) {
9291
setUwu(uwuQueryParam);
9392
} else if (checkLocalStorage()) {

tailwind.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ module.exports = {
6060
...defaultTheme.maxWidth,
6161
'custom-xs': '21rem',
6262
},
63-
minWidth:{
63+
minWidth: {
6464
...defaultTheme.minWidth,
6565
80: '20rem',
6666
},

0 commit comments

Comments
 (0)