Fix e2e test

Author: brophdawg11

packages/react-router/lib/dom/ssr/single-fetch.tsx

@@ -468,34 +468,54 @@ async function singleFetchLoaderNavigationStrategy(
 
   await resolvePromise;
 
-  // If a middleware threw on the way down, we won't have data for our requested
-  // loaders and they'll resolve to `SingleFetchNoResultError` results.  If this
-  // happens, take the highest error we find in our results (which is a middleware
-  // error if no loaders ever ran), and assign to these missing routes and let
-  // the router bubble accordingly
-  let middlewareError: unknown;
-  let fetchedData = await singleFetchDfd.promise;
-  if ("routes" in fetchedData) {
-    for (let match of args.matches) {
-      if (match.route.id in fetchedData.routes) {
-        let routeResult = fetchedData.routes[match.route.id];
-        if ("error" in routeResult) {
-          middlewareError = routeResult.error;
-          break;
+  await bubbleMiddlewareErrors(
+    singleFetchDfd.promise,
+    args.matches,
+    routesParams,
+    results
+  );
+
+  return results;
+}
+
+// If a middleware threw on the way down, we won't have data for our requested
+// loaders and they'll resolve to `SingleFetchNoResultError` results.  If this
+// happens, take the highest error we find in our results (which is a middleware
+// error if no loaders ever ran), and assign to these missing routes and let
+// the router bubble accordingly
+async function bubbleMiddlewareErrors(
+  singleFetchPromise: Promise<DecodedSingleFetchResults>,
+  matches: DataStrategyFunctionArgs["matches"],
+  routesParams: Set<string>,
+  results: Record<string, DataStrategyResult>
+) {
+  try {
+    let middlewareError: unknown;
+    let fetchedData = await singleFetchPromise;
+
+    if ("routes" in fetchedData) {
+      for (let match of matches) {
+        if (match.route.id in fetchedData.routes) {
+          let routeResult = fetchedData.routes[match.route.id];
+          if ("error" in routeResult) {
+            middlewareError = routeResult.error;
+            break;
+          }
         }
       }
     }
-  }
 
-  if (middlewareError !== undefined) {
-    Array.from(routesParams.values()).forEach((routeId) => {
-      if (results[routeId].result instanceof SingleFetchNoResultError) {
-        results[routeId].result = middlewareError;
-      }
-    });
+    if (middlewareError !== undefined) {
+      Array.from(routesParams.values()).forEach((routeId) => {
+        if (results[routeId].result instanceof SingleFetchNoResultError) {
+          results[routeId].result = middlewareError;
+        }
+      });
+    }
+  } catch (e) {
+    // No-op - this logic is only intended to process successful responses
+    // If the `.data` failed, the routes will handle those errors themselves
   }
-
-  return results;
 }
 
 // Fetcher loader calls are much simpler than navigational loader calls