Merge branch 'release-v6' into v6

Author: brophdawg11

.changeset/big-lamps-remain.md

@@ -66,7 +66,7 @@ jobs:
     name: 🦋 Find Package
     needs: [release]
     runs-on: ubuntu-latest
-    if: github.repository == 'remix-run/react-router' && needs.release.outputs.published == 'true'
+    if: github.repository == 'remix-run/react-router' && github.ref_name != 'release-v6' && needs.release.outputs.published == 'true'
     outputs:
       package_version: ${{ steps.find_package_version.outputs.package_version }}
     steps:
@@ -92,6 +92,6 @@ jobs:
 
   comment:
     name: 📝 Comment on related issues and pull requests
-    if: github.repository == 'remix-run/react-router' && needs.find_package_version.outputs.package_version != ''
+    if: github.repository == 'remix-run/react-router' && github.ref_name != 'release-v6' && needs.find_package_version.outputs.package_version != ''
     needs: [release, find_package_version]
     uses: ./.github/workflows/release-comments.yml

.changeset/proud-stingrays-wink.md

@@ -13,190 +13,193 @@ We manage release notes in this file instead of the paginated Github Releases Pa
   <summary>Table of Contents</summary>
 
 - [React Router Releases](#react-router-releases)
-  - [v6.28.2](#v6282)
+  - [v6.29.0](#v6290)
+    - [Minor Changes](#minor-changes)
     - [Patch Changes](#patch-changes)
-  - [v6.28.1](#v6281)
+  - [v6.28.2](#v6282)
     - [Patch Changes](#patch-changes-1)
+  - [v6.28.1](#v6281)
+    - [Patch Changes](#patch-changes-2)
   - [v6.28.0](#v6280)
     - [What's Changed](#whats-changed)
-    - [Minor Changes](#minor-changes)
-    - [Patch Changes](#patch-changes-2)
+    - [Minor Changes](#minor-changes-1)
+    - [Patch Changes](#patch-changes-3)
   - [v6.27.0](#v6270)
     - [What's Changed](#whats-changed-1)
       - [Stabilized APIs](#stabilized-apis)
-    - [Minor Changes](#minor-changes-1)
-    - [Patch Changes](#patch-changes-3)
-  - [v6.26.2](#v6262)
+    - [Minor Changes](#minor-changes-2)
     - [Patch Changes](#patch-changes-4)
-  - [v6.26.1](#v6261)
+  - [v6.26.2](#v6262)
     - [Patch Changes](#patch-changes-5)
-  - [v6.26.0](#v6260)
-    - [Minor Changes](#minor-changes-2)
+  - [v6.26.1](#v6261)
     - [Patch Changes](#patch-changes-6)
-  - [v6.25.1](#v6251)
+  - [v6.26.0](#v6260)
+    - [Minor Changes](#minor-changes-3)
     - [Patch Changes](#patch-changes-7)
+  - [v6.25.1](#v6251)
+    - [Patch Changes](#patch-changes-8)
   - [v6.25.0](#v6250)
     - [What's Changed](#whats-changed-2)
       - [Stabilized `v7_skipActionErrorRevalidation`](#stabilized-v7_skipactionerrorrevalidation)
-    - [Minor Changes](#minor-changes-3)
-    - [Patch Changes](#patch-changes-8)
-  - [v6.24.1](#v6241)
+    - [Minor Changes](#minor-changes-4)
     - [Patch Changes](#patch-changes-9)
+  - [v6.24.1](#v6241)
+    - [Patch Changes](#patch-changes-10)
   - [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-4)
-    - [Patch Changes](#patch-changes-10)
-  - [v6.23.1](#v6231)
+    - [Minor Changes](#minor-changes-5)
     - [Patch Changes](#patch-changes-11)
+  - [v6.23.1](#v6231)
+    - [Patch Changes](#patch-changes-12)
   - [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-5)
+    - [Minor Changes](#minor-changes-6)
   - [v6.22.3](#v6223)
-    - [Patch Changes](#patch-changes-12)
-  - [v6.22.2](#v6222)
     - [Patch Changes](#patch-changes-13)
-  - [v6.22.1](#v6221)
+  - [v6.22.2](#v6222)
     - [Patch Changes](#patch-changes-14)
+  - [v6.22.1](#v6221)
+    - [Patch Changes](#patch-changes-15)
   - [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-6)
-    - [Patch Changes](#patch-changes-15)
-  - [v6.21.3](#v6213)
+    - [Minor Changes](#minor-changes-7)
     - [Patch Changes](#patch-changes-16)
-  - [v6.21.2](#v6212)
+  - [v6.21.3](#v6213)
     - [Patch Changes](#patch-changes-17)
-  - [v6.21.1](#v6211)
+  - [v6.21.2](#v6212)
     - [Patch Changes](#patch-changes-18)
+  - [v6.21.1](#v6211)
+    - [Patch Changes](#patch-changes-19)
   - [v6.21.0](#v6210)
     - [What's Changed](#whats-changed-6)
       - [`future.v7_relativeSplatPath`](#futurev7_relativesplatpath)
       - [Partial Hydration](#partial-hydration)
-    - [Minor Changes](#minor-changes-7)
-    - [Patch Changes](#patch-changes-19)
-  - [v6.20.1](#v6201)
-    - [Patch Changes](#patch-changes-20)
-  - [v6.20.0](#v6200)
     - [Minor Changes](#minor-changes-8)
+    - [Patch Changes](#patch-changes-20)
+  - [v6.20.1](#v6201)
     - [Patch Changes](#patch-changes-21)
+  - [v6.20.0](#v6200)
+    - [Minor Changes](#minor-changes-9)
+    - [Patch Changes](#patch-changes-22)
   - [v6.19.0](#v6190)
     - [What's Changed](#whats-changed-7)
       - [`unstable_flushSync` API](#unstable_flushsync-api)
-    - [Minor Changes](#minor-changes-9)
-    - [Patch Changes](#patch-changes-22)
+    - [Minor Changes](#minor-changes-10)
+    - [Patch Changes](#patch-changes-23)
   - [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-10)
-    - [Patch Changes](#patch-changes-23)
+    - [Minor Changes](#minor-changes-11)
+    - [Patch Changes](#patch-changes-24)
   - [v6.17.0](#v6170)
     - [What's Changed](#whats-changed-9)
       - [View Transitions 🚀](#view-transitions-)
-    - [Minor Changes](#minor-changes-11)
-    - [Patch Changes](#patch-changes-24)
-  - [v6.16.0](#v6160)
     - [Minor Changes](#minor-changes-12)
     - [Patch Changes](#patch-changes-25)
-  - [v6.15.0](#v6150)
+  - [v6.16.0](#v6160)
     - [Minor Changes](#minor-changes-13)
     - [Patch Changes](#patch-changes-26)
-  - [v6.14.2](#v6142)
+  - [v6.15.0](#v6150)
+    - [Minor Changes](#minor-changes-14)
     - [Patch Changes](#patch-changes-27)
-  - [v6.14.1](#v6141)
+  - [v6.14.2](#v6142)
     - [Patch Changes](#patch-changes-28)
+  - [v6.14.1](#v6141)
+    - [Patch Changes](#patch-changes-29)
   - [v6.14.0](#v6140)
     - [What's Changed](#whats-changed-10)
       - [JSON/Text Submissions](#jsontext-submissions)
-    - [Minor Changes](#minor-changes-14)
-    - [Patch Changes](#patch-changes-29)
+    - [Minor Changes](#minor-changes-15)
+    - [Patch Changes](#patch-changes-30)
   - [v6.13.0](#v6130)
     - [What's Changed](#whats-changed-11)
       - [`future.v7_startTransition`](#futurev7_starttransition)
-    - [Minor Changes](#minor-changes-15)
-    - [Patch Changes](#patch-changes-30)
-  - [v6.12.1](#v6121)
+    - [Minor Changes](#minor-changes-16)
     - [Patch Changes](#patch-changes-31)
+  - [v6.12.1](#v6121)
+    - [Patch Changes](#patch-changes-32)
   - [v6.12.0](#v6120)
     - [What's Changed](#whats-changed-12)
       - [`React.startTransition` support](#reactstarttransition-support)
-    - [Minor Changes](#minor-changes-16)
-    - [Patch Changes](#patch-changes-32)
-  - [v6.11.2](#v6112)
+    - [Minor Changes](#minor-changes-17)
     - [Patch Changes](#patch-changes-33)
-  - [v6.11.1](#v6111)
+  - [v6.11.2](#v6112)
     - [Patch Changes](#patch-changes-34)
-  - [v6.11.0](#v6110)
-    - [Minor Changes](#minor-changes-17)
+  - [v6.11.1](#v6111)
     - [Patch Changes](#patch-changes-35)
+  - [v6.11.0](#v6110)
+    - [Minor Changes](#minor-changes-18)
+    - [Patch Changes](#patch-changes-36)
   - [v6.10.0](#v6100)
     - [What's Changed](#whats-changed-13)
-    - [Minor Changes](#minor-changes-18)
+    - [Minor Changes](#minor-changes-19)
       - [`future.v7_normalizeFormMethod`](#futurev7_normalizeformmethod)
-    - [Patch Changes](#patch-changes-36)
+    - [Patch Changes](#patch-changes-37)
   - [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-19)
-    - [Patch Changes](#patch-changes-37)
-  - [v6.8.2](#v682)
+    - [Minor Changes](#minor-changes-20)
     - [Patch Changes](#patch-changes-38)
-  - [v6.8.1](#v681)
+  - [v6.8.2](#v682)
     - [Patch Changes](#patch-changes-39)
-  - [v6.8.0](#v680)
-    - [Minor Changes](#minor-changes-20)
+  - [v6.8.1](#v681)
     - [Patch Changes](#patch-changes-40)
-  - [v6.7.0](#v670)
+  - [v6.8.0](#v680)
     - [Minor Changes](#minor-changes-21)
     - [Patch Changes](#patch-changes-41)
-  - [v6.6.2](#v662)
+  - [v6.7.0](#v670)
+    - [Minor Changes](#minor-changes-22)
     - [Patch Changes](#patch-changes-42)
-  - [v6.6.1](#v661)
+  - [v6.6.2](#v662)
     - [Patch Changes](#patch-changes-43)
+  - [v6.6.1](#v661)
+    - [Patch Changes](#patch-changes-44)
   - [v6.6.0](#v660)
     - [What's Changed](#whats-changed-15)
-    - [Minor Changes](#minor-changes-22)
-    - [Patch Changes](#patch-changes-44)
-  - [v6.5.0](#v650)
-    - [What's Changed](#whats-changed-16)
     - [Minor Changes](#minor-changes-23)
     - [Patch Changes](#patch-changes-45)
-  - [v6.4.5](#v645)
+  - [v6.5.0](#v650)
+    - [What's Changed](#whats-changed-16)
+    - [Minor Changes](#minor-changes-24)
     - [Patch Changes](#patch-changes-46)
-  - [v6.4.4](#v644)
+  - [v6.4.5](#v645)
     - [Patch Changes](#patch-changes-47)
-  - [v6.4.3](#v643)
+  - [v6.4.4](#v644)
     - [Patch Changes](#patch-changes-48)
-  - [v6.4.2](#v642)
+  - [v6.4.3](#v643)
     - [Patch Changes](#patch-changes-49)
-  - [v6.4.1](#v641)
+  - [v6.4.2](#v642)
     - [Patch Changes](#patch-changes-50)
+  - [v6.4.1](#v641)
+    - [Patch Changes](#patch-changes-51)
   - [v6.4.0](#v640)
     - [What's Changed](#whats-changed-17)
       - [Remix Data APIs](#remix-data-apis)
-    - [Patch Changes](#patch-changes-51)
+    - [Patch Changes](#patch-changes-52)
   - [v6.3.0](#v630)
-    - [Minor Changes](#minor-changes-24)
+    - [Minor Changes](#minor-changes-25)
   - [v6.2.2](#v622)
-    - [Patch Changes](#patch-changes-52)
-  - [v6.2.1](#v621)
     - [Patch Changes](#patch-changes-53)
-  - [v6.2.0](#v620)
-    - [Minor Changes](#minor-changes-25)
+  - [v6.2.1](#v621)
     - [Patch Changes](#patch-changes-54)
-  - [v6.1.1](#v611)
-    - [Patch Changes](#patch-changes-55)
-  - [v6.1.0](#v610)
+  - [v6.2.0](#v620)
     - [Minor Changes](#minor-changes-26)
+    - [Patch Changes](#patch-changes-55)
+  - [v6.1.1](#v611)
     - [Patch Changes](#patch-changes-56)
-  - [v6.0.2](#v602)
+  - [v6.1.0](#v610)
+    - [Minor Changes](#minor-changes-27)
     - [Patch Changes](#patch-changes-57)
-  - [v6.0.1](#v601)
+  - [v6.0.2](#v602)
     - [Patch Changes](#patch-changes-58)
+  - [v6.0.1](#v601)
+    - [Patch Changes](#patch-changes-59)
   - [v6.0.0](#v600)
 
 </details>
@@ -220,6 +223,24 @@ Date: YYYY-MM-DD
 **Full Changelog**: [`v6.X.Y...v6.X.Y`](https://github.com/remix-run/react-router/compare/[email protected]@6.X.Y)
 -->
 
+## v6.29.0
+
+Date: 2025-01-30
+
+### Minor Changes
+
+- Provide the request `signal` as a parameter to `patchRoutesOnNavigation` ([#12900](https://github.com/remix-run/react-router/pull/12900))
+  - This can be used to abort any manifest fetches if the in-flight navigation/fetcher is aborted
+
+### Patch Changes
+
+- Do not log v7 deprecation warnings in production builds ([#12794](https://github.com/remix-run/react-router/pull/12794))
+- Properly bubble headers when throwing a `data()` result ([#12845](https://github.com/remix-run/react-router/pull/12845))
+- Optimize route matching by skipping redundant `matchRoutes` calls when possible ([#12169](https://github.com/remix-run/react-router/pull/12169))
+- Strip search parameters from `patchRoutesOnNavigation` `path` param for fetcher calls ([#12899](https://github.com/remix-run/react-router/pull/12899))
+
+**Full Changelog**: [`v6.28.2...v6.29.0`](https://github.com/remix-run/react-router/compare/[email protected]@6.29.0)
+
 ## v6.28.2
 
 Date: 2025-01-16

.changeset/short-pugs-double.md

@@ -103,7 +103,7 @@ Hotfix releases follow the same process as standard releases above, but the `rel
 - Steps:
   - `git checkout v6 && git pull origin v6`
   - `git checkout -b release-v6`
-  - `pnpm changeset pre enter pre`
+  - `pnpm changeset pre enter pre-v6`
   - The process of the PRs and iterating on prereleases remains the same
 - Once the stable release is out:
   - Merge `release-v6` back to `v6` with a **Normal Merge**

.github/workflows/release.yml

@@ -8,7 +8,7 @@
     "format:check": "prettier --ignore-path .eslintignore --check .",
     "lint": "eslint --cache .",
     "prerelease": "pnpm build",
-    "release": "changeset publish --tag v6",
+    "release": "./scripts/changesets-release.sh",
     "size": "filesize",
     "test": "jest",
     "test:inspect": "node --inspect-brk ./node_modules/.bin/jest",

CHANGELOG.md

@@ -1,5 +1,40 @@
 # `react-router-dom-v5-compat`
 
+## 6.29.0
+
+### Patch Changes
+
+- Updated dependencies:
+  - `[email protected]`
+  - `[email protected]`
+  - `@remix-run/[email protected]`
+
+## 6.29.0-pre-v6.2
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/[email protected]`
+  - `[email protected]`
+  - `[email protected]`
+
+## 6.28.3-pre-v6.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `[email protected]`
+  - `[email protected]`
+
+## 6.28.3-pre-v6.0
+
+### Patch Changes
+
+- Updated dependencies:
+  - `[email protected]`
+  - `[email protected]`
+  - `@remix-run/[email protected]`
+
 ## 6.28.2
 
 ### Patch Changes