Skip to content

Commit db369b3

Browse files
merging all conflicts
2 parents ce41101 + 341c312 commit db369b3

File tree

6 files changed

+29
-10
lines changed

6 files changed

+29
-10
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/learn/scaling-up-with-reducer-and-context.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -690,7 +690,11 @@ ul, li { margin: 0; padding: 0; }
690690
</TasksContext>
691691
```
692692

693+
<<<<<<< HEAD
693694
相反,任何需要 tasks 的组件都可以从 `TaskContext` 中读取它:
695+
=======
696+
Instead, any component that needs the task list can read it from the `TasksContext`:
697+
>>>>>>> 341c312916e1b657262bbe14b134a6f1779fecf1
694698
695699
```js {2}
696700
export default function TaskList() {

src/content/reference/rsc/directives.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@ title: "指示符"
1010

1111
<Intro>
1212

13+
<<<<<<< HEAD
1314
指示符(directive)向 [与 React 服务器组件兼容的捆绑器](/learn/start-a-new-react-project#bleeding-edge-react-frameworks) 提供指令(instruction)。
15+
=======
16+
Directives provide instructions to [bundlers compatible with React Server Components](/learn/start-a-new-react-project#full-stack-frameworks).
17+
>>>>>>> 341c312916e1b657262bbe14b134a6f1779fecf1
1418
1519
</Intro>
1620

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

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@ title: 服务器组件
44

55
<RSC>
66

7+
<<<<<<< HEAD
78
服务器组件被用在 [React 服务器组件](/learn/start-a-new-react-project#bleeding-edge-react-frameworks) 中。
9+
=======
10+
Server Components are for use in [React Server Components](/learn/start-a-new-react-project#full-stack-frameworks).
11+
>>>>>>> 341c312916e1b657262bbe14b134a6f1779fecf1
812
913
</RSC>
1014

@@ -22,7 +26,11 @@ React 服务器组件中的「服务器」就是指这个独立的环境。服
2226

2327
#### 我如何构建对服务器组件的支持? {/*how-do-i-build-support-for-server-components*/}
2428

29+
<<<<<<< HEAD
2530
虽然 React 19 中的 React 服务器组件是稳定的,并且在小版本之间不会发生破坏,但用于实现 React 服务器组件打包器或框架的底层 API 不遵循 semver,并可能在 React 19.x 的小版本之间发生破坏。
31+
=======
32+
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.
33+
>>>>>>> 341c312916e1b657262bbe14b134a6f1779fecf1
2634
2735
为了支持 React 服务器组件作为打包器或框架,我们建议固定到特定的 React 版本,或者使用 Canary 发行版。我们将继续与打包器和框架合作,以在未来稳定用于实现 React 服务器组件的 API。
2836

@@ -45,7 +53,7 @@ function Page({page}) {
4553
setContent(data.content);
4654
});
4755
}, [page]);
48-
56+
4957
return <div>{sanitizeHtml(marked(content))}</div>;
5058
}
5159
```
@@ -69,7 +77,7 @@ import sanitizeHtml from 'sanitize-html'; // 不会包括在 bundle 中
6977
async function Page({page}) {
7078
// 注意: 会在应用构建的 **渲染过程中** 加载
7179
const content = await file.readFile(`${page}.md`);
72-
80+
7381
return <div>{sanitizeHtml(marked(content))}</div>;
7482
}
7583
```
@@ -113,7 +121,7 @@ function Note({id}) {
113121
setNote(data.note);
114122
});
115123
}, [id]);
116-
124+
117125
return (
118126
<div>
119127
<Author id={note.authorId} />
@@ -253,7 +261,7 @@ export default function Expandable({children}) {
253261
<p>this is the second note</p>
254262
</Expandable>
255263
<!--...-->
256-
</div>
264+
</div>
257265
</body>
258266
```
259267

@@ -270,8 +278,13 @@ import db from './database';
270278
async function Page({id}) {
271279
// 使用 await 会使服务器组件暂停
272280
const note = await db.notes.get(id);
281+
<<<<<<< HEAD
273282

274283
// 注意: 没有使用 await, 所以从这里开始执行,但是客户端上面进行 await
284+
=======
285+
286+
// NOTE: not awaited, will start here and await on the client.
287+
>>>>>>> 341c312916e1b657262bbe14b134a6f1779fecf1
275288
const commentsPromise = db.comments.get(note.id);
276289
return (
277290
<div>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,11 @@ export default function RichTextEditor({ timestamp, text }) {
4141
}
4242
```
4343

44+
<<<<<<< HEAD
4445
当从服务器组件导入带有 `'use client'` 标记的文件时,[兼容的捆绑工具](/learn/start-a-new-react-project#bleeding-edge-react-frameworks) 将模块导入视为服务器运行和客户端运行代码之间的边界。
46+
=======
47+
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.
48+
>>>>>>> 341c312916e1b657262bbe14b134a6f1779fecf1
4549
4650
作为 `RichTextEditor` 的依赖项,无论 `formatDate``Button` 的模块是否包含 `'use client'`,其都将在客户端上进行评估。请注意,当从服务器代码导入时,单个模块可能在服务器上进行评估,并且当从客户端代码导入时,可能在客户端上进行评估。
4751

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)