Skip to content

Commit ff4f524

Browse files
authored
Merge branch 'main' into jr/refactor-use-billing-is-enabled
2 parents 9d21054 + 93ead8c commit ff4f524

File tree

4 files changed

+24
-8
lines changed

4 files changed

+24
-8
lines changed

.changeset/shaggy-lights-type.md

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

.github/actions/verdaccio/action.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ runs:
9696
"@clerk/shared"
9797
"@clerk/tanstack-react-start"
9898
"@clerk/testing"
99-
"@clerk/types"
10099
"@clerk/ui"
101100
"@clerk/upgrade"
102101
"@clerk/vue"

.github/workflows/nightly-checks.yml

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,23 +32,37 @@ jobs:
3232
turbo-token: ${{ secrets.TURBO_TOKEN }}
3333
playwright-enabled: true
3434

35+
- name: Version packages for snapshot
36+
run: npm run version-packages:snapshot ci
37+
3538
- name: Verdaccio
3639
uses: ./.github/actions/verdaccio
3740
with:
3841
publish-cmd: |
39-
if [ "$(npm config get registry)" = "https://registry.npmjs.org/" ]; then echo 'Error: Using default registry' && exit 1; else pnpm turbo build $TURBO_ARGS --only && pnpm changeset publish --no-git-tag; fi
42+
if [ "$(pnpm config get registry)" = "https://registry.npmjs.org/" ]; then echo 'Error: Using default registry' && exit 1; else pnpm turbo build $TURBO_ARGS --only && pnpm changeset publish --no-git-tag --tag latest; fi
4043
4144
- name: Install @clerk/backend in /integration
4245
working-directory: ./integration
43-
run: pnpm init && pnpm add @clerk/backend
46+
run: |
47+
pnpm init
48+
pnpm config set minimum-release-age-exclude @clerk/*
49+
pnpm add @clerk/backend
4450
4551
- name: Install @clerk/clerk-js in os temp
4652
working-directory: ${{runner.temp}}
47-
run: mkdir clerk-js && cd clerk-js && pnpm init && pnpm add @clerk/clerk-js
53+
run: |
54+
mkdir clerk-js && cd clerk-js
55+
pnpm init
56+
pnpm config set minimum-release-age-exclude @clerk/*
57+
pnpm add @clerk/clerk-js
4858
4959
- name: Install @clerk/ui in os temp
5060
working-directory: ${{runner.temp}}
51-
run: mkdir clerk-ui && cd clerk-ui && pnpm init && pnpm add @clerk/ui
61+
run: |
62+
mkdir clerk-ui && cd clerk-ui
63+
pnpm init
64+
pnpm config set minimum-release-age-exclude @clerk/*
65+
pnpm add @clerk/ui
5266
5367
- name: Run Integration Tests
5468
id: integration_tests
@@ -66,8 +80,10 @@ jobs:
6680
env:
6781
E2E_APP_CLERK_JS_DIR: ${{runner.temp}}
6882
E2E_APP_CLERK_UI_DIR: ${{runner.temp}}
69-
E2E_CLERK_JS_VERSION: "latest"
70-
E2E_CLERK_UI_VERSION: "latest"
83+
# Don't set E2E_CLERK_JS_VERSION - let it use '*' (via linkPackage)
84+
# which matches any version including snapshots from verdaccio.
85+
# Using "latest" would fail since snapshot packages don't have
86+
# the "latest" dist-tag, causing fallback to npm's stable version.
7187
E2E_NEXTJS_VERSION: "canary"
7288
E2E_NPM_FORCE: "true"
7389
E2E_REACT_DOM_VERSION: "19.2.3"

integration/presets/nuxt.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ const nuxtNode = applicationConfig()
1414
.addScript('serve', 'pnpm preview')
1515
.addDependency('@clerk/nuxt', constants.E2E_CLERK_JS_VERSION || linkPackage('nuxt'))
1616
.addDependency('@clerk/shared', linkPackage('shared'))
17-
.addDependency('@clerk/types', linkPackage('types'))
1817
.addDependency('@clerk/vue', linkPackage('vue'));
1918

2019
export const nuxt = {

0 commit comments

Comments
 (0)