Merge branch 'release-next'

Author: brophdawg11

CHANGELOG.md

@@ -13,143 +13,145 @@ 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.22.1](#v6221)
+  - [v6.22.2](#v6222)
     - [Patch Changes](#patch-changes)
+  - [v6.22.1](#v6221)
+    - [Patch Changes](#patch-changes-1)
   - [v6.22.0](#v6220)
     - [What's Changed](#whats-changed)
       - [Core Web Vitals Technology Report Flag](#core-web-vitals-technology-report-flag)
     - [Minor Changes](#minor-changes)
-    - [Patch Changes](#patch-changes-1)
-  - [v6.21.3](#v6213)
     - [Patch Changes](#patch-changes-2)
-  - [v6.21.2](#v6212)
+  - [v6.21.3](#v6213)
     - [Patch Changes](#patch-changes-3)
-  - [v6.21.1](#v6211)
+  - [v6.21.2](#v6212)
     - [Patch Changes](#patch-changes-4)
+  - [v6.21.1](#v6211)
+    - [Patch Changes](#patch-changes-5)
   - [v6.21.0](#v6210)
     - [What's Changed](#whats-changed-1)
       - [`future.v7_relativeSplatPath`](#futurev7_relativesplatpath)
       - [Partial Hydration](#partial-hydration)
     - [Minor Changes](#minor-changes-1)
-    - [Patch Changes](#patch-changes-5)
-  - [v6.20.1](#v6201)
     - [Patch Changes](#patch-changes-6)
+  - [v6.20.1](#v6201)
+    - [Patch Changes](#patch-changes-7)
   - [v6.20.0](#v6200)
     - [Minor Changes](#minor-changes-2)
-    - [Patch Changes](#patch-changes-7)
+    - [Patch Changes](#patch-changes-8)
   - [v6.19.0](#v6190)
     - [What's Changed](#whats-changed-2)
       - [`unstable_flushSync` API](#unstable_flushsync-api)
     - [Minor Changes](#minor-changes-3)
-    - [Patch Changes](#patch-changes-8)
+    - [Patch Changes](#patch-changes-9)
   - [v6.18.0](#v6180)
     - [What's Changed](#whats-changed-3)
       - [New Fetcher APIs](#new-fetcher-apis)
       - [Persistence Future Flag (`future.v7_fetcherPersist`)](#persistence-future-flag-futurev7_fetcherpersist)
     - [Minor Changes](#minor-changes-4)
-    - [Patch Changes](#patch-changes-9)
+    - [Patch Changes](#patch-changes-10)
   - [v6.17.0](#v6170)
     - [What's Changed](#whats-changed-4)
       - [View Transitions 🚀](#view-transitions-)
     - [Minor Changes](#minor-changes-5)
-    - [Patch Changes](#patch-changes-10)
+    - [Patch Changes](#patch-changes-11)
   - [v6.16.0](#v6160)
     - [Minor Changes](#minor-changes-6)
-    - [Patch Changes](#patch-changes-11)
+    - [Patch Changes](#patch-changes-12)
   - [v6.15.0](#v6150)
     - [Minor Changes](#minor-changes-7)
-    - [Patch Changes](#patch-changes-12)
-  - [v6.14.2](#v6142)
     - [Patch Changes](#patch-changes-13)
-  - [v6.14.1](#v6141)
+  - [v6.14.2](#v6142)
     - [Patch Changes](#patch-changes-14)
+  - [v6.14.1](#v6141)
+    - [Patch Changes](#patch-changes-15)
   - [v6.14.0](#v6140)
     - [What's Changed](#whats-changed-5)
       - [JSON/Text Submissions](#jsontext-submissions)
     - [Minor Changes](#minor-changes-8)
-    - [Patch Changes](#patch-changes-15)
+    - [Patch Changes](#patch-changes-16)
   - [v6.13.0](#v6130)
     - [What's Changed](#whats-changed-6)
     - [Minor Changes](#minor-changes-9)
-    - [Patch Changes](#patch-changes-16)
-  - [v6.12.1](#v6121)
     - [Patch Changes](#patch-changes-17)
+  - [v6.12.1](#v6121)
+    - [Patch Changes](#patch-changes-18)
   - [v6.12.0](#v6120)
     - [What's Changed](#whats-changed-7)
       - [`React.startTransition` support](#reactstarttransition-support)
     - [Minor Changes](#minor-changes-10)
-    - [Patch Changes](#patch-changes-18)
-  - [v6.11.2](#v6112)
     - [Patch Changes](#patch-changes-19)
-  - [v6.11.1](#v6111)
+  - [v6.11.2](#v6112)
     - [Patch Changes](#patch-changes-20)
+  - [v6.11.1](#v6111)
+    - [Patch Changes](#patch-changes-21)
   - [v6.11.0](#v6110)
     - [Minor Changes](#minor-changes-11)
-    - [Patch Changes](#patch-changes-21)
+    - [Patch Changes](#patch-changes-22)
   - [v6.10.0](#v6100)
     - [What's Changed](#whats-changed-8)
     - [Minor Changes](#minor-changes-12)
-    - [Patch Changes](#patch-changes-22)
+    - [Patch Changes](#patch-changes-23)
   - [v6.9.0](#v690)
     - [What's Changed](#whats-changed-9)
       - [`Component`/`ErrorBoundary` route properties](#componenterrorboundary-route-properties)
       - [Introducing Lazy Route Modules](#introducing-lazy-route-modules)
     - [Minor Changes](#minor-changes-13)
-    - [Patch Changes](#patch-changes-23)
-  - [v6.8.2](#v682)
     - [Patch Changes](#patch-changes-24)
-  - [v6.8.1](#v681)
+  - [v6.8.2](#v682)
     - [Patch Changes](#patch-changes-25)
+  - [v6.8.1](#v681)
+    - [Patch Changes](#patch-changes-26)
   - [v6.8.0](#v680)
     - [Minor Changes](#minor-changes-14)
-    - [Patch Changes](#patch-changes-26)
+    - [Patch Changes](#patch-changes-27)
   - [v6.7.0](#v670)
     - [Minor Changes](#minor-changes-15)
-    - [Patch Changes](#patch-changes-27)
-  - [v6.6.2](#v662)
     - [Patch Changes](#patch-changes-28)
-  - [v6.6.1](#v661)
+  - [v6.6.2](#v662)
     - [Patch Changes](#patch-changes-29)
+  - [v6.6.1](#v661)
+    - [Patch Changes](#patch-changes-30)
   - [v6.6.0](#v660)
     - [What's Changed](#whats-changed-10)
     - [Minor Changes](#minor-changes-16)
-    - [Patch Changes](#patch-changes-30)
+    - [Patch Changes](#patch-changes-31)
   - [v6.5.0](#v650)
     - [What's Changed](#whats-changed-11)
     - [Minor Changes](#minor-changes-17)
-    - [Patch Changes](#patch-changes-31)
-  - [v6.4.5](#v645)
     - [Patch Changes](#patch-changes-32)
-  - [v6.4.4](#v644)
+  - [v6.4.5](#v645)
     - [Patch Changes](#patch-changes-33)
-  - [v6.4.3](#v643)
+  - [v6.4.4](#v644)
     - [Patch Changes](#patch-changes-34)
-  - [v6.4.2](#v642)
+  - [v6.4.3](#v643)
     - [Patch Changes](#patch-changes-35)
-  - [v6.4.1](#v641)
+  - [v6.4.2](#v642)
     - [Patch Changes](#patch-changes-36)
+  - [v6.4.1](#v641)
+    - [Patch Changes](#patch-changes-37)
   - [v6.4.0](#v640)
     - [What's Changed](#whats-changed-12)
       - [Remix Data APIs](#remix-data-apis)
-    - [Patch Changes](#patch-changes-37)
+    - [Patch Changes](#patch-changes-38)
   - [v6.3.0](#v630)
     - [Minor Changes](#minor-changes-18)
   - [v6.2.2](#v622)
-    - [Patch Changes](#patch-changes-38)
-  - [v6.2.1](#v621)
     - [Patch Changes](#patch-changes-39)
+  - [v6.2.1](#v621)
+    - [Patch Changes](#patch-changes-40)
   - [v6.2.0](#v620)
     - [Minor Changes](#minor-changes-19)
-    - [Patch Changes](#patch-changes-40)
-  - [v6.1.1](#v611)
     - [Patch Changes](#patch-changes-41)
+  - [v6.1.1](#v611)
+    - [Patch Changes](#patch-changes-42)
   - [v6.1.0](#v610)
     - [Minor Changes](#minor-changes-20)
-    - [Patch Changes](#patch-changes-42)
-  - [v6.0.2](#v602)
     - [Patch Changes](#patch-changes-43)
-  - [v6.0.1](#v601)
+  - [v6.0.2](#v602)
     - [Patch Changes](#patch-changes-44)
+  - [v6.0.1](#v601)
+    - [Patch Changes](#patch-changes-45)
   - [v6.0.0](#v600)
 
 </details>
@@ -173,6 +175,16 @@ Date: YYYY-MM-DD
 **Full Changelog**: [`v6.X.Y...v6.X.Y`](https://github.com/remix-run/react-router/compare/react-router@6.X.Y...react-router@6.X.Y)
 -->
 
+## v6.22.2
+
+Date: 2024-02-28
+
+### Patch Changes
+
+- Preserve hydrated errors during partial hydration runs ([#11305](https://github.com/remix-run/react-router/pull/11305))
+
+**Full Changelog**: [`v6.22.1...v6.22.2`](https://github.com/remix-run/react-router/compare/react-router@6.22.1...react-router@6.22.2)
+
 ## v6.22.1
 
 Date: 2024-02-16

packages/react-router-dom-v5-compat/CHANGELOG.md

@@ -1,5 +1,13 @@
 # `react-router-dom-v5-compat`
 
+## 6.22.2
+
+### Patch Changes
+
+- Updated dependencies:
+  - `react-router@6.22.2`
+  - `react-router-dom@6.22.2`
+
 ## 6.22.1
 
 ### Patch Changes

packages/react-router-dom-v5-compat/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-router-dom-v5-compat",
-  "version": "6.22.1",
+  "version": "6.22.2",
   "description": "Migration path to React Router v6 from v4/5",
   "keywords": [
     "react",
@@ -24,7 +24,7 @@
   "types": "./dist/index.d.ts",
   "dependencies": {
     "history": "^5.3.0",
-    "react-router": "6.22.1"
+    "react-router": "6.22.2"
   },
   "peerDependencies": {
     "react": ">=16.8",

packages/react-router-dom/CHANGELOG.md

@@ -1,5 +1,13 @@
 # `react-router-dom`
 
+## 6.22.2
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/router@1.15.2`
+  - `react-router@6.22.2`
+
 ## 6.22.1
 
 ### Patch Changes

packages/react-router-dom/__tests__/partial-hydration-test.tsx

@@ -1,5 +1,5 @@
 import "@testing-library/jest-dom";
-import { render, screen, waitFor } from "@testing-library/react";
+import { act, render, screen, waitFor } from "@testing-library/react";
 import * as React from "react";
 import type { LoaderFunction } from "react-router";
 import { RouterProvider as ReactRouter_RouterPRovider } from "react-router";
@@ -650,4 +650,89 @@ function testPartialHydration(
       </div>"
     `);
   });
+
+  it("preserves hydrated errors for non-hydrating loaders", async () => {
+    let dfd = createDeferred();
+    let rootSpy: LoaderFunction = jest.fn(() => dfd.promise);
+    rootSpy.hydrate = true;
+
+    let indexSpy = jest.fn();
+
+    let router = createTestRouter(
+      [
+        {
+          id: "root",
+          path: "/",
+          loader: rootSpy,
+          Component() {
+            let data = useLoaderData() as string;
+            return (
+              <>
+                <h1>{`Home - ${data}`}</h1>
+                <Outlet />
+              </>
+            );
+          },
+          children: [
+            {
+              id: "index",
+              index: true,
+              loader: indexSpy,
+              Component() {
+                let data = useLoaderData() as string;
+                return <h2>{`Index - ${data}`}</h2>;
+              },
+              ErrorBoundary() {
+                let error = useRouteError() as string;
+                return <p>{error}</p>;
+              },
+            },
+          ],
+        },
+      ],
+      {
+        hydrationData: {
+          loaderData: {
+            root: "HYDRATED ROOT",
+          },
+          errors: {
+            index: "INDEX ERROR",
+          },
+        },
+        future: {
+          v7_partialHydration: true,
+        },
+      }
+    );
+    let { container } = render(<RouterProvider router={router} />);
+
+    expect(getHtml(container)).toMatchInlineSnapshot(`
+      "<div>
+        <h1>
+          Home - HYDRATED ROOT
+        </h1>
+        <p>
+          INDEX ERROR
+        </p>
+      </div>"
+    `);
+
+    expect(router.state.initialized).toBe(false);
+
+    await act(() => dfd.resolve("UPDATED ROOT"));
+
+    expect(getHtml(container)).toMatchInlineSnapshot(`
+      "<div>
+        <h1>
+          Home - UPDATED ROOT
+        </h1>
+        <p>
+          INDEX ERROR
+        </p>
+      </div>"
+    `);
+
+    expect(rootSpy).toHaveBeenCalledTimes(1);
+    expect(indexSpy).not.toHaveBeenCalled();
+  });
 }

packages/react-router-dom/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-router-dom",
-  "version": "6.22.1",
+  "version": "6.22.2",
   "description": "Declarative routing for React web applications",
   "keywords": [
     "react",
@@ -23,8 +23,8 @@
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "dependencies": {
-    "@remix-run/router": "1.15.1",
-    "react-router": "6.22.1"
+    "@remix-run/router": "1.15.2",
+    "react-router": "6.22.2"
   },
   "devDependencies": {
     "react": "^18.2.0",

packages/react-router-native/CHANGELOG.md

@@ -1,5 +1,12 @@
 # `react-router-native`
 
+## 6.22.2
+
+### Patch Changes
+
+- Updated dependencies:
+  - `react-router@6.22.2`
+
 ## 6.22.1
 
 ### Patch Changes

packages/react-router-native/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-router-native",
-  "version": "6.22.1",
+  "version": "6.22.2",
   "description": "Declarative routing for React Native applications",
   "keywords": [
     "react",
@@ -22,7 +22,7 @@
   "types": "./dist/index.d.ts",
   "dependencies": {
     "@ungap/url-search-params": "^0.2.2",
-    "react-router": "6.22.1"
+    "react-router": "6.22.2"
   },
   "devDependencies": {
     "react": "^18.2.0",

packages/react-router/CHANGELOG.md

@@ -1,5 +1,12 @@
 # `react-router`
 
+## 6.22.2
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/router@1.15.2`
+
 ## 6.22.1
 
 ### Patch Changes

packages/react-router/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-router",
-  "version": "6.22.1",
+  "version": "6.22.2",
   "description": "Declarative routing for React",
   "keywords": [
     "react",
@@ -23,7 +23,7 @@
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "dependencies": {
-    "@remix-run/router": "1.15.1"
+    "@remix-run/router": "1.15.2"
   },
   "devDependencies": {
     "react": "^18.2.0"

packages/router/CHANGELOG.md

@@ -1,5 +1,11 @@
 # `@remix-run/router`
 
+## 1.15.2
+
+### Patch Changes
+
+- Preserve hydrated errors during partial hydration runs ([#11305](https://github.com/remix-run/react-router/pull/11305))
+
 ## 1.15.1
 
 ### Patch Changes

packages/router/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/router",
-  "version": "1.15.1",
+  "version": "1.15.2",
   "description": "Nested/Data-driven/Framework-agnostic Routing",
   "keywords": [
     "remix",

packages/router/router.ts

@@ -1718,7 +1718,7 @@ export function createRouter(init: RouterInit): Router {
     // preserving any new action data or existing action data (in the case of
     // a revalidation interrupting an actionReload)
     // If we have partialHydration enabled, then don't update the state for the
-    // initial data load since iot's not a "navigation"
+    // initial data load since it's not a "navigation"
     if (
       !isUninterruptedRevalidation &&
       (!future.v7_partialHydration || !initialHydration)
@@ -1835,6 +1835,15 @@ export function createRouter(init: RouterInit): Router {
       });
     });
 
+    // During partial hydration, preserve SSR errors for routes that don't re-run
+    if (future.v7_partialHydration && initialHydration && state.errors) {
+      Object.entries(state.errors)
+        .filter(([id]) => !matchesToLoad.some((m) => m.route.id === id))
+        .forEach(([routeId, error]) => {
+          errors = Object.assign(errors || {}, { [routeId]: error });
+        });
+    }
+
     let updatedFetchers = markFetchRedirectsDone();
     let didAbortFetchLoads = abortStaleFetchLoads(pendingNavigationLoadId);
     let shouldUpdateFetchers =