Skip to content

Commit 33461a1

Browse files
authored
Merge branch 'main' into renovate/radix-ui-primitives-monorepo
2 parents 0fce27d + 8b25035 commit 33461a1

File tree

356 files changed

+9800
-2430
lines changed

Some content is hidden

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

356 files changed

+9800
-2430
lines changed

.changeset/angry-nights-smash.md

-5
This file was deleted.

.changeset/bright-spoons-fix.md

-12
This file was deleted.

.changeset/busy-ducks-strive.md

-5
This file was deleted.

.changeset/cold-bears-go.md

-5
This file was deleted.

.changeset/every-feet-brush.md

-5
This file was deleted.

.changeset/flat-cougars-mate.md

-5
This file was deleted.

.changeset/four-doors-attack.md

-33
This file was deleted.

.changeset/four-streets-join.md

-17
This file was deleted.

.changeset/fresh-bears-unite.md

-15
This file was deleted.

.changeset/giant-bats-leave.md

-7
This file was deleted.

.changeset/hip-sides-kick.md

-61
This file was deleted.

.changeset/icy-lemons-fall.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@clerk/clerk-js': patch
3+
---
4+
5+
Minor UI fixes for Billing pages in `<UserProfile/>` and `<OrganizationProfile/>`.

.changeset/major-terms-travel.md

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@clerk/localizations': patch
3+
'@clerk/types': patch
4+
---
5+
6+
Make the `session_exists` error message more user-friendly and localize

.changeset/open-cases-happen.md

-5
This file was deleted.

.changeset/open-papers-cross.md

-5
This file was deleted.

.changeset/rich-jobs-serve.md

-14
This file was deleted.

.changeset/shaky-crabs-show.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@clerk/clerk-react': patch
3+
---
4+
5+
Add details to `<UserButton.*>` error messages indicating that the components must be used within client components.

.changeset/slick-taxis-cut.md

-5
This file was deleted.

.changeset/smart-rooms-refuse.md

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
---

.changeset/thick-beers-wave.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@clerk/nextjs': patch
3+
---
4+
5+
Resolved an issue with Keyless on Safari where users appeared to be signed out immediately after a successful sign-in.

.changeset/thin-foxes-exist.md

-31
This file was deleted.

.changeset/upset-taxes-marry.md

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
'@clerk/chrome-extension': minor
3+
'@clerk/clerk-expo': minor
4+
'@clerk/clerk-react': minor
5+
'@clerk/react-router': minor
6+
'@clerk/remix': minor
7+
'@clerk/nextjs': minor
8+
'@clerk/tanstack-react-start': minor
9+
---
10+
11+
Export `<__experimental_PricingTable />`.

.typedoc/__tests__/__snapshots__/file-structure.test.ts.snap

