@tanstack/react-router 0.0.1-beta.13 → 0.0.1-beta.15

package/build/esm/index.js

@@ -1570,7 +1570,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
@@ -1587,6 +1590,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;
@@ -1599,11 +1603,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;
@@ -1747,10 +1752,16 @@ function createRouter(userOptions) {
       return router.routesById[id];
     },
     notify: () => {
-      router.state = _extends({}, router.state, {
-        isFetching: router.state.status === 'loading' || router.state.matches.some(d => d.isFetching),
-        isPreloading: Object.values(router.matchCache).some(d => d.match.isFetching && !router.state.matches.find(dd => dd.matchId === d.match.matchId))
-      });
+      const isFetching = router.state.status === 'loading' || router.state.matches.some(d => d.isFetching);
+      const isPreloading = Object.values(router.matchCache).some(d => d.match.isFetching && !router.state.matches.find(dd => dd.matchId === d.match.matchId));
+
+      if (router.state.isFetching !== isFetching || router.state.isPreloading !== isPreloading) {
+        router.state = _extends({}, router.state, {
+          isFetching,
+          isPreloading
+        });
+      }
+
       cascadeLoaderData(router.state.matches);
       router.listeners.forEach(listener => listener(router));
     },
@@ -1769,7 +1780,7 @@ function createRouter(userOptions) {
         invariant(dehydratedMatch, 'Oh no! Dehydrated route matches did not match the active state of the router 😬');
         Object.assign(match, dehydratedMatch);
       });
-      router.loadMatches(matches);
+      matches.forEach(match => match.__.validate());
       router.state = _extends({}, router.state, dehydratedState, {
         matches
       });
@@ -1785,8 +1796,11 @@ function createRouter(userOptions) {
 
       if (next.href !== router.location.href) {
         router.__.commitLocation(next, true);
-      } // router.load()
+      }
 
+      if (!router.state.matches.length) {
+        router.load();
+      }
 
       const unsub = router.history.listen(event => {
         router.load(router.__.parseLocation(event.location, router.location));
@@ -2076,6 +2090,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])
@@ -2487,9 +2502,6 @@ const _excluded = ["type", "children", "target", "activeProps", "inactiveProps",
 //
 const matchesContext = /*#__PURE__*/React.createContext(null);
 const routerContext = /*#__PURE__*/React.createContext(null); // Detect if we're in the DOM
-
-const isDOM = Boolean(typeof window !== 'undefined' && window.document && window.document.createElement);
-const useLayoutEffect = isDOM ? React.useLayoutEffect : React.useEffect;
 function MatchesProvider(props) {
   return /*#__PURE__*/React.createElement(matchesContext.Provider, props);
 }
@@ -2671,10 +2683,8 @@ function RouterProvider(_ref2) {
 
   router.update(rest);
   useRouterSubscription(router);
-  useLayoutEffect(() => {
-    const unsub = router.mount();
-    router.load();
-    return unsub;
+  React.useEffect(() => {
+    return router.mount();
   }, [router]);
   return /*#__PURE__*/React.createElement(routerContext.Provider, {
     value: {