@tanstack/react-router 1.36.2 → 1.38.1

package/dist/esm/router.js

@@ -692,7 +692,6 @@ class Router {
             redirect = err;
             if (!this.isServer) {
               this.navigate({ ...err, replace: true, __isRedirect: true });
-              this.load();
             }
           } else if (isNotFound(err)) {
             notFound = err;
@@ -763,7 +762,7 @@ class Router {
           }
           if (isRedirect(err)) {
             rendered = true;
-            err = this.resolveRedirect(err);
+            err = this.resolveRedirect({ ...err, _fromLocation: location });
             throw err;
           } else if (isNotFound(err)) {
             this.handleNotFound(matches, err);
@@ -775,7 +774,6 @@ class Router {
         await new Promise((resolveAll, rejectAll) => {
           ;
           (async () => {
-            var _a, _b;
             try {
               for (let [index, match] of matches.entries()) {
                 const parentMatch = matches[index - 1];
@@ -807,7 +805,7 @@ class Router {
                   loadPromise
                 }));
                 const handleSerialError = (err, routerCode) => {
-                  var _a2, _b2;
+                  var _a, _b;
                   if (err instanceof Promise) {
                     throw err;
                   }
@@ -815,7 +813,7 @@ class Router {
                   firstBadMatchIndex = firstBadMatchIndex ?? index;
                   handleRedirectAndNotFound(match, err);
                   try {
-                    (_b2 = (_a2 = route.options).onError) == null ? void 0 : _b2.call(_a2, err);
+                    (_b = (_a = route.options).onError) == null ? void 0 : _b.call(_a, err);
                   } catch (errorHandlerErr) {
                     err = errorHandlerErr;
                     handleRedirectAndNotFound(match, err);
@@ -836,25 +834,27 @@ class Router {
                 }
                 try {
                   const parentContext = (parentMatch == null ? void 0 : parentMatch.context) ?? this.options.context ?? {};
-                  matches[index] = match = updateMatch(match.id, () => ({
+                  matches[index] = match = {
                     ...match,
                     routeContext: replaceEqualDeep(
                       match.routeContext,
                       parentContext
                     ),
+                    context: replaceEqualDeep(match.context, parentContext),
                     abortController
-                  }));
-                  const beforeLoadContext = await ((_b = (_a = route.options).beforeLoad) == null ? void 0 : _b.call(_a, {
+                  };
+                  const beforeLoadFnContext = {
                     search: match.search,
                     abortController,
                     params: match.params,
                     preload: !!preload,
-                    context: parentContext,
+                    context: match.routeContext,
                     location,
                     navigate: (opts) => this.navigate({ ...opts, _fromLocation: location }),
                     buildLocation: this.buildLocation,
                     cause: preload ? "preload" : match.cause
-                  })) ?? {};
+                  };
+                  const beforeLoadContext = route.options.beforeLoad ? await route.options.beforeLoad(beforeLoadFnContext) ?? {} : {};
                   checkLatest();
                   if (isRedirect(beforeLoadContext) || isNotFound(beforeLoadContext)) {
                     handleSerialError(beforeLoadContext, "BEFORE_LOAD");
@@ -897,8 +897,8 @@ class Router {
                     cause: preload ? "preload" : match.cause,
                     route
                   };
-                  const fetch = async () => {
-                    var _a2, _b2, _c, _d, _e, _f, _g, _h, _i;
+                  const fetchAndResolveInLoaderLifetime = async () => {
+                    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
                     const existing = getRouteMatch(this.state, match.id);
                     let lazyPromise = Promise.resolve();
                     let componentsPromise = Promise.resolve();
@@ -924,7 +924,7 @@ class Router {
                             fetchCount: match.fetchCount + 1
                           })
                         );
-                        lazyPromise = ((_a2 = route.lazyFn) == null ? void 0 : _a2.call(route).then((lazyRoute) => {
+                        lazyPromise = ((_a = route.lazyFn) == null ? void 0 : _a.call(route).then((lazyRoute) => {
                           Object.assign(route.options, lazyRoute.options);
                         })) || Promise.resolve();
                         componentsPromise = lazyPromise.then(
@@ -939,7 +939,7 @@ class Router {
                         );
                         await lazyPromise;
                         checkLatest();
-                        loaderPromise = (_c = (_b2 = route.options).loader) == null ? void 0 : _c.call(_b2, loaderContext);
+                        loaderPromise = (_c = (_b = route.options).loader) == null ? void 0 : _c.call(_b, loaderContext);
                         matches[index] = match = updateMatch(
                           match.id,
                           (prev) => ({
@@ -1004,7 +1004,7 @@ class Router {
                   };
                   const fetchWithRedirectAndNotFound = async () => {
                     try {
-                      await fetch();
+                      await fetchAndResolveInLoaderLifetime();
                     } catch (err) {
                       checkLatest();
                       handleRedirectAndNotFound(match, err);
@@ -1144,7 +1144,8 @@ class Router {
       if ((opts == null ? void 0 : opts.pending) && this.state.status !== "pending") {
         return false;
       }
-      const baseLocation = (opts == null ? void 0 : opts.pending) ? this.latestLocation : this.state.resolvedLocation;
+      const pending = (opts == null ? void 0 : opts.pending) === void 0 ? !this.state.isLoading : opts.pending;
+      const baseLocation = pending ? this.latestLocation : this.state.resolvedLocation;
       const match = matchPathname(this.basepath, baseLocation.pathname, {
         ...opts,
         to: next.pathname