Skip to content

Commit 14df9f0

Browse files
committed
Merge branch 'main' into jrad/js-prop-bundling
2 parents 562c91e + 833b325 commit 14df9f0

38 files changed

Lines changed: 2229 additions & 1173 deletions

File tree

.changeset/busy-wolves-rush.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
'@clerk/clerk-js': minor
3+
'@clerk/shared': minor
4+
'@clerk/react': minor
5+
---
6+
7+
Add support for email link based verification to SignUpFuture

.changeset/green-humans-yawn.md

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
---
2+
'@clerk/react-router': major
3+
---
4+
5+
Usage of `rootAuthLoader` without the `clerkMiddleware()` installed will not throw a runtime error.
6+
7+
**Before (Removed):**
8+
9+
```tsx
10+
import { rootAuthLoader } from '@clerk/react-router/ssr.server'
11+
12+
export const loader = (args: Route.LoaderArgs) => rootAuthLoader(args)
13+
```
14+
15+
**After:**
16+
17+
1. Enable the `v8_middleware` future flag:
18+
19+
```ts
20+
// react-router.config.ts
21+
export default {
22+
future: {
23+
v8_middleware: true,
24+
},
25+
} satisfies Config;
26+
```
27+
28+
2. Use the middleware in your app:
29+
30+
```tsx
31+
import { clerkMiddleware, rootAuthLoader } from '@clerk/react-router/server'
32+
33+
export const middleware: Route.MiddlewareFunction[] = [clerkMiddleware()]
34+
35+
export const loader = (args: Route.LoaderArgs) => rootAuthLoader(args)
36+
```

.changeset/legal-crabs-shout.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/backend': minor
4+
---
5+
6+
Add `providerUserId` field to `ExternalAccount` resource as the preferred way to access the unique user ID from the OAuth provider. The existing `externalId` field is now deprecated in favor of `providerUserId` for better clarity and consistency across the API.

.changeset/moody-sites-lead.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@clerk/shared': major
3+
---
4+
5+
Adjust features parsing to throw errors on unknown scopes.

.changeset/pretty-queens-relate.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@clerk/ui': patch
3+
---
4+
5+
Skip the strategy selection screen if only one MFA strategy is available for the setup MFA session task

.changeset/soft-trains-grin.md

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

.changeset/vast-loops-open.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
'@clerk/chrome-extension': minor
3+
'@clerk/nextjs': minor
4+
'@clerk/react': minor
5+
---
6+
7+
Add `HandleSSOCallback` component which handles the SSO callback during custom flows, including support for sign-in-or-up.

integration/tests/react-router/pre-middleware.test.ts

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

packages/backend/src/api/resources/ExternalAccount.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,17 @@ export class ExternalAccount {
1616
* The provider name (e.g., `google`).
1717
*/
1818
readonly provider: string,
19+
/**
20+
* The unique ID of the user in the provider.
21+
*/
22+
readonly providerUserId: string,
1923
/**
2024
* The identification with which this external account is associated.
2125
*/
2226
readonly identificationId: string,
2327
/**
2428
* The unique ID of the user in the provider.
29+
* @deprecated Use providerUserId instead
2530
*/
2631
readonly externalId: string,
2732
/**
@@ -70,6 +75,7 @@ export class ExternalAccount {
7075
return new ExternalAccount(
7176
data.id,
7277
data.provider,
78+
data.provider_user_id,
7379
data.identification_id,
7480
data.provider_user_id,
7581
data.approved_scopes,

packages/chrome-extension/src/__tests__/__snapshots__/exports.test.ts.snap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ exports[`public exports > should not include a breaking change 1`] = `
1111
"ClerkProvider",
1212
"CreateOrganization",
1313
"GoogleOneTap",
14+
"HandleSSOCallback",
1415
"OrganizationList",
1516
"OrganizationProfile",
1617
"OrganizationSwitcher",

0 commit comments

Comments
 (0)