Updates

Author: brophdawg11

packages/react-router/__tests__/router/revalidate-test.ts

@@ -1112,8 +1112,12 @@ describe("router.revalidate", () => {
       revalidation: "idle",
       loaderData: { root: "ROOT**" },
     });
+    // The interrupted revalidation hooks into the next completed navigation
+    // so it reflects the end state value
     expect(revalidationValue).toBe("ROOT**");
-    expect(navigationValue).toBe("ROOT**");
+    // The interim navigation gets interrupted and ends while the router still
+    // reflects the original value
+    expect(navigationValue).toBe("ROOT");
     expect(navigationValue2).toBe("ROOT**");
 
     // no-op
@@ -1126,7 +1130,7 @@ describe("router.revalidate", () => {
       loaderData: { root: "ROOT**" },
     });
     expect(revalidationValue).toBe("ROOT**");
-    expect(navigationValue).toBe("ROOT**");
+    expect(navigationValue).toBe("ROOT");
     expect(navigationValue2).toBe("ROOT**");
   });
 });

packages/react-router/lib/router/router.ts

@@ -2864,10 +2864,12 @@ export function createRouter(init: RouterInit): Router {
       return dataResults;
     }
 
+    if (request.signal.aborted) {
+      return dataResults;
+    }
+
     for (let [routeId, result] of Object.entries(results)) {
-      if (!result) {
-        dataResults[routeId] = { type: ResultType.error, error: result };
-      } else if (isRedirectDataStrategyResult(result)) {
+      if (isRedirectDataStrategyResult(result)) {
         let response = result.result as Response;
         dataResults[routeId] = {
           type: ResultType.redirect,