react-router 7.3.0 → 7.4.0

package/dist/production/index.js

@@ -1,5 +1,5 @@
 /**
- * react-router v7.3.0
+ * react-router v7.4.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -2832,7 +2832,7 @@ function createStaticHandler(routes, opts) {
     if (respond && matches.some((m) => m.route.unstable_middleware)) {
       invariant(
         requestContext instanceof unstable_RouterContextProvider,
-        "When using middleware in `staticHandler.query()`, any provided `requestContext` must bean instance of `unstable_RouterContextProvider`"
+        "When using middleware in `staticHandler.query()`, any provided `requestContext` must be an instance of `unstable_RouterContextProvider`"
       );
       try {
         let renderedStaticContext;
@@ -2865,20 +2865,20 @@ function createStaticHandler(routes, opts) {
             let res = await respond(renderedStaticContext);
             return res;
           },
-          async (e) => {
-            if (isResponse(e.error)) {
-              return e.error;
+          async (error, routeId) => {
+            if (isResponse(error)) {
+              return error;
             }
             if (renderedStaticContext) {
-              if (e.routeId in renderedStaticContext.loaderData) {
-                renderedStaticContext.loaderData[e.routeId] = void 0;
+              if (routeId in renderedStaticContext.loaderData) {
+                renderedStaticContext.loaderData[routeId] = void 0;
               }
               return respond(
                 getStaticContextFromError(
                   dataRoutes,
                   renderedStaticContext,
-                  e.error,
-                  findNearestBoundary(matches, e.routeId).route.id
+                  error,
+                  findNearestBoundary(matches, routeId).route.id
                 )
               );
             } else {
@@ -2891,9 +2891,9 @@ function createStaticHandler(routes, opts) {
                 loaderData: {},
                 actionData: null,
                 errors: {
-                  [boundary.route.id]: e.error
+                  [boundary.route.id]: error
                 },
-                statusCode: isRouteErrorResponse(e.error) ? e.error.status : 500,
+                statusCode: isRouteErrorResponse(error) ? error.status : 500,
                 actionHeaders: {},
                 loaderHeaders: {}
               });
@@ -2953,7 +2953,7 @@ function createStaticHandler(routes, opts) {
     if (respond && matches.some((m) => m.route.unstable_middleware)) {
       invariant(
         requestContext instanceof unstable_RouterContextProvider,
-        "When using middleware in `staticHandler.queryRoute()`, any provided `requestContext` must bean instance of `unstable_RouterContextProvider`"
+        "When using middleware in `staticHandler.queryRoute()`, any provided `requestContext` must be an instance of `unstable_RouterContextProvider`"
       );
       let response = await runMiddlewarePipeline(
         {
@@ -2987,11 +2987,11 @@ function createStaticHandler(routes, opts) {
           let value = result2.actionData ? Object.values(result2.actionData)[0] : Object.values(result2.loaderData)[0];
           return typeof value === "string" ? new Response(value) : Response.json(value);
         },
-        (e) => {
-          if (isResponse(e.error)) {
-            return respond(e.error);
+        (error2) => {
+          if (isResponse(error2)) {
+            return respond(error2);
           }
-          return new Response(String(e.error), {
+          return new Response(String(error2), {
             status: 500,
             statusText: "Unexpected Server Error"
           });
@@ -3724,14 +3724,13 @@ async function defaultDataStrategyWithMiddleware(args) {
     args,
     false,
     () => defaultDataStrategy(args),
-    (e) => ({ [e.routeId]: { type: "error", result: e.error } })
+    (error, routeId) => ({ [routeId]: { type: "error", result: error } })
   );
 }
 async function runMiddlewarePipeline(args, propagateResult, handler, errorHandler) {
   let { matches, request, params, context } = args;
   let middlewareState = {
-    handlerResult: void 0,
-    propagateResult
+    handlerResult: void 0
   };
   try {
     let tuples = matches.flatMap(
@@ -3740,28 +3739,26 @@ async function runMiddlewarePipeline(args, propagateResult, handler, errorHandle
     let result = await callRouteMiddleware(
       { request, params, context },
       tuples,
+      propagateResult,
       middlewareState,
       handler
     );
-    return middlewareState.propagateResult ? result : middlewareState.handlerResult;
+    return propagateResult ? result : middlewareState.handlerResult;
   } catch (e) {
-    if (!(e instanceof MiddlewareError)) {
+    if (!middlewareState.middlewareError) {
       throw e;
     }
-    let result = await errorHandler(e);
+    let result = await errorHandler(
+      middlewareState.middlewareError.error,
+      middlewareState.middlewareError.routeId
+    );
     if (propagateResult || !middlewareState.handlerResult) {
       return result;
     }
     return Object.assign(middlewareState.handlerResult, result);
   }
 }
-var MiddlewareError = class {
-  constructor(routeId, error) {
-    this.routeId = routeId;
-    this.error = error;
-  }
-};
-async function callRouteMiddleware(args, middlewares, middlewareState, handler, idx = 0) {
+async function callRouteMiddleware(args, middlewares, propagateResult, middlewareState, handler, idx = 0) {
   let { request } = args;
   if (request.signal.aborted) {
     if (request.signal.reason) {
@@ -3787,11 +3784,12 @@ async function callRouteMiddleware(args, middlewares, middlewareState, handler,
     let result = await callRouteMiddleware(
       args,
       middlewares,
+      propagateResult,
       middlewareState,
       handler,
       idx + 1
     );
-    if (middlewareState.propagateResult) {
+    if (propagateResult) {
       nextResult = result;
       return nextResult;
     }
@@ -3814,11 +3812,13 @@ async function callRouteMiddleware(args, middlewares, middlewareState, handler,
     } else {
       return next();
     }
-  } catch (e) {
-    if (e instanceof MiddlewareError) {
-      throw e;
+  } catch (error) {
+    if (!middlewareState.middlewareError) {
+      middlewareState.middlewareError = { routeId, error };
+    } else if (middlewareState.middlewareError.error !== error) {
+      middlewareState.middlewareError = { routeId, error };
     }
-    throw new MiddlewareError(routeId, e);
+    throw error;
   }
 }
 async function callDataStrategyImpl(dataStrategyImpl, type, request, matchesToLoad, matches, fetcherKey, manifest, mapRouteProperties2, scopedContext, enableMiddleware) {
@@ -6152,6 +6152,9 @@ function StreamTransfer({
     )));
   }
 }
+function handleMiddlewareError(error, routeId) {
+  return { [routeId]: { type: "error", result: error } };
+}
 function getSingleFetchDataStrategy(manifest, routeModules, ssr, basename, getRouter) {
   return async (args) => {
     let { request, matches, fetcherKey } = args;
@@ -6160,7 +6163,7 @@ function getSingleFetchDataStrategy(manifest, routeModules, ssr, basename, getRo
         args,
         false,
         () => singleFetchActionStrategy(request, matches, basename),
-        (e) => ({ [e.routeId]: { type: "error", result: e.error } })
+        handleMiddlewareError
       );
     }
     if (!ssr) {
@@ -6172,7 +6175,7 @@ function getSingleFetchDataStrategy(manifest, routeModules, ssr, basename, getRo
           args,
           false,
           () => nonSsrStrategy(manifest, request, matches, basename),
-          (e) => ({ [e.routeId]: { type: "error", result: e.error } })
+          handleMiddlewareError
         );
       }
     }
@@ -6181,7 +6184,7 @@ function getSingleFetchDataStrategy(manifest, routeModules, ssr, basename, getRo
         args,
         false,
         () => singleFetchLoaderFetcherStrategy(request, matches, basename),
-        (e) => ({ [e.routeId]: { type: "error", result: e.error } })
+        handleMiddlewareError
       );
     }
     return runMiddlewarePipeline(
@@ -6196,7 +6199,7 @@ function getSingleFetchDataStrategy(manifest, routeModules, ssr, basename, getRo
         matches,
         basename
       ),
-      (e) => ({ [e.routeId]: { type: "error", result: e.error } })
+      handleMiddlewareError
     );
   };
 }
@@ -6246,9 +6249,6 @@ async function nonSsrStrategy(manifest, request, matches, basename) {
   );
   return results;
 }
-function isOptedOut(manifestRoute, routeModule, match, router) {
-  return match.route.id in router.state.loaderData && manifestRoute && manifestRoute.hasLoader && routeModule && routeModule.shouldRevalidate;
-}
 async function singleFetchLoaderNavigationStrategy(manifest, routeModules, ssr, router, request, matches, basename) {
   let routesParams = /* @__PURE__ */ new Set();
   let foundOptOutRoute = false;
