@tanstack/react-router 0.0.1-alpha.7 → 0.0.1-alpha.9

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":"fe9b-59","name":"\u0000rollupPluginBabelHelpers.js"},{"name":"packages","children":[{"name":"router-core/build/esm/index.js","uid":"fe9b-61"},{"name":"react-router/src/index.tsx","uid":"fe9b-63"}]}]}],"isRoot":true},"nodeParts":{"fe9b-59":{"renderedLength":798,"gzipLength":366,"brotliLength":0,"mainUid":"fe9b-58"},"fe9b-61":{"renderedLength":73014,"gzipLength":15395,"brotliLength":0,"mainUid":"fe9b-60"},"fe9b-63":{"renderedLength":11495,"gzipLength":2999,"brotliLength":0,"mainUid":"fe9b-62"}},"nodeMetas":{"fe9b-58":{"id":"\u0000rollupPluginBabelHelpers.js","moduleParts":{"index.production.js":"fe9b-59"},"imported":[],"importedBy":[{"uid":"fe9b-62"}]},"fe9b-60":{"id":"/packages/router-core/build/esm/index.js","moduleParts":{"index.production.js":"fe9b-61"},"imported":[],"importedBy":[{"uid":"fe9b-62"}]},"fe9b-62":{"id":"/packages/react-router/src/index.tsx","moduleParts":{"index.production.js":"fe9b-63"},"imported":[{"uid":"fe9b-58"},{"uid":"fe9b-64"},{"uid":"fe9b-65"},{"uid":"fe9b-60"}],"importedBy":[],"isEntry":true},"fe9b-64":{"id":"react","moduleParts":{},"imported":[],"importedBy":[{"uid":"fe9b-62"}],"isExternal":true},"fe9b-65":{"id":"use-sync-external-store/shim","moduleParts":{},"imported":[],"importedBy":[{"uid":"fe9b-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":"72d9-59","name":"\u0000rollupPluginBabelHelpers.js"},{"name":"packages","children":[{"name":"router-core/build/esm/index.js","uid":"72d9-61"},{"name":"react-router/src/index.tsx","uid":"72d9-63"}]}]}],"isRoot":true},"nodeParts":{"72d9-59":{"renderedLength":798,"gzipLength":366,"brotliLength":0,"mainUid":"72d9-58"},"72d9-61":{"renderedLength":74043,"gzipLength":15503,"brotliLength":0,"mainUid":"72d9-60"},"72d9-63":{"renderedLength":11495,"gzipLength":2999,"brotliLength":0,"mainUid":"72d9-62"}},"nodeMetas":{"72d9-58":{"id":"\u0000rollupPluginBabelHelpers.js","moduleParts":{"index.production.js":"72d9-59"},"imported":[],"importedBy":[{"uid":"72d9-62"}]},"72d9-60":{"id":"/packages/router-core/build/esm/index.js","moduleParts":{"index.production.js":"72d9-61"},"imported":[],"importedBy":[{"uid":"72d9-62"}]},"72d9-62":{"id":"/packages/react-router/src/index.tsx","moduleParts":{"index.production.js":"72d9-63"},"imported":[{"uid":"72d9-58"},{"uid":"72d9-64"},{"uid":"72d9-65"},{"uid":"72d9-60"}],"importedBy":[],"isEntry":true},"72d9-64":{"id":"react","moduleParts":{},"imported":[],"importedBy":[{"uid":"72d9-62"}],"isExternal":true},"72d9-65":{"id":"use-sync-external-store/shim","moduleParts":{},"imported":[],"importedBy":[{"uid":"72d9-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": "fe9b-67",
+            "uid": "72d9-67",
             "name": "\u0000rollupPluginBabelHelpers.js"
           },
           {
@@ -15,11 +15,11 @@
             "children": [
               {
                 "name": "router-core/build/esm/index.js",
-                "uid": "fe9b-69"
+                "uid": "72d9-69"
               },
               {
                 "name": "react-router/src/index.tsx",
-                "uid": "fe9b-71"
+                "uid": "72d9-71"
               }
             ]
           }
