Skip to content

Commit 7428075

Browse files
authored
Merge branch 'master' into hooks_effect
2 parents 4145fb0 + 180d185 commit 7428075

11 files changed

+21
-11
lines changed

content/community/conferences.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,11 @@ April 25, 2020 in Bangalore, India
4747

4848
[Website](https://reactday.in) - [Twitter](https://twitter.com/ReactDayIn) - [LinkedIn](https://www.linkedin.com/company/react-day/)
4949

50+
### Byteconf React 2020 {#byteconf-react-2020}
51+
May 1, 2020. Streamed online on YouTube.
52+
53+
[Website](https://www.bytesized.xyz) - [Twitter](https://twitter.com/bytesizedcode) - [YouTube](https://www.youtube.com/channel/UC046lFvJZhiwSRWsoH8SFjg)
54+
5055
### render(ATL) 2020 {#render-atlanta-2020}
5156
May 4-6, 2020. Atlanta, GA, USA.
5257

@@ -82,6 +87,11 @@ July 18, 2020. Medellín, Colombia.
8287

8388
[Website](https://reactlaconf.co/) - [Twitter](https://twitter.com/reactlaconf)
8489

90+
### Chain React 2020 {#chain-react-2020}
91+
July 29-30, 2020. Portland, Oregon, USA.
92+
93+
[Website](https://infinite.red/ChainReactConf) - [Twitter](https://twitter.com/ChainReactConf)
94+
8595
### ComponentsConf 2020 {#components20}
8696
September 1, 2020 in Melbourne, Australia
8797

content/community/examples.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ There are many example projects created by the React community. Feel free to add
1212
* **[Zeldog](https://yannsainty.github.io/Zeldog/)** A Zelda like game with a dog fighting ducks and more to eat pizza !
1313
* **[Calculator](https://github.com/ahfarmer/calculator)** Implementation of the iOS calculator built in React
1414
* **[Emoji Search](https://github.com/ahfarmer/emoji-search)** Simple React app for searching emoji
15-
* **[GitHub Battle App](https://tm.dev/react-course-project/)** Battle two GitHub users and see the most popular Github projects for any language.
1615
* **[React Powered Hacker News Client](https://github.com/insin/react-hn)** A React & `react-router`-powered implementation of Hacker News using its Firebase API
1716
* **[Pokedex](https://github.com/alik0211/pokedex)** The list of Pokémon with live search
1817
* **[Shopping Cart](https://github.com/jeffersonRibeiro/react-shopping-cart)** Simple e-commerce cart application built using React

content/community/meetups.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
148148
* [Kyiv](https://www.meetup.com/Kyiv-ReactJS-Meetup)
149149

150150
## US {#us}
151+
* [Ann Arbor, MI - ReactJS](https://www.meetup.com/AnnArbor-jsx/)
151152
* [Atlanta, GA - ReactJS](https://www.meetup.com/React-ATL/)
152153
* [Austin, TX - ReactJS](https://www.meetup.com/ReactJS-Austin-Meetup/)
153154
* [Boston, MA - ReactJS](https://www.meetup.com/ReactJS-Boston/)

content/docs/concurrent-mode-adoption.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ ReactDOM.createRoot(
8080
>
8181
>`createRoot`와 같은 Concurrent 모드 API는 React의 실험 배포판에만 존재합니다.
8282
83-
Concurrent 모드에서는 "unsafe"라고 [기존에 표시된](https://reactjs.org/blog/2018/03/27/update-on-async-rendering.html) 생명주기 메서드가 현재 React 버전에서보다도 더 많은 버그를 야기할 수 있습니다. 앱이 [Strict 모드](https://reactjs.org/docs/strict-mode.html)와 호환되기 전까지 Concurrent 모드를 시도하는 걸 권장하지 않습니다.
83+
Concurrent 모드에서는 "unsafe"라고 [기존에 표시된](/blog/2018/03/27/update-on-async-rendering.html) 생명주기 메서드가 현재 React 버전에서보다도 더 많은 버그를 야기할 수 있습니다. 앱이 [Strict 모드](/docs/strict-mode.html)와 호환되기 전까지 Concurrent 모드를 시도하는 걸 권장하지 않습니다.
8484

8585
## 무엇을 기대해야 할까요? {#what-to-expect}
8686

content/docs/faq-versioning.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Minor releases are the most common type of release.
2222
2323
### Breaking Changes {#breaking-changes}
2424

25-
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.
25+
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 sometime in 2020.
2626

2727
Instead, we release new features in minor versions. That means that minor releases are often more interesting and compelling than majors, despite their unassuming name.
2828

content/docs/how-to-contribute.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ All work on React happens directly on [GitHub](https://github.com/facebook/react
2121

2222
### Semantic Versioning {#semantic-versioning}
2323

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).
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](/docs/faq-versioning.html).
2525

2626
Every significant change is documented in the [changelog file](https://github.com/facebook/react/blob/master/CHANGELOG.md).
2727

@@ -56,7 +56,7 @@ Facebook has a [bounty program](https://www.facebook.com/whitehat/) for the safe
5656
### How to Get in Touch {#how-to-get-in-touch}
5757

5858
* IRC: [#reactjs on freenode](https://webchat.freenode.net/?channels=reactjs)
59-
* [Discussion forums](https://reactjs.org/community/support.html#popular-discussion-forums)
59+
* [Discussion forums](/community/support.html#popular-discussion-forums)
6060

6161
There is also [an active community of React users on the Discord chat platform](https://www.reactiflux.com/) in case you need help with React.
6262

content/docs/react-without-jsx.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ ReactDOM.render(
4040

4141
JSX가 JavaScript로 변환되는 예시를 더 보고 싶다면 [the online Babel compiler](babel://jsx-simple-example)를 참고하세요.
4242

43-
컴포넌트는 문자열이나 `React.Component`의 하위 클래스 또는 무상태 컴포넌트를 위한 순수 함수로 제공됩니다.
43+
컴포넌트는 문자열이나 `React.Component`의 하위 클래스 또는 컴포넌트를 위한 일반 함수로 제공됩니다.
4444

4545
`React.createElement`를 너무 많이 입력하는 것이 피곤하다면 짧은 변수에 할당하는 방법이 있습니다.
4646

content/docs/reference-profiler.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ permalink: docs/profiler.html
77
---
88

99
The `Profiler` measures how often a React application renders and what the "cost" of rendering is.
10-
Its purpose is to help identify parts of an application that are slow and may benefit from [optimizations such as memoization](https://reactjs.org/docs/hooks-faq.html#how-to-memoize-calculations).
10+
Its purpose is to help identify parts of an application that are slow and may benefit from [optimizations such as memoization](/docs/hooks-faq.html#how-to-memoize-calculations).
1111

1212
> Note:
1313
>
14-
> Profiling adds some additional overhead, so **it is disabled in [the production build](https://reactjs.org/docs/optimizing-performance.html#use-the-production-build)**.
14+
> Profiling adds some additional overhead, so **it is disabled in [the production build](/docs/optimizing-performance.html#use-the-production-build)**.
1515
>
1616
> To opt into production profiling, React provides a special production build with profiling enabled.
1717
> Read more about how to use this build at [fb.me/react-profiling](https://fb.me/react-profiling)

content/docs/refs-and-the-dom.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ class Parent extends React.Component {
161161
}
162162
```
163163

164-
함수 컴포넌트에 `ref`를 사용할 수 있도록 하려면, [`forwardRef`](https://reactjs.org/docs/forwarding-refs.html) (높은 확률로 [`useImperativeHandle`](/docs/hooks-reference.html#useimperativehandle)와 함께)를 사용하거나 클래스 컴포넌트로 변경할 수 있습니다.
164+
함수 컴포넌트에 `ref`를 사용할 수 있도록 하려면, [`forwardRef`](/docs/forwarding-refs.html) (높은 확률로 [`useImperativeHandle`](/docs/hooks-reference.html#useimperativehandle)와 함께)를 사용하거나 클래스 컴포넌트로 변경할 수 있습니다.
165165

166166
다만, DOM 엘리먼트나 클래스 컴포넌트의 인스턴스에 접근하기 위해 **`ref` 어트리뷰트를 함수 컴포넌트에서 사용하는 것**은 됩니다.
167167

content/docs/testing-environments.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ A large portion of UI tests can be written with the above setup: using Jest as a
2929

3030
If you're writing a library that tests mostly browser-specific behavior, and requires native browser behavior like layout or real inputs, you could use a framework like [mocha.](https://mochajs.org/)
3131

32-
In an environment where you _can't_ simulate a DOM (e.g. testing React Native components on Node.js), you could use [event simulation helpers](https://reactjs.org/docs/test-utils.html#simulate) to simulate interactions with elements. Alternately, you could use the `fireEvent` helper from [`@testing-library/react-native`](https://testing-library.com/docs/native-testing-library).
32+
In an environment where you _can't_ simulate a DOM (e.g. testing React Native components on Node.js), you could use [event simulation helpers](/docs/test-utils.html#simulate) to simulate interactions with elements. Alternately, you could use the `fireEvent` helper from [`@testing-library/react-native`](https://testing-library.com/docs/native-testing-library).
3333

3434
Frameworks like [Cypress](https://www.cypress.io/), [puppeteer](https://github.com/GoogleChrome/puppeteer) and [webdriver](https://www.seleniumhq.org/projects/webdriver/) are useful for running [end-to-end tests](#end-to-end-tests-aka-e2e-tests).
3535

0 commit comments

Comments
 (0)