react-router 7.3.0-pre.0 → 7.3.0

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # `react-router`
 
-## 7.3.0-pre.0
+## 7.3.0
 
 ### Minor Changes
 
@@ -13,6 +13,7 @@
 ### Patch Changes
 
 - Skip resource route flow in dev server in SPA mode ([#13113](https://github.com/remix-run/react-router/pull/13113))
+
 - Support middleware on routes (unstable) ([#12941](https://github.com/remix-run/react-router/pull/12941))
 
   Middleware is implemented behind a `future.unstable_middleware` flag. To enable, you must enable the flag and the types in your `react-router-config.ts` file:
@@ -211,7 +212,10 @@
 
   For library and framework authors using `unstable_SerializesTo`, you may need to add `as unknown` casts before casting to `unstable_SerializesTo`.
 
+- \[REMOVE] Remove middleware depth logic and always call middlware for all matches ([#13172](https://github.com/remix-run/react-router/pull/13172))
+
 - Fix single fetch `_root.data` requests when a `basename` is used ([#12898](https://github.com/remix-run/react-router/pull/12898))
+
 - Add `context` support to client side data routers (unstable) ([#12941](https://github.com/remix-run/react-router/pull/12941))
 
   Your application `loader` and `action` functions on the client will now receive a `context` parameter. This is an instance of `unstable_RouterContextProvider` that you use with type-safe contexts (similar to `React.createContext`) and is most useful with the corresponding `middleware`/`clientMiddleware` API's:

package/dist/development/{chunk-W5LWFPOT.mjs → chunk-K6CSEXPM.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v7.3.0-pre.0
+ * react-router v7.3.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -2687,8 +2687,6 @@ function createStaticHandler(routes, opts) {
         "When using middleware in `staticHandler.query()`, any provided `requestContext` must bean instance of `unstable_RouterContextProvider`"
       );
       try {
-        let tailIdx = [...matches].reverse().findIndex((m) => !filterMatchesToLoad || filterMatchesToLoad(m));
-        let lowestLoadingIdx = tailIdx < 0 ? 0 : matches.length - 1 - tailIdx;
         let renderedStaticContext;
         let response = await runMiddlewarePipeline(
           {
@@ -2699,7 +2697,6 @@ function createStaticHandler(routes, opts) {
             // this to the proper type knowing it's not an `AppLoadContext`
             context: requestContext
           },
-          lowestLoadingIdx,
           true,
           async () => {
             let result2 = await queryImpl(
@@ -2819,7 +2816,6 @@ function createStaticHandler(routes, opts) {
           // this to the proper type knowing it's not an `AppLoadContext`
           context: requestContext
         },
-        matches.length - 1,
         true,
         async () => {
           let result2 = await queryImpl(
@@ -3576,55 +3572,39 @@ async function defaultDataStrategyWithMiddleware(args) {
   if (!args.matches.some((m) => m.route.unstable_middleware)) {
     return defaultDataStrategy(args);
   }
-  let lastIndex = args.matches.length - 1;
-  for (let i = lastIndex; i >= 0; i--) {
-    if (args.matches[i].shouldLoad) {
-      lastIndex = i;
-      break;
-    }
-  }
-  let results = await runMiddlewarePipeline(
+  return runMiddlewarePipeline(
     args,
-    lastIndex,
     false,
-    async (keyedResults) => {
-      Object.assign(keyedResults, await defaultDataStrategy(args));
-    },
-    (e, keyedResults) => {
-      Object.assign(keyedResults, {
-        [e.routeId]: { type: "error", result: e.error }
-      });
-    }
+    () => defaultDataStrategy(args),
+    (e) => ({ [e.routeId]: { type: "error", result: e.error } })
   );
-  return results;
 }
-async function runMiddlewarePipeline({
-  request,
-  params,
-  context,
-  matches
-}, lastIndex, propagateResult, handler, errorHandler) {
+async function runMiddlewarePipeline(args, propagateResult, handler, errorHandler) {
+  let { matches, request, params, context } = args;
   let middlewareState = {
-    keyedResults: {},
+    handlerResult: void 0,
     propagateResult
   };
   try {
+    let tuples = matches.flatMap(
+      (m) => m.route.unstable_middleware ? m.route.unstable_middleware.map((fn) => [m.route.id, fn]) : []
+    );
     let result = await callRouteMiddleware(
-      matches.slice(0, lastIndex + 1).flatMap(
-        (m) => m.route.unstable_middleware ? m.route.unstable_middleware.map((fn) => [m.route.id, fn]) : []
-      ),
-      0,
       { request, params, context },
+      tuples,
       middlewareState,
       handler
     );
-    return middlewareState.propagateResult ? result : middlewareState.keyedResults;
+    return middlewareState.propagateResult ? result : middlewareState.handlerResult;
   } catch (e) {
     if (!(e instanceof MiddlewareError)) {
       throw e;
     }
-    let result = await errorHandler(e, middlewareState.keyedResults);
-    return middlewareState.propagateResult ? result : middlewareState.keyedResults;
+    let result = await errorHandler(e);
+    if (propagateResult || !middlewareState.handlerResult) {
+      return result;
+    }
+    return Object.assign(middlewareState.handlerResult, result);
   }
 }
 var MiddlewareError = class {
@@ -3633,7 +3613,7 @@ var MiddlewareError = class {
     this.error = error;
   }
 };
-async function callRouteMiddleware(middlewares, idx, args, middlewareState, handler) {
+async function callRouteMiddleware(args, middlewares, middlewareState, handler, idx = 0) {
   let { request } = args;
   if (request.signal.aborted) {
     if (request.signal.reason) {
@@ -3645,8 +3625,8 @@ async function callRouteMiddleware(middlewares, idx, args, middlewareState, hand
   }
   let tuple = middlewares[idx];
   if (!tuple) {
-    let result = await handler(middlewareState.keyedResults);
-    return result;
+    middlewareState.handlerResult = await handler();
+    return middlewareState.handlerResult;
   }
   let [routeId, middleware] = tuple;
   let nextCalled = false;
@@ -3657,11 +3637,11 @@ async function callRouteMiddleware(middlewares, idx, args, middlewareState, hand
     }
     nextCalled = true;
     let result = await callRouteMiddleware(
-      middlewares,
-      idx + 1,
       args,
+      middlewares,
       middlewareState,
-      handler
+      handler,
+      idx + 1
     );
     if (middlewareState.propagateResult) {
       nextResult = result;
@@ -6024,28 +6004,15 @@ function StreamTransfer({
     )));
   }
 }
-function middlewareErrorHandler(e, keyedResults) {
-  Object.assign(keyedResults, {
-    [e.routeId]: { type: "error", result: e.error }
-  });
-}
 function getSingleFetchDataStrategy(manifest, routeModules, ssr, basename, getRouter) {
   return async (args) => {
     let { request, matches, fetcherKey } = args;
     if (request.method !== "GET") {
       return runMiddlewarePipeline(
         args,
-        matches.findIndex((m) => m.shouldLoad),
         false,
-        async (keyedResults) => {
-          let results = await singleFetchActionStrategy(
-            request,
-            matches,
-            basename
-          );
-          Object.assign(keyedResults, results);
-        },
-        middlewareErrorHandler
+        () => singleFetchActionStrategy(request, matches, basename),
+        (e) => ({ [e.routeId]: { type: "error", result: e.error } })
       );
     }
     if (!ssr) {
@@ -6053,64 +6020,35 @@ function getSingleFetchDataStrategy(manifest, routeModules, ssr, basename, getRo
         (m) => m.shouldLoad && manifest.routes[m.route.id]?.hasLoader && !manifest.routes[m.route.id]?.hasClientLoader
       );
       if (!foundRevalidatingServerLoader) {
-        let tailIdx = [...matches].reverse().findIndex((m) => m.shouldLoad);
-        let lowestLoadingIndex2 = tailIdx < 0 ? 0 : matches.length - 1 - tailIdx;
         return runMiddlewarePipeline(
           args,
-          lowestLoadingIndex2,
           false,
-          async (keyedResults) => {
-            let results = await nonSsrStrategy(
-              manifest,
-              request,
-              matches,
-              basename
-            );
-            Object.assign(keyedResults, results);
-          },
-          middlewareErrorHandler
+          () => nonSsrStrategy(manifest, request, matches, basename),
+          (e) => ({ [e.routeId]: { type: "error", result: e.error } })
         );
       }
     }
     if (fetcherKey) {
       return runMiddlewarePipeline(
         args,
-        matches.findIndex((m) => m.shouldLoad),
         false,
-        async (keyedResults) => {
-          let results = await singleFetchLoaderFetcherStrategy(
-            request,
-            matches,
-            basename
-          );
-          Object.assign(keyedResults, results);
-        },
-        middlewareErrorHandler
+        () => singleFetchLoaderFetcherStrategy(request, matches, basename),
+        (e) => ({ [e.routeId]: { type: "error", result: e.error } })
       );
     }
-    let lowestLoadingIndex = getLowestLoadingIndex(
-      manifest,
-      routeModules,
-      getRouter(),
-      matches
-    );
     return runMiddlewarePipeline(
       args,
-      lowestLoadingIndex,
       false,
-      async (keyedResults) => {
-        let results = await singleFetchLoaderNavigationStrategy(
-          manifest,
-          routeModules,
-          ssr,
-          getRouter(),
-          request,
-          matches,
-          basename
-        );
-        Object.assign(keyedResults, results);
-      },
-      middlewareErrorHandler
+      () => singleFetchLoaderNavigationStrategy(
+        manifest,
+        routeModules,
+        ssr,
+        getRouter(),
+        request,
+        matches,
+        basename
+      ),
+      (e) => ({ [e.routeId]: { type: "error", result: e.error } })
     );
   };
 }
@@ -6163,17 +6101,6 @@ async function nonSsrStrategy(manifest, request, matches, basename) {
 function isOptedOut(manifestRoute, routeModule, match, router) {
   return match.route.id in router.state.loaderData && manifestRoute && manifestRoute.hasLoader && routeModule && routeModule.shouldRevalidate;
 }
-function getLowestLoadingIndex(manifest, routeModules, router, matches) {
-  let tailIdx = [...matches].reverse().findIndex(
-    (m) => m.shouldLoad || !isOptedOut(
-      manifest.routes[m.route.id],
-      routeModules[m.route.id],
-      m,
-      router
-    )
-  );
-  return tailIdx < 0 ? 0 : matches.length - 1 - tailIdx;
-}
 async function singleFetchLoaderNavigationStrategy(manifest, routeModules, ssr, router, request, matches, basename) {
   let routesParams = /* @__PURE__ */ new Set();
   let foundOptOutRoute = false;
@@ -7588,7 +7515,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-pre.0";
+    window.__reactRouterVersion = "7.3.0";
   }
 } catch (e) {
 }

package/dist/development/dom-export.js

@@ -1,5 +1,5 @@
 /**
- * react-router v7.3.0-pre.0
+ * react-router v7.3.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -2868,55 +2868,39 @@ async function defaultDataStrategyWithMiddleware(args) {
   if (!args.matches.some((m) => m.route.unstable_middleware)) {
     return defaultDataStrategy(args);
   }
-  let lastIndex = args.matches.length - 1;
-  for (let i = lastIndex; i >= 0; i--) {
-    if (args.matches[i].shouldLoad) {
-      lastIndex = i;
-      break;
-    }
-  }
-  let results = await runMiddlewarePipeline(
+  return runMiddlewarePipeline(
     args,
-    lastIndex,
     false,
-    async (keyedResults) => {
-      Object.assign(keyedResults, await defaultDataStrategy(args));
-    },
-    (e, keyedResults) => {
-      Object.assign(keyedResults, {
-        [e.routeId]: { type: "error", result: e.error }
-      });
-    }
+    () => defaultDataStrategy(args),
+    (e) => ({ [e.routeId]: { type: "error", result: e.error } })
   );
-  return results;
 }
-async function runMiddlewarePipeline({
-  request,
-  params,
-  context,
-  matches
-}, lastIndex, propagateResult, handler, errorHandler) {
+async function runMiddlewarePipeline(args, propagateResult, handler, errorHandler) {
+  let { matches, request, params, context } = args;
   let middlewareState = {
-    keyedResults: {},
+    handlerResult: void 0,
     propagateResult
   };
   try {
+    let tuples = matches.flatMap(
+      (m) => m.route.unstable_middleware ? m.route.unstable_middleware.map((fn) => [m.route.id, fn]) : []
+    );
     let result = await callRouteMiddleware(
-      matches.slice(0, lastIndex + 1).flatMap(
-        (m) => m.route.unstable_middleware ? m.route.unstable_middleware.map((fn) => [m.route.id, fn]) : []
-      ),
-      0,
       { request, params, context },
+      tuples,
       middlewareState,
       handler
     );
-    return middlewareState.propagateResult ? result : middlewareState.keyedResults;
+    return middlewareState.propagateResult ? result : middlewareState.handlerResult;
   } catch (e) {
     if (!(e instanceof MiddlewareError)) {
       throw e;
     }
-    let result = await errorHandler(e, middlewareState.keyedResults);
-    return middlewareState.propagateResult ? result : middlewareState.keyedResults;
+    let result = await errorHandler(e);
+    if (propagateResult || !middlewareState.handlerResult) {
+      return result;
+    }
+    return Object.assign(middlewareState.handlerResult, result);
   }
 }
 var MiddlewareError = class {
@@ -2925,7 +2909,7 @@ var MiddlewareError = class {
     this.error = error;
   }
 };
-async function callRouteMiddleware(middlewares, idx, args, middlewareState, handler) {
+async function callRouteMiddleware(args, middlewares, middlewareState, handler, idx = 0) {
   let { request } = args;
   if (request.signal.aborted) {
     if (request.signal.reason) {
@@ -2937,8 +2921,8 @@ async function callRouteMiddleware(middlewares, idx, args, middlewareState, hand
   }
   let tuple = middlewares[idx];
   if (!tuple) {
-    let result = await handler(middlewareState.keyedResults);
-    return result;
+    middlewareState.handlerResult = await handler();
+    return middlewareState.handlerResult;
   }
   let [routeId, middleware] = tuple;
   let nextCalled = false;
@@ -2949,11 +2933,11 @@ async function callRouteMiddleware(middlewares, idx, args, middlewareState, hand
     }
     nextCalled = true;
     let result = await callRouteMiddleware(
-      middlewares,
-      idx + 1,
       args,
+      middlewares,
       middlewareState,
-      handler
+      handler,
+      idx + 1
     );
     if (middlewareState.propagateResult) {
       nextResult = result;
@@ -4528,28 +4512,15 @@ async function createRequestInit(request) {
 
 // lib/dom/ssr/single-fetch.tsx
 var SingleFetchRedirectSymbol = Symbol("SingleFetchRedirect");
-function middlewareErrorHandler(e, keyedResults) {
-  Object.assign(keyedResults, {
-    [e.routeId]: { type: "error", result: e.error }
-  });
-}
 function getSingleFetchDataStrategy(manifest, routeModules, ssr, basename, getRouter) {
   return async (args) => {
     let { request, matches, fetcherKey } = args;
     if (request.method !== "GET") {
       return runMiddlewarePipeline(
         args,
-        matches.findIndex((m) => m.shouldLoad),
         false,
-        async (keyedResults) => {
-          let results = await singleFetchActionStrategy(
-            request,
-            matches,
-            basename
-          );
-          Object.assign(keyedResults, results);
-        },
-        middlewareErrorHandler
+        () => singleFetchActionStrategy(request, matches, basename),
+        (e) => ({ [e.routeId]: { type: "error", result: e.error } })
       );
     }
     if (!ssr) {
@@ -4557,64 +4528,35 @@ function getSingleFetchDataStrategy(manifest, routeModules, ssr, basename, getRo
         (m) => m.shouldLoad && manifest.routes[m.route.id]?.hasLoader && !manifest.routes[m.route.id]?.hasClientLoader
       );
       if (!foundRevalidatingServerLoader) {
-        let tailIdx = [...matches].reverse().findIndex((m) => m.shouldLoad);
-        let lowestLoadingIndex2 = tailIdx < 0 ? 0 : matches.length - 1 - tailIdx;
         return runMiddlewarePipeline(
           args,
-          lowestLoadingIndex2,
           false,
-          async (keyedResults) => {
-            let results = await nonSsrStrategy(
-              manifest,
-              request,
-              matches,
-              basename
-            );
-            Object.assign(keyedResults, results);
-          },
-          middlewareErrorHandler
+          () => nonSsrStrategy(manifest, request, matches, basename),
+          (e) => ({ [e.routeId]: { type: "error", result: e.error } })
         );
       }
     }
     if (fetcherKey) {
       return runMiddlewarePipeline(
         args,
-        matches.findIndex((m) => m.shouldLoad),
         false,
-        async (keyedResults) => {
-          let results = await singleFetchLoaderFetcherStrategy(
-            request,
-            matches,
-            basename
-          );
-          Object.assign(keyedResults, results);
-        },
-        middlewareErrorHandler
+        () => singleFetchLoaderFetcherStrategy(request, matches, basename),
+        (e) => ({ [e.routeId]: { type: "error", result: e.error } })
       );
     }
-    let lowestLoadingIndex = getLowestLoadingIndex(
-      manifest,
-      routeModules,
-      getRouter(),
-      matches
-    );
     return runMiddlewarePipeline(
       args,
-      lowestLoadingIndex,
       false,
-      async (keyedResults) => {
-        let results = await singleFetchLoaderNavigationStrategy(
-          manifest,
-          routeModules,
-          ssr,
-          getRouter(),
-          request,
-          matches,
-          basename
-        );
-        Object.assign(keyedResults, results);
-      },
-      middlewareErrorHandler
+      () => singleFetchLoaderNavigationStrategy(
+        manifest,
+        routeModules,
+        ssr,
+        getRouter(),
+        request,
+        matches,
+        basename
+      ),
+      (e) => ({ [e.routeId]: { type: "error", result: e.error } })
     );
   };
 }
@@ -4667,17 +4609,6 @@ async function nonSsrStrategy(manifest, request, matches, basename) {
 function isOptedOut(manifestRoute, routeModule, match, router2) {
   return match.route.id in router2.state.loaderData && manifestRoute && manifestRoute.hasLoader && routeModule && routeModule.shouldRevalidate;
 }
-function getLowestLoadingIndex(manifest, routeModules, router2, matches) {
-  let tailIdx = [...matches].reverse().findIndex(
-    (m) => m.shouldLoad || !isOptedOut(
-      manifest.routes[m.route.id],
-      routeModules[m.route.id],
-      m,
-      router2
-    )
-  );
-  return tailIdx < 0 ? 0 : matches.length - 1 - tailIdx;
-}
 async function singleFetchLoaderNavigationStrategy(manifest, routeModules, ssr, router2, request, matches, basename) {
   let routesParams = /* @__PURE__ */ new Set();
   let foundOptOutRoute = false;

package/dist/development/dom-export.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v7.3.0-pre.0
+ * react-router v7.3.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -25,7 +25,7 @@ import {
   matchRoutes,
   shouldHydrateRouteLoader,
   useFogOFWarDiscovery
-} from "./chunk-W5LWFPOT.mjs";
+} from "./chunk-K6CSEXPM.mjs";
 
 // lib/dom-export/dom-router-provider.tsx
 import * as React from "react";