Merge branch 'main' into ss/more-typedoc-outputs

Author: SarahSoutoul

.changeset/expo-mobile-485-cold-start-activity.md

@@ -0,0 +1,7 @@
+---
+"@clerk/expo": patch
+---
+
+Fix `MissingActivity` error on cold-start Google sign-in / passkey flows. Previously, the first tap on "Sign in with Google" in `<AuthView />` failed with `Clerk error: Google sign-in cannot start: Credential Manager requires an active Activity context.` — the workaround was to background and foreground the app once before signing in.
+
+The Android bridge now calls `Clerk.attachActivity()` (added in clerk-android 1.0.16) at SDK initialization and on AuthView/UserProfile mount, so the current Activity is registered with the underlying SDK before any Credential Manager call. No app-side changes required; the fix is transparent on rebuild.

.changeset/four-wombats-clean.md

@@ -0,0 +1,6 @@
+---
+"@clerk/clerk-js": minor
+"@clerk/ui": minor
+---
+
+Removed unused internal OAuthConsent prop.

.changeset/lucky-tables-learn.md

@@ -0,0 +1,5 @@
+---
+'@clerk/ui': patch
+---
+
+Add wizard steps for the `<__experimental_ConfigureSSO />` component

.changeset/pink-taxes-do.md

@@ -0,0 +1,7 @@
+---
+'@clerk/ui': patch
+---
+
+Remove back button on the sign-in password compromised/pwned error screen.
+
+These errors are not recoverable by re-entering the password, so the back button led to a confusing dead end that would always take you back to the same error.

package.json

@@ -77,7 +77,7 @@
     "@clerk/backend": "workspace:*",
     "@clerk/shared": "workspace:*",
     "@clerk/testing": "workspace:*",
-    "@commitlint/cli": "^20.5.0",
+    "@commitlint/cli": "^20.5.2",
     "@commitlint/config-conventional": "^20.5.0",
     "@eslint/eslintrc": "^3.3.5",
     "@eslint/js": "9.31.0",

packages/backend/package.json

@@ -125,8 +125,8 @@
   },
   "devDependencies": {
     "@edge-runtime/vm": "5.0.0",
-    "cookie": "1.0.2",
-    "msw": "2.11.6",
+    "cookie": "1.1.1",
+    "msw": "2.14.2",
     "npm-run-all": "^4.1.5",
     "snakecase-keys": "9.0.2",
     "vitest-environment-miniflare": "2.14.4"

packages/clerk-js/package.json

@@ -103,16 +103,16 @@
   "devDependencies": {
     "@clerk/msw": "workspace:^",
     "@clerk/testing": "workspace:^",
-    "@emotion/react": "11.11.1",
+    "@emotion/react": "11.14.0",
     "@rsdoctor/rspack-plugin": "^0.4.13",
     "@rspack/cli": "catalog:rspack",
     "@rspack/core": "catalog:rspack",
     "@rspack/plugin-react-refresh": "catalog:rspack",
     "@types/cloudflare-turnstile": "^0.2.2",
     "@types/webpack-env": "^1.18.8",
-    "bundlewatch": "^0.4.1",
+    "bundlewatch": "^0.4.2",
     "jsdom": "26.1.0",
-    "minimatch": "^10.0.3",
+    "minimatch": "^10.2.5",
     "webpack-merge": "^5.10.0"
   },
   "engines": {

packages/clerk-js/sandbox/app.ts

@@ -486,7 +486,6 @@ void (async () => {
           scopes,
           oauthClientId: 'Wg9fP2d0pSFXCZ1u',
           redirectUrl: searchParams.get('redirect_uri') ?? 'http://localhost:4000/oauth/callback',
-          __internal_enableOrgSelection: true,
         },
       );
     },

packages/clerk-js/src/core/clerk.ts

@@ -1457,6 +1457,15 @@ export class Clerk implements ClerkInterface {
       return;
     }
 
+    if (noUserExists(this)) {
+      if (this.#instanceType === 'development') {
+        throw new ClerkRuntimeError(warnings.cannotRenderConfigureSSOComponentWhenUserDoesNotExist, {
+          code: CANNOT_RENDER_USER_MISSING_ERROR_CODE,
+        });
+      }
+      return;
+    }
+
     this.assertComponentsReady(this.#clerkUI);
     const component = 'ConfigureSSO';
     void this.#clerkUI

packages/expo/android/build.gradle

@@ -18,8 +18,8 @@ ext {
   credentialsVersion = "1.3.0"
   googleIdVersion = "1.1.1"
   kotlinxCoroutinesVersion = "1.7.3"
-  clerkAndroidApiVersion = "1.0.13"
-  clerkAndroidUiVersion = "1.0.13"
+  clerkAndroidApiVersion = "1.0.16"
+  clerkAndroidUiVersion = "1.0.16"
   composeVersion = "1.7.0"
   activityComposeVersion = "1.9.0"
   lifecycleVersion = "2.8.0"
@@ -117,6 +117,16 @@ dependencies {
     exclude group: 'com.squareup.okhttp3', module: 'okhttp'
     exclude group: 'com.squareup.okhttp3', module: 'okhttp-urlconnection'
   }
+  // clerk-android-telemetry has a transitive dep on the last released
+  // clerk-android-api. Pinning the api explicitly here keeps consumers
+  // compiling against the same version we ship the UI from.
+  implementation("com.clerk:clerk-android-api:$clerkAndroidApiVersion") {
+    exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib'
+    exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk7'
+    exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk8'
+    exclude group: 'com.squareup.okhttp3', module: 'okhttp'
+    exclude group: 'com.squareup.okhttp3', module: 'okhttp-urlconnection'
+  }
 
   // Jetpack Compose for wrapping Clerk views
   implementation "androidx.compose.ui:ui:$composeVersion"