Updates

Author: brophdawg11

packages/react-router/__tests__/router/lazy-discovery-test.ts

@@ -2120,7 +2120,21 @@ describe("Lazy Route Discovery (Fog of War)", () => {
 
       await router.navigate("/b");
       expect(router.state).toMatchObject({
-        matches: [],
+        // A bit odd but this is a result of our best attempt to display some form
+        // of error UI to the user - follows the same logic we use on 404s
+        matches: [
+          {
+            params: {},
+            pathname: "",
+            pathnameBase: "",
+            route: {
+              children: undefined,
+              hasErrorBoundary: false,
+              id: "a",
+              path: "a",
+            },
+          },
+        ],
         location: { pathname: "/b" },
         actionData: null,
         loaderData: {},
@@ -2150,7 +2164,21 @@ describe("Lazy Route Discovery (Fog of War)", () => {
         formData: createFormData({}),
       });
       expect(router.state).toMatchObject({
-        matches: [],
+        // A bit odd but this is a result of our best attempt to display some form
+        // of error UI to the user - follows the same logic we use on 404s
+        matches: [
+          {
+            params: {},
+            pathname: "",
+            pathnameBase: "",
+            route: {
+              children: undefined,
+              hasErrorBoundary: false,
+              id: "a",
+              path: "a",
+            },
+          },
+        ],
         location: { pathname: "/b" },
         actionData: null,
         loaderData: {},

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

@@ -1802,9 +1802,22 @@ export function createRouter(init: RouterInit): Router {
       if (discoverResult.type === "aborted") {
         return { shortCircuited: true };
       } else if (discoverResult.type === "error") {
-        let boundaryId =
-          findNearestBoundary(discoverResult.partialMatches)?.route.id ??
-          getShortCircuitMatches(dataRoutes).route.id;
+        if (discoverResult.partialMatches.length === 0) {
+          let { matches, route } = getShortCircuitMatches(dataRoutes);
+          return {
+            matches,
+            pendingActionResult: [
+              route.id,
+              {
+                type: ResultType.error,
+                error: discoverResult.error,
+              },
+            ],
+          };
+        }
+
+        let boundaryId = findNearestBoundary(discoverResult.partialMatches)
+          ?.route.id;
         return {
           matches: discoverResult.partialMatches,
           pendingActionResult: [
@@ -1997,6 +2010,17 @@ export function createRouter(init: RouterInit): Router {
       if (discoverResult.type === "aborted") {
         return { shortCircuited: true };
       } else if (discoverResult.type === "error") {
+        if (discoverResult.partialMatches.length === 0) {
+          let { matches, route } = getShortCircuitMatches(dataRoutes);
+          return {
+            matches,
+            loaderData: {},
+            errors: {
+              [route.id]: discoverResult.error,
+            },
+          };
+        }
+
         let boundaryId =
           findNearestBoundary(discoverResult.partialMatches)?.route.id ??
           getShortCircuitMatches(dataRoutes).route.id;