From e0b1db441c20edec7423449ce1f303f6f163747a Mon Sep 17 00:00:00 2001
From: Jacob Ebey <jacob.ebey@live.com>
Date: Mon, 29 Apr 2024 12:13:37 -0700
Subject: [PATCH 01/10] fix: allow undefined to be resolved with `<Await>`
 (#11513)

---
 .changeset/heavy-lies-ring.md                 |  5 ++++
 .../__tests__/data-memory-router-test.tsx     | 29 +++++++++++++++++++
 packages/react-router/lib/components.tsx      |  4 +--
 3 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/heavy-lies-ring.md

diff --git a/.changeset/heavy-lies-ring.md b/.changeset/heavy-lies-ring.md
new file mode 100644
index 0000000000..f758c28dc0
--- /dev/null
+++ b/.changeset/heavy-lies-ring.md
@@ -0,0 +1,5 @@
+---
+"react-router": patch
+---
+
+allow undefined to be resolved with `<Await>`
diff --git a/packages/react-router/__tests__/data-memory-router-test.tsx b/packages/react-router/__tests__/data-memory-router-test.tsx
index 4a4826dd2c..db9dd488ad 100644
--- a/packages/react-router/__tests__/data-memory-router-test.tsx
+++ b/packages/react-router/__tests__/data-memory-router-test.tsx
@@ -3089,6 +3089,35 @@ describe("createMemoryRouter", () => {
       `);
     });
 
+    it("can render raw resolved to undefined promises with <Await>", async () => {
+      let dfd = createDeferred();
+
+      let { container } = render(
+        <React.Suspense fallback={<p>Loading...</p>}>
+          <Await resolve={dfd.promise}>{(data) => <p>{String(data)}</p>}</Await>
+        </React.Suspense>
+      );
+
+      console.log(getHtml(container));
+      expect(getHtml(container)).toMatchInlineSnapshot(`
+        "<div>
+          <p>
+            Loading...
+          </p>
+        </div>"
+      `);
+
+      dfd.resolve(undefined);
+      await waitFor(() => screen.getByText("undefined"));
+      expect(getHtml(container)).toMatchInlineSnapshot(`
+        "<div>
+          <p>
+            undefined
+          </p>
+        </div>"
+      `);
+    });
+
     it("can render raw resolved promises with <Await>", async () => {
       let dfd = createDeferred();
 
diff --git a/packages/react-router/lib/components.tsx b/packages/react-router/lib/components.tsx
index 918bc34d39..958cb5a773 100644
--- a/packages/react-router/lib/components.tsx
+++ b/packages/react-router/lib/components.tsx
@@ -590,9 +590,9 @@ class AwaitErrorBoundary extends React.Component<
       // Already tracked promise - check contents
       promise = resolve;
       status =
-        promise._error !== undefined
+        "_error" in promise
           ? AwaitRenderStatus.error
-          : promise._data !== undefined
+          : "_data" in promise
           ? AwaitRenderStatus.success
           : AwaitRenderStatus.pending;
     } else {

From fdff9ddfd3b929b6750f750523b77649d1421e60 Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Tue, 30 Apr 2024 09:30:05 -0400
Subject: [PATCH 02/10] Fix react-router-dom/server index.ts import from pnpm
 migration (#11514)

---
 .changeset/little-ghosts-give.md        | 5 +++++
 packages/react-router-dom/server.tsx    | 4 ++--
 packages/react-router-dom/tsconfig.json | 8 +++++++-
 3 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/little-ghosts-give.md

diff --git a/.changeset/little-ghosts-give.md b/.changeset/little-ghosts-give.md
new file mode 100644
index 0000000000..e3fe8207f0
--- /dev/null
+++ b/.changeset/little-ghosts-give.md
@@ -0,0 +1,5 @@
+---
+"react-router-dom": patch
+---
+
+Change the `react-router-dom/server` import back to `react-router-dom` instead of `index.ts`
diff --git a/packages/react-router-dom/server.tsx b/packages/react-router-dom/server.tsx
index 3195c3d271..9fcb91b173 100644
--- a/packages/react-router-dom/server.tsx
+++ b/packages/react-router-dom/server.tsx
@@ -29,7 +29,7 @@ import type {
   Location,
   RouteObject,
   To,
-} from "./index";
+} from "react-router-dom";
 import {
   createPath,
   parsePath,
@@ -38,7 +38,7 @@ import {
   UNSAFE_DataRouterStateContext as DataRouterStateContext,
   UNSAFE_FetchersContext as FetchersContext,
   UNSAFE_ViewTransitionContext as ViewTransitionContext,
-} from "./index";
+} from "react-router-dom";
 
 export interface StaticRouterProps {
   basename?: string;
diff --git a/packages/react-router-dom/tsconfig.json b/packages/react-router-dom/tsconfig.json
index a84a59018c..c01508b4ef 100644
--- a/packages/react-router-dom/tsconfig.json
+++ b/packages/react-router-dom/tsconfig.json
@@ -16,6 +16,12 @@
     "skipLibCheck": true,
 
     "outDir": ".",
-    "rootDir": "."
+    "rootDir": ".",
+
+    // Needed for the more-strict pnpm setup, can be removed in v7 since we'll
+    // be collapsing the lifted server file into the main package export
+    "paths": {
+      "react-router-dom": ["./index.tsx"]
+    }
   }
 }

From b5796619a9a0602398203ff498bcc742020427d7 Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Tue, 30 Apr 2024 15:57:43 -0400
Subject: [PATCH 03/10] Support unstable_dataStrategy on
 staticHandler.queryRoute (#11515)

---
 .changeset/clever-pumas-arrive.md     |  5 +++++
 packages/router/__tests__/ssr-test.ts | 13 +++++++++++++
 packages/router/router.ts             | 15 ++++++++++++---
 3 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/clever-pumas-arrive.md

diff --git a/.changeset/clever-pumas-arrive.md b/.changeset/clever-pumas-arrive.md
new file mode 100644
index 0000000000..06fcbf24af
--- /dev/null
+++ b/.changeset/clever-pumas-arrive.md
@@ -0,0 +1,5 @@
+---
+"@remix-run/router": patch
+---
+
+Support `unstable_dataStrategy` on `staticHandler.queryRoute`
diff --git a/packages/router/__tests__/ssr-test.ts b/packages/router/__tests__/ssr-test.ts
index 7795c08f70..df7c1882b5 100644
--- a/packages/router/__tests__/ssr-test.ts
+++ b/packages/router/__tests__/ssr-test.ts
@@ -2628,5 +2628,18 @@ describe("ssr", () => {
 
       /* eslint-enable jest/no-conditional-expect */
     });
+
+    describe("router dataStrategy", () => {
+      it("should apply a custom data strategy", async () => {
+        let { queryRoute } = createStaticHandler(SSR_ROUTES);
+        let data;
+
+        data = await queryRoute(createRequest("/custom"), {
+          unstable_dataStrategy: urlDataStrategy,
+        });
+        expect(data).toBeInstanceOf(URLSearchParams);
+        expect((data as URLSearchParams).get("foo")).toBe("bar");
+      });
+    });
   });
 });
diff --git a/packages/router/router.ts b/packages/router/router.ts
index 7a7d2c0a61..b72cb70091 100644
--- a/packages/router/router.ts
+++ b/packages/router/router.ts
@@ -412,7 +412,11 @@ export interface StaticHandler {
   ): Promise<StaticHandlerContext | Response>;
   queryRoute(
     request: Request,
-    opts?: { routeId?: string; requestContext?: unknown }
+    opts?: {
+      routeId?: string;
+      requestContext?: unknown;
+      unstable_dataStrategy?: DataStrategyFunction;
+    }
   ): Promise<any>;
 }
 
@@ -3099,7 +3103,12 @@ export function createStaticHandler(
     {
       routeId,
       requestContext,
-    }: { requestContext?: unknown; routeId?: string } = {}
+      unstable_dataStrategy,
+    }: {
+      requestContext?: unknown;
+      routeId?: string;
+      unstable_dataStrategy?: DataStrategyFunction;
+    } = {}
   ): Promise<any> {
     let url = new URL(request.url);
     let method = request.method;
@@ -3132,7 +3141,7 @@ export function createStaticHandler(
       location,
       matches,
       requestContext,
-      null,
+      unstable_dataStrategy || null,
       false,
       match
     );

From fc0e2e4af16ffca1d71be579b47e5ab54c8b5a2c Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Tue, 30 Apr 2024 16:04:17 -0400
Subject: [PATCH 04/10] Enter prerelease mode

---
 .changeset/pre.json | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 .changeset/pre.json

diff --git a/.changeset/pre.json b/.changeset/pre.json
new file mode 100644
index 0000000000..f0980c2bb4
--- /dev/null
+++ b/.changeset/pre.json
@@ -0,0 +1,12 @@
+{
+  "mode": "pre",
+  "tag": "pre",
+  "initialVersions": {
+    "react-router": "6.23.0",
+    "react-router-dom": "6.23.0",
+    "react-router-dom-v5-compat": "6.23.0",
+    "react-router-native": "6.23.0",
+    "@remix-run/router": "1.16.0"
+  },
+  "changesets": []
+}

From 9651465485fc6c96c1dd793a96d8af8f1ebf42d0 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 30 Apr 2024 16:09:04 -0400
Subject: [PATCH 05/10] chore: Update version for release (pre) (#11516)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/pre.json                              | 6 +++++-
 packages/react-router-dom-v5-compat/CHANGELOG.md | 9 +++++++++
 packages/react-router-dom-v5-compat/package.json | 2 +-
 packages/react-router-dom/CHANGELOG.md           | 9 +++++++++
 packages/react-router-dom/package.json           | 2 +-
 packages/react-router-native/CHANGELOG.md        | 7 +++++++
 packages/react-router-native/package.json        | 2 +-
 packages/react-router/CHANGELOG.md               | 8 ++++++++
 packages/react-router/package.json               | 2 +-
 packages/router/CHANGELOG.md                     | 6 ++++++
 packages/router/package.json                     | 2 +-
 11 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/.changeset/pre.json b/.changeset/pre.json
index f0980c2bb4..e67d6c8ddb 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -8,5 +8,9 @@
     "react-router-native": "6.23.0",
     "@remix-run/router": "1.16.0"
   },
-  "changesets": []
+  "changesets": [
+    "clever-pumas-arrive",
+    "heavy-lies-ring",
+    "little-ghosts-give"
+  ]
 }
diff --git a/packages/react-router-dom-v5-compat/CHANGELOG.md b/packages/react-router-dom-v5-compat/CHANGELOG.md
index ee5bac22db..5dee3edbac 100644
--- a/packages/react-router-dom-v5-compat/CHANGELOG.md
+++ b/packages/react-router-dom-v5-compat/CHANGELOG.md
@@ -1,5 +1,14 @@
 # `react-router-dom-v5-compat`
 
+## 6.23.1-pre.0
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/router@1.16.1-pre.0`
+  - `react-router@6.23.1-pre.0`
+  - `react-router-dom@6.23.1-pre.0`
+
 ## 6.23.0
 
 ### Minor Changes
diff --git a/packages/react-router-dom-v5-compat/package.json b/packages/react-router-dom-v5-compat/package.json
index cccca5fe5d..7bb237c308 100644
--- a/packages/react-router-dom-v5-compat/package.json
+++ b/packages/react-router-dom-v5-compat/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-router-dom-v5-compat",
-  "version": "6.23.0",
+  "version": "6.23.1-pre.0",
   "description": "Migration path to React Router v6 from v4/5",
   "keywords": [
     "react",
diff --git a/packages/react-router-dom/CHANGELOG.md b/packages/react-router-dom/CHANGELOG.md
index c19bc004b8..053ed85d5a 100644
--- a/packages/react-router-dom/CHANGELOG.md
+++ b/packages/react-router-dom/CHANGELOG.md
@@ -1,5 +1,14 @@
 # `react-router-dom`
 
+## 6.23.1-pre.0
+
+### Patch Changes
+
+- Change the `react-router-dom/server` import back to `react-router-dom` instead of `index.ts` ([#11514](https://github.com/remix-run/react-router/pull/11514))
+- Updated dependencies:
+  - `@remix-run/router@1.16.1-pre.0`
+  - `react-router@6.23.1-pre.0`
+
 ## 6.23.0
 
 ### Minor Changes
diff --git a/packages/react-router-dom/package.json b/packages/react-router-dom/package.json
index 407c913a5d..9b4e80625c 100644
--- a/packages/react-router-dom/package.json
+++ b/packages/react-router-dom/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-router-dom",
-  "version": "6.23.0",
+  "version": "6.23.1-pre.0",
   "description": "Declarative routing for React web applications",
   "keywords": [
     "react",
diff --git a/packages/react-router-native/CHANGELOG.md b/packages/react-router-native/CHANGELOG.md
index 5da49a7c3d..3e4d0fe67c 100644
--- a/packages/react-router-native/CHANGELOG.md
+++ b/packages/react-router-native/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `react-router-native`
 
+## 6.23.1-pre.0
+
+### Patch Changes
+
+- Updated dependencies:
+  - `react-router@6.23.1-pre.0`
+
 ## 6.23.0
 
 ### Minor Changes
diff --git a/packages/react-router-native/package.json b/packages/react-router-native/package.json
index adfe7b83a1..65a206aac5 100644
--- a/packages/react-router-native/package.json
+++ b/packages/react-router-native/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-router-native",
-  "version": "6.23.0",
+  "version": "6.23.1-pre.0",
   "description": "Declarative routing for React Native applications",
   "keywords": [
     "react",
diff --git a/packages/react-router/CHANGELOG.md b/packages/react-router/CHANGELOG.md
index 53b8b016ad..dd4d67891a 100644
--- a/packages/react-router/CHANGELOG.md
+++ b/packages/react-router/CHANGELOG.md
@@ -1,5 +1,13 @@
 # `react-router`
 
+## 6.23.1-pre.0
+
+### Patch Changes
+
+- allow undefined to be resolved with `<Await>` ([#11513](https://github.com/remix-run/react-router/pull/11513))
+- Updated dependencies:
+  - `@remix-run/router@1.16.1-pre.0`
+
 ## 6.23.0
 
 ### Minor Changes
diff --git a/packages/react-router/package.json b/packages/react-router/package.json
index 692a6b3a71..249b32ac7e 100644
--- a/packages/react-router/package.json
+++ b/packages/react-router/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-router",
-  "version": "6.23.0",
+  "version": "6.23.1-pre.0",
   "description": "Declarative routing for React",
   "keywords": [
     "react",
diff --git a/packages/router/CHANGELOG.md b/packages/router/CHANGELOG.md
index f63876348a..0830e11578 100644
--- a/packages/router/CHANGELOG.md
+++ b/packages/router/CHANGELOG.md
@@ -1,5 +1,11 @@
 # `@remix-run/router`
 
+## 1.16.1-pre.0
+
+### Patch Changes
+
+- Support `unstable_dataStrategy` on `staticHandler.queryRoute` ([#11515](https://github.com/remix-run/react-router/pull/11515))
+
 ## 1.16.0
 
 ### Minor Changes
diff --git a/packages/router/package.json b/packages/router/package.json
index 2560dadb8d..a81d98d6c2 100644
--- a/packages/router/package.json
+++ b/packages/router/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/router",
-  "version": "1.16.0",
+  "version": "1.16.1-pre.0",
   "description": "Nested/Data-driven/Framework-agnostic Routing",
   "keywords": [
     "remix",

From 031478d4acc46cc631673ef14e3215fac97dee8b Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Thu, 9 May 2024 10:17:24 -0400
Subject: [PATCH 06/10] Add defensive window.document check when checking for
 startViewTransition (#11544)

Co-authored-by: Nathan Rajlich <n@n8.io>
---
 .changeset/good-donkeys-kiss.md     | 5 +++++
 contributors.yml                    | 1 +
 packages/react-router-dom/index.tsx | 1 +
 3 files changed, 7 insertions(+)
 create mode 100644 .changeset/good-donkeys-kiss.md

diff --git a/.changeset/good-donkeys-kiss.md b/.changeset/good-donkeys-kiss.md
new file mode 100644
index 0000000000..15be073c5d
--- /dev/null
+++ b/.changeset/good-donkeys-kiss.md
@@ -0,0 +1,5 @@
+---
+"react-router-dom": patch
+---
+
+Check for `document` existence when checking `startViewTransition`
diff --git a/contributors.yml b/contributors.yml
index a2aab00d2e..d3c533fac1 100644
--- a/contributors.yml
+++ b/contributors.yml
@@ -241,6 +241,7 @@
 - tlinhart
 - tom-sherman
 - tomasr8
+- TooTallNate
 - triangularcube
 - trungpv1601
 - turansky
diff --git a/packages/react-router-dom/index.tsx b/packages/react-router-dom/index.tsx
index 1d4675396e..1f2e515f75 100644
--- a/packages/react-router-dom/index.tsx
+++ b/packages/react-router-dom/index.tsx
@@ -526,6 +526,7 @@ export function RouterProvider({
 
       let isViewTransitionUnavailable =
         router.window == null ||
+        router.window.document == null ||
         typeof router.window.document.startViewTransition !== "function";
 
       // If this isn't a view transition or it's not available in this browser,

From 26bc8e295398b571104ef529149c22a0724eeb7e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 9 May 2024 11:11:36 -0400
Subject: [PATCH 07/10] chore: Update version for release (pre) (#11545)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/pre.json                              | 1 +
 packages/react-router-dom-v5-compat/CHANGELOG.md | 8 ++++++++
 packages/react-router-dom-v5-compat/package.json | 2 +-
 packages/react-router-dom/CHANGELOG.md           | 8 ++++++++
 packages/react-router-dom/package.json           | 2 +-
 packages/react-router-native/CHANGELOG.md        | 7 +++++++
 packages/react-router-native/package.json        | 2 +-
 packages/react-router/CHANGELOG.md               | 2 ++
 packages/react-router/package.json               | 2 +-
 9 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/.changeset/pre.json b/.changeset/pre.json
index e67d6c8ddb..5a13d94e17 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -10,6 +10,7 @@
   },
   "changesets": [
     "clever-pumas-arrive",
+    "good-donkeys-kiss",
     "heavy-lies-ring",
     "little-ghosts-give"
   ]
diff --git a/packages/react-router-dom-v5-compat/CHANGELOG.md b/packages/react-router-dom-v5-compat/CHANGELOG.md
index 5dee3edbac..f07c06929d 100644
--- a/packages/react-router-dom-v5-compat/CHANGELOG.md
+++ b/packages/react-router-dom-v5-compat/CHANGELOG.md
@@ -1,5 +1,13 @@
 # `react-router-dom-v5-compat`
 
+## 6.23.1-pre.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `react-router-dom@6.23.1-pre.1`
+  - `react-router@6.23.1-pre.1`
+
 ## 6.23.1-pre.0
 
 ### Patch Changes
diff --git a/packages/react-router-dom-v5-compat/package.json b/packages/react-router-dom-v5-compat/package.json
index 7bb237c308..b418a68a99 100644
--- a/packages/react-router-dom-v5-compat/package.json
+++ b/packages/react-router-dom-v5-compat/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-router-dom-v5-compat",
-  "version": "6.23.1-pre.0",
+  "version": "6.23.1-pre.1",
   "description": "Migration path to React Router v6 from v4/5",
   "keywords": [
     "react",
diff --git a/packages/react-router-dom/CHANGELOG.md b/packages/react-router-dom/CHANGELOG.md
index 053ed85d5a..6e6c0c1b94 100644
--- a/packages/react-router-dom/CHANGELOG.md
+++ b/packages/react-router-dom/CHANGELOG.md
@@ -1,5 +1,13 @@
 # `react-router-dom`
 
+## 6.23.1-pre.1
+
+### Patch Changes
+
+- Check for `document` existence when checking `startViewTransition` ([#11544](https://github.com/remix-run/react-router/pull/11544))
+- Updated dependencies:
+  - `react-router@6.23.1-pre.1`
+
 ## 6.23.1-pre.0
 
 ### Patch Changes
diff --git a/packages/react-router-dom/package.json b/packages/react-router-dom/package.json
index 9b4e80625c..c2aea0d3fc 100644
--- a/packages/react-router-dom/package.json
+++ b/packages/react-router-dom/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-router-dom",
-  "version": "6.23.1-pre.0",
+  "version": "6.23.1-pre.1",
   "description": "Declarative routing for React web applications",
   "keywords": [
     "react",
diff --git a/packages/react-router-native/CHANGELOG.md b/packages/react-router-native/CHANGELOG.md
index 3e4d0fe67c..deb99f3730 100644
--- a/packages/react-router-native/CHANGELOG.md
+++ b/packages/react-router-native/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `react-router-native`
 
+## 6.23.1-pre.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `react-router@6.23.1-pre.1`
+
 ## 6.23.1-pre.0
 
 ### Patch Changes
diff --git a/packages/react-router-native/package.json b/packages/react-router-native/package.json
index 65a206aac5..c647e30026 100644
--- a/packages/react-router-native/package.json
+++ b/packages/react-router-native/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-router-native",
-  "version": "6.23.1-pre.0",
+  "version": "6.23.1-pre.1",
   "description": "Declarative routing for React Native applications",
   "keywords": [
     "react",
diff --git a/packages/react-router/CHANGELOG.md b/packages/react-router/CHANGELOG.md
index dd4d67891a..bd69ab2ea3 100644
--- a/packages/react-router/CHANGELOG.md
+++ b/packages/react-router/CHANGELOG.md
@@ -1,5 +1,7 @@
 # `react-router`
 
+## 6.23.1-pre.1
+
 ## 6.23.1-pre.0
 
 ### Patch Changes
diff --git a/packages/react-router/package.json b/packages/react-router/package.json
index 249b32ac7e..2aaaba12be 100644
--- a/packages/react-router/package.json
+++ b/packages/react-router/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-router",
-  "version": "6.23.1-pre.0",
+  "version": "6.23.1-pre.1",
   "description": "Declarative routing for React",
   "keywords": [
     "react",

From 86b50d7b4fbea451f9cd14430975e42773d63bd0 Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Fri, 10 May 2024 13:55:44 -0400
Subject: [PATCH 08/10] Update release notes

---
 CHANGELOG.md | 109 +++++++++++++++++++++++++++++----------------------
 1 file changed, 62 insertions(+), 47 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dcd3e0e023..365d2eade9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,152 +13,154 @@ 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.23.1](#v6231)
+    - [Patch Changes](#patch-changes)
   - [v6.23.0](#v6230)
     - [What's Changed](#whats-changed)
       - [Data Strategy (unstable)](#data-strategy-unstable)
       - [Skip Action Error Revalidation (unstable)](#skip-action-error-revalidation-unstable)
     - [Minor Changes](#minor-changes)
   - [v6.22.3](#v6223)
-    - [Patch Changes](#patch-changes)
-  - [v6.22.2](#v6222)
     - [Patch Changes](#patch-changes-1)
-  - [v6.22.1](#v6221)
+  - [v6.22.2](#v6222)
     - [Patch Changes](#patch-changes-2)
+  - [v6.22.1](#v6221)
+    - [Patch Changes](#patch-changes-3)
   - [v6.22.0](#v6220)
     - [What's Changed](#whats-changed-1)
       - [Core Web Vitals Technology Report Flag](#core-web-vitals-technology-report-flag)
     - [Minor Changes](#minor-changes-1)
-    - [Patch Changes](#patch-changes-3)
-  - [v6.21.3](#v6213)
     - [Patch Changes](#patch-changes-4)
-  - [v6.21.2](#v6212)
+  - [v6.21.3](#v6213)
     - [Patch Changes](#patch-changes-5)
-  - [v6.21.1](#v6211)
+  - [v6.21.2](#v6212)
     - [Patch Changes](#patch-changes-6)
+  - [v6.21.1](#v6211)
+    - [Patch Changes](#patch-changes-7)
   - [v6.21.0](#v6210)
     - [What's Changed](#whats-changed-2)
       - [`future.v7_relativeSplatPath`](#futurev7_relativesplatpath)
       - [Partial Hydration](#partial-hydration)
     - [Minor Changes](#minor-changes-2)
-    - [Patch Changes](#patch-changes-7)
-  - [v6.20.1](#v6201)
     - [Patch Changes](#patch-changes-8)
+  - [v6.20.1](#v6201)
+    - [Patch Changes](#patch-changes-9)
   - [v6.20.0](#v6200)
     - [Minor Changes](#minor-changes-3)
-    - [Patch Changes](#patch-changes-9)
+    - [Patch Changes](#patch-changes-10)
   - [v6.19.0](#v6190)
     - [What's Changed](#whats-changed-3)
       - [`unstable_flushSync` API](#unstable_flushsync-api)
     - [Minor Changes](#minor-changes-4)
-    - [Patch Changes](#patch-changes-10)
+    - [Patch Changes](#patch-changes-11)
   - [v6.18.0](#v6180)
     - [What's Changed](#whats-changed-4)
       - [New Fetcher APIs](#new-fetcher-apis)
       - [Persistence Future Flag (`future.v7_fetcherPersist`)](#persistence-future-flag-futurev7_fetcherpersist)
     - [Minor Changes](#minor-changes-5)
-    - [Patch Changes](#patch-changes-11)
+    - [Patch Changes](#patch-changes-12)
   - [v6.17.0](#v6170)
     - [What's Changed](#whats-changed-5)
       - [View Transitions 🚀](#view-transitions-)
     - [Minor Changes](#minor-changes-6)
-    - [Patch Changes](#patch-changes-12)
+    - [Patch Changes](#patch-changes-13)
   - [v6.16.0](#v6160)
     - [Minor Changes](#minor-changes-7)
-    - [Patch Changes](#patch-changes-13)
+    - [Patch Changes](#patch-changes-14)
   - [v6.15.0](#v6150)
     - [Minor Changes](#minor-changes-8)
-    - [Patch Changes](#patch-changes-14)
-  - [v6.14.2](#v6142)
     - [Patch Changes](#patch-changes-15)
-  - [v6.14.1](#v6141)
+  - [v6.14.2](#v6142)
     - [Patch Changes](#patch-changes-16)
+  - [v6.14.1](#v6141)
+    - [Patch Changes](#patch-changes-17)
   - [v6.14.0](#v6140)
     - [What's Changed](#whats-changed-6)
       - [JSON/Text Submissions](#jsontext-submissions)
     - [Minor Changes](#minor-changes-9)
-    - [Patch Changes](#patch-changes-17)
+    - [Patch Changes](#patch-changes-18)
   - [v6.13.0](#v6130)
     - [What's Changed](#whats-changed-7)
     - [Minor Changes](#minor-changes-10)
-    - [Patch Changes](#patch-changes-18)
-  - [v6.12.1](#v6121)
     - [Patch Changes](#patch-changes-19)
+  - [v6.12.1](#v6121)
+    - [Patch Changes](#patch-changes-20)
   - [v6.12.0](#v6120)
     - [What's Changed](#whats-changed-8)
       - [`React.startTransition` support](#reactstarttransition-support)
     - [Minor Changes](#minor-changes-11)
-    - [Patch Changes](#patch-changes-20)
-  - [v6.11.2](#v6112)
     - [Patch Changes](#patch-changes-21)
-  - [v6.11.1](#v6111)
+  - [v6.11.2](#v6112)
     - [Patch Changes](#patch-changes-22)
+  - [v6.11.1](#v6111)
+    - [Patch Changes](#patch-changes-23)
   - [v6.11.0](#v6110)
     - [Minor Changes](#minor-changes-12)
-    - [Patch Changes](#patch-changes-23)
+    - [Patch Changes](#patch-changes-24)
   - [v6.10.0](#v6100)
     - [What's Changed](#whats-changed-9)
     - [Minor Changes](#minor-changes-13)
-    - [Patch Changes](#patch-changes-24)
+    - [Patch Changes](#patch-changes-25)
   - [v6.9.0](#v690)
     - [What's Changed](#whats-changed-10)
       - [`Component`/`ErrorBoundary` route properties](#componenterrorboundary-route-properties)
       - [Introducing Lazy Route Modules](#introducing-lazy-route-modules)
     - [Minor Changes](#minor-changes-14)
-    - [Patch Changes](#patch-changes-25)
-  - [v6.8.2](#v682)
     - [Patch Changes](#patch-changes-26)
-  - [v6.8.1](#v681)
+  - [v6.8.2](#v682)
     - [Patch Changes](#patch-changes-27)
+  - [v6.8.1](#v681)
+    - [Patch Changes](#patch-changes-28)
   - [v6.8.0](#v680)
     - [Minor Changes](#minor-changes-15)
-    - [Patch Changes](#patch-changes-28)
+    - [Patch Changes](#patch-changes-29)
   - [v6.7.0](#v670)
     - [Minor Changes](#minor-changes-16)
-    - [Patch Changes](#patch-changes-29)
-  - [v6.6.2](#v662)
     - [Patch Changes](#patch-changes-30)
-  - [v6.6.1](#v661)
+  - [v6.6.2](#v662)
     - [Patch Changes](#patch-changes-31)
+  - [v6.6.1](#v661)
+    - [Patch Changes](#patch-changes-32)
   - [v6.6.0](#v660)
     - [What's Changed](#whats-changed-11)
     - [Minor Changes](#minor-changes-17)
-    - [Patch Changes](#patch-changes-32)
+    - [Patch Changes](#patch-changes-33)
   - [v6.5.0](#v650)
     - [What's Changed](#whats-changed-12)
     - [Minor Changes](#minor-changes-18)
-    - [Patch Changes](#patch-changes-33)
-  - [v6.4.5](#v645)
     - [Patch Changes](#patch-changes-34)
-  - [v6.4.4](#v644)
+  - [v6.4.5](#v645)
     - [Patch Changes](#patch-changes-35)
-  - [v6.4.3](#v643)
+  - [v6.4.4](#v644)
     - [Patch Changes](#patch-changes-36)
-  - [v6.4.2](#v642)
+  - [v6.4.3](#v643)
     - [Patch Changes](#patch-changes-37)
-  - [v6.4.1](#v641)
+  - [v6.4.2](#v642)
     - [Patch Changes](#patch-changes-38)
+  - [v6.4.1](#v641)
+    - [Patch Changes](#patch-changes-39)
   - [v6.4.0](#v640)
     - [What's Changed](#whats-changed-13)
       - [Remix Data APIs](#remix-data-apis)
-    - [Patch Changes](#patch-changes-39)
+    - [Patch Changes](#patch-changes-40)
   - [v6.3.0](#v630)
     - [Minor Changes](#minor-changes-19)
   - [v6.2.2](#v622)
-    - [Patch Changes](#patch-changes-40)
-  - [v6.2.1](#v621)
     - [Patch Changes](#patch-changes-41)
+  - [v6.2.1](#v621)
+    - [Patch Changes](#patch-changes-42)
   - [v6.2.0](#v620)
     - [Minor Changes](#minor-changes-20)
-    - [Patch Changes](#patch-changes-42)
-  - [v6.1.1](#v611)
     - [Patch Changes](#patch-changes-43)
+  - [v6.1.1](#v611)
+    - [Patch Changes](#patch-changes-44)
   - [v6.1.0](#v610)
     - [Minor Changes](#minor-changes-21)
-    - [Patch Changes](#patch-changes-44)
-  - [v6.0.2](#v602)
     - [Patch Changes](#patch-changes-45)
-  - [v6.0.1](#v601)
+  - [v6.0.2](#v602)
     - [Patch Changes](#patch-changes-46)
+  - [v6.0.1](#v601)
+    - [Patch Changes](#patch-changes-47)
   - [v6.0.0](#v600)
 
 </details>
@@ -182,6 +184,19 @@ 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.23.1
+
+Date: 2024-05-10
+
+### Patch Changes
+
+- Allow `undefined` to be resolved through `<Await>` ([#11513](https://github.com/remix-run/react-router/pull/11513))
+- Add defensive `document` check when checking for `document.startViewTransition` availability ([#11544](https://github.com/remix-run/react-router/pull/11544))
+- Change the `react-router-dom/server` import back to `react-router-dom` instead of `index.ts` ([#11514](https://github.com/remix-run/react-router/pull/11514))
+- `@remix-run/router` - Support `unstable_dataStrategy` on `staticHandler.queryRoute` ([#11515](https://github.com/remix-run/react-router/pull/11515))
+
+**Full Changelog**: [`v6.23.0...v6.23.1`](https://github.com/remix-run/react-router/compare/react-router@6.23.0...react-router@6.23.1)
+
 ## v6.23.0
 
 Date: 2024-04-23

From 884452ac4a849741c5ed25a7a85fd1bdb903e48b Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Fri, 10 May 2024 13:55:58 -0400
Subject: [PATCH 09/10] Exit prerelease mode

---
 .changeset/pre.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/pre.json b/.changeset/pre.json
index 5a13d94e17..0d8d38e269 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -1,5 +1,5 @@
 {
-  "mode": "pre",
+  "mode": "exit",
   "tag": "pre",
   "initialVersions": {
     "react-router": "6.23.0",

From aef5c4a617756e6fcc493de17b4be9997a5a19c8 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 10 May 2024 13:58:23 -0400
Subject: [PATCH 10/10] chore: Update version for release (#11551)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/clever-pumas-arrive.md               |  5 -----
 .changeset/good-donkeys-kiss.md                 |  5 -----
 .changeset/heavy-lies-ring.md                   |  5 -----
 .changeset/little-ghosts-give.md                |  5 -----
 .changeset/pre.json                             | 17 -----------------
 .../react-router-dom-v5-compat/CHANGELOG.md     | 16 ++++------------
 .../react-router-dom-v5-compat/package.json     |  2 +-
 packages/react-router-dom/CHANGELOG.md          | 13 +++----------
 packages/react-router-dom/package.json          |  2 +-
 packages/react-router-native/CHANGELOG.md       | 11 ++---------
 packages/react-router-native/package.json       |  2 +-
 packages/react-router/CHANGELOG.md              |  6 ++----
 packages/react-router/package.json              |  2 +-
 packages/router/CHANGELOG.md                    |  2 +-
 packages/router/package.json                    |  2 +-
 15 files changed, 17 insertions(+), 78 deletions(-)
 delete mode 100644 .changeset/clever-pumas-arrive.md
 delete mode 100644 .changeset/good-donkeys-kiss.md
 delete mode 100644 .changeset/heavy-lies-ring.md
 delete mode 100644 .changeset/little-ghosts-give.md
 delete mode 100644 .changeset/pre.json

diff --git a/.changeset/clever-pumas-arrive.md b/.changeset/clever-pumas-arrive.md
deleted file mode 100644
index 06fcbf24af..0000000000
--- a/.changeset/clever-pumas-arrive.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@remix-run/router": patch
----
-
-Support `unstable_dataStrategy` on `staticHandler.queryRoute`
diff --git a/.changeset/good-donkeys-kiss.md b/.changeset/good-donkeys-kiss.md
deleted file mode 100644
index 15be073c5d..0000000000
--- a/.changeset/good-donkeys-kiss.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"react-router-dom": patch
----
-
-Check for `document` existence when checking `startViewTransition`
diff --git a/.changeset/heavy-lies-ring.md b/.changeset/heavy-lies-ring.md
deleted file mode 100644
index f758c28dc0..0000000000
--- a/.changeset/heavy-lies-ring.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"react-router": patch
----
-
-allow undefined to be resolved with `<Await>`
diff --git a/.changeset/little-ghosts-give.md b/.changeset/little-ghosts-give.md
deleted file mode 100644
index e3fe8207f0..0000000000
--- a/.changeset/little-ghosts-give.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"react-router-dom": patch
----
-
-Change the `react-router-dom/server` import back to `react-router-dom` instead of `index.ts`
diff --git a/.changeset/pre.json b/.changeset/pre.json
deleted file mode 100644
index 0d8d38e269..0000000000
--- a/.changeset/pre.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "mode": "exit",
-  "tag": "pre",
-  "initialVersions": {
-    "react-router": "6.23.0",
-    "react-router-dom": "6.23.0",
-    "react-router-dom-v5-compat": "6.23.0",
-    "react-router-native": "6.23.0",
-    "@remix-run/router": "1.16.0"
-  },
-  "changesets": [
-    "clever-pumas-arrive",
-    "good-donkeys-kiss",
-    "heavy-lies-ring",
-    "little-ghosts-give"
-  ]
-}
diff --git a/packages/react-router-dom-v5-compat/CHANGELOG.md b/packages/react-router-dom-v5-compat/CHANGELOG.md
index f07c06929d..d2a01670a8 100644
--- a/packages/react-router-dom-v5-compat/CHANGELOG.md
+++ b/packages/react-router-dom-v5-compat/CHANGELOG.md
@@ -1,21 +1,13 @@
 # `react-router-dom-v5-compat`
 
-## 6.23.1-pre.1
+## 6.23.1
 
 ### Patch Changes
 
 - Updated dependencies:
-  - `react-router-dom@6.23.1-pre.1`
-  - `react-router@6.23.1-pre.1`
-
-## 6.23.1-pre.0
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/router@1.16.1-pre.0`
-  - `react-router@6.23.1-pre.0`
-  - `react-router-dom@6.23.1-pre.0`
+  - `@remix-run/router@1.16.1`
+  - `react-router-dom@6.23.1`
+  - `react-router@6.23.1`
 
 ## 6.23.0
 
diff --git a/packages/react-router-dom-v5-compat/package.json b/packages/react-router-dom-v5-compat/package.json
index b418a68a99..3d1be4b8e2 100644
--- a/packages/react-router-dom-v5-compat/package.json
+++ b/packages/react-router-dom-v5-compat/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-router-dom-v5-compat",
-  "version": "6.23.1-pre.1",
+  "version": "6.23.1",
   "description": "Migration path to React Router v6 from v4/5",
   "keywords": [
     "react",
diff --git a/packages/react-router-dom/CHANGELOG.md b/packages/react-router-dom/CHANGELOG.md
index 6e6c0c1b94..ffa5a9f3b2 100644
--- a/packages/react-router-dom/CHANGELOG.md
+++ b/packages/react-router-dom/CHANGELOG.md
@@ -1,21 +1,14 @@
 # `react-router-dom`
 
-## 6.23.1-pre.1
+## 6.23.1
 
 ### Patch Changes
 
 - Check for `document` existence when checking `startViewTransition` ([#11544](https://github.com/remix-run/react-router/pull/11544))
-- Updated dependencies:
-  - `react-router@6.23.1-pre.1`
-
-## 6.23.1-pre.0
-
-### Patch Changes
-
 - Change the `react-router-dom/server` import back to `react-router-dom` instead of `index.ts` ([#11514](https://github.com/remix-run/react-router/pull/11514))
 - Updated dependencies:
-  - `@remix-run/router@1.16.1-pre.0`
-  - `react-router@6.23.1-pre.0`
+  - `@remix-run/router@1.16.1`
+  - `react-router@6.23.1`
 
 ## 6.23.0
 
diff --git a/packages/react-router-dom/package.json b/packages/react-router-dom/package.json
index c2aea0d3fc..c0df38a090 100644
--- a/packages/react-router-dom/package.json
+++ b/packages/react-router-dom/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-router-dom",
-  "version": "6.23.1-pre.1",
+  "version": "6.23.1",
   "description": "Declarative routing for React web applications",
   "keywords": [
     "react",
diff --git a/packages/react-router-native/CHANGELOG.md b/packages/react-router-native/CHANGELOG.md
index deb99f3730..c7cf07c35f 100644
--- a/packages/react-router-native/CHANGELOG.md
+++ b/packages/react-router-native/CHANGELOG.md
@@ -1,18 +1,11 @@
 # `react-router-native`
 
-## 6.23.1-pre.1
+## 6.23.1
 
 ### Patch Changes
 
 - Updated dependencies:
-  - `react-router@6.23.1-pre.1`
-
-## 6.23.1-pre.0
-
-### Patch Changes
-
-- Updated dependencies:
-  - `react-router@6.23.1-pre.0`
+  - `react-router@6.23.1`
 
 ## 6.23.0
 
diff --git a/packages/react-router-native/package.json b/packages/react-router-native/package.json
index c647e30026..6226d7a219 100644
--- a/packages/react-router-native/package.json
+++ b/packages/react-router-native/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-router-native",
-  "version": "6.23.1-pre.1",
+  "version": "6.23.1",
   "description": "Declarative routing for React Native applications",
   "keywords": [
     "react",
diff --git a/packages/react-router/CHANGELOG.md b/packages/react-router/CHANGELOG.md
index bd69ab2ea3..6a595543b3 100644
--- a/packages/react-router/CHANGELOG.md
+++ b/packages/react-router/CHANGELOG.md
@@ -1,14 +1,12 @@
 # `react-router`
 
-## 6.23.1-pre.1
-
-## 6.23.1-pre.0
+## 6.23.1
 
 ### Patch Changes
 
 - allow undefined to be resolved with `<Await>` ([#11513](https://github.com/remix-run/react-router/pull/11513))
 - Updated dependencies:
-  - `@remix-run/router@1.16.1-pre.0`
+  - `@remix-run/router@1.16.1`
 
 ## 6.23.0
 
diff --git a/packages/react-router/package.json b/packages/react-router/package.json
index 2aaaba12be..9305a2d1b6 100644
--- a/packages/react-router/package.json
+++ b/packages/react-router/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-router",
-  "version": "6.23.1-pre.1",
+  "version": "6.23.1",
   "description": "Declarative routing for React",
   "keywords": [
     "react",
diff --git a/packages/router/CHANGELOG.md b/packages/router/CHANGELOG.md
index 0830e11578..32ebe56d45 100644
--- a/packages/router/CHANGELOG.md
+++ b/packages/router/CHANGELOG.md
@@ -1,6 +1,6 @@
 # `@remix-run/router`
 
-## 1.16.1-pre.0
+## 1.16.1
 
 ### Patch Changes
 
diff --git a/packages/router/package.json b/packages/router/package.json
index a81d98d6c2..95b7e368a6 100644
--- a/packages/router/package.json
+++ b/packages/router/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/router",
-  "version": "1.16.1-pre.0",
+  "version": "1.16.1",
   "description": "Nested/Data-driven/Framework-agnostic Routing",
   "keywords": [
     "remix",