Merge branch 'jrad/ui-prop-cleanup' into jrad/js-prop-bundling

Author: jacekradko

.changeset/forty-months-appear.md

@@ -0,0 +1,13 @@
+---
+'@clerk/shared': major
+'@clerk/react': patch
+'@clerk/ui': patch
+---
+
+Remove `useUserContext`, `useOrganizationContext`, `useSessionContext` and `useClientContext` from the `shared/react` package.
+
+These hooks have never been meant for public use and have been replaced with internal hooks that do not rely on context.
+
+If you need access to these resources, use the `useUser`, `useOrganization` and `useSession` hooks instead.
+
+If you are building a React SDK and need direct access to the `client`, get in touch with us to discuss!

.changeset/improve-guide-generation.md

@@ -0,0 +1,5 @@
+---
+"@clerk/upgrade": patch
+---
+
+Improve `generate-guide` script to support generating guides for all SDKs at once and output MDX format compatible with clerk-docs

.changeset/improve-token-validation.md

@@ -0,0 +1,5 @@
+---
+"@clerk/backend": patch
+---
+
+Improve token type validation in authentication requests

.changeset/nextjs-cache-components-support.md

@@ -0,0 +1,5 @@
+---
+'@clerk/nextjs': patch
+---
+
+Add support for Next.js 16 cache components by improving error detection and providing helpful error messages when `auth()` or `currentUser()` are called inside a `"use cache"` function.

.changeset/silly-peaches-march.md

@@ -0,0 +1,5 @@
+---
+'@clerk/nextjs': patch
+'@clerk/shared': patch
+'@clerk/react': patch
+---

.changeset/tangy-sides-crash.md

@@ -0,0 +1,2 @@
+---
+---

.changeset/tough-taxis-care.md

@@ -0,0 +1,5 @@
+---
+'@clerk/backend': minor
+---
+
+Add `createBulk()` method to `WaitlistEntryAPI` for bulk creating waitlist entries

integration/templates/next-cache-components/src/app/api/use-cache-error-trigger/route.ts

@@ -0,0 +1,19 @@
+import { auth } from '@clerk/nextjs/server';
+
+// This function deliberately calls auth() inside "use cache" to trigger the error
+async function getCachedAuthData() {
+  'use cache';
+  // This WILL throw an error because auth() uses headers() internally
+  const { userId } = await auth();
+  return { userId };
+}
+
+export async function GET() {
+  try {
+    const data = await getCachedAuthData();
+    return Response.json(data);
+  } catch (e: any) {
+    // Return the error message so we can verify it in tests
+    return Response.json({ error: e.message }, { status: 500 });
+  }
+}

integration/templates/next-cache-components/src/app/current-user-cache-correct/page.tsx

@@ -0,0 +1,93 @@
+import { Suspense } from 'react';
+import { currentUser, clerkClient } from '@clerk/nextjs/server';
+
+// Simulated cached operation that fetches additional user data
+async function getCachedUserProfile(userId: string) {
+  'use cache';
+  // This is the CORRECT pattern:
+  // - currentUser() is called OUTSIDE the cache function
+  // - Only the userId is passed into the cache function
+  // - The cache function uses clerkClient() which is allowed in cache contexts
+  const client = await clerkClient();
+  const user = await client.users.getUser(userId);
+
+  return {
+    userId,
+    cachedAt: new Date().toISOString(),
+    profile: {
+      fullName: [user.firstName, user.lastName].filter(Boolean).join(' ') || 'Unknown',
+      emailCount: user.emailAddresses?.length ?? 0,
+    },
+  };
+}
+
+async function CurrentUserCacheContent() {
+  // Step 1: Call currentUser() OUTSIDE the cache function
+  const user = await currentUser();
+
+  if (!user) {
+    return (
+      <>
+        <p>Please sign in to test the caching pattern with currentUser().</p>
+        <div data-testid='signed-out'>Not signed in</div>
+      </>
+    );
+  }
+
+  // Step 2: Pass userId INTO the cache function
+  const cachedProfile = await getCachedUserProfile(user.id);
+
+  return (
+    <>
+      <p>
+        This demonstrates the correct way to use <code>&quot;use cache&quot;</code> with currentUser():
+      </p>
+      <ol>
+        <li>
+          Call <code>currentUser()</code> <strong>outside</strong> the cache function
+        </li>
+        <li>
+          Pass the <code>userId</code> <strong>into</strong> the cache function
+        </li>
+        <li>
+          Use <code>clerkClient()</code> inside the cache function (allowed)
+        </li>
+      </ol>
+
+      <div className='test-result success'>
+        <h3>Cached Profile Data:</h3>
+        <pre data-testid='cached-profile'>{JSON.stringify(cachedProfile, null, 2)}</pre>
+      </div>
+
+      <div data-testid='current-user-id'>{user.id}</div>
+
+      <pre>
+        {`
+// Correct pattern:
+const user = await currentUser();  // Outside cache
+if (user) {
+  const profile = await getCachedProfile(user.id);  // Pass userId in
+}
+
+async function getCachedProfile(userId: string) {
+  'use cache';
+  const client = await clerkClient();
+  return client.users.getUser(userId);
+}
+        `}
+      </pre>
+    </>
+  );
+}
+
+export default function CurrentUserCacheCorrectPage() {
+  return (
+    <main>
+      <h1>currentUser() with &quot;use cache&quot; Correct Pattern</h1>
+
+      <Suspense fallback={<div>Loading...</div>}>
+        <CurrentUserCacheContent />
+      </Suspense>
+    </main>
+  );
+}

integration/templates/next-cache-components/src/app/current-user-server-component/page.tsx

@@ -0,0 +1,43 @@
+import { Suspense } from 'react';
+import { currentUser } from '@clerk/nextjs/server';
+
+async function CurrentUserContent() {
+  const user = await currentUser();
+
+  return (
+    <>
+      <div className={`test-result ${user ? 'success' : ''}`}>
+        <h3>Current User Result:</h3>
+        <pre>
+          {JSON.stringify(
+            {
+              id: user?.id ?? null,
+              firstName: user?.firstName ?? null,
+              lastName: user?.lastName ?? null,
+              primaryEmailAddress: user?.primaryEmailAddress?.emailAddress ?? null,
+              isSignedIn: !!user,
+            },
+            null,
+            2,
+          )}
+        </pre>
+      </div>
+
+      <div data-testid='current-user-id'>{user?.id ?? 'Not signed in'}</div>
+      <div data-testid='current-user-email'>{user?.primaryEmailAddress?.emailAddress ?? 'No email'}</div>
+    </>
+  );
+}
+
+export default function CurrentUserServerComponentPage() {
+  return (
+    <main>
+      <h1>currentUser() in Server Component</h1>
+      <p>This page tests using currentUser() in a standard React Server Component.</p>
+
+      <Suspense fallback={<div>Loading user...</div>}>
+        <CurrentUserContent />
+      </Suspense>
+    </main>
+  );
+}