From 11c15f3806d51fbabe74f0166de611290dcdb4b9 Mon Sep 17 00:00:00 2001
From: Jacek <jacek@clerk.dev>
Date: Thu, 17 Oct 2024 12:31:35 -0500
Subject: [PATCH 01/12] feat: support async request methods

---
 .changeset/grumpy-hairs-remember.md           |    7 +
 .changeset/loud-birds-grin.md                 |    5 -
 .changeset/serious-moose-design.md            |    5 -
 .../next-app-router/src/app/api/me/route.ts   |    4 +-
 .../src/app/api/settings/route.ts             |    4 +-
 .../next-app-router/src/app/csp/page.tsx      |    6 +-
 .../src/app/organizations-by-id/[id]/page.tsx |    4 +-
 .../[id]/settings/page.tsx                    |    4 +-
 .../app/organizations-by-slug/[slug]/page.tsx |    4 +-
 .../[slug]/settings/page.tsx                  |    4 +-
 .../src/app/page-protected/page.tsx           |    5 +-
 .../src/app/personal-account/page.tsx         |    4 +-
 .../src/app/settings/auth-has/page.tsx        |    4 +-
 .../src/app/settings/auth-protect/page.tsx    |    4 +-
 .../next-app-router/src/middleware.ts         |    2 +-
 .../src/custom-user-button-trigger/index.tsx  |  100 +
 .../src/custom-user-button/index.tsx          |    2 +-
 .../src/custom-user-profile/index.tsx         |    2 +-
 integration/templates/react-vite/src/main.tsx |    5 +
 .../templates/tanstack-start/app.config.ts    |    2 +-
 integration/tests/custom-pages.test.ts        |   68 +-
 integration/tests/dynamic-keys.test.ts        |   16 +-
 integration/tests/restricted-mode.test.ts     |    4 +-
 package-lock.json                             | 1984 ++++++++++++++---
 packages/astro/CHANGELOG.md                   |   16 +
 packages/astro/package.json                   |    8 +-
 packages/backend/CHANGELOG.md                 |   20 +
 packages/backend/package.json                 |    6 +-
 packages/backend/src/api/resources/JSON.ts    |    1 +
 .../backend/src/api/resources/Verification.ts |    1 +
 .../src/tokens/__tests__/request.test.ts      |   11 +-
 packages/backend/src/tokens/request.ts        |   35 +-
 packages/backend/src/tokens/types.ts          |    4 +-
 packages/chrome-extension/CHANGELOG.md        |    9 +
 packages/chrome-extension/package.json        |    8 +-
 packages/clerk-js/CHANGELOG.md                |   33 +
 packages/clerk-js/bundlewatch.config.json     |    2 +-
 packages/clerk-js/package.json                |    8 +-
 packages/clerk-js/src/core/clerk.ts           |    7 +
 .../clerk-js/src/core/resources/Session.ts    |    2 -
 .../clerk-js/src/core/resources/SignIn.ts     |    8 +-
 .../clerk-js/src/core/resources/SignUp.ts     |    8 +-
 .../src/core/resources/Verification.ts        |    2 +
 packages/clerk-js/src/ui/Components.tsx       |   10 +
 .../OrganizationSwitcher.tsx                  |   62 +-
 .../OrganizationSwitcherPopover.tsx           |    9 +-
 .../__tests__/OrganizationSwitcher.test.tsx   |   18 +-
 .../SignUp/SignUpRestrictedAccess.tsx         |   31 +-
 .../SignUp/__tests__/SignUpStart.test.tsx     |    2 +-
 .../ui/components/UserButton/UserButton.tsx   |   43 +-
 .../UserButton/UserButtonPopover.tsx          |    7 +-
 .../UserButton/__tests__/UserButton.test.tsx  |   12 +
 .../ui/components/UserProfile/Web3Form.tsx    |    4 +-
 .../components/prefetch-organization-list.tsx |    8 +
 .../clerk-js/src/ui/elements/PopoverCard.tsx  |   36 +-
 .../clerk-js/src/ui/lazyModules/providers.tsx |    7 +
 packages/clerk-js/src/utils/web3.ts           |   15 +-
 packages/elements/CHANGELOG.md                |    7 +
 packages/elements/package.json                |    8 +-
 packages/expo/CHANGELOG.md                    |   10 +
 packages/expo/package.json                    |   10 +-
 packages/express/CHANGELOG.md                 |   26 +
 packages/express/package.json                 |    8 +-
 .../__snapshots__/exports.test.ts.snap        |    1 +
 packages/express/src/index.ts                 |    1 +
 packages/fastify/CHANGELOG.md                 |   16 +
 packages/fastify/package.json                 |    8 +-
 packages/localizations/CHANGELOG.md           |   13 +
 packages/localizations/package.json           |    4 +-
 packages/localizations/src/en-US.ts           |    8 +-
 packages/nextjs/CHANGELOG.md                  |   17 +
 packages/nextjs/MIGRATION.md                  |   84 +
 packages/nextjs/package.json                  |   10 +-
 .../src/app-router/server/ClerkProvider.tsx   |    8 +-
 packages/nextjs/src/app-router/server/auth.ts |   34 +-
 .../app-router/server/controlComponents.tsx   |   22 +-
 .../src/app-router/server/currentUser.ts      |    6 +-
 .../nextjs/src/app-router/server/utils.ts     |   12 +-
 .../src/server/__tests__/clerkClient.test.ts  |    4 +-
 .../server/__tests__/clerkMiddleware.test.ts  |   38 +-
 packages/nextjs/src/server/clerkClient.ts     |   10 +-
 packages/nextjs/src/server/clerkMiddleware.ts |    9 +-
 packages/react/CHANGELOG.md                   |   38 +
 packages/react/package.json                   |    8 +-
 .../react/src/components/uiComponents.tsx     |  210 +-
 packages/react/src/isomorphicClerk.ts         |    9 +
 packages/react/src/types.ts                   |    7 +-
 packages/react/src/utils/useCustomPages.tsx   |   97 +-
 packages/remix/CHANGELOG.md                   |   17 +
 packages/remix/package.json                   |   10 +-
 packages/sdk-node/CHANGELOG.md                |   16 +
 packages/sdk-node/package.json                |    8 +-
 packages/shared/CHANGELOG.md                  |    9 +
 packages/shared/package.json                  |    4 +-
 packages/shared/src/loadScript.ts             |   53 +-
 packages/tanstack-start/CHANGELOG.md          |   17 +
 packages/tanstack-start/package.json          |   10 +-
 packages/testing/CHANGELOG.md                 |   16 +
 packages/testing/package.json                 |    8 +-
 packages/themes/CHANGELOG.md                  |    7 +
 packages/themes/package.json                  |    4 +-
 packages/types/CHANGELOG.md                   |   22 +
 packages/types/package.json                   |    2 +-
 packages/types/src/clerk.ts                   |   26 +
 packages/types/src/json.ts                    |    1 +
 packages/types/src/localization.ts            |    2 +
 packages/types/src/session.ts                 |    2 -
 packages/types/src/sessionVerification.ts     |   11 +-
 packages/types/src/verification.ts            |    1 +
 packages/upgrade/package.json                 |   16 +-
 packages/upgrade/src/app.js                   |   73 +-
 packages/upgrade/src/cli.js                   |   14 +-
 .../transform-async-request.fixtures.js       |  161 ++
 .../__tests__/transform-async-request.test.js |   13 +
 packages/upgrade/src/codemods/index.js        |   17 +
 .../src/codemods/transform-async-request.js   |  145 ++
 packages/upgrade/src/components/Codemod.js    |   75 +
 packages/upgrade/src/components/Header.js     |   14 +
 .../upgrade/src/components/SDKWorkflow.js     |   96 +
 .../src/{scan.js => components/Scan.js}       |    4 +-
 packages/upgrade/src/constants/versions.js    |    1 +
 .../src/util/detect-package-manager.js        |   24 +
 .../upgrade/src/util/get-clerk-version.js     |   27 +-
 packages/upgrade/vitest.config.js             |    8 +
 playground/app-router/src/app/action/page.tsx |    2 +-
 .../app-router/src/app/protected/page.tsx     |   10 +-
 .../src/pages/user/[[...index]].tsx           |    2 +-
 playground/nextjs/app/app-dir/page.tsx        |    2 +-
 128 files changed, 3594 insertions(+), 801 deletions(-)
 create mode 100644 .changeset/grumpy-hairs-remember.md
 delete mode 100644 .changeset/loud-birds-grin.md
 delete mode 100644 .changeset/serious-moose-design.md
 create mode 100644 integration/templates/react-vite/src/custom-user-button-trigger/index.tsx
 create mode 100644 packages/clerk-js/src/ui/components/prefetch-organization-list.tsx
 create mode 100644 packages/nextjs/MIGRATION.md
 create mode 100644 packages/upgrade/src/codemods/__tests__/__fixtures__/transform-async-request.fixtures.js
 create mode 100644 packages/upgrade/src/codemods/__tests__/transform-async-request.test.js
 create mode 100644 packages/upgrade/src/codemods/index.js
 create mode 100644 packages/upgrade/src/codemods/transform-async-request.js
 create mode 100644 packages/upgrade/src/components/Codemod.js
 create mode 100644 packages/upgrade/src/components/Header.js
 create mode 100644 packages/upgrade/src/components/SDKWorkflow.js
 rename packages/upgrade/src/{scan.js => components/Scan.js} (97%)
 create mode 100644 packages/upgrade/src/util/detect-package-manager.js
 create mode 100644 packages/upgrade/vitest.config.js

diff --git a/.changeset/grumpy-hairs-remember.md b/.changeset/grumpy-hairs-remember.md
new file mode 100644
index 00000000000..d70d9c24a92
--- /dev/null
+++ b/.changeset/grumpy-hairs-remember.md
@@ -0,0 +1,7 @@
+---
+"@clerk/nextjs": major
+"@clerk/upgrade": minor
+---
+
+@clerk/nextjs: Converting auth() and clerkClient() interfaces to be async
+@clerk/upgrade: Adding required codemod for @clerk/nextjs breaking changes
diff --git a/.changeset/loud-birds-grin.md b/.changeset/loud-birds-grin.md
deleted file mode 100644
index 36ed9c77e30..00000000000
--- a/.changeset/loud-birds-grin.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@clerk/localizations": patch
----
-
-Remove typos from pl-PL 
diff --git a/.changeset/serious-moose-design.md b/.changeset/serious-moose-design.md
deleted file mode 100644
index 9d29e0cf281..00000000000
--- a/.changeset/serious-moose-design.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@clerk/clerk-js": patch
----
-
-Add the `?render=explicit` query parameter to the Turnstile script.
diff --git a/integration/templates/next-app-router/src/app/api/me/route.ts b/integration/templates/next-app-router/src/app/api/me/route.ts
index c6088c6a977..8ae059dff05 100644
--- a/integration/templates/next-app-router/src/app/api/me/route.ts
+++ b/integration/templates/next-app-router/src/app/api/me/route.ts
@@ -1,6 +1,6 @@
 import { auth } from '@clerk/nextjs/server';
 
-export function GET() {
-  const { userId } = auth();
+export async function GET() {
+  const { userId } = await auth();
   return new Response(JSON.stringify({ userId }));
 }
diff --git a/integration/templates/next-app-router/src/app/api/settings/route.ts b/integration/templates/next-app-router/src/app/api/settings/route.ts
index 62553e05efd..8e6d46017e6 100644
--- a/integration/templates/next-app-router/src/app/api/settings/route.ts
+++ b/integration/templates/next-app-router/src/app/api/settings/route.ts
@@ -1,6 +1,6 @@
 import { auth } from '@clerk/nextjs/server';
 
-export function GET() {
-  const { userId } = auth().protect(has => has({ role: 'admin' }) || has({ role: 'org:editor' }));
+export async function GET() {
+  const { userId } = await auth.protect((has: any) => has({ role: 'admin' }) || has({ role: 'org:editor' }));
   return new Response(JSON.stringify({ userId }));
 }
diff --git a/integration/templates/next-app-router/src/app/csp/page.tsx b/integration/templates/next-app-router/src/app/csp/page.tsx
index 803218da796..fec6f7b09c0 100644
--- a/integration/templates/next-app-router/src/app/csp/page.tsx
+++ b/integration/templates/next-app-router/src/app/csp/page.tsx
@@ -1,10 +1,12 @@
 import { headers } from 'next/headers';
 import { ClerkLoaded } from '@clerk/nextjs';
 
-export default function CSPPage() {
+export default async function CSPPage() {
+  const cspHeader = await headers().get('Content-Security-Policy');
+
   return (
     <div>
-      CSP: <pre>{headers().get('Content-Security-Policy')}</pre>
+      CSP: <pre>{cspHeader}</pre>
       <ClerkLoaded>
         <p>clerk loaded</p>
       </ClerkLoaded>
diff --git a/integration/templates/next-app-router/src/app/organizations-by-id/[id]/page.tsx b/integration/templates/next-app-router/src/app/organizations-by-id/[id]/page.tsx
index 41eb746d5e0..794d8c6b2a1 100644
--- a/integration/templates/next-app-router/src/app/organizations-by-id/[id]/page.tsx
+++ b/integration/templates/next-app-router/src/app/organizations-by-id/[id]/page.tsx
@@ -1,7 +1,7 @@
 import { auth } from '@clerk/nextjs/server';
 
-export default function Home({ params }: { params: { id: string } }) {
-  const { orgId } = auth();
+export default async function Home({ params }: { params: { id: string } }) {
+  const { orgId } = await auth();
 
   if (params.id != orgId) {
     console.log('Mismatch - returning nothing for now...', params.id, orgId);
diff --git a/integration/templates/next-app-router/src/app/organizations-by-id/[id]/settings/page.tsx b/integration/templates/next-app-router/src/app/organizations-by-id/[id]/settings/page.tsx
index 8d1adf2e244..f99a9eb4cd4 100644
--- a/integration/templates/next-app-router/src/app/organizations-by-id/[id]/settings/page.tsx
+++ b/integration/templates/next-app-router/src/app/organizations-by-id/[id]/settings/page.tsx
@@ -1,7 +1,7 @@
 import { auth } from '@clerk/nextjs/server';
 
-export default function Home({ params }: { params: { id: string } }) {
-  const { orgId } = auth();
+export default async function Home({ params }: { params: { id: string } }) {
+  const { orgId } = await auth();
 
   if (params.id != orgId) {
     console.log('Mismatch - returning nothing for now...', params.id, orgId);
diff --git a/integration/templates/next-app-router/src/app/organizations-by-slug/[slug]/page.tsx b/integration/templates/next-app-router/src/app/organizations-by-slug/[slug]/page.tsx
index 1847d88f181..fea8138ea7b 100644
--- a/integration/templates/next-app-router/src/app/organizations-by-slug/[slug]/page.tsx
+++ b/integration/templates/next-app-router/src/app/organizations-by-slug/[slug]/page.tsx
@@ -1,7 +1,7 @@
 import { auth } from '@clerk/nextjs/server';
 
-export default function Home({ params }: { params: { slug: string } }) {
-  const { orgSlug } = auth();
+export default async function Home({ params }: { params: { slug: string } }) {
+  const { orgSlug } = await auth();
 
   if (params.slug != orgSlug) {
     console.log('Mismatch - returning nothing for now...', params.slug, orgSlug);
diff --git a/integration/templates/next-app-router/src/app/organizations-by-slug/[slug]/settings/page.tsx b/integration/templates/next-app-router/src/app/organizations-by-slug/[slug]/settings/page.tsx
index f2613fdbcc4..7cfcdbd93a1 100644
--- a/integration/templates/next-app-router/src/app/organizations-by-slug/[slug]/settings/page.tsx
+++ b/integration/templates/next-app-router/src/app/organizations-by-slug/[slug]/settings/page.tsx
@@ -1,7 +1,7 @@
 import { auth } from '@clerk/nextjs/server';
 
-export default function Home({ params }: { params: { slug: string } }) {
-  const { orgSlug } = auth();
+export default async function Home({ params }: { params: { slug: string } }) {
+  const { orgSlug } = await auth();
 
   if (params.slug != orgSlug) {
     console.log('Mismatch - returning nothing for now...', params.slug, orgSlug);
diff --git a/integration/templates/next-app-router/src/app/page-protected/page.tsx b/integration/templates/next-app-router/src/app/page-protected/page.tsx
index d67679ce800..0cce9cdcd98 100644
--- a/integration/templates/next-app-router/src/app/page-protected/page.tsx
+++ b/integration/templates/next-app-router/src/app/page-protected/page.tsx
@@ -1,6 +1,7 @@
 import { auth } from '@clerk/nextjs/server';
 
-export default function Page() {
-  auth().protect();
+export default async function Page() {
+  await auth.protect();
+
   return <div>Protected Page</div>;
 }
diff --git a/integration/templates/next-app-router/src/app/personal-account/page.tsx b/integration/templates/next-app-router/src/app/personal-account/page.tsx
index fdd6a1460d0..39dc9da1da9 100644
--- a/integration/templates/next-app-router/src/app/personal-account/page.tsx
+++ b/integration/templates/next-app-router/src/app/personal-account/page.tsx
@@ -1,7 +1,7 @@
 import { auth } from '@clerk/nextjs/server';
 
-export default function Home(): {} {
-  const { orgId } = auth();
+export default async function Home() {
+  const { orgId } = await auth();
 
   if (orgId != null) {
     console.log('Oh no, this page should only activate on the personal account!');
diff --git a/integration/templates/next-app-router/src/app/settings/auth-has/page.tsx b/integration/templates/next-app-router/src/app/settings/auth-has/page.tsx
index a036ccfc7ce..b1363c49723 100644
--- a/integration/templates/next-app-router/src/app/settings/auth-has/page.tsx
+++ b/integration/templates/next-app-router/src/app/settings/auth-has/page.tsx
@@ -1,7 +1,7 @@
 import { auth } from '@clerk/nextjs/server';
 
-export default function Page() {
-  const { userId, has } = auth();
+export default async function Page() {
+  const { userId, has } = await auth();
   if (!userId || !has({ permission: 'org:posts:manage' })) {
     return <p>User is missing permissions</p>;
   }
diff --git a/integration/templates/next-app-router/src/app/settings/auth-protect/page.tsx b/integration/templates/next-app-router/src/app/settings/auth-protect/page.tsx
index cddf0f7d505..c7f9b76b514 100644
--- a/integration/templates/next-app-router/src/app/settings/auth-protect/page.tsx
+++ b/integration/templates/next-app-router/src/app/settings/auth-protect/page.tsx
@@ -1,6 +1,6 @@
 import { auth } from '@clerk/nextjs/server';
 
-export default function Page() {
-  auth().protect({ role: 'admin' });
+export default async function Page() {
+  await auth.protect({ role: 'admin' });
   return <p>User has access</p>;
 }
diff --git a/integration/templates/next-app-router/src/middleware.ts b/integration/templates/next-app-router/src/middleware.ts
index 2deaf8df808..b6a2c375d32 100644
--- a/integration/templates/next-app-router/src/middleware.ts
+++ b/integration/templates/next-app-router/src/middleware.ts
@@ -11,7 +11,7 @@ const csp = `default-src 'self';
 const isProtectedRoute = createRouteMatcher(['/protected(.*)', '/user(.*)', '/switcher(.*)']);
 const isCSPRoute = createRouteMatcher(['/csp']);
 
-export default clerkMiddleware((auth, req) => {
+export default clerkMiddleware(async (auth, req) => {
   if (isProtectedRoute(req)) {
     auth().protect();
   }
diff --git a/integration/templates/react-vite/src/custom-user-button-trigger/index.tsx b/integration/templates/react-vite/src/custom-user-button-trigger/index.tsx
new file mode 100644
index 00000000000..bbcd41b52e9
--- /dev/null
+++ b/integration/templates/react-vite/src/custom-user-button-trigger/index.tsx
@@ -0,0 +1,100 @@
+import { UserButton } from '@clerk/clerk-react';
+import { PropsWithChildren, useContext, useState } from 'react';
+import { PageContext, PageContextProvider } from '../PageContext.tsx';
+
+function Page1() {
+  const { counter, setCounter } = useContext(PageContext);
+
+  return (
+    <>
+      <h1 data-page={1}>Page 1</h1>
+      <p data-page={1}>Counter: {counter}</p>
+      <button
+        data-page={1}
+        onClick={() => setCounter(a => a + 1)}
+      >
+        Update
+      </button>
+    </>
+  );
+}
+
+function ToggleChildren(props: PropsWithChildren) {
+  const [isMounted, setMounted] = useState(false);
+
+  return (
+    <>
+      <button
+        data-toggle-btn
+        onClick={() => setMounted(v => !v)}
+      >
+        Toggle
+      </button>
+      {isMounted ? props.children : null}
+    </>
+  );
+}
+
+export default function Page() {
+  return (
+    <PageContextProvider>
+      <UserButton __experimental_asProvider>
+        <UserButton.UserProfilePage
+          label={'Page 1'}
+          labelIcon={<p data-label-icon={'page-1'}>🙃</p>}
+          url='page-1'
+        >
+          <Page1 />
+        </UserButton.UserProfilePage>
+        <UserButton.UserProfilePage label={'security'} />
+        <UserButton.UserProfilePage
+          label={'Page 2'}
+          labelIcon={<p data-label-icon={'page-2'}>🙃</p>}
+          url='page-2'
+        >
+          <h1>Page 2</h1>
+        </UserButton.UserProfilePage>
+        <p data-leaked-child>This is leaking</p>
+        <UserButton.UserProfileLink
+          url={'https://clerk.com'}
+          label={'Visit Clerk'}
+          labelIcon={<p data-label-icon={'page-3'}>🌐</p>}
+        />
+        <UserButton.MenuItems>
+          <UserButton.Action
+            label={'page-1'}
+            labelIcon={<span>🙃</span>}
+            open={'page-1'}
+          />
+          <UserButton.Action label={'manageAccount'} />
+          <UserButton.Action label={'signOut'} />
+          <UserButton.Link
+            href={'http://clerk.com'}
+            label={'Visit Clerk'}
+            labelIcon={<span>🌐</span>}
+          />
+
+          <UserButton.Link
+            href={'/user'}
+            label={'Visit User page'}
+            labelIcon={<span>🌐</span>}
+          />
+
+          <UserButton.Action
+            label={'Custom Alert'}
+            labelIcon={<span>🔔</span>}
+            onClick={() => alert('custom-alert')}
+          />
+        </UserButton.MenuItems>
+        <UserButton.UserProfileLink
+          url={'/user'}
+          label={'Visit User page'}
+          labelIcon={<p data-label-icon={'page-4'}>🌐</p>}
+        />
+        <ToggleChildren>
+          <UserButton.__experimental_Outlet __experimental_asStandalone />
+        </ToggleChildren>
+      </UserButton>
+    </PageContextProvider>
+  );
+}
diff --git a/integration/templates/react-vite/src/custom-user-button/index.tsx b/integration/templates/react-vite/src/custom-user-button/index.tsx
index e6c800bcaf3..e283cddd76b 100644
--- a/integration/templates/react-vite/src/custom-user-button/index.tsx
+++ b/integration/templates/react-vite/src/custom-user-button/index.tsx
@@ -38,7 +38,7 @@ export default function Page() {
         >
           <h1>Page 2</h1>
         </UserButton.UserProfilePage>
-        🌐
+        <p data-leaked-child>This is leaking</p>
         <UserButton.UserProfileLink
           url={'https://clerk.com'}
           label={'Visit Clerk'}
diff --git a/integration/templates/react-vite/src/custom-user-profile/index.tsx b/integration/templates/react-vite/src/custom-user-profile/index.tsx
index 08264af02d3..8a259a16398 100644
--- a/integration/templates/react-vite/src/custom-user-profile/index.tsx
+++ b/integration/templates/react-vite/src/custom-user-profile/index.tsx
@@ -38,7 +38,7 @@ export default function Page() {
         >
           <h1>Page 2</h1>
         </UserProfile.Page>
-        🌐
+        <p data-leaked-child>This is leaking</p>
         <UserProfile.Link
           url={'https://clerk.com'}
           label={'Visit Clerk'}
diff --git a/integration/templates/react-vite/src/main.tsx b/integration/templates/react-vite/src/main.tsx
index 21366dff082..86f1252b5ec 100644
--- a/integration/templates/react-vite/src/main.tsx
+++ b/integration/templates/react-vite/src/main.tsx
@@ -10,6 +10,7 @@ import SignUp from './sign-up';
 import UserProfile from './user';
 import UserProfileCustom from './custom-user-profile';
 import UserButtonCustom from './custom-user-button';
+import UserButtonCustomTrigger from './custom-user-button-trigger';
 
 const Root = () => {
   const navigate = useNavigate();
@@ -64,6 +65,10 @@ const router = createBrowserRouter([
         path: '/custom-user-button',
         element: <UserButtonCustom />,
       },
+      {
+        path: '/custom-user-button-trigger',
+        element: <UserButtonCustomTrigger />,
+      },
     ],
   },
 ]);
diff --git a/integration/templates/tanstack-start/app.config.ts b/integration/templates/tanstack-start/app.config.ts
index d1d9b04ded7..732f04eabe7 100644
--- a/integration/templates/tanstack-start/app.config.ts
+++ b/integration/templates/tanstack-start/app.config.ts
@@ -3,7 +3,7 @@ import tsConfigPaths from 'vite-tsconfig-paths'
 
 export default defineConfig({
   vite: {
-    plugins: () => [
+    plugins: [
       tsConfigPaths({
         projects: ['./tsconfig.json'],
       }),
diff --git a/integration/tests/custom-pages.test.ts b/integration/tests/custom-pages.test.ts
index f3dd4a51937..f7621bb9ffb 100644
--- a/integration/tests/custom-pages.test.ts
+++ b/integration/tests/custom-pages.test.ts
@@ -6,6 +6,7 @@ import { createTestUtils, testAgainstRunningApps } from '../testUtils';
 
 const CUSTOM_PROFILE_PAGE = '/custom-user-profile';
 const CUSTOM_BUTTON_PAGE = '/custom-user-button';
+const CUSTOM_BUTTON_TRIGGER_PAGE = '/custom-user-button-trigger';
 
 async function waitForMountedComponent(
   component: 'UserButton' | 'UserProfile',
@@ -106,11 +107,29 @@ testAgainstRunningApps({ withPattern: ['react.vite.withEmailCodes'] })(
           await u.page.waitForSelector('p[data-page="1"]', { state: 'attached' });
 
           await expect(u.page.locator('p[data-page="1"]')).toHaveText('Counter: 0');
-          u.page.locator('button[data-page="1"]').click();
+          await u.page.locator('button[data-page="1"]').click();
 
           await expect(u.page.locator('p[data-page="1"]')).toHaveText('Counter: 1');
         });
 
+        test('renders only custom pages and does not display unrelated child components', async ({ page, context }) => {
+          const u = createTestUtils({ app, page, context });
+          await u.po.signIn.goTo();
+          await u.po.signIn.waitForMounted();
+          await u.po.signIn.signInWithEmailAndInstantPassword({ email: fakeUser.email, password: fakeUser.password });
+          await u.po.expect.toBeSignedIn();
+
+          await waitForMountedComponent(component, u);
+
+          const buttons = await u.page.locator('button.cl-navbarButton__custom-page-0').all();
+          expect(buttons.length).toBe(1);
+          const [profilePage] = buttons;
+          await expect(profilePage.locator('div.cl-navbarButtonIcon__custom-page-0')).toHaveText('🙃');
+          await profilePage.click();
+
+          await expect(u.page.locator('p[data-leaked-child]')).toBeHidden();
+        });
+
         test('user profile custom external absolute link', async ({ page, context }) => {
           const u = createTestUtils({ app, page, context });
           await u.po.signIn.goTo();
@@ -149,6 +168,53 @@ testAgainstRunningApps({ withPattern: ['react.vite.withEmailCodes'] })(
       });
     });
 
+    test.describe('User Button with experimental asStandalone and asProvider', () => {
+      test('items at the specified order', async ({ page, context }) => {
+        const u = createTestUtils({ app, page, context });
+        await u.po.signIn.goTo();
+        await u.po.signIn.waitForMounted();
+        await u.po.signIn.signInWithEmailAndInstantPassword({ email: fakeUser.email, password: fakeUser.password });
+        await u.po.expect.toBeSignedIn();
+
+        await u.page.goToRelative(CUSTOM_BUTTON_TRIGGER_PAGE);
+        const toggleButton = await u.page.waitForSelector('button[data-toggle-btn]');
+        await toggleButton.click();
+
+        await u.po.userButton.waitForPopover();
+        await u.po.userButton.triggerManageAccount();
+        await u.po.userProfile.waitForMounted();
+
+        const pagesContainer = u.page.locator('div.cl-navbarButtons').first();
+
+        const buttons = await pagesContainer.locator('button').all();
+
+        expect(buttons.length).toBe(6);
+
+        const expectedTexts = ['Profile', '🙃Page 1', 'Security', '🙃Page 2', '🌐Visit Clerk', '🌐Visit User page'];
+        for (let i = 0; i < buttons.length; i++) {
+          await expect(buttons[i]).toHaveText(expectedTexts[i]);
+        }
+      });
+
+      test('children should be leaking when used with asProvider', async ({ page, context }) => {
+        const u = createTestUtils({ app, page, context });
+        await u.po.signIn.goTo();
+        await u.po.signIn.waitForMounted();
+        await u.po.signIn.signInWithEmailAndInstantPassword({ email: fakeUser.email, password: fakeUser.password });
+        await u.po.expect.toBeSignedIn();
+
+        await u.page.goToRelative(CUSTOM_BUTTON_TRIGGER_PAGE);
+        const toggleButton = await u.page.waitForSelector('button[data-toggle-btn]');
+        await toggleButton.click();
+
+        await u.po.userButton.waitForPopover();
+        await u.po.userButton.triggerManageAccount();
+        await u.po.userProfile.waitForMounted();
+
+        await expect(u.page.locator('p[data-leaked-child]')).toBeVisible();
+      });
+    });
+
     test.describe('User Button custom items', () => {
       test('items at the specified order', async ({ page, context }) => {
         const u = createTestUtils({ app, page, context });
diff --git a/integration/tests/dynamic-keys.test.ts b/integration/tests/dynamic-keys.test.ts
index e034146c646..8e7b59f6a4f 100644
--- a/integration/tests/dynamic-keys.test.ts
+++ b/integration/tests/dynamic-keys.test.ts
@@ -13,8 +13,8 @@ test.describe('dynamic keys @nextjs', () => {
       .clone()
       .addFile(
         'src/middleware.ts',
-        () => `import { clerkClient, clerkMiddleware, createRouteMatcher } from '@clerk/nextjs/server'
-        import { NextResponse } from 'next/server'
+        () => `import { clerkClient, clerkMiddleware, createRouteMatcher } from '@clerk/nextjs/server';
+        import { NextResponse } from 'next/server';
 
         const isProtectedRoute = createRouteMatcher(['/protected']);
         const shouldFetchBapi = createRouteMatcher(['/fetch-bapi-from-middleware']);
@@ -25,10 +25,12 @@ test.describe('dynamic keys @nextjs', () => {
           }
 
           if (shouldFetchBapi(request)){
-            const count = await clerkClient().users.getCount();
+            const client = await clerkClient();
+
+            const count = await client.users?.getCount();
 
             if (count){
-              return NextResponse.redirect(new URL('/users-count', request.url))
+              return NextResponse.redirect(new URL('/users-count', request.url));
             }
           }
         }, {
@@ -45,7 +47,7 @@ test.describe('dynamic keys @nextjs', () => {
         () => `import { clerkClient } from '@clerk/nextjs/server'
 
         export default async function Page(){
-          const count = await clerkClient().users.getCount()
+          const count = await clerkClient().users?.getCount() ?? 0;
 
           return <p>Users count: {count}</p>
         }
@@ -62,7 +64,7 @@ test.describe('dynamic keys @nextjs', () => {
     await app.teardown();
   });
 
-  test('redirects to `signInUrl` on `auth().protect()`', async ({ page, context }) => {
+  test('redirects to `signInUrl` on `await auth.protect()`', async ({ page, context }) => {
     const u = createTestUtils({ app, page, context });
 
     await u.page.goToAppHome();
@@ -74,7 +76,7 @@ test.describe('dynamic keys @nextjs', () => {
     await u.page.waitForURL(/foobar/);
   });
 
-  test('resolves auth signature with `secretKey` on `auth().protect()`', async ({ page, context }) => {
+  test('resolves auth signature with `secretKey` on `await auth.protect()`', async ({ page, context }) => {
     const u = createTestUtils({ app, page, context });
     await u.page.goToRelative('/page-protected');
     await u.page.waitForURL(/foobar/);
diff --git a/integration/tests/restricted-mode.test.ts b/integration/tests/restricted-mode.test.ts
index ab016126633..947f8a516a6 100644
--- a/integration/tests/restricted-mode.test.ts
+++ b/integration/tests/restricted-mode.test.ts
@@ -102,8 +102,8 @@ export default function Page() {
     await u.po.signUp.goTo();
     await u.po.signUp.waitForMounted();
 
-    await expect(u.page.getByText(/Restricted access/i).first()).toBeVisible();
-    const backToSignIn = u.page.getByRole('link', { name: /Back to sign in/i });
+    await expect(u.page.getByText(/Access restricted/i).first()).toBeVisible();
+    const backToSignIn = u.page.getByRole('link', { name: /Sign in/i });
     await backToSignIn.click();
 
     await u.po.signUp.waitForMounted();
diff --git a/package-lock.json b/package-lock.json
index ecf42ff4d1b..c48daa2ea4e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2489,42 +2489,6 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/register/node_modules/find-cache-dir": {
-      "version": "2.1.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "commondir": "^1.0.1",
-        "make-dir": "^2.0.0",
-        "pkg-dir": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/@babel/register/node_modules/find-up": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "locate-path": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/@babel/register/node_modules/locate-path": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/@babel/register/node_modules/make-dir": {
       "version": "2.1.0",
       "dev": true,
@@ -2537,25 +2501,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/@babel/register/node_modules/p-locate": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "p-limit": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/@babel/register/node_modules/path-exists": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/@babel/register/node_modules/pify": {
       "version": "4.0.1",
       "dev": true,
@@ -2564,17 +2509,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/@babel/register/node_modules/pkg-dir": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "find-up": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/@babel/register/node_modules/semver": {
       "version": "5.7.2",
       "dev": true,
@@ -7203,66 +7137,6 @@
         "url": "https://opencollective.com/libvips"
       }
     },
-    "node_modules/@inkjs/ui": {
-      "version": "1.0.0",
-      "license": "MIT",
-      "dependencies": {
-        "chalk": "^5.2.0",
-        "cli-spinners": "^2.9.0",
-        "deepmerge": "^4.3.1",
-        "figures": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=14.16"
-      },
-      "peerDependencies": {
-        "ink": "^4.2.0"
-      }
-    },
-    "node_modules/@inkjs/ui/node_modules/chalk": {
-      "version": "5.3.0",
-      "license": "MIT",
-      "engines": {
-        "node": "^12.17.0 || ^14.13 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@inkjs/ui/node_modules/escape-string-regexp": {
-      "version": "5.0.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@inkjs/ui/node_modules/figures": {
-      "version": "5.0.0",
-      "license": "MIT",
-      "dependencies": {
-        "escape-string-regexp": "^5.0.0",
-        "is-unicode-supported": "^1.2.0"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@inkjs/ui/node_modules/is-unicode-supported": {
-      "version": "1.3.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/@internationalized/date": {
       "version": "3.5.4",
       "license": "Apache-2.0",
@@ -12991,6 +12865,12 @@
       "version": "1.5.1",
       "license": "MIT"
     },
+    "node_modules/@sec-ant/readable-stream": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/@sec-ant/readable-stream/-/readable-stream-0.4.1.tgz",
+      "integrity": "sha512-831qok9r2t8AlxLko40y2ebgSDhenenCatLVeW/uBtnHPyhHOvG0C7TvfgecV+wHzIm5KUICgzmVpWS+IMEAeg==",
+      "license": "MIT"
+    },
     "node_modules/@segment/loosely-validate-event": {
       "version": "2.0.0",
       "dev": true,
@@ -13966,6 +13846,56 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@types/jscodeshift": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/@types/jscodeshift/-/jscodeshift-0.12.0.tgz",
+      "integrity": "sha512-Jr2fQbEoDmjwEa92TreR/mX2t9iAaY/l5P/GKezvK4BodXahex60PDLXaQR0vAgP0KfCzc1CivHusQB9NhzX8w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ast-types": "^0.14.1",
+        "recast": "^0.20.3"
+      }
+    },
+    "node_modules/@types/jscodeshift/node_modules/ast-types": {
+      "version": "0.14.2",
+      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.14.2.tgz",
+      "integrity": "sha512-O0yuUDnZeQDL+ncNGlJ78BiO4jnYI3bvMsD5prT0/nsgijG/LpNBIr63gTjVTNsiGkgQhiyCShTgxt8oXOrklA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@types/jscodeshift/node_modules/recast": {
+      "version": "0.20.5",
+      "resolved": "https://registry.npmjs.org/recast/-/recast-0.20.5.tgz",
+      "integrity": "sha512-E5qICoPoNL4yU0H0NoBDntNB0Q5oMSNh9usFctYniLBluTthi3RsQVBXIJNbApOlvSwW/RGxIuokPcAc59J5fQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ast-types": "0.14.2",
+        "esprima": "~4.0.0",
+        "source-map": "~0.6.1",
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/@types/jscodeshift/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/@types/jsdom": {
       "version": "20.0.1",
       "dev": true,
@@ -15378,6 +15308,47 @@
         "node": ">= 14.16"
       }
     },
+    "node_modules/@vitest/mocker": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-2.1.3.tgz",
+      "integrity": "sha512-eSpdY/eJDuOvuTA3ASzCjdithHa+GIF1L4PqtEELl6Qa3XafdMLBpBlZCIUCX2J+Q6sNmjmxtosAG62fK4BlqQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vitest/spy": "2.1.3",
+        "estree-walker": "^3.0.3",
+        "magic-string": "^0.30.11"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      },
+      "peerDependencies": {
+        "@vitest/spy": "2.1.3",
+        "msw": "^2.3.5",
+        "vite": "^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "msw": {
+          "optional": true
+        },
+        "vite": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@vitest/mocker/node_modules/@vitest/spy": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-2.1.3.tgz",
+      "integrity": "sha512-Nb2UzbcUswzeSP7JksMDaqsI43Sj5+Kry6ry6jQJT4b5gAK+NS9NED6mDb8FlMRCX8m5guaHCDZmqYMMWRy5nQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "tinyspy": "^3.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      }
+    },
     "node_modules/@vitest/pretty-format": {
       "version": "2.0.5",
       "dev": true,
@@ -17087,6 +17058,18 @@
         "node": ">=8.0.0"
       }
     },
+    "node_modules/auto-bind": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/auto-bind/-/auto-bind-5.0.1.tgz",
+      "integrity": "sha512-ooviqdwwgfIfNmDwo94wlshcdzfO64XV0Cg6oDsDYBJfITDz1EngD2z7DkbvCWn+XIMsIqW27sEVF6qcpJrRcg==",
+      "license": "MIT",
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/available-typed-arrays": {
       "version": "1.0.7",
       "license": "MIT",
@@ -22308,7 +22291,6 @@
     },
     "node_modules/environment": {
       "version": "1.1.0",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=18"
@@ -25262,6 +25244,109 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/find-cache-dir": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
+      "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
+      "license": "MIT",
+      "dependencies": {
+        "commondir": "^1.0.1",
+        "make-dir": "^2.0.0",
+        "pkg-dir": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/find-cache-dir/node_modules/find-up": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+      "license": "MIT",
+      "dependencies": {
+        "locate-path": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/find-cache-dir/node_modules/locate-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+      "license": "MIT",
+      "dependencies": {
+        "p-locate": "^3.0.0",
+        "path-exists": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/find-cache-dir/node_modules/make-dir": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+      "license": "MIT",
+      "dependencies": {
+        "pify": "^4.0.1",
+        "semver": "^5.6.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/find-cache-dir/node_modules/p-locate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+      "license": "MIT",
+      "dependencies": {
+        "p-limit": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/find-cache-dir/node_modules/path-exists": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/find-cache-dir/node_modules/pify": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/find-cache-dir/node_modules/pkg-dir": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+      "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
+      "license": "MIT",
+      "dependencies": {
+        "find-up": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/find-cache-dir/node_modules/semver": {
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
     "node_modules/find-root": {
       "version": "1.1.0",
       "license": "MIT"
@@ -25652,7 +25737,6 @@
     "node_modules/get-east-asian-width": {
       "version": "1.2.0",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=18"
       },
@@ -26978,6 +27062,7 @@
     "node_modules/ink": {
       "version": "4.4.1",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@alcalzone/ansi-tokenize": "^0.1.3",
         "ansi-escapes": "^6.0.0",
@@ -27082,81 +27167,10 @@
         "url": "https://github.com/chalk/strip-ansi?sponsor=1"
       }
     },
-    "node_modules/ink-link": {
-      "version": "3.0.0",
-      "license": "MIT",
-      "dependencies": {
-        "prop-types": "^15.8.1",
-        "terminal-link": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      },
-      "peerDependencies": {
-        "ink": ">=4"
-      }
-    },
-    "node_modules/ink-link/node_modules/ansi-escapes": {
-      "version": "5.0.0",
-      "license": "MIT",
-      "dependencies": {
-        "type-fest": "^1.0.2"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/ink-link/node_modules/has-flag": {
-      "version": "4.0.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ink-link/node_modules/supports-hyperlinks": {
-      "version": "2.3.0",
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0",
-        "supports-color": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ink-link/node_modules/terminal-link": {
-      "version": "3.0.0",
-      "license": "MIT",
-      "dependencies": {
-        "ansi-escapes": "^5.0.0",
-        "supports-hyperlinks": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/ink-link/node_modules/type-fest": {
-      "version": "1.4.0",
-      "license": "(MIT OR CC0-1.0)",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/ink/node_modules/ansi-escapes": {
       "version": "6.2.1",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=14.16"
       },
@@ -27167,6 +27181,7 @@
     "node_modules/ink/node_modules/ansi-regex": {
       "version": "6.0.1",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -27177,6 +27192,7 @@
     "node_modules/ink/node_modules/ansi-styles": {
       "version": "6.2.1",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -27184,19 +27200,10 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/ink/node_modules/auto-bind": {
-      "version": "5.0.1",
-      "license": "MIT",
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/ink/node_modules/chalk": {
       "version": "5.3.0",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": "^12.17.0 || ^14.13 || >=16.0.0"
       },
@@ -27207,6 +27214,7 @@
     "node_modules/ink/node_modules/cli-cursor": {
       "version": "4.0.0",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "restore-cursor": "^4.0.0"
       },
@@ -27220,6 +27228,7 @@
     "node_modules/ink/node_modules/indent-string": {
       "version": "5.0.0",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -27230,6 +27239,7 @@
     "node_modules/ink/node_modules/restore-cursor": {
       "version": "4.0.0",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "onetime": "^5.1.0",
         "signal-exit": "^3.0.2"
@@ -27243,11 +27253,13 @@
     },
     "node_modules/ink/node_modules/signal-exit": {
       "version": "3.0.7",
-      "license": "ISC"
+      "license": "ISC",
+      "peer": true
     },
     "node_modules/ink/node_modules/slice-ansi": {
       "version": "6.0.0",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "ansi-styles": "^6.2.1",
         "is-fullwidth-code-point": "^4.0.0"
@@ -27262,6 +27274,7 @@
     "node_modules/ink/node_modules/string-width": {
       "version": "5.1.2",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "eastasianwidth": "^0.2.0",
         "emoji-regex": "^9.2.2",
@@ -27277,6 +27290,7 @@
     "node_modules/ink/node_modules/strip-ansi": {
       "version": "7.1.0",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "ansi-regex": "^6.0.1"
       },
@@ -27290,6 +27304,7 @@
     "node_modules/ink/node_modules/type-fest": {
       "version": "0.12.0",
       "license": "(MIT OR CC0-1.0)",
+      "peer": true,
       "engines": {
         "node": ">=10"
       },
@@ -27300,6 +27315,7 @@
     "node_modules/ink/node_modules/wrap-ansi": {
       "version": "8.1.0",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "ansi-styles": "^6.1.0",
         "string-width": "^5.0.1",
@@ -27679,6 +27695,21 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/is-in-ci": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/is-in-ci/-/is-in-ci-0.1.0.tgz",
+      "integrity": "sha512-d9PXLEY0v1iJ64xLiQMJ51J128EYHAaOR4yZqQi8aHGfw6KgifM3/Viw1oZZ1GCVmb3gBuyhLyHj0HgR2DhSXQ==",
+      "license": "MIT",
+      "bin": {
+        "is-in-ci": "cli.js"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/is-inside-container": {
       "version": "1.0.0",
       "license": "MIT",
@@ -27792,6 +27823,7 @@
     "node_modules/is-lower-case": {
       "version": "2.0.2",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "tslib": "^2.0.3"
       }
@@ -28022,6 +28054,7 @@
     "node_modules/is-upper-case": {
       "version": "2.0.2",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "tslib": "^2.0.3"
       }
@@ -39847,8 +39880,7 @@
     },
     "node_modules/tinyexec": {
       "version": "0.3.0",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/tinygradient": {
       "version": "1.1.5",
@@ -43265,6 +43297,19 @@
       "version": "1.0.2",
       "license": "ISC"
     },
+    "node_modules/write-file-atomic": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz",
+      "integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==",
+      "license": "ISC",
+      "dependencies": {
+        "imurmurhash": "^0.1.4",
+        "signal-exit": "^4.0.1"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
     "node_modules/ws": {
       "version": "8.17.1",
       "license": "MIT",
@@ -43442,6 +43487,18 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/yoctocolors": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/yoctocolors/-/yoctocolors-2.1.1.tgz",
+      "integrity": "sha512-GQHQqAopRhwU8Kt1DDM8NjibDXHC8eoh1erhGAJPEyveY9qqVeXvVikNKrDz69sHowPMorbPUrH/mx8c50eiBQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/yoga-wasm-web": {
       "version": "0.3.3",
       "license": "MIT"
@@ -43634,12 +43691,12 @@
     },
     "packages/astro": {
       "name": "@clerk/astro",
-      "version": "1.3.14",
+      "version": "1.3.16",
       "license": "MIT",
       "dependencies": {
-        "@clerk/backend": "1.13.10",
-        "@clerk/shared": "2.9.1",
-        "@clerk/types": "4.25.1",
+        "@clerk/backend": "1.14.1",
+        "@clerk/shared": "2.9.2",
+        "@clerk/types": "4.26.0",
         "nanoid": "5.0.7",
         "nanostores": "0.11.3"
       },
@@ -43652,7 +43709,7 @@
         "node": ">=18.17.0"
       },
       "peerDependencies": {
-        "astro": "^4.16.1"
+        "astro": "^3.2.0 || ^4.0.0"
       }
     },
     "packages/astro/node_modules/nanoid": {
@@ -43686,11 +43743,11 @@
     },
     "packages/backend": {
       "name": "@clerk/backend",
-      "version": "1.13.10",
+      "version": "1.14.1",
       "license": "MIT",
       "dependencies": {
-        "@clerk/shared": "2.9.1",
-        "@clerk/types": "4.25.1",
+        "@clerk/shared": "2.9.2",
+        "@clerk/types": "4.26.0",
         "cookie": "0.7.0",
         "snakecase-keys": "5.4.4",
         "tslib": "2.4.1"
@@ -44263,12 +44320,12 @@
     },
     "packages/chrome-extension": {
       "name": "@clerk/chrome-extension",
-      "version": "1.3.19",
+      "version": "1.3.20",
       "license": "MIT",
       "dependencies": {
-        "@clerk/clerk-js": "5.26.5",
-        "@clerk/clerk-react": "5.11.1",
-        "@clerk/shared": "2.9.1",
+        "@clerk/clerk-js": "5.27.0",
+        "@clerk/clerk-react": "5.12.0",
+        "@clerk/shared": "2.9.2",
         "webextension-polyfill": "^0.10.0"
       },
       "devDependencies": {
@@ -44312,12 +44369,12 @@
     },
     "packages/clerk-js": {
       "name": "@clerk/clerk-js",
-      "version": "5.26.5",
+      "version": "5.27.0",
       "license": "MIT",
       "dependencies": {
-        "@clerk/localizations": "3.2.1",
-        "@clerk/shared": "2.9.1",
-        "@clerk/types": "4.25.1",
+        "@clerk/localizations": "3.3.0",
+        "@clerk/shared": "2.9.2",
+        "@clerk/types": "4.26.0",
         "@coinbase/wallet-sdk": "4.0.4",
         "@emotion/cache": "11.11.0",
         "@emotion/react": "11.11.1",
@@ -44603,28 +44660,6 @@
         "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
-    "packages/dev-cli/node_modules/find-cache-dir": {
-      "version": "2.1.0",
-      "license": "MIT",
-      "dependencies": {
-        "commondir": "^1.0.1",
-        "make-dir": "^2.0.0",
-        "pkg-dir": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "packages/dev-cli/node_modules/find-up": {
-      "version": "3.0.0",
-      "license": "MIT",
-      "dependencies": {
-        "locate-path": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "packages/dev-cli/node_modules/globby": {
       "version": "14.0.2",
       "license": "MIT",
@@ -44686,17 +44721,6 @@
         }
       }
     },
-    "packages/dev-cli/node_modules/locate-path": {
-      "version": "3.0.0",
-      "license": "MIT",
-      "dependencies": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "packages/dev-cli/node_modules/make-dir": {
       "version": "2.1.0",
       "license": "MIT",
@@ -44719,23 +44743,6 @@
         "node": ">=8.6"
       }
     },
-    "packages/dev-cli/node_modules/p-locate": {
-      "version": "3.0.0",
-      "license": "MIT",
-      "dependencies": {
-        "p-limit": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "packages/dev-cli/node_modules/path-exists": {
-      "version": "3.0.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "packages/dev-cli/node_modules/path-type": {
       "version": "5.0.0",
       "license": "MIT",
@@ -44753,16 +44760,6 @@
         "node": ">=6"
       }
     },
-    "packages/dev-cli/node_modules/pkg-dir": {
-      "version": "3.0.0",
-      "license": "MIT",
-      "dependencies": {
-        "find-up": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "packages/dev-cli/node_modules/recast": {
       "version": "0.23.9",
       "license": "MIT",
@@ -44848,23 +44845,12 @@
         "node": ">=6.0.0"
       }
     },
-    "packages/dev-cli/node_modules/write-file-atomic": {
-      "version": "5.0.1",
-      "license": "ISC",
-      "dependencies": {
-        "imurmurhash": "^0.1.4",
-        "signal-exit": "^4.0.1"
-      },
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
     "packages/elements": {
       "name": "@clerk/elements",
-      "version": "0.16.1",
+      "version": "0.16.2",
       "license": "MIT",
       "dependencies": {
-        "@clerk/types": "^4.25.1",
+        "@clerk/types": "^4.26.0",
         "@radix-ui/react-form": "^0.1.0",
         "@radix-ui/react-slot": "^1.1.0",
         "@xstate/react": "^4.1.1",
@@ -44872,9 +44858,9 @@
         "xstate": "^5.15.0"
       },
       "devDependencies": {
-        "@clerk/clerk-react": "5.11.1",
+        "@clerk/clerk-react": "5.12.0",
         "@clerk/eslint-config-custom": "*",
-        "@clerk/shared": "2.9.1",
+        "@clerk/shared": "2.9.2",
         "@statelyai/inspect": "^0.4.0",
         "@types/node": "^18.19.33",
         "@types/react": "*",
@@ -45693,13 +45679,13 @@
     },
     "packages/expo": {
       "name": "@clerk/clerk-expo",
-      "version": "2.2.25",
+      "version": "2.2.26",
       "license": "MIT",
       "dependencies": {
-        "@clerk/clerk-js": "5.26.5",
-        "@clerk/clerk-react": "5.11.1",
-        "@clerk/shared": "2.9.1",
-        "@clerk/types": "4.25.1",
+        "@clerk/clerk-js": "5.27.0",
+        "@clerk/clerk-react": "5.12.0",
+        "@clerk/shared": "2.9.2",
+        "@clerk/types": "4.26.0",
         "base-64": "^1.0.0",
         "react-native-url-polyfill": "2.0.0",
         "tslib": "2.4.1"
@@ -45978,12 +45964,12 @@
     },
     "packages/express": {
       "name": "@clerk/express",
-      "version": "1.2.3",
+      "version": "1.3.1",
       "license": "MIT",
       "dependencies": {
-        "@clerk/backend": "^1.13.10",
-        "@clerk/shared": "^2.9.1",
-        "@clerk/types": "4.25.1",
+        "@clerk/backend": "^1.14.1",
+        "@clerk/shared": "^2.9.2",
+        "@clerk/types": "4.26.0",
         "tslib": "2.4.1"
       },
       "devDependencies": {
@@ -46009,12 +45995,12 @@
     },
     "packages/fastify": {
       "name": "@clerk/fastify",
-      "version": "2.0.1",
+      "version": "2.0.3",
       "license": "MIT",
       "dependencies": {
-        "@clerk/backend": "1.13.10",
-        "@clerk/shared": "2.9.1",
-        "@clerk/types": "4.25.1",
+        "@clerk/backend": "1.14.1",
+        "@clerk/shared": "2.9.2",
+        "@clerk/types": "4.26.0",
         "cookies": "0.8.0",
         "fastify-plugin": "^5.0.1"
       },
@@ -46349,10 +46335,10 @@
     },
     "packages/localizations": {
       "name": "@clerk/localizations",
-      "version": "3.2.1",
+      "version": "3.3.0",
       "license": "MIT",
       "dependencies": {
-        "@clerk/types": "4.25.1"
+        "@clerk/types": "4.26.0"
       },
       "devDependencies": {
         "@clerk/eslint-config-custom": "*",
@@ -46365,13 +46351,13 @@
     },
     "packages/nextjs": {
       "name": "@clerk/nextjs",
-      "version": "5.7.3",
+      "version": "5.7.5",
       "license": "MIT",
       "dependencies": {
-        "@clerk/backend": "1.13.10",
-        "@clerk/clerk-react": "5.11.1",
-        "@clerk/shared": "2.9.1",
-        "@clerk/types": "4.25.1",
+        "@clerk/backend": "1.14.1",
+        "@clerk/clerk-react": "5.12.0",
+        "@clerk/shared": "2.9.2",
+        "@clerk/types": "4.26.0",
         "crypto-js": "4.2.0",
         "server-only": "0.0.1",
         "tslib": "2.4.1"
@@ -46624,16 +46610,16 @@
     },
     "packages/react": {
       "name": "@clerk/clerk-react",
-      "version": "5.11.1",
+      "version": "5.12.0",
       "license": "MIT",
       "dependencies": {
-        "@clerk/shared": "2.9.1",
-        "@clerk/types": "4.25.1",
+        "@clerk/shared": "2.9.2",
+        "@clerk/types": "4.26.0",
         "tslib": "2.4.1"
       },
       "devDependencies": {
         "@clerk/eslint-config-custom": "*",
-        "@clerk/themes": "2.1.36",
+        "@clerk/themes": "2.1.37",
         "@types/node": "^18.19.33",
         "@types/react": "*",
         "@types/react-dom": "*",
@@ -46654,13 +46640,13 @@
     },
     "packages/remix": {
       "name": "@clerk/remix",
-      "version": "4.2.37",
+      "version": "4.2.39",
       "license": "MIT",
       "dependencies": {
-        "@clerk/backend": "1.13.10",
-        "@clerk/clerk-react": "5.11.1",
-        "@clerk/shared": "2.9.1",
-        "@clerk/types": "4.25.1",
+        "@clerk/backend": "1.14.1",
+        "@clerk/clerk-react": "5.12.0",
+        "@clerk/shared": "2.9.2",
+        "@clerk/types": "4.26.0",
         "cookie": "0.7.0",
         "tslib": "2.4.1"
       },
@@ -46703,12 +46689,12 @@
     },
     "packages/sdk-node": {
       "name": "@clerk/clerk-sdk-node",
-      "version": "5.0.50",
+      "version": "5.0.52",
       "license": "MIT",
       "dependencies": {
-        "@clerk/backend": "1.13.10",
-        "@clerk/shared": "2.9.1",
-        "@clerk/types": "4.25.1",
+        "@clerk/backend": "1.14.1",
+        "@clerk/shared": "2.9.2",
+        "@clerk/types": "4.26.0",
         "tslib": "2.4.1"
       },
       "devDependencies": {
@@ -46730,11 +46716,11 @@
     },
     "packages/shared": {
       "name": "@clerk/shared",
-      "version": "2.9.1",
+      "version": "2.9.2",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
-        "@clerk/types": "4.25.1",
+        "@clerk/types": "4.26.0",
         "glob-to-regexp": "0.4.1",
         "js-cookie": "3.0.5",
         "std-env": "^3.7.0",
@@ -47429,13 +47415,13 @@
     },
     "packages/tanstack-start": {
       "name": "@clerk/tanstack-start",
-      "version": "0.4.13",
+      "version": "0.4.15",
       "license": "MIT",
       "dependencies": {
-        "@clerk/backend": "1.13.10",
-        "@clerk/clerk-react": "5.11.1",
-        "@clerk/shared": "2.9.1",
-        "@clerk/types": "4.25.1",
+        "@clerk/backend": "1.14.1",
+        "@clerk/clerk-react": "5.12.0",
+        "@clerk/shared": "2.9.2",
+        "@clerk/types": "4.26.0",
         "tslib": "2.4.1"
       },
       "devDependencies": {
@@ -47881,12 +47867,12 @@
     },
     "packages/testing": {
       "name": "@clerk/testing",
-      "version": "1.3.11",
+      "version": "1.3.13",
       "license": "MIT",
       "dependencies": {
-        "@clerk/backend": "1.13.10",
-        "@clerk/shared": "2.9.1",
-        "@clerk/types": "4.25.1",
+        "@clerk/backend": "1.14.1",
+        "@clerk/shared": "2.9.2",
+        "@clerk/types": "4.26.0",
         "dotenv": "16.4.5"
       },
       "devDependencies": {
@@ -47915,10 +47901,10 @@
     },
     "packages/themes": {
       "name": "@clerk/themes",
-      "version": "2.1.36",
+      "version": "2.1.37",
       "license": "MIT",
       "dependencies": {
-        "@clerk/types": "4.25.1",
+        "@clerk/types": "4.26.0",
         "tslib": "2.4.1"
       },
       "devDependencies": {
@@ -47935,7 +47921,7 @@
     },
     "packages/types": {
       "name": "@clerk/types",
-      "version": "4.25.1",
+      "version": "4.26.0",
       "license": "MIT",
       "dependencies": {
         "csstype": "3.1.1"
@@ -48254,16 +48240,18 @@
       "version": "1.0.9",
       "license": "MIT",
       "dependencies": {
-        "@inkjs/ui": "^1.0.0",
+        "@inkjs/ui": "^2.0.0",
         "@jescalan/ink-markdown": "^2.0.0",
         "ejs": "3.1.10",
+        "execa": "9.4.1",
         "globby": "^14.0.1",
         "gray-matter": "^4.0.3",
         "index-to-position": "^0.1.2",
-        "ink": "^4.4.1",
+        "ink": "^5.0.1",
         "ink-big-text": "^2.0.0",
         "ink-gradient": "^3.0.0",
-        "ink-link": "^3.0.0",
+        "ink-link": "^4.1.0",
+        "jscodeshift": "^17.0.0",
         "marked": "^11.1.1",
         "meow": "^11.0.0",
         "react": "^18.3.1",
@@ -48277,14 +48265,225 @@
       "devDependencies": {
         "@babel/cli": "^7.24.7",
         "@babel/preset-react": "^7.24.7",
-        "chalk": "^5.3.0",
+        "@types/jscodeshift": "^0.12.0",
         "del-cli": "^5.1.0",
-        "eslint-config-custom": "*"
+        "eslint-config-custom": "*",
+        "vitest": "^2.1.3"
       },
       "engines": {
         "node": ">=18.17.0"
       }
     },
+    "packages/upgrade/.yalc/@clerk/upgrade": {
+      "version": "1.0.9",
+      "extraneous": true,
+      "license": "MIT",
+      "dependencies": {
+        "@clerk/upgrade": "file:.yalc/@clerk/upgrade",
+        "@inkjs/ui": "^2.0.0",
+        "@jescalan/ink-markdown": "^2.0.0",
+        "ejs": "3.1.10",
+        "globby": "^14.0.1",
+        "gray-matter": "^4.0.3",
+        "index-to-position": "^0.1.2",
+        "ink": "^5.0.1",
+        "ink-big-text": "^2.0.0",
+        "ink-gradient": "^3.0.0",
+        "ink-link": "^4.1.0",
+        "jscodeshift": "^17.0.0",
+        "marked": "^11.1.1",
+        "meow": "^11.0.0",
+        "react": "^18.3.1",
+        "read-pkg": "^9.0.1",
+        "semver-regex": "^4.0.5",
+        "temp-dir": "^3.0.0"
+      },
+      "bin": {
+        "clerk-upgrade": "dist/cli.js"
+      },
+      "engines": {
+        "node": ">=18.17.0"
+      }
+    },
+    "packages/upgrade/node_modules/@babel/helper-create-class-features-plugin": {
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.7.tgz",
+      "integrity": "sha512-bD4WQhbkx80mAyj/WCm4ZHcF4rDxkoLFO6ph8/5/mQ3z4vAzltQXAmbc7GvVJx5H+lk5Mi5EmbTeox5nMGCsbw==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.25.7",
+        "@babel/helper-member-expression-to-functions": "^7.25.7",
+        "@babel/helper-optimise-call-expression": "^7.25.7",
+        "@babel/helper-replace-supers": "^7.25.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7",
+        "@babel/traverse": "^7.25.7",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "packages/upgrade/node_modules/@babel/helper-create-class-features-plugin/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "packages/upgrade/node_modules/@babel/helper-member-expression-to-functions": {
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.25.7.tgz",
+      "integrity": "sha512-O31Ssjd5K6lPbTX9AAYpSKrZmLeagt9uwschJd+Ixo6QiRyfpvgtVQp8qrDR9UNFjZ8+DO34ZkdrN+BnPXemeA==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/traverse": "^7.25.7",
+        "@babel/types": "^7.25.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "packages/upgrade/node_modules/@babel/helper-optimise-call-expression": {
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.25.7.tgz",
+      "integrity": "sha512-VAwcwuYhv/AT+Vfr28c9y6SHzTan1ryqrydSTFGjU0uDJHw3uZ+PduI8plCLkRsDnqK2DMEDmwrOQRsK/Ykjng==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.25.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "packages/upgrade/node_modules/@babel/helper-replace-supers": {
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.25.7.tgz",
+      "integrity": "sha512-iy8JhqlUW9PtZkd4pHM96v6BdJ66Ba9yWSE4z0W4TvSZwLBPkyDsiIU3ENe4SmrzRBs76F7rQXTy1lYC49n6Lw==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-member-expression-to-functions": "^7.25.7",
+        "@babel/helper-optimise-call-expression": "^7.25.7",
+        "@babel/traverse": "^7.25.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "packages/upgrade/node_modules/@babel/helper-skip-transparent-expression-wrappers": {
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.7.tgz",
+      "integrity": "sha512-pPbNbchZBkPMD50K0p3JGcFMNLVUCuU/ABybm/PGNj4JiHrpmNyqqCphBk4i19xXtNV0JhldQJJtbSW5aUvbyA==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/traverse": "^7.25.7",
+        "@babel/types": "^7.25.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "packages/upgrade/node_modules/@babel/plugin-syntax-flow": {
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.25.7.tgz",
+      "integrity": "sha512-fyoj6/YdVtlv2ROig/J0fP7hh/wNO1MJGm1NR70Pg7jbkF+jOUL9joorqaCOQh06Y+LfgTagHzC8KqZ3MF782w==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "packages/upgrade/node_modules/@babel/plugin-transform-class-properties": {
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.7.tgz",
+      "integrity": "sha512-mhyfEW4gufjIqYFo9krXHJ3ElbFLIze5IDp+wQTxoPd+mwFb1NxatNAwmv8Q8Iuxv7Zc+q8EkiMQwc9IhyGf4g==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-create-class-features-plugin": "^7.25.7",
+        "@babel/helper-plugin-utils": "^7.25.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "packages/upgrade/node_modules/@babel/plugin-transform-flow-strip-types": {
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.25.7.tgz",
+      "integrity": "sha512-q8Td2PPc6/6I73g96SreSUCKEcwMXCwcXSIAVTyTTN6CpJe0dMj8coxu1fg1T9vfBLi6Rsi6a4ECcFBbKabS5w==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.7",
+        "@babel/plugin-syntax-flow": "^7.25.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "packages/upgrade/node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
+      "version": "7.25.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.25.8.tgz",
+      "integrity": "sha512-Z7WJJWdQc8yCWgAmjI3hyC+5PXIubH9yRKzkl9ZEG647O9szl9zvmKLzpbItlijBnVhTUf1cpyWBsZ3+2wjWPQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "packages/upgrade/node_modules/@babel/plugin-transform-optional-chaining": {
+      "version": "7.25.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.25.8.tgz",
+      "integrity": "sha512-q05Bk7gXOxpTHoQ8RSzGSh/LHVB9JEIkKnk3myAWwZHnYiTGYtbdrYkIsS8Xyh4ltKf7GNUSgzs/6P2bJtBAQg==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "packages/upgrade/node_modules/@babel/plugin-transform-private-methods": {
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.7.tgz",
+      "integrity": "sha512-KY0hh2FluNxMLwOCHbxVOKfdB5sjWG4M183885FmaqWWiGMhRZq4DQRKH6mHdEucbJnyDyYiZNwNG424RymJjA==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-create-class-features-plugin": "^7.25.7",
+        "@babel/helper-plugin-utils": "^7.25.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
     "packages/upgrade/node_modules/@babel/plugin-transform-react-display-name": {
       "version": "7.24.7",
       "dev": true,
@@ -48328,6 +48527,23 @@
         "@babel/core": "^7.0.0-0"
       }
     },
+    "packages/upgrade/node_modules/@babel/preset-flow": {
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.25.7.tgz",
+      "integrity": "sha512-q2x3g0YHzo/Ohsr51KOYS/BtZMsvkzVd8qEyhZAyTatYdobfgXCuyppTqTuIhdq5kR/P3nyyVvZ6H5dMc4PnCQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.7",
+        "@babel/helper-validator-option": "^7.25.7",
+        "@babel/plugin-transform-flow-strip-types": "^7.25.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
     "packages/upgrade/node_modules/@babel/preset-react": {
       "version": "7.24.7",
       "dev": true,
@@ -48347,6 +48563,187 @@
         "@babel/core": "^7.0.0-0"
       }
     },
+    "packages/upgrade/node_modules/@babel/register": {
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/register/-/register-7.25.7.tgz",
+      "integrity": "sha512-qHTd2Rhn/rKhSUwdY6+n98FmwXN+N+zxSVx3zWqRe9INyvTpv+aQ5gDV2+43ACd3VtMBzPPljbb0gZb8u5ma6Q==",
+      "license": "MIT",
+      "dependencies": {
+        "clone-deep": "^4.0.1",
+        "find-cache-dir": "^2.0.0",
+        "make-dir": "^2.1.0",
+        "pirates": "^4.0.6",
+        "source-map-support": "^0.5.16"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "packages/upgrade/node_modules/@inkjs/ui": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@inkjs/ui/-/ui-2.0.0.tgz",
+      "integrity": "sha512-5+8fJmwtF9UvikzLfph9sA+LS+l37Ij/szQltkuXLOAXwNkBX9innfzh4pLGXIB59vKEQUtc6D4qGvhD7h3pAg==",
+      "license": "MIT",
+      "dependencies": {
+        "chalk": "^5.3.0",
+        "cli-spinners": "^3.0.0",
+        "deepmerge": "^4.3.1",
+        "figures": "^6.1.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "ink": ">=5"
+      }
+    },
+    "packages/upgrade/node_modules/@inkjs/ui/node_modules/cli-spinners": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-3.2.0.tgz",
+      "integrity": "sha512-pXftdQloMZzjCr3pCTIRniDcys6dDzgpgVhAHHk6TKBDbRuP1MkuetTF5KSv4YUutbOPa7+7ZrAJ2kVtbMqyXA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "packages/upgrade/node_modules/@vitest/expect": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-2.1.3.tgz",
+      "integrity": "sha512-SNBoPubeCJhZ48agjXruCI57DvxcsivVDdWz+SSsmjTT4QN/DfHk3zB/xKsJqMs26bLZ/pNRLnCf0j679i0uWQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vitest/spy": "2.1.3",
+        "@vitest/utils": "2.1.3",
+        "chai": "^5.1.1",
+        "tinyrainbow": "^1.2.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      }
+    },
+    "packages/upgrade/node_modules/@vitest/pretty-format": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-2.1.3.tgz",
+      "integrity": "sha512-XH1XdtoLZCpqV59KRbPrIhFCOO0hErxrQCMcvnQete3Vibb9UeIOX02uFPfVn3Z9ZXsq78etlfyhnkmIZSzIwQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "tinyrainbow": "^1.2.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      }
+    },
+    "packages/upgrade/node_modules/@vitest/runner": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-2.1.3.tgz",
+      "integrity": "sha512-JGzpWqmFJ4fq5ZKHtVO3Xuy1iF2rHGV4d/pdzgkYHm1+gOzNZtqjvyiaDGJytRyMU54qkxpNzCx+PErzJ1/JqQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vitest/utils": "2.1.3",
+        "pathe": "^1.1.2"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      }
+    },
+    "packages/upgrade/node_modules/@vitest/snapshot": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-2.1.3.tgz",
+      "integrity": "sha512-qWC2mWc7VAXmjAkEKxrScWHWFyCQx/cmiZtuGqMi+WwqQJ2iURsVY4ZfAK6dVo6K2smKRU6l3BPwqEBvhnpQGg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vitest/pretty-format": "2.1.3",
+        "magic-string": "^0.30.11",
+        "pathe": "^1.1.2"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      }
+    },
+    "packages/upgrade/node_modules/@vitest/spy": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-2.1.3.tgz",
+      "integrity": "sha512-Nb2UzbcUswzeSP7JksMDaqsI43Sj5+Kry6ry6jQJT4b5gAK+NS9NED6mDb8FlMRCX8m5guaHCDZmqYMMWRy5nQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "tinyspy": "^3.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      }
+    },
+    "packages/upgrade/node_modules/@vitest/utils": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-2.1.3.tgz",
+      "integrity": "sha512-xpiVfDSg1RrYT0tX6czgerkpcKFmFOF/gCr30+Mve5V2kewCy4Prn1/NDMSRwaSmT7PRaOF83wu+bEtsY1wrvA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vitest/pretty-format": "2.1.3",
+        "loupe": "^3.1.1",
+        "tinyrainbow": "^1.2.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      }
+    },
+    "packages/upgrade/node_modules/ansi-regex": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "packages/upgrade/node_modules/ansi-styles": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "packages/upgrade/node_modules/assertion-error": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz",
+      "integrity": "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "packages/upgrade/node_modules/ast-types": {
+      "version": "0.16.1",
+      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.16.1.tgz",
+      "integrity": "sha512-6t10qk83GOG8p0vKmaCr8eiilZwO171AvbROMtvvNiwrTly62t+7XkA8RdIIVbpMhCASAsxgAzdRSwh6nw/5Dg==",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "packages/upgrade/node_modules/camelcase": {
       "version": "7.0.1",
       "license": "MIT",
@@ -48383,9 +48780,27 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "packages/upgrade/node_modules/chai": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-5.1.1.tgz",
+      "integrity": "sha512-pT1ZgP8rPNqUgieVaEY+ryQr6Q4HXNg8Ei9UnLUrjN4IA7dvQC5JB+/kxVcPNDHyBcc/26CXPkbNzq3qwrOEKA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "assertion-error": "^2.0.1",
+        "check-error": "^2.1.1",
+        "deep-eql": "^5.0.1",
+        "loupe": "^3.1.0",
+        "pathval": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "packages/upgrade/node_modules/chalk": {
       "version": "5.3.0",
-      "dev": true,
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
+      "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
       "license": "MIT",
       "engines": {
         "node": "^12.17.0 || ^14.13 || >=16.0.0"
@@ -48394,6 +48809,49 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
+    "packages/upgrade/node_modules/check-error": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/check-error/-/check-error-2.1.1.tgz",
+      "integrity": "sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 16"
+      }
+    },
+    "packages/upgrade/node_modules/cli-cursor": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-4.0.0.tgz",
+      "integrity": "sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg==",
+      "license": "MIT",
+      "dependencies": {
+        "restore-cursor": "^4.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "packages/upgrade/node_modules/debug": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
     "packages/upgrade/node_modules/decamelize": {
       "version": "6.0.0",
       "license": "MIT",
@@ -48404,6 +48862,81 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "packages/upgrade/node_modules/deep-eql": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-5.0.2.tgz",
+      "integrity": "sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "packages/upgrade/node_modules/execa": {
+      "version": "9.4.1",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-9.4.1.tgz",
+      "integrity": "sha512-5eo/BRqZm3GYce+1jqX/tJ7duA2AnE39i88fuedNFUV8XxGxUpF3aWkBRfbUcjV49gCkvS/pzc0YrCPhaIewdg==",
+      "license": "MIT",
+      "dependencies": {
+        "@sindresorhus/merge-streams": "^4.0.0",
+        "cross-spawn": "^7.0.3",
+        "figures": "^6.1.0",
+        "get-stream": "^9.0.0",
+        "human-signals": "^8.0.0",
+        "is-plain-obj": "^4.1.0",
+        "is-stream": "^4.0.1",
+        "npm-run-path": "^6.0.0",
+        "pretty-ms": "^9.0.0",
+        "signal-exit": "^4.1.0",
+        "strip-final-newline": "^4.0.0",
+        "yoctocolors": "^2.0.0"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.5.0"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+      }
+    },
+    "packages/upgrade/node_modules/execa/node_modules/@sindresorhus/merge-streams": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-4.0.0.tgz",
+      "integrity": "sha512-tlqY9xq5ukxTUZBmoOp+m61cqwQD5pHJtFY3Mn8CA8ps6yghLH/Hw8UPdqg4OLmFW3IFlcXnQNmo/dh8HzXYIQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "packages/upgrade/node_modules/execa/node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "packages/upgrade/node_modules/figures": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-6.1.0.tgz",
+      "integrity": "sha512-d+l3qxjSesT4V7v2fh+QnmFnUWv9lSpjarhShNTgBOfA0ttejbQUAlHLitbjkoRiDulW0OPoQPYIGhIC8ohejg==",
+      "license": "MIT",
+      "dependencies": {
+        "is-unicode-supported": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "packages/upgrade/node_modules/find-up": {
       "version": "6.3.0",
       "license": "MIT",
@@ -48418,6 +48951,43 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "packages/upgrade/node_modules/get-stream": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-9.0.1.tgz",
+      "integrity": "sha512-kVCxPF3vQM/N0B1PmoqVUqgHP+EeVjmZSQn+1oCRPxd2P21P2F19lIgbR3HBosbB1PUhOAoctJnfEn2GbN2eZA==",
+      "license": "MIT",
+      "dependencies": {
+        "@sec-ant/readable-stream": "^0.4.1",
+        "is-stream": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "packages/upgrade/node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "license": "ISC",
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "packages/upgrade/node_modules/globby": {
       "version": "14.0.1",
       "license": "MIT",
@@ -48436,6 +49006,15 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "packages/upgrade/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "packages/upgrade/node_modules/hosted-git-info": {
       "version": "5.2.1",
       "license": "ISC",
@@ -48446,6 +49025,15 @@
         "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
       }
     },
+    "packages/upgrade/node_modules/human-signals": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-8.0.0.tgz",
+      "integrity": "sha512-/1/GPCpDUCCYwlERiYjxoczfP0zfvZMU/OWgQPMya9AbAE24vseigFdhAMObpc8Q4lc/kjutPfUddDYyAmejnA==",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=18.18.0"
+      }
+    },
     "packages/upgrade/node_modules/indent-string": {
       "version": "5.0.0",
       "license": "MIT",
@@ -48456,6 +49044,294 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "packages/upgrade/node_modules/ink": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ink/-/ink-5.0.1.tgz",
+      "integrity": "sha512-ae4AW/t8jlkj/6Ou21H2av0wxTk8vrGzXv+v2v7j4in+bl1M5XRMVbfNghzhBokV++FjF8RBDJvYo+ttR9YVRg==",
+      "license": "MIT",
+      "dependencies": {
+        "@alcalzone/ansi-tokenize": "^0.1.3",
+        "ansi-escapes": "^7.0.0",
+        "ansi-styles": "^6.2.1",
+        "auto-bind": "^5.0.1",
+        "chalk": "^5.3.0",
+        "cli-boxes": "^3.0.0",
+        "cli-cursor": "^4.0.0",
+        "cli-truncate": "^4.0.0",
+        "code-excerpt": "^4.0.0",
+        "indent-string": "^5.0.0",
+        "is-in-ci": "^0.1.0",
+        "lodash": "^4.17.21",
+        "patch-console": "^2.0.0",
+        "react-reconciler": "^0.29.0",
+        "scheduler": "^0.23.0",
+        "signal-exit": "^3.0.7",
+        "slice-ansi": "^7.1.0",
+        "stack-utils": "^2.0.6",
+        "string-width": "^7.0.0",
+        "type-fest": "^4.8.3",
+        "widest-line": "^5.0.0",
+        "wrap-ansi": "^9.0.0",
+        "ws": "^8.15.0",
+        "yoga-wasm-web": "~0.3.3"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/react": ">=18.0.0",
+        "react": ">=18.0.0",
+        "react-devtools-core": "^4.19.1"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "react-devtools-core": {
+          "optional": true
+        }
+      }
+    },
+    "packages/upgrade/node_modules/ink-link": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/ink-link/-/ink-link-4.1.0.tgz",
+      "integrity": "sha512-3nNyJXum0FJIKAXBK8qat2jEOM41nJ1J60NRivwgK9Xh92R5UMN/k4vbz0A9xFzhJVrlf4BQEmmxMgXkCE1Jeg==",
+      "license": "MIT",
+      "dependencies": {
+        "prop-types": "^15.8.1",
+        "terminal-link": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      },
+      "peerDependencies": {
+        "ink": ">=4"
+      }
+    },
+    "packages/upgrade/node_modules/ink/node_modules/ansi-escapes": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.0.0.tgz",
+      "integrity": "sha512-GdYO7a61mR0fOlAsvC9/rIHf7L96sBc6dEWzeOu+KAea5bZyQRPIpojrVoI4AXGJS/ycu/fBTdLrUkA4ODrvjw==",
+      "license": "MIT",
+      "dependencies": {
+        "environment": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "packages/upgrade/node_modules/ink/node_modules/cli-truncate": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-4.0.0.tgz",
+      "integrity": "sha512-nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA==",
+      "license": "MIT",
+      "dependencies": {
+        "slice-ansi": "^5.0.0",
+        "string-width": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "packages/upgrade/node_modules/ink/node_modules/cli-truncate/node_modules/slice-ansi": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz",
+      "integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^6.0.0",
+        "is-fullwidth-code-point": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
+      }
+    },
+    "packages/upgrade/node_modules/ink/node_modules/emoji-regex": {
+      "version": "10.4.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz",
+      "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==",
+      "license": "MIT"
+    },
+    "packages/upgrade/node_modules/ink/node_modules/slice-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-7.1.0.tgz",
+      "integrity": "sha512-bSiSngZ/jWeX93BqeIAbImyTbEihizcwNjFoRUIY/T1wWQsfsm2Vw1agPKylXvQTU7iASGdHhyqRlqQzfz+Htg==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^6.2.1",
+        "is-fullwidth-code-point": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
+      }
+    },
+    "packages/upgrade/node_modules/ink/node_modules/slice-ansi/node_modules/is-fullwidth-code-point": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-5.0.0.tgz",
+      "integrity": "sha512-OVa3u9kkBbw7b8Xw5F9P+D/T9X+Z4+JruYVNapTjPYZYUznQ5YfWeFkOj606XYYW8yugTfC8Pj0hYqvi4ryAhA==",
+      "license": "MIT",
+      "dependencies": {
+        "get-east-asian-width": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "packages/upgrade/node_modules/ink/node_modules/string-width": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",
+      "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^10.3.0",
+        "get-east-asian-width": "^1.0.0",
+        "strip-ansi": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "packages/upgrade/node_modules/ink/node_modules/type-fest": {
+      "version": "4.26.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.26.1.tgz",
+      "integrity": "sha512-yOGpmOAL7CkKe/91I5O3gPICmJNLJ1G4zFYVAsRHg7M64biSnPtRj0WNQt++bRkjYOqjWXrhnUw1utzmVErAdg==",
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "packages/upgrade/node_modules/ink/node_modules/widest-line": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-5.0.0.tgz",
+      "integrity": "sha512-c9bZp7b5YtRj2wOe6dlj32MK+Bx/M/d+9VB2SHM1OtsUHR0aV0tdP6DWh/iMt0kWi1t5g1Iudu6hQRNd1A4PVA==",
+      "license": "MIT",
+      "dependencies": {
+        "string-width": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "packages/upgrade/node_modules/ink/node_modules/wrap-ansi": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.0.tgz",
+      "integrity": "sha512-G8ura3S+3Z2G+mkgNRq8dqaFZAuxfsxpBB8OCTGRTCtp+l/v9nbFNmCUP1BZMts3G1142MsZfn6eeUKrr4PD1Q==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^6.2.1",
+        "string-width": "^7.0.0",
+        "strip-ansi": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "packages/upgrade/node_modules/is-plain-obj": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-4.1.0.tgz",
+      "integrity": "sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "packages/upgrade/node_modules/is-stream": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-4.0.1.tgz",
+      "integrity": "sha512-Dnz92NInDqYckGEUJv689RbRiTSEHCQ7wOVeALbkOz999YpqT46yMRIGtSNl2iCL1waAZSx40+h59NV/EwzV/A==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "packages/upgrade/node_modules/is-unicode-supported": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-2.1.0.tgz",
+      "integrity": "sha512-mE00Gnza5EEB3Ds0HfMyllZzbBrmLOX3vfWoj9A9PEnTfratQ/BcaJOuMhnkhjXvb2+FkY3VuHqtAGpTPmglFQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "packages/upgrade/node_modules/jscodeshift": {
+      "version": "17.0.0",
+      "resolved": "https://registry.npmjs.org/jscodeshift/-/jscodeshift-17.0.0.tgz",
+      "integrity": "sha512-Af+MFsNwLSVO+t4kKjJdJKh6iNbNHfDfFGdyltJ2wUFN3furgbvHguJmB85iou+fY7wbHgI8eiEKpp6doGgtKg==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/core": "^7.24.7",
+        "@babel/parser": "^7.24.7",
+        "@babel/plugin-transform-class-properties": "^7.24.7",
+        "@babel/plugin-transform-modules-commonjs": "^7.24.7",
+        "@babel/plugin-transform-nullish-coalescing-operator": "^7.24.7",
+        "@babel/plugin-transform-optional-chaining": "^7.24.7",
+        "@babel/plugin-transform-private-methods": "^7.24.7",
+        "@babel/preset-flow": "^7.24.7",
+        "@babel/preset-typescript": "^7.24.7",
+        "@babel/register": "^7.24.6",
+        "flow-parser": "0.*",
+        "graceful-fs": "^4.2.4",
+        "micromatch": "^4.0.7",
+        "neo-async": "^2.5.0",
+        "picocolors": "^1.0.1",
+        "recast": "^0.23.9",
+        "temp": "^0.9.4",
+        "write-file-atomic": "^5.0.1"
+      },
+      "bin": {
+        "jscodeshift": "bin/jscodeshift.js"
+      },
+      "engines": {
+        "node": ">=16"
+      },
+      "peerDependencies": {
+        "@babel/preset-env": "^7.1.6"
+      },
+      "peerDependenciesMeta": {
+        "@babel/preset-env": {
+          "optional": true
+        }
+      }
+    },
     "packages/upgrade/node_modules/locate-path": {
       "version": "7.2.0",
       "license": "MIT",
@@ -48469,6 +49345,13 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "packages/upgrade/node_modules/loupe": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.2.tgz",
+      "integrity": "sha512-23I4pFZHmAemUnz8WZXbYRSKYj801VDaNv9ETuMh7IrMc7VuVVSo+Z9iLE3ni30+U48iDWfi30d3twAXBYmnCg==",
+      "dev": true,
+      "license": "MIT"
+    },
     "packages/upgrade/node_modules/lru-cache": {
       "version": "7.18.3",
       "license": "ISC",
@@ -48476,6 +49359,28 @@
         "node": ">=12"
       }
     },
+    "packages/upgrade/node_modules/make-dir": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+      "license": "MIT",
+      "dependencies": {
+        "pify": "^4.0.1",
+        "semver": "^5.6.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "packages/upgrade/node_modules/make-dir/node_modules/semver": {
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
     "packages/upgrade/node_modules/marked": {
       "version": "11.2.0",
       "license": "MIT",
@@ -48510,6 +49415,26 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "packages/upgrade/node_modules/micromatch": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+      "license": "MIT",
+      "dependencies": {
+        "braces": "^3.0.3",
+        "picomatch": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "packages/upgrade/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "packages/upgrade/node_modules/normalize-package-data": {
       "version": "4.0.1",
       "license": "BSD-2-Clause",
@@ -48523,6 +49448,34 @@
         "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
       }
     },
+    "packages/upgrade/node_modules/npm-run-path": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-6.0.0.tgz",
+      "integrity": "sha512-9qny7Z9DsQU8Ou39ERsPU4OZQlSTP47ShQzuKZ6PRXpYLtIFgl/DEBYEXKlvcEa+9tHVcK8CF81Y2V72qaZhWA==",
+      "license": "MIT",
+      "dependencies": {
+        "path-key": "^4.0.0",
+        "unicorn-magic": "^0.3.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "packages/upgrade/node_modules/npm-run-path/node_modules/unicorn-magic": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.3.0.tgz",
+      "integrity": "sha512-+QBBXBCvifc56fsbuxZQ6Sic3wqqc3WWaqxs58gvJrcOuN83HGTCwz3oS5phzU9LthRNE9VrJCFCLUgHeeFnfA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "packages/upgrade/node_modules/p-limit": {
       "version": "4.0.0",
       "license": "MIT",
@@ -48574,6 +49527,18 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "packages/upgrade/node_modules/parse-ms": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-4.0.0.tgz",
+      "integrity": "sha512-TXfryirbmq34y8QBwgqCVLi+8oA3oWx2eAnSn62ITyEhEYaWRlVZ2DvMM9eZbMs/RfxPu/PK/aBLyGj4IrqMHw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "packages/upgrade/node_modules/path-exists": {
       "version": "5.0.0",
       "license": "MIT",
@@ -48581,6 +49546,18 @@
         "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       }
     },
+    "packages/upgrade/node_modules/path-key": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz",
+      "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "packages/upgrade/node_modules/path-type": {
       "version": "5.0.0",
       "license": "MIT",
@@ -48591,6 +49568,46 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "packages/upgrade/node_modules/pathval": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/pathval/-/pathval-2.0.0.tgz",
+      "integrity": "sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 14.16"
+      }
+    },
+    "packages/upgrade/node_modules/picocolors": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz",
+      "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==",
+      "license": "ISC"
+    },
+    "packages/upgrade/node_modules/pify": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "packages/upgrade/node_modules/pretty-ms": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-9.1.0.tgz",
+      "integrity": "sha512-o1piW0n3tgKIKCwk2vpM/vOV13zjJzvP37Ioze54YlTHE06m4tjEbzg9WsKkvTuyYln2DHjo5pY4qrZGI0otpw==",
+      "license": "MIT",
+      "dependencies": {
+        "parse-ms": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "packages/upgrade/node_modules/quick-lru": {
       "version": "6.1.2",
       "license": "MIT",
@@ -48748,6 +49765,22 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "packages/upgrade/node_modules/recast": {
+      "version": "0.23.9",
+      "resolved": "https://registry.npmjs.org/recast/-/recast-0.23.9.tgz",
+      "integrity": "sha512-Hx/BGIbwj+Des3+xy5uAtAbdCyqK9y9wbBcDFDYanLS9JnMqf7OeF87HQwUimE87OEc72mr6tkKUKMBBL+hF9Q==",
+      "license": "MIT",
+      "dependencies": {
+        "ast-types": "^0.16.1",
+        "esprima": "~4.0.0",
+        "source-map": "~0.6.1",
+        "tiny-invariant": "^1.3.3",
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 4"
+      }
+    },
     "packages/upgrade/node_modules/redent": {
       "version": "4.0.0",
       "license": "MIT",
@@ -48762,6 +49795,41 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "packages/upgrade/node_modules/restore-cursor": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-4.0.0.tgz",
+      "integrity": "sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg==",
+      "license": "MIT",
+      "dependencies": {
+        "onetime": "^5.1.0",
+        "signal-exit": "^3.0.2"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "packages/upgrade/node_modules/rimraf": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+      "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+      "deprecated": "Rimraf versions prior to v4 are no longer supported",
+      "license": "ISC",
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
+    "packages/upgrade/node_modules/signal-exit": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+      "license": "ISC"
+    },
     "packages/upgrade/node_modules/slash": {
       "version": "5.1.0",
       "license": "MIT",
@@ -48772,6 +49840,52 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "packages/upgrade/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "packages/upgrade/node_modules/source-map-support": {
+      "version": "0.5.21",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+      "license": "MIT",
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "packages/upgrade/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "packages/upgrade/node_modules/strip-final-newline": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-4.0.0.tgz",
+      "integrity": "sha512-aulFJcD6YK8V1G7iRB5tigAP4TsHBZZrOV8pjV++zdUwmeV8uzbY7yn6h9MswN62adStNZFuCIx4haBnRuMDaw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "packages/upgrade/node_modules/strip-indent": {
       "version": "4.0.0",
       "license": "MIT",
@@ -48785,6 +49899,32 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "packages/upgrade/node_modules/supports-hyperlinks": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz",
+      "integrity": "sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==",
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0",
+        "supports-color": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "packages/upgrade/node_modules/temp": {
+      "version": "0.9.4",
+      "resolved": "https://registry.npmjs.org/temp/-/temp-0.9.4.tgz",
+      "integrity": "sha512-yYrrsWnrXMcdsnu/7YMYAofM1ktpL5By7vZhf15CrXijWWrEYZks5AXBudalfSWJLlnen/QUJUB5aoB0kqZUGA==",
+      "license": "MIT",
+      "dependencies": {
+        "mkdirp": "^0.5.1",
+        "rimraf": "~2.6.2"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
     "packages/upgrade/node_modules/temp-dir": {
       "version": "3.0.0",
       "license": "MIT",
@@ -48792,6 +49932,49 @@
         "node": ">=14.16"
       }
     },
+    "packages/upgrade/node_modules/terminal-link": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-3.0.0.tgz",
+      "integrity": "sha512-flFL3m4wuixmf6IfhFJd1YPiLiMuxEc8uHRM1buzIeZPm22Au2pDqBJQgdo7n1WfPU1ONFGv7YDwpFBmHGF6lg==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-escapes": "^5.0.0",
+        "supports-hyperlinks": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "packages/upgrade/node_modules/terminal-link/node_modules/ansi-escapes": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-5.0.0.tgz",
+      "integrity": "sha512-5GFMVX8HqE/TB+FuBJGuO5XG0WrsA6ptUqoODaT/n9mmUaZFkqnBueB4leqGBCmrUHnCnC4PCZTCd0E7QQ83bA==",
+      "license": "MIT",
+      "dependencies": {
+        "type-fest": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "packages/upgrade/node_modules/terminal-link/node_modules/type-fest": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz",
+      "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==",
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "packages/upgrade/node_modules/trim-newlines": {
       "version": "4.1.1",
       "license": "MIT",
@@ -48812,6 +49995,93 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "packages/upgrade/node_modules/vite-node": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-2.1.3.tgz",
+      "integrity": "sha512-I1JadzO+xYX887S39Do+paRePCKoiDrWRRjp9kkG5he0t7RXNvPAJPCQSJqbGN4uCrFFeS3Kj3sLqY8NMYBEdA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cac": "^6.7.14",
+        "debug": "^4.3.6",
+        "pathe": "^1.1.2",
+        "vite": "^5.0.0"
+      },
+      "bin": {
+        "vite-node": "vite-node.mjs"
+      },
+      "engines": {
+        "node": "^18.0.0 || >=20.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      }
+    },
+    "packages/upgrade/node_modules/vitest": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/vitest/-/vitest-2.1.3.tgz",
+      "integrity": "sha512-Zrxbg/WiIvUP2uEzelDNTXmEMJXuzJ1kCpbDvaKByFA9MNeO95V+7r/3ti0qzJzrxdyuUw5VduN7k+D3VmVOSA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vitest/expect": "2.1.3",
+        "@vitest/mocker": "2.1.3",
+        "@vitest/pretty-format": "^2.1.3",
+        "@vitest/runner": "2.1.3",
+        "@vitest/snapshot": "2.1.3",
+        "@vitest/spy": "2.1.3",
+        "@vitest/utils": "2.1.3",
+        "chai": "^5.1.1",
+        "debug": "^4.3.6",
+        "magic-string": "^0.30.11",
+        "pathe": "^1.1.2",
+        "std-env": "^3.7.0",
+        "tinybench": "^2.9.0",
+        "tinyexec": "^0.3.0",
+        "tinypool": "^1.0.0",
+        "tinyrainbow": "^1.2.0",
+        "vite": "^5.0.0",
+        "vite-node": "2.1.3",
+        "why-is-node-running": "^2.3.0"
+      },
+      "bin": {
+        "vitest": "vitest.mjs"
+      },
+      "engines": {
+        "node": "^18.0.0 || >=20.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      },
+      "peerDependencies": {
+        "@edge-runtime/vm": "*",
+        "@types/node": "^18.0.0 || >=20.0.0",
+        "@vitest/browser": "2.1.3",
+        "@vitest/ui": "2.1.3",
+        "happy-dom": "*",
+        "jsdom": "*"
+      },
+      "peerDependenciesMeta": {
+        "@edge-runtime/vm": {
+          "optional": true
+        },
+        "@types/node": {
+          "optional": true
+        },
+        "@vitest/browser": {
+          "optional": true
+        },
+        "@vitest/ui": {
+          "optional": true
+        },
+        "happy-dom": {
+          "optional": true
+        },
+        "jsdom": {
+          "optional": true
+        }
+      }
+    },
     "packages/upgrade/node_modules/yallist": {
       "version": "4.0.0",
       "license": "ISC"
diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md
index bbd875bcde6..1c1b256d6d5 100644
--- a/packages/astro/CHANGELOG.md
+++ b/packages/astro/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @clerk/astro
 
+## 1.3.16
+
+### Patch Changes
+
+- Updated dependencies [[`e1a26547a`](https://github.com/clerk/javascript/commit/e1a26547a9c65f4c79c2bbd4dc386ddf67c2fbee)]:
+  - @clerk/backend@1.14.1
+
+## 1.3.15
+
+### Patch Changes
+
+- Updated dependencies [[`e81d45b72`](https://github.com/clerk/javascript/commit/e81d45b72c81403c7c206dac5454de1fef6bec57), [`752ce9bfa`](https://github.com/clerk/javascript/commit/752ce9bfa47a8eebd38cd272eeb58ae26fea3371), [`99cdf9b67`](https://github.com/clerk/javascript/commit/99cdf9b67d1e99e66cc73d8a5bfce1f1f8df1b83), [`ce40ff6f0`](https://github.com/clerk/javascript/commit/ce40ff6f0d3bc79e33375be6dd5e03f140a07000), [`fb7ba1f34`](https://github.com/clerk/javascript/commit/fb7ba1f3485abdeac5e504cce6c2d84d3f3e4ffc), [`2102052c0`](https://github.com/clerk/javascript/commit/2102052c017065ab511339870fcebaa6719f2702)]:
+  - @clerk/types@4.26.0
+  - @clerk/shared@2.9.2
+  - @clerk/backend@1.14.0
+
 ## 1.3.14
 
 ### Patch Changes
diff --git a/packages/astro/package.json b/packages/astro/package.json
index 194d8bb7899..a88aaeeffa4 100644
--- a/packages/astro/package.json
+++ b/packages/astro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@clerk/astro",
-  "version": "1.3.14",
+  "version": "1.3.16",
   "description": "Clerk SDK for Astro",
   "keywords": [
     "auth",
@@ -81,9 +81,9 @@
     "publish:local": "npx yalc push --replace --sig"
   },
   "dependencies": {
-    "@clerk/backend": "1.13.10",
-    "@clerk/shared": "2.9.1",
-    "@clerk/types": "4.25.1",
+    "@clerk/backend": "1.14.1",
+    "@clerk/shared": "2.9.2",
+    "@clerk/types": "4.26.0",
     "nanoid": "5.0.7",
     "nanostores": "0.11.3"
   },
diff --git a/packages/backend/CHANGELOG.md b/packages/backend/CHANGELOG.md
index 0800d9f3028..7d255640700 100644
--- a/packages/backend/CHANGELOG.md
+++ b/packages/backend/CHANGELOG.md
@@ -1,5 +1,25 @@
 # Change Log
 
+## 1.14.1
+
+### Patch Changes
+
+- Remove console error message from refresh token flow failures. ([#4351](https://github.com/clerk/javascript/pull/4351)) by [@anagstef](https://github.com/anagstef)
+
+## 1.14.0
+
+### Minor Changes
+
+- Updates `organizationPatterns` to take precedence over `personalAccountPatterns` in `organizationSyncOptions` ([#4320](https://github.com/clerk/javascript/pull/4320)) by [@izaaklauer](https://github.com/izaaklauer)
+
+- Use EIP-4361 message spec for Web3 wallets sign in signature requests ([#4334](https://github.com/clerk/javascript/pull/4334)) by [@chanioxaris](https://github.com/chanioxaris)
+
+### Patch Changes
+
+- Updated dependencies [[`e81d45b72`](https://github.com/clerk/javascript/commit/e81d45b72c81403c7c206dac5454de1fef6bec57), [`752ce9bfa`](https://github.com/clerk/javascript/commit/752ce9bfa47a8eebd38cd272eeb58ae26fea3371), [`99cdf9b67`](https://github.com/clerk/javascript/commit/99cdf9b67d1e99e66cc73d8a5bfce1f1f8df1b83), [`ce40ff6f0`](https://github.com/clerk/javascript/commit/ce40ff6f0d3bc79e33375be6dd5e03f140a07000), [`2102052c0`](https://github.com/clerk/javascript/commit/2102052c017065ab511339870fcebaa6719f2702)]:
+  - @clerk/types@4.26.0
+  - @clerk/shared@2.9.2
+
 ## 1.13.10
 
 ### Patch Changes
diff --git a/packages/backend/package.json b/packages/backend/package.json
index 0f94db88b94..a1ae71f7d79 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@clerk/backend",
-  "version": "1.13.10",
+  "version": "1.14.1",
   "description": "Clerk Backend SDK - REST Client for Backend API & JWT verification utilities",
   "homepage": "https://clerk.com/",
   "bugs": {
@@ -95,8 +95,8 @@
     "test:cloudflare-workerd": "tests/cloudflare-workerd/run.sh"
   },
   "dependencies": {
-    "@clerk/shared": "2.9.1",
-    "@clerk/types": "4.25.1",
+    "@clerk/shared": "2.9.2",
+    "@clerk/types": "4.26.0",
     "cookie": "0.7.0",
     "snakecase-keys": "5.4.4",
     "tslib": "2.4.1"
diff --git a/packages/backend/src/api/resources/JSON.ts b/packages/backend/src/api/resources/JSON.ts
index 7b769f4495e..a37308485a8 100644
--- a/packages/backend/src/api/resources/JSON.ts
+++ b/packages/backend/src/api/resources/JSON.ts
@@ -326,6 +326,7 @@ export interface VerificationJSON extends ClerkResourceJSON {
   verified_at_client?: string;
   external_verification_redirect_url?: string | null;
   nonce?: string | null;
+  message?: string | null;
 }
 
 export interface Web3WalletJSON extends ClerkResourceJSON {
diff --git a/packages/backend/src/api/resources/Verification.ts b/packages/backend/src/api/resources/Verification.ts
index 35cbfb4d369..451556ecd22 100644
--- a/packages/backend/src/api/resources/Verification.ts
+++ b/packages/backend/src/api/resources/Verification.ts
@@ -10,6 +10,7 @@ export class Verification {
     readonly attempts: number | null = null,
     readonly expireAt: number | null = null,
     readonly nonce: string | null = null,
+    readonly message: string | null = null,
   ) {}
 
   static fromJSON(data: VerificationJSON): Verification {
diff --git a/packages/backend/src/tokens/__tests__/request.test.ts b/packages/backend/src/tokens/__tests__/request.test.ts
index 61b5c893398..e187432ee7e 100644
--- a/packages/backend/src/tokens/__tests__/request.test.ts
+++ b/packages/backend/src/tokens/__tests__/request.test.ts
@@ -298,14 +298,15 @@ export default (QUnit: QUnit) => {
         },
       },
       {
-        name: 'personal account match precedes org match',
+        name: 'org match match precedes personal account',
         whenOrgSyncOptions: {
-          organizationPatterns: ['/personal-account'], // bad practice
-          personalAccountPatterns: ['/personal-account'],
+          personalAccountPatterns: ['/', '/(.*)'], // Personal account captures everything
+          organizationPatterns: ['/orgs/:slug'], // that isn't org scoped
         },
-        whenAppRequestPath: '/personal-account',
+        whenAppRequestPath: '/orgs/my-org',
         thenExpectActivationEntity: {
-          type: 'personalAccount',
+          type: 'organization',
+          organizationSlug: 'my-org',
         },
       },
       {
diff --git a/packages/backend/src/tokens/request.ts b/packages/backend/src/tokens/request.ts
index 2e4ed6b9fa3..abc93dbabca 100644
--- a/packages/backend/src/tokens/request.ts
+++ b/packages/backend/src/tokens/request.ts
@@ -629,8 +629,7 @@ ${error.getFullMessage()}`,
         return signedIn(authenticateContext, data.jwtPayload, undefined, data.sessionToken);
       }
 
-      // If there's any error, simply fallback to the handshake flow.
-      console.error('Clerk: unable to refresh token:', error?.message || error);
+      // If there's any error, simply fallback to the handshake flow including the reason as a query parameter.
       if (error?.cause?.reason) {
         refreshError = error.cause.reason;
       } else {
@@ -735,22 +734,6 @@ export function getOrganizationSyncTarget(
     return null;
   }
 
-  // Check for personal account activation
-  if (matchers.PersonalAccountMatcher) {
-    let personalResult: Match<Partial<Record<string, string | string[]>>>;
-    try {
-      personalResult = matchers.PersonalAccountMatcher(url.pathname);
-    } catch (e) {
-      // Intentionally not logging the path to avoid potentially leaking anything sensitive
-      console.error(`Failed to apply personal account pattern "${options.personalAccountPatterns}" to a path`, e);
-      return null;
-    }
-
-    if (personalResult) {
-      return { type: 'personalAccount' };
-    }
-  }
-
   // Check for organization activation
   if (matchers.OrganizationMatcher) {
     let orgResult: Match<Partial<Record<string, string | string[]>>>;
@@ -776,6 +759,22 @@ export function getOrganizationSyncTarget(
       );
     }
   }
+
+  // Check for personal account activation
+  if (matchers.PersonalAccountMatcher) {
+    let personalResult: Match<Partial<Record<string, string | string[]>>>;
+    try {
+      personalResult = matchers.PersonalAccountMatcher(url.pathname);
+    } catch (e) {
+      // Intentionally not logging the path to avoid potentially leaking anything sensitive
+      console.error(`Failed to apply personal account pattern "${options.personalAccountPatterns}" to a path`, e);
+      return null;
+    }
+
+    if (personalResult) {
+      return { type: 'personalAccount' };
+    }
+  }
   return null;
 }
 
diff --git a/packages/backend/src/tokens/types.ts b/packages/backend/src/tokens/types.ts
index 0e97c0026c4..235b08eb078 100644
--- a/packages/backend/src/tokens/types.ts
+++ b/packages/backend/src/tokens/types.ts
@@ -36,7 +36,7 @@ export type OrganizationSyncOptions = {
    * organization-related fields will be set to null. The server component must detect this and respond
    * with an appropriate error (e.g., notFound()).
    *
-   * If the route also matches the personalAccountPatterns, the personalAccountPattern takes precedence.
+   * If the route also matches the personalAccountPatterns, this takes precedence.
    *
    * Must have a path token named either ":id" (matches a clerk organization ID) or ":slug" (matches a clerk
    * organization slug).
@@ -50,7 +50,7 @@ export type OrganizationSyncOptions = {
 
   /**
    * URL patterns for resources in the context of a clerk personal account (user-specific, outside any organization).
-   * If the route also matches the organizationPattern, this takes precedence.
+   * If the route also matches the organizationPattern, the organizationPatterns takes precedence.
    *
    * Common examples:
    * - ["/user", "/user/(.*)"]
diff --git a/packages/chrome-extension/CHANGELOG.md b/packages/chrome-extension/CHANGELOG.md
index 28f24e5243e..4ede4fc57c0 100644
--- a/packages/chrome-extension/CHANGELOG.md
+++ b/packages/chrome-extension/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Change Log
 
+## 1.3.20
+
+### Patch Changes
+
+- Updated dependencies [[`ce40ff6f0`](https://github.com/clerk/javascript/commit/ce40ff6f0d3bc79e33375be6dd5e03f140a07000), [`e81d45b72`](https://github.com/clerk/javascript/commit/e81d45b72c81403c7c206dac5454de1fef6bec57), [`752ce9bfa`](https://github.com/clerk/javascript/commit/752ce9bfa47a8eebd38cd272eeb58ae26fea3371), [`99cdf9b67`](https://github.com/clerk/javascript/commit/99cdf9b67d1e99e66cc73d8a5bfce1f1f8df1b83), [`48421febe`](https://github.com/clerk/javascript/commit/48421febe5feb85d8cf0706c3b150d3e8c545635), [`ce40ff6f0`](https://github.com/clerk/javascript/commit/ce40ff6f0d3bc79e33375be6dd5e03f140a07000), [`2102052c0`](https://github.com/clerk/javascript/commit/2102052c017065ab511339870fcebaa6719f2702)]:
+  - @clerk/clerk-react@5.12.0
+  - @clerk/clerk-js@5.27.0
+  - @clerk/shared@2.9.2
+
 ## 1.3.19
 
 ### Patch Changes
diff --git a/packages/chrome-extension/package.json b/packages/chrome-extension/package.json
index a6498519531..a135d041a56 100644
--- a/packages/chrome-extension/package.json
+++ b/packages/chrome-extension/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@clerk/chrome-extension",
-  "version": "1.3.19",
+  "version": "1.3.20",
   "description": "Clerk SDK for Chrome extensions",
   "keywords": [
     "auth",
@@ -47,9 +47,9 @@
     "test:coverage": "jest --collectCoverage && open coverage/lcov-report/index.html"
   },
   "dependencies": {
-    "@clerk/clerk-js": "5.26.5",
-    "@clerk/clerk-react": "5.11.1",
-    "@clerk/shared": "2.9.1",
+    "@clerk/clerk-js": "5.27.0",
+    "@clerk/clerk-react": "5.12.0",
+    "@clerk/shared": "2.9.2",
     "webextension-polyfill": "^0.10.0"
   },
   "devDependencies": {
diff --git a/packages/clerk-js/CHANGELOG.md b/packages/clerk-js/CHANGELOG.md
index 2edcfbafb0f..5c9e1e2457e 100644
--- a/packages/clerk-js/CHANGELOG.md
+++ b/packages/clerk-js/CHANGELOG.md
@@ -1,5 +1,38 @@
 # Change Log
 
+## 5.27.0
+
+### Minor Changes
+
+- Drop `maxAgeMinutes` from `__experimental_startVerification`. ([#4338](https://github.com/clerk/javascript/pull/4338)) by [@panteliselef](https://github.com/panteliselef)
+
+  Drop types `__experimental_SessionVerificationConfig` and `__experimental_SessionVerificationMaxAgeMinutes`.
+
+- The "Restricted access" screen has been improved for visual consistency and the ability to contact support. The displayed texts have been made more clear and the sign-in button has been moved to the bottom. ([#4335](https://github.com/clerk/javascript/pull/4335)) by [@nikospapcom](https://github.com/nikospapcom)
+
+- Add experimental standalone mode for `<UserButton />` and `<OrganizationSwitcher />`. ([#4042](https://github.com/clerk/javascript/pull/4042)) by [@panteliselef](https://github.com/panteliselef)
+
+  When `__experimental_asStandalone: true` the component will not render its trigger, and instead it will render only the contents of the popover in place.
+
+  APIs that changed:
+
+  - (For internal usage) Added `__experimental_prefetchOrganizationSwitcher` as a way to mount an internal component that will render the `useOrganizationList()` hook and prefetch the necessary data for the popover of `<OrganizationSwitcher />`. This enhances the UX since no loading state will be visible and keeps CLS to the minimum.
+  - New property for `mountOrganizationSwitcher(node, { __experimental_asStandalone: true })`
+  - New property for `mountUserButton(node, { __experimental_asStandalone: true })`
+
+- Use EIP-4361 message spec for Web3 wallets sign in signature requests ([#4334](https://github.com/clerk/javascript/pull/4334)) by [@chanioxaris](https://github.com/chanioxaris)
+
+### Patch Changes
+
+- Retry with exponential backoff if loadScript fails to load the script ([#4349](https://github.com/clerk/javascript/pull/4349)) by [@nikosdouvlis](https://github.com/nikosdouvlis)
+
+- Add the `?render=explicit` query parameter to the Turnstile script. ([#4332](https://github.com/clerk/javascript/pull/4332)) by [@anagstef](https://github.com/anagstef)
+
+- Updated dependencies [[`e81d45b72`](https://github.com/clerk/javascript/commit/e81d45b72c81403c7c206dac5454de1fef6bec57), [`752ce9bfa`](https://github.com/clerk/javascript/commit/752ce9bfa47a8eebd38cd272eeb58ae26fea3371), [`0a9bf8ef4`](https://github.com/clerk/javascript/commit/0a9bf8ef4902606f06b371e11c7ae84d493eda6c), [`99cdf9b67`](https://github.com/clerk/javascript/commit/99cdf9b67d1e99e66cc73d8a5bfce1f1f8df1b83), [`ce40ff6f0`](https://github.com/clerk/javascript/commit/ce40ff6f0d3bc79e33375be6dd5e03f140a07000), [`2102052c0`](https://github.com/clerk/javascript/commit/2102052c017065ab511339870fcebaa6719f2702)]:
+  - @clerk/types@4.26.0
+  - @clerk/shared@2.9.2
+  - @clerk/localizations@3.3.0
+
 ## 5.26.5
 
 ### Patch Changes
diff --git a/packages/clerk-js/bundlewatch.config.json b/packages/clerk-js/bundlewatch.config.json
index 6e8b142720e..30ee61bacba 100644
--- a/packages/clerk-js/bundlewatch.config.json
+++ b/packages/clerk-js/bundlewatch.config.json
@@ -1,6 +1,6 @@
 {
   "files": [
-    { "path": "./dist/clerk.browser.js", "maxSize": "65kB" },
+    { "path": "./dist/clerk.browser.js", "maxSize": "65.5kB" },
     { "path": "./dist/clerk.headless.js", "maxSize": "43kB" },
     { "path": "./dist/ui-common*.js", "maxSize": "86KB" },
     { "path": "./dist/vendors*.js", "maxSize": "70KB" },
diff --git a/packages/clerk-js/package.json b/packages/clerk-js/package.json
index 3d2f37ad7d8..4904c807c7c 100644
--- a/packages/clerk-js/package.json
+++ b/packages/clerk-js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@clerk/clerk-js",
-  "version": "5.26.5",
+  "version": "5.27.0",
   "description": "Clerk JS library",
   "keywords": [
     "clerk",
@@ -50,9 +50,9 @@
   },
   "browserslist": "last 2 versions, ios_saf > 12, Safari > 12, > 1%, not dead, not ie > 0",
   "dependencies": {
-    "@clerk/localizations": "3.2.1",
-    "@clerk/shared": "2.9.1",
-    "@clerk/types": "4.25.1",
+    "@clerk/localizations": "3.3.0",
+    "@clerk/shared": "2.9.2",
+    "@clerk/types": "4.26.0",
     "@coinbase/wallet-sdk": "4.0.4",
     "@emotion/cache": "11.11.0",
     "@emotion/react": "11.11.1",
diff --git a/packages/clerk-js/src/core/clerk.ts b/packages/clerk-js/src/core/clerk.ts
index 98ebad1d080..dc4b101985d 100644
--- a/packages/clerk-js/src/core/clerk.ts
+++ b/packages/clerk-js/src/core/clerk.ts
@@ -667,6 +667,13 @@ export class Clerk implements ClerkInterface {
     void this.#componentControls?.ensureMounted().then(controls => controls.unmountComponent({ node }));
   };
 
+  public __experimental_prefetchOrganizationSwitcher = () => {
+    this.assertComponentsReady(this.#componentControls);
+    void this.#componentControls
+      ?.ensureMounted({ preloadHint: 'OrganizationSwitcher' })
+      .then(controls => controls.prefetch('organizationSwitcher'));
+  };
+
   public mountOrganizationList = (node: HTMLDivElement, props?: OrganizationListProps) => {
     this.assertComponentsReady(this.#componentControls);
     if (disabledOrganizationsFeature(this, this.environment)) {
diff --git a/packages/clerk-js/src/core/resources/Session.ts b/packages/clerk-js/src/core/resources/Session.ts
index 9a1c3963af0..b9ef6743736 100644
--- a/packages/clerk-js/src/core/resources/Session.ts
+++ b/packages/clerk-js/src/core/resources/Session.ts
@@ -122,7 +122,6 @@ export class Session extends BaseResource implements SessionResource {
 
   __experimental_startVerification = async ({
     level,
-    maxAgeMinutes,
   }: __experimental_SessionVerifyCreateParams): Promise<__experimental_SessionVerificationResource> => {
     const json = (
       await BaseResource._fetch({
@@ -130,7 +129,6 @@ export class Session extends BaseResource implements SessionResource {
         path: `/client/sessions/${this.id}/verify`,
         body: {
           level,
-          maxAgeMinutes,
         } as any,
       })
     )?.response as unknown as __experimental_SessionVerificationJSON;
diff --git a/packages/clerk-js/src/core/resources/SignIn.ts b/packages/clerk-js/src/core/resources/SignIn.ts
index e9124638042..50ce5f39e4c 100644
--- a/packages/clerk-js/src/core/resources/SignIn.ts
+++ b/packages/clerk-js/src/core/resources/SignIn.ts
@@ -250,14 +250,14 @@ export class SignIn extends BaseResource implements SignInResource {
 
     await this.prepareFirstFactor(web3FirstFactor);
 
-    const { nonce } = this.firstFactorVerification;
-    if (!nonce) {
+    const { message } = this.firstFactorVerification;
+    if (!message) {
       clerkVerifyWeb3WalletCalledBeforeCreate('SignIn');
     }
 
     let signature: string;
     try {
-      signature = await generateSignature({ identifier, nonce, provider });
+      signature = await generateSignature({ identifier, nonce: message, provider });
     } catch (err) {
       // There is a chance that as a user when you try to setup and use the Coinbase Wallet with an existing
       // Passkey in order to authenticate, the initial generate signature request to be rejected. For this
@@ -266,7 +266,7 @@ export class SignIn extends BaseResource implements SignInResource {
       // error code 4001 means the user rejected the request
       // Reference: https://docs.cdp.coinbase.com/wallet-sdk/docs/errors
       if (provider === 'coinbase_wallet' && err.code === 4001) {
-        signature = await generateSignature({ identifier, nonce, provider });
+        signature = await generateSignature({ identifier, nonce: message, provider });
       } else {
         throw err;
       }
diff --git a/packages/clerk-js/src/core/resources/SignUp.ts b/packages/clerk-js/src/core/resources/SignUp.ts
index 5f239241227..bf7a06932ea 100644
--- a/packages/clerk-js/src/core/resources/SignUp.ts
+++ b/packages/clerk-js/src/core/resources/SignUp.ts
@@ -203,14 +203,14 @@ export class SignUp extends BaseResource implements SignUpResource {
     await this.create({ web3Wallet, unsafeMetadata });
     await this.prepareWeb3WalletVerification({ strategy });
 
-    const { nonce } = this.verifications.web3Wallet;
-    if (!nonce) {
+    const { message } = this.verifications.web3Wallet;
+    if (!message) {
       clerkVerifyWeb3WalletCalledBeforeCreate('SignUp');
     }
 
     let signature: string;
     try {
-      signature = await generateSignature({ identifier, nonce, provider });
+      signature = await generateSignature({ identifier, nonce: message, provider });
     } catch (err) {
       // There is a chance that as a first time visitor when you try to setup and use the
       // Coinbase Wallet from scratch in order to authenticate, the initial generate
@@ -220,7 +220,7 @@ export class SignUp extends BaseResource implements SignUpResource {
       // error code 4001 means the user rejected the request
       // Reference: https://docs.cdp.coinbase.com/wallet-sdk/docs/errors
       if (provider === 'coinbase_wallet' && err.code === 4001) {
-        signature = await generateSignature({ identifier, nonce, provider });
+        signature = await generateSignature({ identifier, nonce: message, provider });
       } else {
         throw err;
       }
diff --git a/packages/clerk-js/src/core/resources/Verification.ts b/packages/clerk-js/src/core/resources/Verification.ts
index e301098065e..8028c4c1778 100644
--- a/packages/clerk-js/src/core/resources/Verification.ts
+++ b/packages/clerk-js/src/core/resources/Verification.ts
@@ -23,6 +23,7 @@ export class Verification extends BaseResource implements VerificationResource {
   status: VerificationStatus | null = null;
   strategy: string | null = null;
   nonce: string | null = null;
+  message: string | null = null;
   externalVerificationRedirectURL: URL | null = null;
   attempts: number | null = null;
   expireAt: Date | null = null;
@@ -44,6 +45,7 @@ export class Verification extends BaseResource implements VerificationResource {
       this.verifiedAtClient = data.verified_at_client;
       this.strategy = data.strategy;
       this.nonce = data.nonce || null;
+      this.message = data.message || null;
       if (data.external_verification_redirect_url) {
         this.externalVerificationRedirectURL = new URL(data.external_verification_redirect_url);
       } else {
diff --git a/packages/clerk-js/src/ui/Components.tsx b/packages/clerk-js/src/ui/Components.tsx
index fa419d4c9f1..5fd0168ee3d 100644
--- a/packages/clerk-js/src/ui/Components.tsx
+++ b/packages/clerk-js/src/ui/Components.tsx
@@ -37,6 +37,7 @@ import {
   LazyModalRenderer,
   LazyOneTapRenderer,
   LazyProviders,
+  OrganizationSwitcherPrefetch,
 } from './lazyModules/providers';
 import type { AvailableComponentProps } from './types';
 
@@ -88,6 +89,7 @@ export type ComponentControls = {
       notify?: boolean;
     },
   ) => void;
+  prefetch: (component: 'organizationSwitcher') => void;
   // Special case, as the impersonation fab mounts automatically
   mountImpersonationFab: () => void;
 };
@@ -116,6 +118,7 @@ interface ComponentsState {
   userVerificationModal: null | __experimental_UserVerificationProps;
   organizationProfileModal: null | OrganizationProfileProps;
   createOrganizationModal: null | CreateOrganizationProps;
+  organizationSwitcherPrefetch: boolean;
   nodes: Map<HTMLDivElement, HtmlNodeOptions>;
   impersonationFab: boolean;
 }
@@ -193,6 +196,7 @@ const Components = (props: ComponentsProps) => {
     userVerificationModal: null,
     organizationProfileModal: null,
     createOrganizationModal: null,
+    organizationSwitcherPrefetch: false,
     nodes: new Map(),
     impersonationFab: false,
   });
@@ -301,6 +305,10 @@ const Components = (props: ComponentsProps) => {
       setState(s => ({ ...s, impersonationFab: true }));
     };
 
+    componentsControls.prefetch = component => {
+      setState(s => ({ ...s, [`${component}Prefetch`]: true }));
+    };
+
     props.onComponentsMounted();
   }, []);
 
@@ -452,6 +460,8 @@ const Components = (props: ComponentsProps) => {
             <ImpersonationFab />
           </LazyImpersonationFabProvider>
         )}
+
+        <Suspense>{state.organizationSwitcherPrefetch && <OrganizationSwitcherPrefetch />}</Suspense>
       </LazyProviders>
     </Suspense>
   );
diff --git a/packages/clerk-js/src/ui/components/OrganizationSwitcher/OrganizationSwitcher.tsx b/packages/clerk-js/src/ui/components/OrganizationSwitcher/OrganizationSwitcher.tsx
index 234ddb9b2d6..e0fdd0be568 100644
--- a/packages/clerk-js/src/ui/components/OrganizationSwitcher/OrganizationSwitcher.tsx
+++ b/packages/clerk-js/src/ui/components/OrganizationSwitcher/OrganizationSwitcher.tsx
@@ -1,4 +1,5 @@
-import { useId } from 'react';
+import type { ReactElement } from 'react';
+import { cloneElement, useId } from 'react';
 
 import { AcceptedInvitationsProvider, useOrganizationSwitcherContext, withCoreUserGuard } from '../../contexts';
 import { Flow } from '../../customizables';
@@ -7,8 +8,9 @@ import { usePopover } from '../../hooks';
 import { OrganizationSwitcherPopover } from './OrganizationSwitcherPopover';
 import { OrganizationSwitcherTrigger } from './OrganizationSwitcherTrigger';
 
-const _OrganizationSwitcher = withFloatingTree(() => {
+const OrganizationSwitcherWithFloatingTree = withFloatingTree<{ children: ReactElement }>(({ children }) => {
   const { defaultOpen } = useOrganizationSwitcherContext();
+
   const { floating, reference, styles, toggle, isOpen, nodeId, context } = usePopover({
     defaultOpen,
     placement: 'bottom-start',
@@ -17,34 +19,50 @@ const _OrganizationSwitcher = withFloatingTree(() => {
 
   const switcherButtonMenuId = useId();
 
+  return (
+    <>
+      <OrganizationSwitcherTrigger
+        ref={reference}
+        onClick={toggle}
+        isOpen={isOpen}
+        aria-controls={isOpen ? switcherButtonMenuId : undefined}
+        aria-expanded={isOpen}
+      />
+      <Popover
+        nodeId={nodeId}
+        context={context}
+        isOpen={isOpen}
+      >
+        {cloneElement(children, {
+          id: switcherButtonMenuId,
+          close: toggle,
+          ref: floating,
+          style: styles,
+        })}
+      </Popover>
+    </>
+  );
+});
+
+const _OrganizationSwitcher = () => {
+  const { __experimental_asStandalone } = useOrganizationSwitcherContext();
+
   return (
     <Flow.Root
       flow='organizationSwitcher'
       sx={{ display: 'inline-flex' }}
     >
       <AcceptedInvitationsProvider>
-        <OrganizationSwitcherTrigger
-          ref={reference}
-          onClick={toggle}
-          isOpen={isOpen}
-          aria-controls={isOpen ? switcherButtonMenuId : undefined}
-          aria-expanded={isOpen}
-        />
-        <Popover
-          nodeId={nodeId}
-          context={context}
-          isOpen={isOpen}
-        >
-          <OrganizationSwitcherPopover
-            id={switcherButtonMenuId}
-            close={toggle}
-            ref={floating}
-            style={{ ...styles }}
-          />
-        </Popover>
+        {__experimental_asStandalone ? (
+          <OrganizationSwitcherPopover />
+        ) : (
+          <OrganizationSwitcherWithFloatingTree>
+            <OrganizationSwitcherPopover />
+          </OrganizationSwitcherWithFloatingTree>
+        )}
       </AcceptedInvitationsProvider>
     </Flow.Root>
   );
-});
+};
 
 export const OrganizationSwitcher = withCoreUserGuard(withCardStateProvider(_OrganizationSwitcher));
diff --git a/packages/clerk-js/src/ui/components/OrganizationSwitcher/OrganizationSwitcherPopover.tsx b/packages/clerk-js/src/ui/components/OrganizationSwitcher/OrganizationSwitcherPopover.tsx
index 523a35552d4..1fbb9436e91 100644
--- a/packages/clerk-js/src/ui/components/OrganizationSwitcher/OrganizationSwitcherPopover.tsx
+++ b/packages/clerk-js/src/ui/components/OrganizationSwitcher/OrganizationSwitcherPopover.tsx
@@ -20,12 +20,16 @@ import { useRouter } from '../../router';
 import type { PropsOfComponent, ThemableCssProp } from '../../styledSystem';
 import { OrganizationActionList } from './OtherOrganizationActions';
 
-type OrganizationSwitcherPopoverProps = { close: () => void } & PropsOfComponent<typeof PopoverCard.Root>;
+type OrganizationSwitcherPopoverProps = {
+  close?: (open: boolean | ((prevState: boolean) => boolean)) => void;
+} & PropsOfComponent<typeof PopoverCard.Root>;
 
 export const OrganizationSwitcherPopover = React.forwardRef<HTMLDivElement, OrganizationSwitcherPopoverProps>(
   (props, ref) => {
-    const { close, ...rest } = props;
+    const { close: unsafeClose, ...rest } = props;
+    const close = () => unsafeClose?.(false);
     const card = useCardState();
+    const { __experimental_asStandalone } = useOrganizationSwitcherContext();
     const { openOrganizationProfile, openCreateOrganization } = useClerk();
     const { organization: currentOrg } = useOrganization();
     const { isLoaded, setActive } = useOrganizationList();
@@ -191,6 +195,7 @@ export const OrganizationSwitcherPopover = React.forwardRef<HTMLDivElement, Orga
           ref={ref}
           role='dialog'
           aria-label={`${currentOrg?.name} is active`}
+          shouldEntryAnimate={!__experimental_asStandalone}
           {...rest}
         >
           <PopoverCard.Content elementDescriptor={descriptors.organizationSwitcherPopoverMain}>
diff --git a/packages/clerk-js/src/ui/components/OrganizationSwitcher/__tests__/OrganizationSwitcher.test.tsx b/packages/clerk-js/src/ui/components/OrganizationSwitcher/__tests__/OrganizationSwitcher.test.tsx
index 60a9fb997ba..bac49c52af3 100644
--- a/packages/clerk-js/src/ui/components/OrganizationSwitcher/__tests__/OrganizationSwitcher.test.tsx
+++ b/packages/clerk-js/src/ui/components/OrganizationSwitcher/__tests__/OrganizationSwitcher.test.tsx
@@ -1,5 +1,6 @@
 import type { MembershipRole } from '@clerk/types';
 import { describe } from '@jest/globals';
+import { waitFor } from '@testing-library/react';
 
 import { act, render } from '../../../../testUtils';
 import { bindCreateFixtures } from '../../../utils/test/createFixtures';
@@ -119,10 +120,25 @@ describe('OrganizationSwitcher', () => {
 
       props.setProps({ hidePersonal: true });
       const { getByText, getByRole, userEvent } = render(<OrganizationSwitcher />, { wrapper });
-      await userEvent.click(getByRole('button'));
+      await userEvent.click(getByRole('button', { name: 'Open organization switcher' }));
       expect(getByText('Create organization')).toBeInTheDocument();
     });
 
+    it('renders organization switcher popover as standalone', async () => {
+      const { wrapper, props } = await createFixtures(f => {
+        f.withOrganizations();
+        f.withUser({ email_addresses: ['test@clerk.com'], create_organization_enabled: true });
+      });
+      props.setProps({
+        __experimental_asStandalone: true,
+      });
+      const { getByText, queryByRole } = render(<OrganizationSwitcher />, { wrapper });
+      await waitFor(() => {
+        expect(queryByRole('button', { name: 'Open organization switcher' })).toBeNull();
+        expect(getByText('Personal account')).toBeInTheDocument();
+      });
+    });
+
     it('lists all organizations the user belongs to', async () => {
       const { wrapper, props, fixtures } = await createFixtures(f => {
         f.withOrganizations();
diff --git a/packages/clerk-js/src/ui/components/SignUp/SignUpRestrictedAccess.tsx b/packages/clerk-js/src/ui/components/SignUp/SignUpRestrictedAccess.tsx
index 44d86185ac2..2a931b5ce19 100644
--- a/packages/clerk-js/src/ui/components/SignUp/SignUpRestrictedAccess.tsx
+++ b/packages/clerk-js/src/ui/components/SignUp/SignUpRestrictedAccess.tsx
@@ -1,14 +1,21 @@
 import { useClerk } from '@clerk/shared/react';
 
 import { useSignUpContext } from '../../contexts';
-import { Icon, localizationKeys } from '../../customizables';
+import { Button, Flex, Icon, localizationKeys } from '../../customizables';
 import { Card, Header } from '../../elements';
 import { useCardState } from '../../elements/contexts';
+import { useSupportEmail } from '../../hooks/useSupportEmail';
 import { Block } from '../../icons';
+
 export const SignUpRestrictedAccess = () => {
   const clerk = useClerk();
   const card = useCardState();
   const { signInUrl } = useSignUpContext();
+  const supportEmail = useSupportEmail();
+
+  const handleEmailSupport = () => {
+    window.location.href = `mailto:${supportEmail}`;
+  };
 
   return (
     <Card.Root>
@@ -18,22 +25,36 @@ export const SignUpRestrictedAccess = () => {
             icon={Block}
             sx={t => ({
               margin: 'auto',
-              width: t.sizes.$12,
-              height: t.sizes.$12,
+              width: t.sizes.$10,
+              height: t.sizes.$10,
             })}
           />
           <Header.Title localizationKey={localizationKeys('signUp.restrictedAccess.title')} />
           <Header.Subtitle localizationKey={localizationKeys('signUp.restrictedAccess.subtitle')} />
         </Header.Root>
         <Card.Alert>{card.error}</Card.Alert>
+        {supportEmail && (
+          <Flex
+            direction='col'
+            gap={4}
+          >
+            <Button
+              localizationKey={localizationKeys('signUp.restrictedAccess.blockButton__emailSupport')}
+              onClick={handleEmailSupport}
+              hasArrow
+            />
+          </Flex>
+        )}
+      </Card.Content>
+      <Card.Footer>
         <Card.Action elementId='signUp'>
+          <Card.ActionText localizationKey={localizationKeys('signUp.restrictedAccess.actionText')} />
           <Card.ActionLink
             localizationKey={localizationKeys('signUp.restrictedAccess.actionLink')}
             to={clerk.buildUrlWithAuth(signInUrl)}
           />
         </Card.Action>
-      </Card.Content>
-      <Card.Footer />
+      </Card.Footer>
     </Card.Root>
   );
 };
diff --git a/packages/clerk-js/src/ui/components/SignUp/__tests__/SignUpStart.test.tsx b/packages/clerk-js/src/ui/components/SignUp/__tests__/SignUpStart.test.tsx
index 1ccf35f5fa0..4aaec2a2d85 100644
--- a/packages/clerk-js/src/ui/components/SignUp/__tests__/SignUpStart.test.tsx
+++ b/packages/clerk-js/src/ui/components/SignUp/__tests__/SignUpStart.test.tsx
@@ -252,7 +252,7 @@ describe('SignUpStart', () => {
       });
 
       render(<SignUpStart />, { wrapper });
-      screen.getByText('Restricted access');
+      screen.getByText('Access restricted');
     });
   });
 
diff --git a/packages/clerk-js/src/ui/components/UserButton/UserButton.tsx b/packages/clerk-js/src/ui/components/UserButton/UserButton.tsx
index 941d8fa1da6..6e256949469 100644
--- a/packages/clerk-js/src/ui/components/UserButton/UserButton.tsx
+++ b/packages/clerk-js/src/ui/components/UserButton/UserButton.tsx
@@ -1,4 +1,4 @@
-import { useId } from 'react';
+import { cloneElement, type ReactElement, useId } from 'react';
 
 import { useUserButtonContext, withCoreUserGuard } from '../../contexts';
 import { Flow } from '../../customizables';
@@ -7,8 +7,9 @@ import { usePopover } from '../../hooks';
 import { UserButtonPopover } from './UserButtonPopover';
 import { UserButtonTrigger } from './UserButtonTrigger';
 
-const _UserButton = withFloatingTree(() => {
+const UserButtonWithFloatingTree = withFloatingTree<{ children: ReactElement }>(({ children }) => {
   const { defaultOpen } = useUserButtonContext();
+
   const { floating, reference, styles, toggle, isOpen, nodeId, context } = usePopover({
     defaultOpen,
     placement: 'bottom-end',
@@ -18,10 +19,7 @@ const _UserButton = withFloatingTree(() => {
   const userButtonMenuId = useId();
 
   return (
-    <Flow.Root
-      flow='userButton'
-      sx={{ display: 'inline-flex' }}
-    >
+    <>
       <UserButtonTrigger
         ref={reference}
         onClick={toggle}
@@ -34,15 +32,34 @@ const _UserButton = withFloatingTree(() => {
         context={context}
         isOpen={isOpen}
       >
-        <UserButtonPopover
-          id={userButtonMenuId}
-          close={toggle}
-          ref={floating}
-          style={{ ...styles }}
-        />
+        {cloneElement(children, {
+          id: userButtonMenuId,
+          close: toggle,
+          ref: floating,
+          style: styles,
+        })}
       </Popover>
-    </Flow.Root>
+    </>
   );
 });
 
+const _UserButton = () => {
+  const { __experimental_asStandalone } = useUserButtonContext();
+
+  return (
+    <Flow.Root
+      flow='userButton'
+      sx={{ display: 'inline-flex' }}
+    >
+      {__experimental_asStandalone ? (
+        <UserButtonPopover />
+      ) : (
+        <UserButtonWithFloatingTree>
+          <UserButtonPopover />
+        </UserButtonWithFloatingTree>
+      )}
+    </Flow.Root>
+  );
+};
+
 export const UserButton = withCoreUserGuard(withCardStateProvider(_UserButton));
diff --git a/packages/clerk-js/src/ui/components/UserButton/UserButtonPopover.tsx b/packages/clerk-js/src/ui/components/UserButton/UserButtonPopover.tsx
index ce5ce45d6b0..114a6ed8b8e 100644
--- a/packages/clerk-js/src/ui/components/UserButton/UserButtonPopover.tsx
+++ b/packages/clerk-js/src/ui/components/UserButton/UserButtonPopover.tsx
@@ -9,11 +9,13 @@ import type { PropsOfComponent } from '../../styledSystem';
 import { MultiSessionActions, SignOutAllActions, SingleSessionActions } from './SessionActions';
 import { useMultisessionActions } from './useMultisessionActions';
 
-type UserButtonPopoverProps = { close: () => void } & PropsOfComponent<typeof PopoverCard.Root>;
+type UserButtonPopoverProps = { close?: () => void } & PropsOfComponent<typeof PopoverCard.Root>;
 
 export const UserButtonPopover = React.forwardRef<HTMLDivElement, UserButtonPopoverProps>((props, ref) => {
-  const { close, ...rest } = props;
+  const { close: unsafeClose, ...rest } = props;
+  const close = () => unsafeClose?.();
   const { session } = useSession() as { session: ActiveSessionResource };
+  const { __experimental_asStandalone } = useUserButtonContext();
   const { authConfig } = useEnvironment();
   const { user } = useUser();
   const {
@@ -33,6 +35,7 @@ export const UserButtonPopover = React.forwardRef<HTMLDivElement, UserButtonPopo
         ref={ref}
         role='dialog'
         aria-label='User button popover'
+        shouldEntryAnimate={!__experimental_asStandalone}
         {...rest}
       >
         <PopoverCard.Content elementDescriptor={descriptors.userButtonPopoverMain}>
diff --git a/packages/clerk-js/src/ui/components/UserButton/__tests__/UserButton.test.tsx b/packages/clerk-js/src/ui/components/UserButton/__tests__/UserButton.test.tsx
index 42692294ab6..f109431182c 100644
--- a/packages/clerk-js/src/ui/components/UserButton/__tests__/UserButton.test.tsx
+++ b/packages/clerk-js/src/ui/components/UserButton/__tests__/UserButton.test.tsx
@@ -21,6 +21,18 @@ describe('UserButton', () => {
     expect(queryByRole('button')).not.toBeNull();
   });
 
+  it('renders popover as standalone when there is a user', async () => {
+    const { wrapper, props } = await createFixtures(f => {
+      f.withUser({ email_addresses: ['test@clerk.com'] });
+    });
+    props.setProps({
+      __experimental_asStandalone: true,
+    });
+    const { getByText, queryByRole } = render(<UserButton />, { wrapper });
+    expect(queryByRole('button', { name: 'Open user button' })).toBeNull();
+    getByText('Manage account');
+  });
+
   it('opens the user button popover when clicked', async () => {
     const { wrapper } = await createFixtures(f => {
       f.withUser({
diff --git a/packages/clerk-js/src/ui/components/UserProfile/Web3Form.tsx b/packages/clerk-js/src/ui/components/UserProfile/Web3Form.tsx
index 3f0178c420e..0f607a67916 100644
--- a/packages/clerk-js/src/ui/components/UserProfile/Web3Form.tsx
+++ b/packages/clerk-js/src/ui/components/UserProfile/Web3Form.tsx
@@ -31,8 +31,8 @@ export const AddWeb3WalletActionMenu = withCardStateProvider(() => {
 
       let web3Wallet = await user.createWeb3Wallet({ web3Wallet: identifier });
       web3Wallet = await web3Wallet.prepareVerification({ strategy });
-      const nonce = web3Wallet.verification.nonce as string;
-      const signature = await generateWeb3Signature({ identifier, nonce, provider });
+      const message = web3Wallet.verification.message as string;
+      const signature = await generateWeb3Signature({ identifier, nonce: message, provider });
       await web3Wallet.attemptVerification({ signature });
       card.setIdle();
     } catch (err) {
diff --git a/packages/clerk-js/src/ui/components/prefetch-organization-list.tsx b/packages/clerk-js/src/ui/components/prefetch-organization-list.tsx
new file mode 100644
index 00000000000..e7ca34f17c0
--- /dev/null
+++ b/packages/clerk-js/src/ui/components/prefetch-organization-list.tsx
@@ -0,0 +1,8 @@
+import { useOrganizationList } from '@clerk/shared/react';
+
+import { organizationListParams } from './OrganizationSwitcher/utils';
+
+export function OrganizationSwitcherPrefetch() {
+  useOrganizationList(organizationListParams);
+  return null;
+}
diff --git a/packages/clerk-js/src/ui/elements/PopoverCard.tsx b/packages/clerk-js/src/ui/elements/PopoverCard.tsx
index d3446c130e8..9bfe49ea425 100644
--- a/packages/clerk-js/src/ui/elements/PopoverCard.tsx
+++ b/packages/clerk-js/src/ui/elements/PopoverCard.tsx
@@ -3,27 +3,41 @@ import React from 'react';
 import { useEnvironment } from '../contexts';
 import { Col, descriptors, Flex, Flow, useAppearance } from '../customizables';
 import type { ElementDescriptor } from '../customizables/elementDescriptors';
-import type { PropsOfComponent } from '../styledSystem';
+import type { PropsOfComponent, ThemableCssProp } from '../styledSystem';
 import { animations, common } from '../styledSystem';
 import { colors } from '../utils';
 import { Card } from '.';
 
-const PopoverCardRoot = React.forwardRef<HTMLDivElement, PropsOfComponent<typeof Card.Content>>((props, ref) => {
-  const { elementDescriptor, ...rest } = props;
+const PopoverCardRoot = React.forwardRef<
+  HTMLDivElement,
+  PropsOfComponent<typeof Card.Content> & {
+    shouldEntryAnimate?: boolean;
+  }
+>((props, ref) => {
+  const { elementDescriptor, shouldEntryAnimate = true, ...rest } = props;
+
+  const withAnimation: ThemableCssProp = t => ({
+    animation: shouldEntryAnimate
+      ? `${animations.dropdownSlideInScaleAndFade} ${t.transitionDuration.$fast}`
+      : undefined,
+  });
+
   return (
     <Flow.Part part='popover'>
       <Card.Root
         elementDescriptor={[descriptors.popoverBox, elementDescriptor as ElementDescriptor]}
         {...rest}
         ref={ref}
-        sx={t => ({
-          width: t.sizes.$94,
-          maxWidth: `calc(100vw - ${t.sizes.$8})`,
-          zIndex: t.zIndices.$modal,
-          borderRadius: t.radii.$xl,
-          animation: `${animations.dropdownSlideInScaleAndFade} ${t.transitionDuration.$fast}`,
-          outline: 'none',
-        })}
+        sx={[
+          t => ({
+            width: t.sizes.$94,
+            maxWidth: `calc(100vw - ${t.sizes.$8})`,
+            zIndex: t.zIndices.$modal,
+            borderRadius: t.radii.$xl,
+            outline: 'none',
+          }),
+          withAnimation,
+        ]}
       >
         {props.children}
       </Card.Root>
diff --git a/packages/clerk-js/src/ui/lazyModules/providers.tsx b/packages/clerk-js/src/ui/lazyModules/providers.tsx
index 70c3dcf56e8..1439e17c8a2 100644
--- a/packages/clerk-js/src/ui/lazyModules/providers.tsx
+++ b/packages/clerk-js/src/ui/lazyModules/providers.tsx
@@ -16,6 +16,11 @@ const Portal = lazy(() => import('./../portal').then(m => ({ default: m.Portal }
 const VirtualBodyRootPortal = lazy(() => import('./../portal').then(m => ({ default: m.VirtualBodyRootPortal })));
 const FlowMetadataProvider = lazy(() => import('./../elements').then(m => ({ default: m.FlowMetadataProvider })));
 const Modal = lazy(() => import('./../elements').then(m => ({ default: m.Modal })));
+const OrganizationSwitcherPrefetch = lazy(() =>
+  import(/* webpackChunkName: "prefetchorganizationlist" */ '../components/prefetch-organization-list').then(m => ({
+    default: m.OrganizationSwitcherPrefetch,
+  })),
+);
 
 type LazyProvidersProps = React.PropsWithChildren<{ clerk: any; environment: any; options: any; children: any }>;
 
@@ -155,3 +160,5 @@ export const LazyOneTapRenderer = (props: LazyOneTapRendererProps) => {
     </AppearanceProvider>
   );
 };
+
+export { OrganizationSwitcherPrefetch };
diff --git a/packages/clerk-js/src/utils/web3.ts b/packages/clerk-js/src/utils/web3.ts
index a3cd9626c12..018c0901f6f 100644
--- a/packages/clerk-js/src/utils/web3.ts
+++ b/packages/clerk-js/src/utils/web3.ts
@@ -21,9 +21,7 @@ export async function getWeb3Identifier(params: GetWeb3IdentifierParams): Promis
   return (identifiers && identifiers[0]) || '';
 }
 
-type GenerateWeb3SignatureParams = {
-  identifier: string;
-  nonce: string;
+type GenerateWeb3SignatureParams = GenerateSignatureParams & {
   provider: Web3Provider;
 };
 
@@ -55,15 +53,12 @@ type GenerateSignatureParams = {
   nonce: string;
 };
 
-export async function generateSignatureWithMetamask({ identifier, nonce }: GenerateSignatureParams): Promise<string> {
-  return await generateWeb3Signature({ identifier, nonce, provider: 'metamask' });
+export async function generateSignatureWithMetamask(params: GenerateSignatureParams): Promise<string> {
+  return await generateWeb3Signature({ ...params, provider: 'metamask' });
 }
 
-export async function generateSignatureWithCoinbaseWallet({
-  identifier,
-  nonce,
-}: GenerateSignatureParams): Promise<string> {
-  return await generateWeb3Signature({ identifier, nonce, provider: 'coinbase_wallet' });
+export async function generateSignatureWithCoinbaseWallet(params: GenerateSignatureParams): Promise<string> {
+  return await generateWeb3Signature({ ...params, provider: 'coinbase_wallet' });
 }
 
 async function getEthereumProvider(provider: Web3Provider) {
diff --git a/packages/elements/CHANGELOG.md b/packages/elements/CHANGELOG.md
index 1e74d7722e3..281835eeb97 100644
--- a/packages/elements/CHANGELOG.md
+++ b/packages/elements/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @clerk/elements
 
+## 0.16.2
+
+### Patch Changes
+
+- Updated dependencies [[`e81d45b72`](https://github.com/clerk/javascript/commit/e81d45b72c81403c7c206dac5454de1fef6bec57), [`99cdf9b67`](https://github.com/clerk/javascript/commit/99cdf9b67d1e99e66cc73d8a5bfce1f1f8df1b83), [`ce40ff6f0`](https://github.com/clerk/javascript/commit/ce40ff6f0d3bc79e33375be6dd5e03f140a07000), [`2102052c0`](https://github.com/clerk/javascript/commit/2102052c017065ab511339870fcebaa6719f2702)]:
+  - @clerk/types@4.26.0
+
 ## 0.16.1
 
 ### Patch Changes
diff --git a/packages/elements/package.json b/packages/elements/package.json
index 92d36b46569..3898162fef3 100644
--- a/packages/elements/package.json
+++ b/packages/elements/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@clerk/elements",
-  "version": "0.16.1",
+  "version": "0.16.2",
   "description": "Clerk Elements",
   "keywords": [
     "clerk",
@@ -71,7 +71,7 @@
     "test:cache:clear": "jest --clearCache --useStderr"
   },
   "dependencies": {
-    "@clerk/types": "^4.25.1",
+    "@clerk/types": "^4.26.0",
     "@radix-ui/react-form": "^0.1.0",
     "@radix-ui/react-slot": "^1.1.0",
     "@xstate/react": "^4.1.1",
@@ -79,9 +79,9 @@
     "xstate": "^5.15.0"
   },
   "devDependencies": {
-    "@clerk/clerk-react": "5.11.1",
+    "@clerk/clerk-react": "5.12.0",
     "@clerk/eslint-config-custom": "*",
-    "@clerk/shared": "2.9.1",
+    "@clerk/shared": "2.9.2",
     "@statelyai/inspect": "^0.4.0",
     "@types/node": "^18.19.33",
     "@types/react": "*",
diff --git a/packages/expo/CHANGELOG.md b/packages/expo/CHANGELOG.md
index 9bda0161073..dd855e47af0 100644
--- a/packages/expo/CHANGELOG.md
+++ b/packages/expo/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Change Log
 
+## 2.2.26
+
+### Patch Changes
+
+- Updated dependencies [[`ce40ff6f0`](https://github.com/clerk/javascript/commit/ce40ff6f0d3bc79e33375be6dd5e03f140a07000), [`e81d45b72`](https://github.com/clerk/javascript/commit/e81d45b72c81403c7c206dac5454de1fef6bec57), [`752ce9bfa`](https://github.com/clerk/javascript/commit/752ce9bfa47a8eebd38cd272eeb58ae26fea3371), [`99cdf9b67`](https://github.com/clerk/javascript/commit/99cdf9b67d1e99e66cc73d8a5bfce1f1f8df1b83), [`48421febe`](https://github.com/clerk/javascript/commit/48421febe5feb85d8cf0706c3b150d3e8c545635), [`ce40ff6f0`](https://github.com/clerk/javascript/commit/ce40ff6f0d3bc79e33375be6dd5e03f140a07000), [`2102052c0`](https://github.com/clerk/javascript/commit/2102052c017065ab511339870fcebaa6719f2702)]:
+  - @clerk/clerk-react@5.12.0
+  - @clerk/clerk-js@5.27.0
+  - @clerk/types@4.26.0
+  - @clerk/shared@2.9.2
+
 ## 2.2.25
 
 ### Patch Changes
diff --git a/packages/expo/package.json b/packages/expo/package.json
index f3580fb7af0..7402030cd1c 100644
--- a/packages/expo/package.json
+++ b/packages/expo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@clerk/clerk-expo",
-  "version": "2.2.25",
+  "version": "2.2.26",
   "description": "Clerk React Native/Expo library",
   "keywords": [
     "react",
@@ -55,10 +55,10 @@
     "publish:local": "npx yalc push --replace  --sig"
   },
   "dependencies": {
-    "@clerk/clerk-js": "5.26.5",
-    "@clerk/clerk-react": "5.11.1",
-    "@clerk/shared": "2.9.1",
-    "@clerk/types": "4.25.1",
+    "@clerk/clerk-js": "5.27.0",
+    "@clerk/clerk-react": "5.12.0",
+    "@clerk/shared": "2.9.2",
+    "@clerk/types": "4.26.0",
     "base-64": "^1.0.0",
     "react-native-url-polyfill": "2.0.0",
     "tslib": "2.4.1"
diff --git a/packages/express/CHANGELOG.md b/packages/express/CHANGELOG.md
index d455bfb4631..c1da45193c2 100644
--- a/packages/express/CHANGELOG.md
+++ b/packages/express/CHANGELOG.md
@@ -1,5 +1,31 @@
 # Change Log
 
+## 1.3.1
+
+### Patch Changes
+
+- Updated dependencies [[`e1a26547a`](https://github.com/clerk/javascript/commit/e1a26547a9c65f4c79c2bbd4dc386ddf67c2fbee)]:
+  - @clerk/backend@1.14.1
+
+## 1.3.0
+
+### Minor Changes
+
+- Export [`authenticateRequest` method](https://clerk.com/docs/references/backend/authenticate-request) from `@clerk/express` (in case you want to go low-level and implement flows to your specific needs). You can use it like so: ([#4340](https://github.com/clerk/javascript/pull/4340)) by [@jescalan](https://github.com/jescalan)
+
+  ```ts
+  import { authenticateRequest } from "@clerk/express";
+  ```
+
+  This function is adapted to Express' Request wrapper and as such notably different to the exported function from `@clerk/backend`. If you need to use it, be sure to import from `@clerk/express`.
+
+### Patch Changes
+
+- Updated dependencies [[`e81d45b72`](https://github.com/clerk/javascript/commit/e81d45b72c81403c7c206dac5454de1fef6bec57), [`752ce9bfa`](https://github.com/clerk/javascript/commit/752ce9bfa47a8eebd38cd272eeb58ae26fea3371), [`99cdf9b67`](https://github.com/clerk/javascript/commit/99cdf9b67d1e99e66cc73d8a5bfce1f1f8df1b83), [`ce40ff6f0`](https://github.com/clerk/javascript/commit/ce40ff6f0d3bc79e33375be6dd5e03f140a07000), [`fb7ba1f34`](https://github.com/clerk/javascript/commit/fb7ba1f3485abdeac5e504cce6c2d84d3f3e4ffc), [`2102052c0`](https://github.com/clerk/javascript/commit/2102052c017065ab511339870fcebaa6719f2702)]:
+  - @clerk/types@4.26.0
+  - @clerk/shared@2.9.2
+  - @clerk/backend@1.14.0
+
 ## 1.2.3
 
 ### Patch Changes
diff --git a/packages/express/package.json b/packages/express/package.json
index 7fdc7ac4fbc..a2cfa6c95ad 100644
--- a/packages/express/package.json
+++ b/packages/express/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@clerk/express",
-  "version": "1.2.3",
+  "version": "1.3.1",
   "description": "Clerk server SDK for usage with Express",
   "keywords": [
     "clerk",
@@ -53,9 +53,9 @@
     "test:ci": "jest --maxWorkers=70%"
   },
   "dependencies": {
-    "@clerk/backend": "^1.13.10",
-    "@clerk/shared": "^2.9.1",
-    "@clerk/types": "4.25.1",
+    "@clerk/backend": "^1.14.1",
+    "@clerk/shared": "^2.9.2",
+    "@clerk/types": "4.26.0",
     "tslib": "2.4.1"
   },
   "devDependencies": {
diff --git a/packages/express/src/__tests__/__snapshots__/exports.test.ts.snap b/packages/express/src/__tests__/__snapshots__/exports.test.ts.snap
index 406f539783d..a25599d3afb 100644
--- a/packages/express/src/__tests__/__snapshots__/exports.test.ts.snap
+++ b/packages/express/src/__tests__/__snapshots__/exports.test.ts.snap
@@ -2,6 +2,7 @@
 
 exports[`module exports should not change unless explicitly set 1`] = `
 [
+  "authenticateRequest",
   "clerkClient",
   "clerkMiddleware",
   "createClerkClient",
diff --git a/packages/express/src/index.ts b/packages/express/src/index.ts
index 197bf2cd966..b64dc029cf4 100644
--- a/packages/express/src/index.ts
+++ b/packages/express/src/index.ts
@@ -6,3 +6,4 @@ export type { ExpressRequestWithAuth } from './types';
 export { clerkMiddleware } from './clerkMiddleware';
 export { getAuth } from './getAuth';
 export { requireAuth } from './requireAuth';
+export { authenticateRequest } from './authenticateRequest';
diff --git a/packages/fastify/CHANGELOG.md b/packages/fastify/CHANGELOG.md
index 4446622bf84..d9a5b05f6a5 100644
--- a/packages/fastify/CHANGELOG.md
+++ b/packages/fastify/CHANGELOG.md
@@ -1,5 +1,21 @@
 # Change Log
 
+## 2.0.3
+
+### Patch Changes
+
+- Updated dependencies [[`e1a26547a`](https://github.com/clerk/javascript/commit/e1a26547a9c65f4c79c2bbd4dc386ddf67c2fbee)]:
+  - @clerk/backend@1.14.1
+
+## 2.0.2
+
+### Patch Changes
+
+- Updated dependencies [[`e81d45b72`](https://github.com/clerk/javascript/commit/e81d45b72c81403c7c206dac5454de1fef6bec57), [`752ce9bfa`](https://github.com/clerk/javascript/commit/752ce9bfa47a8eebd38cd272eeb58ae26fea3371), [`99cdf9b67`](https://github.com/clerk/javascript/commit/99cdf9b67d1e99e66cc73d8a5bfce1f1f8df1b83), [`ce40ff6f0`](https://github.com/clerk/javascript/commit/ce40ff6f0d3bc79e33375be6dd5e03f140a07000), [`fb7ba1f34`](https://github.com/clerk/javascript/commit/fb7ba1f3485abdeac5e504cce6c2d84d3f3e4ffc), [`2102052c0`](https://github.com/clerk/javascript/commit/2102052c017065ab511339870fcebaa6719f2702)]:
+  - @clerk/types@4.26.0
+  - @clerk/shared@2.9.2
+  - @clerk/backend@1.14.0
+
 ## 2.0.1
 
 ### Patch Changes
diff --git a/packages/fastify/package.json b/packages/fastify/package.json
index 2c3d188a4c7..a75a5661dca 100644
--- a/packages/fastify/package.json
+++ b/packages/fastify/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@clerk/fastify",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "description": "Clerk SDK for Fastify",
   "keywords": [
     "auth",
@@ -40,9 +40,9 @@
     "test:cache:clear": "jest --clearCache --useStderr"
   },
   "dependencies": {
-    "@clerk/backend": "1.13.10",
-    "@clerk/shared": "2.9.1",
-    "@clerk/types": "4.25.1",
+    "@clerk/backend": "1.14.1",
+    "@clerk/shared": "2.9.2",
+    "@clerk/types": "4.26.0",
     "cookies": "0.8.0",
     "fastify-plugin": "^5.0.1"
   },
diff --git a/packages/localizations/CHANGELOG.md b/packages/localizations/CHANGELOG.md
index e2872a7bfe5..c1c7c4d1b87 100644
--- a/packages/localizations/CHANGELOG.md
+++ b/packages/localizations/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Change Log
 
+## 3.3.0
+
+### Minor Changes
+
+- The "Restricted access" screen has been improved for visual consistency and the ability to contact support. The displayed texts have been made more clear and the sign-in button has been moved to the bottom. ([#4335](https://github.com/clerk/javascript/pull/4335)) by [@nikospapcom](https://github.com/nikospapcom)
+
+### Patch Changes
+
+- Remove typos from pl-PL ([#4319](https://github.com/clerk/javascript/pull/4319)) by [@pmichalski98](https://github.com/pmichalski98)
+
+- Updated dependencies [[`e81d45b72`](https://github.com/clerk/javascript/commit/e81d45b72c81403c7c206dac5454de1fef6bec57), [`99cdf9b67`](https://github.com/clerk/javascript/commit/99cdf9b67d1e99e66cc73d8a5bfce1f1f8df1b83), [`ce40ff6f0`](https://github.com/clerk/javascript/commit/ce40ff6f0d3bc79e33375be6dd5e03f140a07000), [`2102052c0`](https://github.com/clerk/javascript/commit/2102052c017065ab511339870fcebaa6719f2702)]:
+  - @clerk/types@4.26.0
+
 ## 3.2.1
 
 ### Patch Changes
diff --git a/packages/localizations/package.json b/packages/localizations/package.json
index 7f43f1d3bfa..cafd767be16 100644
--- a/packages/localizations/package.json
+++ b/packages/localizations/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@clerk/localizations",
-  "version": "3.2.1",
+  "version": "3.3.0",
   "description": "Localizations for the Clerk components",
   "keywords": [
     "react",
@@ -100,7 +100,7 @@
     "lint": "eslint src/"
   },
   "dependencies": {
-    "@clerk/types": "4.25.1"
+    "@clerk/types": "4.26.0"
   },
   "devDependencies": {
     "@clerk/eslint-config-custom": "*",
diff --git a/packages/localizations/src/en-US.ts b/packages/localizations/src/en-US.ts
index b6f2342684a..7611951666d 100644
--- a/packages/localizations/src/en-US.ts
+++ b/packages/localizations/src/en-US.ts
@@ -509,9 +509,11 @@ export const enUS: LocalizationResource = {
       title: 'Create your account',
     },
     restrictedAccess: {
-      title: 'Restricted access',
-      subtitle: 'Access to this app is limited, and an invitation is required to sign up.',
-      actionLink: 'Back to sign in',
+      title: 'Access restricted',
+      subtitle: 'Sign ups are currently disabled. If you believe you should have access, please contact support.',
+      actionLink: 'Sign in',
+      actionText: 'Already have an account?',
+      blockButton__emailSupport: 'Email support',
     },
   },
   socialButtonsBlockButton: 'Continue with {{provider|titleize}}',
diff --git a/packages/nextjs/CHANGELOG.md b/packages/nextjs/CHANGELOG.md
index 5b469e59ddc..e0efc0748b3 100644
--- a/packages/nextjs/CHANGELOG.md
+++ b/packages/nextjs/CHANGELOG.md
@@ -1,5 +1,22 @@
 # Change Log
 
+## 5.7.5
+
+### Patch Changes
+
+- Updated dependencies [[`e1a26547a`](https://github.com/clerk/javascript/commit/e1a26547a9c65f4c79c2bbd4dc386ddf67c2fbee)]:
+  - @clerk/backend@1.14.1
+
+## 5.7.4
+
+### Patch Changes
+
+- Updated dependencies [[`ce40ff6f0`](https://github.com/clerk/javascript/commit/ce40ff6f0d3bc79e33375be6dd5e03f140a07000), [`e81d45b72`](https://github.com/clerk/javascript/commit/e81d45b72c81403c7c206dac5454de1fef6bec57), [`752ce9bfa`](https://github.com/clerk/javascript/commit/752ce9bfa47a8eebd38cd272eeb58ae26fea3371), [`99cdf9b67`](https://github.com/clerk/javascript/commit/99cdf9b67d1e99e66cc73d8a5bfce1f1f8df1b83), [`ce40ff6f0`](https://github.com/clerk/javascript/commit/ce40ff6f0d3bc79e33375be6dd5e03f140a07000), [`fb7ba1f34`](https://github.com/clerk/javascript/commit/fb7ba1f3485abdeac5e504cce6c2d84d3f3e4ffc), [`2102052c0`](https://github.com/clerk/javascript/commit/2102052c017065ab511339870fcebaa6719f2702)]:
+  - @clerk/clerk-react@5.12.0
+  - @clerk/types@4.26.0
+  - @clerk/shared@2.9.2
+  - @clerk/backend@1.14.0
+
 ## 5.7.3
 
 ### Patch Changes
diff --git a/packages/nextjs/MIGRATION.md b/packages/nextjs/MIGRATION.md
new file mode 100644
index 00000000000..37202c96880
--- /dev/null
+++ b/packages/nextjs/MIGRATION.md
@@ -0,0 +1,84 @@
+# Migration guide
+
+The upcoming major version of `@clerk/nextjs` includes several breaking changes to public SDK methods. Here is the summary of the breaking changes and how to address them in your own codebase.
+
+## `auth()` is now async
+
+Previously the `auth()` method from `@clerk/nextjs/server` was synchronous.
+
+```typescript
+import { auth } from '@clerk/nextjs/server';
+
+export function GET() {
+  const { userId } = auth();
+  return new Response(JSON.stringify({ userId }));
+}
+```
+
+The `auth`method now becomes asynchronous. You will need to make the following changes to the snippet above to make it compatible.
+
+```diff
+- export function GET() {
++ export async function GET() {
+-   const { userId } = auth();
++   const { userId } = await auth();
+  return new Response(JSON.stringify({ userId }));
+}
+```
+
+## Clerk middleware auth is now async
+
+```typescript
+import { clerkClient, clerkMiddleware } from '@clerk/nextjs/server';
+import { NextResponse } from 'next/server';
+
+export default clerkMiddleware(async (auth, request) => {
+  const resolvedAuth = await auth();
+
+  const count = await resolvedAuth.users.getCount();
+
+  if (count) {
+    return NextResponse.redirect(new URL('/new-url', request.url));
+  }
+});
+
+export const config = {
+  matcher: [...],
+};
+```
+
+## clerkClient() is now async
+
+Previously the `clerkClient()` method from `@clerk/nextjs/server` was synchronous.
+
+```typescript
+import { clerkClient, clerkMiddleware } from '@clerk/nextjs/server';
+import { NextResponse } from 'next/server';
+
+export default clerkMiddleware((auth, request) => {
+  const client = clerkClient();
+
+  const count = await client.users?.getCount();
+
+  if (count) {
+    return NextResponse.redirect(new URL('/new-url', request.url));
+  }
+});
+
+export const config = {
+  matcher: [...],
+};
+```
+
+The method now becomes async. You will need to make the following changes to the snippet above to make it compatible.
+
+```diff
+- export default clerkMiddleware((auth, request) => {
+- const client = clerkClient();
++ export default clerkMiddleware(async (auth, request) => {
++ const client = await clerkClient();
+  const count = await client.users?.getCount();
+
+  if (count) {
+}
+```
diff --git a/packages/nextjs/package.json b/packages/nextjs/package.json
index 9a260b0c6df..16f094533ea 100644
--- a/packages/nextjs/package.json
+++ b/packages/nextjs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@clerk/nextjs",
-  "version": "5.7.3",
+  "version": "5.7.5",
   "description": "Clerk SDK for NextJS",
   "keywords": [
     "clerk",
@@ -67,10 +67,10 @@
     "test:ci": "jest --maxWorkers=70%"
   },
   "dependencies": {
-    "@clerk/backend": "1.13.10",
-    "@clerk/clerk-react": "5.11.1",
-    "@clerk/shared": "2.9.1",
-    "@clerk/types": "4.25.1",
+    "@clerk/backend": "1.14.1",
+    "@clerk/clerk-react": "5.12.0",
+    "@clerk/shared": "2.9.2",
+    "@clerk/types": "4.26.0",
     "crypto-js": "4.2.0",
     "server-only": "0.0.1",
     "tslib": "2.4.1"
diff --git a/packages/nextjs/src/app-router/server/ClerkProvider.tsx b/packages/nextjs/src/app-router/server/ClerkProvider.tsx
index 1e7060926ab..f6bfb123038 100644
--- a/packages/nextjs/src/app-router/server/ClerkProvider.tsx
+++ b/packages/nextjs/src/app-router/server/ClerkProvider.tsx
@@ -8,10 +8,12 @@ import { ClientClerkProvider } from '../client/ClerkProvider';
 import { initialState } from './auth';
 import { getScriptNonceFromHeader } from './utils';
 
-export function ClerkProvider(props: Without<NextClerkProviderProps, '__unstable_invokeMiddlewareOnAuthStateChange'>) {
+export async function ClerkProvider(
+  props: Without<NextClerkProviderProps, '__unstable_invokeMiddlewareOnAuthStateChange'>,
+) {
   const { children, ...rest } = props;
-  const state = initialState()?.__clerk_ssr_state as InitialState;
-  const cspHeader = headers().get('Content-Security-Policy');
+  const state = (await initialState())?.__clerk_ssr_state as InitialState;
+  const cspHeader = await headers().get('Content-Security-Policy');
 
   return (
     <ClientClerkProvider
diff --git a/packages/nextjs/src/app-router/server/auth.ts b/packages/nextjs/src/app-router/server/auth.ts
index 4db3d4bf2d1..70279323dda 100644
--- a/packages/nextjs/src/app-router/server/auth.ts
+++ b/packages/nextjs/src/app-router/server/auth.ts
@@ -1,23 +1,21 @@
 import type { AuthObject } from '@clerk/backend';
-import type { RedirectFun } from '@clerk/backend/internal';
-import { constants, createClerkRequest, createRedirect } from '@clerk/backend/internal';
+import { constants, createClerkRequest, createRedirect, type RedirectFun } from '@clerk/backend/internal';
 import { notFound, redirect } from 'next/navigation';
 
 import { buildClerkProps } from '../../server/buildClerkProps';
 import { PUBLISHABLE_KEY, SIGN_IN_URL, SIGN_UP_URL } from '../../server/constants';
 import { createGetAuth } from '../../server/createGetAuth';
 import { authAuthHeaderMissing } from '../../server/errors';
-import type { AuthProtect } from '../../server/protect';
 import { createProtect } from '../../server/protect';
 import { decryptClerkRequestData, getAuthKeyFromRequest, getHeader } from '../../server/utils';
 import { buildRequestLike } from './utils';
 
-type Auth = AuthObject & { protect: AuthProtect; redirectToSignIn: RedirectFun<ReturnType<typeof redirect>> };
+type Auth = AuthObject & { redirectToSignIn: RedirectFun<ReturnType<typeof redirect>> };
 
-export const auth = (): Auth => {
+export async function auth(): Promise<Auth> {
   require('server-only');
 
-  const request = buildRequestLike();
+  const request = await buildRequestLike();
   const authObject = createGetAuth({
     debugLoggerName: 'auth()',
     noAuthStatusMessage: authAuthHeaderMissing(),
@@ -46,11 +44,25 @@ export const auth = (): Auth => {
     });
   };
 
-  const protect = createProtect({ request, authObject, redirectToSignIn, notFound, redirect });
+  return Object.assign(authObject, { redirectToSignIn });
+}
 
-  return Object.assign(authObject, { protect, redirectToSignIn });
-};
+auth.protect = async (...args: any[]) => {
+  require('server-only');
 
-export const initialState = () => {
-  return buildClerkProps(buildRequestLike());
+  const request = await buildRequestLike();
+  const authObject = await auth();
+
+  const protect = createProtect({
+    request,
+    authObject,
+    redirectToSignIn: authObject.redirectToSignIn,
+    notFound,
+    redirect,
+  });
+  return protect(...args);
 };
+
+export async function initialState() {
+  return buildClerkProps(await buildRequestLike());
+}
diff --git a/packages/nextjs/src/app-router/server/controlComponents.tsx b/packages/nextjs/src/app-router/server/controlComponents.tsx
index 4618efd8218..12ff7812480 100644
--- a/packages/nextjs/src/app-router/server/controlComponents.tsx
+++ b/packages/nextjs/src/app-router/server/controlComponents.tsx
@@ -3,15 +3,15 @@ import React from 'react';
 
 import { auth } from './auth';
 
-export function SignedIn(props: React.PropsWithChildren): React.JSX.Element | null {
+export async function SignedIn(props: React.PropsWithChildren): Promise<React.JSX.Element | null> {
   const { children } = props;
-  const { userId } = auth();
+  const { userId } = await auth();
   return userId ? <>{children}</> : null;
 }
 
-export function SignedOut(props: React.PropsWithChildren): React.JSX.Element | null {
+export async function SignedOut(props: React.PropsWithChildren): Promise<React.JSX.Element | null> {
   const { children } = props;
-  const { userId } = auth();
+  const { userId } = await auth();
   return userId ? null : <>{children}</>;
 }
 
@@ -27,9 +27,9 @@ export function SignedOut(props: React.PropsWithChildren): React.JSX.Element | n
  * <Protect fallback={<p>Unauthorized</p>} />
  * ```
  */
-export function Protect(props: ProtectProps): React.JSX.Element | null {
+export async function Protect(props: ProtectProps): Promise<React.JSX.Element | null> {
   const { children, fallback, ...restAuthorizedParams } = props;
-  const { has, userId } = auth();
+  const { has, userId } = await auth();
 
   /**
    * Fallback to UI provided by user or `null` if authorization checks failed
@@ -46,17 +46,11 @@ export function Protect(props: ProtectProps): React.JSX.Element | null {
    * Check against the results of `has` called inside the callback
    */
   if (typeof restAuthorizedParams.condition === 'function') {
-    if (restAuthorizedParams.condition(has)) {
-      return authorized;
-    }
-    return unauthorized;
+    return restAuthorizedParams.condition(has) ? authorized : unauthorized;
   }
 
   if (restAuthorizedParams.role || restAuthorizedParams.permission) {
-    if (has(restAuthorizedParams)) {
-      return authorized;
-    }
-    return unauthorized;
+    return has(restAuthorizedParams) ? authorized : unauthorized;
   }
 
   /**
diff --git a/packages/nextjs/src/app-router/server/currentUser.ts b/packages/nextjs/src/app-router/server/currentUser.ts
index 336fd655658..e76e8cce9ad 100644
--- a/packages/nextjs/src/app-router/server/currentUser.ts
+++ b/packages/nextjs/src/app-router/server/currentUser.ts
@@ -6,10 +6,12 @@ import { auth } from './auth';
 export async function currentUser(): Promise<User | null> {
   require('server-only');
 
-  const { userId } = auth();
+  const { userId } = await auth();
   if (!userId) {
     return null;
   }
 
-  return clerkClient().users.getUser(userId);
+  const resolvedClerkClient = await clerkClient();
+
+  return resolvedClerkClient.users.getUser(userId);
 }
diff --git a/packages/nextjs/src/app-router/server/utils.ts b/packages/nextjs/src/app-router/server/utils.ts
index 513e84f5745..d831c4fdaaa 100644
--- a/packages/nextjs/src/app-router/server/utils.ts
+++ b/packages/nextjs/src/app-router/server/utils.ts
@@ -19,13 +19,13 @@ export const isPrerenderingBailout = (e: unknown) => {
   return routeRegex.test(message) || dynamicServerUsage || bailOutPrerendering;
 };
 
-export const buildRequestLike = () => {
+export async function buildRequestLike() {
   try {
     // Dynamically import next/headers, otherwise Next12 apps will break
-    // because next/headers was introduced in next@13
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    const { headers } = require('next/headers');
-    return new NextRequest('https://placeholder.com', { headers: headers() });
+    // @ts-ignore: Cannot find module 'next/headers' or its corresponding type declarations.ts(2307)
+    const { headers } = await import('next/headers');
+    const resolvedHeaders = await headers();
+    return new NextRequest('https://placeholder.com', { headers: resolvedHeaders });
   } catch (e: any) {
     // rethrow the error when react throws a prerendering bailout
     // https://nextjs.org/docs/messages/ppr-caught-error
@@ -37,7 +37,7 @@ export const buildRequestLike = () => {
       `Clerk: auth() and currentUser() are only supported in App Router (/app directory).\nIf you're using /pages, try getAuth() instead.\nOriginal error: ${e}`,
     );
   }
-};
+}
 
 // Original source: https://github.com/vercel/next.js/blob/canary/packages/next/src/server/app-render/get-script-nonce-from-header.tsx
 export function getScriptNonceFromHeader(cspHeaderValue: string): string | undefined {
diff --git a/packages/nextjs/src/server/__tests__/clerkClient.test.ts b/packages/nextjs/src/server/__tests__/clerkClient.test.ts
index 58b6e883ddd..d41af5a6ad0 100644
--- a/packages/nextjs/src/server/__tests__/clerkClient.test.ts
+++ b/packages/nextjs/src/server/__tests__/clerkClient.test.ts
@@ -4,7 +4,9 @@ import { clerkClient } from '../clerkClient';
 
 describe('clerkClient', () => {
   it('should pass version package to userAgent', async () => {
-    await clerkClient().users.getUser('user_test');
+    const resolvedClerkClient = await clerkClient();
+
+    await resolvedClerkClient.users.getUser('user_test');
 
     expect(global.fetch).toBeCalled();
     expect((global.fetch as any).mock.calls[0][1].headers).toMatchObject({
diff --git a/packages/nextjs/src/server/__tests__/clerkMiddleware.test.ts b/packages/nextjs/src/server/__tests__/clerkMiddleware.test.ts
index ea116a664db..5e706b3fb50 100644
--- a/packages/nextjs/src/server/__tests__/clerkMiddleware.test.ts
+++ b/packages/nextjs/src/server/__tests__/clerkMiddleware.test.ts
@@ -267,7 +267,7 @@ describe('clerkMiddleware(params)', () => {
 
       expect(resp?.status).toEqual(307);
       expect(resp?.headers.get('location')).toContain('sign-in');
-      expect(clerkClient().authenticateRequest).toBeCalled();
+      expect((await clerkClient()).authenticateRequest).toBeCalled();
     });
 
     it('redirects to sign-in url when redirectToSignIn is called with the correct returnBackUrl', async () => {
@@ -284,7 +284,7 @@ describe('clerkMiddleware(params)', () => {
       expect(resp?.status).toEqual(307);
       expect(resp?.headers.get('location')).toContain('sign-in');
       expect(new URL(resp!.headers.get('location')!).searchParams.get('redirect_url')).toContain('/protected');
-      expect(clerkClient().authenticateRequest).toBeCalled();
+      expect((await clerkClient()).authenticateRequest).toBeCalled();
     });
 
     it('redirects to sign-in url with redirect_url set to the  provided returnBackUrl param', async () => {
@@ -303,7 +303,7 @@ describe('clerkMiddleware(params)', () => {
       expect(new URL(resp!.headers.get('location')!).searchParams.get('redirect_url')).toEqual(
         'https://www.clerk.com/hello',
       );
-      expect(clerkClient().authenticateRequest).toBeCalled();
+      expect((await clerkClient()).authenticateRequest).toBeCalled();
     });
 
     it('redirects to sign-in url without a redirect_url when returnBackUrl is null', async () => {
@@ -320,7 +320,7 @@ describe('clerkMiddleware(params)', () => {
       expect(resp?.status).toEqual(307);
       expect(resp?.headers.get('location')).toContain('sign-in');
       expect(new URL(resp!.headers.get('location')!).searchParams.get('redirect_url')).toBeNull();
-      expect(clerkClient().authenticateRequest).toBeCalled();
+      expect((await clerkClient()).authenticateRequest).toBeCalled();
     });
   });
 
@@ -345,7 +345,7 @@ describe('clerkMiddleware(params)', () => {
 
       expect(resp?.status).toEqual(307);
       expect(resp?.headers.get('location')).toContain('sign-in');
-      expect(clerkClient().authenticateRequest).toBeCalled();
+      expect((await clerkClient()).authenticateRequest).toBeCalled();
     });
 
     it('does not redirect to sign-in url when protect is called, the user is signed in and the request is a page request', async () => {
@@ -368,7 +368,7 @@ describe('clerkMiddleware(params)', () => {
 
       expect(resp?.status).toEqual(200);
       expect(resp?.headers.get('location')).toBeFalsy();
-      expect(clerkClient().authenticateRequest).toBeCalled();
+      expect((await clerkClient()).authenticateRequest).toBeCalled();
     });
 
     it('throws a not found error when protect is called, the user is signed out, and is not a page request', async () => {
@@ -391,7 +391,7 @@ describe('clerkMiddleware(params)', () => {
 
       expect(resp?.status).toEqual(200);
       expect(resp?.headers.get(constants.Headers.AuthReason)).toContain('protect-rewrite');
-      expect(clerkClient().authenticateRequest).toBeCalled();
+      expect((await clerkClient()).authenticateRequest).toBeCalled();
     });
 
     it('throws a not found error when protect is called with RBAC params the user does not fulfill, and is a page request', async () => {
@@ -414,7 +414,7 @@ describe('clerkMiddleware(params)', () => {
 
       expect(resp?.status).toEqual(200);
       expect(resp?.headers.get(constants.Headers.AuthReason)).toContain('protect-rewrite');
-      expect(clerkClient().authenticateRequest).toBeCalled();
+      expect((await clerkClient()).authenticateRequest).toBeCalled();
     });
 
     it('redirects to unauthenticatedUrl when protect is called with the redirectUrl param, the user is signed out, and is a page request', async () => {
@@ -438,7 +438,7 @@ describe('clerkMiddleware(params)', () => {
       expect(resp?.status).toEqual(307);
       expect(resp?.headers.get('location')).toEqual('https://www.clerk.com/hello');
       expect(resp?.headers.get(constants.Headers.ClerkRedirectTo)).toEqual('true');
-      expect(clerkClient().authenticateRequest).toBeCalled();
+      expect(await (await clerkClient()).authenticateRequest).toBeCalled();
     });
 
     it('redirects to unauthorizedUrl when protect is called with the redirectUrl param, the user does not fulfill the RBAC params, and is a page request', async () => {
@@ -468,7 +468,7 @@ describe('clerkMiddleware(params)', () => {
       expect(resp?.status).toEqual(307);
       expect(resp?.headers.get('location')).toEqual('https://www.clerk.com/discover');
       expect(resp?.headers.get(constants.Headers.ClerkRedirectTo)).toEqual('true');
-      expect(clerkClient().authenticateRequest).toBeCalled();
+      expect((await clerkClient()).authenticateRequest).toBeCalled();
     });
   });
 
@@ -493,7 +493,7 @@ describe('clerkMiddleware(params)', () => {
 
       expect(resp?.status).toEqual(307);
       expect(resp?.headers.get('location')).toContain('sign-in');
-      expect(clerkClient().authenticateRequest).toBeCalled();
+      expect((await clerkClient()).authenticateRequest).toBeCalled();
     });
 
     it('forwards headers from authenticateRequest when auth().protect() is called', async () => {
@@ -521,7 +521,7 @@ describe('clerkMiddleware(params)', () => {
       expect(resp?.headers.get('X-Clerk-Auth')).toEqual('1');
       expect(resp?.headers.get('Set-Cookie')).toEqual('session=;');
       expect(resp?.headers.get('location')).toContain('sign-in');
-      expect(clerkClient().authenticateRequest).toBeCalled();
+      expect((await clerkClient()).authenticateRequest).toBeCalled();
     });
 
     it('redirects to unauthenticatedUrl when protect is called with the unauthenticatedUrl param, the user is signed out, and is a page request', async () => {
@@ -548,7 +548,7 @@ describe('clerkMiddleware(params)', () => {
       expect(resp?.status).toEqual(307);
       expect(resp?.headers.get('location')).toContain('https://www.clerk.com/unauthenticatedUrl');
       expect(resp?.headers.get(constants.Headers.ClerkRedirectTo)).toEqual('true');
-      expect(clerkClient().authenticateRequest).toBeCalled();
+      expect((await clerkClient()).authenticateRequest).toBeCalled();
     });
 
     it('redirects to unauthorizedUrl when protect is called with the unauthorizedUrl param, the user is signed in but does not have permissions, and is a page request', async () => {
@@ -578,7 +578,7 @@ describe('clerkMiddleware(params)', () => {
       expect(resp?.status).toEqual(307);
       expect(resp?.headers.get('location')).toContain('https://www.clerk.com/unauthorizedUrl');
       expect(resp?.headers.get(constants.Headers.ClerkRedirectTo)).toEqual('true');
-      expect(clerkClient().authenticateRequest).toBeCalled();
+      expect((await clerkClient()).authenticateRequest).toBeCalled();
     });
   });
 
@@ -632,7 +632,7 @@ describe('Dev Browser JWT when redirecting to cross origin for page requests', f
     expect(resp?.headers.get('location')).toEqual(
       'https://accounts.included.katydid-92.lcl.dev/sign-in?redirect_url=https%3A%2F%2Fwww.clerk.com%2Fprotected',
     );
-    expect(clerkClient().authenticateRequest).toBeCalled();
+    expect((await clerkClient()).authenticateRequest).toBeCalled();
   });
 
   it('appends the Dev Browser JWT to the search when cookie __clerk_db_jwt exists and location is an Account Portal URL', async () => {
@@ -649,14 +649,15 @@ describe('Dev Browser JWT when redirecting to cross origin for page requests', f
       toAuth: () => ({ userId: null }),
     });
 
-    const resp = await clerkMiddleware(auth => {
+    const resp = await clerkMiddleware(async auth => {
       auth().protect();
     })(req, {} as NextFetchEvent);
+
     expect(resp?.status).toEqual(307);
     expect(resp?.headers.get('location')).toEqual(
       'https://accounts.included.katydid-92.lcl.dev/sign-in?redirect_url=https%3A%2F%2Fwww.clerk.com%2Fprotected&__clerk_db_jwt=test_jwt',
     );
-    expect(clerkClient().authenticateRequest).toBeCalled();
+    expect((await clerkClient()).authenticateRequest).toBeCalled();
   });
 
   it('does NOT append the Dev Browser JWT if x-clerk-redirect-to header is not set (user-returned redirect)', async () => {
@@ -678,10 +679,11 @@ describe('Dev Browser JWT when redirecting to cross origin for page requests', f
         'https://accounts.included.katydid-92.lcl.dev/sign-in?redirect_url=https%3A%2F%2Fwww.clerk.com%2Fprotected',
       );
     })(req, {} as NextFetchEvent);
+
     expect(resp?.status).toEqual(307);
     expect(resp?.headers.get('location')).toEqual(
       'https://accounts.included.katydid-92.lcl.dev/sign-in?redirect_url=https%3A%2F%2Fwww.clerk.com%2Fprotected',
     );
-    expect(clerkClient().authenticateRequest).toBeCalled();
+    expect((await clerkClient()).authenticateRequest).toBeCalled();
   });
 });
diff --git a/packages/nextjs/src/server/clerkClient.ts b/packages/nextjs/src/server/clerkClient.ts
index 84d3ba236af..015a2581310 100644
--- a/packages/nextjs/src/server/clerkClient.ts
+++ b/packages/nextjs/src/server/clerkClient.ts
@@ -48,11 +48,11 @@ const clerkClientSingleton = createClerkClient(clerkClientDefaultOptions);
  * Constructs a BAPI client that accesses request data within the runtime.
  * Necessary if middleware dynamic keys are used.
  */
-const clerkClientForRequest = () => {
+const clerkClientForRequest = async () => {
   let requestData;
 
   try {
-    const request = buildRequestLike();
+    const request = await buildRequestLike();
     const encryptedRequestData = getHeader(request, constants.Headers.ClerkRequestData);
     requestData = decryptClerkRequestData(encryptedRequestData);
   } catch (err) {
@@ -71,16 +71,14 @@ const clerkClientForRequest = () => {
 };
 
 interface ClerkClientExport extends ClerkClient {
-  (): ClerkClient;
+  (): Promise<ClerkClient>;
 }
 
 // TODO SDK-1839 - Remove `clerkClient` singleton in the next major version of `@clerk/nextjs`
-const clerkClient = new Proxy(Object.assign(clerkClientForRequest, clerkClientSingleton), {
+export const clerkClient = new Proxy(Object.assign(clerkClientForRequest, clerkClientSingleton), {
   get(target, prop: string, receiver) {
     deprecated('clerkClient singleton', 'Use `clerkClient()` as a function instead.');
 
     return Reflect.get(target, prop, receiver);
   },
 }) as ClerkClientExport;
-
-export { clerkClient };
diff --git a/packages/nextjs/src/server/clerkMiddleware.ts b/packages/nextjs/src/server/clerkMiddleware.ts
index 592064c8a34..54923f08dd3 100644
--- a/packages/nextjs/src/server/clerkMiddleware.ts
+++ b/packages/nextjs/src/server/clerkMiddleware.ts
@@ -76,7 +76,8 @@ interface ClerkMiddleware {
 const clerkMiddlewareRequestDataStore = new Map<'requestData', AuthenticateRequestOptions>();
 export const clerkMiddlewareRequestDataStorage = new AsyncLocalStorage<typeof clerkMiddlewareRequestDataStore>();
 
-export const clerkMiddleware: ClerkMiddleware = (...args: unknown[]): any => {
+// @ts-expect-error TS is not happy here. Will dig into it
+export const clerkMiddleware: ClerkMiddleware = (...args: unknown[]) => {
   const [request, event] = parseRequestAndEvent(args);
   const [handler, params] = parseHandlerAndOptions(args);
 
@@ -105,7 +106,9 @@ export const clerkMiddleware: ClerkMiddleware = (...args: unknown[]): any => {
       // Propagates the request data to be accessed on the server application runtime from helpers such as `clerkClient`
       clerkMiddlewareRequestDataStore.set('requestData', options);
 
-      clerkClient().telemetry.record(
+      const resolvedClerkClient = await clerkClient();
+
+      resolvedClerkClient.telemetry.record(
         eventMethodCalled('clerkMiddleware', {
           handler: Boolean(handler),
           satellite: Boolean(options.isSatellite),
@@ -120,7 +123,7 @@ export const clerkMiddleware: ClerkMiddleware = (...args: unknown[]): any => {
       logger.debug('options', options);
       logger.debug('url', () => clerkRequest.toJSON());
 
-      const requestState = await clerkClient().authenticateRequest(
+      const requestState = await resolvedClerkClient.authenticateRequest(
         clerkRequest,
         createAuthenticateRequestOptions(clerkRequest, options),
       );
diff --git a/packages/react/CHANGELOG.md b/packages/react/CHANGELOG.md
index 2b5f6d02e6f..89b38291c04 100644
--- a/packages/react/CHANGELOG.md
+++ b/packages/react/CHANGELOG.md
@@ -1,5 +1,43 @@
 # Change Log
 
+## 5.12.0
+
+### Minor Changes
+
+- Introducing experimental `asProvider`, `asStandalone`, and `<X.Outlet />` for `<UserButton />` and `<OrganizationSwitcher />` components. ([#4042](https://github.com/clerk/javascript/pull/4042)) by [@panteliselef](https://github.com/panteliselef)
+
+  - `asProvider` converts `<UserButton />` and `<OrganizationSwitcher />` to a provider that defers rendering until `<Outlet />` is mounted.
+  - `<Outlet />` also accepts a `asStandalone` prop. It will skip the trigger of these components and display only the UI which was previously inside the popover. This allows developers to create their own triggers.
+
+  Example usage:
+
+  ```tsx
+  <UserButton __experimental_asProvider afterSignOutUrl="/">
+    <UserButton.UserProfilePage label="Custom Page" url="/custom-page">
+      <h1> This is my page available to all children </h1>
+    </UserButton.UserProfilePage>
+    <UserButton.__experimental_Outlet __experimental_asStandalone />
+  </UserButton>
+  ```
+
+  ```tsx
+  <OrganizationSwitcher __experimental_asProvider afterSignOutUrl="/">
+    <OrganizationSwitcher.OrganizationProfilePage
+      label="Custom Page"
+      url="/custom-page"
+    >
+      <h1> This is my page available to all children </h1>
+    </OrganizationSwitcher.OrganizationProfilePage>
+    <OrganizationSwitcher.__experimental_Outlet __experimental_asStandalone />
+  </OrganizationSwitcher>
+  ```
+
+### Patch Changes
+
+- Updated dependencies [[`e81d45b72`](https://github.com/clerk/javascript/commit/e81d45b72c81403c7c206dac5454de1fef6bec57), [`752ce9bfa`](https://github.com/clerk/javascript/commit/752ce9bfa47a8eebd38cd272eeb58ae26fea3371), [`99cdf9b67`](https://github.com/clerk/javascript/commit/99cdf9b67d1e99e66cc73d8a5bfce1f1f8df1b83), [`ce40ff6f0`](https://github.com/clerk/javascript/commit/ce40ff6f0d3bc79e33375be6dd5e03f140a07000), [`2102052c0`](https://github.com/clerk/javascript/commit/2102052c017065ab511339870fcebaa6719f2702)]:
+  - @clerk/types@4.26.0
+  - @clerk/shared@2.9.2
+
 ## 5.11.1
 
 ### Patch Changes
diff --git a/packages/react/package.json b/packages/react/package.json
index 4272a625423..36a201936aa 100644
--- a/packages/react/package.json
+++ b/packages/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@clerk/clerk-react",
-  "version": "5.11.1",
+  "version": "5.12.0",
   "description": "Clerk React library",
   "keywords": [
     "clerk",
@@ -76,13 +76,13 @@
     "test:ci": "jest --maxWorkers=70%"
   },
   "dependencies": {
-    "@clerk/shared": "2.9.1",
-    "@clerk/types": "4.25.1",
+    "@clerk/shared": "2.9.2",
+    "@clerk/types": "4.26.0",
     "tslib": "2.4.1"
   },
   "devDependencies": {
     "@clerk/eslint-config-custom": "*",
-    "@clerk/themes": "2.1.36",
+    "@clerk/themes": "2.1.37",
     "@types/node": "^18.19.33",
     "@types/react": "*",
     "@types/react-dom": "*",
diff --git a/packages/react/src/components/uiComponents.tsx b/packages/react/src/components/uiComponents.tsx
index 919ec0d1736..d4c589ced15 100644
--- a/packages/react/src/components/uiComponents.tsx
+++ b/packages/react/src/components/uiComponents.tsx
@@ -13,7 +13,7 @@ import type {
   Without,
 } from '@clerk/types';
 import type { PropsWithChildren } from 'react';
-import React, { createElement } from 'react';
+import React, { createContext, createElement, useContext } from 'react';
 
 import {
   organizationProfileLinkRenderedError,
@@ -25,6 +25,7 @@ import {
   userProfilePageRenderedError,
 } from '../errors/messages';
 import type {
+  CustomPortalsRendererProps,
   MountProps,
   OpenProps,
   OrganizationProfileLinkProps,
@@ -35,7 +36,12 @@ import type {
   UserProfilePageProps,
   WithClerkProp,
 } from '../types';
-import { useOrganizationProfileCustomPages, useUserButtonCustomMenuItems, useUserProfileCustomPages } from '../utils';
+import {
+  useOrganizationProfileCustomPages,
+  useSanitizedChildren,
+  useUserButtonCustomMenuItems,
+  useUserProfileCustomPages,
+} from '../utils';
 import { withClerk } from './withClerk';
 
 type UserProfileExportType = typeof _UserProfile & {
@@ -49,10 +55,26 @@ type UserButtonExportType = typeof _UserButton & {
   MenuItems: typeof MenuItems;
   Action: typeof MenuAction;
   Link: typeof MenuLink;
+  /**
+   * The `<Outlet />` component can be used in conjunction with `asProvider` in order to control rendering
+   * of the `<OrganizationSwitcher />` without affecting its configuration or any custom pages
+   * that could be mounted
+   * @experimental This API is experimental and may change at any moment.
+   */
+  __experimental_Outlet: typeof UserButtonOutlet;
 };
 
-type UserButtonPropsWithoutCustomPages = Without<UserButtonProps, 'userProfileProps'> & {
+type UserButtonPropsWithoutCustomPages = Without<
+  UserButtonProps,
+  'userProfileProps' | '__experimental_asStandalone'
+> & {
   userProfileProps?: Pick<UserProfileProps, 'additionalOAuthScopes' | 'appearance'>;
+  /**
+   * Adding `asProvider` will defer rendering until the `<Outlet />` component is mounted.
+   * @experimental This API is experimental and may change at any moment.
+   * @default undefined
+   */
+  __experimental_asProvider?: boolean;
 };
 
 type OrganizationProfileExportType = typeof _OrganizationProfile & {
@@ -63,10 +85,34 @@ type OrganizationProfileExportType = typeof _OrganizationProfile & {
 type OrganizationSwitcherExportType = typeof _OrganizationSwitcher & {
   OrganizationProfilePage: typeof OrganizationProfilePage;
   OrganizationProfileLink: typeof OrganizationProfileLink;
+  /**
+   * The `<Outlet />` component can be used in conjunction with `asProvider` in order to control rendering
+   * of the `<OrganizationSwitcher />` without affecting its configuration or any custom pages
+   * that could be mounted
+   * @experimental This API is experimental and may change at any moment.
+   */
+  __experimental_Outlet: typeof OrganizationSwitcherOutlet;
 };
 
-type OrganizationSwitcherPropsWithoutCustomPages = Without<OrganizationSwitcherProps, 'organizationProfileProps'> & {
+type OrganizationSwitcherPropsWithoutCustomPages = Without<
+  OrganizationSwitcherProps,
+  'organizationProfileProps' | '__experimental_asStandalone'
+> & {
   organizationProfileProps?: Pick<OrganizationProfileProps, 'appearance'>;
+  /**
+   * Adding `asProvider` will defer rendering until the `<Outlet />` component is mounted.
+   * @experimental This API is experimental and may change at any moment.
+   * @default undefined
+   */
+  __experimental_asProvider?: boolean;
+};
+
+const isMountProps = (props: any): props is MountProps => {
+  return 'mount' in props;
+};
+
+const isOpenProps = (props: any): props is OpenProps => {
+  return 'open' in props;
 };
 
 // README: <Portal/> should be a class pure component in order for mount and unmount
@@ -98,15 +144,9 @@ type OrganizationSwitcherPropsWithoutCustomPages = Without<OrganizationSwitcherP
 
 // Portal.displayName = 'ClerkPortal';
 
-const isMountProps = (props: any): props is MountProps => {
-  return 'mount' in props;
-};
-
-const isOpenProps = (props: any): props is OpenProps => {
-  return 'open' in props;
-};
-
-class Portal extends React.PureComponent<MountProps | OpenProps> {
+class Portal extends React.PureComponent<
+  PropsWithChildren<(MountProps | OpenProps) & { hideRootHtmlElement?: boolean }>
+> {
   private portalRef = React.createRef<HTMLDivElement>();
 
   componentDidUpdate(_prevProps: Readonly<MountProps | OpenProps>) {
@@ -122,8 +162,11 @@ class Portal extends React.PureComponent<MountProps | OpenProps> {
     // instead, we simply use the length of customPages to determine if it changed or not
     const customPagesChanged = prevProps.customPages?.length !== newProps.customPages?.length;
     const customMenuItemsChanged = prevProps.customMenuItems?.length !== newProps.customMenuItems?.length;
+
     if (!isDeeplyEqual(prevProps, newProps) || customPagesChanged || customMenuItemsChanged) {
-      this.props.updateProps({ node: this.portalRef.current, props: this.props.props });
+      if (this.portalRef.current) {
+        this.props.updateProps({ node: this.portalRef.current, props: this.props.props });
+      }
     }
   }
 
@@ -151,18 +194,25 @@ class Portal extends React.PureComponent<MountProps | OpenProps> {
   }
 
   render() {
+    const { hideRootHtmlElement = false } = this.props;
     return (
       <>
-        <div ref={this.portalRef} />
-        {isMountProps(this.props) &&
-          this.props?.customPagesPortals?.map((portal, index) => createElement(portal, { key: index }))}
-        {isMountProps(this.props) &&
-          this.props?.customMenuItemsPortals?.map((portal, index) => createElement(portal, { key: index }))}
+        {!hideRootHtmlElement && <div ref={this.portalRef} />}
+        {this.props.children}
       </>
     );
   }
 }
 
+const CustomPortalsRenderer = (props: CustomPortalsRendererProps) => {
+  return (
+    <>
+      {props?.customPagesPortals?.map((portal, index) => createElement(portal, { key: index }))}
+      {props?.customMenuItemsPortals?.map((portal, index) => createElement(portal, { key: index }))}
+    </>
+  );
+};
+
 export const SignIn = withClerk(({ clerk, ...props }: WithClerkProp<SignInProps>) => {
   return (
     <Portal
@@ -204,8 +254,9 @@ const _UserProfile = withClerk(
         unmount={clerk.unmountUserProfile}
         updateProps={(clerk as any).__unstable__updateProps}
         props={{ ...props, customPages }}
-        customPagesPortals={customPagesPortals}
-      />
+      >
+        <CustomPortalsRenderer customPagesPortals={customPagesPortals} />
+      </Portal>
     );
   },
   'UserProfile',
@@ -216,21 +267,43 @@ export const UserProfile: UserProfileExportType = Object.assign(_UserProfile, {
   Link: UserProfileLink,
 });
 
+const UserButtonContext = createContext<MountProps>({
+  mount: () => {},
+  unmount: () => {},
+  updateProps: () => {},
+});
+
 const _UserButton = withClerk(
   ({ clerk, ...props }: WithClerkProp<PropsWithChildren<UserButtonPropsWithoutCustomPages>>) => {
-    const { customPages, customPagesPortals } = useUserProfileCustomPages(props.children);
+    const { customPages, customPagesPortals } = useUserProfileCustomPages(props.children, {
+      allowForAnyChildren: !!props.__experimental_asProvider,
+    });
     const userProfileProps = Object.assign(props.userProfileProps || {}, { customPages });
     const { customMenuItems, customMenuItemsPortals } = useUserButtonCustomMenuItems(props.children);
+    const sanitizedChildren = useSanitizedChildren(props.children);
+
+    const passableProps = {
+      mount: clerk.mountUserButton,
+      unmount: clerk.unmountUserButton,
+      updateProps: (clerk as any).__unstable__updateProps,
+      props: { ...props, userProfileProps, customMenuItems },
+    };
+    const portalProps = {
+      customPagesPortals: customPagesPortals,
+      customMenuItemsPortals: customMenuItemsPortals,
+    };
 
     return (
-      <Portal
-        mount={clerk.mountUserButton}
-        unmount={clerk.unmountUserButton}
-        updateProps={(clerk as any).__unstable__updateProps}
-        props={{ ...props, userProfileProps, customMenuItems }}
-        customPagesPortals={customPagesPortals}
-        customMenuItemsPortals={customMenuItemsPortals}
-      />
+      <UserButtonContext.Provider value={passableProps}>
+        <Portal
+          {...passableProps}
+          hideRootHtmlElement={!!props.__experimental_asProvider}
+        >
+          {/*This mimics the previous behaviour before asProvider existed*/}
+          {props.__experimental_asProvider ? sanitizedChildren : null}
+          <CustomPortalsRenderer {...portalProps} />
+        </Portal>
+      </UserButtonContext.Provider>
     );
   },
   'UserButton',
@@ -251,12 +324,27 @@ export function MenuLink({ children }: PropsWithChildren<UserButtonLinkProps>) {
   return <>{children}</>;
 }
 
+export function UserButtonOutlet(outletProps: Without<UserButtonProps, 'userProfileProps'>) {
+  const providerProps = useContext(UserButtonContext);
+
+  const portalProps = {
+    ...providerProps,
+    props: {
+      ...providerProps.props,
+      ...outletProps,
+    },
+  } satisfies MountProps;
+
+  return <Portal {...portalProps} />;
+}
+
 export const UserButton: UserButtonExportType = Object.assign(_UserButton, {
   UserProfilePage,
   UserProfileLink,
   MenuItems,
   Action: MenuAction,
   Link: MenuLink,
+  __experimental_Outlet: UserButtonOutlet,
 });
 
 export function OrganizationProfilePage({ children }: PropsWithChildren<OrganizationProfilePageProps>) {
@@ -278,8 +366,9 @@ const _OrganizationProfile = withClerk(
         unmount={clerk.unmountOrganizationProfile}
         updateProps={(clerk as any).__unstable__updateProps}
         props={{ ...props, customPages }}
-        customPagesPortals={customPagesPortals}
-      />
+      >
+        <CustomPortalsRenderer customPagesPortals={customPagesPortals} />
+      </Portal>
     );
   },
   'OrganizationProfile',
@@ -301,27 +390,68 @@ export const CreateOrganization = withClerk(({ clerk, ...props }: WithClerkProp<
   );
 }, 'CreateOrganization');
 
+const OrganizationSwitcherContext = createContext<MountProps>({
+  mount: () => {},
+  unmount: () => {},
+  updateProps: () => {},
+});
+
 const _OrganizationSwitcher = withClerk(
   ({ clerk, ...props }: WithClerkProp<PropsWithChildren<OrganizationSwitcherPropsWithoutCustomPages>>) => {
-    const { customPages, customPagesPortals } = useOrganizationProfileCustomPages(props.children);
+    const { customPages, customPagesPortals } = useOrganizationProfileCustomPages(props.children, {
+      allowForAnyChildren: !!props.__experimental_asProvider,
+    });
     const organizationProfileProps = Object.assign(props.organizationProfileProps || {}, { customPages });
+    const sanitizedChildren = useSanitizedChildren(props.children);
+
+    const passableProps = {
+      mount: clerk.mountOrganizationSwitcher,
+      unmount: clerk.unmountOrganizationSwitcher,
+      updateProps: (clerk as any).__unstable__updateProps,
+      props: { ...props, organizationProfileProps },
+    };
+
+    /**
+     * Prefetch organization list
+     */
+    clerk.__experimental_prefetchOrganizationSwitcher();
 
     return (
-      <Portal
-        mount={clerk.mountOrganizationSwitcher}
-        unmount={clerk.unmountOrganizationSwitcher}
-        updateProps={(clerk as any).__unstable__updateProps}
-        props={{ ...props, organizationProfileProps }}
-        customPagesPortals={customPagesPortals}
-      />
+      <OrganizationSwitcherContext.Provider value={passableProps}>
+        <Portal
+          {...passableProps}
+          hideRootHtmlElement={!!props.__experimental_asProvider}
+        >
+          {/*This mimics the previous behaviour before asProvider existed*/}
+          {props.__experimental_asProvider ? sanitizedChildren : null}
+          <CustomPortalsRenderer customPagesPortals={customPagesPortals} />
+        </Portal>
+      </OrganizationSwitcherContext.Provider>
     );
   },
   'OrganizationSwitcher',
 );
 
+export function OrganizationSwitcherOutlet(
+  outletProps: Without<OrganizationSwitcherProps, 'organizationProfileProps'>,
+) {
+  const providerProps = useContext(OrganizationSwitcherContext);
+
+  const portalProps = {
+    ...providerProps,
+    props: {
+      ...providerProps.props,
+      ...outletProps,
+    },
+  } satisfies MountProps;
+
+  return <Portal {...portalProps} />;
+}
+
 export const OrganizationSwitcher: OrganizationSwitcherExportType = Object.assign(_OrganizationSwitcher, {
   OrganizationProfilePage,
   OrganizationProfileLink,
+  __experimental_Outlet: OrganizationSwitcherOutlet,
 });
 
 export const OrganizationList = withClerk(({ clerk, ...props }: WithClerkProp<OrganizationListProps>) => {
diff --git a/packages/react/src/isomorphicClerk.ts b/packages/react/src/isomorphicClerk.ts
index 1623b81cadb..3a94a521f9a 100644
--- a/packages/react/src/isomorphicClerk.ts
+++ b/packages/react/src/isomorphicClerk.ts
@@ -841,6 +841,15 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
     }
   };
 
+  __experimental_prefetchOrganizationSwitcher = (): void => {
+    const callback = () => this.clerkjs?.__experimental_prefetchOrganizationSwitcher();
+    if (this.clerkjs && this.#loaded) {
+      void callback();
+    } else {
+      this.premountMethodCalls.set('__experimental_prefetchOrganizationSwitcher', callback);
+    }
+  };
+
   mountOrganizationList = (node: HTMLDivElement, props: OrganizationListProps): void => {
     if (this.clerkjs && this.#loaded) {
       this.clerkjs.mountOrganizationList(node, props);
diff --git a/packages/react/src/types.ts b/packages/react/src/types.ts
index 2ad19fa125c..ec0f8dbd235 100644
--- a/packages/react/src/types.ts
+++ b/packages/react/src/types.ts
@@ -67,14 +67,17 @@ export interface HeadlessBrowserClerkConstructor {
 
 export type WithClerkProp<T = unknown> = T & { clerk: LoadedClerk };
 
+export interface CustomPortalsRendererProps {
+  customPagesPortals?: any[];
+  customMenuItemsPortals?: any[];
+}
+
 // Clerk object
 export interface MountProps {
   mount: (node: HTMLDivElement, props: any) => void;
   unmount: (node: HTMLDivElement) => void;
   updateProps: (props: any) => void;
   props?: any;
-  customPagesPortals?: any[];
-  customMenuItemsPortals?: any[];
 }
 
 export interface OpenProps {
diff --git a/packages/react/src/utils/useCustomPages.tsx b/packages/react/src/utils/useCustomPages.tsx
index 4274fe34fca..c3367d1cc7b 100644
--- a/packages/react/src/utils/useCustomPages.tsx
+++ b/packages/react/src/utils/useCustomPages.tsx
@@ -16,27 +16,39 @@ import { isThatComponent } from './componentValidation';
 import type { UseCustomElementPortalParams, UseCustomElementPortalReturn } from './useCustomElementPortal';
 import { useCustomElementPortal } from './useCustomElementPortal';
 
-export const useUserProfileCustomPages = (children: React.ReactNode | React.ReactNode[]) => {
+export const useUserProfileCustomPages = (
+  children: React.ReactNode | React.ReactNode[],
+  options?: UseCustomPagesOptions,
+) => {
   const reorderItemsLabels = ['account', 'security'];
-  return useCustomPages({
-    children,
-    reorderItemsLabels,
-    LinkComponent: UserProfileLink,
-    PageComponent: UserProfilePage,
-    MenuItemsComponent: MenuItems,
-    componentName: 'UserProfile',
-  });
+  return useCustomPages(
+    {
+      children,
+      reorderItemsLabels,
+      LinkComponent: UserProfileLink,
+      PageComponent: UserProfilePage,
+      MenuItemsComponent: MenuItems,
+      componentName: 'UserProfile',
+    },
+    options,
+  );
 };
 
-export const useOrganizationProfileCustomPages = (children: React.ReactNode | React.ReactNode[]) => {
+export const useOrganizationProfileCustomPages = (
+  children: React.ReactNode | React.ReactNode[],
+  options?: UseCustomPagesOptions,
+) => {
   const reorderItemsLabels = ['general', 'members'];
-  return useCustomPages({
-    children,
-    reorderItemsLabels,
-    LinkComponent: OrganizationProfileLink,
-    PageComponent: OrganizationProfilePage,
-    componentName: 'OrganizationProfile',
-  });
+  return useCustomPages(
+    {
+      children,
+      reorderItemsLabels,
+      LinkComponent: OrganizationProfileLink,
+      PageComponent: OrganizationProfilePage,
+      componentName: 'OrganizationProfile',
+    },
+    options,
+  );
 };
 
 type UseCustomPagesParams = {
@@ -48,16 +60,49 @@ type UseCustomPagesParams = {
   componentName: string;
 };
 
+type UseCustomPagesOptions = {
+  allowForAnyChildren: boolean;
+};
+
 type CustomPageWithIdType = UserProfilePageProps & { children?: React.ReactNode };
 
-const useCustomPages = ({
-  children,
-  LinkComponent,
-  PageComponent,
-  MenuItemsComponent,
-  reorderItemsLabels,
-  componentName,
-}: UseCustomPagesParams) => {
+/**
+ * Exclude any children that is used for identifying Custom Pages or Custom Items.
+ * Passing:
+ * ```tsx
+ *  <UserProfile.Page/>
+ *  <OrganizationProfile.Link/>
+ *  <MyComponent>
+ *  <UserButton.MenuItems/>
+ * ```
+ * Gives back
+ * ```tsx
+ * <MyComponent>
+ * ````
+ */
+export const useSanitizedChildren = (children: React.ReactNode) => {
+  const sanitizedChildren: React.ReactNode[] = [];
+
+  const excludedComponents: any[] = [
+    OrganizationProfileLink,
+    OrganizationProfilePage,
+    MenuItems,
+    UserProfilePage,
+    UserProfileLink,
+  ];
+
+  React.Children.forEach(children, child => {
+    if (!excludedComponents.some(component => isThatComponent(child, component))) {
+      sanitizedChildren.push(child);
+    }
+  });
+
+  return sanitizedChildren;
+};
+
+const useCustomPages = (params: UseCustomPagesParams, options?: UseCustomPagesOptions) => {
+  const { children, LinkComponent, PageComponent, MenuItemsComponent, reorderItemsLabels, componentName } = params;
+  const { allowForAnyChildren = false } = options || {};
   const validChildren: CustomPageWithIdType[] = [];
 
   React.Children.forEach(children, child => {
@@ -66,7 +111,7 @@ const useCustomPages = ({
       !isThatComponent(child, LinkComponent) &&
       !isThatComponent(child, MenuItemsComponent)
     ) {
-      if (child) {
+      if (child && !allowForAnyChildren) {
         logErrorInDevMode(customPagesIgnoredComponent(componentName));
       }
       return;
diff --git a/packages/remix/CHANGELOG.md b/packages/remix/CHANGELOG.md
index d9d3bed4581..45197c5ea99 100644
--- a/packages/remix/CHANGELOG.md
+++ b/packages/remix/CHANGELOG.md
@@ -1,5 +1,22 @@
 # Change Log
 
+## 4.2.39
+
+### Patch Changes
+
+- Updated dependencies [[`e1a26547a`](https://github.com/clerk/javascript/commit/e1a26547a9c65f4c79c2bbd4dc386ddf67c2fbee)]:
+  - @clerk/backend@1.14.1
+
+## 4.2.38
+
+### Patch Changes
+
+- Updated dependencies [[`ce40ff6f0`](https://github.com/clerk/javascript/commit/ce40ff6f0d3bc79e33375be6dd5e03f140a07000), [`e81d45b72`](https://github.com/clerk/javascript/commit/e81d45b72c81403c7c206dac5454de1fef6bec57), [`752ce9bfa`](https://github.com/clerk/javascript/commit/752ce9bfa47a8eebd38cd272eeb58ae26fea3371), [`99cdf9b67`](https://github.com/clerk/javascript/commit/99cdf9b67d1e99e66cc73d8a5bfce1f1f8df1b83), [`ce40ff6f0`](https://github.com/clerk/javascript/commit/ce40ff6f0d3bc79e33375be6dd5e03f140a07000), [`fb7ba1f34`](https://github.com/clerk/javascript/commit/fb7ba1f3485abdeac5e504cce6c2d84d3f3e4ffc), [`2102052c0`](https://github.com/clerk/javascript/commit/2102052c017065ab511339870fcebaa6719f2702)]:
+  - @clerk/clerk-react@5.12.0
+  - @clerk/types@4.26.0
+  - @clerk/shared@2.9.2
+  - @clerk/backend@1.14.0
+
 ## 4.2.37
 
 ### Patch Changes
diff --git a/packages/remix/package.json b/packages/remix/package.json
index 67a0f5a008e..c0aee7b0553 100644
--- a/packages/remix/package.json
+++ b/packages/remix/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@clerk/remix",
-  "version": "4.2.37",
+  "version": "4.2.39",
   "description": "Clerk SDK for Remix",
   "keywords": [
     "clerk",
@@ -73,10 +73,10 @@
     "publish:local": "npx yalc push --replace  --sig"
   },
   "dependencies": {
-    "@clerk/backend": "1.13.10",
-    "@clerk/clerk-react": "5.11.1",
-    "@clerk/shared": "2.9.1",
-    "@clerk/types": "4.25.1",
+    "@clerk/backend": "1.14.1",
+    "@clerk/clerk-react": "5.12.0",
+    "@clerk/shared": "2.9.2",
+    "@clerk/types": "4.26.0",
     "cookie": "0.7.0",
     "tslib": "2.4.1"
   },
diff --git a/packages/sdk-node/CHANGELOG.md b/packages/sdk-node/CHANGELOG.md
index e5cddf87207..fba8c41b25c 100644
--- a/packages/sdk-node/CHANGELOG.md
+++ b/packages/sdk-node/CHANGELOG.md
@@ -1,5 +1,21 @@
 # Change Log
 
+## 5.0.52
+
+### Patch Changes
+
+- Updated dependencies [[`e1a26547a`](https://github.com/clerk/javascript/commit/e1a26547a9c65f4c79c2bbd4dc386ddf67c2fbee)]:
+  - @clerk/backend@1.14.1
+
+## 5.0.51
+
+### Patch Changes
+
+- Updated dependencies [[`e81d45b72`](https://github.com/clerk/javascript/commit/e81d45b72c81403c7c206dac5454de1fef6bec57), [`752ce9bfa`](https://github.com/clerk/javascript/commit/752ce9bfa47a8eebd38cd272eeb58ae26fea3371), [`99cdf9b67`](https://github.com/clerk/javascript/commit/99cdf9b67d1e99e66cc73d8a5bfce1f1f8df1b83), [`ce40ff6f0`](https://github.com/clerk/javascript/commit/ce40ff6f0d3bc79e33375be6dd5e03f140a07000), [`fb7ba1f34`](https://github.com/clerk/javascript/commit/fb7ba1f3485abdeac5e504cce6c2d84d3f3e4ffc), [`2102052c0`](https://github.com/clerk/javascript/commit/2102052c017065ab511339870fcebaa6719f2702)]:
+  - @clerk/types@4.26.0
+  - @clerk/shared@2.9.2
+  - @clerk/backend@1.14.0
+
 ## 5.0.50
 
 ### Patch Changes
diff --git a/packages/sdk-node/package.json b/packages/sdk-node/package.json
index 518ce152085..5910a37b994 100644
--- a/packages/sdk-node/package.json
+++ b/packages/sdk-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@clerk/clerk-sdk-node",
-  "version": "5.0.50",
+  "version": "5.0.52",
   "description": "Clerk server SDK for usage with node",
   "keywords": [
     "clerk",
@@ -53,9 +53,9 @@
     "test:ci": "jest --maxWorkers=70%"
   },
   "dependencies": {
-    "@clerk/backend": "1.13.10",
-    "@clerk/shared": "2.9.1",
-    "@clerk/types": "4.25.1",
+    "@clerk/backend": "1.14.1",
+    "@clerk/shared": "2.9.2",
+    "@clerk/types": "4.26.0",
     "tslib": "2.4.1"
   },
   "devDependencies": {
diff --git a/packages/shared/CHANGELOG.md b/packages/shared/CHANGELOG.md
index ae926190dbe..6d8d62e182d 100644
--- a/packages/shared/CHANGELOG.md
+++ b/packages/shared/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Change Log
 
+## 2.9.2
+
+### Patch Changes
+
+- Retry with exponential backoff if loadScript fails to load the script ([#4349](https://github.com/clerk/javascript/pull/4349)) by [@nikosdouvlis](https://github.com/nikosdouvlis)
+
+- Updated dependencies [[`e81d45b72`](https://github.com/clerk/javascript/commit/e81d45b72c81403c7c206dac5454de1fef6bec57), [`99cdf9b67`](https://github.com/clerk/javascript/commit/99cdf9b67d1e99e66cc73d8a5bfce1f1f8df1b83), [`ce40ff6f0`](https://github.com/clerk/javascript/commit/ce40ff6f0d3bc79e33375be6dd5e03f140a07000), [`2102052c0`](https://github.com/clerk/javascript/commit/2102052c017065ab511339870fcebaa6719f2702)]:
+  - @clerk/types@4.26.0
+
 ## 2.9.1
 
 ### Patch Changes
diff --git a/packages/shared/package.json b/packages/shared/package.json
index 4f47a4d5908..66bdd857e3b 100644
--- a/packages/shared/package.json
+++ b/packages/shared/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@clerk/shared",
-  "version": "2.9.1",
+  "version": "2.9.2",
   "description": "Internal package utils used by the Clerk SDKs",
   "repository": {
     "type": "git",
@@ -95,7 +95,7 @@
     "test:coverage": "jest --collectCoverage && open coverage/lcov-report/index.html"
   },
   "dependencies": {
-    "@clerk/types": "4.25.1",
+    "@clerk/types": "4.26.0",
     "glob-to-regexp": "0.4.1",
     "js-cookie": "3.0.5",
     "std-env": "^3.7.0",
diff --git a/packages/shared/src/loadScript.ts b/packages/shared/src/loadScript.ts
index c10d775328d..9a85ab4e551 100644
--- a/packages/shared/src/loadScript.ts
+++ b/packages/shared/src/loadScript.ts
@@ -1,3 +1,5 @@
+import { runWithExponentialBackOff } from './utils';
+
 const NO_DOCUMENT_ERROR = 'loadScript cannot be called when document does not exist';
 const NO_SRC_ERROR = 'loadScript cannot be called without a src';
 
@@ -11,34 +13,39 @@ type LoadScriptOptions = {
 
 export async function loadScript(src = '', opts: LoadScriptOptions): Promise<HTMLScriptElement> {
   const { async, defer, beforeLoad, crossOrigin, nonce } = opts || {};
-  return new Promise((resolve, reject) => {
-    if (!src) {
-      reject(NO_SRC_ERROR);
-    }
 
-    if (!document || !document.body) {
-      reject(NO_DOCUMENT_ERROR);
-    }
+  const load = () => {
+    return new Promise<HTMLScriptElement>((resolve, reject) => {
+      if (!src) {
+        reject(NO_SRC_ERROR);
+      }
 
-    const script = document.createElement('script');
+      if (!document || !document.body) {
+        reject(NO_DOCUMENT_ERROR);
+      }
 
-    crossOrigin && script.setAttribute('crossorigin', crossOrigin);
-    script.async = async || false;
-    script.defer = defer || false;
+      const script = document.createElement('script');
 
-    script.addEventListener('load', () => {
-      script.remove();
-      resolve(script);
-    });
+      crossOrigin && script.setAttribute('crossorigin', crossOrigin);
+      script.async = async || false;
+      script.defer = defer || false;
+
+      script.addEventListener('load', () => {
+        script.remove();
+        resolve(script);
+      });
+
+      script.addEventListener('error', () => {
+        script.remove();
+        reject();
+      });
 
-    script.addEventListener('error', () => {
-      script.remove();
-      reject();
+      script.src = src;
+      script.nonce = nonce;
+      beforeLoad?.(script);
+      document.body.appendChild(script);
     });
+  };
 
-    script.src = src;
-    script.nonce = nonce;
-    beforeLoad?.(script);
-    document.body.appendChild(script);
-  });
+  return runWithExponentialBackOff(load, { shouldRetry: (_, iterations) => iterations < 5 });
 }
diff --git a/packages/tanstack-start/CHANGELOG.md b/packages/tanstack-start/CHANGELOG.md
index ae23c2522b1..c483b0e755f 100644
--- a/packages/tanstack-start/CHANGELOG.md
+++ b/packages/tanstack-start/CHANGELOG.md
@@ -1,5 +1,22 @@
 # @clerk/tanstack-start
 
+## 0.4.15
+
+### Patch Changes
+
+- Updated dependencies [[`e1a26547a`](https://github.com/clerk/javascript/commit/e1a26547a9c65f4c79c2bbd4dc386ddf67c2fbee)]:
+  - @clerk/backend@1.14.1
+
+## 0.4.14
+
+### Patch Changes
+
+- Updated dependencies [[`ce40ff6f0`](https://github.com/clerk/javascript/commit/ce40ff6f0d3bc79e33375be6dd5e03f140a07000), [`e81d45b72`](https://github.com/clerk/javascript/commit/e81d45b72c81403c7c206dac5454de1fef6bec57), [`752ce9bfa`](https://github.com/clerk/javascript/commit/752ce9bfa47a8eebd38cd272eeb58ae26fea3371), [`99cdf9b67`](https://github.com/clerk/javascript/commit/99cdf9b67d1e99e66cc73d8a5bfce1f1f8df1b83), [`ce40ff6f0`](https://github.com/clerk/javascript/commit/ce40ff6f0d3bc79e33375be6dd5e03f140a07000), [`fb7ba1f34`](https://github.com/clerk/javascript/commit/fb7ba1f3485abdeac5e504cce6c2d84d3f3e4ffc), [`2102052c0`](https://github.com/clerk/javascript/commit/2102052c017065ab511339870fcebaa6719f2702)]:
+  - @clerk/clerk-react@5.12.0
+  - @clerk/types@4.26.0
+  - @clerk/shared@2.9.2
+  - @clerk/backend@1.14.0
+
 ## 0.4.13
 
 ### Patch Changes
diff --git a/packages/tanstack-start/package.json b/packages/tanstack-start/package.json
index ae1d9d1f6e5..3587f8a7cad 100644
--- a/packages/tanstack-start/package.json
+++ b/packages/tanstack-start/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@clerk/tanstack-start",
-  "version": "0.4.13",
+  "version": "0.4.15",
   "description": "Clerk SDK for TanStack Start",
   "keywords": [
     "clerk",
@@ -54,10 +54,10 @@
     "publish:local": "npx yalc push --replace --sig"
   },
   "dependencies": {
-    "@clerk/backend": "1.13.10",
-    "@clerk/clerk-react": "5.11.1",
-    "@clerk/shared": "2.9.1",
-    "@clerk/types": "4.25.1",
+    "@clerk/backend": "1.14.1",
+    "@clerk/clerk-react": "5.12.0",
+    "@clerk/shared": "2.9.2",
+    "@clerk/types": "4.26.0",
     "tslib": "2.4.1"
   },
   "devDependencies": {
diff --git a/packages/testing/CHANGELOG.md b/packages/testing/CHANGELOG.md
index 48a693005b6..fbe97fde30d 100644
--- a/packages/testing/CHANGELOG.md
+++ b/packages/testing/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @clerk/testing
 
+## 1.3.13
+
+### Patch Changes
+
+- Updated dependencies [[`e1a26547a`](https://github.com/clerk/javascript/commit/e1a26547a9c65f4c79c2bbd4dc386ddf67c2fbee)]:
+  - @clerk/backend@1.14.1
+
+## 1.3.12
+
+### Patch Changes
+
+- Updated dependencies [[`e81d45b72`](https://github.com/clerk/javascript/commit/e81d45b72c81403c7c206dac5454de1fef6bec57), [`752ce9bfa`](https://github.com/clerk/javascript/commit/752ce9bfa47a8eebd38cd272eeb58ae26fea3371), [`99cdf9b67`](https://github.com/clerk/javascript/commit/99cdf9b67d1e99e66cc73d8a5bfce1f1f8df1b83), [`ce40ff6f0`](https://github.com/clerk/javascript/commit/ce40ff6f0d3bc79e33375be6dd5e03f140a07000), [`fb7ba1f34`](https://github.com/clerk/javascript/commit/fb7ba1f3485abdeac5e504cce6c2d84d3f3e4ffc), [`2102052c0`](https://github.com/clerk/javascript/commit/2102052c017065ab511339870fcebaa6719f2702)]:
+  - @clerk/types@4.26.0
+  - @clerk/shared@2.9.2
+  - @clerk/backend@1.14.0
+
 ## 1.3.11
 
 ### Patch Changes
diff --git a/packages/testing/package.json b/packages/testing/package.json
index 4bc5944e57c..5b4fdaf4d74 100644
--- a/packages/testing/package.json
+++ b/packages/testing/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@clerk/testing",
-  "version": "1.3.11",
+  "version": "1.3.13",
   "description": "Utilities to help you create E2E test suites for apps using Clerk",
   "keywords": [
     "auth",
@@ -62,9 +62,9 @@
     "lint": "eslint src/"
   },
   "dependencies": {
-    "@clerk/backend": "1.13.10",
-    "@clerk/shared": "2.9.1",
-    "@clerk/types": "4.25.1",
+    "@clerk/backend": "1.14.1",
+    "@clerk/shared": "2.9.2",
+    "@clerk/types": "4.26.0",
     "dotenv": "16.4.5"
   },
   "devDependencies": {
diff --git a/packages/themes/CHANGELOG.md b/packages/themes/CHANGELOG.md
index b73bad53833..2a3283ea227 100644
--- a/packages/themes/CHANGELOG.md
+++ b/packages/themes/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Change Log
 
+## 2.1.37
+
+### Patch Changes
+
+- Updated dependencies [[`e81d45b72`](https://github.com/clerk/javascript/commit/e81d45b72c81403c7c206dac5454de1fef6bec57), [`99cdf9b67`](https://github.com/clerk/javascript/commit/99cdf9b67d1e99e66cc73d8a5bfce1f1f8df1b83), [`ce40ff6f0`](https://github.com/clerk/javascript/commit/ce40ff6f0d3bc79e33375be6dd5e03f140a07000), [`2102052c0`](https://github.com/clerk/javascript/commit/2102052c017065ab511339870fcebaa6719f2702)]:
+  - @clerk/types@4.26.0
+
 ## 2.1.36
 
 ### Patch Changes
diff --git a/packages/themes/package.json b/packages/themes/package.json
index 8498d08b557..8f68f6ec680 100644
--- a/packages/themes/package.json
+++ b/packages/themes/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@clerk/themes",
-  "version": "2.1.36",
+  "version": "2.1.37",
   "description": "Themes for the Clerk auth components",
   "keywords": [
     "react",
@@ -37,7 +37,7 @@
     "lint": "eslint src/"
   },
   "dependencies": {
-    "@clerk/types": "4.25.1",
+    "@clerk/types": "4.26.0",
     "tslib": "2.4.1"
   },
   "devDependencies": {
diff --git a/packages/types/CHANGELOG.md b/packages/types/CHANGELOG.md
index 938f3ae81da..4ffc3e8a81a 100644
--- a/packages/types/CHANGELOG.md
+++ b/packages/types/CHANGELOG.md
@@ -1,5 +1,27 @@
 # Change Log
 
+## 4.26.0
+
+### Minor Changes
+
+- Drop `maxAgeMinutes` from `__experimental_startVerification`. ([#4338](https://github.com/clerk/javascript/pull/4338)) by [@panteliselef](https://github.com/panteliselef)
+
+  Drop types `__experimental_SessionVerificationConfig` and `__experimental_SessionVerificationMaxAgeMinutes`.
+
+- The "Restricted access" screen has been improved for visual consistency and the ability to contact support. The displayed texts have been made more clear and the sign-in button has been moved to the bottom. ([#4335](https://github.com/clerk/javascript/pull/4335)) by [@nikospapcom](https://github.com/nikospapcom)
+
+- Add experimental standalone mode for `<UserButton />` and `<OrganizationSwitcher />`. ([#4042](https://github.com/clerk/javascript/pull/4042)) by [@panteliselef](https://github.com/panteliselef)
+
+  When `__experimental_asStandalone: true` the component will not render its trigger, and instead it will render only the contents of the popover in place.
+
+  APIs that changed:
+
+  - (For internal usage) Added `__experimental_prefetchOrganizationSwitcher` as a way to mount an internal component that will render the `useOrganizationList()` hook and prefetch the necessary data for the popover of `<OrganizationSwitcher />`. This enhances the UX since no loading state will be visible and keeps CLS to the minimum.
+  - New property for `mountOrganizationSwitcher(node, { __experimental_asStandalone: true })`
+  - New property for `mountUserButton(node, { __experimental_asStandalone: true })`
+
+- Use EIP-4361 message spec for Web3 wallets sign in signature requests ([#4334](https://github.com/clerk/javascript/pull/4334)) by [@chanioxaris](https://github.com/chanioxaris)
+
 ## 4.25.1
 
 ### Patch Changes
diff --git a/packages/types/package.json b/packages/types/package.json
index d2a7b19d8e6..f5e73b00c57 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@clerk/types",
-  "version": "4.25.1",
+  "version": "4.26.0",
   "description": "Typings for Clerk libraries.",
   "keywords": [
     "clerk",
diff --git a/packages/types/src/clerk.ts b/packages/types/src/clerk.ts
index 3f1b8abd9e2..7f7e11cd139 100644
--- a/packages/types/src/clerk.ts
+++ b/packages/types/src/clerk.ts
@@ -329,6 +329,14 @@ export interface Clerk {
    */
   unmountOrganizationSwitcher: (targetNode: HTMLDivElement) => void;
 
+  /**
+   * Prefetches the data displayed by an organization switcher.
+   * It can be used when `mountOrganizationSwitcher({ asStandalone: true})`, to avoid unwanted loading states.
+   * @experimantal This API is still under active development and may change at any moment.
+   * @param props Optional user verification configuration parameters.
+   */
+  __experimental_prefetchOrganizationSwitcher: () => void;
+
   /**
    * Mount an organization list component at the target element.
    * @param targetNode Target to mount the OrganizationList component.
@@ -1035,6 +1043,15 @@ export type UserButtonProps = UserButtonProfileMode & {
    * Controls the default state of the UserButton
    */
   defaultOpen?: boolean;
+
+  /**
+   * If true the `<UserButton />` will only render the popover.
+   * Enables developers to implement a custom dialog.
+   * @experimental This API is experimental and may change at any moment.
+   * @default undefined
+   */
+  __experimental_asStandalone?: boolean;
+
   /**
    * Full URL or path to navigate after sign out is complete
    * @deprecated Configure `afterSignOutUrl` as a global configuration, either in <ClerkProvider/> or in await Clerk.load()
@@ -1095,6 +1112,15 @@ export type OrganizationSwitcherProps = CreateOrganizationMode &
      * Controls the default state of the OrganizationSwitcher
      */
     defaultOpen?: boolean;
+
+    /**
+     * If true, `<OrganizationSwitcher />` will only render the popover.
+     * Enables developers to implement a custom dialog.
+     * @experimental This API is experimental and may change at any moment.
+     * @default undefined
+     */
+    __experimental_asStandalone?: boolean;
+
     /**
      * By default, users can switch between organization and their personal account.
      * This option controls whether OrganizationSwitcher will include the user's personal account
diff --git a/packages/types/src/json.ts b/packages/types/src/json.ts
index 88a07f00770..01f1a8b0c22 100644
--- a/packages/types/src/json.ts
+++ b/packages/types/src/json.ts
@@ -261,6 +261,7 @@ export interface VerificationJSON extends ClerkResourceJSON {
   verified_at_client: string;
   strategy: string;
   nonce?: string;
+  message?: string;
   external_verification_redirect_url?: string;
   attempts: number;
   expire_at: number;
diff --git a/packages/types/src/localization.ts b/packages/types/src/localization.ts
index 9b6a0140a4d..27caaedfc50 100644
--- a/packages/types/src/localization.ts
+++ b/packages/types/src/localization.ts
@@ -148,6 +148,8 @@ type _LocalizationResource = {
       title: LocalizationValue;
       subtitle: LocalizationValue;
       actionLink: LocalizationValue;
+      actionText: LocalizationValue;
+      blockButton__emailSupport: LocalizationValue;
     };
   };
   signIn: {
diff --git a/packages/types/src/session.ts b/packages/types/src/session.ts
index b9f05337451..d401e563166 100644
--- a/packages/types/src/session.ts
+++ b/packages/types/src/session.ts
@@ -18,7 +18,6 @@ import type { ClerkResource } from './resource';
 import type {
   __experimental_ReverificationConfig,
   __experimental_SessionVerificationLevel,
-  __experimental_SessionVerificationMaxAgeMinutes,
   __experimental_SessionVerificationResource,
 } from './sessionVerification';
 import type { TokenResource } from './token';
@@ -155,7 +154,6 @@ export type GetToken = (options?: GetTokenOptions) => Promise<string | null>;
 
 export type __experimental_SessionVerifyCreateParams = {
   level: __experimental_SessionVerificationLevel;
-  maxAgeMinutes: __experimental_SessionVerificationMaxAgeMinutes;
 };
 
 export type __experimental_SessionVerifyPrepareFirstFactorParams = EmailCodeConfig | PhoneCodeConfig;
diff --git a/packages/types/src/sessionVerification.ts b/packages/types/src/sessionVerification.ts
index 8dbd46a3773..b5dbf4a771a 100644
--- a/packages/types/src/sessionVerification.ts
+++ b/packages/types/src/sessionVerification.ts
@@ -17,22 +17,15 @@ export type __experimental_SessionVerificationStatus = 'needs_first_factor' | 'n
 
 export type __experimental_SessionVerificationTypes = 'veryStrict' | 'strict' | 'moderate' | 'lax';
 
-export type __experimental_SessionVerificationConfig =
-  | __experimental_SessionVerificationTypes
-  | {
-      level: __experimental_SessionVerificationLevel;
-      maxAgeMinutes: __experimental_SessionVerificationMaxAgeMinutes;
-    };
-
 export type __experimental_ReverificationConfig =
   | __experimental_SessionVerificationTypes
   | {
       level: __experimental_SessionVerificationLevel;
-      afterMinutes: __experimental_SessionVerificationMaxAgeMinutes;
+      afterMinutes: __experimental_SessionVerificationAfterMinutes;
     };
 
 export type __experimental_SessionVerificationLevel = 'firstFactor' | 'secondFactor' | 'multiFactor';
-export type __experimental_SessionVerificationMaxAgeMinutes = number;
+export type __experimental_SessionVerificationAfterMinutes = number;
 
 export type __experimental_SessionVerificationFirstFactor = EmailCodeFactor | PhoneCodeFactor | PasswordFactor;
 export type __experimental_SessionVerificationSecondFactor = PhoneCodeFactor | TOTPFactor | BackupCodeFactor;
diff --git a/packages/types/src/verification.ts b/packages/types/src/verification.ts
index 9fa41444e98..5b53a5801cb 100644
--- a/packages/types/src/verification.ts
+++ b/packages/types/src/verification.ts
@@ -8,6 +8,7 @@ export interface VerificationResource extends ClerkResource {
   expireAt: Date | null;
   externalVerificationRedirectURL: URL | null;
   nonce: string | null;
+  message: string | null;
   status: VerificationStatus | null;
   strategy: string | null;
   verifiedAtClient: string | null;
diff --git a/packages/upgrade/package.json b/packages/upgrade/package.json
index 7dea16c548c..05e0f8068de 100644
--- a/packages/upgrade/package.json
+++ b/packages/upgrade/package.json
@@ -20,7 +20,8 @@
     "clean": "del-cli dist/*",
     "dev": "babel --out-dir=dist --watch src --copy-files",
     "lint": "eslint src/",
-    "lint:publint": "publint"
+    "lint:publint": "publint",
+    "test": "vitest"
   },
   "babel": {
     "presets": [
@@ -28,16 +29,18 @@
     ]
   },
   "dependencies": {
-    "@inkjs/ui": "^1.0.0",
+    "@inkjs/ui": "^2.0.0",
     "@jescalan/ink-markdown": "^2.0.0",
     "ejs": "3.1.10",
+    "execa": "9.4.1",
     "globby": "^14.0.1",
     "gray-matter": "^4.0.3",
     "index-to-position": "^0.1.2",
-    "ink": "^4.4.1",
+    "ink": "^5.0.1",
     "ink-big-text": "^2.0.0",
     "ink-gradient": "^3.0.0",
-    "ink-link": "^3.0.0",
+    "ink-link": "^4.1.0",
+    "jscodeshift": "^17.0.0",
     "marked": "^11.1.1",
     "meow": "^11.0.0",
     "react": "^18.3.1",
@@ -48,9 +51,10 @@
   "devDependencies": {
     "@babel/cli": "^7.24.7",
     "@babel/preset-react": "^7.24.7",
-    "chalk": "^5.3.0",
+    "@types/jscodeshift": "^0.12.0",
     "del-cli": "^5.1.0",
-    "eslint-config-custom": "*"
+    "eslint-config-custom": "*",
+    "vitest": "^2.1.3"
   },
   "engines": {
     "node": ">=18.17.0"
diff --git a/packages/upgrade/src/app.js b/packages/upgrade/src/app.js
index 332530a2dc8..f0d00bb2e5d 100644
--- a/packages/upgrade/src/app.js
+++ b/packages/upgrade/src/app.js
@@ -1,37 +1,43 @@
 import { MultiSelect, Select, TextInput } from '@inkjs/ui';
 import { Newline, Text } from 'ink';
-import BigText from 'ink-big-text';
-import Gradient from 'ink-gradient';
 import React, { useState } from 'react';
 
+import { Header } from './components/Header.js';
+import { Scan } from './components/Scan.js';
+import { SDKWorkflow } from './components/SDKWorkflow.js';
 import SDKS from './constants/sdks.js';
-import Scan from './scan.js';
-import getClerkMajorVersion from './util/get-clerk-version.js';
+import { getClerkMajorVersion } from './util/get-clerk-version.js';
 import guessFrameworks from './util/guess-framework.js';
 
-export default function App({
-  _fromVersion,
-  _toVersion,
-  _sdk,
-  _dir = false,
-  _ignore = [],
-  _yolo = false,
-  noWarnings = false,
-  disableTelemetry = false,
-}) {
-  const [yolo, setYolo] = useState(_yolo);
-  const [sdks, setSdks] = useState(_sdk ? [_sdk] : []);
+/**
+ * Main CLI application component for handling Clerk SDK upgrades.
+ *
+ * @param {Object} props - The `props` object.
+ * @param {string} [props.dir] - The directory to scan for files.
+ * @param {boolean} [props.disableTelemetry=false] - Flag to disable telemetry.
+ * @param {string} [props.fromVersion] - The current version of the SDK.
+ * @param {Array<string>} [props.ignore] - List of files or directories to ignore.
+ * @param {boolean} [props.noWarnings=false] - Flag to disable warnings.
+ * @param {string} [props.sdk] - The SDK to upgrade.
+ * @param {string} [props.toVersion] - The target version of the SDK.
+ * @param {boolean} [props.yolo=false] - Flag to enable YOLO mode.
+ *
+ * @returns {JSX.Element} The rendered component.
+ */
+export default function App(props) {
+  const { noWarnings = false, disableTelemetry = false } = props;
+
+  const [yolo, setYolo] = useState(props.yolo ?? false);
+  const [sdks, setSdks] = useState(props.sdk ? [props.sdk] : []);
   const [sdkGuesses, setSdkGuesses] = useState([]);
   const [sdkGuessConfirmed, setSdkGuessConfirmed] = useState(false);
   const [sdkGuessAttempted, setSdkGuessAttempted] = useState(false);
   // See comments below, can be enabled on next major
-  // eslint-disable-next-line no-unused-vars
-  const [fromVersion, setFromVersion] = useState(_fromVersion);
+  const [fromVersion, setFromVersion] = useState(props.fromVersion);
   const [fromVersionGuessAttempted, setFromVersionGuessAttempted] = useState(false);
-  // eslint-disable-next-line no-unused-vars
-  const [toVersion, setToVersion] = useState(_toVersion);
-  const [dir, setDir] = useState(_dir);
-  const [ignore, setIgnore] = useState(_ignore);
+  const [toVersion, setToVersion] = useState(props.toVersion);
+  const [dir, setDir] = useState(props.dir);
+  const [ignore, setIgnore] = useState(props.ignore);
   const [configComplete, setConfigComplete] = useState(false);
   const [configVerified, setConfigVerified] = useState(false);
   const [uuid, setUuid] = useState();
@@ -42,20 +48,25 @@ export default function App({
     setYolo(false);
   }
 
+  // Handle the individual SDK upgrade
+  if (sdks.length === 1) {
+    return <SDKWorkflow sdk={sdks[0]} />;
+  }
+
   // We try to guess which SDK they are using
   if (isEmpty(sdks) && isEmpty(sdkGuesses) && !sdkGuessAttempted) {
     if (!dir) {
       return setDir(process.cwd());
     }
     const { guesses, _uuid } = guessFrameworks(dir, disableTelemetry);
-    console.log({ guesses, _uuid });
+    // console.log({ guesses, _uuid });
     setUuid(_uuid);
     setSdkGuesses(guesses);
     setSdkGuessAttempted(true);
   }
 
   // We try to guess which version of Clerk they are using
-  if (!fromVersion && !fromVersionGuess && !fromVersionGuessAttempted) {
+  if (isEmpty(sdks) && !fromVersion && !fromVersionGuess && !fromVersionGuessAttempted) {
     fromVersionGuess = getClerkMajorVersion();
     setFromVersionGuessAttempted(true);
   }
@@ -72,20 +83,14 @@ export default function App({
 
   return (
     <>
-      <Gradient name='vice'>
-        <BigText
-          text='Clerk Upgrade'
-          font='tiny'
-        />
-      </Gradient>
+      <Header />
 
       {/* Welcome to the upgrade script! */}
       {!configComplete && (
         <>
           <Text>
-            <Text color='blue'>Hello friend!</Text> We're excited to help you upgrade Clerk
-            {fromVersion ? ` from ${fromVersion}` : ''}
-            {toVersion ? ` to ${toVersion}` : ''}. Before we get started, a couple questions...
+            <Text color='blue'>Hello friend!</Text> We're excited to help you upgrade Clerk modules. Before we get
+            started, a couple questions...
           </Text>
           <Newline />
         </>
@@ -186,7 +191,7 @@ export default function App({
 					/>
 				</>
 			)} */}
-      {!isEmpty(sdks) > 0 && fromVersion && toVersion && !dir && (
+      {!isEmpty(sdks) && fromVersion && toVersion && !dir && (
         <>
           <Text>Where would you like for us to scan for files in your project?</Text>
           <Text color='gray'>(globstar syntax supported)</Text>
diff --git a/packages/upgrade/src/cli.js b/packages/upgrade/src/cli.js
index 7054218efe0..1d92919e267 100644
--- a/packages/upgrade/src/cli.js
+++ b/packages/upgrade/src/cli.js
@@ -41,14 +41,14 @@ const cli = meow(
 
 render(
   <App
-    _fromVersion={cli.flags.from}
-    _toVersion={cli.flags.to}
-    _sdk={cli.flags.sdk}
-    _dir={cli.flags.dir}
-    _ignore={cli.flags.ignore}
-    _yolo={cli.flags.yolo}
-    noWarnings={cli.flags.noWarnings}
+    dir={cli.flags.dir}
     disableTelemetry={cli.flags.disableTelemetry}
+    fromVersion={cli.flags.from}
+    ignore={cli.flags.ignore}
+    noWarnings={cli.flags.noWarnings}
+    sdk={cli.flags.sdk}
+    toVersion={cli.flags.to}
+    yolo={cli.flags.yolo}
   />,
   // if having issues with errors being swallowed, uncomment this
   // { debug: true },
diff --git a/packages/upgrade/src/codemods/__tests__/__fixtures__/transform-async-request.fixtures.js b/packages/upgrade/src/codemods/__tests__/__fixtures__/transform-async-request.fixtures.js
new file mode 100644
index 00000000000..3c21861b8a2
--- /dev/null
+++ b/packages/upgrade/src/codemods/__tests__/__fixtures__/transform-async-request.fixtures.js
@@ -0,0 +1,161 @@
+export const fixtures = [
+  {
+    name: 'Basic await transform',
+    source: `
+import { auth } from '@clerk/nextjs/server';
+
+export function any() {
+    const { userId } = auth();
+    return new Response(JSON.stringify({ userId }));
+}
+
+export function another() {
+    return true;
+}
+    `,
+    output: `
+import { auth } from '@clerk/nextjs/server';
+
+export async function any() {
+    const { userId } = await auth();
+    return new Response(JSON.stringify({ userId }));
+}
+
+export function another() {
+    return true;
+}
+    `,
+  },
+  {
+    name: 'auth().protect -> await auth.protect()',
+    source: `
+import { auth } from '@clerk/nextjs/server';
+
+export function GET() {
+    const { userId } = auth().protect(
+        (has) => has({ role: 'admin' }) || has({ role: 'org:editor' }),
+    );
+    return new Response(JSON.stringify({ userId }));
+}
+    `,
+    output: `
+import { auth } from '@clerk/nextjs/server';
+
+export async function GET() {
+    const { userId } = await auth.protect(
+        (has) => has({ role: 'admin' }) || has({ role: 'org:editor' }),
+    );
+    return new Response(JSON.stringify({ userId }));
+}
+    `,
+  },
+  {
+    name: 'Basic clerkMiddleware()',
+    source: `
+import {
+    clerkMiddleware,
+    createRouteMatcher
+} from "@clerk/nextjs/server"
+
+const isPublicRoute = createRouteMatcher(["/", "/contact"])
+
+export default clerkMiddleware((auth, req) => {
+    auth().protect(); // for any other route, require auth
+})
+    `,
+    output: `
+import {
+    clerkMiddleware,
+    createRouteMatcher
+} from "@clerk/nextjs/server"
+
+const isPublicRoute = createRouteMatcher(["/", "/contact"])
+
+export default clerkMiddleware(async (auth, req) => {
+    await auth.protect(); // for any other route, require auth
+})
+    `,
+  },
+  {
+    name: 'Complex clerkMiddleware()',
+    source: `
+import {
+    clerkMiddleware,
+    createRouteMatcher
+} from "@clerk/nextjs/server"
+import createMiddleware from "next-intl/middleware"
+
+const intlMiddleware = createMiddleware({
+    locales: ["en", "de"],
+    defaultLocale: "en",
+})
+
+const isDashboardRoute = createRouteMatcher(["/dashboard(.*)"])
+
+export default clerkMiddleware((auth, request) => {
+    if (isDashboardRoute(request)) auth().protect()
+
+    return intlMiddleware(request)
+})
+    `,
+    output: `
+import {
+    clerkMiddleware,
+    createRouteMatcher
+} from "@clerk/nextjs/server"
+import createMiddleware from "next-intl/middleware"
+
+const intlMiddleware = createMiddleware({
+    locales: ["en", "de"],
+    defaultLocale: "en",
+})
+
+const isDashboardRoute = createRouteMatcher(["/dashboard(.*)"])
+
+export default clerkMiddleware(async (auth, request) => {
+    if (isDashboardRoute(request)) await auth.protect()
+
+    return intlMiddleware(request)
+})
+`,
+  },
+  {
+    name: 'Complex clerkMiddleware() with protect being destructured from auth()',
+    source: `
+import { clerkMiddleware } from '@clerk/nextjs/server';
+
+export default clerkMiddleware(
+  (auth, req) => {
+    const { protect, sessionClaims } = auth();
+
+    protect();
+  },
+);
+`,
+    output: `
+import { clerkMiddleware } from '@clerk/nextjs/server';
+
+export default clerkMiddleware(
+  async (auth, req) => {
+    const {
+      sessionClaims
+    } = auth();
+
+    await auth.protect();
+  },
+);
+`,
+  },
+  {
+    name: 'Does not transform other imports',
+    source: `
+import { auth } from '@some/other/module';
+
+export function any() {
+    const { IBauthed } = auth();
+    return new Response(JSON.stringify({ IBauthed }));
+}
+    `,
+    output: '',
+  },
+];
diff --git a/packages/upgrade/src/codemods/__tests__/transform-async-request.test.js b/packages/upgrade/src/codemods/__tests__/transform-async-request.test.js
new file mode 100644
index 00000000000..7efdf21458c
--- /dev/null
+++ b/packages/upgrade/src/codemods/__tests__/transform-async-request.test.js
@@ -0,0 +1,13 @@
+import { applyTransform } from 'jscodeshift/dist/testUtils';
+import { describe, expect, it } from 'vitest';
+
+import transformer from '../transform-async-request';
+import { fixtures } from './__fixtures__/transform-async-request.fixtures';
+
+describe('transform-async-request', () => {
+  it.each(fixtures)(`$name`, ({ source, output }) => {
+    const result = applyTransform(transformer, {}, { source });
+
+    expect(result).toEqual(output.trim());
+  });
+});
diff --git a/packages/upgrade/src/codemods/index.js b/packages/upgrade/src/codemods/index.js
new file mode 100644
index 00000000000..0cbc83835e9
--- /dev/null
+++ b/packages/upgrade/src/codemods/index.js
@@ -0,0 +1,17 @@
+import { dirname, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+import { run } from 'jscodeshift/src/Runner.js';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
+export async function runCodemod(transform = 'transform-async-request', paths, options) {
+  const resolvedPath = resolve(__dirname, `${transform}.js`);
+
+  return await run(resolvedPath, paths ?? [], {
+    dry: true,
+    ...options,
+    // we must silence stdout to prevent output from interfering with ink CLI
+    silent: true,
+  });
+}
diff --git a/packages/upgrade/src/codemods/transform-async-request.js b/packages/upgrade/src/codemods/transform-async-request.js
new file mode 100644
index 00000000000..b0dc98ce96b
--- /dev/null
+++ b/packages/upgrade/src/codemods/transform-async-request.js
@@ -0,0 +1,145 @@
+/**
+ * Transforms the source code by modifying calls to `auth().protect()` and ensuring
+ * that calls to `auth` are awaited within function declarations.
+ *
+ * @param {import('jscodeshift').FileInfo} FileInfo - The parameters object
+ * @param {import('jscodeshift').API} api - The API object provided by jscodeshift
+ * @param {Object} _options - Additional options (unused)
+ * @returns {string|undefined} - The transformed source code if modifications were made, otherwise undefined
+ */
+export default function transformAsyncRequest({ _path, source }, { jscodeshift: j }, _options) {
+  const root = j(source);
+  let dirtyFlag = false;
+
+  // Short-circuit if the import from '@clerk/nextjs/server' is not found
+  if (
+    root
+      .find(j.ImportDeclaration, {
+        source: { value: '@clerk/nextjs/server' },
+      })
+      .size() === 0
+  ) {
+    return undefined;
+  }
+
+  // Find all function expressions
+  root.find(j.FunctionDeclaration).forEach(func => {
+    let authCallFound = false;
+    let authProtectFound = false;
+
+    // Find the auth().protect call and transform it
+    j(func)
+      .find(j.CallExpression, {
+        callee: {
+          type: 'MemberExpression',
+          object: { type: 'CallExpression', callee: { name: 'auth' } },
+          property: { name: 'protect' },
+        },
+      })
+      .forEach(authProtectPath => {
+        // Replace auth().protect with await auth.protect
+        authProtectPath.node.callee = j.memberExpression(j.identifier('auth'), j.identifier('protect'));
+        authProtectPath.replace(j.awaitExpression(authProtectPath.node));
+        authProtectFound = true;
+        dirtyFlag = true;
+      });
+
+    // Find the auth() call and transform it
+    j(func)
+      .find(j.CallExpression, { callee: { name: 'auth' } })
+      .forEach(authPath => {
+        authCallFound = true;
+        // Ensure the call to 'auth' is awaited
+        if (!j.AwaitExpression.check(authPath.parent.node)) {
+          j(authPath).replaceWith(j.awaitExpression(authPath.node));
+          dirtyFlag = true;
+        }
+      });
+
+    // Add 'async' keyword to the function declaration
+    if (!func.node.async && (authCallFound || authProtectFound)) {
+      func.node.async = true;
+      dirtyFlag = true;
+    }
+  });
+
+  // Find the default export which is a call to clerkMiddleware
+  root.find(j.ExportDefaultDeclaration).forEach(path => {
+    const declaration = path.node.declaration;
+    if (
+      j.CallExpression.check(declaration) &&
+      j.Identifier.check(declaration.callee) &&
+      declaration.callee.name === 'clerkMiddleware'
+    ) {
+      const middlewareFunction = declaration.arguments[0];
+      if (j.FunctionExpression.check(middlewareFunction) || j.ArrowFunctionExpression.check(middlewareFunction)) {
+        // Add async keyword to the function
+        if (!middlewareFunction.async) {
+          middlewareFunction.async = true;
+          dirtyFlag = true;
+        }
+
+        // Find auth().protect()
+        j(middlewareFunction.body)
+          .find(j.CallExpression, {
+            callee: {
+              type: 'MemberExpression',
+              object: { type: 'CallExpression', callee: { type: 'Identifier', name: 'auth' } },
+              property: { type: 'Identifier', name: 'protect' },
+            },
+          })
+          .forEach(callPath => {
+            const memberExpr = callPath.node.callee;
+            if (j.MemberExpression.check(memberExpr) && j.CallExpression.check(memberExpr.object)) {
+              // Transform auth().protect() to await auth.protect()
+              callPath.replace(
+                j.awaitExpression(
+                  j.callExpression(j.memberExpression(j.identifier('auth'), j.identifier('protect')), []),
+                ),
+              );
+              dirtyFlag = true;
+            }
+          });
+
+        // Find the destructuring assignment and modify it
+        j(middlewareFunction.body)
+          .find(j.VariableDeclarator)
+          .forEach(varPath => {
+            const id = varPath.node.id;
+            const init = varPath.node.init;
+            if (
+              j.ObjectPattern.check(id) &&
+              j.CallExpression.check(init) &&
+              j.Identifier.check(init.callee) &&
+              init.callee.name === 'auth'
+            ) {
+              // Remove 'protect' from destructuring
+              id.properties = id.properties.filter(prop => {
+                return !(j.Identifier.check(prop.key) && prop.key.name === 'protect');
+              });
+              dirtyFlag = true;
+            }
+          });
+
+        // Replace protect() call with await auth.protect()
+        j(middlewareFunction.body)
+          .find(j.ExpressionStatement)
+          .forEach(exprPath => {
+            const expr = exprPath.node.expression;
+            if (j.CallExpression.check(expr) && j.Identifier.check(expr.callee) && expr.callee.name === 'protect') {
+              exprPath.replace(
+                j.expressionStatement(
+                  j.awaitExpression(
+                    j.callExpression(j.memberExpression(j.identifier('auth'), j.identifier('protect')), []),
+                  ),
+                ),
+              );
+              dirtyFlag = true;
+            }
+          });
+      }
+    }
+  });
+
+  return dirtyFlag ? root.toSource() : undefined;
+}
diff --git a/packages/upgrade/src/components/Codemod.js b/packages/upgrade/src/components/Codemod.js
new file mode 100644
index 00000000000..929cf24f6f8
--- /dev/null
+++ b/packages/upgrade/src/components/Codemod.js
@@ -0,0 +1,75 @@
+import { TextInput } from '@inkjs/ui';
+import { Newline, Text } from 'ink';
+import React, { useEffect, useState } from 'react';
+
+import { runCodemod } from '../codemods/index.js';
+
+/**
+ * Codemod component that allows users to run a codemod transformation on their project files.
+ *
+ * @param {Object} props - The properties object.
+ * @param {Function} props.callback - The callback function to be called after the codemod is run.
+ * @param {string} [props.dir] - The directory to scan for files in the project.
+ * @param {string} props.sdk - The SDK name to be used in the codemod.
+ * @param {string} props.transform - The transformation to be applied by the codemod.
+ *
+ * @returns {JSX.Element} The rendered Codemod component.
+ */
+export function Codemod(props) {
+  const { callback, sdk, transform } = props;
+  const [error, setError] = useState();
+  const [result, setResult] = useState(null);
+  const [glob, setGlob] = useState(props.glob);
+
+  useEffect(() => {
+    if (!glob) {
+      return;
+    }
+    console.log(glob);
+    runCodemod(transform, glob)
+      .then(res => {
+        setResult(res);
+      })
+      .catch(err => {
+        setError(err);
+      })
+      .finally(() => {
+        callback(true);
+      });
+  }, [glob]);
+
+  return (
+    <>
+      <>
+        <Text>Where would you like for us to scan for files in your project?</Text>
+        <Text color='gray'>(globstar syntax supported)</Text>
+        {glob ? (
+          <Text>{glob.toString()}</Text>
+        ) : (
+          <TextInput
+            defaultValue='**/*'
+            onSubmit={val => {
+              setGlob(val.split(/[ ,]/));
+            }}
+          />
+        )}
+      </>
+      {!result && !error && glob && (
+        <Text>
+          Running <Text bold>@clerk/{sdk}</Text> codemod... {transform}
+        </Text>
+      )}
+      {result && (
+        <>
+          <Text>
+            Running <Text bold>@clerk/{sdk}</Text> codemod... {transform} complete!
+          </Text>
+          <Newline />
+          <Text bold>Results:</Text>
+          {result.timeElapsed && <Text>Time elapsed: {result.timeElapsed}</Text>}
+        </>
+      )}
+      {error && <Text color='red'>{error.message}</Text>}
+    </>
+  );
+}
diff --git a/packages/upgrade/src/components/Header.js b/packages/upgrade/src/components/Header.js
new file mode 100644
index 00000000000..4caee200bf3
--- /dev/null
+++ b/packages/upgrade/src/components/Header.js
@@ -0,0 +1,14 @@
+import BigText from 'ink-big-text';
+import Gradient from 'ink-gradient';
+import React from 'react';
+
+export function Header() {
+  return (
+    <Gradient name='vice'>
+      <BigText
+        text='Clerk Upgrade'
+        font='tiny'
+      />
+    </Gradient>
+  );
+}
diff --git a/packages/upgrade/src/components/SDKWorkflow.js b/packages/upgrade/src/components/SDKWorkflow.js
new file mode 100644
index 00000000000..0e9bdacd06d
--- /dev/null
+++ b/packages/upgrade/src/components/SDKWorkflow.js
@@ -0,0 +1,96 @@
+import { Select } from '@inkjs/ui';
+import { execa } from 'execa';
+import { Newline, Text } from 'ink';
+import React, { useEffect, useState } from 'react';
+
+import { getUpgradeCommand } from '../util/detect-package-manager.js';
+import { getClerkSdkVersion } from '../util/get-clerk-version.js';
+import { Codemod } from './Codemod.js';
+import { Header } from './Header.js';
+
+export function SDKWorkflow(props) {
+  const { sdk } = props;
+
+  const [done, setDone] = useState(false);
+  const [upgradeComplete, setUpgradeComplete] = useState(false);
+
+  const version = getClerkSdkVersion(sdk);
+
+  return (
+    <>
+      <Header />
+      {version === 5 && (
+        <>
+          <UpgradeCommand
+            callback={setUpgradeComplete}
+            sdk={sdk}
+          />
+          {upgradeComplete ? (
+            <Codemod
+              callback={setDone}
+              sdk={sdk}
+              transform='transform-async-request'
+            />
+          ) : null}
+        </>
+      )}
+      {!done && version === 6 && (
+        <>
+          <Text>
+            Looks like you are already on the latest version of <Text bold>@clerk/{sdk}</Text>. Would you like to run
+            the associated codemod?.
+          </Text>
+          {upgradeComplete ? (
+            <Codemod
+              sdk={sdk}
+              callback={setDone}
+            />
+          ) : (
+            <Select
+              options={[
+                { label: 'yes', value: 'yes' },
+                { label: 'no', value: 'no' },
+              ]}
+              onChange={value => {
+                if (value === 'yes') {
+                  setUpgradeComplete(true);
+                } else {
+                  setDone(true);
+                }
+              }}
+            />
+          )}
+        </>
+      )}
+      {done && <Text>You are done!</Text>}
+    </>
+  );
+}
+
+function UpgradeCommand({ sdk, callback }) {
+  const [result, setResult] = useState();
+  const [error, setError] = useState();
+
+  const command = getUpgradeCommand(sdk);
+
+  useEffect(() => {
+    execa({ shell: true })`${command}`
+      .then(res => {
+        setResult(res);
+        callback(true);
+      })
+      .catch(err => {
+        console.error(error);
+        setError(err);
+      });
+  }, [command]);
+
+  return (
+    <>
+      <Text>Running upgrade command: {command}</Text>
+      {result && <Text color='green'>Upgrade complete!</Text>}
+      {error && <Text color='red'>Upgrade failed!</Text>}
+      <Newline />
+    </>
+  );
+}
diff --git a/packages/upgrade/src/scan.js b/packages/upgrade/src/components/Scan.js
similarity index 97%
rename from packages/upgrade/src/scan.js
rename to packages/upgrade/src/components/Scan.js
index 100317ff631..a0d06af6d79 100644
--- a/packages/upgrade/src/scan.js
+++ b/packages/upgrade/src/components/Scan.js
@@ -6,9 +6,9 @@ import { Newline, Text } from 'ink';
 import path from 'path';
 import React, { useEffect, useState } from 'react';
 
-import ExpandableList from './util/expandable-list.js';
+import ExpandableList from '../util/expandable-list.js';
 
-export default function Scan({ fromVersion, toVersion, sdks, dir, ignore, noWarnings, uuid, disableTelemetry }) {
+export function Scan({ fromVersion, toVersion, sdks, dir, ignore, noWarnings, uuid, disableTelemetry }) {
   // NOTE: if the difference between fromVersion and toVersion is greater than 1
   // we need to do a little extra work here and import two matchers,
   // sequence them after each other, and clearly mark which version migration
diff --git a/packages/upgrade/src/constants/versions.js b/packages/upgrade/src/constants/versions.js
index 3e32d88b991..ab1c31a1cb0 100644
--- a/packages/upgrade/src/constants/versions.js
+++ b/packages/upgrade/src/constants/versions.js
@@ -1,4 +1,5 @@
 export default [
+  { label: 'Next', value: 'next' },
   { label: 'Core 2', value: 'core-2' },
   { label: 'Core 1', value: 'core-1' },
 ];
diff --git a/packages/upgrade/src/util/detect-package-manager.js b/packages/upgrade/src/util/detect-package-manager.js
new file mode 100644
index 00000000000..a0b15e3a8ee
--- /dev/null
+++ b/packages/upgrade/src/util/detect-package-manager.js
@@ -0,0 +1,24 @@
+import { existsSync } from 'fs';
+
+export function detectPackageManager() {
+  if (existsSync('package-lock.json')) {
+    return 'npm';
+  } else if (existsSync('yarn.lock')) {
+    return 'yarn';
+  } else if (existsSync('pnpm-lock.yaml')) {
+    return 'pnpm';
+  } else {
+    return 'npm';
+  }
+}
+
+export function getUpgradeCommand(sdk) {
+  switch (detectPackageManager()) {
+    case 'yarn':
+      return `yarn add @clerk/${sdk}@latest`;
+    case 'pnpm':
+      return `pnpm add @clerk/${sdk}@latest`;
+    default:
+      return `npm install @clerk/${sdk}@latest`;
+  }
+}
diff --git a/packages/upgrade/src/util/get-clerk-version.js b/packages/upgrade/src/util/get-clerk-version.js
index 98baeddc9fc..316aefeb54b 100644
--- a/packages/upgrade/src/util/get-clerk-version.js
+++ b/packages/upgrade/src/util/get-clerk-version.js
@@ -1,8 +1,31 @@
 import { readPackageSync } from 'read-pkg';
 import semverRegex from 'semver-regex';
 
-export default function getClerkMajorVersion() {
+export function getClerkMajorVersion() {
   const pkg = readPackageSync();
   const clerk = pkg.dependencies.clerk;
-  return clerk ? semverRegex.exec(clerk)[0][0] : false;
+  return clerk ? semverRegex().exec(clerk)[0][0] : false;
+}
+
+export function getClerkSdkVersion(sdk) {
+  const pkg = readPackageSync();
+  const clerkSdk = pkg.dependencies[`@clerk/${sdk}`];
+  if (!clerkSdk) {
+    return false;
+  }
+
+  try {
+    return getMajorVersion(clerkSdk.replace('^', '').replace('~', ''));
+  } catch {
+    return false;
+  }
+}
+
+function getMajorVersion(semver) {
+  const match = semver.match(semverRegex());
+  if (match) {
+    const [major] = match[0].split('.');
+    return parseInt(major, 10); // Return as an integer
+  }
+  throw new Error('Invalid semver string');
 }
diff --git a/packages/upgrade/vitest.config.js b/packages/upgrade/vitest.config.js
new file mode 100644
index 00000000000..2dcea8c54d1
--- /dev/null
+++ b/packages/upgrade/vitest.config.js
@@ -0,0 +1,8 @@
+import { defineConfig } from 'vitest/config';
+
+export default defineConfig({
+  test: {
+    globals: false,
+    environment: 'node',
+  },
+});
diff --git a/playground/app-router/src/app/action/page.tsx b/playground/app-router/src/app/action/page.tsx
index a143b30183e..5962909a82b 100644
--- a/playground/app-router/src/app/action/page.tsx
+++ b/playground/app-router/src/app/action/page.tsx
@@ -3,7 +3,7 @@ import { auth, currentUser } from '@clerk/nextjs/server';
 export default function AddToCart() {
   async function addItem(data: any) {
     'use server';
-    console.log(auth().userId);
+    console.log((await auth()).userId);
     console.log((await currentUser())?.firstName);
     console.log('add item server action', data);
   }
diff --git a/playground/app-router/src/app/protected/page.tsx b/playground/app-router/src/app/protected/page.tsx
index ec270135955..dbf53f5c6c9 100644
--- a/playground/app-router/src/app/protected/page.tsx
+++ b/playground/app-router/src/app/protected/page.tsx
@@ -1,11 +1,13 @@
-import { auth, ClerkLoaded, SignedIn, SignedOut, UserButton } from '@clerk/nextjs';
+import { useAuth, ClerkLoaded, SignedIn, SignedOut, UserButton } from '@clerk/nextjs';
 import React from 'react';
 import { ClientSideWrapper } from '@/app/protected/ClientSideWrapper';
 import { headers } from 'next/headers';
 
-export default function Page() {
-  const { userId } = auth();
-  console.log('Auth run in /protected', userId, headers().get('x-clerk-debug'), headers().keys());
+export default async function Page() {
+  const { userId } = useAuth();
+  const resolvedHeaders = await headers().get('x-clerk-debug');
+
+  console.log('Auth run in /protected', userId, resolvedHeaders.get('x-clerk-debug'), resolvedHeaders.keys());
   // console.log(auth());
   return (
     <div>
diff --git a/playground/app-router/src/pages/user/[[...index]].tsx b/playground/app-router/src/pages/user/[[...index]].tsx
index 9769bbf59a4..965be25b361 100644
--- a/playground/app-router/src/pages/user/[[...index]].tsx
+++ b/playground/app-router/src/pages/user/[[...index]].tsx
@@ -22,4 +22,4 @@ const UserProfilePage: NextPage = (props: any) => {
   );
 };
 
-export default UserProfilePage;
+export default UserProfilePage;
\ No newline at end of file
diff --git a/playground/nextjs/app/app-dir/page.tsx b/playground/nextjs/app/app-dir/page.tsx
index 7fc36ec68c1..2f21a6da389 100644
--- a/playground/nextjs/app/app-dir/page.tsx
+++ b/playground/nextjs/app/app-dir/page.tsx
@@ -3,7 +3,7 @@ import { auth, clerkClient, currentUser } from '@clerk/nextjs/server';
 import Link from 'next/link';
 
 export default async function Page() {
-  const { userId } = auth();
+  const { userId } = await auth();
   const currentUser_ = await currentUser();
   const user = userId ? await clerkClient.users.getUser(userId) : null;
 

From f1652070c7c30cdf40a36d846245e027e1c3c4b1 Mon Sep 17 00:00:00 2001
From: Jacek <jacek@clerk.dev>
Date: Thu, 17 Oct 2024 14:47:18 -0500
Subject: [PATCH 02/12] run codemod through cli

---
 packages/upgrade/package.json                 |  4 +--
 packages/upgrade/src/app.js                   |  7 ++++-
 packages/upgrade/src/cli.js                   |  5 +++-
 .../__tests__/transform-async-request.test.js |  2 +-
 packages/upgrade/src/codemods/index.js        | 29 +++++++++++++++++--
 ...request.js => transform-async-request.cjs} |  8 +++--
 packages/upgrade/src/components/Codemod.js    |  5 +++-
 .../upgrade/src/components/SDKWorkflow.js     |  4 +--
 .../src/util/detect-package-manager.js        |  4 +--
 9 files changed, 53 insertions(+), 15 deletions(-)
 rename packages/upgrade/src/codemods/{transform-async-request.js => transform-async-request.cjs} (96%)

diff --git a/packages/upgrade/package.json b/packages/upgrade/package.json
index 05e0f8068de..1a1156cd2df 100644
--- a/packages/upgrade/package.json
+++ b/packages/upgrade/package.json
@@ -16,9 +16,9 @@
     "dist"
   ],
   "scripts": {
-    "build": "npm run clean && NODE_ENV=production babel --out-dir=dist src --copy-files",
+    "build": "npm run clean && NODE_ENV=production babel --keep-file-extension --out-dir=dist src --copy-files",
     "clean": "del-cli dist/*",
-    "dev": "babel --out-dir=dist --watch src --copy-files",
+    "dev": "babel --keep-file-extension --out-dir=dist --watch src --copy-files",
     "lint": "eslint src/",
     "lint:publint": "publint",
     "test": "vitest"
diff --git a/packages/upgrade/src/app.js b/packages/upgrade/src/app.js
index f0d00bb2e5d..66e16496a12 100644
--- a/packages/upgrade/src/app.js
+++ b/packages/upgrade/src/app.js
@@ -50,7 +50,12 @@ export default function App(props) {
 
   // Handle the individual SDK upgrade
   if (sdks.length === 1) {
-    return <SDKWorkflow sdk={sdks[0]} />;
+    return (
+      <SDKWorkflow
+        packageManager={props.packageManager}
+        sdk={sdks[0]}
+      />
+    );
   }
 
   // We try to guess which SDK they are using
diff --git a/packages/upgrade/src/cli.js b/packages/upgrade/src/cli.js
index 1d92919e267..d121f7bbefa 100644
--- a/packages/upgrade/src/cli.js
+++ b/packages/upgrade/src/cli.js
@@ -16,7 +16,8 @@ const cli = meow(
 			--to               Major version number you're upgrading to
 			--sdk              Name of the SDK you're upgrading
 			--dir              Directory you'd like to scan for files
-			--ignore           Any files or directories you'd like to ignore
+      --ignore           Any files or directories you'd like to ignore
+      --packageManager   The package manager you're using (npm, yarn, pnpm)
 			--noWarnings       Do not print warnings, only items that must be fixed
 			--disableTelemetry Do not send anonymous usage telemetry
 
@@ -32,6 +33,7 @@ const cli = meow(
       sdk: { type: 'string', choices: sdks.map(i => i.value) },
       dir: { type: 'string' },
       ignore: { type: 'string', isMultiple: true },
+      packageManager: { type: 'string' },
       yolo: { type: 'boolean' },
       noWarnings: { type: 'boolean' },
       disableTelemetry: { type: 'boolean' },
@@ -46,6 +48,7 @@ render(
     fromVersion={cli.flags.from}
     ignore={cli.flags.ignore}
     noWarnings={cli.flags.noWarnings}
+    packageManager={cli.flags.packageManager}
     sdk={cli.flags.sdk}
     toVersion={cli.flags.to}
     yolo={cli.flags.yolo}
diff --git a/packages/upgrade/src/codemods/__tests__/transform-async-request.test.js b/packages/upgrade/src/codemods/__tests__/transform-async-request.test.js
index 7efdf21458c..0f0bd1e505b 100644
--- a/packages/upgrade/src/codemods/__tests__/transform-async-request.test.js
+++ b/packages/upgrade/src/codemods/__tests__/transform-async-request.test.js
@@ -1,7 +1,7 @@
 import { applyTransform } from 'jscodeshift/dist/testUtils';
 import { describe, expect, it } from 'vitest';
 
-import transformer from '../transform-async-request';
+import transformer from '../transform-async-request.cjs';
 import { fixtures } from './__fixtures__/transform-async-request.fixtures';
 
 describe('transform-async-request', () => {
diff --git a/packages/upgrade/src/codemods/index.js b/packages/upgrade/src/codemods/index.js
index 0cbc83835e9..1e422276b2f 100644
--- a/packages/upgrade/src/codemods/index.js
+++ b/packages/upgrade/src/codemods/index.js
@@ -1,15 +1,38 @@
 import { dirname, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
+import { globby } from 'globby';
 import { run } from 'jscodeshift/src/Runner.js';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 
-export async function runCodemod(transform = 'transform-async-request', paths, options) {
-  const resolvedPath = resolve(__dirname, `${transform}.js`);
+export async function runCodemod(transform = 'transform-async-request', glob, options) {
+  const resolvedPath = resolve(__dirname, `${transform}.cjs`);
+
+  const paths = await globby(glob, {
+    ignore: [
+      '**/*.md',
+      'node_modules/**',
+      '**/node_modules/**',
+      '.git/**',
+      '**/*.json',
+      'package.json',
+      '**/package.json',
+      'package-lock.json',
+      '**/package-lock.json',
+      'yarn.lock',
+      '**/yarn.lock',
+      'pnpm-lock.yaml',
+      '**/pnpm-lock.yaml',
+      'yalc.lock',
+      '**/*.(ico|png|webp|svg|gif|jpg|jpeg)+', // common image files
+      '**/*.(mp4|mkv|wmv|m4v|mov|avi|flv|webm|flac|mka|m4a|aac|ogg)+', // common video files] }).then(files => {
+      '**/*.(css|scss|sass|less|styl)+', // common style files
+    ],
+  });
 
   return await run(resolvedPath, paths ?? [], {
-    dry: true,
+    dry: false,
     ...options,
     // we must silence stdout to prevent output from interfering with ink CLI
     silent: true,
diff --git a/packages/upgrade/src/codemods/transform-async-request.js b/packages/upgrade/src/codemods/transform-async-request.cjs
similarity index 96%
rename from packages/upgrade/src/codemods/transform-async-request.js
rename to packages/upgrade/src/codemods/transform-async-request.cjs
index b0dc98ce96b..4f355e367fb 100644
--- a/packages/upgrade/src/codemods/transform-async-request.js
+++ b/packages/upgrade/src/codemods/transform-async-request.cjs
@@ -7,10 +7,12 @@
  * @param {Object} _options - Additional options (unused)
  * @returns {string|undefined} - The transformed source code if modifications were made, otherwise undefined
  */
-export default function transformAsyncRequest({ _path, source }, { jscodeshift: j }, _options) {
+module.exports = function transformAsyncRequest({ path, source }, { jscodeshift: j }, _options) {
   const root = j(source);
   let dirtyFlag = false;
 
+  console.log('path', path);
+
   // Short-circuit if the import from '@clerk/nextjs/server' is not found
   if (
     root
@@ -142,4 +144,6 @@ export default function transformAsyncRequest({ _path, source }, { jscodeshift:
   });
 
   return dirtyFlag ? root.toSource() : undefined;
-}
+};
+
+module.exports.parser = 'tsx';
diff --git a/packages/upgrade/src/components/Codemod.js b/packages/upgrade/src/components/Codemod.js
index 929cf24f6f8..65767dc23b2 100644
--- a/packages/upgrade/src/components/Codemod.js
+++ b/packages/upgrade/src/components/Codemod.js
@@ -25,7 +25,6 @@ export function Codemod(props) {
     if (!glob) {
       return;
     }
-    console.log(glob);
     runCodemod(transform, glob)
       .then(res => {
         setResult(res);
@@ -66,6 +65,10 @@ export function Codemod(props) {
           </Text>
           <Newline />
           <Text bold>Results:</Text>
+          <Text color='red'>{result.error ?? 0} errors</Text>
+          <Text color='green'>{result.ok ?? 0} ok</Text>
+          <Text color='yellow'>{result.skip ?? 0} skipped</Text>
+          <Text color='gray'>{result.nochange ?? 0} unmodified</Text>
           {result.timeElapsed && <Text>Time elapsed: {result.timeElapsed}</Text>}
         </>
       )}
diff --git a/packages/upgrade/src/components/SDKWorkflow.js b/packages/upgrade/src/components/SDKWorkflow.js
index 0e9bdacd06d..3c91dfc51a1 100644
--- a/packages/upgrade/src/components/SDKWorkflow.js
+++ b/packages/upgrade/src/components/SDKWorkflow.js
@@ -9,7 +9,7 @@ import { Codemod } from './Codemod.js';
 import { Header } from './Header.js';
 
 export function SDKWorkflow(props) {
-  const { sdk } = props;
+  const { packageManager, sdk } = props;
 
   const [done, setDone] = useState(false);
   const [upgradeComplete, setUpgradeComplete] = useState(false);
@@ -23,6 +23,7 @@ export function SDKWorkflow(props) {
         <>
           <UpgradeCommand
             callback={setUpgradeComplete}
+            packageManager={packageManager}
             sdk={sdk}
           />
           {upgradeComplete ? (
@@ -80,7 +81,6 @@ function UpgradeCommand({ sdk, callback }) {
         callback(true);
       })
       .catch(err => {
-        console.error(error);
         setError(err);
       });
   }, [command]);
diff --git a/packages/upgrade/src/util/detect-package-manager.js b/packages/upgrade/src/util/detect-package-manager.js
index a0b15e3a8ee..5ba8e8f7aef 100644
--- a/packages/upgrade/src/util/detect-package-manager.js
+++ b/packages/upgrade/src/util/detect-package-manager.js
@@ -12,8 +12,8 @@ export function detectPackageManager() {
   }
 }
 
-export function getUpgradeCommand(sdk) {
-  switch (detectPackageManager()) {
+export function getUpgradeCommand(sdk, packageManager) {
+  switch (packageManager || detectPackageManager()) {
     case 'yarn':
       return `yarn add @clerk/${sdk}@latest`;
     case 'pnpm':

From 56307be722bc8e4321eab3c972b70580c21e115c Mon Sep 17 00:00:00 2001
From: Jacek <jacek@clerk.dev>
Date: Thu, 17 Oct 2024 16:23:54 -0500
Subject: [PATCH 03/12] WIP

---
 packages/upgrade/src/app.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/upgrade/src/app.js b/packages/upgrade/src/app.js
index 66e16496a12..2d225b564f0 100644
--- a/packages/upgrade/src/app.js
+++ b/packages/upgrade/src/app.js
@@ -33,8 +33,11 @@ export default function App(props) {
   const [sdkGuessConfirmed, setSdkGuessConfirmed] = useState(false);
   const [sdkGuessAttempted, setSdkGuessAttempted] = useState(false);
   // See comments below, can be enabled on next major
+
+  // eslint-disable-next-line no-unused-vars
   const [fromVersion, setFromVersion] = useState(props.fromVersion);
   const [fromVersionGuessAttempted, setFromVersionGuessAttempted] = useState(false);
+  // eslint-disable-next-line no-unused-vars
   const [toVersion, setToVersion] = useState(props.toVersion);
   const [dir, setDir] = useState(props.dir);
   const [ignore, setIgnore] = useState(props.ignore);

From c23e478657653a4b835e02c098f6956c6080921d Mon Sep 17 00:00:00 2001
From: Jacek <jacek@clerk.dev>
Date: Thu, 17 Oct 2024 20:10:57 -0500
Subject: [PATCH 04/12] fix edge case in codemod

---
 .../transform-async-request.fixtures.js       | 149 +++++++++++-------
 .../src/codemods/transform-async-request.cjs  |  61 +++----
 2 files changed, 119 insertions(+), 91 deletions(-)

diff --git a/packages/upgrade/src/codemods/__tests__/__fixtures__/transform-async-request.fixtures.js b/packages/upgrade/src/codemods/__tests__/__fixtures__/transform-async-request.fixtures.js
index 3c21861b8a2..8d1dc4718a8 100644
--- a/packages/upgrade/src/codemods/__tests__/__fixtures__/transform-async-request.fixtures.js
+++ b/packages/upgrade/src/codemods/__tests__/__fixtures__/transform-async-request.fixtures.js
@@ -26,6 +26,45 @@ export function another() {
 }
     `,
   },
+  {
+    name: 'Arrow function await transform',
+    source: `
+'use server';
+
+import { patchCommunication, postSMSTemplate } from '@/app/api/instances';
+import { Instance } from '@/app/api/types/instances';
+import { Template } from '@/app/api/types/templates';
+import { auth } from '@clerk/nextjs/server';
+
+export const toggleSMSTemplate = async (
+  instanceId: string,
+  template: Template,
+) => {
+  const { getToken } = auth();
+
+  return await postSMSTemplate(instanceId, template, {
+    token: await getToken(),
+  });
+};`,
+    output: `
+'use server';
+
+import { patchCommunication, postSMSTemplate } from '@/app/api/instances';
+import { Instance } from '@/app/api/types/instances';
+import { Template } from '@/app/api/types/templates';
+import { auth } from '@clerk/nextjs/server';
+
+export const toggleSMSTemplate = async (
+  instanceId: string,
+  template: Template,
+) => {
+  const { getToken } = await auth();
+
+  return await postSMSTemplate(instanceId, template, {
+    token: await getToken(),
+  });
+};`,
+  },
   {
     name: 'auth().protect -> await auth.protect()',
     source: `
@@ -52,72 +91,72 @@ export async function GET() {
   {
     name: 'Basic clerkMiddleware()',
     source: `
-import {
-    clerkMiddleware,
-    createRouteMatcher
-} from "@clerk/nextjs/server"
+  import {
+      clerkMiddleware,
+      createRouteMatcher
+  } from "@clerk/nextjs/server"
 
-const isPublicRoute = createRouteMatcher(["/", "/contact"])
+  const isPublicRoute = createRouteMatcher(["/", "/contact"])
 
-export default clerkMiddleware((auth, req) => {
-    auth().protect(); // for any other route, require auth
-})
-    `,
+  export default clerkMiddleware((auth, req) => {
+      auth().protect(); // for any other route, require auth
+  })
+      `,
     output: `
-import {
-    clerkMiddleware,
-    createRouteMatcher
-} from "@clerk/nextjs/server"
+  import {
+      clerkMiddleware,
+      createRouteMatcher
+  } from "@clerk/nextjs/server"
 
-const isPublicRoute = createRouteMatcher(["/", "/contact"])
+  const isPublicRoute = createRouteMatcher(["/", "/contact"])
 
-export default clerkMiddleware(async (auth, req) => {
-    await auth.protect(); // for any other route, require auth
-})
-    `,
+  export default clerkMiddleware(async (auth, req) => {
+      await auth.protect(); // for any other route, require auth
+  })
+      `,
   },
   {
     name: 'Complex clerkMiddleware()',
     source: `
-import {
-    clerkMiddleware,
-    createRouteMatcher
-} from "@clerk/nextjs/server"
-import createMiddleware from "next-intl/middleware"
+  import {
+      clerkMiddleware,
+      createRouteMatcher
+  } from "@clerk/nextjs/server"
+  import createMiddleware from "next-intl/middleware"
 
-const intlMiddleware = createMiddleware({
-    locales: ["en", "de"],
-    defaultLocale: "en",
-})
+  const intlMiddleware = createMiddleware({
+      locales: ["en", "de"],
+      defaultLocale: "en",
+  })
 
-const isDashboardRoute = createRouteMatcher(["/dashboard(.*)"])
+  const isDashboardRoute = createRouteMatcher(["/dashboard(.*)"])
 
-export default clerkMiddleware((auth, request) => {
-    if (isDashboardRoute(request)) auth().protect()
+  export default clerkMiddleware((auth, request) => {
+      if (isDashboardRoute(request)) auth().protect()
 
-    return intlMiddleware(request)
-})
-    `,
+      return intlMiddleware(request)
+  })
+      `,
     output: `
-import {
-    clerkMiddleware,
-    createRouteMatcher
-} from "@clerk/nextjs/server"
-import createMiddleware from "next-intl/middleware"
+  import {
+      clerkMiddleware,
+      createRouteMatcher
+  } from "@clerk/nextjs/server"
+  import createMiddleware from "next-intl/middleware"
 
-const intlMiddleware = createMiddleware({
-    locales: ["en", "de"],
-    defaultLocale: "en",
-})
+  const intlMiddleware = createMiddleware({
+      locales: ["en", "de"],
+      defaultLocale: "en",
+  })
 
-const isDashboardRoute = createRouteMatcher(["/dashboard(.*)"])
+  const isDashboardRoute = createRouteMatcher(["/dashboard(.*)"])
 
-export default clerkMiddleware(async (auth, request) => {
-    if (isDashboardRoute(request)) await auth.protect()
+  export default clerkMiddleware(async (auth, request) => {
+      if (isDashboardRoute(request)) await auth.protect()
 
-    return intlMiddleware(request)
-})
-`,
+      return intlMiddleware(request)
+  })
+  `,
   },
   {
     name: 'Complex clerkMiddleware() with protect being destructured from auth()',
@@ -139,7 +178,7 @@ export default clerkMiddleware(
   async (auth, req) => {
     const {
       sessionClaims
-    } = auth();
+    } = await auth();
 
     await auth.protect();
   },
@@ -149,13 +188,13 @@ export default clerkMiddleware(
   {
     name: 'Does not transform other imports',
     source: `
-import { auth } from '@some/other/module';
+  import { auth } from '@some/other/module';
 
-export function any() {
-    const { IBauthed } = auth();
-    return new Response(JSON.stringify({ IBauthed }));
-}
-    `,
+  export function any() {
+      const { IBauthed } = auth();
+      return new Response(JSON.stringify({ IBauthed }));
+  }
+      `,
     output: '',
   },
 ];
diff --git a/packages/upgrade/src/codemods/transform-async-request.cjs b/packages/upgrade/src/codemods/transform-async-request.cjs
index 4f355e367fb..b3acfb07cae 100644
--- a/packages/upgrade/src/codemods/transform-async-request.cjs
+++ b/packages/upgrade/src/codemods/transform-async-request.cjs
@@ -11,8 +11,6 @@ module.exports = function transformAsyncRequest({ path, source }, { jscodeshift:
   const root = j(source);
   let dirtyFlag = false;
 
-  console.log('path', path);
-
   // Short-circuit if the import from '@clerk/nextjs/server' is not found
   if (
     root
@@ -24,8 +22,15 @@ module.exports = function transformAsyncRequest({ path, source }, { jscodeshift:
     return undefined;
   }
 
-  // Find all function expressions
-  root.find(j.FunctionDeclaration).forEach(func => {
+  // Helper function to make a function async
+  function makeFunctionAsync(func) {
+    if (!func.async) {
+      func.async = true;
+      dirtyFlag = true;
+    }
+  }
+
+  function transformFunctions(func) {
     let authCallFound = false;
     let authProtectFound = false;
 
@@ -63,7 +68,11 @@ module.exports = function transformAsyncRequest({ path, source }, { jscodeshift:
       func.node.async = true;
       dirtyFlag = true;
     }
-  });
+  }
+
+  // Find all function expressions
+  root.find(j.FunctionDeclaration).forEach(transformFunctions);
+  root.find(j.ArrowFunctionExpression).forEach(transformFunctions);
 
   // Find the default export which is a call to clerkMiddleware
   root.find(j.ExportDefaultDeclaration).forEach(path => {
@@ -76,32 +85,7 @@ module.exports = function transformAsyncRequest({ path, source }, { jscodeshift:
       const middlewareFunction = declaration.arguments[0];
       if (j.FunctionExpression.check(middlewareFunction) || j.ArrowFunctionExpression.check(middlewareFunction)) {
         // Add async keyword to the function
-        if (!middlewareFunction.async) {
-          middlewareFunction.async = true;
-          dirtyFlag = true;
-        }
-
-        // Find auth().protect()
-        j(middlewareFunction.body)
-          .find(j.CallExpression, {
-            callee: {
-              type: 'MemberExpression',
-              object: { type: 'CallExpression', callee: { type: 'Identifier', name: 'auth' } },
-              property: { type: 'Identifier', name: 'protect' },
-            },
-          })
-          .forEach(callPath => {
-            const memberExpr = callPath.node.callee;
-            if (j.MemberExpression.check(memberExpr) && j.CallExpression.check(memberExpr.object)) {
-              // Transform auth().protect() to await auth.protect()
-              callPath.replace(
-                j.awaitExpression(
-                  j.callExpression(j.memberExpression(j.identifier('auth'), j.identifier('protect')), []),
-                ),
-              );
-              dirtyFlag = true;
-            }
-          });
+        makeFunctionAsync(middlewareFunction);
 
         // Find the destructuring assignment and modify it
         j(middlewareFunction.body)
@@ -109,11 +93,10 @@ module.exports = function transformAsyncRequest({ path, source }, { jscodeshift:
           .forEach(varPath => {
             const id = varPath.node.id;
             const init = varPath.node.init;
+
             if (
-              j.ObjectPattern.check(id) &&
-              j.CallExpression.check(init) &&
-              j.Identifier.check(init.callee) &&
-              init.callee.name === 'auth'
+              (j.CallExpression.check(init) || j.AwaitExpression.check(init)) &&
+              (init.callee?.name === 'auth' || init.argument?.callee?.name === 'auth')
             ) {
               // Remove 'protect' from destructuring
               id.properties = id.properties.filter(prop => {
@@ -143,7 +126,13 @@ module.exports = function transformAsyncRequest({ path, source }, { jscodeshift:
     }
   });
 
-  return dirtyFlag ? root.toSource() : undefined;
+  if (dirtyFlag) {
+    if (process.env.NODE_ENV !== 'test') {
+      console.log(`changed: ${path}`);
+    }
+    return root.toSource();
+  }
+  return undefined;
 };
 
 module.exports.parser = 'tsx';

From a4f987bff3693e2cab66f595b897f2ef99674960 Mon Sep 17 00:00:00 2001
From: Jacek <jacek@clerk.dev>
Date: Thu, 17 Oct 2024 20:15:46 -0500
Subject: [PATCH 05/12] tabs to spaces

---
 packages/upgrade/src/cli.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/upgrade/src/cli.js b/packages/upgrade/src/cli.js
index d121f7bbefa..a1742293a05 100644
--- a/packages/upgrade/src/cli.js
+++ b/packages/upgrade/src/cli.js
@@ -8,21 +8,21 @@ import sdks from './constants/sdks.js';
 
 const cli = meow(
   `
-		Usage
-		  $ clerk-upgrade
+    Usage
+      $ clerk-upgrade
 
-		Options
-			--from             Major version number you're upgrading from
-			--to               Major version number you're upgrading to
-			--sdk              Name of the SDK you're upgrading
-			--dir              Directory you'd like to scan for files
+    Options
+      --from             Major version number you're upgrading from
+      --to               Major version number you're upgrading to
+      --sdk              Name of the SDK you're upgrading
+      --dir              Directory you'd like to scan for files
       --ignore           Any files or directories you'd like to ignore
       --packageManager   The package manager you're using (npm, yarn, pnpm)
-			--noWarnings       Do not print warnings, only items that must be fixed
-			--disableTelemetry Do not send anonymous usage telemetry
+      --noWarnings       Do not print warnings, only items that must be fixed
+      --disableTelemetry Do not send anonymous usage telemetry
 
-		Examples
-		  $ clerk-upgrade --sdk=nextjs --dir=src/**
+    Examples
+      $ clerk-upgrade --sdk=nextjs --dir=src/**
       $ clerk-upgrade --ignore=**/public/** --ignore=**/dist/**
 	`,
   {

From 49b6f8d7547693d10b3ba051eeb0c77c0ba24e81 Mon Sep 17 00:00:00 2001
From: Jacek Radko <jacekradko@gmail.com>
Date: Thu, 17 Oct 2024 20:18:12 -0500
Subject: [PATCH 06/12] Update packages/upgrade/src/constants/versions.js

---
 packages/upgrade/src/constants/versions.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/upgrade/src/constants/versions.js b/packages/upgrade/src/constants/versions.js
index ab1c31a1cb0..3e32d88b991 100644
--- a/packages/upgrade/src/constants/versions.js
+++ b/packages/upgrade/src/constants/versions.js
@@ -1,5 +1,4 @@
 export default [
-  { label: 'Next', value: 'next' },
   { label: 'Core 2', value: 'core-2' },
   { label: 'Core 1', value: 'core-1' },
 ];

From 87f266fa7ae75a9b09ffe92366226d6a39786b78 Mon Sep 17 00:00:00 2001
From: Jacek <jacek@clerk.dev>
Date: Fri, 18 Oct 2024 11:25:51 -0500
Subject: [PATCH 07/12] clerkMiddleware auth.protect()

---
 .../src/app-router/server/ClerkProvider.tsx   |  2 +-
 .../src/app-router/server/currentUser.ts      |  4 +-
 .../server/__tests__/clerkMiddleware.test.ts  | 49 ++++++++++---------
 packages/nextjs/src/server/clerkMiddleware.ts | 22 +++++----
 packages/nextjs/src/server/protect.ts         | 14 +++---
 5 files changed, 47 insertions(+), 44 deletions(-)

diff --git a/packages/nextjs/src/app-router/server/ClerkProvider.tsx b/packages/nextjs/src/app-router/server/ClerkProvider.tsx
index f6bfb123038..f405b2a87e8 100644
--- a/packages/nextjs/src/app-router/server/ClerkProvider.tsx
+++ b/packages/nextjs/src/app-router/server/ClerkProvider.tsx
@@ -13,7 +13,7 @@ export async function ClerkProvider(
 ) {
   const { children, ...rest } = props;
   const state = (await initialState())?.__clerk_ssr_state as InitialState;
-  const cspHeader = await headers().get('Content-Security-Policy');
+  const cspHeader = (await headers()).get('Content-Security-Policy');
 
   return (
     <ClientClerkProvider
diff --git a/packages/nextjs/src/app-router/server/currentUser.ts b/packages/nextjs/src/app-router/server/currentUser.ts
index e76e8cce9ad..1e7426843c6 100644
--- a/packages/nextjs/src/app-router/server/currentUser.ts
+++ b/packages/nextjs/src/app-router/server/currentUser.ts
@@ -11,7 +11,5 @@ export async function currentUser(): Promise<User | null> {
     return null;
   }
 
-  const resolvedClerkClient = await clerkClient();
-
-  return resolvedClerkClient.users.getUser(userId);
+  return (await clerkClient()).users.getUser(userId);
 }
diff --git a/packages/nextjs/src/server/__tests__/clerkMiddleware.test.ts b/packages/nextjs/src/server/__tests__/clerkMiddleware.test.ts
index 5e706b3fb50..73bf3f6c089 100644
--- a/packages/nextjs/src/server/__tests__/clerkMiddleware.test.ts
+++ b/packages/nextjs/src/server/__tests__/clerkMiddleware.test.ts
@@ -324,7 +324,7 @@ describe('clerkMiddleware(params)', () => {
     });
   });
 
-  describe('auth().protect()', () => {
+  describe('auth.protect()', () => {
     it('redirects to sign-in url when protect is called, the user is signed out and the request is a page request', async () => {
       const req = mockRequest({
         url: '/protected',
@@ -339,8 +339,9 @@ describe('clerkMiddleware(params)', () => {
         toAuth: () => ({ userId: null }),
       });
 
-      const resp = await clerkMiddleware(auth => {
-        auth().protect();
+      // @ts-expect-error - FIXME
+      const resp = await clerkMiddleware(async auth => {
+        return auth.protect();
       })(req, {} as NextFetchEvent);
 
       expect(resp?.status).toEqual(307);
@@ -362,8 +363,8 @@ describe('clerkMiddleware(params)', () => {
         toAuth: () => ({ userId: 'user-id' }),
       });
 
-      const resp = await clerkMiddleware(auth => {
-        auth().protect();
+      const resp = await clerkMiddleware(async auth => {
+        await auth.protect();
       })(req, {} as NextFetchEvent);
 
       expect(resp?.status).toEqual(200);
@@ -385,8 +386,8 @@ describe('clerkMiddleware(params)', () => {
         toAuth: () => ({ userId: null }),
       });
 
-      const resp = await clerkMiddleware(auth => {
-        auth().protect();
+      const resp = await clerkMiddleware(async auth => {
+        await auth.protect();
       })(req, {} as NextFetchEvent);
 
       expect(resp?.status).toEqual(200);
@@ -408,8 +409,8 @@ describe('clerkMiddleware(params)', () => {
         toAuth: () => ({ userId: 'user-id', has: () => false }),
       });
 
-      const resp = await clerkMiddleware(auth => {
-        auth().protect({ role: 'random-role' });
+      const resp = await clerkMiddleware(async auth => {
+        await auth.protect({ role: 'random-role' });
       })(req, {} as NextFetchEvent);
 
       expect(resp?.status).toEqual(200);
@@ -431,8 +432,8 @@ describe('clerkMiddleware(params)', () => {
         toAuth: () => ({ userId: null }),
       });
 
-      const resp = await clerkMiddleware(auth => {
-        auth().protect({ unauthenticatedUrl: 'https://www.clerk.com/hello' });
+      const resp = await clerkMiddleware(async auth => {
+        await auth.protect({ unauthenticatedUrl: 'https://www.clerk.com/hello' });
       })(req, {} as NextFetchEvent);
 
       expect(resp?.status).toEqual(307);
@@ -455,8 +456,8 @@ describe('clerkMiddleware(params)', () => {
         toAuth: () => ({ userId: 'user-id', has: () => false }),
       });
 
-      const resp = await clerkMiddleware(auth => {
-        auth().protect(
+      const resp = await clerkMiddleware(async auth => {
+        await auth.protect(
           { role: 'random-role' },
           {
             unauthorizedUrl: 'https://www.clerk.com/discover',
@@ -487,8 +488,8 @@ describe('clerkMiddleware(params)', () => {
         toAuth: () => ({ userId: null }),
       });
 
-      const resp = await clerkMiddleware(auth => {
-        auth().protect();
+      const resp = await clerkMiddleware(async auth => {
+        await auth.protect();
       })(req, {} as NextFetchEvent);
 
       expect(resp?.status).toEqual(307);
@@ -513,8 +514,8 @@ describe('clerkMiddleware(params)', () => {
         toAuth: () => ({ userId: null }),
       });
 
-      const resp = await clerkMiddleware(auth => {
-        auth().protect();
+      const resp = await clerkMiddleware(async auth => {
+        await auth.protect();
       })(req, {} as NextFetchEvent);
 
       expect(resp?.status).toEqual(307);
@@ -538,8 +539,8 @@ describe('clerkMiddleware(params)', () => {
         toAuth: () => ({ userId: null }),
       });
 
-      const resp = await clerkMiddleware(auth => {
-        auth().protect({
+      const resp = await clerkMiddleware(async auth => {
+        await auth.protect({
           unauthenticatedUrl: 'https://www.clerk.com/unauthenticatedUrl',
           unauthorizedUrl: 'https://www.clerk.com/unauthorizedUrl',
         });
@@ -565,8 +566,8 @@ describe('clerkMiddleware(params)', () => {
         toAuth: () => ({ userId: 'userId', has: () => false }),
       });
 
-      const resp = await clerkMiddleware(auth => {
-        auth().protect(
+      const resp = await clerkMiddleware(async auth => {
+        await auth.protect(
           { permission: 'random-permission' },
           {
             unauthenticatedUrl: 'https://www.clerk.com/unauthenticatedUrl',
@@ -624,8 +625,8 @@ describe('Dev Browser JWT when redirecting to cross origin for page requests', f
       toAuth: () => ({ userId: null }),
     });
 
-    const resp = await clerkMiddleware(auth => {
-      auth().protect();
+    const resp = await clerkMiddleware(async auth => {
+      await auth.protect();
     })(req, {} as NextFetchEvent);
 
     expect(resp?.status).toEqual(307);
@@ -650,7 +651,7 @@ describe('Dev Browser JWT when redirecting to cross origin for page requests', f
     });
 
     const resp = await clerkMiddleware(async auth => {
-      auth().protect();
+      await auth.protect();
     })(req, {} as NextFetchEvent);
 
     expect(resp?.status).toEqual(307);
diff --git a/packages/nextjs/src/server/clerkMiddleware.ts b/packages/nextjs/src/server/clerkMiddleware.ts
index 54923f08dd3..a38ce924e97 100644
--- a/packages/nextjs/src/server/clerkMiddleware.ts
+++ b/packages/nextjs/src/server/clerkMiddleware.ts
@@ -30,11 +30,13 @@ const CONTROL_FLOW_ERROR = {
 };
 
 export type ClerkMiddlewareAuthObject = AuthObject & {
-  protect: AuthProtect;
   redirectToSignIn: RedirectFun<Response>;
 };
 
-export type ClerkMiddlewareAuth = () => ClerkMiddlewareAuthObject;
+export interface ClerkMiddlewareAuth {
+  (): ClerkMiddlewareAuthObject;
+  protect: AuthProtect;
+}
 
 type ClerkMiddlewareHandler = (
   auth: ClerkMiddlewareAuth,
@@ -145,14 +147,17 @@ export const clerkMiddleware: ClerkMiddleware = (...args: unknown[]) => {
       logger.debug('auth', () => ({ auth: authObject, debug: authObject.debug() }));
 
       const redirectToSignIn = createMiddlewareRedirectToSignIn(clerkRequest);
-      const protect = createMiddlewareProtect(clerkRequest, authObject, redirectToSignIn);
-      const authObjWithMethods: ClerkMiddlewareAuthObject = Object.assign(authObject, { protect, redirectToSignIn });
+      const protect = await createMiddlewareProtect(clerkRequest, authObject, redirectToSignIn);
+
+      const authObjWithMethods: ClerkMiddlewareAuthObject = Object.assign(authObject, { redirectToSignIn });
+      const authHandler = () => authObjWithMethods;
+      authHandler.protect = protect;
 
       let handlerResult: Response = NextResponse.next();
       try {
         const userHandlerResult = await clerkMiddlewareRequestDataStorage.run(
           clerkMiddlewareRequestDataStore,
-          async () => handler?.(() => authObjWithMethods, request, event),
+          async () => handler?.(authHandler, request, event),
         );
         handlerResult = userHandlerResult || handlerResult;
       } catch (e: any) {
@@ -233,8 +238,8 @@ const createMiddlewareProtect = (
   clerkRequest: ClerkRequest,
   authObject: AuthObject,
   redirectToSignIn: RedirectFun<Response>,
-): ClerkMiddlewareAuthObject['protect'] => {
-  return ((params, options) => {
+) => {
+  return (async (params: any, options: any) => {
     const notFound = () => {
       throw new Error(CONTROL_FLOW_ERROR.FORCE_NOT_FOUND) as any;
     };
@@ -245,9 +250,8 @@ const createMiddlewareProtect = (
       throw err;
     };
 
-    // @ts-expect-error TS is not happy even though the types are correct
     return createProtect({ request: clerkRequest, redirect, notFound, authObject, redirectToSignIn })(params, options);
-  }) as AuthProtect;
+  }) as unknown as Promise<AuthProtect>;
 };
 
 // Handle errors thrown by protect() and redirectToSignIn() calls,
diff --git a/packages/nextjs/src/server/protect.ts b/packages/nextjs/src/server/protect.ts
index 0d9721aa8cd..463dc8db3be 100644
--- a/packages/nextjs/src/server/protect.ts
+++ b/packages/nextjs/src/server/protect.ts
@@ -15,17 +15,17 @@ type AuthProtectOptions = { unauthorizedUrl?: string; unauthenticatedUrl?: strin
  * Throws a Nextjs notFound error if user is not authenticated or authorized.
  */
 export interface AuthProtect {
-  (params?: CheckAuthorizationParamsWithCustomPermissions, options?: AuthProtectOptions): SignedInAuthObject;
+  (params?: CheckAuthorizationParamsWithCustomPermissions, options?: AuthProtectOptions): Promise<SignedInAuthObject>;
 
   (
     params?: (has: CheckAuthorizationWithCustomPermissions) => boolean,
     options?: AuthProtectOptions,
-  ): SignedInAuthObject;
+  ): Promise<SignedInAuthObject>;
 
-  (options?: AuthProtectOptions): SignedInAuthObject;
+  (options?: AuthProtectOptions): Promise<SignedInAuthObject>;
 }
 
-export const createProtect = (opts: {
+export function createProtect(opts: {
   request: Request;
   authObject: AuthObject;
   /**
@@ -44,10 +44,10 @@ export const createProtect = (opts: {
    * use this callback to customise the behavior
    */
   redirectToSignIn: RedirectFun<unknown>;
-}): AuthProtect => {
+}): AuthProtect {
   const { redirectToSignIn, authObject, redirect, notFound, request } = opts;
 
-  return ((...args: any[]) => {
+  return (async (...args: any[]) => {
     const optionValuesAsParam = args[0]?.unauthenticatedUrl || args[0]?.unauthorizedUrl;
     const paramsOrFunction = optionValuesAsParam
       ? undefined
@@ -108,7 +108,7 @@ export const createProtect = (opts: {
 
     return handleUnauthorized();
   }) as AuthProtect;
-};
+}
 
 const isServerActionRequest = (req: Request) => {
   return (

From d5390bed88d7b4aa45ab667e69833a66929d5fab Mon Sep 17 00:00:00 2001
From: Jacek <jacek@clerk.dev>
Date: Fri, 18 Oct 2024 11:49:10 -0500
Subject: [PATCH 08/12] WIP

---
 integration/templates/next-app-router/src/middleware.ts         | 2 +-
 integration/tests/dynamic-keys.test.ts                          | 2 +-
 .../src/client-boundary/hooks/useEnforceCatchAllRoute.tsx       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/integration/templates/next-app-router/src/middleware.ts b/integration/templates/next-app-router/src/middleware.ts
index b6a2c375d32..71cc5ffa398 100644
--- a/integration/templates/next-app-router/src/middleware.ts
+++ b/integration/templates/next-app-router/src/middleware.ts
@@ -13,7 +13,7 @@ const isCSPRoute = createRouteMatcher(['/csp']);
 
 export default clerkMiddleware(async (auth, req) => {
   if (isProtectedRoute(req)) {
-    auth().protect();
+    await auth.protect();
   }
 
   if (isCSPRoute(req)) {
diff --git a/integration/tests/dynamic-keys.test.ts b/integration/tests/dynamic-keys.test.ts
index 8e7b59f6a4f..832dfa95ad3 100644
--- a/integration/tests/dynamic-keys.test.ts
+++ b/integration/tests/dynamic-keys.test.ts
@@ -21,7 +21,7 @@ test.describe('dynamic keys @nextjs', () => {
 
         export default clerkMiddleware(async (auth, request) => {
           if (isProtectedRoute(request)) {
-            auth().protect();
+            await auth.protect();
           }
 
           if (shouldFetchBapi(request)){
diff --git a/packages/nextjs/src/client-boundary/hooks/useEnforceCatchAllRoute.tsx b/packages/nextjs/src/client-boundary/hooks/useEnforceCatchAllRoute.tsx
index 2925795bf1d..47e61f1a47e 100644
--- a/packages/nextjs/src/client-boundary/hooks/useEnforceCatchAllRoute.tsx
+++ b/packages/nextjs/src/client-boundary/hooks/useEnforceCatchAllRoute.tsx
@@ -38,7 +38,7 @@ export const useEnforceCatchAllRoute = (
     // because these components are usually protected by the middleware
     // and if the check runs before the session is available, it will fail
     // even if the route is a catch-all route, as the check request will result
-    // in a 404 because of auth().protect();
+    // in a 404 because of auth.protect();
     if (requireSessionBeforeCheck && !session) {
       return;
     }

From 44ecba8817f1c860e8cd8406844310ab04b49019 Mon Sep 17 00:00:00 2001
From: Jacek <jacek@clerk.dev>
Date: Fri, 18 Oct 2024 20:31:23 -0500
Subject: [PATCH 09/12] CLI polish

---
 packages/upgrade/src/app.js                   | 13 +++--
 packages/upgrade/src/components/Codemod.js    | 55 ++++++++++---------
 .../upgrade/src/components/SDKWorkflow.js     | 44 ++++++++++++---
 3 files changed, 72 insertions(+), 40 deletions(-)

diff --git a/packages/upgrade/src/app.js b/packages/upgrade/src/app.js
index 2d225b564f0..6f78a39af9f 100644
--- a/packages/upgrade/src/app.js
+++ b/packages/upgrade/src/app.js
@@ -1,5 +1,5 @@
 import { MultiSelect, Select, TextInput } from '@inkjs/ui';
-import { Newline, Text } from 'ink';
+import { Newline, Text, useApp } from 'ink';
 import React, { useState } from 'react';
 
 import { Header } from './components/Header.js';
@@ -26,6 +26,7 @@ import guessFrameworks from './util/guess-framework.js';
  */
 export default function App(props) {
   const { noWarnings = false, disableTelemetry = false } = props;
+  const { exit } = useApp();
 
   const [yolo, setYolo] = useState(props.yolo ?? false);
   const [sdks, setSdks] = useState(props.sdk ? [props.sdk] : []);
@@ -133,6 +134,8 @@ export default function App(props) {
               // if true, we were right so we set the sdk
               if (item === 'yes') {
                 setSdks(sdkGuesses.map(guess => guess.value));
+              } else {
+                setSdkGuesses([]);
               }
             }}
           />
@@ -256,12 +259,12 @@ export default function App(props) {
           <Text>Does this look right?</Text>
           <Select
             options={[
-              { label: 'yes', value: true },
-              { label: 'no - exit, and i will try again', value: false },
+              { label: 'yes', value: 'yes' },
+              { label: 'no - exit, and i will try again', value: 'no' },
             ]}
             onChange={value => {
-              if (!value) {
-                process.exit();
+              if (!value || value === 'no') {
+                exit();
               } else {
                 setConfigVerified(true);
               }
diff --git a/packages/upgrade/src/components/Codemod.js b/packages/upgrade/src/components/Codemod.js
index 65767dc23b2..bc1da985626 100644
--- a/packages/upgrade/src/components/Codemod.js
+++ b/packages/upgrade/src/components/Codemod.js
@@ -1,5 +1,5 @@
-import { TextInput } from '@inkjs/ui';
-import { Newline, Text } from 'ink';
+import { Spinner, StatusMessage, TextInput } from '@inkjs/ui';
+import { Text } from 'ink';
 import React, { useEffect, useState } from 'react';
 
 import { runCodemod } from '../codemods/index.js';
@@ -7,9 +7,9 @@ import { runCodemod } from '../codemods/index.js';
 /**
  * Codemod component that allows users to run a codemod transformation on their project files.
  *
- * @param {Object} props - The properties object.
+ * @param {Object} props
  * @param {Function} props.callback - The callback function to be called after the codemod is run.
- * @param {string} [props.dir] - The directory to scan for files in the project.
+ * @param {string} props.glob - The directory to scan for files in the project.
  * @param {string} props.sdk - The SDK name to be used in the codemod.
  * @param {string} props.transform - The transformation to be applied by the codemod.
  *
@@ -18,8 +18,8 @@ import { runCodemod } from '../codemods/index.js';
 export function Codemod(props) {
   const { callback, sdk, transform } = props;
   const [error, setError] = useState();
-  const [result, setResult] = useState(null);
   const [glob, setGlob] = useState(props.glob);
+  const [result, setResult] = useState();
 
   useEffect(() => {
     if (!glob) {
@@ -39,32 +39,33 @@ export function Codemod(props) {
 
   return (
     <>
-      <>
-        <Text>Where would you like for us to scan for files in your project?</Text>
-        <Text color='gray'>(globstar syntax supported)</Text>
-        {glob ? (
-          <Text>{glob.toString()}</Text>
-        ) : (
-          <TextInput
-            defaultValue='**/*'
-            onSubmit={val => {
-              setGlob(val.split(/[ ,]/));
-            }}
-          />
-        )}
-      </>
-      {!result && !error && glob && (
-        <Text>
-          Running <Text bold>@clerk/{sdk}</Text> codemod... {transform}
-        </Text>
+      {glob ? (
+        <StatusMessage variant='success'>Scanning for files in your project... {glob.toString()}</StatusMessage>
+      ) : (
+        <>
+          <Text>Where would you like for us to scan for files in your project?</Text>
+          <Text color='gray'>(globstar syntax supported)</Text>
+          {glob ? (
+            <Text>{glob.toString()}</Text>
+          ) : (
+            <TextInput
+              defaultValue='**/*'
+              onSubmit={val => {
+                setGlob(val.split(/[ ,]/));
+              }}
+            />
+          )}
+        </>
       )}
+
+      {!result && !error && glob && <Spinner label={`Running @clerk/${sdk}</Text> codemod... ${transform}`} />}
       {result && (
         <>
-          <Text>
+          <StatusMessage variant='success'>
             Running <Text bold>@clerk/{sdk}</Text> codemod... {transform} complete!
-          </Text>
-          <Newline />
-          <Text bold>Results:</Text>
+          </StatusMessage>
+
+          <Text bold>Codemod results:</Text>
           <Text color='red'>{result.error ?? 0} errors</Text>
           <Text color='green'>{result.ok ?? 0} ok</Text>
           <Text color='yellow'>{result.skip ?? 0} skipped</Text>
diff --git a/packages/upgrade/src/components/SDKWorkflow.js b/packages/upgrade/src/components/SDKWorkflow.js
index 3c91dfc51a1..70a6b6b39ea 100644
--- a/packages/upgrade/src/components/SDKWorkflow.js
+++ b/packages/upgrade/src/components/SDKWorkflow.js
@@ -1,6 +1,6 @@
-import { Select } from '@inkjs/ui';
+import { Select, Spinner, StatusMessage } from '@inkjs/ui';
 import { execa } from 'execa';
-import { Newline, Text } from 'ink';
+import { Text } from 'ink';
 import React, { useEffect, useState } from 'react';
 
 import { getUpgradeCommand } from '../util/detect-package-manager.js';
@@ -8,6 +8,18 @@ import { getClerkSdkVersion } from '../util/get-clerk-version.js';
 import { Codemod } from './Codemod.js';
 import { Header } from './Header.js';
 
+/**
+ * SDKWorkflow component handles the upgrade process for a given SDK.
+ * It checks the current version of the SDK and provides the necessary steps
+ * to upgrade or run codemods based on the version.
+ *
+ * @component
+ * @param {Object} props
+ * @param {string} props.packageManager - The package manager to use for the upgrade, if needed.
+ * @param {string} props.sdk - The SDK to be upgraded.
+ *
+ * @returns {JSX.Element} The rendered component.
+ */
 export function SDKWorkflow(props) {
   const { packageManager, sdk } = props;
 
@@ -16,6 +28,7 @@ export function SDKWorkflow(props) {
 
   const version = getClerkSdkVersion(sdk);
 
+  // Right now, we only have one codemod for the async request transformation
   return (
     <>
       <Header />
@@ -68,9 +81,21 @@ export function SDKWorkflow(props) {
   );
 }
 
-function UpgradeCommand({ sdk, callback }) {
-  const [result, setResult] = useState();
+/**
+ * Component that runs an upgrade command for a given SDK and handles the result.
+ *
+ * @component
+ * @param {Object} props
+ * @param {Function} props.callback - The callback function to be called after the command execution.
+ * @param {string} props.sdk - The SDK for which the upgrade command is run.
+ * @returns {JSX.Element} The rendered component.
+ *
+ * @example
+ * <UpgradeCommand sdk="example-sdk" callback={handleUpgrade} />
+ */
+function UpgradeCommand({ callback, sdk }) {
   const [error, setError] = useState();
+  const [result, setResult] = useState();
 
   const command = getUpgradeCommand(sdk);
 
@@ -87,10 +112,13 @@ function UpgradeCommand({ sdk, callback }) {
 
   return (
     <>
-      <Text>Running upgrade command: {command}</Text>
-      {result && <Text color='green'>Upgrade complete!</Text>}
-      {error && <Text color='red'>Upgrade failed!</Text>}
-      <Newline />
+      {!result && !error && <Spinner label={`Running upgrade command: ${command}`} />}
+      {result && (
+        <StatusMessage variant='success'>
+          <Text bold>@clerk/{sdk}</Text> upgraded successfully to <Text bold>latest!</Text>
+        </StatusMessage>
+      )}
+      {error && <StatusMessage variant='error'>Upgrade failed!</StatusMessage>}
     </>
   );
 }

From 2f36da16dd99e57c1a7fcba9345d306d597ef10d Mon Sep 17 00:00:00 2001
From: Jacek Radko <jacekradko@gmail.com>
Date: Sun, 20 Oct 2024 21:55:58 -0500
Subject: [PATCH 10/12] Apply suggestions from code review

Co-authored-by: Bryce Kalow <bryce@clerk.dev>
---
 packages/upgrade/src/app.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/upgrade/src/app.js b/packages/upgrade/src/app.js
index 6f78a39af9f..94df0bd23f4 100644
--- a/packages/upgrade/src/app.js
+++ b/packages/upgrade/src/app.js
@@ -68,7 +68,6 @@ export default function App(props) {
       return setDir(process.cwd());
     }
     const { guesses, _uuid } = guessFrameworks(dir, disableTelemetry);
-    // console.log({ guesses, _uuid });
     setUuid(_uuid);
     setSdkGuesses(guesses);
     setSdkGuessAttempted(true);
@@ -260,7 +259,7 @@ export default function App(props) {
           <Select
             options={[
               { label: 'yes', value: 'yes' },
-              { label: 'no - exit, and i will try again', value: 'no' },
+              { label: 'no - exit, and I will try again', value: 'no' },
             ]}
             onChange={value => {
               if (!value || value === 'no') {

From 20384b174d955da54a3d762d364d68ac74b06b1b Mon Sep 17 00:00:00 2001
From: Jacek <jacek@clerk.dev>
Date: Mon, 21 Oct 2024 12:39:55 -0500
Subject: [PATCH 11/12] Check for next.js SDK

---
 packages/upgrade/src/components/SDKWorkflow.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/upgrade/src/components/SDKWorkflow.js b/packages/upgrade/src/components/SDKWorkflow.js
index 70a6b6b39ea..f6ab38c0b85 100644
--- a/packages/upgrade/src/components/SDKWorkflow.js
+++ b/packages/upgrade/src/components/SDKWorkflow.js
@@ -28,6 +28,14 @@ export function SDKWorkflow(props) {
 
   const version = getClerkSdkVersion(sdk);
 
+  if (sdk !== 'nextjs') {
+    return (
+      <StatusMessage variant='error'>
+        The SDK upgrade functionality is only available for <Text bold>@clerk/nextjs</Text> at the moment.
+      </StatusMessage>
+    );
+  }
+
   // Right now, we only have one codemod for the async request transformation
   return (
     <>

From ee76c39c8372b5372c178ab6a866f3bd599f1476 Mon Sep 17 00:00:00 2001
From: Jacek <jacek@clerk.dev>
Date: Mon, 21 Oct 2024 12:43:13 -0500
Subject: [PATCH 12/12] do not fallback transform

---
 packages/upgrade/src/codemods/index.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/upgrade/src/codemods/index.js b/packages/upgrade/src/codemods/index.js
index 1e422276b2f..dd153370257 100644
--- a/packages/upgrade/src/codemods/index.js
+++ b/packages/upgrade/src/codemods/index.js
@@ -6,7 +6,10 @@ import { run } from 'jscodeshift/src/Runner.js';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 
-export async function runCodemod(transform = 'transform-async-request', glob, options) {
+export async function runCodemod(transform, glob, options) {
+  if (!transform) {
+    throw new Error('No transform provided');
+  }
   const resolvedPath = resolve(__dirname, `${transform}.cjs`);
 
   const paths = await globby(glob, {