Skip to content

Commit 6f4bfff

Browse files
Merge branch 'main' of https://github.com/reactjs/react.dev into sync-a30e1f95
2 parents f4617fe + a30e1f9 commit 6f4bfff

18 files changed

+179
-44
lines changed

.github/workflows/site_lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ jobs:
1616
steps:
1717
- uses: actions/checkout@v1
1818
- name: Use Node.js 20.x
19-
uses: actions/setup-node@v1
19+
uses: actions/setup-node@v3
2020
with:
2121
node-version: 20.x
2222

2323
- name: Install deps and build (with cache)
24-
uses: bahmutov/npm-install@v1.7.10
24+
uses: bahmutov/npm-install@v1.8.32
2525

2626
- name: Lint codebase
2727
run: yarn ci-check

src/content/community/conferences.md

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -10,36 +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-
### Reactathon 2023 {/*reactathon-2023*/}
14-
May 2 - 3, 2023. San Francisco, CA, USA
15-
16-
[Website](https://reactathon.com) - [Twitter](https://twitter.com/reactathon) - [YouTube](https://www.youtube.com/realworldreact)
17-
18-
### RemixConf 2023 {/*remixconf-2023*/}
19-
May, 2023. Salt Lake City, UT
20-
21-
[Website](https://remix.run/conf/2023) - [Twitter](https://twitter.com/remix_run)
22-
23-
### App.js Conf 2023 {/*appjs-conf-2023*/}
24-
May 10 - 12, 2023. In-person in Kraków, Poland + remote
25-
26-
[Website](https://appjs.co) - [Twitter](https://twitter.com/appjsconf)
27-
28-
### Chain React 2023 {/*chain-react-2023*/}
29-
May 17 - 19, 2023. Portland, OR, USA
30-
31-
[Website](https://chainreactconf.com/) - [Twitter](https://twitter.com/ChainReactConf) - [Facebook](https://www.facebook.com/ChainReactConf/) - [Youtube](https://www.youtube.com/channel/UCwpSzVt7QpLDbCnPXqR97-g/playlists)
32-
33-
### Render(ATL) 2023 🍑 {/*renderatl-2023-*/}
34-
May 31 - June 2, 2023. Atlanta, GA, USA
35-
36-
[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#/)
37-
38-
### React Summit 2023 {/*react-summit-2023*/}
39-
June 2 & 6, 2023. In-person in Amsterdam, Netherlands + remote first interactivity (hybrid event)
40-
41-
[Website](https://reactsummit.com) - [Twitter](https://twitter.com/reactsummit) - [Facebook](https://www.facebook.com/reactamsterdam) - [Videos](https://portal.gitnation.org/events/react-summit-2023)
42-
4313
### React Norway 2023 {/*react-norway-2023*/}
4414
June 16th, 2023. Larvik, Norway
4515

@@ -82,6 +52,36 @@ December 8 & 12, 2023. In-person in Berlin, Germany + remote first interactivity
8252

8353
## Past Conferences {/*past-conferences*/}
8454

55+
### React Summit 2023 {/*react-summit-2023*/}
56+
June 2 & 6, 2023. In-person in Amsterdam, Netherlands + remote first interactivity (hybrid event)
57+
58+
[Website](https://reactsummit.com) - [Twitter](https://twitter.com/reactsummit) - [Facebook](https://www.facebook.com/reactamsterdam) - [Videos](https://portal.gitnation.org/events/react-summit-2023)
59+
60+
### Render(ATL) 2023 🍑 {/*renderatl-2023-*/}
61+
May 31 - June 2, 2023. Atlanta, GA, USA
62+
63+
[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#/)
64+
65+
### Chain React 2023 {/*chain-react-2023*/}
66+
May 17 - 19, 2023. Portland, OR, USA
67+
68+
[Website](https://chainreactconf.com/) - [Twitter](https://twitter.com/ChainReactConf) - [Facebook](https://www.facebook.com/ChainReactConf/) - [Youtube](https://www.youtube.com/channel/UCwpSzVt7QpLDbCnPXqR97-g/playlists)
69+
70+
### App.js Conf 2023 {/*appjs-conf-2023*/}
71+
May 10 - 12, 2023. In-person in Kraków, Poland + remote
72+
73+
[Website](https://appjs.co) - [Twitter](https://twitter.com/appjsconf)
74+
75+
### RemixConf 2023 {/*remixconf-2023*/}
76+
May, 2023. Salt Lake City, UT
77+
78+
[Website](https://remix.run/conf/2023) - [Twitter](https://twitter.com/remix_run)
79+
80+
### Reactathon 2023 {/*reactathon-2023*/}
81+
May 2 - 3, 2023. San Francisco, CA, USA
82+
83+
[Website](https://reactathon.com) - [Twitter](https://twitter.com/reactathon) - [YouTube](https://www.youtube.com/realworldreact)
84+
8585
### React Miami 2023 {/*react-miami-2023*/}
8686
April 20 - 21, 2023. Miami, FL, USA
8787

src/content/learn/manipulating-the-dom-with-refs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Then, use it to declare a ref inside your component:
3131
const myRef = useRef(null);
3232
```
3333

34-
Finally, pass it to the DOM node as the `ref` attribute:
34+
Finally, pass your ref as the `ref` attribute to the JSX tag for which you want to get the DOM node:
3535

3636
```js
3737
<div ref={myRef}>

src/content/learn/you-might-not-need-an-effect.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1438,7 +1438,7 @@ It would be nice if there was a way to tell React that when `savedContact.id` is
14381438
14391439
<Solution>
14401440
1441-
Split the `EditContact` component in two. Move all the form state into the inner `EditForm` component. Export the outer `EditContact` component, and make it pass `savedContact.id` as the `key` to the inner `EditContact` component. As a result, the inner `EditForm` component resets all of the form state and recreates the DOM whenever you select a different contact.
1441+
Split the `EditContact` component in two. Move all the form state into the inner `EditForm` component. Export the outer `EditContact` component, and make it pass `savedContact.id` as the `key` to the inner `EditForm` component. As a result, the inner `EditForm` component resets all of the form state and recreates the DOM whenever you select a different contact.
14421442
14431443
<Sandpack>
14441444

src/content/reference/react-dom/components/option.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ The [built-in browser `<option>` component](https://developer.mozilla.org/en-US/
2323

2424
### `<option>` {/*option*/}
2525

26-
The [built-in browser `<option>` component](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/select) lets you render an option inside a [`<select>`](/reference/react-dom/components/select) box.
26+
The [built-in browser `<option>` component](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/option) lets you render an option inside a [`<select>`](/reference/react-dom/components/select) box.
2727

2828
```js
2929
<select>

src/content/reference/react-dom/components/progress.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ To display a progress indicator, render the [built-in browser `<progress>`](http
3535
Additionally, `<progress>` supports these props:
3636

3737
* [`max`](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/progress#attr-max): A number. Specifies the maximum `value`. Defaults to `1`.
38-
* [`value`](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/progress#attr-value): A number between `0` and `max`, or `null` for intermedinate progress. Specifies how much was done.
38+
* [`value`](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/progress#attr-value): A number between `0` and `max`, or `null` for indeterminate progress. Specifies how much was done.
3939

4040
---
4141

src/content/reference/react-dom/server/renderToPipeableStream.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ Streaming does not need to wait for React itself to load in the browser, or for
286286
287287
**Only Suspense-enabled data sources will activate the Suspense component.** They include:
288288
289-
- Data fetching with Suspense-enabled frameworks like [Relay](https://relay.dev/docs/guided-tour/rendering/loading-states/) and [Next.js](https://nextjs.org/docs/advanced-features/react-18)
289+
- Data fetching with Suspense-enabled frameworks like [Relay](https://relay.dev/docs/guided-tour/rendering/loading-states/) and [Next.js](https://nextjs.org/docs/getting-started/react-essentials)
290290
- Lazy-loading component code with [`lazy`](/reference/react/lazy)
291291
292292
Suspense **does not** detect when data is fetched inside an Effect or event handler.

src/content/reference/react-dom/server/renderToReadableStream.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ Streaming does not need to wait for React itself to load in the browser, or for
285285
286286
**Only Suspense-enabled data sources will activate the Suspense component.** They include:
287287
288-
- Data fetching with Suspense-enabled frameworks like [Relay](https://relay.dev/docs/guided-tour/rendering/loading-states/) and [Next.js](https://nextjs.org/docs/advanced-features/react-18)
288+
- Data fetching with Suspense-enabled frameworks like [Relay](https://relay.dev/docs/guided-tour/rendering/loading-states/) and [Next.js](https://nextjs.org/docs/getting-started/react-essentials)
289289
- Lazy-loading component code with [`lazy`](/reference/react/lazy)
290290
291291
Suspense **does not** detect when data is fetched inside an Effect or event handler.

src/content/reference/react/Component.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1393,7 +1393,7 @@ Then you can wrap a part of your component tree with it:
13931393
13941394
If `Profile` or its child component throws an error, `ErrorBoundary` will "catch" that error, display a fallback UI with the error message you've provided, and send a production error report to your error reporting service.
13951395
1396-
You don't need to wrap every component into a separate error boundary. When you think about the [granularity of error boundaries,](https://aweary.dev/fault-tolerance-react/) consider where it makes sense to display an error message. For example, in a messaging app, it makes sense to place an error boundary around the list of conversations. It also makes sense to place one around every individual message. However, it wouldn't make sense to place a boundary around every avatar.
1396+
You don't need to wrap every component into a separate error boundary. When you think about the [granularity of error boundaries,](https://www.brandondail.com/posts/fault-tolerance-react) consider where it makes sense to display an error message. For example, in a messaging app, it makes sense to place an error boundary around the list of conversations. It also makes sense to place one around every individual message. However, it wouldn't make sense to place a boundary around every avatar.
13971397
13981398
<Note>
13991399

src/content/reference/react/Suspense.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ async function getAlbums() {
252252

253253
**Only Suspense-enabled data sources will activate the Suspense component.** They include:
254254

255-
- Data fetching with Suspense-enabled frameworks like [Relay](https://relay.dev/docs/guided-tour/rendering/loading-states/) and [Next.js](https://nextjs.org/docs/advanced-features/react-18)
255+
- Data fetching with Suspense-enabled frameworks like [Relay](https://relay.dev/docs/guided-tour/rendering/loading-states/) and [Next.js](https://nextjs.org/docs/getting-started/react-essentials)
256256
- Lazy-loading component code with [`lazy`](/reference/react/lazy)
257257

258258
Suspense **does not** detect when data is fetched inside an Effect or event handler.

0 commit comments

Comments
 (0)