Skip to content

Commit 82a325c

Browse files
Merge branch 'main' of https://github.com/reactjs/react.dev into sync-9a1e1c61
2 parents f17f5b6 + 9a1e1c6 commit 82a325c

File tree

3 files changed

+33
-33
lines changed

3 files changed

+33
-33
lines changed

.github/workflows/site_lint.yml

+2-2
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

+30-30
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/you-might-not-need-an-effect.md

+1-1
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

0 commit comments

Comments
 (0)