Skip to content

Commit

Permalink
dep: upgrade pnpm / turbo (#11991)
Browse files Browse the repository at this point in the history
* dep: upgrade pnpm / turbo

* dep: overrides parcel watcher
  • Loading branch information
fz6m authored Dec 23, 2023
1 parent 130fab8 commit 7592e7a
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 33 deletions.
15 changes: 14 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,22 @@ jobs:
if: ${{ matrix.node-version != '14.x' }}
uses: pnpm/action-setup@v2.2.4

- name: Get pnpm version (node 14)
if: ${{ matrix.node-version == '14.x' }}
uses: actions/github-script@v7
id: pnpm-version
with:
result-encoding: string
script: |
const packageJson = require('./package.json')
const pnpmVersion = packageJson.packageManager.split('@')[1]
console.log(`Use pnpm ${pnpmVersion}`)
return pnpmVersion
- name: Install pnpm (node 14)
if: ${{ matrix.node-version == '14.x' }}
run: npm install -g @pnpm/exe@8.6.2
run: |
npm install -g @pnpm/exe@${{ steps.pnpm-version.outputs.result }}
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
Expand Down
14 changes: 9 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -110,19 +110,22 @@
"ts-node": "^10.7.0",
"tsx": "^3.12.2",
"tunnel": "^0.0.6",
"turbo": "^1.9.3",
"turbo": "^1.11.2",
"typescript": "^4.9.4",
"uglify-js": "^3.17.4",
"umi": "workspace:*",
"umi-scripts": "workspace:*",
"zx": "^7.1.1"
},
"packageManager": "pnpm@8.6.2",
"packageManager": "pnpm@8.12.1",
"engines": {
"node": ">=14",
"pnpm": "^8.6.2"
"pnpm": "^8.12.1"
},
"//": {
"why-overrides-parcel-watcher": "https://github.com/parcel-bundler/watcher/issues/156",
"why-overrides-browserslist": "See scripts/bundleDeps.ts"
},
"//why-overrides-browserslist": "See scripts/bundleDeps.ts",
"pnpm": {
"peerDependencyRules": {
"ignoreMissing": [
Expand All @@ -138,7 +141,8 @@
]
},
"overrides": {
"browserslist": "$browserslist"
"browserslist": "$browserslist",
"@parcel/watcher": "2.1.0"
}
},
"_local": "This flag is used to check if the development in local, Please do not delete."
Expand Down
55 changes: 29 additions & 26 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion turbo.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"cache": false
},
"dev": {
"cache": false
"cache": false,
"persistent": true
},
"test": {
"outputs": [".jest-cache/**"]
Expand Down

0 comments on commit 7592e7a

Please sign in to comment.