Skip to content

Commit 86aef72

Browse files
authored
Merge branch 'master' into id-introducing-hooks
2 parents ad187da + 0c0b906 commit 86aef72

Some content is hidden

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

46 files changed

+1097
-479
lines changed

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-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
@@ -43,7 +43,7 @@ We started of with an initial trial period of three languages: Spanish, Japanese
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

46-
Because of the automation, the rest of the maintance went mostly smoothly. We eventually created a [Slack channel](https://rt-slack-invite.herokuapp.com) to make it easier for translators to share information, and I released a guide solidifying the [responsibilities of maintainers](https://github.com/reactjs/reactjs.org-translation/blob/master/maintainer-guide.md). Allowing translators to talk with each other was a great boon -- for example, the Arabic, Persian, and Hebrew translations were able to talk to each other in order to get [right-to-left text](https://en.wikipedia.org/wiki/Right-to-left) working!
46+
Because of the automation, the rest of the maintenance went mostly smoothly. We eventually created a [Slack channel](https://rt-slack-invite.herokuapp.com) to make it easier for translators to share information, and I released a guide solidifying the [responsibilities of maintainers](https://github.com/reactjs/reactjs.org-translation/blob/master/maintainer-guide.md). Allowing translators to talk with each other was a great boon -- for example, the Arabic, Persian, and Hebrew translations were able to talk to each other in order to get [right-to-left text](https://en.wikipedia.org/wiki/Right-to-left) working!
4747

4848
## The Bot {#the-bot}
4949

content/community/articles.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ 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.
1515
- [React FAQ](https://reactfaq.site/) - An external site with articles that try to answer frequently asked questions about React.
1616
- [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: 71 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -12,26 +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-
### 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
22-
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-
3515
### ReactEurope 2019 {#reacteurope-2019}
3616
May 23-24, 2019 in Paris, France
3717

@@ -42,6 +22,11 @@ May 25, 2019 in Yerevan, Armenia
4222

4323
[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)
4424

25+
### ReactNext 2019 {#react-next-2019}
26+
June 11, 2019. Tel Aviv, Israel
27+
28+
[Website](https://react-next.com) - [Twitter](https://twitter.com/ReactNext) - [Videos](https://www.youtube.com/channel/UC3BT8hh3yTTYxbLQy_wbk2w)
29+
4530
### React Norway 2019 {#react-norway-2019}
4631
June 12, 2019. Larvik, Norway
4732

@@ -52,13 +37,19 @@ June 21, 2019 Chicago, Illinois USA
5237

5338
[Website](https://reactloop.com) - [Twitter](https://twitter.com/ReactLoop)
5439

55-
### React Week '19 {#RWNY19}
56-
July 15-21, 2019. New York City, USA
40+
### Chain React 2019 {#chain-react-2019}
41+
July 11-12, 2019. Portland, OR, USA.
42+
43+
[Website](https://infinite.red/ChainReactConf)
5744

58-
[Website](https://reactweek.nyc) - [Twitter](https://twitter.com/ReactWeek)
45+
### React Rally 2019 {#react-rally-2019}
46+
August 22-23, 2019. Salt Lake City, USA.
47+
48+
[Website](https://www.reactrally.com/) - [Twitter](https://twitter.com/ReactRally) - [Instagram](https://www.instagram.com/reactrally/)
5949

6050
### ComponentsConf 2019 {#componentsconf-2019}
6151
September 6, 2019 in Melbourne, Australia
52+
6253
[Website](https://www.componentsconf.com.au/) - [Twitter](https://twitter.com/componentsconf)
6354

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

7263
[Website](https://reactnewyork.com/) - [Twitter](https://twitter.com/reactnewyork)
7364

65+
### React Live 2019 {#react-live-2019}
66+
September 13th, 2019. Amsterdam, The Netherlands
67+
68+
[Website](https://www.reactlive.nl/) - [Twitter](https://twitter.com/reactlivenl)
69+
70+
### React Boston 2019 {#react-boston-2019}
71+
September 21-22, 2019 in Boston, Massachusetts USA
72+
73+
[Website](https://www.reactboston.com/) - [Twitter](https://twitter.com/reactboston)
74+
7475
### React India 2019 {#react-india-2019}
7576
September 26-28, 2019 in Goa, India
7677

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

80+
### React Alicante 2019 {#react-alicante-2019}
81+
September 26-28, 2019 in Alicante, Spain
82+
83+
[Website](http://reactalicante.es/) - [Twitter](https://twitter.com/reactalicante) - [Facebook](https://www.facebook.com/ReactAlicante)
84+
85+
### React Advanced 2019 {#react-advanced-2019}
86+
October 25, 2019 in London, UK
87+
88+
[Website](https://reactadvanced.com) - [Twitter](http://twitter.com/reactadvanced) - [Facebook](https://www.facebook.com/ReactAdvanced) - [Videos](https://youtube.com/c/ReactConferences)
89+
90+
### React Day Berlin 2019 {#react-day-berlin-2019}
91+
December 6, 2019 in Berlin, Germany
92+
93+
[Website](https://reactday.berlin) - [Twitter](https://twitter.com/reactdayberlin) - [Facebook](https://www.facebook.com/reactdayberlin/) - [Videos](https://www.youtube.com/reactdayberlin)
94+
7995
## Past Conferences {#past-conferences}
8096

8197
### React.js Conf 2015 {#reactjs-conf-2015}
@@ -103,7 +119,7 @@ February 22 & 23 in San Francisco, CA
103119
### React Amsterdam 2016 {#react-amsterdam-2016}
104120
April 16 in Amsterdam, The Netherlands
105121

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

108124
### ReactEurope 2016 {#reacteurope-2016}
109125
June 2 & 3 in Paris, France
@@ -153,7 +169,7 @@ March 28th at the [QEII Centre, London](http://qeiicentre.london/)
153169
### React Amsterdam 2017 {#react-amsterdam-2017}
154170
April 21st in Amsterdam, The Netherlands
155171

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

158174
### ReactEurope 2017 {#reacteurope-2017}
159175
May 18th & 19th in Paris, France
@@ -349,3 +365,33 @@ November 30, Berlin, Germany
349365
January 31, 2019 in Tehran, Iran
350366

351367
[Website](http://reactiran.com) - [Instagram](https://www.instagram.com/reactiran/)
368+
369+
### Reactathon 2019 {#reactathon-2019}
370+
March 30-31, 2019 in San Francisco, USA
371+
372+
[Website](https://www.reactathon.com/) - [Twitter](https://twitter.com/reactathon)
373+
374+
### App.js Conf 2019 {#appjs-conf-2019}
375+
April 4-5, 2019 in Kraków, Poland
376+
377+
[Website](https://appjs.co) - [Twitter](https://twitter.com/appjsconf)
378+
379+
### React Amsterdam 2019 {#react-amsterdam-2019}
380+
April 12, 2019 in Amsterdam, The Netherlands
381+
382+
[Website](https://react.amsterdam) - [Twitter](https://twitter.com/reactamsterdam) - [Facebook](https://www.facebook.com/reactamsterdam) - [Videos](https://youtube.com/c/ReactConferences)
383+
384+
### React Finland 2019 {#react-finland-2019}
385+
April 24-26 in Helsinki, Finland
386+
387+
[Website](https://react-finland.fi/) - [Twitter](https://twitter.com/ReactFinland)
388+
389+
### ReactJS Girls Conference {#reactjs-girls-conference}
390+
May 3, 2019 in London, UK
391+
392+
[Website](https://reactjsgirls.com/) - [Twitter](https://twitter.com/reactjsgirls)
393+
394+
### <React.NotAConf /> 2019 {#reactnotaconf--2019}
395+
May 11 in Sofia, Bulgaria
396+
397+
[Website](http://react-not-a-conf.com/) - [Twitter](https://twitter.com/reactnotaconf) - [Facebook](https://www.facebook.com/events/780891358936156)

content/community/meetups.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
8888

8989
## Pakistan {#pakistan}
9090
* [Karachi](https://www.facebook.com/groups/902678696597634/)
91+
* [Lahore](https://www.facebook.com/groups/ReactjsLahore/)
9192

9293
## Peru {#peru}
9394
* [Lima](https://www.meetup.com/ReactJS-Peru/)
@@ -130,13 +131,14 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
130131
* [New York, NY - ReactJS](https://www.meetup.com/NYC-Javascript-React-Group/)
131132
* [New York, NY - React Ladies](https://www.meetup.com/React-Ladies/)
132133
* [New York, NY - React Native](https://www.meetup.com/React-Native-NYC/)
133-
* [New York, NY - ReactNYC](https://www.meetup.com/ReactNYC/)
134134
* [Palo Alto, CA - React Native](https://www.meetup.com/React-Native-Silicon-Valley/)
135+
* [Philadelphia, PA - ReactJS](https://www.meetup.com/RQ-React/)
135136
* [Phoenix, AZ - ReactJS](https://www.meetup.com/ReactJS-Phoenix/)
136137
* [Pittsburgh, PA - ReactJS/React Native](https://www.meetup.com/ReactPgh/)
137138
* [Portland, OR - ReactJS](https://www.meetup.com/Portland-ReactJS/)
138139
* [Provo, UT - ReactJS](https://www.meetup.com/ReactJS-Utah/)
139140
* [Sacramento, CA - ReactJS](https://www.meetup.com/Sacramento-ReactJS-Meetup/)
141+
* [San Francisco - Real World React](https://www.meetup.com/Real-World-React)
140142
* [San Francisco - ReactJS](https://www.meetup.com/ReactJS-San-Francisco/)
141143
* [San Francisco, CA - React Native](https://www.meetup.com/React-Native-San-Francisco/)
142144
* [San Ramon, CA - TriValley Coders](https://www.meetup.com/trivalleycoders/)

content/docs/add-react-to-a-website.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ return (
149149

150150
These two code snippets are equivalent. While **JSX is [completely optional](/docs/react-without-jsx.html)**, many people find it helpful for writing UI code -- both with React and with other libraries.
151151

152-
You can play with JSX using [this online converter](https://babeljs.io/repl#?babili=false&browsers=&build=&builtIns=false&spec=false&loose=false&code_lz=Q&debug=false&forceAllTransforms=false&shippedProposals=false&circleciRepo=&evaluate=false&fileSize=false&sourceType=module&lineWrap=true&presets=es2015%2Creact%2Cstage-2%2Cstage-3&prettier=true&targets=Node-6.12&version=6.26.0&envVersion=).
152+
You can play with JSX using [this online converter](https://babeljs.io/en/repl#?babili=false&browsers=&build=&builtIns=false&spec=false&loose=false&code_lz=DwIwrgLhD2B2AEcDCAbAlgYwNYF4DeAFAJTw4B88EAFmgM4B0tAphAMoQCGETBe86WJgBMAXJQBOYJvAC-RGWQBQ8FfAAyaQYuAB6cFDhkgA&debug=false&forceAllTransforms=false&shippedProposals=false&circleciRepo=&evaluate=false&fileSize=false&timeTravel=false&sourceType=module&lineWrap=true&presets=es2015%2Creact%2Cstage-2&prettier=false&targets=&version=7.4.3).
153153

154154
### Quickly Try JSX {#quickly-try-jsx}
155155

content/docs/addons-shallow-compare.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ category: Reference
88

99
> Note:
1010
>
11-
> `shallowCompare` is a legacy add-on. Use [`React.PureComponent`](/docs/react-api.html#reactpurecomponent) instead.
11+
> `shallowCompare` is a legacy add-on. Use [`React.memo`](/docs/react-api.html#reactmemo) or [`React.PureComponent`](/docs/react-api.html#reactpurecomponent) instead.
1212
1313
**Importing**
1414

content/docs/addons-test-utils.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Untuk menyiapkan komponen sebelum penegasan, bungkus kode yang me-*render* kompo
5353
Sebagai contoh, katakanlah kita punya `Counter` komponen:
5454

5555
```js
56-
class App extends React.Component {
56+
class Counter extends React.Component {
5757
constructor(props) {
5858
super(props);
5959
this.state = {count: 0};

0 commit comments

Comments
 (0)