Skip to content

fix(tanstack-start): Fix event handler return type mismatch #5051

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 31, 2025
Merged

fix(tanstack-start): Fix event handler return type mismatch #5051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1b31d4e
fix(tanstack-start): Fix event handler return type mismatch
wobsoriano Jan 30, 2025
81e280f
Merge branch 'main' into fix/tanstack-start-event-handler
wobsoriano Jan 31, 2025
cd683aa
chore: more type improvements
wobsoriano Jan 31, 2025
185c81c
chore: add changeset
wobsoriano Jan 31, 2025
0982e00
run dedupe
wobsoriano Jan 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/great-peaches-yell.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@clerk/tanstack-start": patch
---

Fix type mismatch between TanStack Start and Clerk event handlers
3 changes: 2 additions & 1 deletion packages/tanstack-start/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Copy link
Member Author

@wobsoriano wobsoriano Jan 31, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Adding to dev deps as we don't use it in runtime. Just need the return type

},
"peerDependencies": {
"@tanstack/react-router": ">=1.85.9",
Expand Down
9 changes: 6 additions & 3 deletions packages/tanstack-start/src/server/middlewareHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -11,13 +11,16 @@ export type HandlerCallback<TRouter extends AnyRouter> = (ctx: {
router: TRouter;
responseHeaders: Headers;
}) => Response | Promise<Response>;
export type CustomizeStartHandler<TRouter extends AnyRouter> = (cb: HandlerCallback<TRouter>) => EventHandler;

export type CustomizeStartHandler<TRouter extends AnyRouter> = (
cb: HandlerCallback<TRouter>,
) => ReturnType<typeof eventHandler>;

export function createClerkHandler<TRouter extends AnyRouter>(
eventHandler: CustomizeStartHandler<TRouter>,
clerkOptions: LoaderOptions = {},
) {
return (cb: HandlerCallback<TRouter>): EventHandler => {
return (cb: HandlerCallback<TRouter>) => {
return eventHandler(async ({ request, router, responseHeaders }) => {
try {
const loadedOptions = loadOptions(request, clerkOptions);
Expand Down
3 changes: 3 additions & 0 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading