Merge branch 'main' into rob/api-keys-stable

Author: wobsoriano

.changeset/eight-paws-exercise.md

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

.changeset/fifty-paths-tie.md

@@ -0,0 +1,5 @@
+---
+'@clerk/ui': patch
+---
+
+Adjust padding and display logo on `OrganizationList` header

.changeset/fix-org-invitation-accepted-export.md

@@ -0,0 +1,5 @@
+---
+'@clerk/backend': patch
+---
+
+Export `OrganizationInvitationAcceptedWebhookEvent` type.

.changeset/fix-testing-concurrent-workers.md

@@ -0,0 +1,5 @@
+---
+"@clerk/testing": patch
+---
+
+Fix `signIn()` timing out with concurrent Playwright workers by de-duplicating route handler registration and adding retry with exponential backoff for transient FAPI errors (429, 502, 503, 504).

.changeset/skip-permissions-dispatch.md

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

.github/workflows/e2e-staging.yml

@@ -39,6 +39,7 @@ concurrency:
 jobs:
   permissions-check:
     name: Check Permissions
+    if: ${{ github.event_name != 'repository_dispatch' }}
     runs-on: 'blacksmith-8vcpu-ubuntu-2204'
     steps:
       - name: Check org membership
@@ -70,12 +71,35 @@ jobs:
   validate-instances:
     name: Validate Staging Instances
     needs: [permissions-check]
+    if: ${{ always() && (needs.permissions-check.result == 'success' || needs.permissions-check.result == 'skipped') }}
     runs-on: 'blacksmith-8vcpu-ubuntu-2204'
     steps:
+      - name: Normalize inputs
+        id: inputs
+        env:
+          EVENT_NAME: ${{ github.event_name }}
+          INPUT_REF: ${{ github.event.inputs.ref }}
+          PAYLOAD_REF: ${{ github.event.client_payload.ref }}
+        run: |
+          if [ "$EVENT_NAME" = "workflow_dispatch" ]; then
+            echo "ref=${INPUT_REF:-main}" >> $GITHUB_OUTPUT
+          else
+            echo "ref=${PAYLOAD_REF:-main}" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Validate ref
+        env:
+          REF: ${{ steps.inputs.outputs.ref }}
+        run: |
+          if [[ ! "$REF" =~ ^(main|release/.*)$ ]]; then
+            echo "::error::Ref '$REF' is not allowed. Only 'main' and 'release/*' branches are permitted."
+            exit 1
+          fi
+
       - name: Checkout Repo
         uses: actions/checkout@v4
         with:
-          ref: ${{ github.event.inputs.ref || github.event.client_payload.ref || 'main' }}
+          ref: ${{ steps.inputs.outputs.ref }}
           sparse-checkout: scripts/validate-staging-instances.mjs
           fetch-depth: 1
 
@@ -88,6 +112,7 @@ jobs:
   integration-tests:
     name: Integration Tests (${{ matrix.test-name }}, ${{ matrix.test-project }})
     needs: [permissions-check]
+    if: ${{ always() && (needs.permissions-check.result == 'success' || needs.permissions-check.result == 'skipped') }}
     runs-on: 'blacksmith-8vcpu-ubuntu-2204'
     defaults:
       run:

eslint.config.mjs

@@ -2,7 +2,6 @@ import eslint from '@eslint/js';
 import configPrettier from 'eslint-config-prettier';
 import configTurbo from 'eslint-config-turbo/flat';
 import pluginImport from 'eslint-plugin-import';
-import pluginJest from 'eslint-plugin-jest';
 import pluginJsDoc from 'eslint-plugin-jsdoc';
 import pluginJsxA11y from 'eslint-plugin-jsx-a11y';
 import pluginPlaywright from 'eslint-plugin-playwright';
@@ -497,16 +496,12 @@ export default tseslint.config([
     name: 'repo/test',
     files: TEST_FILES,
     languageOptions: {
-      globals: pluginJest.environments.globals.globals,
-    },
-    plugins: {
-      jest: pluginJest,
+      globals: globals.vitest,
     },
     rules: {
       '@typescript-eslint/await-thenable': 'off',
       '@typescript-eslint/no-non-null-assertion': 'off',
       '@typescript-eslint/unbound-method': 'off',
-      'jest/unbound-method': 'error',
     },
   },
   {
@@ -546,7 +541,6 @@ export default tseslint.config([
     name: 'packages - vitest',
     files: ['packages/*/src/**/*.test.{ts,tsx}'],
     rules: {
-      'jest/unbound-method': 'off',
       '@typescript-eslint/unbound-method': 'off',
     },
   },

integration/templates/expo-web/package.json

@@ -9,9 +9,6 @@
     "lint": "expo lint",
     "start": "pnpm dlx serve dist --single"
   },
-  "jest": {
-    "preset": "jest-expo"
-  },
   "dependencies": {
     "@expo/vector-icons": "^14.0.2",
     "@react-navigation/native": "^6.0.2",
@@ -37,11 +34,8 @@
   "devDependencies": {
     "@babel/core": "^7.20.0",
     "@babel/runtime": "7.26.0",
-    "@types/jest": "^29.5.12",
     "@types/react": "18.3.12",
     "@types/react-test-renderer": "^18.0.7",
-    "jest": "^29.2.1",
-    "jest-expo": "~51.0.3",
     "react-test-renderer": "18.2.0",
     "typescript": "~5.7.3"
   }

integration/templates/react-cra/package.json

@@ -5,8 +5,7 @@
   "scripts": {
     "build": "react-scripts build",
     "eject": "react-scripts eject",
-    "start": "BROWSER=none react-scripts start",
-    "test": "react-scripts test"
+    "start": "BROWSER=none react-scripts start"
   },
   "browserslist": {
     "production": [
@@ -22,8 +21,7 @@
   },
   "eslintConfig": {
     "extends": [
-      "react-app",
-      "react-app/jest"
+      "react-app"
     ]
   },
   "dependencies": {

integration/testUtils/__tests__/retryableClerkClient.test.ts

@@ -135,6 +135,29 @@ describe('withRetry', () => {
       expect(mock).toHaveBeenCalledTimes(2);
     });
 
+    it('uses exponential backoff as floor when retryAfter is 0', async () => {
+      vi.spyOn(Math, 'random').mockReturnValue(0);
+      const error = makeClerkAPIError(429, { retryAfter: 0 });
+      const mock = vi
+        .fn()
+        .mockImplementationOnce(() => Promise.resolve().then(() => Promise.reject(error)))
+        .mockResolvedValueOnce({ id: 'user_123' });
+      const client = makeMockClient({ getUser: mock });
+      const wrapped = withRetry(client);
+
+      const promise = (wrapped.users as any).getUser('user_123');
+
+      // retryAfter=0 should NOT cause a 0ms delay; exponential backoff (1000ms for attempt 0) is used as floor
+      await vi.advanceTimersByTimeAsync(999);
+      expect(mock).toHaveBeenCalledTimes(1);
+
+      await vi.advanceTimersByTimeAsync(1);
+      await vi.advanceTimersByTimeAsync(0);
+
+      await expect(promise).resolves.toEqual({ id: 'user_123' });
+      expect(mock).toHaveBeenCalledTimes(2);
+    });
+
     it('caps retryAfter delay at MAX_RETRY_DELAY_MS (30s)', async () => {
       const error = makeClerkAPIError(429, { retryAfter: 60 });
       const mock = vi