Skip to content

Commit 49a6600

Browse files
authored
Merge pull request #168 from reactjs/sync-941f5418
Sync with reactjs.org @ 941f541
2 parents c8726b8 + 3a07b2b commit 49a6600

19 files changed

+210
-89
lines changed

CODE_OF_CONDUCT.md

Lines changed: 74 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,76 @@
11
# Code of Conduct
22

3-
Facebook has adopted a Code of Conduct that we expect project participants to adhere to.
4-
Please read the [full text](https://code.fb.com/codeofconduct/)
5-
so that you can understand what actions will and will not be tolerated.
3+
## Our Pledge
4+
5+
In the interest of fostering an open and welcoming environment, we as
6+
contributors and maintainers pledge to make participation in our project and
7+
our community a harassment-free experience for everyone, regardless of age, body
8+
size, disability, ethnicity, sex characteristics, gender identity and expression,
9+
level of experience, education, socio-economic status, nationality, personal
10+
appearance, race, religion, or sexual identity and orientation.
11+
12+
## Our Standards
13+
14+
Examples of behavior that contributes to creating a positive environment
15+
include:
16+
17+
* Using welcoming and inclusive language
18+
* Being respectful of differing viewpoints and experiences
19+
* Gracefully accepting constructive criticism
20+
* Focusing on what is best for the community
21+
* Showing empathy towards other community members
22+
23+
Examples of unacceptable behavior by participants include:
24+
25+
* The use of sexualized language or imagery and unwelcome sexual attention or
26+
advances
27+
* Trolling, insulting/derogatory comments, and personal or political attacks
28+
* Public or private harassment
29+
* Publishing others' private information, such as a physical or electronic
30+
address, without explicit permission
31+
* Other conduct which could reasonably be considered inappropriate in a
32+
professional setting
33+
34+
## Our Responsibilities
35+
36+
Project maintainers are responsible for clarifying the standards of acceptable
37+
behavior and are expected to take appropriate and fair corrective action in
38+
response to any instances of unacceptable behavior.
39+
40+
Project maintainers have the right and responsibility to remove, edit, or
41+
reject comments, commits, code, wiki edits, issues, and other contributions
42+
that are not aligned to this Code of Conduct, or to ban temporarily or
43+
permanently any contributor for other behaviors that they deem inappropriate,
44+
threatening, offensive, or harmful.
45+
46+
## Scope
47+
48+
This Code of Conduct applies within all project spaces, and it also applies when
49+
an individual is representing the project or its community in public spaces.
50+
Examples of representing a project or community include using an official
51+
project e-mail address, posting via an official social media account, or acting
52+
as an appointed representative at an online or offline event. Representation of
53+
a project may be further defined and clarified by project maintainers.
54+
55+
## Enforcement
56+
57+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
58+
reported by contacting the project team at <[email protected]>. All
59+
complaints will be reviewed and investigated and will result in a response that
60+
is deemed necessary and appropriate to the circumstances. The project team is
61+
obligated to maintain confidentiality with regard to the reporter of an incident.
62+
Further details of specific enforcement policies may be posted separately.
63+
64+
Project maintainers who do not follow or enforce the Code of Conduct in good
65+
faith may face temporary or permanent repercussions as determined by other
66+
members of the project's leadership.
67+
68+
## Attribution
69+
70+
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
71+
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
72+
73+
[homepage]: https://www.contributor-covenant.org
74+
75+
For answers to common questions about this code of conduct, see
76+
https://www.contributor-covenant.org/faq

content/blog/2017-07-26-error-handling-in-react-16.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,4 +111,4 @@ Error boundaries preserve the declarative nature of React, and behave as you wou
111111

112112
React 15 included a very limited support for error boundaries under a different method name: `unstable_handleError`. This method no longer works, and you will need to change it to `componentDidCatch` in your code starting from the first 16 beta release.
113113

114-
For this change, we’ve provided [a codemod](https://github.com/reactjs/react-codemod#error-boundaries) to automatically migrate your code.
114+
For this change, we’ve provided a [codemod](https://github.com/reactjs/react-codemod#error-boundaries) to automatically migrate your code.

content/blog/2019-08-15-new-react-devtools.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@ git clone https://github.com/facebook/react-devtools
6060

6161
cd react-devtools
6262

63+
# Checkout the previous release branch
64+
git checkout v3
65+
6366
# Install dependencies and build the unpacked extension
6467
yarn install
6568
yarn build:extension

content/community/conferences.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,12 @@ February 27 & 28, 2020 in Sydney, Australia
8080
### Render-Atlanta 2020 {#render-atlanta-2020}
8181
May 4-6, 2020. Atlanta, GA, USA.
8282

83-
[Website](https://renderatl.com)
83+
[Website](https://renderatl.com) - [Twitter](https://twitter.com/renderATL) - [Instagram](https://www.instagram.com/renderatl/) - [Facebook](https://www.facebook.com/renderatl/)
84+
85+
### React Finland 2020 {#react-finland-2020}
86+
May 26-29 in Helsinki, Finland
87+
88+
[Website](https://react-finland.fi/) - [Twitter](https://twitter.com/ReactFinland)
8489

8590
### React Next 2020 {#react-next-2020}
8691
June 15, 2020. Tel Aviv, Israel.

content/community/courses.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ permalink: community/courses.html
88

99
## Free Courses {#free-courses}
1010

11+
- [Glitch: React Starter Kit](https://glitch.com/culture/react-starter-kit/) - A free, 5-part video course with interactive code examples that will help you learn React.
12+
1113
- [Codecademy: React 101](https://www.codecademy.com/learn/react-101) - Codecademy's introductory course for React.
1214

1315
- [Egghead.io: Start Learning React](https://egghead.io/courses/start-learning-react) - This series will explore the basic fundamentals of React to get you started.

content/community/meetups.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
144144
* [New York, NY - ReactJS](https://www.meetup.com/NYC-Javascript-React-Group/)
145145
* [New York, NY - React Ladies](https://www.meetup.com/React-Ladies/)
146146
* [New York, NY - React Native](https://www.meetup.com/React-Native-NYC/)
147+
* [New York, NY - useReactNYC](https://www.meetup.com/useReactNYC/)
147148
* [Palo Alto, CA - React Native](https://www.meetup.com/React-Native-Silicon-Valley/)
148149
* [Philadelphia, PA - ReactJS](https://www.meetup.com/RQ-React/)
149150
* [Phoenix, AZ - ReactJS](https://www.meetup.com/ReactJS-Phoenix/)

content/community/support.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ React has a community of millions of developers.
1212

1313
On this page we've listed some React-related communities that you can be a part of; see the other pages in this section for additional online and in-person learning materials.
1414

15+
Before participating in React's communities, [please read our Code of Conduct](https://github.com/facebook/react/blob/master/CODE_OF_CONDUCT.md). We have adopted the [Contributor Covenant](https://www.contributor-covenant.org/) and we expect that all community members adhere to the guidelines within.
16+
1517
## Stack Overflow {#stack-overflow}
1618

1719
Stack Overflow is a popular forum to ask code-level questions or if you're stuck with a specific error. Read through the [existing questions](https://stackoverflow.com/questions/tagged/reactjs) tagged with **reactjs** or [ask your own](https://stackoverflow.com/questions/ask?tags=reactjs)!

content/docs/codebase-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ Its source code is located in [`packages/react-reconciler`](https://github.com/f
217217

218218
### Event System {#event-system}
219219

220-
React implements a synthetic event system which is agnostic of the renderers and works both with React DOM and React Native. Its source code is located in [`packages/events`](https://github.com/facebook/react/tree/master/packages/events).
220+
React implements a synthetic event system which is agnostic of the renderers and works both with React DOM and React Native. Its source code is located in [`packages/react-events`](https://github.com/facebook/react/tree/master/packages/react-events).
221221

222222
There is a [video with a deep code dive into it](https://www.youtube.com/watch?v=dRo_egw7tBc) (66 mins).
223223

content/docs/how-to-contribute.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@ redirect_from:
1111

1212
React is one of Facebook's first open source projects that is both under very active development and is also being used to ship code to everybody on [facebook.com](https://www.facebook.com). We're still working out the kinks to make contributing to this project as easy and transparent as possible, but we're not quite there yet. Hopefully this document makes the process for contributing clear and answers some questions that you may have.
1313

14-
### [Code of Conduct](https://code.facebook.com/codeofconduct) {#code-of-conduct}
14+
### [Code of Conduct](https://github.com/facebook/react/blob/master/CODE_OF_CONDUCT.md) {#code-of-conduct}
1515

16-
Facebook has adopted a Code of Conduct that we expect project participants to adhere to. Please read [the full text](https://code.facebook.com/codeofconduct) so that you can understand what actions will and will not be tolerated.
16+
Facebook has adopted the [Contributor Covenant](https://www.contributor-covenant.org/) as its Code of Conduct, and we expect project participants to adhere to it. Please read [the full text](https://github.com/facebook/react/blob/master/CODE_OF_CONDUCT.md) so that you can understand what actions will and will not be tolerated.
1717

1818
### Open Development {#open-development}
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

2222
### Branch Organization {#branch-organization}
2323

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](/downloads.html).
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).
2525

2626
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.
2727

content/docs/reference-test-renderer.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ testRenderer.toJSON()
151151
testRenderer.toTree()
152152
```
153153

154-
렌더링 된 트리를 나타내는 객체를 반환합니다. `toJSON()`에서 반환되는 값과 달리 더욱 자세한 정보가 반환되며, 반환 값에는 사용자가 작성한 컴포넌트 역시 포함되어있습니다. 테스트 렌더러 위에 별도의 검증(assertion) 라이브러리를 만드는 것이 아니라면 이 함수는 필요하지 않을 것입니다.
154+
렌더링 된 트리를 나타내는 객체를 반환합니다. `toJSON()`에서 반환되는 값보다 더욱 자세한 정보가 반환되며, 반환 값에는 사용자가 작성한 컴포넌트 역시 포함되어있습니다. 테스트 렌더러 위에 별도의 검증(assertion) 라이브러리를 만드는 것이 아니라면 이 함수는 필요하지 않을 것입니다.
155155

156156
### `testRenderer.update()` {#testrendererupdate}
157157

content/docs/render-props.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ render props 패턴으로 구현된 컴포넌트는 자체적으로 렌더링
1414
)}/>
1515
```
1616

17-
render props를 사용하는 라이브러리는 [React Router](https://reacttraining.com/react-router/web/api/Route/Route-render-methods) [Downshift](https://github.com/paypal/downshift) 있습니다.
17+
render props를 사용하는 라이브러리는 [React Router](https://reacttraining.com/react-router/web/api/Route/Route-render-methods), [Downshift](https://github.com/paypal/downshift), [Formik](https://github.com/jaredpalmer/formik) 있습니다.
1818

1919
이 문서에서는 render props가 왜 유용하고, 어떻게 여러분의 프로젝트에 적용할 수 있을지에 관해 이야기 하겠습니다.
2020

content/docs/testing-recipes.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ Common testing patterns for React components.
1414
1515
On this page, we will primarily use function components. However, these testing strategies don't depend on implementation details, and work just as well for class components too.
1616

17-
- [Setup/Teardown ](#setup--teardown)
17+
- [Setup/Teardown](#setup--teardown)
1818
- [`act()`](#act)
19+
- [Rendering](#rendering)
1920
- [Data Fetching](#data-fetching)
2021
- [Mocking Modules](#mocking-modules)
2122
- [Events](#events)

content/docs/testing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Different answers may work for different teams and products.
2828

2929
### Recommended Tools {#tools}
3030

31-
**[Jest](https://facebook.github.io/jest/)** is a JavaScript test runner that lets you access the DOM via [`jsdom`](#mocking-a-rendering-surface). While jsdom is only an approximation of how the browser works, it is often good enough for testing React components. Jest provides a great iteration speed combined with powerful features like mocking [modules](#mocking-modules) and [timers](#mocking-timers) so you can have more control over how the code executes.
31+
**[Jest](https://facebook.github.io/jest/)** is a JavaScript test runner that lets you access the DOM via [`jsdom`](/docs/testing-environments.html#mocking-a-rendering-surface). While jsdom is only an approximation of how the browser works, it is often good enough for testing React components. Jest provides a great iteration speed combined with powerful features like mocking [modules](/docs/testing-environments.html#mocking-modules) and [timers](/docs/testing-environments.html#mocking-timers) so you can have more control over how the code executes.
3232

3333
**[React Testing Library](https://testing-library.com/react)** is a set of helpers that let you test React components without relying on their implementation details. This approach makes refactoring a breeze and also nudges you towards best practices for accessibility. Although it doesn't provide a way to "shallowly" render a component without its children, a test runner like Jest lets you do this by [mocking](/docs/testing-recipes.html#mocking-modules).
3434

content/footerNav.yml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
community:
2+
title: 커뮤니티
3+
4+
docs:
5+
title: 문서
6+
7+
more:
8+
title: 더보기
9+
items:
10+
- title: 자습서
11+
to: /tutorial/tutorial.html
12+
- title: 블로그
13+
to: /blog
14+
- title: 감사의 글
15+
to: /acknowledgements.html
16+
- title: React Native
17+
to: https://facebook.github.io/react-native/
18+
external: true
19+
20+
channels:
21+
title: 채널
22+
items:
23+
- title: Github
24+
to: https://github.com/facebook/react
25+
external: true
26+
- title: Stack Overflow
27+
to: https://stackoverflow.com/questions/tagged/reactjs
28+
external: true
29+
- title: Discussion Forums
30+
to: https://reactjs.org/community/support.html#popular-discussion-forums
31+
external: true
32+
- title: Reactiflux Chat
33+
to: https://discord.gg/0ZcbPKXt5bZjGY5n
34+
external: true
35+
- title: DEV Community
36+
to: https://dev.to/t/react
37+
external: true
38+
- title: Facebook
39+
to: https://www.facebook.com/react
40+
external: true
41+
- title: Twitter
42+
to: https://twitter.com/reactjs
43+
external: true

content/headerNav.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
items:
2+
- title: 문서
3+
to: /docs/getting-started.html
4+
activeSelector: /docs/
5+
- title: 자습서
6+
to: /tutorial/tutorial.html
7+
activeSelector: /tutorial
8+
- title: 블로그
9+
to: /blog/
10+
activeSelector: /blog
11+
- title: 커뮤니티
12+
to: /community/support.html
13+
activeSelector: /community

content/languages.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@
5959
translated_name: हिन्दी
6060
code: hi
6161
status: 0
62+
- name: Hungarian
63+
translated_name: magyar
64+
code: hu
65+
status: 0
6266
- name: Armenian
6367
translated_name: Հայերեն
6468
code: hy
@@ -174,7 +178,7 @@
174178
- name: Vietnamese
175179
translated_name: Tiếng Việt
176180
code: vi
177-
status: 0
181+
status: 1
178182
- name: Simplified Chinese
179183
translated_name: 简体中文
180184
code: zh-hans

src/components/LayoutFooter/Footer.js

Lines changed: 14 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,14 @@ import ExternalFooterLink from './ExternalFooterLink';
1010
import FooterLink from './FooterLink';
1111
import FooterNav from './FooterNav';
1212
import MetaTitle from 'templates/components/MetaTitle';
13+
import SectionLinks from './SectionLinks';
1314
import React from 'react';
1415
import {colors, media} from 'theme';
1516
import {sectionListCommunity, sectionListDocs} from 'utils/sectionList';
1617

18+
// $FlowFixMe
19+
import navFooter from '../../../content/footerNav.yml';
20+
1721
import ossLogoPng from 'images/oss_logo.png';
1822

1923
const Footer = ({layoutHasSidebar = false}: {layoutHasSidebar: boolean}) => (
@@ -60,7 +64,7 @@ const Footer = ({layoutHasSidebar = false}: {layoutHasSidebar: boolean}) => (
6064
},
6165
}}>
6266
<FooterNav layoutHasSidebar={layoutHasSidebar}>
63-
<MetaTitle onDark={true}>문서</MetaTitle>
67+
<MetaTitle onDark={true}>{navFooter.docs.title}</MetaTitle>
6468
{sectionListDocs.map(section => {
6569
const defaultItem = section.items[0];
6670
return (
@@ -73,52 +77,15 @@ const Footer = ({layoutHasSidebar = false}: {layoutHasSidebar: boolean}) => (
7377
})}
7478
</FooterNav>
7579
<FooterNav layoutHasSidebar={layoutHasSidebar}>
76-
<MetaTitle onDark={true}>채널</MetaTitle>
77-
<ExternalFooterLink
78-
href="https://github.com/facebook/react"
79-
target="_blank"
80-
rel="noopener">
81-
GitHub
82-
</ExternalFooterLink>
83-
<ExternalFooterLink
84-
href="https://stackoverflow.com/questions/tagged/reactjs"
85-
target="_blank"
86-
rel="noopener">
87-
Stack Overflow
88-
</ExternalFooterLink>
89-
<ExternalFooterLink
90-
href="https://reactjs.org/community/support.html#popular-discussion-forums"
91-
target="_blank"
92-
rel="noopener">
93-
Discussion Forums
94-
</ExternalFooterLink>
95-
<ExternalFooterLink
96-
href="https://discord.gg/0ZcbPKXt5bZjGY5n"
97-
target="_blank"
98-
rel="noopener">
99-
Reactiflux Chat
100-
</ExternalFooterLink>
101-
<ExternalFooterLink
102-
href="https://dev.to/t/react"
103-
target="_blank"
104-
rel="noopener">
105-
DEV Community
106-
</ExternalFooterLink>
107-
<ExternalFooterLink
108-
href="https://www.facebook.com/react"
109-
target="_blank"
110-
rel="noopener">
111-
Facebook
112-
</ExternalFooterLink>
113-
<ExternalFooterLink
114-
href="https://twitter.com/reactjs"
115-
target="_blank"
116-
rel="noopener">
117-
Twitter
118-
</ExternalFooterLink>
80+
<MetaTitle onDark={true}>{navFooter.channels.title}</MetaTitle>
81+
<SectionLinks links={navFooter.channels.items} />
11982
</FooterNav>
12083
<FooterNav layoutHasSidebar={layoutHasSidebar}>
121-
<MetaTitle onDark={true}>커뮤니티</MetaTitle>
84+
<MetaTitle onDark={true}>{navFooter.community.title}</MetaTitle>
85+
<ExternalFooterLink
86+
href={`https://github.com/facebook/react/blob/master/CODE_OF_CONDUCT.md`}>
87+
Code of Conduct
88+
</ExternalFooterLink>
12289
{sectionListCommunity.map(section => (
12390
<FooterLink
12491
to={`/community/${section.items[0].id}.html`}
@@ -128,16 +95,8 @@ const Footer = ({layoutHasSidebar = false}: {layoutHasSidebar: boolean}) => (
12895
))}
12996
</FooterNav>
13097
<FooterNav layoutHasSidebar={layoutHasSidebar}>
131-
<MetaTitle onDark={true}>더보기</MetaTitle>
132-
<FooterLink to="/tutorial/tutorial.html">자습서</FooterLink>
133-
<FooterLink to="/blog/">블로그</FooterLink>
134-
<FooterLink to="/acknowledgements.html">감사의 글</FooterLink>
135-
<ExternalFooterLink
136-
href="https://facebook.github.io/react-native/"
137-
target="_blank"
138-
rel="noopener">
139-
React Native
140-
</ExternalFooterLink>
98+
<MetaTitle onDark={true}>{navFooter.more.title}</MetaTitle>
99+
<SectionLinks links={navFooter.more.items} />
141100
</FooterNav>
142101
</div>
143102
<section

0 commit comments

Comments
 (0)