Skip to content

Commit 95c4f2f

Browse files
authored
Merge branch 'main' into fix/init-retry-logic
2 parents b6f68e2 + a233ddb commit 95c4f2f

623 files changed

Lines changed: 33340 additions & 17015 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.
File renamed without changes.

.changeset/fix-astro-cf-pages-env-fallback.md

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

.changeset/fix-satellite-auto-sync-default.md

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

.changeset/legal-numbers-fry.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
'@clerk/localizations': patch
3+
'@clerk/clerk-js': patch
4+
'@clerk/shared': patch
5+
'@clerk/ui': patch
6+
---
7+
8+
Update `<ConfigureSSO />` in the context of organizations to only allow managing enterprise connections based on system permission
File renamed without changes.
File renamed without changes.
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+
Refactor `<__experimental_ConfigureSSO />` into a layered primitive set: a state-driven Wizard, a UI-only Stepper, a `Step` compound, and ProfileCard chrome. No public component API change. Drops the central FooterActionsContext registry — each step now renders its own footer via `Step.Footer.Previous` / `Step.Footer.Continue` purely-presentational compounds. Adds a SelectProviderStep boilerplate filtered out of the breadcrumb.

.cursor/commands/cmt.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Generate a commit message for changes in this chat. **Do not commit or push** (s
1717

1818
Scopes must match package/app names. No scope is also valid. Invalid scope = commitlint rejection.
1919

20-
- **Packages:** agent-toolkit, astro, backend, chrome-extension, clerk-js, dev-cli, elements, expo, expo-passkeys, express, fastify, localizations, nextjs, nuxt, react, react-router, remix, shared, tanstack-react-start, testing, themes, types, ui, upgrade, vue
20+
- **Packages:** astro, backend, chrome-extension, clerk-js, dev-cli, elements, expo, expo-passkeys, express, fastify, localizations, nextjs, nuxt, react, react-router, remix, shared, tanstack-react-start, testing, themes, types, ui, upgrade, vue
2121
- **Other:** docs, repo, release, e2e, \*
2222

2323
---

.cursor/rules/monorepo.mdc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ Core Package Categories
2222
- **Backend**: `@clerk/backend` - Server-side utilities and JWT verification
2323
- **Shared Utilities**: `@clerk/shared`, `@clerk/types` - Common utilities and TypeScript types
2424
- **Developer Tools**: `@clerk/testing`, `@clerk/dev-cli`, `@clerk/upgrade`
25-
- **Specialized**: `@clerk/agent-toolkit` - AI agent integration tools
2625

2726
Directory Structure
2827

.github/actions/init-blacksmith/action.yml

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ inputs:
44
node-version:
55
description: 'The node version to use'
66
required: false
7-
default: '22'
7+
default: '24.15.0'
88
playwright-enabled:
99
description: 'Enable Playwright?'
1010
required: false
@@ -26,10 +26,10 @@ inputs:
2626
required: false
2727
turbo-team:
2828
description: 'The team to use for Turbo remote auth'
29-
required: true
29+
required: false
3030
turbo-token:
3131
description: 'The token to use for Turbo remote auth'
32-
required: true
32+
required: false
3333
registry-url:
3434
description: 'The registry the packages will be published to'
3535
required: false
@@ -82,15 +82,17 @@ runs:
8282
)
8383
8484
if (ENABLED === 'true') {
85-
if (!TEAM) {
86-
throw new Error('turbo-team input is required and must not be empty')
87-
}
88-
if (!TOKEN) {
89-
throw new Error('turbo-token input is required and must not be empty')
85+
const missing = []
86+
if (!TEAM) missing.push('turbo-team')
87+
if (!TOKEN) missing.push('turbo-token')
88+
89+
if (missing.length > 0) {
90+
core.warning(`Missing Turbo remote cache credentials: ${missing.join(', ')}. Turbo remote caching will be disabled.`)
91+
} else {
92+
core.exportVariable('TURBO_CACHE', CACHE)
93+
core.exportVariable('TURBO_TEAM', TEAM)
94+
core.exportVariable('TURBO_TOKEN', TOKEN)
9095
}
91-
core.exportVariable('TURBO_CACHE', CACHE)
92-
core.exportVariable('TURBO_TEAM', TEAM)
93-
core.exportVariable('TURBO_TOKEN', TOKEN)
9496
}
9597
9698
if (SIGNATURE && SIGNATURE !== '') {

0 commit comments

Comments
 (0)