Skip to content

Commit 91fc9ee

Browse files
authored
Merge branch 'master' into Translating-hooks-reference.md
2 parents 02d0eba + 697b956 commit 91fc9ee

109 files changed

Lines changed: 3938 additions & 3277 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎README.md‎

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,36 +28,47 @@ This repo contains the source code and documentation powering [ar.reactjs.org](h
2828

2929
The documentation is divided into several sections with a different tone and purpose. If you plan to write more than a few sentences, you might find it helpful to get familiar with the [contributing guidelines](https://github.com/reactjs/ar.reactjs.org/blob/master/CONTRIBUTING.md#guidelines-for-text) for the appropriate sections.
3030

31-
### Fork and Setup Repo
31+
### Steps
32+
33+
1. Check that no one else has claimed your page in the checklist and comments of [Arabic Translation Progress](https://github.com/reactjs/ar.reactjs.org/issues/1) and the pull requests.
34+
2. Comment at [Arabic Translation Progress](https://github.com/reactjs/ar.reactjs.org/issues/1) with the name of the page you would like to translate. **Please take only one page at a time.**
35+
3. [Fork and Setup Repo](https://github.com/reactjs/ar.reactjs.org#fork-and-setup-repo), translate your page, and submit a pull request!
36+
37+
Before contributing, read the [glossary](https://github.com/reactjs/ar.reactjs.org/wiki/Glossary) and [style guide](https://github.com/reactjs/reactjs.org-translation/blob/master/style-guide.md) to understand how to translate various technical and React-specific terms.
38+
39+
And use [Hsoub's translation](https://wiki.hsoub.com/React) as a reference.
40+
41+
42+
#### Fork and Setup Repo
3243
1. Fork the repo
33-
1. Clone forked repo on your local machine
34-
1. `cd ar.reactjs.org` to go into the project root
35-
1. `git remote add upstream https://github.com/reactjs/ar.reactjs.org` to add original repo as an upstream
36-
1. `yarn` to install the website's npm dependencies
44+
2. Clone forked repo on your local machine
45+
3. `cd ar.reactjs.org` to go into the project root
46+
4. `git remote add upstream https://github.com/reactjs/ar.reactjs.org` to add original repo as an upstream
47+
5. `yarn` to install the website's npm dependencies
3748

38-
### Create a branch
49+
#### Create a branch
3950

4051
1. `git checkout master` from any folder in your local `ar.reactjs.org` repository
4152
1. `git pull upstream master` to ensure you have the latest main code
4253
1. `git checkout -b the-name-of-my-branch` (replacing `the-name-of-my-branch` with a suitable name) to create a branch
4354

44-
### Make the change
55+
#### Make the change
4556

4657
1. Follow the ["Running locally"](#running-locally) instructions
4758
1. Save the files and check in the browser
4859
1. Changes to React components in `src` will hot-reload
4960
1. Changes to markdown files in `content` will hot-reload
5061
1. If working with plugins, you may need to remove the `.cache` directory and restart the server
5162

52-
### Test the change
63+
#### Test the change
5364

5465
1. If possible, test any visual changes in all latest versions of common browsers, on both desktop and mobile.
5566
1. Run `yarn check-all` from the project root. (This will run Prettier, ESLint, and Flow.)
5667

57-
### Push it
68+
#### Push it
5869

59-
1. `git add -A && git commit -m "My message"` (replacing `My message` with a commit message, such as `Fixed header logo on Android`) to stage and commit your changes
60-
1. `git push origin the-name-of-my-branch`
70+
1. `git add -A && git commit -m "My message"` (replacing `My message` with a commit message, such as `Fix header logo on Android`) to stage and commit your changes
71+
1. `git push my-fork-name the-name-of-my-branch`
6172
1. Go to the [reactjs.org repo](https://github.com/reactjs/reactjs.org) and you should see recently pushed branches.
6273
1. Follow GitHub's instructions.
6374
1. If possible, include screenshots of visual changes. A Netlify build will also be automatically created once you make your PR so other people can see your change.

‎content/blog/2014-09-24-testing-flux-applications.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ The first steps toward working with Jest are as follows:
1717

1818
1. Get the module dependencies for the application installed by running `npm install`.
1919
2. Create a directory `__tests__/` with a test file, in this case TodoStore-test.js
20-
3. Run `npm install jest-cli save-dev`
20+
3. Run `npm install jest-cli --save-dev`
2121
4. Add the following to your package.json
2222

2323
```javascript

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ Here is an example of a component that uses the legacy `componentWillReceiveProp
134134

135135
Although the above code is not problematic in itself, the `componentWillReceiveProps` lifecycle is often mis-used in ways that _do_ present problems. Because of this, the method will be deprecated.
136136

137-
As of version 16.3, the recommended way to update `state` in response to `props` changes is with the new `static getDerivedStateFromProps` lifecycle. (That lifecycle is called when a component is created and each time it receives new props):
137+
As of version 16.3, the recommended way to update `state` in response to `props` changes is with the new `static getDerivedStateFromProps` lifecycle. It is called when a component is created and each time it re-renders due to changes to props or state:
138138
`embed:update-on-async-rendering/updating-state-from-props-after.js`
139139

140140
You may notice in the example above that `props.currentRow` is mirrored in state (as `state.lastRow`). This enables `getDerivedStateFromProps` to access the previous props value in the same way as is done in `componentWillReceiveProps`.

‎content/blog/2018-10-01-create-react-app-v2.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Here's a short summary of what's new in this release:
2525
* 🃏 We updated to [Jest 23](https://jestjs.io/blog/2018/05/29/jest-23-blazing-fast-delightful-testing.html), which includes an [interactive mode](https://jestjs.io/blog/2018/05/29/jest-23-blazing-fast-delightful-testing#interactive-snapshot-mode) for reviewing snapshots.
2626
* 💄 We added [PostCSS](https://preset-env.cssdb.org/features#stage-3) so you can use new CSS features in old browsers.
2727
* 💎 You can use [Apollo](https://github.com/leoasis/graphql-tag.macro#usage), [Relay Modern](https://github.com/facebook/relay/pull/2171#issuecomment-411459604), [MDX](https://github.com/facebook/create-react-app/issues/5149#issuecomment-425396995), and other third-party [Babel Macros](https://babeljs.io/blog/2017/09/11/zero-config-with-babel-macros) transforms.
28-
* 🌠 You can now [import an SVG as a React component](https://github.com/facebook/create-react-app/blob/master/packages/react-scripts/template/README.md#adding-svgs), and use it in JSX.
28+
* 🌠 You can now [import an SVG as a React component](https://facebook.github.io/create-react-app/docs/adding-images-fonts-and-files#adding-svgs), and use it in JSX.
2929
* 🐈 You can try the experimental [Yarn Plug'n'Play mode](https://github.com/yarnpkg/rfcs/pull/101) that removes `node_modules`.
3030
* 🕸 You can now [plug your own proxy implementation](https://github.com/facebook/create-react-app/blob/master/packages/react-scripts/template/README.md#configuring-the-proxy-manually) in development to match your backend API.
3131
* 🚀 You can now use [packages written for latest Node versions](https://github.com/sindresorhus/ama/issues/446#issuecomment-281014491) without breaking the build.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,10 +140,10 @@ Assuming you already have ESLint installed, run:
140140

141141
```sh
142142
# npm
143-
npm install eslint-plugin-react-hooks@next --save-dev
143+
npm install eslint-plugin-react-hooks --save-dev
144144

145145
# yarn
146-
yarn add eslint-plugin-react-hooks@next --dev
146+
yarn add eslint-plugin-react-hooks --dev
147147
```
148148

149149
Then add it to your ESLint configuration:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ This approach appealed to us for several reasons:
3939
* It encouraged active maintainers for each repo to ensure quality.
4040
* Contributors already understand GitHub as a platform and are motivated to contribute directly to the React organization.
4141

42-
We started of with an initial trial period of three languages: Spanish, Japanese, and Simplified Chinese. This allowed us to work out any kinks in our process and make sure future translations are set up for success. I wanted to give the translation teams freedom to choose whatever tools they felt comfortable with. The only requirement is a [checklist](https://github.com/reactjs/reactjs.org-translation/blob/master/PROGRESS.template.md) that outlines the order of importance for translating pages.
42+
We started off with an initial trial period of three languages: Spanish, Japanese, and Simplified Chinese. This allowed us to work out any kinks in our process and make sure future translations are set up for success. I wanted to give the translation teams freedom to choose whatever tools they felt comfortable with. The only requirement is a [checklist](https://github.com/reactjs/reactjs.org-translation/blob/master/PROGRESS.template.md) that outlines the order of importance for translating pages.
4343

4444
After the trial period, we were ready to accept more languages. I created [a script](https://github.com/reactjs/reactjs.org-translation/blob/master/scripts/create.js) to automate the creation of the new language repo, and a site, [Is React Translated Yet?](https://isreacttranslatedyet.com), to track progress on the different translations. We started *10* new translations on our first day alone!
4545

‎content/community/articles.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ permalink: community/articles.html
1010
- [9 things every React.js beginner should know](https://camjackson.net/post/9-things-every-reactjs-beginner-should-know) - Cam Jackson's guide for beginners.
1111
- [React "Aha" Moments](https://tylermcginnis.com/react-aha-moments/) - Tyler McGinnis' article on his collection of "Aha" moments with React.
1212
- [You're missing the point of React](https://medium.com/@dan_abramov/youre-missing-the-point-of-react-a20e34a51e1a) - Dan Abramov's article about the best parts of React.
13-
- [Timeline for Learning React](https://daveceddia.com/timeline-for-learning-react/) - Dave Ceddia's reccommended timeline for learning React and the React ecosystem.
13+
- [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.
15-
- [React FAQ](https://reactfaq.site/) - An external site with articles that try to answer frequently asked questions about React.
1615
- [Visual Guide to State in React](https://daveceddia.com/visual-guide-to-state-in-react/) - Dave Ceddia's visual guide to React state.

‎content/community/conferences.md‎

Lines changed: 91 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -12,53 +12,14 @@ 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-
### Reactathon 2019 {#reactathon-2019}
16-
March 30-31, 2019 in San Francisco, USA
17-
18-
[Website](https://www.reactathon.com/) - [Twitter](https://twitter.com/reactathon)
19-
20-
### App.js Conf 2019 {#appjs-conf-2019}
21-
April 4-5, 2019 in Kraków, Poland
15+
### React Rally 2019 {#react-rally-2019}
16+
August 22-23, 2019. Salt Lake City, USA.
2217

23-
[Website](https://appjs.co) - [Twitter](https://twitter.com/appjsconf)
24-
25-
### React Amsterdam 2019 {#react-amsterdam-2019}
26-
April 12, 2019 in Amsterdam, The Netherlands
27-
28-
[Website](https://react.amsterdam) - [Twitter](https://twitter.com/reactamsterdam) - [Facebook](https://www.facebook.com/reactamsterdam)
29-
30-
### ReactJS Girls Conference
31-
May 3, 2019 in London, UK
32-
33-
[Website](https://reactjsgirls.com/) - [Twitter](https://twitter.com/reactjsgirls)
34-
35-
### ReactEurope 2019 {#reacteurope-2019}
36-
May 23-24, 2019 in Paris, France
37-
38-
[Website](https://www.react-europe.org) - [Twitter](https://twitter.com/ReactEurope) - [Facebook](https://www.facebook.com/ReactEurope) - [Videos](https://www.youtube.com/c/ReacteuropeOrgConf)
39-
40-
### React Conf Armenia 2019 {#react-conf-am-19}
41-
May 25, 2019 in Yerevan, Armenia
42-
43-
[Website](https://reactconf.am/) - [Twitter](https://twitter.com/ReactConfAM) - [Facebook](https://www.facebook.com/reactconf.am/) - [YouTube](https://www.youtube.com/c/JavaScriptConferenceArmenia) - [CFP](http://bit.ly/speakReact)
44-
45-
### React Norway 2019 {#react-norway-2019}
46-
June 12, 2019. Larvik, Norway
47-
48-
[Website](https://reactnorway.com) - [Twitter](https://twitter.com/ReactNorway)
49-
50-
### React Loop 2019 {#react-loop-2019}
51-
June 21, 2019 Chicago, Illinois USA
52-
53-
[Website](https://reactloop.com) - [Twitter](https://twitter.com/ReactLoop)
54-
55-
### React Week '19 {#RWNY19}
56-
July 15-21, 2019. New York City, USA
57-
58-
[Website](https://reactweek.nyc) - [Twitter](https://twitter.com/ReactWeek)
18+
[Website](https://www.reactrally.com/) - [Twitter](https://twitter.com/ReactRally) - [Instagram](https://www.instagram.com/reactrally/)
5919

6020
### ComponentsConf 2019 {#componentsconf-2019}
6121
September 6, 2019 in Melbourne, Australia
22+
6223
[Website](https://www.componentsconf.com.au/) - [Twitter](https://twitter.com/componentsconf)
6324

6425
### React Native EU 2019 {#react-native-eu-2019}
@@ -71,11 +32,36 @@ September 13th, 2019. New York, USA
7132

7233
[Website](https://reactnewyork.com/) - [Twitter](https://twitter.com/reactnewyork)
7334

35+
### React Live 2019 {#react-live-2019}
36+
September 13th, 2019. Amsterdam, The Netherlands
37+
38+
[Website](https://www.reactlive.nl/) - [Twitter](https://twitter.com/reactlivenl)
39+
40+
### React Boston 2019 {#react-boston-2019}
41+
September 21-22, 2019 in Boston, Massachusetts USA
42+
43+
[Website](https://www.reactboston.com/) - [Twitter](https://twitter.com/reactboston)
44+
7445
### React India 2019 {#react-india-2019}
7546
September 26-28, 2019 in Goa, India
7647

7748
[Website](https://www.reactindia.io/) - [Twitter](https://twitter.com/react_india) - [Facebook](https://www.facebook.com/ReactJSIndia)
7849

50+
### React Alicante 2019 {#react-alicante-2019}
51+
September 26-28, 2019 in Alicante, Spain
52+
53+
[Website](http://reactalicante.es/) - [Twitter](https://twitter.com/reactalicante) - [Facebook](https://www.facebook.com/ReactAlicante)
54+
55+
### React Advanced 2019 {#react-advanced-2019}
56+
October 25, 2019 in London, UK
57+
58+
[Website](https://reactadvanced.com) - [Twitter](http://twitter.com/reactadvanced) - [Facebook](https://www.facebook.com/ReactAdvanced) - [Videos](https://youtube.com/c/ReactConferences)
59+
60+
### React Day Berlin 2019 {#react-day-berlin-2019}
61+
December 6, 2019 in Berlin, Germany
62+
63+
[Website](https://reactday.berlin) - [Twitter](https://twitter.com/reactdayberlin) - [Facebook](https://www.facebook.com/reactdayberlin/) - [Videos](https://www.youtube.com/reactdayberlin)
64+
7965
## Past Conferences {#past-conferences}
8066

8167
### React.js Conf 2015 {#reactjs-conf-2015}
@@ -103,7 +89,7 @@ February 22 & 23 in San Francisco, CA
10389
### React Amsterdam 2016 {#react-amsterdam-2016}
10490
April 16 in Amsterdam, The Netherlands
10591

106-
[Website](https://react.amsterdam/2016) - [Videos](https://youtu.be/sXDZBxbRRag?list=PLNBNS7NRGKMG3uLrm5fgY02hJ87Wzb4IU)
92+
[Website](https://react.amsterdam) - [Twitter](https://twitter.com/reactamsterdam) - [Facebook](https://www.facebook.com/reactamsterdam) - [Videos](https://youtube.com/c/ReactConferences)
10793

10894
### ReactEurope 2016 {#reacteurope-2016}
10995
June 2 & 3 in Paris, France
@@ -153,7 +139,7 @@ March 28th at the [QEII Centre, London](http://qeiicentre.london/)
153139
### React Amsterdam 2017 {#react-amsterdam-2017}
154140
April 21st in Amsterdam, The Netherlands
155141

156-
[Website](https://react.amsterdam) - [Twitter](https://twitter.com/reactamsterdam) - [Videos](https://www.youtube.com/watch?v=NQyL-Dm7Kig&list=PLNBNS7NRGKMHxfm0CcYNuINLdRw7r4a9M)
142+
[Website](https://react.amsterdam) - [Twitter](https://twitter.com/reactamsterdam) - [Videos](https://youtube.com/c/ReactConferences)
157143

158144
### ReactEurope 2017 {#reacteurope-2017}
159145
May 18th & 19th in Paris, France
@@ -349,3 +335,63 @@ November 30, Berlin, Germany
349335
January 31, 2019 in Tehran, Iran
350336

351337
[Website](http://reactiran.com) - [Instagram](https://www.instagram.com/reactiran/)
338+
339+
### Reactathon 2019 {#reactathon-2019}
340+
March 30-31, 2019 in San Francisco, USA
341+
342+
[Website](https://www.reactathon.com/) - [Twitter](https://twitter.com/reactathon)
343+
344+
### App.js Conf 2019 {#appjs-conf-2019}
345+
April 4-5, 2019 in Kraków, Poland
346+
347+
[Website](https://appjs.co) - [Twitter](https://twitter.com/appjsconf)
348+
349+
### React Amsterdam 2019 {#react-amsterdam-2019}
350+
April 12, 2019 in Amsterdam, The Netherlands
351+
352+
[Website](https://react.amsterdam) - [Twitter](https://twitter.com/reactamsterdam) - [Facebook](https://www.facebook.com/reactamsterdam) - [Videos](https://youtube.com/c/ReactConferences)
353+
354+
### React Finland 2019 {#react-finland-2019}
355+
April 24-26 in Helsinki, Finland
356+
357+
[Website](https://react-finland.fi/) - [Twitter](https://twitter.com/ReactFinland)
358+
359+
### ReactJS Girls Conference {#reactjs-girls-conference}
360+
May 3, 2019 in London, UK
361+
362+
[Website](https://reactjsgirls.com/) - [Twitter](https://twitter.com/reactjsgirls)
363+
364+
### <React.NotAConf /> 2019 {#reactnotaconf--2019}
365+
May 11 in Sofia, Bulgaria
366+
367+
[Website](http://react-not-a-conf.com/) - [Twitter](https://twitter.com/reactnotaconf) - [Facebook](https://www.facebook.com/events/780891358936156)
368+
369+
### ReactEurope 2019 {#reacteurope-2019}
370+
May 23-24, 2019 in Paris, France
371+
372+
[Website](https://www.react-europe.org) - [Twitter](https://twitter.com/ReactEurope) - [Facebook](https://www.facebook.com/ReactEurope) - [Videos](https://www.youtube.com/c/ReacteuropeOrgConf)
373+
374+
### React Conf Armenia 2019 {#react-conf-am-19}
375+
May 25, 2019 in Yerevan, Armenia
376+
377+
[Website](https://reactconf.am/) - [Twitter](https://twitter.com/ReactConfAM) - [Facebook](https://www.facebook.com/reactconf.am/) - [YouTube](https://www.youtube.com/c/JavaScriptConferenceArmenia) - [CFP](http://bit.ly/speakReact)
378+
379+
### ReactNext 2019 {#react-next-2019}
380+
June 11, 2019. Tel Aviv, Israel
381+
382+
[Website](https://react-next.com) - [Twitter](https://twitter.com/ReactNext) - [Videos](https://www.youtube.com/channel/UC3BT8hh3yTTYxbLQy_wbk2w)
383+
384+
### React Norway 2019 {#react-norway-2019}
385+
June 12, 2019. Larvik, Norway
386+
387+
[Website](https://reactnorway.com) - [Twitter](https://twitter.com/ReactNorway)
388+
389+
### React Loop 2019 {#react-loop-2019}
390+
June 21, 2019 Chicago, Illinois USA
391+
392+
[Website](https://reactloop.com) - [Twitter](https://twitter.com/ReactLoop)
393+
394+
### Chain React 2019 {#chain-react-2019}
395+
July 11-12, 2019. Portland, OR, USA.
396+
397+
[Website](https://infinite.red/ChainReactConf)

‎content/community/courses.md‎

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

2323
- [Free React Bootcamp](https://tylermcginnis.com/free-react-bootcamp/) - Recordings from three days of a free online React bootcamp.
2424

25+
- [Scrimba: Learn React for free](https://scrimba.com/g/glearnreact) - 48 hands-on video tutorials building react apps.
26+
2527
## Paid Courses {#paid-courses}
2628

2729
- [Egghead.io](https://egghead.io/browse/frameworks/react) - Short instructional videos on React and many other topics.

0 commit comments

Comments
 (0)