Skip to content

Commit 22fe01c

Browse files
committed
Merge tag '2024.5.0-io.5' into bun
2 parents 8bc0d52 + 18f354c commit 22fe01c

File tree

200 files changed

+6050
-4650
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

200 files changed

+6050
-4650
lines changed

.devcontainer/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
FROM mcr.microsoft.com/devcontainers/javascript-node:0-18
1+
FROM mcr.microsoft.com/devcontainers/javascript-node:22

.devcontainer/devcontainer.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
"service": "app",
55
"workspaceFolder": "/workspace",
66
"features": {
7-
"ghcr.io/devcontainers/features/node:1": {
8-
"version": "20"
7+
"ghcr.io/devcontainers/features/node:latest": {
8+
"version": "22"
99
},
10-
"ghcr.io/devcontainers-contrib/features/corepack:1": {}
10+
"ghcr.io/devcontainers-contrib/features/pnpm:latest": {}
1111
},
1212
"forwardPorts": [3000],
1313
"postCreateCommand": "sudo chmod 755 .devcontainer/init.sh && .devcontainer/init.sh",

.devcontainer/init.sh

-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ set -xe
44

55
sudo chown -R node /workspace
66
git submodule update --init
7-
corepack install
8-
corepack enable
97
pnpm config set store-dir /home/node/.local/share/pnpm/store
108
pnpm install --frozen-lockfile
119
cp .devcontainer/devcontainer.yml .config/default.yml

.dockerignore

+4-11
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
**/.git
2+
13
.autogen
24
.github
35
.travis
@@ -7,24 +9,15 @@ Dockerfile
79
build/
810
built/
911
db/
12+
compose.yml
1013
docker-compose.yml
1114
node_modules/
1215
packages/*/node_modules
1316
redis/
1417
files/
15-
fluent-emojis/
16-
.pnp.*
17-
18-
# .yarn関連
19-
.yarn/*
20-
!.yarn/patches
21-
!.yarn/plugins
22-
!.yarn/releases
23-
!.yarn/sdks
24-
!.yarn/versions
25-
2618
.pnpm-store
2719

2820
.idea/
2921
packages/*/.vscode/
22+
packages/backend/test/compose.yml
3023
packages/backend/test/docker-compose.yml

.github/ISSUE_TEMPLATE/01_bug-report.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ body:
7575
Examples:
7676
* Installation Method or Hosting Service: docker compose, k8s/docker, systemd, "Misskey install shell script", development environment
7777
* Misskey: 13.x.x
78-
* Node: 20.x.x
78+
* Node: 22.x.x
7979
* PostgreSQL: 15.x.x
8080
* Redis: 7.x.x
8181
* OS and Architecture: Ubuntu 22.04.2 LTS aarch64

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

+8-2
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,15 @@ jobs:
1515

1616
steps:
1717
- name: Checkout
18-
uses: actions/checkout@v4.1.1
18+
uses: actions/checkout@v4
19+
with:
20+
fetch-depth: 0
21+
submodules: true
1922

20-
- run: corepack enable
23+
- name: Install pnpm
24+
uses: pnpm/action-setup@v4
25+
with:
26+
run_install: false
2127

2228
- name: Setup Node.js
2329
uses: actions/setup-node@v4.1.0

.github/workflows/check-misskey-js-version.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@ jobs:
2222
runs-on: ubuntu-latest
2323
steps:
2424
- name: Checkout
25-
uses: actions/checkout@v4.1.1
25+
uses: actions/checkout@v4
26+
with:
27+
fetch-depth: 0
28+
submodules: true
2629
- name: Check version
2730
run: |
2831
if [ "$(jq -r '.version' package.json)" != "$(jq -r '.version' packages/misskey-js/package.json)" ]; then

.github/workflows/docker-beta.yml

+3
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ jobs:
1414
steps:
1515
- name: Check out the repo
1616
uses: actions/checkout@v4
17+
with:
18+
fetch-depth: 0
19+
submodules: true
1720
- name: Set up Docker Buildx
1821
id: buildx
1922
uses: docker/setup-buildx-action@v3

.github/workflows/docker-host.yml

+3
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ jobs:
1616
steps:
1717
- name: Check out the repo
1818
uses: actions/checkout@v4
19+
with:
20+
fetch-depth: 0
21+
submodules: true
1922
- name: Set up Docker Buildx
2023
id: buildx
2124
uses: docker/setup-buildx-action@v3

.github/workflows/docker-io.yml

+3
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ jobs:
1616
steps:
1717
- name: Check out the repo
1818
uses: actions/checkout@v4
19+
with:
20+
fetch-depth: 0
21+
submodules: true
1922
- name: Set up Docker Buildx
2023
id: buildx
2124
uses: docker/setup-buildx-action@v3

.github/workflows/dockle.yml

+3
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ jobs:
1515
steps:
1616
- name: Checkout code
1717
uses: actions/checkout@v4
18+
with:
19+
fetch-depth: 0
20+
submodules: true
1821
- name: Build an image from Dockerfile
1922
uses: docker/build-push-action@v6
2023
with:

.github/workflows/lint.yml

+3-6
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
pnpm_install:
2626
runs-on: ubuntu-latest
2727
steps:
28-
- uses: actions/checkout@v4.1.1
28+
- uses: actions/checkout@v4
2929
with:
3030
fetch-depth: 0
3131
submodules: true
@@ -36,7 +36,6 @@ jobs:
3636
with:
3737
node-version-file: '.node-version'
3838
cache: 'pnpm'
39-
- run: corepack enable
4039
- run: pnpm i --frozen-lockfile
4140

4241
lint:
@@ -51,7 +50,7 @@ jobs:
5150
- sw
5251
- misskey-js
5352
steps:
54-
- uses: actions/checkout@v4.1.1
53+
- uses: actions/checkout@v4
5554
with:
5655
fetch-depth: 0
5756
submodules: true
@@ -62,7 +61,6 @@ jobs:
6261
with:
6362
node-version-file: '.node-version'
6463
cache: 'pnpm'
65-
- run: corepack enable
6664
- run: pnpm i --frozen-lockfile
6765
- run: pnpm --filter ${{ matrix.workspace }} run eslint
6866

@@ -76,7 +74,7 @@ jobs:
7674
- backend
7775
- misskey-js
7876
steps:
79-
- uses: actions/checkout@v4.1.1
77+
- uses: actions/checkout@v4
8078
with:
8179
fetch-depth: 0
8280
submodules: true
@@ -87,7 +85,6 @@ jobs:
8785
with:
8886
node-version-file: '.node-version'
8987
cache: 'pnpm'
90-
- run: corepack enable
9188
- run: pnpm i --frozen-lockfile
9289
- run: pnpm -r run build:tsc
9390
if: ${{ matrix.workspace == 'backend' }}

.github/workflows/test-backend.yml

+8-10
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ jobs:
2323

2424
strategy:
2525
matrix:
26-
node-version: [20.x]
27-
bun-version: [1.1.26]
26+
node-version: [22.x]
27+
bun-version: [1.1.x]
2828

2929
services:
3030
postgres:
@@ -50,7 +50,7 @@ jobs:
5050
- 56312:6379
5151

5252
steps:
53-
- uses: actions/checkout@v4.1.1
53+
- uses: actions/checkout@v4
5454
with:
5555
fetch-depth: 0
5656
submodules: true
@@ -69,7 +69,6 @@ jobs:
6969
uses: oven-sh/setup-bun@v2
7070
with:
7171
bun-version: ${{ matrix.bun-version }}
72-
- run: corepack enable
7372
- run: pnpm i --frozen-lockfile
7473
- name: Check pnpm-lock.yaml
7574
run: git diff --exit-code pnpm-lock.yaml
@@ -80,7 +79,7 @@ jobs:
8079
- name: Test
8180
run: pnpm --filter backend test-and-coverage
8281
- name: Upload to Codecov
83-
uses: codecov/codecov-action@v4
82+
uses: codecov/codecov-action@v5
8483
with:
8584
token: ${{ secrets.CODECOV_TOKEN }}
8685
files: ./packages/backend/coverage/coverage-final.json
@@ -90,8 +89,8 @@ jobs:
9089

9190
strategy:
9291
matrix:
93-
node-version: [20.x]
94-
bun-version: [1.1.26]
92+
node-version: [22.x]
93+
bun-version: [1.1.x]
9594

9695
services:
9796
postgres:
@@ -117,7 +116,7 @@ jobs:
117116
- 56312:6379
118117

119118
steps:
120-
- uses: actions/checkout@v4.1.1
119+
- uses: actions/checkout@v4
121120
with:
122121
fetch-depth: 0
123122
submodules: true
@@ -134,7 +133,6 @@ jobs:
134133
uses: oven-sh/setup-bun@v2
135134
with:
136135
bun-version: ${{ matrix.bun-version }}
137-
- run: corepack enable
138136
- run: pnpm i --frozen-lockfile
139137
- name: Check pnpm-lock.yaml
140138
run: git diff --exit-code pnpm-lock.yaml
@@ -145,7 +143,7 @@ jobs:
145143
- name: Test
146144
run: pnpm --filter backend test-and-coverage:e2e
147145
- name: Upload to Codecov
148-
uses: codecov/codecov-action@v4
146+
uses: codecov/codecov-action@v5
149147
with:
150148
token: ${{ secrets.CODECOV_TOKEN }}
151149
files: ./packages/backend/coverage/coverage-final.json

.github/workflows/test-frontend.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ jobs:
2828

2929
strategy:
3030
matrix:
31-
node-version: [20.x]
31+
node-version: [22.x]
3232

3333
steps:
34-
- uses: actions/checkout@v4.1.1
34+
- uses: actions/checkout@v4
3535
with:
3636
fetch-depth: 0
3737
submodules: true
@@ -44,7 +44,6 @@ jobs:
4444
with:
4545
node-version: ${{ matrix.node-version }}
4646
cache: 'pnpm'
47-
- run: corepack enable
4847
- run: pnpm i --frozen-lockfile
4948
- name: Check pnpm-lock.yaml
5049
run: git diff --exit-code pnpm-lock.yaml
@@ -55,7 +54,7 @@ jobs:
5554
- name: Test
5655
run: pnpm --filter frontend test-and-coverage
5756
- name: Upload Coverage
58-
uses: codecov/codecov-action@v4
57+
uses: codecov/codecov-action@v5
5958
with:
6059
token: ${{ secrets.CODECOV_TOKEN }}
6160
files: ./packages/frontend/coverage/coverage-final.json

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

+10-4
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,20 @@ jobs:
2323

2424
strategy:
2525
matrix:
26-
node-version: [20.x]
26+
node-version: [22.x]
2727
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
2828

2929
steps:
3030
- name: Checkout
31-
uses: actions/checkout@v4.1.1
31+
uses: actions/checkout@v4
32+
with:
33+
fetch-depth: 0
34+
submodules: true
3235

33-
- run: corepack enable
36+
- name: Install pnpm
37+
uses: pnpm/action-setup@v4
38+
with:
39+
run_install: false
3440

3541
- name: Setup Node.js ${{ matrix.node-version }}
3642
uses: actions/setup-node@v4.1.0
@@ -53,7 +59,7 @@ jobs:
5359
CI: true
5460

5561
- name: Upload Coverage
56-
uses: codecov/codecov-action@v4
62+
uses: codecov/codecov-action@v5
5763
with:
5864
token: ${{ secrets.CODECOV_TOKEN }}
5965
files: ./packages/misskey-js/coverage/coverage-final.json

.github/workflows/test-production.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ jobs:
1818

1919
strategy:
2020
matrix:
21-
node-version: [20.x]
21+
node-version: [22.x]
2222

2323
steps:
24-
- uses: actions/checkout@v4.1.1
24+
- uses: actions/checkout@v4
2525
with:
2626
fetch-depth: 0
2727
submodules: true
@@ -34,7 +34,6 @@ jobs:
3434
with:
3535
node-version: ${{ matrix.node-version }}
3636
cache: 'pnpm'
37-
- run: corepack enable
3837
- run: pnpm i --frozen-lockfile
3938
- name: Check pnpm-lock.yaml
4039
run: git diff --exit-code pnpm-lock.yaml

.github/workflows/validate-api-json.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ jobs:
1919

2020
strategy:
2121
matrix:
22-
node-version: [20.x]
23-
bun-version: [1.1.26]
22+
node-version: [22.x]
23+
bun-version: [1.1.x]
2424

2525
steps:
26-
- uses: actions/checkout@v4.1.1
26+
- uses: actions/checkout@v4
2727
with:
2828
fetch-depth: 0
2929
submodules: true
@@ -42,7 +42,6 @@ jobs:
4242
bun-version: ${{ matrix.bun-version }}
4343
- name: Install Redocly CLI
4444
run: npm i -g @redocly/cli
45-
- run: corepack enable
4645
- run: pnpm i --frozen-lockfile
4746
- name: Check pnpm-lock.yaml
4847
run: git diff --exit-code pnpm-lock.yaml

.gitignore

+3-11
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,6 @@
99
node_modules
1010
report.*.json
1111

12-
# Yarn
13-
.yarn/*
14-
!.yarn/patches
15-
!.yarn/plugins
16-
!.yarn/releases
17-
!.yarn/sdks
18-
!.yarn/versions
19-
packages/frontend/.yarn/cache
20-
packages/backend/.yarn/cache
21-
packages/sw/.yarn/cache
22-
2312
# pnpm
2413
.pnpm-store
2514

@@ -35,8 +24,11 @@ coverage
3524
!/.config/example.yml
3625
!/.config/docker_example.yml
3726
!/.config/docker_example.env
27+
compose.yml
3828
docker-compose.yml
29+
!/.devcontainer/compose.yml
3930
!/.devcontainer/docker-compose.yml
31+
!/packages/backend/test/compose.yml
4032
!/packages/backend/test/docker-compose.yml
4133

4234
# misskey

0 commit comments

Comments
 (0)