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

package/build/stats-html.html

@@ -4014,7 +4014,7 @@ var drawChart = (function (exports) {
   </script>
   <script>
     /*<!--*/
-    const data = {"version":2,"tree":{"name":"root","children":[{"name":"index.production.js","children":[{"uid":"c00e-59","name":"\u0000rollupPluginBabelHelpers.js"},{"name":"packages","children":[{"name":"router-core/build/esm/index.js","uid":"c00e-61"},{"name":"react-router/src/index.tsx","uid":"c00e-63"}]}]}],"isRoot":true},"nodeParts":{"c00e-59":{"renderedLength":798,"gzipLength":366,"brotliLength":0,"mainUid":"c00e-58"},"c00e-61":{"renderedLength":73815,"gzipLength":15405,"brotliLength":0,"mainUid":"c00e-60"},"c00e-63":{"renderedLength":11547,"gzipLength":3026,"brotliLength":0,"mainUid":"c00e-62"}},"nodeMetas":{"c00e-58":{"id":"\u0000rollupPluginBabelHelpers.js","moduleParts":{"index.production.js":"c00e-59"},"imported":[],"importedBy":[{"uid":"c00e-62"}]},"c00e-60":{"id":"/packages/router-core/build/esm/index.js","moduleParts":{"index.production.js":"c00e-61"},"imported":[],"importedBy":[{"uid":"c00e-62"}]},"c00e-62":{"id":"/packages/react-router/src/index.tsx","moduleParts":{"index.production.js":"c00e-63"},"imported":[{"uid":"c00e-58"},{"uid":"c00e-64"},{"uid":"c00e-65"},{"uid":"c00e-60"},{"uid":"c00e-66"}],"importedBy":[],"isEntry":true},"c00e-64":{"id":"react","moduleParts":{},"imported":[],"importedBy":[{"uid":"c00e-62"}],"isExternal":true},"c00e-65":{"id":"use-sync-external-store/shim","moduleParts":{},"imported":[],"importedBy":[{"uid":"c00e-62"}],"isExternal":true},"c00e-66":{"id":"react-lazy-with-preload/lib/index","moduleParts":{},"imported":[],"importedBy":[{"uid":"c00e-62"}],"isExternal":true}},"env":{"rollup":"2.77.2"},"options":{"gzip":true,"brotli":false,"sourcemap":false}};
+    const data = {"version":2,"tree":{"name":"root","children":[{"name":"index.production.js","children":[{"uid":"c8b3-59","name":"\u0000rollupPluginBabelHelpers.js"},{"name":"packages","children":[{"name":"router-core/build/esm/index.js","uid":"c8b3-61"},{"name":"react-router/src/index.tsx","uid":"c8b3-63"}]}]}],"isRoot":true},"nodeParts":{"c8b3-59":{"renderedLength":798,"gzipLength":366,"brotliLength":0,"mainUid":"c8b3-58"},"c8b3-61":{"renderedLength":74380,"gzipLength":15496,"brotliLength":0,"mainUid":"c8b3-60"},"c8b3-63":{"renderedLength":11304,"gzipLength":2961,"brotliLength":0,"mainUid":"c8b3-62"}},"nodeMetas":{"c8b3-58":{"id":"\u0000rollupPluginBabelHelpers.js","moduleParts":{"index.production.js":"c8b3-59"},"imported":[],"importedBy":[{"uid":"c8b3-62"}]},"c8b3-60":{"id":"/packages/router-core/build/esm/index.js","moduleParts":{"index.production.js":"c8b3-61"},"imported":[],"importedBy":[{"uid":"c8b3-62"}]},"c8b3-62":{"id":"/packages/react-router/src/index.tsx","moduleParts":{"index.production.js":"c8b3-63"},"imported":[{"uid":"c8b3-58"},{"uid":"c8b3-64"},{"uid":"c8b3-65"},{"uid":"c8b3-60"},{"uid":"c8b3-66"}],"importedBy":[],"isEntry":true},"c8b3-64":{"id":"react","moduleParts":{},"imported":[],"importedBy":[{"uid":"c8b3-62"}],"isExternal":true},"c8b3-65":{"id":"use-sync-external-store/shim","moduleParts":{},"imported":[],"importedBy":[{"uid":"c8b3-62"}],"isExternal":true},"c8b3-66":{"id":"react-lazy-with-preload/lib/index","moduleParts":{},"imported":[],"importedBy":[{"uid":"c8b3-62"}],"isExternal":true}},"env":{"rollup":"2.77.2"},"options":{"gzip":true,"brotli":false,"sourcemap":false}};
 
     const run = () => {
       const width = window.innerWidth;

package/build/stats-react.json

@@ -7,7 +7,7 @@
         "name": "index.production.js",
         "children": [
           {
-            "uid": "c00e-68",
+            "uid": "c8b3-68",
             "name": "\u0000rollupPluginBabelHelpers.js"
           },
           {
@@ -15,11 +15,11 @@
             "children": [
               {
                 "name": "router-core/build/esm/index.js",
-                "uid": "c00e-70"
+                "uid": "c8b3-70"
               },
               {
                 "name": "react-router/src/index.tsx",
-                "uid": "c00e-72"
+                "uid": "c8b3-72"
               }
             ]
           }
@@ -29,104 +29,104 @@
     "isRoot": true
   },
   "nodeParts": {
-    "c00e-68": {
+    "c8b3-68": {
       "renderedLength": 798,
       "gzipLength": 366,
       "brotliLength": 0,
-      "mainUid": "c00e-67"
+      "mainUid": "c8b3-67"
     },
-    "c00e-70": {
-      "renderedLength": 73815,
-      "gzipLength": 15405,
+    "c8b3-70": {
+      "renderedLength": 74380,
+      "gzipLength": 15496,
       "brotliLength": 0,
-      "mainUid": "c00e-69"
+      "mainUid": "c8b3-69"
     },
-    "c00e-72": {
-      "renderedLength": 11547,
-      "gzipLength": 3026,
+    "c8b3-72": {
+      "renderedLength": 11304,
+      "gzipLength": 2961,
       "brotliLength": 0,
-      "mainUid": "c00e-71"
+      "mainUid": "c8b3-71"
     }
   },
   "nodeMetas": {
-    "c00e-67": {
+    "c8b3-67": {
       "id": "\u0000rollupPluginBabelHelpers.js",
       "moduleParts": {
-        "index.production.js": "c00e-68"
+        "index.production.js": "c8b3-68"
       },
       "imported": [],
       "importedBy": [
         {
-          "uid": "c00e-71"
+          "uid": "c8b3-71"
         }
       ]
     },
-    "c00e-69": {
+    "c8b3-69": {
       "id": "/packages/router-core/build/esm/index.js",
       "moduleParts": {
-        "index.production.js": "c00e-70"
+        "index.production.js": "c8b3-70"
       },
       "imported": [],
       "importedBy": [
         {
-          "uid": "c00e-71"
+          "uid": "c8b3-71"
         }
       ]
     },
-    "c00e-71": {
+    "c8b3-71": {
       "id": "/packages/react-router/src/index.tsx",
       "moduleParts": {
-        "index.production.js": "c00e-72"
+        "index.production.js": "c8b3-72"
       },
       "imported": [
         {
-          "uid": "c00e-67"
+          "uid": "c8b3-67"
         },
         {
-          "uid": "c00e-73"
+          "uid": "c8b3-73"
         },
         {
-          "uid": "c00e-74"
+          "uid": "c8b3-74"
         },
         {
-          "uid": "c00e-69"
+          "uid": "c8b3-69"
         },
         {
-          "uid": "c00e-75"
+          "uid": "c8b3-75"
         }
       ],
       "importedBy": [],
       "isEntry": true
     },
-    "c00e-73": {
+    "c8b3-73": {
       "id": "react",
       "moduleParts": {},
       "imported": [],
       "importedBy": [
         {
-          "uid": "c00e-71"
+          "uid": "c8b3-71"
         }
       ],
       "isExternal": true
     },
-    "c00e-74": {
+    "c8b3-74": {
       "id": "use-sync-external-store/shim",
       "moduleParts": {},
       "imported": [],
       "importedBy": [
         {
-          "uid": "c00e-71"
+          "uid": "c8b3-71"
         }
       ],
       "isExternal": true
     },
-    "c00e-75": {
+    "c8b3-75": {
       "id": "react-lazy-with-preload/lib/index",
       "moduleParts": {},
       "imported": [],
       "importedBy": [
         {
-          "uid": "c00e-71"
+          "uid": "c8b3-71"
         }
       ],
       "isExternal": true

package/build/umd/index.development.js

@@ -1585,7 +1585,10 @@
               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
@@ -1602,6 +1605,7 @@
               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;
@@ -1614,11 +1618,12 @@
               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;
@@ -1762,10 +1767,16 @@
         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));
       },
@@ -1784,7 +1795,7 @@
           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
         });
@@ -1800,8 +1811,11 @@
 
         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));
@@ -2091,6 +2105,7 @@
             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])
@@ -2502,9 +2517,6 @@
   //
   const matchesContext = /*#__PURE__*/React__namespace.createContext(null);
   const routerContext = /*#__PURE__*/React__namespace.createContext(null); // Detect if we're in the DOM
-
-  const isDOM = Boolean(typeof window !== 'undefined' && window.document && window.document.createElement);
-  const useLayoutEffect = isDOM ? React__namespace.useLayoutEffect : React__namespace.useEffect;
   function MatchesProvider(props) {
     return /*#__PURE__*/React__namespace.createElement(matchesContext.Provider, props);
   }
@@ -2686,10 +2698,8 @@
 
     router.update(rest);
     useRouterSubscription(router);
-    useLayoutEffect(() => {
-      const unsub = router.mount();
-      router.load();
-      return unsub;
+    React__namespace.useEffect(() => {
+      return router.mount();
     }, [router]);
     return /*#__PURE__*/React__namespace.createElement(routerContext.Provider, {
       value: {