@tanstack/router-core 1.131.12 → 1.131.13

package/dist/cjs/router.cjs

@@ -729,42 +729,36 @@ class RouterCore {
       }
       const handleRedirectAndNotFound = (match, err) => {
         var _a, _b, _c;
-        if (redirect.isRedirect(err) || notFound.isNotFound(err)) {
-          if (redirect.isRedirect(err)) {
-            if (err.redirectHandled) {
-              if (!err.options.reloadDocument) {
-                throw err;
-              }
-            }
-          }
-          if (match) {
-            (_a = match._nonReactive.beforeLoadPromise) == null ? void 0 : _a.resolve();
-            (_b = match._nonReactive.loaderPromise) == null ? void 0 : _b.resolve();
-            match._nonReactive.beforeLoadPromise = void 0;
-            match._nonReactive.loaderPromise = void 0;
-            updateMatch(match.id, (prev) => ({
-              ...prev,
-              status: redirect.isRedirect(err) ? "redirected" : notFound.isNotFound(err) ? "notFound" : "error",
-              isFetching: false,
-              error: err
-            }));
-            if (!err.routeId) {
-              err.routeId = match.routeId;
-            }
-            (_c = match._nonReactive.loadPromise) == null ? void 0 : _c.resolve();
-          }
-          if (redirect.isRedirect(err)) {
-            rendered = true;
-            err.options._fromLocation = location;
-            err.redirectHandled = true;
-            err = this.resolveRedirect(err);
-            throw err;
-          } else if (notFound.isNotFound(err)) {
-            this._handleNotFound(matches, err, {
-              updateMatch
-            });
-            throw err;
+        if (!redirect.isRedirect(err) && !notFound.isNotFound(err)) return;
+        if (redirect.isRedirect(err) && err.redirectHandled && !err.options.reloadDocument) {
+          throw err;
+        }
+        if (match) {
+          (_a = match._nonReactive.beforeLoadPromise) == null ? void 0 : _a.resolve();
+          (_b = match._nonReactive.loaderPromise) == null ? void 0 : _b.resolve();
+          match._nonReactive.beforeLoadPromise = void 0;
+          match._nonReactive.loaderPromise = void 0;
+          const status = redirect.isRedirect(err) ? "redirected" : "notFound";
+          updateMatch(match.id, (prev) => ({
+            ...prev,
+            status,
+            isFetching: false,
+            error: err
+          }));
+          if (notFound.isNotFound(err) && !err.routeId) {
+            err.routeId = match.routeId;
           }
+          (_c = match._nonReactive.loadPromise) == null ? void 0 : _c.resolve();
+        }
+        if (redirect.isRedirect(err)) {
+          rendered = true;
+          err.options._fromLocation = location;
+          err.redirectHandled = true;
+          err = this.resolveRedirect(err);
+          throw err;
+        } else {
+          this._handleNotFound(matches, err, updateMatch);
+          throw err;
         }
       };
       const shouldSkipLoader = (matchId) => {
@@ -1411,9 +1405,7 @@ class RouterCore {
       }
       return match;
     };
-    this._handleNotFound = (matches, err, {
-      updateMatch = this.updateMatch
-    } = {}) => {
+    this._handleNotFound = (matches, err, updateMatch = this.updateMatch) => {
       var _a;
       const routeCursor = this.routesById[err.routeId ?? ""] ?? this.routeTree;
       const matchesByRouteId = {};
@@ -1440,9 +1432,7 @@ class RouterCore {
       }));
       if (err.routerCode === "BEFORE_LOAD" && routeCursor.parentRoute) {
         err.routeId = routeCursor.parentRoute.id;
-        this._handleNotFound(matches, err, {
-          updateMatch
-        });
+        this._handleNotFound(matches, err, updateMatch);
       }
     };
     this.hasNotFoundMatch = () => {