Skip to content

Commit e86b844

Browse files
authored
Merge branch 'master' into master
2 parents db6bc44 + c2b67cb commit e86b844

39 files changed

+454
-284
lines changed

CODE_OF_CONDUCT.md

Lines changed: 74 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,76 @@
11
# Code of Conduct
22

3-
Facebook has adopted a Code of Conduct that we expect project participants to adhere to.
4-
Please read the [full text](https://code.fb.com/codeofconduct/)
5-
so that you can understand what actions will and will not be tolerated.
3+
## Our Pledge
4+
5+
In the interest of fostering an open and welcoming environment, we as
6+
contributors and maintainers pledge to make participation in our project and
7+
our community a harassment-free experience for everyone, regardless of age, body
8+
size, disability, ethnicity, sex characteristics, gender identity and expression,
9+
level of experience, education, socio-economic status, nationality, personal
10+
appearance, race, religion, or sexual identity and orientation.
11+
12+
## Our Standards
13+
14+
Examples of behavior that contributes to creating a positive environment
15+
include:
16+
17+
* Using welcoming and inclusive language
18+
* Being respectful of differing viewpoints and experiences
19+
* Gracefully accepting constructive criticism
20+
* Focusing on what is best for the community
21+
* Showing empathy towards other community members
22+
23+
Examples of unacceptable behavior by participants include:
24+
25+
* The use of sexualized language or imagery and unwelcome sexual attention or
26+
advances
27+
* Trolling, insulting/derogatory comments, and personal or political attacks
28+
* Public or private harassment
29+
* Publishing others' private information, such as a physical or electronic
30+
address, without explicit permission
31+
* Other conduct which could reasonably be considered inappropriate in a
32+
professional setting
33+
34+
## Our Responsibilities
35+
36+
Project maintainers are responsible for clarifying the standards of acceptable
37+
behavior and are expected to take appropriate and fair corrective action in
38+
response to any instances of unacceptable behavior.
39+
40+
Project maintainers have the right and responsibility to remove, edit, or
41+
reject comments, commits, code, wiki edits, issues, and other contributions
42+
that are not aligned to this Code of Conduct, or to ban temporarily or
43+
permanently any contributor for other behaviors that they deem inappropriate,
44+
threatening, offensive, or harmful.
45+
46+
## Scope
47+
48+
This Code of Conduct applies within all project spaces, and it also applies when
49+
an individual is representing the project or its community in public spaces.
50+
Examples of representing a project or community include using an official
51+
project e-mail address, posting via an official social media account, or acting
52+
as an appointed representative at an online or offline event. Representation of
53+
a project may be further defined and clarified by project maintainers.
54+
55+
## Enforcement
56+
57+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
58+
reported by contacting the project team at <[email protected]>. All
59+
complaints will be reviewed and investigated and will result in a response that
60+
is deemed necessary and appropriate to the circumstances. The project team is
61+
obligated to maintain confidentiality with regard to the reporter of an incident.
62+
Further details of specific enforcement policies may be posted separately.
63+
64+
Project maintainers who do not follow or enforce the Code of Conduct in good
65+
faith may face temporary or permanent repercussions as determined by other
66+
members of the project's leadership.
67+
68+
## Attribution
69+
70+
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
71+
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
72+
73+
[homepage]: https://www.contributor-covenant.org
74+
75+
For answers to common questions about this code of conduct, see
76+
https://www.contributor-covenant.org/faq

content/blog/2017-07-26-error-handling-in-react-16.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,4 +111,4 @@ Error boundaries preserve the declarative nature of React, and behave as you wou
111111

112112
React 15 included a very limited support for error boundaries under a different method name: `unstable_handleError`. This method no longer works, and you will need to change it to `componentDidCatch` in your code starting from the first 16 beta release.
113113

114-
For this change, we’ve provided [a codemod](https://github.com/reactjs/react-codemod#error-boundaries) to automatically migrate your code.
114+
For this change, we’ve provided a [codemod](https://github.com/reactjs/react-codemod#error-boundaries) to automatically migrate your code.

content/blog/2019-08-15-new-react-devtools.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@ git clone https://github.com/facebook/react-devtools
6060

6161
cd react-devtools
6262

63+
# Checkout the previous release branch
64+
git checkout v3
65+
6366
# Install dependencies and build the unpacked extension
6467
yarn install
6568
yarn build:extension

content/community/articles.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,5 @@ permalink: community/articles.html
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.
1616
- [The Hands-On Guide to Learning React Hooks](https://www.telerik.com/kendo-react-ui/react-hooks-guide/) - Eric Bishard's step-by-step guide to learning React Hooks.
17+
- [How to Use the React Profiler Component to Measure Render Performance](https://medium.com/@adamhenson/how-to-use-the-react-profiler-component-to-measure-performance-improvements-from-hooks-d43b7092d7a8) - Adam Henson's article exemplifying a use case for `<React.Profiler />`.
18+
- [Thinking in React Hooks](https://wattenberger.com/blog/react-hooks) - Amelia Wattenberger's provides visualizations and highlighting the mindset change needed switching from classes to functional components + hooks.

content/community/conferences.md

Lines changed: 66 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -12,51 +12,6 @@ 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-
20-
### React Rally 2019 {#react-rally-2019}
21-
August 22-23, 2019. Salt Lake City, USA.
22-
23-
[Website](https://www.reactrally.com/) - [Twitter](https://twitter.com/ReactRally) - [Instagram](https://www.instagram.com/reactrally/)
24-
25-
### ComponentsConf 2019 {#componentsconf-2019}
26-
September 6, 2019 in Melbourne, Australia
27-
28-
[Website](https://www.componentsconf.com.au/) - [Twitter](https://twitter.com/componentsconf)
29-
30-
### React Native EU 2019 {#react-native-eu-2019}
31-
September 5-6 in Wrocław, Poland
32-
33-
[Website](https://react-native.eu) - [Twitter](https://twitter.com/react_native_eu) - [Facebook](https://www.facebook.com/reactnativeeu)
34-
35-
### React New York 2019 {#react-new-york-2019}
36-
September 13th, 2019. New York, USA
37-
38-
[Website](https://reactnewyork.com/) - [Twitter](https://twitter.com/reactnewyork)
39-
40-
### React Live 2019 {#react-live-2019}
41-
September 13th, 2019. Amsterdam, The Netherlands
42-
43-
[Website](https://www.reactlive.nl/) - [Twitter](https://twitter.com/reactlivenl)
44-
45-
### React Boston 2019 {#react-boston-2019}
46-
September 21-22, 2019 in Boston, Massachusetts USA
47-
48-
[Website](https://www.reactboston.com/) - [Twitter](https://twitter.com/reactboston)
49-
50-
### React India 2019 {#react-india-2019}
51-
September 26-28, 2019 in Goa, India
52-
53-
[Website](https://www.reactindia.io/) - [Twitter](https://twitter.com/react_india) - [Facebook](https://www.facebook.com/ReactJSIndia)
54-
55-
### React Alicante 2019 {#react-alicante-2019}
56-
September 26-28, 2019 in Alicante, Spain
57-
58-
[Website](http://reactalicante.es/) - [Twitter](https://twitter.com/reactalicante) - [Facebook](https://www.facebook.com/ReactAlicante)
59-
6015
### React Conf 2019 {#react-conf-2019}
6116
October 24-25, 2019 in Henderson, Nevada USA
6217

@@ -67,6 +22,11 @@ October 25, 2019 in London, UK
6722

6823
[Website](https://reactadvanced.com) - [Twitter](http://twitter.com/reactadvanced) - [Facebook](https://www.facebook.com/ReactAdvanced) - [Videos](https://youtube.com/c/ReactConferences)
6924

25+
### React Conf Brasil 2019 {#react-conf-2019}
26+
October 19, 2019 in São Paulo, BR
27+
28+
[Website](https://reactconf.com.br/) - [Twitter](https://twitter.com/reactconfbr) - [Facebook](https://www.facebook.com/ReactAdvanced) - [Slack](https://react.now.sh/)
29+
7030
### React Day Berlin 2019 {#react-day-berlin-2019}
7131
December 6, 2019 in Berlin, Germany
7232

@@ -80,13 +40,28 @@ February 27 & 28, 2020 in Sydney, Australia
8040
### Render-Atlanta 2020 {#render-atlanta-2020}
8141
May 4-6, 2020. Atlanta, GA, USA.
8242

83-
[Website](https://renderatl.com)
43+
[Website](https://renderatl.com) - [Twitter](https://twitter.com/renderATL) - [Instagram](https://www.instagram.com/renderatl/) - [Facebook](https://www.facebook.com/renderatl/)
44+
45+
### ReactEurope 2020 {#reacteurope-2020}
46+
May 14-15, 2020 in Paris, France
47+
48+
[Website](https://www.react-europe.org) - [Twitter](https://twitter.com/ReactEurope) - [Facebook](https://www.facebook.com/ReactEurope) - [Videos](https://www.youtube.com/c/ReacteuropeOrgConf)
49+
50+
### React Finland 2020 {#react-finland-2020}
51+
May 26-29 in Helsinki, Finland
52+
53+
[Website](https://react-finland.fi/) - [Twitter](https://twitter.com/ReactFinland)
8454

8555
### React Next 2020 {#react-next-2020}
8656
June 15, 2020. Tel Aviv, Israel.
8757

8858
[Website](https://react-next.com/) - [Twitter](https://twitter.com/reactnext) - [Facebook](https://www.facebook.com/ReactNext2016/)
8959

60+
### React Week NY 2020 {#react-week-NY-2020}
61+
July 17, 2020. New York City, USA.
62+
63+
[Website](https://reactweek.nyc/) - [Twitter](https://twitter.com/reactweek) - [Facebook](https://www.facebook.com/reactweek)
64+
9065

9166
## Past Conferences {#past-conferences}
9267

@@ -422,3 +397,48 @@ July 11-12, 2019. Portland, OR, USA.
422397

423398
[Website](https://infinite.red/ChainReactConf)
424399

400+
### React Rally 2019 {#react-rally-2019}
401+
August 22-23, 2019. Salt Lake City, USA.
402+
403+
[Website](https://www.reactrally.com/) - [Twitter](https://twitter.com/ReactRally) - [Instagram](https://www.instagram.com/reactrally/)
404+
405+
### React Conf Iran 2019 {#react-conf-iran-2019}
406+
August 29, 2019. Tehran, Iran.
407+
408+
[Website](https://reactconf.ir/) - [Videos](https://www.youtube.com/playlist?list=PL-VNqZFI5Nf-Nsj0rD3CWXGPkH-DI_0VY) - [Highlights](https://github.com/ReactConf/react-conf-highlights)
409+
410+
### React Native EU 2019 {#react-native-eu-2019}
411+
September 5-6 in Wrocław, Poland
412+
413+
[Website](https://react-native.eu) - [Twitter](https://twitter.com/react_native_eu) - [Facebook](https://www.facebook.com/reactnativeeu)
414+
415+
### ComponentsConf 2019 {#componentsconf-2019}
416+
September 6, 2019 in Melbourne, Australia
417+
418+
[Website](https://www.componentsconf.com.au/) - [Twitter](https://twitter.com/componentsconf)
419+
420+
### React New York 2019 {#react-new-york-2019}
421+
September 13th, 2019. New York, USA
422+
423+
[Website](https://reactnewyork.com/) - [Twitter](https://twitter.com/reactnewyork)
424+
425+
### React Live 2019 {#react-live-2019}
426+
September 13th, 2019. Amsterdam, The Netherlands
427+
428+
[Website](https://www.reactlive.nl/) - [Twitter](https://twitter.com/reactlivenl)
429+
430+
### React Boston 2019 {#react-boston-2019}
431+
September 21-22, 2019 in Boston, Massachusetts USA
432+
433+
[Website](https://www.reactboston.com/) - [Twitter](https://twitter.com/reactboston)
434+
435+
### React India 2019 {#react-india-2019}
436+
September 26-28, 2019 in Goa, India
437+
438+
[Website](https://www.reactindia.io/) - [Twitter](https://twitter.com/react_india) - [Facebook](https://www.facebook.com/ReactJSIndia)
439+
440+
### React Alicante 2019 {#react-alicante-2019}
441+
September 26-28, 2019 in Alicante, Spain
442+
443+
[Website](http://reactalicante.es/) - [Twitter](https://twitter.com/reactalicante) - [Facebook](https://www.facebook.com/ReactAlicante)
444+

content/community/courses.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ permalink: community/courses.html
88

99
## Free Courses {#free-courses}
1010

11+
- [Glitch: React Starter Kit](https://glitch.com/culture/react-starter-kit/) - A free, 5-part video course with interactive code examples that will help you learn React.
12+
1113
- [Codecademy: React 101](https://www.codecademy.com/learn/react-101) - Codecademy's introductory course for React.
1214

1315
- [Egghead.io: Start Learning React](https://egghead.io/courses/start-learning-react) - This series will explore the basic fundamentals of React to get you started.

content/community/examples.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,7 @@ There are many example projects created by the React community. Feel free to add
2121
* **[Bitcoin Price Index](https://github.com/mrkjlchvz/bitcoin-price-index)** Simple bitcoin price index data from CoinDesk API.
2222
* **[Builder Book](https://github.com/builderbook/builderbook)** Open source web app to write and host documentation or sell books. Built with React, Material-UI, Next, Express, Mongoose, MongoDB.
2323
* **[GFonts Space](https://github.com/pankajladhar/GFontsSpace)** A space which allows user to play with Google fonts. Built with React, Redux and React-Router.
24+
* **[Course Learn Page](https://github.com/ulearnpro/ulearn)** Open Source LMS script in Laravel 5.8 and ReactJS 16.9
25+
* **[Speedy math](https://github.com/pankajladhar/speedy-math)** An application which allows kids to practice basic Mathematics i.e Addition, Subtraction, Multiply, Comparison. It is a PWA (Progressive web app) with offline support and install as App features.
26+
* **[Unit Converter](https://github.com/KarthikeyanRanasthala/react-unit-converter)** Minimal Yet Responsive Unit Converter Built With React, Material-UI & Convert-Units.
27+
* **[BMI Calculator](https://github.com/GermaVinsmoke/bmi-calculator)** A React Hooks app for calculating BMI

content/community/meetups.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
2525
* [Joinville](https://www.meetup.com/pt-BR/React-Joinville/)
2626
* [Rio de Janeiro](https://www.meetup.com/pt-BR/React-Rio-de-Janeiro/)
2727
* [São Paulo](https://www.meetup.com/pt-BR/ReactJS-SP/)
28+
* [Vila Velha](https://www.meetup.com/pt-BR/React-ES/)
2829

2930
## Bolivia {#bolivia}
3031
* [Bolivia](https://www.meetup.com/ReactBolivia/)
3132

3233
## Canada {#canada}
33-
* [Montreal, QC - ReactJS](https://www.meetup.com/fr-FR/ReactMontreal/)
3434
* [Montreal, QC - React Native](https://www.meetup.com/fr-FR/React-Native-MTL/)
3535
* [Vancouver, BC](https://www.meetup.com/ReactJS-Vancouver-Meetup/)
3636
* [Ottawa, ON](https://www.meetup.com/Ottawa-ReactJS-Meetup/)
@@ -50,6 +50,7 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
5050
* [React.JS Girls London](https://www.meetup.com/ReactJS-Girls-London/)
5151

5252
## France {#france}
53+
* [Lille](https://www.meetup.com/ReactBeerLille/)
5354
* [Paris](https://www.meetup.com/ReactJS-Paris/)
5455

5556
## Germany {#germany}
@@ -58,8 +59,7 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
5859
* [Karlsruhe](https://www.meetup.com/react_ka/)
5960
* [Kiel](https://www.meetup.com/Kiel-React-Native-Meetup/)
6061
* [Munich](https://www.meetup.com/ReactJS-Meetup-Munich/)
61-
* [React Berlin](https://www.meetup.com/React-Berlin/)
62-
* [React.JS Girls Berlin](https://www.meetup.com/ReactJS-Girls-Berlin/)
62+
* [React Berlin](https://www.meetup.com/React-Open-Source/)
6363

6464
## Greece {#greece}
6565
* [Thessaloniki](https://www.meetup.com/Thessaloniki-ReactJS-Meetup/)
@@ -144,8 +144,9 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
144144
* [New York, NY - ReactJS](https://www.meetup.com/NYC-Javascript-React-Group/)
145145
* [New York, NY - React Ladies](https://www.meetup.com/React-Ladies/)
146146
* [New York, NY - React Native](https://www.meetup.com/React-Native-NYC/)
147+
* [New York, NY - useReactNYC](https://www.meetup.com/useReactNYC/)
147148
* [Palo Alto, CA - React Native](https://www.meetup.com/React-Native-Silicon-Valley/)
148-
* [Philadelphia, PA - ReactJS](https://www.meetup.com/RQ-React/)
149+
* [Philadelphia, PA - ReactJS](https://www.meetup.com/Reactadelphia/)
149150
* [Phoenix, AZ - ReactJS](https://www.meetup.com/ReactJS-Phoenix/)
150151
* [Pittsburgh, PA - ReactJS/React Native](https://www.meetup.com/ReactPgh/)
151152
* [Portland, OR - ReactJS](https://www.meetup.com/Portland-ReactJS/)

content/community/support.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ React has a community of millions of developers.
1212

1313
On this page we've listed some React-related communities that you can be a part of; see the other pages in this section for additional online and in-person learning materials.
1414

15+
Before participating in React's communities, [please read our Code of Conduct](https://github.com/facebook/react/blob/master/CODE_OF_CONDUCT.md). We have adopted the [Contributor Covenant](https://www.contributor-covenant.org/) and we expect that all community members adhere to the guidelines within.
16+
1517
## Stack Overflow {#stack-overflow}
1618

1719
Stack Overflow is a popular forum to ask code-level questions or if you're stuck with a specific error. Read through the [existing questions](https://stackoverflow.com/questions/tagged/reactjs) tagged with **reactjs** or [ask your own](https://stackoverflow.com/questions/ask?tags=reactjs)!
@@ -24,7 +26,7 @@ Each community consists of many thousands of React users.
2426

2527
* [DEV's React community](https://dev.to/t/react)
2628
* [Hashnode's React community](https://hashnode.com/n/reactjs)
27-
* [Reactiflux online chat](https://discord.gg/0ZcbPKXt5bZjGY5n)
29+
* [Reactiflux online chat](https://discord.gg/reactiflux)
2830
* [Reddit's React community](https://www.reddit.com/r/reactjs/)
2931
* [Spectrum's React community](https://spectrum.chat/react)
3032

content/community/tools-debugging.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ layout: community
55
permalink: community/debugging-tools.html
66
---
77

8-
* **[React Developer Tools](https://github.com/facebook/react-devtools):** an extension available for [Chrome](https://chrome.google.com/webstore/detail/react-developer-tools/fmkadmapgofadopljbjfkapdkoienihi), [Firefox](https://addons.mozilla.org/firefox/addon/react-devtools/), and as a [standalone app](https://github.com/facebook/react-devtools/tree/master/packages/react-devtools) that allows you to inspect the React component hierarchy in the Chrome Developer Tools.
8+
* **[React Developer Tools](https://github.com/facebook/react-devtools):** an extension available for [Chrome](https://chrome.google.com/webstore/detail/react-developer-tools/fmkadmapgofadopljbjfkapdkoienihi), [Firefox](https://addons.mozilla.org/firefox/addon/react-devtools/), and as a [standalone app](https://github.com/facebook/react/tree/master/packages/react-devtools) that allows you to inspect the React component hierarchy in the Chrome Developer Tools.

0 commit comments

Comments
 (0)