Skip to content

Commit 6b5bfbc

Browse files
Merge branch 'main' of https://github.com/reactjs/react.dev into sync-9000e6e0
2 parents 57f2601 + 9000e6e commit 6b5bfbc

31 files changed

+204
-184
lines changed
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: Discord Notify
2+
3+
on:
4+
pull_request_target:
5+
types: [ labeled ]
6+
7+
jobs:
8+
notify:
9+
if: ${{ github.event.label.name == 'React Core Team' }}
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Discord Webhook Action
13+
uses: tsickert/[email protected]
14+
with:
15+
webhook-url: ${{ secrets.DISCORD_WEBHOOK_URL }}
16+
embed-author-name: ${{ github.event.pull_request.user.login }}
17+
embed-author-url: ${{ github.event.pull_request.user.html_url }}
18+
embed-author-icon-url: ${{ github.event.pull_request.user.avatar_url }}
19+
embed-title: '#${{ github.event.number }} (+${{github.event.pull_request.additions}} -${{github.event.pull_request.deletions}}): ${{ github.event.pull_request.title }}'
20+
embed-description: ${{ github.event.pull_request.body }}
21+
embed-url: ${{ github.event.pull_request.html_url }}

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ This repo contains the source code and documentation powering [gu.react.dev](htt
77
### Prerequisites
88

99
1. Git
10-
1. Node: any 12.x version starting with v12.0.0 or greater
10+
1. Node: any version starting with v16.8.0 or greater
1111
1. Yarn: See [Yarn website for installation instructions](https://yarnpkg.com/lang/en/docs/install/)
1212
1. A fork of the repo (for any contributions)
1313
1. A clone of the [gu.react.dev repo](https://github.com/reactjs/gu.react.dev) on your local machine

public/images/team/lauren.jpg

949 KB
Loading

src/components/MDX/TerminalBlock.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ function TerminalBlock({level = 'info', children}: TerminalBlockProps) {
7171
</div>
7272
</div>
7373
<div
74-
className="px-8 pt-4 pb-6 text-primary-dark dark:text-primary-dark font-mono text-code whitespace-pre overflow-x-scroll"
74+
className="px-8 pt-4 pb-6 text-primary-dark dark:text-primary-dark font-mono text-code whitespace-pre overflow-x-auto"
7575
translate="no"
7676
dir="ltr">
7777
<LevelText type={level} />

src/content/blog/2024/04/25/react-19-upgrade-guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ This will run the following codemods from `react-codemod`:
113113
- [`replace-string-ref`](https://github.com/reactjs/react-codemod?tab=readme-ov-file#replace-string-ref)
114114
- [`replace-act-import`](https://github.com/reactjs/react-codemod?tab=readme-ov-file#replace-act-import)
115115
- [`replace-use-form-state`](https://github.com/reactjs/react-codemod?tab=readme-ov-file#replace-use-form-state)
116-
- [`prop-types-typescript`](TODO)
116+
- [`prop-types-typescript`](https://codemod.com/registry/react-prop-types-typescript)
117117

118118
This does not include the TypeScript changes. See [TypeScript changes](#typescript-changes) below.
119119

src/content/blog/2024/12/05/react-19.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Additions since this post was originally shared with the React 19 RC in April:
1717
- **Pre-warming for suspended trees**: see [Improvements to Suspense](/blog/2024/04/25/react-19-upgrade-guide#improvements-to-suspense).
1818
- **React DOM static APIs**: see [New React DOM Static APIs](#new-react-dom-static-apis).
1919

20-
_The date for this post has been update to reflect the stable release date._
20+
_The date for this post has been updated to reflect the stable release date._
2121

2222
</Note>
2323

@@ -362,7 +362,7 @@ React 19 includes all of the React Server Components features included from the
362362

363363
#### How do I build support for Server Components? {/*how-do-i-build-support-for-server-components*/}
364364

365-
While React Server Components in React 19 are stable and will not break between major versions, the underlying APIs used to implement a React Server Components bundler or framework do not follow semver and may break between minors in React 19.x.
365+
While React Server Components in React 19 are stable and will not break between minor versions, the underlying APIs used to implement a React Server Components bundler or framework do not follow semver and may break between minors in React 19.x.
366366

367367
To support React Server Components as a bundler or framework, we recommend pinning to a specific React version, or using the Canary release. We will continue working with bundlers and frameworks to stabilize the APIs used to implement React Server Components in the future.
368368

@@ -807,4 +807,4 @@ Thanks to [Joey Arhar](https://github.com/josepharhar) for driving the design an
807807
#### How to upgrade {/*how-to-upgrade*/}
808808
See the [React 19 Upgrade Guide](/blog/2024/04/25/react-19-upgrade-guide) for step-by-step instructions and a full list of breaking and notable changes.
809809

810-
_Note: this post was originally published 04/25/2024 and has been updated to 12/05/2024 with the stable release._
810+
_Note: this post was originally published 04/25/2024 and has been updated to 12/05/2024 with the stable release._

src/content/community/conferences.md

Lines changed: 46 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -10,62 +10,78 @@ 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 Universe Conf 2024 {/*react-universe-conf-2024*/}
14-
September 5-6, 2024. Wrocław, Poland.
13+
### React Day Berlin 2024 {/*react-day-berlin-2024*/}
14+
December 13 & 16, 2024. In-person in Berlin, Germany + remote (hybrid event)
15+
16+
[Website](https://reactday.berlin/) - [Twitter](https://x.com/reactdayberlin)
17+
18+
### App.js Conf 2025 {/*appjs-conf-2025*/}
19+
May 28 - 30, 2025. In-person in Kraków, Poland + remote
20+
21+
[Website](https://appjs.co) - [Twitter](https://twitter.com/appjsconf)
22+
23+
### React Summit 2025 {/*react-summit-2025*/}
24+
June 13 - 17, 2025. In-person in Amsterdam, Netherlands + remote (hybrid event)
25+
26+
[Website](https://reactsummit.com/) - [Twitter](https://x.com/reactsummit)
27+
28+
### React Universe Conf 2025 {/*react-universe-conf-2025*/}
29+
September 2-4, 2025. Wrocław, Poland.
1530

1631
[Website](https://www.reactuniverseconf.com/) - [Twitter](https://twitter.com/react_native_eu) - [LinkedIn](https://www.linkedin.com/events/reactuniverseconf7163919537074118657/)
1732

18-
### React Alicante 2024 {/*react-alicante-2024*/}
19-
September 19-21, 2024. Alicante, Spain.
33+
## Past Conferences {/*past-conferences*/}
2034

21-
[Website](https://reactalicante.es/) - [Twitter](https://twitter.com/ReactAlicante) - [YouTube](https://www.youtube.com/channel/UCaSdUaITU1Cz6PvC97A7e0w)
35+
### React Africa 2024 {/*react-africa-2024*/}
36+
November 29, 2024. In-person in Casablanca, Morocco (hybrid event)
2237

23-
### RenderCon Kenya 2024 {/*rendercon-kenya-2024*/}
24-
October 04 - 05, 2024. Nairobi, Kenya
38+
[Website](https://react-africa.com/) - [Twitter](https://x.com/BeJS_)
2539

26-
[Website](https://rendercon.org/) - [Twitter](https://twitter.com/renderconke) - [LinkedIn](https://www.linkedin.com/company/renderconke/) - [YouTube](https://www.youtube.com/channel/UC0bCcG8gHUL4njDOpQGcMIA)
40+
### React Summit US 2024 {/*react-summit-us-2024*/}
41+
November 19 & 22, 2024. In-person in New York, USA + online (hybrid event)
2742

28-
### React India 2024 {/*react-india-2024*/}
29-
October 17 - 19, 2024. In-person in Goa, India (hybrid event) + Oct 15 2024 - remote day
43+
[Website](https://reactsummit.us/) - [Twitter](https://twitter.com/reactsummit) - [Videos](https://portal.gitnation.org/)
3044

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)
45+
### React Native London Conf 2024 {/*react-native-london-2024*/}
46+
November 14 & 15, 2024. In-person in London, UK
3247

33-
### React Brussels 2024 {/*react-brussels-2024*/}
34-
October 18, 2024. In-person in Brussels, Belgium (hybrid event)
48+
[Website](https://reactnativelondon.co.uk/) - [Twitter](https://x.com/RNLConf)
3549

36-
[Website](https://www.react.brussels/) - [Twitter](https://x.com/BrusselsReact)
50+
### React Advanced London 2024 {/*react-advanced-london-2024*/}
51+
October 25 & 28, 2024. In-person in London, UK + online (hybrid event)
52+
53+
[Website](https://reactadvanced.com/) - [Twitter](https://x.com/reactadvanced)
3754

3855
### reactjsday 2024 {/*reactjsday-2024*/}
3956
October 25, 2024. In-person in Verona, Italy + online (hybrid event)
4057

4158
[Website](https://2024.reactjsday.it/) - [Twitter](https://x.com/reactjsday) - [Facebook](https://www.facebook.com/GrUSP/) - [YouTube](https://www.youtube.com/c/grusp)
4259

43-
### React Advanced London 2024 {/*react-advanced-london-2024*/}
44-
October 25 & 28, 2024. In-person in London, UK + online (hybrid event)
60+
### React Brussels 2024 {/*react-brussels-2024*/}
61+
October 18, 2024. In-person in Brussels, Belgium (hybrid event)
4562

46-
[Website](https://reactadvanced.com/) - [Twitter](https://x.com/reactadvanced)
63+
[Website](https://www.react.brussels/) - [Twitter](https://x.com/BrusselsReact)
4764

48-
### React Native London Conf 2024 {/*react-native-london-2024*/}
49-
November 14 & 15, 2024. In-person in London, UK
65+
### React India 2024 {/*react-india-2024*/}
66+
October 17 - 19, 2024. In-person in Goa, India (hybrid event) + Oct 15 2024 - remote day
5067

51-
[Website](https://reactnativelondon.co.uk/) - [Twitter](https://x.com/RNLConf)
68+
[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)
5269

53-
### React Summit US 2024 {/*react-summit-us-2024*/}
54-
November 19 & 22, 2024. In-person in New York, USA + online (hybrid event)
70+
### RenderCon Kenya 2024 {/*rendercon-kenya-2024*/}
71+
October 04 - 05, 2024. Nairobi, Kenya
5572

56-
[Website](https://reactsummit.us/) - [Twitter](https://twitter.com/reactsummit) - [Videos](https://portal.gitnation.org/)
73+
[Website](https://rendercon.org/) - [Twitter](https://twitter.com/renderconke) - [LinkedIn](https://www.linkedin.com/company/renderconke/) - [YouTube](https://www.youtube.com/channel/UC0bCcG8gHUL4njDOpQGcMIA)
5774

58-
### React Africa 2024 {/*react-africa-2024*/}
59-
November 29, 2024. In-person in Casablanca, Morocco (hybrid event)
75+
### React Alicante 2024 {/*react-alicante-2024*/}
76+
September 19-21, 2024. Alicante, Spain.
6077

61-
[Website](https://react-africa.com/) - [Twitter](https://x.com/BeJS_)
78+
[Website](https://reactalicante.es/) - [Twitter](https://twitter.com/ReactAlicante) - [YouTube](https://www.youtube.com/channel/UCaSdUaITU1Cz6PvC97A7e0w)
6279

63-
### React Day Berlin 2024 {/*react-day-berlin-2024*/}
64-
December 13 & 16, 2024. In-person in Berlin, Germany + remote (hybrid event)
80+
### React Universe Conf 2024 {/*react-universe-conf-2024*/}
81+
September 5-6, 2024. Wrocław, Poland.
6582

66-
[Website](https://reactday.berlin/) - [Twitter](https://x.com/reactdayberlin)
83+
[Website](https://www.reactuniverseconf.com/) - [Twitter](https://twitter.com/react_native_eu) - [LinkedIn](https://www.linkedin.com/events/reactuniverseconf7163919537074118657/)
6784

68-
## Past Conferences {/*past-conferences*/}
6985

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

src/content/community/team.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Current members of the React team are listed in alphabetical order below.
4343
</TeamMember>
4444

4545
<TeamMember name="Lauren Tan" permalink="lauren-tan" photo="/images/team/lauren.jpg" github="poteto" twitter="potetotes" threads="potetotes" bsky="no.lol" title="Engineer at Meta">
46-
Lauren's programming career peaked when she first discovered the `<marquee>` tag. She’s been chasing that high ever since. She studied Finance instead of CS in college, so she learned to code using Excel instead of Java. Lauren enjoys dropping cheeky memes in chat, playing video games with her partner, and petting her dog Zelda.
46+
Lauren's programming career peaked when she first discovered the `<marquee>` tag. She’s been chasing that high ever since. She studied Finance instead of CS in college, so she learned to code using Excel. Lauren enjoys dropping cheeky memes in chat, playing video games with her partner, learning Korean, and petting her dog Zelda.
4747
</TeamMember>
4848

4949
<TeamMember name="Luna Wei" permalink="luna-wei" photo="/images/team/luna-wei.jpg" github="lunaleaps" twitter="lunaleaps" threads="lunaleaps" title="Engineer at Meta">

src/content/learn/add-react-to-an-existing-project.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Let's say you have an existing web app at `example.com` built with another serve
2121
Here's how we recommend to set it up:
2222

2323
1. **Build the React part of your app** using one of the [React-based frameworks](/learn/start-a-new-react-project).
24-
2. **Specify `/some-app` as the *base path*** in your framework's configuration (here's how: [Next.js](https://nextjs.org/docs/api-reference/next.config.js/basepath), [Gatsby](https://www.gatsbyjs.com/docs/how-to/previews-deploys-hosting/path-prefix/)).
24+
2. **Specify `/some-app` as the *base path*** in your framework's configuration (here's how: [Next.js](https://nextjs.org/docs/app/api-reference/config/next-config-js/basePath), [Gatsby](https://www.gatsbyjs.com/docs/how-to/previews-deploys-hosting/path-prefix/)).
2525
3. **Configure your server or a proxy** so that all requests under `/some-app/` are handled by your React app.
2626

2727
This ensures the React part of your app can [benefit from the best practices](/learn/start-a-new-react-project#can-i-use-react-without-a-framework) baked into those frameworks.

src/content/learn/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ title: Quick Start
44

55
<Intro>
66

7-
Welcome to the React documentation! This page will give you an introduction to the 80% of React concepts that you will use on a daily basis.
7+
Welcome to the React documentation! This page will give you an introduction to 80% of the React concepts that you will use on a daily basis.
88

99
</Intro>
1010

0 commit comments

Comments
 (0)