@tanstack/solid-router 1.162.2 → 1.162.5

package/dist/cjs/RouterProvider.cjs

@@ -17,11 +17,10 @@ function RouterContextProvider({
       ...rest.context
     }
   });
-  const routerContext$1 = routerContext.getRouterContext();
   const OptionalWrapper = router.options.Wrap || SafeFragment.SafeFragment;
   return Solid.createComponent(OptionalWrapper, {
     get children() {
-      return Solid.createComponent(routerContext$1.Provider, {
+      return Solid.createComponent(routerContext.routerContext.Provider, {
         value: router,
         get children() {
           return children();

package/dist/cjs/RouterProvider.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"RouterProvider.cjs","sources":["../../src/RouterProvider.tsx"],"sourcesContent":["import { getRouterContext } from './routerContext'\nimport { SafeFragment } from './SafeFragment'\nimport { Matches } from './Matches'\nimport type {\n  AnyRouter,\n  RegisteredRouter,\n  RouterOptions,\n} from '@tanstack/router-core'\nimport type * as Solid from 'solid-js'\n\nexport function RouterContextProvider<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TDehydrated extends Record<string, any> = Record<string, any>,\n>({\n  router,\n  children,\n  ...rest\n}: RouterProps<TRouter, TDehydrated> & {\n  children: () => Solid.JSX.Element\n}) {\n  // Allow the router to update options on the router instance\n  router.update({\n    ...router.options,\n    ...rest,\n    context: {\n      ...router.options.context,\n      ...rest.context,\n    },\n  })\n\n  const routerContext = getRouterContext()\n\n  const OptionalWrapper = router.options.Wrap || SafeFragment\n\n  return (\n    <OptionalWrapper>\n      <routerContext.Provider value={router as AnyRouter}>\n        {children()}\n      </routerContext.Provider>\n    </OptionalWrapper>\n  )\n}\n\nexport function RouterProvider<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TDehydrated extends Record<string, any> = Record<string, any>,\n>({ router, ...rest }: RouterProps<TRouter, TDehydrated>) {\n  return (\n    <RouterContextProvider router={router} {...rest}>\n      {() => <Matches />}\n    </RouterContextProvider>\n  )\n}\n\nexport type RouterProps<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TDehydrated extends Record<string, any> = Record<string, any>,\n> = Omit<\n  RouterOptions<\n    TRouter['routeTree'],\n    NonNullable<TRouter['options']['trailingSlash']>,\n    false,\n    TRouter['history'],\n    TDehydrated\n  >,\n  'context'\n> & {\n  router: TRouter\n  context?: Partial<\n    RouterOptions<\n      TRouter['routeTree'],\n      NonNullable<TRouter['options']['trailingSlash']>,\n      false,\n      TRouter['history'],\n      TDehydrated\n    >['context']\n  >\n}\n"],"names":["RouterContextProvider","router","children","rest","update","options","context","routerContext","getRouterContext","OptionalWrapper","Wrap","SafeFragment","_$createComponent","Provider","value","RouterProvider","_$mergeProps","Matches"],"mappings":";;;;;;AAUO,SAASA,sBAGd;AAAA,EACAC;AAAAA,EACAC;AAAAA,EACA,GAAGC;AAGL,GAAG;AAEDF,SAAOG,OAAO;AAAA,IACZ,GAAGH,OAAOI;AAAAA,IACV,GAAGF;AAAAA,IACHG,SAAS;AAAA,MACP,GAAGL,OAAOI,QAAQC;AAAAA,MAClB,GAAGH,KAAKG;AAAAA,IAAAA;AAAAA,EACV,CACD;AAED,QAAMC,kBAAgBC,cAAAA,iBAAAA;AAEtB,QAAMC,kBAAkBR,OAAOI,QAAQK,QAAQC,aAAAA;AAE/C,SAAAC,MAAAA,gBACGH,iBAAe;AAAA,IAAA,IAAAP,WAAA;AAAA,aAAAU,MAAAA,gBACbL,gBAAcM,UAAQ;AAAA,QAACC,OAAOb;AAAAA,QAAmB,IAAAC,WAAA;AAAA,iBAC/CA,SAAAA;AAAAA,QAAU;AAAA,MAAA,CAAA;AAAA,IAAA;AAAA,EAAA,CAAA;AAInB;AAEO,SAASa,eAGd;AAAA,EAAEd;AAAAA,EAAQ,GAAGE;AAAwC,GAAG;AACxD,SAAAS,MAAAA,gBACGZ,uBAAqBgB,iBAAA;AAAA,IAACf;AAAAA,EAAAA,GAAoBE,MAAI;AAAA,IAAAD,UAC5CA,MAAAU,sBAAOK,QAAAA,SAAO,CAAA,CAAA;AAAA,EAAA,CAAG,CAAA;AAGxB;;;"}
+{"version":3,"file":"RouterProvider.cjs","sources":["../../src/RouterProvider.tsx"],"sourcesContent":["import { routerContext } from './routerContext'\nimport { SafeFragment } from './SafeFragment'\nimport { Matches } from './Matches'\nimport type {\n  AnyRouter,\n  RegisteredRouter,\n  RouterOptions,\n} from '@tanstack/router-core'\nimport type * as Solid from 'solid-js'\n\nexport function RouterContextProvider<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TDehydrated extends Record<string, any> = Record<string, any>,\n>({\n  router,\n  children,\n  ...rest\n}: RouterProps<TRouter, TDehydrated> & {\n  children: () => Solid.JSX.Element\n}) {\n  // Allow the router to update options on the router instance\n  router.update({\n    ...router.options,\n    ...rest,\n    context: {\n      ...router.options.context,\n      ...rest.context,\n    },\n  })\n\n  const OptionalWrapper = router.options.Wrap || SafeFragment\n\n  return (\n    <OptionalWrapper>\n      <routerContext.Provider value={router as AnyRouter}>\n        {children()}\n      </routerContext.Provider>\n    </OptionalWrapper>\n  )\n}\n\nexport function RouterProvider<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TDehydrated extends Record<string, any> = Record<string, any>,\n>({ router, ...rest }: RouterProps<TRouter, TDehydrated>) {\n  return (\n    <RouterContextProvider router={router} {...rest}>\n      {() => <Matches />}\n    </RouterContextProvider>\n  )\n}\n\nexport type RouterProps<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TDehydrated extends Record<string, any> = Record<string, any>,\n> = Omit<\n  RouterOptions<\n    TRouter['routeTree'],\n    NonNullable<TRouter['options']['trailingSlash']>,\n    false,\n    TRouter['history'],\n    TDehydrated\n  >,\n  'context'\n> & {\n  router: TRouter\n  context?: Partial<\n    RouterOptions<\n      TRouter['routeTree'],\n      NonNullable<TRouter['options']['trailingSlash']>,\n      false,\n      TRouter['history'],\n      TDehydrated\n    >['context']\n  >\n}\n"],"names":["RouterContextProvider","router","children","rest","update","options","context","OptionalWrapper","Wrap","SafeFragment","_$createComponent","routerContext","Provider","value","RouterProvider","_$mergeProps","Matches"],"mappings":";;;;;;AAUO,SAASA,sBAGd;AAAA,EACAC;AAAAA,EACAC;AAAAA,EACA,GAAGC;AAGL,GAAG;AAEDF,SAAOG,OAAO;AAAA,IACZ,GAAGH,OAAOI;AAAAA,IACV,GAAGF;AAAAA,IACHG,SAAS;AAAA,MACP,GAAGL,OAAOI,QAAQC;AAAAA,MAClB,GAAGH,KAAKG;AAAAA,IAAAA;AAAAA,EACV,CACD;AAED,QAAMC,kBAAkBN,OAAOI,QAAQG,QAAQC,aAAAA;AAE/C,SAAAC,MAAAA,gBACGH,iBAAe;AAAA,IAAA,IAAAL,WAAA;AAAA,aAAAQ,MAAAA,gBACbC,cAAAA,cAAcC,UAAQ;AAAA,QAACC,OAAOZ;AAAAA,QAAmB,IAAAC,WAAA;AAAA,iBAC/CA,SAAAA;AAAAA,QAAU;AAAA,MAAA,CAAA;AAAA,IAAA;AAAA,EAAA,CAAA;AAInB;AAEO,SAASY,eAGd;AAAA,EAAEb;AAAAA,EAAQ,GAAGE;AAAwC,GAAG;AACxD,SAAAO,MAAAA,gBACGV,uBAAqBe,iBAAA;AAAA,IAACd;AAAAA,EAAAA,GAAoBE,MAAI;AAAA,IAAAD,UAC5CA,MAAAQ,sBAAOM,QAAAA,SAAO,CAAA,CAAA;AAAA,EAAA,CAAG,CAAA;AAGxB;;;"}

package/dist/cjs/index.cjs

@@ -9,7 +9,6 @@ const fileRoute = require("./fileRoute.cjs");
 const lazyRouteComponent = require("./lazyRouteComponent.cjs");
 const link = require("./link.cjs");
 const Matches = require("./Matches.cjs");
-const matchContext = require("./matchContext.cjs");
 const Match = require("./Match.cjs");
 const useMatch = require("./useMatch.cjs");
 const useLoaderDeps = require("./useLoaderDeps.cjs");
@@ -22,13 +21,11 @@ const useBlocker = require("./useBlocker.cjs");
 const useNavigate = require("./useNavigate.cjs");
 const useParams = require("./useParams.cjs");
 const useSearch = require("./useSearch.cjs");
-const routerContext = require("./routerContext.cjs");
 const useRouteContext = require("./useRouteContext.cjs");
 const useRouter = require("./useRouter.cjs");
 const useRouterState = require("./useRouterState.cjs");
 const useLocation = require("./useLocation.cjs");
 const useCanGoBack = require("./useCanGoBack.cjs");
-const utils = require("./utils.cjs");
 const notFound = require("./not-found.cjs");
 const ScriptOnce = require("./ScriptOnce.cjs");
 const Asset = require("./Asset.cjs");
@@ -39,26 +36,14 @@ Object.defineProperty(exports, "DEFAULT_PROTOCOL_ALLOWLIST", {
   enumerable: true,
   get: () => routerCore.DEFAULT_PROTOCOL_ALLOWLIST
 });
-Object.defineProperty(exports, "PathParamError", {
-  enumerable: true,
-  get: () => routerCore.PathParamError
-});
 Object.defineProperty(exports, "SearchParamError", {
   enumerable: true,
   get: () => routerCore.SearchParamError
 });
-Object.defineProperty(exports, "TSR_DEFERRED_PROMISE", {
-  enumerable: true,
-  get: () => routerCore.TSR_DEFERRED_PROMISE
-});
 Object.defineProperty(exports, "cleanPath", {
   enumerable: true,
   get: () => routerCore.cleanPath
 });
-Object.defineProperty(exports, "componentTypes", {
-  enumerable: true,
-  get: () => routerCore.componentTypes
-});
 Object.defineProperty(exports, "composeRewrites", {
   enumerable: true,
   get: () => routerCore.composeRewrites
@@ -79,10 +64,6 @@ Object.defineProperty(exports, "defaultParseSearch", {
   enumerable: true,
   get: () => routerCore.defaultParseSearch
 });
-Object.defineProperty(exports, "defaultSerializeError", {
-  enumerable: true,
-  get: () => routerCore.defaultSerializeError
-});
 Object.defineProperty(exports, "defaultStringifySearch", {
   enumerable: true,
   get: () => routerCore.defaultStringifySearch
@@ -95,10 +76,6 @@ Object.defineProperty(exports, "functionalUpdate", {
   enumerable: true,
   get: () => routerCore.functionalUpdate
 });
-Object.defineProperty(exports, "getInitialRouterState", {
-  enumerable: true,
-  get: () => routerCore.getInitialRouterState
-});
 Object.defineProperty(exports, "interpolatePath", {
   enumerable: true,
   get: () => routerCore.interpolatePath
@@ -218,7 +195,6 @@ exports.useChildMatches = Matches.useChildMatches;
 exports.useMatchRoute = Matches.useMatchRoute;
 exports.useMatches = Matches.useMatches;
 exports.useParentMatches = Matches.useParentMatches;
-exports.matchContext = matchContext.matchContext;
 exports.Match = Match.Match;
 exports.Outlet = Match.Outlet;
 exports.useMatch = useMatch.useMatch;
@@ -246,13 +222,11 @@ exports.Navigate = useNavigate.Navigate;
 exports.useNavigate = useNavigate.useNavigate;
 exports.useParams = useParams.useParams;
 exports.useSearch = useSearch.useSearch;
-exports.getRouterContext = routerContext.getRouterContext;
 exports.useRouteContext = useRouteContext.useRouteContext;
 exports.useRouter = useRouter.useRouter;
 exports.useRouterState = useRouterState.useRouterState;
 exports.useLocation = useLocation.useLocation;
 exports.useCanGoBack = useCanGoBack.useCanGoBack;
-exports.useLayoutEffect = utils.useLayoutEffect;
 exports.CatchNotFound = notFound.CatchNotFound;
 exports.DefaultGlobalNotFound = notFound.DefaultGlobalNotFound;
 exports.ScriptOnce = ScriptOnce.ScriptOnce;

package/dist/cjs/index.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.cjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"index.cjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/dist/cjs/index.d.cts

@@ -1,4 +1,4 @@
-export { defer, TSR_DEFERRED_PROMISE, isMatch, joinPaths, cleanPath, trimPathLeft, trimPathRight, trimPath, resolvePath, interpolatePath, rootRouteId, defaultSerializeError, defaultParseSearch, defaultStringifySearch, parseSearchWith, stringifySearchWith, functionalUpdate, replaceEqualDeep, isPlainObject, isPlainArray, deepEqual, createControlledPromise, retainSearchParams, stripSearchParams, createSerializationAdapter, } from '@tanstack/router-core';
+export { defer, isMatch, joinPaths, cleanPath, trimPathLeft, trimPathRight, trimPath, resolvePath, interpolatePath, rootRouteId, defaultParseSearch, defaultStringifySearch, parseSearchWith, stringifySearchWith, functionalUpdate, replaceEqualDeep, isPlainObject, isPlainArray, deepEqual, createControlledPromise, retainSearchParams, stripSearchParams, createSerializationAdapter, } from '@tanstack/router-core';
 export type { DeferredPromiseState, DeferredPromise, ParsedLocation, RemoveTrailingSlashes, RemoveLeadingSlashes, ActiveOptions, ResolveRelativePath, RootRouteId, AnyPathParams, ResolveParams, ResolveOptionalParams, ResolveRequiredParams, SearchSchemaInput, AnyContext, RouteContext, PreloadableObj, RoutePathOptions, StaticDataRouteOption, RoutePathOptionsIntersection, UpdatableStaticRouteOption, MetaDescriptor, RouteLinkEntry, ParseParamsFn, SearchFilter, ResolveId, InferFullSearchSchema, InferFullSearchSchemaInput, ErrorRouteProps, ErrorComponentProps, NotFoundRouteProps, TrimPath, TrimPathLeft, TrimPathRight, StringifyParamsFn, ParamsOptions, InferAllParams, InferAllContext, LooseReturnType, LooseAsyncReturnType, ContextReturnType, ContextAsyncReturnType, ResolveLoaderData, ResolveRouteContext, SearchSerializer, SearchParser, TrailingSlashOption, Manifest, RouterManagedTag, ControlledPromise, Constrain, Expand, MergeAll, Assign, IntersectAssign, ResolveValidatorInput, ResolveValidatorOutput, AnyValidator, DefaultValidator, ValidatorFn, AnySchema, AnyValidatorAdapter, AnyValidatorFn, AnyValidatorObj, ResolveValidatorInputFn, ResolveValidatorOutputFn, ResolveSearchValidatorInput, ResolveSearchValidatorInputFn, Validator, ValidatorAdapter, ValidatorObj, NavigateFn, BuildLocationFn, InferDescendantToPaths, RelativeToPath, RelativeToParentPath, RelativeToCurrentPath, Register, AbsoluteToPath, RelativeToPathAutoComplete, NavigateOptions, ToOptions, ToMaskOptions, ToSubOptions, ResolveRoute, SearchParamOptions, PathParamOptions, ToPathOption, LinkOptions, MakeOptionalPathParams, AnyRouterWithContext, ParseRoute, RoutesById, RouteById, RouteIds, RoutesByPath, RouteByPath, RoutePaths, FullSearchSchema, AllParams, AllLoaderData, FullSearchSchemaInput, AllContext, CommitLocationOptions, MatchLocation, ResolveFullSearchSchema, ResolveFullSearchSchemaInput, ResolveAllParamsFromParent, RouteContextParameter, BeforeLoadContextParameter, ResolveAllContext, FullSearchSchemaOption, MakeRemountDepsOptionsUnion, RemountDepsOptions, FileRouteTypes, FileRoutesByPath, UseNavigateResult, AnyRedirect, Redirect, RedirectOptions, ResolvedRedirect, RouteOptions, FileBaseRouteOptions, BaseRouteOptions, UpdatableRouteOptions, RouteLoaderFn, LoaderFnContext, MakeRouteMatch, MakeRouteMatchUnion, RouteMatch, AnyRouteMatch, RouteContextFn, RouteContextOptions, BeforeLoadContextOptions, ContextOptions, RootRouteOptions, AnyRouteWithContext, LazyRouteOptions, AnyRoute, ResolveFullPath, RouteConstraints, RouterState, ListenerFn, BuildNextOptions, AnyRouter, RegisteredRouter, RouterEvents, RouterEvent, RouterListener, MatchRouteOptions, RouteMask, RouterContextOptions, RouterOptions, RouterConstructorOptions, ControllablePromise, InjectedHtmlEntry, CreateFileRoute, CreateLazyFileRoute, AnySerializationAdapter, SerializationAdapter, SerializableExtensions, } from '@tanstack/router-core';
 export { createHistory, createBrowserHistory, createHashHistory, createMemoryHistory, } from '@tanstack/history';
 export type { BlockerFn, HistoryLocation, RouterHistory, ParsedPath, HistoryState, } from '@tanstack/history';
@@ -13,7 +13,6 @@ export { useLinkProps, createLink, Link, linkOptions } from './link.cjs';
 export type { UseLinkPropsOptions, ActiveLinkOptions, LinkProps, LinkComponent, LinkComponentProps, CreateLinkProps, } from './link.cjs';
 export { Matches, useMatchRoute, MatchRoute, useMatches, useParentMatches, useChildMatches, } from './Matches.cjs';
 export type { UseMatchRouteOptions, MakeMatchRouteOptions } from './Matches.cjs';
-export { matchContext } from './matchContext.cjs';
 export { Match, Outlet } from './Match.cjs';
 export { useMatch } from './useMatch.cjs';
 export { useLoaderDeps } from './useLoaderDeps.cjs';
@@ -22,7 +21,7 @@ export { redirect, isRedirect, DEFAULT_PROTOCOL_ALLOWLIST, } from '@tanstack/rou
 export { RouteApi, getRouteApi, Route, createRoute, RootRoute, rootRouteWithContext, createRootRoute, createRootRouteWithContext, createRouteMask, NotFoundRoute, } from './route.cjs';
 export type { AnyRootRoute, SolidNode, AsyncRouteComponent, RouteComponent, ErrorRouteComponent, NotFoundRouteComponent, } from './route.cjs';
 export { createRouter, Router } from './router.cjs';
-export { componentTypes, lazyFn, SearchParamError, PathParamError, getInitialRouterState, } from '@tanstack/router-core';
+export { lazyFn, SearchParamError } from '@tanstack/router-core';
 export { RouterProvider, RouterContextProvider } from './RouterProvider.cjs';
 export type { RouterProps } from './RouterProvider.cjs';
 export { useElementScrollRestoration, ScrollRestoration, } from './ScrollRestoration.cjs';
@@ -31,13 +30,11 @@ export { useBlocker, Block } from './useBlocker.cjs';
 export { useNavigate, Navigate } from './useNavigate.cjs';
 export { useParams } from './useParams.cjs';
 export { useSearch } from './useSearch.cjs';
-export { getRouterContext, } from './routerContext.cjs';
 export { useRouteContext } from './useRouteContext.cjs';
 export { useRouter } from './useRouter.cjs';
 export { useRouterState } from './useRouterState.cjs';
 export { useLocation } from './useLocation.cjs';
 export { useCanGoBack } from './useCanGoBack.cjs';
-export { useLayoutEffect } from './utils.cjs';
 export { CatchNotFound, DefaultGlobalNotFound } from './not-found.cjs';
 export { notFound, isNotFound } from '@tanstack/router-core';
 export type { NotFoundError } from '@tanstack/router-core';

package/dist/cjs/index.dev.cjs

@@ -9,7 +9,6 @@ const fileRoute = require("./fileRoute.cjs");
 const lazyRouteComponent = require("./lazyRouteComponent.cjs");
 const link = require("./link.cjs");
 const Matches = require("./Matches.cjs");
-const matchContext = require("./matchContext.cjs");
 const Match = require("./Match.cjs");
 const useMatch = require("./useMatch.cjs");
 const useLoaderDeps = require("./useLoaderDeps.cjs");
@@ -22,13 +21,11 @@ const useBlocker = require("./useBlocker.cjs");
 const useNavigate = require("./useNavigate.cjs");
 const useParams = require("./useParams.cjs");
 const useSearch = require("./useSearch.cjs");
-const routerContext = require("./routerContext.cjs");
 const useRouteContext = require("./useRouteContext.cjs");
 const useRouter = require("./useRouter.cjs");
 const useRouterState = require("./useRouterState.cjs");
 const useLocation = require("./useLocation.cjs");
 const useCanGoBack = require("./useCanGoBack.cjs");
-const utils = require("./utils.cjs");
 const notFound = require("./not-found.cjs");
 const ScriptOnce = require("./ScriptOnce.cjs");
 const Asset = require("./Asset.cjs");
@@ -39,26 +36,14 @@ Object.defineProperty(exports, "DEFAULT_PROTOCOL_ALLOWLIST", {
   enumerable: true,
   get: () => routerCore.DEFAULT_PROTOCOL_ALLOWLIST
 });
-Object.defineProperty(exports, "PathParamError", {
-  enumerable: true,
-  get: () => routerCore.PathParamError
-});
 Object.defineProperty(exports, "SearchParamError", {
   enumerable: true,
   get: () => routerCore.SearchParamError
 });
-Object.defineProperty(exports, "TSR_DEFERRED_PROMISE", {
-  enumerable: true,
-  get: () => routerCore.TSR_DEFERRED_PROMISE
-});
 Object.defineProperty(exports, "cleanPath", {
   enumerable: true,
   get: () => routerCore.cleanPath
 });
-Object.defineProperty(exports, "componentTypes", {
-  enumerable: true,
-  get: () => routerCore.componentTypes
-});
 Object.defineProperty(exports, "composeRewrites", {
   enumerable: true,
   get: () => routerCore.composeRewrites
@@ -79,10 +64,6 @@ Object.defineProperty(exports, "defaultParseSearch", {
   enumerable: true,
   get: () => routerCore.defaultParseSearch
 });
-Object.defineProperty(exports, "defaultSerializeError", {
-  enumerable: true,
-  get: () => routerCore.defaultSerializeError
-});
 Object.defineProperty(exports, "defaultStringifySearch", {
   enumerable: true,
   get: () => routerCore.defaultStringifySearch
@@ -95,10 +76,6 @@ Object.defineProperty(exports, "functionalUpdate", {
   enumerable: true,
   get: () => routerCore.functionalUpdate
 });
-Object.defineProperty(exports, "getInitialRouterState", {
-  enumerable: true,
-  get: () => routerCore.getInitialRouterState
-});
 Object.defineProperty(exports, "interpolatePath", {
   enumerable: true,
   get: () => routerCore.interpolatePath
@@ -218,7 +195,6 @@ exports.useChildMatches = Matches.useChildMatches;
 exports.useMatchRoute = Matches.useMatchRoute;
 exports.useMatches = Matches.useMatches;
 exports.useParentMatches = Matches.useParentMatches;
-exports.matchContext = matchContext.matchContext;
 exports.Match = Match.Match;
 exports.Outlet = Match.Outlet;
 exports.useMatch = useMatch.useMatch;
@@ -246,13 +222,11 @@ exports.Navigate = useNavigate.Navigate;
 exports.useNavigate = useNavigate.useNavigate;
 exports.useParams = useParams.useParams;
 exports.useSearch = useSearch.useSearch;
-exports.getRouterContext = routerContext.getRouterContext;
 exports.useRouteContext = useRouteContext.useRouteContext;
 exports.useRouter = useRouter.useRouter;
 exports.useRouterState = useRouterState.useRouterState;
 exports.useLocation = useLocation.useLocation;
 exports.useCanGoBack = useCanGoBack.useCanGoBack;
-exports.useLayoutEffect = utils.useLayoutEffect;
 exports.CatchNotFound = notFound.CatchNotFound;
 exports.DefaultGlobalNotFound = notFound.DefaultGlobalNotFound;
 exports.ScriptOnce = ScriptOnce.ScriptOnce;

package/dist/cjs/index.dev.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.dev.cjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"index.dev.cjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/dist/cjs/routerContext.cjs

@@ -19,15 +19,5 @@ function _interopNamespaceDefault(e) {
 }
 const Solid__namespace = /* @__PURE__ */ _interopNamespaceDefault(Solid);
 const routerContext = Solid__namespace.createContext(null);
-function getRouterContext() {
-  if (typeof document === "undefined") {
-    return routerContext;
-  }
-  if (window.__TSR_ROUTER_CONTEXT__) {
-    return window.__TSR_ROUTER_CONTEXT__;
-  }
-  window.__TSR_ROUTER_CONTEXT__ = routerContext;
-  return routerContext;
-}
-exports.getRouterContext = getRouterContext;
+exports.routerContext = routerContext;
 //# sourceMappingURL=routerContext.cjs.map

package/dist/cjs/routerContext.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"routerContext.cjs","sources":["../../src/routerContext.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport type { AnyRouter } from '@tanstack/router-core'\n\ndeclare global {\n  interface Window {\n    __TSR_ROUTER_CONTEXT__?: Solid.Context<AnyRouter>\n  }\n}\n\nconst routerContext = Solid.createContext<AnyRouter>(\n  null as unknown as AnyRouter,\n)\n\nexport function getRouterContext() {\n  if (typeof document === 'undefined') {\n    return routerContext\n  }\n\n  if (window.__TSR_ROUTER_CONTEXT__) {\n    return window.__TSR_ROUTER_CONTEXT__\n  }\n\n  window.__TSR_ROUTER_CONTEXT__ = routerContext as any\n\n  return routerContext\n}\n"],"names":["routerContext","Solid","createContext","getRouterContext","document","window","__TSR_ROUTER_CONTEXT__"],"mappings":";;;;;;;;;;;;;;;;;;;;AASA,MAAMA,gBAAgBC,iBAAMC,cAC1B,IACF;AAEO,SAASC,mBAAmB;AACjC,MAAI,OAAOC,aAAa,aAAa;AACnC,WAAOJ;AAAAA,EACT;AAEA,MAAIK,OAAOC,wBAAwB;AACjC,WAAOD,OAAOC;AAAAA,EAChB;AAEAD,SAAOC,yBAAyBN;AAEhC,SAAOA;AACT;;"}
+{"version":3,"file":"routerContext.cjs","sources":["../../src/routerContext.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport type { AnyRouter } from '@tanstack/router-core'\n\nexport const routerContext = Solid.createContext<AnyRouter>(\n  null as unknown as AnyRouter,\n)\n"],"names":["routerContext","Solid","createContext"],"mappings":";;;;;;;;;;;;;;;;;;;;AAGO,MAAMA,gBAAgBC,iBAAMC,cACjC,IACF;;"}

package/dist/cjs/routerContext.d.cts

@@ -1,8 +1,3 @@
 import { AnyRouter } from '@tanstack/router-core';
 import * as Solid from 'solid-js';
-declare global {
-    interface Window {
-        __TSR_ROUTER_CONTEXT__?: Solid.Context<AnyRouter>;
-    }
-}
-export declare function getRouterContext(): Solid.Context<AnyRouter>;
+export declare const routerContext: Solid.Context<AnyRouter>;

package/dist/cjs/useRouter.cjs

@@ -21,7 +21,7 @@ function _interopNamespaceDefault(e) {
 }
 const Solid__namespace = /* @__PURE__ */ _interopNamespaceDefault(Solid);
 function useRouter(opts) {
-  const value = Solid__namespace.useContext(routerContext.getRouterContext());
+  const value = Solid__namespace.useContext(routerContext.routerContext);
   warning(!((opts?.warn ?? true) && !value), "useRouter must be used inside a <RouterProvider> component!");
   return value;
 }

package/dist/cjs/useRouter.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"useRouter.cjs","sources":["../../src/useRouter.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport warning from 'tiny-warning'\nimport { getRouterContext } from './routerContext'\nimport type { AnyRouter, RegisteredRouter } from '@tanstack/router-core'\n\nexport function useRouter<TRouter extends AnyRouter = RegisteredRouter>(opts?: {\n  warn?: boolean\n}): TRouter {\n  const value = Solid.useContext(getRouterContext() as any)\n  warning(\n    !((opts?.warn ?? true) && !value),\n    'useRouter must be used inside a <RouterProvider> component!',\n  )\n  return value as any\n}\n"],"names":["useRouter","opts","value","Solid","useContext","getRouterContext","warning","warn"],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAKO,SAASA,UAAwDC,MAE5D;AACV,QAAMC,QAAQC,iBAAMC,WAAWC,cAAAA,iBAAAA,CAAyB;AACxDC,UACE,GAAGL,MAAMM,QAAQ,SAAS,CAACL,QAC3B,6DACF;AACA,SAAOA;AACT;;"}
+{"version":3,"file":"useRouter.cjs","sources":["../../src/useRouter.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport warning from 'tiny-warning'\nimport { routerContext } from './routerContext'\nimport type { AnyRouter, RegisteredRouter } from '@tanstack/router-core'\n\nexport function useRouter<TRouter extends AnyRouter = RegisteredRouter>(opts?: {\n  warn?: boolean\n}): TRouter {\n  const value = Solid.useContext(routerContext as any)\n  warning(\n    !((opts?.warn ?? true) && !value),\n    'useRouter must be used inside a <RouterProvider> component!',\n  )\n  return value as any\n}\n"],"names":["useRouter","opts","value","Solid","useContext","routerContext","warning","warn"],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAKO,SAASA,UAAwDC,MAE5D;AACV,QAAMC,QAAQC,iBAAMC,WAAWC,2BAAoB;AACnDC,UACE,GAAGL,MAAMM,QAAQ,SAAS,CAACL,QAC3B,6DACF;AACA,SAAOA;AACT;;"}

package/dist/cjs/utils.cjs

@@ -18,7 +18,6 @@ function _interopNamespaceDefault(e) {
   return Object.freeze(n);
 }
 const Solid__namespace = /* @__PURE__ */ _interopNamespaceDefault(Solid);
-const useLayoutEffect = typeof window !== "undefined" ? Solid__namespace.createRenderEffect : Solid__namespace.createEffect;
 const usePrevious = (fn) => {
   return Solid__namespace.createMemo(
     (prev = {
@@ -53,6 +52,5 @@ function useIntersectionObserver(ref, callback, intersectionObserverOptions = {}
   return () => observerRef;
 }
 exports.useIntersectionObserver = useIntersectionObserver;
-exports.useLayoutEffect = useLayoutEffect;
 exports.usePrevious = usePrevious;
 //# sourceMappingURL=utils.cjs.map

package/dist/cjs/utils.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"utils.cjs","sources":["../../src/utils.ts"],"sourcesContent":["import * as Solid from 'solid-js'\n\nexport const useLayoutEffect =\n  typeof window !== 'undefined' ? Solid.createRenderEffect : Solid.createEffect\n\nexport const usePrevious = (fn: () => boolean) => {\n  return Solid.createMemo(\n    (\n      prev: { current: boolean | null; previous: boolean | null } = {\n        current: null,\n        previous: null,\n      },\n    ) => {\n      const current = fn()\n\n      if (prev.current !== current) {\n        prev.previous = prev.current\n        prev.current = current\n      }\n\n      return prev\n    },\n  )\n}\n\n/**\n * React hook to wrap `IntersectionObserver`.\n *\n * This hook will create an `IntersectionObserver` and observe the ref passed to it.\n *\n * When the intersection changes, the callback will be called with the `IntersectionObserverEntry`.\n *\n * @param ref - The ref to observe\n * @param intersectionObserverOptions - The options to pass to the IntersectionObserver\n * @param options - The options to pass to the hook\n * @param callback - The callback to call when the intersection changes\n * @returns The IntersectionObserver instance\n * @example\n * ```tsx\n * const MyComponent = () => {\n * const ref = React.useRef<HTMLDivElement>(null)\n * useIntersectionObserver(\n *  ref,\n *  (entry) => { doSomething(entry) },\n *  { rootMargin: '10px' },\n *  { disabled: false }\n * )\n * return <div ref={ref} />\n * ```\n */\nexport function useIntersectionObserver<T extends Element>(\n  ref: Solid.Accessor<T | null>,\n  callback: (entry: IntersectionObserverEntry | undefined) => void,\n  intersectionObserverOptions: IntersectionObserverInit = {},\n  options: { disabled?: boolean } = {},\n): Solid.Accessor<IntersectionObserver | null> {\n  const isIntersectionObserverAvailable =\n    typeof IntersectionObserver === 'function'\n  let observerRef: IntersectionObserver | null = null\n\n  Solid.createEffect(() => {\n    const r = ref()\n    if (!r || !isIntersectionObserverAvailable || options.disabled) {\n      return\n    }\n\n    observerRef = new IntersectionObserver(([entry]) => {\n      callback(entry)\n    }, intersectionObserverOptions)\n\n    observerRef.observe(r)\n\n    Solid.onCleanup(() => {\n      observerRef?.disconnect()\n    })\n  })\n\n  return () => observerRef\n}\n"],"names":["Solid"],"mappings":";;;;;;;;;;;;;;;;;;;;AAEO,MAAM,kBACX,OAAO,WAAW,cAAcA,iBAAM,qBAAqBA,iBAAM;AAE5D,MAAM,cAAc,CAAC,OAAsB;AAChD,SAAOA,iBAAM;AAAA,IACX,CACE,OAA8D;AAAA,MAC5D,SAAS;AAAA,MACT,UAAU;AAAA,IAAA,MAET;AACH,YAAM,UAAU,GAAA;AAEhB,UAAI,KAAK,YAAY,SAAS;AAC5B,aAAK,WAAW,KAAK;AACrB,aAAK,UAAU;AAAA,MACjB;AAEA,aAAO;AAAA,IACT;AAAA,EAAA;AAEJ;AA2BO,SAAS,wBACd,KACA,UACA,8BAAwD,CAAA,GACxD,UAAkC,IACW;AAC7C,QAAM,kCACJ,OAAO,yBAAyB;AAClC,MAAI,cAA2C;AAE/CA,mBAAM,aAAa,MAAM;AACvB,UAAM,IAAI,IAAA;AACV,QAAI,CAAC,KAAK,CAAC,mCAAmC,QAAQ,UAAU;AAC9D;AAAA,IACF;AAEA,kBAAc,IAAI,qBAAqB,CAAC,CAAC,KAAK,MAAM;AAClD,eAAS,KAAK;AAAA,IAChB,GAAG,2BAA2B;AAE9B,gBAAY,QAAQ,CAAC;AAErBA,qBAAM,UAAU,MAAM;AACpB,mBAAa,WAAA;AAAA,IACf,CAAC;AAAA,EACH,CAAC;AAED,SAAO,MAAM;AACf;;;;"}
+{"version":3,"file":"utils.cjs","sources":["../../src/utils.ts"],"sourcesContent":["import * as Solid from 'solid-js'\n\nexport const usePrevious = (fn: () => boolean) => {\n  return Solid.createMemo(\n    (\n      prev: { current: boolean | null; previous: boolean | null } = {\n        current: null,\n        previous: null,\n      },\n    ) => {\n      const current = fn()\n\n      if (prev.current !== current) {\n        prev.previous = prev.current\n        prev.current = current\n      }\n\n      return prev\n    },\n  )\n}\n\n/**\n * React hook to wrap `IntersectionObserver`.\n *\n * This hook will create an `IntersectionObserver` and observe the ref passed to it.\n *\n * When the intersection changes, the callback will be called with the `IntersectionObserverEntry`.\n *\n * @param ref - The ref to observe\n * @param intersectionObserverOptions - The options to pass to the IntersectionObserver\n * @param options - The options to pass to the hook\n * @param callback - The callback to call when the intersection changes\n * @returns The IntersectionObserver instance\n * @example\n * ```tsx\n * const MyComponent = () => {\n * const ref = React.useRef<HTMLDivElement>(null)\n * useIntersectionObserver(\n *  ref,\n *  (entry) => { doSomething(entry) },\n *  { rootMargin: '10px' },\n *  { disabled: false }\n * )\n * return <div ref={ref} />\n * ```\n */\nexport function useIntersectionObserver<T extends Element>(\n  ref: Solid.Accessor<T | null>,\n  callback: (entry: IntersectionObserverEntry | undefined) => void,\n  intersectionObserverOptions: IntersectionObserverInit = {},\n  options: { disabled?: boolean } = {},\n): Solid.Accessor<IntersectionObserver | null> {\n  const isIntersectionObserverAvailable =\n    typeof IntersectionObserver === 'function'\n  let observerRef: IntersectionObserver | null = null\n\n  Solid.createEffect(() => {\n    const r = ref()\n    if (!r || !isIntersectionObserverAvailable || options.disabled) {\n      return\n    }\n\n    observerRef = new IntersectionObserver(([entry]) => {\n      callback(entry)\n    }, intersectionObserverOptions)\n\n    observerRef.observe(r)\n\n    Solid.onCleanup(() => {\n      observerRef?.disconnect()\n    })\n  })\n\n  return () => observerRef\n}\n"],"names":["Solid"],"mappings":";;;;;;;;;;;;;;;;;;;;AAEO,MAAM,cAAc,CAAC,OAAsB;AAChD,SAAOA,iBAAM;AAAA,IACX,CACE,OAA8D;AAAA,MAC5D,SAAS;AAAA,MACT,UAAU;AAAA,IAAA,MAET;AACH,YAAM,UAAU,GAAA;AAEhB,UAAI,KAAK,YAAY,SAAS;AAC5B,aAAK,WAAW,KAAK;AACrB,aAAK,UAAU;AAAA,MACjB;AAEA,aAAO;AAAA,IACT;AAAA,EAAA;AAEJ;AA2BO,SAAS,wBACd,KACA,UACA,8BAAwD,CAAA,GACxD,UAAkC,IACW;AAC7C,QAAM,kCACJ,OAAO,yBAAyB;AAClC,MAAI,cAA2C;AAE/CA,mBAAM,aAAa,MAAM;AACvB,UAAM,IAAI,IAAA;AACV,QAAI,CAAC,KAAK,CAAC,mCAAmC,QAAQ,UAAU;AAC9D;AAAA,IACF;AAEA,kBAAc,IAAI,qBAAqB,CAAC,CAAC,KAAK,MAAM;AAClD,eAAS,KAAK;AAAA,IAChB,GAAG,2BAA2B;AAE9B,gBAAY,QAAQ,CAAC;AAErBA,qBAAM,UAAU,MAAM;AACpB,mBAAa,WAAA;AAAA,IACf,CAAC;AAAA,EACH,CAAC;AAED,SAAO,MAAM;AACf;;;"}

package/dist/cjs/utils.d.cts

@@ -1,5 +1,4 @@
 import * as Solid from 'solid-js';
-export declare const useLayoutEffect: typeof Solid.createRenderEffect;
 export declare const usePrevious: (fn: () => boolean) => Solid.Accessor<{
     current: boolean | null;
     previous: boolean | null;

package/dist/esm/RouterProvider.js

@@ -1,5 +1,5 @@
 import { createComponent, mergeProps } from "solid-js/web";
-import { getRouterContext } from "./routerContext.js";
+import { routerContext } from "./routerContext.js";
 import { SafeFragment } from "./SafeFragment.js";
 import { Matches } from "./Matches.js";
 function RouterContextProvider({
@@ -15,7 +15,6 @@ function RouterContextProvider({
       ...rest.context
     }
   });
-  const routerContext = getRouterContext();
   const OptionalWrapper = router.options.Wrap || SafeFragment;
   return createComponent(OptionalWrapper, {
     get children() {

package/dist/esm/RouterProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"RouterProvider.js","sources":["../../src/RouterProvider.tsx"],"sourcesContent":["import { getRouterContext } from './routerContext'\nimport { SafeFragment } from './SafeFragment'\nimport { Matches } from './Matches'\nimport type {\n  AnyRouter,\n  RegisteredRouter,\n  RouterOptions,\n} from '@tanstack/router-core'\nimport type * as Solid from 'solid-js'\n\nexport function RouterContextProvider<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TDehydrated extends Record<string, any> = Record<string, any>,\n>({\n  router,\n  children,\n  ...rest\n}: RouterProps<TRouter, TDehydrated> & {\n  children: () => Solid.JSX.Element\n}) {\n  // Allow the router to update options on the router instance\n  router.update({\n    ...router.options,\n    ...rest,\n    context: {\n      ...router.options.context,\n      ...rest.context,\n    },\n  })\n\n  const routerContext = getRouterContext()\n\n  const OptionalWrapper = router.options.Wrap || SafeFragment\n\n  return (\n    <OptionalWrapper>\n      <routerContext.Provider value={router as AnyRouter}>\n        {children()}\n      </routerContext.Provider>\n    </OptionalWrapper>\n  )\n}\n\nexport function RouterProvider<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TDehydrated extends Record<string, any> = Record<string, any>,\n>({ router, ...rest }: RouterProps<TRouter, TDehydrated>) {\n  return (\n    <RouterContextProvider router={router} {...rest}>\n      {() => <Matches />}\n    </RouterContextProvider>\n  )\n}\n\nexport type RouterProps<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TDehydrated extends Record<string, any> = Record<string, any>,\n> = Omit<\n  RouterOptions<\n    TRouter['routeTree'],\n    NonNullable<TRouter['options']['trailingSlash']>,\n    false,\n    TRouter['history'],\n    TDehydrated\n  >,\n  'context'\n> & {\n  router: TRouter\n  context?: Partial<\n    RouterOptions<\n      TRouter['routeTree'],\n      NonNullable<TRouter['options']['trailingSlash']>,\n      false,\n      TRouter['history'],\n      TDehydrated\n    >['context']\n  >\n}\n"],"names":["RouterContextProvider","router","children","rest","update","options","context","routerContext","getRouterContext","OptionalWrapper","Wrap","SafeFragment","_$createComponent","Provider","value","RouterProvider","_$mergeProps","Matches"],"mappings":";;;;AAUO,SAASA,sBAGd;AAAA,EACAC;AAAAA,EACAC;AAAAA,EACA,GAAGC;AAGL,GAAG;AAEDF,SAAOG,OAAO;AAAA,IACZ,GAAGH,OAAOI;AAAAA,IACV,GAAGF;AAAAA,IACHG,SAAS;AAAA,MACP,GAAGL,OAAOI,QAAQC;AAAAA,MAClB,GAAGH,KAAKG;AAAAA,IAAAA;AAAAA,EACV,CACD;AAED,QAAMC,gBAAgBC,iBAAAA;AAEtB,QAAMC,kBAAkBR,OAAOI,QAAQK,QAAQC;AAE/C,SAAAC,gBACGH,iBAAe;AAAA,IAAA,IAAAP,WAAA;AAAA,aAAAU,gBACbL,cAAcM,UAAQ;AAAA,QAACC,OAAOb;AAAAA,QAAmB,IAAAC,WAAA;AAAA,iBAC/CA,SAAAA;AAAAA,QAAU;AAAA,MAAA,CAAA;AAAA,IAAA;AAAA,EAAA,CAAA;AAInB;AAEO,SAASa,eAGd;AAAA,EAAEd;AAAAA,EAAQ,GAAGE;AAAwC,GAAG;AACxD,SAAAS,gBACGZ,uBAAqBgB,WAAA;AAAA,IAACf;AAAAA,EAAAA,GAAoBE,MAAI;AAAA,IAAAD,UAC5CA,MAAAU,gBAAOK,SAAO,CAAA,CAAA;AAAA,EAAA,CAAG,CAAA;AAGxB;"}
+{"version":3,"file":"RouterProvider.js","sources":["../../src/RouterProvider.tsx"],"sourcesContent":["import { routerContext } from './routerContext'\nimport { SafeFragment } from './SafeFragment'\nimport { Matches } from './Matches'\nimport type {\n  AnyRouter,\n  RegisteredRouter,\n  RouterOptions,\n} from '@tanstack/router-core'\nimport type * as Solid from 'solid-js'\n\nexport function RouterContextProvider<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TDehydrated extends Record<string, any> = Record<string, any>,\n>({\n  router,\n  children,\n  ...rest\n}: RouterProps<TRouter, TDehydrated> & {\n  children: () => Solid.JSX.Element\n}) {\n  // Allow the router to update options on the router instance\n  router.update({\n    ...router.options,\n    ...rest,\n    context: {\n      ...router.options.context,\n      ...rest.context,\n    },\n  })\n\n  const OptionalWrapper = router.options.Wrap || SafeFragment\n\n  return (\n    <OptionalWrapper>\n      <routerContext.Provider value={router as AnyRouter}>\n        {children()}\n      </routerContext.Provider>\n    </OptionalWrapper>\n  )\n}\n\nexport function RouterProvider<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TDehydrated extends Record<string, any> = Record<string, any>,\n>({ router, ...rest }: RouterProps<TRouter, TDehydrated>) {\n  return (\n    <RouterContextProvider router={router} {...rest}>\n      {() => <Matches />}\n    </RouterContextProvider>\n  )\n}\n\nexport type RouterProps<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TDehydrated extends Record<string, any> = Record<string, any>,\n> = Omit<\n  RouterOptions<\n    TRouter['routeTree'],\n    NonNullable<TRouter['options']['trailingSlash']>,\n    false,\n    TRouter['history'],\n    TDehydrated\n  >,\n  'context'\n> & {\n  router: TRouter\n  context?: Partial<\n    RouterOptions<\n      TRouter['routeTree'],\n      NonNullable<TRouter['options']['trailingSlash']>,\n      false,\n      TRouter['history'],\n      TDehydrated\n    >['context']\n  >\n}\n"],"names":["RouterContextProvider","router","children","rest","update","options","context","OptionalWrapper","Wrap","SafeFragment","_$createComponent","routerContext","Provider","value","RouterProvider","_$mergeProps","Matches"],"mappings":";;;;AAUO,SAASA,sBAGd;AAAA,EACAC;AAAAA,EACAC;AAAAA,EACA,GAAGC;AAGL,GAAG;AAEDF,SAAOG,OAAO;AAAA,IACZ,GAAGH,OAAOI;AAAAA,IACV,GAAGF;AAAAA,IACHG,SAAS;AAAA,MACP,GAAGL,OAAOI,QAAQC;AAAAA,MAClB,GAAGH,KAAKG;AAAAA,IAAAA;AAAAA,EACV,CACD;AAED,QAAMC,kBAAkBN,OAAOI,QAAQG,QAAQC;AAE/C,SAAAC,gBACGH,iBAAe;AAAA,IAAA,IAAAL,WAAA;AAAA,aAAAQ,gBACbC,cAAcC,UAAQ;AAAA,QAACC,OAAOZ;AAAAA,QAAmB,IAAAC,WAAA;AAAA,iBAC/CA,SAAAA;AAAAA,QAAU;AAAA,MAAA,CAAA;AAAA,IAAA;AAAA,EAAA,CAAA;AAInB;AAEO,SAASY,eAGd;AAAA,EAAEb;AAAAA,EAAQ,GAAGE;AAAwC,GAAG;AACxD,SAAAO,gBACGV,uBAAqBe,WAAA;AAAA,IAACd;AAAAA,EAAAA,GAAoBE,MAAI;AAAA,IAAAD,UAC5CA,MAAAQ,gBAAOM,SAAO,CAAA,CAAA;AAAA,EAAA,CAAG,CAAA;AAGxB;"}

package/dist/esm/index.d.ts

@@ -1,4 +1,4 @@
-export { defer, TSR_DEFERRED_PROMISE, isMatch, joinPaths, cleanPath, trimPathLeft, trimPathRight, trimPath, resolvePath, interpolatePath, rootRouteId, defaultSerializeError, defaultParseSearch, defaultStringifySearch, parseSearchWith, stringifySearchWith, functionalUpdate, replaceEqualDeep, isPlainObject, isPlainArray, deepEqual, createControlledPromise, retainSearchParams, stripSearchParams, createSerializationAdapter, } from '@tanstack/router-core';
+export { defer, isMatch, joinPaths, cleanPath, trimPathLeft, trimPathRight, trimPath, resolvePath, interpolatePath, rootRouteId, defaultParseSearch, defaultStringifySearch, parseSearchWith, stringifySearchWith, functionalUpdate, replaceEqualDeep, isPlainObject, isPlainArray, deepEqual, createControlledPromise, retainSearchParams, stripSearchParams, createSerializationAdapter, } from '@tanstack/router-core';
 export type { DeferredPromiseState, DeferredPromise, ParsedLocation, RemoveTrailingSlashes, RemoveLeadingSlashes, ActiveOptions, ResolveRelativePath, RootRouteId, AnyPathParams, ResolveParams, ResolveOptionalParams, ResolveRequiredParams, SearchSchemaInput, AnyContext, RouteContext, PreloadableObj, RoutePathOptions, StaticDataRouteOption, RoutePathOptionsIntersection, UpdatableStaticRouteOption, MetaDescriptor, RouteLinkEntry, ParseParamsFn, SearchFilter, ResolveId, InferFullSearchSchema, InferFullSearchSchemaInput, ErrorRouteProps, ErrorComponentProps, NotFoundRouteProps, TrimPath, TrimPathLeft, TrimPathRight, StringifyParamsFn, ParamsOptions, InferAllParams, InferAllContext, LooseReturnType, LooseAsyncReturnType, ContextReturnType, ContextAsyncReturnType, ResolveLoaderData, ResolveRouteContext, SearchSerializer, SearchParser, TrailingSlashOption, Manifest, RouterManagedTag, ControlledPromise, Constrain, Expand, MergeAll, Assign, IntersectAssign, ResolveValidatorInput, ResolveValidatorOutput, AnyValidator, DefaultValidator, ValidatorFn, AnySchema, AnyValidatorAdapter, AnyValidatorFn, AnyValidatorObj, ResolveValidatorInputFn, ResolveValidatorOutputFn, ResolveSearchValidatorInput, ResolveSearchValidatorInputFn, Validator, ValidatorAdapter, ValidatorObj, NavigateFn, BuildLocationFn, InferDescendantToPaths, RelativeToPath, RelativeToParentPath, RelativeToCurrentPath, Register, AbsoluteToPath, RelativeToPathAutoComplete, NavigateOptions, ToOptions, ToMaskOptions, ToSubOptions, ResolveRoute, SearchParamOptions, PathParamOptions, ToPathOption, LinkOptions, MakeOptionalPathParams, AnyRouterWithContext, ParseRoute, RoutesById, RouteById, RouteIds, RoutesByPath, RouteByPath, RoutePaths, FullSearchSchema, AllParams, AllLoaderData, FullSearchSchemaInput, AllContext, CommitLocationOptions, MatchLocation, ResolveFullSearchSchema, ResolveFullSearchSchemaInput, ResolveAllParamsFromParent, RouteContextParameter, BeforeLoadContextParameter, ResolveAllContext, FullSearchSchemaOption, MakeRemountDepsOptionsUnion, RemountDepsOptions, FileRouteTypes, FileRoutesByPath, UseNavigateResult, AnyRedirect, Redirect, RedirectOptions, ResolvedRedirect, RouteOptions, FileBaseRouteOptions, BaseRouteOptions, UpdatableRouteOptions, RouteLoaderFn, LoaderFnContext, MakeRouteMatch, MakeRouteMatchUnion, RouteMatch, AnyRouteMatch, RouteContextFn, RouteContextOptions, BeforeLoadContextOptions, ContextOptions, RootRouteOptions, AnyRouteWithContext, LazyRouteOptions, AnyRoute, ResolveFullPath, RouteConstraints, RouterState, ListenerFn, BuildNextOptions, AnyRouter, RegisteredRouter, RouterEvents, RouterEvent, RouterListener, MatchRouteOptions, RouteMask, RouterContextOptions, RouterOptions, RouterConstructorOptions, ControllablePromise, InjectedHtmlEntry, CreateFileRoute, CreateLazyFileRoute, AnySerializationAdapter, SerializationAdapter, SerializableExtensions, } from '@tanstack/router-core';
 export { createHistory, createBrowserHistory, createHashHistory, createMemoryHistory, } from '@tanstack/history';
 export type { BlockerFn, HistoryLocation, RouterHistory, ParsedPath, HistoryState, } from '@tanstack/history';
@@ -13,7 +13,6 @@ export { useLinkProps, createLink, Link, linkOptions } from './link.js';
 export type { UseLinkPropsOptions, ActiveLinkOptions, LinkProps, LinkComponent, LinkComponentProps, CreateLinkProps, } from './link.js';
 export { Matches, useMatchRoute, MatchRoute, useMatches, useParentMatches, useChildMatches, } from './Matches.js';
 export type { UseMatchRouteOptions, MakeMatchRouteOptions } from './Matches.js';
-export { matchContext } from './matchContext.js';
 export { Match, Outlet } from './Match.js';
 export { useMatch } from './useMatch.js';
 export { useLoaderDeps } from './useLoaderDeps.js';
@@ -22,7 +21,7 @@ export { redirect, isRedirect, DEFAULT_PROTOCOL_ALLOWLIST, } from '@tanstack/rou
 export { RouteApi, getRouteApi, Route, createRoute, RootRoute, rootRouteWithContext, createRootRoute, createRootRouteWithContext, createRouteMask, NotFoundRoute, } from './route.js';
 export type { AnyRootRoute, SolidNode, AsyncRouteComponent, RouteComponent, ErrorRouteComponent, NotFoundRouteComponent, } from './route.js';
 export { createRouter, Router } from './router.js';
-export { componentTypes, lazyFn, SearchParamError, PathParamError, getInitialRouterState, } from '@tanstack/router-core';
+export { lazyFn, SearchParamError } from '@tanstack/router-core';
 export { RouterProvider, RouterContextProvider } from './RouterProvider.js';
 export type { RouterProps } from './RouterProvider.js';
 export { useElementScrollRestoration, ScrollRestoration, } from './ScrollRestoration.js';
@@ -31,13 +30,11 @@ export { useBlocker, Block } from './useBlocker.js';
 export { useNavigate, Navigate } from './useNavigate.js';
 export { useParams } from './useParams.js';
 export { useSearch } from './useSearch.js';
-export { getRouterContext, } from './routerContext.js';
 export { useRouteContext } from './useRouteContext.js';
 export { useRouter } from './useRouter.js';
 export { useRouterState } from './useRouterState.js';
 export { useLocation } from './useLocation.js';
 export { useCanGoBack } from './useCanGoBack.js';
-export { useLayoutEffect } from './utils.js';
 export { CatchNotFound, DefaultGlobalNotFound } from './not-found.js';
 export { notFound, isNotFound } from '@tanstack/router-core';
 export type { NotFoundError } from '@tanstack/router-core';

package/dist/esm/index.dev.js

@@ -1,4 +1,4 @@
-import { DEFAULT_PROTOCOL_ALLOWLIST, PathParamError, SearchParamError, TSR_DEFERRED_PROMISE, cleanPath, componentTypes, composeRewrites, createControlledPromise, createSerializationAdapter, deepEqual, defaultParseSearch, defaultSerializeError, defaultStringifySearch, defer, functionalUpdate, getInitialRouterState, interpolatePath, isMatch, isNotFound, isPlainArray, isPlainObject, isRedirect, joinPaths, lazyFn, notFound, parseSearchWith, redirect, replaceEqualDeep, resolvePath, retainSearchParams, rootRouteId, stringifySearchWith, stripSearchParams, trimPath, trimPathLeft, trimPathRight } from "@tanstack/router-core";
+import { DEFAULT_PROTOCOL_ALLOWLIST, SearchParamError, cleanPath, composeRewrites, createControlledPromise, createSerializationAdapter, deepEqual, defaultParseSearch, defaultStringifySearch, defer, functionalUpdate, interpolatePath, isMatch, isNotFound, isPlainArray, isPlainObject, isRedirect, joinPaths, lazyFn, notFound, parseSearchWith, redirect, replaceEqualDeep, resolvePath, retainSearchParams, rootRouteId, stringifySearchWith, stripSearchParams, trimPath, trimPathLeft, trimPathRight } from "@tanstack/router-core";
 import { createBrowserHistory, createHashHistory, createHistory, createMemoryHistory } from "@tanstack/history";
 import { Await, useAwaited } from "./awaited.js";
 import { CatchBoundary, ErrorComponent } from "./CatchBoundary.js";
@@ -7,7 +7,6 @@ import { FileRoute, FileRouteLoader, LazyRoute, createFileRoute, createLazyFileR
 import { lazyRouteComponent } from "./lazyRouteComponent.js";
 import { Link, createLink, linkOptions, useLinkProps } from "./link.js";
 import { MatchRoute, Matches, useChildMatches, useMatchRoute, useMatches, useParentMatches } from "./Matches.js";
-import { matchContext } from "./matchContext.js";
 import { Match, Outlet } from "./Match.js";
 import { useMatch } from "./useMatch.js";
 import { useLoaderDeps } from "./useLoaderDeps.js";
@@ -20,13 +19,11 @@ import { Block, useBlocker } from "./useBlocker.js";
 import { Navigate, useNavigate } from "./useNavigate.js";
 import { useParams } from "./useParams.js";
 import { useSearch } from "./useSearch.js";
-import { getRouterContext } from "./routerContext.js";
 import { useRouteContext } from "./useRouteContext.js";
 import { useRouter } from "./useRouter.js";
 import { useRouterState } from "./useRouterState.js";
 import { useLocation } from "./useLocation.js";
 import { useCanGoBack } from "./useCanGoBack.js";
-import { useLayoutEffect } from "./utils.js";
 import { CatchNotFound, DefaultGlobalNotFound } from "./not-found.js";
 import { ScriptOnce } from "./ScriptOnce.js";
 import { Asset } from "./Asset.js";
@@ -54,7 +51,6 @@ export {
   Navigate,
   NotFoundRoute,
   Outlet,
-  PathParamError,
   RootRoute,
   Route,
   RouteApi,
@@ -65,9 +61,7 @@ export {
   Scripts,
   ScrollRestoration,
   SearchParamError,
-  TSR_DEFERRED_PROMISE,
   cleanPath,
-  componentTypes,
   composeRewrites,
   createBrowserHistory,
   createControlledPromise,
@@ -86,13 +80,10 @@ export {
   createSerializationAdapter,
   deepEqual,
   defaultParseSearch,
-  defaultSerializeError,
   defaultStringifySearch,
   defer,
   functionalUpdate,
-  getInitialRouterState,
   getRouteApi,
-  getRouterContext,
   interpolatePath,
   isMatch,
   isNotFound,
@@ -103,7 +94,6 @@ export {
   lazyFn,
   lazyRouteComponent,
   linkOptions,
-  matchContext,
   notFound,
   parseSearchWith,
   redirect,
@@ -123,7 +113,6 @@ export {
   useChildMatches,
   useElementScrollRestoration,
   useHydrated,
-  useLayoutEffect,
   useLinkProps,
   useLoaderData,
   useLoaderDeps,

package/dist/esm/index.dev.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.dev.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"index.dev.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/dist/esm/index.js

@@ -1,4 +1,4 @@
-import { DEFAULT_PROTOCOL_ALLOWLIST, PathParamError, SearchParamError, TSR_DEFERRED_PROMISE, cleanPath, componentTypes, composeRewrites, createControlledPromise, createSerializationAdapter, deepEqual, defaultParseSearch, defaultSerializeError, defaultStringifySearch, defer, functionalUpdate, getInitialRouterState, interpolatePath, isMatch, isNotFound, isPlainArray, isPlainObject, isRedirect, joinPaths, lazyFn, notFound, parseSearchWith, redirect, replaceEqualDeep, resolvePath, retainSearchParams, rootRouteId, stringifySearchWith, stripSearchParams, trimPath, trimPathLeft, trimPathRight } from "@tanstack/router-core";
+import { DEFAULT_PROTOCOL_ALLOWLIST, SearchParamError, cleanPath, composeRewrites, createControlledPromise, createSerializationAdapter, deepEqual, defaultParseSearch, defaultStringifySearch, defer, functionalUpdate, interpolatePath, isMatch, isNotFound, isPlainArray, isPlainObject, isRedirect, joinPaths, lazyFn, notFound, parseSearchWith, redirect, replaceEqualDeep, resolvePath, retainSearchParams, rootRouteId, stringifySearchWith, stripSearchParams, trimPath, trimPathLeft, trimPathRight } from "@tanstack/router-core";
 import { createBrowserHistory, createHashHistory, createHistory, createMemoryHistory } from "@tanstack/history";
 import { Await, useAwaited } from "./awaited.js";
 import { CatchBoundary, ErrorComponent } from "./CatchBoundary.js";
@@ -7,7 +7,6 @@ import { FileRoute, FileRouteLoader, LazyRoute, createFileRoute, createLazyFileR
 import { lazyRouteComponent } from "./lazyRouteComponent.js";
 import { Link, createLink, linkOptions, useLinkProps } from "./link.js";
 import { MatchRoute, Matches, useChildMatches, useMatchRoute, useMatches, useParentMatches } from "./Matches.js";
-import { matchContext } from "./matchContext.js";
 import { Match, Outlet } from "./Match.js";
 import { useMatch } from "./useMatch.js";
 import { useLoaderDeps } from "./useLoaderDeps.js";
@@ -20,13 +19,11 @@ import { Block, useBlocker } from "./useBlocker.js";
 import { Navigate, useNavigate } from "./useNavigate.js";
 import { useParams } from "./useParams.js";
 import { useSearch } from "./useSearch.js";
-import { getRouterContext } from "./routerContext.js";
 import { useRouteContext } from "./useRouteContext.js";
 import { useRouter } from "./useRouter.js";
 import { useRouterState } from "./useRouterState.js";
 import { useLocation } from "./useLocation.js";
 import { useCanGoBack } from "./useCanGoBack.js";
-import { useLayoutEffect } from "./utils.js";
 import { CatchNotFound, DefaultGlobalNotFound } from "./not-found.js";
 import { ScriptOnce } from "./ScriptOnce.js";
 import { Asset } from "./Asset.js";
@@ -54,7 +51,6 @@ export {
   Navigate,
   NotFoundRoute,
   Outlet,
-  PathParamError,
   RootRoute,
   Route,
   RouteApi,
@@ -65,9 +61,7 @@ export {
   Scripts,
   ScrollRestoration,
   SearchParamError,
-  TSR_DEFERRED_PROMISE,
   cleanPath,
-  componentTypes,
   composeRewrites,
   createBrowserHistory,
   createControlledPromise,
@@ -86,13 +80,10 @@ export {
   createSerializationAdapter,
   deepEqual,
   defaultParseSearch,
-  defaultSerializeError,
   defaultStringifySearch,
   defer,
   functionalUpdate,
-  getInitialRouterState,
   getRouteApi,
-  getRouterContext,
   interpolatePath,
   isMatch,
   isNotFound,
@@ -103,7 +94,6 @@ export {
   lazyFn,
   lazyRouteComponent,
   linkOptions,
-  matchContext,
   notFound,
   parseSearchWith,
   redirect,
@@ -123,7 +113,6 @@ export {
   useChildMatches,
   useElementScrollRestoration,
   useHydrated,
-  useLayoutEffect,
   useLinkProps,
   useLoaderData,
   useLoaderDeps,

package/dist/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/dist/esm/routerContext.d.ts

@@ -1,8 +1,3 @@
 import { AnyRouter } from '@tanstack/router-core';
 import * as Solid from 'solid-js';
-declare global {
-    interface Window {
-        __TSR_ROUTER_CONTEXT__?: Solid.Context<AnyRouter>;
-    }
-}
-export declare function getRouterContext(): Solid.Context<AnyRouter>;
+export declare const routerContext: Solid.Context<AnyRouter>;

package/dist/esm/routerContext.js

@@ -1,16 +1,6 @@
 import * as Solid from "solid-js";
 const routerContext = Solid.createContext(null);
-function getRouterContext() {
-  if (typeof document === "undefined") {
-    return routerContext;
-  }
-  if (window.__TSR_ROUTER_CONTEXT__) {
-    return window.__TSR_ROUTER_CONTEXT__;
-  }
-  window.__TSR_ROUTER_CONTEXT__ = routerContext;
-  return routerContext;
-}
 export {
-  getRouterContext
+  routerContext
 };
 //# sourceMappingURL=routerContext.js.map

package/dist/esm/routerContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"routerContext.js","sources":["../../src/routerContext.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport type { AnyRouter } from '@tanstack/router-core'\n\ndeclare global {\n  interface Window {\n    __TSR_ROUTER_CONTEXT__?: Solid.Context<AnyRouter>\n  }\n}\n\nconst routerContext = Solid.createContext<AnyRouter>(\n  null as unknown as AnyRouter,\n)\n\nexport function getRouterContext() {\n  if (typeof document === 'undefined') {\n    return routerContext\n  }\n\n  if (window.__TSR_ROUTER_CONTEXT__) {\n    return window.__TSR_ROUTER_CONTEXT__\n  }\n\n  window.__TSR_ROUTER_CONTEXT__ = routerContext as any\n\n  return routerContext\n}\n"],"names":["routerContext","Solid","createContext","getRouterContext","document","window","__TSR_ROUTER_CONTEXT__"],"mappings":";AASA,MAAMA,gBAAgBC,MAAMC,cAC1B,IACF;AAEO,SAASC,mBAAmB;AACjC,MAAI,OAAOC,aAAa,aAAa;AACnC,WAAOJ;AAAAA,EACT;AAEA,MAAIK,OAAOC,wBAAwB;AACjC,WAAOD,OAAOC;AAAAA,EAChB;AAEAD,SAAOC,yBAAyBN;AAEhC,SAAOA;AACT;"}
+{"version":3,"file":"routerContext.js","sources":["../../src/routerContext.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport type { AnyRouter } from '@tanstack/router-core'\n\nexport const routerContext = Solid.createContext<AnyRouter>(\n  null as unknown as AnyRouter,\n)\n"],"names":["routerContext","Solid","createContext"],"mappings":";AAGO,MAAMA,gBAAgBC,MAAMC,cACjC,IACF;"}

package/dist/esm/useRouter.js

@@ -1,8 +1,8 @@
 import * as Solid from "solid-js";
 import warning from "tiny-warning";
-import { getRouterContext } from "./routerContext.js";
+import { routerContext } from "./routerContext.js";
 function useRouter(opts) {
-  const value = Solid.useContext(getRouterContext());
+  const value = Solid.useContext(routerContext);
   warning(!((opts?.warn ?? true) && !value), "useRouter must be used inside a <RouterProvider> component!");
   return value;
 }

package/dist/esm/useRouter.js.map

@@ -1 +1 @@
-{"version":3,"file":"useRouter.js","sources":["../../src/useRouter.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport warning from 'tiny-warning'\nimport { getRouterContext } from './routerContext'\nimport type { AnyRouter, RegisteredRouter } from '@tanstack/router-core'\n\nexport function useRouter<TRouter extends AnyRouter = RegisteredRouter>(opts?: {\n  warn?: boolean\n}): TRouter {\n  const value = Solid.useContext(getRouterContext() as any)\n  warning(\n    !((opts?.warn ?? true) && !value),\n    'useRouter must be used inside a <RouterProvider> component!',\n  )\n  return value as any\n}\n"],"names":["useRouter","opts","value","Solid","useContext","getRouterContext","warning","warn"],"mappings":";;;AAKO,SAASA,UAAwDC,MAE5D;AACV,QAAMC,QAAQC,MAAMC,WAAWC,iBAAAA,CAAyB;AACxDC,UACE,GAAGL,MAAMM,QAAQ,SAAS,CAACL,QAC3B,6DACF;AACA,SAAOA;AACT;"}
+{"version":3,"file":"useRouter.js","sources":["../../src/useRouter.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport warning from 'tiny-warning'\nimport { routerContext } from './routerContext'\nimport type { AnyRouter, RegisteredRouter } from '@tanstack/router-core'\n\nexport function useRouter<TRouter extends AnyRouter = RegisteredRouter>(opts?: {\n  warn?: boolean\n}): TRouter {\n  const value = Solid.useContext(routerContext as any)\n  warning(\n    !((opts?.warn ?? true) && !value),\n    'useRouter must be used inside a <RouterProvider> component!',\n  )\n  return value as any\n}\n"],"names":["useRouter","opts","value","Solid","useContext","routerContext","warning","warn"],"mappings":";;;AAKO,SAASA,UAAwDC,MAE5D;AACV,QAAMC,QAAQC,MAAMC,WAAWC,aAAoB;AACnDC,UACE,GAAGL,MAAMM,QAAQ,SAAS,CAACL,QAC3B,6DACF;AACA,SAAOA;AACT;"}

package/dist/esm/utils.d.ts

@@ -1,5 +1,4 @@
 import * as Solid from 'solid-js';
-export declare const useLayoutEffect: typeof Solid.createRenderEffect;
 export declare const usePrevious: (fn: () => boolean) => Solid.Accessor<{
     current: boolean | null;
     previous: boolean | null;

package/dist/esm/utils.js

@@ -1,5 +1,4 @@
 import * as Solid from "solid-js";
-const useLayoutEffect = typeof window !== "undefined" ? Solid.createRenderEffect : Solid.createEffect;
 const usePrevious = (fn) => {
   return Solid.createMemo(
     (prev = {
@@ -35,7 +34,6 @@ function useIntersectionObserver(ref, callback, intersectionObserverOptions = {}
 }
 export {
   useIntersectionObserver,
-  useLayoutEffect,
   usePrevious
 };
 //# sourceMappingURL=utils.js.map

package/dist/esm/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sources":["../../src/utils.ts"],"sourcesContent":["import * as Solid from 'solid-js'\n\nexport const useLayoutEffect =\n  typeof window !== 'undefined' ? Solid.createRenderEffect : Solid.createEffect\n\nexport const usePrevious = (fn: () => boolean) => {\n  return Solid.createMemo(\n    (\n      prev: { current: boolean | null; previous: boolean | null } = {\n        current: null,\n        previous: null,\n      },\n    ) => {\n      const current = fn()\n\n      if (prev.current !== current) {\n        prev.previous = prev.current\n        prev.current = current\n      }\n\n      return prev\n    },\n  )\n}\n\n/**\n * React hook to wrap `IntersectionObserver`.\n *\n * This hook will create an `IntersectionObserver` and observe the ref passed to it.\n *\n * When the intersection changes, the callback will be called with the `IntersectionObserverEntry`.\n *\n * @param ref - The ref to observe\n * @param intersectionObserverOptions - The options to pass to the IntersectionObserver\n * @param options - The options to pass to the hook\n * @param callback - The callback to call when the intersection changes\n * @returns The IntersectionObserver instance\n * @example\n * ```tsx\n * const MyComponent = () => {\n * const ref = React.useRef<HTMLDivElement>(null)\n * useIntersectionObserver(\n *  ref,\n *  (entry) => { doSomething(entry) },\n *  { rootMargin: '10px' },\n *  { disabled: false }\n * )\n * return <div ref={ref} />\n * ```\n */\nexport function useIntersectionObserver<T extends Element>(\n  ref: Solid.Accessor<T | null>,\n  callback: (entry: IntersectionObserverEntry | undefined) => void,\n  intersectionObserverOptions: IntersectionObserverInit = {},\n  options: { disabled?: boolean } = {},\n): Solid.Accessor<IntersectionObserver | null> {\n  const isIntersectionObserverAvailable =\n    typeof IntersectionObserver === 'function'\n  let observerRef: IntersectionObserver | null = null\n\n  Solid.createEffect(() => {\n    const r = ref()\n    if (!r || !isIntersectionObserverAvailable || options.disabled) {\n      return\n    }\n\n    observerRef = new IntersectionObserver(([entry]) => {\n      callback(entry)\n    }, intersectionObserverOptions)\n\n    observerRef.observe(r)\n\n    Solid.onCleanup(() => {\n      observerRef?.disconnect()\n    })\n  })\n\n  return () => observerRef\n}\n"],"names":[],"mappings":";AAEO,MAAM,kBACX,OAAO,WAAW,cAAc,MAAM,qBAAqB,MAAM;AAE5D,MAAM,cAAc,CAAC,OAAsB;AAChD,SAAO,MAAM;AAAA,IACX,CACE,OAA8D;AAAA,MAC5D,SAAS;AAAA,MACT,UAAU;AAAA,IAAA,MAET;AACH,YAAM,UAAU,GAAA;AAEhB,UAAI,KAAK,YAAY,SAAS;AAC5B,aAAK,WAAW,KAAK;AACrB,aAAK,UAAU;AAAA,MACjB;AAEA,aAAO;AAAA,IACT;AAAA,EAAA;AAEJ;AA2BO,SAAS,wBACd,KACA,UACA,8BAAwD,CAAA,GACxD,UAAkC,IACW;AAC7C,QAAM,kCACJ,OAAO,yBAAyB;AAClC,MAAI,cAA2C;AAE/C,QAAM,aAAa,MAAM;AACvB,UAAM,IAAI,IAAA;AACV,QAAI,CAAC,KAAK,CAAC,mCAAmC,QAAQ,UAAU;AAC9D;AAAA,IACF;AAEA,kBAAc,IAAI,qBAAqB,CAAC,CAAC,KAAK,MAAM;AAClD,eAAS,KAAK;AAAA,IAChB,GAAG,2BAA2B;AAE9B,gBAAY,QAAQ,CAAC;AAErB,UAAM,UAAU,MAAM;AACpB,mBAAa,WAAA;AAAA,IACf,CAAC;AAAA,EACH,CAAC;AAED,SAAO,MAAM;AACf;"}
+{"version":3,"file":"utils.js","sources":["../../src/utils.ts"],"sourcesContent":["import * as Solid from 'solid-js'\n\nexport const usePrevious = (fn: () => boolean) => {\n  return Solid.createMemo(\n    (\n      prev: { current: boolean | null; previous: boolean | null } = {\n        current: null,\n        previous: null,\n      },\n    ) => {\n      const current = fn()\n\n      if (prev.current !== current) {\n        prev.previous = prev.current\n        prev.current = current\n      }\n\n      return prev\n    },\n  )\n}\n\n/**\n * React hook to wrap `IntersectionObserver`.\n *\n * This hook will create an `IntersectionObserver` and observe the ref passed to it.\n *\n * When the intersection changes, the callback will be called with the `IntersectionObserverEntry`.\n *\n * @param ref - The ref to observe\n * @param intersectionObserverOptions - The options to pass to the IntersectionObserver\n * @param options - The options to pass to the hook\n * @param callback - The callback to call when the intersection changes\n * @returns The IntersectionObserver instance\n * @example\n * ```tsx\n * const MyComponent = () => {\n * const ref = React.useRef<HTMLDivElement>(null)\n * useIntersectionObserver(\n *  ref,\n *  (entry) => { doSomething(entry) },\n *  { rootMargin: '10px' },\n *  { disabled: false }\n * )\n * return <div ref={ref} />\n * ```\n */\nexport function useIntersectionObserver<T extends Element>(\n  ref: Solid.Accessor<T | null>,\n  callback: (entry: IntersectionObserverEntry | undefined) => void,\n  intersectionObserverOptions: IntersectionObserverInit = {},\n  options: { disabled?: boolean } = {},\n): Solid.Accessor<IntersectionObserver | null> {\n  const isIntersectionObserverAvailable =\n    typeof IntersectionObserver === 'function'\n  let observerRef: IntersectionObserver | null = null\n\n  Solid.createEffect(() => {\n    const r = ref()\n    if (!r || !isIntersectionObserverAvailable || options.disabled) {\n      return\n    }\n\n    observerRef = new IntersectionObserver(([entry]) => {\n      callback(entry)\n    }, intersectionObserverOptions)\n\n    observerRef.observe(r)\n\n    Solid.onCleanup(() => {\n      observerRef?.disconnect()\n    })\n  })\n\n  return () => observerRef\n}\n"],"names":[],"mappings":";AAEO,MAAM,cAAc,CAAC,OAAsB;AAChD,SAAO,MAAM;AAAA,IACX,CACE,OAA8D;AAAA,MAC5D,SAAS;AAAA,MACT,UAAU;AAAA,IAAA,MAET;AACH,YAAM,UAAU,GAAA;AAEhB,UAAI,KAAK,YAAY,SAAS;AAC5B,aAAK,WAAW,KAAK;AACrB,aAAK,UAAU;AAAA,MACjB;AAEA,aAAO;AAAA,IACT;AAAA,EAAA;AAEJ;AA2BO,SAAS,wBACd,KACA,UACA,8BAAwD,CAAA,GACxD,UAAkC,IACW;AAC7C,QAAM,kCACJ,OAAO,yBAAyB;AAClC,MAAI,cAA2C;AAE/C,QAAM,aAAa,MAAM;AACvB,UAAM,IAAI,IAAA;AACV,QAAI,CAAC,KAAK,CAAC,mCAAmC,QAAQ,UAAU;AAC9D;AAAA,IACF;AAEA,kBAAc,IAAI,qBAAqB,CAAC,CAAC,KAAK,MAAM;AAClD,eAAS,KAAK;AAAA,IAChB,GAAG,2BAA2B;AAE9B,gBAAY,QAAQ,CAAC;AAErB,UAAM,UAAU,MAAM;AACpB,mBAAa,WAAA;AAAA,IACf,CAAC;AAAA,EACH,CAAC;AAED,SAAO,MAAM;AACf;"}

package/dist/source/RouterProvider.jsx

@@ -1,4 +1,4 @@
-import { getRouterContext } from './routerContext';
+import { routerContext } from './routerContext';
 import { SafeFragment } from './SafeFragment';
 import { Matches } from './Matches';
 export function RouterContextProvider({ router, children, ...rest }) {
@@ -11,7 +11,6 @@ export function RouterContextProvider({ router, children, ...rest }) {
             ...rest.context,
         },
     });
-    const routerContext = getRouterContext();
     const OptionalWrapper = router.options.Wrap || SafeFragment;
     return (<OptionalWrapper>
       <routerContext.Provider value={router}>

package/dist/source/RouterProvider.jsx.map

@@ -1 +1 @@
-{"version":3,"file":"RouterProvider.jsx","sourceRoot":"","sources":["../../src/RouterProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAC7C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAQnC,MAAM,UAAU,qBAAqB,CAGnC,EACA,MAAM,EACN,QAAQ,EACR,GAAG,IAAI,EAGR;IACC,4DAA4D;IAC5D,MAAM,CAAC,MAAM,CAAC;QACZ,GAAG,MAAM,CAAC,OAAO;QACjB,GAAG,IAAI;QACP,OAAO,EAAE;YACP,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO;YACzB,GAAG,IAAI,CAAC,OAAO;SAChB;KACF,CAAC,CAAA;IAEF,MAAM,aAAa,GAAG,gBAAgB,EAAE,CAAA;IAExC,MAAM,eAAe,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,IAAI,YAAY,CAAA;IAE3D,OAAO,CACL,CAAC,eAAe,CACd;MAAA,CAAC,aAAa,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,MAAmB,CAAC,CACjD;QAAA,CAAC,QAAQ,EAAE,CACb;MAAA,EAAE,aAAa,CAAC,QAAQ,CAC1B;IAAA,EAAE,eAAe,CAAC,CACnB,CAAA;AACH,CAAC;AAED,MAAM,UAAU,cAAc,CAG5B,EAAE,MAAM,EAAE,GAAG,IAAI,EAAqC;IACtD,OAAO,CACL,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,IAAI,CAAC,CAC9C;MAAA,CAAC,GAAG,EAAE,CAAC,CAAC,OAAO,CAAC,AAAD,EAAG,CACpB;IAAA,EAAE,qBAAqB,CAAC,CACzB,CAAA;AACH,CAAC"}
+{"version":3,"file":"RouterProvider.jsx","sourceRoot":"","sources":["../../src/RouterProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAC7C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAQnC,MAAM,UAAU,qBAAqB,CAGnC,EACA,MAAM,EACN,QAAQ,EACR,GAAG,IAAI,EAGR;IACC,4DAA4D;IAC5D,MAAM,CAAC,MAAM,CAAC;QACZ,GAAG,MAAM,CAAC,OAAO;QACjB,GAAG,IAAI;QACP,OAAO,EAAE;YACP,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO;YACzB,GAAG,IAAI,CAAC,OAAO;SAChB;KACF,CAAC,CAAA;IAEF,MAAM,eAAe,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,IAAI,YAAY,CAAA;IAE3D,OAAO,CACL,CAAC,eAAe,CACd;MAAA,CAAC,aAAa,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,MAAmB,CAAC,CACjD;QAAA,CAAC,QAAQ,EAAE,CACb;MAAA,EAAE,aAAa,CAAC,QAAQ,CAC1B;IAAA,EAAE,eAAe,CAAC,CACnB,CAAA;AACH,CAAC;AAED,MAAM,UAAU,cAAc,CAG5B,EAAE,MAAM,EAAE,GAAG,IAAI,EAAqC;IACtD,OAAO,CACL,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,IAAI,CAAC,CAC9C;MAAA,CAAC,GAAG,EAAE,CAAC,CAAC,OAAO,CAAC,AAAD,EAAG,CACpB;IAAA,EAAE,qBAAqB,CAAC,CACzB,CAAA;AACH,CAAC"}

package/dist/source/index.d.ts

@@ -1,4 +1,4 @@
-export { defer, TSR_DEFERRED_PROMISE, isMatch, joinPaths, cleanPath, trimPathLeft, trimPathRight, trimPath, resolvePath, interpolatePath, rootRouteId, defaultSerializeError, defaultParseSearch, defaultStringifySearch, parseSearchWith, stringifySearchWith, functionalUpdate, replaceEqualDeep, isPlainObject, isPlainArray, deepEqual, createControlledPromise, retainSearchParams, stripSearchParams, createSerializationAdapter, } from '@tanstack/router-core';
+export { defer, isMatch, joinPaths, cleanPath, trimPathLeft, trimPathRight, trimPath, resolvePath, interpolatePath, rootRouteId, defaultParseSearch, defaultStringifySearch, parseSearchWith, stringifySearchWith, functionalUpdate, replaceEqualDeep, isPlainObject, isPlainArray, deepEqual, createControlledPromise, retainSearchParams, stripSearchParams, createSerializationAdapter, } from '@tanstack/router-core';
 export type { DeferredPromiseState, DeferredPromise, ParsedLocation, RemoveTrailingSlashes, RemoveLeadingSlashes, ActiveOptions, ResolveRelativePath, RootRouteId, AnyPathParams, ResolveParams, ResolveOptionalParams, ResolveRequiredParams, SearchSchemaInput, AnyContext, RouteContext, PreloadableObj, RoutePathOptions, StaticDataRouteOption, RoutePathOptionsIntersection, UpdatableStaticRouteOption, MetaDescriptor, RouteLinkEntry, ParseParamsFn, SearchFilter, ResolveId, InferFullSearchSchema, InferFullSearchSchemaInput, ErrorRouteProps, ErrorComponentProps, NotFoundRouteProps, TrimPath, TrimPathLeft, TrimPathRight, StringifyParamsFn, ParamsOptions, InferAllParams, InferAllContext, LooseReturnType, LooseAsyncReturnType, ContextReturnType, ContextAsyncReturnType, ResolveLoaderData, ResolveRouteContext, SearchSerializer, SearchParser, TrailingSlashOption, Manifest, RouterManagedTag, ControlledPromise, Constrain, Expand, MergeAll, Assign, IntersectAssign, ResolveValidatorInput, ResolveValidatorOutput, AnyValidator, DefaultValidator, ValidatorFn, AnySchema, AnyValidatorAdapter, AnyValidatorFn, AnyValidatorObj, ResolveValidatorInputFn, ResolveValidatorOutputFn, ResolveSearchValidatorInput, ResolveSearchValidatorInputFn, Validator, ValidatorAdapter, ValidatorObj, NavigateFn, BuildLocationFn, InferDescendantToPaths, RelativeToPath, RelativeToParentPath, RelativeToCurrentPath, Register, AbsoluteToPath, RelativeToPathAutoComplete, NavigateOptions, ToOptions, ToMaskOptions, ToSubOptions, ResolveRoute, SearchParamOptions, PathParamOptions, ToPathOption, LinkOptions, MakeOptionalPathParams, AnyRouterWithContext, ParseRoute, RoutesById, RouteById, RouteIds, RoutesByPath, RouteByPath, RoutePaths, FullSearchSchema, AllParams, AllLoaderData, FullSearchSchemaInput, AllContext, CommitLocationOptions, MatchLocation, ResolveFullSearchSchema, ResolveFullSearchSchemaInput, ResolveAllParamsFromParent, RouteContextParameter, BeforeLoadContextParameter, ResolveAllContext, FullSearchSchemaOption, MakeRemountDepsOptionsUnion, RemountDepsOptions, FileRouteTypes, FileRoutesByPath, UseNavigateResult, AnyRedirect, Redirect, RedirectOptions, ResolvedRedirect, RouteOptions, FileBaseRouteOptions, BaseRouteOptions, UpdatableRouteOptions, RouteLoaderFn, LoaderFnContext, MakeRouteMatch, MakeRouteMatchUnion, RouteMatch, AnyRouteMatch, RouteContextFn, RouteContextOptions, BeforeLoadContextOptions, ContextOptions, RootRouteOptions, AnyRouteWithContext, LazyRouteOptions, AnyRoute, ResolveFullPath, RouteConstraints, RouterState, ListenerFn, BuildNextOptions, AnyRouter, RegisteredRouter, RouterEvents, RouterEvent, RouterListener, MatchRouteOptions, RouteMask, RouterContextOptions, RouterOptions, RouterConstructorOptions, ControllablePromise, InjectedHtmlEntry, CreateFileRoute, CreateLazyFileRoute, AnySerializationAdapter, SerializationAdapter, SerializableExtensions, } from '@tanstack/router-core';
 export { createHistory, createBrowserHistory, createHashHistory, createMemoryHistory, } from '@tanstack/history';
 export type { BlockerFn, HistoryLocation, RouterHistory, ParsedPath, HistoryState, } from '@tanstack/history';
@@ -13,7 +13,6 @@ export { useLinkProps, createLink, Link, linkOptions } from './link';
 export type { UseLinkPropsOptions, ActiveLinkOptions, LinkProps, LinkComponent, LinkComponentProps, CreateLinkProps, } from './link';
 export { Matches, useMatchRoute, MatchRoute, useMatches, useParentMatches, useChildMatches, } from './Matches';
 export type { UseMatchRouteOptions, MakeMatchRouteOptions } from './Matches';
-export { matchContext } from './matchContext';
 export { Match, Outlet } from './Match';
 export { useMatch } from './useMatch';
 export { useLoaderDeps } from './useLoaderDeps';
@@ -22,7 +21,7 @@ export { redirect, isRedirect, DEFAULT_PROTOCOL_ALLOWLIST, } from '@tanstack/rou
 export { RouteApi, getRouteApi, Route, createRoute, RootRoute, rootRouteWithContext, createRootRoute, createRootRouteWithContext, createRouteMask, NotFoundRoute, } from './route';
 export type { AnyRootRoute, SolidNode, AsyncRouteComponent, RouteComponent, ErrorRouteComponent, NotFoundRouteComponent, } from './route';
 export { createRouter, Router } from './router';
-export { componentTypes, lazyFn, SearchParamError, PathParamError, getInitialRouterState, } from '@tanstack/router-core';
+export { lazyFn, SearchParamError } from '@tanstack/router-core';
 export { RouterProvider, RouterContextProvider } from './RouterProvider';
 export type { RouterProps } from './RouterProvider';
 export { useElementScrollRestoration, ScrollRestoration, } from './ScrollRestoration';
@@ -31,13 +30,11 @@ export { useBlocker, Block } from './useBlocker';
 export { useNavigate, Navigate } from './useNavigate';
 export { useParams } from './useParams';
 export { useSearch } from './useSearch';
-export { getRouterContext, } from './routerContext';
 export { useRouteContext } from './useRouteContext';
 export { useRouter } from './useRouter';
 export { useRouterState } from './useRouterState';
 export { useLocation } from './useLocation';
 export { useCanGoBack } from './useCanGoBack';
-export { useLayoutEffect } from './utils';
 export { CatchNotFound, DefaultGlobalNotFound } from './not-found';
 export { notFound, isNotFound } from '@tanstack/router-core';
 export type { NotFoundError } from '@tanstack/router-core';

package/dist/source/index.jsx

@@ -1,4 +1,4 @@
-export { defer, TSR_DEFERRED_PROMISE, isMatch, joinPaths, cleanPath, trimPathLeft, trimPathRight, trimPath, resolvePath, interpolatePath, rootRouteId, defaultSerializeError, defaultParseSearch, defaultStringifySearch, parseSearchWith, stringifySearchWith, functionalUpdate, replaceEqualDeep, isPlainObject, isPlainArray, deepEqual, createControlledPromise, retainSearchParams, stripSearchParams, createSerializationAdapter, } from '@tanstack/router-core';
+export { defer, isMatch, joinPaths, cleanPath, trimPathLeft, trimPathRight, trimPath, resolvePath, interpolatePath, rootRouteId, defaultParseSearch, defaultStringifySearch, parseSearchWith, stringifySearchWith, functionalUpdate, replaceEqualDeep, isPlainObject, isPlainArray, deepEqual, createControlledPromise, retainSearchParams, stripSearchParams, createSerializationAdapter, } from '@tanstack/router-core';
 export { createHistory, createBrowserHistory, createHashHistory, createMemoryHistory, } from '@tanstack/history';
 export { useAwaited, Await } from './awaited';
 export { CatchBoundary, ErrorComponent } from './CatchBoundary';
@@ -8,7 +8,6 @@ export * from './history';
 export { lazyRouteComponent } from './lazyRouteComponent';
 export { useLinkProps, createLink, Link, linkOptions } from './link';
 export { Matches, useMatchRoute, MatchRoute, useMatches, useParentMatches, useChildMatches, } from './Matches';
-export { matchContext } from './matchContext';
 export { Match, Outlet } from './Match';
 export { useMatch } from './useMatch';
 export { useLoaderDeps } from './useLoaderDeps';
@@ -16,21 +15,18 @@ export { useLoaderData } from './useLoaderData';
 export { redirect, isRedirect, DEFAULT_PROTOCOL_ALLOWLIST, } from '@tanstack/router-core';
 export { RouteApi, getRouteApi, Route, createRoute, RootRoute, rootRouteWithContext, createRootRoute, createRootRouteWithContext, createRouteMask, NotFoundRoute, } from './route';
 export { createRouter, Router } from './router';
-export { componentTypes, lazyFn, SearchParamError, PathParamError, getInitialRouterState, } from '@tanstack/router-core';
+export { lazyFn, SearchParamError } from '@tanstack/router-core';
 export { RouterProvider, RouterContextProvider } from './RouterProvider';
 export { useElementScrollRestoration, ScrollRestoration, } from './ScrollRestoration';
 export { useBlocker, Block } from './useBlocker';
 export { useNavigate, Navigate } from './useNavigate';
 export { useParams } from './useParams';
 export { useSearch } from './useSearch';
-export { getRouterContext, // SSR
- } from './routerContext';
 export { useRouteContext } from './useRouteContext';
 export { useRouter } from './useRouter';
 export { useRouterState } from './useRouterState';
 export { useLocation } from './useLocation';
 export { useCanGoBack } from './useCanGoBack';
-export { useLayoutEffect } from './utils';
 export { CatchNotFound, DefaultGlobalNotFound } from './not-found';
 export { notFound, isNotFound } from '@tanstack/router-core';
 export { ScriptOnce } from './ScriptOnce';

package/dist/source/index.jsx.map

@@ -1 +1 @@
-{"version":3,"file":"index.jsx","sourceRoot":"","sources":["../../src/index.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.jsx","sourceRoot":"","sources":["../../src/index.tsx"],"names":[],"mappings":"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"}

package/dist/source/routerContext.d.ts

@@ -1,8 +1,3 @@
 import * as Solid from 'solid-js';
 import type { AnyRouter } from '@tanstack/router-core';
-declare global {
-    interface Window {
-        __TSR_ROUTER_CONTEXT__?: Solid.Context<AnyRouter>;
-    }
-}
-export declare function getRouterContext(): Solid.Context<AnyRouter>;
+export declare const routerContext: Solid.Context<AnyRouter>;

package/dist/source/routerContext.jsx

@@ -1,13 +1,3 @@
 import * as Solid from 'solid-js';
-const routerContext = Solid.createContext(null);
-export function getRouterContext() {
-    if (typeof document === 'undefined') {
-        return routerContext;
-    }
-    if (window.__TSR_ROUTER_CONTEXT__) {
-        return window.__TSR_ROUTER_CONTEXT__;
-    }
-    window.__TSR_ROUTER_CONTEXT__ = routerContext;
-    return routerContext;
-}
+export const routerContext = Solid.createContext(null);
 //# sourceMappingURL=routerContext.jsx.map

package/dist/source/routerContext.jsx.map

@@ -1 +1 @@
-{"version":3,"file":"routerContext.jsx","sourceRoot":"","sources":["../../src/routerContext.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,UAAU,CAAA;AASjC,MAAM,aAAa,GAAG,KAAK,CAAC,aAAa,CACvC,IAA4B,CAC7B,CAAA;AAED,MAAM,UAAU,gBAAgB;IAC9B,IAAI,OAAO,QAAQ,KAAK,WAAW,EAAE,CAAC;QACpC,OAAO,aAAa,CAAA;IACtB,CAAC;IAED,IAAI,MAAM,CAAC,sBAAsB,EAAE,CAAC;QAClC,OAAO,MAAM,CAAC,sBAAsB,CAAA;IACtC,CAAC;IAED,MAAM,CAAC,sBAAsB,GAAG,aAAoB,CAAA;IAEpD,OAAO,aAAa,CAAA;AACtB,CAAC"}
+{"version":3,"file":"routerContext.jsx","sourceRoot":"","sources":["../../src/routerContext.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,UAAU,CAAA;AAGjC,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,CAAC,aAAa,CAC9C,IAA4B,CAC7B,CAAA"}

package/dist/source/useRouter.jsx

@@ -1,8 +1,8 @@
 import * as Solid from 'solid-js';
 import warning from 'tiny-warning';
-import { getRouterContext } from './routerContext';
+import { routerContext } from './routerContext';
 export function useRouter(opts) {
-    const value = Solid.useContext(getRouterContext());
+    const value = Solid.useContext(routerContext);
     warning(!((opts?.warn ?? true) && !value), 'useRouter must be used inside a <RouterProvider> component!');
     return value;
 }

package/dist/source/useRouter.jsx.map

@@ -1 +1 @@
-{"version":3,"file":"useRouter.jsx","sourceRoot":"","sources":["../../src/useRouter.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,UAAU,CAAA;AACjC,OAAO,OAAO,MAAM,cAAc,CAAA;AAClC,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAGlD,MAAM,UAAU,SAAS,CAA+C,IAEvE;IACC,MAAM,KAAK,GAAG,KAAK,CAAC,UAAU,CAAC,gBAAgB,EAAS,CAAC,CAAA;IACzD,OAAO,CACL,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EACjC,6DAA6D,CAC9D,CAAA;IACD,OAAO,KAAY,CAAA;AACrB,CAAC"}
+{"version":3,"file":"useRouter.jsx","sourceRoot":"","sources":["../../src/useRouter.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,UAAU,CAAA;AACjC,OAAO,OAAO,MAAM,cAAc,CAAA;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAG/C,MAAM,UAAU,SAAS,CAA+C,IAEvE;IACC,MAAM,KAAK,GAAG,KAAK,CAAC,UAAU,CAAC,aAAoB,CAAC,CAAA;IACpD,OAAO,CACL,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EACjC,6DAA6D,CAC9D,CAAA;IACD,OAAO,KAAY,CAAA;AACrB,CAAC"}

package/dist/source/utils.d.ts

@@ -1,5 +1,4 @@
 import * as Solid from 'solid-js';
-export declare const useLayoutEffect: typeof Solid.createRenderEffect;
 export declare const usePrevious: (fn: () => boolean) => Solid.Accessor<{
     current: boolean | null;
     previous: boolean | null;

package/dist/source/utils.js

@@ -1,5 +1,4 @@
 import * as Solid from 'solid-js';
-export const useLayoutEffect = typeof window !== 'undefined' ? Solid.createRenderEffect : Solid.createEffect;
 export const usePrevious = (fn) => {
     return Solid.createMemo((prev = {
         current: 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;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"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,UAAU,CAAA;AAEjC,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.162.2",
+  "version": "1.162.5",
   "description": "Modern and scalable routing for Solid applications",
   "author": "Tanner Linsley",
   "license": "MIT",
@@ -92,7 +92,7 @@
     "tiny-invariant": "^1.3.3",
     "tiny-warning": "^1.0.3",
     "@tanstack/history": "1.161.4",
-    "@tanstack/router-core": "1.162.2"
+    "@tanstack/router-core": "1.162.5"
   },
   "devDependencies": {
     "@solidjs/testing-library": "^0.8.10",

package/src/RouterProvider.tsx

@@ -1,4 +1,4 @@
-import { getRouterContext } from './routerContext'
+import { routerContext } from './routerContext'
 import { SafeFragment } from './SafeFragment'
 import { Matches } from './Matches'
 import type {
@@ -28,8 +28,6 @@ export function RouterContextProvider<
     },
   })
 
-  const routerContext = getRouterContext()
-
   const OptionalWrapper = router.options.Wrap || SafeFragment
 
   return (

package/src/index.tsx

@@ -1,6 +1,5 @@
 export {
   defer,
-  TSR_DEFERRED_PROMISE,
   isMatch,
   joinPaths,
   cleanPath,
@@ -10,7 +9,6 @@ export {
   resolvePath,
   interpolatePath,
   rootRouteId,
-  defaultSerializeError,
   defaultParseSearch,
   defaultStringifySearch,
   parseSearchWith,
@@ -244,7 +242,6 @@ export {
 
 export type { UseMatchRouteOptions, MakeMatchRouteOptions } from './Matches'
 
-export { matchContext } from './matchContext'
 export { Match, Outlet } from './Match'
 
 export { useMatch } from './useMatch'
@@ -280,13 +277,7 @@ export type {
 
 export { createRouter, Router } from './router'
 
-export {
-  componentTypes,
-  lazyFn,
-  SearchParamError,
-  PathParamError,
-  getInitialRouterState,
-} from '@tanstack/router-core'
+export { lazyFn, SearchParamError } from '@tanstack/router-core'
 
 export { RouterProvider, RouterContextProvider } from './RouterProvider'
 export type { RouterProps } from './RouterProvider'
@@ -304,18 +295,12 @@ export { useNavigate, Navigate } from './useNavigate'
 export { useParams } from './useParams'
 export { useSearch } from './useSearch'
 
-export {
-  getRouterContext, // SSR
-} from './routerContext'
-
 export { useRouteContext } from './useRouteContext'
 export { useRouter } from './useRouter'
 export { useRouterState } from './useRouterState'
 export { useLocation } from './useLocation'
 export { useCanGoBack } from './useCanGoBack'
 
-export { useLayoutEffect } from './utils'
-
 export { CatchNotFound, DefaultGlobalNotFound } from './not-found'
 export { notFound, isNotFound } from '@tanstack/router-core'
 export type { NotFoundError } from '@tanstack/router-core'

package/src/routerContext.tsx

@@ -1,26 +1,6 @@
 import * as Solid from 'solid-js'
 import type { AnyRouter } from '@tanstack/router-core'
 
-declare global {
-  interface Window {
-    __TSR_ROUTER_CONTEXT__?: Solid.Context<AnyRouter>
-  }
-}
-
-const routerContext = Solid.createContext<AnyRouter>(
+export const routerContext = Solid.createContext<AnyRouter>(
   null as unknown as AnyRouter,
 )
-
-export function getRouterContext() {
-  if (typeof document === 'undefined') {
-    return routerContext
-  }
-
-  if (window.__TSR_ROUTER_CONTEXT__) {
-    return window.__TSR_ROUTER_CONTEXT__
-  }
-
-  window.__TSR_ROUTER_CONTEXT__ = routerContext as any
-
-  return routerContext
-}

package/src/useRouter.tsx

@@ -1,12 +1,12 @@
 import * as Solid from 'solid-js'
 import warning from 'tiny-warning'
-import { getRouterContext } from './routerContext'
+import { routerContext } from './routerContext'
 import type { AnyRouter, RegisteredRouter } from '@tanstack/router-core'
 
 export function useRouter<TRouter extends AnyRouter = RegisteredRouter>(opts?: {
   warn?: boolean
 }): TRouter {
-  const value = Solid.useContext(getRouterContext() as any)
+  const value = Solid.useContext(routerContext as any)
   warning(
     !((opts?.warn ?? true) && !value),
     'useRouter must be used inside a <RouterProvider> component!',

package/src/utils.ts

@@ -1,8 +1,5 @@
 import * as Solid from 'solid-js'
 
-export const useLayoutEffect =
-  typeof window !== 'undefined' ? Solid.createRenderEffect : Solid.createEffect
-
 export const usePrevious = (fn: () => boolean) => {
   return Solid.createMemo(
     (