@@ -29,90 +29,90 @@
     "isRoot": true
   },
   "nodeParts": {
-    "fe9b-67": {
+    "72d9-67": {
       "renderedLength": 798,
       "gzipLength": 366,
       "brotliLength": 0,
-      "mainUid": "fe9b-66"
+      "mainUid": "72d9-66"
     },
-    "fe9b-69": {
-      "renderedLength": 73014,
-      "gzipLength": 15395,
+    "72d9-69": {
+      "renderedLength": 74043,
+      "gzipLength": 15503,
       "brotliLength": 0,
-      "mainUid": "fe9b-68"
+      "mainUid": "72d9-68"
     },
-    "fe9b-71": {
+    "72d9-71": {
       "renderedLength": 11495,
       "gzipLength": 2999,
       "brotliLength": 0,
-      "mainUid": "fe9b-70"
+      "mainUid": "72d9-70"
     }
   },
   "nodeMetas": {
-    "fe9b-66": {
+    "72d9-66": {
       "id": "\u0000rollupPluginBabelHelpers.js",
       "moduleParts": {
-        "index.production.js": "fe9b-67"
+        "index.production.js": "72d9-67"
       },
       "imported": [],
       "importedBy": [
         {
-          "uid": "fe9b-70"
+          "uid": "72d9-70"
         }
       ]
     },
-    "fe9b-68": {
+    "72d9-68": {
       "id": "/packages/router-core/build/esm/index.js",
       "moduleParts": {
-        "index.production.js": "fe9b-69"
+        "index.production.js": "72d9-69"
       },
       "imported": [],
       "importedBy": [
         {
-          "uid": "fe9b-70"
+          "uid": "72d9-70"
         }
       ]
     },
-    "fe9b-70": {
+    "72d9-70": {
       "id": "/packages/react-router/src/index.tsx",
       "moduleParts": {
-        "index.production.js": "fe9b-71"
+        "index.production.js": "72d9-71"
       },
       "imported": [
         {
-          "uid": "fe9b-66"
+          "uid": "72d9-66"
         },
         {
-          "uid": "fe9b-72"
+          "uid": "72d9-72"
         },
         {
-          "uid": "fe9b-73"
+          "uid": "72d9-73"
         },
         {
-          "uid": "fe9b-68"
+          "uid": "72d9-68"
         }
       ],
       "importedBy": [],
       "isEntry": true
     },
-    "fe9b-72": {
+    "72d9-72": {
       "id": "react",
       "moduleParts": {},
       "imported": [],
       "importedBy": [
         {
-          "uid": "fe9b-70"
+          "uid": "72d9-70"
         }
       ],
       "isExternal": true
     },
-    "fe9b-73": {
+    "72d9-73": {
       "id": "use-sync-external-store/shim",
       "moduleParts": {},
       "imported": [],
       "importedBy": [
         {
-          "uid": "fe9b-70"
+          "uid": "72d9-70"
         }
       ],
       "isExternal": true

package/build/umd/index.development.js

@@ -1426,12 +1426,10 @@
       isPending: false,
       isFetching: false,
       isInvalid: false,
+      invalidAt: Infinity,
       getIsInvalid: () => {
-        var _ref, _routeMatch$options$l;
-
         const now = Date.now();
-        const maxAge = (_ref = (_routeMatch$options$l = routeMatch.options.loaderMaxAge) != null ? _routeMatch$options$l : router.options.defaultLoaderMaxAge) != null ? _ref : 0;
-        return routeMatch.isInvalid || routeMatch.updatedAt + maxAge < now;
+        return routeMatch.isInvalid || routeMatch.invalidAt < now;
       },
       __: {
         abortController: new AbortController(),
@@ -1522,7 +1520,7 @@
       hasLoaders: () => {
         return !!(route.options.loader || route.options.import || elementTypes.some(d => typeof route.options[d] === 'function'));
       },
-      load: async () => {
+      load: async opts => {
         const id = '' + Date.now() + Math.random();
         routeMatch.__.latestId = id; // If the match was in an error state, set it
         // to a loading state again. Otherwise, keep it
@@ -1577,6 +1575,8 @@
 
             routeMatch.__.dataPromise = Promise.resolve().then(async () => {
               try {
+                var _ref, _ref2, _opts$maxAge;
+
                 if (routeMatch.options.loader) {
                   const data = await routeMatch.options.loader({
                     params: routeMatch.params,
@@ -1594,6 +1594,7 @@
                 routeMatch.error = undefined;
                 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);
               } catch (err) {
                 if (id !== routeMatch.__.latestId) {
                   return routeMatch.__.loaderPromise;
@@ -1716,7 +1717,8 @@
     const originalOptions = _extends({
       defaultLoaderGcMaxAge: 5 * 60 * 1000,
       defaultLoaderMaxAge: 0,
-      defaultLinkPreloadDelay: 50
+      defaultPreloadMaxAge: 2000,
+      defaultPreloadDelay: 50
     }, userOptions, {
       stringifySearch: (_userOptions$stringif = userOptions == null ? void 0 : userOptions.stringifySearch) != null ? _userOptions$stringif : defaultStringifySearch,
       parseSearch: (_userOptions$parseSea = userOptions == null ? void 0 : userOptions.parseSearch) != null ? _userOptions$parseSea : defaultParseSearch
@@ -2113,7 +2115,21 @@
           delete router.matchCache[matchId];
         });
       },
-      loadRoute: async function loadRoute(navigateOpts, loaderOpts) {
+      loadRoute: async function loadRoute(navigateOpts) {
+        if (navigateOpts === void 0) {
+          navigateOpts = router.location;
+        }
+
+        const next = router.buildNext(navigateOpts);
+        const matches = router.matchRoutes(next.pathname, {
+          strictParseParams: true
+        });
+        await router.loadMatches(matches);
+        return matches;
+      },
+      preloadRoute: async function preloadRoute(navigateOpts, loaderOpts) {
+        var _ref4, _ref5, _loaderOpts$maxAge, _ref6, _ref7, _loaderOpts$gcMaxAge;
+
         if (navigateOpts === void 0) {
           navigateOpts = router.location;
         }
@@ -2124,7 +2140,8 @@
         });
         await router.loadMatches(matches, {
           preload: true,
-          maxAge: loaderOpts.maxAge
+          maxAge: (_ref4 = (_ref5 = (_loaderOpts$maxAge = loaderOpts.maxAge) != null ? _loaderOpts$maxAge : router.options.defaultPreloadMaxAge) != null ? _ref5 : router.options.defaultLoaderMaxAge) != null ? _ref4 : 0,
+          gcMaxAge: (_ref6 = (_ref7 = (_loaderOpts$gcMaxAge = loaderOpts.gcMaxAge) != null ? _loaderOpts$gcMaxAge : router.options.defaultPreloadGcMaxAge) != null ? _ref7 : router.options.defaultLoaderGcMaxAge) != null ? _ref6 : 0
         });
         return matches;
       },
@@ -2219,32 +2236,30 @@
       },
       loadMatches: async (resolvedMatches, loaderOpts) => {
         const now = Date.now();
+        const minMaxAge = loaderOpts != null && loaderOpts.preload ? Math.max(loaderOpts == null ? void 0 : loaderOpts.maxAge, loaderOpts == null ? void 0 : loaderOpts.gcMaxAge) : 0;
         const matchPromises = resolvedMatches.map(async match => {
           // Validate the match (loads search params etc)
-          match.__.validate(); // If the match doesn't have a loader, don't attempt to load it
+          match.__.validate(); // If this is a preload, add it to the preload cache
 
 
-          if (!match.hasLoaders()) {
-            return;
-          } // If this is a preload, add it to the preload cache
-
-
-          if (loaderOpts != null && loaderOpts.preload && (loaderOpts == null ? void 0 : loaderOpts.maxAge) > 0) {
+          if (loaderOpts != null && loaderOpts.preload && minMaxAge > 0) {
             // If the match is currently active, don't preload it
             if (router.state.matches.find(d => d.matchId === match.matchId)) {
               return;
             }
 
             router.matchCache[match.matchId] = {
-              gc: now + loaderOpts.maxAge,
-              // TODO: Should this use the route's maxAge?
+              gc: now + loaderOpts.gcMaxAge,
               match
             };
           } // If the match is invalid, errored or idle, trigger it to load
 
 
           if (match.status === 'success' && match.getIsInvalid() || match.status === 'error' || match.status === 'idle') {
-            match.load();
+            const maxAge = loaderOpts != null && loaderOpts.preload ? loaderOpts == null ? void 0 : loaderOpts.maxAge : undefined;
+            match.load({
+              maxAge
+            });
           }
 
           if (match.status === 'loading') {
@@ -2306,7 +2321,7 @@
         const next = router.buildNext(location);
         return router.commitLocation(next, location.replace);
       },
-      navigate: async _ref4 => {
+      navigate: async _ref8 => {
         let {
           from,
           to = '.',
@@ -2314,7 +2329,7 @@
           hash,
           replace,
           params
-        } = _ref4;
+        } = _ref8;
         // If this link simply reloads the current route,
         // make sure it has a new key so it will trigger a data refresh
         // If this `to` is a valid external URL, return
@@ -2338,8 +2353,8 @@
           params
         });
       },
-      buildLink: _ref5 => {
-        var _preload, _ref6, _ref7, _ref8;
+      buildLink: _ref9 => {
+        var _preload, _ref10;
 
         let {
           from,
@@ -2352,9 +2367,10 @@
           activeOptions,
           preload,
           preloadMaxAge: userPreloadMaxAge,
+          preloadGcMaxAge: userPreloadGcMaxAge,
           preloadDelay: userPreloadDelay,
           disabled
-        } = _ref5;
+        } = _ref9;
 
         // If this link simply reloads the current route,
         // make sure it has a new key so it will trigger a data refresh
@@ -2377,9 +2393,8 @@
           replace
         };
         const next = router.buildNext(nextOpts);
-        preload = (_preload = preload) != null ? _preload : router.options.defaultLinkPreload;
-        const preloadMaxAge = (_ref6 = (_ref7 = userPreloadMaxAge != null ? userPreloadMaxAge : router.options.defaultLinkPreloadMaxAge) != null ? _ref7 : router.options.defaultLoaderGcMaxAge) != null ? _ref6 : 0;
-        const preloadDelay = (_ref8 = userPreloadDelay != null ? userPreloadDelay : router.options.defaultLinkPreloadDelay) != null ? _ref8 : 0; // Compare path/hash for matches
+        preload = (_preload = preload) != null ? _preload : router.options.defaultPreload;
+        const preloadDelay = (_ref10 = userPreloadDelay != null ? userPreloadDelay : router.options.defaultPreloadDelay) != null ? _ref10 : 0; // Compare path/hash for matches
 
         const pathIsEqual = router.state.location.pathname === next.pathname;
         const currentPathSplit = router.state.location.pathname.split('/');
@@ -2407,9 +2422,10 @@
 
 
         const handleFocus = e => {
-          if (preload && preloadMaxAge > 0) {
-            router.loadRoute(nextOpts, {
-              maxAge: preloadMaxAge
+          if (preload) {
+            router.preloadRoute(nextOpts, {
+              maxAge: userPreloadMaxAge,
+              gcMaxAge: userPreloadGcMaxAge
             });
           }
         };
@@ -2417,15 +2433,16 @@
         const handleEnter = e => {
           const target = e.target || {};
 
-          if (preload && preloadMaxAge > 0) {
+          if (preload) {
             if (target.preloadTimeout) {
               return;
             }
 
             target.preloadTimeout = setTimeout(() => {
               target.preloadTimeout = null;
-              router.loadRoute(nextOpts, {
-                maxAge: preloadMaxAge
+              router.preloadRoute(nextOpts, {
+                maxAge: userPreloadMaxAge,
+                gcMaxAge: userPreloadGcMaxAge
               });
             }, preloadDelay);
           }