Skip to content

Commit ccf5a79

Browse files
authored
Merge branch 'main' into brkalow/proxy-hardening
2 parents 545a88c + 39ee042 commit ccf5a79

87 files changed

Lines changed: 1521 additions & 54 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@clerk/expo": patch
3+
---
4+
5+
Add directory-level `package.json` fallback stubs for all subpath exports so that imports like `@clerk/expo/token-cache` resolve correctly in React Native bundlers that don't support the `exports` field (e.g., Metro without `unstable_enablePackageExports`).

.changeset/fix-ci-artifact-name.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
---
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+
Fix frontend API proxy following redirects server-side instead of passing them to the browser. The proxy's `fetch()` call now uses `redirect: 'manual'` so that 3xx responses from FAPI (e.g. after OAuth callbacks) are returned to the client as-is, matching standard HTTP proxy behavior.

.changeset/humble-trams-laugh.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
'@clerk/clerk-js': minor
3+
'@clerk/shared': minor
4+
'@clerk/ui': minor
5+
---
6+
7+
Add `EnterpriseConnection` resource
8+
9+
`User.getEnterpriseConnections()` was wrongly typed as returning `EnterpriseAccountConnectionResource[]`, it now returns `EnterpriseConnectionResource[]`

.changeset/large-cameras-talk.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
'@clerk/localizations': minor
3+
'@clerk/clerk-js': minor
4+
'@clerk/shared': minor
5+
'@clerk/ui': minor
6+
---
7+
8+
Allow to link external accounts to enterprise accounts via `UserProfile`

.github/workflows/ci.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -457,11 +457,20 @@ jobs:
457457
NODE_EXTRA_CA_CERTS: ${{ github.workspace }}/integration/certs/rootCA.pem
458458
VERCEL_AUTOMATION_BYPASS_SECRET: ${{ secrets.VERCEL_AUTOMATION_BYPASS_SECRET }}
459459

460+
- name: Sanitize artifact name
461+
if: ${{ cancelled() || failure() }}
462+
id: sanitize
463+
run: |
464+
SANITIZED="${TEST_NAME//:/-}"
465+
echo "artifact-suffix=${SANITIZED}" >> $GITHUB_OUTPUT
466+
env:
467+
TEST_NAME: ${{ matrix.test-name }}
468+
460469
- name: Upload test-results
461470
if: ${{ cancelled() || failure() }}
462471
uses: actions/upload-artifact@v4
463472
with:
464-
name: playwright-traces-${{ github.run_id }}-${{ github.run_attempt }}-${{ matrix.test-name }}${{ matrix.next-version && format('-next{0}', matrix.next-version) || '' }}
473+
name: playwright-traces-${{ github.run_id }}-${{ github.run_attempt }}-${{ steps.sanitize.outputs.artifact-suffix }}${{ matrix.next-version && format('-next{0}', matrix.next-version) || '' }}
465474
path: test-results
466475
retention-days: 1
467476

0 commit comments

Comments
 (0)