Skip to content

Commit e79ca88

Browse files
chore: resolved conflicts
1 parent a0c3121 commit e79ca88

7 files changed

+4
-43
lines changed

src/components/Seo.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,7 @@ const deployedTranslations = [
2222
'zh-hans',
2323
'es',
2424
'fr',
25-
<<<<<<< HEAD
26-
=======
2725
'ja',
28-
>>>>>>> e85b71de88a20cda9588f51f01d4a70e5cbe1cb4
2926
// We'll add more languages when they have enough content.
3027
// Please DO NOT edit this list without a discussion in the reactjs/react.dev repo.
3128
// It must be the same between all translations.

src/content/learn/rendering-lists.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1086,11 +1086,7 @@ export const recipes = [{
10861086

10871087
#### 帶有分隔線的列表 {/*list-with-a-separator*/}
10881088

1089-
<<<<<<< HEAD
10901089
這個範例展示了葛飾北斎一首著名的俳句,它的每一行都由 `<p>` 標籤包覆。你需要在段落之間插入一個 `<hr />` 分隔線。你的結果大概會像這個樣子:
1091-
=======
1092-
This example renders a famous haiku by Tachibana Hokushi, with each line wrapped in a `<p>` tag. Your job is to insert an `<hr />` separator between each paragraph. Your resulting structure should look like this:
1093-
>>>>>>> e85b71de88a20cda9588f51f01d4a70e5cbe1cb4
10941090

10951091
```js
10961092
<article>

src/content/learn/start-a-new-react-project.md

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,7 @@ npx create-next-app@latest
2626

2727
如果你是第一次使用 Next.js,請參考 [Next.js 教學](https://nextjs.org/learn/foundations/about-nextjs)
2828

29-
<<<<<<< HEAD
3029
Next.js 是由 [Vercel](https://vercel.com/) 維護。你可以將 [Next.js 應用程式部署](https://nextjs.org/docs/app/building-your-application/deploying)到任何 Node.js 或 serverless 主機,或是你自己的伺服器上。Next.js 也支援 [static export](https://nextjs.org/docs/pages/building-your-application/deploying/static-exports),它不需要伺服器。
31-
=======
32-
Next.js is maintained by [Vercel](https://vercel.com/). You can [deploy a Next.js app](https://nextjs.org/docs/app/building-your-application/deploying) to any Node.js or serverless hosting, or to your own server. Next.js also supports a [static export](https://nextjs.org/docs/pages/building-your-application/deploying/static-exports) which doesn't require a server.
33-
>>>>>>> e85b71de88a20cda9588f51f01d4a70e5cbe1cb4
3430

3531
### Remix {/*remix*/}
3632

@@ -93,15 +89,9 @@ Expo 由 [Expo(公司)](https://expo.dev/about)維護。使用 Expo 構建
9389

9490
### Next.js (App Router) {/*nextjs-app-router*/}
9591

96-
<<<<<<< HEAD
97-
**[Next.js 的 App Router](https://nextjs.org/docs) 是 Next.js API 的重新設計,旨在實現 React 團隊的全端架構願景。**它允許你在執行於伺服器上或甚至是構建期間的非同步(asynchronous) component 中取得資料。
92+
**[Next.js 的 App Router](https://nextjs.org/docs) 是 Next.js API 的重新設計,旨在實現 React 團隊的全端架構願景。**它允許你在執行於伺服器上或甚至是構建期間的 asynchronous component 中取得資料。
9893

99-
Next.js 是由 [Vercel](https://vercel.com/) 維護。你可以將 [Next.js 應用程式部署](https://nextjs.org/docs/app/building-your-application/deploying)到任何 Node.js 或 serverless 主機,或是你自己的伺服器上。Next.js 還支援[靜態匯出](https://nextjs.org/docs/app/building-your-application/deploying/static-exports),不需要伺服器即可執行。
100-
=======
101-
**[Next.js's App Router](https://nextjs.org/docs) is a redesign of the Next.js APIs aiming to fulfill the React team’s full-stack architecture vision.** It lets you fetch data in asynchronous components that run on the server or even during the build.
102-
103-
Next.js is maintained by [Vercel](https://vercel.com/). You can [deploy a Next.js app](https://nextjs.org/docs/app/building-your-application/deploying) to any Node.js or serverless hosting, or to your own server. Next.js also supports [static export](https://nextjs.org/docs/app/building-your-application/deploying/static-exports) which doesn't require a server.
104-
>>>>>>> e85b71de88a20cda9588f51f01d4a70e5cbe1cb4
94+
Next.js 是由 [Vercel](https://vercel.com/) 維護。你可以將 [Next.js 應用程式部署](https://nextjs.org/docs/app/building-your-application/deploying)到任何 Node.js 或 serverless 主機,或是你自己的伺服器上。Next.js 還支援 [static export](https://nextjs.org/docs/app/building-your-application/deploying/static-exports),不需要伺服器即可執行。
10595

10696
<DeepDive>
10797

src/content/learn/state-as-a-snapshot.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,9 @@ label, textarea { margin-bottom: 10px; display: block; }
7777

7878
當 React 重新 render component 時:
7979

80-
<<<<<<< HEAD
8180
1. React 再次呼叫函式。
8281
2. 你的函式回傳一個全新的 JSX 快照。
8382
3. React 接著更新畫面,使畫面與你回傳的快照相符。
84-
=======
85-
1. React calls your function again.
86-
2. Your function returns a new JSX snapshot.
87-
3. React then updates the screen to match the snapshot your function returned.
88-
>>>>>>> e85b71de88a20cda9588f51f01d4a70e5cbe1cb4
8983

9084
<IllustrationBlock sequential>
9185
<Illustration caption="React executing the function" src="/images/docs/illustrations/i_render1.png" />

src/content/reference/react/experimental_taintObjectReference.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,7 @@ experimental_taintObjectReference(
6868

6969
<Pitfall>
7070

71-
<<<<<<< HEAD
72-
**Do not rely on just tainting for security.** Tainting an object doesn't prevent leaking of every possible derived value. For example, the clone of a tainted object will create a new untained object. Using data from a tainted object (e.g. `{secret: taintedObj.secret}`) will create a new value or object that is not tainted. Tainting is a layer of protection, a secure app will have multiple layers of protection, well designed APIs, and isolation patterns.
73-
=======
7471
**Do not rely on just tainting for security.** Tainting an object doesn't prevent leaking of every possible derived value. For example, the clone of a tainted object will create a new untained object. Using data from a tainted object (e.g. `{secret: taintedObj.secret}`) will create a new value or object that is not tainted. Tainting is a layer of protection; a secure app will have multiple layers of protection, well designed APIs, and isolation patterns.
75-
>>>>>>> e85b71de88a20cda9588f51f01d4a70e5cbe1cb4
7672

7773
</Pitfall>
7874

src/content/reference/react/experimental_taintUniqueValue.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ experimental_taintUniqueValue(
7575

7676
### Prevent a token from being passed to Client Components {/*prevent-a-token-from-being-passed-to-client-components*/}
7777

78-
To ensure that sensitive information such as passwords, session tokens, or other unique values do not inadvertently get passed to Client Components, the `taintUniqueValue` function provides a layer of protection. When a value is tainted, any attempt to pass it to a Client Component will result in an error.
78+
To ensure that sensitive information such as passwords, session tokens, or other unique values do not inadvertently get passed to Client Components, the `taintUniqueValue` function provides a layer of protection. When a value is tainted, any attempt to pass it to a Client Component will result in an error.
7979

8080
The `lifetime` argument defines the duration for which the value remains tainted. For values that should remain tainted indefinitely, objects like [`globalThis`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/globalThis) or `process` can serve as the `lifetime` argument. These objects have a lifespan that spans the entire duration of your app's execution.
8181

@@ -130,11 +130,7 @@ In this example, the constant `password` is tainted. Then `password` is used to
130130

131131
Other similar ways of deriving new values from tainted values like concatenating it into a larger string, converting it to base64, or returning a substring create untained values.
132132

133-
<<<<<<< HEAD
134-
Tainting only protects against simple mistakes like explictly passing secret values to the client. Mistakes in calling the `taintUniqueValue` like using a global store outside of React, without the corresponding lifetime object, can cause the tainted value to become untainted. Tainting is a layer of protection, a secure app will have multiple layers of protection, well designed APIs, and isolation patterns.
135-
=======
136133
Tainting only protects against simple mistakes like explictly passing secret values to the client. Mistakes in calling the `taintUniqueValue` like using a global store outside of React, without the corresponding lifetime object, can cause the tainted value to become untainted. Tainting is a layer of protection; a secure app will have multiple layers of protection, well designed APIs, and isolation patterns.
137-
>>>>>>> e85b71de88a20cda9588f51f01d4a70e5cbe1cb4
138134

139135
</Pitfall>
140136

@@ -180,7 +176,7 @@ export function fetchAPI(url) {
180176
}
181177
```
182178

183-
Sometimes mistakes happen during refactoring and not all of your colleagues might know about this.
179+
Sometimes mistakes happen during refactoring and not all of your colleagues might know about this.
184180
To protect against this mistakes happening down the line we can "taint" the actual password:
185181

186182
```js

src/sidebarReference.json

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -130,21 +130,13 @@
130130
},
131131
{
132132
"title": "experimental_taintObjectReference",
133-
<<<<<<< HEAD
134-
"path": "/reference/react/experimental_taintObjectReference"
135-
},
136-
{
137-
"title": "experimental_taintUniqueValue",
138-
"path": "/reference/react/experimental_taintUniqueValue"
139-
=======
140133
"path": "/reference/react/experimental_taintObjectReference",
141134
"canary": true
142135
},
143136
{
144137
"title": "experimental_taintUniqueValue",
145138
"path": "/reference/react/experimental_taintUniqueValue",
146139
"canary": true
147-
>>>>>>> e85b71de88a20cda9588f51f01d4a70e5cbe1cb4
148140
}
149141
]
150142
},

0 commit comments

Comments
 (0)