Skip to content

Commit 35b5bde

Browse files
kakkokari-gtyihDA-TENSHI
authored andcommitted
deps: update pnpm to v10 (misskey-dev#15588)
* Revert "fix(build): corepackのバグの回避 (misskey-dev#15387)" This reverts commit 9c70a4e. * deps: update pnpm to v10 * fix broken lockfile * update changelog * fix * fix * Revert "fix" This reverts commit 4abc6c1. * fix * fix * attempt to fix docker build * lint fixes * fix: revertしすぎた * detect pnpm version and install it * fix: そもそもpnpmを2回入れる必要がないかも * fix * refactor * fix * refactor: remove unnecessary arg * Update Dockerfile * update pnpm to v10.6.1 * Update Changelog * chore: use node to avoid installing jq
1 parent 377dba3 commit 35b5bde

24 files changed

+226
-350
lines changed

.devcontainer/devcontainer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
"ghcr.io/devcontainers/features/node:1": {
88
"version": "22.11.0"
99
},
10-
"ghcr.io/devcontainers-extra/features/corepack:1": {
11-
"version": "0.31.0"
10+
"ghcr.io/devcontainers-extra/features/pnpm:2": {
11+
"version": "10.6.1"
1212
}
1313
},
1414
"forwardPorts": [3000],

.devcontainer/init.sh

-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ sudo apt-get update
77
sudo apt-get -y install libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libnss3 libxss1 libasound2 libxtst6 xauth xvfb
88
git config --global --add safe.directory /workspace
99
git submodule update --init
10-
corepack install
11-
corepack enable
1210
pnpm config set store-dir /home/node/.local/share/pnpm/store
1311
pnpm install --frozen-lockfile
1412
cp .devcontainer/devcontainer.yml .config/default.yml

.github/workflows/api-misskey-js.yml

+2-5
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@ on:
99
paths:
1010
- packages/misskey-js/**
1111
- .github/workflows/api-misskey-js.yml
12-
13-
env:
14-
COREPACK_DEFAULT_TO_LATEST: 0
15-
1612
jobs:
1713
report:
1814

@@ -22,7 +18,8 @@ jobs:
2218
- name: Checkout
2319
uses: actions/checkout@v4.1.1
2420

25-
- run: corepack enable
21+
- name: Setup pnpm
22+
uses: pnpm/action-setup@v4.1.0
2623

2724
- name: Setup Node.js
2825
uses: actions/setup-node@v4.1.0

.github/workflows/get-api-diff.yml

+2-7
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@ on:
99
paths:
1010
- packages/backend/**
1111
- .github/workflows/get-api-diff.yml
12-
13-
env:
14-
COREPACK_DEFAULT_TO_LATEST: 0
15-
1612
jobs:
1713
get-from-misskey:
1814
runs-on: ubuntu-latest
@@ -34,14 +30,13 @@ jobs:
3430
with:
3531
ref: ${{ matrix.ref }}
3632
submodules: true
37-
- name: Install pnpm
38-
uses: pnpm/action-setup@v4
33+
- name: Setup pnpm
34+
uses: pnpm/action-setup@v4.1.0
3935
- name: Use Node.js ${{ matrix.node-version }}
4036
uses: actions/setup-node@v4.1.0
4137
with:
4238
node-version: ${{ matrix.node-version }}
4339
cache: 'pnpm'
44-
- run: corepack enable
4540
- run: pnpm i --frozen-lockfile
4641
- name: Check pnpm-lock.yaml
4742
run: git diff --exit-code pnpm-lock.yaml

.github/workflows/lint.yml

+9-13
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@ on:
2828
- packages/misskey-reversi/**
2929
- packages/shared/eslint.config.js
3030
- .github/workflows/lint.yml
31-
32-
env:
33-
COREPACK_DEFAULT_TO_LATEST: 0
34-
3531
jobs:
3632
pnpm_install:
3733
runs-on: ubuntu-latest
@@ -40,12 +36,12 @@ jobs:
4036
with:
4137
fetch-depth: 0
4238
submodules: true
43-
- uses: pnpm/action-setup@v4
44-
- uses: actions/setup-node@v4.1.0
39+
- name: Setup pnpm
40+
uses: pnpm/action-setup@v4.1.0
41+
- uses: actions/setup-node@v4.2.0
4542
with:
4643
node-version-file: '.node-version'
4744
cache: 'pnpm'
48-
- run: corepack enable
4945
- run: pnpm i --frozen-lockfile
5046

5147
lint:
@@ -71,12 +67,12 @@ jobs:
7167
with:
7268
fetch-depth: 0
7369
submodules: true
74-
- uses: pnpm/action-setup@v4
75-
- uses: actions/setup-node@v4.1.0
70+
- name: Setup pnpm
71+
uses: pnpm/action-setup@v4.1.0
72+
- uses: actions/setup-node@v4.2.0
7673
with:
7774
node-version-file: '.node-version'
7875
cache: 'pnpm'
79-
- run: corepack enable
8076
- run: pnpm i --frozen-lockfile
8177
- name: Restore eslint cache
8278
uses: actions/cache@v4.2.2
@@ -101,12 +97,12 @@ jobs:
10197
with:
10298
fetch-depth: 0
10399
submodules: true
104-
- uses: pnpm/action-setup@v4
105-
- uses: actions/setup-node@v4.1.0
100+
- name: Setup pnpm
101+
uses: pnpm/action-setup@v4.1.0
102+
- uses: actions/setup-node@v4.2.0
106103
with:
107104
node-version-file: '.node-version'
108105
cache: 'pnpm'
109-
- run: corepack enable
110106
- run: pnpm i --frozen-lockfile
111107
- run: pnpm --filter misskey-js run build
112108
if: ${{ matrix.workspace == 'backend' || matrix.workspace == 'sw' }}

.github/workflows/locale.yml

+3-7
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@ on:
99
paths:
1010
- locales/**
1111
- .github/workflows/locale.yml
12-
13-
env:
14-
COREPACK_DEFAULT_TO_LATEST: 0
15-
1612
jobs:
1713
locale_verify:
1814
runs-on: ubuntu-latest
@@ -22,11 +18,11 @@ jobs:
2218
with:
2319
fetch-depth: 0
2420
submodules: true
25-
- uses: pnpm/action-setup@v4
26-
- uses: actions/setup-node@v4.1.0
21+
- name: Setup pnpm
22+
uses: pnpm/action-setup@v4.1.0
23+
- uses: actions/setup-node@v4.2.0
2724
with:
2825
node-version-file: '.node-version'
2926
cache: 'pnpm'
30-
- run: corepack enable
3127
- run: pnpm i --frozen-lockfile
3228
- run: cd locales && node verify.js

.github/workflows/on-release-created.yml

+2-6
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ on:
66

77
workflow_dispatch:
88

9-
env:
10-
COREPACK_DEFAULT_TO_LATEST: 0
11-
129
jobs:
1310
publish-misskey-js:
1411
name: Publish misskey-js
@@ -26,8 +23,8 @@ jobs:
2623
- uses: actions/checkout@v4.1.1
2724
with:
2825
submodules: true
29-
- name: Install pnpm
30-
uses: pnpm/action-setup@v4
26+
- name: Setup pnpm
27+
uses: pnpm/action-setup@v4.1.0
3128
- name: Use Node.js ${{ matrix.node-version }}
3229
uses: actions/setup-node@v4.1.0
3330
with:
@@ -36,7 +33,6 @@ jobs:
3633
registry-url: 'https://registry.npmjs.org'
3734
- name: Publish package
3835
run: |
39-
corepack enable
4036
pnpm i --frozen-lockfile
4137
pnpm build
4238
pnpm --filter misskey-js publish --access public --no-git-checks --provenance

.github/workflows/storybook.yml

+2-6
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ on:
1313
# This is a waste of chromatic build quota, so we don't run storybook CI on pull requests targets master.
1414
- master
1515

16-
env:
17-
COREPACK_DEFAULT_TO_LATEST: 0
18-
1916
jobs:
2017
build:
2118
# chromatic is not likely to be available for fork repositories, so we disable for fork repositories.
@@ -43,14 +40,13 @@ jobs:
4340
run: |
4441
echo "base=$(git rev-list --parents -n1 HEAD | cut -d" " -f2)" >> $GITHUB_OUTPUT
4542
git checkout $(git rev-list --parents -n1 HEAD | cut -d" " -f3)
46-
- name: Install pnpm
47-
uses: pnpm/action-setup@v4
43+
- name: Setup pnpm
44+
uses: pnpm/action-setup@v4.1.0
4845
- name: Use Node.js 20.x
4946
uses: actions/setup-node@v4.1.0
5047
with:
5148
node-version-file: '.node-version'
5249
cache: 'pnpm'
53-
- run: corepack enable
5450
- run: pnpm i --frozen-lockfile
5551
- name: Check pnpm-lock.yaml
5652
run: git diff --exit-code pnpm-lock.yaml

.github/workflows/test-backend.yml

+4-10
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ on:
1818
- packages/misskey-js/**
1919
- .github/workflows/test-backend.yml
2020
- .github/misskey/test.yml
21-
22-
env:
23-
COREPACK_DEFAULT_TO_LATEST: 0
24-
2521
jobs:
2622
unit:
2723
name: Unit tests (backend)
@@ -48,8 +44,8 @@ jobs:
4844
- uses: actions/checkout@v4.1.1
4945
with:
5046
submodules: true
51-
- name: Install pnpm
52-
uses: pnpm/action-setup@v4
47+
- name: Setup pnpm
48+
uses: pnpm/action-setup@v4.1.0
5349
- name: Install FFmpeg
5450
run: |
5551
for i in {1..3}; do
@@ -70,7 +66,6 @@ jobs:
7066
with:
7167
node-version: ${{ matrix.node-version }}
7268
cache: 'pnpm'
73-
- run: corepack enable
7469
- run: pnpm i --frozen-lockfile
7570
- name: Check pnpm-lock.yaml
7671
run: git diff --exit-code pnpm-lock.yaml
@@ -111,14 +106,13 @@ jobs:
111106
- uses: actions/checkout@v4.1.1
112107
with:
113108
submodules: true
114-
- name: Install pnpm
115-
uses: pnpm/action-setup@v4
109+
- name: Setup pnpm
110+
uses: pnpm/action-setup@v4.1.0
116111
- name: Use Node.js ${{ matrix.node-version }}
117112
uses: actions/setup-node@v4.1.0
118113
with:
119114
node-version: ${{ matrix.node-version }}
120115
cache: 'pnpm'
121-
- run: corepack enable
122116
- run: pnpm i --frozen-lockfile
123117
- name: Check pnpm-lock.yaml
124118
run: git diff --exit-code pnpm-lock.yaml

.github/workflows/test-federation.yml

+2-6
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ on:
1515
- packages/misskey-js/**
1616
- .github/workflows/test-federation.yml
1717

18-
env:
19-
COREPACK_DEFAULT_TO_LATEST: 0
20-
2118
jobs:
2219
test:
2320
name: Federation test
@@ -29,8 +26,8 @@ jobs:
2926
- uses: actions/checkout@v4
3027
with:
3128
submodules: true
32-
- name: Install pnpm
33-
uses: pnpm/action-setup@v4
29+
- name: Setup pnpm
30+
uses: pnpm/action-setup@v4.1.0
3431
- name: Install FFmpeg
3532
run: |
3633
for i in {1..3}; do
@@ -53,7 +50,6 @@ jobs:
5350
cache: 'pnpm'
5451
- name: Build Misskey
5552
run: |
56-
corepack enable && corepack prepare
5753
pnpm i --frozen-lockfile
5854
pnpm build
5955
- name: Setup

.github/workflows/test-frontend.yml

+4-10
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@ on:
2222
- packages/backend/**
2323
- .github/workflows/test-frontend.yml
2424
- .github/misskey/test.yml
25-
26-
env:
27-
COREPACK_DEFAULT_TO_LATEST: 0
28-
2925
jobs:
3026
vitest:
3127
name: Unit tests (frontend)
@@ -39,14 +35,13 @@ jobs:
3935
- uses: actions/checkout@v4.1.1
4036
with:
4137
submodules: true
42-
- name: Install pnpm
43-
uses: pnpm/action-setup@v4
38+
- name: Setup pnpm
39+
uses: pnpm/action-setup@v4.1.0
4440
- name: Use Node.js ${{ matrix.node-version }}
4541
uses: actions/setup-node@v4.1.0
4642
with:
4743
node-version: ${{ matrix.node-version }}
4844
cache: 'pnpm'
49-
- run: corepack enable
5045
- run: pnpm i --frozen-lockfile
5146
- name: Check pnpm-lock.yaml
5247
run: git diff --exit-code pnpm-lock.yaml
@@ -95,14 +90,13 @@ jobs:
9590
# if: ${{ matrix.browser == 'firefox' }}
9691
#- uses: browser-actions/setup-firefox@latest
9792
# if: ${{ matrix.browser == 'firefox' }}
98-
- name: Install pnpm
99-
uses: pnpm/action-setup@v4
93+
- name: Setup pnpm
94+
uses: pnpm/action-setup@v4.1.0
10095
- name: Use Node.js ${{ matrix.node-version }}
10196
uses: actions/setup-node@v4.1.0
10297
with:
10398
node-version: ${{ matrix.node-version }}
10499
cache: 'pnpm'
105-
- run: corepack enable
106100
- run: pnpm i --frozen-lockfile
107101
- name: Copy Configure
108102
run: cp .github/misskey/test.yml .config

.github/workflows/test-misskey-js.yml

+2-5
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ on:
1414
paths:
1515
- packages/misskey-js/**
1616
- .github/workflows/test-misskey-js.yml
17-
18-
env:
19-
COREPACK_DEFAULT_TO_LATEST: 0
20-
2117
jobs:
2218
test:
2319
name: Unit tests (misskey.js)
@@ -33,7 +29,8 @@ jobs:
3329
- name: Checkout
3430
uses: actions/checkout@v4.1.1
3531

36-
- run: corepack enable
32+
- name: Setup pnpm
33+
uses: pnpm/action-setup@v4.1.0
3734

3835
- name: Setup Node.js ${{ matrix.node-version }}
3936
uses: actions/setup-node@v4.1.0

.github/workflows/test-production.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ on:
99

1010
env:
1111
NODE_ENV: production
12-
COREPACK_DEFAULT_TO_LATEST: 0
1312

1413
jobs:
1514
production:
@@ -24,14 +23,13 @@ jobs:
2423
- uses: actions/checkout@v4.1.1
2524
with:
2625
submodules: true
27-
- name: Install pnpm
28-
uses: pnpm/action-setup@v4
26+
- name: Setup pnpm
27+
uses: pnpm/action-setup@v4.1.0
2928
- name: Use Node.js ${{ matrix.node-version }}
3029
uses: actions/setup-node@v4.1.0
3130
with:
3231
node-version: ${{ matrix.node-version }}
3332
cache: 'pnpm'
34-
- run: corepack enable
3533
- run: pnpm i --frozen-lockfile
3634
- name: Check pnpm-lock.yaml
3735
run: git diff --exit-code pnpm-lock.yaml

0 commit comments

Comments
 (0)