Skip to content

Commit a93674f

Browse files
committed
Merge branch 'main' into elef/com-1153-fix-flickering-of-pricing-table-on-load
2 parents 9cd7057 + 4db1e58 commit a93674f

File tree

206 files changed

+4136
-1134
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

206 files changed

+4136
-1134
lines changed

.changeset/all-cougars-hide.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@clerk/clerk-js': patch
3+
'@clerk/types': patch
4+
---
5+
6+
Introduce debugLogger for internal debugging support

.changeset/bright-parks-search.md

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

.changeset/chatty-kings-raise.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
---
2+
"@clerk/backend": minor
3+
---
4+
5+
Remove `secret` in favor of `token` in m2m response.
6+
7+
Before:
8+
9+
```ts
10+
const result = await clerkClient.m2mTokens.create()
11+
12+
console.log(result.secret)
13+
```
14+
15+
After:
16+
17+
```ts
18+
const result = await clerkClient.m2mTokens.create()
19+
20+
console.log(result.token)
21+
```

.changeset/complete-persian-localization.md

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

.changeset/eighty-plums-listen.md

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

.changeset/forty-bottles-accept.md

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

.changeset/nasty-colts-travel.md

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

.changeset/rich-donuts-agree.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
---
2+
'@clerk/clerk-js': minor
3+
'@clerk/types': minor
4+
---
5+
6+
Add `navigate` parameter to `clerk.setActive()` for custom navigation before the session and/or organization is set.
7+
8+
It's useful for handling pending session tasks for after-auth flows:
9+
10+
```typescript
11+
await clerk.setActive({
12+
session,
13+
navigate: async ({ session }) => {
14+
const currentTask = session.currentTask;
15+
if (currentTask) {
16+
await router.push(`/onboarding/${currentTask.key}`)
17+
return;
18+
}
19+
20+
await router.push('/dashboard')
21+
}
22+
});
23+
```

.changeset/rich-drinks-ring.md

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

.changeset/sad-turkeys-rhyme.md

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

0 commit comments

Comments
 (0)