Skip to content

Commit d046105

Browse files
authored
Merge branch 'master' into portals-page
2 parents e3c55fe + a924421 commit d046105

File tree

3 files changed

+8
-13
lines changed

3 files changed

+8
-13
lines changed

content/community/conferences.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,10 @@ March 30 - 31, 2020 in San Francisco, CA
1818
[Website](https://www.reactathon.com) - [Twitter](https://twitter.com/reactathon) - [Facebook](https://www.facebook.com/events/575942819854160/)
1919

2020
### React Summit Amsterdam 2020 {#react-summit-2020}
21-
April 15-17, 2020 in Amsterdam, The Netherlands
21+
September 11, 2020 in Amsterdam, The Netherlands
2222

2323
[Website](https://reactsummit.com) - [Twitter](https://twitter.com/reactamsterdam) - [Facebook](https://www.facebook.com/reactamsterdam) - [Videos](https://youtube.com/c/ReactConferences)
2424

25-
### App.js Conf 2020 {#appjsonf2020}
26-
April 23 - 24, 2020 in Kraków, Poland
27-
28-
[Website](http://appjs.co/react) - [Twitter](https://twitter.com/appjsconf)
29-
3025
### React Day Bangalore 2020 {#react-day-bangalore-2020}
3126
April 25, 2020 in Bangalore, India
3227

content/docs/code-splitting.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ import("./math").then(math => {
9797
When Webpack comes across this syntax, it automatically starts code-splitting
9898
your app. If you're using Create React App, this is already configured for you
9999
and you can [start using it](https://facebook.github.io/create-react-app/docs/code-splitting) immediately. It's also supported
100-
out of the box in [Next.js](https://github.com/zeit/next.js/#dynamic-import).
100+
out of the box in [Next.js](https://nextjs.org/docs/advanced-features/dynamic-import).
101101

102102
If you're setting up Webpack yourself, you'll probably want to read Webpack's
103103
[guide on code splitting](https://webpack.js.org/guides/code-splitting/). Your Webpack config should look vaguely [like this](https://gist.github.com/gaearon/ca6e803f5c604d37468b0091d9959269).

content/docs/strict-mode.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,13 @@ Render phase lifecycles include the following class component methods:
9797

9898
Because the above methods might be called more than once, it's important that they do not contain side-effects. Ignoring this rule can lead to a variety of problems, including memory leaks and invalid application state. Unfortunately, it can be difficult to detect these problems as they can often be [non-deterministic](https://en.wikipedia.org/wiki/Deterministic_algorithm).
9999

100-
Strict mode can't automatically detect side effects for you, but it can help you spot them by making them a little more deterministic. This is done by intentionally double-invoking the following methods:
100+
Strict mode can't automatically detect side effects for you, but it can help you spot them by making them a little more deterministic. This is done by intentionally double-invoking the following functions:
101101

102-
* Class component `constructor` method
103-
* The `render` method
104-
* `setState` updater functions (the first argument)
105-
* The static `getDerivedStateFromProps` lifecycle
106-
* The `shouldComponentUpdate` method
102+
* Class component `constructor`, `render`, and `shouldComponent` methods
103+
* Class component static `getDerivedStateFromProps` method
104+
* Function component bodies
105+
* State updater functions (the first argument to `setState`)
106+
* Functions passed to `useState`, `useMemo`, or `useReducer`
107107

108108
> Note:
109109
>

0 commit comments

Comments
 (0)