@tanstack/react-router 1.97.8 → 1.97.16

package/dist/esm/routerContext.d.ts

@@ -1,3 +1,8 @@
-import { Router } from './router.js';
+import { AnyRouter, Router } from './router.js';
 import * as React from 'react';
-export declare function getRouterContext(): React.Context<Router<any, any, any, import('@tanstack/history').RouterHistory, Record<string, any>, Record<string, any>>>;
+declare global {
+    interface Window {
+        __TSR_ROUTER_CONTEXT__?: React.Context<AnyRouter>;
+    }
+}
+export declare function getRouterContext(): React.Context<AnyRouter> | React.Context<Router<any, any, any, import('@tanstack/history').RouterHistory, Record<string, any>, Record<string, any>>>;

package/dist/esm/routerContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"routerContext.js","sources":["../../src/routerContext.tsx"],"sourcesContent":["import * as React from 'react'\nimport type { Router } from './router'\n\nconst routerContext = React.createContext<Router<any, any, any>>(null!)\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":[],"mappings":";AAGA,MAAM,gBAAgB,MAAM,cAAqC,IAAK;AAE/D,SAAS,mBAAmB;AAC7B,MAAA,OAAO,aAAa,aAAa;AAC5B,WAAA;AAAA,EAAA;AAGT,MAAI,OAAO,wBAAwB;AACjC,WAAO,OAAO;AAAA,EAAA;AAGhB,SAAO,yBAAyB;AAEzB,SAAA;AACT;"}
+{"version":3,"file":"routerContext.js","sources":["../../src/routerContext.tsx"],"sourcesContent":["import * as React from 'react'\nimport type { AnyRouter, Router } from './router'\n\ndeclare global {\n  interface Window {\n    __TSR_ROUTER_CONTEXT__?: React.Context<AnyRouter>\n  }\n}\n\nconst routerContext = React.createContext<Router<any, any, any>>(null!)\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":[],"mappings":";AASA,MAAM,gBAAgB,MAAM,cAAqC,IAAK;AAE/D,SAAS,mBAAmB;AAC7B,MAAA,OAAO,aAAa,aAAa;AAC5B,WAAA;AAAA,EAAA;AAGT,MAAI,OAAO,wBAAwB;AACjC,WAAO,OAAO;AAAA,EAAA;AAGhB,SAAO,yBAAyB;AAEzB,SAAA;AACT;"}

package/dist/esm/serializer.d.ts

@@ -0,0 +1,15 @@
+export interface StartSerializer {
+    stringify: (obj: unknown) => string;
+    parse: (str: string) => unknown;
+    encode: <T>(value: T) => T;
+    decode: <T>(value: T) => T;
+}
+export type SerializerStringifyBy<T, TSerializable> = T extends TSerializable ? T : T extends (...args: Array<any>) => any ? 'Function is not serializable' : {
+    [K in keyof T]: SerializerStringifyBy<T[K], TSerializable>;
+};
+export type SerializerParseBy<T, TSerializable> = T extends TSerializable ? T : T extends React.JSX.Element ? ReadableStream : {
+    [K in keyof T]: SerializerParseBy<T[K], TSerializable>;
+};
+export type Serializable = Date | undefined | Error | FormData;
+export type SerializerStringify<T> = SerializerStringifyBy<T, Serializable>;
+export type SerializerParse<T> = SerializerParseBy<T, Serializable>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/react-router",
-  "version": "1.97.8",
+  "version": "1.97.16",
   "description": "Modern and scalable routing for React applications",
   "author": "Tanner Linsley",
   "license": "MIT",

package/src/Match.tsx

@@ -10,7 +10,6 @@ import { createControlledPromise, pick } from './utils'
 import { CatchNotFound, isNotFound } from './not-found'
 import { isRedirect } from './redirects'
 import { matchContext } from './matchContext'
-import { defaultDeserializeError, isServerSideError } from './isServerSideError'
 import { SafeFragment } from './SafeFragment'
 import { renderRouteNotFound } from './renderRouteNotFound'
 import { rootRouteId } from './root'
@@ -157,19 +156,8 @@ export const MatchInner = React.memo(function MatchInnerImpl({
     ErrorComponent
 
   if (match.status === 'notFound') {
-    let error: unknown
-    if (isServerSideError(match.error)) {
-      const deserializeError =
-        router.options.errorSerializer?.deserialize ?? defaultDeserializeError
-
-      error = deserializeError(match.error.data)
-    } else {
-      error = match.error
-    }
-
-    invariant(isNotFound(error), 'Expected a notFound error')
-
-    return renderRouteNotFound(router, route, error)
+    invariant(isNotFound(match.error), 'Expected a notFound error')
+    return renderRouteNotFound(router, route, match.error)
   }
 
   if (match.status === 'redirected') {
@@ -201,13 +189,7 @@ export const MatchInner = React.memo(function MatchInnerImpl({
       )
     }
 
-    if (isServerSideError(match.error)) {
-      const deserializeError =
-        router.options.errorSerializer?.deserialize ?? defaultDeserializeError
-      throw deserializeError(match.error.data)
-    } else {
-      throw match.error
-    }
+    throw match.error
   }
 
   if (match.status === 'pending') {
@@ -241,14 +223,7 @@ export const MatchInner = React.memo(function MatchInnerImpl({
     throw router.getMatch(match.id)?.loadPromise
   }
 
-  return (
-    <>
-      {out}
-      {router.AfterEachMatch ? (
-        <router.AfterEachMatch match={match} matchIndex={matchIndex} />
-      ) : null}
-    </>
-  )
+  return out
 })
 
 export const Outlet = React.memo(function OutletImpl() {

package/src/Matches.tsx

@@ -219,7 +219,7 @@ export function Matches() {
 
   // Do not render a root Suspense during SSR or hydrating from SSR
   const ResolvedSuspense =
-    router.isServer || (typeof document !== 'undefined' && window.__TSR__)
+    router.isServer || (typeof document !== 'undefined' && router.clientSsr)
       ? SafeFragment
       : React.Suspense
 

package/src/RouterProvider.tsx

@@ -54,8 +54,6 @@ export type BuildLocationFn = <
   },
 ) => ParsedLocation
 
-export type InjectedHtmlEntry = string | (() => Promise<string> | string)
-
 export function RouterContextProvider<
   TRouter extends AnyRouter = RegisteredRouter,
   TDehydrated extends Record<string, any> = Record<string, any>,
@@ -79,7 +77,9 @@ export function RouterContextProvider<
   const routerContext = getRouterContext()
 
   const provider = (
-    <routerContext.Provider value={router}>{children}</routerContext.Provider>
+    <routerContext.Provider value={router as AnyRouter}>
+      {children}
+    </routerContext.Provider>
   )
 
   if (router.options.Wrap) {

package/src/ScriptOnce.tsx

@@ -1,4 +1,4 @@
-import { useRouter } from './useRouter'
+import jsesc from 'jsesc'
 
 export function ScriptOnce({
   children,
@@ -6,9 +6,27 @@ export function ScriptOnce({
 }: {
   children: string
   log?: boolean
+  sync?: boolean
 }) {
-  const router = useRouter()
+  if (typeof document !== 'undefined') {
+    return null
+  }
 
-  router.injectScript(children, { logScript: log })
-  return null
+  return (
+    <script
+      className="tsr-once"
+      dangerouslySetInnerHTML={{
+        __html: [
+          children,
+          (log ?? true) && process.env.NODE_ENV === 'development'
+            ? `console.info(\`Injected From Server:
+${jsesc(children.toString(), { quotes: 'backtick' })}\`)`
+            : '',
+          'if (typeof __TSR__ !== "undefined") __TSR__.cleanScripts()',
+        ]
+          .filter(Boolean)
+          .join('\n'),
+      }}
+    />
+  )
 }

package/src/Transitioner.tsx

@@ -65,7 +65,7 @@ export function Transitioner() {
   // Try to load the initial location
   useLayoutEffect(() => {
     if (
-      (typeof window !== 'undefined' && window.__TSR__?.dehydrated) ||
+      (typeof window !== 'undefined' && router.clientSsr) ||
       (mountLoadForRouter.current.router === router &&
         mountLoadForRouter.current.mounted)
     ) {

package/src/awaited.tsx

@@ -1,9 +1,6 @@
 import * as React from 'react'
-import warning from 'tiny-warning'
-import { useRouter } from './useRouter'
-import { defaultSerializeError } from './router'
+
 import { TSR_DEFERRED_PROMISE, defer } from './defer'
-import { defaultDeserializeError, isServerSideError } from './isServerSideError'
 import type { DeferredPromise } from './defer'
 
 export type AwaitOptions<T> = {
@@ -13,7 +10,6 @@ export type AwaitOptions<T> = {
 export function useAwaited<T>({
   promise: _promise,
 }: AwaitOptions<T>): [T, DeferredPromise<T>] {
-  const router = useRouter()
   const promise = defer(_promise)
 
   if (promise[TSR_DEFERRED_PROMISE].status === 'pending') {
@@ -21,27 +17,9 @@ export function useAwaited<T>({
   }
 
   if (promise[TSR_DEFERRED_PROMISE].status === 'error') {
-    if (typeof document !== 'undefined') {
-      if (isServerSideError(promise[TSR_DEFERRED_PROMISE].error)) {
-        throw (
-          router.options.errorSerializer?.deserialize ?? defaultDeserializeError
-        )(promise[TSR_DEFERRED_PROMISE].error.data as any)
-      } else {
-        warning(
-          false,
-          "Encountered a server-side error that doesn't fit the expected shape",
-        )
-        throw promise[TSR_DEFERRED_PROMISE].error
-      }
-    } else {
-      throw {
-        data: (
-          router.options.errorSerializer?.serialize ?? defaultSerializeError
-        )(promise[TSR_DEFERRED_PROMISE].error),
-        __isServerError: true,
-      }
-    }
+    throw promise[TSR_DEFERRED_PROMISE].error
   }
+
   return [promise[TSR_DEFERRED_PROMISE].data, promise]
 }
 

package/src/index.tsx

@@ -17,8 +17,6 @@ export { default as warning } from 'tiny-warning'
 export { useAwaited, Await } from './awaited'
 export type { AwaitOptions } from './awaited'
 
-export { ScriptOnce } from './ScriptOnce'
-
 export { defer, TSR_DEFERRED_PROMISE } from './defer'
 export type { DeferredPromiseState, DeferredPromise } from './defer'
 
@@ -95,15 +93,9 @@ export type {
 } from './Matches'
 
 export { matchContext } from './matchContext'
-
 export { Match, Outlet } from './Match'
-
-export { isServerSideError, defaultDeserializeError } from './isServerSideError'
-
 export { useMatch } from './useMatch'
-
 export { useLoaderDeps } from './useLoaderDeps'
-
 export { useLoaderData } from './useLoaderData'
 
 export {
@@ -239,7 +231,6 @@ export type {
   Register,
   AnyRouter,
   RegisteredRouter,
-  HydrationCtx,
   RouterContextOptions,
   TrailingSlashOption,
   RouterOptions,
@@ -247,23 +238,24 @@ export type {
   RouterState,
   ListenerFn,
   BuildNextOptions,
-  DehydratedRouterState,
-  DehydratedRouteMatch,
-  DehydratedRouter,
   RouterConstructorOptions,
   RouterEvents,
   RouterEvent,
   RouterListener,
   AnyRouterWithContext,
-  ClientExtractedBaseEntry,
-  ClientExtractedEntry,
-  ClientExtractedPromise,
   ControllablePromise,
-  StreamState,
-  TSRGlobal,
-  TSRGlobalMatch,
+  InjectedHtmlEntry,
 } from './router'
 
+export type {
+  StartSerializer,
+  Serializable,
+  SerializerParse,
+  SerializerParseBy,
+  SerializerStringify,
+  SerializerStringifyBy,
+} from './serializer'
+
 export { RouterProvider, RouterContextProvider } from './RouterProvider'
 export type {
   RouterProps,
@@ -271,7 +263,6 @@ export type {
   MatchLocation,
   NavigateFn,
   BuildLocationFn,
-  InjectedHtmlEntry,
 } from './RouterProvider'
 
 export {
@@ -289,16 +280,6 @@ export {
 } from './searchParams'
 export type { SearchSerializer, SearchParser } from './searchParams'
 
-export { defaultTransformer } from './transformer'
-export type {
-  RouterTransformer,
-  TransformerParse,
-  TransformerStringify,
-  DefaultSerializable,
-  DefaultTransformerParse,
-  DefaultTransformerStringify,
-} from './transformer'
-
 export type { UseBlockerOpts, ShouldBlockFn } from './useBlocker'
 export { useBlocker, Block } from './useBlocker'
 
@@ -306,7 +287,6 @@ export { useNavigate, Navigate } from './useNavigate'
 export type { UseNavigateResult } from './useNavigate'
 
 export { useParams } from './useParams'
-
 export { useSearch } from './useSearch'
 
 export {
@@ -314,13 +294,9 @@ export {
 } from './routerContext'
 
 export { useRouteContext } from './useRouteContext'
-
 export { useRouter } from './useRouter'
-
 export { useRouterState } from './useRouterState'
-
 export { useLocation } from './useLocation'
-
 export { useCanGoBack } from './useCanGoBack'
 
 export {
@@ -377,3 +353,5 @@ export type {
 export { retainSearchParams, stripSearchParams } from './searchMiddleware'
 
 export * from './typePrimitives'
+
+export { ScriptOnce } from './ScriptOnce'