@tanstack/start-server-core 1.120.5 → 1.121.0-alpha.3

package/dist/esm/serverRoute.js

@@ -0,0 +1,100 @@
+import { rootRouteId, trimPathLeft, joinPaths } from "@tanstack/router-core";
+function createServerFileRoute(__) {
+  return createServerRoute();
+}
+function createServerRoute(__, __opts) {
+  const options = __opts || {};
+  const route = {
+    path: "",
+    id: "",
+    fullPath: "",
+    to: "",
+    options,
+    parentRoute: void 0,
+    _types: {},
+    // children: undefined as TChildren,
+    middleware: (middlewares) => createServerRoute(void 0, {
+      ...options,
+      middleware: middlewares
+    }),
+    methods: (methodsOrGetMethods) => {
+      const methods = (() => {
+        if (typeof methodsOrGetMethods === "function") {
+          return methodsOrGetMethods(createMethodBuilder());
+        }
+        return methodsOrGetMethods;
+      })();
+      return createServerRoute(void 0, {
+        ...__opts,
+        methods
+      });
+    },
+    update: (opts) => createServerRoute(void 0, {
+      ...options,
+      ...opts
+    }),
+    init: (opts) => {
+      var _a;
+      options.originalIndex = opts.originalIndex;
+      const isRoot = !options.path && !options.id;
+      route.parentRoute = (_a = options.getParentRoute) == null ? void 0 : _a.call(options);
+      if (isRoot) {
+        route.path = rootRouteId;
+      } else if (!route.parentRoute) {
+        throw new Error(
+          `Child Route instances must pass a 'getParentRoute: () => ParentRoute' option that returns a ServerRoute instance.`
+        );
+      }
+      let path = isRoot ? rootRouteId : options.path;
+      if (path && path !== "/") {
+        path = trimPathLeft(path);
+      }
+      const customId = options.id || path;
+      let id = isRoot ? rootRouteId : joinPaths([
+        route.parentRoute.id === rootRouteId ? "" : route.parentRoute.id,
+        customId
+      ]);
+      if (path === rootRouteId) {
+        path = "/";
+      }
+      if (id !== rootRouteId) {
+        id = joinPaths(["/", id]);
+      }
+      const fullPath = id === rootRouteId ? "/" : joinPaths([route.parentRoute.fullPath, path]);
+      route.path = path;
+      route.id = id;
+      route.fullPath = fullPath;
+      route.to = fullPath;
+    },
+    _addFileChildren: (children) => {
+      if (Array.isArray(children)) {
+        route.children = children;
+      }
+      if (typeof children === "object" && children !== null) {
+        route.children = Object.values(children);
+      }
+      return route;
+    },
+    _addFileTypes: () => route
+  };
+  return route;
+}
+const createMethodBuilder = (__opts) => {
+  return {
+    _options: __opts || {},
+    _types: {},
+    middleware: (middlewares) => createMethodBuilder({
+      ...__opts,
+      middlewares
+    }),
+    handler: (handler) => createMethodBuilder({
+      ...__opts,
+      handler
+    })
+  };
+};
+export {
+  createServerFileRoute,
+  createServerRoute
+};
+//# sourceMappingURL=serverRoute.js.map

