Merge branch 'release-next'

Author: brophdawg11

CHANGELOG.md

@@ -13,134 +13,135 @@ 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.21.1](#v6211)
+    - [Patch Changes](#patch-changes)
   - [v6.21.0](#v6210)
     - [What's Changed](#whats-changed)
       - [`future.v7_relativeSplatPath`](#futurev7_relativesplatpath)
       - [Partial Hydration](#partial-hydration)
     - [Minor Changes](#minor-changes)
-    - [Patch Changes](#patch-changes)
-  - [v6.20.1](#v6201)
     - [Patch Changes](#patch-changes-1)
+  - [v6.20.1](#v6201)
+    - [Patch Changes](#patch-changes-2)
   - [v6.20.0](#v6200)
     - [Minor Changes](#minor-changes-1)
-    - [Patch Changes](#patch-changes-2)
+    - [Patch Changes](#patch-changes-3)
   - [v6.19.0](#v6190)
     - [What's Changed](#whats-changed-1)
       - [`unstable_flushSync` API](#unstable_flushsync-api)
     - [Minor Changes](#minor-changes-2)
-    - [Patch Changes](#patch-changes-3)
+    - [Patch Changes](#patch-changes-4)
   - [v6.18.0](#v6180)
     - [What's Changed](#whats-changed-2)
       - [New Fetcher APIs](#new-fetcher-apis)
       - [Persistence Future Flag (`future.v7_fetcherPersist`)](#persistence-future-flag-futurev7_fetcherpersist)
     - [Minor Changes](#minor-changes-3)
-    - [Patch Changes](#patch-changes-4)
+    - [Patch Changes](#patch-changes-5)
   - [v6.17.0](#v6170)
     - [What's Changed](#whats-changed-3)
       - [View Transitions 🚀](#view-transitions-)
     - [Minor Changes](#minor-changes-4)
-    - [Patch Changes](#patch-changes-5)
+    - [Patch Changes](#patch-changes-6)
   - [v6.16.0](#v6160)
     - [Minor Changes](#minor-changes-5)
-    - [Patch Changes](#patch-changes-6)
+    - [Patch Changes](#patch-changes-7)
   - [v6.15.0](#v6150)
     - [Minor Changes](#minor-changes-6)
-    - [Patch Changes](#patch-changes-7)
-  - [v6.14.2](#v6142)
     - [Patch Changes](#patch-changes-8)
-  - [v6.14.1](#v6141)
+  - [v6.14.2](#v6142)
     - [Patch Changes](#patch-changes-9)
+  - [v6.14.1](#v6141)
+    - [Patch Changes](#patch-changes-10)
   - [v6.14.0](#v6140)
     - [What's Changed](#whats-changed-4)
       - [JSON/Text Submissions](#jsontext-submissions)
     - [Minor Changes](#minor-changes-7)
-    - [Patch Changes](#patch-changes-10)
+    - [Patch Changes](#patch-changes-11)
   - [v6.13.0](#v6130)
     - [What's Changed](#whats-changed-5)
     - [Minor Changes](#minor-changes-8)
-    - [Patch Changes](#patch-changes-11)
-  - [v6.12.1](#v6121)
     - [Patch Changes](#patch-changes-12)
+  - [v6.12.1](#v6121)
+    - [Patch Changes](#patch-changes-13)
   - [v6.12.0](#v6120)
     - [What's Changed](#whats-changed-6)
       - [`React.startTransition` support](#reactstarttransition-support)
     - [Minor Changes](#minor-changes-9)
-    - [Patch Changes](#patch-changes-13)
-  - [v6.11.2](#v6112)
     - [Patch Changes](#patch-changes-14)
-  - [v6.11.1](#v6111)
+  - [v6.11.2](#v6112)
     - [Patch Changes](#patch-changes-15)
+  - [v6.11.1](#v6111)
+    - [Patch Changes](#patch-changes-16)
   - [v6.11.0](#v6110)
     - [Minor Changes](#minor-changes-10)
-    - [Patch Changes](#patch-changes-16)
+    - [Patch Changes](#patch-changes-17)
   - [v6.10.0](#v6100)
     - [What's Changed](#whats-changed-7)
     - [Minor Changes](#minor-changes-11)
-    - [Patch Changes](#patch-changes-17)
+    - [Patch Changes](#patch-changes-18)
   - [v6.9.0](#v690)
     - [What's Changed](#whats-changed-8)
       - [`Component`/`ErrorBoundary` route properties](#componenterrorboundary-route-properties)
       - [Introducing Lazy Route Modules](#introducing-lazy-route-modules)
     - [Minor Changes](#minor-changes-12)
-    - [Patch Changes](#patch-changes-18)
-  - [v6.8.2](#v682)
     - [Patch Changes](#patch-changes-19)
-  - [v6.8.1](#v681)
+  - [v6.8.2](#v682)
     - [Patch Changes](#patch-changes-20)
+  - [v6.8.1](#v681)
+    - [Patch Changes](#patch-changes-21)
   - [v6.8.0](#v680)
     - [Minor Changes](#minor-changes-13)
-    - [Patch Changes](#patch-changes-21)
+    - [Patch Changes](#patch-changes-22)
   - [v6.7.0](#v670)
     - [Minor Changes](#minor-changes-14)
-    - [Patch Changes](#patch-changes-22)
-  - [v6.6.2](#v662)
     - [Patch Changes](#patch-changes-23)
-  - [v6.6.1](#v661)
+  - [v6.6.2](#v662)
     - [Patch Changes](#patch-changes-24)
+  - [v6.6.1](#v661)
+    - [Patch Changes](#patch-changes-25)
   - [v6.6.0](#v660)
     - [What's Changed](#whats-changed-9)
     - [Minor Changes](#minor-changes-15)
-    - [Patch Changes](#patch-changes-25)
+    - [Patch Changes](#patch-changes-26)
   - [v6.5.0](#v650)
     - [What's Changed](#whats-changed-10)
     - [Minor Changes](#minor-changes-16)
-    - [Patch Changes](#patch-changes-26)
-  - [v6.4.5](#v645)
     - [Patch Changes](#patch-changes-27)
-  - [v6.4.4](#v644)
+  - [v6.4.5](#v645)
     - [Patch Changes](#patch-changes-28)
-  - [v6.4.3](#v643)
+  - [v6.4.4](#v644)
     - [Patch Changes](#patch-changes-29)
-  - [v6.4.2](#v642)
+  - [v6.4.3](#v643)
     - [Patch Changes](#patch-changes-30)
-  - [v6.4.1](#v641)
+  - [v6.4.2](#v642)
     - [Patch Changes](#patch-changes-31)
+  - [v6.4.1](#v641)
+    - [Patch Changes](#patch-changes-32)
   - [v6.4.0](#v640)
     - [What's Changed](#whats-changed-11)
       - [Remix Data APIs](#remix-data-apis)
-    - [Patch Changes](#patch-changes-32)
+    - [Patch Changes](#patch-changes-33)
   - [v6.3.0](#v630)
     - [Minor Changes](#minor-changes-17)
   - [v6.2.2](#v622)
-    - [Patch Changes](#patch-changes-33)
-  - [v6.2.1](#v621)
     - [Patch Changes](#patch-changes-34)
+  - [v6.2.1](#v621)
+    - [Patch Changes](#patch-changes-35)
   - [v6.2.0](#v620)
     - [Minor Changes](#minor-changes-18)
-    - [Patch Changes](#patch-changes-35)
-  - [v6.1.1](#v611)
     - [Patch Changes](#patch-changes-36)
+  - [v6.1.1](#v611)
+    - [Patch Changes](#patch-changes-37)
   - [v6.1.0](#v610)
     - [Minor Changes](#minor-changes-19)
-    - [Patch Changes](#patch-changes-37)
-  - [v6.0.1](#v601)
     - [Patch Changes](#patch-changes-38)
+  - [v6.0.1](#v601)
+    - [Patch Changes](#patch-changes-39)
   - [v6.0.0](#v600)
 
 </details>
 
-<!--
-To add a new release, copy from this template:
+<!-- To add a new release, copy from this template:
 
 ## v6.X.Y
 
@@ -155,9 +156,18 @@ To add a new release, copy from this template:
 ### Patch Changes
 
 **Full Changelog**: [`v6.X.Y...v6.X.Y`](https://github.com/remix-run/react-router/compare/[email protected]@6.X.Y)
-
 -->
 
+## v6.21.1
+
+### Patch Changes
+
+- Fix bug with `route.lazy` not working correctly on initial SPA load when `v7_partialHydration` is specified ([#11121](https://github.com/remix-run/react-router/pull/11121))
+- Fix bug preventing revalidation from occurring for persisted fetchers unmounted during the `submitting` phase ([#11102](https://github.com/remix-run/react-router/pull/11102))
+- De-dup relative path logic in `resolveTo` ([#11097](https://github.com/remix-run/react-router/pull/11097))
+
+**Full Changelog**: [`v6.21.0...v6.21.1`](https://github.com/remix-run/react-router/compare/[email protected]@6.21.1)
+
 ## v6.21.0
 
 ### What's Changed

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

@@ -1,5 +1,13 @@
 # `react-router-dom-v5-compat`
 
+## 6.21.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `[email protected]`
+  - `[email protected]`
+
 ## 6.21.0
 
 ### Minor Changes

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

@@ -1,6 +1,6 @@
 {
   "name": "react-router-dom-v5-compat",
-  "version": "6.21.0",
+  "version": "6.21.1",
   "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.21.0"
+    "react-router": "6.21.1"
   },
   "peerDependencies": {
     "react": ">=16.8",

packages/react-router-dom/CHANGELOG.md

@@ -1,5 +1,13 @@
 # `react-router-dom`
 
+## 6.21.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `[email protected]`
+  - `@remix-run/[email protected]`
+
 ## 6.21.0
 
 ### Minor Changes

packages/react-router-dom/__tests__/data-browser-router-test.tsx

@@ -5712,10 +5712,10 @@ function testDomRouter(
             await waitFor(() => screen.getByText("Page (1)"));
             expect(getHtml(container)).toMatch("Num fetchers: 1");
 
-            // Resolve after the navigation and revalidation
+            // Resolve action after the navigation and trigger revalidation
             dfd.resolve("FETCH");
             await waitFor(() => screen.getByText("Num fetchers: 0"));
-            expect(getHtml(container)).toMatch("Page (1)");
+            expect(getHtml(container)).toMatch("Page (2)");
           });
 
           it("submitting fetchers w/revalidations are cleaned up on completion (remounted)", async () => {

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

@@ -14,7 +14,7 @@ import {
 } from "react-router-dom";
 
 import getHtml from "../../react-router/__tests__/utils/getHtml";
-import { createDeferred } from "../../router/__tests__/utils/utils";
+import { createDeferred, tick } from "../../router/__tests__/utils/utils";
 
 let didAssertMissingHydrateFallback = false;
 
@@ -521,4 +521,133 @@ function testPartialHydration(
       </div>"
     `);
   });
+
+  it("supports partial hydration w/lazy initial routes (leaf fallback)", async () => {
+    let dfd = createDeferred();
+    let router = createTestRouter(
+      [
+        {
+          path: "/",
+          Component() {
+            return (
+              <>
+                <h1>Root</h1>
+                <Outlet />
+              </>
+            );
+          },
+          children: [
+            {
+              id: "index",
+              index: true,
+              HydrateFallback: () => <p>Index Loading...</p>,
+              async lazy() {
+                await tick();
+                return {
+                  loader: () => dfd.promise,
+                  Component() {
+                    let data = useLoaderData() as string;
+                    return <h2>{`Index - ${data}`}</h2>;
+                  },
+                };
+              },
+            },
+          ],
+        },
+      ],
+      {
+        future: {
+          v7_partialHydration: true,
+        },
+      }
+    );
+    let { container } = render(<RouterProvider router={router} />);
+
+    expect(getHtml(container)).toMatchInlineSnapshot(`
+      "<div>
+        <h1>
+          Root
+        </h1>
+        <p>
+          Index Loading...
+        </p>
+      </div>"
+    `);
+
+    dfd.resolve("INDEX DATA");
+    await waitFor(() => screen.getByText(/INDEX DATA/));
+    expect(getHtml(container)).toMatchInlineSnapshot(`
+      "<div>
+        <h1>
+          Root
+        </h1>
+        <h2>
+          Index - INDEX DATA
+        </h2>
+      </div>"
+    `);
+  });
+
+  it("supports partial hydration w/lazy initial routes (root fallback)", async () => {
+    let dfd = createDeferred();
+    let router = createTestRouter(
+      [
+        {
+          path: "/",
+          Component() {
+            return (
+              <>
+                <h1>Root</h1>
+                <Outlet />
+              </>
+            );
+          },
+          HydrateFallback: () => <p>Loading...</p>,
+          children: [
+            {
+              id: "index",
+              index: true,
+              async lazy() {
+                await tick();
+                return {
+                  loader: () => dfd.promise,
+                  Component() {
+                    let data = useLoaderData() as string;
+                    return <h2>{`Index - ${data}`}</h2>;
+                  },
+                };
+              },
+            },
+          ],
+        },
+      ],
+      {
+        future: {
+          v7_partialHydration: true,
+        },
+      }
+    );
+    let { container } = render(<RouterProvider router={router} />);
+
+    expect(getHtml(container)).toMatchInlineSnapshot(`
+      "<div>
+        <p>
+          Loading...
+        </p>
+      </div>"
+    `);
+
+    dfd.resolve("INDEX DATA");
+    await waitFor(() => screen.getByText(/INDEX DATA/));
+    expect(getHtml(container)).toMatchInlineSnapshot(`
+      "<div>
+        <h1>
+          Root
+        </h1>
+        <h2>
+          Index - INDEX DATA
+        </h2>
+      </div>"
+    `);
+  });
 }