Skip to content

Commit 151e46a

Browse files
author
Jacek
committed
Merge remote-tracking branch 'origin/main' into fredrik/nextjs-deprecate-create-route-matcher
# Conflicts: # packages/nextjs/src/server/routeMatcher.ts
2 parents 06f95dd + 485bca5 commit 151e46a

113 files changed

Lines changed: 4851 additions & 153 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.

‎.changeset/electron-user-agent.md‎

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

‎.changeset/sixty-hairs-sniff.md‎

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

‎.changeset/social-icon-button-height.md‎

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

‎.changeset/truncate-surrogate-safe.md‎

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

‎.github/workflows/api-changes.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ jobs:
107107

108108
- name: Generate API snapshot
109109
run: |
110-
npx --yes "@clerk/break-check@0.5.0" snapshot \
110+
npx --yes "@clerk/break-check@0.6.0" snapshot \
111111
--output "$GITHUB_WORKSPACE/.api-snapshots-baseline"
112112
113113
- name: Upload baseline artifact
@@ -172,9 +172,9 @@ jobs:
172172
run: echo "BREAK_CHECK_FILTERS=$BREAK_CHECK_FILTERS" >> "$GITHUB_ENV"
173173

174174
- name: Break Check
175-
uses: clerk/break-check@28f2635be18aa1127189f088a564645efb3aad90 # v0.5.0
175+
uses: clerk/break-check@92be9cc726c848b9567c7b869e9b11dc761ddd6e # v0.6.0
176176
with:
177-
break-check-version: '0.5.0'
177+
break-check-version: '0.6.0'
178178
# The PR head is already checked out, so build it in place rather than
179179
# in a second head worktree.
180180
head-ref: ''

‎.github/workflows/expo-native-build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ jobs:
4545
- expo-sdk: 55
4646
platform: ios
4747
runner: blacksmith-6vcpu-macos-26
48-
- expo-sdk: 56
48+
- expo-sdk: 57
4949
platform: android
5050
runner: blacksmith-8vcpu-ubuntu-2204
51-
- expo-sdk: 56
51+
- expo-sdk: 57
5252
platform: ios
5353
runner: blacksmith-6vcpu-macos-26
5454

integration/templates/expo-native/package.sdk-56.json renamed to integration/templates/expo-native/package.sdk-57.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
"prebuild:ios": "expo prebuild --clean --platform ios"
1111
},
1212
"dependencies": {
13-
"expo": "~56.0.12",
14-
"react": "19.2.3",
15-
"react-native": "0.85.3"
13+
"expo": "~57.0.1",
14+
"react": "19.2.7",
15+
"react-native": "0.86.0"
1616
},
1717
"devDependencies": {
1818
"@babel/core": "^7.29.0",

‎integration/tests/pricing-table.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,7 @@ testAgainstRunningApps({})('pricing table @billing', ({ app }) => {
595595
await u.po.checkout.clickPayOrSubscribe();
596596
await u.po.checkout.confirmAndContinue();
597597
await u.po.pricingTable.startCheckout({ planSlug: 'pro', period: 'monthly' });
598-
await expect(u.po.page.getByText('- $9.99')).toBeVisible();
598+
await expect(u.po.page.getByText('-$9.99')).toBeVisible();
599599

600600
await fakeUser.deleteIfExists();
601601
});

‎packages/astro/CHANGELOG.md‎

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

3+
## 3.4.12
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [[`1efc7e5`](https://github.com/clerk/javascript/commit/1efc7e55c568e87b7e47c2d3f235ea4d822242d9), [`5028b54`](https://github.com/clerk/javascript/commit/5028b540c945571db396f8c32a7a6b0c48a31071), [`2e1fec7`](https://github.com/clerk/javascript/commit/2e1fec7c85d7f5d95aa42f8e1f1066be399b88db)]:
8+
- @clerk/backend@3.11.0
9+
- @clerk/shared@4.24.0
10+
311
## 3.4.11
412

513
### Patch 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": "3.4.11",
3+
"version": "3.4.12",
44
"description": "Clerk SDK for Astro",
55
"keywords": [
66
"auth",

0 commit comments

Comments
 (0)