Skip to content

Commit 9ee2bed

Browse files
authored
Merge branch 'master' into master
2 parents 6e96b18 + 503f762 commit 9ee2bed

16 files changed

+46
-25
lines changed

content/blog/2014-09-24-testing-flux-applications.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ The first steps toward working with Jest are as follows:
1717

1818
1. Get the module dependencies for the application installed by running `npm install`.
1919
2. Create a directory `__tests__/` with a test file, in this case TodoStore-test.js
20-
3. Run `npm install jest-cli save-dev`
20+
3. Run `npm install jest-cli --save-dev`
2121
4. Add the following to your package.json
2222

2323
```javascript

content/blog/2018-10-01-create-react-app-v2.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Here's a short summary of what's new in this release:
2525
* 🃏 We updated to [Jest 23](https://jestjs.io/blog/2018/05/29/jest-23-blazing-fast-delightful-testing.html), which includes an [interactive mode](https://jestjs.io/blog/2018/05/29/jest-23-blazing-fast-delightful-testing#interactive-snapshot-mode) for reviewing snapshots.
2626
* 💄 We added [PostCSS](https://preset-env.cssdb.org/features#stage-3) so you can use new CSS features in old browsers.
2727
* 💎 You can use [Apollo](https://github.com/leoasis/graphql-tag.macro#usage), [Relay Modern](https://github.com/facebook/relay/pull/2171#issuecomment-411459604), [MDX](https://github.com/facebook/create-react-app/issues/5149#issuecomment-425396995), and other third-party [Babel Macros](https://babeljs.io/blog/2017/09/11/zero-config-with-babel-macros) transforms.
28-
* 🌠 You can now [import an SVG as a React component](https://github.com/facebook/create-react-app/blob/master/packages/react-scripts/template/README.md#adding-svgs), and use it in JSX.
28+
* 🌠 You can now [import an SVG as a React component](https://facebook.github.io/create-react-app/docs/adding-images-fonts-and-files#adding-svgs), and use it in JSX.
2929
* 🐈 You can try the experimental [Yarn Plug'n'Play mode](https://github.com/yarnpkg/rfcs/pull/101) that removes `node_modules`.
3030
* 🕸 You can now [plug your own proxy implementation](https://github.com/facebook/create-react-app/blob/master/packages/react-scripts/template/README.md#configuring-the-proxy-manually) in development to match your backend API.
3131
* 🚀 You can now use [packages written for latest Node versions](https://github.com/sindresorhus/ama/issues/446#issuecomment-281014491) without breaking the build.

content/blog/2019-02-06-react-v16.8.0.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -140,10 +140,10 @@ Assuming you already have ESLint installed, run:
140140

141141
```sh
142142
# npm
143-
npm install eslint-plugin-react-hooks@next --save-dev
143+
npm install eslint-plugin-react-hooks --save-dev
144144

145145
# yarn
146-
yarn add eslint-plugin-react-hooks@next --dev
146+
yarn add eslint-plugin-react-hooks --dev
147147
```
148148

149149
Then add it to your ESLint configuration:

content/community/articles.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ permalink: community/articles.html
1010
- [9 things every React.js beginner should know](https://camjackson.net/post/9-things-every-reactjs-beginner-should-know) - Cam Jackson's guide for beginners.
1111
- [React "Aha" Moments](https://tylermcginnis.com/react-aha-moments/) - Tyler McGinnis' article on his collection of "Aha" moments with React.
1212
- [You're missing the point of React](https://medium.com/@dan_abramov/youre-missing-the-point-of-react-a20e34a51e1a) - Dan Abramov's article about the best parts of React.
13-
- [Timeline for Learning React](https://daveceddia.com/timeline-for-learning-react/) - Dave Ceddia's reccommended timeline for learning React and the React ecosystem.
13+
- [Timeline for Learning React](https://daveceddia.com/timeline-for-learning-react/) - Dave Ceddia's recommended timeline for learning React and the React ecosystem.
1414
- [Simple React Development in 2017](https://hackernoon.com/simple-react-development-in-2017-113bd563691f) - Joshua Comeau's guide to showcase how easy it can be to start modern React development.
1515
- [React FAQ](https://reactfaq.site/) - An external site with articles that try to answer frequently asked questions about React.
1616
- [Visual Guide to State in React](https://daveceddia.com/visual-guide-to-state-in-react/) - Dave Ceddia's visual guide to React state.

content/community/conferences.md

+5
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@ 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+
### React Finland 2019 {#react-finland-2019}
16+
April 24-26 in Helsinki, Finland
17+
18+
[Website](https://react-finland.fi/) - [Twitter](https://twitter.com/ReactFinland)
19+
1520
### ReactJS Girls Conference
1621
May 3, 2019 in London, UK
1722

content/docs/add-react-to-a-website.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ return (
149149

150150
These two code snippets are equivalent. While **JSX is [completely optional](/docs/react-without-jsx.html)**, many people find it helpful for writing UI code -- both with React and with other libraries.
151151

152-
You can play with JSX using [this online converter](https://babeljs.io/repl#?babili=false&browsers=&build=&builtIns=false&spec=false&loose=false&code_lz=Q&debug=false&forceAllTransforms=false&shippedProposals=false&circleciRepo=&evaluate=false&fileSize=false&sourceType=module&lineWrap=true&presets=es2015%2Creact%2Cstage-2%2Cstage-3&prettier=true&targets=Node-6.12&version=6.26.0&envVersion=).
152+
You can play with JSX using [this online converter](https://babeljs.io/en/repl#?babili=false&browsers=&build=&builtIns=false&spec=false&loose=false&code_lz=DwIwrgLhD2B2AEcDCAbAlgYwNYF4DeAFAJTw4B88EAFmgM4B0tAphAMoQCGETBe86WJgBMAXJQBOYJvAC-RGWQBQ8FfAAyaQYuAB6cFDhkgA&debug=false&forceAllTransforms=false&shippedProposals=false&circleciRepo=&evaluate=false&fileSize=false&timeTravel=false&sourceType=module&lineWrap=true&presets=es2015%2Creact%2Cstage-2&prettier=false&targets=&version=7.4.3).
153153

154154
### Quickly Try JSX {#quickly-try-jsx}
155155

content/docs/create-a-new-react-app.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ npm start
5353
5454
Create React App doesn't handle backend logic or databases; it just creates a frontend build pipeline, so you can use it with any backend you want. Under the hood, it uses [Babel](https://babeljs.io/) and [webpack](https://webpack.js.org/), but you don't need to know anything about them.
5555

56-
When you're ready to deploy to production, running `npm run build` will create an optimized build of your app in the `build` folder. You can learn more about Create React App [from its README](https://github.com/facebookincubator/create-react-app#create-react-app-) and the [User Guide](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#table-of-contents).
56+
When you're ready to deploy to production, running `npm run build` will create an optimized build of your app in the `build` folder. You can learn more about Create React App [from its README](https://github.com/facebookincubator/create-react-app#create-react-app--) and the [User Guide](https://facebook.github.io/create-react-app/).
5757

5858
### Next.js {#nextjs}
5959

@@ -69,7 +69,7 @@ Learn Gatsby from [its official guide](https://www.gatsbyjs.org/docs/) and a [ga
6969

7070
### More Flexible Toolchains {#more-flexible-toolchains}
7171

72-
The following toolchains offer more flexiblity and choice. We recommend them to more experienced users:
72+
The following toolchains offer more flexibility and choice. We recommend them to more experienced users:
7373

7474
- **[Neutrino](https://neutrinojs.org/)** combines the power of [webpack](https://webpack.js.org/) with the simplicity of presets, and includes a preset for [React apps](https://neutrinojs.org/packages/react/) and [React components](https://neutrinojs.org/packages/react-components/).
7575

content/docs/getting-started.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ React 문서는 Javascript 프로그래밍에 익숙한 사람을 대상으로
115115

116116
트위터의 [@reactjs 계정](https://twitter.com/reactjs)을 팔로우할 수도 있지만, 블로그만 읽어도 꼭 알아야 하는 정보는 놓치지 않을 수 있습니다.
117117

118-
모든 React 릴리즈가 자체 블로그 게시물을 사용할 만한 것은 아니지만 [릴리즈](https://github.com/facebook/react) 페이지와 React의 `CHANGELOG.md` 파일에서 모든 릴리즈에 대한 자세한 변경 기록을 확인할 수 있습니다.
118+
모든 React 릴리즈가 자체 블로그 게시물을 사용할 만한 것은 아니지만 [릴리즈](https://github.com/facebook/react/releases) 페이지와 React의 [`CHANGELOG.md` 파일](https://github.com/facebook/react/blob/master/CHANGELOG.md)에서 모든 릴리즈에 대한 자세한 변경 기록을 확인할 수 있습니다.
119119

120120
## 버전 관리된 문서 {#versioned-documentation}
121121

content/docs/hooks-rules.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Hook은 JavaScript 함수입니다. 하지만 Hook을 사용할 때는 두 가
2828
우리는 이 두 가지 규칙을 강제하는 [`eslint-plugin-react-hooks`](https://www.npmjs.com/package/eslint-plugin-react-hooks) 라는 ESLint 플러그인을 출시했습니다. 이 플러그인을 프로젝트에 추가할 수 있습니다.
2929

3030
```bash
31-
npm install eslint-plugin-react-hooks
31+
npm install eslint-plugin-react-hooks --save-dev
3232
```
3333

3434
```js

content/docs/reference-react.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ const MyComponent = React.memo(function MyComponent(props) {
126126

127127
`React.memo`[고차 컴포넌트(Higher Order Component)](/docs/higher-order-components.html)입니다. [`React.PureComponent`](#reactpurecomponent)와 비슷하지만 class가 아니라 함수 컴포넌트라는 점이 다릅니다.
128128

129-
당신의 함수형 컴포넌트가 동일한 props로 동일한 결과를 렌더링해낸다면, `React.memo`를 호출하고 결과를 메모이징(Memoizing)하도록 래핑하여 경우에 따라 성능 향상을 누릴 수 있습니다. 즉, React는 컴포넌트를 렌더링하지 않고 마지막으로 렌더링된 결과를 재사용합니다.
129+
당신의 함수 컴포넌트가 동일한 props로 동일한 결과를 렌더링해낸다면, `React.memo`를 호출하고 결과를 메모이징(Memoizing)하도록 래핑하여 경우에 따라 성능 향상을 누릴 수 있습니다. 즉, React는 컴포넌트를 렌더링하지 않고 마지막으로 렌더링된 결과를 재사용합니다.
130130

131131
props가 갖는 복잡한 객체에 대하여 얕은 비교만을 수행하는 것이 기본 동작입니다. 다른 비교 동작을 원한다면, 두 번째 인자로 별도의 비교 함수를 제공하면 됩니다.
132132

@@ -196,7 +196,7 @@ React.cloneElement(
196196
React.createFactory(type)
197197
```
198198

199-
주어진 타입의 React 엘리먼트를 만들어내는 함수를 반환합니다. [`React.createElement()`](#createElement)와 마찬가지로 type 인자는 태그 이름 문자열(`'div'` 또는 `'span'` 등), [React 컴포넌트](/docs/components-and-props.html) 타입, 또는 [React Fragment](#reactfragment) 타입 중 하나가 올 수 있습니다.
199+
주어진 타입의 React 엘리먼트를 만들어내는 함수를 반환합니다. [`React.createElement()`](#createelement)와 마찬가지로 type 인자는 태그 이름 문자열(`'div'` 또는 `'span'` 등), [React 컴포넌트](/docs/components-and-props.html) 타입, 또는 [React Fragment](#reactfragment) 타입 중 하나가 올 수 있습니다.
200200

201201
이 헬퍼 함수는 레거시 기능으로 간주되며, 대신 JSX 문법을 사용하거나 `React.createElement()`를 직접 사용하는 것이 좋습니다.
202202

gatsby-config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
module.exports = {
1010
siteMetadata: {
1111
title: 'React: A JavaScript library for building user interfaces',
12-
siteUrl: 'https://reactjs.org',
12+
siteUrl: 'https://ko.reactjs.org',
1313
rssFeedTitle: 'React',
1414
rssFeedDescription: 'A JavaScript library for building user interfaces',
1515
},

package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"version": "0.0.1",
55
"private": true,
66
"bugs": {
7-
"url": "https://github.com/reactjs/reactjs.org"
7+
"url": "https://github.com/reactjs/ko.reactjs.org"
88
},
99
"dependencies": {
1010
"babel-eslint": "^8.0.1",
@@ -60,15 +60,15 @@
6060
"node": ">8.4.0",
6161
"yarn": "^1.3.2"
6262
},
63-
"homepage": "https://reactjs.org/",
63+
"homepage": "https://ko.reactjs.org/",
6464
"keywords": [
6565
"gatsby"
6666
],
6767
"license": "CC",
6868
"main": "n/a",
6969
"repository": {
7070
"type": "git",
71-
"url": "git+https://github.com/reactjs/reactjs.org.git"
71+
"url": "git+https://github.com/reactjs/ko.reactjs.org.git"
7272
},
7373
"scripts": {
7474
"build": "gatsby build",

src/components/MarkdownPage/MarkdownPage.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ const MarkdownPage = ({
112112
<div css={{marginTop: 80}}>
113113
<a
114114
css={sharedStyles.articleLayout.editLink}
115-
href={`https://github.com/reactjs/reactjs.org/tree/master/${
115+
href={`https://github.com/reactjs/ko.reactjs.org/tree/master/${
116116
markdownRemark.fields.path
117117
}`}>
118118
Edit this page

src/html.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const JS_NPM_URLS = [
77
export default class HTML extends React.Component {
88
render() {
99
return (
10-
<html lang="en" {...this.props.htmlAttributes}>
10+
<html lang="ko" {...this.props.htmlAttributes}>
1111
<head>
1212
{JS_NPM_URLS.map(url => (
1313
<link key={url} rel="preload" href={url} as="script" />

src/pages/index.js

+22-6
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class Home extends Component {
6262
<div
6363
css={{
6464
paddingTop: 45,
65-
paddingBottom: 20,
65+
paddingBottom: 10,
6666

6767
[media.greaterThan('small')]: {
6868
paddingTop: 60,
@@ -137,8 +137,11 @@ class Home extends Component {
137137
</p>
138138
<Flex
139139
valign="center"
140+
halign="center"
140141
css={{
141142
paddingTop: 40,
143+
flexWrap: 'wrap',
144+
justifyContent: 'center',
142145

143146
[media.greaterThan('xlarge')]: {
144147
paddingTop: 65,
@@ -279,10 +282,16 @@ class Home extends Component {
279282
background: colors.dark,
280283
color: colors.white,
281284
paddingTop: 45,
282-
paddingBottom: 45,
285+
paddingBottom: 25,
283286
}}>
284287
<Container>
285-
<Flex valign="center">
288+
<Flex
289+
valign="center"
290+
halign="center"
291+
css={{
292+
flexWrap: 'wrap',
293+
justifyContent: 'center',
294+
}}>
286295
<CtaItem>
287296
<ButtonLink to="/docs/getting-started.html" type="primary">
288297
시작하기
@@ -312,8 +321,6 @@ Home.propTypes = {
312321
const CtaItem = ({children, primary = false}) => (
313322
<div
314323
css={{
315-
width: '50%',
316-
317324
[media.between('small', 'large')]: {
318325
paddingLeft: 20,
319326
},
@@ -324,13 +331,22 @@ const CtaItem = ({children, primary = false}) => (
324331

325332
'&:first-child': {
326333
textAlign: 'right',
327-
paddingRight: 15,
334+
paddingRight: 7,
335+
paddingLeft: 7,
336+
[media.lessThan('small')]: {
337+
marginBottom: 10,
338+
},
328339
},
329340

330341
'&:nth-child(2)': {
342+
paddingRight: 7,
343+
paddingLeft: 7,
331344
[media.greaterThan('small')]: {
332345
paddingLeft: 15,
333346
},
347+
[media.lessThan('small')]: {
348+
marginBottom: 10,
349+
},
334350
},
335351
}}>
336352
{children}

src/site-constants.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

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.
10-
const urlRoot = 'https://reactjs.org';
10+
const urlRoot = 'https://ko.reactjs.org';
1111
const version = '16.8.6';
1212
const babelURL = 'https://unpkg.com/[email protected]/babel.min.js';
1313

0 commit comments

Comments
 (0)