@tanstack/start-server-core 1.120.4-alpha.10 → 1.120.4-alpha.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (20) hide show
  1. package/dist/cjs/createStartHandler.cjs +19 -2
  2. package/dist/cjs/createStartHandler.cjs.map +1 -1
  3. package/dist/cjs/index.cjs +0 -3
  4. package/dist/cjs/index.cjs.map +1 -1
  5. package/dist/cjs/index.d.cts +0 -1
  6. package/dist/esm/createStartHandler.js +20 -3
  7. package/dist/esm/createStartHandler.js.map +1 -1
  8. package/dist/esm/index.d.ts +0 -1
  9. package/dist/esm/index.js +0 -3
  10. package/dist/esm/index.js.map +1 -1
  11. package/package.json +4 -4
  12. package/src/createStartHandler.ts +21 -2
  13. package/src/index.tsx +0 -2
  14. package/dist/cjs/undici.cjs +0 -14
  15. package/dist/cjs/undici.cjs.map +0 -1
  16. package/dist/cjs/undici.d.cts +0 -43
  17. package/dist/esm/undici.d.ts +0 -43
  18. package/dist/esm/undici.js +0 -14
  19. package/dist/esm/undici.js.map +0 -1
  20. package/src/undici.ts +0 -60
package/dist/cjs/createStartHandler.cjs CHANGED
@@ -126,6 +126,20 @@ function createStartHandler({
126
126
  }
127
127
  })();