package/dist/esm/serverRoute.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"serverRoute.js","sources":["../../src/serverRoute.ts"],"sourcesContent":["import { joinPaths, rootRouteId, trimPathLeft } from '@tanstack/router-core'\nimport type {\n  Assign,\n  Constrain,\n  Expand,\n  ResolveParams,\n  RouteConstraints,\n  TrimPathRight,\n} from '@tanstack/router-core'\nimport type {\n  AnyRequestMiddleware,\n  AssignAllServerContext,\n} from '@tanstack/start-client-core'\n\ntype TODO = any\n\nexport function createServerFileRoute<\n  TParentRoute extends AnyServerRouteWithTypes,\n  TId extends RouteConstraints['TId'],\n  TPath extends RouteConstraints['TPath'],\n  TFullPath extends RouteConstraints['TFullPath'],\n  TChildren,\n>(__?: never): ServerRoute<TParentRoute, TId, TPath, TFullPath, TChildren> {\n  return createServerRoute<TParentRoute, TId, TPath, TFullPath, TChildren>(\n    undefined,\n  )\n}\n\nexport interface ServerRouteOptions<\n  TParentRoute extends AnyServerRouteWithTypes,\n  TId extends RouteConstraints['TId'],\n  TPath extends RouteConstraints['TPath'],\n  TFullPath extends RouteConstraints['TFullPath'],\n  TMiddlewares,\n> {\n  id: TId\n  path: TPath\n  pathname: TFullPath\n  originalIndex: number\n  getParentRoute?: () => TParentRoute\n  middleware: Constrain<TMiddlewares, ReadonlyArray<AnyRequestMiddleware>>\n  methods: Record<\n    string,\n    ServerRouteMethodHandlerFn<TParentRoute, TFullPath, TMiddlewares, any, any>\n  >\n  caseSensitive?: boolean\n}\n\nexport type ServerRouteManifest = {\n  middleware: boolean\n  methods: Record<string, { middleware: boolean }>\n}\n\nexport function createServerRoute<\n  TParentRoute extends AnyServerRouteWithTypes,\n  TId extends RouteConstraints['TId'],\n  TPath extends RouteConstraints['TPath'],\n  TFullPath extends RouteConstraints['TFullPath'],\n  TChildren,\n>(\n  __?: never,\n  __opts?: Partial<\n    ServerRouteOptions<TParentRoute, TId, TPath, TFullPath, undefined>\n  >,\n): ServerRoute<TParentRoute, TId, TPath, TFullPath, TChildren> {\n  const options = __opts || {}\n\n  const route: ServerRoute<TParentRoute, TId, TPath, TFullPath, TChildren> = {\n    path: '' as TPath,\n    id: '' as TId,\n    fullPath: '' as TFullPath,\n    to: '' as TrimPathRight<TFullPath>,\n    options: options as TODO,\n    parentRoute: undefined as unknown as TParentRoute,\n    _types: {} as TODO,\n    // children: undefined as TChildren,\n    middleware: (middlewares: TODO) =>\n      createServerRoute(undefined, {\n        ...options,\n        middleware: middlewares,\n      }) as TODO,\n    methods: (methodsOrGetMethods: TODO) => {\n      const methods = (() => {\n        if (typeof methodsOrGetMethods === 'function') {\n          return methodsOrGetMethods(createMethodBuilder())\n        }\n\n        return methodsOrGetMethods\n      })()\n\n      return createServerRoute(undefined, {\n        ...__opts,\n        methods,\n      }) as TODO\n    },\n    update: (opts) =>\n      createServerRoute(undefined, {\n        ...options,\n        ...opts,\n      }) as TODO,\n    init: (opts: { originalIndex: number }): void => {\n      options.originalIndex = opts.originalIndex\n\n      const isRoot = !options.path && !options.id\n\n      route.parentRoute = options.getParentRoute?.() as TParentRoute\n\n      if (isRoot) {\n        route.path = rootRouteId as TPath\n      } else if (!(route.parentRoute as any)) {\n        throw new Error(\n          `Child Route instances must pass a 'getParentRoute: () => ParentRoute' option that returns a ServerRoute instance.`,\n        )\n      }\n\n      let path: undefined | string = isRoot ? rootRouteId : options.path\n\n      // If the path is anything other than an index path, trim it up\n      if (path && path !== '/') {\n        path = trimPathLeft(path)\n      }\n\n      const customId = options.id || path\n\n      // Strip the parentId prefix from the first level of children\n      let id = isRoot\n        ? rootRouteId\n        : joinPaths([\n            route.parentRoute.id === rootRouteId ? '' : route.parentRoute.id,\n            customId,\n          ])\n\n      if (path === rootRouteId) {\n        path = '/'\n      }\n\n      if (id !== rootRouteId) {\n        id = joinPaths(['/', id])\n      }\n\n      const fullPath =\n        id === rootRouteId ? '/' : joinPaths([route.parentRoute.fullPath, path])\n\n      route.path = path as TPath\n      route.id = id as TId\n      route.fullPath = fullPath as TFullPath\n      route.to = fullPath as TrimPathRight<TFullPath>\n    },\n\n    _addFileChildren: (children) => {\n      if (Array.isArray(children)) {\n        route.children = children as TChildren as TODO\n      }\n\n      if (typeof children === 'object' && children !== null) {\n        route.children = Object.values(children) as TChildren as TODO\n      }\n\n      return route as any\n    },\n\n    _addFileTypes: <TFileTypes>() => route,\n  }\n\n  return route\n}\n\nexport type ServerRouteAddFileChildrenFn<\n  in out TParentRoute extends AnyServerRouteWithTypes,\n  in out TId extends RouteConstraints['TId'],\n  in out TPath extends RouteConstraints['TPath'],\n  in out TFullPath extends RouteConstraints['TFullPath'],\n  in out TMiddlewares,\n  in out TMethods,\n  in out TChildren,\n> = (\n  children: TChildren,\n) => ServerRouteWithTypes<\n  TParentRoute,\n  TId,\n  TPath,\n  TFullPath,\n  TMiddlewares,\n  TMethods,\n  TChildren\n>\n\nconst createMethodBuilder = <\n  TParentRoute extends AnyServerRouteWithTypes,\n  TFullPath extends string,\n  TMiddlewares,\n>(\n  __opts?: TODO,\n): ServerRouteMethodBuilder<TParentRoute, TFullPath, TMiddlewares> => {\n  return {\n    _options: __opts || {},\n    _types: {} as TODO,\n    middleware: (middlewares) =>\n      createMethodBuilder({\n        ...__opts,\n        middlewares,\n      }) as TODO,\n    handler: (handler) =>\n      createMethodBuilder({\n        ...__opts,\n        handler,\n      }) as TODO,\n  }\n}\n\nexport type CreateServerFileRoute<\n  TParentRoute extends AnyServerRouteWithTypes,\n  TId extends RouteConstraints['TId'],\n  TPath extends RouteConstraints['TPath'],\n  TFullPath extends RouteConstraints['TFullPath'],\n  TChildren,\n> = (\n  options?: undefined,\n) => ServerRoute<TParentRoute, TId, TPath, TFullPath, TChildren>\n\nexport type AnyServerRouteWithTypes = ServerRouteWithTypes<\n  any,\n  any,\n  any,\n  any,\n  any,\n  any,\n  any\n>\n\nexport interface ServerRouteWithTypes<\n  TParentRoute extends AnyServerRouteWithTypes,\n  TId extends RouteConstraints['TId'],\n  TPath extends RouteConstraints['TPath'],\n  TFullPath extends RouteConstraints['TFullPath'],\n  TMiddlewares,\n  TMethods,\n  TChildren,\n> {\n  _types: ServerRouteTypes<\n    TParentRoute,\n    TId,\n    TPath,\n    TFullPath,\n    TMiddlewares,\n    TMethods\n  >\n  path: TPath\n  id: TId\n  fullPath: TFullPath\n  to: TrimPathRight<TFullPath>\n  parentRoute: TParentRoute\n  children?: TChildren\n  options: ServerRouteOptions<TParentRoute, TId, TPath, TFullPath, TMiddlewares>\n  update: (\n    opts: ServerRouteOptions<TParentRoute, TId, TPath, TFullPath, undefined>,\n  ) => ServerRoute<TParentRoute, TId, TPath, TFullPath, TChildren>\n  init: (opts: { originalIndex: number }) => void\n  _addFileChildren: ServerRouteAddFileChildrenFn<\n    TParentRoute,\n    TId,\n    TPath,\n    TFullPath,\n    TMiddlewares,\n    TMethods,\n    TChildren\n  >\n  _addFileTypes: () => ServerRouteWithTypes<\n    TParentRoute,\n    TId,\n    TPath,\n    TFullPath,\n    TMiddlewares,\n    TMethods,\n    TChildren\n  >\n}\n\nexport interface ServerRouteTypes<\n  TParentRoute extends AnyServerRouteWithTypes,\n  TId extends RouteConstraints['TId'],\n  TPath extends RouteConstraints['TPath'],\n  TFullPath extends RouteConstraints['TFullPath'],\n  TMiddlewares,\n  TMethods,\n> {\n  id: TId\n  path: TPath\n  fullPath: TFullPath\n  middlewares: TMiddlewares\n  methods: TMethods\n  parentRoute: TParentRoute\n  allContext: ResolveAllServerContext<TParentRoute, TMiddlewares>\n}\n\nexport type ResolveAllServerContext<\n  TParentRoute extends AnyServerRouteWithTypes,\n  TMiddlewares,\n> = unknown extends TParentRoute\n  ? AssignAllServerContext<TMiddlewares>\n  : Assign<\n      TParentRoute['_types']['allContext'],\n      AssignAllServerContext<TMiddlewares>\n    >\n\nexport type AnyServerRoute = AnyServerRouteWithTypes\n\nexport interface ServerRoute<\n  TParentRoute extends AnyServerRouteWithTypes,\n  TId extends RouteConstraints['TId'],\n  TPath extends RouteConstraints['TPath'],\n  TFullPath extends RouteConstraints['TFullPath'],\n  TChildren,\n> extends ServerRouteWithTypes<\n      TParentRoute,\n      TId,\n      TPath,\n      TFullPath,\n      undefined,\n      undefined,\n      TChildren\n    >,\n    ServerRouteMiddleware<TParentRoute, TId, TPath, TFullPath, TChildren>,\n    ServerRouteMethods<\n      TParentRoute,\n      TId,\n      TPath,\n      TFullPath,\n      undefined,\n      TChildren\n    > {}\n\nexport interface ServerRouteMiddleware<\n  TParentRoute extends AnyServerRouteWithTypes,\n  TId extends RouteConstraints['TId'],\n  TPath extends RouteConstraints['TPath'],\n  TFullPath extends RouteConstraints['TFullPath'],\n  TChildren,\n> {\n  middleware: <const TNewMiddleware>(\n    middleware: Constrain<TNewMiddleware, ReadonlyArray<AnyRequestMiddleware>>,\n  ) => ServerRouteAfterMiddleware<\n    TParentRoute,\n    TId,\n    TPath,\n    TFullPath,\n    TNewMiddleware,\n    TChildren\n  >\n}\n\nexport interface ServerRouteAfterMiddleware<\n  TParentRoute extends AnyServerRouteWithTypes,\n  TId extends RouteConstraints['TId'],\n  TPath extends RouteConstraints['TPath'],\n  TFullPath extends RouteConstraints['TFullPath'],\n  TMiddlewares,\n  TChildren,\n> extends ServerRouteWithTypes<\n      TParentRoute,\n      TId,\n      TPath,\n      TFullPath,\n      TMiddlewares,\n      undefined,\n      TChildren\n    >,\n    ServerRouteMethods<\n      TParentRoute,\n      TId,\n      TPath,\n      TFullPath,\n      TMiddlewares,\n      TChildren\n    > {}\n\nexport interface ServerRouteMethods<\n  TParentRoute extends AnyServerRouteWithTypes,\n  TId extends RouteConstraints['TId'],\n  TPath extends RouteConstraints['TPath'],\n  TFullPath extends RouteConstraints['TFullPath'],\n  TMiddlewares,\n  TChildren,\n> {\n  methods: <const TMethods>(\n    methodsOrGetMethods: Constrain<\n      TMethods,\n      ServerRouteMethodsOptions<TParentRoute, TFullPath, TMiddlewares>\n    >,\n  ) => ServerRouteAfterMethods<\n    TParentRoute,\n    TId,\n    TPath,\n    TFullPath,\n    TMiddlewares,\n    TMethods,\n    TChildren\n  >\n}\n\nexport type ServerRouteMethodsOptions<\n  TParentRoute extends AnyServerRouteWithTypes,\n  TFullPath extends string,\n  TMiddlewares,\n> =\n  | ServerRouteMethodsRecord<TParentRoute, TFullPath, TMiddlewares>\n  | ((\n      api: ServerRouteMethodBuilder<TParentRoute, TFullPath, TMiddlewares>,\n    ) => ServerRouteMethodsRecord<TParentRoute, TFullPath, TMiddlewares>)\n\nexport interface ServerRouteMethodsRecord<\n  TParentRoute extends AnyServerRouteWithTypes,\n  TFullPath extends string,\n  TMiddlewares,\n> {\n  GET?: ServerRouteMethodRecordValue<TParentRoute, TFullPath, TMiddlewares>\n  POST?: ServerRouteMethodRecordValue<TParentRoute, TFullPath, TMiddlewares>\n  PUT?: ServerRouteMethodRecordValue<TParentRoute, TFullPath, TMiddlewares>\n  PATCH?: ServerRouteMethodRecordValue<TParentRoute, TFullPath, TMiddlewares>\n  DELETE?: ServerRouteMethodRecordValue<TParentRoute, TFullPath, TMiddlewares>\n  OPTIONS?: ServerRouteMethodRecordValue<TParentRoute, TFullPath, TMiddlewares>\n  HEAD?: ServerRouteMethodRecordValue<TParentRoute, TFullPath, TMiddlewares>\n}\n\nexport type ServerRouteMethodRecordValue<\n  TParentRoute extends AnyServerRouteWithTypes,\n  TFullPath extends string,\n  TMiddlewares,\n> =\n  | ServerRouteMethodHandlerFn<\n      TParentRoute,\n      TFullPath,\n      TMiddlewares,\n      undefined,\n      any\n    >\n  | AnyRouteMethodsBuilder\n\nexport type ServerRouteVerb = (typeof ServerRouteVerbs)[number]\n\nexport const ServerRouteVerbs = [\n  'GET',\n  'POST',\n  'PUT',\n  'PATCH',\n  'DELETE',\n  'OPTIONS',\n  'HEAD',\n] as const\n\nexport type ServerRouteMethodHandlerFn<\n  TParentRoute extends AnyServerRouteWithTypes,\n  TFullPath extends string,\n  TMiddlewares,\n  TMethodMiddlewares,\n  TResponse,\n> = (\n  ctx: ServerRouteMethodHandlerCtx<\n    TParentRoute,\n    TFullPath,\n    TMiddlewares,\n    TMethodMiddlewares\n  >,\n) => TResponse | Promise<TResponse>\n\nexport interface ServerRouteMethodHandlerCtx<\n  in out TParentRoute extends AnyServerRouteWithTypes,\n  in out TFullPath extends string,\n  in out TMiddlewares,\n  in out TMethodMiddlewares,\n> {\n  context: Expand<\n    AssignAllMethodContext<TParentRoute, TMiddlewares, TMethodMiddlewares>\n  >\n  request: Request\n  params: Expand<ResolveParams<TFullPath>>\n  pathname: TFullPath\n}\n\nexport type MergeMethodMiddlewares<TMiddlewares, TMethodMiddlewares> =\n  TMiddlewares extends ReadonlyArray<any>\n    ? TMethodMiddlewares extends ReadonlyArray<any>\n      ? readonly [...TMiddlewares, ...TMethodMiddlewares]\n      : TMiddlewares\n    : TMethodMiddlewares\n\nexport type AssignAllMethodContext<\n  TParentRoute extends AnyServerRouteWithTypes,\n  TMiddlewares,\n  TMethodMiddlewares,\n> = ResolveAllServerContext<\n  TParentRoute,\n  MergeMethodMiddlewares<TMiddlewares, TMethodMiddlewares>\n>\n\nexport type AnyRouteMethodsBuilder = ServerRouteMethodBuilderWithTypes<\n  any,\n  any,\n  any,\n  any\n>\n\nexport interface ServerRouteMethodBuilder<\n  TParentRoute extends AnyServerRouteWithTypes,\n  TFullPath extends string,\n  TMiddlewares,\n> extends ServerRouteMethodBuilderWithTypes<\n      TFullPath,\n      TMiddlewares,\n      undefined,\n      undefined\n    >,\n    ServerRouteMethodBuilderMiddleware<TParentRoute, TFullPath, TMiddlewares>,\n    ServerRouteMethodBuilderHandler<\n      TParentRoute,\n      TFullPath,\n      TMiddlewares,\n      undefined\n    > {}\n\nexport interface ServerRouteMethodBuilderWithTypes<\n  TFullPath extends string,\n  TMiddlewares,\n  TMethodMiddlewares,\n  TResponse,\n> {\n  _options: TODO\n  _types: ServerRouteMethodBuilderTypes<\n    TFullPath,\n    TMiddlewares,\n    TMethodMiddlewares,\n    TResponse\n  >\n}\n\nexport interface ServerRouteMethodBuilderTypes<\n  in out TFullPath extends string,\n  in out TMiddlewares,\n  in out TMethodMiddlewares,\n  in out TResponse,\n> {\n  middlewares: TMiddlewares\n  methodMiddleware: TMethodMiddlewares\n  fullPath: TFullPath\n  response: TResponse\n}\n\nexport interface ServerRouteMethodBuilderMiddleware<\n  TParentRoute extends AnyServerRouteWithTypes,\n  TFullPath extends string,\n  TMiddlewares,\n> {\n  middleware: <const TNewMethodMiddlewares>(\n    middleware: Constrain<\n      TNewMethodMiddlewares,\n      ReadonlyArray<AnyRequestMiddleware>\n    >,\n  ) => ServerRouteMethodBuilderAfterMiddleware<\n    TParentRoute,\n    TFullPath,\n    TMiddlewares,\n    TNewMethodMiddlewares\n  >\n}\n\nexport interface ServerRouteMethodBuilderAfterMiddleware<\n  TParentRoute extends AnyServerRouteWithTypes,\n  TFullPath extends string,\n  TMiddlewares,\n  TMethodMiddlewares,\n> extends ServerRouteMethodBuilderWithTypes<\n      TFullPath,\n      TMiddlewares,\n      TMethodMiddlewares,\n      undefined\n    >,\n    ServerRouteMethodBuilderHandler<\n      TParentRoute,\n      TFullPath,\n      TMiddlewares,\n      TMethodMiddlewares\n    > {}\n\nexport interface ServerRouteMethodBuilderHandler<\n  TParentRoute extends AnyServerRouteWithTypes,\n  TFullPath extends string,\n  TMiddlewares,\n  TMethodMiddlewares,\n> {\n  handler: <TResponse>(\n    handler: ServerRouteMethodHandlerFn<\n      TParentRoute,\n      TFullPath,\n      TMiddlewares,\n      TMethodMiddlewares,\n      TResponse\n    >,\n  ) => ServerRouteMethodBuilderAfterHandler<\n    TParentRoute,\n    TFullPath,\n    TMiddlewares,\n    TMethodMiddlewares,\n    TResponse\n  >\n}\n\nexport interface ServerRouteMethodBuilderAfterHandler<\n  TParentRoute extends AnyServerRouteWithTypes,\n  TFullPath extends string,\n  TMiddlewares,\n  TMethodMiddlewares,\n  TResponse,\n> extends ServerRouteMethodBuilderWithTypes<\n    TFullPath,\n    TMiddlewares,\n    TMethodMiddlewares,\n    TResponse\n  > {\n  opts: ServerRouteMethod<\n    TParentRoute,\n    TFullPath,\n    TMiddlewares,\n    TMethodMiddlewares\n  >\n}\n\nexport interface ServerRouteMethod<\n  TParentRoute extends AnyServerRouteWithTypes,\n  TFullPath extends string,\n  TMiddlewares,\n  TMethodMiddlewares,\n> {\n  middleware?: Constrain<TMiddlewares, Array<AnyRequestMiddleware>>\n  handler?: ServerRouteMethodHandlerFn<\n    TParentRoute,\n    TFullPath,\n    TMiddlewares,\n    TMethodMiddlewares,\n    undefined\n  >\n}\n\nexport interface ServerRouteAfterMethods<\n  TParentRoute extends AnyServerRouteWithTypes,\n  TId extends RouteConstraints['TId'],\n  TPath extends RouteConstraints['TPath'],\n  TFullPath extends RouteConstraints['TFullPath'],\n  TMiddlewares,\n  TMethods,\n  TChildren,\n> extends ServerRouteWithTypes<\n    TParentRoute,\n    TId,\n    TPath,\n    TFullPath,\n    TMiddlewares,\n    TMethods,\n    TChildren\n  > {\n  options: ServerRouteOptions<TParentRoute, TId, TPath, TFullPath, TMiddlewares>\n}\n"],"names":[],"mappings":";AAgBO,SAAS,sBAMd,IAAyE;AAClE,SAAA,kBAEP;AACF;AA2BgB,SAAA,kBAOd,IACA,QAG6D;AACvD,QAAA,UAAU,UAAU,CAAC;AAE3B,QAAM,QAAqE;AAAA,IACzE,MAAM;AAAA,IACN,IAAI;AAAA,IACJ,UAAU;AAAA,IACV,IAAI;AAAA,IACJ;AAAA,IACA,aAAa;AAAA,IACb,QAAQ,CAAC;AAAA;AAAA,IAET,YAAY,CAAC,gBACX,kBAAkB,QAAW;AAAA,MAC3B,GAAG;AAAA,MACH,YAAY;AAAA,IAAA,CACb;AAAA,IACH,SAAS,CAAC,wBAA8B;AACtC,YAAM,WAAW,MAAM;AACjB,YAAA,OAAO,wBAAwB,YAAY;AACtC,iBAAA,oBAAoB,qBAAqB;AAAA,QAAA;AAG3C,eAAA;AAAA,MAAA,GACN;AAEH,aAAO,kBAAkB,QAAW;AAAA,QAClC,GAAG;AAAA,QACH;AAAA,MAAA,CACD;AAAA,IACH;AAAA,IACA,QAAQ,CAAC,SACP,kBAAkB,QAAW;AAAA,MAC3B,GAAG;AAAA,MACH,GAAG;AAAA,IAAA,CACJ;AAAA,IACH,MAAM,CAAC,SAA0C;;AAC/C,cAAQ,gBAAgB,KAAK;AAE7B,YAAM,SAAS,CAAC,QAAQ,QAAQ,CAAC,QAAQ;AAEnC,YAAA,eAAc,aAAQ,mBAAR;AAEpB,UAAI,QAAQ;AACV,cAAM,OAAO;AAAA,MAAA,WACJ,CAAE,MAAM,aAAqB;AACtC,cAAM,IAAI;AAAA,UACR;AAAA,QACF;AAAA,MAAA;AAGE,UAAA,OAA2B,SAAS,cAAc,QAAQ;AAG1D,UAAA,QAAQ,SAAS,KAAK;AACxB,eAAO,aAAa,IAAI;AAAA,MAAA;AAGpB,YAAA,WAAW,QAAQ,MAAM;AAG3B,UAAA,KAAK,SACL,cACA,UAAU;AAAA,QACR,MAAM,YAAY,OAAO,cAAc,KAAK,MAAM,YAAY;AAAA,QAC9D;AAAA,MAAA,CACD;AAEL,UAAI,SAAS,aAAa;AACjB,eAAA;AAAA,MAAA;AAGT,UAAI,OAAO,aAAa;AACtB,aAAK,UAAU,CAAC,KAAK,EAAE,CAAC;AAAA,MAAA;AAGpB,YAAA,WACJ,OAAO,cAAc,MAAM,UAAU,CAAC,MAAM,YAAY,UAAU,IAAI,CAAC;AAEzE,YAAM,OAAO;AACb,YAAM,KAAK;AACX,YAAM,WAAW;AACjB,YAAM,KAAK;AAAA,IACb;AAAA,IAEA,kBAAkB,CAAC,aAAa;AAC1B,UAAA,MAAM,QAAQ,QAAQ,GAAG;AAC3B,cAAM,WAAW;AAAA,MAAA;AAGnB,UAAI,OAAO,aAAa,YAAY,aAAa,MAAM;AAC/C,cAAA,WAAW,OAAO,OAAO,QAAQ;AAAA,MAAA;AAGlC,aAAA;AAAA,IACT;AAAA,IAEA,eAAe,MAAkB;AAAA,EACnC;AAEO,SAAA;AACT;AAsBA,MAAM,sBAAsB,CAK1B,WACoE;AAC7D,SAAA;AAAA,IACL,UAAU,UAAU,CAAC;AAAA,IACrB,QAAQ,CAAC;AAAA,IACT,YAAY,CAAC,gBACX,oBAAoB;AAAA,MAClB,GAAG;AAAA,MACH;AAAA,IAAA,CACD;AAAA,IACH,SAAS,CAAC,YACR,oBAAoB;AAAA,MAClB,GAAG;AAAA,MACH;AAAA,IACD,CAAA;AAAA,EACL;AACF;"}

