Skip to content

Commit 4489cc6

Browse files
authored
Merge branch 'main' into jacek/backend-token-hardening
2 parents 201020d + 9c9960a commit 4489cc6

9 files changed

Lines changed: 33 additions & 19 deletions

File tree

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@clerk/expo": patch
3+
---
4+
5+
Bump the native SDKs pulled into Expo: `clerk-ios` to `1.1.5` and `clerk-android-api`/`clerk-android-ui` to `1.0.26`.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@clerk/ui': patch
3+
---
4+
5+
Fix Chrome-specific scroll jump when toggling the billing period switch on the pricing table.

.changeset/stale-steaks-accept.md

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

.typedoc/custom-plugin.mjs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ export function applyRelativeLinkReplacements(contents) {
176176
function getCatchAllReplacements() {
177177
return [
178178
{
179-
pattern: /(?<![`[\]])\bClerkAPIResponseError\b(?![\]\(])/g,
179+
pattern: /(?<![\[\w`#])`?ClerkAPIResponseError`?(?![\]\w`])/g,
180180
replace: '[ClerkAPIResponseError](/docs/reference/types/clerk-api-response-error)',
181181
},
182182
{
@@ -204,7 +204,7 @@ function getCatchAllReplacements() {
204204
replace: '[ExternalAccountResource](/docs/reference/types/external-account)',
205205
},
206206
{
207-
pattern: /(?<![#])`LoadedClerk`/g,
207+
pattern: /(?<![\[\w`#])`?LoadedClerk`?(?![\]\w`])/g,
208208
replace: '[Clerk](/docs/reference/objects/clerk)',
209209
},
210210
{
@@ -230,7 +230,7 @@ function getCatchAllReplacements() {
230230
replace: '[SessionStatusClaim](/docs/reference/types/session-status)',
231231
},
232232
{
233-
pattern: /(?<![`#[\]])\bSetActiveParams\b(?![\]\(])/g,
233+
pattern: /(?<![\[\w`#])`?SetActiveParams`?(?![\]\w`])/g,
234234
replace: '[SetActiveParams](/docs/reference/types/set-active-params)',
235235
},
236236
{
@@ -258,11 +258,11 @@ function getCatchAllReplacements() {
258258
replace: '[SignedInSessionResource](/docs/reference/objects/session)',
259259
},
260260
{
261-
pattern: /(?<![#])`SignInRedirectOptions`/g,
261+
pattern: /(?<![\[\w`#])`?SignInRedirectOptions`?(?![\]\w`])/g,
262262
replace: '[SignInRedirectOptions](/docs/reference/types/sign-in-redirect-options)',
263263
},
264264
{
265-
pattern: /(?<![#])`SignUpRedirectOptions`/g,
265+
pattern: /(?<![\[\w`#])`?SignUpRedirectOptions`?(?![\]\w`])/g,
266266
replace: '[SignUpRedirectOptions](/docs/reference/types/sign-up-redirect-options)',
267267
},
268268
{
@@ -274,15 +274,15 @@ function getCatchAllReplacements() {
274274
replace: '[SignUpVerificationResource](/docs/reference/types/sign-up-verification-resource)',
275275
},
276276
{
277-
pattern: /(?<![#])`SignUpUnsafeMetadata`/g,
277+
pattern: /(?<![\[\w`#])`?SignUpUnsafeMetadata`?(?![\]\w`])/g,
278278
replace: '[SignUpUnsafeMetadata](/docs/reference/types/metadata#sign-up-unsafe-metadata)',
279279
},
280280
{
281281
pattern: /(?<![\[\w`#])`?SignUpFutureResource`?(?![\]\w`])/g,
282282
replace: '[SignUpFutureResource](/docs/reference/objects/sign-up-future)',
283283
},
284284
{
285-
pattern: /(?<![#])`TasksRedirectOptions`/g,
285+
pattern: /(?<![\[\w`#])`?TasksRedirectOptions`?(?![\]\w`])/g,
286286
replace: '[TasksRedirectOptions](/docs/reference/types/redirect-options)',
287287
},
288288
{
@@ -294,30 +294,30 @@ function getCatchAllReplacements() {
294294
replace: '[OrganizationResource](/docs/reference/objects/organization)',
295295
},
296296
{
297-
pattern: /(?<![#])`OrganizationPrivateMetadata`/g,
297+
pattern: /(?<![\[\w`#])`?OrganizationPrivateMetadata`?(?![\]\w`])/g,
298298
replace: '[OrganizationPrivateMetadata](/docs/reference/types/metadata#organization-private-metadata)',
299299
},
300300
{
301-
pattern: /(?<![#])`OrganizationPublicMetadata`/g,
301+
pattern: /(?<![\[\w`#])`?OrganizationPublicMetadata`?(?![\]\w`])/g,
302302
replace: '[OrganizationPublicMetadata](/docs/reference/types/metadata#organization-public-metadata)',
303303
},
304304
{
305-
pattern: /(?<![#])`OrganizationInvitationPrivateMetadata`/g,
305+
pattern: /(?<![\[\w`#])`?OrganizationInvitationPrivateMetadata`?(?![\]\w`])/g,
306306
replace:
307307
'[OrganizationInvitationPrivateMetadata](/docs/reference/types/metadata#organization-invitation-private-metadata)',
308308
},
309309
{
310-
pattern: /(?<![#])`OrganizationInvitationPublicMetadata`/g,
310+
pattern: /(?<![\[\w`#])`?OrganizationInvitationPublicMetadata`?(?![\]\w`])/g,
311311
replace:
312312
'[OrganizationInvitationPublicMetadata](/docs/reference/types/metadata#organization-invitation-public-metadata)',
313313
},
314314
{
315-
pattern: /(?<![#])`OrganizationMembershipPrivateMetadata`/g,
315+
pattern: /(?<![\[\w`#])`?OrganizationMembershipPrivateMetadata`?(?![\]\w`])/g,
316316
replace:
317317
'[OrganizationMembershipPrivateMetadata](/docs/reference/types/metadata#organization-membership-private-metadata)',
318318
},
319319
{
320-
pattern: /(?<![#])`OrganizationMembershipPublicMetadata`/g,
320+
pattern: /(?<![\[\w`#])`?OrganizationMembershipPublicMetadata`?(?![\]\w`])/g,
321321
replace:
322322
'[OrganizationMembershipPublicMetadata](/docs/reference/types/metadata#organization-membership-public-metadata)',
323323
},
@@ -335,7 +335,7 @@ function getCatchAllReplacements() {
335335
},
336336
{
337337
pattern: /(?<![\[\w`#])`?UserResource`?(?![\]\w`])/g,
338-
replace: '[`UserResource`](/docs/reference/objects/user)',
338+
replace: '[UserResource](/docs/reference/objects/user)',
339339
},
340340
{
341341
pattern: /(?<![\[\w`#])`?LastAuthenticationStrategy`?(?![\]\w`])/g,

packages/expo/android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ ext {
1818
credentialsVersion = "1.3.0"
1919
googleIdVersion = "1.1.1"
2020
kotlinxCoroutinesVersion = "1.7.3"
21-
clerkAndroidApiVersion = "1.0.23"
22-
clerkAndroidUiVersion = "1.0.23"
21+
clerkAndroidApiVersion = "1.0.26"
22+
clerkAndroidUiVersion = "1.0.26"
2323
composeVersion = "1.7.0"
2424
activityComposeVersion = "1.9.0"
2525
lifecycleVersion = "2.8.0"

packages/expo/app.plugin.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const path = require('path');
2020
const fs = require('fs');
2121

2222
const CLERK_IOS_REPO = 'https://github.com/clerk/clerk-ios.git';
23-
const CLERK_IOS_VERSION = '1.1.4';
23+
const CLERK_IOS_VERSION = '1.1.5';
2424

2525
const CLERK_MIN_IOS_VERSION = '17.0';
2626

packages/shared/src/types/session.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ export interface SessionResource extends ClerkResource {
247247
*/
248248
actor: ActClaim | null;
249249
/**
250-
* When the session's actor claim has `type: 'agent'`, this property exposes information about the agent and [Agent Task](https://clerk.com/docs/reference/objects/agent-task) that was used to create the session.
250+
* When the session's actor claim has `type: 'agent'`, this property exposes information about the agent and [Agent Task](https://clerk.com/docs/reference/types/agent-task) that was used to create the session.
251251
*/
252252
agent: AgentActClaim | null;
253253
/**

packages/shared/src/types/signUpFuture.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ export interface SignUpFuturePhoneCodeVerifyParams {
203203
/** @generateWithEmptyComment */
204204
export interface SignUpFutureSSOParams extends SignUpFutureAdditionalParams {
205205
/**
206-
* The strategy to use for authentication. Either [`OAuthStrategy`](https://clerk.com/docs/reference/types/oauth-strategy) or [`EnterpriseSSOStrategy`](https://clerk.com/docs/reference/types/enterprise-sso-strategy).
206+
* The strategy to use for authentication. Either [`OAuthStrategy`](https://clerk.com/docs/reference/types/sso#o-auth-strategy) or [`EnterpriseSSOStrategy`](https://clerk.com/docs/reference/types/sso#enterprise-sso-strategy).
207207
*/
208208
strategy: string;
209209
/**

packages/ui/src/elements/Switch.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ export const Switch = forwardRef<HTMLDivElement, SwitchProps>(
5353
align='center'
5454
as='label'
5555
sx={t => ({
56+
position: 'relative',
5657
isolation: 'isolate',
5758
width: 'fit-content',
5859
'&:has(input:focus-visible) > input + span': {
@@ -73,6 +74,7 @@ export const Switch = forwardRef<HTMLDivElement, SwitchProps>(
7374
aria-labelledby={ariaLabelledBy}
7475
style={{
7576
...common.visuallyHidden(),
77+
inset: 0,
7678
}}
7779
/>
7880
<Flex

0 commit comments

Comments
 (0)