diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index de2bfc362..ab8a7d4fe 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -3,5 +3,5 @@ contact_links:
url: https://github.com/react/react/issues/new/choose
about: This issue tracker is not for bugs in React. Please file React issues here.
- name: ๐ค Questions and Help
- url: https://reactjs.org/community/support.html
+ url: https://react.dev/community
about: This issue tracker is not for support questions. Please refer to the React community's help and discussion forums.
diff --git a/.github/workflows/analyze.yml b/.github/workflows/analyze.yml
index 83e7f2e8a..1620c50f6 100644
--- a/.github/workflows/analyze.yml
+++ b/.github/workflows/analyze.yml
@@ -18,7 +18,7 @@ jobs:
- name: Set up node
uses: actions/setup-node@v4
with:
- node-version: '20.x'
+ node-version: '24.x'
cache: yarn
cache-dependency-path: yarn.lock
@@ -26,7 +26,7 @@ jobs:
uses: actions/cache@v4
with:
path: '**/node_modules'
- key: node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
+ key: node_modules-24-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
- name: Install deps
run: yarn install --frozen-lockfile
diff --git a/.github/workflows/site_lint.yml b/.github/workflows/site_lint.yml
index 81a04601c..ef43b2c8f 100644
--- a/.github/workflows/site_lint.yml
+++ b/.github/workflows/site_lint.yml
@@ -13,14 +13,14 @@ jobs:
lint:
runs-on: ubuntu-latest
- name: Lint on node 20.x and ubuntu-latest
+ name: Lint on node 24.x and ubuntu-latest
steps:
- uses: actions/checkout@v4
- - name: Use Node.js 20.x
+ - name: Use Node.js 24.x
uses: actions/setup-node@v4
with:
- node-version: 20.x
+ node-version: 24.x
cache: yarn
cache-dependency-path: yarn.lock
@@ -28,7 +28,7 @@ jobs:
uses: actions/cache@v4
with:
path: '**/node_modules'
- key: node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
+ key: node_modules-24-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
- name: Install deps
run: yarn install --frozen-lockfile
diff --git a/CLAUDE.md b/CLAUDE.md
index 3a081e6d5..3943097cc 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -4,7 +4,7 @@ This file provides guidance to Claude Code when working with this repository.
## Project Overview
-This is the React documentation website (react.dev), built with Next.js 15.1.11 and React 19. Documentation is written in MDX format.
+This is the React documentation website (react.dev), built with Next.js 15.1.12 and React 19. Documentation is written in MDX format.
## Development Commands
@@ -47,6 +47,6 @@ When editing files in `src/content/`, the appropriate skill will be auto-suggest
For MDX components (DeepDive, Pitfall, Note, etc.), invoke `/docs-components`.
For Sandpack code examples, invoke `/docs-sandpack`.
-See `.claude/docs/react-docs-patterns.md` for comprehensive style guidelines.
+See `.claude/skills/` for comprehensive style guidelines.
Prettier is used for formatting (config in `.prettierrc`).
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 96229a467..b5ebcbace 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -36,6 +36,7 @@ React ๋ฌธ์ ๊ธฐ์ฌ์ ๊ด์ฌ์ ๊ฐ์ ธ์ฃผ์
์ ๊ฐ์ฌํฉ๋๋ค!
ES5๋ง ๋ค๋ฃจ๋ ๊ฒฝ์ฐ๋ผ๋ฉด ์ด ๊ท์น์ ๋ฌด์ํ์ธ์.
+<<<<<<< HEAD
#### ES5์ ๊ธฐ๋ฅ๋ง์ผ๋ก ๊ฐ๋จํ๊ฒ ์์ฑํ ์ ์๋ ๊ฒฝ์ฐ, ES6์ ๊ธฐ๋ฅ์ ๋ฌด์กฐ๊ฑด์ ์ผ๋ก ์ฌ์ฉํ์ง ๋ง์ธ์
ES6๊ฐ ์์ง ๋ฏ์ ์ฌ๋๋ ๋ง์ต๋๋ค. ์ด๋ฏธ ์ฌ๋ฌ ๊ณณ์์ `const` / `let`, ํด๋์ค, ํ์ดํ ํจ์ ๋ฑ์ ์ฌ์ฉํ๊ณ ์์ง๋ง, ๊ทธ์ ์์ํ๋ ES5 ์ฝ๋๊ฐ ๊ฐ๋จํ๊ณ ๊ฐ๋
์ฑ์ด ์ข๋ค๋ฉด ES5๋ฅผ ์ฌ์ฉํ๋ ๊ฒ๋ ๊ณ ๋ คํ์ธ์.
@@ -71,6 +72,11 @@ class MyComponent extends React.Component {
```
์คํ์ ์ธ ์ ์Experimental Proposal ์ ๋ํด ์ค๋ช
ํ๋ ๊ฒฝ์ฐ๋ผ๋ฉด ์์ธ๋ก ํ๋, ์ฝ๋์ ์ฃผ๋ณ ๊ธ์์ ์คํ์ ์Experimental ์ ๋ช
์ํ์ธ์.
+=======
+#### Prefer readable syntax.
+
+Choose syntax that makes each example easier to follow. Prefer named `function` declarations over `const myFunction = () => ...` arrows for top-level functions. Use arrow functions when they make callbacks easier to read. In class components, arrow functions can also preserve the component's `this` value.
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
### ์คํ์ผ
diff --git a/README.md b/README.md
index 4cbaabe18..f2f15fb20 100644
--- a/README.md
+++ b/README.md
@@ -22,15 +22,28 @@
### ์ฌ์ ์ค๋น
1. Git
+<<<<<<< HEAD
1. Node: v16.8.0 ์ด์์ ๋ชจ๋ ๋ฒ์
1. Yarn v1(`yarn@1.22.22`): [Yarn ์ค์น ์๋ด](https://yarnpkg.com/lang/en/docs/install/) ์ฐธ๊ณ
1. ํฌํฌFork ํ ๊ฐ์ธ ์ ์ฅ์
1. ๋ก์ปฌ์ ํด๋ก Clone ํ [ko.react.dev ์ ์ฅ์](https://github.com/reactjs/ko.react.dev)
+=======
+1. Node: v24 or greater
+1. Yarn Classic: See [Yarn website for installation instructions](https://classic.yarnpkg.com/en/docs/install/)
+1. A fork of the repo (for any contributions)
+1. A clone of the [react.dev repo](https://github.com/reactjs/react.dev) on your local machine
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
### ์ค์น
+<<<<<<< HEAD
1. `cd ko.react.dev`๋ฅผ ์คํํ์ฌ ํ๋ก์ ํธ ๊ฒฝ๋ก๋ก ์ด๋ํฉ๋๋ค.
1. `yarn` ๋ช
๋ น์ด๋ฅผ ์คํํ์ฌ npm ์์กด์ฑ ๋ชจ๋๋ค์ ์ค์นํฉ๋๋ค.
+=======
+1. `cd react.dev` to go into the project root
+2. `git remote add my-fork-name https://github.com/YOUR_USERNAME/react.dev.git` to add your fork as a remote. Replace `YOUR_USERNAME` with your GitHub username. You only need to do this once.
+3. `yarn` to install the website's npm dependencies
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
### ๊ฐ๋ฐ ์๋ฒ ์คํํ๊ธฐ
@@ -51,11 +64,19 @@
### ์์ ํ๊ธฐ
+<<<<<<< HEAD
1. ["๊ฐ๋ฐ ์๋ฒ ์คํํ๊ธฐ"](#๊ฐ๋ฐ-์๋ฒ-์คํํ๊ธฐ) ๋ถ๋ถ์ ๋ฐ๋ฆ
๋๋ค.
1. ํ์ผ์ ์ ์ฅํ๊ณ ๋ธ๋ผ์ฐ์ ์์ ํ์ธํฉ๋๋ค.
1. `src` ์์ ์๋ React ์ปดํฌ๋ํธ๊ฐ ์์ ๋ ๊ฒฝ์ฐ hot-reload๊ฐ ์ ์ฉ๋ฉ๋๋ค.
1. `content` ์์ ์๋ ๋งํฌ๋ค์ด ํ์ผ์ด ์์ ๋ ๊ฒฝ์ฐ hot-reload๊ฐ ์ ์ฉ๋ฉ๋๋ค.
1. ํ๋ฌ๊ทธ์ธ์ ์ฌ์ฉํ๋ ๊ฒฝ์ฐ, `.cache` ๋๋ ํ ๋ฆฌ๋ฅผ ์ ๊ฑฐํ ํ ์๋ฒ๋ฅผ ์ฌ์์ํด์ผ ํฉ๋๋ค.
+=======
+1. Follow the ["Running locally"](#running-locally) instructions
+1. Save the files and check in the browser
+ 1. Changes to React components in `src` will hot-reload
+ 1. Changes to markdown files in `src/content` will hot-reload
+ 1. If working with plugins, you may need to remove the `node_modules/.cache/react-docs-mdx` directory and restart the server
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
### ์์ ์ฌํญ ๊ฒ์ฌํ๊ธฐ
@@ -72,7 +93,11 @@
## ๋ฌธ์ ํด๊ฒฐํ๊ธฐ
+<<<<<<< HEAD
`yarn cache-reset` ๋ช
๋ น์ด๋ฅผ ์ฌ์ฉํ์ฌ ๋ก์ปฌ ์บ์๋ฅผ ์ด๊ธฐํํฉ๋๋ค.
+=======
+If you are interested in translating `react.dev`, please see the current translation efforts [here](https://react.dev/community/translations).
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
## ๋ฒ์ญ
diff --git a/package.json b/package.json
index 5ea848fbc..b4d970e72 100644
--- a/package.json
+++ b/package.json
@@ -121,7 +121,7 @@
"webpack-bundle-analyzer": "^4.5.0"
},
"engines": {
- "node": ">=16.8.0"
+ "node": ">=24"
},
"nextBundleAnalysis": {
"budget": null,
diff --git a/src/components/MDX/TeamMember.tsx b/src/components/MDX/TeamMember.tsx
index 2716fa2d1..3be1fa7a7 100644
--- a/src/components/MDX/TeamMember.tsx
+++ b/src/components/MDX/TeamMember.tsx
@@ -68,7 +68,7 @@ function GroupBadges({group}: {group: string}) {
);
}
-// TODO: good alt text for images/links
+// TODO: good alt text for images
export function TeamMember({
name,
title,
@@ -113,7 +113,7 @@ export function TeamMember({
aria-label={`${name} on Twitter`}
href={`https://twitter.com/${twitter}`}
className="hover:text-primary hover:underline dark:text-primary-dark flex flex-row items-center">
-
+
{twitter}
@@ -124,7 +124,7 @@ export function TeamMember({
aria-label={`${name} on Threads`}
href={`https://threads.net/${threads}`}
className="hover:text-primary hover:underline dark:text-primary-dark flex flex-row items-center">
-
+
{threads}
@@ -135,7 +135,7 @@ export function TeamMember({
aria-label={`${name} on Bluesky`}
href={`https://bsky.app/profile/${bsky}`}
className="hover:text-primary hover:underline dark:text-primary-dark flex flex-row items-center">
-
+
{bsky}
@@ -143,19 +143,19 @@ export function TeamMember({
{github && (
- {github}
+ {github}
)}
{personal && (
- {personal}
+ {personal}
)}
diff --git a/src/content/blog/2023/03/16/introducing-react-dev.md b/src/content/blog/2023/03/16/introducing-react-dev.md
index 966203ece..70c42f316 100644
--- a/src/content/blog/2023/03/16/introducing-react-dev.md
+++ b/src/content/blog/2023/03/16/introducing-react-dev.md
@@ -42,8 +42,13 @@ description: ์ค๋ React์ React ๋ฌธ์์ ์๋ก์ด ๋ณด๊ธ์๋ฆฌ์ธ react.dev
**์๋ก์ด ๋ฌธ์๋ Hook์ ์ฌ์ฉํ React๋ฅผ ์ฒ์๋ถํฐ ๊ฐ๋ฅด์นฉ๋๋ค.** ๋ฌธ์๋ ๋ ๊ฐ์ง ์ฃผ์ ์น์
์ผ๋ก ๋๋์ด์ ธ ์์ต๋๋ค.
+<<<<<<< HEAD
* **[React ํ์ตํ๊ธฐ](/learn)** ๋ React๋ฅผ ๊ธฐ์ด๋ถํฐ ์ค์ค๋ก ํ์ตํ ์ ์๋ ๊ณผ์ ์
๋๋ค.
* **[API ์ฐธ๊ณ ์](/reference)** ๋ ๋ชจ๋ React API์ ๋ํ ์ธ๋ถ ๋ด์ฉ๊ณผ ์ฌ์ฉ ์์๋ฅผ ์ ๊ณตํฉ๋๋ค.
+=======
+* **[Learn React](/learn)** is a self-paced course that teaches React from scratch.
+* **[API Reference](/reference/react)** provides the details and usage examples for every React API.
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
๊ฐ ์น์
์์ ๋ฌด์จ ๋ด์ฉ์ ์ ์ ์๋์ง ์์ธํ ์ดํด๋ณด๊ฒ ์ต๋๋ค.
@@ -460,6 +465,7 @@ export default function PackingList() {
[API ์ฐธ๊ณ ์](/reference/react)์์, ์ด์ ๋ชจ๋ React API๋ ์ ์ฉ ํ์ด์ง๋ฅผ ๊ฐ์ง๋๋ค. ๋ชจ๋ ์ข
๋ฅ์ API๋ค์ด ํฌํจ๋ฉ๋๋ค.
+<<<<<<< HEAD
- [`useState`](/reference/react/useState) ๊ฐ์ ๋ด์ฅ Hook
- [``](/reference/react/Suspense) ๊ฐ์ ๋ด์ฅ ์ปดํฌ๋ํธ
- [` `](/reference/react-dom/components/input) ๊ฐ์ ๋ธ๋ผ์ฐ์ ๋ด์ฅ ์ปดํฌ๋ํธ
@@ -467,6 +473,13 @@ export default function PackingList() {
- [`memo`](/reference/react/memo) ๊ฐ์ ๊ทธ ๋ฐ์ React API
r
๋ชจ๋ API ํ์ด์ง๊ฐ *๋ ํผ๋ฐ์ค* ์ *์ฌ์ฉ๋ฒ*์ ํฌํจํ๋ ์ต์ ๋ ๊ฐ์ ์ธ๊ทธ๋จผํธ๋ก ๋๋์ด ์๋ค๋ ๊ฒ์ ์ ์ ์์ต๋๋ค.
+=======
+- Built-in Hooks like [`useState`](/reference/react/useState).
+- Built-in components like [``](/reference/react/Suspense).
+- Built-in browser components like [` `](/reference/react-dom/components/input).
+- Framework-oriented APIs like [`renderToPipeableStream`](/reference/react-dom/server/renderToPipeableStream).
+- Other React APIs like [`memo`](/reference/react/memo).
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
[๋ ํผ๋ฐ์ค](/reference/react/useState#reference)๋ ์ธ์์ ๋ฐํ ๊ฐ์ ๋์ดํ์ฌ ํ์์ ์ธ API ์๋ช
์ ์ค๋ช
ํฉ๋๋ค. ์ด๋ ๊ฐ๊ฒฐํ์ง๋ง, ํด๋น API์ ์ต์ํ์ง ์๋ค๋ฉด ์ฝ๊ฐ ์ถ์์ ์ผ๋ก ๋๊ปด์ง ์ ์์ต๋๋ค. ์ด๊ฒ์ API๋ฅผ ์ด๋ป๊ฒ ์ฌ์ฉํ๋์ง๊ฐ ์๋, API๊ฐ ๋ฌด์์ ํ๋์ง๋ฅผ ์ค๋ช
ํฉ๋๋ค.
@@ -608,7 +621,11 @@ button { display: block; margin-top: 10px; }
+<<<<<<< HEAD
๋ํ ๋ช๋ช API ํ์ด์ง๋ (์ผ๋ฐ์ ์ธ ๋ฌธ์ ์ ๋ํ) [ํธ๋ฌ๋ธ์ํ
](/reference/react/useEffect#troubleshooting)๊ณผ (๋ ์ด์ ์ฌ์ฉํ์ง ์๋ API์ ๊ด๋ จ๋) [๋์](/reference/react-dom/findDOMNode#alternatives)์ ํฌํจํ๊ณ ์์ต๋๋ค.
+=======
+Some API pages also include [Troubleshooting](/reference/react/useEffect#troubleshooting) (for common problems) and [Alternatives](https://18.react.dev/reference/react-dom/findDOMNode#alternatives) (for deprecated APIs).
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
์ด๋ฌํ ์ ๊ทผ ๋ฐฉ์์ด API ์ฐธ๊ณ ์๋ฅผ ๋จ์ํ ์ธ์๋ฅผ ์ฐพ๋ ์ฉ๋๋ฟ๋ง ์๋๋ผ, ๊ฐ API๊ฐ ์ด๋ค ๋ค์ํ ์์
์ ์ํํ ์ ์๋์ง, ์ด๋ป๊ฒ ๋ค๋ฅธ API์ ์ฐ๊ฒฐ๋์ด ์๋์ง๋ฅผ ํ์ธํ๋ ๋ฐ ์ ์ฉํ๊ฒ ๋ ๊ฒ์ ๊ธฐ๋ํฉ๋๋ค.
diff --git a/src/content/blog/2024/04/25/react-19-upgrade-guide.md b/src/content/blog/2024/04/25/react-19-upgrade-guide.md
index 5ba723288..4dfcbdcd5 100644
--- a/src/content/blog/2024/04/25/react-19-upgrade-guide.md
+++ b/src/content/blog/2024/04/25/react-19-upgrade-guide.md
@@ -639,7 +639,11 @@ const ref = useRef(null);
ref.current = 1;
```
+<<<<<<< HEAD
`MutableRef`๋ ์ด์ ์ฌ์ฉ ์ค๋จ๋์์ผ๋ฉฐ `useRef`๋ ํญ์ ๋จ์ผ `RefObject` ํ์
์ ๋ฐํํฉ๋๋ค.
+=======
+`MutableRefObject` is now deprecated in favor of a single `RefObject` type which `useRef` will always return:
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
```ts
interface RefObject {
diff --git a/src/content/blog/2024/12/05/react-19.md b/src/content/blog/2024/12/05/react-19.md
index 951e33d76..a1ef9cd47 100644
--- a/src/content/blog/2024/12/05/react-19.md
+++ b/src/content/blog/2024/12/05/react-19.md
@@ -389,7 +389,11 @@ React ์๋ฒ ์ปดํฌ๋ํธ๋ฅผ ์ง์ํ๊ธฐ ์ํด, ํน์ React ๋ฒ์ ์ ๊ณ ์
์๋ฒ ์ก์
์ ์๋ฒ ์ปดํฌ๋ํธ์์ ์์ฑ๋๋ฉฐ ํด๋ผ์ด์ธํธ ์ปดํฌ๋ํธ์ props๋ฅผ ์ ๋ฌ๋๊ฑฐ๋ ํด๋ผ์ด์ธํธ ์ปดํฌ๋ํธ์์ ๊ฐ์ ธ์ ์ฌ์ฉํ ์ ์์ต๋๋ค.
+<<<<<<< HEAD
๋ ๋ง์ ์ ๋ณด๋ [React ์๋ฒ ์ก์
](/reference/rsc/server-actions)์ ์ฐธ๊ณ ํ์ธ์.
+=======
+For more, see the docs for [React Server Actions](/reference/rsc/server-functions).
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
## React 19์์ ๊ฐ์ ์ฌํญ {/*improvements-in-react-19*/}
diff --git a/src/content/blog/2025/04/23/react-labs-view-transitions-activity-and-more.md b/src/content/blog/2025/04/23/react-labs-view-transitions-activity-and-more.md
index 0cc480007..927a1bb90 100644
--- a/src/content/blog/2025/04/23/react-labs-view-transitions-activity-and-more.md
+++ b/src/content/blog/2025/04/23/react-labs-view-transitions-activity-and-more.md
@@ -14266,7 +14266,11 @@ hooks๋ฅผ ์ถ์ํ์ ๋, ์ ํฌ๋ ์ธ ๊ฐ์ง ๋๊ธฐ๊ฐ ์์์ต๋๋ค:
์ข
์ข
ํผ๋์ ํ์ํ์ง ์์ ๋ Effect๋ฅผ ์ฌ์ฉํ๋ ๋ฐ์ ์จ๋ค๋ ๊ฒ์ ๋ฐ๊ฒฌํ์ต๋๋ค. [You Might Not Need an Effect](/learn/you-might-not-need-an-effect) ๊ฐ์ด๋๋ Effects๊ฐ ์ฌ๋ฐ๋ฅธ ์๋ฃจ์
์ด ์๋ ๊ฒฝ์ฐ๋ค์ ๋ง์ด ๋ค๋ฃจ๊ณ ์์ต๋๋ค. ํ์ง๋ง Effect๊ฐ ๋ฌธ์ ์ ์ ํฉํ ํด๊ฒฐ์ฑ
์ผ ๋์กฐ์ฐจ๋, Effects๋ ํด๋์ค ์ปดํฌ๋ํธ ์๋ช
์ฃผ๊ธฐ๋ณด๋ค ์ฌ์ ํ ์ดํดํ๊ธฐ ์ด๋ ค์ธ ์ ์์ต๋๋ค.
+<<<<<<< HEAD
ํผ๋์ ์ด์ ์ค ํ๋๋ ๊ฐ๋ฐ์๋ค์ด _Effects_ ๊ด์ (Effect๊ฐ ๋ฌด์์ ํ๋์ง)์ด ์๋๋ผ _์ปดํฌ๋ํธ์_ ๊ด์ (์๋ช
์ฃผ๊ธฐ ๊ฐ์)์์ Effects๋ฅผ ์๊ฐํ๊ธฐ ๋๋ฌธ์ด๋ผ๊ณ ์๊ฐํฉ๋๋ค.
+=======
+We believe one of the reasons for confusion is that developers tend to think of Effects from the _component's_ perspective (like a lifecycle), instead of the _Effects_ point of view (what the Effect does).
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
[๋ฌธ์์ ์์](/learn/lifecycle-of-reactive-effects#thinking-from-the-effects-perspective)๋ฅผ ์ดํด๋ณด๊ฒ ์ต๋๋ค:
diff --git a/src/content/blog/2025/12/11/denial-of-service-and-source-code-exposure-in-react-server-components.md b/src/content/blog/2025/12/11/denial-of-service-and-source-code-exposure-in-react-server-components.md
index 10600e275..736fa3375 100644
--- a/src/content/blog/2025/12/11/denial-of-service-and-source-code-exposure-in-react-server-components.md
+++ b/src/content/blog/2025/12/11/denial-of-service-and-source-code-exposure-in-react-server-components.md
@@ -76,7 +76,7 @@ Additional disclosures can be frustrating, but they are generally a sign of a he
### Affected frameworks and bundlers {/*affected-frameworks-and-bundlers*/}
-Some React frameworks and bundlers depended on, had peer dependencies for, or included the vulnerable React packages. The following React frameworks & bundlers are affected: [next](https://www.npmjs.com/package/next), [react-router](https://www.npmjs.com/package/react-router), [waku](https://www.npmjs.com/package/waku), [@parcel/rsc](https://www.npmjs.com/package/@parcel/rsc), [@vite/rsc-plugin](https://www.npmjs.com/package/@vitejs/plugin-rsc), and [rwsdk](https://www.npmjs.com/package/rwsdk).
+Some React frameworks and bundlers depended on, had peer dependencies for, or included the vulnerable React packages. The following React frameworks & bundlers are affected: [next](https://www.npmjs.com/package/next), [react-router](https://www.npmjs.com/package/react-router), [waku](https://www.npmjs.com/package/waku), [@parcel/rsc](https://www.npmjs.com/package/@parcel/rsc), [@vitejs/plugin-rsc](https://www.npmjs.com/package/@vitejs/plugin-rsc), and [rwsdk](https://www.npmjs.com/package/rwsdk).
Please see [the instructions in the previous post](/blog/2025/12/03/critical-security-vulnerability-in-react-server-components#update-instructions) for upgrade steps.
diff --git a/src/content/community/conferences.md b/src/content/community/conferences.md
index 6718d506a..a6b20b503 100644
--- a/src/content/community/conferences.md
+++ b/src/content/community/conferences.md
@@ -19,6 +19,7 @@ April 14-17, 2026. In-person in London
[Website](https://india.cityjsconf.org/) - [Twitter](https://x.com/cityjsconf) - [Bluesky](https://bsky.app/profile/cityjsconf.bsky.social)
+<<<<<<< HEAD
### ZurichJS Conf 2026 {/*zurichjs-conf-2026*/}
September 10-11, 2026. In-person in Zurich, Switzerland
@@ -39,6 +40,8 @@ October 23 & 26, 2026. In-person in London, UK + online (hybrid event)
[Website](https://reactadvanced.com/) - [Twitter](https://x.com/reactadvanced) - [LinkedIn](https://www.linkedin.com/showcase/react-advanced-london/)
+=======
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
### React Summit US 2026 {/*react-summit-us-2026*/}
November 17 & 20, 2026. In-person in New York, USA + online (hybrid event)
@@ -54,6 +57,11 @@ April 15 & 19, 2027. In-person in Singapore + online (hybrid event)
[Website](https://reactsummit.asia/) - [Twitter](https://x.com/reactsummit) - [LinkedIn](https://www.linkedin.com/showcase/reactsummit)
+### React Conf Japan 2027 {/*react-conf-japan-2027*/}
+April 24, 2027. In-person in Tokyo, Japan
+
+[Website](https://reactconf.jp/) - [Twitter](https://x.com/reactconfjp)
+
### React Summit 2027 {/*react-summit-2027*/}
May 21 & 25, 2027. In-person in Amsterdam, Netherlands + online (hybrid event)
@@ -62,16 +70,65 @@ May 21 & 25, 2027. In-person in Amsterdam, Netherlands + online (hybrid event)
## Past Conferences {/*past-conferences*/}
+### React India 2026 {/*react-india-2026*/}
+October 29-31, 2026. In-person in Goa, India
+<<<<<<< HEAD
### React Conf Japan 2027 {/*react-conf-japan-2027*/}
April 24, 2027. In-person in Tokyo, Japan
+=======
+[Website](https://www.reactindia.io/) - [Twitter](https://x.com/react_india)
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
-[Website](https://reactconf.jp/) - [Twitter](https://x.com/reactconfjp)
+### React Advanced London 2026 {/*react-advanced-london-2026*/}
+October 23 & 26, 2026. In-person in London, UK + online (hybrid event)
+
+[Website](https://reactadvanced.com/) - [Twitter](https://x.com/reactadvanced) - [LinkedIn](https://www.linkedin.com/showcase/react-advanced-london/)
+
+### CityJS Athens 2026 {/*cityjs-athens-2026*/}
+October 21-23, 2026. In-person in Athens
+
+[Website](https://athens.cityjsconf.org/) - [Twitter](https://x.com/cityjsconf) - [Bluesky](https://bsky.app/profile/cityjsconf.bsky.social)
+
+### React Alicante 2026 {/*react-alicante-2026*/}
+Sep 24 - 26, 2026. In-person in Alicante
+
+[Website](https://reactalicante.es//) - [Twitter](https://x.com/ReactAlicante)
+
+### React Native Connection 2026 {/*react-native-connection-2026*/}
+September 24, 2026. In-person in Paris, France
+
+[Website](https://reactnativeconnection.io/) - [Twitter](https://x.com/ReactNativeConn) - [Bluesky](https://bsky.app/profile/reactnativeconnect.bsky.social)
+
+### ZurichJS Conf 2026 {/*zurichjs-conf-2026*/}
+September 10-11, 2026. In-person in Zurich, Switzerland
+
+[Website](https://conf.zurichjs.com?utm_campaign=ZurichJS_Conf&utm_source=referral&utm_content=reactjs_community_conferences) - [Twitter](https://x.com/zurichjs) - [LinkedIn](https://www.linkedin.com/company/zurichjs/)
+
+### Render(ATL) 2026 ๐ {/*renderatl-2026-*/}
+August 12-13, 2026. In-person in Atlanta, GA, USA
+
+[Website](https://renderatl.com/) - [Twitter](https://x.com/renderATL) - [LinkedIn](https://www.linkedin.com/company/renderatl)
+
+### React Summit 2026 {/*react-summit-2026*/}
+June 12 & 16, 2026. In-person in Amsterdam, Netherlands + online (hybrid event)
+
+[Website](https://reactsummit.com/) - [Twitter](https://x.com/reactsummit) - [LinkedIn](https://www.linkedin.com/showcase/reactsummit)
+
+### React Norway 2026 {/*react-norway-2026*/}
+June 5, 2026. In-person in Oslo, Norway
+
+[Website](https://reactnorway.com/) - [Twitter](https://x.com/ReactNorway)
+
+### React Miami 2026 {/*react-miami-2026*/}
+April 23-24, 2026. In-person in Miami, FL, USA
+
+[Website](https://reactmiami.com/) - [Twitter](https://x.com/ReactMiamiConf)
### CityJS London 2026 {/*cityjs-london-2026-past*/}
April 14-17, 2026. In-person in London
-[Website](https://india.cityjsconf.org/) - [Twitter](https://x.com/cityjsconf) - [Bluesky](https://bsky.app/profile/cityjsconf.bsky.social)
+[Website](https://london.cityjsconf.org/) - [Twitter](https://x.com/cityjsconf) - [Bluesky](https://bsky.app/profile/cityjsconf.bsky.social)
### React Paris 2026 {/*react-paris-2026-past*/}
@@ -88,7 +145,7 @@ February 12-13, 2026. In-person in New Delhi, India
### CityJS Singapore 2026 {/*cityjs-singapore-2026*/}
February 4-6, 2026. In-person in Singapore
-[Website](https://india.cityjsconf.org/) - [Twitter](https://x.com/cityjsconf) - [Bluesky](https://bsky.app/profile/cityjsconf.bsky.social)
+[Website](https://singapore.cityjsconf.org/) - [Twitter](https://x.com/cityjsconf) - [Bluesky](https://bsky.app/profile/cityjsconf.bsky.social)
### React Advanced London 2025 {/*react-advanced-london-2025*/}
November 28 & December 1, 2025. In-person in London, UK + online (hybrid event)
diff --git a/src/content/learn/describing-the-ui.md b/src/content/learn/describing-the-ui.md
index 82820712b..1a06645d4 100644
--- a/src/content/learn/describing-the-ui.md
+++ b/src/content/learn/describing-the-ui.md
@@ -530,7 +530,7 @@ React๋ ์ปดํฌ๋ํธ์ ๋ชจ๋ ๊ฐ์ ๊ด๊ณ๋ฅผ ๋ชจ๋ธ๋งํ๊ธฐ ์ํด ํธ๋ฆฌ
React ๋ ๋ ํธ๋ฆฌ๋ ์ปดํฌ๋ํธ ๊ฐ์ ๋ถ๋ชจ-์์ ๊ด๊ณ๋ฅผ ๋ํ๋
๋๋ค.
-
+
React ๋ ๋ ํธ๋ฆฌ ์์
diff --git a/src/content/learn/extracting-state-logic-into-a-reducer.md b/src/content/learn/extracting-state-logic-into-a-reducer.md
index 0897fa5ba..1e70bac38 100644
--- a/src/content/learn/extracting-state-logic-into-a-reducer.md
+++ b/src/content/learn/extracting-state-logic-into-a-reducer.md
@@ -870,7 +870,11 @@ Reducer๊ฐ ์ข์ ์ ๋ง ์๋ ๊ฒ์ ์๋๋๋ค! ์๋์์ `useState`์
- **์ฝ๋ ํฌ๊ธฐ:** ์ผ๋ฐ์ ์ผ๋ก `useState`๋ฅผ ์ฌ์ฉํ๋ฉด, ๋ฏธ๋ฆฌ ์์ฑํด์ผ ํ๋ ์ฝ๋๊ฐ ์ค์ด๋ญ๋๋ค. `useReducer`๋ฅผ ์ฌ์ฉํ๋ฉด Reducer ํจ์ *๊ทธ๋ฆฌ๊ณ * Action์ ์ ๋ฌํ๋ ๋ถ๋ถ ๋ ๋ค ์์ฑํด์ผ ํฉ๋๋ค. ํ์ง๋ง ์ฌ๋ฌ ์ด๋ฒคํธ ํธ๋ค๋ฌ์์ ๋น์ทํ ๋ฐฉ์์ผ๋ก State๋ฅผ ์
๋ฐ์ดํธํ๋ ๊ฒฝ์ฐ, `useReducer`๋ฅผ ์ฌ์ฉํ๋ฉด ์ฝ๋์ ์์ ์ค์ด๋ ๋ฐ ๋์์ด ๋ ์ ์์ต๋๋ค.
+<<<<<<< HEAD
- **๊ฐ๋
์ฑ:** `useState`๋ก ๊ฐ๋จํ State๋ฅผ ์
๋ฐ์ดํธํ๋ ๊ฒฝ์ฐ ๊ฐ๋
์ฑ์ด ์ข์ ํธ์
๋๋ค. ๊ทธ๋ ์ง๋ง ๋ ๋ณต์กํ ๊ตฌ์กฐ์ State๋ฅผ ๋ค๋ฃจ๊ฒ ๋๋ฉด ์ปดํฌ๋ํธ์ ์ฝ๋ ์์ด ๋ ๋ง์์ ธ ํ๋์ ์ฝ๊ธฐ ์ด๋ ค์์ง ์ ์์ต๋๋ค. ์ด ๊ฒฝ์ฐ `useReducer`๋ฅผ ์ฌ์ฉํ๋ฉด ์
๋ฐ์ดํธ ๋ก์ง์ด *์ด๋ป๊ฒ ๋์ํ๋์ง*์ ์ด๋ฒคํธ ํธ๋ค๋ฌ๋ฅผ ํตํด์ *๋ฌด์์ด ๋ฐ์ํ๋์ง* ๊ตฌํํ ๋ถ๋ถ์ ๋ช
ํํ๊ฒ ๊ตฌ๋ถํ ์ ์์ต๋๋ค.
+=======
+We recommend using a reducer if you often encounter bugs due to incorrect state updates in some component, and want to introduce more structure to its code. You don't have to use reducers for everything: feel free to mix and match! You can even use `useState` and `useReducer` in the same component.
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
- **๋๋ฒ๊น
:** `useState`๋ฅผ ์ฌ์ฉํ๋ฉฐ ๋ฒ๊ทธ๋ฅผ ๋ฐ๊ฒฌํ์ ๋, *์*, *์ด๋์* State๊ฐ ์๋ชป ์ค์ ๋๋์ง ์ฐพ๊ธฐ ์ด๋ ค์ธ ์ ์์ต๋๋ค. `useReducer`๋ฅผ ์ฌ์ฉํ๋ฉด, ์ฝ์ ๋ก๊ทธ๋ฅผ Reducer์ ์ถ๊ฐํ์ฌ State๊ฐ ์
๋ฐ์ดํธ๋๋ ๋ชจ๋ ๋ถ๋ถ๊ณผ *์* ํด๋น ๋ฒ๊ทธ๊ฐ ๋ฐ์ํ๋์ง(์ด๋ค `Action`์ผ๋ก ์ธํ ๊ฒ์ธ์ง)๋ฅผ ํ์ธํ ์ ์์ต๋๋ค. ๊ฐ `Action`์ด ์ฌ๋ฐ๋ฅด๊ฒ ์์ฑ๋์ด ์๋ค๋ฉด, ๋ฒ๊ทธ๋ฅผ ๋ฐ์์ํจ ๋ถ๋ถ์ด Reducer ๋ก์ง ์์ฒด์ ์๋ค๋ ๊ฒ์ ์ ์ ์์ ๊ฒ์
๋๋ค. ๊ทธ๋ ์ง๋ง `useState`๋ฅผ ์ฌ์ฉํ๋ ๊ฒฝ์ฐ๋ณด๋ค ๋ ๋ง์ ์ฝ๋๋ฅผ ๋จ๊ณ๋ณ๋ก ์คํํด์ ๋๋ฒ๊น
ํด์ผ ํ๋ ์ ์ด ์๊ธฐ๋ ํฉ๋๋ค.
diff --git a/src/content/learn/index.md b/src/content/learn/index.md
index 097f414a2..771854d31 100644
--- a/src/content/learn/index.md
+++ b/src/content/learn/index.md
@@ -335,7 +335,11 @@ function MyButton() {
}
```
+<<<<<<< HEAD
React๊ฐ ์ปดํฌ๋ํธ ํจ์๋ฅผ ๋ค์ ํธ์ถํฉ๋๋ค. ์ด๋ฒ์๋ `count`๊ฐ `1`์ด ๋๊ณ , ๊ทธ ๋ค์์๋ `2`๊ฐ ๋ ๊ฒ์
๋๋ค. ์ด๋ฐ ๋ฐฉ์์
๋๋ค.
+=======
+Calling `setCount` tells React to call your component function again. This is called a *re-render*. This time, `count` will be `1`. Then it will be `2`. And so on.
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
๊ฐ์ ์ปดํฌ๋ํธ๋ฅผ ์ฌ๋ฌ ๋ฒ ๋ ๋๋งํ๋ฉด ๊ฐ๊ฐ์ ์ปดํฌ๋ํธ๋ ๊ณ ์ ํ State๋ฅผ ์ป๊ฒ ๋ฉ๋๋ค. ๊ฐ ๋ฒํผ์ ๊ฐ๋ณ์ ์ผ๋ก ํด๋ฆญํด ๋ณด์ธ์.
diff --git a/src/content/learn/lifecycle-of-reactive-effects.md b/src/content/learn/lifecycle-of-reactive-effects.md
index 4a11e1dd2..270295102 100644
--- a/src/content/learn/lifecycle-of-reactive-effects.md
+++ b/src/content/learn/lifecycle-of-reactive-effects.md
@@ -1375,8 +1375,13 @@ export default function App() {
}
```
+<<<<<<< HEAD
```js src/ChatRoom.js active
import { useState, useEffect } from 'react';
+=======
+```js {expectedErrors: {'react-compiler': [8]}} src/ChatRoom.js active
+import { useEffect } from 'react';
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
export default function ChatRoom({ roomId, createConnection }) {
useEffect(() => {
@@ -1474,7 +1479,7 @@ export default function App() {
```
```js src/ChatRoom.js active
-import { useState, useEffect } from 'react';
+import { useEffect } from 'react';
export default function ChatRoom({ roomId, createConnection }) {
useEffect(() => {
@@ -1562,7 +1567,7 @@ export default function App() {
```
```js src/ChatRoom.js active
-import { useState, useEffect } from 'react';
+import { useEffect } from 'react';
import {
createEncryptedConnection,
createUnencryptedConnection,
diff --git a/src/content/learn/preserving-and-resetting-state.md b/src/content/learn/preserving-and-resetting-state.md
index 5c759fd69..7f54504a6 100644
--- a/src/content/learn/preserving-and-resetting-state.md
+++ b/src/content/learn/preserving-and-resetting-state.md
@@ -18,7 +18,11 @@ title: State๋ฅผ ๋ณด์กดํ๊ณ ์ด๊ธฐํํ๊ธฐ
## State๋ ๋ ๋ํธ๋ฆฌ์ ์์น์ ์ฐ๊ฒฐ ๋ฉ๋๋ค. {/*state-is-tied-to-a-position-in-the-tree*/}
+<<<<<<< HEAD
React๋ UI ์์ ์๋ ์ปดํฌ๋ํธ ๊ตฌ์กฐ๋ก [๋ ๋ ํธ๋ฆฌ](learn/understanding-your-ui-as-a-tree#the-render-tree)๋ฅผ ๋ง๋ญ๋๋ค.
+=======
+React builds [render trees](/learn/understanding-your-ui-as-a-tree#the-render-tree) for the component structure in your UI.
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
์ปดํฌ๋ํธ์ State๋ฅผ ์ค ๋ State๊ฐ ์ปดํฌ๋ํธ ์์ "์ด๊ณ " ์๋ค๊ณ ์๊ฐํ ์๋ ์์ต๋๋ค. ํ์ง๋ง ์ฌ์ค State๋ React ์์ ์์ต๋๋ค. React๋ ์ปดํฌ๋ํธ๊ฐ UI ํธ๋ฆฌ์ ์๋ ์์น๋ฅผ ์ด์ฉํด React๊ฐ ๊ฐ์ง๊ณ ์๋ ๊ฐ State๋ฅผ ์๋ง์ ์ปดํฌ๋ํธ์ ์ฐ๊ฒฐํฉ๋๋ค.
diff --git a/src/content/learn/react-compiler/introduction.md b/src/content/learn/react-compiler/introduction.md
index ad3c3a5bd..ece1ca297 100644
--- a/src/content/learn/react-compiler/introduction.md
+++ b/src/content/learn/react-compiler/introduction.md
@@ -144,7 +144,11 @@ function TableContainer({ items }) {
- React ์ปดํ์ผ๋ฌ๋ ๋ชจ๋ ํจ์๊ฐ ์๋ React ์ปดํฌ๋ํธ์ Hook๋ง ๋ฉ๋ชจ์ด์ ์ด์
ํฉ๋๋ค.
- React ์ปดํ์ผ๋ฌ์ ๋ฉ๋ชจ์ด์ ์ด์
์ ์ฌ๋ฌ ์ปดํฌ๋ํธ๋ Hook ๊ฐ์ ๊ณต์ ๋์ง ์์ต๋๋ค.
+<<<<<<< HEAD
๋ฐ๋ผ์ `expensivelyProcessAReallyLargeArrayOfObjects`๊ฐ ์ฌ๋ฌ ๋ค๋ฅธ ์ปดํฌ๋ํธ์์ ์ฌ์ฉ๋๋ ๊ฒฝ์ฐ, ์ ํํ ๋์ผํ `items`๊ฐ ์ ๋ฌ๋๋๋ผ๋ ๋น์ฉ์ด ๋ง์ด ๋๋ ๊ณ์ฐ์ด ๋ฐ๋ณต์ ์ผ๋ก ์คํ๋ฉ๋๋ค. ์ฝ๋๋ฅผ ๋ ๋ณต์กํ๊ฒ ๋ง๋ค๊ธฐ ์ ์ ๋จผ์ [ํ๋กํ์ผ๋ง](reference/react/useMemo#how-to-tell-if-a-calculation-is-expensive)ํ์ฌ ์ ๋ง๋ก ๋น์ฉ์ด ๋ง์ด ๋๋์ง ํ์ธํ๋ ๊ฒ์ ๊ถ์ฅํฉ๋๋ค.
+=======
+So if `expensivelyProcessAReallyLargeArrayOfObjects` was used in many different components, even if the same exact items were passed down, that expensive calculation would be run repeatedly. We recommend [profiling](/reference/react/useMemo#how-to-tell-if-a-calculation-is-expensive) first to see if it really is that expensive before making code more complicated.
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
## ์ปดํ์ผ๋ฌ๋ฅผ ์ฌ์ฉํด ๋ด์ผ ํ๋์? {/*should-i-try-out-the-compiler*/}
diff --git a/src/content/learn/setup.md b/src/content/learn/setup.md
index 6c8ff6b10..6d73874c7 100644
--- a/src/content/learn/setup.md
+++ b/src/content/learn/setup.md
@@ -17,7 +17,11 @@ React๋ ์๋ํฐ, ํ์
์คํฌ๋ฆฝํธ, ๋ธ๋ผ์ฐ์ ํ์ฅ ํ๋ก๊ทธ๋จ, ์ปดํ
## React ๊ฐ๋ฐ์ ๋๊ตฌ {/*react-developer-tools*/}
+<<<<<<< HEAD
React ๊ฐ๋ฐ์ ๋๊ตฌ๋ React ์ปดํฌ๋ํธ๋ฅผ ๊ฒ์ฌํ๊ณ , Props์ State๋ฅผ ํธ์งํ๊ณ , ์ฑ๋ฅ ๋ฌธ์ ๋ฅผ ์๋ณํ ์ ์๋ ๋ธ๋ผ์ฐ์ ํ์ฅ ํ๋ก๊ทธ๋จ์
๋๋ค. [์ฌ๊ธฐ](learn/react-developer-tools)์์ ์ค์นํ๋ ๋ฐฉ๋ฒ์ ํ์ธํด๋ณด์ธ์.
+=======
+React Developer Tools is a browser extension that can inspect React components, edit props and state, and identify performance problems. Learn how to install it [here](/learn/react-developer-tools).
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
## React ์ปดํ์ผ๋ฌ {/*react-compiler*/}
diff --git a/src/content/learn/synchronizing-with-effects.md b/src/content/learn/synchronizing-with-effects.md
index 455c21394..063bb0e67 100644
--- a/src/content/learn/synchronizing-with-effects.md
+++ b/src/content/learn/synchronizing-with-effects.md
@@ -732,8 +732,13 @@ Effect ์์์ `fetch` ํธ์ถ์ ์์ฑํ๋ ๊ฒ์ [๋ฐ์ดํฐ๋ฅผ ๊ฐ์ ธ์ค
์ด ๋จ์ ๋ชฉ๋ก์ React์๋ง ํด๋น๋๋ ๊ฒ์ ์๋๋๋ค. ์ด๋ค ๋ผ์ด๋ธ๋ฌ๋ฆฌ์์๋ ๋ง์ดํธ ์์ ๋ฐ์ดํฐ๋ฅผ ๊ฐ์ ธ์จ๋ค๋ฉด ๋น์ทํ ๋จ์ ์ด ์กด์ฌํฉ๋๋ค. ๋ง์ดํธ ์์ ๋ฐ์ดํฐ๋ฅผ ํ์นญํ๋ ๊ฒ๋ ๋ผ์ฐํ
๊ณผ ๋ง์ฐฌ๊ฐ์ง๋ก ์ ์ํํ๊ธฐ ์ด๋ ค์ด ์์
์ด๋ฏ๋ก ๋ค์ ์ ๊ทผ ๋ฐฉ์์ ๊ถ์ฅํฉ๋๋ค.
+<<<<<<< HEAD
- **[ํ๋ ์์ํฌ](/learn/creating-a-react-app#full-stack-frameworks)๋ฅผ ์ฌ์ฉํ๊ณ ์๋ค๋ฉด, ๊ทธ ํ๋ ์์ํฌ๊ฐ ์ ๊ณตํ๋ ๋ด์ฅ ๋ฐ์ดํฐ ํจ์นญ ๊ธฐ๋ฅ์ ์ฌ์ฉํ์ธ์.** ์ต์ React ํ๋ ์์ํฌ๋ ํจ์จ์ ์ธ ๋ฐ์ดํฐ ํจ์นญ ๋ฉ์ปค๋์ฆ์ ๋ด์ฅํ๊ณ ์์ผ๋ฉฐ, ์์ ์ธ๊ธํ ๋จ์ ์ ๊ฒช์ง ์์ต๋๋ค.
- **์ฌ์ฉํ์ง ์๋๋ค๋ฉด, ํด๋ผ์ด์ธํธ ์ฌ์ด๋ ์บ์๋ฅผ ์ฌ์ฉํ๊ฑฐ๋ ์ง์ ๊ตฌ์ถํ๋ ๊ฒ์ ๊ณ ๋ คํ์ธ์.** ์ธ๊ธฐ ์๋ ์คํ์์ค ์๋ฃจ์
์ผ๋ก๋ [React Query](https://tanstack.com/query/latest), [useSWR](https://swr.vercel.app/), [React Router 6.4+](https://beta.reactrouter.com/en/main/start/overview)๊ฐ ์์ต๋๋ค. ์ง์ ๊ตฌํํ ์๋ ์๋๋ฐ, ์ด ๊ฒฝ์ฐ์๋ Effect๋ฅผ ์ฌ์ฉํ๋, ์์ฒญ ์ค๋ณต ์ ๊ฑฐ, ์๋ต ์บ์ฑ, ๋คํธ์ํฌ ์ํฐํด ๋ฐฉ์ง๋ฅผ ์ํ ๋ก์ง์ ์ถ๊ฐํด์ผ ํฉ๋๋ค(๋ฐ์ดํฐ๋ฅผ ๋ฏธ๋ฆฌ ๋ก๋ํ๊ฑฐ๋, ํ์ํ ๋ฐ์ดํฐ๋ฅผ ์์ ๋ผ์ฐํธ๋ก ํธ์ด์คํ
ํ๋ ๋ฐฉ์์ผ๋ก).
+=======
+- **If you use a [framework](/learn/creating-a-react-app#full-stack-frameworks), use its built-in data fetching mechanism.** Modern React frameworks have integrated data fetching mechanisms that are efficient and don't suffer from the above pitfalls.
+- **Otherwise, consider using or building a client-side cache.** Popular open source solutions include [TanStack Query](https://tanstack.com/query/latest), [useSWR](https://swr.vercel.app/), and [React Router](https://reactrouter.com/). You can build your own solution too, in which case you would use Effects under the hood, but add logic for deduplicating requests, caching responses, and avoiding network waterfalls (by preloading data or hoisting data requirements to routes).
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
์ด๋ฌํ ์ ๊ทผ ๋ฐฉ์ ์ค ์ด๋ ๊ฒ๋ ์ ํฉํ์ง ์์ ๊ฒฝ์ฐ, Effect ๋ด์์ ๋ฐ์ดํฐ๋ฅผ ์ง์ ๊ฐ์ ธ์ค๋ ๊ฒ์ ๊ณ์ํ์
๋ ๋ฉ๋๋ค.
diff --git a/src/content/learn/tutorial-tic-tac-toe.md b/src/content/learn/tutorial-tic-tac-toe.md
index 2e84a2664..89eeea706 100644
--- a/src/content/learn/tutorial-tic-tac-toe.md
+++ b/src/content/learn/tutorial-tic-tac-toe.md
@@ -1140,7 +1140,11 @@ export default function Board() {
+<<<<<<< HEAD
์ด์ ๋ณด๋์ X๋ฅผ ์ถ๊ฐํ ์ ์๊ฒ ๋์์ง๋ง ๊ฐ๋ฅํ ๊ฑด ์ค์ง ์ผ์ชฝ ์ ์ฌ๊ฐํ๋ฟ์
๋๋ค. `handleClick` ํจ์๋ ์ผ์ชฝ ์ ์ฌ๊ฐํ(์ธ๋ฑ์ค `0`)๋ง ์
๋ฐ์ดํธํ๋๋ก ํ๋ ์ฝ๋ฉ๋์ด ์์ต๋๋ค. ๋ชจ๋ ์ฌ๊ฐํ์ ์
๋ฐ์ดํธํ ์ ์๋๋ก `handleClick` ํจ์๋ฅผ ์์ ํ๊ฒ ์ต๋๋ค. `handleClick` ํจ์์ ์
๋ฐ์ดํธํ ์ฌ๊ฐํ์ ์ธ๋ฑ์ค๋ฅผ ๋ํ๋ด๋ ์ธ์ `i`๋ฅผ ์ถ๊ฐํ์ธ์.
+=======
+Now you can add X's to the board... but only to the upper left square. Your `handleClick` function is hardcoded to update the index for the upper left square (`0`). Let's update `handleClick` to be able to update any square. Add a parameter `i` to the `handleClick` function that takes the index of the square to update:
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
```js {4,6}
export default function Board() {
diff --git a/src/content/learn/typescript.md b/src/content/learn/typescript.md
index 5c20b741f..0806e70b4 100644
--- a/src/content/learn/typescript.md
+++ b/src/content/learn/typescript.md
@@ -334,7 +334,11 @@ function MyComponent() {
+<<<<<<< HEAD
[`useMemo`](/reference/react/useMemo) Hook์ ํจ์ ํธ์ถ๋ก๋ถํฐ Memorized ๋ ๊ฐ์ ์์ฑ/์ฌ์ ๊ทผํ์ฌ, ๋ ๋ฒ์งธ ๋งค๊ฐ๋ณ์๋ก ์ ๋ฌ๋ ์ข
์์ฑ์ด ๋ณ๊ฒฝ๋ ๋๋ง ํจ์๋ฅผ ๋ค์ ์คํํฉ๋๋ค. Hook์ ํธ์ถํ ๊ฒฐ๊ณผ๋ ์ฒซ ๋ฒ์งธ ๋งค๊ฐ๋ณ์์ ์๋ ํจ์์ ๋ฐํ ๊ฐ์์ ์ถ๋ก ๋ฉ๋๋ค. Hook์ ํ์
์ธ์๋ฅผ ์ ๊ณตํ์ฌ ๋์ฑ๋ ๋ช
ํํ๊ฒ ํ ์ ์์ต๋๋ค.
+=======
+The [`useMemo`](/reference/react/useMemo) Hooks will create/re-access a memoized value from a function call, re-running the function only when dependencies passed as the 2nd parameter are changed. The result of calling the Hook is inferred from the return value from the function in the first parameter. You can be more explicit by providing a type argument to the Hook.
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
```ts
// visibleTodos์ ํ์
์ filterTodos์ ๋ฐํ ๊ฐ์์ ์ถ๋ก ๋ฉ๋๋ค.
diff --git a/src/content/learn/understanding-your-ui-as-a-tree.md b/src/content/learn/understanding-your-ui-as-a-tree.md
index 1e5bac99c..1971b5931 100644
--- a/src/content/learn/understanding-your-ui-as-a-tree.md
+++ b/src/content/learn/understanding-your-ui-as-a-tree.md
@@ -134,7 +134,11 @@ React ๋ ๋ ํธ๋ฆฌ์์ ๋ฃจํธ ๋
ธ๋๋ ์ฑ์ [Root ์ปดํฌ๋ํธ](/learn/imp
#### ๋ ๋ ํธ๋ฆฌ์ HTML ํ๊ทธ๋ ์ด๋์ ์๋์? {/*where-are-the-html-elements-in-the-render-tree*/}
+<<<<<<< HEAD
์์ ๋ ๋ ํธ๋ฆฌ์์ ๊ฐ ์ปดํฌ๋ํธ๊ฐ ๋ ๋๋งํ๋ HTML ํ๊ทธ์ ๋ํ ์ธ๊ธ์ด ์์์ ์ ์ ์์ต๋๋ค. ์ด๋ ๋ ๋ ํธ๋ฆฌ๊ฐ React [์ปดํฌ๋ํธ](learn/your-first-component#components-ui-building-blocks)๋ก๋ง ๊ตฌ์ฑ๋์ด ์๊ธฐ ๋๋ฌธ์
๋๋ค.
+=======
+You'll notice in the above render tree, there is no mention of the HTML tags that each component renders. This is because the render tree is only composed of React [components](/learn/your-first-component#components-ui-building-blocks).
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
UI ํ๋ ์์ํฌ๋ก์ React๋ ํ๋ซํผ์ ๋
๋ฆฝ์ ์
๋๋ค. react.dev์์๋ HTML ๋งํฌ์
์ UI ๊ธฐ๋ณธ ์์๋ก ์ฌ์ฉํ๋ ์น์ ๋ ๋๋งํ๋ ์์๋ฅผ ๋ณด์ฌ์ค๋๋ค. ํ์ง๋ง React ์ฑ์ ๋ชจ๋ฐ์ผ์ด๋ ๋ฐ์คํฌํฑ ํ๋ซํผ์ ๋ ๋๋ง ๋ ์ ์์ผ๋ฉฐ, ์ด๋ฌํ ํ๋ซํผ์ [UIView](https://developer.apple.com/documentation/uikit/uiview)๋ [FrameworkElement](https://learn.microsoft.com/en-us/dotnet/api/system.windows.frameworkelement?view=windowsdesktop-7.0)์ ๊ฐ์ ๋ค๋ฅธ UI ๊ธฐ๋ณธ ์์๋ฅผ ์ฌ์ฉํ ์ ์์ต๋๋ค.
diff --git a/src/content/reference/dev-tools/react-devtools-cdt-mcp.md b/src/content/reference/dev-tools/react-devtools-cdt-mcp.md
new file mode 100644
index 000000000..9c966a0ff
--- /dev/null
+++ b/src/content/reference/dev-tools/react-devtools-cdt-mcp.md
@@ -0,0 +1,407 @@
+---
+title: React DevTools for agents
+version: experimental
+---
+
+
+
+**`react-devtools-cdt-mcp` is experimental.** It is built on the [experimental third-party developer tools API](https://developer.chrome.com/blog/devtools-for-agents-3p-tools) in [Chrome DevTools MCP](https://github.com/ChromeDevTools/chrome-devtools-mcp), and both its tools and their output may change between releases.
+
+
+
+
+
+`react-devtools-cdt-mcp` gives AI coding agents the same view of your app that React DevTools gives you: the component tree, props, hooks, owners, source locations, and render timing.
+
+```js
+import 'react-devtools-cdt-mcp/register';
+```
+
+
+
+
+
+---
+
+## Overview {/*overview*/}
+
+Coding agents that drive a browser through [Chrome DevTools MCP](https://github.com/ChromeDevTools/chrome-devtools-mcp) can click, take snapshots, and read the DOM, but the DOM doesn't tell them which component rendered a button, what state it holds, or why an interaction was slow.
+
+`react-devtools-cdt-mcp` is a small browser library that you import into the page you're debugging. It registers a group of React tools with the page. When Chrome DevTools MCP connects to that page, it discovers the tools automatically, and your agent can call them like any other MCP tool.
+
+
+
+`react-devtools-cdt-mcp` is **not** an MCP server, and it doesn't go in your MCP client config. It runs inside your page. The only MCP server you configure is Chrome DevTools MCP.
+
+
+
+---
+
+## Setup {/*setup*/}
+
+#### Install the package {/*install-the-package*/}
+
+
+
+npm install --save-dev react-devtools-cdt-mcp
+
+
+
+#### Import it before React {/*import-it-before-react*/}
+
+Import the `register` entry point at the very top of your app's entry file, **before** anything imports `react-dom`:
+
+```js {1}
+import 'react-devtools-cdt-mcp/register';
+
+import { createRoot } from 'react-dom/client';
+import App from './App';
+
+createRoot(document.getElementById('root')).render( );
+```
+
+`react-devtools-cdt-mcp` has to load before React does. If you import it after React, the tools won't see your components.
+
+
+
+`react-devtools-cdt-mcp` connects to React the same way the React DevTools extension does, and makes React report every commit to it. This slows down your app, so only include it in development builds.
+
+
+
+#### Set up Chrome DevTools MCP {/*set-up-chrome-devtools-mcp*/}
+
+Your agent needs [Chrome DevTools MCP](https://github.com/ChromeDevTools/chrome-devtools-mcp) with [third-party developer tools](https://developer.chrome.com/blog/devtools-for-agents-3p-tools) enabled. Follow the [Chrome DevTools MCP docs](https://github.com/ChromeDevTools/chrome-devtools-mcp#getting-started) to set it up. Once your agent opens a page that imports `react-devtools-cdt-mcp/register`, it can list and call the React tools.
+
+---
+
+## Try it {/*try-it*/}
+
+You don't need an agent to see what the tools return. The sandbox below imports `react-devtools-cdt-mcp/register` exactly as you would in your app, and adds a small **tool console** under the app. The console discovers the React tools the same way Chrome DevTools MCP does, by dispatching the `devtoolstooldiscovery` event, and lets you call them by hand.
+
+Pick a tool, edit the JSON parameters, and press **Run tool**. Here's a debugging session to follow, playing the agent's part:
+
+1. **Find a component.** Run `react_find_components` with `{"name": "Row"}`. Each result has a `uid`, like `"r12"`, that the other tools accept.
+2. **Inspect it.** Run `react_get_component_by_uid` with one of those uids and `"includeHooks": true` to see its props and hooks.
+3. **Start from the screen.** Choose `react_get_component_by_dom_element`, press **Pick element**, and click a product in the list to get the host component that rendered it.
+4. **Profile an interaction.** Run `react_start_profiling`, click **Add to cart** in the app, then run `react_stop_profiling`.
+5. **See what rendered.** Run `react_get_trace_overview`, then `react_get_commit_report` for commit `0` to see which components rendered in that commit and how long each one took.
+
+
+
+```js src/App.js active
+import { useState } from 'react';
+
+const PRODUCTS = Array.from({ length: 20 }, (_, i) => ({
+ id: i,
+ name: 'Product ' + (i + 1),
+ price: 10 + i,
+}));
+
+export default function App() {
+ const [query, setQuery] = useState('');
+ const visibleProducts = PRODUCTS.filter((product) =>
+ product.name.toLowerCase().includes(query.toLowerCase())
+ );
+ return (
+
+
+ setQuery(e.target.value)}
+ placeholder="Filter products"
+ />
+
+
+ );
+}
+
+function Cart() {
+ const [count, setCount] = useState(0);
+ return (
+
+
+ setCount((c) => c + 1)}>Add to cart
+
+ );
+}
+
+function CartBadge({ count }) {
+ return Cart: {count} ;
+}
+
+function ProductList({ products }) {
+ return (
+
+ {products.map((product) => (
+
+ ))}
+
+ );
+}
+
+function ProductRow({ product }) {
+ return (
+
+ {product.name} ${product.price}
+
+ );
+}
+```
+
+```js src/index.js
+import 'react-devtools-cdt-mcp/register';
+
+import { createRoot } from 'react-dom/client';
+import './styles.css';
+import App from './App';
+import { mountToolConsole } from './ToolConsole';
+
+createRoot(document.getElementById('root')).render( );
+mountToolConsole();
+```
+
+```js src/ToolConsole.js hidden
+// A tiny stand-in for chrome-devtools-mcp. It discovers the React tool group
+// the same way chrome-devtools-mcp does (the `devtoolstooldiscovery` event)
+// and lets you call the tools by hand.
+function discoverToolGroup() {
+ let toolGroup = null;
+ const event = new Event('devtoolstooldiscovery');
+ event.respondWith = group => {
+ toolGroup = group;
+ };
+ window.dispatchEvent(event);
+ return toolGroup;
+}
+
+function firstUid(tools, name) {
+ const find = tools.find(t => t.name === 'react_find_components');
+ const result = find.execute({name});
+ return result.results && result.results[0] ? result.results[0].uid : 'r0';
+}
+
+function exampleParams(tools, toolName) {
+ switch (toolName) {
+ case 'react_get_component_tree':
+ return {depth: 4};
+ case 'react_find_components':
+ return {name: 'Row'};
+ case 'react_get_component_by_uid':
+ return {uid: firstUid(tools, 'App'), includeHooks: true};
+ case 'react_get_component_by_dom_element':
+ return {element: '(click "Pick element", then click the page)'};
+ case 'react_get_component_source':
+ case 'react_get_owner_stack_trace':
+ case 'react_get_parent_stack':
+ case 'react_get_owner_stack':
+ return {uid: firstUid(tools, 'CartBadge')};
+ case 'react_start_profiling':
+ return {traceName: 'add-to-cart'};
+ case 'react_stop_profiling':
+ return {};
+ case 'react_get_trace_overview':
+ return {traceName: 'add-to-cart'};
+ case 'react_get_commit_report':
+ return {traceName: 'add-to-cart', commitIndex: 0};
+ default:
+ return {};
+ }
+}
+
+export function mountToolConsole() {
+ const toolGroup = discoverToolGroup();
+ const container = document.createElement('section');
+ container.className = 'tool-console';
+ document.body.appendChild(container);
+ if (toolGroup === null) {
+ container.textContent =
+ 'No tools found. Import react-devtools-cdt-mcp/register before React.';
+ return;
+ }
+ const {tools} = toolGroup;
+ container.innerHTML = `
+ Tool console
+
+
+
+
+ Run tool
+ Pick element
+
+
+ `;
+ const select = container.querySelector('select');
+ const description = container.querySelector('.description');
+ const textarea = container.querySelector('textarea');
+ const runButton = container.querySelector('.run');
+ const pickButton = container.querySelector('.pick');
+ const output = container.querySelector('pre');
+ let pickedElement = null;
+
+ for (const tool of tools) {
+ const option = document.createElement('option');
+ option.value = tool.name;
+ option.textContent = tool.name;
+ select.appendChild(option);
+ }
+
+ function selectTool() {
+ const tool = tools.find(t => t.name === select.value);
+ description.textContent = tool.description;
+ textarea.value = JSON.stringify(exampleParams(tools, tool.name));
+ pickButton.hidden = tool.name !== 'react_get_component_by_dom_element';
+ pickedElement = null;
+ }
+
+ function run() {
+ const tool = tools.find(t => t.name === select.value);
+ let params;
+ try {
+ params = JSON.parse(textarea.value || '{}');
+ } catch (error) {
+ output.textContent = 'Invalid JSON: ' + error.message;
+ return;
+ }
+ if (tool.name === 'react_get_component_by_dom_element') {
+ params.element = pickedElement;
+ }
+ const result = tool.execute(params);
+ output.textContent = JSON.stringify(result, null, 2);
+ }
+
+ pickButton.addEventListener('click', () => {
+ output.textContent = 'Click any element in the app above...';
+ document.addEventListener(
+ 'click',
+ event => {
+ if (container.contains(event.target)) {
+ return;
+ }
+ event.preventDefault();
+ event.stopPropagation();
+ pickedElement = event.target;
+ textarea.value = JSON.stringify({
+ element: '<' + event.target.tagName.toLowerCase() + '>',
+ });
+ run();
+ },
+ {capture: true, once: true},
+ );
+ });
+ select.addEventListener('change', selectTool);
+ runButton.addEventListener('click', run);
+ selectTool();
+}
+```
+
+```css src/styles.css hidden
+header { display: flex; gap: 8px; align-items: center; margin-bottom: 8px; }
+.badge { padding: 2px 8px; border-radius: 10px; background: #087ea4; color: white; }
+ul { padding-left: 20px; max-height: 160px; overflow: auto; }
+.tool-console { margin-top: 20px; padding-top: 12px; border-top: 1px solid #ddd; }
+.tool-console select, .tool-console textarea { width: 100%; font-family: monospace; }
+.tool-console .actions { display: flex; gap: 8px; margin: 8px 0; }
+.tool-console pre { background: #f6f7f9; padding: 8px; max-height: 300px; overflow: auto; }
+```
+
+```json package.json hidden
+{
+ "dependencies": {
+ "react": "latest",
+ "react-dom": "latest",
+ "react-scripts": "latest",
+ "react-devtools-cdt-mcp": "0.0.1"
+ },
+ "scripts": {
+ "start": "react-scripts start",
+ "build": "react-scripts build",
+ "test": "react-scripts test --env=jsdom",
+ "eject": "react-scripts eject"
+ }
+}
+```
+
+
+
+
+
+The tool console in this sandbox stands in for Chrome DevTools MCP so you can try the tools on this page. In your own app, you don't write any of this code: Chrome DevTools MCP discovers the tools and your agent decides which ones to call.
+
+
+
+---
+
+## Reference {/*reference*/}
+
+### Tools {/*tools*/}
+
+`react-devtools-cdt-mcp` registers a tool group called `react`. Your agent calls these tools through Chrome DevTools MCP.
+
+* `react_get_component_tree`: Returns a snapshot of the component tree.
+* `react_find_components`: Finds components by name.
+* `react_get_component_by_uid`: Returns a component's props and Hooks.
+* `react_get_component_by_dom_element`: Returns the React host component for a DOM element.
+* `react_get_parent_stack`: Returns where a component is mounted in the tree.
+* `react_get_owner_stack`: Returns the components that created a component in their JSX.
+* `react_get_owner_stack_trace`: Returns the owner stack of a component as a stack trace.
+* `react_get_component_source`: Returns where a component is defined.
+* `react_start_profiling`: Starts recording render timing.
+* `react_stop_profiling`: Stops recording render timing.
+* `react_get_trace_overview`: Returns a summary of every commit in a recording.
+* `react_get_commit_report`: Returns which components rendered in a commit and how long each took.
+
+Components are identified by short, stable uids like `"r5"`. A uid stays the same across every tool and across re-renders, but not across page reloads.
+
+Every tool returns a plain, serializable object. If a tool fails, it returns an object with an `error` message instead.
+
+---
+
+### `register(target?)` {/*register*/}
+
+Call `register` to install the React DevTools hook and register the React tools with Chrome DevTools MCP yourself, instead of importing `react-devtools-cdt-mcp/register`.
+
+```js
+import { register } from 'react-devtools-cdt-mcp';
+
+register();
+```
+
+#### Parameters {/*register-parameters*/}
+
+* **optional** `target`: The global object to install the hook on. Defaults to `globalThis`.
+
+#### Returns {/*register-returns*/}
+
+`register` returns an object with two properties:
+
+* `facade`: The installed React DevTools hook and the state the tools read from.
+* `unregister`: A function that stops registering the React tools with Chrome DevTools MCP.
+
+#### Caveats {/*register-caveats*/}
+
+* Call `register` before React initializes, or React won't connect to the hook.
+* Calling `register` again for the same `target` returns the existing registration.
+
+---
+
+## Troubleshooting {/*troubleshooting*/}
+
+#### My agent doesn't see any React tools {/*my-agent-doesnt-see-any-react-tools*/}
+
+Check that [third-party developer tools](https://developer.chrome.com/blog/devtools-for-agents-3p-tools) are enabled in your Chrome DevTools MCP setup. Then check that the page selected in Chrome DevTools MCP imports `react-devtools-cdt-mcp/register`. The tools are discovered per page, when the page loads or is selected.
+
+#### The component tree is empty {/*the-component-tree-is-empty*/}
+
+`react-devtools-cdt-mcp/register` was imported after React initialized. Move the import to the very first line of your entry file, before any import that loads `react-dom`.
+
+#### I'm getting an error about a browser-like environment {/*im-getting-an-error-about-a-browser-like-environment*/}
+
+`react-devtools-cdt-mcp/register` throws if it's imported outside a browser, for example during server rendering or in tests. Import it only from client-side code, or call `register()` from the package root yourself where it's safe.
+
+#### Source locations and owner stacks are empty {/*source-locations-and-owner-stacks-are-empty*/}
+
+This data only exists in development builds of React. Make sure you're running your app's development server rather than a production build.
+
+#### A uid stopped working {/*a-uid-stopped-working*/}
+
+Uids don't survive page reloads. After a reload, get fresh uids with `react_get_component_tree` or `react_find_components`.
diff --git a/src/content/reference/dev-tools/react-performance-tracks.md b/src/content/reference/dev-tools/react-performance-tracks.md
index 762c8ab59..d74c7ea3b 100644
--- a/src/content/reference/dev-tools/react-performance-tracks.md
+++ b/src/content/reference/dev-tools/react-performance-tracks.md
@@ -140,8 +140,13 @@ Scheduler๋ ์ฐ์ ์์๊ฐ ๋ค๋ฅธ ์์
์ ๊ด๋ฆฌํ๋ ๋ฐ ์ฌ์ฉ๋๋ Reac
์๋ฒ ์์ฒญ ํธ๋์ ์ต์ข
์ ์ผ๋ก React ์๋ฒ ์ปดํฌ๋ํธ๋ก ๊ท๊ฒฐ๋๋ ๋ชจ๋ Promise๋ฅผ ์๊ฐํํฉ๋๋ค. ์ฌ๊ธฐ์๋ `fetch` ํธ์ถ์ด๋ ๋น๋๊ธฐ Node.js ํ์ผ ์์
๊ณผ ๊ฐ์ ๋ชจ๋ ๋น๋๊ธฐ(async) ์์
์ด ํฌํจ๋ฉ๋๋ค.
+<<<<<<< HEAD
React๋ ์๋ ํํฐ ์ฝ๋ ๋ด๋ถ์์ ์์๋ Promise๋ฅผ **ํผ์คํธ ํํฐ(1st party) ์ฝ๋**๋ฅผ ์ฐจ๋จํ๋ ์ ์ฒด ์์
์ ์ง์ ์๊ฐ์ ๋ํ๋ด๋ ๋จ์ผ ์คํฌ์ผ๋ก ๊ฒฐํฉํ๋ ค๊ณ ์๋ํฉ๋๋ค.
์๋ฅผ ๋ค์ด, ๋ด๋ถ์ ์ผ๋ก `fetch`๋ฅผ ์ฌ๋ฌ ๋ฒ ํธ์ถํ๋ ์๋ ํํฐ ๋ผ์ด๋ธ๋ฌ๋ฆฌ ๋ฉ์๋ `getUser`๋ ์ฌ๋ฌ `fetch` ์คํฌ์ ํ์ํ๋ ๋์ `getUser`๋ผ๋ ๋จ์ผ ์คํฌ์ผ๋ก ํํ๋ฉ๋๋ค.
+=======
+React will try to combine Promises that are started from inside third-party code into a single span representing the duration of the entire operation blocking 1st party code.
+For example, a third party library method called `getUser` that calls `fetch` internally multiple times will be represented as a single span called `getUser`, instead of showing multiple `fetch` spans.
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
์คํฌ์ ํด๋ฆญํ๋ฉด Promise๊ฐ ์์ฑ๋ ์์น์ ์คํ ํธ๋ ์ด์ค์ ํจ๊ป, ๊ฐ๋ฅํ ๊ฒฝ์ฐ **Promise๊ฐ ํด๊ฒฐ(resolve)๋ ๊ฐ**์ ๋ทฐ๊ฐ ํ์๋ฉ๋๋ค.
@@ -155,5 +160,10 @@ Promise๋ฅผ awaitํ๋ฉด React๊ฐ ํด๋น Promise์ ์ง์ ์๊ฐ์ **ํ์ธํ
๋ ๋๋ง ์ง์ ์๊ฐ์ ๋ฐ๋ผ ๋ค๋ฅธ ์์์ผ๋ก ํ์๋ฉ๋๋ค. ์์ด ์ด๋์ธ์๋ก ์ง์ ์๊ฐ์ด ๋ ๊ธธ๋ค๋ ๊ฒ์ ์๋ฏธํฉ๋๋ค.
+<<<<<<< HEAD
์๋ฒ ์ปดํฌ๋ํธ ํธ๋ ๊ทธ๋ฃน์๋ ํญ์ "Primary" ํธ๋์ด ํฌํจ๋ฉ๋๋ค. React๊ฐ ์๋ฒ ์ปดํฌ๋ํธ๋ฅผ **๋์(concurrently)์** ๋ ๋๋งํ ์ ์๋ ๊ฒฝ์ฐ ์ถ๊ฐ์ ์ธ "Parallel" ํธ๋์ด ํ์๋ฉ๋๋ค.
8๊ฐ ์ด์์ ์๋ฒ ์ปดํฌ๋ํธ๊ฐ ๋์์ ๋ ๋๋ง๋๋ฉด React๋ ํธ๋์ ๊ณ์ ์ถ๊ฐํ๋ ๋์ ๋ง์ง๋ง "Parallel" ํธ๋์ ์ฐ๊ฒฐํ์ฌ ํ์ํฉ๋๋ค.
+=======
+The Server Components track group will always contain a "Primary" track. If React is able to render Server Components concurrently, it will display additional "Parallel" tracks.
+If more than 8 Server Components are rendered concurrently, React will associate them with the last "Parallel" track instead of adding more tracks.
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
diff --git a/src/content/reference/eslint-plugin-react-hooks/lints/set-state-in-render.md b/src/content/reference/eslint-plugin-react-hooks/lints/set-state-in-render.md
index f2e1484bf..7d7c54f33 100644
--- a/src/content/reference/eslint-plugin-react-hooks/lints/set-state-in-render.md
+++ b/src/content/reference/eslint-plugin-react-hooks/lints/set-state-in-render.md
@@ -107,4 +107,8 @@ function Counter({max}) {
์ด์ setter๋ ํด๋ฆญ์ ๋ํ ์๋ต์ผ๋ก๋ง ์คํ๋๊ณ , React๋ ์ ์์ ์ผ๋ก ๋ ๋๋ง์ ์๋ฃํ๋ฉฐ, `count`๋ ์ ๋ `max`๋ฅผ ๋์ง ์์ต๋๋ค.
+<<<<<<< HEAD
๋๋ฌธ ๊ฒฝ์ฐ์ง๋ง ์ด์ ๋ ๋๋ง์ ์ ๋ณด๋ฅผ ๊ธฐ๋ฐ์ผ๋ก state๋ฅผ ์กฐ์ ํด์ผ ํ ์ ์์ต๋๋ค. ๊ทธ๋ฐ ๊ฒฝ์ฐ ์กฐ๊ฑด๋ถ๋ก state๋ฅผ ์ค์ ํ๋ [์ด ํจํด](/reference/react/useState#storing-information-from-previous-renders)์ ๋ฐ๋ฅด์ธ์.
+=======
+In rare cases, you may need to adjust state based on information from previous renders. For those, follow [this pattern](/reference/react/useState#storing-information-from-previous-renders) of setting state conditionally.
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
diff --git a/src/content/reference/eslint-plugin-react-hooks/lints/use-memo.md b/src/content/reference/eslint-plugin-react-hooks/lints/use-memo.md
index 473079b0e..a1f3ddd87 100644
--- a/src/content/reference/eslint-plugin-react-hooks/lints/use-memo.md
+++ b/src/content/reference/eslint-plugin-react-hooks/lints/use-memo.md
@@ -79,7 +79,11 @@ function Component({user}) {
}
```
+<<<<<<< HEAD
๋ถ์ ํจ๊ณผ๊ฐ React state๋ฅผ ์ธ๋ถ state์ ๋๊ธฐํํ๋ ๊ฒฝ์ฐ(๋๋ ๊ทธ ๋ฐ๋) `useEffect`๋ฅผ ์ฌ์ฉํ์ธ์.
+=======
+If the side effect synchronizes React state with some external state (or vice versa), use `useEffect`:
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
```js
// โ
์ข์ ์์: useEffect์์ ๋๊ธฐํ
diff --git a/src/content/reference/react-compiler/directives.md b/src/content/reference/react-compiler/directives.md
index c58fcb63c..1fbca6c01 100644
--- a/src/content/reference/react-compiler/directives.md
+++ b/src/content/reference/react-compiler/directives.md
@@ -193,6 +193,12 @@ function ProblematicComponent() {
## ์ฐธ๊ณ {/*see-also*/}
+<<<<<<< HEAD
* [`compilationMode`](/reference/react-compiler/compilationMode) - ์ปดํ์ผ๋ฌ๊ฐ ์ต์ ํ ๋์์ ์ ํํ๋ ๋ฐฉ์์ ์ค์ ํฉ๋๋ค.
* [`Configuration`](/reference/react-compiler/configuration) - ์ ์ฒด ์ปดํ์ผ๋ฌ ์ค์ ์ต์
.
* [React Compiler documentation](/learn/react-compiler) - ์์ ๊ฐ์ด๋.
+=======
+* [`compilationMode`](/reference/react-compiler/compilationMode) - Configure how the compiler chooses what to optimize
+* [`Configuration`](/reference/react-compiler/configuration) - Full compiler configuration options
+* [React Compiler documentation](/learn/react-compiler) - Getting started guide
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
diff --git a/src/content/reference/react-dom/client/createRoot.md b/src/content/reference/react-dom/client/createRoot.md
index e71aad0de..d209adf23 100644
--- a/src/content/reference/react-dom/client/createRoot.md
+++ b/src/content/reference/react-dom/client/createRoot.md
@@ -88,7 +88,11 @@ React๋ `root`์ ` `์ ํ์ํ๊ณ ๊ทธ ์์ ์๋ DOM์ ๊ด๋ฆฌํฉ
* ๋์ผํ ๋ฃจํธ์์ `render`๋ฅผ ๋ ๋ฒ ์ด์ ํธ์ถํ๋ฉด, React๋ ํ์์ ๋ฐ๋ผ DOM์ ์
๋ฐ์ดํธํ์ฌ ์ฌ์ฉ์๊ฐ ์ ๋ฌํ ์ต์ JSX๋ฅผ ๋ฐ์ํฉ๋๋ค. React๋ ์ด์ ์ ๋ ๋๋ง ๋ ํธ๋ฆฌ์ ["๋น๊ต"](/learn/preserving-and-resetting-state)ํด์ ์ฌ์ฌ์ฉํ ์ ์๋ ๋ถ๋ถ๊ณผ ๋ค์ ๋ง๋ค์ด์ผ ํ๋ ๋ถ๋ถ์ ๊ฒฐ์ ํฉ๋๋ค. ๋์ผํ ๋ฃจํธ์์ `render`๋ฅผ ๋ค์ ํธ์ถํ๋ ๊ฒ์ ๋ฃจํธ ์ปดํฌ๋ํธ์์ [`set` ํจ์](/reference/react/useState#setstate)๋ฅผ ํธ์ถํ๋ ๊ฒ๊ณผ ๋น์ทํฉ๋๋ค. React๋ ๋ถํ์ํ DOM ์
๋ฐ์ดํธ๋ฅผ ํผํฉ๋๋ค.
+<<<<<<< HEAD
* ๋ ๋๋ง์ด ์์๋ ์ดํ์๋ ๋๊ธฐ์ ์ผ๋ก ์คํ๋์ง๋ง, `root.render(...)` ์์ฒด๋ ๋น๋๊ธฐ์ ์
๋๋ค. ์ฆ, `root.render()` ์ดํ์ ์์ฑ๋ ์ฝ๋๊ฐ ํด๋น ๋ ๋๋ง์ `useLayoutEffect`๋ `useEffect`๋ณด๋ค ๋จผ์ ์คํ๋ ์ ์์ต๋๋ค. ์ผ๋ฐ์ ์ธ ์ํฉ์์๋ ์ด๋ฌํ ๋์๋ ๋ฌธ์ ์์ด ์ ์๋ํ๋ฉฐ, ๋๋ถ๋ถ ์์ ์ด ํ์ํ์ง ์์ต๋๋ค. ๋ค๋ง, Effect์ ์คํ ์์๊ฐ ์ค์ํ ๊ฒฝ์ฐ์๋ [`flushSync`](/reference/react-dom/flushSync)๋ก `root.render(...)` ํธ์ถ์ ๊ฐ์ธ๋ฉด ์ด๊ธฐ ๋ ๋๋ง์ด ์์ ํ ๋๊ธฐ์ ์ผ๋ก ์คํ๋๋๋ก ๋ณด์ฅํ ์ ์์ต๋๋ค.
+=======
+* Although rendering is synchronous once it starts, `root.render(...)` is not. This means code after `root.render()` may run before any effects (`useLayoutEffect`, `useEffect`) of that specific render are fired. This is usually fine and rarely needs adjustment. In rare cases where effect timing matters, you can wrap `root.render(...)` in [`flushSync`](/reference/react-dom/flushSync) to ensure the initial render runs fully synchronously.
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
```js
const root = createRoot(document.getElementById('root'));
@@ -376,7 +380,11 @@ const root = createRoot(container, {
1. ๋ฐ์ํ error ๊ฐ์ฒด.
2. ์ค๋ฅ์ componentStack ์ ๋ณด๋ฅผ ํฌํจํ errorInfo ๊ฐ์ฒด.
+<<<<<<< HEAD
`onUncaughtError`์ `onRecoverableError`๋ฅผ ํจ๊ป ์ฌ์ฉํ๋ฉด, ์ฌ์ฉ์ ์ ์ ์ค๋ฅ ๋ณด๊ณ ์์คํ
์ ๊ตฌํํ ์ ์์ต๋๋ค.
+=======
+Together with `onUncaughtError` and `onRecoverableError`, you can implement your own error reporting system:
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
@@ -414,9 +422,15 @@ import {
const container = document.getElementById("root");
const root = createRoot(container, {
+<<<<<<< HEAD
// ๊ฐ๋ฐ ํ๊ฒฝ์์๋ ์ด ์ต์
๋ค์ ์ ๊ฑฐํ๊ณ
// React์ ๊ธฐ๋ณธ ํธ๋ค๋ฌ๋ฅผ ์ฌ์ฉํ๊ฑฐ๋ ์ง์ ์ค๋ฒ๋ ์ด๋ฅผ ๊ตฌํํ๋ ๊ฒ์ ๊ถ์ฅํฉ๋๋ค.
// ์ฌ๊ธฐ์๋ ํธ์๋ฅผ ์ํด ์กฐ๊ฑด ์์ด ํธ๋ค๋ฌ๋ฅผ ์ง์ ํ์ต๋๋ค.
+=======
+ // Keep in mind to remove these options in development to leverage
+ // React's default handlers or implement your own overlay for development.
+ // The handlers are only specified unconditionally here for demonstration purposes.
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
onCaughtError: onCaughtErrorProd,
onRecoverableError: onRecoverableErrorProd,
onUncaughtError: onUncaughtErrorProd,
diff --git a/src/content/reference/react-dom/client/hydrateRoot.md b/src/content/reference/react-dom/client/hydrateRoot.md
index 471348985..fcb03c60f 100644
--- a/src/content/reference/react-dom/client/hydrateRoot.md
+++ b/src/content/reference/react-dom/client/hydrateRoot.md
@@ -120,7 +120,11 @@ Calling `root.unmount` will unmount all the components in the root and "detach"
### ์๋ฒ์์ ๋ ๋๋ง๋ HTML์ Hydrateํ๊ธฐ {/*hydrating-server-rendered-html*/}
+<<<<<<< HEAD
[`react-dom/server`](/reference/react-dom/client/createRoot)๋ก ์ฑ์ HTML์ ์์ฑํ๋ค๋ฉด, ํด๋ผ์ด์ธํธ์์ *Hydrate* ํด์ฃผ์ด์ผ ํฉ๋๋ค.
+=======
+If your app's HTML was generated by [`react-dom/server`](/reference/react-dom/server), you need to *hydrate* it on the client.
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
```js [[1, 3, "document.getElementById('root')"], [2, 3, " "]]
import { hydrateRoot } from 'react-dom/client';
@@ -440,9 +444,15 @@ import {
const container = document.getElementById("root");
hydrateRoot(container, , {
+<<<<<<< HEAD
// ๊ฐ๋ฐ ํ๊ฒฝ์์๋ ์ด ์ต์
๋ค์ ์ ๊ฑฐํ๊ณ
// React์ ๊ธฐ๋ณธ ํธ๋ค๋ฌ๋ฅผ ์ฌ์ฉํ๊ฑฐ๋ ์ง์ ์ค๋ฒ๋ ์ด๋ฅผ ๊ตฌํํ๋ ๊ฒ์ ๊ถ์ฅํฉ๋๋ค.
// ์ฌ๊ธฐ์๋ ํธ์๋ฅผ ์ํด ์กฐ๊ฑด ์์ด ํธ๋ค๋ฌ๋ฅผ ์ง์ ํ์ต๋๋ค.
+=======
+ // Keep in mind to remove these options in development to leverage
+ // React's default handlers or implement your own overlay for development.
+ // The handlers are only specified unconditionally here for demonstration purposes.
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
onCaughtError: onCaughtErrorProd,
onRecoverableError: onRecoverableErrorProd,
onUncaughtError: onUncaughtErrorProd,
diff --git a/src/content/reference/react-dom/components/common.md b/src/content/reference/react-dom/components/common.md
index 0ceb161aa..147b0bca4 100644
--- a/src/content/reference/react-dom/components/common.md
+++ b/src/content/reference/react-dom/components/common.md
@@ -257,9 +257,15 @@ title: "๊ณตํต ์ปดํฌ๋ํธ (์: )"
[`ref` ์ฝ๋ฐฑ์ ์ฌ์ฉํ๋ ์์๋ฅผ ํ์ธํด ๋ณด์ธ์.](/learn/manipulating-the-dom-with-refs#how-to-manage-a-list-of-refs-using-a-ref-callback)
+<<<<<<< HEAD
ํ๋ฉด์ `
` DOM ๋
ธ๋๊ฐ ์ถ๊ฐ๋๋ฉด, React๋ `ref` ์ฝ๋ฐฑ์ ํธ์ถํ๊ณ ๊ทธ ์ธ์๋ก DOM `node`๋ฅผ ์ ๋ฌํฉ๋๋ค. ํด๋น `
` DOM ๋
ธ๋๊ฐ ์ ๊ฑฐ๋๋ฉด, React๋ ์ฝ๋ฐฑ์์ ๋ฐํํ Cleanup ํจ์๋ฅผ ํธ์ถํฉ๋๋ค.
React๋ *๋ค๋ฅธ* `ref` ์ฝ๋ฐฑ์ ์ ๋ฌํ ๋๋ง๋ค `ref` ์ฝ๋ฐฑ๋ ํธ์ถํฉ๋๋ค. ์ ์์์์ `(node) => { ... }`๋ ๋ ๋๋ง๋ง๋ค ์๋ก ๋ค๋ฅธ ํจ์์
๋๋ค. ์ปดํฌ๋ํธ๊ฐ ๋ค์ ๋ ๋๋ง ๋ ๋, *์ด์ * ํจ์๋ ์ธ์๋ก `null`์ ๋ฐ์ ํธ์ถ๋๊ณ , *๋ค์* ํจ์๋ DOM ๋
ธ๋๋ฅผ ์ธ์๋ก ๋ฐ์ ํธ์ถ๋ฉ๋๋ค.
+=======
+When the `
` DOM node is added to the screen, React will call your `ref` callback with the DOM `node` as the argument. When that `
` DOM node is removed, React will call the cleanup function returned from the callback.
+
+React will also call your `ref` callback whenever you pass a *different* `ref` callback. In the above example, `(node) => { ... }` is a different function on every render. When your component re-renders, the cleanup function returned by the *previous* function will be called, and the *next* function will be called with the DOM node. If no cleanup function is returned, the *previous* function will be called with `null` as the argument instead.
+>>>>>>> 46a54e0592729712b7640308b53268e84fdc7c9f
#### ๋งค๊ฐ๋ณ์ {/*ref-callback-parameters*/}
diff --git a/src/content/reference/react-dom/components/form.md b/src/content/reference/react-dom/components/form.md
index f4df10742..eac77e476 100644
--- a/src/content/reference/react-dom/components/form.md
+++ b/src/content/reference/react-dom/components/form.md
@@ -38,27 +38,97 @@ title: "