Skip to content

Commit 880546e

Browse files
authored
Merge branch 'master' into hooks-intro
2 parents 7aaabbb + 144e60e commit 880546e

36 files changed

+329
-148
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/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: 58 additions & 23 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 {#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,7 +37,7 @@ June 21, 2019 Chicago, Illinois USA
5237

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

55-
### Chain React 2019
40+
### Chain React 2019 {#chain-react-2019}
5641
July 11-12, 2019. Portland, OR, USA.
5742

5843
[Website](https://infinite.red/ChainReactConf)
@@ -77,6 +62,16 @@ September 13th, 2019. New York, USA
7762

7863
[Website](https://reactnewyork.com/) - [Twitter](https://twitter.com/reactnewyork)
7964

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+
8075
### React India 2019 {#react-india-2019}
8176
September 26-28, 2019 in Goa, India
8277

@@ -87,6 +82,16 @@ September 26-28, 2019 in Alicante, Spain
8782

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

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+
9095
## Past Conferences {#past-conferences}
9196

9297
### React.js Conf 2015 {#reactjs-conf-2015}
@@ -114,7 +119,7 @@ February 22 & 23 in San Francisco, CA
114119
### React Amsterdam 2016 {#react-amsterdam-2016}
115120
April 16 in Amsterdam, The Netherlands
116121

117-
[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)
118123

119124
### ReactEurope 2016 {#reacteurope-2016}
120125
June 2 & 3 in Paris, France
@@ -164,7 +169,7 @@ March 28th at the [QEII Centre, London](http://qeiicentre.london/)
164169
### React Amsterdam 2017 {#react-amsterdam-2017}
165170
April 21st in Amsterdam, The Netherlands
166171

167-
[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)
168173

169174
### ReactEurope 2017 {#reacteurope-2017}
170175
May 18th & 19th in Paris, France
@@ -360,3 +365,33 @@ November 30, Berlin, Germany
360365
January 31, 2019 in Tehran, Iran
361366

362367
[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: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
138138
* [Portland, OR - ReactJS](https://www.meetup.com/Portland-ReactJS/)
139139
* [Provo, UT - ReactJS](https://www.meetup.com/ReactJS-Utah/)
140140
* [Sacramento, CA - ReactJS](https://www.meetup.com/Sacramento-ReactJS-Meetup/)
141+
* [San Francisco - Real World React](https://www.meetup.com/Real-World-React)
141142
* [San Francisco - ReactJS](https://www.meetup.com/ReactJS-San-Francisco/)
142143
* [San Francisco, CA - React Native](https://www.meetup.com/React-Native-San-Francisco/)
143144
* [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
Questi due frammenti di codice sono equivalenti. Anche se **JSX è [completamente opzionale](/docs/react-without-jsx.html)**, molte persone trovano che sia utile per scrivere il codice della UI -- non solo con React ma anche con altre librerie!
151151

152-
Puoi fare esperimenti con JSX utilizzando [questo convertitore online](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+
Puoi fare esperimenti con JSX utilizzando [questo convertitore online](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
### Prova JSX Velocemente {#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/code-splitting.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ const App = () => (
247247

248248
## Named Exports {#named-exports}
249249

250-
`React.lazy` currently only supports default exports. If the module you want to import uses named exports, you can create an intermediate module that reexports it as the default. This ensures that treeshaking keeps working and that you don't pull in unused components.
250+
`React.lazy` currently only supports default exports. If the module you want to import uses named exports, you can create an intermediate module that reexports it as the default. This ensures that tree shaking keeps working and that you don't pull in unused components.
251251

252252
```js
253253
// ManyComponents.js

content/docs/create-a-new-react-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ npm start
5353
5454
Create React App non gestisce la logica di backend o i database; crea soltanto una catena di build per il frontend, quindi puoi utilizzarlo con qualsiasi backend. Al suo interno utilizza [Babel](https://babeljs.io/) e [webpack](https://webpack.js.org/), ma non hai bisogno di sapere nulla a tal riguardo.
5555

56-
Quando sei pronto a rilasciare in produzione, esegui il comando `npm run build` e verrà creata una build ottimizzata della tua applicazione nella cartella `build`. Puoi sapere di più su Create React App [leggendo il README](https://github.com/facebookincubator/create-react-app#create-react-app-) e la [Guida per gli Utenti](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#table-of-contents).
56+
Quando sei pronto a rilasciare in produzione, esegui il comando `npm run build` e verrà creata una build ottimizzata della tua applicazione nella cartella `build`. Puoi sapere di più su Create React App [leggendo il README](https://github.com/facebookincubator/create-react-app#create-react-app--) e la [Guida per gli Utenti](https://facebook.github.io/create-react-app/).
5757

5858
### Next.js {#nextjs}
5959

content/docs/faq-functions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ class Foo extends Component {
8383

8484
>**Note:**
8585
>
86-
>Using an arrow function in render creates a new function each time the component renders, which may have performance implications (see below).
86+
>Using an arrow function in render creates a new function each time the component renders, which may break optimizations based on strict identity comparison.
8787
8888
### Is it OK to use arrow functions in render methods? {#is-it-ok-to-use-arrow-functions-in-render-methods}
8989

0 commit comments

Comments
 (0)