diff --git a/.changeset/neat-taxes-feel.md b/.changeset/neat-taxes-feel.md new file mode 100644 index 00000000000..3aeec51d32e --- /dev/null +++ b/.changeset/neat-taxes-feel.md @@ -0,0 +1,5 @@ +--- +'@tanstack/start-server-core': minor +--- + +less unnecessary creation of URL diff --git a/packages/router-core/src/ssr/createRequestHandler.ts b/packages/router-core/src/ssr/createRequestHandler.ts index d2521876675..2f1cbba839b 100644 --- a/packages/router-core/src/ssr/createRequestHandler.ts +++ b/packages/router-core/src/ssr/createRequestHandler.ts @@ -1,10 +1,6 @@ import { createMemoryHistory } from '@tanstack/history' import { mergeHeaders } from './headers' -import { - attachRouterServerSsrUtils, - getNormalizedURL, - getOrigin, -} from './ssr-server' +import { attachRouterServerSsrUtils, getNormalizedURL } from './ssr-server' import type { HandlerCallback } from './handlerCallback' import type { AnyHeaders } from './headers' import type { AnyRouter } from '../router' @@ -36,7 +32,7 @@ export function createRequestHandler({ // normalizing and sanitizing the pathname here for server, so we always deal with the same format during SSR. const { url } = getNormalizedURL(request.url, 'http://localhost') - const origin = getOrigin(request) + const origin = url.origin const href = url.href.replace(url.origin, '') // Create a history for the router diff --git a/packages/start-server-core/src/createStartHandler.ts b/packages/start-server-core/src/createStartHandler.ts index 625e9cc4877..fdb0e31bbf4 100644 --- a/packages/start-server-core/src/createStartHandler.ts +++ b/packages/start-server-core/src/createStartHandler.ts @@ -13,7 +13,6 @@ import { import { attachRouterServerSsrUtils, getNormalizedURL, - getOrigin, } from '@tanstack/router-core/ssr/server' import { runWithStartContext } from '@tanstack/start-storage-context' import { requestHandler } from './request-response' @@ -434,7 +433,7 @@ export function createStartHandler( // in these cases we would prefer to redirect to the new path const { url, handledProtocolRelativeURL } = getNormalizedURL(request.url) const href = url.pathname + url.search + url.hash - const origin = getOrigin(request) + const origin = url.origin if (handledProtocolRelativeURL) { return Response.redirect(url, 308)