Skip to content

Commit 398b05e

Browse files
saranshkatariasaranshkataria
authored
Merge branch 'master' into patch-2
2 parents 69ddcf2 + 1f08fed commit 398b05e

17 files changed

+108
-47
lines changed

Diff for: ‎content/blog/2019-11-06-building-great-user-experiences-with-concurrent-mode-and-suspense.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ function Post(props) {
194194
<div>
195195
<h1>{postData.title}</h1>
196196
<h2>by {postData.author}</h2>
197-
{/* @defer pairs naturally w <Suspense> to make the UI non-blocking too */}
197+
{/* @defer pairs naturally with <Suspense> to make the UI non-blocking too */}
198198
<Suspense fallback={<Spinner/>}>
199199
<CommentList post={postData} />
200200
</Suspense>

Diff for: ‎content/community/articles.md

+1
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@ permalink: community/articles.html
1717
- [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 />`.
1818
- [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.
1919
- [React/Redux Links](https://github.com/markerikson/react-redux-links) - Curated tutorial and resource links by Mark Erikson collected on React, Redux, ES6, and more. Very helpful for all kind of developers because of it's categorised content.
20+
- [Developer Productivity Tips from the React Experts](https://www.telerik.com/kendo-react-ui/react-best-practices-and-productivity-tips/) - The KendoReact team curated the top productivity tips of 20+ React experts. Includes tips from Emma Wedekind, Kent C. Dodds, vjeux and many more.

Diff for: ‎content/community/conferences.md

+10
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ December 6, 2019 in Berlin, Germany
2222

2323
[Website](https://reactday.berlin) - [Twitter](https://twitter.com/reactdayberlin) - [Facebook](https://www.facebook.com/reactdayberlin/) - [Videos](https://www.youtube.com/reactdayberlin)
2424

25+
### React Barcamp Cologne 2020 {#react-barcamp-cologne-2020}
26+
February 1-2, 2020 in Cologne, Germany
27+
28+
[Website](https://react-barcamp.de/) - [Twitter](https://twitter.com/ReactBarcamp) - [Facebook](https://www.facebook.com/reactbarcamp)
29+
2530
### ReactConf AU 2020 {#reactconfau}
2631
February 27 & 28, 2020 in Sydney, Australia
2732

@@ -62,6 +67,11 @@ June 15, 2020. Tel Aviv, Israel.
6267

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

70+
### React Loop 2020 {#react-loop-2020}
71+
June 19, 2020. Chicago, Illinois, USA.
72+
73+
[Website](https://reactloop.com) - [Twitter](https://twitter.com/ReactLoop)
74+
6575
### React Week NY 2020 {#react-week-ny-2020}
6676
July 17, 2020. New York City, USA.
6777

Diff for: ‎content/community/examples.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ There are many example projects created by the React community. Feel free to add
1111

1212
* **[Calculator](https://github.com/ahfarmer/calculator)** Implementation of the iOS calculator built in React
1313
* **[Emoji Search](https://github.com/ahfarmer/emoji-search)** Simple React app for searching emoji
14-
* **[Github Battle App](https://tm.dev/react-course-project/)** Battle two Github users and see the most popular Github projects for any language.
15-
* **[React Powered Hacker News Client](https://github.com/insin/react-hn)** A React & react-router-powered implementation of Hacker News using its Firebase API.
14+
* **[GitHub Battle App](https://tm.dev/react-course-project/)** Battle two GitHub users and see the most popular Github projects for any language.
15+
* **[React Powered Hacker News Client](https://github.com/insin/react-hn)** A React & `react-router`-powered implementation of Hacker News using its Firebase API
1616
* **[Pokedex](https://github.com/alik0211/pokedex)** The list of Pokémon with live search
17-
* **[Shopping Cart](https://github.com/jeffersonRibeiro/react-shopping-cart)** Simple ecommerce cart application built using React
17+
* **[Shopping Cart](https://github.com/jeffersonRibeiro/react-shopping-cart)** Simple e-commerce cart application built using React
1818
* **[Progressive Web Tetris](https://github.com/skidding/flatris)** Besides a beautiful, mobile-friendly implementation of Tetris, this project is a playground for integrating and experimenting with web technologies.
1919
* **[Product Comparison Page](https://github.com/Rhymond/product-compare-react)** Simple Product Compare page built in React
20-
* **[Hacker News Clone React/GraphQL](https://github.com/clintonwoo/hackernews-react-graphql)** Hacker News clone rewritten with universal JavaScript, using React and GraphQL.
21-
* **[Bitcoin Price Index](https://github.com/mrkjlchvz/bitcoin-price-index)** Simple bitcoin price index data from CoinDesk API.
22-
* **[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.
20+
* **[Hacker News Clone React/GraphQL](https://github.com/clintonwoo/hackernews-react-graphql)** Hacker News clone rewritten with universal JavaScript, using React and GraphQL
21+
* **[Bitcoin Price Index](https://github.com/mrkjlchvz/bitcoin-price-index)** Simple Bitcoin price index data from CoinDesk API
22+
* **[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.
2424
* **[Course Learn Page](https://github.com/ulearnpro/ulearn)** Open Source LMS script in Laravel 5.8 and ReactJS 16.9
2525
* **[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.

Diff for: ‎content/community/meetups.md

+1
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
6161
* [Paris](https://www.meetup.com/ReactJS-Paris/)
6262

6363
## Germany {#germany}
64+
* [Cologne](https://www.meetup.com/React-Cologne/)
6465
* [Düsseldorf](https://www.meetup.com/de-DE/ReactJS-Meetup-Dusseldorf/)
6566
* [Hamburg](https://www.meetup.com/Hamburg-React-js-Meetup/)
6667
* [Karlsruhe](https://www.meetup.com/react_ka/)

Diff for: ‎content/docs/accessibility.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ Refer to the following guides on how to best use NVDA:
492492

493493
VoiceOver is an integrated screen reader on Apple devices.
494494

495-
Refer to the following guides on how activate and use VoiceOver:
495+
Refer to the following guides on how to activate and use VoiceOver:
496496

497497
- [WebAIM - Using VoiceOver to Evaluate Web Accessibility](https://webaim.org/articles/voiceover/)
498498
- [Deque - VoiceOver for OS X Keyboard Shortcuts](https://dequeuniversity.com/screenreaders/voiceover-keyboard-shortcuts)

Diff for: ‎content/docs/code-splitting.md

-7
Original file line numberDiff line numberDiff line change
@@ -94,13 +94,6 @@ import("./math").then(math => {
9494
});
9595
```
9696

97-
> Note:
98-
>
99-
> The dynamic `import()` syntax is a ECMAScript (JavaScript)
100-
> [proposal](https://github.com/tc39/proposal-dynamic-import) not currently
101-
> part of the language standard. It is expected to be accepted in the
102-
> near future.
103-
10497
When Webpack comes across this syntax, it automatically starts code-splitting
10598
your app. If you're using Create React App, this is already configured for you
10699
and you can [start using it](https://facebook.github.io/create-react-app/docs/code-splitting) immediately. It's also supported

Diff for: ‎content/docs/concurrent-mode-adoption.md

+22-11
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,22 @@ prev: concurrent-mode-patterns.html
66
next: concurrent-mode-reference.html
77
---
88

9+
<style>
10+
.scary > blockquote {
11+
background-color: rgba(237, 51, 21, 0.2);
12+
border-left-color: #ed3315;
13+
}
14+
</style>
15+
16+
<div class="scary">
17+
918
>Caution:
1019
>
1120
>This page describes **experimental features that are not yet available in a stable release**. Don't rely on experimental builds of React in production apps. These features may change significantly and without a warning before they become a part of React.
1221
>
13-
>This documentation is aimed at early adopters and people who are curious. If you're new to React, don't worry about these features -- you don't need to learn them right now.
22+
>This documentation is aimed at early adopters and people who are curious. **If you're new to React, don't worry about these features** -- you don't need to learn them right now.
23+
24+
</div>
1425

1526
- [Installation](#installation)
1627
- [Who Is This Experimental Release For?](#who-is-this-experimental-release-for)
@@ -107,21 +118,21 @@ You can think of the Blocking Mode as a "gracefully degraded" version of the Con
107118

108119
| |Legacy Mode |Blocking Mode |Concurrent Mode |
109120
|--- |--- |--- |--- |
110-
|String Refs |✅ |🚫** |🚫** |
111-
|Legacy Context |✅ |🚫** |🚫** |
112-
|findDOMNode |✅ |🚫** |🚫** |
113-
|Suspense |✅ |✅ |✅ |
114-
|SuspenseList |🚫 |✅ |✅ |
121+
|[String Refs](/docs/refs-and-the-dom.html#legacy-api-string-refs) |✅ |🚫** |🚫** |
122+
|[Legacy Context](/docs/legacy-context.html) |✅ |🚫** |🚫** |
123+
|[findDOMNode](/docs/strict-mode.html#warning-about-deprecated-finddomnode-usage) |✅ |🚫** |🚫** |
124+
|[Suspense](/docs/concurrent-mode-suspense.html#what-is-suspense-exactly) |✅ |✅ |✅ |
125+
|[SuspenseList](/docs/concurrent-mode-patterns.html#suspenselist) |🚫 |✅ |✅ |
115126
|Suspense SSR + Hydration |🚫 |✅ |✅ |
116127
|Progressive Hydration |🚫 |✅ |✅ |
117128
|Selective Hydration |🚫 |🚫 |✅ |
118129
|Cooperative Multitasking |🚫 |🚫 |✅ |
119130
|Automatic batching of multiple setStates    |🚫* |✅ |✅ |
120-
|Priority-based Rendering |🚫 |🚫 |✅ |
121-
|Interruptible Prerendering |🚫 |🚫 |✅ |
122-
|useTransition |🚫 |🚫 |✅ |
123-
|useDeferredValue |🚫 |🚫 |✅ |
124-
|Suspense Reveal "Train" |🚫 |🚫 |✅ |
131+
|[Priority-based Rendering](/docs/concurrent-mode-patterns.html#splitting-high-and-low-priority-state) |🚫 |🚫 |✅ |
132+
|[Interruptible Prerendering](/docs/concurrent-mode-intro.html#interruptible-rendering) |🚫 |🚫 |✅ |
133+
|[useTransition](/docs/concurrent-mode-patterns.html#transitions) |🚫 |🚫 |✅ |
134+
|[useDeferredValue](/docs/concurrent-mode-patterns.html#deferring-a-value) |🚫 |🚫 |✅ |
135+
|[Suspense Reveal "Train"](/docs/concurrent-mode-patterns.html#suspense-reveal-train) |🚫 |🚫 |✅ |
125136

126137
</div>
127138

Diff for: ‎content/docs/concurrent-mode-intro.md

+12-1
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,22 @@ permalink: docs/concurrent-mode-intro.html
55
next: concurrent-mode-suspense.html
66
---
77

8+
<style>
9+
.scary > blockquote {
10+
background-color: rgba(237, 51, 21, 0.2);
11+
border-left-color: #ed3315;
12+
}
13+
</style>
14+
15+
<div class="scary">
16+
817
>Caution:
918
>
1019
>This page describes **experimental features that are [not yet available](/docs/concurrent-mode-adoption.html) in a stable release**. Don't rely on experimental builds of React in production apps. These features may change significantly and without a warning before they become a part of React.
1120
>
12-
>This documentation is aimed at early adopters and people who are curious. If you're new to React, don't worry about these features -- you don't need to learn them right now.
21+
>This documentation is aimed at early adopters and people who are curious. **If you're new to React, don't worry about these features** -- you don't need to learn them right now.
22+
23+
</div>
1324

1425
This page provides a theoretical overview of Concurrent Mode. **For a more practical introduction, you might want to check out the next sections:**
1526

Diff for: ‎content/docs/concurrent-mode-patterns.md

+12-1
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,22 @@ prev: concurrent-mode-suspense.html
66
next: concurrent-mode-adoption.html
77
---
88

9+
<style>
10+
.scary > blockquote {
11+
background-color: rgba(237, 51, 21, 0.2);
12+
border-left-color: #ed3315;
13+
}
14+
</style>
15+
16+
<div class="scary">
17+
918
>Caution:
1019
>
1120
>This page describes **experimental features that are [not yet available](/docs/concurrent-mode-adoption.html) in a stable release**. Don't rely on experimental builds of React in production apps. These features may change significantly and without a warning before they become a part of React.
1221
>
13-
>This documentation is aimed at early adopters and people who are curious. If you're new to React, don't worry about these features -- you don't need to learn them right now.
22+
>This documentation is aimed at early adopters and people who are curious. **If you're new to React, don't worry about these features** -- you don't need to learn them right now. For example, if you're looking for a data fetching tutorial that works today, read [this article](https://www.robinwieruch.de/react-hooks-fetch-data/) instead.
23+
24+
</div>
1425

1526
Usually, when we update the state, we expect to see changes on the screen immediately. This makes sense because we want to keep our app responsive to user input. However, there are cases where we might prefer to **defer an update from appearing on the screen**.
1627

Diff for: ‎content/docs/concurrent-mode-reference.md

+12-1
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,22 @@ permalink: docs/concurrent-mode-reference.html
55
prev: concurrent-mode-adoption.html
66
---
77

8+
<style>
9+
.scary > blockquote {
10+
background-color: rgba(237, 51, 21, 0.2);
11+
border-left-color: #ed3315;
12+
}
13+
</style>
14+
15+
<div class="scary">
16+
817
>Caution:
918
>
1019
>This page describes **experimental features that are [not yet available](/docs/concurrent-mode-adoption.html) in a stable release**. Don't rely on experimental builds of React in production apps. These features may change significantly and without a warning before they become a part of React.
1120
>
12-
>This documentation is aimed at early adopters and people who are curious. If you're new to React, don't worry about these features -- you don't need to learn them right now.
21+
>This documentation is aimed at early adopters and people who are curious. **If you're new to React, don't worry about these features** -- you don't need to learn them right now.
22+
23+
</div>
1324

1425
This page is an API reference for the React [Concurrent Mode](/docs/concurrent-mode-intro.html). If you're looking for a guided introduction instead, check out [Concurrent UI Patterns](/docs/concurrent-mode-patterns.html).
1526

Diff for: ‎content/docs/concurrent-mode-suspense.md

+11-1
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,22 @@ prev: concurrent-mode-intro.html
66
next: concurrent-mode-patterns.html
77
---
88

9+
<style>
10+
.scary > blockquote {
11+
background-color: rgba(237, 51, 21, 0.2);
12+
border-left-color: #ed3315;
13+
}
14+
</style>
15+
16+
<div class="scary">
17+
918
>Caution:
1019
>
1120
>This page describes **experimental features that are [not yet available](/docs/concurrent-mode-adoption.html) in a stable release**. Don't rely on experimental builds of React in production apps. These features may change significantly and without a warning before they become a part of React.
1221
>
13-
>This documentation is aimed at early adopters and people who are curious. If you're new to React, don't worry about these features -- you don't need to learn them right now.
22+
>This documentation is aimed at early adopters and people who are curious. **If you're new to React, don't worry about these features** -- you don't need to learn them right now. For example, if you're looking for a data fetching tutorial that works today, read [this article](https://www.robinwieruch.de/react-hooks-fetch-data/) instead.
1423
24+
</div>
1525

1626
React 16.6 added a `<Suspense>` component that lets you "wait" for some code to load and declaratively specify a loading state (like a spinner) while we're waiting:
1727

Diff for: ‎content/docs/hooks-reference.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ function FancyInput(props, ref) {
450450
FancyInput = forwardRef(FancyInput);
451451
```
452452

453-
In this example, a parent component that renders `<FancyInput ref={fancyInputRef} />` would be able to call `fancyInputRef.current.focus()`.
453+
In this example, a parent component that renders `<FancyInput ref={inputRef} />` would be able to call `inputRef.current.focus()`.
454454

455455
### `useLayoutEffect` {#uselayouteffect}
456456

Diff for: ‎content/versions.yml

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
- title: '16.12.0'
2+
changelog: https://github.com/facebook/react/blob/master/CHANGELOG.md#16120-november-14-2019
13
- title: '16.11'
24
changelog: https://github.com/facebook/react/blob/master/CHANGELOG.md#16110-october-22-2019
35
- title: '16.10.2'

Diff for: ‎package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
"normalize.css": "^8.0.0",
4848
"prettier": "^1.7.4",
4949
"prismjs": "^1.15.0",
50-
"react": "^16.10.2",
51-
"react-dom": "^16.10.2",
50+
"react": "^16.12.0",
51+
"react-dom": "^16.12.0",
5252
"react-helmet": "^5.2.0",
5353
"react-live": "1.8.0-0",
5454
"remarkable": "^1.7.1",

Diff for: ‎src/site-constants.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// NOTE: We can't just use `location.toString()` because when we are rendering
99
// the SSR part in node.js we won't have a proper location.
1010
const urlRoot = 'https://reactjs.org';
11-
const version = '16.11.0';
11+
const version = '16.12.0';
1212
const babelURL = 'https://unpkg.com/[email protected]/babel.min.js';
1313

1414
export {babelURL, urlRoot, version};

Diff for: ‎yarn.lock

+13-13
Original file line numberDiff line numberDiff line change
@@ -10241,15 +10241,15 @@ react-dev-utils@^4.2.1:
1024110241
strip-ansi "3.0.1"
1024210242
text-table "0.2.0"
1024310243

10244-
react-dom@^16.10.2:
10245-
version "16.10.2"
10246-
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.10.2.tgz#4840bce5409176bc3a1f2bd8cb10b92db452fda6"
10247-
integrity sha512-kWGDcH3ItJK4+6Pl9DZB16BXYAZyrYQItU4OMy0jAkv5aNqc+mAKb4TpFtAteI6TJZu+9ZlNhaeNQSVQDHJzkw==
10244+
react-dom@^16.12.0:
10245+
version "16.12.0"
10246+
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.12.0.tgz#0da4b714b8d13c2038c9396b54a92baea633fe11"
10247+
integrity sha512-LMxFfAGrcS3kETtQaCkTKjMiifahaMySFDn71fZUNpPHZQEzmk/GiAeIT8JSOrHB23fnuCOMruL2a8NYlw+8Gw==
1024810248
dependencies:
1024910249
loose-envify "^1.1.0"
1025010250
object-assign "^4.1.1"
1025110251
prop-types "^15.6.2"
10252-
scheduler "^0.16.2"
10252+
scheduler "^0.18.0"
1025310253

1025410254
react-error-overlay@^3.0.0:
1025510255
version "3.0.0"
@@ -10303,10 +10303,10 @@ react-side-effect@^1.1.0:
1030310303
exenv "^1.2.1"
1030410304
shallowequal "^1.0.1"
1030510305

10306-
react@^16.10.2:
10307-
version "16.10.2"
10308-
resolved "https://registry.yarnpkg.com/react/-/react-16.10.2.tgz#a5ede5cdd5c536f745173c8da47bda64797a4cf0"
10309-
integrity sha512-MFVIq0DpIhrHFyqLU0S3+4dIcBhhOvBE8bJ/5kHPVOVaGdo0KuiQzpcjCPsf585WvhypqtrMILyoE2th6dT+Lw==
10306+
react@^16.12.0:
10307+
version "16.12.0"
10308+
resolved "https://registry.yarnpkg.com/react/-/react-16.12.0.tgz#0c0a9c6a142429e3614834d5a778e18aa78a0b83"
10309+
integrity sha512-fglqy3k5E+81pA8s+7K0/T3DBCF0ZDOher1elBFzF7O6arXJgzyu/FW+COxFvAWXJoJN9KIZbT2LXlukwphYTA==
1031010310
dependencies:
1031110311
loose-envify "^1.1.0"
1031210312
object-assign "^4.1.1"
@@ -11019,10 +11019,10 @@ sax@>=0.6.0, sax@^1.2.4, sax@~1.2.1, sax@~1.2.4:
1101911019
resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
1102011020
integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
1102111021

11022-
scheduler@^0.16.2:
11023-
version "0.16.2"
11024-
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.16.2.tgz#f74cd9d33eff6fc554edfb79864868e4819132c1"
11025-
integrity sha512-BqYVWqwz6s1wZMhjFvLfVR5WXP7ZY32M/wYPo04CcuPM7XZEbV2TBNW7Z0UkguPTl0dWMA59VbNXxK6q+pHItg==
11022+
scheduler@^0.18.0:
11023+
version "0.18.0"
11024+
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.18.0.tgz#5901ad6659bc1d8f3fdaf36eb7a67b0d6746b1c4"
11025+
integrity sha512-agTSHR1Nbfi6ulI0kYNK0203joW2Y5W4po4l+v03tOoiJKpTBbxpNhWDvqc/4IcOw+KLmSiQLTasZ4cab2/UWQ==
1102611026
dependencies:
1102711027
loose-envify "^1.1.0"
1102811028
object-assign "^4.1.1"

0 commit comments

Comments
 (0)