@tanstack/solid-router 1.120.2 → 1.120.4-alpha.1

package/src/link.tsx

@@ -522,20 +522,25 @@ export type LinkComponent<
   props: LinkComponentProps<TComp, TRouter, TFrom, TTo, TMaskFrom, TMaskTo>,
 ) => Solid.JSX.Element
 
-export type LinkComponentRoute<in out TDefaultFrom extends string = string> = <
-  TRouter extends AnyRouter = RegisteredRouter,
-  const TTo extends string | undefined = undefined,
-  const TMaskTo extends string = '',
->(
-  props: LinkComponentProps<
-    'a',
-    TRouter,
-    TDefaultFrom,
-    TTo,
-    TDefaultFrom,
-    TMaskTo
-  >,
-) => Solid.JSX.Element
+export interface LinkComponentRoute<
+  in out TDefaultFrom extends string = string,
+> {
+  defaultFrom: TDefaultFrom
+  <
+    TRouter extends AnyRouter = RegisteredRouter,
+    const TTo extends string | undefined = undefined,
+    const TMaskTo extends string = '',
+  >(
+    props: LinkComponentProps<
+      'a',
+      TRouter,
+      this['defaultFrom'],
+      TTo,
+      this['defaultFrom'],
+      TMaskTo
+    >,
+  ): Solid.JSX.Element
+}
 
 export function createLink<const TComp>(
   Comp: Constrain<TComp, any, (props: CreateLinkProps) => Solid.JSX.Element>,

package/src/route.tsx

@@ -53,8 +53,8 @@ declare module '@tanstack/router-core' {
   }
 
   export interface RouteExtensions<
-    TId extends string,
-    TFullPath extends string,
+    in out TId extends string,
+    in out TFullPath extends string,
   > {
     useMatch: UseMatchRoute<TId>
     useRouteContext: UseRouteContextRoute<TId>
@@ -132,13 +132,13 @@ export class RouteApi<
     return notFound({ routeId: this.id as string, ...opts })
   }
 
-  Link: LinkComponentRoute<RouteTypesById<TRouter, TId>['fullPath']> = (
+  Link: LinkComponentRoute<RouteTypesById<TRouter, TId>['fullPath']> = ((
     props,
   ) => {
     const router = useRouter()
     const fullPath = router.routesById[this.id as string].fullPath
     return <Link from={fullPath as never} {...props} />
-  }
+  }) as LinkComponentRoute<RouteTypesById<TRouter, TId>['fullPath']>
 }
 
 export class Route<
@@ -242,9 +242,9 @@ export class Route<
     return useNavigate({ from: this.fullPath })
   }
 
-  Link: LinkComponentRoute<TFullPath> = (props) => {
+  Link: LinkComponentRoute<TFullPath> = ((props) => {
     return <Link from={this.fullPath} {...props} />
-  }
+  }) as LinkComponentRoute<TFullPath>
 }
 
 export function createRoute<
@@ -427,9 +427,9 @@ export class RootRoute<
     return useNavigate({ from: this.fullPath })
   }
 
-  Link: LinkComponentRoute<'/'> = (props) => {
+  Link: LinkComponentRoute<'/'> = ((props) => {
     return <Link from={this.fullPath} {...(props as any)} />
-  }
+  }) as LinkComponentRoute<'/'>
 }
 
 export function createRouteMask<

package/src/router.ts

@@ -1,4 +1,5 @@
 import { RouterCore } from '@tanstack/router-core'
+import { createFileRoute, createLazyFileRoute } from './fileRoute'
 import type { RouterHistory } from '@tanstack/history'
 import type {
   AnyRoute,
@@ -101,3 +102,11 @@ export class Router<
     super(options)
   }
 }
+
+if (typeof globalThis !== 'undefined') {
+  ;(globalThis as any).createFileRoute = createFileRoute
+  ;(globalThis as any).createLazyFileRoute = createLazyFileRoute
+} else if (typeof window !== 'undefined') {
+  ;(window as any).createFileRoute = createFileRoute
+  ;(window as any).createFileRoute = createLazyFileRoute
+}

package/src/useBlocker.tsx

@@ -180,7 +180,10 @@ export function useBlocker(
         location: HistoryLocation,
       ): AnyShouldBlockFnLocation {
         const parsedLocation = router.parseLocation(undefined, location)
-        const matchedRoutes = router.getMatchedRoutes(parsedLocation)
+        const matchedRoutes = router.getMatchedRoutes(
+          parsedLocation.pathname,
+          undefined,
+        )
         if (matchedRoutes.foundRoute === undefined) {
           throw new Error(`No route found for location ${location.href}`)
         }