From 0bc63000f74b3889b141dd4f4f8c1b817cd70d5a Mon Sep 17 00:00:00 2001 From: Ricky Date: Mon, 24 Mar 2025 15:46:53 -0400 Subject: [PATCH 1/8] [ci] fix notify for forks (#7694) --- .github/workflows/discord_notify.yml | 2 +- .github/workflows/label_core_team_prs.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/discord_notify.yml b/.github/workflows/discord_notify.yml index a553b23a0..8314deb3a 100644 --- a/.github/workflows/discord_notify.yml +++ b/.github/workflows/discord_notify.yml @@ -1,7 +1,7 @@ name: Discord Notify on: - pull_request: + pull_request_target: types: [opened, ready_for_review] permissions: {} diff --git a/.github/workflows/label_core_team_prs.yml b/.github/workflows/label_core_team_prs.yml index 6099b8fcb..529d7cc48 100644 --- a/.github/workflows/label_core_team_prs.yml +++ b/.github/workflows/label_core_team_prs.yml @@ -1,7 +1,7 @@ name: Label Core Team PRs on: - pull_request: + pull_request_target: permissions: {} From 9b2ad174d0971230f2ba02d1a2c4580469c7fa86 Mon Sep 17 00:00:00 2001 From: lauren Date: Mon, 24 Mar 2025 16:40:33 -0400 Subject: [PATCH 2/8] [ci] Remove unused param (#7695) https://github.com/facebook/react/pull/32727 removes the `is_remote` param. --- .github/workflows/discord_notify.yml | 1 - .github/workflows/label_core_team_prs.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/.github/workflows/discord_notify.yml b/.github/workflows/discord_notify.yml index 8314deb3a..2f5b2a497 100644 --- a/.github/workflows/discord_notify.yml +++ b/.github/workflows/discord_notify.yml @@ -14,7 +14,6 @@ jobs: contents: read with: actor: ${{ github.event.pull_request.user.login }} - is_remote: true notify: if: ${{ needs.check_maintainer.outputs.is_core_team == 'true' }} diff --git a/.github/workflows/label_core_team_prs.yml b/.github/workflows/label_core_team_prs.yml index 529d7cc48..f9b3328ee 100644 --- a/.github/workflows/label_core_team_prs.yml +++ b/.github/workflows/label_core_team_prs.yml @@ -18,7 +18,6 @@ jobs: contents: read with: actor: ${{ github.event.pull_request.user.login }} - is_remote: true label: if: ${{ needs.check_maintainer.outputs.is_core_team == 'true' }} From 6788f6bade9bd11c3c7f0cdad620501e2063c4e5 Mon Sep 17 00:00:00 2001 From: Alberto Velandia Date: Mon, 24 Mar 2025 15:47:47 -0700 Subject: [PATCH 3/8] Fixes typo (#7688) --- src/content/reference/react-dom/hooks/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/content/reference/react-dom/hooks/index.md b/src/content/reference/react-dom/hooks/index.md index 73eefae75..5dfb07d82 100644 --- a/src/content/reference/react-dom/hooks/index.md +++ b/src/content/reference/react-dom/hooks/index.md @@ -14,7 +14,7 @@ The `react-dom` package contains Hooks that are only supported for web applicati *Forms* let you create interactive controls for submitting information. To manage forms in your components, use one of these Hooks: -* [`useFormStatus`](/reference/react-dom/hooks/useFormStatus) allows you to make updates to the UI based on the status of the a form. +* [`useFormStatus`](/reference/react-dom/hooks/useFormStatus) allows you to make updates to the UI based on the status of a form. ```js function Form({ action }) { From 2859efa07357dfc2927517ce9765515acf903c7c Mon Sep 17 00:00:00 2001 From: Petr Chalupa Date: Tue, 25 Mar 2025 22:28:39 +0100 Subject: [PATCH 4/8] Add React Prague community (#7279) * Add React Prague community * Update link --- src/content/community/meetups.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/content/community/meetups.md b/src/content/community/meetups.md index 906c170de..b3290a004 100644 --- a/src/content/community/meetups.md +++ b/src/content/community/meetups.md @@ -47,6 +47,9 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet ## Colombia {/*colombia*/} * [Medellin](https://www.meetup.com/React-Medellin/) +## Czechia {/*czechia*/} +* [Prague](https://guild.host/react-prague/) + ## Denmark {/*denmark*/} * [Aalborg](https://www.meetup.com/Aalborg-React-React-Native-Meetup/) * [Aarhus](https://www.meetup.com/Aarhus-ReactJS-Meetup/) From ef60556a70ecf43a4870cb5aba27aad7b6db3db5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=A3=A8=EB=B0=80LuMir?= Date: Fri, 4 Apr 2025 22:45:31 +0900 Subject: [PATCH 5/8] chore: resolve conflicts --- .github/workflows/discord_notify.yml | 32 --------------- .github/workflows/label_core_team_prs.yml | 41 ------------------- .../reference/react-dom/hooks/index.md | 4 -- .../react-dom/server/renderToString.md | 2 +- 4 files changed, 1 insertion(+), 78 deletions(-) delete mode 100644 .github/workflows/discord_notify.yml delete mode 100644 .github/workflows/label_core_team_prs.yml diff --git a/.github/workflows/discord_notify.yml b/.github/workflows/discord_notify.yml deleted file mode 100644 index 2f5b2a497..000000000 --- a/.github/workflows/discord_notify.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: Discord Notify - -on: - pull_request_target: - types: [opened, ready_for_review] - -permissions: {} - -jobs: - check_maintainer: - uses: facebook/react/.github/workflows/shared_check_maintainer.yml@main - permissions: - # Used by check_maintainer - contents: read - with: - actor: ${{ github.event.pull_request.user.login }} - - notify: - if: ${{ needs.check_maintainer.outputs.is_core_team == 'true' }} - needs: check_maintainer - 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/.github/workflows/label_core_team_prs.yml b/.github/workflows/label_core_team_prs.yml deleted file mode 100644 index f9b3328ee..000000000 --- a/.github/workflows/label_core_team_prs.yml +++ /dev/null @@ -1,41 +0,0 @@ -name: Label Core Team PRs - -on: - pull_request_target: - -permissions: {} - -env: - TZ: /usr/share/zoneinfo/America/Los_Angeles - # https://github.com/actions/cache/blob/main/tips-and-workarounds.md#cache-segment-restore-timeout - SEGMENT_DOWNLOAD_TIMEOUT_MINS: 1 - -jobs: - check_maintainer: - uses: facebook/react/.github/workflows/shared_check_maintainer.yml@main - permissions: - # Used by check_maintainer - contents: read - with: - actor: ${{ github.event.pull_request.user.login }} - - label: - if: ${{ needs.check_maintainer.outputs.is_core_team == 'true' }} - runs-on: ubuntu-latest - needs: check_maintainer - permissions: - # Used to add labels on issues - issues: write - # Used to add labels on PRs - pull-requests: write - steps: - - name: Label PR as React Core Team - uses: actions/github-script@v7 - with: - script: | - github.rest.issues.addLabels({ - owner: context.repo.owner, - repo: context.repo.repo, - issue_number: ${{ github.event.number }}, - labels: ['React Core Team'] - }); diff --git a/src/content/reference/react-dom/hooks/index.md b/src/content/reference/react-dom/hooks/index.md index e590ac117..6deaf691e 100644 --- a/src/content/reference/react-dom/hooks/index.md +++ b/src/content/reference/react-dom/hooks/index.md @@ -14,11 +14,7 @@ title: "Built-in React DOM Hooks" *폼*은 정보 제출을 위한 상호 작용형 제어를 만들 수 있도록 해줍니다. 컴포넌트에 있는 폼을 관리하기 위해 다음과 같은 Hook 중 하나를 사용할 수 있습니다. -<<<<<<< HEAD * [`useFormStatus`](/reference/react-dom/hooks/useFormStatus) 폼의 상태에 따라 UI를 업데이트할 수 있게 해줍니다. -======= -* [`useFormStatus`](/reference/react-dom/hooks/useFormStatus) allows you to make updates to the UI based on the status of a form. ->>>>>>> 2859efa07357dfc2927517ce9765515acf903c7c ```js function Form({ action }) { diff --git a/src/content/reference/react-dom/server/renderToString.md b/src/content/reference/react-dom/server/renderToString.md index 522fe407c..91174405d 100644 --- a/src/content/reference/react-dom/server/renderToString.md +++ b/src/content/reference/react-dom/server/renderToString.md @@ -42,7 +42,7 @@ const html = renderToString(); * `reactNode`: HTML로 렌더링할 React 노드입니다. 예를 들어 ``과 같은 JSX 노드입니다. * **optional** `options`: 서버 렌더링을 위한 객체입니다. - * **optional** `identifierPrefix`: [`useId`](/reference/react/useId)에 의해 생성된 ID에 대해 React가 사용하는 문자열 접두사입니다. 같은 페이지에서 여러 루트를 사용할 때 충돌을 피하기 위해 유용합니다. [`hydrateRoot`.](/reference/react-dom/client/hydrateRoot#parameters)에 전달된 접두사와 동일해야 합니다. + * **optional** `identifierPrefix`: [`useId`](/reference/react/useId)에 의해 생성된 ID에 대해 React가 사용하는 문자열 접두사입니다. 같은 페이지에서 여러 루트를 사용할 때 충돌을 피하기 위해 유용합니다. [`hydrateRoot`](/reference/react-dom/client/hydrateRoot#parameters)에 전달된 접두사와 동일해야 합니다. #### 반환값 {/*returns*/} From 0925cc074e63aecc854e63c8c93c0bfc99b9b83e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=A3=A8=EB=B0=80LuMir?= Date: Fri, 4 Apr 2025 23:30:27 +0900 Subject: [PATCH 6/8] docs: fix unintended double spaces and typos --- src/content/blog/2022/03/29/react-v18.md | 8 ++++---- ...eact-labs-what-we-have-been-working-on-june-2022.md | 2 +- .../blog/2024/10/21/react-compiler-beta-release.md | 2 +- .../blog/2025/02/14/sunsetting-create-react-app.md | 2 +- src/content/community/conferences.md | 4 ++-- src/content/learn/build-a-react-app-from-scratch.md | 10 +++++----- src/content/learn/creating-a-react-app.md | 8 ++++---- .../learn/scaling-up-with-reducer-and-context.md | 2 +- src/content/learn/state-as-a-snapshot.md | 2 +- src/content/reference/react-dom/client/hydrateRoot.md | 1 - 10 files changed, 20 insertions(+), 21 deletions(-) diff --git a/src/content/blog/2022/03/29/react-v18.md b/src/content/blog/2022/03/29/react-v18.md index f7c9225b1..0e8c7007e 100644 --- a/src/content/blog/2022/03/29/react-v18.md +++ b/src/content/blog/2022/03/29/react-v18.md @@ -272,11 +272,11 @@ React 18의 Strict 모드에서는 개발 모드에서 컴포넌트를 마운트 * Add `useSyncExternalStore` to help external store libraries integrate with React. ([#15022](https://github.com/facebook/react/pull/15022), [#18000](https://github.com/facebook/react/pull/18000), [#18771](https://github.com/facebook/react/pull/18771), [#22211](https://github.com/facebook/react/pull/22211), [#22292](https://github.com/facebook/react/pull/22292), [#22239](https://github.com/facebook/react/pull/22239), [#22347](https://github.com/facebook/react/pull/22347), [#23150](https://github.com/facebook/react/pull/23150) by [@acdlite](https://github.com/acdlite), [@bvaughn](https://github.com/bvaughn), and [@drarmstr](https://github.com/drarmstr)) * Add `startTransition` as a version of `useTransition` without pending feedback. ([#19696](https://github.com/facebook/react/pull/19696) by [@rickhanlonii](https://github.com/rickhanlonii)) * Add `useInsertionEffect` for CSS-in-JS libraries. ([#21913](https://github.com/facebook/react/pull/21913) by [@rickhanlonii](https://github.com/rickhanlonii)) -* Make Suspense remount layout effects when content reappears. ([#19322](https://github.com/facebook/react/pull/19322), [#19374](https://github.com/facebook/react/pull/19374), [#19523](https://github.com/facebook/react/pull/19523), [#20625](https://github.com/facebook/react/pull/20625), [#21079](https://github.com/facebook/react/pull/21079) by [@acdlite](https://github.com/acdlite), [@bvaughn](https://github.com/bvaughn), and [@lunaruan](https://github.com/lunaruan)) +* Make Suspense remount layout effects when content reappears. ([#19322](https://github.com/facebook/react/pull/19322), [#19374](https://github.com/facebook/react/pull/19374), [#19523](https://github.com/facebook/react/pull/19523), [#20625](https://github.com/facebook/react/pull/20625), [#21079](https://github.com/facebook/react/pull/21079) by [@acdlite](https://github.com/acdlite), [@bvaughn](https://github.com/bvaughn), and [@lunaruan](https://github.com/lunaruan)) * Make `` re-run effects to check for restorable state. ([#19523](https://github.com/facebook/react/pull/19523) , [#21418](https://github.com/facebook/react/pull/21418) by [@bvaughn](https://github.com/bvaughn) and [@lunaruan](https://github.com/lunaruan)) * Assume Symbols are always available. ([#23348](https://github.com/facebook/react/pull/23348) by [@sebmarkbage](https://github.com/sebmarkbage)) * Remove `object-assign` polyfill. ([#23351](https://github.com/facebook/react/pull/23351) by [@sebmarkbage](https://github.com/sebmarkbage)) -* Remove unsupported `unstable_changedBits` API. ([#20953](https://github.com/facebook/react/pull/20953) by [@acdlite](https://github.com/acdlite)) +* Remove unsupported `unstable_changedBits` API. ([#20953](https://github.com/facebook/react/pull/20953) by [@acdlite](https://github.com/acdlite)) * Allow components to render undefined. ([#21869](https://github.com/facebook/react/pull/21869) by [@rickhanlonii](https://github.com/rickhanlonii)) * Flush `useEffect` resulting from discrete events like clicks synchronously. ([#21150](https://github.com/facebook/react/pull/21150) by [@acdlite](https://github.com/acdlite)) * Suspense `fallback={undefined}` now behaves the same as `null` and isn't ignored. ([#21854](https://github.com/facebook/react/pull/21854) by [@rickhanlonii](https://github.com/rickhanlonii)) @@ -291,7 +291,7 @@ React 18의 Strict 모드에서는 개발 모드에서 컴포넌트를 마운트 * Fix a crash when rendering `ZonedDateTime` in the tree. ([#20617](https://github.com/facebook/react/pull/20617) by [@dimaqq](https://github.com/dimaqq)) * Fix a crash when document is set to `null` in tests. ([#22695](https://github.com/facebook/react/pull/22695) by [@SimenB](https://github.com/SimenB)) * Fix `onLoad` not triggering when concurrent features are on. ([#23316](https://github.com/facebook/react/pull/23316) by [@gnoff](https://github.com/gnoff)) -* Fix a warning when a selector returns `NaN`. ([#23333](https://github.com/facebook/react/pull/23333) by [@hachibeeDI](https://github.com/hachibeeDI)) +* Fix a warning when a selector returns `NaN`. ([#23333](https://github.com/facebook/react/pull/23333) by [@hachibeeDI](https://github.com/hachibeeDI)) * Fix a crash when document is set to `null` in tests. ([#22695](https://github.com/facebook/react/pull/22695) by [@SimenB](https://github.com/SimenB)) * Fix the generated license header. ([#23004](https://github.com/facebook/react/pull/23004) by [@vitaliemiron](https://github.com/vitaliemiron)) * Add `package.json` as one of the entry points. ([#22954](https://github.com/facebook/react/pull/22954) by [@Jack](https://github.com/Jack-Works)) @@ -305,7 +305,7 @@ React 18의 Strict 모드에서는 개발 모드에서 컴포넌트를 마운트 * Add `aria-description` to the list of known ARIA attributes. ([#22142](https://github.com/facebook/react/pull/22142) by [@mahyareb](https://github.com/mahyareb)) * Add `onResize` event to video elements. ([#21973](https://github.com/facebook/react/pull/21973) by [@rileyjshaw](https://github.com/rileyjshaw)) * Add `imageSizes` and `imageSrcSet` to known props. ([#22550](https://github.com/facebook/react/pull/22550) by [@eps1lon](https://github.com/eps1lon)) -* Allow non-string `