From aa70dcedc6db07987a814dba2b296cc4c5219860 Mon Sep 17 00:00:00 2001 From: yang Date: Sat, 4 Dec 2021 16:16:21 +0800 Subject: [PATCH 1/4] fix: correct the link to navigate to the team page (#4146) * fix: correct the link to navigate to the team page * remove .html Co-authored-by: Strek --- beta/src/pages/community/acknowledgements.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/beta/src/pages/community/acknowledgements.md b/beta/src/pages/community/acknowledgements.md index 095e99e768..197c9ff22d 100644 --- a/beta/src/pages/community/acknowledgements.md +++ b/beta/src/pages/community/acknowledgements.md @@ -4,7 +4,7 @@ title: Acknowledgements ## React {/*react*/} -React was originally created by [Jordan Walke](https://github.com/jordwalke). Today, React has a [dedicated full-time team working on it](/community/team.html), as well as over a thousand [open source contributors](https://github.com/facebook/react/blob/main/AUTHORS). We'd like to recognize a few people who have made significant contributions to React and its documentation in the past and have helped maintain them over the years: +React was originally created by [Jordan Walke](https://github.com/jordwalke). Today, React has a [dedicated full-time team working on it](/community/meet-the-team), as well as over a thousand [open source contributors](https://github.com/facebook/react/blob/main/AUTHORS). We'd like to recognize a few people who have made significant contributions to React and its documentation in the past and have helped maintain them over the years: * [Almero Steyn](https://github.com/AlmeroSteyn) * [Andreas Svensson](https://github.com/syranide) From 29627aec7675c0d9d823d28e6119b569a417c674 Mon Sep 17 00:00:00 2001 From: Strek Date: Tue, 7 Dec 2021 13:18:26 +0530 Subject: [PATCH 2/4] Generated missing ids (#4150) --- content/blog/2021-06-08-the-plan-for-react-18.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/content/blog/2021-06-08-the-plan-for-react-18.md b/content/blog/2021-06-08-the-plan-for-react-18.md index bece945e46..795159da5e 100644 --- a/content/blog/2021-06-08-the-plan-for-react-18.md +++ b/content/blog/2021-06-08-the-plan-for-react-18.md @@ -15,7 +15,7 @@ The React team is excited to share a few updates: These updates are primarily aimed at maintainers of third-party libraries. If you’re learning, teaching, or using React to build user-facing applications, you can safely ignore this post. But you are welcome to follow the discussions in the React 18 Working Group if you're curious! -## What’s coming in React 18 +## What’s coming in React 18 {#whats-coming-in-react-18} When it’s released, React 18 will include out-of-the-box improvements (like [automatic batching](https://github.com/reactwg/react-18/discussions/21)), new APIs (like [`startTransition`](https://github.com/reactwg/react-18/discussions/41)), and a [new streaming server renderer](https://github.com/reactwg/react-18/discussions/37) with built-in support for `React.lazy`. @@ -23,13 +23,13 @@ These features are possible thanks to a new opt-in mechanism we’re adding in R If you've been following our research into the future of React (we don't expect you to!), you might have heard of something called “concurrent mode” or that it might break your app. In response to this feedback from the community, we’ve redesigned the upgrade strategy for gradual adoption. Instead of an all-or-nothing “mode”, concurrent rendering will only be enabled for updates triggered by one of the new features. In practice, this means **you will be able to adopt React 18 without rewrites and try the new features at your own pace.** -## A gradual adoption strategy +## A gradual adoption strategy {#a-gradual-adoption-strategy} Since concurrency in React 18 is opt-in, there are no significant out-of-the-box breaking changes to component behavior. **You can upgrade to React 18 with minimal or no changes to your application code, with a level of effort comparable to a typical major React release**. Based on our experience converting several apps to React 18, we expect that many users will be able to upgrade within a single afternoon. We successfully shipped concurrent features to tens of thousands of components at Facebook, and in our experience, we've found that most React components “just work” without additional changes. We're committed to making sure this is a smooth upgrade for the entire community, so today we're announcing the React 18 Working Group. -## Working with the community +## Working with the community {#working-with-the-community} We’re trying something new for this release: We've invited a panel of experts, developers, library authors, and educators from across the React community to participate in our [React 18 Working Group](https://github.com/reactwg/react-18) to provide feedback, ask questions, and collaborate on the release. We couldn't invite everyone we wanted to this initial, small group, but if this experiment works out, we hope there will be more in the future! @@ -37,7 +37,7 @@ We’re trying something new for this release: We've invited a panel of experts, For more information on upgrading to React 18, or additional resources about the release, see the [React 18 announcement post](https://github.com/reactwg/react-18/discussions/4). -## Accessing the React 18 Working Group +## Accessing the React 18 Working Group {#accessing-the-react-18-working-group} Everyone can read the discussions in the [React 18 Working Group repo](https://github.com/reactwg/react-18). @@ -45,13 +45,13 @@ Because we expect an initial surge of interest in the Working Group, only invite As always, you can submit bug reports, questions, and general feedback to our [issue tracker](https://github.com/facebook/react/issues). -## How to try React 18 Alpha today +## How to try React 18 Alpha today {#how-to-try-react-18-alpha-today} New alphas are [regularly published to npm using the `@alpha` tag](https://github.com/reactwg/react-18/discussions/9). These releases are built using the most recent commit to our main repo. When a feature or bugfix is merged, it will appear in an alpha the following weekday. There may be significant behavioral or API changes between alpha releases. Please remember that **alpha releases are not recommended for user-facing, production applications**. -## Projected React 18 release timeline +## Projected React 18 release timeline {#projected-react-18-release-timeline} We don't have a specific release date scheduled, but we expect it will take several months of feedback and iteration before React 18 is ready for most production applications. From 7d9c9e80d2291bff49718b0c71c129575a212d86 Mon Sep 17 00:00:00 2001 From: bigfang Date: Wed, 8 Dec 2021 15:21:00 +0800 Subject: [PATCH 3/4] fix slice() link (#4156) --- beta/src/pages/learn/updating-arrays-in-state.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/beta/src/pages/learn/updating-arrays-in-state.md b/beta/src/pages/learn/updating-arrays-in-state.md index 771788c73e..92b1f7b45c 100644 --- a/beta/src/pages/learn/updating-arrays-in-state.md +++ b/beta/src/pages/learn/updating-arrays-in-state.md @@ -35,7 +35,7 @@ Alternatively, you can [use Immer](#write-concise-update-logic-with-immer) which -Unfortunately, [`slice`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/splice) and [`splice`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/splice) are named similarly but are very different: +Unfortunately, [`slice`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/slice) and [`splice`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/splice) are named similarly but are very different: * `slice` lets you copy an array or a part of it. * `splice` **mutates** the array (to insert or delete items). From 0b3cc9ea9e8f8a01b17f7f8977de73996f1921d7 Mon Sep 17 00:00:00 2001 From: QC-L Date: Thu, 9 Dec 2021 16:44:36 +0800 Subject: [PATCH 4/4] docs(cn): fix conflicts --- beta/src/pages/community/acknowledgements.md | 6 +---- .../blog/2021-06-08-the-plan-for-react-18.md | 24 ------------------- 2 files changed, 1 insertion(+), 29 deletions(-) diff --git a/beta/src/pages/community/acknowledgements.md b/beta/src/pages/community/acknowledgements.md index 8ac1c3d274..3edbce4957 100644 --- a/beta/src/pages/community/acknowledgements.md +++ b/beta/src/pages/community/acknowledgements.md @@ -4,11 +4,7 @@ title: 鸣谢 ## React {/*react*/} -<<<<<<< HEAD -React 最初由 [Jordan Walke](https://github.com/jordwalke) 创立。如今，React 已拥有 [专门的团队在全职从事这项工作](/community/team.html)，同时社区拥有超过 1k+ 的 [开源贡献者](https://github.com/facebook/react/blob/main/AUTHORS) 参与，我们想表彰一些人，他们在过去对 React 及其文档方面做出了重大贡献，并且多年来一直帮助维护它们： -======= -React was originally created by [Jordan Walke](https://github.com/jordwalke). Today, React has a [dedicated full-time team working on it](/community/meet-the-team), as well as over a thousand [open source contributors](https://github.com/facebook/react/blob/main/AUTHORS). We'd like to recognize a few people who have made significant contributions to React and its documentation in the past and have helped maintain them over the years: ->>>>>>> 7d9c9e80d2291bff49718b0c71c129575a212d86 +React 最初由 [Jordan Walke](https://github.com/jordwalke) 创立。如今，React 已拥有 [专门的团队在全职从事这项工作](/community/meet-the-team)，同时社区拥有超过 1k+ 的 [开源贡献者](https://github.com/facebook/react/blob/main/AUTHORS) 参与，我们想表彰一些人，他们在过去对 React 及其文档方面做出了重大贡献，并且多年来一直帮助维护它们： * [Almero Steyn](https://github.com/AlmeroSteyn) * [Andreas Svensson](https://github.com/syranide) diff --git a/content/blog/2021-06-08-the-plan-for-react-18.md b/content/blog/2021-06-08-the-plan-for-react-18.md index 00886ffe55..93c8fcae39 100644 --- a/content/blog/2021-06-08-the-plan-for-react-18.md +++ b/content/blog/2021-06-08-the-plan-for-react-18.md @@ -15,11 +15,7 @@ React 团队非常激动地与你分享一些最新的工作进展： 目前这些更新主要面向第三方库的维护者。如果你正在学习、教学或使用 React 来构建面向用户的应用程序，你可以忽略这篇博客。但如果你出于好奇，我们同样欢迎你关注 React 18 工作组中的讨论！ -<<<<<<< HEAD ## React 18 带来了什么 {#whats-coming-in-react-18} -======= -## What’s coming in React 18 {#whats-coming-in-react-18} ->>>>>>> 7d9c9e80d2291bff49718b0c71c129575a212d86 当 React 18 发布时，它将包含开箱即用的改进（如 [automatic batching](https://github.com/reactwg/react-18/discussions/21))，全新的 API（如 [`startTransition`](https://github.com/reactwg/react-18/discussions/41)）以及内置支持了 `React.lazy` 的 [全新 SSR 架构](https://github.com/reactwg/react-18/discussions/37)。 @@ -27,21 +23,13 @@ React 团队非常激动地与你分享一些最新的工作进展： 如果你一直在关注我们对 React 未来的研究（我们并不期待你这么做！），你可能已经听说过 “并发模式（concurrent mode）”，或许还听过它可能会搞坏你的应用程序。为了回应社区对此的反馈，我们重新设计了可渐进的升级策略。相比于之前要么不升要么全升的一刀切方式，只有由新特性触发的更新会启用并发渲染。在实践中，这意味着 **你无需重写代码即可直接使用 React 18，且可以根据自己的节奏和需要来尝试新特性**。 -<<<<<<< HEAD ## 循序渐进的采用策略 {#a-gradual-adoption-strategy} -======= -## A gradual adoption strategy {#a-gradual-adoption-strategy} ->>>>>>> 7d9c9e80d2291bff49718b0c71c129575a212d86 由于 React 18 中的并发性是可选功能，所以并不会立刻对组件行为带来任何明显的破坏性变化。**你几乎不需要对应用程序中的代码进行任何改动就可以直接升级到 React 18，并不会比以往的 React 版本升级要困难**。根据我们自己将几个应用程序升级到 React 18 的经验来看，预计许多用户能在一个下午的时间内完成升级工作。 我们在 Facebook 成功地将并发功能交付给了数以万计的组件，根据我们的经验来看，我们发现大多数 React 组件无需任何改动就能 “正常工作”。我们致力于确保整个社区都能平滑的升级，所以今天我们宣布了 React 18 工作组的成立。 -<<<<<<< HEAD ## 与社区合作 {#working-with-the-community} -======= -## Working with the community {#working-with-the-community} ->>>>>>> 7d9c9e80d2291bff49718b0c71c129575a212d86 我们正在这个版本中尝试一些新的可能：我们邀请了来自整个 React 社区的专家、开发者、库作者和教育者参与我们的 [React 18 工作组](https://github.com/reactwg/react-18)，以提供反馈，提出问题，并就发布工作进行合作。我们无法邀请所有我们想邀请的人来参加这个最初的小团体，但如果实验成功，我们希望将来会有更多的人参与！ @@ -49,11 +37,7 @@ React 团队非常激动地与你分享一些最新的工作进展： 欲了解关于升级到 React 18 的更多信息，或关于该版本的其他资源，请参阅 [React 18 公告](https://github.com/reactwg/react-18/discussions/4). -<<<<<<< HEAD ## 访问 React 18 工作组 {#accessing-the-react-18-working-group} -======= -## Accessing the React 18 Working Group {#accessing-the-react-18-working-group} ->>>>>>> 7d9c9e80d2291bff49718b0c71c129575a212d86 大家可以在 [React 18 工作组仓库](https://github.com/reactwg/react-18) 中阅读相关讨论的情况。 @@ -61,21 +45,13 @@ React 团队非常激动地与你分享一些最新的工作进展： 其他依旧，你可以在我们的 [issue](https://github.com/facebook/react/issues) 中提交错误报告、问题和反馈。 -<<<<<<< HEAD ## 如何尝试 React 18 Alpha {#how-to-try-react-18-alpha-today} -======= -## How to try React 18 Alpha today {#how-to-try-react-18-alpha-today} ->>>>>>> 7d9c9e80d2291bff49718b0c71c129575a212d86 新的 alpha 版本通过 [`@alpha` 标签定期发布到 npm 中](https://github.com/reactwg/react-18/discussions/9)。这些版本是由仓库的主分支的最新提交构建而来。当一个特性或 bug 修复被合并时，它将在下一个工作日出现在 alpha 版本中。 在 alpha 版本之间可能会有重大的变更或 API 变化。请谨记，**alpha 版本不建议用于面向用户的生产应用中**。 -<<<<<<< HEAD ## 预计 React 18 的发布时间 {#projected-react-18-release-timeline} -======= -## Projected React 18 release timeline {#projected-react-18-release-timeline} ->>>>>>> 7d9c9e80d2291bff49718b0c71c129575a212d86 我们没有安排具体的发布时间，但我们预计需要几个月的反馈和迭代时间，React 18 才能做好准备，以应用于大多数生产项目。