Skip to content

Commit 70bb69a

Browse files
authored
Merge pull request #17 from reactjs/sync-ddbd064d
Sync with reactjs.org @ ddbd064
2 parents 40303f3 + cc5dab9 commit 70bb69a

37 files changed

+1235
-64
lines changed

content/blog/2018-03-27-update-on-async-rendering.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,15 @@ These lifecycle methods have often been misunderstood and subtly misused; furthe
2525

2626
We maintain over 50,000 React components at Facebook, and we don't plan to rewrite them all immediately. We understand that migrations take time. We will take the gradual migration path along with everyone in the React community.
2727

28+
If you don't have the time to migrate or test these components, we recommend running a ["codemod"](https://medium.com/@cpojer/effective-javascript-codemods-5a6686bb46fb) script that renames them automatically:
29+
30+
```bash
31+
cd your_project
32+
npx react-codemod rename-unsafe-lifecycles
33+
```
34+
35+
Learn more about this codemod on the [16.9.0 release post.](https://reactjs.org/blog/2019/08/08/react-v16.9.0.html#renaming-unsafe-lifecycle-methods)
36+
2837
---
2938

3039
## Migrating from Legacy Lifecycles {#migrating-from-legacy-lifecycles}

content/blog/2018-11-27-react-16-roadmap.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ author: [gaearon]
44
---
55

66
You might have heard about features like "Hooks", "Suspense", and "Concurrent Rendering" in the previous blog posts and talks. In this post, we'll look at how they fit together and the expected timeline for their availability in a stable release of React.
7+
8+
> An Update from August, 2019
9+
>
10+
> You can find an update to this roadmap in the [React 16.9 release blog post](/blog/2019/08/08/react-v16.9.0.html#an-update-to-the-roadmap).
11+
712

813
## tl;dr {#tldr}
914

content/blog/2019-02-06-react-v16.8.0.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Even while Hooks were in alpha, the React community created many interesting [ex
5050

5151
## Testing Hooks {#testing-hooks}
5252

53-
We have added a new API called `ReactTestUtils.act()` in this release. It ensures that the behavior in your tests matches what happens in the browser more closely. We recommend to wrap any code rendering and triggering updates to your components into `act()` calls. Testing libraries can also wrap their APIs with it (for example, [`react-testing-library`](https://github.com/kentcdodds/react-testing-library)'s `render` and `fireEvent` utilities do this).
53+
We have added a new API called `ReactTestUtils.act()` in this release. It ensures that the behavior in your tests matches what happens in the browser more closely. We recommend to wrap any code rendering and triggering updates to your components into `act()` calls. Testing libraries can also wrap their APIs with it (for example, [`react-testing-library`](https://testing-library.com/react)'s `render` and `fireEvent` utilities do this).
5454

5555
For example, the counter example from [this page](/docs/hooks-effect.html) can be tested like this:
5656

@@ -95,7 +95,7 @@ The calls to `act()` will also flush the effects inside of them.
9595

9696
If you need to test a custom Hook, you can do so by creating a component in your test, and using your Hook from it. Then you can test the component you wrote.
9797

98-
To reduce the boilerplate, we recommend using [`react-testing-library`](https://git.io/react-testing-library) which is designed to encourage writing tests that use your components as the end users do.
98+
To reduce the boilerplate, we recommend using [`react-testing-library`](https://testing-library.com/react) which is designed to encourage writing tests that use your components as the end users do.
9999

100100
## Thanks {#thanks}
101101

content/blog/2019-02-23-is-react-translated-yet.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: "Is React Translated Yet? ¡Sí! Sím! はい!"
2+
title: "Is React Translated Yet? ¡Sí! Sim! はい!"
33
author: [tesseralis]
44
---
55

@@ -23,7 +23,7 @@ In the past, React community members have created unofficial translations for [C
2323

2424
If you would like to help out on a current translation, check out the [Languages](/languages) page and click on the "Contribute" link for your language.
2525

26-
Can't find your language? If you'd like to maintain your langauge's translation fork, follow the instructions in the [translation repo](https://github.com/reactjs/reactjs.org-translation#starting-a-new-translation)!
26+
Can't find your language? If you'd like to maintain your language's translation fork, follow the instructions in the [translation repo](https://github.com/reactjs/reactjs.org-translation#starting-a-new-translation)!
2727

2828
## Backstory {#backstory}
2929

content/blog/2019-08-08-react-v16.9.0.md

Lines changed: 241 additions & 0 deletions
Large diffs are not rendered by default.

content/community/articles.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ permalink: community/articles.html
1313
- [Timeline for Learning React](https://daveceddia.com/timeline-for-learning-react/) - Dave Ceddia's recommended timeline for learning React and the React ecosystem.
1414
- [Simple React Development in 2017](https://hackernoon.com/simple-react-development-in-2017-113bd563691f) - Joshua Comeau's guide to showcase how easy it can be to start modern React development.
1515
- [Visual Guide to State in React](https://daveceddia.com/visual-guide-to-state-in-react/) - Dave Ceddia's visual guide to React state.
16+
- [The Hands-On Guide to Learning React Hooks](https://www.telerik.com/kendo-react-ui/react-hooks-guide/)

content/community/conferences.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@ Do you know of a local React.js conference? Add it here! (Please keep the list c
1212

1313
## Upcoming Conferences {#upcoming-conferences}
1414

15+
### React Conf Iran 2019 {#react-conf-iran-2019}
16+
August 29, 2019. Tehran, Iran.
17+
18+
[Website](https://reactconf.ir/) - [Twitter](https://twitter.com/reactconf_ir) - [Instagram](https://www.instagram.com/reactconf/)
19+
1520
### React Rally 2019 {#react-rally-2019}
1621
August 22-23, 2019. Salt Lake City, USA.
1722

@@ -52,6 +57,11 @@ September 26-28, 2019 in Alicante, Spain
5257

5358
[Website](http://reactalicante.es/) - [Twitter](https://twitter.com/reactalicante) - [Facebook](https://www.facebook.com/ReactAlicante)
5459

60+
### React Conf 2019 {#react-conf-2019}
61+
October 24-25, 2019 in Henderson, Nevada USA
62+
63+
[Website](https://conf.reactjs.org/) - [Twitter](https://twitter.com/reactjs)
64+
5565
### React Advanced 2019 {#react-advanced-2019}
5666
October 25, 2019 in London, UK
5767

@@ -62,6 +72,16 @@ December 6, 2019 in Berlin, Germany
6272

6373
[Website](https://reactday.berlin) - [Twitter](https://twitter.com/reactdayberlin) - [Facebook](https://www.facebook.com/reactdayberlin/) - [Videos](https://www.youtube.com/reactdayberlin)
6474

75+
### ReactConf AU 2020 {#reactconfau}
76+
February 27 & 28, 2020 in Sydney, Australia
77+
78+
[Website](https://reactconfau.com/) - [Twitter](https://twitter.com/reactconfau) - [Facebook](https://www.facebook.com/reactconfau) - [Instagram](https://www.instagram.com/reactconfau/)
79+
80+
### Render-Atlanta 2020 {#render-atlanta-2020}
81+
May 4-6, 2020. Atlanta, GA, USA.
82+
83+
[Website](https://renderatl.com)
84+
6585
## Past Conferences {#past-conferences}
6686

6787
### React.js Conf 2015 {#reactjs-conf-2015}
@@ -395,3 +415,4 @@ June 21, 2019 Chicago, Illinois USA
395415
July 11-12, 2019. Portland, OR, USA.
396416

397417
[Website](https://infinite.red/ChainReactConf)
418+

content/community/meetups.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
2222
## Brazil {#brazil}
2323
* [Belo Horizonte](https://www.meetup.com/reactbh/)
2424
* [Curitiba](https://www.meetup.com/pt-br/ReactJS-CWB/)
25+
* [Joinville](https://www.meetup.com/pt-BR/React-Joinville/)
2526
* [Rio de Janeiro](https://www.meetup.com/pt-BR/React-Rio-de-Janeiro/)
2627
* [São Paulo](https://www.meetup.com/pt-BR/ReactJS-SP/)
2728

@@ -55,6 +56,7 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
5556
* [Düsseldorf](https://www.meetup.com/de-DE/ReactJS-Meetup-Dusseldorf/)
5657
* [Hamburg](https://www.meetup.com/Hamburg-React-js-Meetup/)
5758
* [Karlsruhe](https://www.meetup.com/react_ka/)
59+
* [Kiel](https://www.meetup.com/Kiel-React-Native-Meetup/)
5860
* [Munich](https://www.meetup.com/ReactJS-Meetup-Munich/)
5961
* [React Berlin](https://www.meetup.com/React-Berlin/)
6062
* [React.JS Girls Berlin](https://www.meetup.com/ReactJS-Girls-Berlin/)
@@ -106,8 +108,12 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
106108
## Scotland (UK) {#scotland-uk}
107109
* [Edinburgh](https://www.meetup.com/React-Scotland/)
108110

111+
## Singapore {#singapore}
112+
* [Singapore - React Knowledgeable](https://reactknowledgeable.org/)
113+
109114
## Spain {#spain}
110115
* [Barcelona](https://www.meetup.com/ReactJS-Barcelona/)
116+
* [Canarias](https://www.meetup.com/React-Canarias/)
111117

112118
## Sweden {#sweden}
113119
* [Goteborg](https://www.meetup.com/ReactJS-Goteborg/)
@@ -129,6 +135,7 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
129135
* [Leesburg, VA - ReactJS](https://www.meetup.com/React-NOVA/)
130136
* [Los Angeles, CA - ReactJS](https://www.meetup.com/socal-react/)
131137
* [Los Angeles, CA - React Native](https://www.meetup.com/React-Native-Los-Angeles/)
138+
* [Miami, FL - ReactJS](https://www.meetup.com/React-Miami/)
132139
* [Nashville, TN - ReactJS](https://www.meetup.com/NashReact-Meetup/)
133140
* [New York, NY - ReactJS](https://www.meetup.com/NYC-Javascript-React-Group/)
134141
* [New York, NY - React Ladies](https://www.meetup.com/React-Ladies/)

content/community/nav.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@
3434
title: Model Management
3535
- id: data-fetching
3636
title: Data Fetching
37-
- id: testing
38-
title: Testing
3937
- id: ui-components
4038
title: UI Components
4139
- id: misc

content/community/tools-testing.md

Lines changed: 0 additions & 13 deletions
This file was deleted.

content/community/tools-ui-components.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ permalink: community/ui-components.html
7272
## Fee Based Components {#fee-based-components}
7373

7474
* **[ag-Grid](https://www.ag-grid.com)** Advanced data grid / data table for React.
75+
* **[DevExtreme Reactive](https://devexpress.github.io/devextreme-reactive/react/)** High-performance plugin-based Data Grid, Scheduler and Chart components for Bootstrap and Material Design.
7576
* **[ExtReact components](https://www.sencha.com/products/extreact//)**: 115+ Ready-to-Use UI Components.
7677
* **[Grapecity Wijmo UI Components for React](https://www.grapecity.com/en/react/)**: Expand your React UI options with Wijmo’s complete collection of JavaScript components.
7778
* **[jQWidgets React components](https://www.jqwidgets.com/react/)**: Enterprise Ready 70+ UI Components.

content/community/videos.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ Facebook engineers Bill Fisher and Jing Chen talk about Flux and React at Forwar
5353
### Going Big with React {#going-big-with-react}
5454

5555
Areeb Malik investigates how React performs in a high stress situation, and how it helped his team build safe code on a massive scale - (2014 - 0h31m).
56-
[![going big with React](https://i.vimeocdn.com/video/481670116_650.jpg)]
57-
56+
<iframe title="Areeb Malik : Going big with React" width="650" height="366" src="https://www.youtube-nocookie.com/embed/9qcBlN6-qwY" frameborder="0" allowfullscreen></iframe>
5857

5958
### Rethinking Best Practices {#rethinking-best-practices}
6059

content/docs/accessibility.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,7 @@ to assistive technology, such as screen readers.
468468
In some browsers we can easily view the accessibility information for each element in the accessibility tree:
469469

470470
- [Using the Accessibility Inspector in Firefox](https://developer.mozilla.org/en-US/docs/Tools/Accessibility_inspector)
471-
- [Activate the Accessibility Inspector in Chrome](https://gist.github.com/marcysutton/0a42f815878c159517a55e6652e3b23a)
471+
- [Using the Accessibility Inspector in Chrome](https://developers.google.com/web/tools/chrome-devtools/accessibility/reference#pane)
472472
- [Using the Accessibility Inspector in OS X Safari](https://developer.apple.com/library/content/documentation/Accessibility/Conceptual/AccessibilityMacOSX/OSXAXTestingApps.html)
473473

474474
### Screen readers {#screen-readers}

content/docs/addons-test-utils.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,9 @@ it('can render and update a counter', () => {
122122
});
123123
```
124124

125-
Don't forget that dispatching DOM events only works when the DOM container is added to the `document`. You can use a helper like [`react-testing-library`](https://github.com/kentcdodds/react-testing-library) to reduce the boilerplate code.
125+
- Don't forget that dispatching DOM events only works when the DOM container is added to the `document`. You can use a library like [React Testing Library](https://testing-library.com/react) to reduce the boilerplate code.
126+
127+
- The [`recipes`](/docs/recipes.html) document contains more details on how `act()` behaves, with examples and usage.
126128

127129
* * *
128130

@@ -139,7 +141,7 @@ Pass a mocked component module to this method to augment it with useful methods
139141

140142
> Note:
141143
>
142-
> `mockComponent()` is a legacy API. We recommend using [shallow rendering](/docs/shallow-renderer.html) or [`jest.mock()`](https://facebook.github.io/jest/docs/en/tutorial-react-native.html#mock-native-modules-using-jestmock) instead.
144+
> `mockComponent()` is a legacy API. We recommend using [`jest.mock()`](https://facebook.github.io/jest/docs/en/tutorial-react-native.html#mock-native-modules-using-jestmock) instead.
143145
144146
* * *
145147

content/docs/code-splitting.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ permalink: docs/code-splitting.html
77
## Bundling {#bundling}
88

99
Most React apps will have their files "bundled" using tools like
10-
[Webpack](https://webpack.js.org/) or [Browserify](http://browserify.org/).
10+
[Webpack](https://webpack.js.org/), [Rollup](https://rollupjs.org/) or
11+
[Browserify](http://browserify.org/).
1112
Bundling is the process of following imported files and merging them into a
1213
single file: a "bundle". This bundle can then be included on a webpage to load
1314
an entire app at once.

content/docs/error-boundaries.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ class ErrorBoundary extends React.Component {
3636
return { hasError: true };
3737
}
3838
39-
componentDidCatch(error, info) {
39+
componentDidCatch(error, errorInfo) {
4040
// You can also log the error to an error reporting service
41-
logErrorToMyService(error, info);
41+
logErrorToMyService(error, errorInfo);
4242
}
4343
4444
render() {

content/docs/faq-styling.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,4 @@ _Note that this functionality is not a part of React, but provided by third-part
4848

4949
### Can I do animations in React? {#can-i-do-animations-in-react}
5050

51-
React can be used to power animations. See [React Transition Group](https://reactcommunity.org/react-transition-group/) and [React Motion](https://github.com/chenglou/react-motion), for example.
51+
React can be used to power animations. See [React Transition Group](https://reactcommunity.org/react-transition-group/) and [React Motion](https://github.com/chenglou/react-motion) or [React Spring](https://github.com/react-spring/react-spring), for example.

content/docs/hooks-effect.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ function Example() {
131131
useEffect(() => {
132132
document.title = `You clicked ${count} times`;
133133
});
134+
}
134135
```
135136

136137
We declare the `count` state variable, and then we tell React we need to use an effect. We pass a function to the `useEffect` Hook. This function we pass *is* our effect. Inside our effect, we set the document title using the `document.title` browser API. We can read the latest `count` inside the effect because it's in the scope of our function. When React renders our component, it will remember the effect we used, and then run our effect after updating the DOM. This happens for every render, including the first one.

0 commit comments

Comments
 (0)