From c9142b033e359e0ee60060db9297dfe1e2cc01cb Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Thu, 21 Aug 2025 15:13:55 -0400
Subject: [PATCH 01/14] Remove prefix from client middleware

---
 docs/how-to/middleware.md                     |  4 +-
 docs/start/framework/route-module.md          |  6 +-
 integration/middleware-test.ts                | 58 +++++------
 integration/rsc/rsc-test.ts                   | 98 +++++++++----------
 packages/react-router-dev/typegen/generate.ts |  4 +-
 packages/react-router-dev/vite/plugin.ts      | 45 ++++-----
 .../react-router-dev/vite/route-chunks.ts     |  4 +-
 .../vite/rsc/virtual-route-modules.ts         |  2 +-
 .../react-router/lib/dom/ssr/routeModules.ts  |  5 +-
 packages/react-router/lib/dom/ssr/routes.tsx  | 13 +--
 .../lib/types/route-module-annotations.ts     |  2 +-
 playground/middleware/app/root.tsx            | 17 ++--
 .../middleware/app/routes/client.a.b.tsx      | 17 ++--
 playground/middleware/app/routes/client.a.tsx | 17 ++--
 14 files changed, 140 insertions(+), 152 deletions(-)

diff --git a/docs/how-to/middleware.md b/docs/how-to/middleware.md
index 4285aaf09e..34270fa7d8 100644
--- a/docs/how-to/middleware.md
+++ b/docs/how-to/middleware.md
@@ -87,7 +87,7 @@ async function timingMiddleware({ context }, next) {
   console.log(`Navigation took ${duration}ms`);
 }
 
