main
Upgrade tanstack query and fix type issues (#6579)
chore: simplify previous monorepo fix (#6408)