Skip to content

Commit 5d7cdcd

Browse files
lumirlumirlumirlumir
committed
chore: resolve conflicts
1 parent 8d9a3f4 commit 5d7cdcd

10 files changed

+1
-66
lines changed

‎package.json‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"private": true,
3-
"packageManager": "yarn@1.22.22",
43
"license": "CC",
54
"scripts": {
65
"analyze": "ANALYZE=true next build",
@@ -65,11 +64,8 @@
6564
"asyncro": "^3.0.0",
6665
"autoprefixer": "^10.4.2",
6766
"babel-eslint": "10.x",
68-
<<<<<<< HEAD
69-
"editorconfig-checker": "^6.0.0",
70-
=======
67+
"editorconfig-checker": "^6.0.1",
7168
"babel-plugin-react-compiler": "19.0.0-beta-e552027-20250112",
72-
>>>>>>> b22cbc3fed310b39c99fdd0f01621ac1903d1e8e
7369
"eslint": "7.x",
7470
"eslint-config-next": "12.0.3",
7571
"eslint-config-react-app": "^5.2.1",
@@ -104,15 +100,11 @@
104100
"retext-smartypants": "^4.0.0",
105101
"rss": "^1.2.2",
106102
"tailwindcss": "^3.4.1",
107-
<<<<<<< HEAD
108103
"textlint": "^14.0.4",
109104
"textlint-filter-rule-comments": "^1.2.2",
110105
"textlint-rule-allowed-uris": "^1.0.7",
111106
"textlint-tester": "^14.0.4",
112-
"typescript": "^4.0.2",
113-
=======
114107
"typescript": "^5.7.2",
115-
>>>>>>> b22cbc3fed310b39c99fdd0f01621ac1903d1e8e
116108
"unist-util-visit": "^2.0.3",
117109
"webpack-bundle-analyzer": "^4.5.0"
118110
},
@@ -123,14 +115,6 @@
123115
"budget": null,
124116
"budgetPercentIncreaseRed": 10,
125117
"showDetails": true
126-
<<<<<<< HEAD
127-
}
128-
=======
129-
},
130-
"lint-staged": {
131-
"*.{js,ts,jsx,tsx,css}": "yarn prettier",
132-
"src/**/*.md": "yarn fix-headings"
133118
},
134119
"packageManager": "yarn@1.22.22"
135-
>>>>>>> b22cbc3fed310b39c99fdd0f01621ac1903d1e8e
136120
}

‎src/content/blog/2020/12/21/data-fetching-with-react-server-components.md‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@ date: 2020/12/21
55
description: 2020년은 긴 한 해였습니다. 연말이 다가옴에 따라 제로 번들 사이즈의 React 서버 컴포넌트 연구에 대한 특별 연휴 업데이트를 공유하고자 합니다.
66
---
77

