From 91614a51a1be9078777bc337ba83fc62e606cc14 Mon Sep 17 00:00:00 2001 From: Sophie Alpert Date: Sun, 9 Feb 2025 14:35:05 -0800 Subject: [PATCH 1/2] Clarify security updates in versioning-policy.md (#7485) --- src/content/community/versioning-policy.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/content/community/versioning-policy.md b/src/content/community/versioning-policy.md index 7aa71efd20..a61d19942c 100644 --- a/src/content/community/versioning-policy.md +++ b/src/content/community/versioning-policy.md @@ -8,7 +8,7 @@ All stable builds of React go through a high level of testing and follow semanti -For a list of previous releases, see the [Versions](/versions) page. +This versioning policy describes our approach to version numbers for packages such as `react` and `react-dom`. For a list of previous releases, see the [Versions](/versions) page. ## Stable releases {/*stable-releases*/} @@ -24,7 +24,9 @@ Major releases can also contain new features, and any release can include bug fi Minor releases are the most common type of release. -### Breaking Changes {/*breaking-changes*/} +We know our users continue to use old versions of React in production. If we learn of a security vulnerability in React, we release a backported fix for all major versions that are affected by the vulnerability. + +### Breaking changes {/*breaking-changes*/} Breaking changes are inconvenient for everyone, so we try to minimize the number of major releases – for example, React 15 was released in April 2016 and React 16 was released in September 2017, and React 17 was released in October 2020. From 2759cc0c306b3ce86659e7619e6f8c02d54efeca Mon Sep 17 00:00:00 2001 From: Xleine Date: Mon, 10 Feb 2025 22:00:52 +0800 Subject: [PATCH 2/2] fix conflict --- src/content/community/versioning-policy.md | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/content/community/versioning-policy.md b/src/content/community/versioning-policy.md index 8c7daf9c27..1b15fc7270 100644 --- a/src/content/community/versioning-policy.md +++ b/src/content/community/versioning-policy.md @@ -24,13 +24,9 @@ This versioning policy describes our approach to version numbers for packages su 次要版本发布是最常见的发布类型。 -<<<<<<< HEAD -### 破坏性版本 {/*breaking-changes*/} -======= -We know our users continue to use old versions of React in production. If we learn of a security vulnerability in React, we release a backported fix for all major versions that are affected by the vulnerability. +我们知道我们的用户仍然在生产中使用旧版本的 React。如果我们发现了 React 的安全漏洞，我们将为受漏洞影响的所有主要版本发布一个向后移植的修复补丁。 -### Breaking changes {/*breaking-changes*/} ->>>>>>> 91614a51a1be9078777bc337ba83fc62e606cc14 +### 破坏性版本 {/*breaking-changes*/} 破坏性改变对每个人都不方便，因此我们试图尽量减少主要版本的发布数量 - 例如，React 15 发布于 2016 年 4 月，React 16 发布于 2017 年 9 月，React 17 发布于 2020 年 10 月。