react-router 7.8.2 → 7.9.0-pre.1

package/dist/development/{chunk-PVWAREVJ.mjs → chunk-QZH3B547.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v7.8.2
+ * react-router v7.9.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -362,13 +362,13 @@ function createBrowserURLImpl(to, isAbsolute = false) {
 }
 
 // lib/router/utils.ts
-function unstable_createContext(defaultValue) {
+function createContext(defaultValue) {
   return { defaultValue };
 }
 var _map;
-var unstable_RouterContextProvider = class {
+var RouterContextProvider = class {
   /**
-   * 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) {
@@ -428,7 +428,7 @@ var unsupportedLazyRouteFunctionKeys = /* @__PURE__ */ new Set([
   "path",
   "id",
   "index",
-  "unstable_middleware",
+  "middleware",
   "children"
 ]);
 function isUnsupportedLazyRouteFunctionKey(key) {
@@ -1466,7 +1466,7 @@ function createRouter(init) {
       pendingNavigationController.signal,
       opts && opts.submission
     );
-    let scopedContext = init.unstable_getContext ? await init.unstable_getContext() : new unstable_RouterContextProvider();
+    let scopedContext = init.getContext ? await init.getContext() : new RouterContextProvider();
     let pendingActionResult;
     if (opts && opts.pendingError) {
       pendingActionResult = [
@@ -1756,7 +1756,7 @@ function createRouter(init) {
       pendingActionResult
     );
     pendingNavigationLoadId = ++incrementingLoadId;
-    if (!init.dataStrategy && !dsMatches.some((m) => m.shouldLoad) && !dsMatches.some((m) => m.route.unstable_middleware) && revalidatingFetchers.length === 0) {
+    if (!init.dataStrategy && !dsMatches.some((m) => m.shouldLoad) && !dsMatches.some((m) => m.route.middleware) && revalidatingFetchers.length === 0) {
       let updatedFetchers2 = markFetchRedirectsDone();
       completeNavigation(
         location,
@@ -1910,7 +1910,7 @@ function createRouter(init) {
       setFetcherError(key, routeId, error, { flushSync });
       return;
     }
-    let scopedContext = init.unstable_getContext ? await init.unstable_getContext() : new unstable_RouterContextProvider();
+    let scopedContext = init.getContext ? await init.getContext() : new RouterContextProvider();
     let preventScrollReset = (opts && opts.preventScrollReset) === true;
     if (submission && isMutationMethod(submission.formMethod)) {
       await handleFetcherAction(
@@ -2761,13 +2761,13 @@ function createStaticHandler(routes, opts) {
     skipLoaderErrorBubbling,
     skipRevalidation,
     dataStrategy,
-    unstable_generateMiddlewareResponse: generateMiddlewareResponse
+    generateMiddlewareResponse
   } = {}) {
     let url = new URL(request.url);
     let method = request.method;
     let location = createLocation("", createPath(url), null, "default");
     let matches = matchRoutes(dataRoutes, location, basename);
-    requestContext = requestContext != null ? requestContext : new unstable_RouterContextProvider();
+    requestContext = requestContext != null ? requestContext : new RouterContextProvider();
     if (!isValidMethod(method) && method !== "HEAD") {
       let error = getInternalRouterError(405, { method });
       let { matches: methodNotAllowedMatches, route } = getShortCircuitMatches(dataRoutes);
@@ -2805,8 +2805,8 @@ function createStaticHandler(routes, opts) {
     }
     if (generateMiddlewareResponse) {
       invariant(
-        requestContext instanceof unstable_RouterContextProvider,
-        "When using middleware in `staticHandler.query()`, any provided `requestContext` must be an instance of `unstable_RouterContextProvider`"
+        requestContext instanceof RouterContextProvider,
+        "When using middleware in `staticHandler.query()`, any provided `requestContext` must be an instance of `RouterContextProvider`"
       );
       try {
         await loadLazyMiddlewareForMatches(
@@ -2835,7 +2835,7 @@ function createStaticHandler(routes, opts) {
                   dataStrategy || null,
                   skipLoaderErrorBubbling === true,
                   null,
-                  "filterMatchesToLoad" in opts2 ? opts2.filterMatchesToLoad ?? null : null,
+                  "filterMatchesToLoad" in opts2 ? opts2.filterMatchesToLoad ?? null : filterMatchesToLoad ?? null,
                   skipRevalidation === true
                 );
                 if (isResponse(result2)) {
@@ -2933,13 +2933,13 @@ function createStaticHandler(routes, opts) {
     routeId,
     requestContext,
     dataStrategy,
-    unstable_generateMiddlewareResponse: generateMiddlewareResponse
+    generateMiddlewareResponse
   } = {}) {
     let url = new URL(request.url);
     let method = request.method;
     let location = createLocation("", createPath(url), null, "default");
     let matches = matchRoutes(dataRoutes, location, basename);
-    requestContext = requestContext != null ? requestContext : new unstable_RouterContextProvider();
+    requestContext = requestContext != null ? requestContext : new RouterContextProvider();
     if (!isValidMethod(method) && method !== "HEAD" && method !== "OPTIONS") {
       throw getInternalRouterError(405, { method });
     } else if (!matches) {
@@ -2956,8 +2956,8 @@ function createStaticHandler(routes, opts) {
     }
     if (generateMiddlewareResponse) {
       invariant(
-        requestContext instanceof unstable_RouterContextProvider,
-        "When using middleware in `staticHandler.queryRoute()`, any provided `requestContext` must be an instance of `unstable_RouterContextProvider`"
+        requestContext instanceof RouterContextProvider,
+        "When using middleware in `staticHandler.queryRoute()`, any provided `requestContext` must be an instance of `RouterContextProvider`"
       );
       await loadLazyMiddlewareForMatches(matches, manifest, mapRouteProperties2);
       let response = await runServerMiddlewarePipeline(
@@ -3947,11 +3947,11 @@ function isNonNullable(value) {
 }
 function loadLazyMiddlewareForMatches(matches, manifest, mapRouteProperties2) {
   let promises = matches.map(({ route }) => {
-    if (typeof route.lazy !== "object" || !route.lazy.unstable_middleware) {
+    if (typeof route.lazy !== "object" || !route.lazy.middleware) {
       return void 0;
     }
     return loadLazyRouteProperty({
-      key: "unstable_middleware",
+      key: "middleware",
       route,
       manifest,
       mapRouteProperties: mapRouteProperties2
@@ -3969,7 +3969,7 @@ async function defaultDataStrategy(args) {
   return keyedResults;
 }
 async function defaultDataStrategyWithMiddleware(args) {
-  if (!args.matches.some((m) => m.route.unstable_middleware)) {
+  if (!args.matches.some((m) => m.route.middleware)) {
     return defaultDataStrategy(args);
   }
   return runClientMiddlewarePipeline(args, () => defaultDataStrategy(args));
@@ -4023,7 +4023,7 @@ function runClientMiddlewarePipeline(args, handler) {
 async function runMiddlewarePipeline(args, handler, processResult, isResult, errorHandler) {
   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]) : []
+    (m) => m.route.middleware ? m.route.middleware.map((fn) => [m.route.id, fn]) : []
   );
   let result = await callRouteMiddleware(
     { request, params, context },
@@ -4086,7 +4086,7 @@ async function callRouteMiddleware(args, middlewares, handler, processResult, is
 }
 function getDataStrategyMatchLazyPromises(mapRouteProperties2, manifest, request, match, lazyRoutePropertiesToSkip) {
   let lazyMiddlewarePromise = loadLazyRouteProperty({
-    key: "unstable_middleware",
+    key: "middleware",
     route: match.route,
     manifest,
     mapRouteProperties: mapRouteProperties2
@@ -4186,9 +4186,9 @@ async function callDataStrategyImpl(dataStrategyImpl, request, matches, fetcherK
     context: scopedContext,
     matches
   };
-  let unstable_runClientMiddleware = isStaticHandler ? () => {
+  let runClientMiddleware = isStaticHandler ? () => {
     throw new Error(
-      "You cannot call `unstable_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`"
+      "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`"
     );
   } : (cb) => {
     let typedDataStrategyArgs = dataStrategyArgs;
@@ -4196,9 +4196,9 @@ async function callDataStrategyImpl(dataStrategyImpl, request, matches, fetcherK
       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"
           );
         }
       });
@@ -4207,7 +4207,7 @@ async function callDataStrategyImpl(dataStrategyImpl, request, matches, fetcherK
   let results = await dataStrategyImpl({
     ...dataStrategyArgs,
     fetcherKey,
-    unstable_runClientMiddleware
+    runClientMiddleware
   });
   try {
     await Promise.all(
@@ -4926,6 +4926,7 @@ var FetchersContext = React.createContext(
 FetchersContext.displayName = "Fetchers";
 var AwaitContext = React.createContext(null);
 AwaitContext.displayName = "Await";
+var AwaitContextProvider = (props) => React.createElement(AwaitContext.Provider, props);
 var NavigationContext = React.createContext(
   null
 );
@@ -5593,7 +5594,7 @@ var hydrationRouteProperties = [
 function createMemoryRouter(routes, opts) {
   return createRouter({
     basename: opts?.basename,
-    unstable_getContext: opts?.unstable_getContext,
+    getContext: opts?.getContext,
     future: opts?.future,
     history: createMemoryHistory({
       initialEntries: opts?.initialEntries,
@@ -6997,9 +6998,6 @@ var ESCAPE_REGEX = /[&><\u2028\u2029]/g;
 function escapeHtml(html) {
   return html.replace(ESCAPE_REGEX, (match) => ESCAPE_LOOKUP[match]);
 }
-function createHtml(html) {
-  return { __html: html };
-}
 
 // lib/dom/ssr/invariant.ts
 function invariant2(value, message) {
@@ -7097,7 +7095,7 @@ function getTurboStreamSingleFetchDataStrategy(getRouter, manifest, routeModules
     ssr,
     basename
   );
-  return async (args) => args.unstable_runClientMiddleware(dataStrategy);
+  return async (args) => args.runClientMiddleware(dataStrategy);
 }
 function getSingleFetchDataStrategyImpl(getRouter, getRouteInfo, fetchAndDecode, ssr, basename, shouldAllowOptOut = () => true) {
   return async (args) => {
@@ -7893,7 +7891,7 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
       Object.assign(dataRoute, {
         ...dataRoute,
         ...getRouteComponents(route, routeModule, isSpaMode),
-        unstable_middleware: routeModule.unstable_clientMiddleware,
+        middleware: routeModule.clientMiddleware,
         handle: routeModule.handle,
         shouldRevalidate: getShouldRevalidateFunction(
           dataRoute.path,
@@ -8035,17 +8033,14 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
             }
           });
         } : void 0,
-        unstable_middleware: route.hasClientMiddleware ? async () => {
-          let { unstable_clientMiddleware } = route.clientMiddlewareModule ? await import(
+        middleware: route.hasClientMiddleware ? async () => {
+          let { clientMiddleware } = route.clientMiddlewareModule ? await import(
             /* @vite-ignore */
             /* webpackIgnore: true */
             route.clientMiddlewareModule
           ) : await getLazyRoute();
-          invariant2(
-            unstable_clientMiddleware,
-            "No `unstable_clientMiddleware` export found"
-          );
-          return unstable_clientMiddleware;
+          invariant2(clientMiddleware, "No `clientMiddleware` export found");
+          return clientMiddleware;
         } : void 0,
         shouldRevalidate: async () => {
           let lazyRoute = await getLazyRoute();
@@ -8126,7 +8121,7 @@ async function loadRouteModuleWithBlockingLinks(route, routeModules) {
   return {
     Component: getRouteModuleComponent(routeModule),
     ErrorBoundary: routeModule.ErrorBoundary,
-    unstable_clientMiddleware: routeModule.unstable_clientMiddleware,
+    clientMiddleware: routeModule.clientMiddleware,
     clientAction: routeModule.clientAction,
     clientLoader: routeModule.clientLoader,
     handle: routeModule.handle,
@@ -8678,7 +8673,7 @@ function Meta() {
           {
             key: `script:ld+json:${json}`,
             type: "application/ld+json",
-            dangerouslySetInnerHTML: { __html: json }
+            dangerouslySetInnerHTML: { __html: escapeHtml(json) }
           }
         );
       } catch (err) {
@@ -8783,7 +8778,7 @@ import(${JSON.stringify(manifest.entry.module)});`;
       {
         ...scriptProps,
         suppressHydrationWarning: true,
-        dangerouslySetInnerHTML: createHtml(contextScript),
+        dangerouslySetInnerHTML: { __html: contextScript },
         type: void 0
       }
     ), /* @__PURE__ */ React8.createElement(
@@ -8791,7 +8786,7 @@ import(${JSON.stringify(manifest.entry.module)});`;
       {
         ...scriptProps,
         suppressHydrationWarning: true,
-        dangerouslySetInnerHTML: createHtml(routeModulesScript),
+        dangerouslySetInnerHTML: { __html: routeModulesScript },
         type: "module",
         async: true
       }
@@ -8969,14 +8964,14 @@ var isBrowser = typeof window !== "undefined" && typeof window.document !== "und
 try {
   if (isBrowser) {
     window.__reactRouterVersion = // @ts-expect-error
-    "7.8.2";
+    "7.9.0-pre.1";
   }
 } catch (e) {
 }
 function createBrowserRouter(routes, opts) {
   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(),
@@ -8991,7 +8986,7 @@ function createBrowserRouter(routes, opts) {
 function createHashRouter(routes, opts) {
   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(),
@@ -9960,7 +9955,7 @@ function createStaticRouter(routes, context, opts = {}) {
     },
     get future() {
       return {
-        unstable_middleware: false,
+        v8_middleware: false,
         ...opts?.future
       };
     },
@@ -10066,8 +10061,8 @@ export {
   invariant,
   createPath,
   parsePath,
-  unstable_createContext,
-  unstable_RouterContextProvider,
+  createContext,
+  RouterContextProvider,
   convertRoutesToDataRoutes,
   matchRoutes,
   generatePath,
@@ -10096,6 +10091,7 @@ export {
   RSCRouterContext,
   ViewTransitionContext,
   FetchersContext,
+  AwaitContextProvider,
   NavigationContext,
   LocationContext,
   RouteContext,
@@ -10143,6 +10139,7 @@ export {
   WithErrorBoundaryProps,
   withErrorBoundaryProps,
   createSearchParams,
+  escapeHtml,
   encode,
   createRequestInit,
   SingleFetchRedirectSymbol,

package/dist/development/{chunk-ZO66TDGB.js → chunk-RGB6BZUL.js}

@@ -1,5 +1,5 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }/**
- * react-router v7.8.2
+ * react-router v7.9.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -362,13 +362,13 @@ function createBrowserURLImpl(to, isAbsolute = false) {
 }
 
 // lib/router/utils.ts
-function unstable_createContext(defaultValue) {
+function createContext(defaultValue) {
   return { defaultValue };
 }
 var _map;
-var unstable_RouterContextProvider = class {
+var RouterContextProvider = class {
   /**
-   * 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) {
@@ -428,7 +428,7 @@ var unsupportedLazyRouteFunctionKeys = /* @__PURE__ */ new Set([
   "path",
   "id",
   "index",
-  "unstable_middleware",
+  "middleware",
   "children"
 ]);
 function isUnsupportedLazyRouteFunctionKey(key) {
@@ -1466,7 +1466,7 @@ function createRouter(init) {
       pendingNavigationController.signal,
       opts && opts.submission
     );
-    let scopedContext = init.unstable_getContext ? await init.unstable_getContext() : new unstable_RouterContextProvider();
+    let scopedContext = init.getContext ? await init.getContext() : new RouterContextProvider();
     let pendingActionResult;
     if (opts && opts.pendingError) {
       pendingActionResult = [
@@ -1756,7 +1756,7 @@ function createRouter(init) {
       pendingActionResult
     );
     pendingNavigationLoadId = ++incrementingLoadId;
-    if (!init.dataStrategy && !dsMatches.some((m) => m.shouldLoad) && !dsMatches.some((m) => m.route.unstable_middleware) && revalidatingFetchers.length === 0) {
+    if (!init.dataStrategy && !dsMatches.some((m) => m.shouldLoad) && !dsMatches.some((m) => m.route.middleware) && revalidatingFetchers.length === 0) {
       let updatedFetchers2 = markFetchRedirectsDone();
       completeNavigation(
         location,
@@ -1910,7 +1910,7 @@ function createRouter(init) {
       setFetcherError(key, routeId, error, { flushSync });
       return;
     }
-    let scopedContext = init.unstable_getContext ? await init.unstable_getContext() : new unstable_RouterContextProvider();
+    let scopedContext = init.getContext ? await init.getContext() : new RouterContextProvider();
     let preventScrollReset = (opts && opts.preventScrollReset) === true;
     if (submission && isMutationMethod(submission.formMethod)) {
       await handleFetcherAction(
@@ -2761,13 +2761,13 @@ function createStaticHandler(routes, opts) {
     skipLoaderErrorBubbling,
     skipRevalidation,
     dataStrategy,
-    unstable_generateMiddlewareResponse: generateMiddlewareResponse
+    generateMiddlewareResponse
   } = {}) {
     let url = new URL(request.url);
     let method = request.method;
     let location = createLocation("", createPath(url), null, "default");
     let matches = matchRoutes(dataRoutes, location, basename);
-    requestContext = requestContext != null ? requestContext : new unstable_RouterContextProvider();
+    requestContext = requestContext != null ? requestContext : new RouterContextProvider();
     if (!isValidMethod(method) && method !== "HEAD") {
       let error = getInternalRouterError(405, { method });
       let { matches: methodNotAllowedMatches, route } = getShortCircuitMatches(dataRoutes);
@@ -2805,8 +2805,8 @@ function createStaticHandler(routes, opts) {
     }
     if (generateMiddlewareResponse) {
       invariant(
-        requestContext instanceof unstable_RouterContextProvider,
-        "When using middleware in `staticHandler.query()`, any provided `requestContext` must be an instance of `unstable_RouterContextProvider`"
+        requestContext instanceof RouterContextProvider,
+        "When using middleware in `staticHandler.query()`, any provided `requestContext` must be an instance of `RouterContextProvider`"
       );
       try {
         await loadLazyMiddlewareForMatches(
@@ -2835,7 +2835,7 @@ function createStaticHandler(routes, opts) {
                   dataStrategy || null,
                   skipLoaderErrorBubbling === true,
                   null,
-                  "filterMatchesToLoad" in opts2 ? _nullishCoalesce(opts2.filterMatchesToLoad, () => ( null)) : null,
+                  "filterMatchesToLoad" in opts2 ? _nullishCoalesce(opts2.filterMatchesToLoad, () => ( null)) : _nullishCoalesce(filterMatchesToLoad, () => ( null)),
                   skipRevalidation === true
                 );
                 if (isResponse(result2)) {
@@ -2933,13 +2933,13 @@ function createStaticHandler(routes, opts) {
     routeId,
     requestContext,
     dataStrategy,
-    unstable_generateMiddlewareResponse: generateMiddlewareResponse
+    generateMiddlewareResponse
   } = {}) {
     let url = new URL(request.url);
     let method = request.method;
     let location = createLocation("", createPath(url), null, "default");
     let matches = matchRoutes(dataRoutes, location, basename);
-    requestContext = requestContext != null ? requestContext : new unstable_RouterContextProvider();
+    requestContext = requestContext != null ? requestContext : new RouterContextProvider();
     if (!isValidMethod(method) && method !== "HEAD" && method !== "OPTIONS") {
       throw getInternalRouterError(405, { method });
     } else if (!matches) {
@@ -2956,8 +2956,8 @@ function createStaticHandler(routes, opts) {
     }
     if (generateMiddlewareResponse) {
       invariant(
-        requestContext instanceof unstable_RouterContextProvider,
-        "When using middleware in `staticHandler.queryRoute()`, any provided `requestContext` must be an instance of `unstable_RouterContextProvider`"
+        requestContext instanceof RouterContextProvider,
+        "When using middleware in `staticHandler.queryRoute()`, any provided `requestContext` must be an instance of `RouterContextProvider`"
       );
       await loadLazyMiddlewareForMatches(matches, manifest, mapRouteProperties);
       let response = await runServerMiddlewarePipeline(
@@ -3947,11 +3947,11 @@ function isNonNullable(value) {
 }
 function loadLazyMiddlewareForMatches(matches, manifest, mapRouteProperties) {
   let promises = matches.map(({ route }) => {
-    if (typeof route.lazy !== "object" || !route.lazy.unstable_middleware) {
+    if (typeof route.lazy !== "object" || !route.lazy.middleware) {
       return void 0;
     }
     return loadLazyRouteProperty({
-      key: "unstable_middleware",
+      key: "middleware",
       route,
       manifest,
       mapRouteProperties
@@ -3969,7 +3969,7 @@ async function defaultDataStrategy(args) {
   return keyedResults;
 }
 async function defaultDataStrategyWithMiddleware(args) {
-  if (!args.matches.some((m) => m.route.unstable_middleware)) {
+  if (!args.matches.some((m) => m.route.middleware)) {
     return defaultDataStrategy(args);
   }
   return runClientMiddlewarePipeline(args, () => defaultDataStrategy(args));
@@ -4023,7 +4023,7 @@ function runClientMiddlewarePipeline(args, handler) {
 async function runMiddlewarePipeline(args, handler, processResult, isResult, errorHandler) {
   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]) : []
+    (m) => m.route.middleware ? m.route.middleware.map((fn) => [m.route.id, fn]) : []
   );
   let result = await callRouteMiddleware(
     { request, params, context },
@@ -4086,7 +4086,7 @@ async function callRouteMiddleware(args, middlewares, handler, processResult, is
 }
 function getDataStrategyMatchLazyPromises(mapRouteProperties, manifest, request, match, lazyRoutePropertiesToSkip) {
   let lazyMiddlewarePromise = loadLazyRouteProperty({
-    key: "unstable_middleware",
+    key: "middleware",
     route: match.route,
     manifest,
     mapRouteProperties
@@ -4186,9 +4186,9 @@ async function callDataStrategyImpl(dataStrategyImpl, request, matches, fetcherK
     context: scopedContext,
     matches
   };
-  let unstable_runClientMiddleware = isStaticHandler ? () => {
+  let runClientMiddleware = isStaticHandler ? () => {
     throw new Error(
-      "You cannot call `unstable_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`"
+      "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`"
     );
   } : (cb) => {
     let typedDataStrategyArgs = dataStrategyArgs;
@@ -4196,9 +4196,9 @@ async function callDataStrategyImpl(dataStrategyImpl, request, matches, fetcherK
       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"
           );
         }
       });
@@ -4207,7 +4207,7 @@ async function callDataStrategyImpl(dataStrategyImpl, request, matches, fetcherK
   let results = await dataStrategyImpl({
     ...dataStrategyArgs,
     fetcherKey,
-    unstable_runClientMiddleware
+    runClientMiddleware
   });
   try {
     await Promise.all(
@@ -5608,9 +5608,6 @@ var ESCAPE_REGEX = /[&><\u2028\u2029]/g;
 function escapeHtml(html) {
   return html.replace(ESCAPE_REGEX, (match) => ESCAPE_LOOKUP[match]);
 }
-function createHtml(html) {
-  return { __html: html };
-}
 
 // lib/dom/ssr/invariant.ts
 function invariant2(value, message) {
@@ -5708,7 +5705,7 @@ function getTurboStreamSingleFetchDataStrategy(getRouter, manifest, routeModules
     ssr,
     basename
   );
-  return async (args) => args.unstable_runClientMiddleware(dataStrategy);
+  return async (args) => args.runClientMiddleware(dataStrategy);
 }
 function getSingleFetchDataStrategyImpl(getRouter, getRouteInfo, fetchAndDecode, ssr, basename, shouldAllowOptOut = () => true) {
   return async (args) => {
@@ -6107,6 +6104,7 @@ var FetchersContext = React2.createContext(
 FetchersContext.displayName = "Fetchers";
 var AwaitContext = React2.createContext(null);
 AwaitContext.displayName = "Await";
+var AwaitContextProvider = (props) => React2.createElement(AwaitContext.Provider, props);
 var NavigationContext = React2.createContext(
   null
 );
@@ -7130,7 +7128,7 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
       Object.assign(dataRoute, {
         ...dataRoute,
         ...getRouteComponents(route, routeModule, isSpaMode),
-        unstable_middleware: routeModule.unstable_clientMiddleware,
+        middleware: routeModule.clientMiddleware,
         handle: routeModule.handle,
         shouldRevalidate: getShouldRevalidateFunction(
           dataRoute.path,
@@ -7272,17 +7270,14 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
             }
           });
         } : void 0,
-        unstable_middleware: route.hasClientMiddleware ? async () => {
-          let { unstable_clientMiddleware } = route.clientMiddlewareModule ? await Promise.resolve().then(() => _interopRequireWildcard(require(
+        middleware: route.hasClientMiddleware ? async () => {
+          let { clientMiddleware } = route.clientMiddlewareModule ? await Promise.resolve().then(() => _interopRequireWildcard(require(
             /* @vite-ignore */
             /* webpackIgnore: true */
             route.clientMiddlewareModule
           ))) : await getLazyRoute();
-          invariant2(
-            unstable_clientMiddleware,
-            "No `unstable_clientMiddleware` export found"
-          );
-          return unstable_clientMiddleware;
+          invariant2(clientMiddleware, "No `clientMiddleware` export found");
+          return clientMiddleware;
         } : void 0,
         shouldRevalidate: async () => {
           let lazyRoute = await getLazyRoute();
@@ -7363,7 +7358,7 @@ async function loadRouteModuleWithBlockingLinks(route, routeModules) {
   return {
     Component: getRouteModuleComponent(routeModule),
     ErrorBoundary: routeModule.ErrorBoundary,
-    unstable_clientMiddleware: routeModule.unstable_clientMiddleware,
+    clientMiddleware: routeModule.clientMiddleware,
     clientAction: routeModule.clientAction,
     clientLoader: routeModule.clientLoader,
     handle: routeModule.handle,
@@ -7915,7 +7910,7 @@ function Meta() {
           {
             key: `script:ld+json:${json}`,
             type: "application/ld+json",
-            dangerouslySetInnerHTML: { __html: json }
+            dangerouslySetInnerHTML: { __html: escapeHtml(json) }
           }
         );
       } catch (err) {
@@ -8020,7 +8015,7 @@ import(${JSON.stringify(manifest.entry.module)});`;
       {
         ...scriptProps,
         suppressHydrationWarning: true,
-        dangerouslySetInnerHTML: createHtml(contextScript),
+        dangerouslySetInnerHTML: { __html: contextScript },
         type: void 0
       }
     ), /* @__PURE__ */ React7.createElement(
@@ -8028,7 +8023,7 @@ import(${JSON.stringify(manifest.entry.module)});`;
       {
         ...scriptProps,
         suppressHydrationWarning: true,
-        dangerouslySetInnerHTML: createHtml(routeModulesScript),
+        dangerouslySetInnerHTML: { __html: routeModulesScript },
         type: "module",
         async: true
       }
@@ -8301,4 +8296,6 @@ function BoundaryShell({
 
 
 
-exports.Action = Action; exports.createMemoryHistory = createMemoryHistory; exports.createBrowserHistory = createBrowserHistory; exports.createHashHistory = createHashHistory; exports.invariant = invariant; exports.warning = warning; exports.createPath = createPath; exports.parsePath = parsePath; exports.unstable_createContext = unstable_createContext; exports.unstable_RouterContextProvider = unstable_RouterContextProvider; exports.convertRoutesToDataRoutes = convertRoutesToDataRoutes; exports.matchRoutes = matchRoutes; exports.generatePath = generatePath; exports.matchPath = matchPath; exports.stripBasename = stripBasename; exports.resolvePath = resolvePath; exports.getResolveToMatches = getResolveToMatches; exports.resolveTo = resolveTo; exports.joinPaths = joinPaths; exports.data = data; exports.redirect = redirect; exports.redirectDocument = redirectDocument; exports.replace = replace; exports.ErrorResponseImpl = ErrorResponseImpl; exports.isRouteErrorResponse = isRouteErrorResponse; exports.encode = encode; exports.IDLE_NAVIGATION = IDLE_NAVIGATION; exports.IDLE_FETCHER = IDLE_FETCHER; exports.IDLE_BLOCKER = IDLE_BLOCKER; exports.createRouter = createRouter; exports.createStaticHandler = createStaticHandler; exports.getStaticContextFromError = getStaticContextFromError; exports.isDataWithResponseInit = isDataWithResponseInit; exports.isResponse = isResponse; exports.isRedirectStatusCode = isRedirectStatusCode; exports.isRedirectResponse = isRedirectResponse; exports.isMutationMethod = isMutationMethod; exports.createRequestInit = createRequestInit; exports.SingleFetchRedirectSymbol = SingleFetchRedirectSymbol; exports.SINGLE_FETCH_REDIRECT_STATUS = SINGLE_FETCH_REDIRECT_STATUS; exports.NO_BODY_STATUS_CODES = NO_BODY_STATUS_CODES; exports.StreamTransfer = StreamTransfer; exports.getTurboStreamSingleFetchDataStrategy = getTurboStreamSingleFetchDataStrategy; exports.getSingleFetchDataStrategyImpl = getSingleFetchDataStrategyImpl; exports.stripIndexParam = stripIndexParam; exports.singleFetchUrl = singleFetchUrl; exports.decodeViaTurboStream = decodeViaTurboStream; exports.DataRouterContext = DataRouterContext; exports.DataRouterStateContext = DataRouterStateContext; exports.RSCRouterContext = RSCRouterContext; exports.ViewTransitionContext = ViewTransitionContext; exports.FetchersContext = FetchersContext; exports.AwaitContext = AwaitContext; exports.NavigationContext = NavigationContext; exports.LocationContext = LocationContext; exports.RouteContext = RouteContext; exports.ENABLE_DEV_WARNINGS = ENABLE_DEV_WARNINGS; exports.warnOnce = warnOnce; exports.useHref = useHref; exports.useInRouterContext = useInRouterContext; exports.useLocation = useLocation; exports.useNavigationType = useNavigationType; exports.useMatch = useMatch; exports.useNavigate = useNavigate; exports.useOutletContext = useOutletContext; exports.useOutlet = useOutlet; exports.useParams = useParams; exports.useResolvedPath = useResolvedPath; exports.useRoutes = useRoutes; exports.useRoutesImpl = useRoutesImpl; exports._renderMatches = _renderMatches; exports.useRouteId = useRouteId; exports.useNavigation = useNavigation; exports.useRevalidator = useRevalidator; exports.useMatches = useMatches; exports.useLoaderData = useLoaderData; exports.useRouteLoaderData = useRouteLoaderData; exports.useActionData = useActionData; exports.useRouteError = useRouteError; exports.useAsyncValue = useAsyncValue; exports.useAsyncError = useAsyncError; exports.useBlocker = useBlocker; exports.RemixErrorBoundary = RemixErrorBoundary; exports.createServerRoutes = createServerRoutes; exports.createClientRoutesWithHMRRevalidationOptOut = createClientRoutesWithHMRRevalidationOptOut; exports.noActionDefinedError = noActionDefinedError; exports.createClientRoutes = createClientRoutes; exports.shouldHydrateRouteLoader = shouldHydrateRouteLoader; exports.getPatchRoutesOnNavigationFunction = getPatchRoutesOnNavigationFunction; exports.useFogOFWarDiscovery = useFogOFWarDiscovery; exports.getManifestPath = getManifestPath; exports.FrameworkContext = FrameworkContext; exports.usePrefetchBehavior = usePrefetchBehavior; exports.CRITICAL_CSS_DATA_ATTRIBUTE = CRITICAL_CSS_DATA_ATTRIBUTE; exports.Links = Links; exports.PrefetchPageLinks = PrefetchPageLinks; exports.Meta = Meta; exports.setIsHydrated = setIsHydrated; exports.Scripts = Scripts; exports.mergeRefs = mergeRefs;
+
+
+exports.Action = Action; exports.createMemoryHistory = createMemoryHistory; exports.createBrowserHistory = createBrowserHistory; exports.createHashHistory = createHashHistory; exports.invariant = invariant; exports.warning = warning; exports.createPath = createPath; exports.parsePath = parsePath; exports.createContext = createContext; exports.RouterContextProvider = RouterContextProvider; exports.convertRoutesToDataRoutes = convertRoutesToDataRoutes; exports.matchRoutes = matchRoutes; exports.generatePath = generatePath; exports.matchPath = matchPath; exports.stripBasename = stripBasename; exports.resolvePath = resolvePath; exports.getResolveToMatches = getResolveToMatches; exports.resolveTo = resolveTo; exports.joinPaths = joinPaths; exports.data = data; exports.redirect = redirect; exports.redirectDocument = redirectDocument; exports.replace = replace; exports.ErrorResponseImpl = ErrorResponseImpl; exports.isRouteErrorResponse = isRouteErrorResponse; exports.escapeHtml = escapeHtml; exports.encode = encode; exports.IDLE_NAVIGATION = IDLE_NAVIGATION; exports.IDLE_FETCHER = IDLE_FETCHER; exports.IDLE_BLOCKER = IDLE_BLOCKER; exports.createRouter = createRouter; exports.createStaticHandler = createStaticHandler; exports.getStaticContextFromError = getStaticContextFromError; exports.isDataWithResponseInit = isDataWithResponseInit; exports.isResponse = isResponse; exports.isRedirectStatusCode = isRedirectStatusCode; exports.isRedirectResponse = isRedirectResponse; exports.isMutationMethod = isMutationMethod; exports.createRequestInit = createRequestInit; exports.SingleFetchRedirectSymbol = SingleFetchRedirectSymbol; exports.SINGLE_FETCH_REDIRECT_STATUS = SINGLE_FETCH_REDIRECT_STATUS; exports.NO_BODY_STATUS_CODES = NO_BODY_STATUS_CODES; exports.StreamTransfer = StreamTransfer; exports.getTurboStreamSingleFetchDataStrategy = getTurboStreamSingleFetchDataStrategy; exports.getSingleFetchDataStrategyImpl = getSingleFetchDataStrategyImpl; exports.stripIndexParam = stripIndexParam; exports.singleFetchUrl = singleFetchUrl; exports.decodeViaTurboStream = decodeViaTurboStream; exports.DataRouterContext = DataRouterContext; exports.DataRouterStateContext = DataRouterStateContext; exports.RSCRouterContext = RSCRouterContext; exports.ViewTransitionContext = ViewTransitionContext; exports.FetchersContext = FetchersContext; exports.AwaitContext = AwaitContext; exports.AwaitContextProvider = AwaitContextProvider; exports.NavigationContext = NavigationContext; exports.LocationContext = LocationContext; exports.RouteContext = RouteContext; exports.ENABLE_DEV_WARNINGS = ENABLE_DEV_WARNINGS; exports.warnOnce = warnOnce; exports.useHref = useHref; exports.useInRouterContext = useInRouterContext; exports.useLocation = useLocation; exports.useNavigationType = useNavigationType; exports.useMatch = useMatch; exports.useNavigate = useNavigate; exports.useOutletContext = useOutletContext; exports.useOutlet = useOutlet; exports.useParams = useParams; exports.useResolvedPath = useResolvedPath; exports.useRoutes = useRoutes; exports.useRoutesImpl = useRoutesImpl; exports._renderMatches = _renderMatches; exports.useRouteId = useRouteId; exports.useNavigation = useNavigation; exports.useRevalidator = useRevalidator; exports.useMatches = useMatches; exports.useLoaderData = useLoaderData; exports.useRouteLoaderData = useRouteLoaderData; exports.useActionData = useActionData; exports.useRouteError = useRouteError; exports.useAsyncValue = useAsyncValue; exports.useAsyncError = useAsyncError; exports.useBlocker = useBlocker; exports.RemixErrorBoundary = RemixErrorBoundary; exports.createServerRoutes = createServerRoutes; exports.createClientRoutesWithHMRRevalidationOptOut = createClientRoutesWithHMRRevalidationOptOut; exports.noActionDefinedError = noActionDefinedError; exports.createClientRoutes = createClientRoutes; exports.shouldHydrateRouteLoader = shouldHydrateRouteLoader; exports.getPatchRoutesOnNavigationFunction = getPatchRoutesOnNavigationFunction; exports.useFogOFWarDiscovery = useFogOFWarDiscovery; exports.getManifestPath = getManifestPath; exports.FrameworkContext = FrameworkContext; exports.usePrefetchBehavior = usePrefetchBehavior; exports.CRITICAL_CSS_DATA_ATTRIBUTE = CRITICAL_CSS_DATA_ATTRIBUTE; exports.Links = Links; exports.PrefetchPageLinks = PrefetchPageLinks; exports.Meta = Meta; exports.setIsHydrated = setIsHydrated; exports.Scripts = Scripts; exports.mergeRefs = mergeRefs;