Skip to content

Commit f0e8ab5

Browse files
authored
Merge branch 'main' into stefanos/fraud-566-stop-retrying-if-verify-is-failing
2 parents 4eb9763 + d7c0269 commit f0e8ab5

File tree

81 files changed

+1044
-629
lines changed

Some content is hidden

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

81 files changed

+1044
-629
lines changed

.changeset/big-chairs-smile.md

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

.changeset/big-regions-worry.md

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

.changeset/common-teams-do.md

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

.changeset/dry-lamps-sneeze.md

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

.changeset/early-boats-help.md

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

.changeset/fancy-lies-sell.md

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

.changeset/flat-insects-share.md

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

.changeset/lucky-emus-share.md

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

.changeset/major-spoons-fold.md

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

.changeset/mighty-cloths-brush.md

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

.changeset/modern-paws-mate.md

Lines changed: 0 additions & 7 deletions
This file was deleted.
File renamed without changes.

.changeset/nice-clubs-lead.md

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

.changeset/poor-singers-camp.md

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

.changeset/red-ducks-hide.md

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

.changeset/salty-zebras-matter.md

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

.changeset/smart-pianos-know.md

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

.changeset/true-tables-sleep.md

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

.changeset/vast-clubs-speak.md

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

.changeset/whole-women-grab.md

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

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959

6060
- name: Deduplicate lockfile
6161
run: pnpm dedupe
62-
62+
6363
- name: Check for changed lockfile
6464
run: |
6565
if [ -n "$(git status --porcelain pnpm-lock.yaml)" ]; then
@@ -179,7 +179,7 @@ jobs:
179179
next-version: '13'
180180
- test-name: 'nextjs'
181181
test-project: 'chrome'
182-
next-version: '14'
182+
next-version: '14.2.26'
183183
- test-name: 'nextjs'
184184
test-project: 'chrome'
185185
next-version: '15'

integration/tests/next-build.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ export default function RootLayout({ children }: { children: React.ReactNode })
9292

