Merge branch 'main' into release-next2

Author: brophdawg11

CHANGELOG.md

@@ -39,186 +39,188 @@ We manage release notes in this file instead of the paginated Github Releases Pa
     - [Minor Changes](#minor-changes-1)
     - [Patch Changes](#patch-changes-3)
     - [Changes by Package](#changes-by-package-1)
+  - [v6.28.1](#v6281)
+    - [Patch Changes](#patch-changes-4)
   - [v6.28.0](#v6280)
     - [What's Changed](#whats-changed)
     - [Minor Changes](#minor-changes-2)
-    - [Patch Changes](#patch-changes-4)
+    - [Patch Changes](#patch-changes-5)
   - [v6.27.0](#v6270)
     - [What's Changed](#whats-changed-1)
       - [Stabilized APIs](#stabilized-apis)
     - [Minor Changes](#minor-changes-3)
-    - [Patch Changes](#patch-changes-5)
-  - [v6.26.2](#v6262)
     - [Patch Changes](#patch-changes-6)
-  - [v6.26.1](#v6261)
+  - [v6.26.2](#v6262)
     - [Patch Changes](#patch-changes-7)
+  - [v6.26.1](#v6261)
+    - [Patch Changes](#patch-changes-8)
   - [v6.26.0](#v6260)
     - [Minor Changes](#minor-changes-4)
-    - [Patch Changes](#patch-changes-8)
-  - [v6.25.1](#v6251)
     - [Patch Changes](#patch-changes-9)
+  - [v6.25.1](#v6251)
+    - [Patch Changes](#patch-changes-10)
   - [v6.25.0](#v6250)
     - [What's Changed](#whats-changed-2)
       - [Stabilized `v7_skipActionErrorRevalidation`](#stabilized-v7_skipactionerrorrevalidation)
     - [Minor Changes](#minor-changes-5)
-    - [Patch Changes](#patch-changes-10)
-  - [v6.24.1](#v6241)
     - [Patch Changes](#patch-changes-11)
+  - [v6.24.1](#v6241)
+    - [Patch Changes](#patch-changes-12)
   - [v6.24.0](#v6240)
     - [What's Changed](#whats-changed-3)
       - [Lazy Route Discovery (a.k.a. "Fog of War")](#lazy-route-discovery-aka-fog-of-war)
     - [Minor Changes](#minor-changes-6)
-    - [Patch Changes](#patch-changes-12)
-  - [v6.23.1](#v6231)
     - [Patch Changes](#patch-changes-13)
+  - [v6.23.1](#v6231)
+    - [Patch Changes](#patch-changes-14)
   - [v6.23.0](#v6230)
     - [What's Changed](#whats-changed-4)
       - [Data Strategy (unstable)](#data-strategy-unstable)
       - [Skip Action Error Revalidation (unstable)](#skip-action-error-revalidation-unstable)
     - [Minor Changes](#minor-changes-7)
   - [v6.22.3](#v6223)
-    - [Patch Changes](#patch-changes-14)
-  - [v6.22.2](#v6222)
     - [Patch Changes](#patch-changes-15)
-  - [v6.22.1](#v6221)
+  - [v6.22.2](#v6222)
     - [Patch Changes](#patch-changes-16)
+  - [v6.22.1](#v6221)
+    - [Patch Changes](#patch-changes-17)
   - [v6.22.0](#v6220)
     - [What's Changed](#whats-changed-5)
       - [Core Web Vitals Technology Report Flag](#core-web-vitals-technology-report-flag)
     - [Minor Changes](#minor-changes-8)
-    - [Patch Changes](#patch-changes-17)
-  - [v6.21.3](#v6213)
     - [Patch Changes](#patch-changes-18)
-  - [v6.21.2](#v6212)
+  - [v6.21.3](#v6213)
     - [Patch Changes](#patch-changes-19)
-  - [v6.21.1](#v6211)
+  - [v6.21.2](#v6212)
     - [Patch Changes](#patch-changes-20)
+  - [v6.21.1](#v6211)
+    - [Patch Changes](#patch-changes-21)
   - [v6.21.0](#v6210)
     - [What's Changed](#whats-changed-6)
       - [`future.v7_relativeSplatPath`](#futurev7_relativesplatpath)
       - [Partial Hydration](#partial-hydration)
     - [Minor Changes](#minor-changes-9)
-    - [Patch Changes](#patch-changes-21)
-  - [v6.20.1](#v6201)
     - [Patch Changes](#patch-changes-22)
+  - [v6.20.1](#v6201)
+    - [Patch Changes](#patch-changes-23)
   - [v6.20.0](#v6200)
     - [Minor Changes](#minor-changes-10)
-    - [Patch Changes](#patch-changes-23)
+    - [Patch Changes](#patch-changes-24)
   - [v6.19.0](#v6190)
     - [What's Changed](#whats-changed-7)
       - [`unstable_flushSync` API](#unstable_flushsync-api)
     - [Minor Changes](#minor-changes-11)
-    - [Patch Changes](#patch-changes-24)
+    - [Patch Changes](#patch-changes-25)
   - [v6.18.0](#v6180)
     - [What's Changed](#whats-changed-8)
       - [New Fetcher APIs](#new-fetcher-apis)
       - [Persistence Future Flag (`future.v7_fetcherPersist`)](#persistence-future-flag-futurev7_fetcherpersist)
     - [Minor Changes](#minor-changes-12)
-    - [Patch Changes](#patch-changes-25)
+    - [Patch Changes](#patch-changes-26)
   - [v6.17.0](#v6170)
     - [What's Changed](#whats-changed-9)
       - [View Transitions 🚀](#view-transitions-)
     - [Minor Changes](#minor-changes-13)
-    - [Patch Changes](#patch-changes-26)
+    - [Patch Changes](#patch-changes-27)
   - [v6.16.0](#v6160)
     - [Minor Changes](#minor-changes-14)
-    - [Patch Changes](#patch-changes-27)
+    - [Patch Changes](#patch-changes-28)
   - [v6.15.0](#v6150)
     - [Minor Changes](#minor-changes-15)
-    - [Patch Changes](#patch-changes-28)
-  - [v6.14.2](#v6142)
     - [Patch Changes](#patch-changes-29)
-  - [v6.14.1](#v6141)
+  - [v6.14.2](#v6142)
     - [Patch Changes](#patch-changes-30)
+  - [v6.14.1](#v6141)
+    - [Patch Changes](#patch-changes-31)
   - [v6.14.0](#v6140)
     - [What's Changed](#whats-changed-10)
       - [JSON/Text Submissions](#jsontext-submissions)
     - [Minor Changes](#minor-changes-16)
-    - [Patch Changes](#patch-changes-31)
+    - [Patch Changes](#patch-changes-32)
   - [v6.13.0](#v6130)
     - [What's Changed](#whats-changed-11)
       - [`future.v7_startTransition`](#futurev7_starttransition)
     - [Minor Changes](#minor-changes-17)
-    - [Patch Changes](#patch-changes-32)
-  - [v6.12.1](#v6121)
     - [Patch Changes](#patch-changes-33)
+  - [v6.12.1](#v6121)
+    - [Patch Changes](#patch-changes-34)
   - [v6.12.0](#v6120)
     - [What's Changed](#whats-changed-12)
       - [`React.startTransition` support](#reactstarttransition-support)
     - [Minor Changes](#minor-changes-18)
-    - [Patch Changes](#patch-changes-34)
-  - [v6.11.2](#v6112)
     - [Patch Changes](#patch-changes-35)
-  - [v6.11.1](#v6111)
+  - [v6.11.2](#v6112)
     - [Patch Changes](#patch-changes-36)
+  - [v6.11.1](#v6111)
+    - [Patch Changes](#patch-changes-37)
   - [v6.11.0](#v6110)
     - [Minor Changes](#minor-changes-19)
-    - [Patch Changes](#patch-changes-37)
+    - [Patch Changes](#patch-changes-38)
   - [v6.10.0](#v6100)
     - [What's Changed](#whats-changed-13)
     - [Minor Changes](#minor-changes-20)
       - [`future.v7_normalizeFormMethod`](#futurev7_normalizeformmethod)
-    - [Patch Changes](#patch-changes-38)
+    - [Patch Changes](#patch-changes-39)
   - [v6.9.0](#v690)
     - [What's Changed](#whats-changed-14)
       - [`Component`/`ErrorBoundary` route properties](#componenterrorboundary-route-properties)
       - [Introducing Lazy Route Modules](#introducing-lazy-route-modules)
     - [Minor Changes](#minor-changes-21)
-    - [Patch Changes](#patch-changes-39)
-  - [v6.8.2](#v682)
     - [Patch Changes](#patch-changes-40)
-  - [v6.8.1](#v681)
+  - [v6.8.2](#v682)
     - [Patch Changes](#patch-changes-41)
+  - [v6.8.1](#v681)
+    - [Patch Changes](#patch-changes-42)
   - [v6.8.0](#v680)
     - [Minor Changes](#minor-changes-22)
-    - [Patch Changes](#patch-changes-42)
+    - [Patch Changes](#patch-changes-43)
   - [v6.7.0](#v670)
     - [Minor Changes](#minor-changes-23)
-    - [Patch Changes](#patch-changes-43)
-  - [v6.6.2](#v662)
     - [Patch Changes](#patch-changes-44)
-  - [v6.6.1](#v661)
+  - [v6.6.2](#v662)
     - [Patch Changes](#patch-changes-45)
+  - [v6.6.1](#v661)
+    - [Patch Changes](#patch-changes-46)
   - [v6.6.0](#v660)
     - [What's Changed](#whats-changed-15)
     - [Minor Changes](#minor-changes-24)
-    - [Patch Changes](#patch-changes-46)
+    - [Patch Changes](#patch-changes-47)
   - [v6.5.0](#v650)
     - [What's Changed](#whats-changed-16)
     - [Minor Changes](#minor-changes-25)
-    - [Patch Changes](#patch-changes-47)
-  - [v6.4.5](#v645)
     - [Patch Changes](#patch-changes-48)
-  - [v6.4.4](#v644)
+  - [v6.4.5](#v645)
     - [Patch Changes](#patch-changes-49)
-  - [v6.4.3](#v643)
+  - [v6.4.4](#v644)
     - [Patch Changes](#patch-changes-50)
-  - [v6.4.2](#v642)
+  - [v6.4.3](#v643)
     - [Patch Changes](#patch-changes-51)
-  - [v6.4.1](#v641)
+  - [v6.4.2](#v642)
     - [Patch Changes](#patch-changes-52)
+  - [v6.4.1](#v641)
+    - [Patch Changes](#patch-changes-53)
   - [v6.4.0](#v640)
     - [What's Changed](#whats-changed-17)
       - [Remix Data APIs](#remix-data-apis)
-    - [Patch Changes](#patch-changes-53)
+    - [Patch Changes](#patch-changes-54)
   - [v6.3.0](#v630)
     - [Minor Changes](#minor-changes-26)
   - [v6.2.2](#v622)
-    - [Patch Changes](#patch-changes-54)
-  - [v6.2.1](#v621)
     - [Patch Changes](#patch-changes-55)
+  - [v6.2.1](#v621)
+    - [Patch Changes](#patch-changes-56)
   - [v6.2.0](#v620)
     - [Minor Changes](#minor-changes-27)
-    - [Patch Changes](#patch-changes-56)
-  - [v6.1.1](#v611)
     - [Patch Changes](#patch-changes-57)
+  - [v6.1.1](#v611)
+    - [Patch Changes](#patch-changes-58)
   - [v6.1.0](#v610)
     - [Minor Changes](#minor-changes-28)
-    - [Patch Changes](#patch-changes-58)
-  - [v6.0.2](#v602)
     - [Patch Changes](#patch-changes-59)
-  - [v6.0.1](#v601)
+  - [v6.0.2](#v602)
     - [Patch Changes](#patch-changes-60)
+  - [v6.0.1](#v601)
+    - [Patch Changes](#patch-changes-61)
   - [v6.0.0](#v600)
 
 </details>
@@ -731,6 +733,16 @@ async function fakeGetSlugsFromCms() {
 
 **Full Changelog**: [`v6.28.0...v7.0.0`](https://github.com/remix-run/react-router/compare/[email protected]@7.0.0)
 
+## v6.28.1
+
+Date: 2024-12-20
+
+### Patch Changes
+
+- Allow users to opt out of v7 deprecation warnings by setting flags to `false` ([#12441](https://github.com/remix-run/react-router/pull/12441))
+
+**Full Changelog**: [`v6.28.0...v6.28.1`](https://github.com/remix-run/react-router/compare/[email protected]@6.28.1)
+
 ## v6.28.0
 
 Date: 2024-11-06

DEVELOPMENT.md

@@ -108,18 +108,8 @@ Hotfix releases follow the same process as standard releases above, but the `rel
 - Once the stable release is out:
   - Merge `release-v6` back to `v6` with a **Normal Merge**
   - **Do not** merge `release-v6` to `main`
-  - Copy the updated root `CHANGELOG.md` entries for the `6.X.Y` release to `main` and `dev`
-    - `git checkout main`
-    - `git diff [email protected]@6.X.Y -- "***CHANGELOG.md" > ./docs.patch`
-    - `git apply ./docs.patch`
-    - `git checkout dev`
-    - `git apply ./docs.patch`
-    - `rm ./docs.patch`
-  - Copy the docs changes to `main` so they show up on the live docs site for v6
-    - `git checkout main`
-    - `git diff [email protected]@6.X.Y docs/ > ./docs.patch`
-    - `git apply ./docs.patch`
-    - `rm ./docs.patch`
+  - Manually copy the new root `CHANGELOG.md` entry to `main` and `dev`
+    - We don't worry about backporting individual `packages/*/CHANGELOG.md` updates to `main` for subsequent v6 releases
   - The _code_ changes should already be in the `dev` branch
     - This should have happened at the time the v6 change was made (except for changes such as deprecation warnings)
     - Confirm that the commits in this release are all included in `dev` already, and if not you can manually bring them over by cherry-picking the commit or re-doing the work

contributors.yml

@@ -110,6 +110,8 @@
 - GraxMonzo
 - GuptaSiddhant
 - haivuw
+- hampelm
+- harshmangalam
 - hernanif1
 - holynewbie
 - hongji00

docs/community/contributing.md

@@ -65,6 +65,10 @@ All commits that fix bugs or add features need a test.
 
 All commits that change or add to the API must be done in a pull request that also updates all relevant examples and docs.
 
+Documentation is located in the `docs` directory. Once changes make their way into the `main` branch, they will automatically be published to the docs site.
+
+If you want to preview how the changes will look on the docs site, clone the [`react-router-website` repository](https://github.com/remix-run/react-router-website) and follow the instructions in `README.md` to view your changes locally.
+
 ## Development
 
 ### Packages