Skip to content

Commit 7059210

Browse files
committed
Merge branch 'main' into vincent-and-the-doctor
2 parents 5b43f6a + 8376789 commit 7059210

File tree

82 files changed

+1787
-828
lines changed

Some content is hidden

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

82 files changed

+1787
-828
lines changed

.changeset/bright-islands-say.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@clerk/shared': patch
3+
---
4+
5+
Fix for allowing task url customization for specific tasks instead of requiring them all

.changeset/early-clowns-dance.md

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

.changeset/fuzzy-donuts-jam.md

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

.changeset/honest-pigs-move.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+
Rename `__experimental_passwordUntrusted` to `__experimental_passwordCompromised`

.changeset/lazy-items-crash.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@clerk/shared': minor
3+
---
4+
5+
Improve error handling and retry logic when loading `@clerk/clerk-js`.

.changeset/moody-dryers-serve.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+
Deprecating `passwordUntrusted` in favour of `passwordCompromised` and `form_password_untrusted__sign_in` to `form_password_compromised__sign_in`

.changeset/some-phones-report.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@clerk/clerk-js': patch
3+
'@clerk/shared': patch
4+
---
5+
6+
Rename internal `isPasswordUntrustedError` to `isPasswordCompromisedError`

.github/workflows/release-canary.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@ jobs:
6565
github.rest.actions.createWorkflowDispatch({
6666
owner: 'clerk',
6767
repo: 'sdk-infra-workers',
68-
workflow_id: 'update-pkg-versions',
68+
workflow_id: 'update-pkg-versions.yml',
6969
ref: 'main',
70-
inputs: { version: clerkjsVersion }
70+
inputs: { clerkjsVersion: clerkjsVersion }
7171
})
7272
7373
if (nextjsVersion.includes('canary')) {

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,9 @@ jobs:
9292
github.rest.actions.createWorkflowDispatch({
9393
owner: 'clerk',
9494
repo: 'sdk-infra-workers',
95-
workflow_id: 'update-pkg-versions',
95+
workflow_id: 'update-pkg-versions.yml',
9696
ref: 'main',
97-
inputs: { version: clerkjsVersion }
97+
inputs: { clerkjsVersion }
9898
})
9999
100100
github.rest.actions.createWorkflowDispatch({

integration/presets/envs.ts

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,6 @@ const withEmailCodes = base
4343
.setEnvVariable('public', 'CLERK_PUBLISHABLE_KEY', instanceKeys.get('with-email-codes').pk)
4444
.setEnvVariable('private', 'CLERK_ENCRYPTION_KEY', constants.E2E_CLERK_ENCRYPTION_KEY || 'a-key');
4545

46-
const withBroadcastChannel = withEmailCodes
47-
.clone()
48-
.setId('withBroadcastChannel')
49-
.setEnvVariable(
50-
'public',
51-
'CLERK_JS_URL',
52-
constants.E2E_APP_CLERK_JS || 'http://localhost:18211/clerk.channel.browser.js',
53-
);
54-
5546
const sessionsProd1 = base
5647
.clone()
5748
.setId('sessionsProd1')
@@ -212,7 +203,6 @@ export const envs = {
212203
withAPCore2ClerkV4,
213204
withBilling,
214205
withBillingJwtV2,
215-
withBroadcastChannel,
216206
withCustomRoles,
217207
withDynamicKeys,
218208
withEmailCodes,

0 commit comments

Comments
 (0)