Skip to content

Commit

Permalink
Merge branch 'main' into release-next
Browse files Browse the repository at this point in the history
  • Loading branch information
brophdawg11 committed Sep 19, 2024
2 parents 312bddb + 9c32cfa commit bd7d7a1
Show file tree
Hide file tree
Showing 8 changed files with 159 additions and 98 deletions.
132 changes: 78 additions & 54 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,175 +13,177 @@ 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.26.1](#v6261)
- [v6.26.2](#v6262)
- [Patch Changes](#patch-changes)
- [v6.26.1](#v6261)
- [Patch Changes](#patch-changes-1)
- [v6.26.0](#v6260)
- [Minor Changes](#minor-changes)
- [Patch Changes](#patch-changes-1)
- [v6.25.1](#v6251)
- [Patch Changes](#patch-changes-2)
- [v6.25.1](#v6251)
- [Patch Changes](#patch-changes-3)
- [v6.25.0](#v6250)
- [What's Changed](#whats-changed)
- [Stabilized `v7_skipActionErrorRevalidation`](#stabilized-v7_skipactionerrorrevalidation)
- [Minor Changes](#minor-changes-1)
- [Patch Changes](#patch-changes-3)
- [v6.24.1](#v6241)
- [Patch Changes](#patch-changes-4)
- [v6.24.1](#v6241)
- [Patch Changes](#patch-changes-5)
- [v6.24.0](#v6240)
- [What's Changed](#whats-changed-1)
- [Lazy Route Discovery (a.k.a. "Fog of War")](#lazy-route-discovery-aka-fog-of-war)
- [Minor Changes](#minor-changes-2)
- [Patch Changes](#patch-changes-5)
- [v6.23.1](#v6231)
- [Patch Changes](#patch-changes-6)
- [v6.23.1](#v6231)
- [Patch Changes](#patch-changes-7)
- [v6.23.0](#v6230)
- [What's Changed](#whats-changed-2)
- [Data Strategy (unstable)](#data-strategy-unstable)
- [Skip Action Error Revalidation (unstable)](#skip-action-error-revalidation-unstable)
- [Minor Changes](#minor-changes-3)
- [v6.22.3](#v6223)
- [Patch Changes](#patch-changes-7)
- [v6.22.2](#v6222)
- [Patch Changes](#patch-changes-8)
- [v6.22.1](#v6221)
- [v6.22.2](#v6222)
- [Patch Changes](#patch-changes-9)
- [v6.22.1](#v6221)
- [Patch Changes](#patch-changes-10)
- [v6.22.0](#v6220)
- [What's Changed](#whats-changed-3)
- [Core Web Vitals Technology Report Flag](#core-web-vitals-technology-report-flag)
- [Minor Changes](#minor-changes-4)
- [Patch Changes](#patch-changes-10)
- [v6.21.3](#v6213)
- [Patch Changes](#patch-changes-11)
- [v6.21.2](#v6212)
- [v6.21.3](#v6213)
- [Patch Changes](#patch-changes-12)
- [v6.21.1](#v6211)
- [v6.21.2](#v6212)
- [Patch Changes](#patch-changes-13)
- [v6.21.1](#v6211)
- [Patch Changes](#patch-changes-14)
- [v6.21.0](#v6210)
- [What's Changed](#whats-changed-4)
- [`future.v7_relativeSplatPath`](#futurev7_relativesplatpath)
- [Partial Hydration](#partial-hydration)
- [Minor Changes](#minor-changes-5)
- [Patch Changes](#patch-changes-14)
- [v6.20.1](#v6201)
- [Patch Changes](#patch-changes-15)
- [v6.20.1](#v6201)
- [Patch Changes](#patch-changes-16)
- [v6.20.0](#v6200)
- [Minor Changes](#minor-changes-6)
- [Patch Changes](#patch-changes-16)
- [Patch Changes](#patch-changes-17)
- [v6.19.0](#v6190)
- [What's Changed](#whats-changed-5)
- [`unstable_flushSync` API](#unstable_flushsync-api)
- [Minor Changes](#minor-changes-7)
- [Patch Changes](#patch-changes-17)
- [Patch Changes](#patch-changes-18)
- [v6.18.0](#v6180)
- [What's Changed](#whats-changed-6)
- [New Fetcher APIs](#new-fetcher-apis)
- [Persistence Future Flag (`future.v7_fetcherPersist`)](#persistence-future-flag-futurev7_fetcherpersist)
- [Minor Changes](#minor-changes-8)
- [Patch Changes](#patch-changes-18)
- [Patch Changes](#patch-changes-19)
- [v6.17.0](#v6170)
- [What's Changed](#whats-changed-7)
- [View Transitions 🚀](#view-transitions-)
- [Minor Changes](#minor-changes-9)
- [Patch Changes](#patch-changes-19)
- [Patch Changes](#patch-changes-20)
- [v6.16.0](#v6160)
- [Minor Changes](#minor-changes-10)
- [Patch Changes](#patch-changes-20)
- [Patch Changes](#patch-changes-21)
- [v6.15.0](#v6150)
- [Minor Changes](#minor-changes-11)
- [Patch Changes](#patch-changes-21)
- [v6.14.2](#v6142)
- [Patch Changes](#patch-changes-22)
- [v6.14.1](#v6141)
- [v6.14.2](#v6142)
- [Patch Changes](#patch-changes-23)
- [v6.14.1](#v6141)
- [Patch Changes](#patch-changes-24)
- [v6.14.0](#v6140)
- [What's Changed](#whats-changed-8)
- [JSON/Text Submissions](#jsontext-submissions)
- [Minor Changes](#minor-changes-12)
- [Patch Changes](#patch-changes-24)
- [Patch Changes](#patch-changes-25)
- [v6.13.0](#v6130)
- [What's Changed](#whats-changed-9)
- [`future.v7_startTransition`](#futurev7_starttransition)
- [Minor Changes](#minor-changes-13)
- [Patch Changes](#patch-changes-25)
- [v6.12.1](#v6121)
- [Patch Changes](#patch-changes-26)
- [v6.12.1](#v6121)
- [Patch Changes](#patch-changes-27)
- [v6.12.0](#v6120)
- [What's Changed](#whats-changed-10)
- [`React.startTransition` support](#reactstarttransition-support)
- [Minor Changes](#minor-changes-14)
- [Patch Changes](#patch-changes-27)
- [v6.11.2](#v6112)
- [Patch Changes](#patch-changes-28)
- [v6.11.1](#v6111)
- [v6.11.2](#v6112)
- [Patch Changes](#patch-changes-29)
- [v6.11.1](#v6111)
- [Patch Changes](#patch-changes-30)
- [v6.11.0](#v6110)
- [Minor Changes](#minor-changes-15)
- [Patch Changes](#patch-changes-30)
- [Patch Changes](#patch-changes-31)
- [v6.10.0](#v6100)
- [What's Changed](#whats-changed-11)
- [Minor Changes](#minor-changes-16)
- [`future.v7_normalizeFormMethod`](#futurev7_normalizeformmethod)
- [Patch Changes](#patch-changes-31)
- [Patch Changes](#patch-changes-32)
- [v6.9.0](#v690)
- [What's Changed](#whats-changed-12)
- [`Component`/`ErrorBoundary` route properties](#componenterrorboundary-route-properties)
- [Introducing Lazy Route Modules](#introducing-lazy-route-modules)
- [Minor Changes](#minor-changes-17)
- [Patch Changes](#patch-changes-32)
- [v6.8.2](#v682)
- [Patch Changes](#patch-changes-33)
- [v6.8.1](#v681)
- [v6.8.2](#v682)
- [Patch Changes](#patch-changes-34)
- [v6.8.1](#v681)
- [Patch Changes](#patch-changes-35)
- [v6.8.0](#v680)
- [Minor Changes](#minor-changes-18)
- [Patch Changes](#patch-changes-35)
- [Patch Changes](#patch-changes-36)
- [v6.7.0](#v670)
- [Minor Changes](#minor-changes-19)
- [Patch Changes](#patch-changes-36)
- [v6.6.2](#v662)
- [Patch Changes](#patch-changes-37)
- [v6.6.1](#v661)
- [v6.6.2](#v662)
- [Patch Changes](#patch-changes-38)
- [v6.6.1](#v661)
- [Patch Changes](#patch-changes-39)
- [v6.6.0](#v660)
- [What's Changed](#whats-changed-13)
- [Minor Changes](#minor-changes-20)
- [Patch Changes](#patch-changes-39)
- [Patch Changes](#patch-changes-40)
- [v6.5.0](#v650)
- [What's Changed](#whats-changed-14)
- [Minor Changes](#minor-changes-21)
- [Patch Changes](#patch-changes-40)
- [v6.4.5](#v645)
- [Patch Changes](#patch-changes-41)
- [v6.4.4](#v644)
- [v6.4.5](#v645)
- [Patch Changes](#patch-changes-42)
- [v6.4.3](#v643)
- [v6.4.4](#v644)
- [Patch Changes](#patch-changes-43)
- [v6.4.2](#v642)
- [v6.4.3](#v643)
- [Patch Changes](#patch-changes-44)
- [v6.4.1](#v641)
- [v6.4.2](#v642)
- [Patch Changes](#patch-changes-45)
- [v6.4.1](#v641)
- [Patch Changes](#patch-changes-46)
- [v6.4.0](#v640)
- [What's Changed](#whats-changed-15)
- [Remix Data APIs](#remix-data-apis)
- [Patch Changes](#patch-changes-46)
- [Patch Changes](#patch-changes-47)
- [v6.3.0](#v630)
- [Minor Changes](#minor-changes-22)
- [v6.2.2](#v622)
- [Patch Changes](#patch-changes-47)
- [v6.2.1](#v621)
- [Patch Changes](#patch-changes-48)
- [v6.2.1](#v621)
- [Patch Changes](#patch-changes-49)
- [v6.2.0](#v620)
- [Minor Changes](#minor-changes-23)
- [Patch Changes](#patch-changes-49)
- [v6.1.1](#v611)
- [Patch Changes](#patch-changes-50)
- [v6.1.1](#v611)
- [Patch Changes](#patch-changes-51)
- [v6.1.0](#v610)
- [Minor Changes](#minor-changes-24)
- [Patch Changes](#patch-changes-51)
- [v6.0.2](#v602)
- [Patch Changes](#patch-changes-52)
- [v6.0.1](#v601)
- [v6.0.2](#v602)
- [Patch Changes](#patch-changes-53)
- [v6.0.1](#v601)
- [Patch Changes](#patch-changes-54)
- [v6.0.0](#v600)

</details>
Expand All @@ -205,6 +207,28 @@ 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.26.2

Date: 2024-09-09

### Patch Changes

- Update the `unstable_dataStrategy` API to allow for more advanced implementations ([#11943](https://github.com/remix-run/react-router/pull/11943))
- ⚠️ If you have already adopted `unstable_dataStrategy`, please review carefully as this includes breaking changes to this API
- Rename `unstable_HandlerResult` to `unstable_DataStrategyResult`
- Change the return signature of `unstable_dataStrategy` from a parallel array of `unstable_DataStrategyResult[]` (parallel to `matches`) to a key/value object of `routeId => unstable_DataStrategyResult`
- This allows more advanced control over revalidation behavior because you can opt-into or out-of revalidating data that may not have been revalidated by default (via `match.shouldLoad`)
- You should now return/throw a result from your `handlerOverride` instead of returning a `DataStrategyResult`
- The return value (or thrown error) from your `handlerOverride` will be wrapped up into a `DataStrategyResult` and returned fromm `match.resolve`
- Therefore, if you are aggregating the results of `match.resolve()` into a final results object you should not need to think about the `DataStrategyResult` type
- If you are manually filling your results object from within your `handlerOverride`, then you will need to assign a `DataStrategyResult` as the value so React Router knows if it's a successful execution or an error (see examples in the documentation for details)
- Added a new `fetcherKey` parameter to `unstable_dataStrategy` to allow differentiation from navigational and fetcher calls
- Preserve opted-in view transitions through redirects ([#11925](https://github.com/remix-run/react-router/pull/11925))
- Preserve pending view transitions through a router revalidation call ([#11917](https://github.com/remix-run/react-router/pull/11917))
- Fix blocker usage when `blocker.proceed` is called quickly/synchronously ([#11930](https://github.com/remix-run/react-router/pull/11930))

**Full Changelog**: [`v6.26.1...v6.26.2`](https://github.com/remix-run/react-router/compare/[email protected]@6.26.2)

## v6.26.1

Date: 2024-08-15
Expand Down
24 changes: 24 additions & 0 deletions DEVELOPMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,30 @@ You may need to make changes to a pre-release prior to publishing a final stable

Hotfix releases follow the same process as standard releases above, but the `release-next` branch should be branched off latest `main` instead of `dev`. Once the stable hotfix is published, the `release-next` branch should be merged back into both `main` and `dev` just like a normal release.

### 6.x releases from the `v6` branch

After the `6.25.0` release, we branched off a `v6` branch for continued `6.x` work and merged the `v7` branch into `dev` to begin preparation for the `7.0.0` release. Until we launch `7.0.0`, we need to `6.x` releases in a slightly different manner.

- Changes for 6.x should be PR'd to the `v6` branch with a changeset
- Once merged, cherry-pick or re-do those changes against the `dev` branch so that they show up in v7
- This does not apply to things like adding deprecation warnings that should not land in v7
- You should not include a changelog in your commit to `dev`
- Starting the release process for 6.x is the same as outlined above, with a few changes:
- Branch from `v6` instead of `dev`
- Do not merge `main` into the `release-*` branch
- The process of the PRs and iterating on prereleases remains the same
- Once the stable release is out:
- Merge `release-next` back to `v6` with a **Normal Merge**
- Patch the changes into `main`
- `git checkout main`
- `git diff [email protected]@6.26.2 > ./changes.patch`
- `git apply changes.patch`
- The _code_ changes should already be in the `dev` branch but confirm that the commits in this release are all included in `dev` already:
- I.e., https://github.com/remix-run/react-router/compare/[email protected]@6.26.2
- If one or more are not, then you can manually bring them over by cherry-picking the commit (or re-doing the work)
- You should not include a changelog in your commit to `dev`
- Copy the updated changelogs from `release-next` over to `dev` so the changelogs continue to reflect this new 6x release into the v7 releases

### Experimental releases

Experimental releases use a [manually-triggered Github Actions workflow](./.github/workflows/release-experimental.yml) and can be built from any existing branch. to build and publish an experimental release:
Expand Down
2 changes: 2 additions & 0 deletions contributors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
- bhbs
- bilalk711
- bobziroll
- Brendonovich
- BrianT1414
- brockross
- brookslybrand
Expand Down Expand Up @@ -269,6 +270,7 @@
- vijaypushkin
- vikingviolinist
- vishwast03
- vitekzach
- vonagam
- WalkAlone0325
- willemarcel
Expand Down
7 changes: 7 additions & 0 deletions packages/react-router/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# `react-router`

## 6.26.2

### Patch Changes

- Updated dependencies:
- `@remix-run/[email protected]`

## 6.26.1

### Patch Changes
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import type { ErrorResponse, Fetcher, RouterState } from "react-router";
import "@testing-library/jest-dom";
import {
act,
Expand All @@ -9,7 +8,12 @@ import {
} from "@testing-library/react";
import { JSDOM } from "jsdom";
import * as React from "react";
import type { RouteObject } from "../../index";
import type {
RouteObject,
ErrorResponse,
Fetcher,
RouterState,
} from "../../index";
import {
Await,
UNSAFE_DataRouterStateContext as DataRouterStateContext,
Expand Down
Loading

0 comments on commit bd7d7a1

Please sign in to comment.