@tanstack/solid-router 1.114.6 → 1.114.7

package/src/not-found.tsx

@@ -1,34 +1,8 @@
+import { isNotFound } from '@tanstack/router-core'
 import { CatchBoundary } from './CatchBoundary'
 import { useRouterState } from './useRouterState'
 import type * as Solid from 'solid-js'
-import type { RegisteredRouter, RouteIds } from '@tanstack/router-core'
-
-export type NotFoundError = {
-  /**
-    @deprecated
-    Use `routeId: rootRouteId` instead
-  */
-  global?: boolean
-  /**
-    @private
-    Do not use this. It's used internally to indicate a path matching error
-  */
-  _global?: boolean
-  data?: any
-  throw?: boolean
-  routeId?: RouteIds<RegisteredRouter['routeTree']>
-  headers?: HeadersInit
-}
-
-export function notFound(options: NotFoundError = {}) {
-  ;(options as any).isNotFound = true
-  if (options.throw) throw options
-  return options
-}
-
-export function isNotFound(obj: any): obj is NotFoundError {
-  return !!obj?.isNotFound
-}
+import type { NotFoundError } from '@tanstack/router-core'
 
 export function CatchNotFound(props: {
   fallback?: (error: NotFoundError) => Solid.JSX.Element

package/src/route.ts

@@ -1,10 +1,14 @@
 import invariant from 'tiny-invariant'
-import { joinPaths, rootRouteId, trimPathLeft } from '@tanstack/router-core'
+import {
+  joinPaths,
+  notFound,
+  rootRouteId,
+  trimPathLeft,
+} from '@tanstack/router-core'
 import { useLoaderData } from './useLoaderData'
 import { useLoaderDeps } from './useLoaderDeps'
 import { useParams } from './useParams'
 import { useSearch } from './useSearch'
-import { notFound } from './not-found'
 import { useNavigate } from './useNavigate'
 import { useMatch } from './useMatch'
 import { useRouter } from './useRouter'
@@ -17,6 +21,7 @@ import type {
   LazyRoute as CoreLazyRoute,
   Route as CoreRoute,
   ErrorComponentProps,
+  NotFoundError,
   NotFoundRouteProps,
   RegisteredRouter,
   ResolveFullPath,
@@ -48,7 +53,6 @@ import type { UseLoaderDepsRoute } from './useLoaderDeps'
 import type { UseParamsRoute } from './useParams'
 import type { UseSearchRoute } from './useSearch'
 import type * as Solid from 'solid-js'
-import type { NotFoundError } from './not-found'
 import type { UseRouteContextRoute } from './useRouteContext'
 
 declare module '@tanstack/router-core' {

package/src/router.ts

@@ -14,6 +14,9 @@ import {
   functionalUpdate,
   getLocationChangeInfo,
   interpolatePath,
+  isNotFound,
+  isRedirect,
+  isResolvedRedirect,
   joinPaths,
   last,
   matchPathname,
@@ -26,8 +29,6 @@ import {
   trimPathLeft,
   trimPathRight,
 } from '@tanstack/router-core'
-import { isRedirect, isResolvedRedirect } from './redirects'
-import { isNotFound } from './not-found'
 import { setupScrollRestoration } from './scroll-restoration'
 import type * as Solid from 'solid-js'
 import type { HistoryLocation, RouterHistory } from '@tanstack/history'
@@ -63,6 +64,7 @@ import type {
   MatchRoutesOpts,
   MatchedRoutesResult,
   NavigateFn,
+  NotFoundError,
   ParseLocationFn,
   ParsedLocation,
   PickAsRequired,
@@ -90,7 +92,6 @@ import type {
   NotFoundRouteComponent,
   RouteComponent,
 } from './route'
-import type { NotFoundError } from './not-found'
 
 declare module '@tanstack/router-core' {
   export interface RouterOptionsExtensions {

package/dist/cjs/redirects.cjs

@@ -1,29 +0,0 @@
-"use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-function redirect(opts) {
-  opts.isRedirect = true;
-  opts.statusCode = opts.statusCode || opts.code || 307;
-  opts.headers = opts.headers || {};
-  if (!opts.reloadDocument) {
-    opts.reloadDocument = false;
-    try {
-      new URL(`${opts.href}`);
-      opts.reloadDocument = true;
-    } catch {
-    }
-  }
-  if (opts.throw) {
-    throw opts;
-  }
-  return opts;
-}
-function isRedirect(obj) {
-  return !!(obj == null ? void 0 : obj.isRedirect);
-}
-function isResolvedRedirect(obj) {
-  return !!(obj == null ? void 0 : obj.isRedirect) && obj.href;
-}
-exports.isRedirect = isRedirect;
-exports.isResolvedRedirect = isResolvedRedirect;
-exports.redirect = redirect;
-//# sourceMappingURL=redirects.cjs.map

package/dist/cjs/redirects.cjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"redirects.cjs","sources":["../../src/redirects.ts"],"sourcesContent":["import type {\n  AnyRedirect,\n  Redirect,\n  RegisteredRouter,\n  ResolvedRedirect,\n} from '@tanstack/router-core'\n\nexport function redirect<\n  TRouter extends RegisteredRouter,\n  const TTo extends string | undefined,\n  const TFrom extends string = string,\n  const TMaskFrom extends string = TFrom,\n  const TMaskTo extends string = '',\n>(\n  opts: Redirect<TRouter, TFrom, TTo, TMaskFrom, TMaskTo>,\n): Redirect<TRouter, TFrom, TTo, TMaskFrom, TMaskTo> {\n  ;(opts as any).isRedirect = true\n  opts.statusCode = opts.statusCode || opts.code || 307\n  opts.headers = opts.headers || {}\n  if (!opts.reloadDocument) {\n    opts.reloadDocument = false\n    try {\n      new URL(`${opts.href}`)\n      opts.reloadDocument = true\n    } catch {}\n  }\n\n  if (opts.throw) {\n    throw opts\n  }\n\n  return opts\n}\n\nexport function isRedirect(obj: any): obj is AnyRedirect {\n  return !!obj?.isRedirect\n}\n\nexport function isResolvedRedirect(obj: any): obj is ResolvedRedirect {\n  return !!obj?.isRedirect && obj.href\n}\n"],"names":[],"mappings":";;AAOO,SAAS,SAOd,MACmD;AACjD,OAAa,aAAa;AAC5B,OAAK,aAAa,KAAK,cAAc,KAAK,QAAQ;AAC7C,OAAA,UAAU,KAAK,WAAW,CAAC;AAC5B,MAAA,CAAC,KAAK,gBAAgB;AACxB,SAAK,iBAAiB;AAClB,QAAA;AACF,UAAI,IAAI,GAAG,KAAK,IAAI,EAAE;AACtB,WAAK,iBAAiB;AAAA,IAAA,QAChB;AAAA,IAAA;AAAA,EAAC;AAGX,MAAI,KAAK,OAAO;AACR,UAAA;AAAA,EAAA;AAGD,SAAA;AACT;AAEO,SAAS,WAAW,KAA8B;AAChD,SAAA,CAAC,EAAC,2BAAK;AAChB;AAEO,SAAS,mBAAmB,KAAmC;AACpE,SAAO,CAAC,EAAC,2BAAK,eAAc,IAAI;AAClC;;;;"}

package/dist/cjs/redirects.d.cts

@@ -1,4 +0,0 @@
-import { AnyRedirect, Redirect, RegisteredRouter, ResolvedRedirect } from '@tanstack/router-core';
-export declare function redirect<TRouter extends RegisteredRouter, const TTo extends string | undefined, const TFrom extends string = string, const TMaskFrom extends string = TFrom, const TMaskTo extends string = ''>(opts: Redirect<TRouter, TFrom, TTo, TMaskFrom, TMaskTo>): Redirect<TRouter, TFrom, TTo, TMaskFrom, TMaskTo>;
-export declare function isRedirect(obj: any): obj is AnyRedirect;
-export declare function isResolvedRedirect(obj: any): obj is ResolvedRedirect;

package/dist/esm/redirects.d.ts

@@ -1,4 +0,0 @@
-import { AnyRedirect, Redirect, RegisteredRouter, ResolvedRedirect } from '@tanstack/router-core';
-export declare function redirect<TRouter extends RegisteredRouter, const TTo extends string | undefined, const TFrom extends string = string, const TMaskFrom extends string = TFrom, const TMaskTo extends string = ''>(opts: Redirect<TRouter, TFrom, TTo, TMaskFrom, TMaskTo>): Redirect<TRouter, TFrom, TTo, TMaskFrom, TMaskTo>;
-export declare function isRedirect(obj: any): obj is AnyRedirect;
-export declare function isResolvedRedirect(obj: any): obj is ResolvedRedirect;

package/dist/esm/redirects.js

@@ -1,29 +0,0 @@
-function redirect(opts) {
-  opts.isRedirect = true;
-  opts.statusCode = opts.statusCode || opts.code || 307;
-  opts.headers = opts.headers || {};
-  if (!opts.reloadDocument) {
-    opts.reloadDocument = false;
-    try {
-      new URL(`${opts.href}`);
-      opts.reloadDocument = true;
-    } catch {
-    }
-  }
-  if (opts.throw) {
-    throw opts;
-  }
-  return opts;
-}
-function isRedirect(obj) {
-  return !!(obj == null ? void 0 : obj.isRedirect);
-}
-function isResolvedRedirect(obj) {
-  return !!(obj == null ? void 0 : obj.isRedirect) && obj.href;
-}
-export {
-  isRedirect,
-  isResolvedRedirect,
-  redirect
-};
-//# sourceMappingURL=redirects.js.map

package/dist/esm/redirects.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"redirects.js","sources":["../../src/redirects.ts"],"sourcesContent":["import type {\n  AnyRedirect,\n  Redirect,\n  RegisteredRouter,\n  ResolvedRedirect,\n} from '@tanstack/router-core'\n\nexport function redirect<\n  TRouter extends RegisteredRouter,\n  const TTo extends string | undefined,\n  const TFrom extends string = string,\n  const TMaskFrom extends string = TFrom,\n  const TMaskTo extends string = '',\n>(\n  opts: Redirect<TRouter, TFrom, TTo, TMaskFrom, TMaskTo>,\n): Redirect<TRouter, TFrom, TTo, TMaskFrom, TMaskTo> {\n  ;(opts as any).isRedirect = true\n  opts.statusCode = opts.statusCode || opts.code || 307\n  opts.headers = opts.headers || {}\n  if (!opts.reloadDocument) {\n    opts.reloadDocument = false\n    try {\n      new URL(`${opts.href}`)\n      opts.reloadDocument = true\n    } catch {}\n  }\n\n  if (opts.throw) {\n    throw opts\n  }\n\n  return opts\n}\n\nexport function isRedirect(obj: any): obj is AnyRedirect {\n  return !!obj?.isRedirect\n}\n\nexport function isResolvedRedirect(obj: any): obj is ResolvedRedirect {\n  return !!obj?.isRedirect && obj.href\n}\n"],"names":[],"mappings":"AAOO,SAAS,SAOd,MACmD;AACjD,OAAa,aAAa;AAC5B,OAAK,aAAa,KAAK,cAAc,KAAK,QAAQ;AAC7C,OAAA,UAAU,KAAK,WAAW,CAAC;AAC5B,MAAA,CAAC,KAAK,gBAAgB;AACxB,SAAK,iBAAiB;AAClB,QAAA;AACF,UAAI,IAAI,GAAG,KAAK,IAAI,EAAE;AACtB,WAAK,iBAAiB;AAAA,IAAA,QAChB;AAAA,IAAA;AAAA,EAAC;AAGX,MAAI,KAAK,OAAO;AACR,UAAA;AAAA,EAAA;AAGD,SAAA;AACT;AAEO,SAAS,WAAW,KAA8B;AAChD,SAAA,CAAC,EAAC,2BAAK;AAChB;AAEO,SAAS,mBAAmB,KAAmC;AACpE,SAAO,CAAC,EAAC,2BAAK,eAAc,IAAI;AAClC;"}

package/dist/source/redirects.d.ts

@@ -1,4 +0,0 @@
-import type { AnyRedirect, Redirect, RegisteredRouter, ResolvedRedirect } from '@tanstack/router-core';
-export declare function redirect<TRouter extends RegisteredRouter, const TTo extends string | undefined, const TFrom extends string = string, const TMaskFrom extends string = TFrom, const TMaskTo extends string = ''>(opts: Redirect<TRouter, TFrom, TTo, TMaskFrom, TMaskTo>): Redirect<TRouter, TFrom, TTo, TMaskFrom, TMaskTo>;
-export declare function isRedirect(obj: any): obj is AnyRedirect;
-export declare function isResolvedRedirect(obj: any): obj is ResolvedRedirect;

package/dist/source/redirects.js

@@ -1,25 +0,0 @@
-export function redirect(opts) {
-    ;
-    opts.isRedirect = true;
-    opts.statusCode = opts.statusCode || opts.code || 307;
-    opts.headers = opts.headers || {};
-    if (!opts.reloadDocument) {
-        opts.reloadDocument = false;
-        try {
-            new URL(`${opts.href}`);
-            opts.reloadDocument = true;
-        }
-        catch { }
-    }
-    if (opts.throw) {
-        throw opts;
-    }
-    return opts;
-}
-export function isRedirect(obj) {
-    return !!obj?.isRedirect;
-}
-export function isResolvedRedirect(obj) {
-    return !!obj?.isRedirect && obj.href;
-}
-//# sourceMappingURL=redirects.js.map

package/dist/source/redirects.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"redirects.js","sourceRoot":"","sources":["../../src/redirects.ts"],"names":[],"mappings":"AAOA,MAAM,UAAU,QAAQ,CAOtB,IAAuD;IAEvD,CAAC;IAAC,IAAY,CAAC,UAAU,GAAG,IAAI,CAAA;IAChC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,IAAI,IAAI,GAAG,CAAA;IACrD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,EAAE,CAAA;IACjC,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;QACzB,IAAI,CAAC,cAAc,GAAG,KAAK,CAAA;QAC3B,IAAI,CAAC;YACH,IAAI,GAAG,CAAC,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;YACvB,IAAI,CAAC,cAAc,GAAG,IAAI,CAAA;QAC5B,CAAC;QAAC,MAAM,CAAC,CAAA,CAAC;IACZ,CAAC;IAED,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,CAAA;IACZ,CAAC;IAED,OAAO,IAAI,CAAA;AACb,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,GAAQ;IACjC,OAAO,CAAC,CAAC,GAAG,EAAE,UAAU,CAAA;AAC1B,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,GAAQ;IACzC,OAAO,CAAC,CAAC,GAAG,EAAE,UAAU,IAAI,GAAG,CAAC,IAAI,CAAA;AACtC,CAAC"}

package/src/redirects.ts

@@ -1,41 +0,0 @@
-import type {
-  AnyRedirect,
-  Redirect,
-  RegisteredRouter,
-  ResolvedRedirect,
-} from '@tanstack/router-core'
-
-export function redirect<
-  TRouter extends RegisteredRouter,
-  const TTo extends string | undefined,
-  const TFrom extends string = string,
-  const TMaskFrom extends string = TFrom,
-  const TMaskTo extends string = '',
->(
-  opts: Redirect<TRouter, TFrom, TTo, TMaskFrom, TMaskTo>,
-): Redirect<TRouter, TFrom, TTo, TMaskFrom, TMaskTo> {
-  ;(opts as any).isRedirect = true
-  opts.statusCode = opts.statusCode || opts.code || 307
-  opts.headers = opts.headers || {}
-  if (!opts.reloadDocument) {
-    opts.reloadDocument = false
-    try {
-      new URL(`${opts.href}`)
-      opts.reloadDocument = true
-    } catch {}
-  }
-
-  if (opts.throw) {
-    throw opts
-  }
-
-  return opts
-}
-
-export function isRedirect(obj: any): obj is AnyRedirect {
-  return !!obj?.isRedirect
-}
-
-export function isResolvedRedirect(obj: any): obj is ResolvedRedirect {
-  return !!obj?.isRedirect && obj.href
-}