Skip to content

Commit dbdc659

Browse files
Merge pull request #36 from reactjs/sync-821e2072
Sync with reactjs.org @ 821e207
2 parents f66fd9f + e203bbf commit dbdc659

17 files changed

+54
-36
lines changed

content/community/conferences.md

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ February 27 & 28, 2020 in Sydney, Australia
2222

2323
[Website](https://reactconfau.com/) - [Twitter](https://twitter.com/reactconfau) - [Facebook](https://www.facebook.com/reactconfau) - [Instagram](https://www.instagram.com/reactconfau/)
2424

25+
### ReactConf Japan 2020 {#reactconfjp-2020}
26+
March 21, 2020 in Tokyo, Japan
27+
28+
[Website](https://reactconf.jp/) - [Twitter](https://twitter.com/reactjp)
29+
2530
### Reactathon 2020 {#reactathon-2020}
2631
March 30 - 31, 2020 in San Francisco, CA
2732

@@ -40,7 +45,12 @@ April 23 - 24, 2020 in Kraków, Poland
4045
### React Day Bangalore 2020 {#react-day-bangalore-2020}
4146
April 25, 2020 in Bangalore, India
4247

43-
[Website](https://reactday.in) - [Twitter](https://twitter.com/ReactDayIn)
48+
[Website](https://reactday.in) - [Twitter](https://twitter.com/ReactDayIn) - [LinkedIn](https://www.linkedin.com/company/react-day/)
49+
50+
### Byteconf React 2020 {#byteconf-react-2020}
51+
May 1, 2020. Streamed online on YouTube.
52+
53+
[Website](https://www.bytesized.xyz) - [Twitter](https://twitter.com/bytesizedcode) - [YouTube](https://www.youtube.com/channel/UC046lFvJZhiwSRWsoH8SFjg)
4454

4555
### render(ATL) 2020 {#render-atlanta-2020}
4656
May 4-6, 2020. Atlanta, GA, USA.
@@ -72,11 +82,26 @@ July 17, 2020. New York City, USA.
7282

7383
[Website](https://reactweek.nyc/) - [Twitter](https://twitter.com/reactweek) - [Facebook](https://www.facebook.com/reactweek)
7484

85+
### React La Conferencia 2020 {#react-la-conferencia-2020}
86+
July 18, 2020. Medellín, Colombia.
87+
88+
[Website](https://reactlaconf.co/) - [Twitter](https://twitter.com/reactlaconf)
89+
90+
### Chain React 2020 {#chain-react-2020}
91+
July 29-30, 2020. Portland, Oregon, USA.
92+
93+
[Website](https://infinite.red/ChainReactConf) - [Twitter](https://twitter.com/ChainReactConf)
94+
7595
### ComponentsConf 2020 {#components20}
7696
September 1, 2020 in Melbourne, Australia
7797

7898
[Website](https://www.componentsconf.com.au/) - [Twitter](https://twitter.com/ComponentsConf) - [Facebook](https://www.facebook.com/ComponentsConf/) - [LinkedIn](https://www.linkedin.com/company/componentsconf/) - [YouTube](https://www.youtube.com/ComponentsConf)
7999

100+
### React Native EU 2020 {#react-native-eu-2020}
101+
September 5-6, 2020 in Wrocław, Poland
102+
103+
[Website](https://www.react-native.eu/) - [Twitter](https://twitter.com/react_native_eu) - [Facebook](https://www.facebook.com/reactnativeeu/) - [YouTube](https://www.youtube.com/watch?v=m0GfmlGFh3E&list=PLZ3MwD-soTTHy9_88QPLF8DEJkvoB5Tl-) - [Instagram](https://www.instagram.com/reactnative_eu/)
104+
80105
### React India 2020 {#react-india-2020}
81106
November 6, 2020 in Mumbai, India
82107

content/community/examples.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ There are many example projects created by the React community. Feel free to add
1212
* **[Zeldog](https://yannsainty.github.io/Zeldog/)** A Zelda like game with a dog fighting ducks and more to eat pizza !
1313
* **[Calculator](https://github.com/ahfarmer/calculator)** Implementation of the iOS calculator built in React
1414
* **[Emoji Search](https://github.com/ahfarmer/emoji-search)** Simple React app for searching emoji
15-
* **[GitHub Battle App](https://tm.dev/react-course-project/)** Battle two GitHub users and see the most popular Github projects for any language.
1615
* **[React Powered Hacker News Client](https://github.com/insin/react-hn)** A React & `react-router`-powered implementation of Hacker News using its Firebase API
1716
* **[Pokedex](https://github.com/alik0211/pokedex)** The list of Pokémon with live search
1817
* **[Shopping Cart](https://github.com/jeffersonRibeiro/react-shopping-cart)** Simple e-commerce cart application built using React

content/community/external-resources.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ There are many wonderful curated resources the React community has put together.
1818

1919
- [Awesome React Talks](https://github.com/tiaanduplessis/awesome-react-talks) - A curated list of React talks.
2020

21-
- [Hero35 React Hub](https://hero35.com/stack/react) - A website with _all_ React conferences and talks, categorized & curated.
21+
- [Hero35 React Hub](https://hero35.com/topic/react) - A website with _all_ React conferences and talks, categorized & curated.

content/community/meetups.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
9595
* [Tel Aviv](https://www.meetup.com/ReactJS-Israel/)
9696

9797
## Malaysia {#malaysia}
98+
* [Kuala Lumpur](https://www.kl-react.com/)
9899
* [Penang](https://www.facebook.com/groups/reactpenang/)
99100

100101
## Netherlands {#netherlands}
@@ -111,6 +112,9 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
111112
* [Karachi](https://www.facebook.com/groups/902678696597634/)
112113
* [Lahore](https://www.facebook.com/groups/ReactjsLahore/)
113114

115+
## Panama {#panama}
116+
* [Panama](https://www.meetup.com/React-Panama/)
117+
114118
## Peru {#peru}
115119
* [Lima](https://www.meetup.com/ReactJS-Peru/)
116120

@@ -144,13 +148,15 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
144148
* [Kyiv](https://www.meetup.com/Kyiv-ReactJS-Meetup)
145149

146150
## US {#us}
151+
* [Ann Arbor, MI - ReactJS](https://www.meetup.com/AnnArbor-jsx/)
147152
* [Atlanta, GA - ReactJS](https://www.meetup.com/React-ATL/)
148153
* [Austin, TX - ReactJS](https://www.meetup.com/ReactJS-Austin-Meetup/)
149154
* [Boston, MA - ReactJS](https://www.meetup.com/ReactJS-Boston/)
150155
* [Boston, MA - React Native](https://www.meetup.com/Boston-React-Native-Meetup/)
151156
* [Charlotte, NC - ReactJS](https://www.meetup.com/ReactJS-Charlotte/)
152157
* [Charlotte, NC - React Native](https://www.meetup.com/cltreactnative/)
153158
* [Chicago, IL - ReactJS](https://www.meetup.com/React-Chicago/)
159+
* [Cleveland, OH - ReactJS](https://www.meetup.com/Cleveland-React/)
154160
* [Columbus, OH - ReactJS](https://www.meetup.com/ReactJS-Columbus-meetup/)
155161
* [Dallas, TX - ReactJS](https://www.meetup.com/ReactDallas/)
156162
* [Detroit, MI - Detroit React User Group](https://www.meetup.com/Detroit-React-User-Group/)

content/docs/concurrent-mode-adoption.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ ReactDOM.createRoot(
8080
>
8181
>Concurrent Mode APIs such as `createRoot` only exist in the experimental builds of React.
8282
83-
In Concurrent Mode, the lifecycle methods [previously marked](https://reactjs.org/blog/2018/03/27/update-on-async-rendering.html) as "unsafe" actually *are* unsafe, and lead to bugs even more than in today's React. We don't recommend trying Concurrent Mode until your app is [Strict Mode](https://reactjs.org/docs/strict-mode.html)-compatible.
83+
In Concurrent Mode, the lifecycle methods [previously marked](/blog/2018/03/27/update-on-async-rendering.html) as "unsafe" actually *are* unsafe, and lead to bugs even more than in today's React. We don't recommend trying Concurrent Mode until your app is [Strict Mode](/docs/strict-mode.html)-compatible.
8484

8585
## What to Expect {#what-to-expect}
8686

content/docs/concurrent-mode-patterns.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ function ProfileTrivia({ resource }) {
507507

508508
**[Try it on CodeSandbox](https://codesandbox.io/s/focused-mountain-uhkzg)**
509509

510-
If you press "Open Profile" now, you can tell something is wrong. It takes whole seven seconds to make the transition now! This is because our trivia API is too slow. Let's say we can't make the API faster. How can we improve the user experience with this constraint?
510+
If you press "Open Profile" now, you can tell something is wrong. It takes a whole seven seconds to make the transition now! This is because our trivia API is too slow. Let's say we can't make the API faster. How can we improve the user experience with this constraint?
511511

512512
If we don't want to stay in the Pending state for too long, our first instinct might be to set `timeoutMs` in `useTransition` to something smaller, like `3000`. You can try this [here](https://codesandbox.io/s/practical-kowalevski-kpjg4). This lets us escape the prolonged Pending state, but we still don't have anything useful to show!
513513

@@ -790,7 +790,7 @@ function ProfileTimeline({ isStale, resource }) {
790790

791791
The tradeoff we're making here is that `<ProfileTimeline>` will be inconsistent with other components and potentially show an older item. Click "Next" a few times, and you'll notice it. But thanks to that, we were able to cut down the transition time from 1000ms to 300ms.
792792

793-
Whether or not it's an appropriate tradeoff depends on the situation. But it's a handy tool, especially when the content doesn't change very visible between items, and the user might not even realize they were looking at a stale version for a second.
793+
Whether or not it's an appropriate tradeoff depends on the situation. But it's a handy tool, especially when the content doesn't change noticeably between items, and the user might not even realize they were looking at a stale version for a second.
794794

795795
It's worth noting that `useDeferredValue` is not *only* useful for data fetching. It also helps when an expensive component tree causes an interaction (e.g. typing in an input) to be sluggish. Just like we can "defer" a value that takes too long to fetch (and show its old value despite others components updating), we can do this with trees that take too long to render.
796796

content/docs/faq-versioning.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Minor releases are the most common type of release.
2222
2323
### Breaking Changes {#breaking-changes}
2424

25-
Breaking changes are inconvenient for everyone, so we try to minimize the number of major releases – for example, React 15 was released in April 2016 and React 16 was released in September 2017; React 17 isn't expected until 2019.
25+
Breaking changes are inconvenient for everyone, so we try to minimize the number of major releases – for example, React 15 was released in April 2016 and React 16 was released in September 2017; React 17 isn't expected until sometime in 2020.
2626

2727
Instead, we release new features in minor versions. That means that minor releases are often more interesting and compelling than majors, despite their unassuming name.
2828

content/docs/hooks-reference.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ Although `useEffect` is deferred until after the browser has painted, it's guara
143143

144144
The default behavior for effects is to fire the effect after every completed render. That way an effect is always recreated if one of its dependencies changes.
145145

146-
However, this may be overkill in some cases, like the subscription example from the previous section. We don't need to create a new subscription on every update, only if the `source` props has changed.
146+
However, this may be overkill in some cases, like the subscription example from the previous section. We don't need to create a new subscription on every update, only if the `source` prop has changed.
147147

148148
To implement this, pass a second argument to `useEffect` that is the array of values that the effect depends on. Our updated example now looks like this:
149149

content/docs/how-to-contribute.md

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ All work on React happens directly on [GitHub](https://github.com/facebook/react
2121

2222
### Semantic Versioning {#semantic-versioning}
2323

24-
React follows [semantic versioning](https://semver.org/). We release patch versions for critical bugfixes, minor versions for new features or non-essential changes, and major versions for any breaking changes. When we make breaking changes, we also introduce deprecation warnings in a minor version so that our users learn about the upcoming changes and migrate their code in advance. Learn more about our commitment to stability and incremental migration in [our versioning policy](https://reactjs.org/docs/faq-versioning.html).
24+
React follows [semantic versioning](https://semver.org/). We release patch versions for critical bugfixes, minor versions for new features or non-essential changes, and major versions for any breaking changes. When we make breaking changes, we also introduce deprecation warnings in a minor version so that our users learn about the upcoming changes and migrate their code in advance. Learn more about our commitment to stability and incremental migration in [our versioning policy](/docs/faq-versioning.html).
2525

2626
Every significant change is documented in the [changelog file](https://github.com/facebook/react/blob/master/CHANGELOG.md).
2727

@@ -56,7 +56,7 @@ Facebook has a [bounty program](https://www.facebook.com/whitehat/) for the safe
5656
### How to Get in Touch {#how-to-get-in-touch}
5757

5858
* IRC: [#reactjs on freenode](https://webchat.freenode.net/?channels=reactjs)
59-
* [Discussion forums](https://reactjs.org/community/support.html#popular-discussion-forums)
59+
* [Discussion forums](/community/support.html#popular-discussion-forums)
6060

6161
There is also [an active community of React users on the Discord chat platform](https://www.reactiflux.com/) in case you need help with React.
6262

@@ -104,6 +104,7 @@ In order to accept your pull request, we need you to submit a CLA. You only need
104104
### Contribution Prerequisites {#contribution-prerequisites}
105105

106106
* You have [Node](https://nodejs.org) installed at v8.0.0+ and [Yarn](https://yarnpkg.com/en/) at v1.2.0+.
107+
* You have [JDK](https://www.oracle.com/technetwork/java/javase/downloads/index.html) installed.
107108
* You have `gcc` installed or are comfortable installing a compiler if needed. Some of our dependencies may require a compilation step. On OS X, the Xcode Command Line Tools will cover this. On Ubuntu, `apt-get install build-essential` will install the required packages. Similar commands should work on other Linux distros. Windows will require some additional steps, see the [`node-gyp` installation instructions](https://github.com/nodejs/node-gyp#installation) for details.
108109
* You are familiar with Git.
109110

@@ -154,19 +155,6 @@ You can check the status of your code styling by simply running `yarn linc`.
154155

155156
However, there are still some styles that the linter cannot pick up. If you are unsure about something, looking at [Airbnb's Style Guide](https://github.com/airbnb/javascript) will guide you in the right direction.
156157

157-
### Introductory Video {#introductory-video}
158-
159-
You may be interested in watching [this short video](https://www.youtube.com/watch?v=wUpPsEcGsg8) (26 mins) which gives an introduction on how to contribute to React.
160-
161-
#### Video highlights: {#video-highlights}
162-
- [4:12](https://youtu.be/wUpPsEcGsg8?t=4m12s) - Building and testing React locally
163-
- [6:07](https://youtu.be/wUpPsEcGsg8?t=6m7s) - Creating and sending pull requests
164-
- [8:25](https://youtu.be/wUpPsEcGsg8?t=8m25s) - Organizing code
165-
- [14:43](https://youtu.be/wUpPsEcGsg8?t=14m43s) - React npm registry
166-
- [19:15](https://youtu.be/wUpPsEcGsg8?t=19m15s) - Adding new React features
167-
168-
For a realistic overview of what it _feels_ like to contribute to React for the first time, check out [this entertaining ReactNYC talk](https://www.youtube.com/watch?v=GWCcZ6fnpn4).
169-
170158
### Request for Comments (RFC) {#request-for-comments-rfc}
171159

172160
Many changes, including bug fixes and documentation improvements can be implemented and reviewed via the normal GitHub pull request workflow.

content/docs/react-without-jsx.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ ReactDOM.render(
4040

4141
If you're curious to see more examples of how JSX is converted to JavaScript, you can try out [the online Babel compiler](babel://jsx-simple-example).
4242

43-
The component can either be provided as a string, or as a subclass of `React.Component`, or a plain function for stateless components.
43+
The component can either be provided as a string, as a subclass of `React.Component`, or a plain function.
4444

4545
If you get tired of typing `React.createElement` so much, one common pattern is to assign a shorthand:
4646

0 commit comments

Comments
 (0)