-export const unstable_clientMiddleware: Route.unstable_ClientMiddlewareFunction[] =
+export const clientMiddleware: Route.ClientMiddlewareFunction[] =
   [timingMiddleware];
 
 export async function loader({
@@ -266,7 +266,7 @@ async function clientMiddleware({ request }, next) {
 }
 
 // Framework mode
-export const unstable_clientMiddleware: Route.unstable_MiddlewareFunction[] =
+export const clientMiddleware: Route.ClientMiddlewareFunction[] =
   [clientMiddleware];
 
 // Or, Data mode
diff --git a/docs/start/framework/route-module.md b/docs/start/framework/route-module.md
index f613d83a32..441e388088 100644
--- a/docs/start/framework/route-module.md
+++ b/docs/start/framework/route-module.md
@@ -135,7 +135,7 @@ See also:
 - [`unstable_middleware` params][middleware-params]
 - [Middleware][middleware]
 
-## `unstable_clientMiddleware`
+## `clientMiddleware`
 
 This is the client-side equivalent of `unstable_middleware` and runs in the browser during client navigations. The only difference from server middleware is that client middleware doesn't return Responses because they're not wrapping an HTTP request on the server.
 
@@ -158,9 +158,7 @@ async function loggingMiddleware(
   // ✅ No need to return anything
 }
 
-export const unstable_clientMiddleware = [
-  loggingMiddleware,
-];
+export const clientMiddleware = [loggingMiddleware];
 ```
 
 See also:
diff --git a/integration/middleware-test.ts b/integration/middleware-test.ts
index 34b31a9db4..71cf5d7bda 100644
--- a/integration/middleware-test.ts
+++ b/integration/middleware-test.ts
@@ -120,7 +120,7 @@ test.describe("Middleware", () => {
             import { Link } from 'react-router'
             import { orderContext } from '../context'
 
-            export const unstable_clientMiddleware = [
+            export const clientMiddleware = [
               ({ context }) => {
                 context.set(orderContext, [...context.get(orderContext), 'a']);
               },
@@ -145,7 +145,7 @@ test.describe("Middleware", () => {
           "app/routes/about.tsx": js`
             import { orderContext } from '../context'
 
-            export const unstable_clientMiddleware = [
+            export const clientMiddleware = [
               ({ context }) => {
                 context.set(orderContext, [...context.get(orderContext), 'c']);
               },
@@ -211,7 +211,7 @@ test.describe("Middleware", () => {
             import { Link } from 'react-router'
             import { orderContext } from '../context'
 
-            export const unstable_clientMiddleware = [
+            export const clientMiddleware = [
               ({ context }) => {
                 context.set(orderContext, [...context.get(orderContext), 'a']);
               },
@@ -236,7 +236,7 @@ test.describe("Middleware", () => {
           "app/routes/about.tsx": js`
             import { orderContext } from '../context'
 
-            export const unstable_clientMiddleware = [
+            export const clientMiddleware = [
               ({ context }) => {
                 context.set(orderContext, [...context.get(orderContext), 'c']);
               },
@@ -299,7 +299,7 @@ test.describe("Middleware", () => {
             import { Form } from 'react-router'
             import { orderContext } from '../context';
 
-            export const unstable_clientMiddleware = [
+            export const clientMiddleware = [
               ({ request, context }) => {
                 context.set(orderContext, ['a']);
               },
@@ -376,7 +376,7 @@ test.describe("Middleware", () => {
           `,
           "app/routes/redirect.tsx": js`
             import { Link, redirect } from 'react-router'
-            export const unstable_clientMiddleware = [
+            export const clientMiddleware = [
               ({ request, context }) => { throw redirect('/target'); }
             ]
             export default function Component() {
@@ -429,7 +429,7 @@ test.describe("Middleware", () => {
           `,
           "app/routes/redirect.tsx": js`
             import { Link, redirect } from 'react-router'
-            export const unstable_clientMiddleware = [
+            export const clientMiddleware = [
               async ({ request, context }, next) => {
                 await next();
                 throw redirect('/target');
@@ -485,7 +485,7 @@ test.describe("Middleware", () => {
               }
             `,
             "app/routes/broken.tsx": js`
-              export const unstable_clientMiddleware = [
+              export const clientMiddleware = [
                 async ({ request, context }, next) => {
                   throw new Error('broken!');
                 }
@@ -544,7 +544,7 @@ test.describe("Middleware", () => {
               }
             `,
             "app/routes/broken.tsx": js`
-              export const unstable_clientMiddleware = [
+              export const clientMiddleware = [
                 async ({ request, context }, next) => {
                   await next();
                   throw new Error('broken!');
@@ -619,7 +619,7 @@ test.describe("Middleware", () => {
           "app/routes/a.tsx": js`
             import { Outlet } from 'react-router'
             import { orderContext } from '../context';
-            export const unstable_clientMiddleware = [
+            export const clientMiddleware = [
               ({ context }) => {
                 context.set(orderContext, [...context.get(orderContext), 'a']);
               },
@@ -636,7 +636,7 @@ test.describe("Middleware", () => {
           "app/routes/a.b.tsx": js`
             import { Outlet } from 'react-router'
             import { orderContext } from '../context';
-            export const unstable_clientMiddleware = [
+            export const clientMiddleware = [
               ({ context }) => {
                 context.set(orderContext, [...context.get(orderContext), 'b']);
               }
@@ -697,7 +697,7 @@ test.describe("Middleware", () => {
             import { Link } from 'react-router'
             import { orderContext } from "../context";;
 
-            export const unstable_clientMiddleware = [
+            export const clientMiddleware = [
               ({ context }) => {
                 context.set(orderContext, [...context.get(orderContext), 'a']);
               },
@@ -721,7 +721,7 @@ test.describe("Middleware", () => {
           `,
           "app/routes/about.tsx": js`
             import { orderContext } from "../context";;
-            export const unstable_clientMiddleware = [
+            export const clientMiddleware = [
               ({ context }) => {
                 context.set(orderContext, ['c']); // reset order from hydration
               },
@@ -785,7 +785,7 @@ test.describe("Middleware", () => {
             import { Link } from 'react-router'
             import { orderContext } from "../context";;
 
-            export const unstable_clientMiddleware = [
+            export const clientMiddleware = [
               ({ context }) => {
                 context.set(orderContext, [...context.get(orderContext), 'a']);
               },
@@ -809,7 +809,7 @@ test.describe("Middleware", () => {
           `,
           "app/routes/about.tsx": js`
             import { orderContext } from "../context";;
-            export const unstable_clientMiddleware = [
+            export const clientMiddleware = [
               ({ context }) => {
                 context.set(orderContext, ['c']); // reset order from hydration
               },
@@ -865,7 +865,7 @@ test.describe("Middleware", () => {
           "app/routes/_index.tsx": js`
             import { Link } from 'react-router'
 
-            export const unstable_clientMiddleware = [
+            export const clientMiddleware = [
               ({ context }) => {
                 console.log('running index middleware')
               },
@@ -882,7 +882,7 @@ test.describe("Middleware", () => {
           `,
           "app/routes/about.tsx": js`
             import { Link } from 'react-router'
-            export const unstable_clientMiddleware = [
+            export const clientMiddleware = [
               ({ context }) => {
                 console.log('running about middleware')
               },
@@ -943,7 +943,7 @@ test.describe("Middleware", () => {
             import { Form } from 'react-router'
             import { orderContext } from "../context";;
 
-            export const unstable_clientMiddleware = [
+            export const clientMiddleware = [
               ({ context }) => {
                 context.set(orderContext, ['a']);
               },
@@ -1018,7 +1018,7 @@ test.describe("Middleware", () => {
           `,
           "app/routes/redirect.tsx": js`
             import { Link, redirect } from 'react-router'
-            export const unstable_clientMiddleware = [
+            export const clientMiddleware = [
               ({ request, context }) => { throw redirect('/target'); }
             ]
             export default function Component() {
@@ -1069,7 +1069,7 @@ test.describe("Middleware", () => {
           `,
           "app/routes/redirect.tsx": js`
             import { Link, redirect } from 'react-router'
-            export const unstable_clientMiddleware = [
+            export const clientMiddleware = [
               async ({ request, context }, next) => {
                 await next();
                 throw redirect('/target');
@@ -1123,7 +1123,7 @@ test.describe("Middleware", () => {
               }
             `,
             "app/routes/broken.tsx": js`
-              export const unstable_clientMiddleware = [
+              export const clientMiddleware = [
                 async ({ request, context }, next) => {
                   throw new Error('broken!')
                 }
@@ -1181,7 +1181,7 @@ test.describe("Middleware", () => {
             `,
             "app/routes/broken.tsx": js`
               import { useRouteError } from 'react-router'
-              export const unstable_clientMiddleware = [
+              export const clientMiddleware = [
                 async ({ request, context }, next) => {
                   await next();
                   throw new Error('broken!')
@@ -1254,7 +1254,7 @@ test.describe("Middleware", () => {
           "app/routes/a.tsx": js`
             import { Outlet } from 'react-router'
             import { orderContext } from '../context';
-            export const unstable_clientMiddleware = [
+            export const clientMiddleware = [
               ({ context }) => { context.set(orderContext, ['a']); }
             ];
 
@@ -1269,7 +1269,7 @@ test.describe("Middleware", () => {
           "app/routes/a.b.tsx": js`
             import { Outlet } from 'react-router'
             import { orderContext } from '../context';
-            export const unstable_clientMiddleware = [
+            export const clientMiddleware = [
               ({ context }) => {
                 context.set(orderContext, [...context.get(orderContext), 'b']);
               },
@@ -1341,7 +1341,7 @@ test.describe("Middleware", () => {
             export function loader() {
               return 'PARENT'
             }
-            export const unstable_clientMiddleware = [
+            export const clientMiddleware = [
               ({ context }) => { context.get(countContext).parent++ },
             ];
 
@@ -1366,7 +1366,7 @@ test.describe("Middleware", () => {
             export function loader() {
               return 'CHILD'
             }
-            export const unstable_clientMiddleware = [
+            export const clientMiddleware = [
               ({ context }) => { context.get(countContext).child++ },
             ];
 
@@ -1464,7 +1464,7 @@ test.describe("Middleware", () => {
             export function loader() {
               return 'PARENT'
             }
-            export const unstable_clientMiddleware = [
+            export const clientMiddleware = [
               ({ context }) => { context.get(countContext).parent++ },
             ];
             export default function Component({ loaderData }) {
@@ -1485,7 +1485,7 @@ test.describe("Middleware", () => {
             export function loader() {
               return 'CHILD'
             }
-            export const unstable_clientMiddleware = [
+            export const clientMiddleware = [
               ({ context }) => { context.get(countContext).child++ },
             ];
             export default function Component({ loaderData }) {
@@ -1506,7 +1506,7 @@ test.describe("Middleware", () => {
             export function loader() {
               return 'INDEX'
             }
-            export const unstable_clientMiddleware = [
+            export const clientMiddleware = [
               ({ context }) => { context.get(countContext).index++ },
             ];
             export async function clientLoader({ serverLoader, context }) {
diff --git a/integration/rsc/rsc-test.ts b/integration/rsc/rsc-test.ts
index f1a0c40a67..82a9216f07 100644
--- a/integration/rsc/rsc-test.ts
+++ b/integration/rsc/rsc-test.ts
@@ -28,7 +28,7 @@ implementations.forEach((implementation) => {
           files: {
             "src/routes.ts": js`
               import type { unstable_RSCRouteConfig as RSCRouteConfig } from "react-router";
-  
+
               export const routes = [
                 {
                   id: "root",
@@ -299,7 +299,7 @@ implementations.forEach((implementation) => {
           files: {
             "src/routes.ts": js`
               import type { unstable_RSCRouteConfig as RSCRouteConfig } from "react-router";
-  
+
               export const routes = [
                 {
                   id: "root",
@@ -486,9 +486,9 @@ implementations.forEach((implementation) => {
 
             "src/config/request-context.ts": js`
               import { unstable_createContext, unstable_RouterContextProvider } from "react-router";
-  
+
               export const testContext = unstable_createContext<string>("default-value");
-  
+
               export const requestContext = new unstable_RouterContextProvider(
                 new Map([[testContext, "test-context-value"]])
               );
@@ -496,9 +496,9 @@ implementations.forEach((implementation) => {
             "src/config/unstable-get-context.ts": js`
               // THIS FILE OVERRIDES THE DEFAULT IMPLEMENTATION
               import { unstable_createContext } from "react-router";
-  
+
               export const testContext = unstable_createContext<string>("default-value");
-  
+
               export function unstable_getContext() {
                 return new Map([[testContext, "client-context-value"]]);
               }
@@ -506,11 +506,11 @@ implementations.forEach((implementation) => {
 
             "src/routes/soft-navigation/home.tsx": js`
               import { Link } from "react-router";
-  
+
               export function loader() {
                 return { message: "Home Page Data" };
               }
-  
+
               export default function HomeRoute({ loaderData }) {
                 return (
                   <div>
@@ -525,37 +525,37 @@ implementations.forEach((implementation) => {
               export function loader() {
                 return { count: 1 };
               }
-  
+
               export { default } from "./dashboard.client";
             `,
             "src/routes/soft-navigation/dashboard.client.tsx": js`
               "use client";
-  
+
               import { useState } from "react";
               import { Link } from "react-router";
-  
+
               // Export the entire route as a client component
               export default function DashboardRoute({ loaderData }) {
                 const [count, setCount] = useState(loaderData.count);
-  
+
                 return (
                   <div>
                     <h1 data-page="dashboard">Dashboard</h1>
-  
+
                     {/* Server data rendered in client component */}
                     <p data-server-count>
                       Server count: {loaderData.count}
                     </p>
-  
+
                     {/* Client interactive elements */}
                     <p data-client-count>
                       Client count: {count}
                     </p>
-  
+
                     <button data-increment onClick={() => setCount(count + 1)}>
                       Increment
                     </button>
-  
+
                     <Link to="/soft-navigation">Home</Link>
                   </div>
                 );
@@ -564,11 +564,11 @@ implementations.forEach((implementation) => {
 
             "src/routes/request-context/home.tsx": js`
               import { testContext } from "../../config/request-context";
-  
+
               export function loader({ context }) {
                 return { contextValue: context.get(testContext) };
               }
-  
+
               export default function HomeRoute({ loaderData }) {
                 return (
                   <div>
@@ -580,16 +580,16 @@ implementations.forEach((implementation) => {
 
             "src/routes/resource-request-context/home.client.tsx": js`
               "use client";
-  
+
               import { useFetcher } from "react-router";
-  
+
               export function ResourceFetcher() {
                 const fetcher = useFetcher();
-  
+
                 const loadResource = () => {
                   fetcher.submit({ hello: "world" }, { method: "post", action: "/resource-request-context/resource" });
                 };
-  
+
                 return (
                   <div>
                     <button type="button" onClick={loadResource}>
@@ -606,21 +606,21 @@ implementations.forEach((implementation) => {
             `,
             "src/routes/resource-request-context/home.tsx": js`
               import { ResourceFetcher } from "./home.client";
-              
+
               export default function HomeRoute() {
                 return <ResourceFetcher />;
               }
             `,
             "src/routes/resource-request-context/resource.tsx": js`
               import { testContext } from "../../config/request-context";
-  
+
               export function loader({ context }) {
-                return Response.json({ 
+                return Response.json({
                   message: "Hello from resource route!",
                   contextValue: context.get(testContext)
                 });
               }
-  
+
               export async function action({ context }) {
                 return Response.json({
                   message: "Hello from resource route!",
@@ -633,7 +633,7 @@ implementations.forEach((implementation) => {
               import type { unstable_MiddlewareFunction } from "react-router";
               import { Outlet } from "react-router";
               import { testContext } from "../../config/request-context";
-  
+
               export const unstable_middleware: unstable_MiddlewareFunction<Response>[] = [
                 async ({ request, context }, next) => {
                   const contextValue = context.get(testContext);
@@ -641,7 +641,7 @@ implementations.forEach((implementation) => {
                   return await next();
                 },
               ];
-  
+
               export default function RootRoute() {
                 return (
                   <div>
@@ -656,7 +656,7 @@ implementations.forEach((implementation) => {
                 const contextValue = request.headers.get("x-middleware-context");
                 return { contextValue };
               }
-  
+
               export default function HomeRoute({ loaderData }) {
                 return (
                   <div>
@@ -668,22 +668,22 @@ implementations.forEach((implementation) => {
 
             "src/routes/unstable-get-context/root.tsx": js`
               "use client";
-  
+
               import { Outlet } from "react-router";
-              import type { unstable_ClientMiddlewareFunction } from "react-router";
+              import type { ClientMiddlewareFunction } from "react-router";
               import { testContext } from "../../config/unstable-get-context";
-  
-              export const unstable_clientMiddleware = [
+
+              export const clientMiddleware = [
                 async ({ context }, next) => {
-                  context.set(testContext, "client-context-value");                  
+                  context.set(testContext, "client-context-value");
                   return await next();
                 },
               ];
-  
+
               export function HydrateFallback() {
                 return <div>Loading...</div>;
               }
-  
+
               export default function RootRoute() {
                 return (
                   <div>
@@ -695,17 +695,17 @@ implementations.forEach((implementation) => {
             `,
             "src/routes/unstable-get-context/home.tsx": js`
               "use client";
-  
+
               import { useLoaderData } from "react-router";
               import { testContext } from "../../config/unstable-get-context";
-  
+
               export function clientLoader({ context }) {
                 const contextValue = context.get(testContext);
                 return { contextValue };
               }
-  
+
               clientLoader.hydrate = true;
-  
+
               export default function HomeRoute() {
                 const loaderData = useLoaderData();
                 return (
@@ -720,7 +720,7 @@ implementations.forEach((implementation) => {
               export function loader() {
                 return Response.json({ message: "Hello from resource route!" });
               }
-  
+
               export async function action({ request }) {
                 return {
                   message: "Hello from resource route!",
@@ -730,16 +730,16 @@ implementations.forEach((implementation) => {
             `,
             "src/routes/resource-url-and-fetchers/home.client.tsx": js`
               "use client";
-  
+
               import { useFetcher } from "react-router";
-  
+
               export function ResourceFetcher() {
                 const fetcher = useFetcher();
-  
+
                 const loadResource = () => {
                   fetcher.submit({ hello: "world" }, { method: "post", action: "/resource-url-and-fetchers/resource" });
                 };
-  
+
                 return (
                   <div>
                     <button type="button" onClick={loadResource}>
@@ -756,7 +756,7 @@ implementations.forEach((implementation) => {
             `,
             "src/routes/resource-url-and-fetchers/home.tsx": js`
               import { ResourceFetcher } from "./home.client";
-              
+
               export default function HomeRoute() {
                 return <ResourceFetcher />;
               }
@@ -961,17 +961,17 @@ implementations.forEach((implementation) => {
               export function loader() {
                 throw new Error("This error should be sanitized");
               }
-  
+
               export default function HomeRoute() {
                 return <h2>This should not be rendered</h2>;
               }
-  
+
               export { ErrorBoundary } from "./home.client";
             `,
             "src/routes/sanitized-errors/home.client.tsx": js`
               "use client"
               import { useRouteError } from "react-router";
-  
+
               export function ErrorBoundary() {
                 let error = useRouteError();
                 return (
diff --git a/packages/react-router-dev/typegen/generate.ts b/packages/react-router-dev/typegen/generate.ts
index f4a0a04f6d..3c44272e0d 100644
--- a/packages/react-router-dev/typegen/generate.ts
+++ b/packages/react-router-dev/typegen/generate.ts
@@ -293,8 +293,8 @@ function getRouteAnnotations({
         // unstable_middleware
         export type unstable_MiddlewareFunction = Annotations["unstable_MiddlewareFunction"];
 
-        // unstable_clientMiddleware
-        export type unstable_ClientMiddlewareFunction = Annotations["unstable_ClientMiddlewareFunction"];
+        // clientMiddleware
+        export type ClientMiddlewareFunction = Annotations["ClientMiddlewareFunction"];
 
         // loader
         export type LoaderArgs = Annotations["LoaderArgs"];
diff --git a/packages/react-router-dev/vite/plugin.ts b/packages/react-router-dev/vite/plugin.ts
index 8a7af33ba7..6d18a96fa2 100644
--- a/packages/react-router-dev/vite/plugin.ts
+++ b/packages/react-router-dev/vite/plugin.ts
@@ -130,7 +130,7 @@ const SERVER_ONLY_ROUTE_EXPORTS = [
 const CLIENT_NON_COMPONENT_EXPORTS = [
   "clientAction",
   "clientLoader",
-  "unstable_clientMiddleware",
+  "clientMiddleware",
   "handle",
   "meta",
   "links",
@@ -928,9 +928,7 @@ export const reactRouterVitePlugin: ReactRouterVitePlugin = () => {
       let sourceExports = routeManifestExports[route.id];
       let hasClientAction = sourceExports.includes("clientAction");
       let hasClientLoader = sourceExports.includes("clientLoader");
-      let hasClientMiddleware = sourceExports.includes(
-        "unstable_clientMiddleware",
-      );
+      let hasClientMiddleware = sourceExports.includes("clientMiddleware");
       let hasHydrateFallback = sourceExports.includes("HydrateFallback");
 
       let { hasRouteChunkByExportName } = await detectRouteChunksIfEnabled(
@@ -949,9 +947,9 @@ export const reactRouterVitePlugin: ReactRouterVitePlugin = () => {
               !hasClientAction || hasRouteChunkByExportName.clientAction,
             clientLoader:
               !hasClientLoader || hasRouteChunkByExportName.clientLoader,
-            unstable_clientMiddleware:
+            clientMiddleware:
               !hasClientMiddleware ||
-              hasRouteChunkByExportName.unstable_clientMiddleware,
+              hasRouteChunkByExportName.clientMiddleware,
             HydrateFallback:
               !hasHydrateFallback || hasRouteChunkByExportName.HydrateFallback,
           },
@@ -991,14 +989,13 @@ export const reactRouterVitePlugin: ReactRouterVitePlugin = () => {
               getRouteChunkModuleId(routeFile, "clientLoader"),
             )
           : undefined,
-        clientMiddlewareModule:
-          hasRouteChunkByExportName.unstable_clientMiddleware
-            ? getPublicModulePathForEntry(
-                ctx,
-                viteManifest,
-                getRouteChunkModuleId(routeFile, "unstable_clientMiddleware"),
-              )
-            : undefined,
+        clientMiddlewareModule: hasRouteChunkByExportName.clientMiddleware
+          ? getPublicModulePathForEntry(
+              ctx,
+              viteManifest,
+              getRouteChunkModuleId(routeFile, "clientMiddleware"),
+            )
+          : undefined,
         hydrateFallbackModule: hasRouteChunkByExportName.HydrateFallback
           ? getPublicModulePathForEntry(
               ctx,
@@ -1076,9 +1073,7 @@ export const reactRouterVitePlugin: ReactRouterVitePlugin = () => {
       let sourceExports = routeManifestExports[key];
       let hasClientAction = sourceExports.includes("clientAction");
       let hasClientLoader = sourceExports.includes("clientLoader");
-      let hasClientMiddleware = sourceExports.includes(
-        "unstable_clientMiddleware",
-      );
+      let hasClientMiddleware = sourceExports.includes("clientMiddleware");
       let hasHydrateFallback = sourceExports.includes("HydrateFallback");
       let routeModulePath = combineURLs(
         ctx.publicPath,
@@ -1104,9 +1099,9 @@ export const reactRouterVitePlugin: ReactRouterVitePlugin = () => {
               !hasClientAction || hasRouteChunkByExportName.clientAction,
             clientLoader:
               !hasClientLoader || hasRouteChunkByExportName.clientLoader,
-            unstable_clientMiddleware:
+            clientMiddleware:
               !hasClientMiddleware ||
-              hasRouteChunkByExportName.unstable_clientMiddleware,
+              hasRouteChunkByExportName.clientMiddleware,
             HydrateFallback:
               !hasHydrateFallback || hasRouteChunkByExportName.HydrateFallback,
           },
@@ -2030,9 +2025,7 @@ export const reactRouterVitePlugin: ReactRouterVitePlugin = () => {
             valid: {
               clientAction: !exportNames.includes("clientAction"),
               clientLoader: !exportNames.includes("clientLoader"),
-              unstable_clientMiddleware: !exportNames.includes(
-                "unstable_clientMiddleware",
-              ),
+              clientMiddleware: !exportNames.includes("clientMiddleware"),
               HydrateFallback: !exportNames.includes("HydrateFallback"),
             },
           });
@@ -2572,8 +2565,8 @@ async function getRouteMetadata(
     clientLoaderModule: hasRouteChunkByExportName.clientLoader
       ? `${getRouteChunkModuleId(moduleUrl, "clientLoader")}`
       : undefined,
-    clientMiddlewareModule: hasRouteChunkByExportName.unstable_clientMiddleware
-      ? `${getRouteChunkModuleId(moduleUrl, "unstable_clientMiddleware")}`
+    clientMiddlewareModule: hasRouteChunkByExportName.clientMiddleware
+      ? `${getRouteChunkModuleId(moduleUrl, "clientMiddleware")}`
       : undefined,
     hydrateFallbackModule: hasRouteChunkByExportName.HydrateFallback
       ? `${getRouteChunkModuleId(moduleUrl, "HydrateFallback")}`
@@ -2582,7 +2575,7 @@ async function getRouteMetadata(
     hasClientAction: sourceExports.includes("clientAction"),
     hasLoader: sourceExports.includes("loader"),
     hasClientLoader: sourceExports.includes("clientLoader"),
-    hasClientMiddleware: sourceExports.includes("unstable_clientMiddleware"),
+    hasClientMiddleware: sourceExports.includes("clientMiddleware"),
     hasErrorBoundary: sourceExports.includes("ErrorBoundary"),
     imports: [],
   };
@@ -3252,7 +3245,7 @@ async function detectRouteChunksIfEnabled(
       hasRouteChunkByExportName: {
         clientAction: false,
         clientLoader: false,
-        unstable_clientMiddleware: false,
+        clientMiddleware: false,
         HydrateFallback: false,
       },
     };
diff --git a/packages/react-router-dev/vite/route-chunks.ts b/packages/react-router-dev/vite/route-chunks.ts
index 9dd869b991..9fef92936f 100644
--- a/packages/react-router-dev/vite/route-chunks.ts
+++ b/packages/react-router-dev/vite/route-chunks.ts
@@ -938,7 +938,7 @@ export function detectRouteChunks(
 export const routeChunkExportNames = [
   "clientAction",
   "clientLoader",
-  "unstable_clientMiddleware",
+  "clientMiddleware",
   "HydrateFallback",
 ] as const;
 export type RouteChunkExportName = (typeof routeChunkExportNames)[number];
@@ -968,7 +968,7 @@ const routeChunkQueryStrings: Record<RouteChunkName, RouteChunkQueryString> = {
   main: `${routeChunkQueryStringPrefix}main`,
   clientAction: `${routeChunkQueryStringPrefix}clientAction`,
   clientLoader: `${routeChunkQueryStringPrefix}clientLoader`,
-  unstable_clientMiddleware: `${routeChunkQueryStringPrefix}unstable_clientMiddleware`,
+  clientMiddleware: `${routeChunkQueryStringPrefix}clientMiddleware`,
   HydrateFallback: `${routeChunkQueryStringPrefix}HydrateFallback`,
 };
 
diff --git a/packages/react-router-dev/vite/rsc/virtual-route-modules.ts b/packages/react-router-dev/vite/rsc/virtual-route-modules.ts
index 8c54a90676..3063cf57fd 100644
--- a/packages/react-router-dev/vite/rsc/virtual-route-modules.ts
+++ b/packages/react-router-dev/vite/rsc/virtual-route-modules.ts
@@ -49,7 +49,7 @@ const CLIENT_COMPONENT_EXPORTS = [
 export const CLIENT_NON_COMPONENT_EXPORTS = [
   "clientAction",
   "clientLoader",
-  "unstable_clientMiddleware",
+  "clientMiddleware",
   "handle",
   "meta",
   "links",
diff --git a/packages/react-router/lib/dom/ssr/routeModules.ts b/packages/react-router/lib/dom/ssr/routeModules.ts
index 6516dca7c2..76adff9e56 100644
--- a/packages/react-router/lib/dom/ssr/routeModules.ts
+++ b/packages/react-router/lib/dom/ssr/routeModules.ts
@@ -8,6 +8,7 @@ import type {
   unstable_MiddlewareFunction,
   Params,
   ShouldRevalidateFunction,
+  DataStrategyResult,
 } from "../../router/utils";
 
 import type { EntryRoute } from "./routes";
@@ -25,7 +26,9 @@ export interface RouteModules {
 export interface RouteModule {
   clientAction?: ClientActionFunction;
   clientLoader?: ClientLoaderFunction;
-  unstable_clientMiddleware?: unstable_MiddlewareFunction<undefined>[];
+  clientMiddleware?: unstable_MiddlewareFunction<
+    Record<string, DataStrategyResult>
+  >[];
   ErrorBoundary?: ErrorBoundaryComponent;
   HydrateFallback?: HydrateFallbackComponent;
   Layout?: LayoutComponent;
diff --git a/packages/react-router/lib/dom/ssr/routes.tsx b/packages/react-router/lib/dom/ssr/routes.tsx
index 8ad262baae..eacfa575e0 100644
--- a/packages/react-router/lib/dom/ssr/routes.tsx
+++ b/packages/react-router/lib/dom/ssr/routes.tsx
@@ -312,7 +312,7 @@ export function createClientRoutes(
       Object.assign(dataRoute, {
         ...dataRoute,
         ...getRouteComponents(route, routeModule, isSpaMode),
-        unstable_middleware: routeModule.unstable_clientMiddleware,
+        unstable_middleware: routeModule.clientMiddleware,
         handle: routeModule.handle,
         shouldRevalidate: getShouldRevalidateFunction(
           dataRoute.path,
@@ -512,18 +512,15 @@ export function createClientRoutes(
           : undefined,
         unstable_middleware: route.hasClientMiddleware
           ? async () => {
-              let { unstable_clientMiddleware } = route.clientMiddlewareModule
+              let { clientMiddleware } = route.clientMiddlewareModule
                 ? await import(
                     /* @vite-ignore */
                     /* webpackIgnore: true */
                     route.clientMiddlewareModule
                   )
                 : await getLazyRoute();
-              invariant(
-                unstable_clientMiddleware,
-                "No `unstable_clientMiddleware` export found",
-              );
-              return unstable_clientMiddleware;
+              invariant(clientMiddleware, "No `clientMiddleware` export found");
+              return clientMiddleware;
             }
           : undefined,
         shouldRevalidate: async () => {
@@ -656,7 +653,7 @@ async function loadRouteModuleWithBlockingLinks(
   return {
     Component: getRouteModuleComponent(routeModule),
     ErrorBoundary: routeModule.ErrorBoundary,
-    unstable_clientMiddleware: routeModule.unstable_clientMiddleware,
+    clientMiddleware: routeModule.clientMiddleware,
     clientAction: routeModule.clientAction,
     clientLoader: routeModule.clientLoader,
     handle: routeModule.handle,
diff --git a/packages/react-router/lib/types/route-module-annotations.ts b/packages/react-router/lib/types/route-module-annotations.ts
index c07b8272b9..3910bb5bd9 100644
--- a/packages/react-router/lib/types/route-module-annotations.ts
+++ b/packages/react-router/lib/types/route-module-annotations.ts
@@ -205,7 +205,7 @@ export type GetAnnotations<Info extends RouteInfo> = {
   unstable_MiddlewareFunction: CreateServerMiddlewareFunction<Info>;
 
   // clientMiddleware
-  unstable_ClientMiddlewareFunction: CreateClientMiddlewareFunction<Info>;
+  ClientMiddlewareFunction: CreateClientMiddlewareFunction<Info>;
 
   // loader
   LoaderArgs: CreateServerLoaderArgs<Info>;
diff --git a/playground/middleware/app/root.tsx b/playground/middleware/app/root.tsx
index 8404098d9d..44835edba3 100644
--- a/playground/middleware/app/root.tsx
+++ b/playground/middleware/app/root.tsx
@@ -19,15 +19,14 @@ export const unstable_middleware: Route.unstable_MiddlewareFunction[] = [
   },
 ];
 
-export const unstable_clientMiddleware: Route.unstable_ClientMiddlewareFunction[] =
-  [
-    async ({ context }, next) => {
-      console.log("start root middleware");
-      context.set(rootContext, "ROOT");
-      await next();
-      console.log("end root middleware");
-    },
-  ];
+export const clientMiddleware: Route.ClientMiddlewareFunction[] = [
+  async ({ context }, next) => {
+    console.log("start root middleware");
+    context.set(rootContext, "ROOT");
+    await next();
+    console.log("end root middleware");
+  },
+];
 
 export function Layout({ children }: { children: React.ReactNode }) {
   return (
diff --git a/playground/middleware/app/routes/client.a.b.tsx b/playground/middleware/app/routes/client.a.b.tsx
index 61f3a05e21..3187101d58 100644
--- a/playground/middleware/app/routes/client.a.b.tsx
+++ b/playground/middleware/app/routes/client.a.b.tsx
@@ -2,15 +2,14 @@ import { Outlet, unstable_createContext } from "react-router";
 import type { Route } from "./+types/client.a.b";
 import { aContext, bContext, rootContext } from "~/contexts";
 
-export const unstable_clientMiddleware: Route.unstable_ClientMiddlewareFunction[] =
-  [
-    async ({ context }, next) => {
-      console.log("start b middleware");
-      context.set(bContext, "B");
-      await next();
-      console.log("end b middleware");
-    },
-  ];
+export const clientMiddleware: Route.ClientMiddlewareFunction[] = [
+  async ({ context }, next) => {
+    console.log("start b middleware");
+    context.set(bContext, "B");
+    await next();
+    console.log("end b middleware");
+  },
+];
 
 export async function clientLoader({ context }: Route.ClientLoaderArgs) {
   await new Promise((r) => setTimeout(r, 200));
diff --git a/playground/middleware/app/routes/client.a.tsx b/playground/middleware/app/routes/client.a.tsx
index 8e1bbb91fd..746b4878e4 100644
--- a/playground/middleware/app/routes/client.a.tsx
+++ b/playground/middleware/app/routes/client.a.tsx
@@ -2,15 +2,14 @@ import { Outlet } from "react-router";
 import type { Route } from "./+types/client.a";
 import { aContext, rootContext } from "~/contexts";
 
-export const unstable_clientMiddleware: Route.unstable_ClientMiddlewareFunction[] =
-  [
-    async ({ context }, next) => {
-      console.log("start a middleware");
-      context.set(aContext, "A");
-      await next();
-      console.log("end a middleware");
-    },
-  ];
+export const clientMiddleware: Route.ClientMiddlewareFunction[] = [
+  async ({ context }, next) => {
+    console.log("start a middleware");
+    context.set(aContext, "A");
+    await next();
+    console.log("end a middleware");
+  },
+];
 
 export function clientLoader({ context }: Route.ClientLoaderArgs) {
   return JSON.stringify({

From 56077d4fefc84c62747762a95e23074d1d44b6c9 Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Thu, 21 Aug 2025 15:18:54 -0400
Subject: [PATCH 02/14] Remove prefix from server middleware and flag

---
 docs/how-to/middleware.md                     | 134 +++++-----
 docs/start/data/route-object.md               |   6 +-
 docs/start/framework/route-module.md          |  12 +-
 integration/helpers/vite.ts                   |   2 +-
 integration/middleware-test.ts                |  92 +++----
 integration/resource-routes-test.ts           |   4 +-
 integration/rsc/rsc-test.ts                   |   4 +-
 integration/vite-dot-server-test.ts           |   2 +-
 packages/react-router-dev/config/config.ts    |   5 +-
 packages/react-router-dev/typegen/generate.ts |   6 +-
 packages/react-router-dev/vite/plugin.ts      |   7 +-
 .../vite/rsc/virtual-route-modules.ts         |   2 +-
 .../react-router/__tests__/dom/stub-test.tsx  |   5 +-
 .../router/context-middleware-test.ts         | 228 ++++++++----------
 .../router/utils/data-router-setup.ts         |   2 +-
 .../__tests__/server-runtime/server-test.ts   |   2 +-
 .../__tests__/server-runtime/utils.ts         |   2 +-
 .../react-router/__tests__/utils/framework.ts |   2 +-
 packages/react-router/index-react-server.ts   |   2 +-
 packages/react-router/index.ts                |   2 +-
 packages/react-router/lib/context.ts          |   4 +-
 .../lib/dom-export/hydrated-router.tsx        |   2 +-
 packages/react-router/lib/dom/server.tsx      |   2 +-
 packages/react-router/lib/dom/ssr/entry.ts    |   2 +-
 .../react-router/lib/dom/ssr/routeModules.ts  |   8 +-
 .../lib/dom/ssr/routes-test-stub.tsx          |   4 +-
 packages/react-router/lib/dom/ssr/routes.tsx  |   4 +-
 packages/react-router/lib/router/router.ts    |  24 +-
 packages/react-router/lib/router/utils.ts     |   8 +-
 packages/react-router/lib/rsc/browser.tsx     |   2 +-
 packages/react-router/lib/rsc/server.ssr.tsx  |   2 +-
 .../react-router/lib/server-runtime/routes.ts |   6 +-
 .../react-router/lib/server-runtime/server.ts |   6 +-
 .../lib/server-runtime/single-fetch.ts        |   4 +-
 packages/react-router/lib/types/future.ts     |   2 +-
 packages/react-router/lib/types/route-data.ts |   8 +-
 .../lib/types/route-module-annotations.ts     |   2 +-
 playground/middleware/app/root.tsx            |   2 +-
 .../middleware/app/routes/server.a.b.tsx      |   2 +-
 playground/middleware/app/routes/server.a.tsx |   2 +-
 playground/middleware/react-router.config.ts  |   2 +-
 playground/rsc-vite/src/routes/root/root.tsx  |   4 +-
 42 files changed, 293 insertions(+), 330 deletions(-)

diff --git a/docs/how-to/middleware.md b/docs/how-to/middleware.md
index 34270fa7d8..7c89a61c7f 100644
--- a/docs/how-to/middleware.md
+++ b/docs/how-to/middleware.md
@@ -10,7 +10,7 @@ unstable: true
 <br/>
 <br/>
 
-<docs-warning>The middleware feature is currently experimental and subject to breaking changes. Use the `future.unstable_middleware` flag to enable it.</docs-warning>
+<docs-warning>The middleware feature is currently experimental and subject to breaking changes. Use the `future.middleware` flag to enable it.</docs-warning>
 
 Middleware allows you to run code before and after the [`Response`][Response] generation for the matched path. This enables [common patterns][common-patterns] like authentication, logging, error handling, and data preprocessing in a reusable way.
 
@@ -41,7 +41,7 @@ import type { Config } from "@react-router/dev/config";
 
 export default {
   future: {
-    unstable_middleware: true,
+    middleware: true,
   },
 } satisfies Config;
 ```
@@ -76,8 +76,9 @@ async function authMiddleware({ request, context }) {
   context.set(userContext, user);
 }
 
-export const unstable_middleware: Route.unstable_MiddlewareFunction[] =
-  [authMiddleware];
+export const middleware: Route.MiddlewareFunction[] = [
+  authMiddleware,
+];
 
 // Client-side timing middleware
 async function timingMiddleware({ context }, next) {
@@ -138,7 +139,7 @@ function getLoadContext(req, res) {
 ```tsx
 const router = createBrowserRouter(routes, {
   future: {
-    unstable_middleware: true,
+    middleware: true,
   },
 });
 ```
@@ -165,12 +166,12 @@ import { userContext } from "~/context";
 const routes = [
   {
     path: "/",
-    unstable_middleware: [timingMiddleware], // 👈
+    middleware: [timingMiddleware], // 👈
     Component: Root,
     children: [
       {
         path: "profile",
-        unstable_middleware: [authMiddleware], // 👈
+        middleware: [authMiddleware], // 👈
         loader: profileLoader,
         Component: Profile,
       },
@@ -225,7 +226,7 @@ let sessionContext = unstable_createContext();
 
 const router = createBrowserRouter(routes, {
   future: {
-    unstable_middleware: true,
+    middleware: true,
   },
   unstable_getContext() {
     let context = new unstable_RouterContextProvider();
@@ -252,8 +253,9 @@ async function serverMiddleware({ request }, next) {
 }
 
 // Framework mode only
-export const unstable_middleware: Route.unstable_MiddlewareFunction[] =
-  [serverMiddleware];
+export const middleware: Route.MiddlewareFunction[] = [
+  serverMiddleware,
+];
 ```
 
 Client middleware runs in the browser in framework and data mode for client-side navigations and fetcher calls. Client middleware differs from server middleware because there's no HTTP Request, so it doesn't have a `Response` to bubble up. In most cases, you can just ignore the return value from `next` and return nothing from your middleware on the client:
@@ -272,7 +274,7 @@ export const clientMiddleware: Route.ClientMiddlewareFunction[] =
 // Or, Data mode
 const route = {
   path: "/",
-  unstable_middleware: [clientMiddleware],
+  middleware: [clientMiddleware],
   loader: rootLoader,
   Component: Root,
 };
@@ -337,8 +339,9 @@ async function loggingMiddleware({ request }, next) {
   return response;
 }
 
-export const unstable_middleware: Route.unstable_MiddlewareFunction[] =
-  [loggingMiddleware];
+export const middleware: Route.MiddlewareFunction[] = [
+  loggingMiddleware,
+];
 ```
 
 However, there may be cases where you _want_ to run certain server middlewares on _every_ client-navigation - even if no `loader` exists. For example, a form in the authenticated section of your site that doesn't require a `loader` but you'd rather use auth middleware to redirect users away before they fill out the form — rather than when they submit to the `action`. If your middleware meets these criteria, then you can put a `loader` on the route that contains the middleware to force it to always call the server for client-side navigations involving that route.
@@ -350,8 +353,9 @@ function authMiddleware({ request }, next) {
   }
 }
 
-export const unstable_middleware: Route.unstable_MiddlewareFunction[] =
-  [authMiddleware];
+export const middleware: Route.MiddlewareFunction[] = [
+  authMiddleware,
+];
 
 // By adding a `loader`, we force the `authMiddleware` to run on every
 // client-side navigation involving this route.
@@ -412,15 +416,14 @@ export function getUser() {
 ```tsx filename=app/root.tsx
 import { provideUser } from "./user-context";
 
-export const unstable_middleware: Route.unstable_MiddlewareFunction[] =
-  [
-    async ({ request, context }, next) => {
-      return provideUser(request, async () => {
-        let res = await next();
-        return res;
-      });
-    },
-  ];
+export const middleware: Route.MiddlewareFunction[] = [
+  async ({ request, context }, next) => {
+    return provideUser(request, async () => {
+      let res = await next();
+      return res;
+    });
+  },
+];
 ```
 
 ```tsx filename=app/routes/_index.tsx
@@ -477,27 +480,25 @@ React Router contains built-in error handling via the route [`ErrorBoundary`][Er
 This behavior is important to allow middleware patterns such as automatically setting required headers on outgoing responses (i.e., committing a session) from a root `middleware`. If any error from a `middleware` caused `next()` to `throw`, we'd miss the execution of ancestor middlewares on the way out and those required headers wouldn't be set.
 
 ```tsx filename=routes/parent.tsx
-export const unstable_middleware: Route.unstable_MiddlewareFunction[] =
-  [
-    async (_, next) => {
-      let res = await next();
-      //  ^ res.status = 500
-      // This response contains the ErrorBoundary
-      return res;
-    },
-  ];
+export const middleware: Route.MiddlewareFunction[] = [
+  async (_, next) => {
+    let res = await next();
+    //  ^ res.status = 500
+    // This response contains the ErrorBoundary
+    return res;
+  },
+];
 ```
 
 ```tsx filename=routes/parent.child.tsx
-export const unstable_middleware: Route.unstable_MiddlewareFunction[] =
-  [
-    async (_, next) => {
-      let res = await next();
-      //  ^ res.status = 200
-      // This response contains the successful UI render
-      throw new Error("Uh oh, something went wrong!");
-    },
-  ];
+export const middleware: Route.MiddlewareFunction[] = [
+  async (_, next) => {
+    let res = await next();
+    //  ^ res.status = 200
+    // This response contains the successful UI render
+    throw new Error("Uh oh, something went wrong!");
+  },
+];
 ```
 
 ## Changes to `getLoadContext`/`AppLoadContext`
@@ -594,8 +595,9 @@ export const authMiddleware = async ({
 ```tsx filename=app/routes/protected.tsx
 import { authMiddleware } from "~/middleware/auth";
 
-export const unstable_middleware: Route.unstable_MiddlewareFunction[] =
-  [authMiddleware];
+export const middleware: Route.MiddlewareFunction[] = [
+  authMiddleware,
+];
 
 export async function loader({
   context,
@@ -677,16 +679,15 @@ export const headersMiddleware = async (
 ### Conditional Middleware
 
 ```tsx
-export const unstable_middleware: Route.unstable_MiddlewareFunction[] =
-  [
-    async ({ request, context }, next) => {
-      // Only run auth for POST requests
-      if (request.method === "POST") {
-        await ensureAuthenticated(request, context);
-      }
-      return next();
-    },
-  ];
+export const middleware: Route.MiddlewareFunction[] = [
+  async ({ request, context }, next) => {
+    // Only run auth for POST requests
+    if (request.method === "POST") {
+      await ensureAuthenticated(request, context);
+    }
+    return next();
+  },
+];
 ```
 
 ### Sharing Context Between `action` and `loader`
@@ -694,19 +695,18 @@ export const unstable_middleware: Route.unstable_MiddlewareFunction[] =
 ```tsx
 const sharedDataContext = unstable_createContext<any>();
 
-export const unstable_middleware: Route.unstable_MiddlewareFunction[] =
-  [
-    async ({ request, context }, next) => {
-      if (request.method === "POST") {
-        // Set data during action phase
-        context.set(
-          sharedDataContext,
-          await getExpensiveData(),
-        );
-      }
-      return next();
-    },
-  ];
+export const middleware: Route.MiddlewareFunction[] = [
+  async ({ request, context }, next) => {
+    if (request.method === "POST") {
+      // Set data during action phase
+      context.set(
+        sharedDataContext,
+        await getExpensiveData(),
+      );
+    }
+    return next();
+  },
+];
 
 export async function action({
   context,
diff --git a/docs/start/data/route-object.md b/docs/start/data/route-object.md
index f933388ad7..3ddac3e49d 100644
--- a/docs/start/data/route-object.md
+++ b/docs/start/data/route-object.md
@@ -54,7 +54,7 @@ function MyRouteComponent() {
 }
 ```
 
-## `unstable_middleware`
+## `middleware`
 
 Route [middleware][middleware] runs sequentially before and after navigations. This gives you a singular place to do things like logging and authentication. The `next` function continues down the chain, and on the leaf route the `next` function executes the loaders/actions for the navigation.
 
@@ -62,12 +62,12 @@ Route [middleware][middleware] runs sequentially before and after navigations. T
 createBrowserRouter([
   {
     path: "/",
-    unstable_middleware: [loggingMiddleware],
+    middleware: [loggingMiddleware],
     loader: rootLoader,
     Component: Root,
     children: [{
       path: 'auth',
-      unstable_middleware: [authMiddleware],
+      middleware: [authMiddleware],
       loader: authLoader,
       Component: Auth,
       children: [...]
diff --git a/docs/start/framework/route-module.md b/docs/start/framework/route-module.md
index 441e388088..3ed6b452e7 100644
--- a/docs/start/framework/route-module.md
+++ b/docs/start/framework/route-module.md
@@ -78,7 +78,7 @@ export default function MyRouteComponent({
 }
 ```
 
-## `unstable_middleware`
+## `middleware`
 
 Route [middleware][middleware] runs sequentially on the server before and after document and
 data requests. This gives you a singular place to do things like logging,
@@ -103,7 +103,7 @@ async function loggingMiddleware(
   return response;
 }
 
-export const unstable_middleware = [loggingMiddleware];
+export const middleware = [loggingMiddleware];
 ```
 
 Here's an example middleware to check for logged in users and set the user in
@@ -125,19 +125,19 @@ async function authMiddleware ({
   context.set(userContext, user);
 };
 
-export const unstable_middleware = [authMiddleware];
+export const middleware = [authMiddleware];
 ```
 
 <docs-warning>Please make sure you understand [when middleware runs][when-middleware-runs] to make sure your application will behave the way you intend when adding middleware to your routes.</docs-warning>
 
 See also:
 
-- [`unstable_middleware` params][middleware-params]
+- [`middleware` params][middleware-params]
 - [Middleware][middleware]
 
 ## `clientMiddleware`
 
-This is the client-side equivalent of `unstable_middleware` and runs in the browser during client navigations. The only difference from server middleware is that client middleware doesn't return Responses because they're not wrapping an HTTP request on the server.
+This is the client-side equivalent of `middleware` and runs in the browser during client navigations. The only difference from server middleware is that client middleware doesn't return Responses because they're not wrapping an HTTP request on the server.
 
 Here's an example middleware to log requests on the client:
 
@@ -500,7 +500,7 @@ export function shouldRevalidate(
 
 Next: [Rendering Strategies](./rendering)
 
-[middleware-params]: https://api.reactrouter.com/v7/types/react_router.unstable_MiddlewareFunction.html
+[middleware-params]: https://api.reactrouter.com/v7/types/react_router.MiddlewareFunction.html
 [middleware]: ../../how-to/middleware
 [when-middleware-runs]: ../../how-to/middleware#when-middleware-runs
 [loader-params]: https://api.reactrouter.com/v7/interfaces/react_router.LoaderFunctionArgs
diff --git a/integration/helpers/vite.ts b/integration/helpers/vite.ts
index f6468c3b02..8235d6e73a 100644
--- a/integration/helpers/vite.ts
+++ b/integration/helpers/vite.ts
@@ -53,7 +53,7 @@ export const reactRouterConfig = ({
     future: {
       unstable_splitRouteModules: splitRouteModules,
       unstable_viteEnvironmentApi: viteEnvironmentApi,
-      unstable_middleware: middleware,
+      middleware: middleware,
     },
   };
 
diff --git a/integration/middleware-test.ts b/integration/middleware-test.ts
index 71cf5d7bda..931fc52559 100644
--- a/integration/middleware-test.ts
+++ b/integration/middleware-test.ts
@@ -1614,7 +1614,7 @@ test.describe("Middleware", () => {
             import { Link } from 'react-router'
             import { orderContext } from "../context";;
 
-            export const unstable_middleware = [
+            export const middleware = [
               ({ context }) => {
                 context.set(orderContext, [...context.get(orderContext), 'a']);
               },
@@ -1638,7 +1638,7 @@ test.describe("Middleware", () => {
           `,
           "app/routes/about.tsx": js`
             import { orderContext } from "../context";;
-            export const unstable_middleware = [
+            export const middleware = [
               ({ context }) => {
                 context.set(orderContext, ['c']);
               },
@@ -1700,7 +1700,7 @@ test.describe("Middleware", () => {
           "app/routes/parent.tsx": js`
             import { Link, Outlet } from 'react-router'
 
-            export const unstable_middleware = [
+            export const middleware = [
               ({ request }) => {
                 console.log('Running parent middleware', new URL(request.url).pathname)
               },
@@ -1718,7 +1718,7 @@ test.describe("Middleware", () => {
             }
           `,
           "app/routes/parent.a.tsx": js`
-            export const unstable_middleware = [
+            export const middleware = [
               ({ request }) => {
                 console.log('Running A middleware', new URL(request.url).pathname)
               },
@@ -1729,7 +1729,7 @@ test.describe("Middleware", () => {
             }
           `,
           "app/routes/parent.b.tsx": js`
-            export const unstable_middleware = [
+            export const middleware = [
               ({ request }) => {
                 console.log('Running B middleware', new URL(request.url).pathname)
               },
@@ -1787,7 +1787,7 @@ test.describe("Middleware", () => {
             import { Form } from 'react-router'
             import { orderContext } from "../context";;
 
-            export const unstable_middleware = [
+            export const middleware = [
               ({ context }) => {
                 context.set(orderContext, [...context.get(orderContext), 'a']);
               },
@@ -1862,7 +1862,7 @@ test.describe("Middleware", () => {
           `,
           "app/routes/redirect.tsx": js`
             import { Link, redirect } from 'react-router'
-            export const unstable_middleware = [
+            export const middleware = [
               ({ request, context }) => { throw redirect('/target'); }
             ]
             export function loader() {
@@ -1920,7 +1920,7 @@ test.describe("Middleware", () => {
           `,
           "app/routes/redirect.tsx": js`
             import { Link, redirect } from 'react-router'
-            export const unstable_middleware = [
+            export const middleware = [
               async ({ request, context }, next) => {
                 await next();
                 throw redirect('/target');
@@ -1976,7 +1976,7 @@ test.describe("Middleware", () => {
           `,
           "app/routes/redirect.tsx": js`
             import { Link, redirect } from 'react-router'
-            export const unstable_middleware = [
+            export const middleware = [
               async ({ request, context }, next) => {
                 let res = await next();
                 // Should still be a normal redirect here, not yet encoded into
@@ -2047,7 +2047,7 @@ test.describe("Middleware", () => {
               }
             `,
             "app/routes/broken.tsx": js`
-              export const unstable_middleware = [
+              export const middleware = [
                 async ({ request, context }, next) => {
                   throw new Error('broken!');
                 }
@@ -2106,7 +2106,7 @@ test.describe("Middleware", () => {
               }
             `,
             "app/routes/broken.tsx": js`
-              export const unstable_middleware = [
+              export const middleware = [
                 async ({ request, context }, next) => {
                   throw new Error('broken!');
                 }
@@ -2171,7 +2171,7 @@ test.describe("Middleware", () => {
               }
             `,
             "app/routes/broken.tsx": js`
-              export const unstable_middleware = [
+              export const middleware = [
                 async ({ request, context }, next) => {
                   await next();
                   throw new Error('broken!');
@@ -2240,7 +2240,7 @@ test.describe("Middleware", () => {
               }
             `,
             "app/routes/broken.tsx": js`
-              export const unstable_middleware = [
+              export const middleware = [
                 async ({ request, context }, next) => {
                   await next()
                   throw new Error('broken!');
@@ -2314,7 +2314,7 @@ test.describe("Middleware", () => {
             "app/routes/a.tsx": js`
               import { Outlet } from 'react-router'
 
-              export const unstable_middleware = [
+              export const middleware = [
                 async ({ context }, next) => {
                   let res = await next();
                   res.headers.set('x-a', 'true');
@@ -2335,7 +2335,7 @@ test.describe("Middleware", () => {
               }
             `,
             "app/routes/a.b.tsx": js`
-              export const unstable_middleware = [
+              export const middleware = [
                 async ({ context }, next) => {
                   let res = await next();
                   throw new Error('broken!')
@@ -2399,7 +2399,7 @@ test.describe("Middleware", () => {
             "app/routes/a.tsx": js`
               import { Outlet } from 'react-router'
 
-              export const unstable_middleware = [
+              export const middleware = [
                 async ({ context }, next) => {
                   let res = await next();
                   res.headers.set('x-a', 'true');
@@ -2420,7 +2420,7 @@ test.describe("Middleware", () => {
               }
             `,
             "app/routes/a.b.tsx": js`
-              export const unstable_middleware = [
+              export const middleware = [
                 async ({ context }, next) => {
                   let res = await next();
                   throw new Error('broken!')
@@ -2515,7 +2515,7 @@ test.describe("Middleware", () => {
             `,
             "app/routes/a.b.c.d.tsx": js`
               import { Outlet } from 'react-router'
-              export const unstable_middleware = [() => { throw new Error("broken!") }]
+              export const middleware = [() => { throw new Error("broken!") }]
               export default function Component() {
                 return <Outlet/>
               }
@@ -2621,7 +2621,7 @@ test.describe("Middleware", () => {
             `,
             "app/routes/a.b.c.d.tsx": js`
               import { Outlet } from 'react-router'
-              export const unstable_middleware = [() => { throw new Error("broken!") }]
+              export const middleware = [() => { throw new Error("broken!") }]
               export const loader = () => null;
               export default function Component() {
                 return <Outlet/>
@@ -2686,7 +2686,7 @@ test.describe("Middleware", () => {
             `,
             "app/routes/a.tsx": js`
               import { Outlet } from 'react-router'
-              export const unstable_middleware = [
+              export const middleware = [
                 async (_, next) => {
                   let res = await next();
                   res.headers.set('x-a', 'true');
@@ -2702,7 +2702,7 @@ test.describe("Middleware", () => {
             `,
             "app/routes/a.b.tsx": js`
               import { Link, Outlet } from 'react-router'
-              export const unstable_middleware = [
+              export const middleware = [
                 async (_, next) => {
                   let res = await next();
                   res.headers.set('x-b', 'true');
@@ -2714,7 +2714,7 @@ test.describe("Middleware", () => {
               }
             `,
             "app/routes/a.b.c.tsx": js`
-              export const unstable_middleware = [(_, next) => {
+              export const middleware = [(_, next) => {
                 throw new Error('C ERROR')
               }];
               // Force middleware to run on client side navs
@@ -2789,7 +2789,7 @@ test.describe("Middleware", () => {
             `,
             "app/routes/a.tsx": js`
               import { Outlet } from 'react-router'
-              export const unstable_middleware = [
+              export const middleware = [
                 async (_, next) => {
                   let res = await next();
                   res.headers.set('x-a', 'true');
@@ -2814,7 +2814,7 @@ test.describe("Middleware", () => {
             `,
             "app/routes/a.b.tsx": js`
               import { Link, Outlet } from 'react-router'
-              export const unstable_middleware = [
+              export const middleware = [
                 async (_, next) => {
                   let res = await next();
                   res.headers.set('x-b', 'true');
@@ -2826,7 +2826,7 @@ test.describe("Middleware", () => {
               }
             `,
             "app/routes/a.b.c.tsx": js`
-              export const unstable_middleware = [async (_, next) => {
+              export const middleware = [async (_, next) => {
                 let res = await next();
                 throw new Error('C ERROR')
               }];
@@ -2910,7 +2910,7 @@ test.describe("Middleware", () => {
             `,
             "app/routes/a.tsx": js`
               import { Outlet } from 'react-router'
-              export const unstable_middleware = [
+              export const middleware = [
                 async (_, next) => {
                   let res = await next();
                   res.headers.set('x-a', 'true');
@@ -2935,7 +2935,7 @@ test.describe("Middleware", () => {
             `,
             "app/routes/a.b.tsx": js`
               import { Link, Outlet } from 'react-router'
-              export const unstable_middleware = [async (_, next) => {
+              export const middleware = [async (_, next) => {
                 let res = await next();
                 throw new Error('B ERROR')
               }];
@@ -2944,7 +2944,7 @@ test.describe("Middleware", () => {
               }
             `,
             "app/routes/a.b.c.tsx": js`
-              export const unstable_middleware = [async (_, next) => {
+              export const middleware = [async (_, next) => {
                 let res = await next();
                 throw new Error('C ERROR')
               }];
@@ -3040,7 +3040,7 @@ test.describe("Middleware", () => {
             `,
             "app/routes/a.tsx": js`
               import { Outlet } from 'react-router'
-              export const unstable_middleware = [
+              export const middleware = [
                 async (_, next) => {
                   let res = await next();
                   res.headers.set('x-a', 'true');
@@ -3061,7 +3061,7 @@ test.describe("Middleware", () => {
             `,
             "app/routes/a.b.tsx": js`
               import { Link, Outlet } from 'react-router'
-              export const unstable_middleware = [
+              export const middleware = [
                 async (_, next) => {
                   let res = await next();
                   res.headers.set('x-b', 'true');
@@ -3074,7 +3074,7 @@ test.describe("Middleware", () => {
             `,
             "app/routes/a.b.c.tsx": js`
               import { data } from "react-router";
-              export const unstable_middleware = [(_, next) => {
+              export const middleware = [(_, next) => {
                 throw data('C ERROR', { status: 418, statusText: "I'm a teapot" })
               }];
               // Force middleware to run on client side navs
@@ -3149,7 +3149,7 @@ test.describe("Middleware", () => {
             `,
             "app/routes/a.tsx": js`
               import { Outlet } from 'react-router'
-              export const unstable_middleware = [
+              export const middleware = [
                 async (_, next) => {
                   let res = await next();
                   res.headers.set('x-a', 'true');
@@ -3174,7 +3174,7 @@ test.describe("Middleware", () => {
             `,
             "app/routes/a.b.tsx": js`
               import { Link, Outlet } from 'react-router'
-              export const unstable_middleware = [
+              export const middleware = [
                 async (_, next) => {
                   let res = await next();
                   res.headers.set('x-b', 'true');
@@ -3187,7 +3187,7 @@ test.describe("Middleware", () => {
             `,
             "app/routes/a.b.c.tsx": js`
               import { data } from "react-router";
-              export const unstable_middleware = [async (_, next) => {
+              export const middleware = [async (_, next) => {
                 let res = await next();
                 throw data('C ERROR', { status: 418, statusText: "I'm a teapot" })
               }];
@@ -3272,7 +3272,7 @@ test.describe("Middleware", () => {
           "app/routes/a.tsx": js`
             import { Outlet } from 'react-router'
             import { orderContext } from '../context';
-            export const unstable_middleware = [
+            export const middleware = [
               ({ context }) => { context.set(orderContext, ['a']); },
             ];
 
@@ -3297,7 +3297,7 @@ test.describe("Middleware", () => {
           "app/routes/a.b.tsx": js`
             import { Outlet } from 'react-router'
             import { orderContext } from '../context';
-            export const unstable_middleware = [
+            export const middleware = [
               ({ context }) => {
                 context.set(orderContext, [...context.get(orderContext), 'b']);
               },
@@ -3363,7 +3363,7 @@ test.describe("Middleware", () => {
           "app/routes/a.tsx": js`
             import { Outlet } from 'react-router'
             import { orderContext } from '../context';
-            export const unstable_middleware = [
+            export const middleware = [
               ({ context }) => { context.set(orderContext, ['a']); }
             ];
 
@@ -3378,7 +3378,7 @@ test.describe("Middleware", () => {
           "app/routes/a.b.tsx": js`
             import { Outlet } from 'react-router'
             import { orderContext } from '../context';
-            export const unstable_middleware = [
+            export const middleware = [
               ({ context }) => {
                 context.set(orderContext, [...context.get(orderContext), 'b']);
               },
@@ -3442,7 +3442,7 @@ test.describe("Middleware", () => {
           "app/routes/a.tsx": js`
             import { Outlet } from 'react-router'
             import { orderContext } from '../context';
-            export const unstable_middleware = [
+            export const middleware = [
               ({ context }) => { context.set(orderContext, ['a']); }
             ];
 
@@ -3457,7 +3457,7 @@ test.describe("Middleware", () => {
           "app/routes/a.b.tsx": js`
             import { Outlet } from 'react-router'
             import { orderContext } from '../context';
-            export const unstable_middleware = [
+            export const middleware = [
               ({ context }) => {
                 context.set(orderContext, [...context.get(orderContext), 'b']);
               },
@@ -3544,7 +3544,7 @@ test.describe("Middleware", () => {
           `,
           "app/routes/a.tsx": js`
             import { orderContext } from '../context';
-            export const unstable_middleware = [
+            export const middleware = [
               async ({ context }, next) => {
                 context.set(orderContext, ['a']);
                 let res = await next();
@@ -3555,7 +3555,7 @@ test.describe("Middleware", () => {
           `,
           "app/routes/a.b.tsx": js`
             import { orderContext } from '../context';
-            export const unstable_middleware = [
+            export const middleware = [
               async ({ context }, next) => {
                 context.set(orderContext, [...context.get(orderContext), 'b']);
                 let res = await next();
@@ -3625,7 +3625,7 @@ test.describe("Middleware", () => {
             `,
             "app/entry.server.tsx": ENTRY_SERVER_WITH_HANDLE_ERROR,
             "app/routes/a.tsx": js`
-              export const unstable_middleware = [
+              export const middleware = [
                 async ({ context }, next) => {
                   throw new Error("broken!");
                 },
@@ -3671,7 +3671,7 @@ test.describe("Middleware", () => {
             `,
             "app/entry.server.tsx": ENTRY_SERVER_WITH_HANDLE_ERROR,
             "app/routes/a.tsx": js`
-              export const unstable_middleware = [
+              export const middleware = [
                 async ({ context }, next) => {
                   throw new Error("broken!");
                 },
@@ -3717,7 +3717,7 @@ test.describe("Middleware", () => {
             `,
             "app/entry.server.tsx": ENTRY_SERVER_WITH_HANDLE_ERROR,
             "app/routes/a.tsx": js`
-              export const unstable_middleware = [
+              export const middleware = [
                 async ({ context }, next) => {
                   let res = await next()
                   throw new Error("broken!");
@@ -3764,7 +3764,7 @@ test.describe("Middleware", () => {
             `,
             "app/entry.server.tsx": ENTRY_SERVER_WITH_HANDLE_ERROR,
             "app/routes/a.tsx": js`
-              export const unstable_middleware = [
+              export const middleware = [
                 async ({ context }, next) => {
                   let res = await next();
                   throw new Error("broken!");
diff --git a/integration/resource-routes-test.ts b/integration/resource-routes-test.ts
index 0718fe1c1c..0aafeda0d1 100644
--- a/integration/resource-routes-test.ts
+++ b/integration/resource-routes-test.ts
@@ -107,14 +107,14 @@ test.describe("loader in an app", async () => {
         `,
         "app/routes/return-data-through-middleware.tsx": js`
           import { data } from "react-router";
-          export const unstable_middleware = [(_, next) => next()]
+          export const middleware = [(_, next) => next()]
           export let loader = () => {
             return data('Partial', { status: 207, headers: { 'X-Foo': 'Bar'} });
           }
         `,
         "app/routes/throw-data-through-middleware.tsx": js`
           import { data } from "react-router";
-          export const unstable_middleware = [(_, next) => next()]
+          export const middleware = [(_, next) => next()]
           export let loader = () => {
             throw data('Partial', { status: 207, headers: { 'X-Foo': 'Bar'} });
           }
diff --git a/integration/rsc/rsc-test.ts b/integration/rsc/rsc-test.ts
index 82a9216f07..30db730c32 100644
--- a/integration/rsc/rsc-test.ts
+++ b/integration/rsc/rsc-test.ts
@@ -630,11 +630,11 @@ implementations.forEach((implementation) => {
             `,
 
             "src/routes/middleware-request-context/root.tsx": js`
-              import type { unstable_MiddlewareFunction } from "react-router";
+              import type { MiddlewareFunction } from "react-router";
               import { Outlet } from "react-router";
               import { testContext } from "../../config/request-context";
 
-              export const unstable_middleware: unstable_MiddlewareFunction<Response>[] = [
+              export const middleware: MiddlewareFunction<Response>[] = [
                 async ({ request, context }, next) => {
                   const contextValue = context.get(testContext);
                   request.headers.set("x-middleware-context", contextValue);
diff --git a/integration/vite-dot-server-test.ts b/integration/vite-dot-server-test.ts
index a664b11b34..77e749d192 100644
--- a/integration/vite-dot-server-test.ts
+++ b/integration/vite-dot-server-test.ts
@@ -142,7 +142,7 @@ test.describe("Vite / route / server-only module referenced by client", () => {
         `    '${specifier}' imported by route 'app/routes/_index.tsx'`,
 
         "  React Router automatically removes server-code from these exports:",
-        "    `loader`, `action`, `unstable_middleware`, `headers`",
+        "    `loader`, `action`, `middleware`, `headers`",
 
         `  But other route exports in 'app/routes/_index.tsx' depend on '${specifier}'.`,
 
diff --git a/packages/react-router-dev/config/config.ts b/packages/react-router-dev/config/config.ts
index b5bd6ea254..3bc7047a36 100644
--- a/packages/react-router-dev/config/config.ts
+++ b/packages/react-router-dev/config/config.ts
@@ -87,7 +87,7 @@ interface FutureConfig {
   /**
    * Enable route middleware
    */
-  unstable_middleware: boolean;
+  middleware: boolean;
   unstable_optimizeDeps: boolean;
   /**
    * Automatically split route modules into multiple chunks when possible.
@@ -574,8 +574,7 @@ async function resolveConfig({
   }
 
   let future: FutureConfig = {
-    unstable_middleware:
-      reactRouterUserConfig.future?.unstable_middleware ?? false,
+    middleware: reactRouterUserConfig.future?.middleware ?? false,
     unstable_optimizeDeps:
       reactRouterUserConfig.future?.unstable_optimizeDeps ?? false,
     unstable_splitRouteModules:
diff --git a/packages/react-router-dev/typegen/generate.ts b/packages/react-router-dev/typegen/generate.ts
index 3c44272e0d..78724772f9 100644
--- a/packages/react-router-dev/typegen/generate.ts
+++ b/packages/react-router-dev/typegen/generate.ts
@@ -23,7 +23,7 @@ export function generateFuture(ctx: Context): VirtualFile {
 
     declare module "react-router" {
       interface Future {
-        unstable_middleware: ${ctx.config.future.unstable_middleware}
+        middleware: ${ctx.config.future.middleware}
       }
     }
   `;
@@ -290,8 +290,8 @@ function getRouteAnnotations({
         export type HeadersArgs = Annotations["HeadersArgs"];
         export type HeadersFunction = Annotations["HeadersFunction"];
 
-        // unstable_middleware
-        export type unstable_MiddlewareFunction = Annotations["unstable_MiddlewareFunction"];
+        // middleware
+        export type MiddlewareFunction = Annotations["MiddlewareFunction"];
 
         // clientMiddleware
         export type ClientMiddlewareFunction = Annotations["ClientMiddlewareFunction"];
diff --git a/packages/react-router-dev/vite/plugin.ts b/packages/react-router-dev/vite/plugin.ts
index 6d18a96fa2..1bd3727de0 100644
--- a/packages/react-router-dev/vite/plugin.ts
+++ b/packages/react-router-dev/vite/plugin.ts
@@ -121,12 +121,7 @@ export function extractPluginContext(
     | undefined;
 }
 
-const SERVER_ONLY_ROUTE_EXPORTS = [
-  "loader",
-  "action",
-  "unstable_middleware",
-  "headers",
-];
+const SERVER_ONLY_ROUTE_EXPORTS = ["loader", "action", "middleware", "headers"];
 const CLIENT_NON_COMPONENT_EXPORTS = [
   "clientAction",
   "clientLoader",
diff --git a/packages/react-router-dev/vite/rsc/virtual-route-modules.ts b/packages/react-router-dev/vite/rsc/virtual-route-modules.ts
index 3063cf57fd..0dc93141ff 100644
--- a/packages/react-router-dev/vite/rsc/virtual-route-modules.ts
+++ b/packages/react-router-dev/vite/rsc/virtual-route-modules.ts
@@ -9,7 +9,7 @@ const SERVER_ONLY_ROUTE_EXPORTS = [
   ...SERVER_ONLY_COMPONENT_EXPORTS,
   "loader",
   "action",
-  "unstable_middleware",
+  "middleware",
   "headers",
 ] as const;
 type ServerOnlyRouteExport = (typeof SERVER_ONLY_ROUTE_EXPORTS)[number];
diff --git a/packages/react-router/__tests__/dom/stub-test.tsx b/packages/react-router/__tests__/dom/stub-test.tsx
index 463902f3a2..be05bb51c9 100644
--- a/packages/react-router/__tests__/dom/stub-test.tsx
+++ b/packages/react-router/__tests__/dom/stub-test.tsx
@@ -319,10 +319,7 @@ test("can pass context values (w/middleware)", async () => {
   );
 
   render(
-    <RoutesStub
-      future={{ unstable_middleware: true }}
-      initialEntries={["/hello"]}
-    />,
+    <RoutesStub future={{ middleware: true }} initialEntries={["/hello"]} />,
   );
 
   expect(await screen.findByTestId("root")).toHaveTextContent(/Context: hello/);
diff --git a/packages/react-router/__tests__/router/context-middleware-test.ts b/packages/react-router/__tests__/router/context-middleware-test.ts
index 88c9e023c5..15162c922f 100644
--- a/packages/react-router/__tests__/router/context-middleware-test.ts
+++ b/packages/react-router/__tests__/router/context-middleware-test.ts
@@ -8,7 +8,7 @@ import {
 } from "../../lib/router/router";
 import type {
   DataStrategyResult,
-  unstable_MiddlewareFunction,
+  MiddlewareFunction,
   unstable_RouterContext,
 } from "../../lib/router/utils";
 import {
@@ -224,7 +224,7 @@ describe("context/middleware", () => {
     function getOrderMiddleware(
       orderContext: unstable_RouterContext<string[]>,
       name: string,
-    ): unstable_MiddlewareFunction {
+    ): MiddlewareFunction {
       return async ({ context }, next) => {
         context.set(orderContext, [
           ...context.get(orderContext),
@@ -252,7 +252,7 @@ describe("context/middleware", () => {
             {
               id: "parent",
               path: "/parent",
-              unstable_middleware: [
+              middleware: [
                 async ({ context }, next) => {
                   await next();
                   // Grab a snapshot at the end of the upwards middleware chain
@@ -268,7 +268,7 @@ describe("context/middleware", () => {
                 {
                   id: "child",
                   path: "child",
-                  unstable_middleware: [
+                  middleware: [
                     getOrderMiddleware(orderContext, "c"),
                     getOrderMiddleware(orderContext, "d"),
                   ],
@@ -308,7 +308,7 @@ describe("context/middleware", () => {
             {
               id: "parent",
               path: "/parent",
-              unstable_middleware: [
+              middleware: [
                 async ({ context }, next) => {
                   await next();
                   // Grab a snapshot at the end of the upwards middleware chain
@@ -321,7 +321,7 @@ describe("context/middleware", () => {
                 {
                   id: "child",
                   path: "child",
-                  unstable_middleware: [
+                  middleware: [
                     getOrderMiddleware(orderContext, "c"),
                     getOrderMiddleware(orderContext, "d"),
                   ],
@@ -356,7 +356,7 @@ describe("context/middleware", () => {
             {
               id: "parent",
               path: "/parent",
-              unstable_middleware: [
+              middleware: [
                 async ({ context }, next) => {
                   await next();
                   // Grab a snapshot at the end of the upwards middleware chain
@@ -372,7 +372,7 @@ describe("context/middleware", () => {
                 {
                   id: "child",
                   path: "child",
-                  unstable_middleware: [
+                  middleware: [
                     getOrderMiddleware(orderContext, "c"),
                     getOrderMiddleware(orderContext, "d"),
                   ],
@@ -432,7 +432,7 @@ describe("context/middleware", () => {
             {
               id: "parent",
               path: "/parent",
-              unstable_middleware: [
+              middleware: [
                 async ({ context }, next) => {
                   let results = await next();
                   values.push({ ...results });
@@ -446,7 +446,7 @@ describe("context/middleware", () => {
                 {
                   id: "child",
                   path: "child",
-                  unstable_middleware: [
+                  middleware: [
                     async ({ context }, next) => {
                       let results = await next();
                       values.push({ ...results });
@@ -492,7 +492,7 @@ describe("context/middleware", () => {
             {
               id: "parent",
               path: "/parent",
-              unstable_middleware: [
+              middleware: [
                 ({ context }, next) => {
                   context.set(parentContext, "PARENT MIDDLEWARE");
                 },
@@ -504,7 +504,7 @@ describe("context/middleware", () => {
                 {
                   id: "child",
                   path: "child",
-                  unstable_middleware: [
+                  middleware: [
                     ({ context }, next) => {
                       context.set(childContext, "CHILD MIDDLEWARE");
                     },
@@ -537,7 +537,7 @@ describe("context/middleware", () => {
             {
               id: "parent",
               path: "/parent",
-              unstable_middleware: [
+              middleware: [
                 async (_, next) => {
                   await next();
                   await next();
@@ -569,7 +569,7 @@ describe("context/middleware", () => {
             {
               id: "page",
               path: "/page",
-              unstable_middleware: [
+              middleware: [
                 ({ context }) => {
                   context.set(countContext, context.get(countContext) + 1);
                 },
@@ -634,7 +634,7 @@ describe("context/middleware", () => {
               id: "parent",
               path: "/parent",
               lazy: {
-                unstable_middleware: async () => [
+                middleware: async () => [
                   async ({ context }, next) => {
                     await next();
                     // Grab a snapshot at the end of the upwards middleware chain
@@ -652,7 +652,7 @@ describe("context/middleware", () => {
                   id: "child",
                   path: "child",
                   lazy: {
-                    unstable_middleware: async () => [
+                    middleware: async () => [
                       getOrderMiddleware(orderContext, "c"),
                       getOrderMiddleware(orderContext, "d"),
                     ],
@@ -693,7 +693,7 @@ describe("context/middleware", () => {
             {
               id: "parent",
               path: "/parent",
-              unstable_middleware: [
+              middleware: [
                 async ({ context }, next) => {
                   await next();
                   // Grab a snapshot at the end of the upwards middleware chain
@@ -710,7 +710,7 @@ describe("context/middleware", () => {
                   id: "child",
                   path: "child",
                   lazy: {
-                    unstable_middleware: async () => [
+                    middleware: async () => [
                       getOrderMiddleware(orderContext, "c"),
                       getOrderMiddleware(orderContext, "d"),
                     ],
@@ -757,7 +757,7 @@ describe("context/middleware", () => {
               id: "parent",
               path: "/parent",
               lazy: {
-                unstable_middleware: async () => [
+                middleware: async () => [
                   async ({ context }, next) => {
                     await next();
                     // Grab a snapshot at the end of the upwards middleware chain
@@ -776,7 +776,7 @@ describe("context/middleware", () => {
                   path: "child",
                   // @ts-expect-error
                   lazy: async () => ({
-                    unstable_middleware: [
+                    middleware: [
                       getOrderMiddleware(orderContext, "c"),
                       getOrderMiddleware(orderContext, "d"),
                     ],
@@ -802,7 +802,7 @@ describe("context/middleware", () => {
         ]);
 
         expect(consoleWarn).toHaveBeenCalledWith(
-          "Route property unstable_middleware is not a supported property to be returned from a lazy route function. This property will be ignored.",
+          "Route property middleware is not a supported property to be returned from a lazy route function. This property will be ignored.",
         );
       });
     });
@@ -820,7 +820,7 @@ describe("context/middleware", () => {
             {
               id: "parent",
               path: "/parent",
-              unstable_middleware: [
+              middleware: [
                 async ({ context }, next) => {
                   pushOrderContext(context, "PARENT DOWN");
                   await next();
@@ -837,7 +837,7 @@ describe("context/middleware", () => {
                 {
                   id: "child",
                   path: "child",
-                  unstable_middleware: [
+                  middleware: [
                     async ({ context }, next) => {
                       context.set(orderContext, [
                         ...(context.get(orderContext) || []),
@@ -880,7 +880,7 @@ describe("context/middleware", () => {
             {
               id: "parent",
               path: "/parent",
-              unstable_middleware: [
+              middleware: [
                 async (_, next) => {
                   pushOrderContext(context, "PARENT DOWN");
                   await next();
@@ -894,7 +894,7 @@ describe("context/middleware", () => {
                 {
                   id: "child",
                   path: "child",
-                  unstable_middleware: [
+                  middleware: [
                     async (_, next) => {
                       pushOrderContext(context, "CHILD DOWN");
                       await next();
@@ -937,7 +937,7 @@ describe("context/middleware", () => {
             {
               id: "parent",
               path: "/parent",
-              unstable_middleware: [
+              middleware: [
                 async ({ request, context }, next) => {
                   if (request.method !== "GET") {
                     pushOrderContext(context, "parent action start");
@@ -958,7 +958,7 @@ describe("context/middleware", () => {
                   id: "child",
                   path: "child",
                   hasErrorBoundary: true,
-                  unstable_middleware: [
+                  middleware: [
                     async ({ request, context }, next) => {
                       if (request.method !== "GET") {
                         pushOrderContext(context, "child 1 start - throwing");
@@ -1034,7 +1034,7 @@ describe("context/middleware", () => {
             {
               id: "parent",
               path: "/parent",
-              unstable_middleware: [
+              middleware: [
                 async ({ context }, next) => {
                   await next();
                 },
@@ -1058,7 +1058,7 @@ describe("context/middleware", () => {
                   id: "child",
                   path: "child",
                   hasErrorBoundary: true,
-                  unstable_middleware: [
+                  middleware: [
                     async ({ request, context }, next) => {
                       if (request.method !== "GET") {
                         pushOrderContext(context, "child 1 start");
@@ -1136,7 +1136,7 @@ describe("context/middleware", () => {
               id: "parent",
               path: "/parent",
               hasErrorBoundary: true,
-              unstable_middleware: [
+              middleware: [
                 async ({ request, context }, next) => {
                   if (request.method !== "GET") {
                     pushOrderContext(context, "parent action start");
@@ -1156,7 +1156,7 @@ describe("context/middleware", () => {
                 {
                   id: "child",
                   path: "child",
-                  unstable_middleware: [
+                  middleware: [
                     async ({ request, context }, next) => {
                       if (request.method !== "GET") {
                         pushOrderContext(context, "child 1 start - throwing");
@@ -1226,7 +1226,7 @@ describe("context/middleware", () => {
               id: "parent",
               path: "/parent",
               hasErrorBoundary: true,
-              unstable_middleware: [
+              middleware: [
                 async ({ request, context }, next) => {
                   if (request.method !== "GET") {
                     pushOrderContext(context, "parent action start");
@@ -1246,7 +1246,7 @@ describe("context/middleware", () => {
                 {
                   id: "child",
                   path: "child",
-                  unstable_middleware: [
+                  middleware: [
                     async ({ request, context }, next) => {
                       if (request.method !== "GET") {
                         pushOrderContext(context, "child 1 start");
@@ -1317,7 +1317,7 @@ describe("context/middleware", () => {
             },
             {
               path: "/parent",
-              unstable_middleware: [
+              middleware: [
                 async (_, next) => {
                   throw redirect("/target");
                 },
@@ -1352,7 +1352,7 @@ describe("context/middleware", () => {
             },
             {
               path: "/parent",
-              unstable_middleware: [
+              middleware: [
                 async (_, next) => {
                   await next();
                   throw redirect("/target");
@@ -1406,7 +1406,7 @@ describe("context/middleware", () => {
                           id: "d",
                           path: "d",
                           hasErrorBoundary: true,
-                          unstable_middleware: [
+                          middleware: [
                             () => {
                               throw new Error("D ERROR");
                             },
@@ -1417,7 +1417,7 @@ describe("context/middleware", () => {
                           id: "e",
                           path: "e",
                           hasErrorBoundary: true,
-                          unstable_middleware: [
+                          middleware: [
                             () => {
                               throw new Error("E ERROR");
                             },
@@ -1456,7 +1456,7 @@ describe("context/middleware", () => {
   });
 
   describe("middleware - handler.query", () => {
-    function getOrderMiddleware(name: string): unstable_MiddlewareFunction {
+    function getOrderMiddleware(name: string): MiddlewareFunction {
       return async ({ context }, next) => {
         context.set(orderContext, [
           ...context.get(orderContext),
@@ -1481,7 +1481,7 @@ describe("context/middleware", () => {
         {
           id: "parent",
           path: "/parent",
-          unstable_middleware: [
+          middleware: [
             async (_, next) => {
               let res = (await next()) as Response;
               res.headers.set("parent1", "yes");
@@ -1500,7 +1500,7 @@ describe("context/middleware", () => {
             {
               id: "child",
               path: "child",
-              unstable_middleware: [
+              middleware: [
                 async (_, next) => {
                   let res = (await next()) as Response;
                   res.headers.set("child1", "yes");
@@ -1554,7 +1554,7 @@ describe("context/middleware", () => {
           id: "parent",
           path: "/parent",
           lazy: {
-            unstable_middleware: async () => [
+            middleware: async () => [
               async (_, next) => {
                 let res = (await next()) as Response;
                 res.headers.set("parent1", "yes");
@@ -1575,7 +1575,7 @@ describe("context/middleware", () => {
               id: "child",
               path: "child",
               lazy: {
-                unstable_middleware: async () => [
+                middleware: async () => [
                   async (_, next) => {
                     let res = (await next()) as Response;
                     res.headers.set("child1", "yes");
@@ -1629,7 +1629,7 @@ describe("context/middleware", () => {
         {
           id: "parent",
           path: "/parent",
-          unstable_middleware: [
+          middleware: [
             async (_, next) => {
               let res = (await next()) as Response;
               res.headers.set("parent", "yes");
@@ -1670,7 +1670,7 @@ describe("context/middleware", () => {
         {
           id: "parent",
           path: "/parent",
-          unstable_middleware: [
+          middleware: [
             async (_, next) => {
               return new Response("test");
             },
@@ -1697,7 +1697,7 @@ describe("context/middleware", () => {
         {
           id: "parent",
           path: "/parent",
-          unstable_middleware: [
+          middleware: [
             async (_, next) => {
               let result = await next();
               expect(isDataWithResponseInit(result)).toBe(false);
@@ -1731,7 +1731,7 @@ describe("context/middleware", () => {
         {
           id: "parent",
           path: "/parent",
-          unstable_middleware: [
+          middleware: [
             async (_, next) => {
               let result = await next();
               expect(isDataWithResponseInit(result)).toBe(false);
@@ -1780,7 +1780,7 @@ describe("context/middleware", () => {
         {
           id: "parent",
           path: "/parent",
-          unstable_middleware: [
+          middleware: [
             async (_, next) => {
               let result = await next();
               expect(isDataWithResponseInit(result)).toBe(false);
@@ -1815,7 +1815,7 @@ describe("context/middleware", () => {
         {
           id: "parent",
           path: "/parent",
-          unstable_middleware: [
+          middleware: [
             async (_, next) => {
               let result = await next();
               expect(isDataWithResponseInit(result)).toBe(false);
@@ -1866,10 +1866,7 @@ describe("context/middleware", () => {
           {
             id: "parent",
             path: "/parent",
-            unstable_middleware: [
-              getOrderMiddleware("a"),
-              getOrderMiddleware("b"),
-            ],
+            middleware: [getOrderMiddleware("a"), getOrderMiddleware("b")],
             loader({ context }) {
               context.set(orderContext, [
                 ...context.get(orderContext),
@@ -1880,10 +1877,7 @@ describe("context/middleware", () => {
               {
                 id: "child",
                 path: "child",
-                unstable_middleware: [
-                  getOrderMiddleware("c"),
-                  getOrderMiddleware("d"),
-                ],
+                middleware: [getOrderMiddleware("c"), getOrderMiddleware("d")],
                 loader({ context }) {
                   context.set(orderContext, [
                     ...context.get(orderContext),
@@ -1925,10 +1919,7 @@ describe("context/middleware", () => {
           {
             id: "parent",
             path: "/parent",
-            unstable_middleware: [
-              getOrderMiddleware("a"),
-              getOrderMiddleware("b"),
-            ],
+            middleware: [getOrderMiddleware("a"), getOrderMiddleware("b")],
             loader({ context }) {
               context.set(orderContext, [
                 ...context.get(orderContext),
@@ -1939,10 +1930,7 @@ describe("context/middleware", () => {
               {
                 id: "child",
                 path: "child",
-                unstable_middleware: [
-                  getOrderMiddleware("c"),
-                  getOrderMiddleware("d"),
-                ],
+                middleware: [getOrderMiddleware("c"), getOrderMiddleware("d")],
                 action({ context }) {
                   context.set(orderContext, [
                     ...context.get(orderContext),
@@ -1995,7 +1983,7 @@ describe("context/middleware", () => {
           {
             id: "parent",
             path: "/parent",
-            unstable_middleware: [
+            middleware: [
               ({ context }, next) => {
                 context.set(parentContext, "PARENT MIDDLEWARE");
               },
@@ -2007,7 +1995,7 @@ describe("context/middleware", () => {
               {
                 id: "child",
                 path: "child",
-                unstable_middleware: [
+                middleware: [
                   ({ context }, next) => {
                     context.set(childContext, "CHILD MIDDLEWARE");
                   },
@@ -2048,7 +2036,7 @@ describe("context/middleware", () => {
           {
             id: "parent",
             path: "/parent",
-            unstable_middleware: [
+            middleware: [
               async (_, next) => {
                 await next();
                 await next();
@@ -2085,7 +2073,7 @@ describe("context/middleware", () => {
           {
             id: "parent",
             path: "/parent",
-            unstable_middleware: [
+            middleware: [
               async ({ context }, next) => {
                 pushOrderContext(context, "PARENT 1 DOWN");
                 await next();
@@ -2102,7 +2090,7 @@ describe("context/middleware", () => {
               {
                 id: "child",
                 path: "child",
-                unstable_middleware: [
+                middleware: [
                   async ({ context }, next) => {
                     pushOrderContext(context, "CHILD DOWN");
                     await next();
@@ -2144,7 +2132,7 @@ describe("context/middleware", () => {
           {
             id: "parent",
             path: "/parent",
-            unstable_middleware: [
+            middleware: [
               async ({ context }, next) => {
                 pushOrderContext(context, "PARENT DOWN");
                 await next();
@@ -2158,7 +2146,7 @@ describe("context/middleware", () => {
               {
                 id: "child",
                 path: "child",
-                unstable_middleware: [
+                middleware: [
                   async ({ context }, next) => {
                     pushOrderContext(context, "CHILD DOWN");
                     await next();
@@ -2203,7 +2191,7 @@ describe("context/middleware", () => {
           {
             id: "parent",
             path: "/parent",
-            unstable_middleware: [
+            middleware: [
               async ({ request, context }, next) => {
                 pushOrderContext(context, "parent start");
                 let res = await next();
@@ -2219,7 +2207,7 @@ describe("context/middleware", () => {
                 id: "child",
                 path: "child",
                 hasErrorBoundary: true,
-                unstable_middleware: [
+                middleware: [
                   async ({ request, context }, next) => {
                     pushOrderContext(context, "child 1 start - throwing");
                     throw new Error("child 1 error");
@@ -2274,7 +2262,7 @@ describe("context/middleware", () => {
           {
             id: "parent",
             path: "/parent",
-            unstable_middleware: [
+            middleware: [
               async ({ request, context }, next) => {
                 pushOrderContext(context, "parent start");
                 let res = await next();
@@ -2290,7 +2278,7 @@ describe("context/middleware", () => {
                 id: "child",
                 path: "child",
                 hasErrorBoundary: true,
-                unstable_middleware: [
+                middleware: [
                   async ({ request, context }, next) => {
                     pushOrderContext(context, "child 1 start");
                     await next();
@@ -2351,7 +2339,7 @@ describe("context/middleware", () => {
             id: "parent",
             path: "/parent",
             hasErrorBoundary: true,
-            unstable_middleware: [
+            middleware: [
               async ({ request, context }, next) => {
                 pushOrderContext(context, "parent start");
                 let res = await next();
@@ -2366,7 +2354,7 @@ describe("context/middleware", () => {
               {
                 id: "child",
                 path: "child",
-                unstable_middleware: [
+                middleware: [
                   async ({ request, context }, next) => {
                     pushOrderContext(context, "child 1 start - throwing");
                     throw new Error("child 1 error");
@@ -2421,7 +2409,7 @@ describe("context/middleware", () => {
             id: "parent",
             path: "/parent",
             hasErrorBoundary: true,
-            unstable_middleware: [
+            middleware: [
               async ({ request, context }, next) => {
                 pushOrderContext(context, "parent start");
                 let res = await next();
@@ -2436,7 +2424,7 @@ describe("context/middleware", () => {
               {
                 id: "child",
                 path: "child",
-                unstable_middleware: [
+                middleware: [
                   async ({ request, context }, next) => {
                     pushOrderContext(context, "child 1 start");
                     let res = await next();
@@ -2493,7 +2481,7 @@ describe("context/middleware", () => {
         let handler = createStaticHandler([
           {
             path: "/",
-            unstable_middleware: [
+            middleware: [
               async (_, next) => {
                 throw new Response("Error", { status: 401 });
               },
@@ -2524,7 +2512,7 @@ describe("context/middleware", () => {
           },
           {
             path: "/parent",
-            unstable_middleware: [
+            middleware: [
               async (_, next) => {
                 throw redirect("/target");
               },
@@ -2555,7 +2543,7 @@ describe("context/middleware", () => {
           },
           {
             path: "/parent",
-            unstable_middleware: [
+            middleware: [
               async (_, next) => {
                 await next();
                 throw redirect("/target");
@@ -2583,7 +2571,7 @@ describe("context/middleware", () => {
   });
 
   describe("middleware - handler.queryRoute", () => {
-    function getOrderMiddleware(name: string): unstable_MiddlewareFunction {
+    function getOrderMiddleware(name: string): MiddlewareFunction {
       return async ({ context }, next) => {
         context.set(orderContext, [
           ...context.get(orderContext),
@@ -2608,7 +2596,7 @@ describe("context/middleware", () => {
         {
           id: "parent",
           path: "/parent",
-          unstable_middleware: [
+          middleware: [
             async ({ context }, next) => {
               let res = (await next()) as Response;
               res.headers.set("parent1", "yes");
@@ -2627,7 +2615,7 @@ describe("context/middleware", () => {
             {
               id: "child",
               path: "child",
-              unstable_middleware: [
+              middleware: [
                 async ({ context }, next) => {
                   let res = (await next()) as Response;
                   res.headers.set("child1", "yes");
@@ -2668,7 +2656,7 @@ describe("context/middleware", () => {
           id: "parent",
           path: "/parent",
           lazy: {
-            unstable_middleware: async () => [
+            middleware: async () => [
               async ({ context }, next) => {
                 let res = (await next()) as Response;
                 res.headers.set("parent1", "yes");
@@ -2689,7 +2677,7 @@ describe("context/middleware", () => {
               id: "child",
               path: "child",
               lazy: {
-                unstable_middleware: async () => [
+                middleware: async () => [
                   async ({ context }, next) => {
                     let res = (await next()) as Response;
                     res.headers.set("child1", "yes");
@@ -2730,7 +2718,7 @@ describe("context/middleware", () => {
         {
           id: "parent",
           path: "/parent",
-          unstable_middleware: [
+          middleware: [
             async (_, next) => {
               let res = (await next()) as Response;
               res.headers.set("parent", "yes");
@@ -2759,7 +2747,7 @@ describe("context/middleware", () => {
         {
           id: "parent",
           path: "/parent",
-          unstable_middleware: [
+          middleware: [
             async (_, next) => {
               return new Response("test");
             },
@@ -2785,7 +2773,7 @@ describe("context/middleware", () => {
         {
           id: "parent",
           path: "/parent",
-          unstable_middleware: [
+          middleware: [
             async (_, next) => {
               let result = await next();
               expect(isDataWithResponseInit(result)).toBe(false);
@@ -2818,7 +2806,7 @@ describe("context/middleware", () => {
         {
           id: "parent",
           path: "/parent",
-          unstable_middleware: [
+          middleware: [
             async (_, next) => {
               let result = await next();
               expect(isDataWithResponseInit(result)).toBe(false);
@@ -2851,7 +2839,7 @@ describe("context/middleware", () => {
         {
           id: "parent",
           path: "/parent",
-          unstable_middleware: [
+          middleware: [
             async (_, next) => {
               let result = await next();
               expect(isDataWithResponseInit(result)).toBe(false);
@@ -2885,7 +2873,7 @@ describe("context/middleware", () => {
         {
           id: "parent",
           path: "/parent",
-          unstable_middleware: [
+          middleware: [
             async (_, next) => {
               let result = await next();
               expect(isDataWithResponseInit(result)).toBe(false);
@@ -2920,10 +2908,7 @@ describe("context/middleware", () => {
           {
             id: "parent",
             path: "/parent",
-            unstable_middleware: [
-              getOrderMiddleware("a"),
-              getOrderMiddleware("b"),
-            ],
+            middleware: [getOrderMiddleware("a"), getOrderMiddleware("b")],
             loader({ context }) {
               context.set(orderContext, [
                 ...context.get(orderContext),
@@ -2934,10 +2919,7 @@ describe("context/middleware", () => {
               {
                 id: "child",
                 path: "child",
-                unstable_middleware: [
-                  getOrderMiddleware("c"),
-                  getOrderMiddleware("d"),
-                ],
+                middleware: [getOrderMiddleware("c"), getOrderMiddleware("d")],
                 loader({ context }) {
                   context.set(orderContext, [
                     ...context.get(orderContext),
@@ -2978,10 +2960,7 @@ describe("context/middleware", () => {
           {
             id: "parent",
             path: "/parent",
-            unstable_middleware: [
-              getOrderMiddleware("a"),
-              getOrderMiddleware("b"),
-            ],
+            middleware: [getOrderMiddleware("a"), getOrderMiddleware("b")],
             loader({ context }) {
               context.set(orderContext, [
                 ...context.get(orderContext),
@@ -2992,10 +2971,7 @@ describe("context/middleware", () => {
               {
                 id: "child",
                 path: "child",
-                unstable_middleware: [
-                  getOrderMiddleware("c"),
-                  getOrderMiddleware("d"),
-                ],
+                middleware: [getOrderMiddleware("c"), getOrderMiddleware("d")],
                 action({ context }) {
                   context.set(orderContext, [
                     ...context.get(orderContext),
@@ -3046,7 +3022,7 @@ describe("context/middleware", () => {
           {
             id: "parent",
             path: "/parent",
-            unstable_middleware: [
+            middleware: [
               ({ context }, next) => {
                 context.set(parentContext, "PARENT MIDDLEWARE");
               },
@@ -3058,7 +3034,7 @@ describe("context/middleware", () => {
               {
                 id: "child",
                 path: "child",
-                unstable_middleware: [
+                middleware: [
                   ({ context }, next) => {
                     context.set(childContext, "CHILD MIDDLEWARE");
                   },
@@ -3091,7 +3067,7 @@ describe("context/middleware", () => {
           {
             id: "parent",
             path: "/parent",
-            unstable_middleware: [
+            middleware: [
               async (_, next) => {
                 await next();
                 await next();
@@ -3121,7 +3097,7 @@ describe("context/middleware", () => {
           {
             id: "parent",
             path: "/parent",
-            unstable_middleware: [
+            middleware: [
               async ({ context }, next) => {
                 context.set(parentContext, "PARENT 1");
               },
@@ -3136,7 +3112,7 @@ describe("context/middleware", () => {
               {
                 id: "child",
                 path: "child",
-                unstable_middleware: [
+                middleware: [
                   async ({ context }, next) => {
                     context.set(childContext, "CHILD 1");
                     return next();
@@ -3171,7 +3147,7 @@ describe("context/middleware", () => {
           {
             id: "parent",
             path: "/parent",
-            unstable_middleware: [
+            middleware: [
               async ({ context }, next) => {
                 context.set(parentContext, "PARENT DOWN");
                 let res = await next();
@@ -3186,7 +3162,7 @@ describe("context/middleware", () => {
               {
                 id: "child",
                 path: "child",
-                unstable_middleware: [
+                middleware: [
                   async ({ context }, next) => {
                     context.set(childContext, "CHILD DOWN");
                     await next();
@@ -3222,7 +3198,7 @@ describe("context/middleware", () => {
           {
             id: "parent",
             path: "/parent",
-            unstable_middleware: [
+            middleware: [
               async ({ request, context }, next) => {
                 context.set(orderContext, [
                   ...context.get(orderContext),
@@ -3244,7 +3220,7 @@ describe("context/middleware", () => {
                 id: "child",
                 path: "child",
                 hasErrorBoundary: true,
-                unstable_middleware: [
+                middleware: [
                   async ({ request, context }, next) => {
                     context.set(orderContext, [
                       ...context.get(orderContext),
@@ -3301,7 +3277,7 @@ describe("context/middleware", () => {
           {
             id: "parent",
             path: "/parent",
-            unstable_middleware: [
+            middleware: [
               async ({ request, context }, next) => {
                 context.set(orderContext, [
                   ...context.get(orderContext),
@@ -3323,7 +3299,7 @@ describe("context/middleware", () => {
                 id: "child",
                 path: "child",
                 hasErrorBoundary: true,
-                unstable_middleware: [
+                middleware: [
                   async ({ request, context }, next) => {
                     context.set(orderContext, [
                       ...context.get(orderContext),
@@ -3389,7 +3365,7 @@ describe("context/middleware", () => {
             id: "parent",
             path: "/parent",
             hasErrorBoundary: true,
-            unstable_middleware: [
+            middleware: [
               async ({ request, context }, next) => {
                 context.set(orderContext, [
                   ...context.get(orderContext),
@@ -3410,7 +3386,7 @@ describe("context/middleware", () => {
               {
                 id: "child",
                 path: "child",
-                unstable_middleware: [
+                middleware: [
                   async ({ request, context }, next) => {
                     context.set(orderContext, [
                       ...context.get(orderContext),
@@ -3469,7 +3445,7 @@ describe("context/middleware", () => {
             id: "parent",
             path: "/parent",
             hasErrorBoundary: true,
-            unstable_middleware: [
+            middleware: [
               async ({ request, context }, next) => {
                 context.set(orderContext, [
                   ...context.get(orderContext),
@@ -3490,7 +3466,7 @@ describe("context/middleware", () => {
               {
                 id: "child",
                 path: "child",
-                unstable_middleware: [
+                middleware: [
                   async ({ request, context }, next) => {
                     context.set(orderContext, [
                       ...context.get(orderContext),
@@ -3554,7 +3530,7 @@ describe("context/middleware", () => {
           },
           {
             path: "/parent",
-            unstable_middleware: [
+            middleware: [
               async (_, next) => {
                 throw redirect("/target");
               },
@@ -3584,7 +3560,7 @@ describe("context/middleware", () => {
           },
           {
             path: "/parent",
-            unstable_middleware: [
+            middleware: [
               async (_, next) => {
                 await next();
                 throw redirect("/target");
diff --git a/packages/react-router/__tests__/router/utils/data-router-setup.ts b/packages/react-router/__tests__/router/utils/data-router-setup.ts
index 0cbc319ffb..0a2dc3a9cc 100644
--- a/packages/react-router/__tests__/router/utils/data-router-setup.ts
+++ b/packages/react-router/__tests__/router/utils/data-router-setup.ts
@@ -232,7 +232,7 @@ export function setup({
   function enhanceRoutes(_routes: TestRouteObject[]) {
     return _routes.map((r) => {
       let enhancedRoute: AgnosticDataRouteObject = {
-        unstable_middleware: undefined,
+        middleware: undefined,
         ...r,
         loader: undefined,
         action: undefined,
diff --git a/packages/react-router/__tests__/server-runtime/server-test.ts b/packages/react-router/__tests__/server-runtime/server-test.ts
index 2235b2d020..2f917a4db6 100644
--- a/packages/react-router/__tests__/server-runtime/server-test.ts
+++ b/packages/react-router/__tests__/server-runtime/server-test.ts
@@ -158,7 +158,7 @@ describe("server", () => {
         },
         {
           future: {
-            unstable_middleware: true,
+            middleware: true,
           },
           handleError: handleErrorSpy,
           handleDocumentRequest(request) {
diff --git a/packages/react-router/__tests__/server-runtime/utils.ts b/packages/react-router/__tests__/server-runtime/utils.ts
index 6e4fa4dce5..2791f45750 100644
--- a/packages/react-router/__tests__/server-runtime/utils.ts
+++ b/packages/react-router/__tests__/server-runtime/utils.ts
@@ -35,7 +35,7 @@ export function mockServerBuild(
   return {
     ssr: true,
     future: {
-      unstable_middleware: false,
+      middleware: false,
       unstable_subResourceIntegrity: false,
       ...opts.future,
     },
diff --git a/packages/react-router/__tests__/utils/framework.ts b/packages/react-router/__tests__/utils/framework.ts
index 72762d49d7..8ce4bc2ec1 100644
--- a/packages/react-router/__tests__/utils/framework.ts
+++ b/packages/react-router/__tests__/utils/framework.ts
@@ -30,7 +30,7 @@ export function mockFrameworkContext(
       version: "",
     },
     future: {
-      unstable_middleware: false,
+      middleware: false,
       unstable_subResourceIntegrity: false,
     },
     ssr: true,
diff --git a/packages/react-router/index-react-server.ts b/packages/react-router/index-react-server.ts
index 0e4bf1230d..a36f0f5ddc 100644
--- a/packages/react-router/index-react-server.ts
+++ b/packages/react-router/index-react-server.ts
@@ -62,7 +62,7 @@ export { createCookieSessionStorage } from "./lib/server-runtime/sessions/cookie
 export { createMemorySessionStorage } from "./lib/server-runtime/sessions/memoryStorage";
 
 export type {
-  unstable_MiddlewareFunction,
+  MiddlewareFunction,
   unstable_MiddlewareNextFunction,
   unstable_RouterContext,
 } from "./lib/router/utils";
diff --git a/packages/react-router/index.ts b/packages/react-router/index.ts
index b873d7a3d3..509e1dfe3c 100644
--- a/packages/react-router/index.ts
+++ b/packages/react-router/index.ts
@@ -42,7 +42,7 @@ export type {
   LazyRouteFunction,
   LoaderFunction,
   LoaderFunctionArgs,
-  unstable_MiddlewareFunction,
+  MiddlewareFunction,
   ParamParseKey,
   Params,
   PathMatch,
diff --git a/packages/react-router/lib/context.ts b/packages/react-router/lib/context.ts
index 5c1e09c425..98c110f2eb 100644
--- a/packages/react-router/lib/context.ts
+++ b/packages/react-router/lib/context.ts
@@ -27,7 +27,7 @@ export interface IndexRouteObject {
   caseSensitive?: AgnosticIndexRouteObject["caseSensitive"];
   path?: AgnosticIndexRouteObject["path"];
   id?: AgnosticIndexRouteObject["id"];
-  unstable_middleware?: AgnosticIndexRouteObject["unstable_middleware"];
+  middleware?: AgnosticIndexRouteObject["middleware"];
   loader?: AgnosticIndexRouteObject["loader"];
   action?: AgnosticIndexRouteObject["action"];
   hasErrorBoundary?: AgnosticIndexRouteObject["hasErrorBoundary"];
@@ -48,7 +48,7 @@ export interface NonIndexRouteObject {
   caseSensitive?: AgnosticNonIndexRouteObject["caseSensitive"];
   path?: AgnosticNonIndexRouteObject["path"];
   id?: AgnosticNonIndexRouteObject["id"];
-  unstable_middleware?: AgnosticNonIndexRouteObject["unstable_middleware"];
+  middleware?: AgnosticNonIndexRouteObject["middleware"];
   loader?: AgnosticNonIndexRouteObject["loader"];
   action?: AgnosticNonIndexRouteObject["action"];
   hasErrorBoundary?: AgnosticNonIndexRouteObject["hasErrorBoundary"];
diff --git a/packages/react-router/lib/dom-export/hydrated-router.tsx b/packages/react-router/lib/dom-export/hydrated-router.tsx
index f7b1df4dbf..7341b96d81 100644
--- a/packages/react-router/lib/dom-export/hydrated-router.tsx
+++ b/packages/react-router/lib/dom-export/hydrated-router.tsx
@@ -174,7 +174,7 @@ function createHydratedRouter({
     hydrationRouteProperties,
     mapRouteProperties,
     future: {
-      unstable_middleware: ssrInfo.context.future.unstable_middleware,
+      middleware: ssrInfo.context.future.middleware,
     },
     dataStrategy: getTurboStreamSingleFetchDataStrategy(
       () => router,
diff --git a/packages/react-router/lib/dom/server.tsx b/packages/react-router/lib/dom/server.tsx
index b294433999..b1823ff041 100644
--- a/packages/react-router/lib/dom/server.tsx
+++ b/packages/react-router/lib/dom/server.tsx
@@ -419,7 +419,7 @@ export function createStaticRouter(
     },
     get future() {
       return {
-        unstable_middleware: false,
+        middleware: false,
         ...opts?.future,
       };
     },
diff --git a/packages/react-router/lib/dom/ssr/entry.ts b/packages/react-router/lib/dom/ssr/entry.ts
index 063729cd63..417d35a918 100644
--- a/packages/react-router/lib/dom/ssr/entry.ts
+++ b/packages/react-router/lib/dom/ssr/entry.ts
@@ -45,7 +45,7 @@ export interface EntryContext extends FrameworkContextObject {
 
 export interface FutureConfig {
   unstable_subResourceIntegrity: boolean;
-  unstable_middleware: boolean;
+  middleware: boolean;
 }
 
 export type CriticalCss = string | { rel: "stylesheet"; href: string };
diff --git a/packages/react-router/lib/dom/ssr/routeModules.ts b/packages/react-router/lib/dom/ssr/routeModules.ts
index 76adff9e56..c06e8b617c 100644
--- a/packages/react-router/lib/dom/ssr/routeModules.ts
+++ b/packages/react-router/lib/dom/ssr/routeModules.ts
@@ -5,7 +5,7 @@ import type {
   ActionFunctionArgs,
   LoaderFunction,
   LoaderFunctionArgs,
-  unstable_MiddlewareFunction,
+  MiddlewareFunction,
   Params,
   ShouldRevalidateFunction,
   DataStrategyResult,
@@ -26,9 +26,7 @@ export interface RouteModules {
 export interface RouteModule {
   clientAction?: ClientActionFunction;
   clientLoader?: ClientLoaderFunction;
-  clientMiddleware?: unstable_MiddlewareFunction<
-    Record<string, DataStrategyResult>
-  >[];
+  clientMiddleware?: MiddlewareFunction<Record<string, DataStrategyResult>>[];
   ErrorBoundary?: ErrorBoundaryComponent;
   HydrateFallback?: HydrateFallbackComponent;
   Layout?: LayoutComponent;
@@ -46,7 +44,7 @@ export interface ServerRouteModule extends RouteModule {
   action?: ActionFunction;
   headers?: HeadersFunction | { [name: string]: string };
   loader?: LoaderFunction;
-  unstable_middleware?: unstable_MiddlewareFunction<Response>[];
+  middleware?: MiddlewareFunction<Response>[];
 }
 
 /**
diff --git a/packages/react-router/lib/dom/ssr/routes-test-stub.tsx b/packages/react-router/lib/dom/ssr/routes-test-stub.tsx
index 373349ccda..355ee763e1 100644
--- a/packages/react-router/lib/dom/ssr/routes-test-stub.tsx
+++ b/packages/react-router/lib/dom/ssr/routes-test-stub.tsx
@@ -133,7 +133,7 @@ export function createRoutesStub(
         future: {
           unstable_subResourceIntegrity:
             future?.unstable_subResourceIntegrity === true,
-          unstable_middleware: future?.unstable_middleware === true,
+          middleware: future?.middleware === true,
         },
         manifest: {
           routes: {},
@@ -155,7 +155,7 @@ export function createRoutesStub(
         convertRoutesToDataRoutes(routes, (r) => r),
         _context !== undefined
           ? _context
-          : future?.unstable_middleware
+          : future?.middleware
             ? new unstable_RouterContextProvider()
             : {},
         frameworkContextRef.current.manifest,
diff --git a/packages/react-router/lib/dom/ssr/routes.tsx b/packages/react-router/lib/dom/ssr/routes.tsx
index eacfa575e0..7c1f773a6d 100644
--- a/packages/react-router/lib/dom/ssr/routes.tsx
+++ b/packages/react-router/lib/dom/ssr/routes.tsx
@@ -312,7 +312,7 @@ export function createClientRoutes(
       Object.assign(dataRoute, {
         ...dataRoute,
         ...getRouteComponents(route, routeModule, isSpaMode),
-        unstable_middleware: routeModule.clientMiddleware,
+        middleware: routeModule.clientMiddleware,
         handle: routeModule.handle,
         shouldRevalidate: getShouldRevalidateFunction(
           dataRoute.path,
@@ -510,7 +510,7 @@ export function createClientRoutes(
                 });
             }
           : undefined,
-        unstable_middleware: route.hasClientMiddleware
+        middleware: route.hasClientMiddleware
           ? async () => {
               let { clientMiddleware } = route.clientMiddlewareModule
                 ? await import(
diff --git a/packages/react-router/lib/router/router.ts b/packages/react-router/lib/router/router.ts
index f5525b7a6c..102b8c03c0 100644
--- a/packages/react-router/lib/router/router.ts
+++ b/packages/react-router/lib/router/router.ts
@@ -38,7 +38,7 @@ import type {
   ActionFunctionArgs,
   LoaderFunction,
   ActionFunction,
-  unstable_MiddlewareFunction,
+  MiddlewareFunction,
   unstable_MiddlewareNextFunction,
   ErrorResponse,
 } from "./utils";
@@ -385,7 +385,7 @@ export type HydrationState = Partial<
  * Future flags to toggle new feature behavior
  */
 export interface FutureConfig {
-  unstable_middleware: boolean;
+  middleware: boolean;
 }
 
 /**
@@ -874,7 +874,7 @@ export function createRouter(init: RouterInit): Router {
 
   // Config driven behavior flags
   let future: FutureConfig = {
-    unstable_middleware: false,
+    middleware: false,
     ...init.future,
   };
   // Cleanup function for history
@@ -2081,7 +2081,7 @@ export function createRouter(init: RouterInit): Router {
     if (
       !init.dataStrategy &&
       !dsMatches.some((m) => m.shouldLoad) &&
-      !dsMatches.some((m) => m.route.unstable_middleware) &&
+      !dsMatches.some((m) => m.route.middleware) &&
       revalidatingFetchers.length === 0
     ) {
       let updatedFetchers = markFetchRedirectsDone();
@@ -5388,12 +5388,12 @@ function loadLazyMiddlewareForMatches(
 ): Promise<void[]> | void {
   let promises: Promise<void>[] = matches
     .map(({ route }) => {
-      if (typeof route.lazy !== "object" || !route.lazy.unstable_middleware) {
+      if (typeof route.lazy !== "object" || !route.lazy.middleware) {
         return undefined;
       }
 
       return loadLazyRouteProperty({
-        key: "unstable_middleware",
+        key: "middleware",
         route,
         manifest,
         mapRouteProperties,
@@ -5423,7 +5423,7 @@ async function defaultDataStrategyWithMiddleware(
   args: DataStrategyFunctionArgs<unstable_RouterContextProvider>,
 ): ReturnType<DataStrategyFunction<unknown>> {
   // Short circuit all the middleware logic if we have no middlewares
-  if (!args.matches.some((m) => m.route.unstable_middleware)) {
+  if (!args.matches.some((m) => m.route.middleware)) {
     return defaultDataStrategy(args);
   }
 
@@ -5540,10 +5540,8 @@ async function runMiddlewarePipeline<Result>(
 ): Promise<Result> {
   let { matches, request, params, context } = args;
   let tuples = matches.flatMap((m) =>
-    m.route.unstable_middleware
-      ? m.route.unstable_middleware.map((fn) => [m.route.id, fn])
-      : [],
-  ) as [string, unstable_MiddlewareFunction<Result>][];
+    m.route.middleware ? m.route.middleware.map((fn) => [m.route.id, fn]) : [],
+  ) as [string, MiddlewareFunction<Result>][];
 
   let result = await callRouteMiddleware(
     { request, params, context },
@@ -5560,7 +5558,7 @@ async function callRouteMiddleware<Result>(
   args:
     | LoaderFunctionArgs<unstable_RouterContextProvider>
     | ActionFunctionArgs<unstable_RouterContextProvider>,
-  middlewares: [string, unstable_MiddlewareFunction<Result>][],
+  middlewares: [string, MiddlewareFunction<Result>][],
   handler: () => Promise<Result>,
   processResult: (r: Result) => Result,
   isResult: (v: unknown) => v is Result,
@@ -5643,7 +5641,7 @@ function getDataStrategyMatchLazyPromises(
   lazyRoutePropertiesToSkip: string[],
 ): DataStrategyMatch["_lazyPromises"] {
   let lazyMiddlewarePromise = loadLazyRouteProperty({
-    key: "unstable_middleware",
+    key: "middleware",
     route: match.route,
     manifest,
     mapRouteProperties,
diff --git a/packages/react-router/lib/router/utils.ts b/packages/react-router/lib/router/utils.ts
index fcd441e90b..fef0382a05 100644
--- a/packages/react-router/lib/router/utils.ts
+++ b/packages/react-router/lib/router/utils.ts
@@ -308,7 +308,7 @@ export interface unstable_MiddlewareNextFunction<Result = unknown> {
  * a `next` function as the second parameter which will call downstream handlers
  * and then complete middlewares from the bottom-up
  */
-export type unstable_MiddlewareFunction<Result = unknown> = (
+export type MiddlewareFunction<Result = unknown> = (
   args: DataFunctionArgs<Readonly<unstable_RouterContextProvider>>,
   next: unstable_MiddlewareNextFunction<Result>,
 ) => MaybePromise<Result | void>;
@@ -577,7 +577,7 @@ export function isUnsupportedLazyRouteObjectKey(
  */
 type UnsupportedLazyRouteFunctionKey =
   | UnsupportedLazyRouteObjectKey
-  | "unstable_middleware";
+  | "middleware";
 const unsupportedLazyRouteFunctionKeys =
   new Set<UnsupportedLazyRouteFunctionKey>([
     "lazy",
@@ -585,7 +585,7 @@ const unsupportedLazyRouteFunctionKeys =
     "path",
     "id",
     "index",
-    "unstable_middleware",
+    "middleware",
     "children",
   ]);
 export function isUnsupportedLazyRouteFunctionKey(
@@ -628,7 +628,7 @@ type AgnosticBaseRouteObject = {
   caseSensitive?: boolean;
   path?: string;
   id?: string;
-  unstable_middleware?: unstable_MiddlewareFunction[];
+  middleware?: MiddlewareFunction[];
   loader?: LoaderFunction | boolean;
   action?: ActionFunction | boolean;
   hasErrorBoundary?: boolean;
diff --git a/packages/react-router/lib/rsc/browser.tsx b/packages/react-router/lib/rsc/browser.tsx
index f7ebc86c9a..2dd4bbf8eb 100644
--- a/packages/react-router/lib/rsc/browser.tsx
+++ b/packages/react-router/lib/rsc/browser.tsx
@@ -796,7 +796,7 @@ export function RSCHydratedRouter({
     future: {
       // These flags have no runtime impact so can always be false.  If we add
       // flags that drive runtime behavior they'll need to be proxied through.
-      unstable_middleware: false,
+      middleware: false,
       unstable_subResourceIntegrity: false,
     },
     isSpaMode: false,
diff --git a/packages/react-router/lib/rsc/server.ssr.tsx b/packages/react-router/lib/rsc/server.ssr.tsx
index f7a20738e4..83550a10e5 100644
--- a/packages/react-router/lib/rsc/server.ssr.tsx
+++ b/packages/react-router/lib/rsc/server.ssr.tsx
@@ -316,7 +316,7 @@ export function RSCStaticRouter({ getPayload }: RSCStaticRouterProps) {
     future: {
       // These flags have no runtime impact so can always be false.  If we add
       // flags that drive runtime behavior they'll need to be proxied through.
-      unstable_middleware: false,
+      middleware: false,
       unstable_subResourceIntegrity: false,
     },
     isSpaMode: false,
diff --git a/packages/react-router/lib/server-runtime/routes.ts b/packages/react-router/lib/server-runtime/routes.ts
index 20a71cda3f..a445101e44 100644
--- a/packages/react-router/lib/server-runtime/routes.ts
+++ b/packages/react-router/lib/server-runtime/routes.ts
@@ -3,7 +3,7 @@ import type {
   LoaderFunctionArgs as RRLoaderFunctionArgs,
   ActionFunctionArgs as RRActionFunctionArgs,
   RouteManifest,
-  unstable_MiddlewareFunction,
+  MiddlewareFunction,
 } from "../router/utils";
 import { redirectDocument, replace, redirect } from "../router/utils";
 import { callRouteHandler } from "./data";
@@ -78,8 +78,8 @@ export function createStaticHandlerDataRoutes(
         route.id === "root" || route.module.ErrorBoundary != null,
       id: route.id,
       path: route.path,
-      unstable_middleware: route.module.unstable_middleware as unknown as
-        | unstable_MiddlewareFunction[]
+      middleware: route.module.middleware as unknown as
+        | MiddlewareFunction[]
         | undefined,
       // Need to use RR's version in the param typed here to permit the optional
       // context even though we know it'll always be provided in remix
diff --git a/packages/react-router/lib/server-runtime/server.ts b/packages/react-router/lib/server-runtime/server.ts
index 728467525e..ab981a270e 100644
--- a/packages/react-router/lib/server-runtime/server.ts
+++ b/packages/react-router/lib/server-runtime/server.ts
@@ -118,7 +118,7 @@ export const createRequestHandler: CreateRequestHandlerFunction = (
       });
     };
 
-    if (_build.future.unstable_middleware) {
+    if (_build.future.middleware) {
       if (
         initialContext &&
         !(initialContext instanceof unstable_RouterContextProvider)
@@ -445,7 +445,7 @@ async function handleDocumentRequest(
   try {
     let result = await staticHandler.query(request, {
       requestContext: loadContext,
-      unstable_generateMiddlewareResponse: build.future.unstable_middleware
+      unstable_generateMiddlewareResponse: build.future.middleware
         ? async (query) => {
             try {
               let innerResult = await query(request);
@@ -626,7 +626,7 @@ async function handleResourceRequest(
     let result = await staticHandler.queryRoute(request, {
       routeId,
       requestContext: loadContext,
-      unstable_generateMiddlewareResponse: build.future.unstable_middleware
+      unstable_generateMiddlewareResponse: build.future.middleware
         ? async (queryRoute) => {
             try {
               let innerResult = await queryRoute(request);
diff --git a/packages/react-router/lib/server-runtime/single-fetch.ts b/packages/react-router/lib/server-runtime/single-fetch.ts
index 7236a061e7..0db720f31f 100644
--- a/packages/react-router/lib/server-runtime/single-fetch.ts
+++ b/packages/react-router/lib/server-runtime/single-fetch.ts
@@ -54,7 +54,7 @@ export async function singleFetchAction(
       requestContext: loadContext,
       skipLoaderErrorBubbling: true,
       skipRevalidation: true,
-      unstable_generateMiddlewareResponse: build.future.unstable_middleware
+      unstable_generateMiddlewareResponse: build.future.middleware
         ? async (query) => {
             try {
               let innerResult = await query(handlerRequest);
@@ -144,7 +144,7 @@ export async function singleFetchLoaders(
       requestContext: loadContext,
       filterMatchesToLoad: (m) => !loadRouteIds || loadRouteIds.has(m.route.id),
       skipLoaderErrorBubbling: true,
-      unstable_generateMiddlewareResponse: build.future.unstable_middleware
+      unstable_generateMiddlewareResponse: build.future.middleware
         ? async (query) => {
             try {
               let innerResult = await query(handlerRequest);
diff --git a/packages/react-router/lib/types/future.ts b/packages/react-router/lib/types/future.ts
index a40da7f826..57e9e879fe 100644
--- a/packages/react-router/lib/types/future.ts
+++ b/packages/react-router/lib/types/future.ts
@@ -6,4 +6,4 @@ export interface Future {}
 
 // prettier-ignore
 export type MiddlewareEnabled =
-  Future extends { unstable_middleware: infer T extends boolean; } ? T : false
+  Future extends { middleware: infer T extends boolean; } ? T : false
diff --git a/packages/react-router/lib/types/route-data.ts b/packages/react-router/lib/types/route-data.ts
index a5a0e1cf23..9ea474b152 100644
--- a/packages/react-router/lib/types/route-data.ts
+++ b/packages/react-router/lib/types/route-data.ts
@@ -93,9 +93,9 @@ export type ClientDataFunctionArgs<Params> = {
    **/
   params: Params;
   /**
-   * When `future.unstable_middleware` is not enabled, this is undefined.
+   * When `future.middleware` is not enabled, this is undefined.
    *
-   * When `future.unstable_middleware` is enabled, this is an instance of
+   * When `future.middleware` is enabled, this is an instance of
    * `unstable_RouterContextProvider` and can be used to access context values
    * from your route middlewares.  You may pass in initial context values in your
    * `<HydratedRouter unstable_getContext>` prop
@@ -122,12 +122,12 @@ export type ServerDataFunctionArgs<Params> = {
    **/
   params: Params;
   /**
-   * Without `future.unstable_middleware` enabled, this is the context passed in
+   * Without `future.middleware` enabled, this is the context passed in
    * to your server adapter's `getLoadContext` function. It's a way to bridge the
    * gap between the adapter's request/response API with your React Router app.
    * It is only applicable if you are using a custom server adapter.
    *
-   * With `future.unstable_middleware` enabled, this is an instance of
+   * With `future.middleware` enabled, this is an instance of
    * `unstable_RouterContextProvider` and can be used for type-safe access to
    * context value set in your route middlewares.  If you are using a custom
    * server adapter, you may provide an initial set of context values from your
diff --git a/packages/react-router/lib/types/route-module-annotations.ts b/packages/react-router/lib/types/route-module-annotations.ts
index 3910bb5bd9..3683933eca 100644
--- a/packages/react-router/lib/types/route-module-annotations.ts
+++ b/packages/react-router/lib/types/route-module-annotations.ts
@@ -202,7 +202,7 @@ export type GetAnnotations<Info extends RouteInfo> = {
   HeadersFunction: (args: HeadersArgs) => Headers | HeadersInit;
 
   // middleware
-  unstable_MiddlewareFunction: CreateServerMiddlewareFunction<Info>;
+  MiddlewareFunction: CreateServerMiddlewareFunction<Info>;
 
   // clientMiddleware
   ClientMiddlewareFunction: CreateClientMiddlewareFunction<Info>;
diff --git a/playground/middleware/app/root.tsx b/playground/middleware/app/root.tsx
index 44835edba3..a7a44316dd 100644
--- a/playground/middleware/app/root.tsx
+++ b/playground/middleware/app/root.tsx
@@ -9,7 +9,7 @@ import {
 import type { Route } from "./+types/root";
 import { rootContext } from "./contexts";
 
-export const unstable_middleware: Route.unstable_MiddlewareFunction[] = [
+export const middleware: Route.MiddlewareFunction[] = [
   async ({ context }, next) => {
     console.log("start root middleware");
     context.set(rootContext, "ROOT");
diff --git a/playground/middleware/app/routes/server.a.b.tsx b/playground/middleware/app/routes/server.a.b.tsx
index 6cfc823290..4fe56f2bfc 100644
--- a/playground/middleware/app/routes/server.a.b.tsx
+++ b/playground/middleware/app/routes/server.a.b.tsx
@@ -2,7 +2,7 @@ import { Outlet, unstable_createContext } from "react-router";
 import type { Route } from "./+types/server.a.b";
 import { aContext, bContext, expressContext, rootContext } from "~/contexts";
 
-export const unstable_middleware: Route.unstable_MiddlewareFunction[] = [
+export const middleware: Route.MiddlewareFunction[] = [
   async ({ context }, next) => {
     console.log("start b middleware");
     context.set(bContext, "B");
diff --git a/playground/middleware/app/routes/server.a.tsx b/playground/middleware/app/routes/server.a.tsx
index ce0e63fe08..d7b3b590c4 100644
--- a/playground/middleware/app/routes/server.a.tsx
+++ b/playground/middleware/app/routes/server.a.tsx
@@ -2,7 +2,7 @@ import { Outlet, unstable_createContext } from "react-router";
 import type { Route } from "./+types/server.a";
 import { aContext, expressContext, rootContext } from "~/contexts";
 
-export const unstable_middleware: Route.unstable_MiddlewareFunction[] = [
+export const middleware: Route.MiddlewareFunction[] = [
   async ({ context }, next) => {
     console.log("start a middleware");
     context.set(aContext, "A");
diff --git a/playground/middleware/react-router.config.ts b/playground/middleware/react-router.config.ts
index 8ebd8738ed..83de270203 100644
--- a/playground/middleware/react-router.config.ts
+++ b/playground/middleware/react-router.config.ts
@@ -2,7 +2,7 @@ import type { Config } from "@react-router/dev/config";
 
 export default {
   future: {
-    unstable_middleware: true,
+    middleware: true,
     unstable_splitRouteModules: true,
   },
 } satisfies Config;
diff --git a/playground/rsc-vite/src/routes/root/root.tsx b/playground/rsc-vite/src/routes/root/root.tsx
index 9d65f9617d..7820bc4ba7 100644
--- a/playground/rsc-vite/src/routes/root/root.tsx
+++ b/playground/rsc-vite/src/routes/root/root.tsx
@@ -1,5 +1,5 @@
 import { Link, Links, Outlet, ScrollRestoration } from "react-router";
-import { type unstable_MiddlewareFunction } from "react-router";
+import { type MiddlewareFunction } from "react-router";
 
 import { Counter } from "../../counter";
 import { ErrorReporter, NavigationState } from "./root.client";
@@ -11,7 +11,7 @@ export function headers() {
   return new Headers({ "x-root": "yes" });
 }
 
-export const unstable_middleware: unstable_MiddlewareFunction<Response>[] = [
+export const middleware: MiddlewareFunction<Response>[] = [
   async ({ request }, next) => {
     console.log(">>> RSC middleware", request.url);
     let res = await next();

From f1057561f60a097732fb30bd769095502838a6b0 Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Thu, 21 Aug 2025 15:20:55 -0400
Subject: [PATCH 03/14] Remove prefix from MiddlewareNextFunction

---
 packages/react-router/index-react-server.ts                 | 2 +-
 packages/react-router/lib/router/router.ts                  | 4 ++--
 packages/react-router/lib/router/utils.ts                   | 4 ++--
 packages/react-router/lib/types/route-module-annotations.ts | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/react-router/index-react-server.ts b/packages/react-router/index-react-server.ts
index a36f0f5ddc..2a77ca38fd 100644
--- a/packages/react-router/index-react-server.ts
+++ b/packages/react-router/index-react-server.ts
@@ -63,7 +63,7 @@ export { createMemorySessionStorage } from "./lib/server-runtime/sessions/memory
 
 export type {
   MiddlewareFunction,
-  unstable_MiddlewareNextFunction,
+  MiddlewareNextFunction,
   unstable_RouterContext,
 } from "./lib/router/utils";
 
diff --git a/packages/react-router/lib/router/router.ts b/packages/react-router/lib/router/router.ts
index 102b8c03c0..0d38c20e97 100644
--- a/packages/react-router/lib/router/router.ts
+++ b/packages/react-router/lib/router/router.ts
@@ -39,7 +39,7 @@ import type {
   LoaderFunction,
   ActionFunction,
   MiddlewareFunction,
-  unstable_MiddlewareNextFunction,
+  MiddlewareNextFunction,
   ErrorResponse,
 } from "./utils";
 import {
@@ -5586,7 +5586,7 @@ async function callRouteMiddleware<Result>(
 
   let [routeId, middleware] = tuple;
   let nextResult: { value: Result } | undefined;
-  let next: unstable_MiddlewareNextFunction<Result> = async () => {
+  let next: MiddlewareNextFunction<Result> = async () => {
     if (nextResult) {
       throw new Error("You may only call `next()` once per middleware");
     }
diff --git a/packages/react-router/lib/router/utils.ts b/packages/react-router/lib/router/utils.ts
index fef0382a05..a9449b9c6b 100644
--- a/packages/react-router/lib/router/utils.ts
+++ b/packages/react-router/lib/router/utils.ts
@@ -298,7 +298,7 @@ interface DataFunctionArgs<Context> {
  * Route middleware `next` function to call downstream handlers and then complete
  * middlewares from the bottom-up
  */
-export interface unstable_MiddlewareNextFunction<Result = unknown> {
+export interface MiddlewareNextFunction<Result = unknown> {
   (): Promise<Result>;
 }
 
@@ -310,7 +310,7 @@ export interface unstable_MiddlewareNextFunction<Result = unknown> {
  */
 export type MiddlewareFunction<Result = unknown> = (
   args: DataFunctionArgs<Readonly<unstable_RouterContextProvider>>,
-  next: unstable_MiddlewareNextFunction<Result>,
+  next: MiddlewareNextFunction<Result>,
 ) => MaybePromise<Result | void>;
 
 /**
diff --git a/packages/react-router/lib/types/route-module-annotations.ts b/packages/react-router/lib/types/route-module-annotations.ts
index 3683933eca..ceef11ede2 100644
--- a/packages/react-router/lib/types/route-module-annotations.ts
+++ b/packages/react-router/lib/types/route-module-annotations.ts
@@ -3,7 +3,7 @@ import type { Location } from "../router/history";
 import type { LinkDescriptor } from "../router/links";
 import type {
   DataStrategyResult,
-  unstable_MiddlewareNextFunction,
+  MiddlewareNextFunction,
 } from "../router/utils";
 
 import type {
@@ -90,12 +90,12 @@ type HeadersArgs = {
 
 type CreateServerMiddlewareFunction<T extends RouteInfo> = (
   args: ServerDataFunctionArgs<T["params"]>,
-  next: unstable_MiddlewareNextFunction<Response>,
+  next: MiddlewareNextFunction<Response>,
 ) => MaybePromise<Response | void>;
 
 type CreateClientMiddlewareFunction<T extends RouteInfo> = (
   args: ClientDataFunctionArgs<T["params"]>,
-  next: unstable_MiddlewareNextFunction<Record<string, DataStrategyResult>>,
+  next: MiddlewareNextFunction<Record<string, DataStrategyResult>>,
 ) => MaybePromise<Record<string, DataStrategyResult> | void>;
 
 type CreateServerLoaderArgs<T extends RouteInfo> = ServerDataFunctionArgs<

From 755b1f40bc94a469d0dcaff8228ad06644cb0ee9 Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Thu, 21 Aug 2025 15:40:34 -0400
Subject: [PATCH 04/14] Remove prefix from context provider and createContext

---
 docs/how-to/middleware.md                     | 58 ++++++++---------
 docs/start/data/route-object.md               |  2 +-
 integration/browser-entry-test.ts             |  6 +-
 integration/middleware-test.ts                | 64 +++++++++----------
 integration/rsc/rsc-test.ts                   | 16 ++---
 packages/react-router-architect/server.ts     |  4 +-
 packages/react-router-cloudflare/worker.ts    |  4 +-
 .../config/defaults/entry.server.node.tsx     |  2 +-
 .../vite/cloudflare-dev-proxy.ts              |  4 +-
 packages/react-router-dev/vite/plugin.ts      |  4 +-
 packages/react-router-express/server.ts       |  4 +-
 packages/react-router-node/server.ts          |  4 +-
 .../react-router/__tests__/dom/stub-test.tsx  |  9 +--
 .../router/context-middleware-test.ts         | 62 +++++++++---------
 .../__tests__/server-runtime/server-test.ts   |  9 +--
 packages/react-router/index-react-server.ts   |  4 +-
 packages/react-router/index.ts                |  5 +-
 packages/react-router/lib/components.tsx      |  2 +-
 packages/react-router/lib/dom/lib.tsx         | 10 +--
 .../lib/dom/ssr/routes-test-stub.tsx          |  6 +-
 packages/react-router/lib/router/router.ts    | 60 ++++++++---------
 packages/react-router/lib/router/utils.ts     | 26 ++++----
 packages/react-router/lib/rsc/browser.tsx     | 12 ++--
 packages/react-router/lib/rsc/server.rsc.ts   | 10 +--
 .../react-router/lib/server-runtime/build.ts  |  4 +-
 .../react-router/lib/server-runtime/server.ts | 22 +++----
 .../lib/server-runtime/single-fetch.ts        |  6 +-
 packages/react-router/lib/types/route-data.ts | 10 +--
 playground/middleware/app/contexts.ts         | 10 +--
 .../middleware/app/routes/client.a.b.tsx      |  2 +-
 .../middleware/app/routes/server.a.b.tsx      |  2 +-
 playground/middleware/app/routes/server.a.tsx |  2 +-
 playground/middleware/server.ts               |  4 +-
 scripts/docs.ts                               |  3 +-
 34 files changed, 217 insertions(+), 235 deletions(-)

diff --git a/docs/how-to/middleware.md b/docs/how-to/middleware.md
index 7c89a61c7f..250152f9ed 100644
--- a/docs/how-to/middleware.md
+++ b/docs/how-to/middleware.md
@@ -51,14 +51,13 @@ export default {
 ### 2. Create a context
 
 Middleware uses a `context` provider instance to provide data down the middleware chain.
-You can create type-safe context objects using [`unstable_createContext`][createContext]:
+You can create type-safe context objects using [`createContext`][createContext]:
 
 ```ts filename=app/context.ts
-import { unstable_createContext } from "react-router";
+import { createContext } from "react-router";
 import type { User } from "~/types";
 
-export const userContext =
-  unstable_createContext<User | null>(null);
+export const userContext = createContext<User | null>(null);
 ```
 
 ### 3. Export middleware from your routes
@@ -113,20 +112,20 @@ export default function Dashboard({
 
 ### 4. Update your `getLoadContext` function (if applicable)
 
-If you're using a custom server and a `getLoadContext` function, you will need to update your implementation to return an instance of [`unstable_RouterContextProvider`][RouterContextProvider], instead of a JavaScript object:
+If you're using a custom server and a `getLoadContext` function, you will need to update your implementation to return an instance of [`RouterContextProvider`][RouterContextProvider], instead of a JavaScript object:
 
 ```diff
 +import {
-+  unstable_createContext,
-+  unstable_RouterContextProvider,
++  createContext,
++  RouterContextProvider,
 +} from "react-router";
 import { createDb } from "./db";
 
-+const dbContext = unstable_createContext<Database>();
++const dbContext = createContext<Database>();
 
 function getLoadContext(req, res) {
 -  return { db: createDb() };
-+  const context = new unstable_RouterContextProvider();
++  const context = new RouterContextProvider();
 +  context.set(dbContext, createDb());
 +  return context;
 }
@@ -147,14 +146,13 @@ const router = createBrowserRouter(routes, {
 ### 2. Create a context
 
 Middleware uses a `context` provider instance to provide data down the middleware chain.
-You can create type-safe context objects using [`unstable_createContext`][createContext]:
+You can create type-safe context objects using [`createContext`][createContext]:
 
 ```ts
-import { unstable_createContext } from "react-router";
+import { createContext } from "react-router";
 import type { User } from "~/types";
 
-export const userContext =
-  unstable_createContext<User | null>(null);
+export const userContext = createContext<User | null>(null);
 ```
 
 ### 3. Add middleware to your routes
@@ -222,14 +220,14 @@ export default function Profile() {
 If you wish to include a base context on all navigations/fetches, you can add an [`unstable_getContext`][getContext] function to your router. This will be called to populate a fresh context on every navigation/fetch.
 
 ```tsx
-let sessionContext = unstable_createContext();
+let sessionContext = createContext();
 
 const router = createBrowserRouter(routes, {
   future: {
     middleware: true,
   },
   unstable_getContext() {
-    let context = new unstable_RouterContextProvider();
+    let context = new RouterContextProvider();
     context.set(sessionContext, getSession());
     return context;
   },
@@ -374,8 +372,8 @@ The new context system provides type safety and prevents naming conflicts and al
 
 ```ts
 // ✅ Type-safe
-import { unstable_createContext } from "react-router";
-const userContext = unstable_createContext<User>();
+import { createContext } from "react-router";
+const userContext = createContext<User>();
 
 // Later in middleware/`loader`s
 context.set(userContext, user); // Must be `User` type
@@ -509,31 +507,31 @@ Middleware introduces a breaking change to the `context` parameter generated by
 
 Middleware needs an equivalent `context` on the client for `clientMiddleware`, but we didn't want to duplicate this pattern from the server that we already weren't thrilled with, so we decided to introduce a new API where we could tackle type-safety.
 
-When opting into middleware, the `context` parameter changes to an instance of [`unstable_RouterContextProvider`][RouterContextProvider]:
+When opting into middleware, the `context` parameter changes to an instance of [`RouterContextProvider`][RouterContextProvider]:
 
 ```ts
-let dbContext = unstable_createContext<Database>();
-let context = new unstable_RouterContextProvider();
+let dbContext = createContext<Database>();
+let context = new RouterContextProvider();
 context.set(dbContext, getDb());
 //                     ^ type-safe
 let db = context.get(dbContext);
 //  ^ Database
 ```
 
-If you're using a custom server and a `getLoadContext` function, you will need to update your implementation to return an instance of [`unstable_RouterContextProvider`][RouterContextProvider], instead of a plain JavaScript object:
+If you're using a custom server and a `getLoadContext` function, you will need to update your implementation to return an instance of [`RouterContextProvider`][RouterContextProvider], instead of a plain JavaScript object:
 
 ```diff
 +import {
-+  unstable_createContext,
-+  unstable_RouterContextProvider,
++  createContext,
++  RouterContextProvider,
 +} from "react-router";
 import { createDb } from "./db";
 
-+const dbContext = unstable_createContext<Database>();
++const dbContext = createContext<Database>();
 
 function getLoadContext(req, res) {
 -  return { db: createDb() };
-+  const context = new unstable_RouterContextProvider();
++  const context = new RouterContextProvider();
 +  context.set(dbContext, createDb());
 +  return context;
 }
@@ -541,12 +539,12 @@ function getLoadContext(req, res) {
 
 ### Migration from `AppLoadContext`
 
-If you're currently using `AppLoadContext`, you can migrate incrementally by using your existing module augmentation to augment [`unstable_RouterContextProvider`][RouterContextProvider] instead of `AppLoadContext`. Then, update your `getLoadContext` function to return an instance of [`unstable_RouterContextProvider`][RouterContextProvider]:
+If you're currently using `AppLoadContext`, you can migrate incrementally by using your existing module augmentation to augment [`RouterContextProvider`][RouterContextProvider] instead of `AppLoadContext`. Then, update your `getLoadContext` function to return an instance of [`RouterContextProvider`][RouterContextProvider]:
 
 ```diff
 declare module "react-router" {
 -  interface AppLoadContext {
-+  interface unstable_RouterContextProvider {
++  interface RouterContextProvider {
     db: Database;
     user: User;
   }
@@ -555,7 +553,7 @@ declare module "react-router" {
 function getLoadContext() {
   const loadContext = {...};
 -  return loadContext;
-+  let context = new unstable_RouterContextProvider();
++  let context = new RouterContextProvider();
 +  Object.assign(context, loadContext);
 +  return context;
 }
@@ -565,7 +563,7 @@ This allows you to leave your `action`s/`loader`s untouched during initial adopt
 
 <docs-warning>This approach is only intended to be used as a migration strategy when adopting middleware in React Router v7, allowing you to incrementally migrate to `context.set`/`context.get`. It is not safe to assume this approach will work in the next major version of React Router.</docs-warning>
 
-<docs-warning>The [`unstable_RouterContextProvider`][RouterContextProvider] class is also used for the client-side `context` parameter via `<HydratedRouter unstable_getContext>` and `<RouterProvider unstable_getContext>`. Since `AppLoadContext` is primarily intended as a hand-off from your HTTP server into the React Router handlers, you need to be aware that these augmented fields will not be available in `clientMiddleware`, `clientLoader`, or `clientAction` functions even thought TypeScript will tell you they are (unless, of course, you provide the fields via `unstable_getContext` on the client).</docs-warning>
+<docs-warning>The [`RouterContextProvider`][RouterContextProvider] class is also used for the client-side `context` parameter via `<HydratedRouter unstable_getContext>` and `<RouterProvider unstable_getContext>`. Since `AppLoadContext` is primarily intended as a hand-off from your HTTP server into the React Router handlers, you need to be aware that these augmented fields will not be available in `clientMiddleware`, `clientLoader`, or `clientAction` functions even thought TypeScript will tell you they are (unless, of course, you provide the fields via `unstable_getContext` on the client).</docs-warning>
 
 ## Common Patterns
 
@@ -693,7 +691,7 @@ export const middleware: Route.MiddlewareFunction[] = [
 ### Sharing Context Between `action` and `loader`
 
 ```tsx
-const sharedDataContext = unstable_createContext<any>();
+const sharedDataContext = createContext<any>();
 
 export const middleware: Route.MiddlewareFunction[] = [
   async ({ request, context }, next) => {
diff --git a/docs/start/data/route-object.md b/docs/start/data/route-object.md
index 3ddac3e49d..40a8896fdb 100644
--- a/docs/start/data/route-object.md
+++ b/docs/start/data/route-object.md
@@ -84,7 +84,7 @@ async function loggingMiddleware({ request }, next) {
   console.log(`Navigation completed in ${duration}ms`);
 }
 
-const userContext = unstable_createContext<User>();
+const userContext = createContext<User>();
 
 async function authMiddleware ({ context }) {
   const userId = getUserId();
diff --git a/integration/browser-entry-test.ts b/integration/browser-entry-test.ts
index ae4e831296..86290d9a15 100644
--- a/integration/browser-entry-test.ts
+++ b/integration/browser-entry-test.ts
@@ -87,12 +87,12 @@ test("allows users to pass a client side context to HydratedRouter", async ({
   let fixture = await createFixture({
     files: {
       "app/entry.client.tsx": js`
-        import { unstable_createContext, unstable_RouterContextProvider } from "react-router";
+        import { createContext, RouterContextProvider } from "react-router";
         import { HydratedRouter } from "react-router/dom";
         import { startTransition, StrictMode } from "react";
         import { hydrateRoot } from "react-dom/client";
 
-        export const myContext = new unstable_createContext('foo');
+        export const myContext = new createContext('foo');
 
         startTransition(() => {
           hydrateRoot(
@@ -100,7 +100,7 @@ test("allows users to pass a client side context to HydratedRouter", async ({
             <StrictMode>
               <HydratedRouter
                 unstable_getContext={() => {
-                  return new unstable_RouterContextProvider([
+                  return new RouterContextProvider([
                     [myContext, 'bar']
                   ]);
                 }}
diff --git a/integration/middleware-test.ts b/integration/middleware-test.ts
index 931fc52559..a852b0a6bc 100644
--- a/integration/middleware-test.ts
+++ b/integration/middleware-test.ts
@@ -113,8 +113,8 @@ test.describe("Middleware", () => {
             });
           `,
           "app/context.ts": js`
-            import { unstable_createContext } from 'react-router'
-            export const orderContext = unstable_createContext([]);
+            import { createContext } from 'react-router'
+            export const orderContext = createContext([]);
           `,
           "app/routes/_index.tsx": js`
             import { Link } from 'react-router'
@@ -204,8 +204,8 @@ test.describe("Middleware", () => {
             });
           `,
           "app/context.ts": js`
-            import { unstable_createContext } from 'react-router'
-            export const orderContext = unstable_createContext([]);
+            import { createContext } from 'react-router'
+            export const orderContext = createContext([]);
           `,
           "app/routes/_index.tsx": js`
             import { Link } from 'react-router'
@@ -292,8 +292,8 @@ test.describe("Middleware", () => {
             });
           `,
           "app/context.ts": js`
-            import { unstable_createContext } from 'react-router'
-            export const orderContext = unstable_createContext([]);
+            import { createContext } from 'react-router'
+            export const orderContext = createContext([]);
           `,
           "app/routes/_index.tsx": js`
             import { Form } from 'react-router'
@@ -607,8 +607,8 @@ test.describe("Middleware", () => {
             });
           `,
           "app/context.ts": js`
-            import { unstable_createContext } from 'react-router'
-            export const orderContext = unstable_createContext([]);
+            import { createContext } from 'react-router'
+            export const orderContext = createContext([]);
           `,
           "app/routes/_index.tsx": js`
             import { Link } from 'react-router'
@@ -690,8 +690,8 @@ test.describe("Middleware", () => {
             });
           `,
           "app/context.ts": js`
-            import { unstable_createContext } from 'react-router'
-            export const orderContext = unstable_createContext([]);
+            import { createContext } from 'react-router'
+            export const orderContext = createContext([]);
           `,
           "app/routes/_index.tsx": js`
             import { Link } from 'react-router'
@@ -778,8 +778,8 @@ test.describe("Middleware", () => {
             });
           `,
           "app/context.ts": js`
-            import { unstable_createContext } from 'react-router'
-            export const orderContext = unstable_createContext([]);
+            import { createContext } from 'react-router'
+            export const orderContext = createContext([]);
           `,
           "app/routes/_index.tsx": js`
             import { Link } from 'react-router'
@@ -936,8 +936,8 @@ test.describe("Middleware", () => {
             });
           `,
           "app/context.ts": js`
-            import { unstable_createContext } from 'react-router'
-            export const orderContext = unstable_createContext([]);
+            import { createContext } from 'react-router'
+            export const orderContext = createContext([]);
           `,
           "app/routes/_index.tsx": js`
             import { Form } from 'react-router'
@@ -1242,8 +1242,8 @@ test.describe("Middleware", () => {
             });
           `,
           "app/context.ts": js`
-            import { unstable_createContext } from 'react-router'
-            export const orderContext = unstable_createContext([]);
+            import { createContext } from 'react-router'
+            export const orderContext = createContext([]);
           `,
           "app/routes/_index.tsx": js`
             import { Link } from 'react-router'
@@ -1323,8 +1323,8 @@ test.describe("Middleware", () => {
             });
           `,
           "app/context.ts": js`
-            import { unstable_createContext } from 'react-router'
-            export const countContext = unstable_createContext({
+            import { createContext } from 'react-router'
+            export const countContext = createContext({
               parent: 0,
               child: 0,
             });
@@ -1445,8 +1445,8 @@ test.describe("Middleware", () => {
             });
           `,
           "app/context.ts": js`
-            import { unstable_createContext } from 'react-router'
-            export const countContext = unstable_createContext({
+            import { createContext } from 'react-router'
+            export const countContext = createContext({
               parent: 0,
               child: 0,
               index: 0,
@@ -1607,8 +1607,8 @@ test.describe("Middleware", () => {
             });
           `,
           "app/context.ts": js`
-            import { unstable_createContext } from 'react-router'
-            export const orderContext = unstable_createContext([]);
+            import { createContext } from 'react-router'
+            export const orderContext = createContext([]);
           `,
           "app/routes/_index.tsx": js`
             import { Link } from 'react-router'
@@ -1780,8 +1780,8 @@ test.describe("Middleware", () => {
             });
           `,
           "app/context.ts": js`
-            import { unstable_createContext } from 'react-router'
-            export const orderContext = unstable_createContext([]);
+            import { createContext } from 'react-router'
+            export const orderContext = createContext([]);
           `,
           "app/routes/_index.tsx": js`
             import { Form } from 'react-router'
@@ -3260,8 +3260,8 @@ test.describe("Middleware", () => {
             });
           `,
           "app/context.ts": js`
-            import { unstable_createContext } from 'react-router'
-            export const orderContext = unstable_createContext([]);
+            import { createContext } from 'react-router'
+            export const orderContext = createContext([]);
           `,
           "app/routes/_index.tsx": js`
             import { Link } from 'react-router'
@@ -3351,8 +3351,8 @@ test.describe("Middleware", () => {
             });
           `,
           "app/context.ts": js`
-            import { unstable_createContext } from 'react-router'
-            export const orderContext = unstable_createContext([]);
+            import { createContext } from 'react-router'
+            export const orderContext = createContext([]);
           `,
           "app/routes/_index.tsx": js`
             import { Link } from 'react-router'
@@ -3430,8 +3430,8 @@ test.describe("Middleware", () => {
             });
           `,
           "app/context.ts": js`
-            import { unstable_createContext } from 'react-router'
-            export const orderContext = unstable_createContext([]);
+            import { createContext } from 'react-router'
+            export const orderContext = createContext([]);
           `,
           "app/routes/_index.tsx": js`
             import { Link } from 'react-router'
@@ -3509,8 +3509,8 @@ test.describe("Middleware", () => {
             });
           `,
           "app/context.ts": js`
-            import { unstable_createContext } from 'react-router'
-            export const orderContext = unstable_createContext([]);
+            import { createContext } from 'react-router'
+            export const orderContext = createContext([]);
           `,
           "app/routes/_index.tsx": js`
             import * as React from 'react'
diff --git a/integration/rsc/rsc-test.ts b/integration/rsc/rsc-test.ts
index 30db730c32..d6b4b67dd7 100644
--- a/integration/rsc/rsc-test.ts
+++ b/integration/rsc/rsc-test.ts
@@ -485,19 +485,19 @@ implementations.forEach((implementation) => {
             `,
 
             "src/config/request-context.ts": js`
-              import { unstable_createContext, unstable_RouterContextProvider } from "react-router";
+              import { createContext, RouterContextProvider } from "react-router";
 
-              export const testContext = unstable_createContext<string>("default-value");
+              export const testContext = createContext<string>("default-value");
 
-              export const requestContext = new unstable_RouterContextProvider(
+              export const requestContext = new RouterContextProvider(
                 new Map([[testContext, "test-context-value"]])
               );
             `,
             "src/config/unstable-get-context.ts": js`
               // THIS FILE OVERRIDES THE DEFAULT IMPLEMENTATION
-              import { unstable_createContext } from "react-router";
+              import { createContext } from "react-router";
 
-              export const testContext = unstable_createContext<string>("default-value");
+              export const testContext = createContext<string>("default-value");
 
               export function unstable_getContext() {
                 return new Map([[testContext, "client-context-value"]]);
@@ -1200,7 +1200,7 @@ implementations.forEach((implementation) => {
           validateRSCHtml(await page.content());
         });
 
-        test("Supports request context using the unstable_RouterContextProvider API", async ({
+        test("Supports request context using the RouterContextProvider API", async ({
           page,
         }) => {
           await page.goto(`http://localhost:${port}/request-context`);
@@ -1213,7 +1213,7 @@ implementations.forEach((implementation) => {
           validateRSCHtml(await page.content());
         });
 
-        test("Supports request context in resource routes using the unstable_RouterContextProvider API", async ({
+        test("Supports request context in resource routes using the RouterContextProvider API", async ({
           page,
           request,
         }) => {
@@ -1247,7 +1247,7 @@ implementations.forEach((implementation) => {
           validateRSCHtml(await page.content());
         });
 
-        test("Supports request context in middleware using the unstable_RouterContextProvider API", async ({
+        test("Supports request context in middleware using the RouterContextProvider API", async ({
           page,
         }) => {
           await page.goto(
diff --git a/packages/react-router-architect/server.ts b/packages/react-router-architect/server.ts
index 2bce606c62..b31ae20d12 100644
--- a/packages/react-router-architect/server.ts
+++ b/packages/react-router-architect/server.ts
@@ -2,7 +2,7 @@ import type {
   AppLoadContext,
   UNSAFE_MiddlewareEnabled as MiddlewareEnabled,
   ServerBuild,
-  unstable_RouterContextProvider,
+  RouterContextProvider,
 } from "react-router";
 import { createRequestHandler as createReactRouterRequestHandler } from "react-router";
 import { readableStreamToString } from "@react-router/node";
@@ -27,7 +27,7 @@ type MaybePromise<T> = T | Promise<T>;
 export type GetLoadContextFunction = (
   event: APIGatewayProxyEventV2,
 ) => MiddlewareEnabled extends true
-  ? MaybePromise<unstable_RouterContextProvider>
+  ? MaybePromise<RouterContextProvider>
   : MaybePromise<AppLoadContext>;
 
 export type RequestHandler = APIGatewayProxyHandlerV2;
diff --git a/packages/react-router-cloudflare/worker.ts b/packages/react-router-cloudflare/worker.ts
index e0186fc12e..a79518c05f 100644
--- a/packages/react-router-cloudflare/worker.ts
+++ b/packages/react-router-cloudflare/worker.ts
@@ -2,7 +2,7 @@ import type {
   AppLoadContext,
   UNSAFE_MiddlewareEnabled as MiddlewareEnabled,
   ServerBuild,
-  unstable_RouterContextProvider,
+  RouterContextProvider,
 } from "react-router";
 import { createRequestHandler as createReactRouterRequestHandler } from "react-router";
 import { type CacheStorage } from "@cloudflare/workers-types";
@@ -37,7 +37,7 @@ export type GetLoadContextFunction<
     };
   };
 }) => MiddlewareEnabled extends true
-  ? MaybePromise<unstable_RouterContextProvider>
+  ? MaybePromise<RouterContextProvider>
   : MaybePromise<AppLoadContext>;
 
 export type RequestHandler<Env = any> = PagesFunction<Env>;
diff --git a/packages/react-router-dev/config/defaults/entry.server.node.tsx b/packages/react-router-dev/config/defaults/entry.server.node.tsx
index 3709feaab1..18249966a3 100644
--- a/packages/react-router-dev/config/defaults/entry.server.node.tsx
+++ b/packages/react-router-dev/config/defaults/entry.server.node.tsx
@@ -16,7 +16,7 @@ export default function handleRequest(
   routerContext: EntryContext,
   loadContext: AppLoadContext,
   // If you have middleware enabled:
-  // loadContext: unstable_RouterContextProvider
+  // loadContext: RouterContextProvider
 ) {
   return new Promise((resolve, reject) => {
     let shellRendered = false;
diff --git a/packages/react-router-dev/vite/cloudflare-dev-proxy.ts b/packages/react-router-dev/vite/cloudflare-dev-proxy.ts
index 89b8e302ca..8f36a829c3 100644
--- a/packages/react-router-dev/vite/cloudflare-dev-proxy.ts
+++ b/packages/react-router-dev/vite/cloudflare-dev-proxy.ts
@@ -3,7 +3,7 @@ import {
   type AppLoadContext,
   type ServerBuild,
   type UNSAFE_MiddlewareEnabled,
-  type unstable_RouterContextProvider,
+  type RouterContextProvider,
 } from "react-router";
 import { type Plugin } from "vite";
 import { type GetPlatformProxyOptions, type PlatformProxy } from "wrangler";
@@ -26,7 +26,7 @@ type GetLoadContext<Env, Cf extends CfProperties> = (args: {
   request: Request;
   context: LoadContext<Env, Cf>;
 }) => UNSAFE_MiddlewareEnabled extends true
-  ? MaybePromise<unstable_RouterContextProvider>
+  ? MaybePromise<RouterContextProvider>
   : MaybePromise<AppLoadContext>;
 
 function importWrangler() {
diff --git a/packages/react-router-dev/vite/plugin.ts b/packages/react-router-dev/vite/plugin.ts
index 1bd3727de0..5bd0316f42 100644
--- a/packages/react-router-dev/vite/plugin.ts
+++ b/packages/react-router-dev/vite/plugin.ts
@@ -25,7 +25,7 @@ import type {
   ServerBuild,
   DataRouteObject,
   UNSAFE_MiddlewareEnabled as MiddlewareEnabled,
-  unstable_RouterContextProvider,
+  RouterContextProvider,
 } from "react-router";
 import {
   init as initEsModuleLexer,
@@ -610,7 +610,7 @@ let reactRouterDevLoadContext: (
   request: Request,
 ) => MaybePromise<
   MiddlewareEnabled extends true
-    ? MaybePromise<unstable_RouterContextProvider | undefined>
+    ? MaybePromise<RouterContextProvider | undefined>
     : MaybePromise<Record<string, unknown> | undefined>
 > = () => undefined;
 
diff --git a/packages/react-router-express/server.ts b/packages/react-router-express/server.ts
index e2e2a59012..e6238b1fa1 100644
--- a/packages/react-router-express/server.ts
+++ b/packages/react-router-express/server.ts
@@ -7,7 +7,7 @@ import type {
   AppLoadContext,
   ServerBuild,
   UNSAFE_MiddlewareEnabled as MiddlewareEnabled,
-  unstable_RouterContextProvider,
+  RouterContextProvider,
 } from "react-router";
 import { createRequestHandler as createRemixRequestHandler } from "react-router";
 import {
@@ -29,7 +29,7 @@ export type GetLoadContextFunction = (
   req: express.Request,
   res: express.Response,
 ) => MiddlewareEnabled extends true
-  ? MaybePromise<unstable_RouterContextProvider>
+  ? MaybePromise<RouterContextProvider>
   : MaybePromise<AppLoadContext>;
 
 export type RequestHandler = (
diff --git a/packages/react-router-node/server.ts b/packages/react-router-node/server.ts
index 6038db0229..d4423bfb61 100644
--- a/packages/react-router-node/server.ts
+++ b/packages/react-router-node/server.ts
@@ -4,7 +4,7 @@ import type {
   AppLoadContext,
   ServerBuild,
   UNSAFE_MiddlewareEnabled,
-  unstable_RouterContextProvider,
+  RouterContextProvider,
 } from "react-router";
 import { createRequestHandler } from "react-router";
 import type { ClientAddress } from "@mjackson/node-fetch-server";
@@ -18,7 +18,7 @@ export interface RequestListenerOptions {
     request: Request,
     client: ClientAddress,
   ) => UNSAFE_MiddlewareEnabled extends true
-    ? MaybePromise<unstable_RouterContextProvider>
+    ? MaybePromise<RouterContextProvider>
     : MaybePromise<AppLoadContext>;
   mode?: string;
 }
diff --git a/packages/react-router/__tests__/dom/stub-test.tsx b/packages/react-router/__tests__/dom/stub-test.tsx
index be05bb51c9..a2b66c7b26 100644
--- a/packages/react-router/__tests__/dom/stub-test.tsx
+++ b/packages/react-router/__tests__/dom/stub-test.tsx
@@ -12,10 +12,7 @@ import {
   type LoaderFunctionArgs,
   useRouteError,
 } from "../../index";
-import {
-  unstable_RouterContextProvider,
-  unstable_createContext,
-} from "../../lib/router/utils";
+import { RouterContextProvider, createContext } from "../../lib/router/utils";
 
 test("renders a route", () => {
   let RoutesStub = createRoutesStub([
@@ -283,7 +280,7 @@ test("can pass context values (w/o middleware)", async () => {
 });
 
 test("can pass context values (w/middleware)", async () => {
-  let helloContext = unstable_createContext();
+  let helloContext = createContext();
   let RoutesStub = createRoutesStub(
     [
       {
@@ -315,7 +312,7 @@ test("can pass context values (w/middleware)", async () => {
         ],
       },
     ],
-    new unstable_RouterContextProvider(new Map([[helloContext, "hello"]])),
+    new RouterContextProvider(new Map([[helloContext, "hello"]])),
   );
 
   render(
diff --git a/packages/react-router/__tests__/router/context-middleware-test.ts b/packages/react-router/__tests__/router/context-middleware-test.ts
index 15162c922f..32f0ce00df 100644
--- a/packages/react-router/__tests__/router/context-middleware-test.ts
+++ b/packages/react-router/__tests__/router/context-middleware-test.ts
@@ -12,9 +12,9 @@ import type {
   unstable_RouterContext,
 } from "../../lib/router/utils";
 import {
-  unstable_createContext,
+  createContext,
   redirect,
-  unstable_RouterContextProvider,
+  RouterContextProvider,
   data,
   ErrorResponseImpl,
 } from "../../lib/router/utils";
@@ -49,17 +49,17 @@ function respondWithJson(staticContext: StaticHandlerContext | Response) {
 
 describe("context/middleware", () => {
   // Simple context for just asserting that middlewares execute
-  let countContext = unstable_createContext(0);
+  let countContext = createContext(0);
 
   // String contexts to ensure children middlewares have access to parent context values
-  let parentContext = unstable_createContext("empty");
-  let childContext = unstable_createContext("empty");
+  let parentContext = createContext("empty");
+  let childContext = createContext("empty");
 
   // Context for tracking the order in which middlewares/handlers run
-  let orderContext = unstable_createContext<string[]>([]);
+  let orderContext = createContext<string[]>([]);
 
   let pushOrderContext = (
-    context: Readonly<unstable_RouterContextProvider>,
+    context: Readonly<RouterContextProvider>,
     value: string,
   ) => context.set(orderContext, [...(context.get(orderContext) || []), value]);
 
@@ -809,7 +809,7 @@ describe("context/middleware", () => {
 
     describe("throwing", () => {
       it("throwing from a middleware bubbles up (going down - loader)", async () => {
-        let context = new unstable_RouterContextProvider();
+        let context = new RouterContextProvider();
         router = createRouter({
           history: createMemoryHistory(),
           unstable_getContext: () => context,
@@ -869,7 +869,7 @@ describe("context/middleware", () => {
       });
 
       it("throwing from a middleware bubbles up (going up - loader)", async () => {
-        let context = new unstable_RouterContextProvider();
+        let context = new RouterContextProvider();
         router = createRouter({
           history: createMemoryHistory(),
           unstable_getContext: () => context,
@@ -926,7 +926,7 @@ describe("context/middleware", () => {
       });
 
       it("throwing from a middleware short circuits immediately (going down - action w/boundary)", async () => {
-        let context = new unstable_RouterContextProvider();
+        let context = new RouterContextProvider();
         router = createRouter({
           history: createMemoryHistory(),
           unstable_getContext: () => context,
@@ -1023,7 +1023,7 @@ describe("context/middleware", () => {
       });
 
       it("throwing from a middleware short circuits immediately (going up - action w/boundary)", async () => {
-        let context = new unstable_RouterContextProvider();
+        let context = new RouterContextProvider();
         router = createRouter({
           history: createMemoryHistory(),
           unstable_getContext: () => context,
@@ -1124,7 +1124,7 @@ describe("context/middleware", () => {
       });
 
       it("throwing from a middleware short circuits immediately (going down - action w/o boundary)", async () => {
-        let context = new unstable_RouterContextProvider();
+        let context = new RouterContextProvider();
         router = createRouter({
           history: createMemoryHistory(),
           unstable_getContext: () => context,
@@ -1214,7 +1214,7 @@ describe("context/middleware", () => {
       });
 
       it("throwing from a middleware short circuits immediately (going up - action w/o boundary)", async () => {
-        let context = new unstable_RouterContextProvider();
+        let context = new RouterContextProvider();
         router = createRouter({
           history: createMemoryHistory(),
           unstable_getContext: () => context,
@@ -1889,7 +1889,7 @@ describe("context/middleware", () => {
           },
         ]);
 
-        let requestContext = new unstable_RouterContextProvider();
+        let requestContext = new RouterContextProvider();
         let request = new Request("http://localhost/parent/child");
         await handler.query(request, {
           requestContext,
@@ -1948,7 +1948,7 @@ describe("context/middleware", () => {
           },
         ]);
 
-        let requestContext = new unstable_RouterContextProvider();
+        let requestContext = new RouterContextProvider();
         let request = new Request("http://localhost/parent/child", {
           method: "post",
           body: createFormData({}),
@@ -2008,7 +2008,7 @@ describe("context/middleware", () => {
           },
         ]);
 
-        let requestContext = new unstable_RouterContextProvider();
+        let requestContext = new RouterContextProvider();
         let request = new Request("http://localhost/parent/child");
         let res = (await handler.query(request, {
           requestContext,
@@ -2105,7 +2105,7 @@ describe("context/middleware", () => {
           },
         ]);
 
-        let requestContext = new unstable_RouterContextProvider();
+        let requestContext = new RouterContextProvider();
         let request = new Request("http://localhost/parent/child");
         let res = (await handler.query(request, {
           requestContext,
@@ -2161,7 +2161,7 @@ describe("context/middleware", () => {
           },
         ]);
 
-        let requestContext = new unstable_RouterContextProvider();
+        let requestContext = new RouterContextProvider();
         let request = new Request("http://localhost/parent/child");
         let res = (await handler.query(request, {
           requestContext,
@@ -2230,7 +2230,7 @@ describe("context/middleware", () => {
           },
         ]);
 
-        let requestContext = new unstable_RouterContextProvider();
+        let requestContext = new RouterContextProvider();
         let request = new Request("http://localhost/parent/child", {
           method: "post",
           body: createFormData({}),
@@ -2302,7 +2302,7 @@ describe("context/middleware", () => {
           },
         ]);
 
-        let requestContext = new unstable_RouterContextProvider();
+        let requestContext = new RouterContextProvider();
         let request = new Request("http://localhost/parent/child", {
           method: "post",
           body: createFormData({}),
@@ -2377,7 +2377,7 @@ describe("context/middleware", () => {
           },
         ]);
 
-        let requestContext = new unstable_RouterContextProvider();
+        let requestContext = new RouterContextProvider();
         let request = new Request("http://localhost/parent/child", {
           method: "post",
           body: createFormData({}),
@@ -2449,7 +2449,7 @@ describe("context/middleware", () => {
           },
         ]);
 
-        let requestContext = new unstable_RouterContextProvider();
+        let requestContext = new RouterContextProvider();
         let request = new Request("http://localhost/parent/child", {
           method: "post",
           body: createFormData({}),
@@ -2932,7 +2932,7 @@ describe("context/middleware", () => {
           },
         ]);
 
-        let requestContext = new unstable_RouterContextProvider();
+        let requestContext = new RouterContextProvider();
         let request = new Request("http://localhost/parent/child");
         await handler.queryRoute(request, {
           requestContext,
@@ -2991,7 +2991,7 @@ describe("context/middleware", () => {
           },
         ]);
 
-        let requestContext = new unstable_RouterContextProvider();
+        let requestContext = new RouterContextProvider();
         let request = new Request("http://localhost/parent/child", {
           method: "post",
           body: createFormData({}),
@@ -3047,7 +3047,7 @@ describe("context/middleware", () => {
           },
         ]);
 
-        let requestContext = new unstable_RouterContextProvider();
+        let requestContext = new RouterContextProvider();
         let request = new Request("http://localhost/parent/child");
         let response = (await handler.queryRoute(request, {
           requestContext,
@@ -3126,7 +3126,7 @@ describe("context/middleware", () => {
           },
         ]);
 
-        let requestContext = new unstable_RouterContextProvider();
+        let requestContext = new RouterContextProvider();
         let request = new Request("http://localhost/parent/child");
         await expect(
           handler.queryRoute(request, {
@@ -3177,7 +3177,7 @@ describe("context/middleware", () => {
           },
         ]);
 
-        let requestContext = new unstable_RouterContextProvider();
+        let requestContext = new RouterContextProvider();
         let request = new Request("http://localhost/parent/child");
         await expect(
           handler.queryRoute(request, {
@@ -3251,7 +3251,7 @@ describe("context/middleware", () => {
           },
         ]);
 
-        let requestContext = new unstable_RouterContextProvider();
+        let requestContext = new RouterContextProvider();
         let request = new Request("http://localhost/parent/child", {
           method: "post",
           body: createFormData({}),
@@ -3336,7 +3336,7 @@ describe("context/middleware", () => {
           },
         ]);
 
-        let requestContext = new unstable_RouterContextProvider();
+        let requestContext = new RouterContextProvider();
         let request = new Request("http://localhost/parent/child", {
           method: "post",
           body: createFormData({}),
@@ -3418,7 +3418,7 @@ describe("context/middleware", () => {
           },
         ]);
 
-        let requestContext = new unstable_RouterContextProvider();
+        let requestContext = new RouterContextProvider();
         let request = new Request("http://localhost/parent/child", {
           method: "post",
           body: createFormData({}),
@@ -3503,7 +3503,7 @@ describe("context/middleware", () => {
           },
         ]);
 
-        let requestContext = new unstable_RouterContextProvider();
+        let requestContext = new RouterContextProvider();
         let request = new Request("http://localhost/parent/child", {
           method: "post",
           body: createFormData({}),
diff --git a/packages/react-router/__tests__/server-runtime/server-test.ts b/packages/react-router/__tests__/server-runtime/server-test.ts
index 2f917a4db6..2b7ace61bb 100644
--- a/packages/react-router/__tests__/server-runtime/server-test.ts
+++ b/packages/react-router/__tests__/server-runtime/server-test.ts
@@ -2,10 +2,7 @@
  * @jest-environment node
  */
 
-import {
-  unstable_createContext,
-  type StaticHandlerContext,
-} from "react-router";
+import { createContext, type StaticHandlerContext } from "react-router";
 
 import { createRequestHandler } from "../../lib/server-runtime/server";
 import { ServerMode } from "../../lib/server-runtime/mode";
@@ -121,7 +118,7 @@ describe("server", () => {
     });
 
     it("accepts proper values from getLoadContext (with middleware)", async () => {
-      let fooContext = unstable_createContext<string>();
+      let fooContext = createContext<string>();
       let build = mockServerBuild(
         {
           root: {
@@ -179,7 +176,7 @@ describe("server", () => {
       expect(handleErrorSpy).toHaveBeenCalledTimes(1);
       expect(handleErrorSpy.mock.calls[0][0].message).toBe(
         "Invalid `context` value provided to `handleRequest`. When middleware is " +
-          "enabled you must return an instance of `unstable_RouterContextProvider` " +
+          "enabled you must return an instance of `RouterContextProvider` " +
           "from your `getLoadContext` function.",
       );
       handleErrorSpy.mockRestore();
diff --git a/packages/react-router/index-react-server.ts b/packages/react-router/index-react-server.ts
index 2a77ca38fd..30e1f3ffc8 100644
--- a/packages/react-router/index-react-server.ts
+++ b/packages/react-router/index-react-server.ts
@@ -48,8 +48,8 @@ export {
   data,
   matchRoutes,
   isRouteErrorResponse,
-  unstable_createContext,
-  unstable_RouterContextProvider,
+  createContext,
+  RouterContextProvider,
 } from "./lib/router/utils";
 
 export { createCookie, isCookie } from "./lib/server-runtime/cookies";
diff --git a/packages/react-router/index.ts b/packages/react-router/index.ts
index 509e1dfe3c..8b41c848da 100644
--- a/packages/react-router/index.ts
+++ b/packages/react-router/index.ts
@@ -54,10 +54,7 @@ export type {
   ShouldRevalidateFunctionArgs,
   UIMatch,
 } from "./lib/router/utils";
-export {
-  unstable_createContext,
-  unstable_RouterContextProvider,
-} from "./lib/router/utils";
+export { createContext, RouterContextProvider } from "./lib/router/utils";
 
 export {
   Action as NavigationType,
diff --git a/packages/react-router/lib/components.tsx b/packages/react-router/lib/components.tsx
index c2c7e733c9..aaefbbc3b6 100644
--- a/packages/react-router/lib/components.tsx
+++ b/packages/react-router/lib/components.tsx
@@ -144,7 +144,7 @@ export interface MemoryRouterOpts {
    */
   basename?: string;
   /**
-   * A function that returns an {@link unstable_RouterContextProvider} instance
+   * A function that returns an {@link RouterContextProvider} instance
    * which is provided as the `context` argument to client [`action`](../../start/data/route-object#action)s,
    * [`loader`](../../start/data/route-object#loader)s and [middleware](../../how-to/middleware).
    * This function is called to generate a fresh `context` instance on each
diff --git a/packages/react-router/lib/dom/lib.tsx b/packages/react-router/lib/dom/lib.tsx
index 4873b298a7..97749d8d58 100644
--- a/packages/react-router/lib/dom/lib.tsx
+++ b/packages/react-router/lib/dom/lib.tsx
@@ -138,7 +138,7 @@ export interface DOMRouterOpts {
    */
   basename?: string;
   /**
-   * A function that returns an {@link unstable_RouterContextProvider} instance
+   * A function that returns an {@link RouterContextProvider} instance
    * which is provided as the `context` argument to client [`action`](../../start/data/route-object#action)s,
    * [`loader`](../../start/data/route-object#loader)s and [middleware](../../how-to/middleware).
    * This function is called to generate a fresh `context` instance on each
@@ -146,15 +146,15 @@ export interface DOMRouterOpts {
    *
    * ```tsx
    * import {
-   *   unstable_createContext,
-   *   unstable_RouterContextProvider,
+   *   createContext,
+   *   RouterContextProvider,
    * } from "react-router";
    *
-   * const apiClientContext = unstable_createContext<APIClient>();
+   * const apiClientContext = createContext<APIClient>();
    *
    * function createBrowserRouter(routes, {
    *   unstable_getContext() {
-   *     let context = new unstable_RouterContextProvider();
+   *     let context = new RouterContextProvider();
    *     context.set(apiClientContext, getApiClient());
    *     return context;
    *   }
diff --git a/packages/react-router/lib/dom/ssr/routes-test-stub.tsx b/packages/react-router/lib/dom/ssr/routes-test-stub.tsx
index 355ee763e1..07e928e033 100644
--- a/packages/react-router/lib/dom/ssr/routes-test-stub.tsx
+++ b/packages/react-router/lib/dom/ssr/routes-test-stub.tsx
@@ -15,7 +15,7 @@ import type { InitialEntry } from "../../router/history";
 import type { HydrationState } from "../../router/router";
 import {
   convertRoutesToDataRoutes,
-  unstable_RouterContextProvider,
+  RouterContextProvider,
 } from "../../router/utils";
 import type { MiddlewareEnabled } from "../../types/future";
 import type { AppLoadContext } from "../../server-runtime/data";
@@ -117,7 +117,7 @@ export interface RoutesTestStubProps {
  */
 export function createRoutesStub(
   routes: StubRouteObject[],
-  _context?: AppLoadContext | unstable_RouterContextProvider,
+  _context?: AppLoadContext | RouterContextProvider,
 ) {
   return function RoutesTestStub({
     initialEntries,
@@ -156,7 +156,7 @@ export function createRoutesStub(
         _context !== undefined
           ? _context
           : future?.middleware
-            ? new unstable_RouterContextProvider()
+            ? new RouterContextProvider()
             : {},
         frameworkContextRef.current.manifest,
         frameworkContextRef.current.routeModules,
diff --git a/packages/react-router/lib/router/router.ts b/packages/react-router/lib/router/router.ts
index 0d38c20e97..db67ac8fc3 100644
--- a/packages/react-router/lib/router/router.ts
+++ b/packages/react-router/lib/router/router.ts
@@ -57,7 +57,7 @@ import {
   prependBasename,
   resolveTo,
   stripBasename,
-  unstable_RouterContextProvider,
+  RouterContextProvider,
 } from "./utils";
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -395,7 +395,7 @@ export interface RouterInit {
   routes: AgnosticRouteObject[];
   history: History;
   basename?: string;
-  unstable_getContext?: () => MaybePromise<unstable_RouterContextProvider>;
+  unstable_getContext?: () => MaybePromise<RouterContextProvider>;
   mapRouteProperties?: MapRoutePropertiesFunction;
   future?: Partial<FutureConfig>;
   hydrationRouteProperties?: string[];
@@ -1670,7 +1670,7 @@ export function createRouter(init: RouterInit): Router {
     // Create a new context per navigation
     let scopedContext = init.unstable_getContext
       ? await init.unstable_getContext()
-      : new unstable_RouterContextProvider();
+      : new RouterContextProvider();
     let pendingActionResult: PendingActionResult | undefined;
 
     if (opts && opts.pendingError) {
@@ -1785,7 +1785,7 @@ export function createRouter(init: RouterInit): Router {
     location: Location,
     submission: Submission,
     matches: AgnosticDataRouteMatch[],
-    scopedContext: unstable_RouterContextProvider,
+    scopedContext: RouterContextProvider,
     isFogOfWar: boolean,
     initialHydration: boolean,
     opts: { replace?: boolean; flushSync?: boolean } = {},
@@ -1955,7 +1955,7 @@ export function createRouter(init: RouterInit): Router {
     request: Request,
     location: Location,
     matches: AgnosticDataRouteMatch[],
-    scopedContext: unstable_RouterContextProvider,
+    scopedContext: RouterContextProvider,
     isFogOfWar: boolean,
     overrideNavigation?: Navigation,
     submission?: Submission,
@@ -2296,7 +2296,7 @@ export function createRouter(init: RouterInit): Router {
     // Create a new context per fetch
     let scopedContext = init.unstable_getContext
       ? await init.unstable_getContext()
-      : new unstable_RouterContextProvider();
+      : new RouterContextProvider();
     let preventScrollReset = (opts && opts.preventScrollReset) === true;
 
     if (submission && isMutationMethod(submission.formMethod)) {
@@ -2337,7 +2337,7 @@ export function createRouter(init: RouterInit): Router {
     routeId: string,
     path: string,
     requestMatches: AgnosticDataRouteMatch[],
-    scopedContext: unstable_RouterContextProvider,
+    scopedContext: RouterContextProvider,
     isFogOfWar: boolean,
     flushSync: boolean,
     preventScrollReset: boolean,
@@ -2641,7 +2641,7 @@ export function createRouter(init: RouterInit): Router {
     routeId: string,
     path: string,
     matches: AgnosticDataRouteMatch[],
-    scopedContext: unstable_RouterContextProvider,
+    scopedContext: RouterContextProvider,
     isFogOfWar: boolean,
     flushSync: boolean,
     preventScrollReset: boolean,
@@ -2900,7 +2900,7 @@ export function createRouter(init: RouterInit): Router {
   async function callDataStrategy(
     request: Request,
     matches: DataStrategyMatch[],
-    scopedContext: unstable_RouterContextProvider,
+    scopedContext: RouterContextProvider,
     fetcherKey: string | null,
   ): Promise<Record<string, DataResult>> {
     let results: Record<string, DataStrategyResult>;
@@ -2958,7 +2958,7 @@ export function createRouter(init: RouterInit): Router {
     matches: DataStrategyMatch[],
     fetchersToLoad: RevalidatingFetcher[],
     request: Request,
-    scopedContext: unstable_RouterContextProvider,
+    scopedContext: RouterContextProvider,
   ) {
     // Kick off loaders and fetchers in parallel
     let loaderResultsPromise = callDataStrategy(
@@ -3563,9 +3563,7 @@ export function createStaticHandler(
     let location = createLocation("", createPath(url), null, "default");
     let matches = matchRoutes(dataRoutes, location, basename);
     requestContext =
-      requestContext != null
-        ? requestContext
-        : new unstable_RouterContextProvider();
+      requestContext != null ? requestContext : new RouterContextProvider();
 
     // SSR supports HEAD requests while SPA doesn't
     if (!isValidMethod(method) && method !== "HEAD") {
@@ -3627,9 +3625,9 @@ export function createStaticHandler(
     //      can simplify and potentially even collapse back into respond()
     if (generateMiddlewareResponse) {
       invariant(
-        requestContext instanceof unstable_RouterContextProvider,
+        requestContext instanceof RouterContextProvider,
         "When using middleware in `staticHandler.query()`, any provided " +
-          "`requestContext` must be an instance of `unstable_RouterContextProvider`",
+          "`requestContext` must be an instance of `RouterContextProvider`",
       );
       try {
         await loadLazyMiddlewareForMatches(
@@ -3645,7 +3643,7 @@ export function createStaticHandler(
             params: matches[0].params,
             // If we're calling middleware then it must be enabled so we can cast
             // this to the proper type knowing it's not an `AppLoadContext`
-            context: requestContext as unstable_RouterContextProvider,
+            context: requestContext as RouterContextProvider,
           },
           async () => {
             let res = await generateMiddlewareResponse(
@@ -3830,9 +3828,7 @@ export function createStaticHandler(
     let location = createLocation("", createPath(url), null, "default");
     let matches = matchRoutes(dataRoutes, location, basename);
     requestContext =
-      requestContext != null
-        ? requestContext
-        : new unstable_RouterContextProvider();
+      requestContext != null ? requestContext : new RouterContextProvider();
 
     // SSR supports HEAD requests while SPA doesn't
     if (!isValidMethod(method) && method !== "HEAD" && method !== "OPTIONS") {
@@ -3857,9 +3853,9 @@ export function createStaticHandler(
 
     if (generateMiddlewareResponse) {
       invariant(
-        requestContext instanceof unstable_RouterContextProvider,
+        requestContext instanceof RouterContextProvider,
         "When using middleware in `staticHandler.queryRoute()`, any provided " +
-          "`requestContext` must be an instance of `unstable_RouterContextProvider`",
+          "`requestContext` must be an instance of `RouterContextProvider`",
       );
       await loadLazyMiddlewareForMatches(matches, manifest, mapRouteProperties);
       let response = await runServerMiddlewarePipeline(
@@ -3869,7 +3865,7 @@ export function createStaticHandler(
           params: matches[0].params,
           // If we're calling middleware then it must be enabled so we can cast
           // this to the proper type knowing it's not an `AppLoadContext`
-          context: requestContext as unstable_RouterContextProvider,
+          context: requestContext as RouterContextProvider,
         },
         async () => {
           let res = await generateMiddlewareResponse(
@@ -5420,7 +5416,7 @@ async function defaultDataStrategy(
 // Middleware-enabled implementation of `dataStrategy` which calls middleware
 // and fetches all loaders in parallel
 async function defaultDataStrategyWithMiddleware(
-  args: DataStrategyFunctionArgs<unstable_RouterContextProvider>,
+  args: DataStrategyFunctionArgs<RouterContextProvider>,
 ): ReturnType<DataStrategyFunction<unknown>> {
   // Short circuit all the middleware logic if we have no middlewares
   if (!args.matches.some((m) => m.route.middleware)) {
@@ -5432,8 +5428,8 @@ async function defaultDataStrategyWithMiddleware(
 
 function runServerMiddlewarePipeline(
   args: (
-    | LoaderFunctionArgs<unstable_RouterContextProvider>
-    | ActionFunctionArgs<unstable_RouterContextProvider>
+    | LoaderFunctionArgs<RouterContextProvider>
+    | ActionFunctionArgs<RouterContextProvider>
   ) & {
     // Don't use `DataStrategyFunctionArgs` directly so we can we reduce these
     // back from `DataStrategyMatch` to regular matches for use in the staticHandler
@@ -5464,7 +5460,7 @@ function runServerMiddlewarePipeline(
 
 function runClientMiddlewarePipeline(
   args: Omit<
-    DataStrategyFunctionArgs<unstable_RouterContextProvider>,
+    DataStrategyFunctionArgs<RouterContextProvider>,
     "fetcherKey" | "unstable_runClientMiddleware"
   >,
   handler: () => Promise<Record<string, DataStrategyResult>>,
@@ -5514,8 +5510,8 @@ function runClientMiddlewarePipeline(
 
 async function runMiddlewarePipeline<Result>(
   args: (
-    | LoaderFunctionArgs<unstable_RouterContextProvider>
-    | ActionFunctionArgs<unstable_RouterContextProvider>
+    | LoaderFunctionArgs<RouterContextProvider>
+    | ActionFunctionArgs<RouterContextProvider>
   ) & {
     // Don't use `DataStrategyFunctionArgs` directly so we can we reduce these
     // back from `DataStrategyMatch` to regular matches for use in the staticHandler
@@ -5556,8 +5552,8 @@ async function runMiddlewarePipeline<Result>(
 
 async function callRouteMiddleware<Result>(
   args:
-    | LoaderFunctionArgs<unstable_RouterContextProvider>
-    | ActionFunctionArgs<unstable_RouterContextProvider>,
+    | LoaderFunctionArgs<RouterContextProvider>
+    | ActionFunctionArgs<RouterContextProvider>,
   middlewares: [string, MiddlewareFunction<Result>][],
   handler: () => Promise<Result>,
   processResult: (r: Result) => Result,
@@ -5800,9 +5796,9 @@ async function callDataStrategyImpl(
             "via the `respond` API in `query`/`queryRoute`",
         );
       }
-    : (cb: DataStrategyFunction<unstable_RouterContextProvider>) => {
+    : (cb: DataStrategyFunction<RouterContextProvider>) => {
         let typedDataStrategyArgs =
-          dataStrategyArgs as DataStrategyFunctionArgs<unstable_RouterContextProvider>;
+          dataStrategyArgs as DataStrategyFunctionArgs<RouterContextProvider>;
         return runClientMiddlewarePipeline(typedDataStrategyArgs, () => {
           return cb({
             ...typedDataStrategyArgs,
diff --git a/packages/react-router/lib/router/utils.ts b/packages/react-router/lib/router/utils.ts
index a9449b9c6b..b5028ee1f5 100644
--- a/packages/react-router/lib/router/utils.ts
+++ b/packages/react-router/lib/router/utils.ts
@@ -115,7 +115,7 @@ export type Submission =
 
 /**
  * A context instance used as the key for the `get`/`set` methods of a
- * {@link unstable_RouterContextProvider}. Accepts an optional default
+ * {@link RouterContextProvider}. Accepts an optional default
  * value to be returned if no value has been set.
  */
 export interface unstable_RouterContext<T = unknown> {
@@ -134,11 +134,11 @@ export interface unstable_RouterContext<T = unknown> {
  * when no value has been set will throw an error.
  *
  * ```tsx filename=app/context.ts
- * import { unstable_createContext } from "react-router";
+ * import { createContext } from "react-router";
  *
  * // Create a context for user data
  * export const userContext =
- *   unstable_createContext<User | null>(null);
+ *   createContext<User | null>(null);
  * ```
  *
  * ```tsx filename=app/middleware/auth.ts
@@ -180,9 +180,7 @@ export interface unstable_RouterContext<T = unknown> {
  * `context.get()` and `context.set()` in [`action`](../../start/framework/route-module#action)s,
  * [`loader`](../../start/framework/route-module#loader)s, and [middleware](../../how-to/middleware).
  */
-export function unstable_createContext<T>(
-  defaultValue?: T,
-): unstable_RouterContext<T> {
+export function createContext<T>(defaultValue?: T): unstable_RouterContext<T> {
   return { defaultValue };
 }
 
@@ -192,12 +190,12 @@ export function unstable_createContext<T>(
  *
  * @example
  * import {
- *   unstable_createContext,
- *   unstable_RouterContextProvider
+ *   createContext,
+ *   RouterContextProvider
  * } from "react-router";
  *
- * const userContext = unstable_createContext<User | null>(null);
- * const contextProvider = new unstable_RouterContextProvider();
+ * const userContext = createContext<User | null>(null);
+ * const contextProvider = new RouterContextProvider();
  * contextProvider.set(userContext, getUser());
  * //                               ^ Type-safe
  * const user = contextProvider.get(userContext);
@@ -208,11 +206,11 @@ export function unstable_createContext<T>(
  * @mode framework
  * @mode data
  */
-export class unstable_RouterContextProvider {
+export class RouterContextProvider {
   #map = new Map<unstable_RouterContext, unknown>();
 
   /**
-   * Create a new `unstable_RouterContextProvider` instance
+   * Create a new `RouterContextProvider` instance
    * @param init An optional initial context map to populate the provider with
    */
   constructor(init?: Map<unstable_RouterContext, unknown>) {
@@ -260,7 +258,7 @@ export class unstable_RouterContextProvider {
 }
 
 type DefaultContext = MiddlewareEnabled extends true
-  ? Readonly<unstable_RouterContextProvider>
+  ? Readonly<RouterContextProvider>
   : any;
 
 /**
@@ -309,7 +307,7 @@ export interface MiddlewareNextFunction<Result = unknown> {
  * and then complete middlewares from the bottom-up
  */
 export type MiddlewareFunction<Result = unknown> = (
-  args: DataFunctionArgs<Readonly<unstable_RouterContextProvider>>,
+  args: DataFunctionArgs<Readonly<RouterContextProvider>>,
   next: MiddlewareNextFunction<Result>,
 ) => MaybePromise<Result | void>;
 
diff --git a/packages/react-router/lib/rsc/browser.tsx b/packages/react-router/lib/rsc/browser.tsx
index 2dd4bbf8eb..2f14b2ac99 100644
--- a/packages/react-router/lib/rsc/browser.tsx
+++ b/packages/react-router/lib/rsc/browser.tsx
@@ -20,9 +20,9 @@ import type {
 import type {
   DataStrategyFunction,
   DataStrategyFunctionArgs,
-  unstable_RouterContextProvider,
+  RouterContextProvider,
 } from "../router/utils";
-import { ErrorResponseImpl, unstable_createContext } from "../router/utils";
+import { ErrorResponseImpl, createContext } from "../router/utils";
 import type {
   DecodedSingleFetchResults,
   FetchAndDecodeFunction,
@@ -416,7 +416,7 @@ function createRouterFromPayload({
   };
 }
 
-const renderedRoutesContext = unstable_createContext<RSCRouteManifest[]>();
+const renderedRoutesContext = createContext<RSCRouteManifest[]>();
 
 export function getRSCSingleFetchDataStrategy(
   getRouter: () => DataRouter,
@@ -474,7 +474,7 @@ export function getRSCSingleFetchDataStrategy(
       // This cast should be fine since this is always run client side and
       // `context` is always of this type on the client -- unlike on the server
       // in framework mode when it could be `AppLoadContext`
-      let context = args.context as unstable_RouterContextProvider;
+      let context = args.context as RouterContextProvider;
       context.set(renderedRoutesContext, []);
       let results = await dataStrategy(args);
       // patch into router from all payloads in map
@@ -565,7 +565,7 @@ function getFetchAndDecodeViaRSC(
       // this is always run client side and `context` is always of this type on
       // the client -- unlike on the server in framework mode when it could be
       // `AppLoadContext`
-      (context as unstable_RouterContextProvider)
+      (context as RouterContextProvider)
         .get(renderedRoutesContext)
         .push(...payload.matches);
 
@@ -619,7 +619,7 @@ export interface RSCHydratedRouterProps {
    */
   routeDiscovery?: "eager" | "lazy";
   /**
-   * A function that returns an {@link unstable_RouterContextProvider} instance
+   * A function that returns an {@link RouterContextProvider} instance
    * which is provided as the `context` argument to client [`action`](../../start/data/route-object#action)s,
    * [`loader`](../../start/data/route-object#loader)s and [middleware](../../how-to/middleware).
    * This function is called to generate a fresh `context` instance on each
diff --git a/packages/react-router/lib/rsc/server.rsc.ts b/packages/react-router/lib/rsc/server.rsc.ts
index 8a84839815..a941b69448 100644
--- a/packages/react-router/lib/rsc/server.rsc.ts
+++ b/packages/react-router/lib/rsc/server.rsc.ts
@@ -24,7 +24,7 @@ import {
   type LoaderFunction,
   type Params,
   type ShouldRevalidateFunction,
-  type unstable_RouterContextProvider,
+  type RouterContextProvider,
   isRouteErrorResponse,
   matchRoutes,
   prependBasename,
@@ -307,7 +307,7 @@ export type LoadServerActionFunction = (id: string) => Promise<Function>;
  * errors that occur during the request processing.
  * @param opts.request The [`Request`](https://developer.mozilla.org/en-US/docs/Web/API/Request)
  * to match against.
- * @param opts.requestContext An instance of {@link unstable_RouterContextProvider}
+ * @param opts.requestContext An instance of {@link RouterContextProvider}
  * that should be created per request, to be passed to [`action`](../../start/data/route-object#action)s,
  * [`loader`](../../start/data/route-object#loader)s and [middleware](../../how-to/middleware).
  * @param opts.routes Your {@link unstable_RSCRouteConfigEntry | route definitions}.
@@ -333,7 +333,7 @@ export async function matchRSCServerRequest({
   decodeReply?: DecodeReplyFunction;
   decodeAction?: DecodeActionFunction;
   decodeFormState?: DecodeFormStateFunction;
-  requestContext?: unstable_RouterContextProvider;
+  requestContext?: RouterContextProvider;
   loadServerAction?: LoadServerActionFunction;
   onError?: (error: unknown) => void;
   request: Request;
@@ -601,7 +601,7 @@ async function generateResourceResponse(
   routes: RSCRouteConfigEntry[],
   basename: string | undefined,
   routeId: string,
-  requestContext: unstable_RouterContextProvider | undefined,
+  requestContext: RouterContextProvider | undefined,
   onError: ((error: unknown) => void) | undefined,
 ) {
   try {
@@ -663,7 +663,7 @@ async function generateRenderResponse(
   basename: string | undefined,
   isDataRequest: boolean,
   decodeReply: DecodeReplyFunction | undefined,
-  requestContext: unstable_RouterContextProvider | undefined,
+  requestContext: RouterContextProvider | undefined,
   loadServerAction: LoadServerActionFunction | undefined,
   decodeAction: DecodeActionFunction | undefined,
   decodeFormState: DecodeFormStateFunction | undefined,
diff --git a/packages/react-router/lib/server-runtime/build.ts b/packages/react-router/lib/server-runtime/build.ts
index a0d0a3daac..25462b1be9 100644
--- a/packages/react-router/lib/server-runtime/build.ts
+++ b/packages/react-router/lib/server-runtime/build.ts
@@ -1,7 +1,7 @@
 import type {
   ActionFunctionArgs,
   LoaderFunctionArgs,
-  unstable_RouterContextProvider,
+  RouterContextProvider,
 } from "../router/utils";
 import type {
   AssetsManifest,
@@ -50,7 +50,7 @@ export interface HandleDocumentRequestFunction {
     responseHeaders: Headers,
     context: EntryContext,
     loadContext: MiddlewareEnabled extends true
-      ? unstable_RouterContextProvider
+      ? RouterContextProvider
       : AppLoadContext,
   ): Promise<Response> | Response;
 }
diff --git a/packages/react-router/lib/server-runtime/server.ts b/packages/react-router/lib/server-runtime/server.ts
index ab981a270e..046486638c 100644
--- a/packages/react-router/lib/server-runtime/server.ts
+++ b/packages/react-router/lib/server-runtime/server.ts
@@ -1,6 +1,6 @@
 import type { StaticHandler, StaticHandlerContext } from "../router/router";
 import type { ErrorResponse } from "../router/utils";
-import { unstable_RouterContextProvider } from "../router/utils";
+import { RouterContextProvider } from "../router/utils";
 import {
   isRouteErrorResponse,
   ErrorResponseImpl,
@@ -40,7 +40,7 @@ import { getManifestPath } from "../dom/ssr/fog-of-war";
 export type RequestHandler = (
   request: Request,
   loadContext?: MiddlewareEnabled extends true
-    ? unstable_RouterContextProvider
+    ? RouterContextProvider
     : AppLoadContext,
 ) => Promise<Response>;
 
@@ -104,7 +104,7 @@ export const createRequestHandler: CreateRequestHandlerFunction = (
     }
 
     let params: RouteMatch<ServerRoute>["params"] = {};
-    let loadContext: AppLoadContext | unstable_RouterContextProvider;
+    let loadContext: AppLoadContext | RouterContextProvider;
 
     let handleError = (error: unknown) => {
       if (mode === ServerMode.Development) {
@@ -121,17 +121,17 @@ export const createRequestHandler: CreateRequestHandlerFunction = (
     if (_build.future.middleware) {
       if (
         initialContext &&
-        !(initialContext instanceof unstable_RouterContextProvider)
+        !(initialContext instanceof RouterContextProvider)
       ) {
         let error = new Error(
           "Invalid `context` value provided to `handleRequest`. When middleware " +
-            "is enabled you must return an instance of `unstable_RouterContextProvider` " +
+            "is enabled you must return an instance of `RouterContextProvider` " +
             "from your `getLoadContext` function.",
         );
         handleError(error);
         return returnLastResortErrorResponse(error, serverMode);
       }
-      loadContext = initialContext || new unstable_RouterContextProvider();
+      loadContext = initialContext || new RouterContextProvider();
     } else {
       loadContext = initialContext || {};
     }
@@ -405,7 +405,7 @@ async function handleSingleFetchRequest(
   staticHandler: StaticHandler,
   request: Request,
   handlerUrl: URL,
-  loadContext: AppLoadContext | unstable_RouterContextProvider,
+  loadContext: AppLoadContext | RouterContextProvider,
   handleError: (err: unknown) => void,
 ): Promise<Response> {
   let response =
@@ -437,7 +437,7 @@ async function handleDocumentRequest(
   build: ServerBuild,
   staticHandler: StaticHandler,
   request: Request,
-  loadContext: AppLoadContext | unstable_RouterContextProvider,
+  loadContext: AppLoadContext | RouterContextProvider,
   handleError: (err: unknown) => void,
   isSpaMode: boolean,
   criticalCss?: CriticalCss,
@@ -535,7 +535,7 @@ async function handleDocumentRequest(
         headers,
         entryContext,
         loadContext as MiddlewareEnabled extends true
-          ? unstable_RouterContextProvider
+          ? RouterContextProvider
           : AppLoadContext,
       );
     } catch (error: unknown) {
@@ -599,7 +599,7 @@ async function handleDocumentRequest(
           headers,
           entryContext,
           loadContext as MiddlewareEnabled extends true
-            ? unstable_RouterContextProvider
+            ? RouterContextProvider
             : AppLoadContext,
         );
       } catch (error: any) {
@@ -616,7 +616,7 @@ async function handleResourceRequest(
   staticHandler: StaticHandler,
   routeId: string,
   request: Request,
-  loadContext: AppLoadContext | unstable_RouterContextProvider,
+  loadContext: AppLoadContext | RouterContextProvider,
   handleError: (err: unknown) => void,
 ) {
   try {
diff --git a/packages/react-router/lib/server-runtime/single-fetch.ts b/packages/react-router/lib/server-runtime/single-fetch.ts
index 0db720f31f..2ddb7cdad1 100644
--- a/packages/react-router/lib/server-runtime/single-fetch.ts
+++ b/packages/react-router/lib/server-runtime/single-fetch.ts
@@ -1,7 +1,7 @@
 import { encode } from "../../vendor/turbo-stream-v2/turbo-stream";
 import type { StaticHandler, StaticHandlerContext } from "../router/router";
 import { isRedirectStatusCode, isResponse } from "../router/router";
-import type { unstable_RouterContextProvider } from "../router/utils";
+import type { RouterContextProvider } from "../router/utils";
 import {
   isRouteErrorResponse,
   ErrorResponseImpl,
@@ -38,7 +38,7 @@ export async function singleFetchAction(
   staticHandler: StaticHandler,
   request: Request,
   handlerUrl: URL,
-  loadContext: AppLoadContext | unstable_RouterContextProvider,
+  loadContext: AppLoadContext | RouterContextProvider,
   handleError: (err: unknown) => void,
 ): Promise<Response> {
   try {
@@ -128,7 +128,7 @@ export async function singleFetchLoaders(
   staticHandler: StaticHandler,
   request: Request,
   handlerUrl: URL,
-  loadContext: AppLoadContext | unstable_RouterContextProvider,
+  loadContext: AppLoadContext | RouterContextProvider,
   handleError: (err: unknown) => void,
 ): Promise<Response> {
   let routesParam = new URL(request.url).searchParams.get("_routes");
diff --git a/packages/react-router/lib/types/route-data.ts b/packages/react-router/lib/types/route-data.ts
index 9ea474b152..9144aa42fc 100644
--- a/packages/react-router/lib/types/route-data.ts
+++ b/packages/react-router/lib/types/route-data.ts
@@ -4,7 +4,7 @@ import type {
 } from "../dom/ssr/routeModules";
 import type {
   DataWithResponseInit,
-  unstable_RouterContextProvider,
+  RouterContextProvider,
 } from "../router/utils";
 import type { Serializable } from "../server-runtime/single-fetch";
 import type { AppLoadContext } from "../server-runtime/data";
@@ -96,11 +96,11 @@ export type ClientDataFunctionArgs<Params> = {
    * When `future.middleware` is not enabled, this is undefined.
    *
    * When `future.middleware` is enabled, this is an instance of
-   * `unstable_RouterContextProvider` and can be used to access context values
+   * `RouterContextProvider` and can be used to access context values
    * from your route middlewares.  You may pass in initial context values in your
    * `<HydratedRouter unstable_getContext>` prop
    */
-  context: Readonly<unstable_RouterContextProvider>;
+  context: Readonly<RouterContextProvider>;
 };
 
 export type ServerDataFunctionArgs<Params> = {
@@ -128,13 +128,13 @@ export type ServerDataFunctionArgs<Params> = {
    * It is only applicable if you are using a custom server adapter.
    *
    * With `future.middleware` enabled, this is an instance of
-   * `unstable_RouterContextProvider` and can be used for type-safe access to
+   * `RouterContextProvider` and can be used for type-safe access to
    * context value set in your route middlewares.  If you are using a custom
    * server adapter, you may provide an initial set of context values from your
    * `getLoadContext` function.
    */
   context: MiddlewareEnabled extends true
-    ? Readonly<unstable_RouterContextProvider>
+    ? Readonly<RouterContextProvider>
     : AppLoadContext;
 };
 
diff --git a/playground/middleware/app/contexts.ts b/playground/middleware/app/contexts.ts
index b7a6674358..8b4068a4a7 100644
--- a/playground/middleware/app/contexts.ts
+++ b/playground/middleware/app/contexts.ts
@@ -1,6 +1,6 @@
-import { unstable_createContext } from "react-router";
+import { createContext } from "react-router";
 
-export const expressContext = unstable_createContext<string>("default");
-export const rootContext = unstable_createContext<string>();
-export const aContext = unstable_createContext<string>();
-export const bContext = unstable_createContext<string>("empty");
+export const expressContext = createContext<string>("default");
+export const rootContext = createContext<string>();
+export const aContext = createContext<string>();
+export const bContext = createContext<string>("empty");
diff --git a/playground/middleware/app/routes/client.a.b.tsx b/playground/middleware/app/routes/client.a.b.tsx
index 3187101d58..38db172a60 100644
--- a/playground/middleware/app/routes/client.a.b.tsx
+++ b/playground/middleware/app/routes/client.a.b.tsx
@@ -1,4 +1,4 @@
-import { Outlet, unstable_createContext } from "react-router";
+import { Outlet, createContext } from "react-router";
 import type { Route } from "./+types/client.a.b";
 import { aContext, bContext, rootContext } from "~/contexts";
 
diff --git a/playground/middleware/app/routes/server.a.b.tsx b/playground/middleware/app/routes/server.a.b.tsx
index 4fe56f2bfc..39fbfb24a7 100644
--- a/playground/middleware/app/routes/server.a.b.tsx
+++ b/playground/middleware/app/routes/server.a.b.tsx
@@ -1,4 +1,4 @@
-import { Outlet, unstable_createContext } from "react-router";
+import { Outlet, createContext } from "react-router";
 import type { Route } from "./+types/server.a.b";
 import { aContext, bContext, expressContext, rootContext } from "~/contexts";
 
diff --git a/playground/middleware/app/routes/server.a.tsx b/playground/middleware/app/routes/server.a.tsx
index d7b3b590c4..8a01ceac4d 100644
--- a/playground/middleware/app/routes/server.a.tsx
+++ b/playground/middleware/app/routes/server.a.tsx
@@ -1,4 +1,4 @@
-import { Outlet, unstable_createContext } from "react-router";
+import { Outlet, createContext } from "react-router";
 import type { Route } from "./+types/server.a";
 import { aContext, expressContext, rootContext } from "~/contexts";
 
diff --git a/playground/middleware/server.ts b/playground/middleware/server.ts
index 95ce10a032..ecf25ade87 100644
--- a/playground/middleware/server.ts
+++ b/playground/middleware/server.ts
@@ -3,7 +3,7 @@ import compression from "compression";
 import express from "express";
 import morgan from "morgan";
 import "react-router";
-import { unstable_RouterContextProvider } from "react-router";
+import { RouterContextProvider } from "react-router";
 import { expressContext } from "~/contexts";
 
 export const app = express();
@@ -23,7 +23,7 @@ app.use(
   createRequestHandler({
     build: () => import("virtual:react-router/server-build"),
     getLoadContext() {
-      return new unstable_RouterContextProvider(
+      return new RouterContextProvider(
         new Map([[expressContext, "Hello from Express"]]),
       );
     },
diff --git a/scripts/docs.ts b/scripts/docs.ts
index f0fb25b907..d98787c879 100644
--- a/scripts/docs.ts
+++ b/scripts/docs.ts
@@ -83,8 +83,7 @@ const CATEGORIES = [
 
 const warn = (...args: any[]) => console.warn("⚠️ Warning:", ...args);
 
-const isClassApi = (c: SimplifiedComment) =>
-  c.name === "unstable_RouterContextProvider";
+const isClassApi = (c: SimplifiedComment) => c.name === "RouterContextProvider";
 
 const isComponentApi = (c: SimplifiedComment) =>
   c.category === "Components" ||

From 40bfd92de4bc342a9b1a551bcf52ac98a8a974b2 Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Thu, 21 Aug 2025 16:55:39 -0400
Subject: [PATCH 05/14] Rename to future.v8_middleware

---
 docs/how-to/middleware.md                     |  6 +-
 integration/helpers/vite.ts                   |  2 +-
 integration/middleware-test.ts                | 92 +++++++++----------
 packages/react-router-dev/config/config.ts    |  2 +-
 packages/react-router-dev/typegen/generate.ts |  2 +-
 .../react-router/__tests__/dom/stub-test.tsx  |  2 +-
 .../__tests__/server-runtime/server-test.ts   |  2 +-
 .../lib/dom-export/hydrated-router.tsx        |  2 +-
 packages/react-router/lib/dom/ssr/entry.ts    |  2 +-
 .../react-router/lib/server-runtime/server.ts |  6 +-
 .../lib/server-runtime/single-fetch.ts        |  4 +-
 packages/react-router/lib/types/route-data.ts |  8 +-
 playground/middleware/react-router.config.ts  |  2 +-
 13 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/docs/how-to/middleware.md b/docs/how-to/middleware.md
index 250152f9ed..69e3907bbf 100644
--- a/docs/how-to/middleware.md
+++ b/docs/how-to/middleware.md
@@ -41,7 +41,7 @@ import type { Config } from "@react-router/dev/config";
 
 export default {
   future: {
-    middleware: true,
+    v8_middleware: true,
   },
 } satisfies Config;
 ```
@@ -138,7 +138,7 @@ function getLoadContext(req, res) {
 ```tsx
 const router = createBrowserRouter(routes, {
   future: {
-    middleware: true,
+    v8_middleware: true,
   },
 });
 ```
@@ -224,7 +224,7 @@ let sessionContext = createContext();
 
 const router = createBrowserRouter(routes, {
   future: {
-    middleware: true,
+    v8_middleware: true,
   },
   unstable_getContext() {
     let context = new RouterContextProvider();
diff --git a/integration/helpers/vite.ts b/integration/helpers/vite.ts
index 8235d6e73a..2caec7a987 100644
--- a/integration/helpers/vite.ts
+++ b/integration/helpers/vite.ts
@@ -53,7 +53,7 @@ export const reactRouterConfig = ({
     future: {
       unstable_splitRouteModules: splitRouteModules,
       unstable_viteEnvironmentApi: viteEnvironmentApi,
-      middleware: middleware,
+      v8_middleware: middleware,
     },
   };
 
diff --git a/integration/middleware-test.ts b/integration/middleware-test.ts
index a852b0a6bc..1227f97ca0 100644
--- a/integration/middleware-test.ts
+++ b/integration/middleware-test.ts
@@ -101,7 +101,7 @@ test.describe("Middleware", () => {
         files: {
           "react-router.config.ts": reactRouterConfig({
             ssr: false,
-            middleware: true,
+            v8_middleware: true,
           }),
           "vite.config.ts": js`
             import { defineConfig } from "vite";
@@ -191,7 +191,7 @@ test.describe("Middleware", () => {
         files: {
           "react-router.config.ts": reactRouterConfig({
             ssr: false,
-            middleware: true,
+            v8_middleware: true,
             splitRouteModules: true,
           }),
           "vite.config.ts": js`
@@ -280,7 +280,7 @@ test.describe("Middleware", () => {
         files: {
           "react-router.config.ts": reactRouterConfig({
             ssr: false,
-            middleware: true,
+            v8_middleware: true,
           }),
           "vite.config.ts": js`
             import { defineConfig } from "vite";
@@ -356,7 +356,7 @@ test.describe("Middleware", () => {
         files: {
           "react-router.config.ts": reactRouterConfig({
             ssr: false,
-            middleware: true,
+            v8_middleware: true,
           }),
           "vite.config.ts": js`
             import { defineConfig } from "vite";
@@ -409,7 +409,7 @@ test.describe("Middleware", () => {
         files: {
           "react-router.config.ts": reactRouterConfig({
             ssr: false,
-            middleware: true,
+            v8_middleware: true,
           }),
           "vite.config.ts": js`
             import { defineConfig } from "vite";
@@ -466,7 +466,7 @@ test.describe("Middleware", () => {
           files: {
             "react-router.config.ts": reactRouterConfig({
               ssr: false,
-              middleware: true,
+              v8_middleware: true,
             }),
             "vite.config.ts": js`
               import { defineConfig } from "vite";
@@ -525,7 +525,7 @@ test.describe("Middleware", () => {
           files: {
             "react-router.config.ts": reactRouterConfig({
               ssr: false,
-              middleware: true,
+              v8_middleware: true,
             }),
             "vite.config.ts": js`
               import { defineConfig } from "vite";
@@ -595,7 +595,7 @@ test.describe("Middleware", () => {
         files: {
           "react-router.config.ts": reactRouterConfig({
             ssr: false,
-            middleware: true,
+            v8_middleware: true,
           }),
           "vite.config.ts": js`
             import { defineConfig } from "vite";
@@ -678,7 +678,7 @@ test.describe("Middleware", () => {
       let fixture = await createFixture({
         files: {
           "react-router.config.ts": reactRouterConfig({
-            middleware: true,
+            v8_middleware: true,
           }),
           "vite.config.ts": js`
             import { defineConfig } from "vite";
@@ -765,7 +765,7 @@ test.describe("Middleware", () => {
       let fixture = await createFixture({
         files: {
           "react-router.config.ts": reactRouterConfig({
-            middleware: true,
+            v8_middleware: true,
             splitRouteModules: true,
           }),
           "vite.config.ts": js`
@@ -851,7 +851,7 @@ test.describe("Middleware", () => {
       let fixture = await createFixture({
         files: {
           "react-router.config.ts": reactRouterConfig({
-            middleware: true,
+            v8_middleware: true,
           }),
           "vite.config.ts": js`
             import { defineConfig } from "vite";
@@ -924,7 +924,7 @@ test.describe("Middleware", () => {
       let fixture = await createFixture({
         files: {
           "react-router.config.ts": reactRouterConfig({
-            middleware: true,
+            v8_middleware: true,
           }),
           "vite.config.ts": js`
             import { defineConfig } from "vite";
@@ -998,7 +998,7 @@ test.describe("Middleware", () => {
       let fixture = await createFixture({
         files: {
           "react-router.config.ts": reactRouterConfig({
-            middleware: true,
+            v8_middleware: true,
           }),
           "vite.config.ts": js`
             import { defineConfig } from "vite";
@@ -1049,7 +1049,7 @@ test.describe("Middleware", () => {
       let fixture = await createFixture({
         files: {
           "react-router.config.ts": reactRouterConfig({
-            middleware: true,
+            v8_middleware: true,
           }),
           "vite.config.ts": js`
             import { defineConfig } from "vite";
@@ -1104,7 +1104,7 @@ test.describe("Middleware", () => {
         {
           files: {
             "react-router.config.ts": reactRouterConfig({
-              middleware: true,
+              v8_middleware: true,
             }),
             "vite.config.ts": js`
               import { defineConfig } from "vite";
@@ -1161,7 +1161,7 @@ test.describe("Middleware", () => {
         {
           files: {
             "react-router.config.ts": reactRouterConfig({
-              middleware: true,
+              v8_middleware: true,
             }),
             "vite.config.ts": js`
               import { defineConfig } from "vite";
@@ -1230,7 +1230,7 @@ test.describe("Middleware", () => {
       let fixture = await createFixture({
         files: {
           "react-router.config.ts": reactRouterConfig({
-            middleware: true,
+            v8_middleware: true,
           }),
           "vite.config.ts": js`
             import { defineConfig } from "vite";
@@ -1311,7 +1311,7 @@ test.describe("Middleware", () => {
       let fixture = await createFixture({
         files: {
           "react-router.config.ts": reactRouterConfig({
-            middleware: true,
+            v8_middleware: true,
           }),
           "vite.config.ts": js`
             import { defineConfig } from "vite";
@@ -1433,7 +1433,7 @@ test.describe("Middleware", () => {
       let fixture = await createFixture({
         files: {
           "react-router.config.ts": reactRouterConfig({
-            middleware: true,
+            v8_middleware: true,
           }),
           "vite.config.ts": js`
             import { defineConfig } from "vite";
@@ -1595,7 +1595,7 @@ test.describe("Middleware", () => {
       let fixture = await createFixture({
         files: {
           "react-router.config.ts": reactRouterConfig({
-            middleware: true,
+            v8_middleware: true,
           }),
           "vite.config.ts": js`
             import { defineConfig } from "vite";
@@ -1686,7 +1686,7 @@ test.describe("Middleware", () => {
       let fixture = await createFixture({
         files: {
           "react-router.config.ts": reactRouterConfig({
-            middleware: true,
+            v8_middleware: true,
           }),
           "vite.config.ts": js`
             import { defineConfig } from "vite";
@@ -1768,7 +1768,7 @@ test.describe("Middleware", () => {
       let fixture = await createFixture({
         files: {
           "react-router.config.ts": reactRouterConfig({
-            middleware: true,
+            v8_middleware: true,
           }),
           "vite.config.ts": js`
             import { defineConfig } from "vite";
@@ -1842,7 +1842,7 @@ test.describe("Middleware", () => {
       let fixture = await createFixture({
         files: {
           "react-router.config.ts": reactRouterConfig({
-            middleware: true,
+            v8_middleware: true,
           }),
           "vite.config.ts": js`
             import { defineConfig } from "vite";
@@ -1900,7 +1900,7 @@ test.describe("Middleware", () => {
       let fixture = await createFixture({
         files: {
           "react-router.config.ts": reactRouterConfig({
-            middleware: true,
+            v8_middleware: true,
           }),
           "vite.config.ts": js`
             import { defineConfig } from "vite";
@@ -1963,7 +1963,7 @@ test.describe("Middleware", () => {
       let fixture = await createFixture({
         files: {
           "react-router.config.ts": reactRouterConfig({
-            middleware: true,
+            v8_middleware: true,
           }),
           "vite.config.ts": js`
             import { defineConfig } from "vite";
@@ -2027,7 +2027,7 @@ test.describe("Middleware", () => {
         {
           files: {
             "react-router.config.ts": reactRouterConfig({
-              middleware: true,
+              v8_middleware: true,
             }),
             "vite.config.ts": js`
               import { defineConfig } from "vite";
@@ -2086,7 +2086,7 @@ test.describe("Middleware", () => {
         {
           files: {
             "react-router.config.ts": reactRouterConfig({
-              middleware: true,
+              v8_middleware: true,
             }),
             "vite.config.ts": js`
               import { defineConfig } from "vite";
@@ -2160,7 +2160,7 @@ test.describe("Middleware", () => {
               });
             `,
             "react-router.config.ts": reactRouterConfig({
-              middleware: true,
+              v8_middleware: true,
             }),
             "app/entry.server.tsx": ENTRY_SERVER_WITH_HANDLE_ERROR,
             "app/routes/_index.tsx": js`
@@ -2220,7 +2220,7 @@ test.describe("Middleware", () => {
         {
           files: {
             "react-router.config.ts": reactRouterConfig({
-              middleware: true,
+              v8_middleware: true,
             }),
             "vite.config.ts": js`
               import { defineConfig } from "vite";
@@ -2293,7 +2293,7 @@ test.describe("Middleware", () => {
         {
           files: {
             "react-router.config.ts": reactRouterConfig({
-              middleware: true,
+              v8_middleware: true,
             }),
             "vite.config.ts": js`
               import { defineConfig } from "vite";
@@ -2378,7 +2378,7 @@ test.describe("Middleware", () => {
         {
           files: {
             "react-router.config.ts": reactRouterConfig({
-              middleware: true,
+              v8_middleware: true,
             }),
             "vite.config.ts": js`
               import { defineConfig } from "vite";
@@ -2468,7 +2468,7 @@ test.describe("Middleware", () => {
         {
           files: {
             "react-router.config.ts": reactRouterConfig({
-              middleware: true,
+              v8_middleware: true,
             }),
             "vite.config.ts": js`
               import { defineConfig } from "vite";
@@ -2559,7 +2559,7 @@ test.describe("Middleware", () => {
         {
           files: {
             "react-router.config.ts": reactRouterConfig({
-              middleware: true,
+              v8_middleware: true,
             }),
             "vite.config.ts": js`
               import { defineConfig } from "vite";
@@ -2667,7 +2667,7 @@ test.describe("Middleware", () => {
         {
           files: {
             "react-router.config.ts": reactRouterConfig({
-              middleware: true,
+              v8_middleware: true,
             }),
             "vite.config.ts": js`
               import { defineConfig } from "vite";
@@ -2770,7 +2770,7 @@ test.describe("Middleware", () => {
         {
           files: {
             "react-router.config.ts": reactRouterConfig({
-              middleware: true,
+              v8_middleware: true,
             }),
             "vite.config.ts": js`
               import { defineConfig } from "vite";
@@ -2890,7 +2890,7 @@ test.describe("Middleware", () => {
         {
           files: {
             "react-router.config.ts": reactRouterConfig({
-              middleware: true,
+              v8_middleware: true,
             }),
             "vite.config.ts": js`
               import { defineConfig } from "vite";
@@ -3021,7 +3021,7 @@ test.describe("Middleware", () => {
         {
           files: {
             "react-router.config.ts": reactRouterConfig({
-              middleware: true,
+              v8_middleware: true,
             }),
             "vite.config.ts": js`
               import { defineConfig } from "vite";
@@ -3130,7 +3130,7 @@ test.describe("Middleware", () => {
         {
           files: {
             "react-router.config.ts": reactRouterConfig({
-              middleware: true,
+              v8_middleware: true,
             }),
             "vite.config.ts": js`
               import { defineConfig } from "vite";
@@ -3248,7 +3248,7 @@ test.describe("Middleware", () => {
       let fixture = await createFixture({
         files: {
           "react-router.config.ts": reactRouterConfig({
-            middleware: true,
+            v8_middleware: true,
           }),
           "vite.config.ts": js`
             import { defineConfig } from "vite";
@@ -3339,7 +3339,7 @@ test.describe("Middleware", () => {
       let fixture = await createFixture({
         files: {
           "react-router.config.ts": reactRouterConfig({
-            middleware: true,
+            v8_middleware: true,
           }),
           "vite.config.ts": js`
             import { defineConfig } from "vite";
@@ -3418,7 +3418,7 @@ test.describe("Middleware", () => {
       let fixture = await createFixture({
         files: {
           "react-router.config.ts": reactRouterConfig({
-            middleware: true,
+            v8_middleware: true,
           }),
           "vite.config.ts": js`
             import { defineConfig } from "vite";
@@ -3497,7 +3497,7 @@ test.describe("Middleware", () => {
       let fixture = await createFixture({
         files: {
           "react-router.config.ts": reactRouterConfig({
-            middleware: true,
+            v8_middleware: true,
           }),
           "vite.config.ts": js`
             import { defineConfig } from "vite";
@@ -3612,7 +3612,7 @@ test.describe("Middleware", () => {
         {
           files: {
             "react-router.config.ts": reactRouterConfig({
-              middleware: true,
+              v8_middleware: true,
             }),
             "vite.config.ts": js`
               import { defineConfig } from "vite";
@@ -3658,7 +3658,7 @@ test.describe("Middleware", () => {
         {
           files: {
             "react-router.config.ts": reactRouterConfig({
-              middleware: true,
+              v8_middleware: true,
             }),
             "vite.config.ts": js`
               import { defineConfig } from "vite";
@@ -3704,7 +3704,7 @@ test.describe("Middleware", () => {
         {
           files: {
             "react-router.config.ts": reactRouterConfig({
-              middleware: true,
+              v8_middleware: true,
             }),
             "vite.config.ts": js`
               import { defineConfig } from "vite";
@@ -3751,7 +3751,7 @@ test.describe("Middleware", () => {
         {
           files: {
             "react-router.config.ts": reactRouterConfig({
-              middleware: true,
+              v8_middleware: true,
             }),
             "vite.config.ts": js`
               import { defineConfig } from "vite";
diff --git a/packages/react-router-dev/config/config.ts b/packages/react-router-dev/config/config.ts
index 3bc7047a36..8a0a55024c 100644
--- a/packages/react-router-dev/config/config.ts
+++ b/packages/react-router-dev/config/config.ts
@@ -87,7 +87,7 @@ interface FutureConfig {
   /**
    * Enable route middleware
    */
-  middleware: boolean;
+  v8_middleware: boolean;
   unstable_optimizeDeps: boolean;
   /**
    * Automatically split route modules into multiple chunks when possible.
diff --git a/packages/react-router-dev/typegen/generate.ts b/packages/react-router-dev/typegen/generate.ts
index 78724772f9..6bb3742db3 100644
--- a/packages/react-router-dev/typegen/generate.ts
+++ b/packages/react-router-dev/typegen/generate.ts
@@ -23,7 +23,7 @@ export function generateFuture(ctx: Context): VirtualFile {
 
     declare module "react-router" {
       interface Future {
-        middleware: ${ctx.config.future.middleware}
+        middleware: ${ctx.config.future.v8_middleware}
       }
     }
   `;
diff --git a/packages/react-router/__tests__/dom/stub-test.tsx b/packages/react-router/__tests__/dom/stub-test.tsx
index a2b66c7b26..b0de8d060c 100644
--- a/packages/react-router/__tests__/dom/stub-test.tsx
+++ b/packages/react-router/__tests__/dom/stub-test.tsx
@@ -316,7 +316,7 @@ test("can pass context values (w/middleware)", async () => {
   );
 
   render(
-    <RoutesStub future={{ middleware: true }} initialEntries={["/hello"]} />,
+    <RoutesStub future={{ v8_middleware: true }} initialEntries={["/hello"]} />,
   );
 
   expect(await screen.findByTestId("root")).toHaveTextContent(/Context: hello/);
diff --git a/packages/react-router/__tests__/server-runtime/server-test.ts b/packages/react-router/__tests__/server-runtime/server-test.ts
index 2b7ace61bb..69ab365b3a 100644
--- a/packages/react-router/__tests__/server-runtime/server-test.ts
+++ b/packages/react-router/__tests__/server-runtime/server-test.ts
@@ -155,7 +155,7 @@ describe("server", () => {
         },
         {
           future: {
-            middleware: true,
+            v8_middleware: true,
           },
           handleError: handleErrorSpy,
           handleDocumentRequest(request) {
diff --git a/packages/react-router/lib/dom-export/hydrated-router.tsx b/packages/react-router/lib/dom-export/hydrated-router.tsx
index 7341b96d81..c6f48edcdd 100644
--- a/packages/react-router/lib/dom-export/hydrated-router.tsx
+++ b/packages/react-router/lib/dom-export/hydrated-router.tsx
@@ -174,7 +174,7 @@ function createHydratedRouter({
     hydrationRouteProperties,
     mapRouteProperties,
     future: {
-      middleware: ssrInfo.context.future.middleware,
+      middleware: ssrInfo.context.future.v8_middleware,
     },
     dataStrategy: getTurboStreamSingleFetchDataStrategy(
       () => router,
diff --git a/packages/react-router/lib/dom/ssr/entry.ts b/packages/react-router/lib/dom/ssr/entry.ts
index 417d35a918..1752c5578f 100644
--- a/packages/react-router/lib/dom/ssr/entry.ts
+++ b/packages/react-router/lib/dom/ssr/entry.ts
@@ -45,7 +45,7 @@ export interface EntryContext extends FrameworkContextObject {
 
 export interface FutureConfig {
   unstable_subResourceIntegrity: boolean;
-  middleware: boolean;
+  v8_middleware: boolean;
 }
 
 export type CriticalCss = string | { rel: "stylesheet"; href: string };
diff --git a/packages/react-router/lib/server-runtime/server.ts b/packages/react-router/lib/server-runtime/server.ts
index 046486638c..acd1a47828 100644
--- a/packages/react-router/lib/server-runtime/server.ts
+++ b/packages/react-router/lib/server-runtime/server.ts
@@ -118,7 +118,7 @@ export const createRequestHandler: CreateRequestHandlerFunction = (
       });
     };
 
-    if (_build.future.middleware) {
+    if (_build.future.v8_middleware) {
       if (
         initialContext &&
         !(initialContext instanceof RouterContextProvider)
@@ -445,7 +445,7 @@ async function handleDocumentRequest(
   try {
     let result = await staticHandler.query(request, {
       requestContext: loadContext,
-      unstable_generateMiddlewareResponse: build.future.middleware
+      unstable_generateMiddlewareResponse: build.future.v8_middleware
         ? async (query) => {
             try {
               let innerResult = await query(request);
@@ -626,7 +626,7 @@ async function handleResourceRequest(
     let result = await staticHandler.queryRoute(request, {
       routeId,
       requestContext: loadContext,
-      unstable_generateMiddlewareResponse: build.future.middleware
+      unstable_generateMiddlewareResponse: build.future.v8_middleware
         ? async (queryRoute) => {
             try {
               let innerResult = await queryRoute(request);
diff --git a/packages/react-router/lib/server-runtime/single-fetch.ts b/packages/react-router/lib/server-runtime/single-fetch.ts
index 2ddb7cdad1..8e849e4083 100644
--- a/packages/react-router/lib/server-runtime/single-fetch.ts
+++ b/packages/react-router/lib/server-runtime/single-fetch.ts
@@ -54,7 +54,7 @@ export async function singleFetchAction(
       requestContext: loadContext,
       skipLoaderErrorBubbling: true,
       skipRevalidation: true,
-      unstable_generateMiddlewareResponse: build.future.middleware
+      unstable_generateMiddlewareResponse: build.future.v8_middleware
         ? async (query) => {
             try {
               let innerResult = await query(handlerRequest);
@@ -144,7 +144,7 @@ export async function singleFetchLoaders(
       requestContext: loadContext,
       filterMatchesToLoad: (m) => !loadRouteIds || loadRouteIds.has(m.route.id),
       skipLoaderErrorBubbling: true,
-      unstable_generateMiddlewareResponse: build.future.middleware
+      unstable_generateMiddlewareResponse: build.future.v8_middleware
         ? async (query) => {
             try {
               let innerResult = await query(handlerRequest);
diff --git a/packages/react-router/lib/types/route-data.ts b/packages/react-router/lib/types/route-data.ts
index 9144aa42fc..f8ffb0aac4 100644
--- a/packages/react-router/lib/types/route-data.ts
+++ b/packages/react-router/lib/types/route-data.ts
@@ -93,9 +93,9 @@ export type ClientDataFunctionArgs<Params> = {
    **/
   params: Params;
   /**
-   * When `future.middleware` is not enabled, this is undefined.
+   * When `future.v8_middleware` is not enabled, this is undefined.
    *
-   * When `future.middleware` is enabled, this is an instance of
+   * When `future.v8_middleware` is enabled, this is an instance of
    * `RouterContextProvider` and can be used to access context values
    * from your route middlewares.  You may pass in initial context values in your
    * `<HydratedRouter unstable_getContext>` prop
@@ -122,12 +122,12 @@ export type ServerDataFunctionArgs<Params> = {
    **/
   params: Params;
   /**
-   * Without `future.middleware` enabled, this is the context passed in
+   * Without `future.v8_middleware` enabled, this is the context passed in
    * to your server adapter's `getLoadContext` function. It's a way to bridge the
    * gap between the adapter's request/response API with your React Router app.
    * It is only applicable if you are using a custom server adapter.
    *
-   * With `future.middleware` enabled, this is an instance of
+   * With `future.v8_middleware` enabled, this is an instance of
    * `RouterContextProvider` and can be used for type-safe access to
    * context value set in your route middlewares.  If you are using a custom
    * server adapter, you may provide an initial set of context values from your
diff --git a/playground/middleware/react-router.config.ts b/playground/middleware/react-router.config.ts
index 83de270203..50a93eb114 100644
--- a/playground/middleware/react-router.config.ts
+++ b/playground/middleware/react-router.config.ts
@@ -2,7 +2,7 @@ import type { Config } from "@react-router/dev/config";
 
 export default {
   future: {
-    middleware: true,
+    v8_middleware: true,
     unstable_splitRouteModules: true,
   },
 } satisfies Config;

From f1b0dff32070ab66c12ba34f90f65a81dc31a580 Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Thu, 21 Aug 2025 17:05:35 -0400
Subject: [PATCH 06/14] Update docs

---
 docs/community/api-development-strategy.md |  9 +++--
 docs/how-to/middleware.md                  |  4 +--
 docs/upgrading/future.md                   | 41 +++++++++++++++++++++-
 3 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/docs/community/api-development-strategy.md b/docs/community/api-development-strategy.md
index c4c6afb1b5..bfb5cd64ad 100644
--- a/docs/community/api-development-strategy.md
+++ b/docs/community/api-development-strategy.md
@@ -6,7 +6,7 @@ title: API Development Strategy
 
 React Router is foundational to your application. We want to make sure that upgrading to new major versions is as smooth as possible while still allowing us to adjust and enhance the behavior and API as the React ecosystem advances.
 
-Our strategy and motivations are discussed in more detail in our [Future Flags][future-flags-blog-post] blog post.
+Our strategy and motivations are discussed in more detail in our [Future Flags][future-flags-blog-post] blog post and our [Open Governance Model][governance].
 
 ## Future Flags
 
@@ -36,10 +36,9 @@ To learn about current unstable flags, keep an eye on the [CHANGELOG](../start/c
 
 ### Example New Feature Flow
 
-The decision flow for a new feature looks something like this (note this diagram is in relation to Remix v1/v2 but applies to React Router v6/v7 as well):
+The decision flow for a new feature looks something like this:
 
-![Flowchart of the decision process for how to introduce a new feature][feature-flowchart]
+<img width="400" src="https://reactrouter.com/_docs/feature-flowchart.png" alt="Flowchart of the decision process for how to introduce a new feature" />
 
 [future-flags-blog-post]: https://remix.run/blog/future-flags
-[feature-flowchart]: https://remix.run/docs-images/feature-flowchart.png
-[picking-a-router]: ../routers/picking-a-router
+[governance]: https://github.com/remix-run/react-router/blob/main/GOVERNANCE.md#new-feature-process
diff --git a/docs/how-to/middleware.md b/docs/how-to/middleware.md
index 69e3907bbf..8b4827676b 100644
--- a/docs/how-to/middleware.md
+++ b/docs/how-to/middleware.md
@@ -1,6 +1,5 @@
 ---
 title: Middleware
-unstable: true
 ---
 
 # Middleware
@@ -10,7 +9,7 @@ unstable: true
 <br/>
 <br/>
 
-<docs-warning>The middleware feature is currently experimental and subject to breaking changes. Use the `future.middleware` flag to enable it.</docs-warning>
+<docs-info>In Framework Mode, you must opt-into middleware via the [`future.v8_middleware`][future-flags] flag because it contains a minor [breaking change][getloadcontext] to the `getLoadContext` function and the loader/action `context` parameter.</docs-info>
 
 Middleware allows you to run code before and after the [`Response`][Response] generation for the matched path. This enables [common patterns][common-patterns] like authentication, logging, error handling, and data preprocessing in a reusable way.
 
@@ -721,6 +720,7 @@ export async function loader({
 }
 ```
 
+[future-flags]: ../upgrading/future
 [Response]: https://developer.mozilla.org/en-US/docs/Web/API/Response
 [common-patterns]: #common-patterns
 [server-client]: #server-vs-client-middleware
diff --git a/docs/upgrading/future.md b/docs/upgrading/future.md
index 2fcb46c0d4..682400de1b 100644
--- a/docs/upgrading/future.md
+++ b/docs/upgrading/future.md
@@ -9,4 +9,43 @@ This guide walks you through the process of adopting future flags in your React
 
 We highly recommend you make a commit after each step and ship it instead of doing everything all at once. Most flags can be adopted in any order, with exceptions noted below.
 
-<docs-warning>**There are no current future flags in React Router v7**</docs-warning>
+## Update to latest v7.x
+
+First update to the latest minor version of v7.x to have the latest future flags. You may see a number of deprecation warnings as you upgrade, which we'll cover below.
+
+👉 Update to latest v7
+
+```sh
+npm install react-router@7 @react-router/{dev,node,etc.}@7
+```
+
+## `future.v8_middleware`
+
+[MODES: framework]
+
+<br/>
+<br/>
+
+**Background**
+
+Middleware allows you to run code before and after the [`Response`][Response] generation for the matched path. This enables common patterns like authentication, logging, error handling, and data preprocessing in a reusable way. Please see the [docs](../how-to/middleware) for more information.
+
+👉 **Enable the Flag**
+
+```ts filename=react-router.config.ts
+import type { Config } from "@react-router/dev/config";
+
+export default {
+  future: {
+    v8_middleware: true,
+  },
+} satisfies Config;
+```
+
+**Update your Code**
+
+If you're using `react-router-serve`, then you should not need to make any updates to your code.
+
+You should only need to update your code if you are using the `context` parameter in `loader` and `action` functions. This only applies if you have a custom server with a `getLoadContext` function. Please see the docs on the middleware [`getLoadContext` changes](../how-to/middleware#changes-to-getloadcontextapploadcontext) and the instructions to [migrate to the new API](../how-to/middleware#migration-from-apploadcontext).
+
+[Response]: https://developer.mozilla.org/en-US/docs/Web/API/Response

From 3b7ca86ee41afbb671afce0c4d093cfc15d39dea Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Thu, 21 Aug 2025 17:14:58 -0400
Subject: [PATCH 07/14] Remove prefix from getContext

---
 docs/how-to/middleware.md                     | 29 ++++++-------------
 integration/browser-entry-test.ts             |  2 +-
 .../helpers/rsc-parcel/src/browser.tsx        |  4 +--
 .../src/config/unstable-get-context.ts        |  2 +-
 .../src/config/unstable-get-context.ts        |  2 +-
 .../helpers/rsc-vite/src/entry.browser.tsx    |  4 +--
 integration/rsc/rsc-test.ts                   |  6 ++--
 .../router/context-middleware-test.ts         | 12 ++++----
 packages/react-router/lib/components.tsx      |  6 ++--
 .../lib/dom-export/hydrated-router.tsx        | 12 ++++----
 packages/react-router/lib/dom/lib.tsx         | 12 ++++----
 packages/react-router/lib/router/router.ts    | 15 ++++------
 packages/react-router/lib/rsc/browser.tsx     | 21 +++++---------
 packages/react-router/lib/types/route-data.ts |  2 +-
 14 files changed, 54 insertions(+), 75 deletions(-)

diff --git a/docs/how-to/middleware.md b/docs/how-to/middleware.md
index 8b4827676b..12b8797f62 100644
--- a/docs/how-to/middleware.md
+++ b/docs/how-to/middleware.md
@@ -132,17 +132,9 @@ function getLoadContext(req, res) {
 
 ## Quick Start (Data Mode)
 
-### 1. Enable the middleware flag
+<docs-info>Note there is no future flag in Data Mode because you can opt-into middleware by adding it to your routes, no breaking changes exist that require a future flag.</docs-info>
 
-```tsx
-const router = createBrowserRouter(routes, {
-  future: {
-    v8_middleware: true,
-  },
-});
-```
-
-### 2. Create a context
+### 1. Create a context
 
 Middleware uses a `context` provider instance to provide data down the middleware chain.
 You can create type-safe context objects using [`createContext`][createContext]:
@@ -154,7 +146,7 @@ import type { User } from "~/types";
 export const userContext = createContext<User | null>(null);
 ```
 
-### 3. Add middleware to your routes
+### 2. Add middleware to your routes
 
 ```tsx
 import { redirect } from "react-router";
@@ -214,18 +206,15 @@ export default function Profile() {
 }
 ```
 
-### 4. Add an `unstable_getContext` function (optional)
+### 3. Add an `getContext` function (optional)
 
-If you wish to include a base context on all navigations/fetches, you can add an [`unstable_getContext`][getContext] function to your router. This will be called to populate a fresh context on every navigation/fetch.
+If you wish to include a base context on all navigations/fetches, you can add an [`getContext`][getContext] function to your router. This will be called to populate a fresh context on every navigation/fetch.
 
 ```tsx
 let sessionContext = createContext();
 
 const router = createBrowserRouter(routes, {
-  future: {
-    v8_middleware: true,
-  },
-  unstable_getContext() {
+  getContext() {
     let context = new RouterContextProvider();
     context.set(sessionContext, getSession());
     return context;
@@ -233,7 +222,7 @@ const router = createBrowserRouter(routes, {
 });
 ```
 
-<docs-info>This API exists to mirror the `getLoadContext` API on the server in Framework Mode, which exists as a way to hand off values from your HTTP server to the React Router handler. This [`unstable_getContext`][getContext] API can be used to hand off global values from the [`window`][window]/[`document`][document] to React Router, but because they're all running in the same context (the browser), you can achieve effectively the same behavior with root route middleware. Therefore, you may not need this API the same way you would on the server - but it's provided for consistency.</docs-warning>
+<docs-info>This API exists to mirror the `getLoadContext` API on the server in Framework Mode, which exists as a way to hand off values from your HTTP server to the React Router handler. This [`getContext`][getContext] API can be used to hand off global values from the [`window`][window]/[`document`][document] to React Router, but because they're all running in the same context (the browser), you can achieve effectively the same behavior with root route middleware. Therefore, you may not need this API the same way you would on the server - but it's provided for consistency.</docs-warning>
 
 ## Core Concepts
 
@@ -562,7 +551,7 @@ This allows you to leave your `action`s/`loader`s untouched during initial adopt
 
 <docs-warning>This approach is only intended to be used as a migration strategy when adopting middleware in React Router v7, allowing you to incrementally migrate to `context.set`/`context.get`. It is not safe to assume this approach will work in the next major version of React Router.</docs-warning>
 
-<docs-warning>The [`RouterContextProvider`][RouterContextProvider] class is also used for the client-side `context` parameter via `<HydratedRouter unstable_getContext>` and `<RouterProvider unstable_getContext>`. Since `AppLoadContext` is primarily intended as a hand-off from your HTTP server into the React Router handlers, you need to be aware that these augmented fields will not be available in `clientMiddleware`, `clientLoader`, or `clientAction` functions even thought TypeScript will tell you they are (unless, of course, you provide the fields via `unstable_getContext` on the client).</docs-warning>
+<docs-warning>The [`RouterContextProvider`][RouterContextProvider] class is also used for the client-side `context` parameter via `<HydratedRouter getContext>` and `<RouterProvider getContext>`. Since `AppLoadContext` is primarily intended as a hand-off from your HTTP server into the React Router handlers, you need to be aware that these augmented fields will not be available in `clientMiddleware`, `clientLoader`, or `clientAction` functions even thought TypeScript will tell you they are (unless, of course, you provide the fields via `getContext` on the client).</docs-warning>
 
 ## Common Patterns
 
@@ -732,7 +721,7 @@ export async function loader({
 [cms-redirect]: #cms-redirect-on-404
 [createContext]: ../api/utils/createContext
 [RouterContextProvider]: ../api/utils/RouterContextProvider
-[getContext]: ../api/data-routers/createBrowserRouter#optsunstable_getContext
+[getContext]: ../api/data-routers/createBrowserRouter#optsgetContext
 [window]: https://developer.mozilla.org/en-US/docs/Web/API/Window
 [document]: https://developer.mozilla.org/en-US/docs/Web/API/Document
 [request]: https://developer.mozilla.org/en-US/docs/Web/API/Request
diff --git a/integration/browser-entry-test.ts b/integration/browser-entry-test.ts
index 86290d9a15..37e1dbce47 100644
--- a/integration/browser-entry-test.ts
+++ b/integration/browser-entry-test.ts
@@ -99,7 +99,7 @@ test("allows users to pass a client side context to HydratedRouter", async ({
             document,
             <StrictMode>
               <HydratedRouter
-                unstable_getContext={() => {
+                getContext={() => {
                   return new RouterContextProvider([
                     [myContext, 'bar']
                   ]);
diff --git a/integration/helpers/rsc-parcel/src/browser.tsx b/integration/helpers/rsc-parcel/src/browser.tsx
index 37f35708b0..b750793dd3 100644
--- a/integration/helpers/rsc-parcel/src/browser.tsx
+++ b/integration/helpers/rsc-parcel/src/browser.tsx
@@ -15,7 +15,7 @@ import {
   setServerCallback,
   // @ts-expect-error - no types for this yet
 } from "react-server-dom-parcel/client";
-import { unstable_getContext } from "./config/unstable-get-context";
+import { getContext } from "./config/unstable-get-context";
 
 // Create and set the callServer function to support post-hydration server actions.
 setServerCallback(
@@ -39,7 +39,7 @@ createFromReadableStream(getRSCStream()).then((payload: RSCPayload) => {
         <RSCHydratedRouter
           payload={payload}
           createFromReadableStream={createFromReadableStream}
-          unstable_getContext={unstable_getContext}
+          getContext={getContext}
         />
       </StrictMode>,
       {
diff --git a/integration/helpers/rsc-parcel/src/config/unstable-get-context.ts b/integration/helpers/rsc-parcel/src/config/unstable-get-context.ts
index 2616a6a1b1..43ad6d9d54 100644
--- a/integration/helpers/rsc-parcel/src/config/unstable-get-context.ts
+++ b/integration/helpers/rsc-parcel/src/config/unstable-get-context.ts
@@ -1,2 +1,2 @@
 // THIS FILE IS DESIGNED TO BE OVERRIDDEN IN TESTS IF NEEDED
-export const unstable_getContext = undefined;
+export const getContext = undefined;
diff --git a/integration/helpers/rsc-vite/src/config/unstable-get-context.ts b/integration/helpers/rsc-vite/src/config/unstable-get-context.ts
index 2616a6a1b1..43ad6d9d54 100644
--- a/integration/helpers/rsc-vite/src/config/unstable-get-context.ts
+++ b/integration/helpers/rsc-vite/src/config/unstable-get-context.ts
@@ -1,2 +1,2 @@
 // THIS FILE IS DESIGNED TO BE OVERRIDDEN IN TESTS IF NEEDED
-export const unstable_getContext = undefined;
+export const getContext = undefined;
diff --git a/integration/helpers/rsc-vite/src/entry.browser.tsx b/integration/helpers/rsc-vite/src/entry.browser.tsx
index 87d5effe24..34049f0a16 100644
--- a/integration/helpers/rsc-vite/src/entry.browser.tsx
+++ b/integration/helpers/rsc-vite/src/entry.browser.tsx
@@ -12,7 +12,7 @@ import {
   unstable_RSCHydratedRouter as RSCHydratedRouter,
 } from "react-router";
 import type { unstable_RSCPayload as RSCPayload } from "react-router";
-import { unstable_getContext } from "./config/unstable-get-context";
+import { getContext } from "./config/unstable-get-context";
 
 setServerCallback(
   createCallServer({
@@ -30,7 +30,7 @@ createFromReadableStream<RSCPayload>(getRSCStream()).then((payload) => {
         <RSCHydratedRouter
           payload={payload}
           createFromReadableStream={createFromReadableStream}
-          unstable_getContext={unstable_getContext}
+          getContext={getContext}
         />
       </StrictMode>,
     );
diff --git a/integration/rsc/rsc-test.ts b/integration/rsc/rsc-test.ts
index d6b4b67dd7..bdc55b9a83 100644
--- a/integration/rsc/rsc-test.ts
+++ b/integration/rsc/rsc-test.ts
@@ -499,7 +499,7 @@ implementations.forEach((implementation) => {
 
               export const testContext = createContext<string>("default-value");
 
-              export function unstable_getContext() {
+              export function getContext() {
                 return new Map([[testContext, "client-context-value"]]);
               }
             `,
@@ -1262,9 +1262,7 @@ implementations.forEach((implementation) => {
           validateRSCHtml(await page.content());
         });
 
-        test("Supports client context using unstable_getContext", async ({
-          page,
-        }) => {
+        test("Supports client context using getContext", async ({ page }) => {
           await page.goto(`http://localhost:${port}/unstable-get-context`);
           await page.waitForSelector("[data-client-context]");
           expect(
diff --git a/packages/react-router/__tests__/router/context-middleware-test.ts b/packages/react-router/__tests__/router/context-middleware-test.ts
index 32f0ce00df..bddc3df99c 100644
--- a/packages/react-router/__tests__/router/context-middleware-test.ts
+++ b/packages/react-router/__tests__/router/context-middleware-test.ts
@@ -812,7 +812,7 @@ describe("context/middleware", () => {
         let context = new RouterContextProvider();
         router = createRouter({
           history: createMemoryHistory(),
-          unstable_getContext: () => context,
+          getContext: () => context,
           routes: [
             {
               path: "/",
@@ -872,7 +872,7 @@ describe("context/middleware", () => {
         let context = new RouterContextProvider();
         router = createRouter({
           history: createMemoryHistory(),
-          unstable_getContext: () => context,
+          getContext: () => context,
           routes: [
             {
               path: "/",
@@ -929,7 +929,7 @@ describe("context/middleware", () => {
         let context = new RouterContextProvider();
         router = createRouter({
           history: createMemoryHistory(),
-          unstable_getContext: () => context,
+          getContext: () => context,
           routes: [
             {
               path: "/",
@@ -1026,7 +1026,7 @@ describe("context/middleware", () => {
         let context = new RouterContextProvider();
         router = createRouter({
           history: createMemoryHistory(),
-          unstable_getContext: () => context,
+          getContext: () => context,
           routes: [
             {
               path: "/",
@@ -1127,7 +1127,7 @@ describe("context/middleware", () => {
         let context = new RouterContextProvider();
         router = createRouter({
           history: createMemoryHistory(),
-          unstable_getContext: () => context,
+          getContext: () => context,
           routes: [
             {
               path: "/",
@@ -1217,7 +1217,7 @@ describe("context/middleware", () => {
         let context = new RouterContextProvider();
         router = createRouter({
           history: createMemoryHistory(),
-          unstable_getContext: () => context,
+          getContext: () => context,
           routes: [
             {
               path: "/",
diff --git a/packages/react-router/lib/components.tsx b/packages/react-router/lib/components.tsx
index aaefbbc3b6..397ce2cb9e 100644
--- a/packages/react-router/lib/components.tsx
+++ b/packages/react-router/lib/components.tsx
@@ -150,7 +150,7 @@ export interface MemoryRouterOpts {
    * This function is called to generate a fresh `context` instance on each
    * navigation or fetcher call.
    */
-  unstable_getContext?: RouterInit["unstable_getContext"];
+  getContext?: RouterInit["getContext"];
   /**
    * Future flags to enable for the router.
    */
@@ -192,7 +192,7 @@ export interface MemoryRouterOpts {
  * @param {MemoryRouterOpts.basename} opts.basename n/a
  * @param {MemoryRouterOpts.dataStrategy} opts.dataStrategy n/a
  * @param {MemoryRouterOpts.future} opts.future n/a
- * @param {MemoryRouterOpts.unstable_getContext} opts.unstable_getContext n/a
+ * @param {MemoryRouterOpts.getContext} opts.getContext n/a
  * @param {MemoryRouterOpts.hydrationData} opts.hydrationData n/a
  * @param {MemoryRouterOpts.initialEntries} opts.initialEntries n/a
  * @param {MemoryRouterOpts.initialIndex} opts.initialIndex n/a
@@ -205,7 +205,7 @@ export function createMemoryRouter(
 ): DataRouter {
   return createRouter({
     basename: opts?.basename,
-    unstable_getContext: opts?.unstable_getContext,
+    getContext: opts?.getContext,
     future: opts?.future,
     history: createMemoryHistory({
       initialEntries: opts?.initialEntries,
diff --git a/packages/react-router/lib/dom-export/hydrated-router.tsx b/packages/react-router/lib/dom-export/hydrated-router.tsx
index c6f48edcdd..6c02f960cb 100644
--- a/packages/react-router/lib/dom-export/hydrated-router.tsx
+++ b/packages/react-router/lib/dom-export/hydrated-router.tsx
@@ -77,9 +77,9 @@ function initSsrInfo(): void {
 }
 
 function createHydratedRouter({
-  unstable_getContext,
+  getContext,
 }: {
-  unstable_getContext?: RouterInit["unstable_getContext"];
+  getContext?: RouterInit["getContext"];
 }): DataRouter {
   initSsrInfo();
 
@@ -169,7 +169,7 @@ function createHydratedRouter({
     routes,
     history: createBrowserHistory(),
     basename: ssrInfo.context.basename,
-    unstable_getContext,
+    getContext,
     hydrationData,
     hydrationRouteProperties,
     mapRouteProperties,
@@ -222,7 +222,7 @@ export interface HydratedRouterProps {
    * [`clientAction`](../../start/framework/route-module#clientAction)/[`clientLoader`](../../start/framework/route-module#clientLoader)
    * functions
    */
-  unstable_getContext?: RouterInit["unstable_getContext"];
+  getContext?: RouterInit["getContext"];
   /**
    * An error handler function that will be called for any loader/action/render
    * errors that are encountered in your application.  This is useful for
@@ -251,14 +251,14 @@ export interface HydratedRouterProps {
  * @category Framework Routers
  * @mode framework
  * @param props Props
- * @param {dom.HydratedRouterProps.unstable_getContext} props.unstable_getContext n/a
+ * @param {dom.HydratedRouterProps.getContext} props.getContext n/a
  * @param {dom.HydratedRouterProps.unstable_onError} props.unstable_onError n/a
  * @returns A React element that represents the hydrated application.
  */
 export function HydratedRouter(props: HydratedRouterProps) {
   if (!router) {
     router = createHydratedRouter({
-      unstable_getContext: props.unstable_getContext,
+      getContext: props.getContext,
     });
   }
 
diff --git a/packages/react-router/lib/dom/lib.tsx b/packages/react-router/lib/dom/lib.tsx
index 97749d8d58..c3171516f6 100644
--- a/packages/react-router/lib/dom/lib.tsx
+++ b/packages/react-router/lib/dom/lib.tsx
@@ -153,7 +153,7 @@ export interface DOMRouterOpts {
    * const apiClientContext = createContext<APIClient>();
    *
    * function createBrowserRouter(routes, {
-   *   unstable_getContext() {
+   *   getContext() {
    *     let context = new RouterContextProvider();
    *     context.set(apiClientContext, getApiClient());
    *     return context;
@@ -161,7 +161,7 @@ export interface DOMRouterOpts {
    * })
    * ```
    */
-  unstable_getContext?: RouterInit["unstable_getContext"];
+  getContext?: RouterInit["getContext"];
   /**
    * Future flags to enable for the router.
    */
@@ -739,7 +739,7 @@ export interface DOMRouterOpts {
  * @param {DOMRouterOpts.basename} opts.basename n/a
  * @param {DOMRouterOpts.dataStrategy} opts.dataStrategy n/a
  * @param {DOMRouterOpts.future} opts.future n/a
- * @param {DOMRouterOpts.unstable_getContext} opts.unstable_getContext n/a
+ * @param {DOMRouterOpts.getContext} opts.getContext n/a
  * @param {DOMRouterOpts.hydrationData} opts.hydrationData n/a
  * @param {DOMRouterOpts.patchRoutesOnNavigation} opts.patchRoutesOnNavigation n/a
  * @param {DOMRouterOpts.window} opts.window n/a
@@ -751,7 +751,7 @@ export function createBrowserRouter(
 ): DataRouter {
   return createRouter({
     basename: opts?.basename,
-    unstable_getContext: opts?.unstable_getContext,
+    getContext: opts?.getContext,
     future: opts?.future,
     history: createBrowserHistory({ window: opts?.window }),
     hydrationData: opts?.hydrationData || parseHydrationData(),
@@ -775,7 +775,7 @@ export function createBrowserRouter(
  * @param opts Options
  * @param {DOMRouterOpts.basename} opts.basename n/a
  * @param {DOMRouterOpts.future} opts.future n/a
- * @param {DOMRouterOpts.unstable_getContext} opts.unstable_getContext n/a
+ * @param {DOMRouterOpts.getContext} opts.getContext n/a
  * @param {DOMRouterOpts.hydrationData} opts.hydrationData n/a
  * @param {DOMRouterOpts.dataStrategy} opts.dataStrategy n/a
  * @param {DOMRouterOpts.patchRoutesOnNavigation} opts.patchRoutesOnNavigation n/a
@@ -788,7 +788,7 @@ export function createHashRouter(
 ): DataRouter {
   return createRouter({
     basename: opts?.basename,
-    unstable_getContext: opts?.unstable_getContext,
+    getContext: opts?.getContext,
     future: opts?.future,
     history: createHashHistory({ window: opts?.window }),
     hydrationData: opts?.hydrationData || parseHydrationData(),
diff --git a/packages/react-router/lib/router/router.ts b/packages/react-router/lib/router/router.ts
index db67ac8fc3..13d1e9e79f 100644
--- a/packages/react-router/lib/router/router.ts
+++ b/packages/react-router/lib/router/router.ts
@@ -384,9 +384,7 @@ export type HydrationState = Partial<
 /**
  * Future flags to toggle new feature behavior
  */
-export interface FutureConfig {
-  middleware: boolean;
-}
+export interface FutureConfig {}
 
 /**
  * Initialization options for createRouter
@@ -395,7 +393,7 @@ export interface RouterInit {
   routes: AgnosticRouteObject[];
   history: History;
   basename?: string;
-  unstable_getContext?: () => MaybePromise<RouterContextProvider>;
+  getContext?: () => MaybePromise<RouterContextProvider>;
   mapRouteProperties?: MapRoutePropertiesFunction;
   future?: Partial<FutureConfig>;
   hydrationRouteProperties?: string[];
@@ -874,7 +872,6 @@ export function createRouter(init: RouterInit): Router {
 
   // Config driven behavior flags
   let future: FutureConfig = {
-    middleware: false,
     ...init.future,
   };
   // Cleanup function for history
@@ -1668,8 +1665,8 @@ export function createRouter(init: RouterInit): Router {
       opts && opts.submission,
     );
     // Create a new context per navigation
-    let scopedContext = init.unstable_getContext
-      ? await init.unstable_getContext()
+    let scopedContext = init.getContext
+      ? await init.getContext()
       : new RouterContextProvider();
     let pendingActionResult: PendingActionResult | undefined;
 
@@ -2294,8 +2291,8 @@ export function createRouter(init: RouterInit): Router {
     }
 
     // Create a new context per fetch
-    let scopedContext = init.unstable_getContext
-      ? await init.unstable_getContext()
+    let scopedContext = init.getContext
+      ? await init.getContext()
       : new RouterContextProvider();
     let preventScrollReset = (opts && opts.preventScrollReset) === true;
 
diff --git a/packages/react-router/lib/rsc/browser.tsx b/packages/react-router/lib/rsc/browser.tsx
index 2f14b2ac99..59a6302ef5 100644
--- a/packages/react-router/lib/rsc/browser.tsx
+++ b/packages/react-router/lib/rsc/browser.tsx
@@ -223,13 +223,13 @@ export function createCallServer({
 function createRouterFromPayload({
   fetchImplementation,
   createFromReadableStream,
-  unstable_getContext,
+  getContext,
   payload,
 }: {
   payload: RSCPayload;
   createFromReadableStream: BrowserCreateFromReadableStreamFunction;
   fetchImplementation: (request: Request) => Promise<Response>;
-  unstable_getContext: RouterInit["unstable_getContext"] | undefined;
+  getContext: RouterInit["getContext"] | undefined;
 }): {
   router: DataRouter;
   routeModules: RouteModules;
@@ -275,7 +275,7 @@ function createRouterFromPayload({
 
   globalVar.__reactRouterDataRouter = createRouter({
     routes,
-    unstable_getContext,
+    getContext,
     basename: payload.basename,
     history: createBrowserHistory(),
     hydrationData: getHydrationData(
@@ -625,7 +625,7 @@ export interface RSCHydratedRouterProps {
    * This function is called to generate a fresh `context` instance on each
    * navigation or fetcher call.
    */
-  unstable_getContext?: RouterInit["unstable_getContext"];
+  getContext?: RouterInit["getContext"];
 }
 
 /**
@@ -662,7 +662,7 @@ export interface RSCHydratedRouterProps {
  * @param props Props
  * @param {unstable_RSCHydratedRouterProps.createFromReadableStream} props.createFromReadableStream n/a
  * @param {unstable_RSCHydratedRouterProps.fetch} props.fetch n/a
- * @param {unstable_RSCHydratedRouterProps.unstable_getContext} props.unstable_getContext n/a
+ * @param {unstable_RSCHydratedRouterProps.getContext} props.getContext n/a
  * @param {unstable_RSCHydratedRouterProps.payload} props.payload n/a
  * @param {unstable_RSCHydratedRouterProps.routeDiscovery} props.routeDiscovery n/a
  * @returns A hydrated {@link DataRouter} that can be used to navigate and
@@ -673,7 +673,7 @@ export function RSCHydratedRouter({
   fetch: fetchImplementation = fetch,
   payload,
   routeDiscovery = "eager",
-  unstable_getContext,
+  getContext,
 }: RSCHydratedRouterProps) {
   if (payload.type !== "render") throw new Error("Invalid payload type");
 
@@ -682,15 +682,10 @@ export function RSCHydratedRouter({
       createRouterFromPayload({
         payload,
         fetchImplementation,
-        unstable_getContext,
+        getContext,
         createFromReadableStream,
       }),
-    [
-      createFromReadableStream,
-      payload,
-      fetchImplementation,
-      unstable_getContext,
-    ],
+    [createFromReadableStream, payload, fetchImplementation, getContext],
   );
 
   React.useEffect(() => {
diff --git a/packages/react-router/lib/types/route-data.ts b/packages/react-router/lib/types/route-data.ts
index f8ffb0aac4..058a2f5aef 100644
--- a/packages/react-router/lib/types/route-data.ts
+++ b/packages/react-router/lib/types/route-data.ts
@@ -98,7 +98,7 @@ export type ClientDataFunctionArgs<Params> = {
    * When `future.v8_middleware` is enabled, this is an instance of
    * `RouterContextProvider` and can be used to access context values
    * from your route middlewares.  You may pass in initial context values in your
-   * `<HydratedRouter unstable_getContext>` prop
+   * `<HydratedRouter getContext>` prop
    */
   context: Readonly<RouterContextProvider>;
 };

From d127020b5e68c9de640b77c45eef5e6235868a6d Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Thu, 21 Aug 2025 17:17:10 -0400
Subject: [PATCH 08/14] Remove prefix from RouterContext

---
 .../router/context-middleware-test.ts          |  6 +++---
 packages/react-router/index-react-server.ts    |  2 +-
 packages/react-router/index.ts                 |  2 +-
 packages/react-router/lib/router/utils.ts      | 18 +++++++++---------
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/packages/react-router/__tests__/router/context-middleware-test.ts b/packages/react-router/__tests__/router/context-middleware-test.ts
index bddc3df99c..f85ec6a72a 100644
--- a/packages/react-router/__tests__/router/context-middleware-test.ts
+++ b/packages/react-router/__tests__/router/context-middleware-test.ts
@@ -9,7 +9,7 @@ import {
 import type {
   DataStrategyResult,
   MiddlewareFunction,
-  unstable_RouterContext,
+  RouterContext,
 } from "../../lib/router/utils";
 import {
   createContext,
@@ -26,7 +26,7 @@ let router: Router;
 afterEach(() => cleanup(router));
 
 declare module "../../lib/router/utils" {
-  interface unstable_RouterContext {
+  interface RouterContext {
     count?: { value: number };
     order?: string[];
   }
@@ -222,7 +222,7 @@ describe("context/middleware", () => {
 
   describe("middleware - client side", () => {
     function getOrderMiddleware(
-      orderContext: unstable_RouterContext<string[]>,
+      orderContext: RouterContext<string[]>,
       name: string,
     ): MiddlewareFunction {
       return async ({ context }, next) => {
diff --git a/packages/react-router/index-react-server.ts b/packages/react-router/index-react-server.ts
index 30e1f3ffc8..7c7c3d6328 100644
--- a/packages/react-router/index-react-server.ts
+++ b/packages/react-router/index-react-server.ts
@@ -64,7 +64,7 @@ export { createMemorySessionStorage } from "./lib/server-runtime/sessions/memory
 export type {
   MiddlewareFunction,
   MiddlewareNextFunction,
-  unstable_RouterContext,
+  RouterContext,
 } from "./lib/router/utils";
 
 export type {
diff --git a/packages/react-router/index.ts b/packages/react-router/index.ts
index 8b41c848da..d9b650987b 100644
--- a/packages/react-router/index.ts
+++ b/packages/react-router/index.ts
@@ -49,7 +49,7 @@ export type {
   PathParam,
   PathPattern,
   RedirectFunction,
-  unstable_RouterContext,
+  RouterContext,
   ShouldRevalidateFunction,
   ShouldRevalidateFunctionArgs,
   UIMatch,
diff --git a/packages/react-router/lib/router/utils.ts b/packages/react-router/lib/router/utils.ts
index b5028ee1f5..e5aa71eac1 100644
--- a/packages/react-router/lib/router/utils.ts
+++ b/packages/react-router/lib/router/utils.ts
@@ -118,12 +118,12 @@ export type Submission =
  * {@link RouterContextProvider}. Accepts an optional default
  * value to be returned if no value has been set.
  */
-export interface unstable_RouterContext<T = unknown> {
+export interface RouterContext<T = unknown> {
   defaultValue?: T;
 }
 
 /**
- * Creates a type-safe {@link unstable_RouterContext} object that can be used to
+ * Creates a type-safe {@link RouterContext} object that can be used to
  * store and retrieve arbitrary values in [`action`](../../start/framework/route-module#action)s,
  * [`loader`](../../start/framework/route-module#loader)s, and [middleware](../../how-to/middleware).
  * Similar to React's [`createContext`](https://react.dev/reference/react/createContext),
@@ -176,11 +176,11 @@ export interface unstable_RouterContext<T = unknown> {
  * @mode data
  * @param defaultValue An optional default value for the context. This value
  * will be returned if no value has been set for this context.
- * @returns A {@link unstable_RouterContext} object that can be used with
+ * @returns A {@link RouterContext} object that can be used with
  * `context.get()` and `context.set()` in [`action`](../../start/framework/route-module#action)s,
  * [`loader`](../../start/framework/route-module#loader)s, and [middleware](../../how-to/middleware).
  */
-export function createContext<T>(defaultValue?: T): unstable_RouterContext<T> {
+export function createContext<T>(defaultValue?: T): RouterContext<T> {
   return { defaultValue };
 }
 
@@ -207,13 +207,13 @@ export function createContext<T>(defaultValue?: T): unstable_RouterContext<T> {
  * @mode data
  */
 export class RouterContextProvider {
-  #map = new Map<unstable_RouterContext, unknown>();
+  #map = new Map<RouterContext, unknown>();
 
   /**
    * Create a new `RouterContextProvider` instance
    * @param init An optional initial context map to populate the provider with
    */
-  constructor(init?: Map<unstable_RouterContext, unknown>) {
+  constructor(init?: Map<RouterContext, unknown>) {
     if (init) {
       for (let [context, value] of init) {
         this.set(context, value);
@@ -229,7 +229,7 @@ export class RouterContextProvider {
    * @returns The value for the context, or the context's `defaultValue` if no
    * value was set
    */
-  get<T>(context: unstable_RouterContext<T>): T {
+  get<T>(context: RouterContext<T>): T {
     if (this.#map.has(context)) {
       return this.#map.get(context) as T;
     }
@@ -249,9 +249,9 @@ export class RouterContextProvider {
    * @param value The value to set for the context
    * @returns {void}
    */
-  set<C extends unstable_RouterContext>(
+  set<C extends RouterContext>(
     context: C,
-    value: C extends unstable_RouterContext<infer T> ? T : never,
+    value: C extends RouterContext<infer T> ? T : never,
   ): void {
     this.#map.set(context, value);
   }

From 16d3f8ebd8990d7dbfa25d009eaf443055e11ca0 Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Thu, 21 Aug 2025 17:18:33 -0400
Subject: [PATCH 09/14] Remove prefix from dataStrategy runClientMiddleware

---
 packages/react-router/lib/dom/ssr/single-fetch.tsx |  2 +-
 packages/react-router/lib/router/router.ts         | 14 +++++++-------
 packages/react-router/lib/router/utils.ts          |  2 +-
 packages/react-router/lib/rsc/browser.tsx          |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/react-router/lib/dom/ssr/single-fetch.tsx b/packages/react-router/lib/dom/ssr/single-fetch.tsx
index aa755ee02a..4043e35c46 100644
--- a/packages/react-router/lib/dom/ssr/single-fetch.tsx
+++ b/packages/react-router/lib/dom/ssr/single-fetch.tsx
@@ -197,7 +197,7 @@ export function getTurboStreamSingleFetchDataStrategy(
     ssr,
     basename,
   );
-  return async (args) => args.unstable_runClientMiddleware(dataStrategy);
+  return async (args) => args.runClientMiddleware(dataStrategy);
 }
 
 export function getSingleFetchDataStrategyImpl(
diff --git a/packages/react-router/lib/router/router.ts b/packages/react-router/lib/router/router.ts
index 13d1e9e79f..e3c406f1c4 100644
--- a/packages/react-router/lib/router/router.ts
+++ b/packages/react-router/lib/router/router.ts
@@ -5458,7 +5458,7 @@ function runServerMiddlewarePipeline(
 function runClientMiddlewarePipeline(
   args: Omit<
     DataStrategyFunctionArgs<RouterContextProvider>,
-    "fetcherKey" | "unstable_runClientMiddleware"
+    "fetcherKey" | "runClientMiddleware"
   >,
   handler: () => Promise<Record<string, DataStrategyResult>>,
 ): Promise<Record<string, DataStrategyResult>> {
@@ -5784,10 +5784,10 @@ async function callDataStrategyImpl(
     context: scopedContext,
     matches,
   };
-  let unstable_runClientMiddleware = isStaticHandler
+  let runClientMiddleware = isStaticHandler
     ? () => {
         throw new Error(
-          "You cannot call `unstable_runClientMiddleware()` from a static handler " +
+          "You cannot call `runClientMiddleware()` from a static handler " +
             "`dataStrategy`. Middleware is run outside of `dataStrategy` during " +
             "SSR in order to bubble up the Response.  You can enable middleware " +
             "via the `respond` API in `query`/`queryRoute`",
@@ -5800,10 +5800,10 @@ async function callDataStrategyImpl(
           return cb({
             ...typedDataStrategyArgs,
             fetcherKey,
-            unstable_runClientMiddleware: () => {
+            runClientMiddleware: () => {
               throw new Error(
-                "Cannot call `unstable_runClientMiddleware()` from within an " +
-                  "`unstable_runClientMiddleware` handler",
+                "Cannot call `runClientMiddleware()` from within an " +
+                  "`runClientMiddleware` handler",
               );
             },
           });
@@ -5813,7 +5813,7 @@ async function callDataStrategyImpl(
   let results = await dataStrategyImpl({
     ...dataStrategyArgs,
     fetcherKey,
-    unstable_runClientMiddleware,
+    runClientMiddleware,
   });
 
   // Wait for all routes to load here but swallow the error since we want
diff --git a/packages/react-router/lib/router/utils.ts b/packages/react-router/lib/router/utils.ts
index e5aa71eac1..14e5e40c51 100644
--- a/packages/react-router/lib/router/utils.ts
+++ b/packages/react-router/lib/router/utils.ts
@@ -488,7 +488,7 @@ export interface DataStrategyFunctionArgs<Context = DefaultContext>
    * Matches for this route extended with Data strategy APIs
    */
   matches: DataStrategyMatch[];
-  unstable_runClientMiddleware: (
+  runClientMiddleware: (
     cb: DataStrategyFunction<Context>,
   ) => Promise<Record<string, DataStrategyResult>>;
   /**
diff --git a/packages/react-router/lib/rsc/browser.tsx b/packages/react-router/lib/rsc/browser.tsx
index 59a6302ef5..39002eb102 100644
--- a/packages/react-router/lib/rsc/browser.tsx
+++ b/packages/react-router/lib/rsc/browser.tsx
@@ -464,7 +464,7 @@ export function getRSCSingleFetchDataStrategy(
     },
   );
   return async (args) =>
-    args.unstable_runClientMiddleware(async () => {
+    args.runClientMiddleware(async () => {
       // Before we run the dataStrategy, create a place to stick rendered routes
       // from the payload so we can patch them into the router after all loaders
       // have completed.  Need to do this since we may have multiple fetch

From 5755d5bc34ebfd75bdee84039669d8ea434fa6d3 Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Thu, 21 Aug 2025 17:20:36 -0400
Subject: [PATCH 10/14] Remove prefix from static handler
 generateMiddlewareResponse

---
 .../router/context-middleware-test.ts         | 82 +++++++++----------
 packages/react-router/lib/router/router.ts    |  8 +-
 packages/react-router/lib/rsc/server.rsc.ts   |  4 +-
 .../react-router/lib/server-runtime/server.ts |  4 +-
 .../lib/server-runtime/single-fetch.ts        |  4 +-
 5 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/packages/react-router/__tests__/router/context-middleware-test.ts b/packages/react-router/__tests__/router/context-middleware-test.ts
index f85ec6a72a..6bae7d1a34 100644
--- a/packages/react-router/__tests__/router/context-middleware-test.ts
+++ b/packages/react-router/__tests__/router/context-middleware-test.ts
@@ -1522,7 +1522,7 @@ describe("context/middleware", () => {
 
       let request = new Request("http://localhost/parent/child");
       let res = (await handler.query(request, {
-        unstable_generateMiddlewareResponse: async (q) =>
+        generateMiddlewareResponse: async (q) =>
           respondWithJson(await q(request)),
       })) as Response;
       let staticContext = (await res.json()) as StaticHandlerContext;
@@ -1598,7 +1598,7 @@ describe("context/middleware", () => {
 
       let request = new Request("http://localhost/parent/child");
       let res = (await handler.query(request, {
-        unstable_generateMiddlewareResponse: async (q) =>
+        generateMiddlewareResponse: async (q) =>
           respondWithJson(await q(request)),
       })) as Response;
       let staticContext = (await res.json()) as StaticHandlerContext;
@@ -1643,7 +1643,7 @@ describe("context/middleware", () => {
 
       let request = new Request("http://localhost/parent");
       let res = (await handler.query(request, {
-        unstable_generateMiddlewareResponse: async (q) =>
+        generateMiddlewareResponse: async (q) =>
           respondWithJson(await q(request)),
       })) as Response;
       let staticContext = (await res.json()) as StaticHandlerContext;
@@ -1683,7 +1683,7 @@ describe("context/middleware", () => {
 
       let request = new Request("http://localhost/parent");
       let res = (await handler.query(request, {
-        unstable_generateMiddlewareResponse: async (q) =>
+        generateMiddlewareResponse: async (q) =>
           respondWithJson(await q(request)),
       })) as Response;
       await expect(res.text()).resolves.toEqual("test");
@@ -1716,7 +1716,7 @@ describe("context/middleware", () => {
 
       let request = new Request("http://localhost/parent");
       let res = (await handler.query(request, {
-        unstable_generateMiddlewareResponse: async (q) =>
+        generateMiddlewareResponse: async (q) =>
           respondWithJson(await q(request)),
       })) as Response;
       expect(res.status).toBe(404);
@@ -1750,7 +1750,7 @@ describe("context/middleware", () => {
 
       let request = new Request("http://localhost/parent");
       let res = (await handler.query(request, {
-        unstable_generateMiddlewareResponse: async (q) =>
+        generateMiddlewareResponse: async (q) =>
           respondWithJson(await q(request)),
       })) as Response;
       expect(res.status).toBe(404);
@@ -1800,7 +1800,7 @@ describe("context/middleware", () => {
 
       let request = new Request("http://localhost/parent");
       let res = (await handler.query(request, {
-        unstable_generateMiddlewareResponse: async (q) =>
+        generateMiddlewareResponse: async (q) =>
           respondWithJson(await q(request)),
       })) as Response;
       expect(res.status).toBe(404);
@@ -1835,7 +1835,7 @@ describe("context/middleware", () => {
 
       let request = new Request("http://localhost/parent");
       let res = (await handler.query(request, {
-        unstable_generateMiddlewareResponse: async (q) =>
+        generateMiddlewareResponse: async (q) =>
           respondWithJson(await q(request)),
       })) as Response;
       expect(res.status).toBe(404);
@@ -1893,7 +1893,7 @@ describe("context/middleware", () => {
         let request = new Request("http://localhost/parent/child");
         await handler.query(request, {
           requestContext,
-          unstable_generateMiddlewareResponse: async (q) =>
+          generateMiddlewareResponse: async (q) =>
             respondWithJson(await q(request)),
         });
 
@@ -1955,7 +1955,7 @@ describe("context/middleware", () => {
         });
         await handler.query(request, {
           requestContext,
-          unstable_generateMiddlewareResponse: async (q) =>
+          generateMiddlewareResponse: async (q) =>
             respondWithJson(await q(request)),
         });
 
@@ -2012,7 +2012,7 @@ describe("context/middleware", () => {
         let request = new Request("http://localhost/parent/child");
         let res = (await handler.query(request, {
           requestContext,
-          unstable_generateMiddlewareResponse: async (q) =>
+          generateMiddlewareResponse: async (q) =>
             respondWithJson(await q(request)),
         })) as Response;
         let staticContext = (await res.json()) as StaticHandlerContext;
@@ -2050,7 +2050,7 @@ describe("context/middleware", () => {
 
         let request = new Request("http://localhost/parent");
         let res = (await handler.query(request, {
-          unstable_generateMiddlewareResponse: async (q) =>
+          generateMiddlewareResponse: async (q) =>
             respondWithJson(await q(request)),
         })) as Response;
         let staticContext = (await res.json()) as StaticHandlerContext;
@@ -2109,7 +2109,7 @@ describe("context/middleware", () => {
         let request = new Request("http://localhost/parent/child");
         let res = (await handler.query(request, {
           requestContext,
-          unstable_generateMiddlewareResponse: async (q) =>
+          generateMiddlewareResponse: async (q) =>
             respondWithJson(await q(request)),
         })) as Response;
         let staticContext = (await res.json()) as StaticHandlerContext;
@@ -2165,7 +2165,7 @@ describe("context/middleware", () => {
         let request = new Request("http://localhost/parent/child");
         let res = (await handler.query(request, {
           requestContext,
-          unstable_generateMiddlewareResponse: async (q) =>
+          generateMiddlewareResponse: async (q) =>
             respondWithJson(await q(request)),
         })) as Response;
         let staticContext = (await res.json()) as StaticHandlerContext;
@@ -2237,7 +2237,7 @@ describe("context/middleware", () => {
         });
         let res = (await handler.query(request, {
           requestContext,
-          unstable_generateMiddlewareResponse: async (q) =>
+          generateMiddlewareResponse: async (q) =>
             respondWithJson(await q(request)),
         })) as Response;
         let staticContext = (await res.json()) as StaticHandlerContext;
@@ -2309,7 +2309,7 @@ describe("context/middleware", () => {
         });
         let res = (await handler.query(request, {
           requestContext,
-          unstable_generateMiddlewareResponse: async (q) =>
+          generateMiddlewareResponse: async (q) =>
             respondWithJson(await q(request)),
         })) as Response;
         let staticContext = (await res.json()) as StaticHandlerContext;
@@ -2384,7 +2384,7 @@ describe("context/middleware", () => {
         });
         let res = (await handler.query(request, {
           requestContext,
-          unstable_generateMiddlewareResponse: async (q) =>
+          generateMiddlewareResponse: async (q) =>
             respondWithJson(await q(request)),
         })) as Response;
         let staticContext = (await res.json()) as StaticHandlerContext;
@@ -2456,7 +2456,7 @@ describe("context/middleware", () => {
         });
         let res = (await handler.query(request, {
           requestContext,
-          unstable_generateMiddlewareResponse: async (q) =>
+          generateMiddlewareResponse: async (q) =>
             respondWithJson(await q(request)),
         })) as Response;
         let staticContext = (await res.json()) as StaticHandlerContext;
@@ -2494,7 +2494,7 @@ describe("context/middleware", () => {
 
         let request = new Request("http://localhost/");
         let res = (await handler.query(request, {
-          unstable_generateMiddlewareResponse: async (q) =>
+          generateMiddlewareResponse: async (q) =>
             respondWithJson(await q(request)),
         })) as Response;
 
@@ -2528,7 +2528,7 @@ describe("context/middleware", () => {
 
         let request = new Request("http://localhost/parent");
         let response = (await handler.query(request, {
-          unstable_generateMiddlewareResponse: async (q) =>
+          generateMiddlewareResponse: async (q) =>
             respondWithJson(await q(request)),
         })) as Response;
 
@@ -2560,7 +2560,7 @@ describe("context/middleware", () => {
 
         let request = new Request("http://localhost/parent");
         let response = (await handler.query(request, {
-          unstable_generateMiddlewareResponse: async (q) =>
+          generateMiddlewareResponse: async (q) =>
             respondWithJson(await q(request)),
         })) as Response;
 
@@ -2637,7 +2637,7 @@ describe("context/middleware", () => {
 
       let request = new Request("http://localhost/parent/child");
       let res = (await handler.queryRoute(request, {
-        unstable_generateMiddlewareResponse: (q) => q(request),
+        generateMiddlewareResponse: (q) => q(request),
       })) as Response;
 
       expect(await res.text()).toBe("CHILD");
@@ -2700,7 +2700,7 @@ describe("context/middleware", () => {
 
       let request = new Request("http://localhost/parent/child");
       let res = (await handler.queryRoute(request, {
-        unstable_generateMiddlewareResponse: (q) => q(request),
+        generateMiddlewareResponse: (q) => q(request),
       })) as Response;
 
       expect(await res.text()).toBe("CHILD");
@@ -2732,7 +2732,7 @@ describe("context/middleware", () => {
 
       let request = new Request("http://localhost/parent");
       let res = (await handler.queryRoute(request, {
-        unstable_generateMiddlewareResponse: (q) => q(request),
+        generateMiddlewareResponse: (q) => q(request),
       })) as Response;
 
       expect(await res.text()).toBe("PARENT");
@@ -2760,7 +2760,7 @@ describe("context/middleware", () => {
 
       let request = new Request("http://localhost/parent");
       let res = (await handler.queryRoute(request, {
-        unstable_generateMiddlewareResponse: (q) => q(request),
+        generateMiddlewareResponse: (q) => q(request),
       })) as Response;
       await expect(res.text()).resolves.toEqual("test");
     });
@@ -2792,7 +2792,7 @@ describe("context/middleware", () => {
 
       let request = new Request("http://localhost/parent");
       let res = (await handler.queryRoute(request, {
-        unstable_generateMiddlewareResponse: (q) => q(request),
+        generateMiddlewareResponse: (q) => q(request),
       })) as Response;
       expect(res.status).toBe(404);
       await expect(res.json()).resolves.toEqual("not found");
@@ -2825,7 +2825,7 @@ describe("context/middleware", () => {
 
       let request = new Request("http://localhost/parent");
       let res = (await handler.queryRoute(request, {
-        unstable_generateMiddlewareResponse: async (q) => q(request),
+        generateMiddlewareResponse: async (q) => q(request),
       })) as Response;
       expect(res.status).toBe(404);
       await expect(res.json()).resolves.toEqual("not found");
@@ -2859,7 +2859,7 @@ describe("context/middleware", () => {
 
       let request = new Request("http://localhost/parent");
       let res = (await handler.queryRoute(request, {
-        unstable_generateMiddlewareResponse: (q) => q(request),
+        generateMiddlewareResponse: (q) => q(request),
       })) as Response;
       expect(res.status).toBe(404);
       await expect(res.json()).resolves.toEqual("not found");
@@ -2893,7 +2893,7 @@ describe("context/middleware", () => {
 
       let request = new Request("http://localhost/parent");
       let res = (await handler.queryRoute(request, {
-        unstable_generateMiddlewareResponse: async (q) => q(request),
+        generateMiddlewareResponse: async (q) => q(request),
       })) as Response;
       expect(res.status).toBe(404);
       await expect(res.json()).resolves.toEqual("not found");
@@ -2936,7 +2936,7 @@ describe("context/middleware", () => {
         let request = new Request("http://localhost/parent/child");
         await handler.queryRoute(request, {
           requestContext,
-          unstable_generateMiddlewareResponse: (q) => q(request),
+          generateMiddlewareResponse: (q) => q(request),
         });
 
         expect(requestContext.get(orderContext)).toEqual([
@@ -2998,7 +2998,7 @@ describe("context/middleware", () => {
         });
         await handler.queryRoute(request, {
           requestContext,
-          unstable_generateMiddlewareResponse: (q) => q(request),
+          generateMiddlewareResponse: (q) => q(request),
         });
 
         expect(requestContext.get(orderContext)).toEqual([
@@ -3051,7 +3051,7 @@ describe("context/middleware", () => {
         let request = new Request("http://localhost/parent/child");
         let response = (await handler.queryRoute(request, {
           requestContext,
-          unstable_generateMiddlewareResponse: (q) => q(request),
+          generateMiddlewareResponse: (q) => q(request),
         })) as Response;
 
         expect(requestContext.get(parentContext)).toEqual("PARENT MIDDLEWARE");
@@ -3082,7 +3082,7 @@ describe("context/middleware", () => {
         let request = new Request("http://localhost/parent/");
         await expect(
           handler.queryRoute(request, {
-            unstable_generateMiddlewareResponse: (q) => q(request),
+            generateMiddlewareResponse: (q) => q(request),
           }),
         ).rejects.toThrow("You may only call `next()` once per middleware");
       });
@@ -3131,7 +3131,7 @@ describe("context/middleware", () => {
         await expect(
           handler.queryRoute(request, {
             requestContext,
-            unstable_generateMiddlewareResponse: (q) => q(request),
+            generateMiddlewareResponse: (q) => q(request),
           }),
         ).rejects.toThrow("PARENT 2");
 
@@ -3182,7 +3182,7 @@ describe("context/middleware", () => {
         await expect(
           handler.queryRoute(request, {
             requestContext,
-            unstable_generateMiddlewareResponse: (q) => q(request),
+            generateMiddlewareResponse: (q) => q(request),
           }),
         ).rejects.toThrow("CHILD UP");
 
@@ -3259,7 +3259,7 @@ describe("context/middleware", () => {
         await expect(
           handler.queryRoute(request, {
             requestContext,
-            unstable_generateMiddlewareResponse: (q) => q(request),
+            generateMiddlewareResponse: (q) => q(request),
           }),
         ).rejects.toThrow("child 1 error");
 
@@ -3344,7 +3344,7 @@ describe("context/middleware", () => {
         await expect(
           handler.queryRoute(request, {
             requestContext,
-            unstable_generateMiddlewareResponse: (q) => q(request),
+            generateMiddlewareResponse: (q) => q(request),
           }),
         ).rejects.toThrow("child 2 error");
 
@@ -3426,7 +3426,7 @@ describe("context/middleware", () => {
         await expect(
           handler.queryRoute(request, {
             requestContext,
-            unstable_generateMiddlewareResponse: (q) => q(request),
+            generateMiddlewareResponse: (q) => q(request),
           }),
         ).rejects.toThrow("child 1 action error");
 
@@ -3511,7 +3511,7 @@ describe("context/middleware", () => {
         await expect(
           handler.queryRoute(request, {
             requestContext,
-            unstable_generateMiddlewareResponse: (q) => q(request),
+            generateMiddlewareResponse: (q) => q(request),
           }),
         ).rejects.toThrow("child 2 error");
 
@@ -3546,7 +3546,7 @@ describe("context/middleware", () => {
 
         let request = new Request("http://localhost/parent");
         let response = (await handler.queryRoute(request, {
-          unstable_generateMiddlewareResponse: (q) => q(request),
+          generateMiddlewareResponse: (q) => q(request),
         })) as Response;
 
         expect(response.status).toBe(302);
@@ -3577,7 +3577,7 @@ describe("context/middleware", () => {
 
         let request = new Request("http://localhost/parent");
         let response = (await handler.queryRoute(request, {
-          unstable_generateMiddlewareResponse: (q) => q(request),
+          generateMiddlewareResponse: (q) => q(request),
         })) as Response;
 
         expect(response.status).toBe(302);
diff --git a/packages/react-router/lib/router/router.ts b/packages/react-router/lib/router/router.ts
index e3c406f1c4..39080cbacd 100644
--- a/packages/react-router/lib/router/router.ts
+++ b/packages/react-router/lib/router/router.ts
@@ -432,7 +432,7 @@ export interface StaticHandler {
       skipLoaderErrorBubbling?: boolean;
       skipRevalidation?: boolean;
       dataStrategy?: DataStrategyFunction<unknown>;
-      unstable_generateMiddlewareResponse?: (
+      generateMiddlewareResponse?: (
         query: (r: Request) => Promise<StaticHandlerContext | Response>,
       ) => MaybePromise<Response>;
     },
@@ -443,7 +443,7 @@ export interface StaticHandler {
       routeId?: string;
       requestContext?: unknown;
       dataStrategy?: DataStrategyFunction<unknown>;
-      unstable_generateMiddlewareResponse?: (
+      generateMiddlewareResponse?: (
         queryRoute: (r: Request) => Promise<Response>,
       ) => MaybePromise<Response>;
     },
@@ -3552,7 +3552,7 @@ export function createStaticHandler(
       skipLoaderErrorBubbling,
       skipRevalidation,
       dataStrategy,
-      unstable_generateMiddlewareResponse: generateMiddlewareResponse,
+      generateMiddlewareResponse: generateMiddlewareResponse,
     }: Parameters<StaticHandler["query"]>[1] = {},
   ): Promise<StaticHandlerContext | Response> {
     let url = new URL(request.url);
@@ -3817,7 +3817,7 @@ export function createStaticHandler(
       routeId,
       requestContext,
       dataStrategy,
-      unstable_generateMiddlewareResponse: generateMiddlewareResponse,
+      generateMiddlewareResponse: generateMiddlewareResponse,
     }: Parameters<StaticHandler["queryRoute"]>[1] = {},
   ): Promise<any> {
     let url = new URL(request.url);
diff --git a/packages/react-router/lib/rsc/server.rsc.ts b/packages/react-router/lib/rsc/server.rsc.ts
index a941b69448..b59c07a65a 100644
--- a/packages/react-router/lib/rsc/server.rsc.ts
+++ b/packages/react-router/lib/rsc/server.rsc.ts
@@ -612,7 +612,7 @@ async function generateResourceResponse(
     let response = await staticHandler.queryRoute(request, {
       routeId,
       requestContext,
-      async unstable_generateMiddlewareResponse(queryRoute) {
+      async generateMiddlewareResponse(queryRoute) {
         try {
           let response = await queryRoute(request);
           return generateResourceResponse(response);
@@ -709,7 +709,7 @@ async function generateRenderResponse(
       ...(routeIdsToLoad
         ? { filterMatchesToLoad: (m) => routeIdsToLoad!.includes(m.route.id) }
         : null),
-      async unstable_generateMiddlewareResponse(query) {
+      async generateMiddlewareResponse(query) {
         // If this is an RSC server action, process that and then call query as a
         // revalidation.  If this is a RR Form/Fetcher submission,
         // `processServerAction` will fall through as a no-op and we'll pass the
diff --git a/packages/react-router/lib/server-runtime/server.ts b/packages/react-router/lib/server-runtime/server.ts
index acd1a47828..71768f3035 100644
--- a/packages/react-router/lib/server-runtime/server.ts
+++ b/packages/react-router/lib/server-runtime/server.ts
@@ -445,7 +445,7 @@ async function handleDocumentRequest(
   try {
     let result = await staticHandler.query(request, {
       requestContext: loadContext,
-      unstable_generateMiddlewareResponse: build.future.v8_middleware
+      generateMiddlewareResponse: build.future.v8_middleware
         ? async (query) => {
             try {
               let innerResult = await query(request);
@@ -626,7 +626,7 @@ async function handleResourceRequest(
     let result = await staticHandler.queryRoute(request, {
       routeId,
       requestContext: loadContext,
-      unstable_generateMiddlewareResponse: build.future.v8_middleware
+      generateMiddlewareResponse: build.future.v8_middleware
         ? async (queryRoute) => {
             try {
               let innerResult = await queryRoute(request);
diff --git a/packages/react-router/lib/server-runtime/single-fetch.ts b/packages/react-router/lib/server-runtime/single-fetch.ts
index 8e849e4083..52e76df5ff 100644
--- a/packages/react-router/lib/server-runtime/single-fetch.ts
+++ b/packages/react-router/lib/server-runtime/single-fetch.ts
@@ -54,7 +54,7 @@ export async function singleFetchAction(
       requestContext: loadContext,
       skipLoaderErrorBubbling: true,
       skipRevalidation: true,
-      unstable_generateMiddlewareResponse: build.future.v8_middleware
+      generateMiddlewareResponse: build.future.v8_middleware
         ? async (query) => {
             try {
               let innerResult = await query(handlerRequest);
@@ -144,7 +144,7 @@ export async function singleFetchLoaders(
       requestContext: loadContext,
       filterMatchesToLoad: (m) => !loadRouteIds || loadRouteIds.has(m.route.id),
       skipLoaderErrorBubbling: true,
-      unstable_generateMiddlewareResponse: build.future.v8_middleware
+      generateMiddlewareResponse: build.future.v8_middleware
         ? async (query) => {
             try {
               let innerResult = await query(handlerRequest);

From abb7a3493c5d936816ba050fddf70da027e5e016 Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Thu, 21 Aug 2025 17:21:28 -0400
Subject: [PATCH 11/14] Add changeset

---
 .changeset/shy-lemons-boil.md | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 .changeset/shy-lemons-boil.md

diff --git a/.changeset/shy-lemons-boil.md b/.changeset/shy-lemons-boil.md
new file mode 100644
index 0000000000..56c114950b
--- /dev/null
+++ b/.changeset/shy-lemons-boil.md
@@ -0,0 +1,10 @@
+---
+"@react-router/cloudflare": minor
+"@react-router/architect": minor
+"@react-router/express": minor
+"@react-router/node": minor
+"@react-router/dev": minor
+"react-router": minor
+---
+
+Stabilize middleware and context APIs

From 3704e41b2562fc27e0268e8e76d54ad6bdd26c71 Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Thu, 21 Aug 2025 17:30:43 -0400
Subject: [PATCH 12/14] Fix a few missed spots

---
 integration/helpers/vite.ts                             | 6 +++---
 packages/react-router-dev/config/config.ts              | 2 +-
 packages/react-router/__tests__/server-runtime/utils.ts | 2 +-
 packages/react-router/__tests__/utils/framework.ts      | 2 +-
 packages/react-router/lib/dom/server.tsx                | 2 +-
 packages/react-router/lib/dom/ssr/routes-test-stub.tsx  | 4 ++--
 packages/react-router/lib/rsc/browser.tsx               | 2 +-
 packages/react-router/lib/rsc/server.ssr.tsx            | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/integration/helpers/vite.ts b/integration/helpers/vite.ts
index 2caec7a987..e2f8a86d69 100644
--- a/integration/helpers/vite.ts
+++ b/integration/helpers/vite.ts
@@ -30,7 +30,7 @@ export const reactRouterConfig = ({
   appDirectory,
   splitRouteModules,
   viteEnvironmentApi,
-  middleware,
+  v8_middleware,
   routeDiscovery,
 }: {
   ssr?: boolean;
@@ -41,7 +41,7 @@ export const reactRouterConfig = ({
     Config["future"]
   >["unstable_splitRouteModules"];
   viteEnvironmentApi?: boolean;
-  middleware?: boolean;
+  v8_middleware?: boolean;
   routeDiscovery?: Config["routeDiscovery"];
 }) => {
   let config: Config = {
@@ -53,7 +53,7 @@ export const reactRouterConfig = ({
     future: {
       unstable_splitRouteModules: splitRouteModules,
       unstable_viteEnvironmentApi: viteEnvironmentApi,
-      v8_middleware: middleware,
+      v8_middleware,
     },
   };
 
diff --git a/packages/react-router-dev/config/config.ts b/packages/react-router-dev/config/config.ts
index 8a0a55024c..951714b7a4 100644
--- a/packages/react-router-dev/config/config.ts
+++ b/packages/react-router-dev/config/config.ts
@@ -574,7 +574,7 @@ async function resolveConfig({
   }
 
   let future: FutureConfig = {
-    middleware: reactRouterUserConfig.future?.middleware ?? false,
+    v8_middleware: reactRouterUserConfig.future?.v8_middleware ?? false,
     unstable_optimizeDeps:
       reactRouterUserConfig.future?.unstable_optimizeDeps ?? false,
     unstable_splitRouteModules:
diff --git a/packages/react-router/__tests__/server-runtime/utils.ts b/packages/react-router/__tests__/server-runtime/utils.ts
index 2791f45750..ec5634255a 100644
--- a/packages/react-router/__tests__/server-runtime/utils.ts
+++ b/packages/react-router/__tests__/server-runtime/utils.ts
@@ -35,7 +35,7 @@ export function mockServerBuild(
   return {
     ssr: true,
     future: {
-      middleware: false,
+      v8_middleware: false,
       unstable_subResourceIntegrity: false,
       ...opts.future,
     },
diff --git a/packages/react-router/__tests__/utils/framework.ts b/packages/react-router/__tests__/utils/framework.ts
index 8ce4bc2ec1..79e48247ed 100644
--- a/packages/react-router/__tests__/utils/framework.ts
+++ b/packages/react-router/__tests__/utils/framework.ts
@@ -30,7 +30,7 @@ export function mockFrameworkContext(
       version: "",
     },
     future: {
-      middleware: false,
+      v8_middleware: false,
       unstable_subResourceIntegrity: false,
     },
     ssr: true,
diff --git a/packages/react-router/lib/dom/server.tsx b/packages/react-router/lib/dom/server.tsx
index b1823ff041..8c9e84f929 100644
--- a/packages/react-router/lib/dom/server.tsx
+++ b/packages/react-router/lib/dom/server.tsx
@@ -419,7 +419,7 @@ export function createStaticRouter(
     },
     get future() {
       return {
-        middleware: false,
+        v8_middleware: false,
         ...opts?.future,
       };
     },
diff --git a/packages/react-router/lib/dom/ssr/routes-test-stub.tsx b/packages/react-router/lib/dom/ssr/routes-test-stub.tsx
index 07e928e033..a41dd8612c 100644
--- a/packages/react-router/lib/dom/ssr/routes-test-stub.tsx
+++ b/packages/react-router/lib/dom/ssr/routes-test-stub.tsx
@@ -133,7 +133,7 @@ export function createRoutesStub(
         future: {
           unstable_subResourceIntegrity:
             future?.unstable_subResourceIntegrity === true,
-          middleware: future?.middleware === true,
+          v8_middleware: future?.v8_middleware === true,
         },
         manifest: {
           routes: {},
@@ -155,7 +155,7 @@ export function createRoutesStub(
         convertRoutesToDataRoutes(routes, (r) => r),
         _context !== undefined
           ? _context
-          : future?.middleware
+          : future?.v8_middleware
             ? new RouterContextProvider()
             : {},
         frameworkContextRef.current.manifest,
diff --git a/packages/react-router/lib/rsc/browser.tsx b/packages/react-router/lib/rsc/browser.tsx
index 39002eb102..1d15916633 100644
--- a/packages/react-router/lib/rsc/browser.tsx
+++ b/packages/react-router/lib/rsc/browser.tsx
@@ -791,7 +791,7 @@ export function RSCHydratedRouter({
     future: {
       // These flags have no runtime impact so can always be false.  If we add
       // flags that drive runtime behavior they'll need to be proxied through.
-      middleware: false,
+      v8_middleware: false,
       unstable_subResourceIntegrity: false,
     },
     isSpaMode: false,
diff --git a/packages/react-router/lib/rsc/server.ssr.tsx b/packages/react-router/lib/rsc/server.ssr.tsx
index 83550a10e5..c37b64aefa 100644
--- a/packages/react-router/lib/rsc/server.ssr.tsx
+++ b/packages/react-router/lib/rsc/server.ssr.tsx
@@ -316,7 +316,7 @@ export function RSCStaticRouter({ getPayload }: RSCStaticRouterProps) {
     future: {
       // These flags have no runtime impact so can always be false.  If we add
       // flags that drive runtime behavior they'll need to be proxied through.
-      middleware: false,
+      v8_middleware: false,
       unstable_subResourceIntegrity: false,
     },
     isSpaMode: false,

From f60fe648c6eb9a145ea0e97ab48ab3acb7185911 Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Sat, 23 Aug 2025 15:12:59 -0400
Subject: [PATCH 13/14] Fix rsc test

---
 integration/rsc/rsc-test.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/integration/rsc/rsc-test.ts b/integration/rsc/rsc-test.ts
index c418acefc6..6dd322c276 100644
--- a/integration/rsc/rsc-test.ts
+++ b/integration/rsc/rsc-test.ts
@@ -489,8 +489,8 @@ implementations.forEach((implementation) => {
 
             "src/routes/root.tsx": js`
               import { Links, Outlet, ScrollRestoration } from "react-router";
-              
-              export const unstable_middleware = [
+
+              export const middleware = [
                 async (_, next) => {
                   const response = await next();
                   return response.headers.set("x-test", "test");

From 30fe5d9ff5d8250b5d47c3b074c7bb96b6e5d4b8 Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Mon, 25 Aug 2025 10:17:04 -0400
Subject: [PATCH 14/14] Update e2e test unstable-get-context file

---
 .../helpers/rsc-parcel/src/browser.tsx        |  2 +-
 ...unstable-get-context.ts => get-context.ts} |  0
 ...unstable-get-context.ts => get-context.ts} |  0
 .../helpers/rsc-vite/src/entry.browser.tsx    |  2 +-
 integration/rsc/rsc-test.ts                   | 22 +++++++++----------
 5 files changed, 13 insertions(+), 13 deletions(-)
 rename integration/helpers/rsc-parcel/src/config/{unstable-get-context.ts => get-context.ts} (100%)
 rename integration/helpers/rsc-vite/src/config/{unstable-get-context.ts => get-context.ts} (100%)

diff --git a/integration/helpers/rsc-parcel/src/browser.tsx b/integration/helpers/rsc-parcel/src/browser.tsx
index b750793dd3..d0c02387d1 100644
--- a/integration/helpers/rsc-parcel/src/browser.tsx
+++ b/integration/helpers/rsc-parcel/src/browser.tsx
@@ -15,7 +15,7 @@ import {
   setServerCallback,
   // @ts-expect-error - no types for this yet
 } from "react-server-dom-parcel/client";
-import { getContext } from "./config/unstable-get-context";
+import { getContext } from "./config/get-context";
 
 // Create and set the callServer function to support post-hydration server actions.
 setServerCallback(
diff --git a/integration/helpers/rsc-parcel/src/config/unstable-get-context.ts b/integration/helpers/rsc-parcel/src/config/get-context.ts
similarity index 100%
rename from integration/helpers/rsc-parcel/src/config/unstable-get-context.ts
rename to integration/helpers/rsc-parcel/src/config/get-context.ts
diff --git a/integration/helpers/rsc-vite/src/config/unstable-get-context.ts b/integration/helpers/rsc-vite/src/config/get-context.ts
similarity index 100%
rename from integration/helpers/rsc-vite/src/config/unstable-get-context.ts
rename to integration/helpers/rsc-vite/src/config/get-context.ts
diff --git a/integration/helpers/rsc-vite/src/entry.browser.tsx b/integration/helpers/rsc-vite/src/entry.browser.tsx
index 34049f0a16..d8f9df5a33 100644
--- a/integration/helpers/rsc-vite/src/entry.browser.tsx
+++ b/integration/helpers/rsc-vite/src/entry.browser.tsx
@@ -12,7 +12,7 @@ import {
   unstable_RSCHydratedRouter as RSCHydratedRouter,
 } from "react-router";
 import type { unstable_RSCPayload as RSCPayload } from "react-router";
-import { getContext } from "./config/unstable-get-context";
+import { getContext } from "./config/get-context";
 
 setServerCallback(
   createCallServer({
diff --git a/integration/rsc/rsc-test.ts b/integration/rsc/rsc-test.ts
index 6dd322c276..265984b0ad 100644
--- a/integration/rsc/rsc-test.ts
+++ b/integration/rsc/rsc-test.ts
@@ -354,14 +354,14 @@ implementations.forEach((implementation) => {
                       ]
                     },
                     {
-                      id: "unstable-get-context",
-                      path: "unstable-get-context",
-                      lazy: () => import("./routes/unstable-get-context/root"),
+                      id: "get-context",
+                      path: "get-context",
+                      lazy: () => import("./routes/get-context/root"),
                       children: [
                         {
-                          id: "unstable-get-context.home",
+                          id: "get-context.home",
                           index: true,
-                          lazy: () => import("./routes/unstable-get-context/home"),
+                          lazy: () => import("./routes/get-context/home"),
                         },
                       ]
                     },
@@ -528,7 +528,7 @@ implementations.forEach((implementation) => {
                 new Map([[testContext, "test-context-value"]])
               );
             `,
-            "src/config/unstable-get-context.ts": js`
+            "src/config/get-context.ts": js`
               // THIS FILE OVERRIDES THE DEFAULT IMPLEMENTATION
               import { createContext } from "react-router";
 
@@ -701,12 +701,12 @@ implementations.forEach((implementation) => {
               }
             `,
 
-            "src/routes/unstable-get-context/root.tsx": js`
+            "src/routes/get-context/root.tsx": js`
               "use client";
 
               import { Outlet } from "react-router";
               import type { ClientMiddlewareFunction } from "react-router";
-              import { testContext } from "../../config/unstable-get-context";
+              import { testContext } from "../../config/get-context";
 
               export const clientMiddleware = [
                 async ({ context }, next) => {
@@ -728,11 +728,11 @@ implementations.forEach((implementation) => {
                 );
               }
             `,
-            "src/routes/unstable-get-context/home.tsx": js`
+            "src/routes/get-context/home.tsx": js`
               "use client";
 
               import { useLoaderData } from "react-router";
-              import { testContext } from "../../config/unstable-get-context";
+              import { testContext } from "../../config/get-context";
 
               export function clientLoader({ context }) {
                 const contextValue = context.get(testContext);
@@ -1339,7 +1339,7 @@ implementations.forEach((implementation) => {
         });
 
         test("Supports client context using getContext", async ({ page }) => {
-          await page.goto(`http://localhost:${port}/unstable-get-context`);
+          await page.goto(`http://localhost:${port}/get-context`);
           await page.waitForSelector("[data-client-context]");
           expect(
             await page.locator("[data-client-context]").textContent(),