From 184e3472cc598a70dbb40219f9147a2b244076df Mon Sep 17 00:00:00 2001 From: Kacper Wojciechowski <39823706+jog1t@users.noreply.github.com> Date: Wed, 1 Oct 2025 00:49:39 +0200 Subject: [PATCH] refactor(cloud): polish --- frontend/package.json | 4 +- frontend/src/app.tsx | 37 +------- frontend/src/app/login.tsx | 19 ++++- frontend/src/app/sign-up.tsx | 66 ++++++++++++++- frontend/src/app/user-dropdown.tsx | 72 ++++++++++------ frontend/src/routeTree.gen.ts | 84 ++++++++++++++----- frontend/src/routes/__root.tsx | 50 +++++++++-- frontend/src/routes/_context.tsx | 15 ++++ frontend/src/routes/_context/_cloud.tsx | 5 +- .../_cloud/orgs.$organization/index.tsx | 33 +++++++- frontend/src/routes/_context/index.tsx | 24 ++++-- .../src/routes/{_context/_cloud => }/join.tsx | 12 ++- frontend/src/routes/login.tsx | 25 ++++++ frontend/src/routes/sso-callback.tsx | 16 ++++ package.json | 2 +- pnpm-lock.yaml | 79 ++++++++--------- 16 files changed, 388 insertions(+), 155 deletions(-) rename frontend/src/routes/{_context/_cloud => }/join.tsx (54%) create mode 100644 frontend/src/routes/login.tsx create mode 100644 frontend/src/routes/sso-callback.tsx diff --git a/frontend/package.json b/frontend/package.json index 9b79c0eb68..fbd5a3a9ea 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -18,8 +18,8 @@ "preview:cloud": "vite preview --config vite.cloud.config.ts" }, "dependencies": { - "@clerk/clerk-js": "^5.92.1", - "@clerk/clerk-react": "^5.47.0", + "@clerk/clerk-js": "^5.97", + "@clerk/clerk-react": "^5.49.1", "@clerk/elements": "^0.23.63", "@clerk/shared": "*", "@clerk/themes": "^2.4.18", diff --git a/frontend/src/app.tsx b/frontend/src/app.tsx index e9681c73a1..de751908aa 100644 --- a/frontend/src/app.tsx +++ b/frontend/src/app.tsx @@ -1,12 +1,9 @@ import type { Clerk } from "@clerk/clerk-js"; -import { ClerkProvider } from "@clerk/clerk-react"; -import { dark } from "@clerk/themes"; import * as Sentry from "@sentry/react"; import { QueryClientProvider } from "@tanstack/react-query"; import { ReactQueryDevtools } from "@tanstack/react-query-devtools"; import { createRouter, RouterProvider } from "@tanstack/react-router"; import { Suspense } from "react"; -import { match } from "ts-pattern"; import { ConfigProvider, FullscreenLoading, @@ -15,9 +12,7 @@ import { Toaster, TooltipProvider, } from "@/components"; -import { PageLayout } from "@/components/layout"; import { clerk } from "./lib/auth"; -import { cloudEnv } from "./lib/env"; import { queryClient } from "./queries/global"; import { routeTree } from "./routeTree.gen"; @@ -60,32 +55,6 @@ function InnerApp() { return ; } -function CloudApp() { - return ( - - - - ); -} - export function App() { return ( @@ -93,11 +62,7 @@ export function App() { }> - {match(__APP_TYPE__) - .with("cloud", () => ) - .otherwise(() => ( - - ))} + diff --git a/frontend/src/app/login.tsx b/frontend/src/app/login.tsx index 5055f81d66..f0a1ddd248 100644 --- a/frontend/src/app/login.tsx +++ b/frontend/src/app/login.tsx @@ -1,9 +1,11 @@ "use client"; +import { useClerk } from "@clerk/clerk-react"; import * as Clerk from "@clerk/elements/common"; import * as SignIn from "@clerk/elements/sign-in"; import { faGithub, faGoogle, faSpinnerThird, Icon } from "@rivet-gg/icons"; import { Link } from "@tanstack/react-router"; import { motion } from "framer-motion"; +import { Badge } from "@/components"; import { Button } from "@/components/ui/button"; import { Card, @@ -16,7 +18,8 @@ import { import { Input } from "@/components/ui/input"; import { Label } from "@/components/ui/label"; -export default function SignInPage() { +export function Login() { + const clerk = useClerk(); return ( + {clerk.client + .lastAuthenticationStrategy === + "oauth_github" ? ( + + Last used + + ) : null} + {clerk.client + .lastAuthenticationStrategy === + "oauth_google" ? ( + + Last used + + ) : null} diff --git a/frontend/src/app/sign-up.tsx b/frontend/src/app/sign-up.tsx index 7970017fb7..a3ce1a122f 100644 --- a/frontend/src/app/sign-up.tsx +++ b/frontend/src/app/sign-up.tsx @@ -1,10 +1,11 @@ "use client"; +import { useClerk } from "@clerk/clerk-react"; import * as Clerk from "@clerk/elements/common"; import * as ClerkSignUp from "@clerk/elements/sign-up"; import { faGithub, faGoogle, faSpinnerThird, Icon } from "@rivet-gg/icons"; import { Link } from "@tanstack/react-router"; import { motion } from "framer-motion"; -import { cn } from "@/components"; +import { Badge, cn, Skeleton } from "@/components"; import { Button } from "@/components/ui/button"; import { Card, @@ -18,6 +19,7 @@ import { Input } from "@/components/ui/input"; import { Label } from "@/components/ui/label"; export function SignUp() { + const clerk = useClerk(); return ( - + + + Welcome! + + Enter your email below to login to your account. + + + +
+ + +
+

+ or +

+
+ + +
+
+ + +
+ + +
+ + +
+ + + } + > {(isGlobalLoading) => ( <> @@ -71,6 +116,13 @@ export function SignUp() { ) } + {clerk.client + .lastAuthenticationStrategy === + "oauth_github" ? ( + + Last used + + ) : null} + + {clerk.client + .lastAuthenticationStrategy === + "oauth_google" ? ( + + Last used + + ) : null} @@ -174,7 +234,7 @@ export function SignUp() { asChild className="text-primary-foreground" > - + Already have an account? Sign in diff --git a/frontend/src/app/user-dropdown.tsx b/frontend/src/app/user-dropdown.tsx index 216e023589..b6e1479c24 100644 --- a/frontend/src/app/user-dropdown.tsx +++ b/frontend/src/app/user-dropdown.tsx @@ -40,7 +40,16 @@ export function UserDropdown() { {params.organization ? ( - ) : null} + ) : ( + + )} Profile - { - clerk.openOrganizationProfile(); - }} - > - Settings - - { - clerk.openOrganizationProfile({ - __experimental_startPath: "/organization-members", - }); - }} - > - Members - + {clerk.organization ? ( + { + clerk.openOrganizationProfile(); + }} + > + Settings + + ) : null} + {clerk.organization ? ( + { + clerk.openOrganizationProfile({ + __experimental_startPath: + "/organization-members", + }); + }} + > + Members + + ) : null} {isMatchingProjectRoute ? ( { @@ -79,16 +93,20 @@ export function UserDropdown() { ) : null} - - - Switch Organization - - - - - - - + {clerk.organization ? ( + + + Switch Organization + + + + + + + + ) : null} { clerk.signOut(); diff --git a/frontend/src/routeTree.gen.ts b/frontend/src/routeTree.gen.ts index 2fa3d766fa..faab076678 100644 --- a/frontend/src/routeTree.gen.ts +++ b/frontend/src/routeTree.gen.ts @@ -9,11 +9,13 @@ // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. import { Route as rootRouteImport } from './routes/__root' +import { Route as SsoCallbackRouteImport } from './routes/sso-callback' +import { Route as LoginRouteImport } from './routes/login' +import { Route as JoinRouteImport } from './routes/join' import { Route as ContextRouteImport } from './routes/_context' import { Route as ContextIndexRouteImport } from './routes/_context/index' import { Route as ContextEngineRouteImport } from './routes/_context/_engine' import { Route as ContextCloudRouteImport } from './routes/_context/_cloud' -import { Route as ContextCloudJoinRouteImport } from './routes/_context/_cloud/join' import { Route as ContextCloudOrgsIndexRouteImport } from './routes/_context/_cloud/orgs.index' import { Route as ContextEngineNsNamespaceRouteImport } from './routes/_context/_engine/ns.$namespace' import { Route as ContextCloudOrgsOrganizationRouteImport } from './routes/_context/_cloud/orgs.$organization' @@ -27,6 +29,21 @@ import { Route as ContextCloudOrgsOrganizationProjectsProjectNsNamespaceRouteImp import { Route as ContextCloudOrgsOrganizationProjectsProjectNsNamespaceIndexRouteImport } from './routes/_context/_cloud/orgs.$organization/projects.$project/ns.$namespace/index' import { Route as ContextCloudOrgsOrganizationProjectsProjectNsNamespaceConnectRouteImport } from './routes/_context/_cloud/orgs.$organization/projects.$project/ns.$namespace/connect' +const SsoCallbackRoute = SsoCallbackRouteImport.update({ + id: '/sso-callback', + path: '/sso-callback', + getParentRoute: () => rootRouteImport, +} as any) +const LoginRoute = LoginRouteImport.update({ + id: '/login', + path: '/login', + getParentRoute: () => rootRouteImport, +} as any) +const JoinRoute = JoinRouteImport.update({ + id: '/join', + path: '/join', + getParentRoute: () => rootRouteImport, +} as any) const ContextRoute = ContextRouteImport.update({ id: '/_context', getParentRoute: () => rootRouteImport, @@ -44,11 +61,6 @@ const ContextCloudRoute = ContextCloudRouteImport.update({ id: '/_cloud', getParentRoute: () => ContextRoute, } as any) -const ContextCloudJoinRoute = ContextCloudJoinRouteImport.update({ - id: '/join', - path: '/join', - getParentRoute: () => ContextCloudRoute, -} as any) const ContextCloudOrgsIndexRoute = ContextCloudOrgsIndexRouteImport.update({ id: '/orgs/', path: '/orgs/', @@ -128,8 +140,10 @@ const ContextCloudOrgsOrganizationProjectsProjectNsNamespaceConnectRoute = ) export interface FileRoutesByFullPath { + '/join': typeof JoinRoute + '/login': typeof LoginRoute + '/sso-callback': typeof SsoCallbackRoute '/': typeof ContextIndexRoute - '/join': typeof ContextCloudJoinRoute '/orgs/$organization': typeof ContextCloudOrgsOrganizationRouteWithChildren '/ns/$namespace': typeof ContextEngineNsNamespaceRouteWithChildren '/orgs': typeof ContextCloudOrgsIndexRoute @@ -144,8 +158,10 @@ export interface FileRoutesByFullPath { '/orgs/$organization/projects/$project/ns/$namespace/': typeof ContextCloudOrgsOrganizationProjectsProjectNsNamespaceIndexRoute } export interface FileRoutesByTo { + '/join': typeof JoinRoute + '/login': typeof LoginRoute + '/sso-callback': typeof SsoCallbackRoute '/': typeof ContextIndexRoute - '/join': typeof ContextCloudJoinRoute '/orgs': typeof ContextCloudOrgsIndexRoute '/ns/$namespace/runners': typeof ContextEngineNsNamespaceRunnersRoute '/orgs/$organization': typeof ContextCloudOrgsOrganizationIndexRoute @@ -158,10 +174,12 @@ export interface FileRoutesByTo { export interface FileRoutesById { __root__: typeof rootRouteImport '/_context': typeof ContextRouteWithChildren + '/join': typeof JoinRoute + '/login': typeof LoginRoute + '/sso-callback': typeof SsoCallbackRoute '/_context/_cloud': typeof ContextCloudRouteWithChildren '/_context/_engine': typeof ContextEngineRouteWithChildren '/_context/': typeof ContextIndexRoute - '/_context/_cloud/join': typeof ContextCloudJoinRoute '/_context/_cloud/orgs/$organization': typeof ContextCloudOrgsOrganizationRouteWithChildren '/_context/_engine/ns/$namespace': typeof ContextEngineNsNamespaceRouteWithChildren '/_context/_cloud/orgs/': typeof ContextCloudOrgsIndexRoute @@ -178,8 +196,10 @@ export interface FileRoutesById { export interface FileRouteTypes { fileRoutesByFullPath: FileRoutesByFullPath fullPaths: - | '/' | '/join' + | '/login' + | '/sso-callback' + | '/' | '/orgs/$organization' | '/ns/$namespace' | '/orgs' @@ -194,8 +214,10 @@ export interface FileRouteTypes { | '/orgs/$organization/projects/$project/ns/$namespace/' fileRoutesByTo: FileRoutesByTo to: - | '/' | '/join' + | '/login' + | '/sso-callback' + | '/' | '/orgs' | '/ns/$namespace/runners' | '/orgs/$organization' @@ -207,10 +229,12 @@ export interface FileRouteTypes { id: | '__root__' | '/_context' + | '/join' + | '/login' + | '/sso-callback' | '/_context/_cloud' | '/_context/_engine' | '/_context/' - | '/_context/_cloud/join' | '/_context/_cloud/orgs/$organization' | '/_context/_engine/ns/$namespace' | '/_context/_cloud/orgs/' @@ -227,10 +251,34 @@ export interface FileRouteTypes { } export interface RootRouteChildren { ContextRoute: typeof ContextRouteWithChildren + JoinRoute: typeof JoinRoute + LoginRoute: typeof LoginRoute + SsoCallbackRoute: typeof SsoCallbackRoute } declare module '@tanstack/react-router' { interface FileRoutesByPath { + '/sso-callback': { + id: '/sso-callback' + path: '/sso-callback' + fullPath: '/sso-callback' + preLoaderRoute: typeof SsoCallbackRouteImport + parentRoute: typeof rootRouteImport + } + '/login': { + id: '/login' + path: '/login' + fullPath: '/login' + preLoaderRoute: typeof LoginRouteImport + parentRoute: typeof rootRouteImport + } + '/join': { + id: '/join' + path: '/join' + fullPath: '/join' + preLoaderRoute: typeof JoinRouteImport + parentRoute: typeof rootRouteImport + } '/_context': { id: '/_context' path: '' @@ -259,13 +307,6 @@ declare module '@tanstack/react-router' { preLoaderRoute: typeof ContextCloudRouteImport parentRoute: typeof ContextRoute } - '/_context/_cloud/join': { - id: '/_context/_cloud/join' - path: '/join' - fullPath: '/join' - preLoaderRoute: typeof ContextCloudJoinRouteImport - parentRoute: typeof ContextCloudRoute - } '/_context/_cloud/orgs/': { id: '/_context/_cloud/orgs/' path: '/orgs' @@ -411,13 +452,11 @@ const ContextCloudOrgsOrganizationRouteWithChildren = ) interface ContextCloudRouteChildren { - ContextCloudJoinRoute: typeof ContextCloudJoinRoute ContextCloudOrgsOrganizationRoute: typeof ContextCloudOrgsOrganizationRouteWithChildren ContextCloudOrgsIndexRoute: typeof ContextCloudOrgsIndexRoute } const ContextCloudRouteChildren: ContextCloudRouteChildren = { - ContextCloudJoinRoute: ContextCloudJoinRoute, ContextCloudOrgsOrganizationRoute: ContextCloudOrgsOrganizationRouteWithChildren, ContextCloudOrgsIndexRoute: ContextCloudOrgsIndexRoute, @@ -472,6 +511,9 @@ const ContextRouteWithChildren = const rootRouteChildren: RootRouteChildren = { ContextRoute: ContextRouteWithChildren, + JoinRoute: JoinRoute, + LoginRoute: LoginRoute, + SsoCallbackRoute: SsoCallbackRoute, } export const routeTree = rootRouteImport ._addFileChildren(rootRouteChildren) diff --git a/frontend/src/routes/__root.tsx b/frontend/src/routes/__root.tsx index 85525785ec..38748965de 100644 --- a/frontend/src/routes/__root.tsx +++ b/frontend/src/routes/__root.tsx @@ -1,12 +1,17 @@ import type { Clerk } from "@clerk/clerk-js"; +import { ClerkProvider } from "@clerk/clerk-react"; +import { dark } from "@clerk/themes"; import type { QueryClient } from "@tanstack/react-query"; import { createRootRouteWithContext, Outlet, + useNavigate, } from "@tanstack/react-router"; import { TanStackRouterDevtools } from "@tanstack/react-router-devtools"; +import { match } from "ts-pattern"; import { FullscreenLoading } from "@/components"; -import { waitForClerk } from "@/lib/waitForClerk"; +import { clerk } from "@/lib/auth"; +import { cloudEnv } from "@/lib/env"; function RootRoute() { return ( @@ -19,6 +24,40 @@ function RootRoute() { ); } +function CloudRoute() { + const navigate = useNavigate(); + return ( + navigate({ to })} + routerReplace={(to) => navigate({ to, replace: true })} + > + + {import.meta.env.DEV ? ( + + ) : null} + + ); +} + interface RootRouteContext { /** * Only available in cloud mode @@ -28,11 +67,8 @@ interface RootRouteContext { } export const Route = createRootRouteWithContext()({ - component: RootRoute, + component: match(__APP_TYPE__) + .with("cloud", () => CloudRoute) + .otherwise(() => RootRoute), pendingComponent: FullscreenLoading, - beforeLoad:async ({ context }) => { - if (context.clerk && __APP_TYPE__ === "cloud") { - return await waitForClerk(context.clerk); - } - } }); diff --git a/frontend/src/routes/_context.tsx b/frontend/src/routes/_context.tsx index f3cd6de369..a788524853 100644 --- a/frontend/src/routes/_context.tsx +++ b/frontend/src/routes/_context.tsx @@ -1,6 +1,7 @@ import { createFileRoute, Outlet, + redirect, useNavigate, useParams, } from "@tanstack/react-router"; @@ -12,6 +13,7 @@ import { createGlobalContext as createGlobalEngineContext } from "@/app/data-pro import { createGlobalContext as createGlobalInspectorContext } from "@/app/data-providers/inspector-data-provider"; import { getConfig, ls, useDialog } from "@/components"; import { ModalRenderer } from "@/components/modal-renderer"; +import { waitForClerk } from "@/lib/waitForClerk"; const searchSchema = z .object({ @@ -61,6 +63,19 @@ export const Route = createFileRoute("/_context")({ })) .exhaustive(); }, + beforeLoad: async (route) => { + return await match(route.context) + .with({ __type: "cloud" }, () => async () => { + await waitForClerk(route.context.clerk); + if (!route.context.clerk.user) { + throw redirect({ + to: "/login", + search: { from: location.pathname }, + }); + } + }) + .otherwise(() => () => {})(); + }, loaderDeps: (route) => ({ token: route.search.t, url: route.search.u }), }); diff --git a/frontend/src/routes/_context/_cloud.tsx b/frontend/src/routes/_context/_cloud.tsx index 2b96eeec4c..3b8e38c3b5 100644 --- a/frontend/src/routes/_context/_cloud.tsx +++ b/frontend/src/routes/_context/_cloud.tsx @@ -7,12 +7,15 @@ import { } from "@tanstack/react-router"; import { match } from "ts-pattern"; import { useDialog } from "@/app/use-dialog"; +import { waitForClerk } from "@/lib/waitForClerk"; export const Route = createFileRoute("/_context/_cloud")({ component: RouteComponent, beforeLoad: ({ context }) => { return match(context) - .with({ __type: "cloud" }, async () => {}) + .with({ __type: "cloud" }, async () => { + return await waitForClerk(context.clerk); + }) .otherwise(() => { throw notFound(); }); diff --git a/frontend/src/routes/_context/_cloud/orgs.$organization/index.tsx b/frontend/src/routes/_context/_cloud/orgs.$organization/index.tsx index 2b84a0546a..a44bbf7ad5 100644 --- a/frontend/src/routes/_context/_cloud/orgs.$organization/index.tsx +++ b/frontend/src/routes/_context/_cloud/orgs.$organization/index.tsx @@ -7,14 +7,14 @@ import { import { match } from "ts-pattern"; import CreateProjectFrameContent from "@/app/dialogs/create-project-frame"; import { RouteLayout } from "@/app/route-layout"; -import { Button, Card, H1, H2, Skeleton } from "@/components"; +import { Button, Card, H2, Skeleton } from "@/components"; export const Route = createFileRoute("/_context/_cloud/orgs/$organization/")({ - beforeLoad: async ({ context, params }) => { + loader: async ({ context, params }) => { return match(context) .with({ __type: "cloud" }, async () => { if (!context.clerk?.organization) { - throw notFound(); + return; } const result = await context.queryClient.fetchInfiniteQuery( context.dataProvider.currentOrgProjectsQueryOptions(), @@ -38,7 +38,32 @@ export const Route = createFileRoute("/_context/_cloud/orgs/$organization/")({ throw notFound(); }); }, - + wrapInSuspense: true, + pendingMinMs: 0, + pendingMs: 0, + pendingComponent: () => ( + +
+
+

+ +

+
+

+ +

+
+
+ +
+ + + +
+
+
+ + ), component: RouteComponent, errorComponent: ({ error }) => ( diff --git a/frontend/src/routes/_context/index.tsx b/frontend/src/routes/_context/index.tsx index e646dccd8b..b2f3c64a13 100644 --- a/frontend/src/routes/_context/index.tsx +++ b/frontend/src/routes/_context/index.tsx @@ -1,9 +1,10 @@ +import { CreateOrganization } from "@clerk/clerk-react"; import { createFileRoute, redirect } from "@tanstack/react-router"; import { match } from "ts-pattern"; import CreateNamespacesFrameContent from "@/app/dialogs/create-namespace-frame"; import { InspectorRoot } from "@/app/inspector-root"; -import Login from "@/app/login"; import { Logo } from "@/app/logo"; +import { RouteLayout } from "@/app/route-layout"; import { Card } from "@/components"; export const Route = createFileRoute("/_context/")({ @@ -26,7 +27,6 @@ export const Route = createFileRoute("/_context/")({ }); }) .with({ __type: "engine" }, async (ctx) => { - console.log("????"); const result = await ctx.queryClient.fetchInfiniteQuery( ctx.dataProvider.namespacesQueryOptions(), ); @@ -60,12 +60,22 @@ export const Route = createFileRoute("/_context/")({ function CloudRoute() { return ( -
-
- - + +
+
+
+ +
+
-
+ ); } diff --git a/frontend/src/routes/_context/_cloud/join.tsx b/frontend/src/routes/join.tsx similarity index 54% rename from frontend/src/routes/_context/_cloud/join.tsx rename to frontend/src/routes/join.tsx index 04d118f8ac..5f0c58a391 100644 --- a/frontend/src/routes/_context/_cloud/join.tsx +++ b/frontend/src/routes/join.tsx @@ -1,9 +1,17 @@ -import { createFileRoute } from "@tanstack/react-router"; + +import { createFileRoute, redirect } from "@tanstack/react-router"; import { Logo } from "@/app/logo"; import { SignUp } from "@/app/sign-up"; +import { waitForClerk } from "@/lib/waitForClerk"; -export const Route = createFileRoute("/_context/_cloud/join")({ +export const Route = createFileRoute("/join")({ component: RouteComponent, + beforeLoad: async ({context}) => { + await waitForClerk(context.clerk); + if (context.clerk.user) { + throw redirect({to: "/"}) + } + } }); function RouteComponent() { diff --git a/frontend/src/routes/login.tsx b/frontend/src/routes/login.tsx new file mode 100644 index 0000000000..b74e1896d8 --- /dev/null +++ b/frontend/src/routes/login.tsx @@ -0,0 +1,25 @@ +import { createFileRoute, redirect } from "@tanstack/react-router"; +import { Login } from "@/app/login"; +import { Logo } from "@/app/logo"; +import { waitForClerk } from "@/lib/waitForClerk"; + +export const Route = createFileRoute("/login")({ + component: RouteComponent, + beforeLoad: async ({ context }) => { + await waitForClerk(context.clerk); + if (context.clerk.user) { + throw redirect({ to: "/" }); + } + }, +}); + +function RouteComponent() { + return ( +
+
+ + +
+
+ ); +} diff --git a/frontend/src/routes/sso-callback.tsx b/frontend/src/routes/sso-callback.tsx new file mode 100644 index 0000000000..9779a2cf04 --- /dev/null +++ b/frontend/src/routes/sso-callback.tsx @@ -0,0 +1,16 @@ +import { AuthenticateWithRedirectCallback } from "@clerk/clerk-react"; +import { createFileRoute } from "@tanstack/react-router"; +import { FullscreenLoading } from "@/components"; + +export const Route = createFileRoute("/sso-callback")({ + component: RouteComponent, +}); + +function RouteComponent() { + return ( + <> + + + + ) +} diff --git a/package.json b/package.json index a61fb8306e..01849bb735 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,6 @@ }, "resolutions": { "rivetkit": "https://pkg.pr.new/rivet-dev/rivetkit@1296", - "@clerk/shared": "3.26.1" + "@clerk/shared": "3.27.1" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d648aab346..3c483fc0ae 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -6,7 +6,7 @@ settings: overrides: rivetkit: https://pkg.pr.new/rivet-dev/rivetkit@1296 - '@clerk/shared': 3.26.1 + '@clerk/shared': 3.27.1 importers: @@ -57,17 +57,17 @@ importers: frontend: dependencies: '@clerk/clerk-js': - specifier: ^5.92.1 - version: 5.95.0(@types/react@18.3.24)(react-dom@19.1.1(react@19.1.1))(react@19.1.1)(typescript@5.9.2)(use-sync-external-store@1.5.0(react@19.1.1))(zod@3.25.76) + specifier: ^5.97 + version: 5.97.0(@types/react@18.3.24)(react-dom@19.1.1(react@19.1.1))(react@19.1.1)(typescript@5.9.2)(use-sync-external-store@1.5.0(react@19.1.1))(zod@3.25.76) '@clerk/clerk-react': - specifier: ^5.47.0 - version: 5.48.1(react-dom@19.1.1(react@19.1.1))(react@19.1.1) + specifier: ^5.49.1 + version: 5.49.1(react-dom@19.1.1(react@19.1.1))(react@19.1.1) '@clerk/elements': specifier: ^0.23.63 version: 0.23.63(@types/react-dom@18.3.7(@types/react@18.3.24))(@types/react@18.3.24)(next@15.5.2(@babel/core@7.28.4)(react-dom@19.1.1(react@19.1.1))(react@19.1.1)(sass@1.93.2))(react-dom@19.1.1(react@19.1.1))(react@19.1.1) '@clerk/shared': - specifier: 3.26.1 - version: 3.26.1(react-dom@19.1.1(react@19.1.1))(react@19.1.1) + specifier: 3.27.1 + version: 3.27.1(react-dom@19.1.1(react@19.1.1))(react@19.1.1) '@clerk/themes': specifier: ^2.4.18 version: 2.4.21 @@ -1318,22 +1318,15 @@ packages: cpu: [x64] os: [win32] - '@clerk/clerk-js@5.95.0': - resolution: {integrity: sha512-SLIgFPymcL9tV0D/c02TF86F5+C5NecPrd0qVkMzbnQ0cqo5W6RPuQE4ogOHuV+4NH4kQRu2hRHm8crBei2fOg==} + '@clerk/clerk-js@5.97.0': + resolution: {integrity: sha512-bFaghDHoXni1m8gW0iHadyF1PR6/hV5FID5Ec8S3L3TvhU90LCpU3blakaRKHuoINfPXhk6UwIqSpEbKrYB/iA==} engines: {node: '>=18.17.0'} peerDependencies: react: ^18.0.0 || ^19.0.0 || ^19.0.0-0 react-dom: ^18.0.0 || ^19.0.0 || ^19.0.0-0 - '@clerk/clerk-react@5.47.0': - resolution: {integrity: sha512-of2Y6dg36eL7TwAP4DbGOMWW6DJpJSIuCn6g1jJqJkh4NGljHC7vz3H18OERRM5UQXmBG3twjC8CNAQxQrquRA==} - engines: {node: '>=18.17.0'} - peerDependencies: - react: ^18.0.0 || ^19.0.0 || ^19.0.0-0 - react-dom: ^18.0.0 || ^19.0.0 || ^19.0.0-0 - - '@clerk/clerk-react@5.48.1': - resolution: {integrity: sha512-RXaP5+LzgHURWXmunCj129s79qFLuvsKFu7JHBhvClP6FhY/UbgHi5jaIwvDh5JpmTtuvcTZsBViqQgxPoxOvQ==} + '@clerk/clerk-react@5.49.1': + resolution: {integrity: sha512-0yphUDJztg95eAARovx9NbgC5dWNVWhfBQ3klRKupA1hSB8+5VtkE4AugcUU7GMF9XK1jl0yrqMuOGp0U1BTqw==} engines: {node: '>=18.17.0'} peerDependencies: react: ^18.0.0 || ^19.0.0 || ^19.0.0-0 @@ -1350,12 +1343,12 @@ packages: next: optional: true - '@clerk/localizations@3.25.3': - resolution: {integrity: sha512-9/R3PzktThQTmcimUGeag1TGSCwAVf1ZtEsJcpSbzQYe/RpWjSg13CiHsvw+jegFkSEuDcI0nH73k+KgYlMDHw==} + '@clerk/localizations@3.25.5': + resolution: {integrity: sha512-CRksWw5kTnxYaCfwpfQw2t0YswPnP3PML/9SpZecZYOZVnvqVkl1VriMONhV7IXrMq1PuAIw5eurKagFdzEhpw==} engines: {node: '>=18.17.0'} - '@clerk/shared@3.26.1': - resolution: {integrity: sha512-84dAJutr7JAwKwRI0fRj6mFy3D521okNIiCkJ+ffMp0lniQr5IXQSFqkCEd+cQ3bImr1YHKCGVMLkahZI6s9Ng==} + '@clerk/shared@3.27.1': + resolution: {integrity: sha512-xvlc1LktFvVGt7T25Obg5vDyhGh9pVK8X976k7oGsqaJ9SWCdKVKj4cFIXh5bo0o7HkvJKdbz/gRl9GWk+IyoQ==} engines: {node: '>=18.17.0'} peerDependencies: react: ^18.0.0 || ^19.0.0 || ^19.0.0-0 @@ -1378,6 +1371,10 @@ packages: resolution: {integrity: sha512-OAepuiszOrheIThdCtBRiRSq0A3grlD2yhUUO8kvMFv4Uys95gSzkzuvQjUWXZZ23yOdTl6eRUXjtjCGto116w==} engines: {node: '>=18.17.0'} + '@clerk/types@4.90.0': + resolution: {integrity: sha512-AnXeCkyFdM+3icdeKElajVKV73IvlQ6eeWTaLG700CzL+Zw9iD2YV4t8qAhNhwo0FFtkcI9EKDblw6G9Rn1Onw==} + engines: {node: '>=18.17.0'} + '@codemirror/autocomplete@6.18.7': resolution: {integrity: sha512-8EzdeIoWPJDsMBwz3zdzwXnUpCzMiCyz5/A3FIPpriaclFCGDkAzK13sMcnsu5rowqiyeQN2Vs2TsOcoDPZirQ==} @@ -8579,12 +8576,12 @@ snapshots: '@cbor-extract/cbor-extract-win32-x64@2.2.0': optional: true - '@clerk/clerk-js@5.95.0(@types/react@18.3.24)(react-dom@19.1.1(react@19.1.1))(react@19.1.1)(typescript@5.9.2)(use-sync-external-store@1.5.0(react@19.1.1))(zod@3.25.76)': + '@clerk/clerk-js@5.97.0(@types/react@18.3.24)(react-dom@19.1.1(react@19.1.1))(react@19.1.1)(typescript@5.9.2)(use-sync-external-store@1.5.0(react@19.1.1))(zod@3.25.76)': dependencies: '@base-org/account': 2.0.1(@types/react@18.3.24)(react@19.1.1)(typescript@5.9.2)(use-sync-external-store@1.5.0(react@19.1.1))(zod@3.25.76) - '@clerk/localizations': 3.25.3 - '@clerk/shared': 3.26.1(react-dom@19.1.1(react@19.1.1))(react@19.1.1) - '@clerk/types': 4.88.0 + '@clerk/localizations': 3.25.5 + '@clerk/shared': 3.27.1(react-dom@19.1.1(react@19.1.1))(react@19.1.1) + '@clerk/types': 4.90.0 '@coinbase/wallet-sdk': 4.3.0 '@emotion/cache': 11.11.0 '@emotion/react': 11.11.1(@types/react@18.3.24)(react@19.1.1) @@ -8617,26 +8614,18 @@ snapshots: - utf-8-validate - zod - '@clerk/clerk-react@5.47.0(react-dom@19.1.1(react@19.1.1))(react@19.1.1)': - dependencies: - '@clerk/shared': 3.26.1(react-dom@19.1.1(react@19.1.1))(react@19.1.1) - '@clerk/types': 4.86.0 - react: 19.1.1 - react-dom: 19.1.1(react@19.1.1) - tslib: 2.8.1 - - '@clerk/clerk-react@5.48.1(react-dom@19.1.1(react@19.1.1))(react@19.1.1)': + '@clerk/clerk-react@5.49.1(react-dom@19.1.1(react@19.1.1))(react@19.1.1)': dependencies: - '@clerk/shared': 3.26.1(react-dom@19.1.1(react@19.1.1))(react@19.1.1) - '@clerk/types': 4.88.0 + '@clerk/shared': 3.27.1(react-dom@19.1.1(react@19.1.1))(react@19.1.1) + '@clerk/types': 4.90.0 react: 19.1.1 react-dom: 19.1.1(react@19.1.1) tslib: 2.8.1 '@clerk/elements@0.23.63(@types/react-dom@18.3.7(@types/react@18.3.24))(@types/react@18.3.24)(next@15.5.2(@babel/core@7.28.4)(react-dom@19.1.1(react@19.1.1))(react@19.1.1)(sass@1.93.2))(react-dom@19.1.1(react@19.1.1))(react@19.1.1)': dependencies: - '@clerk/clerk-react': 5.47.0(react-dom@19.1.1(react@19.1.1))(react@19.1.1) - '@clerk/shared': 3.26.1(react-dom@19.1.1(react@19.1.1))(react@19.1.1) + '@clerk/clerk-react': 5.49.1(react-dom@19.1.1(react@19.1.1))(react@19.1.1) + '@clerk/shared': 3.27.1(react-dom@19.1.1(react@19.1.1))(react@19.1.1) '@clerk/types': 4.86.0 '@radix-ui/primitive': 1.1.3 '@radix-ui/react-form': 0.1.8(@types/react-dom@18.3.7(@types/react@18.3.24))(@types/react@18.3.24)(react-dom@19.1.1(react@19.1.1))(react@19.1.1) @@ -8654,13 +8643,13 @@ snapshots: - '@types/react' - '@types/react-dom' - '@clerk/localizations@3.25.3': + '@clerk/localizations@3.25.5': dependencies: - '@clerk/types': 4.88.0 + '@clerk/types': 4.90.0 - '@clerk/shared@3.26.1(react-dom@19.1.1(react@19.1.1))(react@19.1.1)': + '@clerk/shared@3.27.1(react-dom@19.1.1(react@19.1.1))(react@19.1.1)': dependencies: - '@clerk/types': 4.88.0 + '@clerk/types': 4.90.0 dequal: 2.0.3 glob-to-regexp: 0.4.1 js-cookie: 3.0.5 @@ -8683,6 +8672,10 @@ snapshots: dependencies: csstype: 3.1.3 + '@clerk/types@4.90.0': + dependencies: + csstype: 3.1.3 + '@codemirror/autocomplete@6.18.7': dependencies: '@codemirror/language': 6.11.3