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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tanstack/router-core",
   "author": "Tanner Linsley",
-  "version": "0.0.1-beta.34",
+  "version": "0.0.1-beta.35",
   "license": "MIT",
   "repository": "tanstack/router",
   "homepage": "https://tanstack.com/router",

package/src/path.ts

@@ -165,10 +165,10 @@ export function matchByPath(
   from: string,
   matchLocation: Pick<MatchLocation, 'to' | 'caseSensitive' | 'fuzzy'>,
 ): Record<string, string> | undefined {
-  if (basepath && !from.startsWith(basepath)) {
+  if (!from.startsWith(basepath)) {
     return undefined
   }
-  from = from.startsWith(basepath) ? from.substring(basepath.length) : from
+  from = basepath != '/' ? from.substring(basepath.length) : from
   const baseSegments = parsePathname(from)
   const to = `${matchLocation.to ?? '*'}`
   const routeSegments = parsePathname(to)

package/src/router.ts

@@ -666,10 +666,8 @@ export function createRouter<
           ),
         )
       } catch (err: any) {
-        if (err?.then) {
-          await new Promise(() => {})
-        }
-        throw err
+        console.info(err)
+        invariant(false, `A route's beforeLoad middleware failed! 👆`)
       }
 
       router.notify()
@@ -712,10 +710,12 @@ export function createRouter<
           d.status = 'idle'
           d.error = undefined
         }
+
         const gc = Math.max(
           d.options.loaderGcMaxAge ?? router.options.defaultLoaderGcMaxAge ?? 0,
           d.options.loaderMaxAge ?? router.options.defaultLoaderMaxAge ?? 0,
         )
+
         if (gc > 0) {
           router.matchCache[d.matchId] = {
             gc: gc == Infinity ? Number.MAX_SAFE_INTEGER : now + gc,
@@ -857,6 +857,14 @@ export function createRouter<
                 route.options.caseSensitive ?? router.options.caseSensitive,
             })
 
+            console.log(
+              router.basepath,
+              route.fullPath,
+              fuzzy,
+              pathname,
+              matchParams,
+            )
+
             if (matchParams) {
               let parsedParams
 
@@ -1032,6 +1040,7 @@ export function createRouter<
         if (!router.state.pending?.location) {
           return false
         }
+
         return !!matchPathname(
           router.basepath,
           router.state.pending.location.pathname,