Skip to content

Commit 7ce2ce6

Browse files
committed
chore: replace lerna with lerna-lite and pnpm run
1 parent 2ebc7fa commit 7ce2ce6

File tree

8 files changed

+1111
-2611
lines changed

8 files changed

+1111
-2611
lines changed

.github/actions/nightly-release/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ runs:
5656
)"
5757
shell: bash
5858
working-directory: ./packages/vuetify
59-
- run: pnpm lerna run build --scope @vuetify/nightly
59+
- run: pnpm run --filter @vuetify/nightly build
6060
shell: bash
61-
- run: pnpm lerna run build --scope @vuetify/api-generator
61+
- run: pnpm run --filter @vuetify/api-generator build
6262
shell: bash
6363
- name: NPM Release
6464
run: |

.github/workflows/ci.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,15 @@ jobs:
4646
strategy:
4747
fail-fast: false
4848
matrix:
49-
scopes: ['--scope vuetify --scope @vuetify/api-generator', '--scope vuetifyjs.com']
49+
scopes: ['--filter vuetify --filter @vuetify/api-generator', '--filter vuetifyjs.com']
5050
steps:
5151
- uses: actions/checkout@v4
5252
- uses: actions/download-artifact@v4
5353
with:
5454
name: vuetify-dist
5555
path: packages/vuetify
5656
- uses: vuetifyjs/setup-action@master
57-
- run: pnpm lerna run lint $SCOPES
57+
- run: pnpm run $SCOPES lint
5858
env:
5959
SCOPES: ${{ matrix.scopes }}
6060

@@ -102,12 +102,10 @@ jobs:
102102
path: packages/vuetify
103103
- uses: vuetifyjs/setup-action@master
104104
- run: pnpm build api
105-
- run: echo "RELEASE_TAG=$GITHUB_REF_NAME" >> $GITHUB_ENV
106105
- name: NPM Release
107-
run: bash scripts/deploy.sh
108-
env:
109-
NPM_API_KEY: ${{ secrets.NPM_TOKEN }}
110-
RELEASE_TAG: ${{ env.RELEASE_TAG }}
106+
run: |
107+
npm config set //registry.npmjs.org/:_authToken ${{ secrets.NPM_TOKEN }}
108+
npm publish ./packages/vuetify --tag $(node ./scripts/parse-npm-tag.js $GITHUB_REF_NAME)
111109
- name: GitHub release
112110
id: create_release
113111
run: pnpm conventional-github-releaser -p vuetify

package.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
"scripts": {
1010
"dev": "node scripts/dev.js",
1111
"build": "node scripts/build.js",
12-
"lint": "lerna run lint --parallel --stream",
13-
"lint:fix": "lerna run lint:fix --parallel",
12+
"lint": "pnpm run -r --parallel --stream lint",
13+
"lint:fix": "pnpm run -r --parallel lint:fix",
1414
"version": "node scripts/confirm-npm-tag.js",
1515
"prepare": "husky; node scripts/post-install.js",
1616
"postversion": "node scripts/post-release-merge.js",
17-
"clean": "lerna clean",
17+
"clean": "pnpm -r exec rm -r node_modules && rm -r node_modules",
1818
"changelog": "conventional-changelog -u -p vuetify",
19-
"all-checks": "pnpm run lint && lerna run test && lerna run cy:run && pnpm run build",
19+
"all-checks": "pnpm run lint && pnpm run -r test && pnpm run -r cy:run && pnpm run -r --stream build",
2020
"vue-ecosystem-ci:build": "pnpm --filter vuetify run build",
2121
"vue-ecosystem-ci:test": "pnpm --filter vuetify run lint && pnpm --filter vuetify run test"
2222
},
@@ -28,6 +28,8 @@
2828
"@babel/core": "^7.27.4",
2929
"@babel/preset-env": "^7.27.2",
3030
"@babel/preset-typescript": "^7.27.0",
31+
"@lerna-lite/cli": "^4.7.3",
32+
"@lerna-lite/version": "^4.7.3",
3133
"@mdi/font": "7.4.47",
3234
"@mdi/js": "7.4.47",
3335
"@mdi/svg": "7.4.47",
@@ -64,7 +66,6 @@
6466
"glob": "^11.0.1",
6567
"husky": "^9.1.7",
6668
"inquirer": "^12.6.0",
67-
"lerna": "^8.2.2",
6869
"lodash-es": "^4.17.21",
6970
"magic-string": "^0.30.17",
7071
"mkdirp": "^3.0.1",