@@ -6267,8 +6267,10 @@ async function singleFetchLoaderNavigationStrategy(manifest, routeModules, ssr,
           if (!router.state.initialized) {
             return;
           }
-          if (isOptedOut(manifestRoute, routeModules[m.route.id], m, router)) {
-            foundOptOutRoute = true;
+          if (m.route.id in router.state.loaderData && manifestRoute && m.route.shouldRevalidate) {
+            if (manifestRoute.hasLoader) {
+              foundOptOutRoute = true;
+            }
             return;
           }
         }
@@ -7663,7 +7665,7 @@ function mergeRefs(...refs) {
 var isBrowser = typeof window !== "undefined" && typeof window.document !== "undefined" && typeof window.document.createElement !== "undefined";
 try {
   if (isBrowser) {
-    window.__reactRouterVersion = "7.3.0";
+    window.__reactRouterVersion = "7.4.0";
   }
 } catch (e) {
 }
@@ -9824,8 +9826,8 @@ var createRequestHandler = (build, mode) => {
     } else {
       let { pathname } = url;
       let criticalCss = void 0;
-      if (_build.getCriticalCss) {
-        criticalCss = await _build.getCriticalCss({ pathname });
+      if (_build.unstable_getCriticalCss) {
+        criticalCss = await _build.unstable_getCriticalCss({ pathname });
       } else if (mode === "development" /* Development */ && getDevServerHooks()?.getCriticalCss) {
         criticalCss = await getDevServerHooks()?.getCriticalCss?.(pathname);
       }
@@ -9860,7 +9862,18 @@ async function handleManifestRequest(build, routes, url) {
   }
   let patches = {};
   if (url.searchParams.has("p")) {
-    for (let path of url.searchParams.getAll("p")) {
+    let paths = /* @__PURE__ */ new Set();
+    url.searchParams.getAll("p").forEach((path) => {
+      if (!path.startsWith("/")) {
+        path = `/${path}`;
+      }
+      let segments = path.split("/").slice(1);
+      segments.forEach((_, i) => {
+        let partialPath = segments.slice(0, i + 1).join("/");
+        paths.add(`/${partialPath}`);
+      });
+    });
+    for (let path of paths) {
       let matches = matchServerRoutes(routes, path, build.basename);
       if (matches) {
         for (let match of matches) {

package/dist/production/index.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v7.3.0
+ * react-router v7.4.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -123,7 +123,7 @@ import {
   useSearchParams,
   useSubmit,
   useViewTransitionState
-} from "./chunk-RFJZTPXA.mjs";
+} from "./chunk-SXJRHUAY.mjs";
 export {
   Await,
   BrowserRouter,

package/dist/production/lib/types/route-module.d.mts

@@ -1,4 +1,4 @@
-import { aE as LinkDescriptor, aB as MetaDescriptor, aT as ServerDataFrom, aU as ClientDataFrom, aV as Func, aW as unstable_MiddlewareNextFunction, E as Equal, u as unstable_RouterContextProvider, aX as Pretty } from '../../route-data-H2S3hwhf.mjs';
+import { aE as LinkDescriptor, aB as MetaDescriptor, aT as ServerDataFrom, aU as ClientDataFrom, aV as Func, aW as unstable_MiddlewareNextFunction, E as Equal, u as unstable_RouterContextProvider, aX as Pretty } from '../../route-data-CGHGzi13.mjs';
 import { M as MiddlewareEnabled, A as AppLoadContext } from '../../future-ldDp5FKH.mjs';
 import 'react';
 
@@ -139,7 +139,7 @@ type ServerDataFunctionArgs<T extends RouteInfo> = {
      */
     context: MiddlewareEnabled extends true ? unstable_RouterContextProvider : AppLoadContext;
 };
-type CreateServerMiddlewareFunction<T extends RouteInfo> = (args: ServerDataFunctionArgs<T>, next: unstable_MiddlewareNextFunction<Response>) => MaybePromise<Response | void>;
+type CreateServerMiddlewareFunction<T extends RouteInfo> = (args: ServerDataFunctionArgs<T>, next: unstable_MiddlewareNextFunction<Response>) => MaybePromise<Response | undefined>;
 type CreateClientMiddlewareFunction<T extends RouteInfo> = (args: ClientDataFunctionArgs<T>, next: unstable_MiddlewareNextFunction<undefined>) => MaybePromise<undefined>;
 type CreateServerLoaderArgs<T extends RouteInfo> = ServerDataFunctionArgs<T>;
 type CreateClientLoaderArgs<T extends RouteInfo> = ClientDataFunctionArgs<T> & {

package/dist/production/lib/types/route-module.d.ts

@@ -1,4 +1,4 @@
-import { aE as LinkDescriptor, aB as MetaDescriptor, aT as ServerDataFrom, aU as ClientDataFrom, aV as Func, aW as unstable_MiddlewareNextFunction, E as Equal, u as unstable_RouterContextProvider, aX as Pretty } from '../../route-data-H2S3hwhf.js';
+import { aE as LinkDescriptor, aB as MetaDescriptor, aT as ServerDataFrom, aU as ClientDataFrom, aV as Func, aW as unstable_MiddlewareNextFunction, E as Equal, u as unstable_RouterContextProvider, aX as Pretty } from '../../route-data-CGHGzi13.js';
 import { M as MiddlewareEnabled, A as AppLoadContext } from '../../future-ldDp5FKH.js';
 import 'react';
 
@@ -139,7 +139,7 @@ type ServerDataFunctionArgs<T extends RouteInfo> = {
      */
     context: MiddlewareEnabled extends true ? unstable_RouterContextProvider : AppLoadContext;
 };
-type CreateServerMiddlewareFunction<T extends RouteInfo> = (args: ServerDataFunctionArgs<T>, next: unstable_MiddlewareNextFunction<Response>) => MaybePromise<Response | void>;
+type CreateServerMiddlewareFunction<T extends RouteInfo> = (args: ServerDataFunctionArgs<T>, next: unstable_MiddlewareNextFunction<Response>) => MaybePromise<Response | undefined>;
 type CreateClientMiddlewareFunction<T extends RouteInfo> = (args: ClientDataFunctionArgs<T>, next: unstable_MiddlewareNextFunction<undefined>) => MaybePromise<undefined>;
 type CreateServerLoaderArgs<T extends RouteInfo> = ServerDataFunctionArgs<T>;
 type CreateClientLoaderArgs<T extends RouteInfo> = ClientDataFunctionArgs<T> & {

package/dist/production/lib/types/route-module.js

@@ -1,5 +1,5 @@
 /**
- * react-router v7.3.0
+ * react-router v7.4.0
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/lib/types/route-module.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v7.3.0
+ * react-router v7.4.0
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/{route-data-H2S3hwhf.d.ts → route-data-CGHGzi13.d.mts}

@@ -206,6 +206,7 @@ type UrlHistoryOptions = {
     v5Compat?: boolean;
 };
 
+type MaybePromise<T> = T | Promise<T>;
 /**
  * Map of routeId -> data returned from a loader/action/error
  */
@@ -323,7 +324,7 @@ interface DataFunctionArgs<Context> {
  * middlewares from the bottom-up
  */
 interface unstable_MiddlewareNextFunction<Result = unknown> {
-    (): Result | Promise<Result>;
+    (): MaybePromise<Result>;
 }
 /**
  * Route middleware function signature.  Receives the same "data" arguments as a
@@ -331,7 +332,7 @@ 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
  */
-type unstable_MiddlewareFunction<Result = unknown> = (args: DataFunctionArgs<unstable_RouterContextProvider>, next: unstable_MiddlewareNextFunction<Result>) => Result | Promise<Result>;
+type unstable_MiddlewareFunction<Result = unknown> = (args: DataFunctionArgs<unstable_RouterContextProvider>, next: unstable_MiddlewareNextFunction<Result>) => MaybePromise<Result | undefined>;
 /**
  * Arguments passed to loader functions
  */
@@ -346,7 +347,7 @@ interface ActionFunctionArgs<Context = any> extends DataFunctionArgs<Context> {
  * Loaders and actions can return anything
  */
 type DataFunctionValue = unknown;
-type DataFunctionReturnValue = Promise<DataFunctionValue> | DataFunctionValue;
+type DataFunctionReturnValue = MaybePromise<DataFunctionValue>;
 /**
  * Route loader function signature
  */
@@ -452,7 +453,7 @@ type AgnosticPatchRoutesOnNavigationFunctionArgs<O extends AgnosticRouteObject =
     fetcherKey: string | undefined;
     patch: (routeId: string | null, children: O[]) => void;
 };
-type AgnosticPatchRoutesOnNavigationFunction<O extends AgnosticRouteObject = AgnosticRouteObject, M extends AgnosticRouteMatch = AgnosticRouteMatch> = (opts: AgnosticPatchRoutesOnNavigationFunctionArgs<O, M>) => void | Promise<void>;
+type AgnosticPatchRoutesOnNavigationFunction<O extends AgnosticRouteObject = AgnosticRouteObject, M extends AgnosticRouteMatch = AgnosticRouteMatch> = (opts: AgnosticPatchRoutesOnNavigationFunctionArgs<O, M>) => MaybePromise<void>;
 /**
  * Function provided by the framework-aware layers to set any framework-specific
  * properties from framework-agnostic properties
@@ -711,7 +712,6 @@ declare class ErrorResponseImpl implements ErrorResponse {
  */
 declare function isRouteErrorResponse(error: any): error is ErrorResponse;
 
-type MaybePromise<T> = T | Promise<T>;
 /**
  * A Router instance manages all navigation and data loading/mutations
  */

package/dist/{development/route-data-H2S3hwhf.d.mts → production/route-data-CGHGzi13.d.ts}

@@ -206,6 +206,7 @@ type UrlHistoryOptions = {
     v5Compat?: boolean;
 };
 
+type MaybePromise<T> = T | Promise<T>;
 /**
  * Map of routeId -> data returned from a loader/action/error
  */
@@ -323,7 +324,7 @@ interface DataFunctionArgs<Context> {
  * middlewares from the bottom-up
  */
 interface unstable_MiddlewareNextFunction<Result = unknown> {
-    (): Result | Promise<Result>;
+    (): MaybePromise<Result>;
 }
 /**
  * Route middleware function signature.  Receives the same "data" arguments as a
@@ -331,7 +332,7 @@ 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
  */
-type unstable_MiddlewareFunction<Result = unknown> = (args: DataFunctionArgs<unstable_RouterContextProvider>, next: unstable_MiddlewareNextFunction<Result>) => Result | Promise<Result>;
+type unstable_MiddlewareFunction<Result = unknown> = (args: DataFunctionArgs<unstable_RouterContextProvider>, next: unstable_MiddlewareNextFunction<Result>) => MaybePromise<Result | undefined>;
 /**
  * Arguments passed to loader functions
  */
@@ -346,7 +347,7 @@ interface ActionFunctionArgs<Context = any> extends DataFunctionArgs<Context> {
  * Loaders and actions can return anything
  */
 type DataFunctionValue = unknown;
-type DataFunctionReturnValue = Promise<DataFunctionValue> | DataFunctionValue;
+type DataFunctionReturnValue = MaybePromise<DataFunctionValue>;
 /**
  * Route loader function signature
  */
@@ -452,7 +453,7 @@ type AgnosticPatchRoutesOnNavigationFunctionArgs<O extends AgnosticRouteObject =
     fetcherKey: string | undefined;
     patch: (routeId: string | null, children: O[]) => void;
 };
-type AgnosticPatchRoutesOnNavigationFunction<O extends AgnosticRouteObject = AgnosticRouteObject, M extends AgnosticRouteMatch = AgnosticRouteMatch> = (opts: AgnosticPatchRoutesOnNavigationFunctionArgs<O, M>) => void | Promise<void>;
+type AgnosticPatchRoutesOnNavigationFunction<O extends AgnosticRouteObject = AgnosticRouteObject, M extends AgnosticRouteMatch = AgnosticRouteMatch> = (opts: AgnosticPatchRoutesOnNavigationFunctionArgs<O, M>) => MaybePromise<void>;
 /**
  * Function provided by the framework-aware layers to set any framework-specific
  * properties from framework-agnostic properties
@@ -711,7 +712,6 @@ declare class ErrorResponseImpl implements ErrorResponse {
  */
 declare function isRouteErrorResponse(error: any): error is ErrorResponse;
 
-type MaybePromise<T> = T | Promise<T>;
 /**
  * A Router instance manages all navigation and data loading/mutations
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-router",
-  "version": "7.3.0",
+  "version": "7.4.0",
   "description": "Declarative routing for React",
   "keywords": [
     "react",