Skip to content

Commit

Permalink
dep: upgrade to pnpm v8 (umijs#10890)
Browse files Browse the repository at this point in the history
* dep: upgrade to pnpm v8

* fix: vue types conflicts

* ci: try use pnpm/exe version instead of pnpm in node 14.x
  • Loading branch information
fz6m authored Apr 4, 2023
1 parent 8072d34 commit cef68fd
Show file tree
Hide file tree
Showing 6 changed files with 9,276 additions and 11,388 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,13 @@ jobs:
fetch-depth: 0

- name: Install pnpm
if: ${{ matrix.node-version != '14.x' }}
uses: pnpm/[email protected]

- name: Install pnpm (node 14)
if: ${{ matrix.node-version == '14.x' }}
run: npm install -g @pnpm/[email protected]

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/compressed-size.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: Use latest LTS Node.js
uses: actions/setup-node@v3
with:
node-version: 'lts/*'
node-version: 16.x
registry-url: 'https://registry.npmjs.org/'
cache: 'pnpm'

Expand Down
6 changes: 5 additions & 1 deletion .npmrc
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
registry=https://registry.npmjs.org/
strict-peer-dependencies=false

# Prevent jsx namespace conflicts, because Vue global types will auto install.
# In the future, Vue 3 will fix this issue
# See https://github.com/vuejs/core/blob/main/CHANGELOG.md#features-1
auto-install-peers=false
2 changes: 1 addition & 1 deletion docs/docs/introduce/contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { Message } from 'umi';

### Node.js 和 pnpm

开发 Umi 需要 Node.js 16+ 和 `pnpm` v7
开发 Umi 需要 Node.js 16+ 和 `pnpm` v8

推荐使用 [`nvm`](https://github.com/nvm-sh/nvm) 管理 Node.js,避免权限问题的同时,还能够随时切换当前使用的 Node.js 的版本。在 Windows 系统下的开发者可以使用 [`nvm-windows`](https://github.com/coreybutler/nvm-windows)

Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -120,10 +120,10 @@
"umi-scripts": "workspace:*",
"zx": "^7.1.1"
},
"packageManager": "pnpm@7.24.2",
"packageManager": "pnpm@8.1.0",
"engines": {
"node": ">=14",
"pnpm": ">=7"
"pnpm": ">=8"
},
"//why-overrides-browserslist": "See scripts/bundleDeps.ts",
"pnpm": {
Expand Down
Loading

0 comments on commit cef68fd

Please sign in to comment.