Merge branch 'main' into brk.feat/redirect-on-session-exists

Author: brkalow

.changeset/bright-papayas-accept.md

@@ -0,0 +1,6 @@
+---
+"@clerk/clerk-js": minor
+"@clerk/shared": minor
+---
+
+Implemented server-side pagination and filtering for API keys

.changeset/moody-parks-scream.md

@@ -0,0 +1,6 @@
+---
+'@clerk/clerk-js': minor
+'@clerk/shared': minor
+---
+
+[Experimental] Add types for errors used in new custom flow APIs

.changeset/ripe-ants-carry.md

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

.changeset/ripe-banks-pay.md

@@ -0,0 +1,6 @@
+---
+'@clerk/clerk-js': minor
+'@clerk/types': minor
+---
+
+[Experimental] Add support for modal SSO sign-ins to new APIs

.changeset/shaggy-numbers-attack.md

@@ -0,0 +1,5 @@
+---
+'@clerk/shared': patch
+---
+
+Add email codes as an option to `PrepareSecondFactorParams`

.typedoc/custom-plugin.mjs

@@ -98,20 +98,50 @@ function getRelativeLinkReplacements() {
 function getCatchAllReplacements() {
   return [
     {
-      pattern: /\(setActiveParams\)/g,
-      replace: '([setActiveParams](/docs/reference/javascript/types/set-active-params))',
+      pattern: /(?<![\[\w`])`Appearance`\\<`Theme`\\>/g,
+      replace: '[`Appearance<Theme>`](/docs/guides/customizing-clerk/appearance-prop/overview)',
+    },
+    {
+      pattern: /\(CreateOrganizationParams\)/g,
+      replace: '([CreateOrganizationParams](#create-organization-params))',
     },
     {
       pattern: /`LoadedClerk`/g,
       replace: '[Clerk](/docs/reference/javascript/clerk)',
     },
     {
-      pattern: /\(CreateOrganizationParams\)/g,
-      replace: '([CreateOrganizationParams](#create-organization-params))',
+      pattern: /(?<![\[\w`])`?LocalizationResource`?(?![\]\w`])/g,
+      replace: '[`LocalizationResource`](/docs/guides/customizing-clerk/localization)',
+    },
+    {
+      // SessionResource appears in plain text, with an array next to it, with backticks, etc.
+      // e.g. `SessionResource[]`
+      pattern: /(?<![`[\]])\bSessionResource(\[\])?\b(?![\]\)`])/g,
+      replace: '[`SessionResource`](/docs/reference/javascript/session)$1',
+    },
+    {
+      pattern: /(?<![\[\w`])`?SessionStatusClaim`?(?![\]\w`])/g,
+      replace: '[`SessionStatusClaim`](/docs/reference/javascript/types/session-status)',
     },
     {
-      pattern: /\| `SignInResource` \|/,
-      replace: '| [SignInResource](/docs/reference/javascript/sign-in) |',
+      pattern: /(?<![`[\]])\bSetActiveParams\b(?![\]\(])/g,
+      replace: '[SetActiveParams](/docs/reference/javascript/types/set-active-params)',
+    },
+    {
+      pattern: /(?<![\[\w`])`?SignInResource`?(?![\]\w`])/g,
+      replace: '[`SignInResource`](/docs/reference/javascript/sign-in)',
+    },
+    {
+      pattern: /(?<![\[\w`])`?SignedInSessionResource`?(?![\]\w`])/g,
+      replace: '[`SignedInSessionResource`](/docs/reference/javascript/session)',
+    },
+    {
+      pattern: /(?<![\[\w`])`?SignUpResource`?(?![\]\w`])/g,
+      replace: '[`SignUpResource`](/docs/reference/javascript/sign-up)',
+    },
+    {
+      pattern: /(?<![\[\w`])`?OrganizationResource`?(?![\]\w`])/g,
+      replace: '[`OrganizationResource`](/docs/reference/javascript/organization)',
     },
     {
       pattern: /`OrganizationPrivateMetadata`/g,
@@ -142,6 +172,10 @@ function getCatchAllReplacements() {
       replace:
         '[`OrganizationMembershipPublicMetadata`](/docs/reference/javascript/types/metadata#organization-membership-public-metadata)',
     },
+    {
+      pattern: /(?<![\[\w`])`?UserResource`?(?![\]\w`])/g,
+      replace: '[`UserResource`](/docs/reference/javascript/user)',
+    },
     {
       /**
        * By default, `@deprecated` is output with `**Deprecated**`. We want to add a full stop to it.

eslint.config.mjs

@@ -367,8 +367,8 @@ export default tseslint.config([
     },
   },
   {
-    name: 'packages/clerk-js - vitest',
-    files: ['packages/clerk-js/src/**/*.test.{ts,tsx}'],
+    name: 'packages - vitest',
+    files: ['packages/*/src/**/*.test.{ts,tsx}'],
     rules: {
       'jest/unbound-method': 'off',
       '@typescript-eslint/unbound-method': 'off',

integration/templates/expo-web/metro.config.js

@@ -1,5 +1,5 @@
 /**
- * DO NOT EDIT THIS FILE UNLESS YOU DEFINITELY KNWO WHAT YOU ARE DOING.
+ * DO NOT EDIT THIS FILE UNLESS YOU DEFINITELY KNOW WHAT YOU ARE DOING.
  * THIS ENSURES THAT INTEGRATION TESTS ARE LOADING THE CORRECT DEPENDENCIES.
  */
 const { getDefaultConfig } = require('expo/metro-config');
@@ -30,25 +30,93 @@ const clerkExpoPath = getClerkExpoPath();
 const clerkMonorepoPath = clerkExpoPath?.replace(/\/packages\/expo$/, '');
 
 /** @type {import('expo/metro-config').MetroConfig} */
-const config = {
-  ...getDefaultConfig(__dirname),
-  watchFolders: [clerkMonorepoPath],
-  resolver: {
-    sourceExts: ['js', 'json', 'ts', 'tsx', 'cjs', 'mjs'],
-    nodeModulesPaths: [
-      path.resolve(__dirname, 'node_modules'),
-      clerkExpoPath && `${clerkMonorepoPath}/node_modules`,
-      clerkExpoPath && `${clerkExpoPath}/node_modules`,
-    ],
-    // This is a workaround for a to prevent multiple versions of react and react-native from being loaded.
-    // https://github.com/expo/expo/pull/26209
-    blockList: [
-      clerkExpoPath && new RegExp(`${clerkMonorepoPath}/node_modules/react`),
-      clerkExpoPath && new RegExp(`${clerkMonorepoPath}/node_modules/react-native`),
-    ],
-  },
-};
+const config = getDefaultConfig(__dirname);
 
-module.exports = {
-  ...config,
-};
+// Only customize Metro config when running from monorepo
+if (clerkMonorepoPath) {
+  console.log('[Metro Config] Applying monorepo customizations');
+  config.watchFolders = [clerkMonorepoPath];
+
+  // Disable file watching to prevent infinite reload loops in integration tests
+  config.watchFolders = [clerkMonorepoPath];
+  config.watcher = {
+    healthCheck: {
+      enabled: false,
+    },
+  };
+
+  // Prioritize local node_modules over monorepo node_modules
+  config.resolver.nodeModulesPaths = [path.resolve(__dirname, 'node_modules'), `${clerkMonorepoPath}/node_modules`];
+
+  // Explicitly map @clerk packages to their source locations
+  // Point to the root of the package so Metro can properly resolve subpath exports
+  config.resolver.extraNodeModules = {
+    '@clerk/clerk-react': path.resolve(clerkMonorepoPath, 'packages/react'),
+    '@clerk/clerk-expo': path.resolve(clerkMonorepoPath, 'packages/expo'),
+    '@clerk/shared': path.resolve(clerkMonorepoPath, 'packages/shared'),
+    '@clerk/types': path.resolve(clerkMonorepoPath, 'packages/types'),
+  };
+
+  // This is a workaround to prevent multiple versions of react and react-native from being loaded.
+  // Block React/React-Native in both monorepo root and all package node_modules
+  // Use word boundaries to avoid blocking clerk-react
+  // https://github.com/expo/expo/pull/26209
+  const escapedPath = clerkMonorepoPath.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+  config.resolver.blockList = [
+    // Block monorepo root node_modules for react/react-native/react-dom
+    new RegExp(`${escapedPath}/node_modules/react/`),
+    new RegExp(`${escapedPath}/node_modules/react$`),
+    new RegExp(`${escapedPath}/node_modules/react-dom/`),
+    new RegExp(`${escapedPath}/node_modules/react-dom$`),
+    new RegExp(`${escapedPath}/node_modules/react-native/`),
+    new RegExp(`${escapedPath}/node_modules/react-native$`),
+    // Block react in monorepo's pnpm store
+    new RegExp(`${escapedPath}/node_modules/\\.pnpm/.*/node_modules/react/`),
+    new RegExp(`${escapedPath}/node_modules/\\.pnpm/.*/node_modules/react$`),
+    new RegExp(`${escapedPath}/node_modules/\\.pnpm/.*/node_modules/react-dom/`),
+    new RegExp(`${escapedPath}/node_modules/\\.pnpm/.*/node_modules/react-dom$`),
+    new RegExp(`${escapedPath}/node_modules/\\.pnpm/.*/node_modules/react-native/`),
+    new RegExp(`${escapedPath}/node_modules/\\.pnpm/.*/node_modules/react-native$`),
+    // Block react/react-native/react-dom in all package node_modules
+    new RegExp(`${escapedPath}/packages/.*/node_modules/react/`),
+    new RegExp(`${escapedPath}/packages/.*/node_modules/react$`),
+    new RegExp(`${escapedPath}/packages/.*/node_modules/react-dom/`),
+    new RegExp(`${escapedPath}/packages/.*/node_modules/react-dom$`),
+    new RegExp(`${escapedPath}/packages/.*/node_modules/react-native/`),
+    new RegExp(`${escapedPath}/packages/.*/node_modules/react-native$`),
+  ];
+
+  // Custom resolver to handle package.json subpath exports for @clerk packages
+  // This enables Metro to resolve imports like '@clerk/clerk-react/internal'
+  const originalResolveRequest = config.resolver.resolveRequest;
+  config.resolver.resolveRequest = (context, moduleName, platform) => {
+    // Check if this is a @clerk package with a subpath
+    const clerkPackageMatch = moduleName.match(/^(@clerk\/[^/]+)\/(.+)$/);
+    if (clerkPackageMatch && config.resolver.extraNodeModules) {
+      const [, packageName, subpath] = clerkPackageMatch;
+      const packageRoot = config.resolver.extraNodeModules[packageName];
+
+      if (packageRoot) {
+        // Try to resolve via the subpath-workaround directory (e.g., internal/package.json)
+        const subpathDir = path.join(packageRoot, subpath);
+        try {
+          const subpathPkg = require(path.join(subpathDir, 'package.json'));
+          if (subpathPkg.main) {
+            const resolvedPath = path.join(subpathDir, subpathPkg.main);
+            return { type: 'sourceFile', filePath: resolvedPath };
+          }
+        } catch (e) {
+          // Subpath directory doesn't exist, continue with default resolution
+        }
+      }
+    }
+
+    // Fall back to default resolution
+    if (originalResolveRequest) {
+      return originalResolveRequest(context, moduleName, platform);
+    }
+    return context.resolveRequest(context, moduleName, platform);
+  };
+}
+
+module.exports = config;

integration/templates/next-app-router/src/app/billing/hooks/page.tsx

@@ -0,0 +1,36 @@
+'use client';
+import { usePlans, useSubscription, useStatements } from '@clerk/nextjs/experimental';
+
+export default function Home() {
+  const { data: plans, count: planCount } = usePlans();
+  const { data: subscription } = useSubscription();
+  const { data: statements, count: statementCount } = useStatements();
+  return (
+    <main>
+      {plans?.map(plan => (
+        <div key={plan.id}>
+          <h2>Plan: {plan.name}</h2>
+          <p>{plan.description}</p>
+        </div>
+      ))}
+
+      {planCount > 0 ? <p>Plans found</p> : <p>No plans found</p>}
+
+      {statements?.map(statement => (
+        <div key={statement.id}>
+          <p>Statement total: {statement.totals.grandTotal.amountFormatted}</p>
+        </div>
+      ))}
+
+      {statementCount > 0 ? <p>Statements found</p> : <p>No statements found</p>}
+
+      {subscription ? (
+        <div>
+          <h2>Subscribed to {subscription.subscriptionItems[0].plan.name}</h2>
+        </div>
+      ) : (
+        <p>No subscription found</p>
+      )}
+    </main>
+  );
+}

integration/testUtils/usersService.ts

@@ -200,15 +200,13 @@ export const createUserService = (clerkClient: ClerkClient) => {
 
       const apiKey = await clerkClient.apiKeys.create({
         subject: userId,
-        name: `Integration Test - ${userId}`,
+        name: `Integration Test - ${faker.string.uuid()}`,
         secondsUntilExpiration: TWENTY_MINUTES,
       });
 
-      const { secret } = await clerkClient.apiKeys.getSecret(apiKey.id);
-
       return {
         apiKey,
-        secret,
+        secret: apiKey.secret ?? '',
         revoke: () => clerkClient.apiKeys.revoke({ apiKeyId: apiKey.id, revocationReason: 'For testing purposes' }),
       } satisfies FakeAPIKey;
     },