128
128
  if (routerCore.isRedirect(response)) {
129
+ if (routerCore.isResolvedRedirect(response)) {
130
+ if (request.headers.get("x-tsr-redirect") === "manual") {
131
+ return startClientCore.json(
132
+ {
133
+ ...response.options,
134
+ isSerializedRedirect: true
135
+ },
136
+ {
137
+ headers: response.headers
138
+ }
139
+ );
140
+ }
141
+ return response;
142
+ }
129
143
  if (response.options.to && typeof response.options.to === "string" && !response.options.to.startsWith("/")) {
130
144
  throw new Error(
131
145
  `Server side redirects must use absolute paths via the 'href' or 'to' options. Received: ${JSON.stringify(response.options)}`
@@ -148,7 +162,7 @@ function createStartHandler({
148
162
  isSerializedRedirect: true
149
163
  },
150
164
  {
151
- headers: redirect.headers
165
+ headers: response.headers
152
166
  }
153
167
  );
154
168
  }
@@ -254,7 +268,10 @@ function handleCtxResult(result) {
254
268
  return result;
255
269
  }
256
270
  function isSpecialResponse(err) {
257
- return err instanceof Response || routerCore.isRedirect(err);
271
+ return isResponse(err) || routerCore.isRedirect(err);
272
+ }
273
+ function isResponse(response) {
274
+ return response instanceof Response;
258
275
  }
259
276
  exports.createStartHandler = createStartHandler;
260
277
  exports.getStartResponseHeaders = getStartResponseHeaders;
package/dist/cjs/createStartHandler.cjs.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"createStartHandler.cjs","sources":["../../src/createStartHandler.ts"],"sourcesContent":["import { createMemoryHistory } from '@tanstack/history'\nimport {\n flattenMiddlewares,\n json,\n mergeHeaders,\n} from '@tanstack/start-client-core'\nimport {\n getMatchedRoutes,\n isRedirect,\n joinPaths,\n processRouteTree,\n rootRouteId,\n trimPath,\n tsrRedirectHeaderKey,\n} from '@tanstack/router-core'\nimport { getResponseHeaders, requestHandler } from './h3'\nimport { attachRouterServerSsrUtils, dehydrateRouter } from './ssr-server'\nimport { getStartManifest } from './router-manifest'\nimport { handleServerAction } from './server-functions-handler'\nimport type { AnyServerRoute, AnyServerRouteWithTypes } from './serverRoute'\nimport type { RequestHandler } from './h3'\nimport type { AnyRouter } from '@tanstack/router-core'\nimport type { HandlerCallback } from './handlerCallback'\n\ntype TODO = any\n\nexport type CustomizeStartHandler<TRouter extends AnyRouter> = (\n cb: HandlerCallback<TRouter>,\n) => RequestHandler\n\nexport function getStartResponseHeaders(opts: { router: AnyRouter }) {\n let headers = mergeHeaders(\n getResponseHeaders(),\n {\n 'Content-Type': 'text/html; charset=UTF-8',\n },\n ...opts.router.state.matches.map((match) => {\n return match.headers\n }),\n )\n // Handle Redirects\n const { redirect } = opts.router.state\n\n if (redirect) {\n headers = mergeHeaders(headers, redirect.headers)\n }\n return headers\n}\n\nexport function createStartHandler<TRouter extends AnyRouter>({\n createRouter,\n}: {\n createRouter: () => TRouter\n}): CustomizeStartHandler<TRouter> {\n return (cb) => {\n return requestHandler(async ({ request }) => {\n const url = new URL(request.url)\n const href = url.href.replace(url.origin, '')\n\n // Create a history for the client-side router\n const history = createMemoryHistory({\n initialEntries: [href],\n })\n\n // Create the client-side router\n const router = createRouter()\n\n // Attach the server-side SSR utils to the client-side router\n attachRouterServerSsrUtils(router, getStartManifest())\n\n // Update the client-side router with the history and context\n router.update({\n history,\n })\n\n const response = await (async () => {\n try {\n if (!process.env.TSS_SERVER_FN_BASE) {\n throw new Error(\n 'tanstack/start-server-core: TSS_SERVER_FN_BASE must be defined in your environment for createStartHandler()',\n )\n }\n\n // First, let's attempt to handle server functions\n // Add trailing slash to sanitise user defined TSS_SERVER_FN_BASE\n const serverFnBase = joinPaths([\n '/',\n trimPath(process.env.TSS_SERVER_FN_BASE),\n '/',\n ])\n if (href.startsWith(serverFnBase)) {\n return await handleServerAction({ request })\n }\n\n // Then move on to attempting to load server routes\n const serverRouteTreeModule = await (async () => {\n try {\n // @ts-expect-error\n return (await import('tanstack:server-routes')) as {\n routeTree: AnyServerRoute\n }\n } catch (e) {\n console.log(e)\n return undefined\n }\n })()\n\n // If we have a server route tree, then we try matching to see if we have a\n // server route that matches the request.\n if (serverRouteTreeModule) {\n const [_matchedRoutes, response] = await handleServerRoutes({\n routeTree: serverRouteTreeModule.routeTree,\n request,\n })\n\n if (response) return response\n }\n\n const requestAcceptHeader = request.headers.get('Accept') || '*/*'\n const splitRequestAcceptHeader = requestAcceptHeader.split(',')\n\n const supportedMimeTypes = ['*/*', 'text/html']\n const isRouterAcceptSupported = supportedMimeTypes.some((mimeType) =>\n splitRequestAcceptHeader.some((acceptedMimeType) =>\n acceptedMimeType.trim().startsWith(mimeType),\n ),\n )\n\n if (!isRouterAcceptSupported) {\n return json(\n {\n error: 'Only HTML requests are supported here',\n },\n {\n status: 500,\n },\n )\n }\n\n // If no Server Routes were found, so fallback to normal SSR matching using\n // the router\n\n await router.load()\n\n // If there was a redirect, skip rendering the page at all\n if (router.state.redirect) return router.state.redirect\n\n dehydrateRouter(router)\n\n const responseHeaders = getStartResponseHeaders({ router })\n const response = await cb({\n request,\n router,\n responseHeaders,\n })\n\n return response\n } catch (err) {\n if (err instanceof Response) {\n return err\n }\n\n throw err\n }\n })()\n\n if (isRedirect(response)) {\n if (\n response.options.to &&\n typeof response.options.to === 'string' &&\n !response.options.to.startsWith('/')\n ) {\n throw new Error(\n `Server side redirects must use absolute paths via the 'href' or 'to' options. Received: ${JSON.stringify(response.options)}`,\n )\n }\n\n if (\n ['params', 'search', 'hash'].some(\n (d) => typeof (response.options as any)[d] === 'function',\n )\n ) {\n throw new Error(\n `Server side redirects must use static search, params, and hash values and do not support functional values. Received functional values for: ${Object.keys(\n response.options,\n )\n .filter((d) => typeof (response.options as any)[d] === 'function')\n .map((d) => `\"${d}\"`)\n .join(', ')}`,\n )\n }\n\n const redirect = router.resolveRedirect(response)\n\n if (request.headers.get('x-tsr-redirect') === 'manual') {\n return json(\n {\n ...response.options,\n isSerializedRedirect: true,\n },\n {\n headers: redirect.headers,\n },\n )\n }\n\n return redirect\n }\n\n // Add Access-Control-Expose-Headers\n // With HTTPs the response/header objects are immutable, therefore we must clone them\n const body =\n response.status === 204 ? null : await response.clone().blob()\n const headers = new Headers(response.headers)\n headers.append('Access-Control-Expose-Headers', tsrRedirectHeaderKey)\n\n return new Response(body, {\n status: response.status,\n statusText: response.statusText,\n headers,\n })\n })\n }\n}\n\nasync function handleServerRoutes({\n routeTree,\n request,\n}: {\n routeTree: AnyServerRouteWithTypes\n request: Request\n}) {\n const { flatRoutes, routesById, routesByPath } = processRouteTree({\n routeTree,\n initRoute: (route, i) => {\n route.init({\n originalIndex: i,\n })\n },\n })\n\n const url = new URL(request.url)\n const pathname = url.pathname\n\n const history = createMemoryHistory({\n initialEntries: [pathname],\n })\n\n const { matchedRoutes, foundRoute, routeParams } =\n getMatchedRoutes<AnyServerRouteWithTypes>({\n pathname: history.location.pathname,\n basepath: '/',\n caseSensitive: true,\n routesByPath,\n routesById,\n flatRoutes,\n })\n\n let response: Response | undefined\n\n if (foundRoute && foundRoute.id !== rootRouteId) {\n // We've found a server route that matches the request, so we can call it.\n // TODO: Get the input type-signature correct\n // TODO: Perform the middlewares?\n // TODO: Error handling? What happens when its `throw redirect()` vs `throw new Error()`?\n\n const method = Object.keys(foundRoute.options.methods).find(\n (method) => method.toLowerCase() === request.method.toLowerCase(),\n )\n\n if (method) {\n const handler = foundRoute.options.methods[method]\n\n if (handler) {\n const middlewares = flattenMiddlewares(\n matchedRoutes.flatMap((r) => r.options.middleware).filter(Boolean),\n ).map((d) => d.options.server)\n\n middlewares.push(handlerToMiddleware(handler) as TODO)\n\n // TODO: This is starting to feel too much like a server function\n // Do generalize the existing middleware execution? Or do we need to\n // build a new middleware execution system for server routes?\n const ctx = await executeMiddleware(middlewares, {\n request,\n context: {},\n params: routeParams,\n pathname: history.location.pathname,\n })\n\n response = ctx.response\n }\n }\n }\n\n // We return the matched routes too so if\n // the app router happens to match the same path,\n // it can use any request middleware from server routes\n return [matchedRoutes, response] as const\n}\n\nfunction handlerToMiddleware(\n handler: AnyServerRouteWithTypes['options']['methods'][string],\n) {\n return async ({ next, ...rest }: TODO) => ({\n response: await handler(rest),\n })\n}\n\nfunction executeMiddleware(middlewares: TODO, ctx: TODO) {\n let index = -1\n\n const next = async (ctx: TODO) => {\n index++\n const middleware = middlewares[index]\n if (!middleware) return ctx\n\n const result = await middleware({\n ...ctx,\n // Allow the middleware to call the next middleware in the chain\n next: async (nextCtx: TODO) => {\n // Allow the caller to extend the context for the next middleware\n const nextResult = await next({ ...ctx, ...nextCtx })\n\n // Merge the result into the context\\\n return Object.assign(ctx, handleCtxResult(nextResult))\n },\n // Allow the middleware result to extend the return context\n }).catch((err: TODO) => {\n if (isSpecialResponse(err)) {\n return {\n response: err,\n }\n }\n\n throw err\n })\n\n // Merge the middleware result into the context, just in case it\n // returns a partial context\n return Object.assign(ctx, handleCtxResult(result))\n }\n\n return handleCtxResult(next(ctx))\n}\n\nfunction handleCtxResult(result: TODO) {\n if (isSpecialResponse(result)) {\n return {\n response: result,\n }\n }\n\n return result\n}\n\nfunction isSpecialResponse(err: TODO) {\n return err instanceof Response || isRedirect(err)\n}\n"],"names":["mergeHeaders","getResponseHeaders","requestHandler","history","createMemoryHistory","attachRouterServerSsrUtils","getStartManifest","joinPaths","trimPath","handleServerAction","response","json","dehydrateRouter","isRedirect","tsrRedirectHeaderKey","processRouteTree","getMatchedRoutes","rootRouteId","method","flattenMiddlewares","ctx"],"mappings":"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"}
1
+ {"version":3,"file":"createStartHandler.cjs","sources":["../../src/createStartHandler.ts"],"sourcesContent":["import { createMemoryHistory } from '@tanstack/history'\nimport {\n flattenMiddlewares,\n json,\n mergeHeaders,\n} from '@tanstack/start-client-core'\nimport {\n getMatchedRoutes,\n isRedirect,\n isResolvedRedirect,\n joinPaths,\n processRouteTree,\n rootRouteId,\n trimPath,\n tsrRedirectHeaderKey,\n} from '@tanstack/router-core'\nimport { getResponseHeaders, requestHandler } from './h3'\nimport { attachRouterServerSsrUtils, dehydrateRouter } from './ssr-server'\nimport { getStartManifest } from './router-manifest'\nimport { handleServerAction } from './server-functions-handler'\nimport type { AnyServerRoute, AnyServerRouteWithTypes } from './serverRoute'\nimport type { RequestHandler } from './h3'\nimport type { AnyRouter } from '@tanstack/router-core'\nimport type { HandlerCallback } from './handlerCallback'\n\ntype TODO = any\n\nexport type CustomizeStartHandler<TRouter extends AnyRouter> = (\n cb: HandlerCallback<TRouter>,\n) => RequestHandler\n\nexport function getStartResponseHeaders(opts: { router: AnyRouter }) {\n let headers = mergeHeaders(\n getResponseHeaders(),\n {\n 'Content-Type': 'text/html; charset=UTF-8',\n },\n ...opts.router.state.matches.map((match) => {\n return match.headers\n }),\n )\n // Handle Redirects\n const { redirect } = opts.router.state\n\n if (redirect) {\n headers = mergeHeaders(headers, redirect.headers)\n }\n return headers\n}\n\nexport function createStartHandler<TRouter extends AnyRouter>({\n createRouter,\n}: {\n createRouter: () => TRouter\n}): CustomizeStartHandler<TRouter> {\n return (cb) => {\n return requestHandler(async ({ request }) => {\n const url = new URL(request.url)\n const href = url.href.replace(url.origin, '')\n\n // Create a history for the client-side router\n const history = createMemoryHistory({\n initialEntries: [href],\n })\n\n // Create the client-side router\n const router = createRouter()\n\n // Attach the server-side SSR utils to the client-side router\n attachRouterServerSsrUtils(router, getStartManifest())\n\n // Update the client-side router with the history and context\n router.update({\n history,\n })\n\n const response = await (async () => {\n try {\n if (!process.env.TSS_SERVER_FN_BASE) {\n throw new Error(\n 'tanstack/start-server-core: TSS_SERVER_FN_BASE must be defined in your environment for createStartHandler()',\n )\n }\n\n // First, let's attempt to handle server functions\n // Add trailing slash to sanitise user defined TSS_SERVER_FN_BASE\n const serverFnBase = joinPaths([\n '/',\n trimPath(process.env.TSS_SERVER_FN_BASE),\n '/',\n ])\n if (href.startsWith(serverFnBase)) {\n return await handleServerAction({ request })\n }\n\n // Then move on to attempting to load server routes\n const serverRouteTreeModule = await (async () => {\n try {\n // @ts-expect-error\n return (await import('tanstack:server-routes')) as {\n routeTree: AnyServerRoute\n }\n } catch (e) {\n console.log(e)\n return undefined\n }\n })()\n\n // If we have a server route tree, then we try matching to see if we have a\n // server route that matches the request.\n if (serverRouteTreeModule) {\n const [_matchedRoutes, response] = await handleServerRoutes({\n routeTree: serverRouteTreeModule.routeTree,\n request,\n })\n\n if (response) return response\n }\n\n const requestAcceptHeader = request.headers.get('Accept') || '*/*'\n const splitRequestAcceptHeader = requestAcceptHeader.split(',')\n\n const supportedMimeTypes = ['*/*', 'text/html']\n const isRouterAcceptSupported = supportedMimeTypes.some((mimeType) =>\n splitRequestAcceptHeader.some((acceptedMimeType) =>\n acceptedMimeType.trim().startsWith(mimeType),\n ),\n )\n\n if (!isRouterAcceptSupported) {\n return json(\n {\n error: 'Only HTML requests are supported here',\n },\n {\n status: 500,\n },\n )\n }\n\n // If no Server Routes were found, so fallback to normal SSR matching using\n // the router\n\n await router.load()\n\n // If there was a redirect, skip rendering the page at all\n if (router.state.redirect) return router.state.redirect\n\n dehydrateRouter(router)\n\n const responseHeaders = getStartResponseHeaders({ router })\n const response = await cb({\n request,\n router,\n responseHeaders,\n })\n\n return response\n } catch (err) {\n if (err instanceof Response) {\n return err\n }\n\n throw err\n }\n })()\n\n if (isRedirect(response)) {\n if (isResolvedRedirect(response)) {\n if (request.headers.get('x-tsr-redirect') === 'manual') {\n return json(\n {\n ...response.options,\n isSerializedRedirect: true,\n },\n {\n headers: response.headers,\n },\n )\n }\n return response\n }\n if (\n response.options.to &&\n typeof response.options.to === 'string' &&\n !response.options.to.startsWith('/')\n ) {\n throw new Error(\n `Server side redirects must use absolute paths via the 'href' or 'to' options. Received: ${JSON.stringify(response.options)}`,\n )\n }\n\n if (\n ['params', 'search', 'hash'].some(\n (d) => typeof (response.options as any)[d] === 'function',\n )\n ) {\n throw new Error(\n `Server side redirects must use static search, params, and hash values and do not support functional values. Received functional values for: ${Object.keys(\n response.options,\n )\n .filter((d) => typeof (response.options as any)[d] === 'function')\n .map((d) => `\"${d}\"`)\n .join(', ')}`,\n )\n }\n\n const redirect = router.resolveRedirect(response)\n\n if (request.headers.get('x-tsr-redirect') === 'manual') {\n return json(\n {\n ...response.options,\n isSerializedRedirect: true,\n },\n {\n headers: response.headers,\n },\n )\n }\n\n return redirect\n }\n\n // Add Access-Control-Expose-Headers\n // With HTTPs the response/header objects are immutable, therefore we must clone them\n const body =\n response.status === 204 ? null : await response.clone().blob()\n const headers = new Headers(response.headers)\n headers.append('Access-Control-Expose-Headers', tsrRedirectHeaderKey)\n\n return new Response(body, {\n status: response.status,\n statusText: response.statusText,\n headers,\n })\n })\n }\n}\n\nasync function handleServerRoutes({\n routeTree,\n request,\n}: {\n routeTree: AnyServerRouteWithTypes\n request: Request\n}) {\n const { flatRoutes, routesById, routesByPath } = processRouteTree({\n routeTree,\n initRoute: (route, i) => {\n route.init({\n originalIndex: i,\n })\n },\n })\n\n const url = new URL(request.url)\n const pathname = url.pathname\n\n const history = createMemoryHistory({\n initialEntries: [pathname],\n })\n\n const { matchedRoutes, foundRoute, routeParams } =\n getMatchedRoutes<AnyServerRouteWithTypes>({\n pathname: history.location.pathname,\n basepath: '/',\n caseSensitive: true,\n routesByPath,\n routesById,\n flatRoutes,\n })\n\n let response: Response | undefined\n\n if (foundRoute && foundRoute.id !== rootRouteId) {\n // We've found a server route that matches the request, so we can call it.\n // TODO: Get the input type-signature correct\n // TODO: Perform the middlewares?\n // TODO: Error handling? What happens when its `throw redirect()` vs `throw new Error()`?\n\n const method = Object.keys(foundRoute.options.methods).find(\n (method) => method.toLowerCase() === request.method.toLowerCase(),\n )\n\n if (method) {\n const handler = foundRoute.options.methods[method]\n\n if (handler) {\n const middlewares = flattenMiddlewares(\n matchedRoutes.flatMap((r) => r.options.middleware).filter(Boolean),\n ).map((d) => d.options.server)\n\n middlewares.push(handlerToMiddleware(handler) as TODO)\n\n // TODO: This is starting to feel too much like a server function\n // Do generalize the existing middleware execution? Or do we need to\n // build a new middleware execution system for server routes?\n const ctx = await executeMiddleware(middlewares, {\n request,\n context: {},\n params: routeParams,\n pathname: history.location.pathname,\n })\n\n response = ctx.response\n }\n }\n }\n\n // We return the matched routes too so if\n // the app router happens to match the same path,\n // it can use any request middleware from server routes\n return [matchedRoutes, response] as const\n}\n\nfunction handlerToMiddleware(\n handler: AnyServerRouteWithTypes['options']['methods'][string],\n) {\n return async ({ next, ...rest }: TODO) => ({\n response: await handler(rest),\n })\n}\n\nfunction executeMiddleware(middlewares: TODO, ctx: TODO) {\n let index = -1\n\n const next = async (ctx: TODO) => {\n index++\n const middleware = middlewares[index]\n if (!middleware) return ctx\n\n const result = await middleware({\n ...ctx,\n // Allow the middleware to call the next middleware in the chain\n next: async (nextCtx: TODO) => {\n // Allow the caller to extend the context for the next middleware\n const nextResult = await next({ ...ctx, ...nextCtx })\n\n // Merge the result into the context\\\n return Object.assign(ctx, handleCtxResult(nextResult))\n },\n // Allow the middleware result to extend the return context\n }).catch((err: TODO) => {\n if (isSpecialResponse(err)) {\n return {\n response: err,\n }\n }\n\n throw err\n })\n\n // Merge the middleware result into the context, just in case it\n // returns a partial context\n return Object.assign(ctx, handleCtxResult(result))\n }\n\n return handleCtxResult(next(ctx))\n}\n\nfunction handleCtxResult(result: TODO) {\n if (isSpecialResponse(result)) {\n return {\n response: result,\n }\n }\n\n return result\n}\n\nfunction isSpecialResponse(err: TODO) {\n return isResponse(err) || isRedirect(err)\n}\n\nfunction isResponse(response: Response): response is Response {\n return response instanceof Response\n}\n"],"names":["mergeHeaders","getResponseHeaders","requestHandler","history","createMemoryHistory","attachRouterServerSsrUtils","getStartManifest","joinPaths","trimPath","handleServerAction","response","json","dehydrateRouter","isRedirect","isResolvedRedirect","tsrRedirectHeaderKey","processRouteTree","getMatchedRoutes","rootRouteId","method","flattenMiddlewares","ctx"],"mappings":"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"}
package/dist/cjs/index.cjs CHANGED
@@ -8,7 +8,6 @@ const ssrServer = require("./ssr-server.cjs");
8
8
  const serverFunctionsHandler = require("./server-functions-handler.cjs");
9
9
  const h3 = require("./h3.cjs");
10
10
  const serverRoute = require("./serverRoute.cjs");
11
- const undici = require("./undici.cjs");
12
11
  const h3$1 = require("h3");
13
12
  exports.transformPipeableStreamWithRouter = transformStreamWithRouter.transformPipeableStreamWithRouter;
14
13
  exports.transformReadableStreamWithRouter = transformStreamWithRouter.transformReadableStreamWithRouter;
@@ -96,8 +95,6 @@ exports.useSession = h3.useSession;
96
95
  exports.writeEarlyHints = h3.writeEarlyHints;
97
96
  exports.createServerFileRoute = serverRoute.createServerFileRoute;
98
97
  exports.createServerRoute = serverRoute.createServerRoute;
99
- exports.__getAbsoluteUrl = undici.__getAbsoluteUrl;
100
- exports.__setGlobalOrigin = undici.__setGlobalOrigin;
101
98
  Object.defineProperty(exports, "H3Error", {
102
99
  enumerable: true,
103
100
  get: () => h3$1.H3Error
package/dist/cjs/index.cjs.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.cjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
1
+ {"version":3,"file":"index.cjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
package/dist/cjs/index.d.cts CHANGED
@@ -9,4 +9,3 @@ export { handleServerAction } from './server-functions-handler.cjs';
9
9
  export * from './h3.cjs';
10
10
  export { createServerRoute, createServerFileRoute } from './serverRoute.cjs';
11
11
  export type { CreateServerFileRoute } from './serverRoute.cjs';
12
- export { __getAbsoluteUrl, __setGlobalOrigin } from './undici.cjs';
package/dist/esm/createStartHandler.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import { createMemoryHistory } from "@tanstack/history";
2
2
  import { mergeHeaders, json, flattenMiddlewares } from "@tanstack/start-client-core";
3
- import { joinPaths, trimPath, isRedirect, tsrRedirectHeaderKey, processRouteTree, getMatchedRoutes, rootRouteId } from "@tanstack/router-core";
3
+ import { joinPaths, trimPath, isRedirect, isResolvedRedirect, tsrRedirectHeaderKey, processRouteTree, getMatchedRoutes, rootRouteId } from "@tanstack/router-core";
4
4
  import { getResponseHeaders, requestHandler } from "./h3.js";
5
5
  import { attachRouterServerSsrUtils, dehydrateRouter } from "./ssr-server.js";
6
6
  import { getStartManifest } from "./router-manifest.js";
@@ -102,6 +102,20 @@ function createStartHandler({
102
102
  }
103
103
  })();
104
104
  if (isRedirect(response)) {
105
+ if (isResolvedRedirect(response)) {
106
+ if (request.headers.get("x-tsr-redirect") === "manual") {
107
+ return json(
108
+ {
109
+ ...response.options,
110
+ isSerializedRedirect: true
111
+ },
112
+ {
113
+ headers: response.headers
114
+ }
115
+ );
116
+ }
117
+ return response;
118
+ }
105
119
  if (response.options.to && typeof response.options.to === "string" && !response.options.to.startsWith("/")) {
106
120
  throw new Error(
107
121
  `Server side redirects must use absolute paths via the 'href' or 'to' options. Received: ${JSON.stringify(response.options)}`
@@ -124,7 +138,7 @@ function createStartHandler({
124
138
  isSerializedRedirect: true
125
139
  },
126
140
  {
127
- headers: redirect.headers
141
+ headers: response.headers
128
142
  }
129
143
  );
130
144
  }
@@ -230,7 +244,10 @@ function handleCtxResult(result) {
230
244
  return result;
231
245
  }
232
246
  function isSpecialResponse(err) {
233
- return err instanceof Response || isRedirect(err);
247
+ return isResponse(err) || isRedirect(err);
248
+ }
249
+ function isResponse(response) {
250
+ return response instanceof Response;
234
251
  }
235
252
  export {
236
253
  createStartHandler,
package/dist/esm/createStartHandler.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"createStartHandler.js","sources":["../../src/createStartHandler.ts"],"sourcesContent":["import { createMemoryHistory } from '@tanstack/history'\nimport {\n flattenMiddlewares,\n json,\n mergeHeaders,\n} from '@tanstack/start-client-core'\nimport {\n getMatchedRoutes,\n isRedirect,\n joinPaths,\n processRouteTree,\n rootRouteId,\n trimPath,\n tsrRedirectHeaderKey,\n} from '@tanstack/router-core'\nimport { getResponseHeaders, requestHandler } from './h3'\nimport { attachRouterServerSsrUtils, dehydrateRouter } from './ssr-server'\nimport { getStartManifest } from './router-manifest'\nimport { handleServerAction } from './server-functions-handler'\nimport type { AnyServerRoute, AnyServerRouteWithTypes } from './serverRoute'\nimport type { RequestHandler } from './h3'\nimport type { AnyRouter } from '@tanstack/router-core'\nimport type { HandlerCallback } from './handlerCallback'\n\ntype TODO = any\n\nexport type CustomizeStartHandler<TRouter extends AnyRouter> = (\n cb: HandlerCallback<TRouter>,\n) => RequestHandler\n\nexport function getStartResponseHeaders(opts: { router: AnyRouter }) {\n let headers = mergeHeaders(\n getResponseHeaders(),\n {\n 'Content-Type': 'text/html; charset=UTF-8',\n },\n ...opts.router.state.matches.map((match) => {\n return match.headers\n }),\n )\n // Handle Redirects\n const { redirect } = opts.router.state\n\n if (redirect) {\n headers = mergeHeaders(headers, redirect.headers)\n }\n return headers\n}\n\nexport function createStartHandler<TRouter extends AnyRouter>({\n createRouter,\n}: {\n createRouter: () => TRouter\n}): CustomizeStartHandler<TRouter> {\n return (cb) => {\n return requestHandler(async ({ request }) => {\n const url = new URL(request.url)\n const href = url.href.replace(url.origin, '')\n\n // Create a history for the client-side router\n const history = createMemoryHistory({\n initialEntries: [href],\n })\n\n // Create the client-side router\n const router = createRouter()\n\n // Attach the server-side SSR utils to the client-side router\n attachRouterServerSsrUtils(router, getStartManifest())\n\n // Update the client-side router with the history and context\n router.update({\n history,\n })\n\n const response = await (async () => {\n try {\n if (!process.env.TSS_SERVER_FN_BASE) {\n throw new Error(\n 'tanstack/start-server-core: TSS_SERVER_FN_BASE must be defined in your environment for createStartHandler()',\n )\n }\n\n // First, let's attempt to handle server functions\n // Add trailing slash to sanitise user defined TSS_SERVER_FN_BASE\n const serverFnBase = joinPaths([\n '/',\n trimPath(process.env.TSS_SERVER_FN_BASE),\n '/',\n ])\n if (href.startsWith(serverFnBase)) {\n return await handleServerAction({ request })\n }\n\n // Then move on to attempting to load server routes\n const serverRouteTreeModule = await (async () => {\n try {\n // @ts-expect-error\n return (await import('tanstack:server-routes')) as {\n routeTree: AnyServerRoute\n }\n } catch (e) {\n console.log(e)\n return undefined\n }\n })()\n\n // If we have a server route tree, then we try matching to see if we have a\n // server route that matches the request.\n if (serverRouteTreeModule) {\n const [_matchedRoutes, response] = await handleServerRoutes({\n routeTree: serverRouteTreeModule.routeTree,\n request,\n })\n\n if (response) return response\n }\n\n const requestAcceptHeader = request.headers.get('Accept') || '*/*'\n const splitRequestAcceptHeader = requestAcceptHeader.split(',')\n\n const supportedMimeTypes = ['*/*', 'text/html']\n const isRouterAcceptSupported = supportedMimeTypes.some((mimeType) =>\n splitRequestAcceptHeader.some((acceptedMimeType) =>\n acceptedMimeType.trim().startsWith(mimeType),\n ),\n )\n\n if (!isRouterAcceptSupported) {\n return json(\n {\n error: 'Only HTML requests are supported here',\n },\n {\n status: 500,\n },\n )\n }\n\n // If no Server Routes were found, so fallback to normal SSR matching using\n // the router\n\n await router.load()\n\n // If there was a redirect, skip rendering the page at all\n if (router.state.redirect) return router.state.redirect\n\n dehydrateRouter(router)\n\n const responseHeaders = getStartResponseHeaders({ router })\n const response = await cb({\n request,\n router,\n responseHeaders,\n })\n\n return response\n } catch (err) {\n if (err instanceof Response) {\n return err\n }\n\n throw err\n }\n })()\n\n if (isRedirect(response)) {\n if (\n response.options.to &&\n typeof response.options.to === 'string' &&\n !response.options.to.startsWith('/')\n ) {\n throw new Error(\n `Server side redirects must use absolute paths via the 'href' or 'to' options. Received: ${JSON.stringify(response.options)}`,\n )\n }\n\n if (\n ['params', 'search', 'hash'].some(\n (d) => typeof (response.options as any)[d] === 'function',\n )\n ) {\n throw new Error(\n `Server side redirects must use static search, params, and hash values and do not support functional values. Received functional values for: ${Object.keys(\n response.options,\n )\n .filter((d) => typeof (response.options as any)[d] === 'function')\n .map((d) => `\"${d}\"`)\n .join(', ')}`,\n )\n }\n\n const redirect = router.resolveRedirect(response)\n\n if (request.headers.get('x-tsr-redirect') === 'manual') {\n return json(\n {\n ...response.options,\n isSerializedRedirect: true,\n },\n {\n headers: redirect.headers,\n },\n )\n }\n\n return redirect\n }\n\n // Add Access-Control-Expose-Headers\n // With HTTPs the response/header objects are immutable, therefore we must clone them\n const body =\n response.status === 204 ? null : await response.clone().blob()\n const headers = new Headers(response.headers)\n headers.append('Access-Control-Expose-Headers', tsrRedirectHeaderKey)\n\n return new Response(body, {\n status: response.status,\n statusText: response.statusText,\n headers,\n })\n })\n }\n}\n\nasync function handleServerRoutes({\n routeTree,\n request,\n}: {\n routeTree: AnyServerRouteWithTypes\n request: Request\n}) {\n const { flatRoutes, routesById, routesByPath } = processRouteTree({\n routeTree,\n initRoute: (route, i) => {\n route.init({\n originalIndex: i,\n })\n },\n })\n\n const url = new URL(request.url)\n const pathname = url.pathname\n\n const history = createMemoryHistory({\n initialEntries: [pathname],\n })\n\n const { matchedRoutes, foundRoute, routeParams } =\n getMatchedRoutes<AnyServerRouteWithTypes>({\n pathname: history.location.pathname,\n basepath: '/',\n caseSensitive: true,\n routesByPath,\n routesById,\n flatRoutes,\n })\n\n let response: Response | undefined\n\n if (foundRoute && foundRoute.id !== rootRouteId) {\n // We've found a server route that matches the request, so we can call it.\n // TODO: Get the input type-signature correct\n // TODO: Perform the middlewares?\n // TODO: Error handling? What happens when its `throw redirect()` vs `throw new Error()`?\n\n const method = Object.keys(foundRoute.options.methods).find(\n (method) => method.toLowerCase() === request.method.toLowerCase(),\n )\n\n if (method) {\n const handler = foundRoute.options.methods[method]\n\n if (handler) {\n const middlewares = flattenMiddlewares(\n matchedRoutes.flatMap((r) => r.options.middleware).filter(Boolean),\n ).map((d) => d.options.server)\n\n middlewares.push(handlerToMiddleware(handler) as TODO)\n\n // TODO: This is starting to feel too much like a server function\n // Do generalize the existing middleware execution? Or do we need to\n // build a new middleware execution system for server routes?\n const ctx = await executeMiddleware(middlewares, {\n request,\n context: {},\n params: routeParams,\n pathname: history.location.pathname,\n })\n\n response = ctx.response\n }\n }\n }\n\n // We return the matched routes too so if\n // the app router happens to match the same path,\n // it can use any request middleware from server routes\n return [matchedRoutes, response] as const\n}\n\nfunction handlerToMiddleware(\n handler: AnyServerRouteWithTypes['options']['methods'][string],\n) {\n return async ({ next, ...rest }: TODO) => ({\n response: await handler(rest),\n })\n}\n\nfunction executeMiddleware(middlewares: TODO, ctx: TODO) {\n let index = -1\n\n const next = async (ctx: TODO) => {\n index++\n const middleware = middlewares[index]\n if (!middleware) return ctx\n\n const result = await middleware({\n ...ctx,\n // Allow the middleware to call the next middleware in the chain\n next: async (nextCtx: TODO) => {\n // Allow the caller to extend the context for the next middleware\n const nextResult = await next({ ...ctx, ...nextCtx })\n\n // Merge the result into the context\\\n return Object.assign(ctx, handleCtxResult(nextResult))\n },\n // Allow the middleware result to extend the return context\n }).catch((err: TODO) => {\n if (isSpecialResponse(err)) {\n return {\n response: err,\n }\n }\n\n throw err\n })\n\n // Merge the middleware result into the context, just in case it\n // returns a partial context\n return Object.assign(ctx, handleCtxResult(result))\n }\n\n return handleCtxResult(next(ctx))\n}\n\nfunction handleCtxResult(result: TODO) {\n if (isSpecialResponse(result)) {\n return {\n response: result,\n }\n }\n\n return result\n}\n\nfunction isSpecialResponse(err: TODO) {\n return err instanceof Response || isRedirect(err)\n}\n"],"names":["response","method","ctx"],"mappings":"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"}
1
+ {"version":3,"file":"createStartHandler.js","sources":["../../src/createStartHandler.ts"],"sourcesContent":["import { createMemoryHistory } from '@tanstack/history'\nimport {\n flattenMiddlewares,\n json,\n mergeHeaders,\n} from '@tanstack/start-client-core'\nimport {\n getMatchedRoutes,\n isRedirect,\n isResolvedRedirect,\n joinPaths,\n processRouteTree,\n rootRouteId,\n trimPath,\n tsrRedirectHeaderKey,\n} from '@tanstack/router-core'\nimport { getResponseHeaders, requestHandler } from './h3'\nimport { attachRouterServerSsrUtils, dehydrateRouter } from './ssr-server'\nimport { getStartManifest } from './router-manifest'\nimport { handleServerAction } from './server-functions-handler'\nimport type { AnyServerRoute, AnyServerRouteWithTypes } from './serverRoute'\nimport type { RequestHandler } from './h3'\nimport type { AnyRouter } from '@tanstack/router-core'\nimport type { HandlerCallback } from './handlerCallback'\n\ntype TODO = any\n\nexport type CustomizeStartHandler<TRouter extends AnyRouter> = (\n cb: HandlerCallback<TRouter>,\n) => RequestHandler\n\nexport function getStartResponseHeaders(opts: { router: AnyRouter }) {\n let headers = mergeHeaders(\n getResponseHeaders(),\n {\n 'Content-Type': 'text/html; charset=UTF-8',\n },\n ...opts.router.state.matches.map((match) => {\n return match.headers\n }),\n )\n // Handle Redirects\n const { redirect } = opts.router.state\n\n if (redirect) {\n headers = mergeHeaders(headers, redirect.headers)\n }\n return headers\n}\n\nexport function createStartHandler<TRouter extends AnyRouter>({\n createRouter,\n}: {\n createRouter: () => TRouter\n}): CustomizeStartHandler<TRouter> {\n return (cb) => {\n return requestHandler(async ({ request }) => {\n const url = new URL(request.url)\n const href = url.href.replace(url.origin, '')\n\n // Create a history for the client-side router\n const history = createMemoryHistory({\n initialEntries: [href],\n })\n\n // Create the client-side router\n const router = createRouter()\n\n // Attach the server-side SSR utils to the client-side router\n attachRouterServerSsrUtils(router, getStartManifest())\n\n // Update the client-side router with the history and context\n router.update({\n history,\n })\n\n const response = await (async () => {\n try {\n if (!process.env.TSS_SERVER_FN_BASE) {\n throw new Error(\n 'tanstack/start-server-core: TSS_SERVER_FN_BASE must be defined in your environment for createStartHandler()',\n )\n }\n\n // First, let's attempt to handle server functions\n // Add trailing slash to sanitise user defined TSS_SERVER_FN_BASE\n const serverFnBase = joinPaths([\n '/',\n trimPath(process.env.TSS_SERVER_FN_BASE),\n '/',\n ])\n if (href.startsWith(serverFnBase)) {\n return await handleServerAction({ request })\n }\n\n // Then move on to attempting to load server routes\n const serverRouteTreeModule = await (async () => {\n try {\n // @ts-expect-error\n return (await import('tanstack:server-routes')) as {\n routeTree: AnyServerRoute\n }\n } catch (e) {\n console.log(e)\n return undefined\n }\n })()\n\n // If we have a server route tree, then we try matching to see if we have a\n // server route that matches the request.\n if (serverRouteTreeModule) {\n const [_matchedRoutes, response] = await handleServerRoutes({\n routeTree: serverRouteTreeModule.routeTree,\n request,\n })\n\n if (response) return response\n }\n\n const requestAcceptHeader = request.headers.get('Accept') || '*/*'\n const splitRequestAcceptHeader = requestAcceptHeader.split(',')\n\n const supportedMimeTypes = ['*/*', 'text/html']\n const isRouterAcceptSupported = supportedMimeTypes.some((mimeType) =>\n splitRequestAcceptHeader.some((acceptedMimeType) =>\n acceptedMimeType.trim().startsWith(mimeType),\n ),\n )\n\n if (!isRouterAcceptSupported) {\n return json(\n {\n error: 'Only HTML requests are supported here',\n },\n {\n status: 500,\n },\n )\n }\n\n // If no Server Routes were found, so fallback to normal SSR matching using\n // the router\n\n await router.load()\n\n // If there was a redirect, skip rendering the page at all\n if (router.state.redirect) return router.state.redirect\n\n dehydrateRouter(router)\n\n const responseHeaders = getStartResponseHeaders({ router })\n const response = await cb({\n request,\n router,\n responseHeaders,\n })\n\n return response\n } catch (err) {\n if (err instanceof Response) {\n return err\n }\n\n throw err\n }\n })()\n\n if (isRedirect(response)) {\n if (isResolvedRedirect(response)) {\n if (request.headers.get('x-tsr-redirect') === 'manual') {\n return json(\n {\n ...response.options,\n isSerializedRedirect: true,\n },\n {\n headers: response.headers,\n },\n )\n }\n return response\n }\n if (\n response.options.to &&\n typeof response.options.to === 'string' &&\n !response.options.to.startsWith('/')\n ) {\n throw new Error(\n `Server side redirects must use absolute paths via the 'href' or 'to' options. Received: ${JSON.stringify(response.options)}`,\n )\n }\n\n if (\n ['params', 'search', 'hash'].some(\n (d) => typeof (response.options as any)[d] === 'function',\n )\n ) {\n throw new Error(\n `Server side redirects must use static search, params, and hash values and do not support functional values. Received functional values for: ${Object.keys(\n response.options,\n )\n .filter((d) => typeof (response.options as any)[d] === 'function')\n .map((d) => `\"${d}\"`)\n .join(', ')}`,\n )\n }\n\n const redirect = router.resolveRedirect(response)\n\n if (request.headers.get('x-tsr-redirect') === 'manual') {\n return json(\n {\n ...response.options,\n isSerializedRedirect: true,\n },\n {\n headers: response.headers,\n },\n )\n }\n\n return redirect\n }\n\n // Add Access-Control-Expose-Headers\n // With HTTPs the response/header objects are immutable, therefore we must clone them\n const body =\n response.status === 204 ? null : await response.clone().blob()\n const headers = new Headers(response.headers)\n headers.append('Access-Control-Expose-Headers', tsrRedirectHeaderKey)\n\n return new Response(body, {\n status: response.status,\n statusText: response.statusText,\n headers,\n })\n })\n }\n}\n\nasync function handleServerRoutes({\n routeTree,\n request,\n}: {\n routeTree: AnyServerRouteWithTypes\n request: Request\n}) {\n const { flatRoutes, routesById, routesByPath } = processRouteTree({\n routeTree,\n initRoute: (route, i) => {\n route.init({\n originalIndex: i,\n })\n },\n })\n\n const url = new URL(request.url)\n const pathname = url.pathname\n\n const history = createMemoryHistory({\n initialEntries: [pathname],\n })\n\n const { matchedRoutes, foundRoute, routeParams } =\n getMatchedRoutes<AnyServerRouteWithTypes>({\n pathname: history.location.pathname,\n basepath: '/',\n caseSensitive: true,\n routesByPath,\n routesById,\n flatRoutes,\n })\n\n let response: Response | undefined\n\n if (foundRoute && foundRoute.id !== rootRouteId) {\n // We've found a server route that matches the request, so we can call it.\n // TODO: Get the input type-signature correct\n // TODO: Perform the middlewares?\n // TODO: Error handling? What happens when its `throw redirect()` vs `throw new Error()`?\n\n const method = Object.keys(foundRoute.options.methods).find(\n (method) => method.toLowerCase() === request.method.toLowerCase(),\n )\n\n if (method) {\n const handler = foundRoute.options.methods[method]\n\n if (handler) {\n const middlewares = flattenMiddlewares(\n matchedRoutes.flatMap((r) => r.options.middleware).filter(Boolean),\n ).map((d) => d.options.server)\n\n middlewares.push(handlerToMiddleware(handler) as TODO)\n\n // TODO: This is starting to feel too much like a server function\n // Do generalize the existing middleware execution? Or do we need to\n // build a new middleware execution system for server routes?\n const ctx = await executeMiddleware(middlewares, {\n request,\n context: {},\n params: routeParams,\n pathname: history.location.pathname,\n })\n\n response = ctx.response\n }\n }\n }\n\n // We return the matched routes too so if\n // the app router happens to match the same path,\n // it can use any request middleware from server routes\n return [matchedRoutes, response] as const\n}\n\nfunction handlerToMiddleware(\n handler: AnyServerRouteWithTypes['options']['methods'][string],\n) {\n return async ({ next, ...rest }: TODO) => ({\n response: await handler(rest),\n })\n}\n\nfunction executeMiddleware(middlewares: TODO, ctx: TODO) {\n let index = -1\n\n const next = async (ctx: TODO) => {\n index++\n const middleware = middlewares[index]\n if (!middleware) return ctx\n\n const result = await middleware({\n ...ctx,\n // Allow the middleware to call the next middleware in the chain\n next: async (nextCtx: TODO) => {\n // Allow the caller to extend the context for the next middleware\n const nextResult = await next({ ...ctx, ...nextCtx })\n\n // Merge the result into the context\\\n return Object.assign(ctx, handleCtxResult(nextResult))\n },\n // Allow the middleware result to extend the return context\n }).catch((err: TODO) => {\n if (isSpecialResponse(err)) {\n return {\n response: err,\n }\n }\n\n throw err\n })\n\n // Merge the middleware result into the context, just in case it\n // returns a partial context\n return Object.assign(ctx, handleCtxResult(result))\n }\n\n return handleCtxResult(next(ctx))\n}\n\nfunction handleCtxResult(result: TODO) {\n if (isSpecialResponse(result)) {\n return {\n response: result,\n }\n }\n\n return result\n}\n\nfunction isSpecialResponse(err: TODO) {\n return isResponse(err) || isRedirect(err)\n}\n\nfunction isResponse(response: Response): response is Response {\n return response instanceof Response\n}\n"],"names":["response","method","ctx"],"mappings":"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"}
package/dist/esm/index.d.ts CHANGED
@@ -9,4 +9,3 @@ export { handleServerAction } from './server-functions-handler.js';
9
9
  export * from './h3.js';
10
10
  export { createServerRoute, createServerFileRoute } from './serverRoute.js';
11
11
  export type { CreateServerFileRoute } from './serverRoute.js';
12
- export { __getAbsoluteUrl, __setGlobalOrigin } from './undici.js';
package/dist/esm/index.js CHANGED
@@ -6,15 +6,12 @@ import { attachRouterServerSsrUtils, dehydrateRouter } from "./ssr-server.js";
6
6
  import { handleServerAction } from "./server-functions-handler.js";
7
7
  import { HTTPEventSymbol, appendCorsHeaders, appendCorsPreflightHeaders, appendHeader, appendHeaders, appendResponseHeader, appendResponseHeaders, assertMethod, clearResponseHeaders, clearSession, defaultContentType, defineEventHandler, defineMiddleware, deleteCookie, eventHandler, fetchWithEvent, getContext, getCookie, getEvent, getHeader, getHeaders, getProxyRequestHeaders, getQuery, getRequestFingerprint, getRequestHeader, getRequestHeaders, getRequestHost, getRequestIP, getRequestProtocol, getRequestURL, getRequestWebStream, getResponseHeader, getResponseHeaders, getResponseStatus, getResponseStatusText, getRouterParam, getRouterParams, getSession, getValidatedQuery, getValidatedRouterParams, getWebRequest, handleCacheHeaders, handleCors, isEvent, isMethod, isPreflightRequest, parseCookies, proxyRequest, readBody, readFormData, readMultipartFormData, readRawBody, readValidatedBody, removeResponseHeader, requestHandler, runWithEvent, sealSession, send, sendError, sendNoContent, sendProxy, sendRedirect, sendStream, sendWebResponse, setContext, setCookie, setHeader, setHeaders, setResponseHeader, setResponseHeaders, setResponseStatus, unsealSession, updateSession, useSession, writeEarlyHints } from "./h3.js";
8
8
  import { createServerFileRoute, createServerRoute } from "./serverRoute.js";
9
- import { __getAbsoluteUrl, __setGlobalOrigin } from "./undici.js";
10
9
  import { H3Error, H3Event, MIMES, callNodeListener, createApp, createAppEventHandler, createError, createEvent, createRouter, defineLazyEventHandler, defineNodeListener, defineNodeMiddleware, defineRequestMiddleware, defineResponseMiddleware, defineWebSocket, dynamicEventHandler, fromNodeMiddleware, fromPlainHandler, fromWebHandler, isCorsOriginAllowed, isError, isEventHandler, isStream, isWebResponse, lazyEventHandler, promisifyNodeListener, sanitizeStatusCode, sanitizeStatusMessage, serveStatic, splitCookiesString, toEventHandler, toNodeListener, toPlainHandler, toWebHandler, toWebRequest, useBase } from "h3";
11
10
  export {
12
11
  H3Error,
13
12
  H3Event,
14
13
  HTTPEventSymbol,
15
14
  MIMES,
16
- __getAbsoluteUrl,
17
- __setGlobalOrigin,
18
15
  appendCorsHeaders,
19
16
  appendCorsPreflightHeaders,
20
17
  appendHeader,
package/dist/esm/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;"}
1
+ {"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tanstack/start-server-core",
3
- "version": "1.120.4-alpha.10",
3
+ "version": "1.120.4-alpha.12",
4
4
  "description": "Modern and scalable routing for React applications",
5
5
  "author": "Tanner Linsley",
6
6
  "license": "MIT",
@@ -54,9 +54,9 @@
54
54
  "tiny-warning": "^1.0.3",
55
55
  "unctx": "^2.4.1",
56
56
  "undici": "^7.8.0",
57
- "@tanstack/router-core": "^1.120.4-alpha.10",
58
- "@tanstack/start-client-core": "^1.120.4-alpha.10",
59
- "@tanstack/history": "^1.120.4-alpha.1"
57
+ "@tanstack/router-core": "^1.120.4-alpha.12",
58
+ "@tanstack/history": "^1.120.4-alpha.1",
59
+ "@tanstack/start-client-core": "^1.120.4-alpha.12"
60
60
  },
61
61
  "devDependencies": {
62
62
  "@types/jsesc": "^3.0.3",
package/src/createStartHandler.ts CHANGED
@@ -7,6 +7,7 @@ import {
7
7
  import {
8
8
  getMatchedRoutes,
9
9
  isRedirect,
10
+ isResolvedRedirect,
10
11
  joinPaths,
11
12
  processRouteTree,
12
13
  rootRouteId,
@@ -165,6 +166,20 @@ export function createStartHandler<TRouter extends AnyRouter>({
165
166
  })()
166
167
 
167
168
  if (isRedirect(response)) {
169
+ if (isResolvedRedirect(response)) {
170
+ if (request.headers.get('x-tsr-redirect') === 'manual') {
171
+ return json(
172
+ {
173
+ ...response.options,
174
+ isSerializedRedirect: true,
175
+ },
176
+ {
177
+ headers: response.headers,
178
+ },
179
+ )
180
+ }
181
+ return response
182
+ }
168
183
  if (
169
184
  response.options.to &&
170
185
  typeof response.options.to === 'string' &&
@@ -199,7 +214,7 @@ export function createStartHandler<TRouter extends AnyRouter>({
199
214
  isSerializedRedirect: true,
200
215
  },
201
216
  {
202
- headers: redirect.headers,
217
+ headers: response.headers,
203
218
  },
204
219
  )
205
220
  }
@@ -355,5 +370,9 @@ function handleCtxResult(result: TODO) {
355
370
  }
356
371
 
357
372
  function isSpecialResponse(err: TODO) {
358
- return err instanceof Response || isRedirect(err)
373
+ return isResponse(err) || isRedirect(err)
374
+ }
375
+
376
+ function isResponse(response: Response): response is Response {
377
+ return response instanceof Response
359
378
  }
package/src/index.tsx CHANGED
@@ -20,5 +20,3 @@ export * from './h3'
20
20
 
21
21
  export { createServerRoute, createServerFileRoute } from './serverRoute'
22
22
  export type { CreateServerFileRoute } from './serverRoute'
23
-
24
- export { __getAbsoluteUrl, __setGlobalOrigin } from './undici'
package/dist/cjs/undici.cjs DELETED
@@ -1,14 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
3
- const undici = require("undici");
4
- const __setGlobalOrigin = undici.setGlobalOrigin;
5
- function __getAbsoluteUrl(req, options = { trustProxy: false }) {
6
- const headers = req.headers;
7
- const host = options.trustProxy ? headers.get("x-forwarded-host") || headers.get("host") : headers.get("host");
8
- const protocol = options.trustProxy ? headers.get("x-forwarded-proto") || "http" : "http";
9
- if (!host) throw new Error("Cannot determine host from request headers");
10
- return `${protocol}://${host}`;
11
- }
12
- exports.__getAbsoluteUrl = __getAbsoluteUrl;
13
- exports.__setGlobalOrigin = __setGlobalOrigin;
14
- //# sourceMappingURL=undici.cjs.map
package/dist/cjs/undici.cjs.map DELETED
@@ -1 +0,0 @@
1
- {"version":3,"file":"undici.cjs","sources":["../../src/undici.ts"],"sourcesContent":["import { setGlobalOrigin } from 'undici'\n\n/**\n * DO NOT USE THIS FUNCTION. THIS FUNCTION IS FOR INTERNAL USE ONLY.\n *\n * @internal\n */\nexport const __setGlobalOrigin = setGlobalOrigin\n\n/**\n * DO NOT USE THIS FUNCTION. THIS FUNCTION IS FOR INTERNAL USE ONLY.\n *\n * Constructs an absolute URL from the given request object and options.\n *\n * @internal\n * @param req - The `Request` object containing the headers to extract the host and protocol.\n * @param options - Configuration options for determining the trust level of proxy headers.\n * @param options.trustProxy - If `true`, the function will trust the `x-forwarded-host` and `x-forwarded-proto` headers\n * to determine the host and protocol. Defaults to `false`.\n * @returns The absolute URL constructed from the request headers as a string.\n * @throws Will throw an error if the `host` cannot be determined from the request headers.\n *\n * @example\n * ```ts\n * // Example usage:\n * const req = new Request('http://example.com', {\n * headers: {\n * 'host': 'example.com',\n * 'x-forwarded-host': 'proxy.example.com',\n * 'x-forwarded-proto': 'https',\n * },\n * });\n *\n * // Without trusting proxy headers\n * const url1 = getAbsoluteUrl(req);\n * console.log(url1); // Output: \"http://example.com\"\n *\n * // With trusting proxy headers\n * const url2 = getAbsoluteUrl(req, { trustProxy: true });\n * console.log(url2); // Output: \"https://proxy.example.com\"\n * ```\n */\nexport function __getAbsoluteUrl(\n req: Request,\n options: { trustProxy: boolean } = { trustProxy: false },\n): string {\n const headers = req.headers\n\n const host = options.trustProxy\n ? headers.get('x-forwarded-host') || headers.get('host')\n : headers.get('host')\n\n const protocol = options.trustProxy\n ? headers.get('x-forwarded-proto') || 'http'\n : 'http'\n\n if (!host) throw new Error('Cannot determine host from request headers')\n\n return `${protocol}://${host}`\n}\n"],"names":["setGlobalOrigin"],"mappings":";;;AAOO,MAAM,oBAAoBA,OAAAA;AAmC1B,SAAS,iBACd,KACA,UAAmC,EAAE,YAAY,SACzC;AACR,QAAM,UAAU,IAAI;AAEpB,QAAM,OAAO,QAAQ,aACjB,QAAQ,IAAI,kBAAkB,KAAK,QAAQ,IAAI,MAAM,IACrD,QAAQ,IAAI,MAAM;AAEtB,QAAM,WAAW,QAAQ,aACrB,QAAQ,IAAI,mBAAmB,KAAK,SACpC;AAEJ,MAAI,CAAC,KAAY,OAAA,IAAI,MAAM,4CAA4C;AAEhE,SAAA,GAAG,QAAQ,MAAM,IAAI;AAC9B;;;"}
package/dist/cjs/undici.d.cts DELETED
@@ -1,43 +0,0 @@
1
- import { setGlobalOrigin } from 'undici';
2
- /**
3
- * DO NOT USE THIS FUNCTION. THIS FUNCTION IS FOR INTERNAL USE ONLY.
4
- *
5
- * @internal
6
- */
7
- export declare const __setGlobalOrigin: typeof setGlobalOrigin;
8
- /**
9
- * DO NOT USE THIS FUNCTION. THIS FUNCTION IS FOR INTERNAL USE ONLY.
10
- *
11
- * Constructs an absolute URL from the given request object and options.
12
- *
13
- * @internal
14
- * @param req - The `Request` object containing the headers to extract the host and protocol.
15
- * @param options - Configuration options for determining the trust level of proxy headers.
16
- * @param options.trustProxy - If `true`, the function will trust the `x-forwarded-host` and `x-forwarded-proto` headers
17
- * to determine the host and protocol. Defaults to `false`.
18
- * @returns The absolute URL constructed from the request headers as a string.
19
- * @throws Will throw an error if the `host` cannot be determined from the request headers.
20
- *
21
- * @example
22
- * ```ts
23
- * // Example usage:
24
- * const req = new Request('http://example.com', {
25
- * headers: {
26
- * 'host': 'example.com',
27
- * 'x-forwarded-host': 'proxy.example.com',
28
- * 'x-forwarded-proto': 'https',
29
- * },
30
- * });
31
- *
32
- * // Without trusting proxy headers
33
- * const url1 = getAbsoluteUrl(req);
34
- * console.log(url1); // Output: "http://example.com"
35
- *
36
- * // With trusting proxy headers
37
- * const url2 = getAbsoluteUrl(req, { trustProxy: true });
38
- * console.log(url2); // Output: "https://proxy.example.com"
39
- * ```
40
- */
41
- export declare function __getAbsoluteUrl(req: Request, options?: {
42
- trustProxy: boolean;
43
- }): string;
package/dist/esm/undici.d.ts DELETED
@@ -1,43 +0,0 @@
1
- import { setGlobalOrigin } from 'undici';
2
- /**
3
- * DO NOT USE THIS FUNCTION. THIS FUNCTION IS FOR INTERNAL USE ONLY.
4
- *
5
- * @internal
6
- */
7
- export declare const __setGlobalOrigin: typeof setGlobalOrigin;
8
- /**
9
- * DO NOT USE THIS FUNCTION. THIS FUNCTION IS FOR INTERNAL USE ONLY.
10
- *
11
- * Constructs an absolute URL from the given request object and options.
12
- *
13
- * @internal
14
- * @param req - The `Request` object containing the headers to extract the host and protocol.
15
- * @param options - Configuration options for determining the trust level of proxy headers.
16
- * @param options.trustProxy - If `true`, the function will trust the `x-forwarded-host` and `x-forwarded-proto` headers
17
- * to determine the host and protocol. Defaults to `false`.
18
- * @returns The absolute URL constructed from the request headers as a string.
19
- * @throws Will throw an error if the `host` cannot be determined from the request headers.
20
- *
21
- * @example
22
- * ```ts
23
- * // Example usage:
24
- * const req = new Request('http://example.com', {
25
- * headers: {
26
- * 'host': 'example.com',
27
- * 'x-forwarded-host': 'proxy.example.com',
28
- * 'x-forwarded-proto': 'https',
29
- * },
30
- * });
31
- *
32
- * // Without trusting proxy headers
33
- * const url1 = getAbsoluteUrl(req);
34
- * console.log(url1); // Output: "http://example.com"
35
- *
36
- * // With trusting proxy headers
37
- * const url2 = getAbsoluteUrl(req, { trustProxy: true });
38
- * console.log(url2); // Output: "https://proxy.example.com"
39
- * ```
40
- */
41
- export declare function __getAbsoluteUrl(req: Request, options?: {
42
- trustProxy: boolean;
43
- }): string;
package/dist/esm/undici.js DELETED
@@ -1,14 +0,0 @@
1
- import { setGlobalOrigin } from "undici";
2
- const __setGlobalOrigin = setGlobalOrigin;
3
- function __getAbsoluteUrl(req, options = { trustProxy: false }) {
4
- const headers = req.headers;
5
- const host = options.trustProxy ? headers.get("x-forwarded-host") || headers.get("host") : headers.get("host");
6
- const protocol = options.trustProxy ? headers.get("x-forwarded-proto") || "http" : "http";
7
- if (!host) throw new Error("Cannot determine host from request headers");
8
- return `${protocol}://${host}`;
9
- }
10
- export {
11
- __getAbsoluteUrl,
12
- __setGlobalOrigin
13
- };
14
- //# sourceMappingURL=undici.js.map
package/dist/esm/undici.js.map DELETED
@@ -1 +0,0 @@
1
- {"version":3,"file":"undici.js","sources":["../../src/undici.ts"],"sourcesContent":["import { setGlobalOrigin } from 'undici'\n\n/**\n * DO NOT USE THIS FUNCTION. THIS FUNCTION IS FOR INTERNAL USE ONLY.\n *\n * @internal\n */\nexport const __setGlobalOrigin = setGlobalOrigin\n\n/**\n * DO NOT USE THIS FUNCTION. THIS FUNCTION IS FOR INTERNAL USE ONLY.\n *\n * Constructs an absolute URL from the given request object and options.\n *\n * @internal\n * @param req - The `Request` object containing the headers to extract the host and protocol.\n * @param options - Configuration options for determining the trust level of proxy headers.\n * @param options.trustProxy - If `true`, the function will trust the `x-forwarded-host` and `x-forwarded-proto` headers\n * to determine the host and protocol. Defaults to `false`.\n * @returns The absolute URL constructed from the request headers as a string.\n * @throws Will throw an error if the `host` cannot be determined from the request headers.\n *\n * @example\n * ```ts\n * // Example usage:\n * const req = new Request('http://example.com', {\n * headers: {\n * 'host': 'example.com',\n * 'x-forwarded-host': 'proxy.example.com',\n * 'x-forwarded-proto': 'https',\n * },\n * });\n *\n * // Without trusting proxy headers\n * const url1 = getAbsoluteUrl(req);\n * console.log(url1); // Output: \"http://example.com\"\n *\n * // With trusting proxy headers\n * const url2 = getAbsoluteUrl(req, { trustProxy: true });\n * console.log(url2); // Output: \"https://proxy.example.com\"\n * ```\n */\nexport function __getAbsoluteUrl(\n req: Request,\n options: { trustProxy: boolean } = { trustProxy: false },\n): string {\n const headers = req.headers\n\n const host = options.trustProxy\n ? headers.get('x-forwarded-host') || headers.get('host')\n : headers.get('host')\n\n const protocol = options.trustProxy\n ? headers.get('x-forwarded-proto') || 'http'\n : 'http'\n\n if (!host) throw new Error('Cannot determine host from request headers')\n\n return `${protocol}://${host}`\n}\n"],"names":[],"mappings":";AAOO,MAAM,oBAAoB;AAmC1B,SAAS,iBACd,KACA,UAAmC,EAAE,YAAY,SACzC;AACR,QAAM,UAAU,IAAI;AAEpB,QAAM,OAAO,QAAQ,aACjB,QAAQ,IAAI,kBAAkB,KAAK,QAAQ,IAAI,MAAM,IACrD,QAAQ,IAAI,MAAM;AAEtB,QAAM,WAAW,QAAQ,aACrB,QAAQ,IAAI,mBAAmB,KAAK,SACpC;AAEJ,MAAI,CAAC,KAAY,OAAA,IAAI,MAAM,4CAA4C;AAEhE,SAAA,GAAG,QAAQ,MAAM,IAAI;AAC9B;"}
package/src/undici.ts DELETED
@@ -1,60 +0,0 @@
1
- import { setGlobalOrigin } from 'undici'
2
-
3
- /**
4
- * DO NOT USE THIS FUNCTION. THIS FUNCTION IS FOR INTERNAL USE ONLY.
5
- *
6
- * @internal
7
- */
8
- export const __setGlobalOrigin = setGlobalOrigin
9
-
10
- /**
11
- * DO NOT USE THIS FUNCTION. THIS FUNCTION IS FOR INTERNAL USE ONLY.
12
- *
13
- * Constructs an absolute URL from the given request object and options.
14
- *
15
- * @internal
16
- * @param req - The `Request` object containing the headers to extract the host and protocol.
17
- * @param options - Configuration options for determining the trust level of proxy headers.
18
- * @param options.trustProxy - If `true`, the function will trust the `x-forwarded-host` and `x-forwarded-proto` headers
19
- * to determine the host and protocol. Defaults to `false`.
20
- * @returns The absolute URL constructed from the request headers as a string.
21
- * @throws Will throw an error if the `host` cannot be determined from the request headers.
22
- *
23
- * @example
24
- * ```ts
25
- * // Example usage:
26
- * const req = new Request('http://example.com', {
27
- * headers: {
28
- * 'host': 'example.com',
29
- * 'x-forwarded-host': 'proxy.example.com',
30
- * 'x-forwarded-proto': 'https',
31
- * },
32
- * });
33
- *
34
- * // Without trusting proxy headers
35
- * const url1 = getAbsoluteUrl(req);
36
- * console.log(url1); // Output: "http://example.com"
37
- *
38
- * // With trusting proxy headers
39
- * const url2 = getAbsoluteUrl(req, { trustProxy: true });
40
- * console.log(url2); // Output: "https://proxy.example.com"
41
- * ```
42
- */
43
- export function __getAbsoluteUrl(
44
- req: Request,
45
- options: { trustProxy: boolean } = { trustProxy: false },
46
- ): string {
47
- const headers = req.headers
48
-
49
- const host = options.trustProxy
50
- ? headers.get('x-forwarded-host') || headers.get('host')
51
- : headers.get('host')
52
-
53
- const protocol = options.trustProxy
54
- ? headers.get('x-forwarded-proto') || 'http'
55
- : 'http'
56
-
57
- if (!host) throw new Error('Cannot determine host from request headers')
58
-
59
- return `${protocol}://${host}`
60
- }