Skip to content

Commit 9a80889

Browse files
authored
Merge branch 'main' into rob/electron-passkeys-ci-cd
2 parents ba805d7 + 52d310c commit 9a80889

8 files changed

Lines changed: 13 additions & 10 deletions

File tree

‎.changeset/eighty-otters-look.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
---

‎.changeset/expo-bump-clerk-android-1-0-29.md‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎.changeset/huge-grapes-kiss.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
---

‎.changeset/sweet-glasses-show.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
---

‎.typedoc/__tests__/__snapshots__/clerk-properties.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
| <a id="issignedin"></a> `isSignedIn` | `boolean` | Indicates whether the current user has a valid signed-in client session. |
1010
| <a id="isstandardbrowser"></a> `isStandardBrowser` | <code>undefined \| boolean</code> | Indicates whether the instance is being loaded in a standard browser environment. Set to `false` on native platforms where cookies cannot be set. When `undefined`, Clerk assumes a standard browser. |
1111
| <a id="loaded"></a> `loaded` | `boolean` | Indicates whether the `Clerk` object is ready for use. Set to `false` when the `status` is `"loading"`. Set to `true` when the `status` is `"ready"` or `"degraded"`. |
12-
| <a id="oauthapplication"></a> `oauthApplication` | [`OAuthApplicationNamespace`](../o-auth-application-namespace.mdx) | OAuth application helpers (e.g. consent metadata for custom consent UIs). |
12+
| <a id="oauthapplication"></a> `oauthApplication` | [`OAuthApplicationNamespace`](/docs/reference/types/oauth-application) | OAuth application helpers (e.g. consent metadata for custom consent UIs). |
1313
| <a id="organization"></a> `organization` | <code>undefined \| null \| [OrganizationResource](/docs/reference/objects/organization)</code> | A shortcut to the last active `Session.user.organizationMemberships` which holds an instance of a `Organization` object. If the session is `null` or `undefined`, the user field will match. |
1414
| <a id="proxyurl"></a> `proxyUrl` | <code>undefined \| string</code> | **Required for applications that run behind a reverse proxy**. Your Clerk app's proxy URL. Can be either a relative path (`/__clerk`) or a full URL (`https://<your-domain>/__clerk`). |
1515
| <a id="publishablekey"></a> `publishableKey` | `string` | Your Clerk [Publishable Key](!publishable-key). |

‎.typedoc/custom-plugin.mjs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ const FILES_WITHOUT_HEADINGS = [
3939
'use-organization-creation-defaults-params.mdx',
4040
'use-o-auth-consent-params.mdx',
4141
'use-o-auth-consent-return.mdx',
42+
'create-organization-domain-params.mdx',
4243
];
4344

4445
/**
@@ -70,6 +71,7 @@ const LINK_REPLACEMENTS = [
7071
['organization-domain-resource', '/docs/reference/types/organization-domain-resource'],
7172
['organization-invitation-resource', '/docs/reference/types/organization-invitation'],
7273
['organization-membership-request-resource', '/docs/reference/types/organization-membership-request'],
74+
['o-auth-application-namespace', '/docs/reference/types/oauth-application'],
7375
['o-auth-consent-info', '/docs/reference/types/oauth-consent-info'],
7476
['o-auth-consent-scope', '/docs/reference/types/oauth-consent-scope'],
7577
['o-auth-strategy', '/docs/reference/types/sso#o-auth-strategy'],
@@ -128,6 +130,7 @@ const LINK_REPLACEMENTS = [
128130
['session-task', '/docs/reference/types/session-task'],
129131
['public-user-data', '/docs/reference/types/public-user-data'],
130132
['session-status', '/docs/reference/types/session-status'],
133+
['create-organization-domain-params', '#create-organization-domain-params'],
131134
];
132135

133136
/**

‎packages/expo/android/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ ext {
1717
credentialsVersion = "1.3.0"
1818
googleIdVersion = "1.1.1"
1919
kotlinxCoroutinesVersion = "1.7.3"
20-
clerkAndroidApiVersion = "1.0.29"
21-
clerkAndroidUiVersion = "1.0.29"
20+
clerkAndroidApiVersion = "1.0.28"
21+
clerkAndroidUiVersion = "1.0.28"
2222
composeVersion = "1.7.0"
2323
activityComposeVersion = "1.9.0"
2424
lifecycleVersion = "2.8.0"

‎packages/react/src/components/PlanDetailsButton.tsx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ import { assertSingleChild, normalizeWithDefaultValue, safeExecute } from '../ut
66
import { withClerk } from './withClerk';
77

88
/**
9-
* A button component that opens the Clerk Plan Details drawer when clicked. This component is part of
10-
* Clerk's Billing feature which is available under a public beta.
9+
* A button component that opens the Clerk Plan Details drawer when clicked.
1110
*
1211
* @example
1312
* ```tsx

0 commit comments

Comments
 (0)