Skip to content

Conversation

@react-translations-bot
Copy link
Collaborator

This PR was automatically generated.

Merge changes from react.dev at e22544e

The following files have conflicts and may need new translations:

Please fix the conflicts by pushing new commits to this pull request, either by editing the files directly on GitHub or by checking out this branch.

DO NOT SQUASH MERGE THIS PULL REQUEST!

Doing so will "erase" the commits from main and cause them to show up as conflicts the next time we merge.

rickhanlonii and others added 30 commits February 14, 2025 13:40
* Blog and docs: Sunsetting Create React App

* fix link

* tweaks

* fix markdown

* clarity + thanks
…te React App (Depreacted) page section (#7612)
* fix(docs): webpack branding states it should be lower case

* chore: fix more occurrences

---------

Co-authored-by: Strek <[email protected]>
* [Blog + Docs] Updates from feedback

* Merge in changes from #7618

Co-authored-by: Mark Erikson <[email protected]>

* Say the words "Vite", "Parcel", and "Rsbuild"

* Tweaks from feedback

* re-apply #7615

* merge in #7622

Co-authored-by: elitalpa <[email protected]>

---------

Co-authored-by: Mark Erikson <[email protected]>
Co-authored-by: elitalpa <[email protected]>
* Remove starting react project from setup page

* Fix typo
fix 18.3.0 release changelog link
* Update nextjs link with the latest URL

The previous link redirected users to a 404 page.

* Update src/content/reference/react/useDeferredValue.md

---------

Co-authored-by: Ricky <[email protected]>
* Update input.md

Fix typo about input

* Update src/content/reference/react-dom/components/input.md

---------

Co-authored-by: Ricky <[email protected]>
* clarify alert message behavior in issue #7494

Reworded the explanation regarding the alert message in the documentation to better describe its behavior. The alert shows the previously entered name, with an initial value set to an empty string.

* Update src/content/learn/state-a-components-memory.md

* Update src/content/learn/state-a-components-memory.md

---------

Co-authored-by: Ricky <[email protected]>
* Fix broken header link

* Update sunsetting-create-react-app.md
…r <style> when using the `precedence` property (#7643)
This is the exact same fix as #6422 as the example is duplicated between the useOptimistic and <form> pages.
* Update index.md

Invalid link to bluesky account

* Update index.md

Fixed invalid bluesky link for react.dev
Ports over the fix in the facebook/react repo for this workflow. We don't have to wait for it to be labeled first, now that we have the reusable maintainer check.
rickhanlonii and others added 27 commits October 16, 2025 17:08
* clarify SRP definition

* Update src/content/learn/thinking-in-react.md

---------

Co-authored-by: Ricky <[email protected]>
* Remove esquery hack

* Add comment explaining next.config change
* fix: correct link for RedwoodJS to RedwoodSDK in documentation

* fix: update links for React Query and TanStack Start in documentation

* fix: update Vite installation command to use TypeScript template

* fix: update references from React Query to TanStack Query in documentation
Fixes #8097

The refactored example in the "Chains of computations" section uses
an incorrect condition that changes the game logic from the original.

The original Effect-based code advances the round after 4 gold cards:
- Increments first (0→1, 1→2, 2→3, 3→4)
- Then checks `goldCardCount > 3` (true when count is 4)

The refactored code with `goldCardCount <= 3` allows 5 gold cards:
- Checks before incrementing
- Allows counts 0, 1, 2, 3 to increment (4 values)
- Advances on the 5th card (when count is 4)

This fix changes the condition to `goldCardCount < 3`:
- Allows counts 0, 1, 2 to increment (3 values)
- Advances on the 4th card (when count is 3)
- Matches the original behavior

Verified by tracing execution logic and building the docs site locally.

Co-authored-by: PaulyBearCoding <[email protected]>
…ave-dev` to `—save-dev`) (#8146)

* Skip smartypants on TerminalBlock

* Improve TerminalBlock HTML tags

* Remove unnecessary TerminalBlock escapes from docs

* Bump DISK_CACHE_BREAKER
Copy link

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR syncs changes from the upstream react.dev repository (commit e22544e), primarily consisting of:

  • Updated file path conventions in code examples (adding src/ prefix)
  • Content corrections and refinements across learning materials
  • New blog posts announcing React 19.2, React Compiler v1.0, and the React Foundation
  • Updated team member information and community resources
  • Minor documentation improvements and typo fixes

Reviewed changes

Copilot reviewed 210 out of 496 changed files in this pull request and generated 2 comments.

Show a summary per file
File Description
src/content/learn/*.md (multiple files) Updated code example file paths from bare filenames to src/ prefixed paths
src/content/blog/2025/12/03/critical-security-vulnerability-in-react-server-components.md New blog post about CVE-2025-55182 security vulnerability
src/content/blog/2025/10/16/react-conf-2025-recap.md New React Conf 2025 recap post
src/content/blog/2025/10/07/react-compiler-1.md New React Compiler v1.0 announcement
src/content/blog/2025/10/07/introducing-the-react-foundation.md New React Foundation announcement
src/content/blog/2025/10/01/react-19-2.md New React 19.2 release post
src/content/community/*.md Updated team members, conference listings, and community resources
src/content/learn/index.md Contains merge conflict markers that need resolution
src/content/learn/preserving-and-resetting-state.md Changed value to checked for checkbox inputs; updated references from "UI tree" to "render tree"

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment on lines +7 to +11
<<<<<<< HEAD
റീയാക്ട് ഡോക്യുമെന്റേഷനിലേക്ക് സ്വാഗതം! ദിവസേന ഒരാൾ ഉപയോഗിക്കാൻ സാധ്യത ഉള്ള 80% ആശയങ്ങളും ഈ ഒരു പേജിലൂടെ നിങ്ങൾക്ക് പഠിക്കാം.
=======
Welcome to the React documentation! This page will give you an introduction to 80% of the React concepts that you will use on a daily basis.
>>>>>>> e22544e68d6fffda33332771efe27034739f35a4
Copy link

Copilot AI Dec 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file contains unresolved merge conflict markers. These must be resolved before the PR can be merged. Remove the conflict markers and decide which content to keep.

Suggested change
<<<<<<< HEAD
റീയാക്ട് ഡോക്യുമെന്റേഷനിലേക്ക് സ്വാഗതം! ദിവസേന ഒരാൾ ഉപയോഗിക്കാൻ സാധ്യത ഉള്ള 80% ആശയങ്ങളും ഈ ഒരു പേജിലൂടെ നിങ്ങൾക്ക് പഠിക്കാം.
=======
Welcome to the React documentation! This page will give you an introduction to 80% of the React concepts that you will use on a daily basis.
>>>>>>> e22544e68d6fffda33332771efe27034739f35a4
റീയാക്ട് ഡോക്യുമെന്റേഷനിലേക്ക് സ്വാഗതം! ദിവസേന ഒരാൾ ഉപയോഗിക്കാൻ സാധ്യത ഉള്ള 80% ആശയങ്ങളും ഈ ഒരു പേജിലൂടെ നിങ്ങൾക്ക് പഠിക്കാം.

Copilot uses AI. Check for mistakes.
Comment on lines +28 to +45
<<<<<<< HEAD
### React Native EU 2023 {/*react-native-eu-2023*/}
September 7 & 8, 2023. Wrocław, Poland

[Website](https://react-native.eu) - [Twitter](https://twitter.com/react_native_eu) - [Facebook](https://www.facebook.com/reactnativeeu)

### RenderCon Kenya 2023 {/*rendercon-kenya-2023*/}
September 29 - 30, 2023. Nairobi, Kenya

[Website](https://rendercon.org/) - [Twitter](https://twitter.com/renderconke) - [LinkedIn](https://www.linkedin.com/company/renderconke/) - [YouTube](https://www.youtube.com/channel/UC0bCcG8gHUL4njDOpQGcMIA)
### React India 2023 {/*react-india-2023*/}
October 5 - 7, 2023. In-person in Goa, India (hybrid event) + Oct 3 2023 - remote day
=======
### React Conf 2025 {/*react-conf-2025*/}
October 7-8, 2025. Henderson, Nevada, USA and free livestream

### React Native EU 2023 {/*react-native-eu-2023*/}
September 7 & 8, 2023. Wrocław, Poland
[Website](https://conf.react.dev/) - [Twitter](https://x.com/reactjs) - [Bluesky](https://bsky.app/profile/react.dev)

[Website](https://react-native.eu) - [Twitter](https://twitter.com/react_native_eu) - [Facebook](https://www.facebook.com/reactnativeeu)
### React India 2025 {/*react-india-2025*/}
October 31 - November 01, 2025. In-person in Goa, India (hybrid event) + Oct 15 2025 - remote day
>>>>>>> e22544e68d6fffda33332771efe27034739f35a4
Copy link

Copilot AI Dec 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file contains unresolved merge conflict markers. These must be resolved before the PR can be merged. Remove the conflict markers and consolidate the conference listings appropriately.

Copilot uses AI. Check for mistakes.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.