Skip to content

Commit 1a87558

Browse files
react-translations-botmrbadrikosh-jpgbhardwaj00mehmetmalli
authored
Sync with react.dev @ c0c955e (#476)
* 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) * Fix #6915: typo fix (#6917) * fix: update ids to point to right part of the docs (#7854) * chore: remove unused date-fns (#7856) --------- 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> Co-authored-by: Batuhan Tomo <91488737+Rekl0w@users.noreply.github.com> Co-authored-by: Noritaka Kobayashi <arukimedesu1166777@gmail.com>
1 parent 147807a commit 1a87558

File tree

8 files changed

+22
-16
lines changed

8 files changed

+22
-16
lines changed

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
"@radix-ui/react-context-menu": "^2.1.5",
3131
"body-scroll-lock": "^3.1.3",
3232
"classnames": "^2.2.6",
33-
"date-fns": "^2.16.1",
3433
"debounce": "^1.2.1",
3534
"github-slugger": "^1.3.0",
3635
"next": "15.1.0",

src/content/reference/react-dom/static/prerender.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ On the client, call [`hydrateRoot`](/reference/react-dom/client/hydrateRoot) to
7171
<<<<<<< HEAD
7272
<<<<<<< HEAD
7373
<<<<<<< HEAD
74+
<<<<<<< HEAD
7475
`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.
7576
=======
7677
`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.
@@ -81,6 +82,9 @@ On the client, call [`hydrateRoot`](/reference/react-dom/client/hydrateRoot) to
8182
=======
8283
`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.
8384
>>>>>>> 50d6991ca6652f4bc4c985cf0c0e593864f2cc91
85+
=======
86+
`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.
87+
>>>>>>> c0c955ed1d1c4fe3bf3e18c06a8d121902a01619
8488
8589
8690
<Note>

src/content/reference/react-dom/static/prerenderToNodeStream.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ On the client, call [`hydrateRoot`](/reference/react-dom/client/hydrateRoot) to
7272
<<<<<<< HEAD
7373
<<<<<<< HEAD
7474
<<<<<<< HEAD
75+
<<<<<<< HEAD
7576
`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.
7677
=======
7778
`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.
@@ -82,6 +83,9 @@ On the client, call [`hydrateRoot`](/reference/react-dom/client/hydrateRoot) to
8283
=======
8384
`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.
8485
>>>>>>> 50d6991ca6652f4bc4c985cf0c0e593864f2cc91
86+
=======
87+
`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.
88+
>>>>>>> c0c955ed1d1c4fe3bf3e18c06a8d121902a01619
8589
8690
<Note>
8791

