@tanstack/router-core 0.0.1-beta.33 → 0.0.1-beta.35

package/build/umd/index.development.js

@@ -1020,8 +1020,8 @@
       return segment.value;
     }));
   }
-  function matchPathname(currentPathname, matchLocation) {
-    const pathParams = matchByPath(currentPathname, matchLocation);
+  function matchPathname(basepath, currentPathname, matchLocation) {
+    const pathParams = matchByPath(basepath, currentPathname, matchLocation);
     // const searchMatched = matchBySearch(currentLocation.search, matchLocation)
 
     if (matchLocation.to && !pathParams) {
@@ -1029,10 +1029,15 @@
     }
     return pathParams != null ? pathParams : {};
   }
-  function matchByPath(from, matchLocation) {
+  function matchByPath(basepath, from, matchLocation) {
     var _matchLocation$to;
+    if (!from.startsWith(basepath)) {
+      return undefined;
+    }
+    from = basepath != '/' ? from.substring(basepath.length) : from;
     const baseSegments = parsePathname(from);
-    const routeSegments = parsePathname("" + ((_matchLocation$to = matchLocation.to) != null ? _matchLocation$to : '*'));
+    const to = "" + ((_matchLocation$to = matchLocation.to) != null ? _matchLocation$to : '*');
+    const routeSegments = parsePathname(to);
     const params = {};
     let isMatch = (() => {
       for (let i = 0; i < Math.max(baseSegments.length, routeSegments.length); i++) {
@@ -1643,7 +1648,7 @@
         });
       },
       mount: () => {
-        const next = router.__.buildLocation({
+        router.__.buildLocation({
           to: '.',
           search: true,
           hash: true
@@ -1651,9 +1656,10 @@
 
         // If the current location isn't updated, trigger a navigation
         // to the current location. Otherwise, load the current location.
-        if (next.href !== router.__location.href) {
-          router.__.commitLocation(next, true);
-        }
+        // if (next.href !== router.__location.href) {
+        //   router.__.commitLocation(next, true)
+        // }
+
         if (!router.state.matches.length) {
           router.load();
         }
@@ -1681,6 +1687,7 @@
         router.load();
       },
       update: opts => {
+        var _trimPath;
         const newHistory = (opts == null ? void 0 : opts.history) !== router.history;
         if (!router.__location || newHistory) {
           if (opts != null && opts.history) {
@@ -1694,7 +1701,7 @@
           basepath,
           routeConfig
         } = router.options;
-        router.basepath = cleanPath("/" + (basepath != null ? basepath : ''));
+        router.basepath = "/" + ((_trimPath = trimPath(basepath != null ? basepath : '')) != null ? _trimPath : '');
         if (routeConfig) {
           router.routesById = {};
           router.routeTree = router.__.buildRouteTree(routeConfig);
@@ -1745,10 +1752,8 @@
             match
           })));
         } catch (err) {
-          if (err != null && err.then) {
-            await new Promise(() => {});
-          }
-          throw err;
+          console.info(err);
+          invariant(false, "A route's beforeLoad middleware failed! \uD83D\uDC46");
         }
         router.notify();
 
@@ -1892,11 +1897,12 @@
                 return findMatchInRoutes([...foundRoutes, route], route.childRoutes);
               }
               const fuzzy = !!(route.routePath !== '/' || (_route$childRoutes2 = route.childRoutes) != null && _route$childRoutes2.length);
-              const matchParams = matchPathname(pathname, {
+              const matchParams = matchPathname(router.basepath, pathname, {
                 to: route.fullPath,
                 fuzzy,
                 caseSensitive: (_route$options$caseSe = route.options.caseSensitive) != null ? _route$options$caseSe : router.options.caseSensitive
               });
+              console.log(router.basepath, route.fullPath, fuzzy, pathname, matchParams);
               if (matchParams) {
                 let parsedParams;
                 try {
@@ -2030,11 +2036,11 @@
           if (!((_router$state$pending7 = router.state.pending) != null && _router$state$pending7.location)) {
             return false;
           }
-          return !!matchPathname(router.state.pending.location.pathname, _extends({}, opts, {
+          return !!matchPathname(router.basepath, router.state.pending.location.pathname, _extends({}, opts, {
             to: next.pathname
           }));
         }
-        return !!matchPathname(router.state.location.pathname, _extends({}, opts, {
+        return !!matchPathname(router.basepath, router.state.location.pathname, _extends({}, opts, {
           to: next.pathname
         }));
       },