Skip to content

Commit 68b1fd3

Browse files
authored
Merge pull request #173 from reactjs/sync-647b6392
Sync with reactjs.org @ 647b639
2 parents 669109f + 6a11548 commit 68b1fd3

14 files changed

+73
-30
lines changed

content/community/meetups.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
2525
* [Joinville](https://www.meetup.com/pt-BR/React-Joinville/)
2626
* [Rio de Janeiro](https://www.meetup.com/pt-BR/React-Rio-de-Janeiro/)
2727
* [São Paulo](https://www.meetup.com/pt-BR/ReactJS-SP/)
28+
* [Vila Velha](https://www.meetup.com/pt-BR/React-ES/)
2829

2930
## Bolivia {#bolivia}
3031
* [Bolivia](https://www.meetup.com/ReactBolivia/)
@@ -58,7 +59,7 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
5859
* [Karlsruhe](https://www.meetup.com/react_ka/)
5960
* [Kiel](https://www.meetup.com/Kiel-React-Native-Meetup/)
6061
* [Munich](https://www.meetup.com/ReactJS-Meetup-Munich/)
61-
* [React Berlin](https://www.meetup.com/React-Berlin/)
62+
* [React Berlin](https://www.meetup.com/React-Open-Source/)
6263
* [React.JS Girls Berlin](https://www.meetup.com/ReactJS-Girls-Berlin/)
6364

6465
## Greece {#greece}

content/community/support.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Each community consists of many thousands of React users.
2626

2727
* [DEV's React community](https://dev.to/t/react)
2828
* [Hashnode's React community](https://hashnode.com/n/reactjs)
29-
* [Reactiflux online chat](https://discord.gg/0ZcbPKXt5bZjGY5n)
29+
* [Reactiflux online chat](https://discord.gg/reactiflux)
3030
* [Reddit's React community](https://www.reddit.com/r/reactjs/)
3131
* [Spectrum's React community](https://spectrum.chat/react)
3232

content/community/tools-ui-components.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,3 +79,4 @@ permalink: community/ui-components.html
7979
* **[jQWidgets React components](https://www.jqwidgets.com/react/)**: Enterprise Ready 70+ UI Components.
8080
* **[KendoReact](https://www.telerik.com/kendo-react-ui/)**: UI for React Developers.
8181
* **[Mobiscroll React UI Components](https://mobiscroll.com/react)** Mobile UI Controls for the Productive React Developer.
82+
* **[React UI Toolkit](https://react-ui-tools.com/)**: 115+ professionally maintainted UI components ranging from a robust grid to charts and more. Try for FREE and build React apps faster.

content/docs/context.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ context를 이용하면 단계마다 일일이 props를 넘겨주지 않고도
1515
- [Context.Provider](#contextprovider)
1616
- [Class.contextType](#classcontexttype)
1717
- [Context.Consumer](#contextconsumer)
18+
- [Context.displayName](#contextdisplayname)
1819
- [예시](#examples)
1920
- [값이 변하는 context](#dynamic-context)
2021
- [하위 컴포넌트에서 context 업데이트하기](#updating-context-from-a-nested-component)
@@ -194,6 +195,20 @@ Context.Consumer의 자식은 [함수](/docs/render-props.html#using-props-other
194195
>
195196
>함수를 자식으로 받는 패턴에 대해서는 [render props](/docs/render-props.html)을 참조하세요.
196197
198+
### `Context.displayName` {#contextdisplayname}
199+
200+
Context 객체는 `displayName` 문자열 속성을 설정할 수 있습니다. React 개발자 도구는 이 문자열을 사용해서 context를 어떻게 보여줄 지 결정합니다.
201+
202+
예를 들어, 아래 컴포넌트는 개발자 도구에 MyDisplayName로 표시됩니다.
203+
204+
```js{2}
205+
const MyContext = React.createContext(/* some value */);
206+
MyContext.displayName = 'MyDisplayName';
207+
208+
<MyContext.Provider> // "MyDisplayName.Provider" in DevTools
209+
<MyContext.Consumer> // "MyDisplayName.Consumer" in DevTools
210+
```
211+
197212
## 예시 {#examples}
198213

199214
### 값이 변하는 context {#dynamic-context}

content/docs/faq-versioning.md

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,14 @@ React follows [semantic versioning (semver)](https://semver.org/) principles.
1010

1111
That means that with a version number **x.y.z**:
1212

13+
* When releasing **critical bug fixes**, we make a **patch release** by changing the **z** number (ex: 15.6.2 to 15.6.3).
14+
* When releasing **new features** or **non-critical fixes**, we make a **minor release** by changing the **y** number (ex: 15.6.2 to 15.7.0).
1315
* When releasing **breaking changes**, we make a **major release** by changing the **x** number (ex: 15.6.2 to 16.0.0).
14-
* When releasing **new features**, we make a **minor release** by changing the **y** number (ex: 15.6.2 to 15.7.0).
15-
* When releasing **bug fixes**, we make a **patch release** by changing the **z** number (ex: 15.6.2 to 15.6.3).
1616

1717
Major releases can also contain new features, and any release can include bug fixes.
1818

19+
Minor releases are the most common type of release.
20+
1921
### Breaking Changes {#breaking-changes}
2022

2123
Breaking changes are inconvenient for everyone, so we try to minimize the number of major releases – for example, React 15 was released in April 2016 and React 16 was released in September 2017; React 17 isn't expected until 2019.
@@ -46,3 +48,17 @@ In general, we *don't* bump the major version number for changes to:
4648
This policy is designed to be pragmatic: certainly, we don't want to cause headaches for you. If we bumped the major version for all of these changes, we would end up releasing more major versions and ultimately causing more versioning pain for the community. It would also mean that we can't make progress in improving React as fast as we'd like.
4749

4850
That said, if we expect that a change on this list will cause broad problems in the community, we will still do our best to provide a gradual migration path.
51+
52+
### If a Minor Release Includes No New Features, Why Isn't It a Patch? {#minors-versus-patches}
53+
54+
It's possible that a minor release will not include new features. [This is allowed by semver](https://semver.org/#spec-item-7), which states **"[a minor version] MAY be incremented if substantial new functionality or improvements are introduced within the private code. It MAY include patch level changes."**
55+
56+
However, it does raise the question of why these releases aren't versioned as patches instead.
57+
58+
The answer is that any change to React (or other software) carries some risk of breaking in unexpected ways. Imagine a scenario where a patch release that fixes one bug accidentally introduces a different bug. This would not only be disruptive to developers, but also harm their confidence in future patch releases. It's especially regrettable if the original fix is for a bug that is rarely encountered in practice.
59+
60+
We have a pretty good track record for keeping React releases free of bugs, but patch releases have an even higher bar for reliability because most developers assume they can be adopted without adverse consequences.
61+
62+
For these reasons, we reserve patch releases only for the most critical bugs and security vulnerabilities.
63+
64+
If a release includes non-essential changes — such as internal refactors, changes to implementation details, performance improvements, or minor bugfixes — we will bump the minor version even when there are no new features.

content/docs/hooks-faq.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,9 @@ You can continue to use the exact same APIs as you always have; they'll continue
109109

110110
React Redux since v7.1.0 [supports Hooks API](https://react-redux.js.org/api/hooks) and exposes hooks like `useDispatch` or `useSelector`.
111111

112-
Libraries like React Router might support hooks in the future.
112+
React Router [supports hooks](https://reacttraining.com/react-router/web/api/Hooks) since v5.1.
113+
114+
Other libraries might support hooks in the future too.
113115

114116
### Do Hooks work with static typing? {#do-hooks-work-with-static-typing}
115117

content/docs/how-to-contribute.md

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,25 @@ Facebook has adopted the [Contributor Covenant](https://www.contributor-covenant
1919

2020
All work on React happens directly on [GitHub](https://github.com/facebook/react). Both core team members and external contributors send pull requests which go through the same review process.
2121

22+
### Semantic Versioning {#semantic-versioning}
23+
24+
React follows [semantic versioning](https://semver.org/). We release patch versions for critical bugfixes, minor versions for new features or non-essential changes, and major versions for any breaking changes. When we make breaking changes, we also introduce deprecation warnings in a minor version so that our users learn about the upcoming changes and migrate their code in advance. Learn more about our commitment to stability and incremental migration in [our versioning policy](https://reactjs.org/docs/faq-versioning.html).
25+
26+
Every significant change is documented in the [changelog file](https://github.com/facebook/react/blob/master/CHANGELOG.md).
27+
2228
### Branch Organization {#branch-organization}
2329

24-
We will do our best to keep the [`master` branch](https://github.com/facebook/react/tree/master) in good shape, with tests passing at all times. But in order to move fast, we will make API changes that your application might not be compatible with. We recommend that you use [the latest stable version of React](/versions.html).
30+
Submit all changes directly to the [`master branch`](https://github.com/facebook/react/tree/master). We don't use separate branches for development or for upcoming releases. We do our best to keep `master` in good shape, with all tests passing.
2531

26-
If you send a pull request, please do it against the `master` branch. We maintain stable branches for major versions separately but we don't accept pull requests to them directly. Instead, we cherry-pick non-breaking changes from master to the latest stable major version.
32+
Code that lands in `master` must be compatible with the latest stable release. It may contain additional features, but no breaking changes. We should be able to release a new minor version from the tip of `master` at any time.
2733

28-
### Semantic Versioning {#semantic-versioning}
34+
### Feature Flags {#feature-flags}
2935

30-
React follows [semantic versioning](https://semver.org/). We release patch versions for bugfixes, minor versions for new features, and major versions for any breaking changes. When we make breaking changes, we also introduce deprecation warnings in a minor version so that our users learn about the upcoming changes and migrate their code in advance.
36+
To keep the `master` branch in a releasable state, breaking changes and experimental features must be gated behind a feature flag.
3137

32-
We tag every pull request with a label marking whether the change should go in the next [patch](https://github.com/facebook/react/pulls?q=is:open+is:pr+label:semver-patch), [minor](https://github.com/facebook/react/pulls?q=is:open+is:pr+label:semver-minor), or a [major](https://github.com/facebook/react/pulls?q=is:open+is:pr+label:semver-major) version. We release new patch versions every few weeks, minor versions every few months, and major versions one or two times a year.
38+
Feature flags are defined in [`packages/shared/ReactFeatureFlags.js`](https://github.com/facebook/react/blob/master/packages/shared/ReactFeatureFlags.js). Some builds of React may enable different sets of feature flags; for example, the React Native build may be configured differently than React DOM. These flags are found in [`packages/shared/forks`](https://github.com/facebook/react/tree/master/packages/shared/forks). Feature flags are statically typed by Flow, so you can run `yarn flow` to confirm that you've updated all the necessary files.
3339

34-
Every significant change is documented in the [changelog file](https://github.com/facebook/react/blob/master/CHANGELOG.md).
40+
React's build system will strip out disabled feature branches before publishing. A continuous integration job runs on every commit to check for changes in bundle size. You can use the change in size as a signal that a feature was gated correctly.
3541

3642
### Bugs {#bugs}
3743

content/footerNav.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ channels:
3030
to: https://reactjs.org/community/support.html#popular-discussion-forums
3131
external: true
3232
- title: Reactiflux Chat
33-
to: https://discord.gg/0ZcbPKXt5bZjGY5n
33+
to: https://discord.gg/reactiflux
3434
external: true
3535
- title: DEV Community
3636
to: https://dev.to/t/react

content/languages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
- name: Bengali
2323
translated_name: বাংলা
2424
code: bn
25-
status: 0
25+
status: 1
2626
- name: Catalan
2727
translated_name: Català
2828
code: ca

content/tutorial/tutorial.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ import './index.css';
120120

121121
### 도움이 필요할 때! {#help-im-stuck}
122122

123-
막히는 부분이 생겼다면 [커뮤니티에서 지원하는 자료](/community/support.html)를 확인해보세요. 특히 [Reactiflux Chat](https://discord.gg/0ZcbPKXt5bZjGY5n)은 빠르게 도움을 받을 수 있는 좋은 방법입니다. 원하는 답을 얻지 못하거나 계속 막힌 상태라면 이슈를 제출해주세요. 우리가 도와드리겠습니다.
123+
막히는 부분이 생겼다면 [커뮤니티에서 지원하는 자료](/community/support.html)를 확인해보세요. 특히 [Reactiflux Chat](https://discord.gg/reactiflux)은 빠르게 도움을 받을 수 있는 좋은 방법입니다. 원하는 답을 얻지 못하거나 계속 막힌 상태라면 이슈를 제출해주세요. 우리가 도와드리겠습니다.
124124

125125
## 개요 {#overview}
126126

content/versions.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
- title: '16.10'
2+
changelog: https://github.com/facebook/react/blob/master/CHANGELOG.md#16100-september-27-2019
13
- title: '16.9'
24
changelog: https://github.com/facebook/react/blob/master/CHANGELOG.md#1690-august-8-2019
35
- title: '16.8'

package.json

Lines changed: 2 additions & 2 deletions
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.9.0",
51-
"react-dom": "^16.9.0",
50+
"react": "^16.10.0",
51+
"react-dom": "^16.10.0",
5252
"react-helmet": "^5.2.0",
5353
"react-live": "1.8.0-0",
5454
"remarkable": "^1.7.1",

src/site-constants.js

Lines changed: 1 addition & 1 deletion
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://ko.reactjs.org';
11-
const version = '16.9.0';
11+
const version = '16.10.0';
1212
const babelURL = 'https://unpkg.com/babel-standalone@6.26.0/babel.min.js';
1313

1414
export {babelURL, urlRoot, version};

yarn.lock

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10903,15 +10903,15 @@ react-dev-utils@^4.2.1:
1090310903
strip-ansi "3.0.1"
1090410904
text-table "0.2.0"
1090510905

10906-
react-dom@^16.9.0:
10907-
version "16.9.0"
10908-
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.9.0.tgz#5e65527a5e26f22ae3701131bcccaee9fb0d3962"
10909-
integrity sha512-YFT2rxO9hM70ewk9jq0y6sQk8cL02xm4+IzYBz75CQGlClQQ1Bxq0nhHF6OtSbit+AIahujJgb/CPRibFkMNJQ==
10906+
react-dom@^16.10.0:
10907+
version "16.10.0"
10908+
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.10.0.tgz#319356767b5c044f3c016eef28518ef7726dce84"
10909+
integrity sha512-0QJQUFrKG04hB/1lWyUs/FOd1qNseKGRQI+JBRsADIqVAFxYObhZ2zsVQKjt+nVSCmi8KA0sL52RLwwWuXQtOw==
1091010910
dependencies:
1091110911
loose-envify "^1.1.0"
1091210912
object-assign "^4.1.1"
1091310913
prop-types "^15.6.2"
10914-
scheduler "^0.15.0"
10914+
scheduler "^0.16.0"
1091510915

1091610916
react-error-overlay@^3.0.0:
1091710917
version "3.0.0"
@@ -10965,10 +10965,10 @@ react-side-effect@^1.1.0:
1096510965
exenv "^1.2.1"
1096610966
shallowequal "^1.0.1"
1096710967

10968-
react@^16.9.0:
10969-
version "16.9.0"
10970-
resolved "https://registry.yarnpkg.com/react/-/react-16.9.0.tgz#40ba2f9af13bc1a38d75dbf2f4359a5185c4f7aa"
10971-
integrity sha512-+7LQnFBwkiw+BobzOF6N//BdoNw0ouwmSJTEm9cglOOmsg/TMiFHZLe2sEoN5M7LgJTj9oHH0gxklfnQe66S1w==
10968+
react@^16.10.0:
10969+
version "16.10.0"
10970+
resolved "https://registry.yarnpkg.com/react/-/react-16.10.0.tgz#95c41e8fc1c706e174deef54b663b5ab94c8ee32"
10971+
integrity sha512-lc37bD3j6ZWJRso/a1rrFu6CO1qOf30ZadUDBi1c5RHA1lBSWA8x2MGABB6Oikk+RfmgC+kAT+XegL0eD1ecKg==
1097210972
dependencies:
1097310973
loose-envify "^1.1.0"
1097410974
object-assign "^4.1.1"
@@ -11718,10 +11718,10 @@ sax@>=0.6.0, sax@^1.2.4, sax@~1.2.1, sax@~1.2.4:
1171811718
resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
1171911719
integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
1172011720

11721-
scheduler@^0.15.0:
11722-
version "0.15.0"
11723-
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.15.0.tgz#6bfcf80ff850b280fed4aeecc6513bc0b4f17f8e"
11724-
integrity sha512-xAefmSfN6jqAa7Kuq7LIJY0bwAPG3xlCj0HMEBQk1lxYiDKZscY2xJ5U/61ZTrYbmNQbXa+gc7czPkVo11tnCg==
11721+
scheduler@^0.16.0:
11722+
version "0.16.0"
11723+
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.16.0.tgz#cc8914b79c5c1cfa16714cb1ddc4cbd2c7513efa"
11724+
integrity sha512-Jq59uCXQzi71B562VEjuDgvsgfTfkLDvdjNhA7hamN/fKBxecXIEFF24Zu4OVrnAz9NJJ8twa9X16Zp4b0P/xQ==
1172511725
dependencies:
1172611726
loose-envify "^1.1.0"
1172711727
object-assign "^4.1.1"

0 commit comments

Comments
 (0)