@tanstack/react-router 0.0.1-beta.253 → 0.0.1-beta.254

package/build/umd/index.development.js

@@ -2420,7 +2420,7 @@
         for (let [index, match] of matches.entries()) {
           const parentMatch = matches[index - 1];
           const route = this.looseRoutesById[match.routeId];
-          const handleError = (err, code) => {
+          const handleErrorAndRedirect = (err, code) => {
             err.routerCode = code;
             firstBadMatchIndex = firstBadMatchIndex ?? index;
             if (isRedirect(err)) {
@@ -2443,10 +2443,10 @@
           };
           try {
             if (match.paramsError) {
-              handleError(match.paramsError, 'PARSE_PARAMS');
+              handleErrorAndRedirect(match.paramsError, 'PARSE_PARAMS');
             }
             if (match.searchError) {
-              handleError(match.searchError, 'VALIDATE_SEARCH');
+              handleErrorAndRedirect(match.searchError, 'VALIDATE_SEARCH');
             }
             const parentContext = parentMatch?.context ?? this.options.context ?? {};
             const beforeLoadContext = (await route.options.beforeLoad?.({
@@ -2464,6 +2464,9 @@
               buildLocation: this.buildLocation,
               cause: match.cause
             })) ?? {};
+            if (isRedirect(beforeLoadContext)) {
+              throw beforeLoadContext;
+            }
             const context = {
               ...parentContext,
               ...beforeLoadContext
@@ -2473,7 +2476,7 @@
               context: replaceEqualDeep(match.context, context)
             };
           } catch (err) {
-            handleError(err, 'BEFORE_LOAD');
+            handleErrorAndRedirect(err, 'BEFORE_LOAD');
             break;
           }
         }
@@ -2490,7 +2493,7 @@
         matchPromises.push((async () => {
           const parentMatchPromise = matchPromises[index - 1];
           const route = this.looseRoutesById[match.routeId];
-          const handleIfRedirect = err => {
+          const handleErrorAndRedirect = err => {
             if (isRedirect(err)) {
               if (!preload) {
                 this.navigate(err);
@@ -2592,6 +2595,9 @@
             try {
               const loaderData = await loadPromise;
               if (latestPromise = checkLatest()) return await latestPromise;
+              if (isRedirect(loaderData)) {
+                if (handleErrorAndRedirect(loaderData)) return;
+              }
               if (didShowPending && pendingMinMs) {
                 await new Promise(r => setTimeout(r, pendingMinMs));
               }
@@ -2607,12 +2613,12 @@
               };
             } catch (error) {
               if (latestPromise = checkLatest()) return await latestPromise;
-              if (handleIfRedirect(error)) return;
+              if (handleErrorAndRedirect(error)) return;
               try {
                 route.options.onError?.(error);
               } catch (onErrorError) {
                 error = onErrorError;
-                if (handleIfRedirect(onErrorError)) return;
+                if (handleErrorAndRedirect(onErrorError)) return;
               }
               matches[index] = match = {
                 ...match,