Sync with react.dev @ 50d6991 (#475)

react-translations-bot · mrbadri · kosh-jp · web-flow · commit 147807a1c5fb · 2025-06-23T02:58:04.000-07:00
* fix: correct overlay highlighting in code examples (#7669) * fix: the value property of checkbox to the checked property (#7804) * No need for useState here — useCounter handles the state internally (#7803) * docs: fix misplaced prepositional phrase error (#7799) * Fix wrong documentation for effect events (#7800) * Fix wrong documentation for effect events * Update src/content/learn/separating-events-from-effects.md --------- Co-authored-by: Ricky <rickhanlonii@gmail.com> * Remove stray console.log and image (#7814) * fix(template): remove unnecessary import of React in template code (#7750) * fix(reference): correct singular form of 'Server Functions' to 'Server Function' (#7749) * Add bold mono font (#7815) --------- Co-authored-by: Nicolas Ettlin <nicolas.ettlin@me.com> * Remove TODO comments and convert them to issues (#7743) * Remove TODO comment and convert to an issue for react-test-renderer * Remove TODO comment and convert to an issue for react-dom/test-utils * Add example of `useActionState` handling execution order (#7733) * docs: update vite link (#7784) * docs: add bsky link (#7781) * docs: add bsky link rename twitter to x * Update src/content/community/index.md --------- Co-authored-by: Ricky <rickhanlonii@gmail.com> * React Montreal Meetings have a new link (#7809) * fix: remove useless content (#6615) * fix: wrong verb tense in doc (#7818) * fix: typo in challenge solution (#7816) * Use experiemental in all uEE doc sandboxes (#7820) * Author: Josh Story <story@hey.com> Date: 2025-05-21 11:01:46 -0700 clarify the nonce and signal options for prerender docs clarifies why nonce is not an option for prerender APIs. clarifies how you would use signal to abort a prerender with in page documentation * Fix wrong explanation in preserving-and-resetting-state (#6043) * fix: correct broken WAI-ARIA modal dialog link in createPortal reference (#7833) * fix link from ARIA dialog-modal * chore: trigger CLA recheck * Update meetups.md adding React Rajasthan Community (#7831) Adding the React Community for Rajasthan India * Update components-and-hooks-must-be-pure.md (#7830) Some grammar fixes, and language clarifications * Update referencing-values-with-refs.md (#7829) Fixed invalid URL * Add uwu click animation (#7822) * Fix typo and clarily that a server function reference is created only when that function is used by a Client Component (#7746) * Add React Alicante 2025 to Conferences page (#7674) * fix: use const where applicable in examples for keeping components pure (#7819) * Remove `forwardRef` reference from API listing (#7837) This API is now under "Legacy APIs" and should probably no longer be listed as a "modern API". * docs: Refactor context provider usage (#7793) * delete provider * Fix NavContext usage in Talks component * Fix TocContext and LanguagesContext usage in Page component * Fix IllustrationContext usage in IllustrationBlock component * Fix LevelContext and TasksContext usage in managing-state.md * Fix ThemeContext and Context usage in MyApp component * Fix HighlightContext usage in List component * Fix ThemeContext usage in MyApp component * Fix ErrorDecoderContext usage in ErrorDecoderPage component * Fix ThemeContext usage in MyPage and MyApp components * Fix ThemeContext usage in MyApp component * Fix useContext documentation to correct context provider references * Fix context provider references in createContext documentation * prettier * Update src/content/reference/react/createContext.md --------- Co-authored-by: Ricky <rickhanlonii@gmail.com> * fix: typo in docs on prerendering (#7823) * Replace Context.Provider with Context (#7838) Update to be in line with the recommended way from React 19. Docs https://react.dev/blog/2024/12/05/react-19#context-as-a-provider --------- Co-authored-by: Ricky <rickhanlonii@gmail.com> * fix(blog): resolve typo in React 19 blog post (`refs` → `ref`s) (#7828) This PR corrects a small typo in the React documentation, changing "`refs`" to "`ref`s" for accuracy and consistency. * Update analyze_comment.yml (#7840) --------- Co-authored-by: Mohammad Reza Badri <85818966+mrbadri@users.noreply.github.com> Co-authored-by: kosh <sipuofare631@gmail.com> Co-authored-by: Gourav Bhardwaj <98509451+gbhardwaj00@users.noreply.github.com> Co-authored-by: Mehmet Mallı <mallimehmet@gmail.com> Co-authored-by: Ricky <rickhanlonii@gmail.com> Co-authored-by: Ryosuke Hoda <h.ryosuke820@gmail.com> Co-authored-by: Nicolas Ettlin <nicolas.ettlin@me.com> Co-authored-by: Bartosz Klonowski <70535775+BartoszKlonowski@users.noreply.github.com> Co-authored-by: Ajit <47279189+ajits01@users.noreply.github.com> Co-authored-by: bornkiss <101384056+bornkiss@users.noreply.github.com> Co-authored-by: Eric Cote <eric@coteexpert.com> Co-authored-by: Xleine <xleine@qq.com> Co-authored-by: Ayman Alhourani <139303034+aalhoura@users.noreply.github.com> Co-authored-by: Josh Story <story@hey.com> Co-authored-by: Soichiro Miki <smiki-tky@umin.ac.jp> Co-authored-by: Dmitry Titov <61434098+dimatitov@users.noreply.github.com> Co-authored-by: Shubham Gupta <50445450+shubhamui@users.noreply.github.com> Co-authored-by: G. van Dorland <giodor13@gmail.com> Co-authored-by: Julius Lundang <cHaLkdusT@users.noreply.github.com> Co-authored-by: jinsoo <89149734+Jinsoo1004@users.noreply.github.com> Co-authored-by: John Kapantzakis <kapantzak@gmail.com> Co-authored-by: Mike DiDomizio <mikedidomizio@gmail.com> Co-authored-by: Aakansha Doshi <aakansha1216@gmail.com> Co-authored-by: Jan Kassens <jkassens@meta.com> Co-authored-by: minami yoshihiko <ymym1990ymym@gmail.com> Co-authored-by: Kunall Banerjee <14703164+yeskunall@users.noreply.github.com> Co-authored-by: Amirhossein Alibakhshi <amir78729@gmail.com> Co-authored-by: Jatin Singh <jadenrizz31@gmail.com>
diff --git a/src/content/reference/react-dom/static/prerender.md b/src/content/reference/react-dom/static/prerender.md
@@ -68,6 +68,7 @@ On the client, call [`hydrateRoot`](/reference/react-dom/client/hydrateRoot) to
 
 #### Caveats {/*caveats*/}
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 `nonce` is not an available option when prerendering. Nonces must be unique per request and if you use nonces to secure your application with [CSP](https://developer.mozilla.org/en-US/docs/Web/HTTP/Guides/CSP) it would be inappropriate and insecure to include the a nonce value in the prerender itself.
@@ -77,6 +78,9 @@ On the client, call [`hydrateRoot`](/reference/react-dom/client/hydrateRoot) to
 =======
 `nonce` is not an available option when prerendering. Nonces must be unique per request and if you use nonces to secure your application with [CSP](https://developer.mozilla.org/en-US/docs/Web/HTTP/Guides/CSP) it would be inappropriate and insecure to include the nonce value in the prerender itself.
 >>>>>>> 50d6991ca6652f4bc4c985cf0c0e593864f2cc91
+=======
+`nonce` is not an available option when prerendering. Nonces must be unique per request and if you use nonces to secure your application with [CSP](https://developer.mozilla.org/en-US/docs/Web/HTTP/Guides/CSP) it would be inappropriate and insecure to include the nonce value in the prerender itself.
+>>>>>>> 50d6991ca6652f4bc4c985cf0c0e593864f2cc91
 
 
 <Note>
diff --git a/src/content/reference/react-dom/static/prerenderToNodeStream.md b/src/content/reference/react-dom/static/prerenderToNodeStream.md
@@ -69,6 +69,7 @@ On the client, call [`hydrateRoot`](/reference/react-dom/client/hydrateRoot) to
 
 #### Caveats {/*caveats*/}
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 `nonce` is not an available option when prerendering. Nonces must be unique per request and if you use nonces to secure your application with [CSP](https://developer.mozilla.org/en-US/docs/Web/HTTP/Guides/CSP) it would be inappropriate and insecure to include the a nonce value in the prerender itself.
@@ -78,6 +79,9 @@ On the client, call [`hydrateRoot`](/reference/react-dom/client/hydrateRoot) to
 =======
 `nonce` is not an available option when prerendering. Nonces must be unique per request and if you use nonces to secure your application with [CSP](https://developer.mozilla.org/en-US/docs/Web/HTTP/Guides/CSP) it would be inappropriate and insecure to include the nonce value in the prerender itself.
 >>>>>>> 50d6991ca6652f4bc4c985cf0c0e593864f2cc91
+=======
+`nonce` is not an available option when prerendering. Nonces must be unique per request and if you use nonces to secure your application with [CSP](https://developer.mozilla.org/en-US/docs/Web/HTTP/Guides/CSP) it would be inappropriate and insecure to include the nonce value in the prerender itself.
+>>>>>>> 50d6991ca6652f4bc4c985cf0c0e593864f2cc91
 
 <Note>
 
diff --git a/src/content/reference/rsc/server-functions.md b/src/content/reference/rsc/server-functions.md
@@ -28,6 +28,7 @@ To support Server Functions as a bundler or framework, we recommend pinning to a
 
 </Note>
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 When a Server Function is defined with the [`"use server"`](/reference/rsc/use-server) directive, your framework will automatically create a reference to the server function, and pass that reference to the Client Component. When that function is called on the client, React will send a request to the server to execute the function, and return the result.
@@ -37,6 +38,9 @@ When a Server Function is defined with the [`"use server"`](/reference/rsc/use-s
 =======
 When a Server Function is defined with the [`"use server"`](/reference/rsc/use-server) directive, your framework will automatically create a reference to the Server Function, and pass that reference to the Client Component. When that function is called on the client, React will send a request to the server to execute the function, and return the result.
 >>>>>>> 50d6991ca6652f4bc4c985cf0c0e593864f2cc91
+=======
+When a Server Function is defined with the [`"use server"`](/reference/rsc/use-server) directive, your framework will automatically create a reference to the Server Function, and pass that reference to the Client Component. When that function is called on the client, React will send a request to the server to execute the function, and return the result.
+>>>>>>> 50d6991ca6652f4bc4c985cf0c0e593864f2cc91
 
 Server Functions can be created in Server Components and passed as props to Client Components, or they can be imported and used in Client Components.
 
