Skip to content

Commit 6363edc

Browse files
authored
fix(upgrade): improve CLI usability for monorepos and CI (#7874)
1 parent ab9efa2 commit 6363edc

20 files changed

Lines changed: 633 additions & 41 deletions

File tree

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@clerk/upgrade': patch
3+
---
4+
5+
Improve CLI usability for monorepos: traverse parent directories for pnpm workspace detection and support named catalogs in version resolution
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"name": "test-web-app",
3+
"version": "1.0.0",
4+
"dependencies": {
5+
"@clerk/nextjs": "catalog:",
6+
"next": "catalog:",
7+
"react": "catalog:"
8+
}
9+
}
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"name": "test-monorepo-root",
3+
"version": "1.0.0",
4+
"private": true,
5+
"dependencies": {
6+
"@clerk/backend": "^1.0.0"
7+
}
8+
}

packages/upgrade/src/__tests__/fixtures/monorepo-workspace-catalog/pnpm-lock.yaml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
packages:
2+
- 'apps/*'
3+
4+
catalog:
5+
'@clerk/nextjs': ^6.0.0
6+
next: ^14.0.0
7+
react: ^18.0.0
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"name": "test-nextjs-catalog-resolved",
3+
"version": "1.0.0",
4+
"dependencies": {
5+
"@clerk/nextjs": "catalog:",
6+
"next": "^14.0.0",
7+
"react": "^18.0.0"
8+
}
9+
}

packages/upgrade/src/__tests__/fixtures/nextjs-catalog-resolved/pnpm-lock.yaml

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
packages:
2+
- 'packages/*'
3+
4+
catalog:
5+
'@clerk/nextjs': ^6.0.0
6+
next: ^14.0.0
7+
react: ^18.0.0
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import { ClerkProvider } from '@clerk/nextjs';
2+
3+
export default function App() {
4+
return (
5+
<ClerkProvider>
6+
<div>Hello</div>
7+
</ClerkProvider>
8+
);
9+
}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"name": "test-nextjs-named-catalog",
3+
"version": "1.0.0",
4+
"dependencies": {
5+
"@clerk/nextjs": "catalog:clerk",
6+
"next": "^14.0.0",
7+
"react": "catalog:peer-react"
8+
}
9+
}

0 commit comments

Comments
 (0)