Skip to content

Commit 6df2b39

Browse files
authored
Merge branch 'master' into translate-universal-style-guide
2 parents 55b18eb + 2934f63 commit 6df2b39

39 files changed

+1254
-139
lines changed

.circleci/config.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,6 @@ jobs:
1818
- run:
1919
name: Check Prettier, ESLint, Flow
2020
command: yarn ci-check
21+
- run:
22+
name: Test Textlint
23+
command: yarn test:textlint

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,11 @@ https://github.com/reactjs/reactjs.org/blob/master/CONTRIBUTING.md
1111
If your PR references an existing issue, please add the issue number below
1212
1313
-->
14+
15+
## Progress
16+
17+
- [ ] 번역 초안 작성(Draft translation)
18+
- [ ] [공통 스타일 가이드 확인 (Check the common style guide)](link)
19+
- [ ] [용어 확인 (Check the term)](link)
20+
- [ ] [맞춤법 검사 (Spelling check)](http://speller.cs.pusan.ac.kr/)
21+
- [ ] 리뷰 반영 (Resolve reviews)

.textlintrc.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
module.exports = {
2+
filters: {
3+
comments: true,
4+
},
5+
formatterName: 'stylish',
6+
};

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ The documentation is divided into several sections with a different tone and pur
5757

5858
## Translation
5959

60-
If you are interesting in translating `reactjs.org`, please see the current translation efforts at [isreactreadyyet.com](https://www.isreactreadyyet.com).
60+
If you are interested in translating `reactjs.org`, please see the current translation efforts at [isreacttranslatedyet.com](https://www.isreacttranslatedyet.com/).
6161

6262

6363
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).

content/blog/2015-03-30-community-roundup-26.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Colin also [blogged about his experience using React Native](http://blog.scottlo
2929

3030
Spencer Ahrens and I had the great pleasure to talk about React Native on [The Changelog](https://thechangelog.com/149/) podcast. It was really fun to chat for an hour, I hope that you'll enjoy listening to it. :)
3131

32-
<audio src="http://fdlyr.co/d/changelog/cdn.5by5.tv/audio/broadcasts/changelog/2015/changelog-149.mp3" controls="controls" style="width: 100%"></audio>
32+
<audio src="https://cdn.changelog.com/uploads/podcast/149/the-changelog-149.mp3" controls="controls" style="width: 100%"></audio>
3333

3434

3535
## Hacker News {#hacker-news}

content/blog/2015-08-11-relay-technical-preview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ While React simplified the process of developing complex user-interfaces, it lef
1313

1414
Declarative data-fetching means that Relay applications specify *what* data they need, not *how* to fetch that data. Just as React uses a description of the desired UI to manage view updates, Relay uses a data description in the form of GraphQL queries. Given these descriptions, Relay coalesces queries into batches for efficiency, manages error-prone asynchronous logic, caches data for performance, and automatically updates views as data changes.
1515

16-
Relay is also component-oriented, extending the notion of a React component to include a description of what data is necessary to render it. This colocation allows developers to reason locally about their application and eliminates bugs such as under- or over-fetching data.
16+
Relay is also component-oriented, extending the notion of a React component to include a description of what data is necessary to render it. This collocation allows developers to reason locally about their application and eliminates bugs such as under- or over-fetching data.
1717

1818
Relay is in use at Facebook in production apps, and we're using it more and more because *Relay lets developers focus on their products and move fast*. It's working for us and we'd like to share it with the community.
1919

content/blog/2018-09-10-introducing-the-react-profiler.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ It also shows that each time it rendered, it was the most "expensive" component
140140

141141
To view this chart, either double-click on a component _or_ select a component and click on the blue bar chart icon in the right detail pane.
142142
You can return to the previous chart by clicking the "x" button in the right detail pane.
143-
You can aso double click on a particular bar to view more information about that commit.
143+
You can also double click on a particular bar to view more information about that commit.
144144

145145
![How to view all renders for a specific component](../images/blog/introducing-the-react-profiler/see-all-commits-for-a-fiber.gif)
146146

content/community/conferences.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@ Do you know of a local React.js conference? Add it here! (Please keep the list c
1616
January 31, 2019 in Tehran, Iran
1717
[Website](http://reactiran.com) - [Instagram](https://www.instagram.com/reactiran/)
1818

19+
### Reactathon 2019 {#reactathon-2019}
20+
March 30-31, 2019 in San Francisco, USA
21+
22+
[Website](https://www.reactathon.com/) - [Twitter](https://twitter.com/reactathon)
23+
1924
### App.js Conf 2019 {#appjs-conf-2019}
2025
April 4-5, 2019 in Kraków, Poland
2126

@@ -31,11 +36,21 @@ May 23-24, 2019 in Paris, France
3136

3237
[Website](https://www.react-europe.org) - [Twitter](https://twitter.com/ReactEurope) - [Facebook](https://www.facebook.com/ReactEurope) - [Videos](https://www.youtube.com/c/ReacteuropeOrgConf)
3338

39+
### React Conf Armenia 2019 {#react-conf-am-19}
40+
May 25, 2019 in Yerevan, Armenia
41+
42+
[Website](https://reactconf.am/) - [Twitter](https://twitter.com/ReactConfAM) - [Facebook](https://www.facebook.com/reactconf.am/) - [YouTube](https://www.youtube.com/c/JavaScriptConferenceArmenia) - [CFP](http://bit.ly/speakReact)
43+
3444
### React Norway 2019 {#react-norway-2019}
3545
June 12, 2019. Larvik, Norway
3646

3747
[Website](https://reactnorway.com) - [Twitter](https://twitter.com/ReactNorway)
3848

49+
### React Loop 2019 {#react-loop-2019}
50+
June 21, 2019 Chicago, Illinois USA
51+
52+
[Website](https://reactloop.com) - [Twitter](https://twitter.com/ReactLoop)
53+
3954
### ComponentsConf 2019 {#componentsconf-2019}
4055
September 6, 2019 in Melbourne, Australia
4156
[Website](https://www.componentsconf.com.au/) - [Twitter](https://twitter.com/componentsconf)

content/docs/addons-test-utils.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ Pass a mocked component module to this method to augment it with useful methods
139139

140140
> Note:
141141
>
142-
> `mockComponent()` is a legacy API. We recommend using [shallow rendering](/docs/test-utils.html#shallow-rendering) or [`jest.mock()`](https://facebook.github.io/jest/docs/en/tutorial-react-native.html#mock-native-modules-using-jestmock) instead.
142+
> `mockComponent()` is a legacy API. We recommend using [shallow rendering](/docs/shallow-renderer.html) or [`jest.mock()`](https://facebook.github.io/jest/docs/en/tutorial-react-native.html#mock-native-modules-using-jestmock) instead.
143143
144144
* * *
145145

content/docs/codebase-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ Its main goals are:
211211
* Ability to return multiple elements from `render()`.
212212
* Better support for error boundaries.
213213

214-
You can read more about React Fiber Architecture [here](https://github.com/acdlite/react-fiber-architecture) and [here](https://blog.ag-grid.com/index.php/2018/11/29/inside-fiber-in-depth-overview-of-the-new-reconciliation-algorithm-in-react). While it has shipped with React 16, the async features are not enabled by default yet.
214+
You can read more about React Fiber Architecture [here](https://github.com/acdlite/react-fiber-architecture) and [here](https://medium.com/react-in-depth/inside-fiber-in-depth-overview-of-the-new-reconciliation-algorithm-in-react-e1c04700ef6e). While it has shipped with React 16, the async features are not enabled by default yet.
215215

216216
Its source code is located in [`packages/react-reconciler`](https://github.com/facebook/react/tree/master/packages/react-reconciler).
217217

0 commit comments

Comments
 (0)