8-
<<<<<<< HEAD
98
2020년 12월 21일, [Dan Abramov](https://twitter.com/dan_abramov), [Lauren Tan](https://twitter.com/potetotes), [Joseph Savona](https://twitter.com/en_JS), [Sebastian Markbåge](https://twitter.com/sebmarkbage)
10-
=======
11-
December 21, 2020 by [Dan Abramov](https://bsky.app/profile/danabra.mov), [Lauren Tan](https://twitter.com/potetotes), [Joseph Savona](https://twitter.com/en_JS), and [Sebastian Markbåge](https://twitter.com/sebmarkbage)
12-
>>>>>>> b22cbc3fed310b39c99fdd0f01621ac1903d1e8e
139

1410
---
1511

‎src/content/blog/2021/06/08/the-plan-for-react-18.md‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@ date: 2021/06/08
55
description: React 팀은 몇 가지 업데이트를 공유하게 되어 기쁩니다. 다음 주요 버전이 될 React 18 릴리즈에 대한 작업을 시작했습니다. 커뮤니티가 React 18의 새로운 기능을 점진적으로 채택할 수 있도록 준비하기 위해 워킹 그룹을 만들었습니다. 라이브러리 작성자가 사용해 보고 피드백을 제공할 수 있도록 React 18 Alpha를 게시했습니다...
66
---
77

8-
<<<<<<< HEAD
98
2021년 6월 8일, [Andrew Clark](https://twitter.com/acdlite), [Brian Vaughn](https://github.com/bvaughn), [Christine Abernathy](https://twitter.com/abernathyca), [Dan Abramov](https://twitter.com/dan_abramov), [Rachel Nabors](https://twitter.com/rachelnabors), [Rick Hanlon](https://twitter.com/rickhanlonii), [Sebastian Markbåge](https://twitter.com/sebmarkbage), [Seth Webster](https://twitter.com/sethwebster)
10-
=======
11-
June 8, 2021 by [Andrew Clark](https://twitter.com/acdlite), [Brian Vaughn](https://github.com/bvaughn), [Christine Abernathy](https://twitter.com/abernathyca), [Dan Abramov](https://bsky.app/profile/danabra.mov), [Rachel Nabors](https://twitter.com/rachelnabors), [Rick Hanlon](https://twitter.com/rickhanlonii), [Sebastian Markbåge](https://twitter.com/sebmarkbage), and [Seth Webster](https://twitter.com/sethwebster)
12-
>>>>>>> b22cbc3fed310b39c99fdd0f01621ac1903d1e8e
139

1410
---
1511

‎src/content/blog/2021/12/17/react-conf-2021-recap.md‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,11 +131,7 @@ React 18에서는 전문가, 개발자, 라이브러리 관리자, 교육자들
131131

132132
먼저, 모든 연사분들께 감사드립니다 [Aakansha Doshi](https://twitter.com/aakansha1216), [Andrew Clark](https://twitter.com/acdlite), [Brian Vaughn](https://twitter.com/brian_d_vaughn), [Daishi Kato](https://twitter.com/dai_shi), [Debbie O'Brien](https://twitter.com/debs_obrien), [Delba de Oliveira](https://twitter.com/delba_oliveira), [Diego Haz](https://twitter.com/diegohaz), [Eric Rozell](https://twitter.com/EricRozell), [Helen Lin](https://twitter.com/wizardlyhel), [Juan Tejada](https://twitter.com/_jstejada), [Lauren Tan](https://twitter.com/potetotes), [Linton Ye](https://twitter.com/lintonye), [Lyle Troxell](https://twitter.com/lyle), [Rachel Nabors](https://twitter.com/rachelnabors), [Rick Hanlon](https://twitter.com/rickhanlonii), [Robert Balicki](https://twitter.com/StatisticsFTW), [Roman Rädle](https://twitter.com/raedle), [Sarah Rainsberger](https://twitter.com/sarah11918), [Shaundai Person](https://twitter.com/shaundai), [Shruti Kapoor](https://twitter.com/shrutikapoor08), [Steven Moyes](https://twitter.com/moyessa), [Tafu Nakazaki](https://twitter.com/hawaiiman0), 그리고 [Xuan Huang (黄玄)](https://twitter.com/Huxpro).
133133

134-
<<<<<<< HEAD
135134
[Andrew Clark](https://twitter.com/acdlite), [Dan Abramov](https://twitter.com/dan_abramov), [Dave McCabe](https://twitter.com/mcc_abe), [Eli White](https://twitter.com/Eli_White), [Joe Savona](https://twitter.com/en_JS), [Lauren Tan](https://twitter.com/potetotes), [Rachel Nabors](https://twitter.com/rachelnabors), [Tim Yung](https://twitter.com/yungsters) 등 대담에 피드백을 제공해 주신 모든 분들께 감사드립니다.
136-
=======
137-
Thanks to everyone who helped provide feedback on talks including [Andrew Clark](https://twitter.com/acdlite), [Dan Abramov](https://bsky.app/profile/danabra.mov), [Dave McCabe](https://twitter.com/mcc_abe), [Eli White](https://twitter.com/Eli_White), [Joe Savona](https://twitter.com/en_JS), [Lauren Tan](https://twitter.com/potetotes), [Rachel Nabors](https://twitter.com/rachelnabors), and [Tim Yung](https://twitter.com/yungsters).
138-
>>>>>>> b22cbc3fed310b39c99fdd0f01621ac1903d1e8e
139135

140136
디스코드 컨퍼런스를 개설하고 디스코드 관리자로 활동해 주신 [Lauren Tan](https://twitter.com/potetotes)에게 감사드립니다.
141137

‎src/content/blog/2022/06/15/react-labs-what-we-have-been-working-on-june-2022.md‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@ date: 2022/06/15
55
description: React 18 은 수년간의 준비 끝에 탄생한 버전으로 React 팀에게 귀중한 교훈을 가져다주었습니다. 수년간의 연구와 다양한 경로를 모색한 끝에 출시된 제품입니다. 그 경로 중 일부는 성공적이었지만 더 많은 경로가 막다른 골목에서 새로운 인사이트로 이어졌습니다. 우리가 얻은 한 가지 교훈은 우리가 탐색하고 있는 경로에 대한 인사이트를 공유받지 못한 채 새로운 기능을 기다리는 것은 커뮤니티에 실망감을 준다는 것입니다.
66
---
77

8-
<<<<<<< HEAD
98
2022년 6월 15일, [Andrew Clark](https://twitter.com/acdlite), [Dan Abramov](https://twitter.com/dan_abramov), [Jan Kassens](https://twitter.com/kassens), [Joseph Savona](https://twitter.com/en_JS), [Josh Story](https://twitter.com/joshcstory), [Lauren Tan](https://twitter.com/potetotes), [Luna Ruan](https://twitter.com/lunaruan), [Mengdi Chen](https://twitter.com/mengdi_en), [Rick Hanlon](https://twitter.com/rickhanlonii), [Robert Zhang](https://twitter.com/jiaxuanzhang01), [Sathya Gunasekaran](https://twitter.com/_gsathya), [Sebastian Markbåge](https://twitter.com/sebmarkbage), [Xuan Huang](https://twitter.com/Huxpro)
10-
=======
11-
June 15, 2022 by [Andrew Clark](https://twitter.com/acdlite), [Dan Abramov](https://bsky.app/profile/danabra.mov), [Jan Kassens](https://twitter.com/kassens), [Joseph Savona](https://twitter.com/en_JS), [Josh Story](https://twitter.com/joshcstory), [Lauren Tan](https://twitter.com/potetotes), [Luna Ruan](https://twitter.com/lunaruan), [Mengdi Chen](https://twitter.com/mengdi_en), [Rick Hanlon](https://twitter.com/rickhanlonii), [Robert Zhang](https://twitter.com/jiaxuanzhang01), [Sathya Gunasekaran](https://twitter.com/_gsathya), [Sebastian Markbåge](https://twitter.com/sebmarkbage), and [Xuan Huang](https://twitter.com/Huxpro)
12-
>>>>>>> b22cbc3fed310b39c99fdd0f01621ac1903d1e8e
139

1410
---
1511

‎src/content/blog/2023/03/16/introducing-react-dev.md‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@ description: 오늘 React와 React 문서의 새로운 보금자리인 react.dev
66

77
---
88

9-
<<<<<<< HEAD
109
2023년 3월 16일 [Dan Abramov](https://twitter.com/dan_abramov)와 [Rachel Nabors](https://twitter.com/rachelnabors)가 작성함
11-
=======
12-
March 16, 2023 by [Dan Abramov](https://bsky.app/profile/danabra.mov) and [Rachel Nabors](https://twitter.com/rachelnabors)
13-
>>>>>>> b22cbc3fed310b39c99fdd0f01621ac1903d1e8e
1410

1511
---
1612

@@ -636,11 +632,7 @@ React를 배우기에 가장 좋은 시기가 왔다고 생각합니다.
636632

637633
## 누가 작업하고 있나요? {/*who-worked-on-this*/}
638634

639-
<<<<<<< HEAD
640635
React 팀에서 [Rachel Nabors](https://twitter.com/rachelnabors/)는 프로젝트를 이끌고 (삽화도 제공했습니다), [Dan Abramov](https://twitter.com/dan_abramov)는 커리큘럼을 설계했습니다. 또한 두 사람은 대부분의 내용을 함께 저술했습니다.
641-
=======
642-
On the React team, [Rachel Nabors](https://twitter.com/rachelnabors/) led the project (and provided the illustrations), and [Dan Abramov](https://bsky.app/profile/danabra.mov) designed the curriculum. They co-authored most of the content together as well.
643-
>>>>>>> b22cbc3fed310b39c99fdd0f01621ac1903d1e8e
644636

645637
물론, 이렇게 큰 프로젝트는 혼자서 진행되는 것이 아닙니다. 감사할 분들이 많습니다!
646638

‎src/content/blog/2023/03/22/react-labs-what-we-have-been-working-on-march-2023.md‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -97,16 +97,9 @@ React 컴포넌트의 순수한 자바스크립트를 반응형으로 만들기
9797
* * *
9898
이번 업데이트 외에도 최근 우리 팀은 커뮤니티 팟캐스트와 라이브스트림에 초청자로 출연하여 우리의 작업에 대해 더 많은 이야기를 나누고 질문에 답변했습니다.
9999

100-
<<<<<<< HEAD
101100
* [Dan Abramov](https://twitter.com/dan_abramov)와 [Joe Savona](https://twitter.com/en_JS)는 [Kent C. Dodds의 YouTube 채널](https://www.youtube.com/watch?v=h7tur48JSaw)에서 인터뷰를 통해 React 서버 컴포넌트를 둘러싼 우려 사항들을 논의했습니다.
102101
* [Dan Abramov](https://twitter.com/dan_abramov)와 [Joe Savona](https://twitter.com/en_JS)는 [JSParty 팟캐스트](https://jsparty.fm/267)의 초청자로서 React의 미래에 대한 생각을 공유했습니다.
103102

104103
이 게시글을 검토해 준 [Andrew Clark](https://twitter.com/acdlite), [Dan Abramov](https://twitter.com/dan_abramov), [Dave McCabe](https://twitter.com/mcc_abe), [Luna Wei](https://twitter.com/lunaleaps), [Matt Carroll](https://twitter.com/mattcarrollcode), [Sean Keegan](https://twitter.com/DevRelSean), [Sebastian Silbermann](https://twitter.com/sebsilbermann), [Seth Webster](https://twitter.com/sethwebster), 그리고 [Sophie Alpert](https://twitter.com/sophiebits)에 감사를 전합니다.
105-
=======
106-
* [Dan Abramov](https://bsky.app/profile/danabra.mov) and [Joe Savona](https://twitter.com/en_JS) were interviewed by [Kent C. Dodds on his YouTube channel](https://www.youtube.com/watch?v=h7tur48JSaw), where they discussed concerns around React Server Components.
107-
* [Dan Abramov](https://bsky.app/profile/danabra.mov) and [Joe Savona](https://twitter.com/en_JS) were guests on the [JSParty podcast](https://jsparty.fm/267) and shared their thoughts about the future of React.
108-
109-
Thanks to [Andrew Clark](https://twitter.com/acdlite), [Dan Abramov](https://bsky.app/profile/danabra.mov), [Dave McCabe](https://twitter.com/mcc_abe), [Luna Wei](https://twitter.com/lunaleaps), [Matt Carroll](https://twitter.com/mattcarrollcode), [Sean Keegan](https://twitter.com/DevRelSean), [Sebastian Silbermann](https://twitter.com/sebsilbermann), [Seth Webster](https://twitter.com/sethwebster), and [Sophie Alpert](https://twitter.com/sophiebits) for reviewing this post.
110-
>>>>>>> b22cbc3fed310b39c99fdd0f01621ac1903d1e8e
111104

112105
읽어주셔서 감사합니다. 다음 업데이트에서 만나요!

‎src/content/blog/2023/05/03/react-canaries.md‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@ date: 2023/05/03
55
description: Meta가 오랫동안 내부적으로 최첨단 버전의 React를 사용해 온 것과 유사하게, 새로운 기능이 안정된 버전으로 출시되기 전에 디자인이 거의 완성되는 즉시 개별적인 새로운 기능을 채택할 수 있는 옵션을 React 커뮤니티에 제공하고자 합니다. 공식적으로 지원하는 새로운 Canary 릴리즈 채널을 소개합니다. 프레임워크와 같이 엄선된 설정을 통해 개별 React 기능의 채택을 React 릴리즈 일정에서 분리할 수 있습니다.
66
---
77

8-
<<<<<<< HEAD
98
2023년 5월 3일, [Dan Abramov](https://twitter.com/dan_abramov), [Sophie Alpert](https://twitter.com/sophiebits), [Rick Hanlon](https://twitter.com/rickhanlonii), [Sebastian Markbåge](https://twitter.com/sebmarkbage), [Andrew Clark](https://twitter.com/acdlite)
10-
=======
11-
May 3, 2023 by [Dan Abramov](https://bsky.app/profile/danabra.mov), [Sophie Alpert](https://twitter.com/sophiebits), [Rick Hanlon](https://twitter.com/rickhanlonii), [Sebastian Markbåge](https://twitter.com/sebmarkbage), and [Andrew Clark](https://twitter.com/acdlite)
12-
>>>>>>> b22cbc3fed310b39c99fdd0f01621ac1903d1e8e
139

1410
---
1511

‎src/content/blog/2024/02/15/react-labs-what-we-have-been-working-on-february-2024.md‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@ date: 2024/02/15
55
description: React Labs 게시글에는 활발히 연구 개발 중인 프로젝트에 대한 내용을 작성합니다. 우리의 지난 업데이트 이후 상당한 발전을 이루었고, 이러한 진전 사항을 공유하려고 합니다.
66
---
77

8-
<<<<<<< HEAD
98
2024년 2월 15일, [Joseph Savona](https://twitter.com/en_JS), [Ricky Hanlon](https://twitter.com/rickhanlonii), [Andrew Clark](https://twitter.com/acdlite), [Matt Carroll](https://twitter.com/mattcarrollcode), [Dan Abramov](https://twitter.com/dan_abramov)
10-
=======
11-
February 15, 2024 by [Joseph Savona](https://twitter.com/en_JS), [Ricky Hanlon](https://twitter.com/rickhanlonii), [Andrew Clark](https://twitter.com/acdlite), [Matt Carroll](https://twitter.com/mattcarrollcode), and [Dan Abramov](https://bsky.app/profile/danabra.mov).
12-
>>>>>>> b22cbc3fed310b39c99fdd0f01621ac1903d1e8e
139

1410
---
1511

‎src/content/community/docs-contributors.md‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,23 +31,13 @@ React 문서는 [React 팀](/community/team)과 [외부 기여자](https://githu
3131

3232
## 개발 {/*development*/}
3333

34-
<<<<<<< HEAD
3534
* [Jared Palmer](https://twitter.com/jaredpalmer): 사이트 개발
3635
* [ThisDotLabs](https://www.thisdot.co/) ([Dane Grant](https://twitter.com/danecando), [Dustin Goodman](https://twitter.com/dustinsgoodman)): 사이트 개발
3736
* [CodeSandbox](https://codesandbox.io/) ([Ives van Hoorne](https://twitter.com/CompuIves), [Alex Moldovan](https://twitter.com/alexnmoldovan), [Jasper De Moor](https://twitter.com/JasperDeMoor), [Danilo Woznica](https://twitter.com/danilowoz)): Sandbox 통합
3837
* [Dan Abramov](https://twitter.com/dan_abramov): 사이트 개발
3938
* [Rick Hanlon](https://twitter.com/rickhanlonii): 사이트 개발
4039
* [Harish Kumar](https://www.strek.in/): 개발과 유지보수
4140
* [Luna Ruan](https://twitter.com/lunaruan): Sandbox 개선
42-
=======
43-
* [Jared Palmer](https://twitter.com/jaredpalmer): site development
44-
* [ThisDotLabs](https://www.thisdot.co/) ([Dane Grant](https://twitter.com/danecando), [Dustin Goodman](https://twitter.com/dustinsgoodman)): site development
45-
* [CodeSandbox](https://codesandbox.io/) ([Ives van Hoorne](https://twitter.com/CompuIves), [Alex Moldovan](https://twitter.com/alexnmoldovan), [Jasper De Moor](https://twitter.com/JasperDeMoor), [Danilo Woznica](https://twitter.com/danilowoz)): sandbox integration
46-
* [Dan Abramov](https://bsky.app/profile/danabra.mov): site development
47-
* [Rick Hanlon](https://twitter.com/rickhanlonii): site development
48-
* [Harish Kumar](https://www.strek.in/): development and maintenance
49-
* [Luna Ruan](https://twitter.com/lunaruan): sandbox improvements
50-
>>>>>>> b22cbc3fed310b39c99fdd0f01621ac1903d1e8e
5141

5242
## 한국어 번역 {/*korean-translations*/}
5343

0 commit comments

Comments
 (0)