src/content/reference/rsc/directives.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Directives are for use in [React Server Components](/reference/rsc/server-compon
1010

1111
<Intro>
1212

13-
Directives provide instructions to [bundlers compatible with React Server Components](/learn/start-a-new-react-project#bleeding-edge-react-frameworks).
13+
Directives provide instructions to [bundlers compatible with React Server Components](/learn/start-a-new-react-project#full-stack-frameworks).
1414

1515
</Intro>
1616

src/content/reference/rsc/server-components.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ title: Server Components
44

55
<RSC>
66

7-
Server Components are for use in [React Server Components](/learn/start-a-new-react-project#bleeding-edge-react-frameworks).
7+
Server Components are for use in [React Server Components](/learn/start-a-new-react-project#full-stack-frameworks).
88

99
</RSC>
1010

@@ -22,7 +22,7 @@ This separate environment is the "server" in React Server Components. Server Com
2222

2323
#### How do I build support for Server Components? {/*how-do-i-build-support-for-server-components*/}
2424

25-
While React Server Components in React 19 are stable and will not break between minor versions, the underlying APIs used to implement a React Server Components bundler or framework do not follow semver and may break between minors in React 19.x.
25+
While React Server Components in React 19 are stable and will not break between minor versions, the underlying APIs used to implement a React Server Components bundler or framework do not follow semver and may break between minors in React 19.x.
2626

2727
To support React Server Components as a bundler or framework, we recommend pinning to a specific React version, or using the Canary release. We will continue working with bundlers and frameworks to stabilize the APIs used to implement React Server Components in the future.
2828

@@ -45,7 +45,7 @@ function Page({page}) {
4545
setContent(data.content);
4646
});
4747
}, [page]);
48-
48+
4949
return <div>{sanitizeHtml(marked(content))}</div>;
5050
}
5151
```
@@ -69,7 +69,7 @@ import sanitizeHtml from 'sanitize-html'; // Not included in bundle
6969
async function Page({page}) {
7070
// NOTE: loads *during* render, when the app is built.
7171
const content = await file.readFile(`${page}.md`);
72-
72+
7373
return <div>{sanitizeHtml(marked(content))}</div>;
7474
}
7575
```
@@ -113,7 +113,7 @@ function Note({id}) {
113113
setNote(data.note);
114114
});
115115
}, [id]);
116-
116+
117117
return (
118118
<div>
119119
<Author id={note.authorId} />
@@ -253,7 +253,7 @@ This works by first rendering `Notes` as a Server Component, and then instructin
253253
<p>this is the second note</p>
254254
</Expandable>
255255
<!--...-->
256-
</div>
256+
</div>
257257
</body>
258258
```
259259

@@ -270,8 +270,8 @@ import db from './database';
270270
async function Page({id}) {
271271
// Will suspend the Server Component.
272272
const note = await db.notes.get(id);
273-
274-
// NOTE: not awaited, will start here and await on the client.
273+
274+
// NOTE: not awaited, will start here and await on the client.
275275
const commentsPromise = db.comments.get(note.id);
276276
return (
277277
<div>

src/content/reference/rsc/server-functions.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ To support Server Functions as a bundler or framework, we recommend pinning to a
3131
<<<<<<< HEAD
3232
<<<<<<< HEAD
3333
<<<<<<< HEAD
34+
<<<<<<< HEAD
3435
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.
3536
=======
3637
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.
@@ -41,6 +42,9 @@ When a Server Function is defined with the [`"use server"`](/reference/rsc/use-s
4142
=======
4243
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.
4344
>>>>>>> 50d6991ca6652f4bc4c985cf0c0e593864f2cc91
45+
=======
46+
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.
47+
>>>>>>> c0c955ed1d1c4fe3bf3e18c06a8d121902a01619
4448
4549
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.
4650

src/content/reference/rsc/use-client.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export default function RichTextEditor({ timestamp, text }) {
4141
}
4242
```
4343

44-
When a file marked with `'use client'` is imported from a Server Component, [compatible bundlers](/learn/start-a-new-react-project#bleeding-edge-react-frameworks) will treat the module import as a boundary between server-run and client-run code.
44+
When a file marked with `'use client'` is imported from a Server Component, [compatible bundlers](/learn/start-a-new-react-project#full-stack-frameworks) will treat the module import as a boundary between server-run and client-run code.
4545

4646
As dependencies of `RichTextEditor`, `formatDate` and `Button` will also be evaluated on the client regardless of whether their modules contain a `'use client'` directive. Note that a single module may be evaluated on the server when imported from server code and on the client when imported from client code.
4747

yarn.lock

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2799,11 +2799,6 @@ data-view-byte-offset@^1.0.0:
27992799
es-errors "^1.3.0"
28002800
is-data-view "^1.0.1"
28012801

2802-
date-fns@^2.16.1:
2803-
version "2.28.0"
2804-
resolved "https://registry.npmjs.org/date-fns/-/date-fns-2.28.0.tgz"
2805-
integrity sha512-8d35hViGYx/QH0icHYCeLmsLmMUheMmTyV9Fcm6gvNwdw31yXXH+O85sOBJ+OLnLQMKZowvpKb6FgMIQjcpvQw==
2806-
28072802
debounce@^1.2.1:
28082803
version "1.2.1"
28092804
resolved "https://registry.npmjs.org/debounce/-/debounce-1.2.1.tgz"

0 commit comments

Comments
 (0)