Skip to content

Commit 01b4913

Browse files
fix conflicts
1 parent 2c8e4bf commit 01b4913

File tree

3 files changed

+14
-54
lines changed

3 files changed

+14
-54
lines changed

src/content/blog/index.md

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,20 @@ title: React Blog
44

55
<Intro>
66

7-
<<<<<<< HEAD
8-
这个博客是 React 团队更新的官方来源。任何重要的内容,包括发布说明或弃用通知,都会首先在这里发布。你也可以关注 Twitter 的 [@reactjs](https://twitter.com/reactjs) 账号,但如果你只阅读这个博客,你也不会错过任何重要的内容。
9-
=======
10-
This blog is the official source for the updates from the React team. Anything important, including release notes or deprecation notices, will be posted here first.
11-
12-
You can also follow the [@react.dev](https://bsky.app/profiles/react.js) account on Bluesky, or [@reactjs](https://twitter.com/reactjs) account on Twitter, but you won’t miss anything essential if you only read this blog.
13-
>>>>>>> 49284218b1f5c94f930f8a9b305040dbe7d3dd48
7+
这个博客是 React 团队更新的官方来源。任何重要的内容,包括发布说明或弃用通知,都会首先在这里发布。
148

9+
你也可以在 Bluesky 上关注 [@react.dev](https://bsky.app/profiles/react.js) 的账号,Twitter 的 [@reactjs](https://twitter.com/reactjs) 账号,但如果你只阅读这个博客,你也不会错过任何重要的内容。
1510
</Intro>
1611

1712
<div className="sm:-mx-5 flex flex-col gap-5 mt-12">
1813

19-
<<<<<<< HEAD
20-
<BlogCard title="React v19 " date="December 05, 2024" url="/blog/2024/12/05/react-19">
21-
=======
2214
<BlogCard title="Sunsetting Create React App" date="February 13, 2025" url="/blog/2025/02/14/sunsetting-create-react-app">
2315

2416
Today, we’re deprecating Create React App for new apps, and encouraging existing apps to migrate to a framework. We’re also providing docs for when a framework isn’t a good fit for your project, or you prefer to start by building a framework.
2517

2618
</BlogCard>
2719

2820
<BlogCard title="React v19 " date="December 5, 2024" url="/blog/2024/12/05/react-19">
29-
>>>>>>> 49284218b1f5c94f930f8a9b305040dbe7d3dd48
3021

3122
在我们的 React 19 升级指南中, 我们分享了将应用程序升级到 React 19 的分步说明。在这篇文章中,我们将概述 React 19 的新特性,以及如何使用它们……
3223

src/content/learn/installation.md

Lines changed: 10 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,7 @@ React 从诞生之初就是可被渐进式使用的。因此你可以选择性
1010

1111
</Intro>
1212

13-
<<<<<<< HEAD
14-
<YouWillLearn isChapter={true}>
15-
16-
* [如何开始一个新的 React 项目](/learn/start-a-new-react-project)
17-
* [如果添加 React 到一个已有的项目](/learn/add-react-to-an-existing-project)
18-
* [如何设置你的编辑器](/learn/editor-setup)
19-
* [如何安装 React 开发者工具套件](/learn/react-developer-tools)
20-
21-
</YouWillLearn>
22-
23-
## 尝试 React {/*try-react*/}
24-
=======
2513
## Try React {/*try-react*/}
26-
>>>>>>> 49284218b1f5c94f930f8a9b305040dbe7d3dd48
2714

2815
无需进行任何安装,即可体验:
2916

@@ -45,41 +32,28 @@ export default function App() {
4532

4633
React 文档中的大部分页面都包含这样的 sandbox。除 React 文档以外,还存在许多支持 React 的在线代码编辑器:例如 [CodeSandbox](https://codesandbox.io/s/new)[StackBlitz](https://stackblitz.com/fork/react),或者 [CodePen](https://codepen.io/pen?template=QWYVwWN)
4734

48-
<<<<<<< HEAD
49-
### 本地尝试 React {/*try-react-locally*/}
50-
51-
如果想在电脑本地上进行尝试, [下载这个HTML页面](https://gist.githubusercontent.com/gaearon/0275b1e1518599bbeafcde4722e79ed1/raw/db72dcbf3384ee1708c4a07d3be79860db04bff0/example.html)。 然后在你的编辑器和浏览器中打开!
35+
想要在本地尝试 React,你可以 [下载这个 HTML 页面](https://gist.githubusercontent.com/gaearon/0275b1e1518599bbeafcde4722e79ed1/raw/db72dcbf3384ee1708c4a07d3be79860db04bff0/example.html)。然后就可以使用编辑器或是浏览器打开它了!
5236

53-
## 开始一个新的 React 项目 {/*start-a-new-react-project*/}
37+
## 创建一个 React 应用 {/*creating-a-react-app*/}
5438

55-
如果你想完全使用 React 建立一个应用或者一个网站, [开始一个新的 React 项目](/learn/start-a-new-react-project)
56-
=======
57-
To try React locally on your computer, [download this HTML page.](https://gist.githubusercontent.com/gaearon/0275b1e1518599bbeafcde4722e79ed1/raw/db72dcbf3384ee1708c4a07d3be79860db04bff0/example.html) Open it in your editor and in your browser!
58-
59-
## Creating a React App {/*creating-a-react-app*/}
60-
61-
If you want to start a new React app, you can [create a React app](/learn/creating-a-react-app) using a recommended framework.
39+
如果你想开始一个新的 React 应用,你可以用我们推荐的框架 [创建一个 React 应用](/learn/creating-a-react-app)
6240

6341
## Build a React Framework {/*build-a-react-framework*/}
6442

65-
If a framework is not a good fit for your project, or you prefer to start by building your own framework, you can [build your own React framework](/learn/building-a-react-framework).
66-
>>>>>>> 49284218b1f5c94f930f8a9b305040dbe7d3dd48
43+
如果某个框架不适合你的项目,或者你更愿意从构建自己的框架开始,则可以 [构建你自己的 React 框架](/learn/building-a-react-framework)
44+
6745

6846
## 添加 React 到一个已有的项目 {/*add-react-to-an-existing-project*/}
6947

70-
<<<<<<< HEAD
71-
如果你想在一个现有的应用或者网站上尝试 React, [添加 React 到一个现有的项目](/learn/add-react-to-an-existing-project)
72-
=======
73-
If want to try using React in your existing app or a website, you can [add React to an existing project.](/learn/add-react-to-an-existing-project)
48+
如果你想尝试在现有应用程序或网站中使用 React,你可以 [将 React 添加到现有项目](/learn/add-react-to-an-existing-project)
7449

75-
## Deprecated Options {/*deprecated-options*/}
50+
## 弃用的选项 {/*deprecated-options*/}
7651

77-
### Create React App (Deprecated) {/*create-react-app-deprecated*/}
52+
### Create React App(已弃用) {/*create-react-app-deprecated*/}
7853

79-
Create React App is a deprecated tool, previously recommended for creating new React apps. If you want to start a new React app, you can [create a React app](/learn/creating-a-react-app) using a recommended framework.
54+
Create React App 是一个已弃用的工具,以前建议用于创建新的 React 应用。如果你想启动新的 React 应用,你可以 [创建 React 应用](/learn/creating-a-react-app)并使用推荐的框架。
8055

81-
For more information, see [Sunsetting Create React App](/blog/2025/02/14/sunsetting-create-react-app).
82-
>>>>>>> 49284218b1f5c94f930f8a9b305040dbe7d3dd48
56+
更多信息,参见 [逐步淘汰 Create React App](/blog/2025/02/14/sunsetting-create-react-app)
8357

8458
## 下一节 {/*next-steps*/}
8559

src/sidebarLearn.json

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,12 @@
2525
"path": "/learn/installation",
2626
"routes": [
2727
{
28-
<<<<<<< HEAD
29-
"title": "启动一个新的 React 项目",
30-
"path": "/learn/start-a-new-react-project"
31-
=======
32-
"title": "Creating a React App",
28+
"title": "创建一个 React 应用",
3329
"path": "/learn/creating-a-react-app"
3430
},
3531
{
36-
"title": "Building a React Framework",
32+
"title": "构建一个 React 框架",
3733
"path": "/learn/building-a-react-framework"
38-
>>>>>>> 49284218b1f5c94f930f8a9b305040dbe7d3dd48
3934
},
4035
{
4136
"title": "将 React 添加到现有项目中",

0 commit comments

Comments
 (0)