@tanstack/react-router 0.0.1-beta.14 → 0.0.1-beta.16

package/build/cjs/router-core/build/esm/index.js

@@ -1538,7 +1538,10 @@ function createRouteMatch(router, route, opts) {
             var _ref, _ref2, _opts$maxAge;
 
             if (routeMatch.options.loader) {
+              var _routeMatch$parentMat3;
+
               const data = await routeMatch.options.loader({
+                parentLoaderPromise: (_routeMatch$parentMat3 = routeMatch.parentMatch) == null ? void 0 : _routeMatch$parentMat3.__.dataPromise,
                 params: routeMatch.params,
                 search: routeMatch.routeSearch,
                 signal: routeMatch.__.abortController.signal
@@ -1555,6 +1558,7 @@ function createRouteMatch(router, route, opts) {
             routeMatch.status = 'success';
             routeMatch.updatedAt = Date.now();
             routeMatch.invalidAt = routeMatch.updatedAt + ((_ref = (_ref2 = (_opts$maxAge = opts == null ? void 0 : opts.maxAge) != null ? _opts$maxAge : routeMatch.options.loaderMaxAge) != null ? _ref2 : router.options.defaultLoaderMaxAge) != null ? _ref : 0);
+            return routeMatch.routeLoaderData;
           } catch (err) {
             if (id !== routeMatch.__.latestId) {
               return routeMatch.__.loadPromise;
@@ -1567,11 +1571,12 @@ function createRouteMatch(router, route, opts) {
             routeMatch.error = err;
             routeMatch.status = 'error';
             routeMatch.updatedAt = Date.now();
+            throw err;
           }
         });
 
         try {
-          await Promise.all([routeMatch.__.componentsPromise, routeMatch.__.dataPromise]);
+          await Promise.all([routeMatch.__.componentsPromise, routeMatch.__.dataPromise.catch(() => {})]);
 
           if (id !== routeMatch.__.latestId) {
             return routeMatch.__.loadPromise;
@@ -2053,6 +2058,7 @@ function createRouter(userOptions) {
           const interpolatedPath = interpolatePath(foundRoute.routePath, params);
           const matchId = interpolatePath(foundRoute.routeId, params, true);
           const match = existingMatches.find(d => d.matchId === matchId) || ((_router$matchCache$ma = router.matchCache[matchId]) == null ? void 0 : _router$matchCache$ma.match) || createRouteMatch(router, foundRoute, {
+            parentMatch,
             matchId,
             params,
             pathname: joinPaths([pathname, interpolatedPath])
@@ -2413,9 +2419,9 @@ function createRouter(userOptions) {
             pathname: next.pathname,
             hash: next.hash,
             search: next.searchStr
-          }, {
+          }, _extends({
             id
-          });
+          }, next.state));
         } else {
           history.push({
             pathname: next.pathname,