Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge upstream #212

Merged
merged 6 commits into from
May 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"version": "8.9.2"
},
"ghcr.io/devcontainers/features/node:1": {
"version": "20.10.0"
"version": "20.12.2"
}
},
"forwardPorts": [3000],
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-misskey-js-autogen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: setup pnpm
uses: pnpm/action-setup@v3
with:
version: 8
version: 9

- name: setup node
id: setup-node
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/get-api-diff.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:

strategy:
matrix:
node-version: [20.10.0]
node-version: [20.12.2]
api-json-name: [api-base.json, api-head.json]
include:
- api-json-name: api-base.json
Expand All @@ -34,7 +34,7 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@v3
with:
version: 8
version: 9
run_install: false
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/[email protected]
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
submodules: true
- uses: pnpm/action-setup@v3
with:
version: 8
version: 9
run_install: false
- uses: actions/[email protected]
with:
Expand All @@ -56,7 +56,7 @@ jobs:
submodules: true
- uses: pnpm/action-setup@v3
with:
version: 7
version: 9
run_install: false
- uses: actions/[email protected]
with:
Expand All @@ -82,7 +82,7 @@ jobs:
submodules: true
- uses: pnpm/action-setup@v3
with:
version: 7
version: 9
run_install: false
- uses: actions/[email protected]
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/on-release-created.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:

strategy:
matrix:
node-version: [20.10.0]
node-version: [20.12.2]

steps:
- uses: actions/[email protected]
Expand All @@ -26,7 +26,7 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@v3
with:
version: 8
version: 9
run_install: false
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/storybook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@v3
with:
version: 8
version: 9
run_install: false
- name: Use Node.js 20.x
uses: actions/[email protected]
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test-backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:

strategy:
matrix:
node-version: [20.10.0]
node-version: [20.12.2]

services:
postgres:
Expand All @@ -43,7 +43,7 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@v3
with:
version: 8
version: 9
run_install: false
- name: Install FFmpeg
uses: FedericoCarboni/setup-ffmpeg@v3
Expand Down Expand Up @@ -73,7 +73,7 @@ jobs:

strategy:
matrix:
node-version: [20.10.0]
node-version: [20.12.2]

services:
postgres:
Expand All @@ -95,7 +95,7 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@v3
with:
version: 8
version: 9
run_install: false
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/[email protected]
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test-frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:

strategy:
matrix:
node-version: [20.10.0]
node-version: [20.12.2]

steps:
- uses: actions/[email protected]
Expand All @@ -35,7 +35,7 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@v3
with:
version: 8
version: 9
run_install: false
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/[email protected]
Expand Down Expand Up @@ -64,7 +64,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node-version: [20.10.0]
node-version: [20.12.2]
browser: [chrome]

services:
Expand Down Expand Up @@ -93,7 +93,7 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@v3
with:
version: 7
version: 9
run_install: false
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-misskey-js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

strategy:
matrix:
node-version: [20.10.0]
node-version: [20.12.2]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

strategy:
matrix:
node-version: [20.10.0]
node-version: [20.12.2]

steps:
- uses: actions/[email protected]
Expand All @@ -25,7 +25,7 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@v3
with:
version: 8
version: 9
run_install: false
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/[email protected]
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/validate-api-json.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:

strategy:
matrix:
node-version: [20.10.0]
node-version: [20.12.2]

steps:
- uses: actions/[email protected]
Expand All @@ -26,7 +26,7 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@v3
with:
version: 8
version: 9
run_install: false
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20.10.0
20.12.2
7 changes: 4 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@
- Enhance: フォローするかどうかの確認ダイアログを出せるように
- Enhance: Playを手動でリロードできるように
- Enhance: 通報のコメント内のリンクをクリックした際、ウィンドウで開くように
- Chore: AiScriptを0.18.0にバージョンアップ
- Enhance: `Ui:C:postForm` および `Ui:C:postFormButton` に `localOnly` と `visibility` を設定できるように
- Enhance: AiScriptを0.18.0にバージョンアップ
- Fix: 一部のページ内リンクが正しく動作しない問題を修正
- Fix: 周年の実績が閏年を考慮しない問題を修正
- Fix: ローカルURLのプレビューポップアップが左上に表示される
Expand All @@ -62,6 +63,8 @@
### Server
- Enhance: エンドポイント`antennas/update`の必須項目を`antennaId`のみに
- Enhance: misskey-dev/[email protected]の取り込み(プレビュー生成処理の効率化)
- Enhance: ドライブのファイルがNSFWかどうか個別に連合されるように (#13756)
- 可能な場合、ノートの添付ファイルのセンシティブ判定がファイル単位になります
- Fix: リモートから配送されたアクティビティにJSON-LD compactionをかける
- Fix: フォローリクエストを作成する際に既存のものは削除するように
(Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/440)
Expand All @@ -77,8 +80,6 @@
- Fix: グローバルタイムラインで返信が表示されないことがある問題を修正
- Fix: リノートをミュートしたユーザの投稿のリノートがミュートされる問題を修正
- Fix: AP Link等は添付ファイル扱いしないようになど (#13754)
- Enhance: ドライブのファイルがNSFWかどうか個別に連合されるように (#13756)
- 可能な場合、ノートの添付ファイルのセンシティブ判定がファイル単位になります

## 2024.3.1

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax = docker/dockerfile:1.4

ARG NODE_VERSION=20.10.0-bookworm
ARG NODE_VERSION=20.12.2-bullseye


# download submodules
Expand Down
24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"type": "git",
"url": "https://github.com/taiyme/misskey.git"
},
"packageManager": "pnpm@8.15.4",
"packageManager": "pnpm@9.0.6",
"workspaces": [
"packages/frontend",
"packages/backend",
Expand Down Expand Up @@ -48,24 +48,24 @@
"lodash": "4.17.21"
},
"dependencies": {
"cssnano": "6.0.5",
"cssnano": "6.1.2",
"execa": "8.0.1",
"fast-glob": "3.3.2",
"ignore-walk": "6.0.4",
"js-yaml": "4.1.0",
"postcss": "8.4.35",
"tar": "6.2.0",
"terser": "5.28.1",
"typescript": "5.3.3",
"esbuild": "0.19.11",
"glob": "10.3.10"
"postcss": "8.4.38",
"tar": "6.2.1",
"terser": "5.30.3",
"typescript": "5.4.5",
"esbuild": "0.20.2",
"glob": "10.3.12"
},
"devDependencies": {
"@types/node": "20.11.28",
"@typescript-eslint/eslint-plugin": "7.1.0",
"@typescript-eslint/parser": "7.1.0",
"@types/node": "20.12.7",
"@typescript-eslint/eslint-plugin": "7.7.1",
"@typescript-eslint/parser": "7.7.1",
"cross-env": "7.0.3",
"cypress": "13.6.6",
"cypress": "13.7.3",
"eslint": "8.57.0",
"ncp": "2.0.0",
"start-server-and-test": "2.0.3"
Expand Down
Loading