@tanstack/solid-router 1.112.11 → 1.112.15

package/dist/source/useRouter.d.ts

@@ -1,4 +1,4 @@
-import type { AnyRouter, RegisteredRouter } from './router';
+import type { AnyRouter, RegisteredRouter } from '@tanstack/router-core';
 export declare function useRouter<TRouter extends AnyRouter = RegisteredRouter>(opts?: {
     warn?: boolean;
 }): TRouter;

package/dist/source/useRouterState.d.ts

@@ -1,4 +1,4 @@
-import type { AnyRouter, RegisteredRouter, RouterState } from './router';
+import type { AnyRouter, RegisteredRouter, RouterState } from '@tanstack/router-core';
 import type { Accessor } from 'solid-js';
 export type UseRouterStateOptions<TRouter extends AnyRouter, TSelected> = {
     router?: TRouter;

package/dist/source/useRouterState.jsx.map

@@ -1 +1 @@
-{"version":3,"file":"useRouterState.jsx","sourceRoot":"","sources":["../../src/useRouterState.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAcvC,MAAM,UAAU,cAAc,CAI5B,IAAgD;IAEhD,MAAM,aAAa,GAAG,SAAS,CAAU;QACvC,IAAI,EAAE,IAAI,EAAE,MAAM,KAAK,SAAS;KACjC,CAAC,CAAA;IACF,MAAM,MAAM,GAAG,IAAI,EAAE,MAAM,IAAI,aAAa,CAAA;IAE5C,OAAO,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;QACxC,IAAI,IAAI,EAAE,MAAM;YAAE,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QAE3C,OAAO,KAAK,CAAA;IACd,CAAC,CAAuD,CAAA;AAC1D,CAAC"}
+{"version":3,"file":"useRouterState.jsx","sourceRoot":"","sources":["../../src/useRouterState.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAkBvC,MAAM,UAAU,cAAc,CAI5B,IAAgD;IAEhD,MAAM,aAAa,GAAG,SAAS,CAAU;QACvC,IAAI,EAAE,IAAI,EAAE,MAAM,KAAK,SAAS;KACjC,CAAC,CAAA;IACF,MAAM,MAAM,GAAG,IAAI,EAAE,MAAM,IAAI,aAAa,CAAA;IAE5C,OAAO,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;QACxC,IAAI,IAAI,EAAE,MAAM;YAAE,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QAE3C,OAAO,KAAK,CAAA;IACd,CAAC,CAAuD,CAAA;AAC1D,CAAC"}

package/dist/source/useSearch.d.ts

@@ -1,8 +1,6 @@
 import type { ThrowConstraint } from './useMatch';
 import type { Accessor } from 'solid-js';
-import type { AnyRouter, RegisteredRouter } from './router';
-import type { StrictOrFrom } from './utils';
-import type { ResolveUseSearch, ThrowOrOptional, UseSearchResult } from '@tanstack/router-core';
+import type { AnyRouter, RegisteredRouter, ResolveUseSearch, StrictOrFrom, ThrowOrOptional, UseSearchResult } from '@tanstack/router-core';
 export interface UseSearchBaseOptions<TRouter extends AnyRouter, TFrom, TStrict extends boolean, TThrow extends boolean, TSelected> {
     select?: (state: ResolveUseSearch<TRouter, TFrom, TStrict>) => TSelected;
     shouldThrow?: TThrow;

package/dist/source/useSearch.jsx.map

@@ -1 +1 @@
-{"version":3,"file":"useSearch.jsx","sourceRoot":"","sources":["../../src/useSearch.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AA4CrC,MAAM,UAAU,SAAS,CAOvB,IAMC;IAID,OAAO,QAAQ,CAAC;QACd,IAAI,EAAE,IAAI,CAAC,IAAK;QAChB,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,MAAM,EAAE,CAAC,KAAU,EAAE,EAAE;YACrB,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAA;QAC/D,CAAC;KACF,CAAQ,CAAA;AACX,CAAC"}
+{"version":3,"file":"useSearch.jsx","sourceRoot":"","sources":["../../src/useSearch.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AA6CrC,MAAM,UAAU,SAAS,CAOvB,IAMC;IAID,OAAO,QAAQ,CAAC;QACd,IAAI,EAAE,IAAI,CAAC,IAAK;QAChB,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,MAAM,EAAE,CAAC,KAAU,EAAE,EAAE;YACrB,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAA;QAC/D,CAAC;KACF,CAAQ,CAAA;AACX,CAAC"}

package/dist/source/utils.d.ts

@@ -1,14 +1,5 @@
 import * as Solid from 'solid-js';
-import type { AnyRouter } from './router';
-import type { ConstrainLiteral, RouteIds } from '@tanstack/router-core';
-export type StrictOrFrom<TRouter extends AnyRouter, TFrom, TStrict extends boolean = true> = TStrict extends false ? {
-    from?: never;
-    strict: TStrict;
-} : {
-    from: ConstrainLiteral<TFrom, RouteIds<TRouter['routeTree']>>;
-    strict?: TStrict;
-};
-export declare const useLayoutEffect: typeof Solid.createRenderEffect;
+export declare const useLayoutEffect: typeof Solid.createEffect;
 export declare const usePrevious: (fn: () => boolean) => Solid.Accessor<{
     current: boolean | null;
     previous: boolean | null;

package/dist/source/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,UAAU,CAAA;AAkBjC,MAAM,CAAC,MAAM,eAAe,GAC1B,OAAO,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAA;AAE/E,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,EAAiB,EAAE,EAAE;IAC/C,OAAO,KAAK,CAAC,UAAU,CACrB,CACE,OAA8D;QAC5D,OAAO,EAAE,IAAI;QACb,QAAQ,EAAE,IAAI;KACf,EACD,EAAE;QACF,MAAM,OAAO,GAAG,EAAE,EAAE,CAAA;QAEpB,IAAI,IAAI,CAAC,OAAO,KAAK,OAAO,EAAE,CAAC;YAC7B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAA;YAC5B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACxB,CAAC;QAED,OAAO,IAAI,CAAA;IACb,CAAC,CACF,CAAA;AACH,CAAC,CAAA;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,MAAM,UAAU,uBAAuB,CACrC,GAA6B,EAC7B,QAAgE,EAChE,8BAAwD,EAAE,EAC1D,UAAkC,EAAE;IAEpC,MAAM,+BAA+B,GACnC,OAAO,oBAAoB,KAAK,UAAU,CAAA;IAC5C,IAAI,WAAW,GAAgC,IAAI,CAAA;IAEnD,KAAK,CAAC,YAAY,CAAC,GAAG,EAAE;QACtB,MAAM,CAAC,GAAG,GAAG,EAAE,CAAA;QACf,IAAI,CAAC,CAAC,IAAI,CAAC,+BAA+B,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;YAC/D,OAAM;QACR,CAAC;QAED,WAAW,GAAG,IAAI,oBAAoB,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE;YACjD,QAAQ,CAAC,KAAK,CAAC,CAAA;QACjB,CAAC,EAAE,2BAA2B,CAAC,CAAA;QAE/B,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;QAEtB,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;YACnB,WAAW,EAAE,UAAU,EAAE,CAAA;QAC3B,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,OAAO,GAAG,EAAE,CAAC,WAAW,CAAA;AAC1B,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,UAAU,CAAA;AAEjC,MAAM,CAAC,MAAM,eAAe,GAC1B,OAAO,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAA;AAE/E,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,EAAiB,EAAE,EAAE;IAC/C,OAAO,KAAK,CAAC,UAAU,CACrB,CACE,OAA8D;QAC5D,OAAO,EAAE,IAAI;QACb,QAAQ,EAAE,IAAI;KACf,EACD,EAAE;QACF,MAAM,OAAO,GAAG,EAAE,EAAE,CAAA;QAEpB,IAAI,IAAI,CAAC,OAAO,KAAK,OAAO,EAAE,CAAC;YAC7B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAA;YAC5B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACxB,CAAC;QAED,OAAO,IAAI,CAAA;IACb,CAAC,CACF,CAAA;AACH,CAAC,CAAA;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,MAAM,UAAU,uBAAuB,CACrC,GAA6B,EAC7B,QAAgE,EAChE,8BAAwD,EAAE,EAC1D,UAAkC,EAAE;IAEpC,MAAM,+BAA+B,GACnC,OAAO,oBAAoB,KAAK,UAAU,CAAA;IAC5C,IAAI,WAAW,GAAgC,IAAI,CAAA;IAEnD,KAAK,CAAC,YAAY,CAAC,GAAG,EAAE;QACtB,MAAM,CAAC,GAAG,GAAG,EAAE,CAAA;QACf,IAAI,CAAC,CAAC,IAAI,CAAC,+BAA+B,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;YAC/D,OAAM;QACR,CAAC;QAED,WAAW,GAAG,IAAI,oBAAoB,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE;YACjD,QAAQ,CAAC,KAAK,CAAC,CAAA;QACjB,CAAC,EAAE,2BAA2B,CAAC,CAAA;QAE/B,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;QAEtB,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;YACnB,WAAW,EAAE,UAAU,EAAE,CAAA;QAC3B,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,OAAO,GAAG,EAAE,CAAC,WAAW,CAAA;AAC1B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/solid-router",
-  "version": "1.112.11",
+  "version": "1.112.15",
   "description": "Modern and scalable routing for Solid applications",
   "author": "Tanner Linsley",
   "license": "MIT",
@@ -60,8 +60,8 @@
     "jsesc": "^3.0.2",
     "tiny-invariant": "^1.3.3",
     "tiny-warning": "^1.0.3",
-    "@tanstack/router-core": "1.112.8",
-    "@tanstack/history": "1.112.8"
+    "@tanstack/history": "1.112.8",
+    "@tanstack/router-core": "1.112.12"
   },
   "devDependencies": {
     "@solidjs/testing-library": "^0.8.10",

package/src/Match.tsx

@@ -17,7 +17,7 @@ import { matchContext } from './matchContext'
 import { SafeFragment } from './SafeFragment'
 import { renderRouteNotFound } from './renderRouteNotFound'
 import { ScrollRestoration } from './scroll-restoration'
-import type { AnyRoute } from './route'
+import type { AnyRoute } from '@tanstack/router-core'
 
 export const Match = (props: { matchId: string }) => {
   const router = useRouter()

package/src/Matches.tsx

@@ -8,18 +8,21 @@ import { matchContext } from './matchContext'
 import { Match } from './Match'
 import { SafeFragment } from './SafeFragment'
 import type {
+  AnyRouter,
   DeepPartial,
   MakeOptionalPathParams,
   MakeOptionalSearchParams,
   MakeRouteMatchUnion,
   MaskOptions,
+  MatchRouteOptions,
   NoInfer,
+  RegisteredRouter,
   ResolveRelativePath,
   ResolveRoute,
   RouteByPath,
+  RouterState,
   ToSubOptionsProps,
 } from '@tanstack/router-core'
-import type { AnyRouter, RegisteredRouter, RouterState } from './router'
 
 declare module '@tanstack/router-core' {
   export interface RouteMatchExtensions {
@@ -87,13 +90,6 @@ function MatchesInner() {
   )
 }
 
-export interface MatchRouteOptions {
-  pending?: boolean
-  caseSensitive?: boolean
-  includeSearch?: boolean
-  fuzzy?: boolean
-}
-
 export type UseMatchRouteOptions<
   TRouter extends AnyRouter = RegisteredRouter,
   TFrom extends string = string,

package/src/RouterProvider.tsx

@@ -4,9 +4,8 @@ import type * as Solid from 'solid-js'
 import type {
   AnyRouter,
   RegisteredRouter,
-  Router,
   RouterOptions,
-} from './router'
+} from '@tanstack/router-core'
 
 export function RouterContextProvider<
   TRouter extends AnyRouter = RegisteredRouter,
@@ -61,20 +60,18 @@ export type RouterProps<
   RouterOptions<
     TRouter['routeTree'],
     NonNullable<TRouter['options']['trailingSlash']>,
+    false,
     TRouter['history'],
     TDehydrated
   >,
   'context'
 > & {
-  router: Router<
-    TRouter['routeTree'],
-    NonNullable<TRouter['options']['trailingSlash']>,
-    TRouter['history']
-  >
+  router: TRouter
   context?: Partial<
     RouterOptions<
       TRouter['routeTree'],
       NonNullable<TRouter['options']['trailingSlash']>,
+      false,
       TRouter['history'],
       TDehydrated
     >['context']

package/src/Transitioner.tsx

@@ -27,7 +27,7 @@ export function Transitioner() {
   const previousIsPagePending = usePrevious(isPagePending)
 
   if (!router.isServer) {
-    router.startSolidTransition = (fn: () => void) => {
+    router.startTransition = (fn: () => void) => {
       setIsTransitioning(true)
       fn()
       setIsTransitioning(false)

package/src/fileRoute.ts

@@ -12,23 +12,22 @@ import type { UseMatchRoute } from './useMatch'
 import type { UseSearchRoute } from './useSearch'
 import type {
   AnyContext,
-  AnyRoute as AnyCoreRoute,
-  AnyPathParams,
+  AnyRoute,
   AnyRouter,
-  AnyValidator,
   Constrain,
   ConstrainLiteral,
   FileBaseRouteOptions,
   FileRoutesByPath,
+  LazyRouteOptions,
+  RegisteredRouter,
   ResolveParams,
+  Route,
   RouteById,
+  RouteConstraints,
   RouteIds,
   RouteLoaderFn,
   UpdatableRouteOptions,
 } from '@tanstack/router-core'
-
-import type { AnyRoute, Route, RouteConstraints } from './route'
-import type { RegisteredRouter } from './router'
 import type { UseLoaderDepsRoute } from './useLoaderDeps'
 import type { UseLoaderDataRoute } from './useLoaderData'
 import type { UseRouteContextRoute } from './useRouteContext'
@@ -115,7 +114,8 @@ export class FileRoute<
     TBeforeLoadFn,
     TLoaderDeps,
     TLoaderFn,
-    TChildren
+    TChildren,
+    unknown
   > => {
     warning(
       this.silent,
@@ -158,23 +158,7 @@ export function FileRouteLoader<
   return (loaderFn) => loaderFn as any
 }
 
-export type LazyRouteOptions = Pick<
-  UpdatableRouteOptions<
-    AnyRoute,
-    string,
-    string,
-    AnyPathParams,
-    AnyValidator,
-    {},
-    AnyContext,
-    AnyContext,
-    AnyContext,
-    AnyContext
-  >,
-  'component' | 'errorComponent' | 'pendingComponent' | 'notFoundComponent'
->
-
-export class LazyRoute<TRoute extends AnyCoreRoute> {
+export class LazyRoute<TRoute extends AnyRoute> {
   options: {
     id: string
   } & LazyRouteOptions
@@ -231,7 +215,7 @@ export class LazyRoute<TRoute extends AnyCoreRoute> {
 export function createLazyRoute<
   TRouter extends AnyRouter = RegisteredRouter,
   TId extends string = string,
-  TRoute extends AnyCoreRoute = RouteById<TRouter['routeTree'], TId>,
+  TRoute extends AnyRoute = RouteById<TRouter['routeTree'], TId>,
 >(id: ConstrainLiteral<TId, RouteIds<TRouter['routeTree']>>) {
   return (opts: LazyRouteOptions) => {
     return new LazyRoute<TRoute>({

package/src/index.tsx

@@ -185,6 +185,27 @@ export type {
   BeforeLoadContextOptions,
   ContextOptions,
   RootRouteOptions,
+  AnyRouteWithContext,
+  LazyRouteOptions,
+  AnyRoute,
+  ResolveFullPath,
+  RouteConstraints,
+  RouterState,
+  ListenerFn,
+  BuildNextOptions,
+  AnyRouter,
+  RegisteredRouter,
+  RouterEvents,
+  RouterEvent,
+  RouterListener,
+  MatchRouteOptions,
+  RouteMask,
+  RouterContextOptions,
+  RouterOptions,
+  RouterConstructorOptions,
+  ControllablePromise,
+  InjectedHtmlEntry,
+  RouterErrorSerializer,
 } from '@tanstack/router-core'
 
 export {
@@ -215,7 +236,6 @@ export {
   createLazyRoute,
   createLazyFileRoute,
 } from './fileRoute'
-export type { LazyRouteOptions } from './fileRoute'
 
 export * from './history'
 
@@ -240,11 +260,7 @@ export {
   useChildMatches,
 } from './Matches'
 
-export type {
-  MatchRouteOptions,
-  UseMatchRouteOptions,
-  MakeMatchRouteOptions,
-} from './Matches'
+export type { UseMatchRouteOptions, MakeMatchRouteOptions } from './Matches'
 
 export { matchContext } from './matchContext'
 export { Match, Outlet } from './Match'
@@ -268,18 +284,13 @@ export {
   NotFoundRoute,
 } from './route'
 export type {
-  AnyRoute,
-  RouteConstraints,
   AnyRootRoute,
-  ResolveFullPath,
-  RouteMask,
   SolidNode,
   SyncRouteComponent,
   AsyncRouteComponent,
   RouteComponent,
   ErrorRouteComponent,
   NotFoundRouteComponent,
-  AnyRouteWithContext,
 } from './route'
 
 export {
@@ -292,23 +303,6 @@ export {
   getInitialRouterState,
 } from './router'
 
-export type {
-  AnyRouter,
-  RegisteredRouter,
-  RouterContextOptions,
-  RouterOptions,
-  RouterErrorSerializer,
-  RouterState,
-  ListenerFn,
-  BuildNextOptions,
-  RouterConstructorOptions,
-  RouterEvents,
-  RouterEvent,
-  RouterListener,
-  ControllablePromise,
-  InjectedHtmlEntry,
-} from './router'
-
 export { RouterProvider, RouterContextProvider } from './RouterProvider'
 export type { RouterProps } from './RouterProvider'
 

package/src/link.tsx

@@ -17,12 +17,13 @@ import { useIntersectionObserver } from './utils'
 
 import { useMatch } from './useMatch'
 import type {
+  AnyRouter,
   Constrain,
   LinkCurrentTargetElement,
   LinkOptions,
+  RegisteredRouter,
   RoutePaths,
 } from '@tanstack/router-core'
-import type { AnyRouter, RegisteredRouter } from './router'
 import type {
   ValidateLinkOptions,
   ValidateLinkOptionsArray,

package/src/not-found.tsx

@@ -1,8 +1,7 @@
 import { CatchBoundary } from './CatchBoundary'
 import { useRouterState } from './useRouterState'
 import type * as Solid from 'solid-js'
-import type { RegisteredRouter } from './router'
-import type { RouteIds } from '@tanstack/router-core'
+import type { RegisteredRouter, RouteIds } from '@tanstack/router-core'
 
 export type NotFoundError = {
   /**

package/src/redirects.ts

@@ -1,7 +1,7 @@
-import type { RegisteredRouter } from './router'
 import type {
   AnyRedirect,
   Redirect,
+  RegisteredRouter,
   ResolvedRedirect,
 } from '@tanstack/router-core'
 

package/src/renderRouteNotFound.tsx

@@ -1,7 +1,6 @@
 import warning from 'tiny-warning'
 import { DefaultGlobalNotFound } from './not-found'
-import type { AnyRouter } from './router'
-import type { AnyRoute } from './route'
+import type { AnyRoute, AnyRouter } from '@tanstack/router-core'
 
 export function renderRouteNotFound(
   router: AnyRouter,