package/dist/esm/ssr-server.js

@@ -52,10 +52,11 @@ ${jsesc(script, { quotes: "backtick" })}\`)` : ""}; if (typeof __TSR_SSR__ !== '
   });
 }
 function dehydrateRouter(router) {
-  var _a, _b;
+  var _a, _b, _c;
   const dehydratedRouter = {
     manifest: router.ssr.manifest,
-    dehydratedData: (_b = (_a = router.options).dehydrate) == null ? void 0 : _b.call(_a)
+    dehydratedData: (_b = (_a = router.options).dehydrate) == null ? void 0 : _b.call(_a),
+    lastMatchId: ((_c = router.state.matches[router.state.matches.length - 1]) == null ? void 0 : _c.id) || ""
   };
   router.serverSsr.injectScript(
     () => `__TSR_SSR__.dehydrated = ${jsesc(

package/dist/esm/ssr-server.js.map

@@ -1 +1 @@
-{"version":3,"file":"ssr-server.js","sources":["../../src/ssr-server.ts"],"sourcesContent":["import { default as warning } from 'tiny-warning'\nimport {\n  TSR_DEFERRED_PROMISE,\n  defer,\n  isPlainArray,\n  isPlainObject,\n  pick,\n} from '@tanstack/router-core'\nimport jsesc from 'jsesc'\nimport { startSerializer } from '@tanstack/start-client-core'\nimport minifiedTsrBootStrapScript from './tsrScript?script-string'\nimport type {\n  ClientExtractedBaseEntry,\n  DehydratedRouter,\n  ResolvePromiseState,\n  SsrMatch,\n} from '@tanstack/start-client-core'\nimport type {\n  AnyRouteMatch,\n  AnyRouter,\n  DeferredPromise,\n  Manifest,\n} from '@tanstack/router-core'\n\nexport type ServerExtractedEntry =\n  | ServerExtractedStream\n  | ServerExtractedPromise\n\nexport interface ServerExtractedBaseEntry extends ClientExtractedBaseEntry {\n  id: number\n  matchIndex: number\n}\n\nexport interface ServerExtractedStream extends ServerExtractedBaseEntry {\n  type: 'stream'\n  stream: ReadableStream\n}\n\nexport interface ServerExtractedPromise extends ServerExtractedBaseEntry {\n  type: 'promise'\n  promise: DeferredPromise<any>\n}\n\nexport function attachRouterServerSsrUtils(\n  router: AnyRouter,\n  manifest: Manifest | undefined,\n) {\n  router.ssr = {\n    manifest,\n    serializer: startSerializer,\n  }\n\n  router.serverSsr = {\n    injectedHtml: [],\n    streamedKeys: new Set(),\n    injectHtml: (getHtml) => {\n      const promise = Promise.resolve().then(getHtml)\n      router.serverSsr!.injectedHtml.push(promise)\n      router.emit({\n        type: 'onInjectedHtml',\n        promise,\n      })\n\n      return promise.then(() => {})\n    },\n    injectScript: (getScript, opts) => {\n      return router.serverSsr!.injectHtml(async () => {\n        const script = await getScript()\n        return `<script class='tsr-once'>${script}${\n          process.env.NODE_ENV === 'development' && (opts?.logScript ?? true)\n            ? `; console.info(\\`Injected From Server:\n${jsesc(script, { quotes: 'backtick' })}\\`)`\n            : ''\n        }; if (typeof __TSR_SSR__ !== 'undefined') __TSR_SSR__.cleanScripts()</script>`\n      })\n    },\n    streamValue: (key, value) => {\n      warning(\n        !router.serverSsr!.streamedKeys.has(key),\n        'Key has already been streamed: ' + key,\n      )\n\n      router.serverSsr!.streamedKeys.add(key)\n      router.serverSsr!.injectScript(\n        () =>\n          `__TSR_SSR__.streamedValues['${key}'] = { value: ${jsesc(\n            router.ssr!.serializer.stringify(value),\n            {\n              isScriptContext: true,\n              wrap: true,\n              json: true,\n            },\n          )}}`,\n      )\n    },\n    onMatchSettled,\n  }\n\n  router.serverSsr.injectScript(() => minifiedTsrBootStrapScript, {\n    logScript: false,\n  })\n}\n\nexport function dehydrateRouter(router: AnyRouter) {\n  const dehydratedRouter: DehydratedRouter = {\n    manifest: router.ssr!.manifest,\n    dehydratedData: router.options.dehydrate?.(),\n  }\n\n  router.serverSsr!.injectScript(\n    () =>\n      `__TSR_SSR__.dehydrated = ${jsesc(\n        router.ssr!.serializer.stringify(dehydratedRouter),\n        {\n          isScriptContext: true,\n          wrap: true,\n          json: true,\n        },\n      )}`,\n  )\n}\n\nexport function extractAsyncLoaderData(\n  loaderData: any,\n  ctx: {\n    match: AnyRouteMatch\n    router: AnyRouter\n  },\n) {\n  const extracted: Array<ServerExtractedEntry> = []\n\n  const replaced = replaceBy(loaderData, (value, path) => {\n    // If it's a stream, we need to tee it so we can read it multiple times\n    if (value instanceof ReadableStream) {\n      const [copy1, copy2] = value.tee()\n      const entry: ServerExtractedStream = {\n        type: 'stream',\n        path,\n        id: extracted.length,\n        matchIndex: ctx.match.index,\n        stream: copy2,\n      }\n\n      extracted.push(entry)\n      return copy1\n    } else if (value instanceof Promise) {\n      const deferredPromise = defer(value)\n      const entry: ServerExtractedPromise = {\n        type: 'promise',\n        path,\n        id: extracted.length,\n        matchIndex: ctx.match.index,\n        promise: deferredPromise,\n      }\n      extracted.push(entry)\n    }\n\n    return value\n  })\n\n  return { replaced, extracted }\n}\n\nexport function onMatchSettled(opts: {\n  router: AnyRouter\n  match: AnyRouteMatch\n}) {\n  const { router, match } = opts\n\n  let extracted: Array<ServerExtractedEntry> | undefined = undefined\n  let serializedLoaderData: any = undefined\n  if (match.loaderData !== undefined) {\n    const result = extractAsyncLoaderData(match.loaderData, {\n      router,\n      match,\n    })\n    match.loaderData = result.replaced\n    extracted = result.extracted\n    serializedLoaderData = extracted.reduce(\n      (acc: any, entry: ServerExtractedEntry) => {\n        return deepImmutableSetByPath(acc, ['temp', ...entry.path], undefined)\n      },\n      { temp: result.replaced },\n    ).temp\n  }\n\n  const initCode = `__TSR_SSR__.initMatch(${jsesc(\n    {\n      id: match.id,\n      __beforeLoadContext: router.ssr!.serializer.stringify(\n        match.__beforeLoadContext,\n      ),\n      loaderData: router.ssr!.serializer.stringify(serializedLoaderData),\n      error: router.ssr!.serializer.stringify(match.error),\n      extracted: extracted?.map((entry) => pick(entry, ['type', 'path'])),\n      updatedAt: match.updatedAt,\n      status: match.status,\n    } satisfies SsrMatch,\n    {\n      isScriptContext: true,\n      wrap: true,\n      json: true,\n    },\n  )})`\n\n  router.serverSsr!.injectScript(() => initCode)\n\n  if (extracted) {\n    extracted.forEach((entry) => {\n      if (entry.type === 'promise') return injectPromise(entry)\n      return injectStream(entry)\n    })\n  }\n\n  function injectPromise(entry: ServerExtractedPromise) {\n    router.serverSsr!.injectScript(async () => {\n      await entry.promise\n\n      return `__TSR_SSR__.resolvePromise(${jsesc(\n        {\n          matchId: match.id,\n          id: entry.id,\n          promiseState: entry.promise[TSR_DEFERRED_PROMISE],\n        } satisfies ResolvePromiseState,\n        {\n          isScriptContext: true,\n          wrap: true,\n          json: true,\n        },\n      )})`\n    })\n  }\n\n  function injectStream(entry: ServerExtractedStream) {\n    // Inject a promise that resolves when the stream is done\n    // We do this to keep the stream open until we're done\n    router.serverSsr!.injectHtml(async () => {\n      //\n      try {\n        const reader = entry.stream.getReader()\n        let chunk: ReadableStreamReadResult<any> | null = null\n        while (!(chunk = await reader.read()).done) {\n          if (chunk.value) {\n            const code = `__TSR_SSR__.injectChunk(${jsesc(\n              {\n                matchId: match.id,\n                id: entry.id,\n                chunk: chunk.value,\n              },\n              {\n                isScriptContext: true,\n                wrap: true,\n                json: true,\n              },\n            )})`\n\n            router.serverSsr!.injectScript(() => code)\n          }\n        }\n\n        router.serverSsr!.injectScript(\n          () =>\n            `__TSR_SSR__.closeStream(${jsesc(\n              {\n                matchId: match.id,\n                id: entry.id,\n              },\n              {\n                isScriptContext: true,\n                wrap: true,\n                json: true,\n              },\n            )})`,\n        )\n      } catch (err) {\n        console.error('stream read error', err)\n      }\n\n      return ''\n    })\n  }\n}\n\nfunction deepImmutableSetByPath<T>(obj: T, path: Array<string>, value: any): T {\n  // immutable set by path retaining array and object references\n  if (path.length === 0) {\n    return value\n  }\n\n  const [key, ...rest] = path\n\n  if (Array.isArray(obj)) {\n    return obj.map((item, i) => {\n      if (i === Number(key)) {\n        return deepImmutableSetByPath(item, rest, value)\n      }\n      return item\n    }) as T\n  }\n\n  if (isPlainObject(obj)) {\n    return {\n      ...obj,\n      [key!]: deepImmutableSetByPath((obj as any)[key!], rest, value),\n    }\n  }\n\n  return obj\n}\n\nexport function replaceBy<T>(\n  obj: T,\n  cb: (value: any, path: Array<string>) => any,\n  path: Array<string> = [],\n): T {\n  if (isPlainArray(obj)) {\n    return obj.map((value, i) => replaceBy(value, cb, [...path, `${i}`])) as any\n  }\n\n  if (isPlainObject(obj)) {\n    // Do not allow objects with illegal\n    const newObj: any = {}\n\n    for (const key in obj) {\n      newObj[key] = replaceBy(obj[key], cb, [...path, key])\n    }\n\n    return newObj\n  }\n\n  // // Detect classes, functions, and other non-serializable objects\n  // // and return undefined. Exclude some known types that are serializable\n  // if (\n  //   typeof obj === 'function' ||\n  //   (typeof obj === 'object' &&\n  //     ![Object, Promise, ReadableStream].includes((obj as any)?.constructor))\n  // ) {\n  //   console.info(obj)\n  //   warning(false, `Non-serializable value ☝️ found at ${path.join('.')}`)\n  //   return undefined as any\n  // }\n\n  const newObj = cb(obj, path)\n\n  if (newObj !== obj) {\n    return newObj\n  }\n\n  return obj\n}\n"],"names":["newObj"],"mappings":"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"}
+{"version":3,"file":"ssr-server.js","sources":["../../src/ssr-server.ts"],"sourcesContent":["import { default as warning } from 'tiny-warning'\nimport {\n  TSR_DEFERRED_PROMISE,\n  defer,\n  isPlainArray,\n  isPlainObject,\n  pick,\n} from '@tanstack/router-core'\nimport jsesc from 'jsesc'\nimport { startSerializer } from '@tanstack/start-client-core'\nimport minifiedTsrBootStrapScript from './tsrScript?script-string'\nimport type {\n  ClientExtractedBaseEntry,\n  DehydratedRouter,\n  ResolvePromiseState,\n  SsrMatch,\n} from '@tanstack/start-client-core'\nimport type {\n  AnyRouteMatch,\n  AnyRouter,\n  DeferredPromise,\n  Manifest,\n} from '@tanstack/router-core'\n\nexport type ServerExtractedEntry =\n  | ServerExtractedStream\n  | ServerExtractedPromise\n\nexport interface ServerExtractedBaseEntry extends ClientExtractedBaseEntry {\n  id: number\n  matchIndex: number\n}\n\nexport interface ServerExtractedStream extends ServerExtractedBaseEntry {\n  type: 'stream'\n  stream: ReadableStream\n}\n\nexport interface ServerExtractedPromise extends ServerExtractedBaseEntry {\n  type: 'promise'\n  promise: DeferredPromise<any>\n}\n\nexport function attachRouterServerSsrUtils(\n  router: AnyRouter,\n  manifest: Manifest | undefined,\n) {\n  router.ssr = {\n    manifest,\n    serializer: startSerializer,\n  }\n\n  router.serverSsr = {\n    injectedHtml: [],\n    streamedKeys: new Set(),\n    injectHtml: (getHtml) => {\n      const promise = Promise.resolve().then(getHtml)\n      router.serverSsr!.injectedHtml.push(promise)\n      router.emit({\n        type: 'onInjectedHtml',\n        promise,\n      })\n\n      return promise.then(() => {})\n    },\n    injectScript: (getScript, opts) => {\n      return router.serverSsr!.injectHtml(async () => {\n        const script = await getScript()\n        return `<script class='tsr-once'>${script}${\n          process.env.NODE_ENV === 'development' && (opts?.logScript ?? true)\n            ? `; console.info(\\`Injected From Server:\n${jsesc(script, { quotes: 'backtick' })}\\`)`\n            : ''\n        }; if (typeof __TSR_SSR__ !== 'undefined') __TSR_SSR__.cleanScripts()</script>`\n      })\n    },\n    streamValue: (key, value) => {\n      warning(\n        !router.serverSsr!.streamedKeys.has(key),\n        'Key has already been streamed: ' + key,\n      )\n\n      router.serverSsr!.streamedKeys.add(key)\n      router.serverSsr!.injectScript(\n        () =>\n          `__TSR_SSR__.streamedValues['${key}'] = { value: ${jsesc(\n            router.ssr!.serializer.stringify(value),\n            {\n              isScriptContext: true,\n              wrap: true,\n              json: true,\n            },\n          )}}`,\n      )\n    },\n    onMatchSettled,\n  }\n\n  router.serverSsr.injectScript(() => minifiedTsrBootStrapScript, {\n    logScript: false,\n  })\n}\n\nexport function dehydrateRouter(router: AnyRouter) {\n  const dehydratedRouter: DehydratedRouter = {\n    manifest: router.ssr!.manifest,\n    dehydratedData: router.options.dehydrate?.(),\n    lastMatchId:\n      router.state.matches[router.state.matches.length - 1]?.id || '',\n  }\n\n  router.serverSsr!.injectScript(\n    () =>\n      `__TSR_SSR__.dehydrated = ${jsesc(\n        router.ssr!.serializer.stringify(dehydratedRouter),\n        {\n          isScriptContext: true,\n          wrap: true,\n          json: true,\n        },\n      )}`,\n  )\n}\n\nexport function extractAsyncLoaderData(\n  loaderData: any,\n  ctx: {\n    match: AnyRouteMatch\n    router: AnyRouter\n  },\n) {\n  const extracted: Array<ServerExtractedEntry> = []\n\n  const replaced = replaceBy(loaderData, (value, path) => {\n    // If it's a stream, we need to tee it so we can read it multiple times\n    if (value instanceof ReadableStream) {\n      const [copy1, copy2] = value.tee()\n      const entry: ServerExtractedStream = {\n        type: 'stream',\n        path,\n        id: extracted.length,\n        matchIndex: ctx.match.index,\n        stream: copy2,\n      }\n\n      extracted.push(entry)\n      return copy1\n    } else if (value instanceof Promise) {\n      const deferredPromise = defer(value)\n      const entry: ServerExtractedPromise = {\n        type: 'promise',\n        path,\n        id: extracted.length,\n        matchIndex: ctx.match.index,\n        promise: deferredPromise,\n      }\n      extracted.push(entry)\n    }\n\n    return value\n  })\n\n  return { replaced, extracted }\n}\n\nexport function onMatchSettled(opts: {\n  router: AnyRouter\n  match: AnyRouteMatch\n}) {\n  const { router, match } = opts\n\n  let extracted: Array<ServerExtractedEntry> | undefined = undefined\n  let serializedLoaderData: any = undefined\n  if (match.loaderData !== undefined) {\n    const result = extractAsyncLoaderData(match.loaderData, {\n      router,\n      match,\n    })\n    match.loaderData = result.replaced\n    extracted = result.extracted\n    serializedLoaderData = extracted.reduce(\n      (acc: any, entry: ServerExtractedEntry) => {\n        return deepImmutableSetByPath(acc, ['temp', ...entry.path], undefined)\n      },\n      { temp: result.replaced },\n    ).temp\n  }\n\n  const initCode = `__TSR_SSR__.initMatch(${jsesc(\n    {\n      id: match.id,\n      __beforeLoadContext: router.ssr!.serializer.stringify(\n        match.__beforeLoadContext,\n      ),\n      loaderData: router.ssr!.serializer.stringify(serializedLoaderData),\n      error: router.ssr!.serializer.stringify(match.error),\n      extracted: extracted?.map((entry) => pick(entry, ['type', 'path'])),\n      updatedAt: match.updatedAt,\n      status: match.status,\n    } satisfies SsrMatch,\n    {\n      isScriptContext: true,\n      wrap: true,\n      json: true,\n    },\n  )})`\n\n  router.serverSsr!.injectScript(() => initCode)\n\n  if (extracted) {\n    extracted.forEach((entry) => {\n      if (entry.type === 'promise') return injectPromise(entry)\n      return injectStream(entry)\n    })\n  }\n\n  function injectPromise(entry: ServerExtractedPromise) {\n    router.serverSsr!.injectScript(async () => {\n      await entry.promise\n\n      return `__TSR_SSR__.resolvePromise(${jsesc(\n        {\n          matchId: match.id,\n          id: entry.id,\n          promiseState: entry.promise[TSR_DEFERRED_PROMISE],\n        } satisfies ResolvePromiseState,\n        {\n          isScriptContext: true,\n          wrap: true,\n          json: true,\n        },\n      )})`\n    })\n  }\n\n  function injectStream(entry: ServerExtractedStream) {\n    // Inject a promise that resolves when the stream is done\n    // We do this to keep the stream open until we're done\n    router.serverSsr!.injectHtml(async () => {\n      //\n      try {\n        const reader = entry.stream.getReader()\n        let chunk: ReadableStreamReadResult<any> | null = null\n        while (!(chunk = await reader.read()).done) {\n          if (chunk.value) {\n            const code = `__TSR_SSR__.injectChunk(${jsesc(\n              {\n                matchId: match.id,\n                id: entry.id,\n                chunk: chunk.value,\n              },\n              {\n                isScriptContext: true,\n                wrap: true,\n                json: true,\n              },\n            )})`\n\n            router.serverSsr!.injectScript(() => code)\n          }\n        }\n\n        router.serverSsr!.injectScript(\n          () =>\n            `__TSR_SSR__.closeStream(${jsesc(\n              {\n                matchId: match.id,\n                id: entry.id,\n              },\n              {\n                isScriptContext: true,\n                wrap: true,\n                json: true,\n              },\n            )})`,\n        )\n      } catch (err) {\n        console.error('stream read error', err)\n      }\n\n      return ''\n    })\n  }\n}\n\nfunction deepImmutableSetByPath<T>(obj: T, path: Array<string>, value: any): T {\n  // immutable set by path retaining array and object references\n  if (path.length === 0) {\n    return value\n  }\n\n  const [key, ...rest] = path\n\n  if (Array.isArray(obj)) {\n    return obj.map((item, i) => {\n      if (i === Number(key)) {\n        return deepImmutableSetByPath(item, rest, value)\n      }\n      return item\n    }) as T\n  }\n\n  if (isPlainObject(obj)) {\n    return {\n      ...obj,\n      [key!]: deepImmutableSetByPath((obj as any)[key!], rest, value),\n    }\n  }\n\n  return obj\n}\n\nexport function replaceBy<T>(\n  obj: T,\n  cb: (value: any, path: Array<string>) => any,\n  path: Array<string> = [],\n): T {\n  if (isPlainArray(obj)) {\n    return obj.map((value, i) => replaceBy(value, cb, [...path, `${i}`])) as any\n  }\n\n  if (isPlainObject(obj)) {\n    // Do not allow objects with illegal\n    const newObj: any = {}\n\n    for (const key in obj) {\n      newObj[key] = replaceBy(obj[key], cb, [...path, key])\n    }\n\n    return newObj\n  }\n\n  // // Detect classes, functions, and other non-serializable objects\n  // // and return undefined. Exclude some known types that are serializable\n  // if (\n  //   typeof obj === 'function' ||\n  //   (typeof obj === 'object' &&\n  //     ![Object, Promise, ReadableStream].includes((obj as any)?.constructor))\n  // ) {\n  //   console.info(obj)\n  //   warning(false, `Non-serializable value ☝️ found at ${path.join('.')}`)\n  //   return undefined as any\n  // }\n\n  const newObj = cb(obj, path)\n\n  if (newObj !== obj) {\n    return newObj\n  }\n\n  return obj\n}\n"],"names":["newObj"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/start-server-core",
-  "version": "1.120.5",
+  "version": "1.121.0-alpha.3",
   "description": "Modern and scalable routing for React applications",
   "author": "Tanner Linsley",
   "license": "MIT",
@@ -47,19 +47,21 @@
     "node": ">=12"
   },
   "dependencies": {
-    "tiny-warning": "^1.0.3",
     "h3": "1.13.0",
     "isbot": "^5.1.22",
     "jsesc": "^3.1.0",
+    "tiny-invariant": "^1.3.3",
+    "tiny-warning": "^1.0.3",
     "unctx": "^2.4.1",
-    "@tanstack/history": "^1.115.0",
-    "@tanstack/router-core": "^1.120.5",
-    "@tanstack/start-client-core": "^1.120.5"
+    "@tanstack/history": "^1.121.0-alpha.1",
+    "@tanstack/router-core": "^1.121.0-alpha.3",
+    "@tanstack/start-client-core": "^1.121.0-alpha.3"
   },
   "devDependencies": {
     "@types/jsesc": "^3.0.3",
     "esbuild": "^0.25.0",
-    "typescript": "^5.7.2"
+    "typescript": "^5.7.2",
+    "vite": "^6.3.5"
   },
   "scripts": {}
 }

package/src/createRequestHandler.ts

@@ -66,9 +66,7 @@ function getRequestHeaders(opts: { router: AnyRouter }): Headers {
   const { redirect } = opts.router.state
 
   if (redirect) {
-    headers = mergeHeaders(headers, redirect.headers, {
-      Location: redirect.href,
-    })
+    headers = mergeHeaders(headers, redirect.headers)
   }
 
   return headers