Skip to content

Commit b356b03

Browse files
jacekradkojacekradko
committed
merge: resolve conflicts with main
2 parents 7170adb + 23f773b commit b356b03

370 files changed

Lines changed: 12860 additions & 1773 deletions

File tree

Some content is hidden

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

‎.changeset/clean-llamas-scream.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@clerk/localizations": patch
3+
---
4+
5+
Using length token in minimum and maximum length for swedish translations.

‎.changeset/cyan-elephants-roll.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"@clerk/localizations": patch
3+
"@clerk/shared": patch
4+
"@clerk/ui": patch
5+
---
6+
7+
Improved error handling when creating API keys.

‎.changeset/expo-subpath-fallbacks.md‎

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+
Add directory-level `package.json` fallback stubs for all subpath exports so that imports like `@clerk/expo/token-cache` resolve correctly in React Native bundlers that don't support the `exports` field (e.g., Metro without `unstable_enablePackageExports`).

‎.changeset/fiery-brooms-tell.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@clerk/localizations": patch
3+
---
4+
5+
Add and improve Japanese translations

.changeset/integration-tests-build-dep.md renamed to .changeset/fix-ci-artifact-name.md

File renamed without changes.

.changeset/re-enable-turbocache.md renamed to .changeset/fix-keyless-claim-test.md

File renamed without changes.

‎.changeset/fix-proxy-redirect-manual.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@clerk/backend': patch
3+
---
4+
5+
Fix frontend API proxy following redirects server-side instead of passing them to the browser. The proxy's `fetch()` call now uses `redirect: 'manual'` so that 3xx responses from FAPI (e.g. after OAuth callbacks) are returned to the client as-is, matching standard HTTP proxy behavior.

‎.changeset/green-hotels-study.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@clerk/localizations': patch
3+
---
4+
5+
fix(localizations): add missing Hungarian translations for form placeholders and legal consent

‎.changeset/humble-trams-laugh.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
'@clerk/clerk-js': minor
3+
'@clerk/shared': minor
4+
'@clerk/ui': minor
5+
---
6+
7+
Add `EnterpriseConnection` resource
8+
9+
`User.getEnterpriseConnections()` was wrongly typed as returning `EnterpriseAccountConnectionResource[]`, it now returns `EnterpriseConnectionResource[]`

.changeset/all-readers-dream.md renamed to .changeset/large-cameras-talk.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
---
2-
'@clerk/backend': minor
32
'@clerk/localizations': minor
43
'@clerk/clerk-js': minor
54
'@clerk/shared': minor
65
'@clerk/ui': minor
76
---
87

9-
Add support for annual-only Billing plans.
8+
Allow to link external accounts to enterprise accounts via `UserProfile`

0 commit comments

Comments
 (0)