Skip to content

Commit a3203ef

Browse files
ex-viex-vi
committed
Merge branch 'main' into feat/localizations-uk-ua-complete
Resolve the conflicts in packages/localizations/src/uk-UA.ts and translate the keys main added since the last sync: - billing.checkout: addPromoCode, applyPromoCode, discount, promoCodePlaceholder, removePromoCode (#9316) - billing: discountAmount, discountCyclesRemaining, discountDuration, months, years (#9316) - unstable__errors.form_password_matches_identifier (#9453) - oauthConsent.scopeList.privateMetadata (#9226) billing.months and billing.years render only after a numeric count, via getBillingPeriodLabel. Ukrainian takes one noun form after 2-4 and another after 5+, so a single key cannot serve both. They use the invariant abbreviations «міс.» and «р.», which are correct after any count. This follows the convention already used for the seat-breakdown strings.
2 parents c6e100f + dc7fab3 commit a3203ef

837 files changed

Lines changed: 44013 additions & 14041 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/blue-otters-count.md‎

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

‎.changeset/bright-dogs-remember.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
'@clerk/electron': patch
3+
---
4+
5+
Keep the current client token available for the lifetime of the Electron app when secure persistence is unavailable or fails.
6+
7+
Fixed a race where an older in-flight token write could replace a newer token when multiple requests completed at the same time.

‎.changeset/hono-security-update.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@clerk/hono': patch
3+
---
4+
5+
Bump `hono` devDependency floor to `^4.12.34` to pick up an upstream security fix (CVE-2026-69207, ReDoS in the CORS middleware).

‎.changeset/invitation-metadata-link-target.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@clerk/backend': patch
3+
'@clerk/nextjs': patch
4+
---
5+
6+
Align JSDoc link targets with the docs link rules: internal docs links don't open in a new tab (removed `{{ target: '_blank' }}` from the `Invitation` Metadata link), while API reference links do (added it to the `ExternalAccount` Backend API link and the `currentUser()` endpoint link).

‎.changeset/lucky-donkeys-brake.md‎

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

‎.changeset/mosaic-banner-component.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
'@clerk/ui': minor
3+
---
4+
5+
Add the Mosaic `Banner` component: a tinted surface that annotates the content around it with a status message. Compose it from `Banner.Root`, `Banner.Label`, and `Banner.Description`. `Banner.Root` takes a `color` of `neutral`, `warning`, or `negative`, and renders the icon for that color itself. It sets no ARIA role, so pass `role='status'` (or `role='alert'`) when the banner appears in response to something the user did.
6+
7+
Also adds an `info-circle` glyph to the Mosaic icon set.

‎.changeset/mosaic-focus-ring-tokens.md‎

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

‎.changeset/mosaic-menu-item-height.md‎

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

‎.changeset/mosaic-user-button-controller.md‎

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

‎.changeset/mosaic-user-button-integration.md‎

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

0 commit comments

Comments
 (0)