Skip to content

Commit 91356bd

Browse files
QC-LQC-L
authored
docs(en): merge reactjs.org into zh-hans @ 72775e9 (#340)
docs(en): merge reactjs.org into zh-hans @ 72775e9
2 parents 3d672b3 + 2a71b40 commit 91356bd

9 files changed

+76
-20
lines changed

‎content/docs/concurrent-mode-adoption.md

+11
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,23 @@ 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
>注意：
1019
>
1120
>本章节所描述的实验功能**在稳定版本中尚不可用**。请不要在应用程序的生产环境中依赖 React 的实验性版本。这些功能可能会发生重大变化，并且在成为 React 的一部分之前不会给出警告。
1221
>
1322
>本文档面向早期此功能的使用者和对此功能好奇的人。如果你不熟悉 React，请不必担心 —— 你不需要立刻学习这些功能。
1423
24+
</div>
25+
1526
- [安装](#installation)
1627
- [此实验版本适用于谁？](#who-is-this-experimental-release-for)
1728
- [开启 concurrent 模式](#enabling-concurrent-mode)

‎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

‎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

‎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

‎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

‎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'

‎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",

‎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://zh-hans.reactjs.org';
11-
const version = '16.11.0';
11+
const version = '16.12.0';
1212
const babelURL = 'https://unpkg.com/babel-standalone@6.26.0/babel.min.js';
1313

1414
export {babelURL, urlRoot, version};

‎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)