Skip to content

Commit 9fba735

Browse files
committed
Merge branch 'vincent-and-the-doctor' into nikos/ui-versioning-p1
2 parents ca2b57e + 54c1a67 commit 9fba735

File tree

208 files changed

+4192
-1046
lines changed

Some content is hidden

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

208 files changed

+4192
-1046
lines changed
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"@clerk/clerk-js": minor
3+
"@clerk/shared": minor
4+
---
5+
6+
Implemented server-side pagination and filtering for API keys

.changeset/cold-bottles-watch.md

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

.changeset/heavy-badgers-beam.md

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

.changeset/modern-cars-fall.md

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

.changeset/moody-parks-scream.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@clerk/clerk-js': minor
3+
'@clerk/shared': minor
4+
---
5+
6+
[Experimental] Add types for errors used in new custom flow APIs
File renamed without changes.

.changeset/ripe-banks-pay.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@clerk/clerk-js': minor
3+
'@clerk/types': minor
4+
---
5+
6+
[Experimental] Add support for modal SSO sign-ins to new APIs
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@clerk/shared': patch
3+
---
4+
5+
Add email codes as an option to `PrepareSecondFactorParams`

.changeset/silly-jars-shave.md

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

.typedoc/custom-plugin.mjs

Lines changed: 40 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,20 +98,50 @@ function getRelativeLinkReplacements() {
9898
function getCatchAllReplacements() {
9999
return [
100100
{
101-
pattern: /\(setActiveParams\)/g,
102-
replace: '([setActiveParams](/docs/reference/javascript/types/set-active-params))',
101+
pattern: /(?<![\[\w`])`Appearance`\\<`Theme`\\>/g,
102+
replace: '[`Appearance<Theme>`](/docs/guides/customizing-clerk/appearance-prop/overview)',
103+
},
104+
{
105+
pattern: /\(CreateOrganizationParams\)/g,
106+
replace: '([CreateOrganizationParams](#create-organization-params))',
103107
},
104108
{
105109
pattern: /`LoadedClerk`/g,
106110
replace: '[Clerk](/docs/reference/javascript/clerk)',
107111
},
108112
{
109-
pattern: /\(CreateOrganizationParams\)/g,
110-
replace: '([CreateOrganizationParams](#create-organization-params))',
113+
pattern: /(?<![\[\w`])`?LocalizationResource`?(?![\]\w`])/g,
114+
replace: '[`LocalizationResource`](/docs/guides/customizing-clerk/localization)',
115+
},
116+
{
117+
// SessionResource appears in plain text, with an array next to it, with backticks, etc.
118+
// e.g. `SessionResource[]`
119+
pattern: /(?<![`[\]])\bSessionResource(\[\])?\b(?![\]\)`])/g,
120+
replace: '[`SessionResource`](/docs/reference/javascript/session)$1',
121+
},
122+
{
123+
pattern: /(?<![\[\w`])`?SessionStatusClaim`?(?![\]\w`])/g,
124+
replace: '[`SessionStatusClaim`](/docs/reference/javascript/types/session-status)',
111125
},
112126
{
113-
pattern: /\| `SignInResource` \|/,
114-
replace: '| [SignInResource](/docs/reference/javascript/sign-in) |',
127+
pattern: /(?<![`[\]])\bSetActiveParams\b(?![\]\(])/g,
128+
replace: '[SetActiveParams](/docs/reference/javascript/types/set-active-params)',
129+
},
130+
{
131+
pattern: /(?<![\[\w`])`?SignInResource`?(?![\]\w`])/g,
132+
replace: '[`SignInResource`](/docs/reference/javascript/sign-in)',
133+
},
134+
{
135+
pattern: /(?<![\[\w`])`?SignedInSessionResource`?(?![\]\w`])/g,
136+
replace: '[`SignedInSessionResource`](/docs/reference/javascript/session)',
137+
},
138+
{
139+
pattern: /(?<![\[\w`])`?SignUpResource`?(?![\]\w`])/g,
140+
replace: '[`SignUpResource`](/docs/reference/javascript/sign-up)',
141+
},
142+
{
143+
pattern: /(?<![\[\w`])`?OrganizationResource`?(?![\]\w`])/g,
144+
replace: '[`OrganizationResource`](/docs/reference/javascript/organization)',
115145
},
116146
{
117147
pattern: /`OrganizationPrivateMetadata`/g,
@@ -142,6 +172,10 @@ function getCatchAllReplacements() {
142172
replace:
143173
'[`OrganizationMembershipPublicMetadata`](/docs/reference/javascript/types/metadata#organization-membership-public-metadata)',
144174
},
175+
{
176+
pattern: /(?<![\[\w`])`?UserResource`?(?![\]\w`])/g,
177+
replace: '[`UserResource`](/docs/reference/javascript/user)',
178+
},
145179
{
146180
/**
147181
* By default, `@deprecated` is output with `**Deprecated**`. We want to add a full stop to it.

0 commit comments

Comments
 (0)