From 363c79159aa3673d3142103a8c3b17b3f9dc65f4 Mon Sep 17 00:00:00 2001 From: Rick Hanlon Date: Mon, 29 Apr 2024 13:20:05 -0400 Subject: [PATCH 1/6] Add versions page and nav version --- src/components/Layout/TopNav/TopNav.tsx | 9 +- src/content/community/versioning-policy.md | 2 + src/content/versions.md | 282 +++++++++++++++++++++ vercel.json | 33 +++ 4 files changed, 325 insertions(+), 1 deletion(-) create mode 100644 src/content/versions.md diff --git a/src/components/Layout/TopNav/TopNav.tsx b/src/components/Layout/TopNav/TopNav.tsx index 440664e4354..57f008b5a70 100644 --- a/src/components/Layout/TopNav/TopNav.tsx +++ b/src/components/Layout/TopNav/TopNav.tsx @@ -247,7 +247,7 @@ export default function TopNav({ )}> {isMenuOpen ? : } -
+
@@ -259,6 +259,13 @@ export default function TopNav({ React
+
+ + v19.0.0 (beta) + +
diff --git a/src/siteConfig.js b/src/siteConfig.js index 0ada6b934d2..37d7c18e720 100644 --- a/src/siteConfig.js +++ b/src/siteConfig.js @@ -5,6 +5,7 @@ exports.siteConfig = { // -------------------------------------- // Translations should replace these lines: + version: '19.0.0 (beta)', languageCode: 'en', hasLegacySite: true, isRTL: false, From 2c6ec1f6144215df9adf4e8fa83460b18dfdc009 Mon Sep 17 00:00:00 2001 From: Rick Hanlon Date: Mon, 29 Apr 2024 16:55:14 -0400 Subject: [PATCH 3/6] Fix typo --- src/content/versions.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/content/versions.md b/src/content/versions.md index 6eaf2da0984..0088a40712c 100644 --- a/src/content/versions.md +++ b/src/content/versions.md @@ -11,16 +11,16 @@ The React docs at [react.dev](https://react.dev) provide documentation for the l We aim to keep the docs updated within major versions, and do not publish versions for each minor or patch version. When a new major is released, we archive the docs for the previous version as `x.react.dev`. See our [versioning policy](/community/versioning-policy) for more info. You can find an archive of previous major versions below. +## Future versions {/*future-versions*/} -## Previous doc versions {/*previous-doc-versions*/} +- [19.react.dev](https://19.react.dev) {/*docs-19*/} -#### [18.react.dev](https//18.react.dev) {/*docs-18*/} +## Previous versions {/*previous-versions*/} -#### [17.react.dev](https://17.react.dev) {/*docs-17*/} - -#### [16.react.dev](https://16.react.dev) {/*docs-16*/} - -#### [15.react.dev](https://15.react.dev) {/*docs-15*/} +- [18.react.dev](https://18.react.dev) {/*docs-18*/} +- [17.react.dev](https://17.react.dev) {/*docs-17*/} +- [16.react.dev](https://16.react.dev) {/*docs-16*/} +- [15.react.dev](https://15.react.dev) {/*docs-15*/} From 55a645319e3801c90d201b1dbb56af426d4bd9fd Mon Sep 17 00:00:00 2001 From: Rick Hanlon Date: Mon, 29 Apr 2024 16:55:55 -0400 Subject: [PATCH 4/6] Set to 18.3.1, use siteConfig in reference sidebar --- src/components/Layout/Sidebar/SidebarRouteTree.tsx | 9 +++++++-- src/components/Layout/TopNav/TopNav.tsx | 2 +- src/sidebarReference.json | 4 ++-- src/siteConfig.js | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/components/Layout/Sidebar/SidebarRouteTree.tsx b/src/components/Layout/Sidebar/SidebarRouteTree.tsx index a9fa575b510..3f058073cbe 100644 --- a/src/components/Layout/Sidebar/SidebarRouteTree.tsx +++ b/src/components/Layout/Sidebar/SidebarRouteTree.tsx @@ -10,6 +10,7 @@ import {SidebarLink} from './SidebarLink'; import {useCollapse} from 'react-collapsed'; import usePendingRoute from 'hooks/usePendingRoute'; import type {RouteItem} from 'components/Layout/getRouteMeta'; +import {siteConfig} from 'siteConfig'; interface SidebarRouteTreeProps { isForceExpanded: boolean; @@ -150,8 +151,12 @@ export function SidebarRouteTree({ ); } if (hasSectionHeader) { + let sectionHeaderText = + sectionHeader != null + ? sectionHeader.replace('{{version}}', siteConfig.version) + : ''; return ( - + {index !== 0 && (
  • - {sectionHeader} + {sectionHeaderText} ); diff --git a/src/components/Layout/TopNav/TopNav.tsx b/src/components/Layout/TopNav/TopNav.tsx index c092fab6afd..021c735f8c7 100644 --- a/src/components/Layout/TopNav/TopNav.tsx +++ b/src/components/Layout/TopNav/TopNav.tsx @@ -264,7 +264,7 @@ export default function TopNav({ - {siteConfig.version} + v{siteConfig.version} diff --git a/src/sidebarReference.json b/src/sidebarReference.json index 11459b704cb..7076e76f50f 100644 --- a/src/sidebarReference.json +++ b/src/sidebarReference.json @@ -4,7 +4,7 @@ "routes": [ { "hasSectionHeader": true, - "sectionHeader": "react@18.2.0" + "sectionHeader": "react@{{version}}" }, { "title": "Overview", @@ -156,7 +156,7 @@ }, { "hasSectionHeader": true, - "sectionHeader": "react-dom@18.2.0" + "sectionHeader": "react-dom@{{version}}" }, { "title": "Hooks", diff --git a/src/siteConfig.js b/src/siteConfig.js index 37d7c18e720..6d37e10fd51 100644 --- a/src/siteConfig.js +++ b/src/siteConfig.js @@ -3,9 +3,9 @@ */ exports.siteConfig = { + version: '18.3.1', // -------------------------------------- // Translations should replace these lines: - version: '19.0.0 (beta)', languageCode: 'en', hasLegacySite: true, isRTL: false, From 9ad167fcf2ed084dbbb2703b1dd89cbe08c4bf97 Mon Sep 17 00:00:00 2001 From: Rick Hanlon Date: Mon, 29 Apr 2024 16:57:28 -0400 Subject: [PATCH 5/6] Redirect 18.react.dev to react.dev for now --- vercel.json | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/vercel.json b/vercel.json index 5a540bb0f4a..509d72b4347 100644 --- a/vercel.json +++ b/vercel.json @@ -4,6 +4,17 @@ }, "trailingSlash": false, "redirects": [ + { + "source": "/", + "has": [ + { + "type": "host", + "value": "18.react.dev" + } + ], + "permanent": false, + "destination": "https://react.dev/" + }, { "source": "/", "has": [ From dce97d55dae1b888071b518fd6e5dfdceae31c38 Mon Sep 17 00:00:00 2001 From: Rick Hanlon Date: Mon, 29 Apr 2024 18:37:51 -0400 Subject: [PATCH 6/6] Fix stray bullet --- src/content/versions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/content/versions.md b/src/content/versions.md index 0088a40712c..fe0dac5595c 100644 --- a/src/content/versions.md +++ b/src/content/versions.md @@ -176,7 +176,7 @@ For versions older than React 15, see [15.react.dev](https://15.react.dev). - [React v0.14.3](https://legacy.reactjs.org/blog/2015/11/18/react-v0.14.3.html) - [React v0.14.4](https://legacy.reactjs.org/blog/2015/12/29/react-v0.14.4.html) - [React v0.14.8](https://legacy.reactjs.org/blog/2016/03/29/react-v0.14.8.html) -- + **Releases** - [v0.14.10 (October 2020)](https://github.com/facebook/react/blob/main/CHANGELOG.md#01410-october-14-2020) - [v0.14.8 (March 2016)](https://github.com/facebook/react/blob/main/CHANGELOG.md#0148-march-29-2016)