diff --git a/.github/ISSUE_TEMPLATE/3-framework.yml b/.github/ISSUE_TEMPLATE/3-framework.yml
new file mode 100644
index 000000000..87f03a660
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/3-framework.yml
@@ -0,0 +1,116 @@
+name: "๐ Suggest new framework"
+description: "I am a framework author applying to be included as a recommended framework."
+title: "[Framework]: "
+labels: ["type: framework"]
+body:
+ - type: markdown
+ attributes:
+ value: |
+ ## Apply to be included as a recommended React framework
+
+ _This form is for framework authors to apply to be included as a recommended [React framework](https://react.dev/learn/creating-a-react-app). If you are not a framework author, please contact the authors before submitting._
+
+ Our goal when recommending a framework is to start developers with a React project that solves common problems like code splitting, data fetching, routing, and HTML generation without any extra work later. We believe this will allow users to get started quickly with React, and scale their app to production.
+
+ While we understand that many frameworks may want to be featured, this page is not a place to advertise every possible React framework or all frameworks that you can add React to. There are many great frameworks that offer support for React that are not listed in our guides. The frameworks we recommend have invested significantly in the React ecosystem, and collaborated with the React team to be compatible with our [full-stack React architecture vision](https://react.dev/learn/creating-a-react-app#which-features-make-up-the-react-teams-full-stack-architecture-vision).
+
+ To be included, frameworks must meet the following criteria:
+
+ - **Free & open-source**: must be open source and free to use.
+ - **Well maintained**. must be actively maintained, providing bug fixes and improvements.
+ - **Active community**: must have a sufficiently large and active community to support users.
+ - **Clear onboarding**: must have clear install steps to install the React version of the framework.
+ - **Ecosystem compatibility**: must support using the full range of libraries and tools in the React ecosystem.
+ - **Self-hosting option**: must support an option to self-host applications without losing access to features.
+ - **Developer experience**. must allow developers to be productive by supporting features like Fast Refresh.
+ - **User experience**. must provide built-in support for common problems like routing and data-fetching.
+ - **Compatible with our future vision for React**. React evolves over time, and frameworks that do not align with Reactโs direction risk isolating their users from the main React ecosystem over time. To be included on this page we must feel confident that the framework is setting its users up for success with React over time.
+
+ Please note, we have reviewed most of the popular frameworks available today, so it is unlikely we have not considered your framework already. But if you think we missed something, please complete the application below.
+ - type: input
+ attributes:
+ label: Name
+ description: |
+ What is the name of your framework?
+ validations:
+ required: true
+ - type: input
+ attributes:
+ label: Homepage
+ description: |
+ What is the URL of your homepage?
+ validations:
+ required: true
+ - type: input
+ attributes:
+ label: Install instructions
+ description: |
+ What is the URL of your getting started guide?
+ validations:
+ required: true
+ - type: dropdown
+ attributes:
+ label: Is your framework open source?
+ description: |
+ We only recommend free and open source frameworks.
+ options:
+ - 'No'
+ - 'Yes'
+ validations:
+ required: true
+ - type: textarea
+ attributes:
+ label: Well maintained
+ description: |
+ Please describe how your framework is actively maintained. Include recent releases, bug fixes, and improvements as examples.
+ validations:
+ required: true
+ - type: textarea
+ attributes:
+ label: Active community
+ description: |
+ Please describe your community. Include the size of your community, and links to community resources.
+ validations:
+ required: true
+ - type: textarea
+ attributes:
+ label: Clear onboarding
+ description: |
+ Please describe how a user can install your framework with React. Include links to any relevant documentation.
+ validations:
+ required: true
+ - type: textarea
+ attributes:
+ label: Ecosystem compatibility
+ description: |
+ Please describe any limitations your framework has with the React ecosystem. Include any libraries or tools that are not compatible with your framework.
+ validations:
+ required: true
+ - type: textarea
+ attributes:
+ label: Self-hosting option
+ description: |
+ Please describe how your framework supports self-hosting. Include any limitations to features when self-hosting. Also include whether you require a server to deploy your framework.
+ validations:
+ required: true
+ - type: textarea
+ attributes:
+ label: Developer Experience
+ description: |
+ Please describe how your framework provides a great developer experience. Include any limitations to React features like React DevTools, Chrome DevTools, and Fast Refresh.
+ validations:
+ required: true
+ - type: textarea
+ attributes:
+ label: User Experience
+ description: |
+ Please describe how your framework helps developers create high quality user experiences by solving common use-cases. Include specifics for how your framework offers built-in support for code-splitting, routing, HTML generation, and data-fetching in a way that avoids client/server waterfalls by default. Include details on how you offer features such as SSG and SSR.
+ validations:
+ required: true
+ - type: textarea
+ attributes:
+ label: Compatible with our future vision for React
+ description: |
+ Please describe how your framework aligns with our future vision for React. Include how your framework will evolve with React over time, and your plans to support future React features like React Server Components.
+ validations:
+ required: true
diff --git a/plugins/remark-smartypants.js b/plugins/remark-smartypants.js
index f56f14b61..c819624ba 100644
--- a/plugins/remark-smartypants.js
+++ b/plugins/remark-smartypants.js
@@ -14,12 +14,24 @@ const visit = require('unist-util-visit');
const retext = require('retext');
const smartypants = require('retext-smartypants');
-function check(parent) {
+function check(node, parent) {
+ if (node.data?.skipSmartyPants) return false;
if (parent.tagName === 'script') return false;
if (parent.tagName === 'style') return false;
return true;
}
+function markSkip(node) {
+ if (!node) return;
+ node.data ??= {};
+ node.data.skipSmartyPants = true;
+ if (Array.isArray(node.children)) {
+ for (const child of node.children) {
+ markSkip(child);
+ }
+ }
+}
+
module.exports = function (options) {
const processor = retext().use(smartypants, {
...options,
@@ -43,8 +55,14 @@ module.exports = function (options) {
let startIndex = 0;
const textOrInlineCodeNodes = [];
+ visit(tree, 'mdxJsxFlowElement', (node) => {
+ if (['TerminalBlock'].includes(node.name)) {
+ markSkip(node); // Mark all children to skip smarty pants
+ }
+ });
+
visit(tree, ['text', 'inlineCode'], (node, _, parent) => {
- if (check(parent)) {
+ if (check(node, parent)) {
if (node.type === 'text') allText += node.value;
// for the case when inlineCode contains just one part of quote: `foo'bar`
else allText += 'A'.repeat(node.value.length);
diff --git a/src/components/Layout/HomeContent.js b/src/components/Layout/HomeContent.js
index 2148fd7f2..3f9a52f98 100644
--- a/src/components/Layout/HomeContent.js
+++ b/src/components/Layout/HomeContent.js
@@ -297,8 +297,13 @@ export function HomeContent() {
ํ๋ ์์ํฌ๋ก ์์ํ๊ธฐ
+=======
+ href="/learn/creating-a-react-app">
+ Get started with a framework
+>>>>>>> 2534424ec6c433cc2c811d5a0bd5a65b75efa5f0
diff --git a/src/components/MDX/TerminalBlock.tsx b/src/components/MDX/TerminalBlock.tsx
index f9a0766e4..a4c1e3e23 100644
--- a/src/components/MDX/TerminalBlock.tsx
+++ b/src/components/MDX/TerminalBlock.tsx
@@ -79,13 +79,15 @@ function TerminalBlock({level = 'info', children}: TerminalBlockProps) {
-
-
- {message}
-
+
+
+ {message}
+
+
);
}
diff --git a/src/content/blog/2023/03/22/react-labs-what-we-have-been-working-on-march-2023.md b/src/content/blog/2023/03/22/react-labs-what-we-have-been-working-on-march-2023.md
index dcc29aab1..913b822d2 100644
--- a/src/content/blog/2023/03/22/react-labs-what-we-have-been-working-on-march-2023.md
+++ b/src/content/blog/2023/03/22/react-labs-what-we-have-been-working-on-march-2023.md
@@ -31,7 +31,11 @@ RSC๋ ์๋ฒ ์ค์ฌ์ ๋ฉํฐ ํ์ด์ง ์ ํ๋ฆฌ์ผ์ด์ ์ ๊ฐ๋จํ "์์ฒญ
์ด์ ๋ฐ์ดํฐ ๊ฐ์ ธ์ค๊ธฐFetching๊ฐ ์ด๋ ์ ๋ ์ ์ ๋ฆฌ๋์์ผ๋ฏ๋ก ๋ค๋ฅธ ๋ฐฉํฅ์ ์ดํด๋ณด๊ณ ์์ต๋๋ค. ๋ฐ๋ก ํด๋ผ์ด์ธํธ์์ ์๋ฒ๋ก ๋ฐ์ดํฐ๋ฅผ ์ ์กํ์ฌ ๋ฐ์ดํฐ๋ฒ ์ด์ค ๋ณ๊ฒฝ์ ์คํํ๊ณ ํผ์ ๊ตฌํํ ์ ์๋๋ก ํ๋ ๊ฒ์ ๋๋ค. ์๋ฒ์ ํด๋ผ์ด์ธํธ์ ๊ฒฝ๊ณ๋ฅผ ๋์ด ์๋ฒ ์ก์ ํจ์๋ฅผ ์ ๋ฌํ๋ฉด ํด๋ผ์ด์ธํธ๊ฐ ์ด๋ฅผ ํธ์ถํ์ฌ ์ํํ RPC๋ฅผ ์ ๊ณตํ ์ ์์ต๋๋ค. ์๋ฒ ์ก์ ์ ๋ํ ์๋ฐ์คํฌ๋ฆฝํธ๋ฅผ ๋ถ๋ฌ์ค๊ธฐ ์ ์ ์ ์ง์ ์ผ๋ก ํฅ์๋ ํผ์ ์ ๊ณตํฉ๋๋ค.
+<<<<<<< HEAD
React ์๋ฒ ์ปดํฌ๋ํธ๋ [Next.js App ๋ผ์ฐํฐ](/learn/start-a-new-react-project#nextjs-app-router)์ ํฌํจ๋์ด ์์ต๋๋ค. Next.js์์๋ ๋ผ์ฐํฐ์ ๊น์ ๊ฒฐํฉ์ ํตํด RSC๋ฅผ ๊ธฐ๋ณธ ์์๋ก ๋ฐ์๋ค์ด๋ ๊ฒ์ ๋ณด์ฌ์ค๋๋ค. ๊ทธ๋ฌ๋ ์ด ๋ฐฉ๋ฒ์ด RSC์ ํธํํ ์ ์๋ ๋ผ์ฐํฐ๋ ํ๋ ์์ํฌ๋ฅผ ๊ตฌ์ถํ๋ ์ ์ผํ ๋ฐฉ๋ฒ์ ์๋๋๋ค. RSC ๋ช ์ธ์ ๊ตฌํ์์ ์ ๊ณตํ๋ ๊ธฐ๋ฅ์๋ ๋ช ํํ ๊ตฌ๋ถ์ด ์์ต๋๋ค. React ์๋ฒ ์ปดํฌ๋ํธ๋ ํธํํ ์ ์๋ React ํ๋ ์์ํฌ์์ ๋์ํ๋ ์ปดํฌ๋ํธ์ ๋ํ ๋ช ์ธ์ ๋๋ค.
+=======
+React Server Components has shipped in [Next.js App Router](/learn/creating-a-react-app#nextjs-app-router). This showcases a deep integration of a router that really buys into RSC as a primitive, but it's not the only way to build a RSC-compatible router and framework. There's a clear separation for features provided by the RSC spec and implementation. React Server Components is meant as a spec for components that work across compatible React frameworks.
+>>>>>>> 2534424ec6c433cc2c811d5a0bd5a65b75efa5f0
์ฐ๋ฆฌ๋ ์ผ๋ฐ์ ์ผ๋ก ๊ธฐ์กด ํ๋ ์์ํฌ๋ฅผ ๊ถ์ฅํ์ง๋ง, ์ง์ ์ฌ์ฉ์ ์ง์ ํ๋ ์์ํฌ๋ฅผ ๊ตฌ์ถํด์ผ ํ๋ ๊ฒฝ์ฐ๋ ๊ฐ๋ฅํฉ๋๋ค. RSC์ ํธํํ ์ ์๋ ํ๋ ์์ํฌ๋ฅผ ์ง์ ๊ตฌ์ถํ๋ ๊ฒ์ ๋ฒ๋ค๋ฌ์์ ๊น์ ๊ฒฐํฉ์ ํ์๋กํ๊ธฐ ๋๋ฌธ์ ์๊ฐ๋งํผ ์ฝ์ง ์์ต๋๋ค. ํ์ฌ ์ธ๋์ ๋ฒ๋ค๋ฌ๋ ํด๋ผ์ด์ธํธ์์ ์ฌ์ฉํ๊ธฐ์๋ ํ๋ฅญํ์ง๋ง, ์๋ฒ์ ํด๋ผ์ด์ธํธ ๊ฐ์ ๋จ์ผ ๋ชจ๋ ๊ทธ๋ํ๋ฅผ ๋ถํ ํ๋ ๊ฒ์ ์ฐ์ ์ผ๋ก ์ง์ํ๋๋ก ์ค๊ณ๋์ง ์์์ต๋๋ค. ์ด๊ฒ์ด ์ง๊ธ RSC๋ฅผ ๋ด์ฅํ๊ธฐ ์ํ ๊ธฐ๋ณธ ์์๋ฅผ ์ป๊ธฐ ์ํด ๋ฒ๋ค๋ฌ ๊ฐ๋ฐ์๋ค๊ณผ ์ง์ ํ๋ ฅํ๋ ์ด์ ์ ๋๋ค.
@@ -92,7 +96,11 @@ React ์ปดํฌ๋ํธ์ ์์ํ ์๋ฐ์คํฌ๋ฆฝํธ๋ฅผ ๋ฐ์ํ์ผ๋ก ๋ง๋ค๊ธฐ
## ํธ๋์ง์ ์ถ์ {/*transition-tracing*/}
+<<<<<<< HEAD
ํธ๋์ง์ ์ถ์ API๋ฅผ ํตํด [React ํธ๋์ง์ ](/reference/react/useTransition)์ด ๋๋ ค์ง๋ ์์ ์ ๊ฐ์งํ๊ณ ๋๋ ค์ง๋ ์ด์ ๋ฅผ ์กฐ์ฌํ ์ ์์ต๋๋ค. ์ง๋ ์ ๋ฐ์ดํธ ์ดํ API์ ์ด๊ธฐ ์ค๊ณ๋ฅผ ๋ง๋ฌด๋ฆฌํ๊ณ [RFC](https://github.com/reactjs/rfcs/pull/238)๋ฅผ ๊ณต๊ฐํ์ต๋๋ค. ๊ธฐ๋ณธ ๊ธฐ๋ฅ๋ ํจ๊ป ๊ตฌํ๋์์ต๋๋ค. ์ด ํ๋ก์ ํธ๋ ํ์ฌ ๋ณด๋ฅ ์ค์ ๋๋ค. RFC์ ๋ํ ํผ๋๋ฐฑ์ ํ์ํ๋ฉฐ, ๊ฐ๋ฐ์ ์ฌ๊ฐํ์ฌ React๋ฅผ ์ํ ๋ ๋์ ์ฑ๋ฅ ์ธก์ ๋๊ตฌ๋ฅผ ์ ๊ณตํ ์ ์๊ธฐ๋ฅผ ๊ธฐ๋ํฉ๋๋ค. ์ด๋ [Next.js App ๋ผ์ฐํฐ](/learn/start-a-new-react-project#nextjs-app-router)์ ๊ฐ์ด React ํธ๋์ง์ ์์ ๊ตฌ์ถ๋ ๋ผ์ฐํฐ์์๋ ํนํ ๋ ์ ์ฉํ ๊ฒ์ ๋๋ค.
+=======
+The Transition Tracing API lets you detect when [React Transitions](/reference/react/useTransition) become slower and investigate why they may be slow. Following our last update, we have completed the initial design of the API and published an [RFC](https://github.com/reactjs/rfcs/pull/238). The basic capabilities have also been implemented. The project is currently on hold. We welcome feedback on the RFC and look forward to resuming its development to provide a better performance measurement tool for React. This will be particularly useful with routers built on top of React Transitions, like the [Next.js App Router](/learn/creating-a-react-app#nextjs-app-router).
+>>>>>>> 2534424ec6c433cc2c811d5a0bd5a65b75efa5f0
* * *
์ด๋ฒ ์ ๋ฐ์ดํธ ์ธ์๋ ์ต๊ทผ ์ฐ๋ฆฌ ํ์ ์ปค๋ฎค๋ํฐ ํ์บ์คํธ์ ๋ผ์ด๋ธ์คํธ๋ฆผ์ ์ด์ฒญ์๋ก ์ถ์ฐํ์ฌ ์ฐ๋ฆฌ์ ์์ ์ ๋ํด ๋ ๋ง์ ์ด์ผ๊ธฐ๋ฅผ ๋๋๊ณ ์ง๋ฌธ์ ๋ต๋ณํ์ต๋๋ค.
diff --git a/src/content/blog/2024/05/22/react-conf-2024-recap.md b/src/content/blog/2024/05/22/react-conf-2024-recap.md
index 39662d070..500318c10 100644
--- a/src/content/blog/2024/05/22/react-conf-2024-recap.md
+++ b/src/content/blog/2024/05/22/react-conf-2024-recap.md
@@ -112,7 +112,11 @@ React Conf 2024๋ฅผ ๊ฐ๋ฅํ๊ฒ ํด์ค ๋ชจ๋ ์คํํ, ๋ฐํ์, ์ฐธ๊ฐ์๋ถ
์ฝํผ๋ฐ์ค ์น์ฌ์ดํธ๋ฅผ ์ ์ํด ์ฃผ์ [Callstack](https://www.callstack.com/), ๋ชจ๋ฐ์ผ ์ฑ์ ์ ์ํด ์ฃผ์ [Kadi Kraman](https://twitter.com/kadikraman)๊ณผ [Expo ํ](https://expo.dev/)๊ป ๊ฐ์ฌ๋๋ฆฝ๋๋ค.
+<<<<<<< HEAD
ํ์ฌ๋ฅผ ๊ฐ๋ฅํ๊ฒ ํด ์ฃผ์ ํ์์๋ถ๋ค๊ป ๊ฐ์ฌ๋๋ฆฝ๋๋ค: [Remix](https://remix.run/), [Amazon](https://developer.amazon.com/apps-and-games?cmp=US_2024_05_3P_React-Conf-2024&ch=prtnr&chlast=prtnr&pub=ref&publast=ref&type=org&typelast=org), [MUI](https://mui.com/), [Sentry](https://sentry.io/for/react/?utm_source=sponsored-conf&utm_medium=sponsored-event&utm_campaign=frontend-fy25q2-evergreen&utm_content=logo-reactconf2024-learnmore), [Abbott](https://www.jobs.abbott/software), [Expo](https://expo.dev/), [RedwoodJS](https://redwoodjs.com/), [Vercel](https://vercel.com).
+=======
+Thank you to all the sponsors who made the event possible: [Remix](https://remix.run/), [Amazon](https://developer.amazon.com/apps-and-games?cmp=US_2024_05_3P_React-Conf-2024&ch=prtnr&chlast=prtnr&pub=ref&publast=ref&type=org&typelast=org), [MUI](https://mui.com/), [Sentry](https://sentry.io/for/react/?utm_source=sponsored-conf&utm_medium=sponsored-event&utm_campaign=frontend-fy25q2-evergreen&utm_content=logo-reactconf2024-learnmore), [Abbott](https://www.jobs.abbott/software), [Expo](https://expo.dev/), [RedwoodJS](https://rwsdk.com/), and [Vercel](https://vercel.com).
+>>>>>>> 2534424ec6c433cc2c811d5a0bd5a65b75efa5f0
์๊ฐ, ๋ฌด๋, ๊ทธ๋ฆฌ๊ณ ์ํฅ์ ๋ด๋นํด ์ฃผ์ AV ํ๊ณผ ํ์ฌ๋ฅผ ๊ฐ์ตํด ์ฃผ์ Westin Hotel์๋ ๊ฐ์ฌ๋๋ฆฝ๋๋ค.
diff --git a/src/content/blog/2024/12/05/react-19.md b/src/content/blog/2024/12/05/react-19.md
index 89c63bf8e..8d91e33ee 100644
--- a/src/content/blog/2024/12/05/react-19.md
+++ b/src/content/blog/2024/12/05/react-19.md
@@ -355,7 +355,11 @@ Prerender API๋ ์ ์ HTML ์คํธ๋ฆผ์ด ๋ฐํ๋๊ธฐ ์ ์ ๋ฐ์ดํฐ๊ฐ ๋ก
์๋ฒ ์ปดํฌ๋ํธ๋ ๋ฒ๋ค๋ง ์ ์ ํด๋ผ์ด์ธํธ ์ ํ๋ฆฌ์ผ์ด์ ๋๋ SSR ์๋ฒ์ ๋ถ๋ฆฌ๋ ํ๊ฒฝ์์ ์ปดํฌ๋ํธ๋ฅผ ๋ฏธ๋ฆฌ ๋ ๋๋งํ ์ ์๋ ์๋ก์ด ์ต์ ์ ๋๋ค. ์ด ๋ณ๋์ ํ๊ฒฝ์ด React ์๋ฒ ์ปดํฌ๋ํธ์์ "์๋ฒ"์ ๋๋ค. ์๋ฒ ์ปดํฌ๋ํธ๋ CI ์๋ฒ์์ ๋น๋ ์ ํ ๋ฒ ์คํํ๊ฑฐ๋ ์น ์๋ฒ๋ฅผ ์ฌ์ฉํ์ฌ ๊ฐ ์์ฒญ์ ๋ํด ์คํํ ์ ์์ต๋๋ค.
+<<<<<<< HEAD
React 19๋ Canary ์ฑ๋์์ ํฌํจ๋ ๋ชจ๋ React ์๋ฒ ์ปดํฌ๋ํธ ๊ธฐ๋ฅ์ ํฌํจํ๊ณ ์์ต๋๋ค. ์ด๋ ์๋ฒ ์ปดํฌ๋ํธ๊ฐ ํฌํจ๋ ๋ผ์ด๋ธ๋ฌ๋ฆฌ๋ค์ด ์ด์ [ํ์คํ React ์ํคํ ์ฒ](/learn/start-a-new-react-project#which-features-make-up-the-react-teams-full-stack-architecture-vision)๋ฅผ ์ง์ํ๋ ํ๋ ์์ํฌ์์ `react-server` [export ์กฐ๊ฑด](https://github.com/reactjs/rfcs/blob/main/text/0227-server-module-conventions.md#react-server-conditional-exports)์ ์ฌ์ฉํ์ฌ React 19๋ฅผ ํฅํ ์ํธ ์์กด์ฑPeer Dependencies์ผ๋ก ์ง์ ํ ์ ์์์ ์๋ฏธํฉ๋๋ค.
+=======
+React 19 includes all of the React Server Components features included from the Canary channel. This means libraries that ship with Server Components can now target React 19 as a peer dependency with a `react-server` [export condition](https://github.com/reactjs/rfcs/blob/main/text/0227-server-module-conventions.md#react-server-conditional-exports) for use in frameworks that support the [Full-stack React Architecture](/learn/creating-a-react-app#which-features-make-up-the-react-teams-full-stack-architecture-vision).
+>>>>>>> 2534424ec6c433cc2c811d5a0bd5a65b75efa5f0
diff --git a/src/content/blog/2025/02/14/sunsetting-create-react-app.md b/src/content/blog/2025/02/14/sunsetting-create-react-app.md
index f4ef59cd7..6046d0513 100644
--- a/src/content/blog/2025/02/14/sunsetting-create-react-app.md
+++ b/src/content/blog/2025/02/14/sunsetting-create-react-app.md
@@ -177,7 +177,11 @@ export default function Dashboard() {
}
```
+<<<<<<< HEAD
Effect์์ ๋ฐ์ดํฐ๋ฅผ ๊ฐ์ ธ์ค๋๊ฒ์, ๋ฐ์ดํฐ๋ฅผ ๋ ์ผ์ฐ ๊ฐ์ ธ์ฌ ์ ์์์์๋ ๋ถ๊ตฌํ๊ณ , ์ฌ์ฉ์๊ฐ ์ฝํ ์ธ ๋ฅผ ๋ณด๊ธฐ ์ํด ๋ ์ค๋ ๊ธฐ๋ค๋ ค์ผ ํจ์ ์๋ฏธํฉ๋๋ค. ์ด ๋ฌธ์ ๋ฅผ ํด๊ฒฐํ๊ธฐ ์ํด ์ปดํฌ๋ํธ๋ฅผ ๋ ๋๋งํ๊ธฐ ์ ์ ์์ฒญ์ ์์ํ ์ ์๋๋ก ๋ฐ์ดํฐ ๋ฏธ๋ฆฌ ๊ฐ์ ธ์ค๊ธฐ ์ต์ ์ ์ ๊ณตํ๋ [React Query](https://react-query.tanstack.com/), [SWR](https://swr.vercel.app/ko), [Apollo](https://www.apollographql.com/docs/react) ๋๋ [Relay](https://relay.dev/)์ ๊ฐ์ ๋ผ์ด๋ธ๋ฌ๋ฆฌ๋ค์ ์ฌ์ฉํ ์ ์์ต๋๋ค.
+=======
+Fetching in an effect means the user has to wait longer to see the content, even though the data could have been fetched earlier. To solve this, you can use a data fetching library like [TanStack Query](https://tanstack.com/query/), [SWR](https://swr.vercel.app/), [Apollo](https://www.apollographql.com/docs/react), or [Relay](https://relay.dev/) which provide options to prefetch data so the request is started before the component renders.
+>>>>>>> 2534424ec6c433cc2c811d5a0bd5a65b75efa5f0
์ด๋ฌํ ๋ผ์ด๋ธ๋ฌ๋ฆฌ๋ค์ ๋ผ์ฐํธ ์์ค์์ ๋ฐ์ดํฐ ์์กด์ฑ์ ์ง์ ํ ์ ์๋ ๋ผ์ฐํ "๋ก๋" ํจํด๊ณผ ํตํฉ๋ ๋ ๊ฐ์ฅ ํจ๊ณผ์ ์ผ๋ก ์๋ํ๋ฉฐ, ์ด๋ฅผ ํตํด ๋ผ์ฐํฐ๊ฐ ๋ฐ์ดํฐ ๊ฐ์ ธ์ค๊ธฐ๋ฅผ ์ต์ ํํ ์ ์์ต๋๋ค.
diff --git a/src/content/blog/2025/10/07/react-compiler-1.md b/src/content/blog/2025/10/07/react-compiler-1.md
index 80017d2ac..202b9da22 100644
--- a/src/content/blog/2025/10/07/react-compiler-1.md
+++ b/src/content/blog/2025/10/07/react-compiler-1.md
@@ -69,17 +69,17 @@ _[React ์ปดํ์ผ๋ฌ Playground](https://playground.react.dev/#N4Igzg9grgTgxgUxA
npm
-{`npm install --save-dev --save-exact babel-plugin-react-compiler@latest`}
+npm install --save-dev --save-exact babel-plugin-react-compiler@latest
pnpm
-{`pnpm add --save-dev --save-exact babel-plugin-react-compiler@latest`}
+pnpm add --save-dev --save-exact babel-plugin-react-compiler@latest
yarn
-{`yarn add --dev --exact babel-plugin-react-compiler@latest`}
+yarn add --dev --exact babel-plugin-react-compiler@latest
์์ ๋ฒ์ ์ถ์์ ์ผํ์ผ๋ก, React ์ปดํ์ผ๋ฌ๋ฅผ ํ๋ก์ ํธ์ ๋ ์ฝ๊ฒ ์ถ๊ฐํ ์ ์๋๋ก ํ๊ณ ์ปดํ์ผ๋ฌ๊ฐ ๋ฉ๋ชจ์ด์ ์ด์ ์ ์์ฑํ๋ ๋ฐฉ์์ ์ต์ ํํ์ต๋๋ค. React ์ปดํ์ผ๋ฌ๋ ์ด์ ์ต์ ๋ ์ฒด์ด๋๊ณผ ๋ฐฐ์ด ์ธ๋ฑ์ค๋ฅผ ์์กด์ฑ์ผ๋ก ์ง์ํฉ๋๋ค. ์ด๋ฌํ ๊ฐ์ ์ฌํญ์ ๊ถ๊ทน์ ์ผ๋ก ์ฌ๋ ๋๋ง์ ์ค์ด๊ณ ๋ ๋ฐ์์ ์ธ UI๋ฅผ ๋ง๋ค๋ฉด์๋, ๊ด์ฉ์ ์ธ ์ ์ธ์ ์ฝ๋๋ฅผ ๊ณ์ ์์ฑํ ์ ์๊ฒ ํด์ค๋๋ค.
@@ -101,17 +101,17 @@ React ์ปดํ์ผ๋ฌ์๋ [React์ ๊ท์น](/reference/rules)์ ์๋ฐํ๋ ์ฝ
npm
-{`npm install --save-dev eslint-plugin-react-hooks@latest`}
+npm install --save-dev eslint-plugin-react-hooks@latest
pnpm
-{`pnpm add --save-dev eslint-plugin-react-hooks@latest`}
+pnpm add --save-dev eslint-plugin-react-hooks@latest
yarn
-{`yarn add --dev eslint-plugin-react-hooks@latest`}
+yarn add --dev eslint-plugin-react-hooks@latest
```js {6}
@@ -153,19 +153,19 @@ Expo, Vite, Next.js ํ๊ณผ ํ๋ ฅํ์ฌ ์๋ก์ด ์ฑ ๊ฒฝํ์ ์ปดํ์ผ๋ฌ๋ฅผ
[Expo SDK 54](https://docs.expo.dev/guides/react-compiler/) ์ด์์์๋ ์ปดํ์ผ๋ฌ๊ฐ ๊ธฐ๋ณธ์ ์ผ๋ก ํ์ฑํ๋์ด ์์ผ๋ฏ๋ก, ์๋ก์ด ์ฑ์ ์ฒ์๋ถํฐ ์๋์ผ๋ก ์ปดํ์ผ๋ฌ์ ์ด์ ์ ํ์ฉํ ์ ์์ต๋๋ค.
-{`npx create-expo-app@latest`}
+npx create-expo-app@latest
[Vite](https://vite.dev/guide/) ๋ฐ [Next.js](https://nextjs.org/docs/app/api-reference/cli/create-next-app) ์ฌ์ฉ์๋ `create-vite` ๋ฐ `create-next-app`์์ ์ปดํ์ผ๋ฌ๊ฐ ํ์ฑํ๋ ํ ํ๋ฆฟ์ ์ ํํ ์ ์์ต๋๋ค.
-{`npm create vite@latest`}
+npm create vite@latest
-{`npx create-next-app@latest`}
+npx create-next-app@latest
## React ์ปดํ์ผ๋ฌ ์ ์ง์ ์ผ๋ก ๋์ ํ๊ธฐ {/*adopt-react-compiler-incrementally*/}
diff --git a/src/content/learn/add-react-to-an-existing-project.md b/src/content/learn/add-react-to-an-existing-project.md
index aeefb5459..cb2fc9635 100644
--- a/src/content/learn/add-react-to-an-existing-project.md
+++ b/src/content/learn/add-react-to-an-existing-project.md
@@ -20,9 +20,15 @@ title: ๊ธฐ์กด ํ๋ก์ ํธ์ React ์ถ๊ฐํ๊ธฐ
๋ค์๊ณผ ๊ฐ์ด ์ค์ ํ๋ ๊ฒ์ ์ถ์ฒํฉ๋๋ค.
+<<<<<<< HEAD
1. [React ๊ธฐ๋ฐ ํ๋ ์์ํฌ](/learn/start-a-new-react-project) ์ค ํ๋๋ฅผ ์ฌ์ฉํ์ฌ **์ฑ์ React ๋ถ๋ถ์ ๋น๋ํ์ธ์.**
2. ์ฌ์ฉํ๋ ํ๋ ์์ํฌ ์ค์ ์์ **`/some-app` ์ *๊ธฐ๋ณธ ๊ฒฝ๋ก**Base Path*๋ก ๋ช ์ํ์ธ์**. (์ด๋, [Next.js](https://nextjs.org/docs/app/api-reference/config/next-config-js/basePath), [Gatsby](https://www.gatsbyjs.com/docs/how-to/previews-deploys-hosting/path-prefix/)๋ฅผ ์ฌ์ฉํ์ธ์!)
3. **์๋ฒ ๋๋ ํ๋ก์๋ฅผ ๊ตฌ์ฑ**ํ์ฌ `/some-app/` ํ์์ ๋ชจ๋ ์์ฒญ์ด React ์ฑ์์ ์ฒ๋ฆฌ๋๋๋ก ํ์ธ์.
+=======
+1. **Build the React part of your app** using one of the [React-based frameworks](/learn/creating-a-react-app).
+2. **Specify `/some-app` as the *base path*** in your framework's configuration (here's how: [Next.js](https://nextjs.org/docs/app/api-reference/config/next-config-js/basePath), [Gatsby](https://www.gatsbyjs.com/docs/how-to/previews-deploys-hosting/path-prefix/)).
+3. **Configure your server or a proxy** so that all requests under `/some-app/` are handled by your React app.
+>>>>>>> 2534424ec6c433cc2c811d5a0bd5a65b75efa5f0
This ensures the React part of your app can [benefit from the best practices](/learn/build-a-react-app-from-scratch#consider-using-a-framework) baked into those frameworks.
@@ -151,7 +157,11 @@ root.render();
๊ธฐ์กด์ ์กด์ฌํ๋ `index.html`์ ์๋ณธ HTML ์ปจํ ์ธ ๊ฐ ๊ทธ๋๋ก ๋จ์์๋ ๊ฒ์ ํ์ธํ ์ ์์ต๋๋ค. ํ์ง๋ง ์ด์ ๋ `