pnpm-lock.yaml

Lines changed: 1059 additions & 2551 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pnpm-workspace.yaml

Lines changed: 35 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,45 @@
1+
packages:
2+
- packages/*
3+
14
autoInstallPeers: false
5+
26
ignoreWorkspaceRootCheck: true
7+
8+
ignoredBuiltDependencies:
9+
- vue-demi
10+
311
linkWorkspacePackages: deep
4-
shellEmulator: true
5-
packages:
6-
- 'packages/*'
7-
updateConfig:
8-
ignoreDependencies:
9-
# 1.6.0 replaces existing extensions
10-
- babel-plugin-add-import-extension
12+
13+
onlyBuiltDependencies:
14+
- '@percy/core'
15+
- edgedriver
16+
- esbuild
17+
- geckodriver
18+
1119
overrides:
12-
# unused react
13-
vite-ssr>react-router-dom: '-'
14-
vite-ssr>react-ssr-prepass: '-'
15-
# should be devDeps
20+
'@testing-library/dom': npm:@vuetify/[email protected]
21+
'@types/node': $@types/node
22+
'@vue/babel-plugin-jsx': npm:@vuetify/[email protected]
1623
brilliant-errors>bumpp: '-'
1724
brilliant-errors>vitest: '-'
18-
# type conflicts
19-
'@types/node': '$@types/node'
20-
# custom fork
21-
'@testing-library/dom': 'npm:@vuetify/[email protected]'
22-
'@vue/babel-plugin-jsx': 'npm:@vuetify/[email protected]'
25+
vite-ssr>react-router-dom: '-'
26+
vite-ssr>react-ssr-prepass: '-'
27+
28+
patchedDependencies:
29+
30+
'@testing-library/vue': patches/@testing-library__vue.patch
31+
2332
peerDependencyRules:
2433
allowedVersions:
25-
# several dependencies still say vite 4/rollup 2 but work fine anyway
26-
vite: '*'
27-
rollup: '*'
28-
'@vueuse/head': '*'
29-
'@vitejs/plugin-vue': '*'
3034
'@sentry/vue>pinia': '*'
31-
# aliased packages don't count for peerDeps apparently
3235
'@testing-library/user-event>@testing-library/dom': '*'
33-
patchedDependencies:
34-
# fixed esm exports
35-
36-
# exposed wrapper and vm
37-
'@testing-library/vue': 'patches/@testing-library__vue.patch'
38-
onlyBuiltDependencies:
39-
- '@percy/core'
40-
- 'edgedriver'
41-
- 'esbuild'
42-
- 'geckodriver'
43-
- 'nx'
36+
'@vitejs/plugin-vue': '*'
37+
'@vueuse/head': '*'
38+
rollup: '*'
39+
vite: '*'
40+
41+
shellEmulator: true
42+
43+
updateConfig:
44+
ignoreDependencies:
45+
- babel-plugin-add-import-extension

scripts/build.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ target = alias[target] || target
1010

1111
let result
1212
if (!target) {
13-
result = spawn.sync('pnpm', ['lerna', 'run', 'build', '--stream'], { stdio: 'inherit' })
13+
result = spawn.sync('pnpm', ['run', '-r', '--stream', 'build'], { stdio: 'inherit' })
1414
} else {
15-
result = spawn.sync('pnpm', ['lerna', 'run', 'build', '--scope', target, '--stream', '--no-prefix'], { stdio: 'inherit' })
15+
result = spawn.sync('pnpm', ['run', '-r', '--filter', target, '--stream', '--reporter-hide-prefix', 'build'], { stdio: 'inherit' })
1616
}
1717

1818
process.exitCode = result.status

scripts/deploy.sh

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

scripts/dev.js

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ let target = process.argv[2]
44
const alias = {
55
docs: 'vuetifyjs.com',
66
}
7-
target = alias[target] || target
7+
target = alias[target] || target || 'vuetify'
88

9-
if (!target) {
10-
spawn('pnpm', ['lerna', 'run', 'dev', '--scope', 'vuetify', '--stream'], { stdio: 'inherit' })
11-
} else {
12-
spawn('pnpm', ['lerna', 'run', 'dev', '--scope', target, '--stream'], { stdio: 'inherit' })
13-
}
9+
spawn('pnpm', ['run', '--filter', target, '--stream', 'dev'], { stdio: 'inherit' })

0 commit comments

Comments
 (0)