9393
/**
9494
* Sometimes utilities from `/server` may use Node APIs even if `clerkMiddleware` does not consumes them.
95-
* This happends because of code for node runtime and edge runtime is bundled together in the `/server/index.ts` barrel file.
95+
* This happens because of code for node runtime and edge runtime is bundled together in the `/server/index.ts` barrel file.
9696
* This test ensures that developers will not end up with warnings on `next build`.
9797
*/
9898
test('Avoid import traces logs indicating misuse of node apis inside middleware', () => {

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
"@testing-library/user-event": "^14.5.2",
7777
"@types/cross-spawn": "^6.0.6",
7878
"@types/jest": "^29.3.1",
79-
"@types/node": "^22.13.14",
79+
"@types/node": "^22.14.0",
8080
"@types/react": "catalog:react",
8181
"@types/react-dom": "catalog:react",
8282
"@vitest/coverage-v8": "3.0.2",

packages/agent-toolkit/CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# @clerk/agent-toolkit
22

3+
## 0.0.18
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [[`e1ec52b`](https://github.com/clerk/javascript/commit/e1ec52b93038c9cb24e030dc06e53825a384a480), [`bebb6d8`](https://github.com/clerk/javascript/commit/bebb6d8af66b2bb7a4b3bdf96f9d480e65b31ba2), [`d0d5203`](https://github.com/clerk/javascript/commit/d0d5203e4ee9e2e1bed5c00ef0f87f0130f1d298), [`6112420`](https://github.com/clerk/javascript/commit/6112420889f1577fb16d7bfa706aaffe1090093d), [`2cceeba`](https://github.com/clerk/javascript/commit/2cceeba177ecf5a28138da308cbba18015e3a646), [`9b25e31`](https://github.com/clerk/javascript/commit/9b25e311cf5e15f896c7948faa42ace45df364c5)]:
8+
- @clerk/types@4.51.0
9+
- @clerk/backend@1.27.0
10+
- @clerk/shared@3.4.0
11+
312
## 0.0.17
413

514
### Patch Changes

packages/agent-toolkit/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@clerk/agent-toolkit",
3-
"version": "0.0.17",
3+
"version": "0.0.18",
44
"description": "Clerk Toolkit for AI Agents",
55
"homepage": "https://clerk.com/",
66
"bugs": {

packages/astro/CHANGELOG.md

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

3+
## 2.6.0
4+
5+
### Minor Changes
6+
7+
- Update `useAuth` to handle pending sessions as signed-out by default, with opt-out via `useAuth({ treatPendingAsSignedOut: false })` or `clerk({ treatPendingAsSignedOut: false })` ([#5507](https://github.com/clerk/javascript/pull/5507)) by [@LauraBeatris](https://github.com/LauraBeatris)
8+
9+
### Patch Changes
10+
11+
- Introduce `treatPendingAsSignedOut` prop to client control components ([#5512](https://github.com/clerk/javascript/pull/5512)) by [@LauraBeatris](https://github.com/LauraBeatris)
12+
13+
```tsx
14+
// Children node only mounts when session is active
15+
// Example: Organization selection must be completed if enforced
16+
<SignedIn>
17+
<p>You have selected an organization!</p>
18+
</SignedIn>
19+
```
20+
21+
```tsx
22+
// Children node mounts for both active and pending session
23+
<SignedIn treatPendingAsSignedOut={false}>
24+
<p>You might not have an organization selected</p>
25+
</SignedIn>
26+
```
27+
28+
```tsx
29+
// Children node only mounts when session is active
30+
// Example: Organization selection must be completed if enforced
31+
<Protect>
32+
<p>You have selected an organization!</p>
33+
</Protect>
34+
```
35+
36+
```tsx
37+
// Children node mounts for both active and pending session
38+
<Protect treatPendingAsSignedOut={false}>
39+
<p>You might not have an organization selected</p>
40+
</Protect>
41+
```
42+
43+
- Updated dependencies [[`e1ec52b`](https://github.com/clerk/javascript/commit/e1ec52b93038c9cb24e030dc06e53825a384a480), [`bebb6d8`](https://github.com/clerk/javascript/commit/bebb6d8af66b2bb7a4b3bdf96f9d480e65b31ba2), [`d0d5203`](https://github.com/clerk/javascript/commit/d0d5203e4ee9e2e1bed5c00ef0f87f0130f1d298), [`6112420`](https://github.com/clerk/javascript/commit/6112420889f1577fb16d7bfa706aaffe1090093d), [`2cceeba`](https://github.com/clerk/javascript/commit/2cceeba177ecf5a28138da308cbba18015e3a646), [`9b25e31`](https://github.com/clerk/javascript/commit/9b25e311cf5e15f896c7948faa42ace45df364c5)]:
44+
- @clerk/types@4.51.0
45+
- @clerk/backend@1.27.0
46+
- @clerk/shared@3.4.0
47+
348
## 2.5.0
449

550
### Minor Changes

packages/astro/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@clerk/astro",
3-
"version": "2.5.0",
3+
"version": "2.6.0",
44
"description": "Clerk SDK for Astro",
55
"keywords": [
66
"auth",

packages/backend/CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
11
# Change Log
22

3+
## 1.27.0
4+
5+
### Minor Changes
6+
7+
- Introduces `ver` as JWT claim to allow versioning of the session token. ([#5521](https://github.com/clerk/javascript/pull/5521)) by [@octoper](https://github.com/octoper)
8+
9+
- Added constants.Headers.ContentSecurityPolicy and constants.Headers.Nonce ([#5493](https://github.com/clerk/javascript/pull/5493)) by [@jacekradko](https://github.com/jacekradko)
10+
11+
### Patch Changes
12+
13+
- Updated dependencies [[`e1ec52b`](https://github.com/clerk/javascript/commit/e1ec52b93038c9cb24e030dc06e53825a384a480), [`bebb6d8`](https://github.com/clerk/javascript/commit/bebb6d8af66b2bb7a4b3bdf96f9d480e65b31ba2), [`d0d5203`](https://github.com/clerk/javascript/commit/d0d5203e4ee9e2e1bed5c00ef0f87f0130f1d298), [`6112420`](https://github.com/clerk/javascript/commit/6112420889f1577fb16d7bfa706aaffe1090093d), [`9b25e31`](https://github.com/clerk/javascript/commit/9b25e311cf5e15f896c7948faa42ace45df364c5)]:
14+
- @clerk/types@4.51.0
15+
- @clerk/shared@3.4.0
16+
317
## 1.26.0
418

519
### Minor Changes

packages/backend/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@clerk/backend",
3-
"version": "1.26.0",
3+
"version": "1.27.0",
44
"description": "Clerk Backend SDK - REST Client for Backend API & JWT verification utilities",
55
"homepage": "https://clerk.com/",
66
"bugs": {

packages/backend/src/createRedirect.ts

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,18 @@ export const createRedirect: CreateRedirect = params => {
9797
}
9898

9999
const accountsSignUpUrl = `${accountsBaseUrl}/sign-up`;
100-
const targetUrl = signUpUrl || accountsSignUpUrl;
100+
101+
// Allows redirection to SignInOrUp path
102+
function buildSignUpUrl(signIn: string | URL | undefined) {
103+
if (!signIn) {
104+
return;
105+
}
106+
const url = new URL(signIn, baseUrl);
107+
url.pathname = `${url.pathname}/create`;
108+
return url.toString();
109+
}
110+
111+
const targetUrl = signUpUrl || buildSignUpUrl(signInUrl) || accountsSignUpUrl;
101112

102113
if (hasPendingStatus) {
103114
return redirectToTasks(targetUrl, { returnBackUrl });

packages/chrome-extension/CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# Change Log
22

3+
## 2.2.25
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [[`31ad772`](https://github.com/clerk/javascript/commit/31ad7724e9d7e00c53ff8ceec0cfbb7f3a0b1de8), [`e1ec52b`](https://github.com/clerk/javascript/commit/e1ec52b93038c9cb24e030dc06e53825a384a480), [`bebb6d8`](https://github.com/clerk/javascript/commit/bebb6d8af66b2bb7a4b3bdf96f9d480e65b31ba2), [`a8180ce`](https://github.com/clerk/javascript/commit/a8180ceef447a13d84eac6a64ed7a04d791d8d64), [`936d223`](https://github.com/clerk/javascript/commit/936d22380ad357d0767262c7758c992d289dc58d), [`9f3de7a`](https://github.com/clerk/javascript/commit/9f3de7a66cc21e4e8beb8664a8a5516cc2c631f7), [`6112420`](https://github.com/clerk/javascript/commit/6112420889f1577fb16d7bfa706aaffe1090093d), [`e1ec52b`](https://github.com/clerk/javascript/commit/e1ec52b93038c9cb24e030dc06e53825a384a480), [`026ad57`](https://github.com/clerk/javascript/commit/026ad5717cf661182c219fb0ffab4522083065c3), [`250b311`](https://github.com/clerk/javascript/commit/250b3117b409626b476c6d3ffbda13c06fcfcb54)]:
8+
- @clerk/clerk-js@5.59.1
9+
- @clerk/clerk-react@5.26.0
10+
- @clerk/shared@3.4.0
11+
312
## 2.2.24
413

514
### Patch Changes

packages/chrome-extension/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@clerk/chrome-extension",
3-
"version": "2.2.24",
3+
"version": "2.2.25",
44
"description": "Clerk SDK for Chrome extensions",
55
"keywords": [
66
"auth",

packages/clerk-js/CHANGELOG.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,28 @@
11
# Change Log
22

3+
## 5.59.1
4+
5+
### Patch Changes
6+
7+
- Adds support for Apple Pay to `AddPaymentSource` component, and removes the unusable "collapsed" state. ([#5506](https://github.com/clerk/javascript/pull/5506)) by [@aeliox](https://github.com/aeliox)
8+
9+
- Fixes an issue where a race condition was caused by triggering navigations during a call to `setActive`. ([#5515](https://github.com/clerk/javascript/pull/5515)) by [@dstaley](https://github.com/dstaley)
10+
11+
- Introduce `clerk.__internal_openCheckout()` and `clerk.__internal_closeCheckout()` methods and remove `<Checkout />` from within the `<PricingTable />` component. ([#5481](https://github.com/clerk/javascript/pull/5481)) by [@alexcarpenter](https://github.com/alexcarpenter)
12+
13+
- Add optional `resourceId` to `useFetch` hook ([#5536](https://github.com/clerk/javascript/pull/5536)) by [@aeliox](https://github.com/aeliox)
14+
15+
- Fix routing issue in `<Checkout />` component by wrapping the `LazyDrawerRenderer` with nested `VirtualRouter`. ([#5527](https://github.com/clerk/javascript/pull/5527)) by [@alexcarpenter](https://github.com/alexcarpenter)
16+
17+
- Fixes an issue where the SSO callback URL was incorrectly set for combined sign-in/sign-up. ([#5515](https://github.com/clerk/javascript/pull/5515)) by [@dstaley](https://github.com/dstaley)
18+
19+
- Trigger navigation to tasks on `setActive` for internal routing only ([#5535](https://github.com/clerk/javascript/pull/5535)) by [@LauraBeatris](https://github.com/LauraBeatris)
20+
21+
- Updated dependencies [[`e1ec52b`](https://github.com/clerk/javascript/commit/e1ec52b93038c9cb24e030dc06e53825a384a480), [`bebb6d8`](https://github.com/clerk/javascript/commit/bebb6d8af66b2bb7a4b3bdf96f9d480e65b31ba2), [`c3e7886`](https://github.com/clerk/javascript/commit/c3e7886d111d32b80a4d95837ad4abf768e1dbf4), [`d0d5203`](https://github.com/clerk/javascript/commit/d0d5203e4ee9e2e1bed5c00ef0f87f0130f1d298), [`6112420`](https://github.com/clerk/javascript/commit/6112420889f1577fb16d7bfa706aaffe1090093d), [`9b25e31`](https://github.com/clerk/javascript/commit/9b25e311cf5e15f896c7948faa42ace45df364c5), [`26ce4c1`](https://github.com/clerk/javascript/commit/26ce4c15794ca27a3c02ff7cea3428a3985d4d10)]:
22+
23+
24+
25+
326
## 5.59.0
427

528
### Minor Changes

0 commit comments

Comments
 (0)