+8
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ exports[`Typedoc output > should have a deliberate file structure 1`] = `
1515
"types/clerk-pagination-params.mdx",
1616
"types/clerk-pagination-request.mdx",
1717
"types/clerk-resource.mdx",
18+
"types/clerk-status.mdx",
1819
"types/clerk.mdx",
1920
"types/create-organization-params.mdx",
2021
"types/element-object-key.mdx",
@@ -27,10 +28,16 @@ exports[`Typedoc output > should have a deliberate file structure 1`] = `
2728
"types/localization-resource.mdx",
2829
"types/multi-domain-and-or-proxy.mdx",
2930
"types/organization-custom-role-key.mdx",
31+
"types/organization-domain-resource.mdx",
3032
"types/organization-domain-verification-status.mdx",
3133
"types/organization-enrollment-mode.mdx",
34+
"types/organization-invitation-resource.mdx",
3235
"types/organization-invitation-status.mdx",
36+
"types/organization-membership-request-resource.mdx",
37+
"types/organization-membership-resource.mdx",
3338
"types/organization-permission-key.mdx",
39+
"types/organization-resource.mdx",
40+
"types/organization-suggestion-resource.mdx",
3441
"types/organization-suggestion-status.mdx",
3542
"types/organizations-jwt-claim.mdx",
3643
"types/override.mdx",
@@ -57,6 +64,7 @@ exports[`Typedoc output > should have a deliberate file structure 1`] = `
5764
"types/use-sign-in-return.mdx",
5865
"types/use-sign-up-return.mdx",
5966
"types/use-user-return.mdx",
67+
"types/user-organization-invitation-resource.mdx",
6068
"types/user-resource.mdx",
6169
"types/without.mdx",
6270
"shared/build-clerk-js-script-attributes.mdx",

.typedoc/custom-plugin.mjs

+31-5
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ const FILES_WITHOUT_HEADINGS = [
1414
'paginated-hook-config.mdx',
1515
'use-organization-list-return.mdx',
1616
'use-organization-list-params.mdx',
17+
'create-organization-params.mdx',
1718
];
1819

1920
/**
@@ -28,6 +29,13 @@ const LINK_REPLACEMENTS = [
2829
['sign-up-resource', '/docs/references/javascript/sign-up'],
2930
['user-resource', '/docs/references/javascript/user'],
3031
['session-status-claim', '/docs/references/javascript/types/session-status'],
32+
['user-organization-invitation-resource', '/docs/references/javascript/types/user-organization-invitation'],
33+
['organization-membership-resource', '/docs/references/javascript/types/organization-membership'],
34+
['organization-suggestion-resource', '/docs/references/javascript/types/organization-suggestion'],
35+
['organization-resource', '/docs/references/javascript/organization'],
36+
['organization-domain-resource', '/docs/references/javascript/types/organization-domain'],
37+
['organization-invitation-resource', '/docs/references/javascript/types/organization-invitation'],
38+
['organization-membership-request-resource', '/docs/references/javascript/types/organization-membership-request'],
3139
];
3240

3341
/**
@@ -54,7 +62,7 @@ function getRelativeLinkReplacements() {
5462
});
5563
}
5664

57-
function getUnlinkedTypesReplacements() {
65+
function getCatchAllReplacements() {
5866
return [
5967
{
6068
pattern: /\(setActiveParams\)/g,
@@ -69,8 +77,26 @@ function getUnlinkedTypesReplacements() {
6977
replace: '[Clerk](/docs/references/javascript/clerk)',
7078
},
7179
{
72-
pattern: /`OrganizationCustomRoleKey`/g,
73-
replace: '[OrganizationCustomRoleKey](/docs/references/javascript/types/organization-custom-role-key)',
80+
pattern: /\(CreateOrganizationParams\)/g,
81+
replace: '([CreateOrganizationParams](#create-organization-params))',
82+
},
83+
{
84+
pattern: /\| `SignInResource` \|/,
85+
replace: '| [SignInResource](/docs/references/javascript/sign-in) |',
86+
},
87+
{
88+
/**
89+
* By default, `@deprecated` is output with `**Deprecated**`. We want to add a full stop to it.
90+
*/
91+
pattern: /\*\*Deprecated\*\*/g,
92+
replace: '**Deprecated.**',
93+
},
94+
{
95+
/**
96+
* By default, `@default` is output with "**Default** `value`". We want to capture the value and place it inside "Defaults to `value`."
97+
*/
98+
pattern: /\*\*Default\*\* `([^`]+)`/g,
99+
replace: 'Defaults to `$1`.',
74100
},
75101
];
76102
}
@@ -89,9 +115,9 @@ export function load(app) {
89115
}
90116
}
91117

92-
const unlinkedTypesReplacements = getUnlinkedTypesReplacements();
118+
const catchAllReplacements = getCatchAllReplacements();
93119

94-
for (const { pattern, replace } of unlinkedTypesReplacements) {
120+
for (const { pattern, replace } of catchAllReplacements) {
95121
if (output.contents) {
96122
output.contents = output.contents.replace(pattern, replace);
97123
}

0 commit comments

Comments
 (0)