Skip to content

Commit 3e2dddd

Browse files
Merge branch 'master' of https://github.com/reactjs/reactjs.org into sync-d0f2db96
2 parents 881f6be + d0f2db9 commit 3e2dddd

File tree

5 files changed

+22
-20
lines changed

5 files changed

+22
-20
lines changed

Diff for: content/docs/state-and-lifecycle.md

-2
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,6 @@ To implement this, we need to add "state" to the `Clock` component.
7272

7373
State is similar to props, but it is private and fully controlled by the component.
7474

75-
We [mentioned before](/docs/components-and-props.html#functional-and-class-components) that components defined as classes have some additional features. Local state is exactly that: a feature available only to classes.
76-
7775
## Converting a Function to a Class {#converting-a-function-to-a-class}
7876

7977
You can convert a function component like `Clock` to a class in five steps:

Diff for: content/languages.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,10 @@
7979
translated_name: ភាសាខ្មែរ
8080
code: km
8181
status: 0
82+
- name: Kannada
83+
translated_name: ಕನ್ನಡ
84+
code: kn
85+
status: 0
8286
- name: Korean
8387
translated_name: 한국어
8488
code: ko
@@ -146,7 +150,7 @@
146150
- name: Turkish
147151
translated_name: Türkçe
148152
code: tr
149-
status: 1
153+
status: 2
150154
- name: Ukrainian
151155
translated_name: Українська
152156
code: uk

Diff for: package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
"normalize.css": "^8.0.0",
4747
"prettier": "^1.7.4",
4848
"prismjs": "^1.15.0",
49-
"react": "16.8.3",
50-
"react-dom": "16.8.3",
49+
"react": "16.8.6",
50+
"react-dom": "16.8.6",
5151
"react-helmet": "^5.2.0",
5252
"react-live": "1.8.0-0",
5353
"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.8.4';
11+
const version = '16.8.6';
1212
const babelURL = 'https://unpkg.com/[email protected]/babel.min.js';
1313

1414
export {babelURL, urlRoot, version};

Diff for: yarn.lock

+14-14
Original file line numberDiff line numberDiff line change
@@ -10882,15 +10882,15 @@ react-dev-utils@^4.2.1:
1088210882
strip-ansi "3.0.1"
1088310883
text-table "0.2.0"
1088410884

10885-
10886-
version "16.8.3"
10887-
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.8.3.tgz#ae236029e66210783ac81999d3015dfc475b9c32"
10888-
integrity sha512-ttMem9yJL4/lpItZAQ2NTFAbV7frotHk5DZEHXUOws2rMmrsvh1Na7ThGT0dTzUIl6pqTOi5tYREfL8AEna3lA==
10885+
10886+
version "16.8.6"
10887+
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.8.6.tgz#71d6303f631e8b0097f56165ef608f051ff6e10f"
10888+
integrity sha512-1nL7PIq9LTL3fthPqwkvr2zY7phIPjYrT0jp4HjyEQrEROnw4dG41VVwi/wfoCneoleqrNX7iAD+pXebJZwrwA==
1088910889
dependencies:
1089010890
loose-envify "^1.1.0"
1089110891
object-assign "^4.1.1"
1089210892
prop-types "^15.6.2"
10893-
scheduler "^0.13.3"
10893+
scheduler "^0.13.6"
1089410894

1089510895
react-error-overlay@^3.0.0:
1089610896
version "3.0.0"
@@ -10944,15 +10944,15 @@ react-side-effect@^1.1.0:
1094410944
exenv "^1.2.1"
1094510945
shallowequal "^1.0.1"
1094610946

10947-
10948-
version "16.8.3"
10949-
resolved "https://registry.yarnpkg.com/react/-/react-16.8.3.tgz#c6f988a2ce895375de216edcfaedd6b9a76451d9"
10950-
integrity sha512-3UoSIsEq8yTJuSu0luO1QQWYbgGEILm+eJl2QN/VLDi7hL+EN18M3q3oVZwmVzzBJ3DkM7RMdRwBmZZ+b4IzSA==
10947+
10948+
version "16.8.6"
10949+
resolved "https://registry.yarnpkg.com/react/-/react-16.8.6.tgz#ad6c3a9614fd3a4e9ef51117f54d888da01f2bbe"
10950+
integrity sha512-pC0uMkhLaHm11ZSJULfOBqV4tIZkx87ZLvbbQYunNixAAvjnC+snJCg0XQXn9VIsttVsbZP/H/ewzgsd5fxKXw==
1095110951
dependencies:
1095210952
loose-envify "^1.1.0"
1095310953
object-assign "^4.1.1"
1095410954
prop-types "^15.6.2"
10955-
scheduler "^0.13.3"
10955+
scheduler "^0.13.6"
1095610956

1095710957
read-all-stream@^3.0.0:
1095810958
version "3.1.0"
@@ -11663,10 +11663,10 @@ sax@>=0.6.0, sax@^1.2.4, sax@~1.2.1, sax@~1.2.4:
1166311663
resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
1166411664
integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
1166511665

11666-
scheduler@^0.13.3:
11667-
version "0.13.3"
11668-
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.3.tgz#bed3c5850f62ea9c716a4d781f9daeb9b2a58896"
11669-
integrity sha512-UxN5QRYWtpR1egNWzJcVLk8jlegxAugswQc984lD3kU7NuobsO37/sRfbpTdBjtnD5TBNFA2Q2oLV5+UmPSmEQ==
11666+
scheduler@^0.13.6:
11667+
version "0.13.6"
11668+
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.6.tgz#466a4ec332467b31a91b9bf74e5347072e4cd889"
11669+
integrity sha512-IWnObHt413ucAYKsD9J1QShUKkbKLQQHdxRyw73sw4FN26iWr3DY/H34xGPe4nmL1DwXyWmSWmMrA9TfQbE/XQ==
1167011670
dependencies:
1167111671
loose-envify "^1.1.0"
1167211672
object-assign "^4.1.1"

0 commit comments

Comments
 (0)