Merge branch 'main' into sync-ab18d2f0

Author: lumirlumir

.github/ISSUE_TEMPLATE/need-translation.md

@@ -0,0 +1,20 @@
+---
+name: 번역 필요
+about: 번역이 필요한 문서에 대해 이 템플릿을 사용해주세요
+title: '[번역 필요]: '
+labels: 'need translation'
+assignees: ''
+---
+
+## Summary
+
+<!-- 번역이 필요한 부분의 요약 -->
+
+## Page
+
+<!-- 번역이 필요한 문서의 페이지 -->
+<!-- 예시: https://ko.react.dev/reference/react/useState#parameters -->
+
+## Details
+
+<!-- 번역이 필요한 부분의 상세 내용 -->

next-env.d.ts

@@ -3,4 +3,4 @@
 /// <reference types="next/navigation-types/compat/navigation" />
 
 // NOTE: This file should not be edited
-// see https://nextjs.org/docs/app/api-reference/config/typescript for more information.
+// see https://nextjs.org/docs/pages/api-reference/config/typescript for more information.

package.json

@@ -1,6 +1,5 @@
 {
   "private": true,
-  "packageManager": "yarn@1.22.22",
   "license": "CC",
   "scripts": {
     "analyze": "ANALYZE=true next build",
@@ -65,11 +64,8 @@
     "asyncro": "^3.0.0",
     "autoprefixer": "^10.4.2",
     "babel-eslint": "10.x",
-<<<<<<< HEAD
-    "editorconfig-checker": "^6.0.0",
-=======
+    "editorconfig-checker": "^6.0.1",
     "babel-plugin-react-compiler": "19.0.0-beta-e552027-20250112",
->>>>>>> ab18d2f0f5151ab0c927a12eb0a64f8170762eff
     "eslint": "7.x",
     "eslint-config-next": "12.0.3",
     "eslint-config-react-app": "^5.2.1",
@@ -104,15 +100,11 @@
     "retext-smartypants": "^4.0.0",
     "rss": "^1.2.2",
     "tailwindcss": "^3.4.1",
-<<<<<<< HEAD
     "textlint": "^14.0.4",
     "textlint-filter-rule-comments": "^1.2.2",
     "textlint-rule-allowed-uris": "^1.0.7",
     "textlint-tester": "^14.0.4",
-    "typescript": "^4.0.2",
-=======
     "typescript": "^5.7.2",
->>>>>>> ab18d2f0f5151ab0c927a12eb0a64f8170762eff
     "unist-util-visit": "^2.0.3",
     "webpack-bundle-analyzer": "^4.5.0"
   },
@@ -123,14 +115,6 @@
     "budget": null,
     "budgetPercentIncreaseRed": 10,
     "showDetails": true
-<<<<<<< HEAD
-  }
-=======
-  },
-  "lint-staged": {
-    "*.{js,ts,jsx,tsx,css}": "yarn prettier",
-    "src/**/*.md": "yarn fix-headings"
   },
   "packageManager": "yarn@1.22.22"
->>>>>>> ab18d2f0f5151ab0c927a12eb0a64f8170762eff
 }

src/content/community/docs-contributors.md

@@ -12,7 +12,7 @@ React 문서는 [React 팀](/community/team)과 [외부 기여자](https://githu
 
 <<<<<<< HEAD
 * [Rachel Nabors](https://twitter.com/RachelNabors): 편집, 글쓰기, 그림 그리기
-* [Dan Abramov](https://twitter.com/dan_abramov): 글쓰기, 커리큘럼 설계
+* [Dan Abramov](https://bsky.app/profile/danabra.mov): 글쓰기, 커리큘럼 설계
 * [Sylwia Vargas](https://twitter.com/SylwiaVargas): 예시 코드
 * [Rick Hanlon](https://twitter.com/rickhanlonii): 글쓰기
 * [David McCabe](https://twitter.com/mcc_abe): 글쓰기