Skip to content

Commit fd64103

Browse files
committed
Merge remote-tracking branch 'upstream/master' into lists-and-keys
2 parents 4f82d07 + 4c798f1 commit fd64103

22 files changed

+547
-530
lines changed

README.md

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,70 @@
11
# reactjs.org
22

3-
This repo contains the source code and documentation powering [reactjs.org](https://reactjs.org/).
3+
이 저장소는 [reactjs.org](https://reactjs.org/)의 소스 코드와 개발 문서를 포함하고 있습니다.
44

5-
## Getting started
5+
## 시작하기
66

7-
### Prerequisites
7+
### 사전 준비
88

99
1. Git
10-
1. Node: any 8.x version starting with 8.4.0 or greater
11-
1. Yarn: See [Yarn website for installation instructions](https://yarnpkg.com/lang/en/docs/install/)
12-
1. A fork of the repo (for any contributions)
13-
1. A clone of the [reactjs.org repo](https://github.com/reactjs/reactjs.org) on your local machine
10+
1. Node: 8.4.0 이상으로 시작하는 모든 8.x 버전
11+
1. Yarn: [Yarn website for installation instructions](https://yarnpkg.com/lang/en/docs/install/) 참고
12+
1. 포크한 개인 저장소
13+
1. 로컬에 클론(Clone) 한 [reactjs.org repo](https://github.com/reactjs/reactjs.org) 개인 저장소
1414

15-
### Installation
15+
### 설치
1616

17-
1. `cd reactjs.org` to go into the project root
18-
1. `yarn` to install the website's npm dependencies
17+
1. `cd reactjs.org`를 실행하여 프로젝트 경로로 이동합니다.
18+
1. `yarn`을 이용하여 npm 의존성 모듈들을 설치합니다.
1919

20-
### Running locally
20+
### 개발 서버 실행하기
2121

22-
1. `yarn dev` to start the hot-reloading development server (powered by [Gatsby](https://www.gatsbyjs.org))
23-
1. `open http://localhost:8000` to open the site in your favorite browser
22+
1. `yarn dev` 명령어를 사용하여 hot-reloading 개발 서버를 시작합니다. (powered by [Gatsby](https://www.gatsbyjs.org))
23+
1. `open http://localhost:8000` 명령어를 사용하여 선호하는 브라우저로 접속하세요.
2424

25-
## Contributing
25+
## 기여방법
2626

27-
### Guidelines
27+
### 가이드라인
2828

29-
The documentation is divided into several sections with a different tone and purpose. If you plan to write more than a few sentences, you might find it helpful to get familiar with the [contributing guidelines](https://github.com/reactjs/reactjs.org/blob/master/CONTRIBUTING.md#guidelines-for-text) for the appropriate sections.
29+
이 문서는 목적이 다른 여러 섹션으로 나뉘게 됩니다. 문장을 추가할 계획이라면, 적절한 섹션에 대한 [가이드라인](https://github.com/reactjs/reactjs.org/blob/master/CONTRIBUTING.md#guidelines-for-text)을 숙지하는 것이 도움이 될 것입니다.
3030

31-
### Create a branch
31+
### 브랜치(branch) 만들기
3232

33-
1. `git checkout master` from any folder in your local `reactjs.org` repository
34-
1. `git pull origin master` to ensure you have the latest main code
35-
1. `git checkout -b the-name-of-my-branch` (replacing `the-name-of-my-branch` with a suitable name) to create a branch
33+
1. `reactjs.org` 로컬 저장소에서 `git checkout master`를 실행합니다.
34+
1. `git pull origin master`를 실행하여 최신 원본 코드를 보장할 수 있습니다.
35+
1. `git checkout -b the-name-of-my-branch` (`the-name-of-my-branch` 를 적절한 이름으로 교체)를 실행하여 브랜치를 만듭니다.
3636

37-
### Make the change
37+
### 수정하기
3838

39-
1. Follow the "Running locally" instructions
40-
1. Save the files and check in the browser
41-
1. Changes to React components in `src` will hot-reload
42-
1. Changes to markdown files in `content` will hot-reload
43-
1. If working with plugins, you may need to remove the `.cache` directory and restart the server
39+
1. "개발 서버 실행하기" 부분을 따릅니다.
40+
1. 파일을 저장하고 브라우저에서 확인합니다.
41+
1.`src`안에 있는 React 컴포넌트가 수정될 경우 hot-reload가 적용됩니다.
42+
1. `content`안에 있는 마크다운 파일이 수정될 경우 hot-reload가 적용됩니다.
43+
1. 플러그인을 사용하는 경우, `.cache` 디렉토리를 제거한 후 서버를 재시작해야 합니다.
4444

45-
### Test the change
45+
### 수정사항 체크하기
4646

47-
1. If possible, test any visual changes in all latest versions of common browsers, on both desktop and mobile.
48-
1. Run `yarn check-all` from the project root. (This will run Prettier, ESLint, and Flow.)
47+
1. 가능하다면, 변경한 부분에 대해서 많이 사용하는 브라우저의 최신 버전에서 시각적으로 제대로 적용되었는지 확인해주세요. (데스크탑과 모바일 모두)
48+
1. 프로젝트 루트에서 `yarn check-all`를 실행합니다. (이 명령어는 Prettier, ESLint, 그리고 Flow를 실행합니다.)
4949

50-
### Push it
50+
### Push 하기
5151

52-
1. `git add -A && git commit -m "My message"` (replacing `My message` with a commit message, such as `Fixed header logo on Android`) to stage and commit your changes
52+
1. `git add -A && git commit -m "My message"` (`My message` 부분을 `Fixed header logo on Android` 같은 커밋 메시지로 교체)를 실행하여 변경한 파일들을 commit 해주세요.
5353
1. `git push my-fork-name the-name-of-my-branch`
54-
1. Go to the [reactjs.org repo](https://github.com/reactjs/reactjs.org) and you should see recently pushed branches.
55-
1. Follow GitHub's instructions.
56-
1. If possible, include screenshots of visual changes. A Netlify build will also be automatically created once you make your PR so other people can see your change.
54+
1. [reactjs.org repo](https://github.com/reactjs/reactjs.org)에서 최근에 푸시된 브랜치를 볼 수 있습니다.
55+
1. Github 지침을 따라주세요.
56+
1. 가능하다면 시각적으로 변화된 부분의 스크린샷을 첨부해주세요. PR을 만들고 다른사람들이 수정사항을 볼 수 있게되면, Netlify가 자동적으로 빌드할 것입니다.
5757

58-
## Translation
58+
## 변역
5959

60-
If you are interested in translating `reactjs.org`, please see the current translation efforts at [isreacttranslatedyet.com](https://www.isreacttranslatedyet.com/).
60+
`reactjs.org` 번역에 흥미가 있다면, [isreacttranslatedyet.com](https://www.isreacttranslatedyet.com/)에서 현재 번역이 얼마나 진행되었는지 확인해주세요.
6161

6262

63-
If your language does not have a translation and you would like to create one, please follow the instructions at [reactjs.org Translations](https://github.com/reactjs/reactjs.org-translation#translating-reactjsorg).
63+
번역하려는 언어가 아직 진행되지 않았다면, 해당 언어에 대해 새롭게 만들 수 있습니다. [reactjs.org Translations](https://github.com/reactjs/reactjs.org-translation#translating-reactjsorg)를 참고해주세요.
6464

65-
## Troubleshooting
65+
## 문제 해결하기
6666

67-
- `yarn reset` to clear the local cache
67+
- `yarn reset` 명령어를 사용하여 로컬 캐시를 초기화합니다.
6868

69-
## License
70-
Content submitted to [reactjs.org](https://reactjs.org/) is CC-BY-4.0 licensed, as found in the [LICENSE-DOCS.md](https://github.com/open-source-explorer/reactjs.org/blob/master/LICENSE-DOCS.md) file.
69+
## 저작권
70+
위 내용에 대한 저작권은 [reactjs.org](https://reactjs.org/)가 가지고 있으며, [LICENSE-DOCS.md](https://github.com/open-source-explorer/reactjs.org/blob/master/LICENSE-DOCS.md)에서 볼 수 있는 CC-BY-4.0 라이센스를 따릅니다.

content/community/conferences.md

Lines changed: 39 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,16 @@ Do you know of a local React.js conference? Add it here! (Please keep the list c
1212

1313
## Upcoming Conferences {#upcoming-conferences}
1414

15-
### Reactathon 2019 {#reactathon-2019}
16-
March 30-31, 2019 in San Francisco, USA
17-
18-
[Website](https://www.reactathon.com/) - [Twitter](https://twitter.com/reactathon)
19-
20-
### App.js Conf 2019 {#appjs-conf-2019}
21-
April 4-5, 2019 in Kraków, Poland
22-
23-
[Website](https://appjs.co) - [Twitter](https://twitter.com/appjsconf)
24-
25-
### React Amsterdam 2019 {#react-amsterdam-2019}
26-
April 12, 2019 in Amsterdam, The Netherlands
27-
28-
[Website](https://react.amsterdam) - [Twitter](https://twitter.com/reactamsterdam) - [Facebook](https://www.facebook.com/reactamsterdam)
29-
30-
### ReactJS Girls Conference {#reactjs-girls-conference}
15+
### ReactJS Girls Conference
3116
May 3, 2019 in London, UK
3217

3318
[Website](https://reactjsgirls.com/) - [Twitter](https://twitter.com/reactjsgirls)
3419

20+
### <React.NotAConf /> 2019 {#reactnotaconf--2019}
21+
May 11 in Sofia, Bulgaria
22+
23+
[Website](http://react-not-a-conf.com/) - [Twitter](https://twitter.com/reactnotaconf) - [Facebook](https://www.facebook.com/events/780891358936156)
24+
3525
### ReactEurope 2019 {#reacteurope-2019}
3626
May 23-24, 2019 in Paris, France
3727

@@ -52,13 +42,19 @@ June 21, 2019 Chicago, Illinois USA
5242

5343
[Website](https://reactloop.com) - [Twitter](https://twitter.com/ReactLoop)
5444

45+
### Chain React 2019
46+
July 11-12, 2019. Portland, OR, USA.
47+
48+
[Website](https://infinite.red/ChainReactConf)
49+
5550
### React Rally 2019
5651
August 22-23, 2019. Salt Lake City, USA.
5752

5853
[Website](https://www.reactrally.com/) - [Twitter](https://twitter.com/ReactRally) - [Instagram](https://www.instagram.com/reactrally/)
5954

6055
### ComponentsConf 2019 {#componentsconf-2019}
6156
September 6, 2019 in Melbourne, Australia
57+
6258
[Website](https://www.componentsconf.com.au/) - [Twitter](https://twitter.com/componentsconf)
6359

6460
### React Native EU 2019 {#react-native-eu-2019}
@@ -81,6 +77,16 @@ September 26-28, 2019 in Alicante, Spain
8177

8278
[Website](http://reactalicante.es/) - [Twitter](https://twitter.com/reactalicante) - [Facebook](https://www.facebook.com/ReactAlicante)
8379

80+
### React Advanced 2019 {#react-advanced-2019}
81+
October 25, 2019 in London, UK
82+
83+
[Website](https://reactadvanced.com) - [Twitter](http://twitter.com/reactadvanced) - [Facebook](https://www.facebook.com/ReactAdvanced) - [Videos](https://youtube.com/c/ReactConferences)
84+
85+
### React Day Berlin 2019 {#react-day-berlin-2019}
86+
December 6, 2019 in Berlin, Germany
87+
88+
[Website](https://reactday.berlin) - [Twitter](https://twitter.com/reactdayberlin) - [Facebook](https://www.facebook.com/reactdayberlin/) - [Videos](https://www.youtube.com/reactdayberlin)
89+
8490
## Past Conferences {#past-conferences}
8591

8692
### React.js Conf 2015 {#reactjs-conf-2015}
@@ -108,7 +114,7 @@ February 22 & 23 in San Francisco, CA
108114
### React Amsterdam 2016 {#react-amsterdam-2016}
109115
April 16 in Amsterdam, The Netherlands
110116

111-
[Website](https://react.amsterdam/2016) - [Videos](https://youtu.be/sXDZBxbRRag?list=PLNBNS7NRGKMG3uLrm5fgY02hJ87Wzb4IU)
117+
[Website](https://react.amsterdam) - [Twitter](https://twitter.com/reactamsterdam) - [Facebook](https://www.facebook.com/reactamsterdam) - [Videos](https://youtube.com/c/ReactConferences)
112118

113119
### ReactEurope 2016 {#reacteurope-2016}
114120
June 2 & 3 in Paris, France
@@ -158,7 +164,7 @@ March 28th at the [QEII Centre, London](http://qeiicentre.london/)
158164
### React Amsterdam 2017 {#react-amsterdam-2017}
159165
April 21st in Amsterdam, The Netherlands
160166

161-
[Website](https://react.amsterdam) - [Twitter](https://twitter.com/reactamsterdam) - [Videos](https://www.youtube.com/watch?v=NQyL-Dm7Kig&list=PLNBNS7NRGKMHxfm0CcYNuINLdRw7r4a9M)
167+
[Website](https://react.amsterdam) - [Twitter](https://twitter.com/reactamsterdam) - [Videos](https://youtube.com/c/ReactConferences)
162168

163169
### ReactEurope 2017 {#reacteurope-2017}
164170
May 18th & 19th in Paris, France
@@ -354,3 +360,18 @@ November 30, Berlin, Germany
354360
January 31, 2019 in Tehran, Iran
355361

356362
[Website](http://reactiran.com) - [Instagram](https://www.instagram.com/reactiran/)
363+
364+
### Reactathon 2019 {#reactathon-2019}
365+
March 30-31, 2019 in San Francisco, USA
366+
367+
[Website](https://www.reactathon.com/) - [Twitter](https://twitter.com/reactathon)
368+
369+
### App.js Conf 2019 {#appjs-conf-2019}
370+
April 4-5, 2019 in Kraków, Poland
371+
372+
[Website](https://appjs.co) - [Twitter](https://twitter.com/appjsconf)
373+
374+
### React Amsterdam 2019 {#react-amsterdam-2019}
375+
April 12, 2019 in Amsterdam, The Netherlands
376+
377+
[Website](https://react.amsterdam) - [Twitter](https://twitter.com/reactamsterdam) - [Facebook](https://www.facebook.com/reactamsterdam) - [Videos](https://youtube.com/c/ReactConferences)

content/docs/addons-shallow-compare.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ category: Reference
88

99
> Note:
1010
>
11-
> `shallowCompare` is a legacy add-on. Use [`React.PureComponent`](/docs/react-api.html#reactpurecomponent) instead.
11+
> `shallowCompare` is a legacy add-on. Use [`React.memo`](/docs/react-api.html#reactmemo) or [`React.PureComponent`](/docs/react-api.html#reactpurecomponent) instead.
1212
1313
**Importing**
1414

0 commit comments

Comments
 (0)