Skip to content

Commit bd8a863

Browse files
authored
Merge branch 'main' into renovate/linting-and-formatting
2 parents b28d72b + d7317c1 commit bd8a863

183 files changed

Lines changed: 4998 additions & 3772 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.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"@clerk/expo": patch
3+
---
4+
5+
Fix `MissingActivity` error on cold-start Google sign-in / passkey flows. Previously, the first tap on "Sign in with Google" in `<AuthView />` failed with `Clerk error: Google sign-in cannot start: Credential Manager requires an active Activity context.` — the workaround was to background and foreground the app once before signing in.
6+
7+
The Android bridge now calls `Clerk.attachActivity()` (added in clerk-android 1.0.16) at SDK initialization and on AuthView/UserProfile mount, so the current Activity is registered with the underlying SDK before any Credential Manager call. No app-side changes required; the fix is transparent on rebuild.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@clerk/nextjs": patch
3+
---
4+
5+
Improved `auth()` error message when `clerkMiddleware()` is not detected to mention that infrastructure issues (e.g. edge runtime errors or platform outages) can also cause this error.

.changeset/pink-taxes-do.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
'@clerk/ui': patch
3+
---
4+
5+
Remove back button on the sign-in password compromised/pwned error screen.
6+
7+
These errors are not recoverable by re-entering the password, so the back button led to a confusing dead end that would always take you back to the same error.

.changeset/sdk-70-keyless-middleware-bypass-fix.md

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

.changeset/ui-mount-diagnostic.md

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

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name: CI
33
on:
44
merge_group:
55
pull_request:
6+
types: [opened, synchronize, reopened, ready_for_review]
67
branches:
78
- main
89
- release/v4

.typedoc/custom-plugin.mjs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@ const LINK_REPLACEMENTS = [
7474
['identification-link', '/docs/reference/backend/types/backend-identification-link'],
7575
['verification', '/docs/reference/backend/types/backend-verification'],
7676
['email-address', '/docs/reference/backend/types/backend-email-address'],
77+
['enterprise-account', '/docs/reference/backend/types/backend-enterprise-account'],
78+
['enterprise-account-connection', '/docs/reference/backend/types/backend-enterprise-account-connection'],
7779
['external-account', '/docs/reference/backend/types/backend-external-account'],
7880
['phone-number', '/docs/reference/backend/types/backend-phone-number'],
7981
['saml-account', '/docs/reference/backend/types/backend-saml-account'],
@@ -85,10 +87,15 @@ const LINK_REPLACEMENTS = [
8587
['billing-payment-method-resource', '/docs/reference/types/billing-payment-method-resource'],
8688
['billing-payer-resource', '/docs/reference/types/billing-payer-resource'],
8789
['billing-plan-resource', '/docs/reference/types/billing-plan-resource'],
90+
['billing-plan-unit-price', '/docs/reference/types/billing-plan-unit-price'],
91+
['billing-plan-unit-price-tier', '/docs/reference/types/billing-plan-unit-price-tier'],
8892
['billing-checkout-totals', '/docs/reference/types/billing-checkout-totals'],
8993
['billing-checkout-resource', '/docs/reference/types/billing-checkout-resource'],
9094
['billing-money-amount', '/docs/reference/types/billing-money-amount'],
95+
['billing-per-unit-total', '/docs/reference/types/billing-per-unit-total'],
96+
['billing-per-unit-total-tier', '/docs/reference/types/billing-per-unit-total-tier'],
9197
['billing-subscription-item-resource', '/docs/reference/types/billing-subscription-item-resource'],
98+
['billing-subscription-item-seats', '/docs/reference/types/billing-subscription-item-seats'],
9299
['feature-resource', '/docs/reference/types/feature-resource'],
93100
['billing-statement-group', '/docs/reference/types/billing-statement-group'],
94101
['billing-statement-resource', '/docs/reference/types/billing-statement-resource'],

integration/testUtils/machineAuthHelpers.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import type { ApplicationConfig } from '../models/applicationConfig';
1212
import type { EnvironmentConfig } from '../models/environment';
1313
import { appConfigs } from '../presets';
1414
import { instanceKeys } from '../presets/envs';
15-
import type { FakeAPIKey, FakeUser } from './usersService';
1615
import { createTestUtils } from './index';
16+
import type { FakeAPIKey, FakeUser } from './usersService';
1717

1818
export type FakeMachineNetwork = {
1919
primaryServer: Machine;

packages/astro/CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
# @clerk/astro
22

3+
## 3.2.0
4+
5+
### Minor Changes
6+
7+
- Add experimental `<ConfigureSSO />` component. Not ready for usage yet. ([#8427](https://github.com/clerk/javascript/pull/8427)) by [@LauraBeatris](https://github.com/LauraBeatris)
8+
9+
### Patch Changes
10+
11+
- Updated dependencies [[`9e9230c`](https://github.com/clerk/javascript/commit/9e9230c8c3cbdb1c253ca7cdd24cc8d681b5ee5a), [`68d32df`](https://github.com/clerk/javascript/commit/68d32dfcc453080ef93edf69be8de765a342d88c), [`1c27d4d`](https://github.com/clerk/javascript/commit/1c27d4dd41a27cf41c3823306fe88e026fed08fb), [`1001193`](https://github.com/clerk/javascript/commit/10011936981fc22bf7d3750f1591f0873ea78bcb)]:
12+
- @clerk/shared@4.10.0
13+
- @clerk/backend@3.4.5
14+
315
## 3.1.0
416

517
### Minor Changes

packages/astro/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@clerk/astro",
3-
"version": "3.1.0",
3+
"version": "3.2.0",
44
"description": "Clerk SDK for Astro",
55
"keywords": [
66
"auth",
@@ -97,7 +97,7 @@
9797
},
9898
"devDependencies": {
9999
"@clerk/ui": "workspace:^",
100-
"astro": "^5.18.1"
100+
"astro": "^6.0.0"
101101
},
102102
"peerDependencies": {
103103
"astro": "^4.15.0 || ^5.0.0 || ^6.0.0"

0 commit comments

Comments
 (0)