diff --git a/.github/ISSUE_TEMPLATE/3-framework.yml b/.github/ISSUE_TEMPLATE/3-framework.yml deleted file mode 100644 index 8bd589f04..000000000 --- a/.github/ISSUE_TEMPLATE/3-framework.yml +++ /dev/null @@ -1,116 +0,0 @@ -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/start-a-new-react-project). 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/start-a-new-react-project#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/.github/dependabot.yml b/.github/dependabot.yml index 97f2a39ea..9ef7b4139 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,8 +1,43 @@ version: 2 updates: - - package-ecosystem: "npm" - directory: "/" + # Maintain dependencies for npm. + - package-ecosystem: 'npm' + assignees: + - 'lumirlumir' + # Specify all directories from the current layer and below recursively, using globstar, for locations of manifest files. + directories: + - '**/*' + groups: + react: + patterns: + - 'react' + - 'react-dom' + next: + patterns: + - 'next' + - '@next/*' + reviewers: + - 'lumirlumir' schedule: - interval: "weekly" - # Disable Dependabot. Doing it here so it propagates to translation forks. - open-pull-requests-limit: 0 + interval: 'daily' + time: '10:00' + timezone: 'Asia/Seoul' + pull-request-branch-name: + separator: '-' + versioning-strategy: 'increase' + + # Maintain dependencies for GitHub Actions. + - package-ecosystem: 'github-actions' + assignees: + - 'lumirlumir' + # Workflow files stored in the default location of `.github/workflows`. (You don't need to specify `/.github/workflows` for `directory`. You can use `directory: "/"`.) + directory: '/' + reviewers: + - 'lumirlumir' + schedule: + interval: 'weekly' + day: 'monday' + time: '10:00' + timezone: 'Asia/Seoul' + pull-request-branch-name: + separator: '-' diff --git a/.github/workflows/discord_notify.yml b/.github/workflows/discord_notify.yml deleted file mode 100644 index c8dc662c2..000000000 --- a/.github/workflows/discord_notify.yml +++ /dev/null @@ -1,21 +0,0 @@ -name: Discord Notify - -on: - pull_request_target: - types: [labeled] - -jobs: - notify: - if: ${{ github.event.label.name == 'React Core Team' }} - runs-on: ubuntu-latest - steps: - - name: Discord Webhook Action - uses: tsickert/discord-webhook@v6.0.0 - with: - webhook-url: ${{ secrets.DISCORD_WEBHOOK_URL }} - embed-author-name: ${{ github.event.pull_request.user.login }} - embed-author-url: ${{ github.event.pull_request.user.html_url }} - embed-author-icon-url: ${{ github.event.pull_request.user.avatar_url }} - embed-title: '#${{ github.event.number }} (+${{github.event.pull_request.additions}} -${{github.event.pull_request.deletions}}): ${{ github.event.pull_request.title }}' - embed-description: ${{ github.event.pull_request.body }} - embed-url: ${{ github.event.pull_request.html_url }} diff --git a/src/components/MDX/ErrorDecoder.tsx b/src/components/MDX/ErrorDecoder.tsx index 198aa939d..b04fa9f79 100644 --- a/src/components/MDX/ErrorDecoder.tsx +++ b/src/components/MDX/ErrorDecoder.tsx @@ -11,7 +11,7 @@ function replaceArgs( return msg.replace(/%s/g, function () { const arg = argList[argIdx++]; // arg can be an empty string: ?args[0]=&args[1]=count - return arg === undefined || arg === '' ? replacer : arg; + return arg === undefined ? replacer : arg; }); } diff --git a/src/components/MDX/Sandpack/SandpackRoot.tsx b/src/components/MDX/Sandpack/SandpackRoot.tsx index a47fa6860..67f40d0b3 100644 --- a/src/components/MDX/Sandpack/SandpackRoot.tsx +++ b/src/components/MDX/Sandpack/SandpackRoot.tsx @@ -71,6 +71,13 @@ function SandpackRoot(props: SandpackProps) { const codeSnippets = Children.toArray(children) as React.ReactElement[]; const files = createFileMap(codeSnippets); + if ('/index.html' in files) { + throw new Error( + 'You cannot use `index.html` file in sandboxes. ' + + 'Only `public/index.html` is respected by Sandpack and CodeSandbox (where forks are created).' + ); + } + files['/src/styles.css'] = { code: [sandboxStyle, files['/src/styles.css']?.code ?? ''].join('\n\n'), hidden: !files['/src/styles.css']?.visible, diff --git a/src/content/blog/2020/12/21/data-fetching-with-react-server-components.md b/src/content/blog/2020/12/21/data-fetching-with-react-server-components.md index 190461156..b4a32db85 100644 --- a/src/content/blog/2020/12/21/data-fetching-with-react-server-components.md +++ b/src/content/blog/2020/12/21/data-fetching-with-react-server-components.md @@ -5,7 +5,7 @@ date: 2020/12/21 description: 2020๋…„์€ ๊ธด ํ•œ ํ•ด์˜€์Šต๋‹ˆ๋‹ค. ์—ฐ๋ง์ด ๋‹ค๊ฐ€์˜ด์— ๋”ฐ๋ผ ์ œ๋กœ ๋ฒˆ๋“ค ์‚ฌ์ด์ฆˆ์˜ React ์„œ๋ฒ„ ์ปดํฌ๋„ŒํŠธ ์—ฐ๊ตฌ์— ๋Œ€ํ•œ ํŠน๋ณ„ ์—ฐํœด ์—…๋ฐ์ดํŠธ๋ฅผ ๊ณต์œ ํ•˜๊ณ ์ž ํ•ฉ๋‹ˆ๋‹ค. --- -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) +2020๋…„ 12์›” 21์ผ, [Dan Abramov](https://bsky.app/profile/danabra.mov), [Lauren Tan](https://twitter.com/potetotes), [Joseph Savona](https://twitter.com/en_JS), [Sebastian Markbรฅge](https://twitter.com/sebmarkbage) --- diff --git a/src/content/blog/2021/06/08/the-plan-for-react-18.md b/src/content/blog/2021/06/08/the-plan-for-react-18.md index c9719277e..6f7b41a0e 100644 --- a/src/content/blog/2021/06/08/the-plan-for-react-18.md +++ b/src/content/blog/2021/06/08/the-plan-for-react-18.md @@ -5,7 +5,11 @@ date: 2021/06/08 description: React ํŒ€์€ ๋ช‡ ๊ฐ€์ง€ ์—…๋ฐ์ดํŠธ๋ฅผ ๊ณต์œ ํ•˜๊ฒŒ ๋˜์–ด ๊ธฐ์ฉ๋‹ˆ๋‹ค. ๋‹ค์Œ ์ฃผ์š” ๋ฒ„์ „์ด ๋  React 18 ๋ฆด๋ฆฌ์ฆˆ์— ๋Œ€ํ•œ ์ž‘์—…์„ ์‹œ์ž‘ํ–ˆ์Šต๋‹ˆ๋‹ค. ์ปค๋ฎค๋‹ˆํ‹ฐ๊ฐ€ React 18์˜ ์ƒˆ๋กœ์šด ๊ธฐ๋Šฅ์„ ์ ์ง„์ ์œผ๋กœ ์ฑ„ํƒํ•  ์ˆ˜ ์žˆ๋„๋ก ์ค€๋น„ํ•˜๊ธฐ ์œ„ํ•ด ์›Œํ‚น ๊ทธ๋ฃน์„ ๋งŒ๋“ค์—ˆ์Šต๋‹ˆ๋‹ค. ๋ผ์ด๋ธŒ๋Ÿฌ๋ฆฌ ์ž‘์„ฑ์ž๊ฐ€ ์‚ฌ์šฉํ•ด ๋ณด๊ณ  ํ”ผ๋“œ๋ฐฑ์„ ์ œ๊ณตํ•  ์ˆ˜ ์žˆ๋„๋ก React 18 Alpha๋ฅผ ๊ฒŒ์‹œํ–ˆ์Šต๋‹ˆ๋‹ค... --- +<<<<<<< HEAD 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) +======= +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) +>>>>>>> a5aad0d5e92872ef715b462b1dd6dcbeb45cf781 --- diff --git a/src/content/blog/2021/12/17/react-conf-2021-recap.md b/src/content/blog/2021/12/17/react-conf-2021-recap.md index 70ae528ea..61d52861f 100644 --- a/src/content/blog/2021/12/17/react-conf-2021-recap.md +++ b/src/content/blog/2021/12/17/react-conf-2021-recap.md @@ -131,7 +131,11 @@ React 18์—์„œ๋Š” ์ „๋ฌธ๊ฐ€, ๊ฐœ๋ฐœ์ž, ๋ผ์ด๋ธŒ๋Ÿฌ๋ฆฌ ๊ด€๋ฆฌ์ž, ๊ต์œก์ž๋“ค ๋จผ์ €, ๋ชจ๋“  ์—ฐ์‚ฌ๋ถ„๋“ค๊ป˜ ๊ฐ์‚ฌ๋“œ๋ฆฝ๋‹ˆ๋‹ค [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). +<<<<<<< HEAD [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) ๋“ฑ ๋Œ€๋‹ด์— ํ”ผ๋“œ๋ฐฑ์„ ์ œ๊ณตํ•ด ์ฃผ์‹  ๋ชจ๋“  ๋ถ„๋“ค๊ป˜ ๊ฐ์‚ฌ๋“œ๋ฆฝ๋‹ˆ๋‹ค. +======= +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). +>>>>>>> a5aad0d5e92872ef715b462b1dd6dcbeb45cf781 ๋””์Šค์ฝ”๋“œ ์ปจํผ๋Ÿฐ์Šค๋ฅผ ๊ฐœ์„คํ•˜๊ณ  ๋””์Šค์ฝ”๋“œ ๊ด€๋ฆฌ์ž๋กœ ํ™œ๋™ํ•ด ์ฃผ์‹  [Lauren Tan](https://twitter.com/potetotes)์—๊ฒŒ ๊ฐ์‚ฌ๋“œ๋ฆฝ๋‹ˆ๋‹ค. diff --git a/src/content/blog/2022/06/15/react-labs-what-we-have-been-working-on-june-2022.md b/src/content/blog/2022/06/15/react-labs-what-we-have-been-working-on-june-2022.md index 15586cd79..99a406b5b 100644 --- a/src/content/blog/2022/06/15/react-labs-what-we-have-been-working-on-june-2022.md +++ b/src/content/blog/2022/06/15/react-labs-what-we-have-been-working-on-june-2022.md @@ -5,7 +5,11 @@ date: 2022/06/15 description: React 18 ์€ ์ˆ˜๋…„๊ฐ„์˜ ์ค€๋น„ ๋์— ํƒ„์ƒํ•œ ๋ฒ„์ „์œผ๋กœ React ํŒ€์—๊ฒŒ ๊ท€์ค‘ํ•œ ๊ตํ›ˆ์„ ๊ฐ€์ ธ๋‹ค์ฃผ์—ˆ์Šต๋‹ˆ๋‹ค. ์ˆ˜๋…„๊ฐ„์˜ ์—ฐ๊ตฌ์™€ ๋‹ค์–‘ํ•œ ๊ฒฝ๋กœ๋ฅผ ๋ชจ์ƒ‰ํ•œ ๋์— ์ถœ์‹œ๋œ ์ œํ’ˆ์ž…๋‹ˆ๋‹ค. ๊ทธ ๊ฒฝ๋กœ ์ค‘ ์ผ๋ถ€๋Š” ์„ฑ๊ณต์ ์ด์—ˆ์ง€๋งŒ ๋” ๋งŽ์€ ๊ฒฝ๋กœ๊ฐ€ ๋ง‰๋‹ค๋ฅธ ๊ณจ๋ชฉ์—์„œ ์ƒˆ๋กœ์šด ์ธ์‚ฌ์ดํŠธ๋กœ ์ด์–ด์กŒ์Šต๋‹ˆ๋‹ค. ์šฐ๋ฆฌ๊ฐ€ ์–ป์€ ํ•œ ๊ฐ€์ง€ ๊ตํ›ˆ์€ ์šฐ๋ฆฌ๊ฐ€ ํƒ์ƒ‰ํ•˜๊ณ  ์žˆ๋Š” ๊ฒฝ๋กœ์— ๋Œ€ํ•œ ์ธ์‚ฌ์ดํŠธ๋ฅผ ๊ณต์œ ๋ฐ›์ง€ ๋ชปํ•œ ์ฑ„ ์ƒˆ๋กœ์šด ๊ธฐ๋Šฅ์„ ๊ธฐ๋‹ค๋ฆฌ๋Š” ๊ฒƒ์€ ์ปค๋ฎค๋‹ˆํ‹ฐ์— ์‹ค๋ง๊ฐ์„ ์ค€๋‹ค๋Š” ๊ฒƒ์ž…๋‹ˆ๋‹ค. --- +<<<<<<< HEAD 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) +======= +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) +>>>>>>> a5aad0d5e92872ef715b462b1dd6dcbeb45cf781 --- 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 4aecb0440..0042dccbf 100644 --- a/src/content/blog/2023/03/16/introducing-react-dev.md +++ b/src/content/blog/2023/03/16/introducing-react-dev.md @@ -6,7 +6,11 @@ description: ์˜ค๋Š˜ React์™€ React ๋ฌธ์„œ์˜ ์ƒˆ๋กœ์šด ๋ณด๊ธˆ์ž๋ฆฌ์ธ react.dev --- +<<<<<<< HEAD 2023๋…„ 3์›” 16์ผ [Dan Abramov](https://twitter.com/dan_abramov)์™€ [Rachel Nabors](https://twitter.com/rachelnabors)๊ฐ€ ์ž‘์„ฑํ•จ +======= +March 16, 2023 by [Dan Abramov](https://bsky.app/profile/danabra.mov) and [Rachel Nabors](https://twitter.com/rachelnabors) +>>>>>>> a5aad0d5e92872ef715b462b1dd6dcbeb45cf781 --- @@ -632,7 +636,11 @@ React๋ฅผ ๋ฐฐ์šฐ๊ธฐ์— ๊ฐ€์žฅ ์ข‹์€ ์‹œ๊ธฐ๊ฐ€ ์™”๋‹ค๊ณ  ์ƒ๊ฐํ•ฉ๋‹ˆ๋‹ค. ## ๋ˆ„๊ฐ€ ์ž‘์—…ํ•˜๊ณ  ์žˆ๋‚˜์š”? {/*who-worked-on-this*/} +<<<<<<< HEAD React ํŒ€์—์„œ [Rachel Nabors](https://twitter.com/rachelnabors/)๋Š” ํ”„๋กœ์ ํŠธ๋ฅผ ์ด๋Œ๊ณ  (์‚ฝํ™”๋„ ์ œ๊ณตํ–ˆ์Šต๋‹ˆ๋‹ค), [Dan Abramov](https://twitter.com/dan_abramov)๋Š” ์ปค๋ฆฌํ˜๋Ÿผ์„ ์„ค๊ณ„ํ–ˆ์Šต๋‹ˆ๋‹ค. ๋˜ํ•œ ๋‘ ์‚ฌ๋žŒ์€ ๋Œ€๋ถ€๋ถ„์˜ ๋‚ด์šฉ์„ ํ•จ๊ป˜ ์ €์ˆ ํ–ˆ์Šต๋‹ˆ๋‹ค. +======= +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. +>>>>>>> a5aad0d5e92872ef715b462b1dd6dcbeb45cf781 ๋ฌผ๋ก , ์ด๋ ‡๊ฒŒ ํฐ ํ”„๋กœ์ ํŠธ๋Š” ํ˜ผ์ž์„œ ์ง„ํ–‰๋˜๋Š” ๊ฒƒ์ด ์•„๋‹™๋‹ˆ๋‹ค. ๊ฐ์‚ฌํ•  ๋ถ„๋“ค์ด ๋งŽ์Šต๋‹ˆ๋‹ค! 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..ed948d5e5 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 @@ -97,9 +97,16 @@ React ์ปดํฌ๋„ŒํŠธ์˜ ์ˆœ์ˆ˜ํ•œ ์ž๋ฐ”์Šคํฌ๋ฆฝํŠธ๋ฅผ ๋ฐ˜์‘ํ˜•์œผ๋กœ ๋งŒ๋“ค๊ธฐ * * * ์ด๋ฒˆ ์—…๋ฐ์ดํŠธ ์™ธ์—๋„ ์ตœ๊ทผ ์šฐ๋ฆฌ ํŒ€์€ ์ปค๋ฎค๋‹ˆํ‹ฐ ํŒŸ์บ์ŠคํŠธ์™€ ๋ผ์ด๋ธŒ์ŠคํŠธ๋ฆผ์— ์ดˆ์ฒญ์ž๋กœ ์ถœ์—ฐํ•˜์—ฌ ์šฐ๋ฆฌ์˜ ์ž‘์—…์— ๋Œ€ํ•ด ๋” ๋งŽ์€ ์ด์•ผ๊ธฐ๋ฅผ ๋‚˜๋ˆ„๊ณ  ์งˆ๋ฌธ์— ๋‹ต๋ณ€ํ–ˆ์Šต๋‹ˆ๋‹ค. +<<<<<<< HEAD * [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 ์„œ๋ฒ„ ์ปดํฌ๋„ŒํŠธ๋ฅผ ๋‘˜๋Ÿฌ์‹ผ ์šฐ๋ ค ์‚ฌํ•ญ๋“ค์„ ๋…ผ์˜ํ–ˆ์Šต๋‹ˆ๋‹ค. * [Dan Abramov](https://twitter.com/dan_abramov)์™€ [Joe Savona](https://twitter.com/en_JS)๋Š” [JSParty ํŒŸ์บ์ŠคํŠธ](https://jsparty.fm/267)์˜ ์ดˆ์ฒญ์ž๋กœ์„œ React์˜ ๋ฏธ๋ž˜์— ๋Œ€ํ•œ ์ƒ๊ฐ์„ ๊ณต์œ ํ–ˆ์Šต๋‹ˆ๋‹ค. ์ด ๊ฒŒ์‹œ๊ธ€์„ ๊ฒ€ํ† ํ•ด ์ค€ [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)์— ๊ฐ์‚ฌ๋ฅผ ์ „ํ•ฉ๋‹ˆ๋‹ค. +======= +* [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. +* [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. + +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. +>>>>>>> a5aad0d5e92872ef715b462b1dd6dcbeb45cf781 ์ฝ์–ด์ฃผ์…”์„œ ๊ฐ์‚ฌํ•ฉ๋‹ˆ๋‹ค. ๋‹ค์Œ ์—…๋ฐ์ดํŠธ์—์„œ ๋งŒ๋‚˜์š”! diff --git a/src/content/blog/2023/05/03/react-canaries.md b/src/content/blog/2023/05/03/react-canaries.md index 56bc2ef3f..d47877c7b 100644 --- a/src/content/blog/2023/05/03/react-canaries.md +++ b/src/content/blog/2023/05/03/react-canaries.md @@ -5,7 +5,11 @@ date: 2023/05/03 description: Meta๊ฐ€ ์˜ค๋žซ๋™์•ˆ ๋‚ด๋ถ€์ ์œผ๋กœ ์ตœ์ฒจ๋‹จ ๋ฒ„์ „์˜ React๋ฅผ ์‚ฌ์šฉํ•ด ์˜จ ๊ฒƒ๊ณผ ์œ ์‚ฌํ•˜๊ฒŒ, ์ƒˆ๋กœ์šด ๊ธฐ๋Šฅ์ด ์•ˆ์ •๋œ ๋ฒ„์ „์œผ๋กœ ์ถœ์‹œ๋˜๊ธฐ ์ „์— ๋””์ž์ธ์ด ๊ฑฐ์˜ ์™„์„ฑ๋˜๋Š” ์ฆ‰์‹œ ๊ฐœ๋ณ„์ ์ธ ์ƒˆ๋กœ์šด ๊ธฐ๋Šฅ์„ ์ฑ„ํƒํ•  ์ˆ˜ ์žˆ๋Š” ์˜ต์…˜์„ React ์ปค๋ฎค๋‹ˆํ‹ฐ์— ์ œ๊ณตํ•˜๊ณ ์ž ํ•ฉ๋‹ˆ๋‹ค. ๊ณต์‹์ ์œผ๋กœ ์ง€์›ํ•˜๋Š” ์ƒˆ๋กœ์šด Canary ๋ฆด๋ฆฌ์ฆˆ ์ฑ„๋„์„ ์†Œ๊ฐœํ•ฉ๋‹ˆ๋‹ค. ํ”„๋ ˆ์ž„์›Œํฌ์™€ ๊ฐ™์ด ์—„์„ ๋œ ์„ค์ •์„ ํ†ตํ•ด ๊ฐœ๋ณ„ React ๊ธฐ๋Šฅ์˜ ์ฑ„ํƒ์„ React ๋ฆด๋ฆฌ์ฆˆ ์ผ์ •์—์„œ ๋ถ„๋ฆฌํ•  ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค. --- +<<<<<<< HEAD 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) +======= +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) +>>>>>>> a5aad0d5e92872ef715b462b1dd6dcbeb45cf781 --- diff --git a/src/content/blog/2024/02/15/react-labs-what-we-have-been-working-on-february-2024.md b/src/content/blog/2024/02/15/react-labs-what-we-have-been-working-on-february-2024.md index 2fb2cd398..cb6f78bfb 100644 --- a/src/content/blog/2024/02/15/react-labs-what-we-have-been-working-on-february-2024.md +++ b/src/content/blog/2024/02/15/react-labs-what-we-have-been-working-on-february-2024.md @@ -5,7 +5,11 @@ date: 2024/02/15 description: React Labs ๊ฒŒ์‹œ๊ธ€์—๋Š” ํ™œ๋ฐœํžˆ ์—ฐ๊ตฌ ๊ฐœ๋ฐœ ์ค‘์ธ ํ”„๋กœ์ ํŠธ์— ๋Œ€ํ•œ ๋‚ด์šฉ์„ ์ž‘์„ฑํ•ฉ๋‹ˆ๋‹ค. ์šฐ๋ฆฌ์˜ ์ง€๋‚œ ์—…๋ฐ์ดํŠธ ์ดํ›„ ์ƒ๋‹นํ•œ ๋ฐœ์ „์„ ์ด๋ฃจ์—ˆ๊ณ , ์ด๋Ÿฌํ•œ ์ง„์ „ ์‚ฌํ•ญ์„ ๊ณต์œ ํ•˜๋ ค๊ณ  ํ•ฉ๋‹ˆ๋‹ค. --- +<<<<<<< HEAD 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) +======= +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). +>>>>>>> a5aad0d5e92872ef715b462b1dd6dcbeb45cf781 --- 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 bc77f4bbb..7cb7d42ee 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 @@ -42,7 +42,7 @@ Next in the keynote, [Josh Story](https://twitter.com/joshcstory) and [Andrew Cl - [React Unpacked: A Roadmap to React 19](https://www.youtube.com/watch?v=T8TZQ6k4SLE&t=10112s) by [Sam Selikoff](https://twitter.com/samselikoff) - [React 19 Deep Dive: Coordinating HTML](https://www.youtube.com/watch?v=T8TZQ6k4SLE&t=24916s) by [Josh Story](https://twitter.com/joshcstory) - [Enhancing Forms with React Server Components](https://www.youtube.com/watch?v=0ckOUBiuxVY&t=25280s) by [Aurora Walberg Scharff](https://twitter.com/aurorascharff) -- [React for Two Computers](https://www.youtube.com/watch?v=T8TZQ6k4SLE&t=18825s) by [Dan Abramov](https://twitter.com/dan_abramov2) +- [React for Two Computers](https://www.youtube.com/watch?v=T8TZQ6k4SLE&t=18825s) by [Dan Abramov](https://bsky.app/profile/danabra.mov) - [And Now You Understand React Server Components](https://www.youtube.com/watch?v=0ckOUBiuxVY&t=11256s) by [Kent C. Dodds](https://twitter.com/kentcdodds) Finally, we ended the keynote with [Joe Savona](https://twitter.com/en_JS), [Sathya Gunasekaran](https://twitter.com/_gsathya), and [Mofei Zhang](https://twitter.com/zmofei) announcing that the React Compiler is now [Open Source](https://github.com/facebook/react/pull/29061), and sharing an experimental version of the React Compiler to try out. diff --git a/src/content/community/conferences.md b/src/content/community/conferences.md index cedd9d507..29b8e7c41 100644 --- a/src/content/community/conferences.md +++ b/src/content/community/conferences.md @@ -10,16 +10,31 @@ Do you know of a local React.js conference? Add it here! (Please keep the list c ## Upcoming Conferences {/*upcoming-conferences*/} -### React Day Berlin 2024 {/*react-day-berlin-2024*/} -December 13 & 16, 2024. In-person in Berlin, Germany + remote (hybrid event) +### React Paris 2025 {/*react-paris-2025*/} +March 20 - 21, 2025. In-person in Paris, France (hybrid event) -[Website](https://reactday.berlin/) - [Twitter](https://x.com/reactdayberlin) +[Website](https://react.paris/) - [Twitter](https://x.com/BeJS_) + +### React Native Connection 2025 {/*react-native-connection-2025*/} +April 3 (Reanimated Training) + April 4 (Conference), 2025. Paris, France. + +[Website](https://reactnativeconnection.io/) - [X](https://x.com/reactnativeconn) - [Bluesky](https://bsky.app/profile/reactnativeconnect.bsky.social) + +### CityJS London 2025 {/*cityjs-london*/} +April 23 - 25, 2025. In-person in London, UK + +[Website](https://london.cityjsconf.org/) - [Twitter](https://x.com/cityjsconf) - [Bluesky](https://bsky.app/profile/cityjsconf.bsky.social) ### App.js Conf 2025 {/*appjs-conf-2025*/} May 28 - 30, 2025. In-person in Krakรณw, Poland + remote [Website](https://appjs.co) - [Twitter](https://twitter.com/appjsconf) +### CityJS Athens 2025 {/*cityjs-athens*/} +May 27 - 31, 2025. In-person in Athens, Greece + +[Website](https://athens.cityjsconf.org/) - [Twitter](https://x.com/cityjsconf) - [Bluesky](https://bsky.app/profile/cityjsconf.bsky.social) + ### React Summit 2025 {/*react-summit-2025*/} June 13 - 17, 2025. In-person in Amsterdam, Netherlands + remote (hybrid event) @@ -30,8 +45,19 @@ September 2-4, 2025. Wrocล‚aw, Poland. [Website](https://www.reactuniverseconf.com/) - [Twitter](https://twitter.com/react_native_eu) - [LinkedIn](https://www.linkedin.com/events/reactuniverseconf7163919537074118657/) +### React India 2025 {/*react-india-2025*/} +October 31 - November 01, 2025. In-person in Goa, India (hybrid event) + Oct 15 2025 - remote day + +[Website](https://www.reactindia.io) - [Twitter](https://twitter.com/react_india) - [Facebook](https://www.facebook.com/ReactJSIndia) - [Youtube](https://www.youtube.com/channel/UCaFbHCBkPvVv1bWs_jwYt3w) + + ## Past Conferences {/*past-conferences*/} +### React Day Berlin 2024 {/*react-day-berlin-2024*/} +December 13 & 16, 2024. In-person in Berlin, Germany + remote (hybrid event) + +[Website](https://reactday.berlin/) - [Twitter](https://x.com/reactdayberlin) + ### React Africa 2024 {/*react-africa-2024*/} November 29, 2024. In-person in Casablanca, Morocco (hybrid event) @@ -60,7 +86,7 @@ October 25, 2024. In-person in Verona, Italy + online (hybrid event) ### React Brussels 2024 {/*react-brussels-2024*/} October 18, 2024. In-person in Brussels, Belgium (hybrid event) -[Website](https://www.react.brussels/) - [Twitter](https://x.com/BrusselsReact) +[Website](https://www.react.brussels/) - [Twitter](https://x.com/BrusselsReact) - [YouTube](https://www.youtube.com/playlist?list=PL53Z0yyYnpWimQ0U75woee2zNUIFsiDC3) ### React India 2024 {/*react-india-2024*/} October 17 - 19, 2024. In-person in Goa, India (hybrid event) + Oct 15 2024 - remote day diff --git a/src/content/community/docs-contributors.md b/src/content/community/docs-contributors.md index ba1a1c8af..d8cd095e0 100644 --- a/src/content/community/docs-contributors.md +++ b/src/content/community/docs-contributors.md @@ -10,6 +10,7 @@ React ๋ฌธ์„œ๋Š” [React ํŒ€](/community/team)๊ณผ [์™ธ๋ถ€ ๊ธฐ์—ฌ์ž](https://githu ## ๋‚ด์šฉ {/*content*/} +<<<<<<< HEAD * [Rachel Nabors](https://twitter.com/RachelNabors): ํŽธ์ง‘, ๊ธ€์“ฐ๊ธฐ, ๊ทธ๋ฆผ ๊ทธ๋ฆฌ๊ธฐ * [Dan Abramov](https://twitter.com/dan_abramov): ๊ธ€์“ฐ๊ธฐ, ์ปค๋ฆฌํ˜๋Ÿผ ์„ค๊ณ„ * [Sylwia Vargas](https://twitter.com/SylwiaVargas): ์˜ˆ์‹œ ์ฝ”๋“œ @@ -21,6 +22,19 @@ React ๋ฌธ์„œ๋Š” [React ํŒ€](/community/team)๊ณผ [์™ธ๋ถ€ ๊ธฐ์—ฌ์ž](https://githu * [Matt Carroll](https://twitter.com/mattcarrollcode): ํŽธ์ง‘, ๊ธ€์“ฐ๊ธฐ * [Natalia Tepluhina](https://twitter.com/n_tepluhina): ๋ฆฌ๋ทฐ, ์กฐ์–ธ * [Sebastian Markbรฅge](https://twitter.com/sebmarkbage): ํ”ผ๋“œ๋ฐฑ +======= +* [Rachel Nabors](https://twitter.com/RachelNabors): editing, writing, illustrating +* [Dan Abramov](https://bsky.app/profile/danabra.mov): writing, curriculum design +* [Sylwia Vargas](https://twitter.com/SylwiaVargas): example code +* [Rick Hanlon](https://twitter.com/rickhanlonii): writing +* [David McCabe](https://twitter.com/mcc_abe): writing +* [Sophie Alpert](https://twitter.com/sophiebits): writing +* [Pete Hunt](https://twitter.com/floydophone): writing +* [Andrew Clark](https://twitter.com/acdlite): writing +* [Matt Carroll](https://twitter.com/mattcarrollcode): editing, writing +* [Natalia Tepluhina](https://twitter.com/n_tepluhina): reviews, advice +* [Sebastian Markbรฅge](https://twitter.com/sebmarkbage): feedback +>>>>>>> a5aad0d5e92872ef715b462b1dd6dcbeb45cf781 ## ๋””์ž์ธ {/*design*/} @@ -31,6 +45,7 @@ React ๋ฌธ์„œ๋Š” [React ํŒ€](/community/team)๊ณผ [์™ธ๋ถ€ ๊ธฐ์—ฌ์ž](https://githu ## ๊ฐœ๋ฐœ {/*development*/} +<<<<<<< HEAD * [Jared Palmer](https://twitter.com/jaredpalmer): ์‚ฌ์ดํŠธ ๊ฐœ๋ฐœ * [ThisDotLabs](https://www.thisdot.co/) ([Dane Grant](https://twitter.com/danecando), [Dustin Goodman](https://twitter.com/dustinsgoodman)): ์‚ฌ์ดํŠธ ๊ฐœ๋ฐœ * [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 ํ†ตํ•ฉ @@ -38,6 +53,15 @@ React ๋ฌธ์„œ๋Š” [React ํŒ€](/community/team)๊ณผ [์™ธ๋ถ€ ๊ธฐ์—ฌ์ž](https://githu * [Rick Hanlon](https://twitter.com/rickhanlonii): ์‚ฌ์ดํŠธ ๊ฐœ๋ฐœ * [Harish Kumar](https://www.strek.in/): ๊ฐœ๋ฐœ๊ณผ ์œ ์ง€๋ณด์ˆ˜ * [Luna Ruan](https://twitter.com/lunaruan): Sandbox ๊ฐœ์„  +======= +* [Jared Palmer](https://twitter.com/jaredpalmer): site development +* [ThisDotLabs](https://www.thisdot.co/) ([Dane Grant](https://twitter.com/danecando), [Dustin Goodman](https://twitter.com/dustinsgoodman)): site development +* [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 +* [Dan Abramov](https://bsky.app/profile/danabra.mov): site development +* [Rick Hanlon](https://twitter.com/rickhanlonii): site development +* [Harish Kumar](https://www.strek.in/): development and maintenance +* [Luna Ruan](https://twitter.com/lunaruan): sandbox improvements +>>>>>>> a5aad0d5e92872ef715b462b1dd6dcbeb45cf781 ## ํ•œ๊ตญ์–ด ๋ฒˆ์—ญ {/*korean-translations*/} 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 b60997633..60e355542 100644 --- a/src/content/learn/add-react-to-an-existing-project.md +++ b/src/content/learn/add-react-to-an-existing-project.md @@ -58,12 +58,17 @@ npm install react react-dom -```html index.html hidden +```html public/index.html hidden My app +<<<<<<< HEAD +======= + +
+>>>>>>> a5aad0d5e92872ef715b462b1dd6dcbeb45cf781 ``` @@ -121,7 +126,7 @@ root.render(

Hello, world

); -```html index.html +```html public/index.html My app diff --git a/src/content/reference/react-dom/client/createRoot.md b/src/content/reference/react-dom/client/createRoot.md index 3215ac45d..b41e5cd7e 100644 --- a/src/content/reference/react-dom/client/createRoot.md +++ b/src/content/reference/react-dom/client/createRoot.md @@ -142,7 +142,7 @@ root.render(); -```html index.html +```html public/index.html My app @@ -372,7 +372,7 @@ You can use the `onUncaughtError` root option to display error dialogs: -```html index.html hidden +```html public/index.html hidden @@ -603,7 +603,7 @@ You can use the `onCaughtError` root option to display error dialogs or filter k -```html index.html hidden +```html public/index.html hidden @@ -882,7 +882,7 @@ You can use the `onRecoverableError` root option to display error dialogs: -```html index.html hidden +```html public/index.html hidden diff --git a/src/content/reference/react-dom/client/hydrateRoot.md b/src/content/reference/react-dom/client/hydrateRoot.md index db0a3b9d7..f1f59e337 100644 --- a/src/content/reference/react-dom/client/hydrateRoot.md +++ b/src/content/reference/react-dom/client/hydrateRoot.md @@ -401,7 +401,7 @@ root.render(); -```html index.html hidden +```html public/index.html hidden @@ -634,7 +634,7 @@ root.render(); -```html index.html hidden +```html public/index.html hidden @@ -914,7 +914,7 @@ Hydration ๋ถˆ์ผ์น˜์— ๋Œ€ํ•œ ๋Œ€ํ™” ์ƒ์ž๋ฅผ ํ‘œ์‹œํ•˜๋ ค๋ฉด `onRecoverableErr -```html index.html hidden +```html public/index.html hidden diff --git a/src/content/reference/react-dom/createPortal.md b/src/content/reference/react-dom/createPortal.md index 2fda3662e..8315a8be4 100644 --- a/src/content/reference/react-dom/createPortal.md +++ b/src/content/reference/react-dom/createPortal.md @@ -251,7 +251,7 @@ Portal์€ React ๋ฃจํŠธ๊ฐ€ React๋กœ ๋นŒ๋“œ๋˜์ง€ ์•Š์€ ์ •์  ๋˜๋Š” ์„œ๋ฒ„ ๋ Œ -```html index.html +```html public/index.html My app diff --git a/src/content/reference/react/useActionState.md b/src/content/reference/react/useActionState.md index acd44c8a5..dbd9d1700 100644 --- a/src/content/reference/react/useActionState.md +++ b/src/content/reference/react/useActionState.md @@ -67,9 +67,15 @@ function StatefulForm({}) { `useActionState`๋Š” ๋‹ค์Œ ์„ธ ๊ฐ€์ง€ ๊ฐ’์„ ๋‹ด์€ ๋ฐฐ์—ด์„ ๋ฐ˜ํ™˜ํ•ฉ๋‹ˆ๋‹ค. +<<<<<<< HEAD 1. ํ˜„์žฌ State์ž…๋‹ˆ๋‹ค. ์ฒซ ๋ Œ๋”๋ง ์‹œ์—๋Š” `initialState`์™€ ์ผ์น˜ํ•˜๋ฉฐ, ์•ก์…˜์ด ์‹คํ–‰๋œ ํ›„์—๋Š” ์•ก์…˜์ด ๋ฐ˜ํ™˜ํ•œ ๊ฐ’๊ณผ ์ผ์น˜ํ•ฉ๋‹ˆ๋‹ค. 2. `
` ์ปดํฌ๋„ŒํŠธ์˜ `action` Prop์ด๋‚˜ ํผ ๋‚ด๋ถ€ `