From 1b31d4ee32926871eec3e414d4f6fc8ee046d055 Mon Sep 17 00:00:00 2001 From: wobsoriano Date: Thu, 30 Jan 2025 15:56:34 -0800 Subject: [PATCH 1/4] fix(tanstack-start): Fix event handler return type mismatch --- packages/tanstack-start/package.json | 3 ++- packages/tanstack-start/src/server/middlewareHandler.ts | 5 ++++- pnpm-lock.yaml | 5 ++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/packages/tanstack-start/package.json b/packages/tanstack-start/package.json index 84a19b2ce58..043d811df64 100644 --- a/packages/tanstack-start/package.json +++ b/packages/tanstack-start/package.json @@ -69,7 +69,8 @@ "devDependencies": { "@tanstack/react-router": "^1.97.25", "@tanstack/start": "^1.97.25", - "esbuild-plugin-file-path-extensions": "^2.1.2" + "esbuild-plugin-file-path-extensions": "^2.1.2", + "h3": "^1.13.0" }, "peerDependencies": { "@tanstack/react-router": ">=1.85.9", diff --git a/packages/tanstack-start/src/server/middlewareHandler.ts b/packages/tanstack-start/src/server/middlewareHandler.ts index 3faa31b9eae..5f4805e9ddb 100644 --- a/packages/tanstack-start/src/server/middlewareHandler.ts +++ b/packages/tanstack-start/src/server/middlewareHandler.ts @@ -1,5 +1,5 @@ import type { AnyRouter } from '@tanstack/react-router'; -import type { EventHandler } from 'vinxi/http'; +import type { eventHandler } from 'h3'; import { authenticateRequest } from './authenticateRequest'; import { loadOptions } from './loadOptions'; @@ -11,6 +11,9 @@ export type HandlerCallback = (ctx: { router: TRouter; responseHeaders: Headers; }) => Response | Promise; + +type EventHandler = ReturnType; + export type CustomizeStartHandler = (cb: HandlerCallback) => EventHandler; export function createClerkHandler( diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0907dfefcd3..28fd82775ae 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -963,6 +963,9 @@ importers: esbuild-plugin-file-path-extensions: specifier: ^2.1.2 version: 2.1.4 + h3: + specifier: ^1.13.0 + version: 1.14.0 packages/testing: dependencies: @@ -2825,7 +2828,7 @@ packages: '@expo/bunyan@4.0.1': resolution: {integrity: sha512-+Lla7nYSiHZirgK+U/uYzsLv/X+HaJienbD5AKX1UQZHYfWaP+9uuQluRB4GrEVWF0GZ7vEVp/jzaOT9k/SQlg==} - engines: {node: '>=0.10.0'} + engines: {'0': node >=0.10.0} '@expo/cli@0.18.30': resolution: {integrity: sha512-V90TUJh9Ly8stYo8nwqIqNWCsYjE28GlVFWEhAFCUOp99foiQr8HSTpiiX5GIrprcPoWmlGoY+J5fQA29R4lFg==} From cd683aa673550c99a9a53f6dbad76fa8fec340af Mon Sep 17 00:00:00 2001 From: wobsoriano Date: Fri, 31 Jan 2025 09:10:08 -0800 Subject: [PATCH 2/4] chore: more type improvements --- packages/tanstack-start/src/server/middlewareHandler.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/tanstack-start/src/server/middlewareHandler.ts b/packages/tanstack-start/src/server/middlewareHandler.ts index 5f4805e9ddb..ec56e4711a9 100644 --- a/packages/tanstack-start/src/server/middlewareHandler.ts +++ b/packages/tanstack-start/src/server/middlewareHandler.ts @@ -12,15 +12,15 @@ export type HandlerCallback = (ctx: { responseHeaders: Headers; }) => Response | Promise; -type EventHandler = ReturnType; - -export type CustomizeStartHandler = (cb: HandlerCallback) => EventHandler; +export type CustomizeStartHandler = ( + cb: HandlerCallback, +) => ReturnType; export function createClerkHandler( eventHandler: CustomizeStartHandler, clerkOptions: LoaderOptions = {}, ) { - return (cb: HandlerCallback): EventHandler => { + return (cb: HandlerCallback) => { return eventHandler(async ({ request, router, responseHeaders }) => { try { const loadedOptions = loadOptions(request, clerkOptions); From 185c81cd0d57b33c157ab13cac70bab652e0fab0 Mon Sep 17 00:00:00 2001 From: Robert Soriano Date: Fri, 31 Jan 2025 09:11:54 -0800 Subject: [PATCH 3/4] chore: add changeset --- .changeset/great-peaches-yell.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/great-peaches-yell.md diff --git a/.changeset/great-peaches-yell.md b/.changeset/great-peaches-yell.md new file mode 100644 index 00000000000..f95f3e9e066 --- /dev/null +++ b/.changeset/great-peaches-yell.md @@ -0,0 +1,5 @@ +--- +"@clerk/tanstack-start": patch +--- + +Fix type mismatch between TanStack Start and Clerk event handlers From 0982e00e4409d41152f7656905bb5fb685aed2c7 Mon Sep 17 00:00:00 2001 From: wobsoriano Date: Fri, 31 Jan 2025 09:13:26 -0800 Subject: [PATCH 4/4] run dedupe --- pnpm-lock.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 28fd82775ae..a51a16dd604 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -2828,7 +2828,7 @@ packages: '@expo/bunyan@4.0.1': resolution: {integrity: sha512-+Lla7nYSiHZirgK+U/uYzsLv/X+HaJienbD5AKX1UQZHYfWaP+9uuQluRB4GrEVWF0GZ7vEVp/jzaOT9k/SQlg==} - engines: {'0': node >=0.10.0} + engines: {node: '>=0.10.0'} '@expo/cli@0.18.30': resolution: {integrity: sha512-V90TUJh9Ly8stYo8nwqIqNWCsYjE28GlVFWEhAFCUOp99foiQr8HSTpiiX5GIrprcPoWmlGoY+J5fQA29R4lFg==}