Skip to content

Commit bae9509

Browse files
authored
Merge pull request #548 from reactjs/sync-c0c955ed
Sync with react.dev @ c0c955e
2 parents 137308a + 00faa56 commit bae9509

File tree

5 files changed

+10
-16
lines changed

5 files changed

+10
-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/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/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)