usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop

This commit is contained in:
syuilo 2025-11-25 10:20:46 +09:00
parent b895088546 1e5592a5bd
commit fd15a7fc23
3 changed files with 663 additions and 406 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
packages/backend/package.json
View File

@ -40,17 +40,17 @@
}, },
"optionalDependencies": { "optionalDependencies": {
"@swc/core-android-arm64": "1.3.11", "@swc/core-android-arm64": "1.3.11",
"@swc/core-darwin-arm64": "1.14.0", "@swc/core-darwin-arm64": "1.15.1",
"@swc/core-darwin-x64": "1.14.0", "@swc/core-darwin-x64": "1.15.1",
"@swc/core-freebsd-x64": "1.3.11", "@swc/core-freebsd-x64": "1.3.11",
"@swc/core-linux-arm-gnueabihf": "1.14.0", "@swc/core-linux-arm-gnueabihf": "1.15.1",
"@swc/core-linux-arm64-gnu": "1.14.0", "@swc/core-linux-arm64-gnu": "1.15.1",
"@swc/core-linux-arm64-musl": "1.14.0", "@swc/core-linux-arm64-musl": "1.15.1",
"@swc/core-linux-x64-gnu": "1.14.0", "@swc/core-linux-x64-gnu": "1.15.1",
"@swc/core-linux-x64-musl": "1.14.0", "@swc/core-linux-x64-musl": "1.15.1",
"@swc/core-win32-arm64-msvc": "1.14.0", "@swc/core-win32-arm64-msvc": "1.15.1",
"@swc/core-win32-ia32-msvc": "1.14.0", "@swc/core-win32-ia32-msvc": "1.15.1",
"@swc/core-win32-x64-msvc": "1.14.0", "@swc/core-win32-x64-msvc": "1.15.1",
"@tensorflow/tfjs": "4.22.0", "@tensorflow/tfjs": "4.22.0",
"@tensorflow/tfjs-node": "4.22.0", "@tensorflow/tfjs-node": "4.22.0",
"bufferutil": "4.0.9", "bufferutil": "4.0.9",
@ -70,8 +70,8 @@
"utf-8-validate": "6.0.5" "utf-8-validate": "6.0.5"
}, },
"dependencies": { "dependencies": {
"@aws-sdk/client-s3": "3.922.0", "@aws-sdk/client-s3": "3.927.0",
"@aws-sdk/lib-storage": "3.922.0", "@aws-sdk/lib-storage": "3.927.0",
"@discordapp/twemoji": "16.0.1", "@discordapp/twemoji": "16.0.1",
"@fastify/accepts": "5.0.3", "@fastify/accepts": "5.0.3",
"@fastify/cookie": "11.0.2", "@fastify/cookie": "11.0.2",
@ -88,13 +88,13 @@
"@nestjs/core": "11.1.8", "@nestjs/core": "11.1.8",
"@nestjs/testing": "11.1.8", "@nestjs/testing": "11.1.8",
"@peertube/http-signature": "1.7.0", "@peertube/http-signature": "1.7.0",
"@sentry/node": "10.22.0", "@sentry/node": "10.23.0",
"@sentry/profiling-node": "10.22.0", "@sentry/profiling-node": "10.23.0",
"@simplewebauthn/server": "12.0.0", "@simplewebauthn/server": "12.0.0",
"@sinonjs/fake-timers": "11.3.1", "@sinonjs/fake-timers": "11.3.1",
"@smithy/node-http-handler": "2.5.0", "@smithy/node-http-handler": "2.5.0",
"@swc/cli": "0.7.8", "@swc/cli": "0.7.9",
"@swc/core": "1.14.0", "@swc/core": "1.15.1",
"@twemoji/parser": "16.0.0", "@twemoji/parser": "16.0.0",
"@types/redis-info": "3.0.3", "@types/redis-info": "3.0.3",
"accepts": "1.3.8", "accepts": "1.3.8",
@ -114,13 +114,13 @@
"content-disposition": "0.5.4", "content-disposition": "0.5.4",
"date-fns": "2.30.0", "date-fns": "2.30.0",
"deep-email-validator": "0.1.21", "deep-email-validator": "0.1.21",
"fastify": "5.6.1", "fastify": "5.6.2",
"fastify-raw-body": "5.0.0", "fastify-raw-body": "5.0.0",
"feed": "4.2.2", "feed": "4.2.2",
"file-type": "21.0.0", "file-type": "21.0.0",
"fluent-ffmpeg": "2.1.3", "fluent-ffmpeg": "2.1.3",
"form-data": "4.0.4", "form-data": "4.0.4",
"got": "14.6.1", "got": "14.6.3",
"happy-dom": "20.0.10", "happy-dom": "20.0.10",
"hpagent": "1.2.0", "hpagent": "1.2.0",
"htmlescape": "1.1.1", "htmlescape": "1.1.1",
@ -161,7 +161,7 @@
"qrcode": "1.5.4", "qrcode": "1.5.4",
"random-seed": "0.3.0", "random-seed": "0.3.0",
"ratelimiter": "3.4.1", "ratelimiter": "3.4.1",
"re2": "1.22.1", "re2": "1.22.3",
"redis-info": "3.1.0", "redis-info": "3.1.0",
"redis-lock": "0.1.4", "redis-lock": "0.1.4",
"reflect-metadata": "0.2.2", "reflect-metadata": "0.2.2",
@ -191,7 +191,7 @@
"devDependencies": { "devDependencies": {
"@jest/globals": "29.7.0", "@jest/globals": "29.7.0",
"@nestjs/platform-express": "10.4.20", "@nestjs/platform-express": "10.4.20",
"@sentry/vue": "10.22.0", "@sentry/vue": "10.23.0",
"@simplewebauthn/types": "12.0.0", "@simplewebauthn/types": "12.0.0",
"@swc/jest": "0.2.39", "@swc/jest": "0.2.39",
"@types/accepts": "1.3.7", "@types/accepts": "1.3.7",
@ -210,7 +210,7 @@
"@types/jsrsasign": "10.5.15", "@types/jsrsasign": "10.5.15",
"@types/mime-types": "2.1.4", "@types/mime-types": "2.1.4",
"@types/ms": "0.7.34", "@types/ms": "0.7.34",
"@types/node": "24.9.2", "@types/node": "24.10.0",
"@types/nodemailer": "6.4.21", "@types/nodemailer": "6.4.21",
"@types/oauth": "0.9.6", "@types/oauth": "0.9.6",
"@types/oauth2orize": "1.11.5", "@types/oauth2orize": "1.11.5",
@ -231,8 +231,8 @@
"@types/vary": "1.1.3", "@types/vary": "1.1.3",
"@types/web-push": "3.6.4", "@types/web-push": "3.6.4",
"@types/ws": "8.18.1", "@types/ws": "8.18.1",
"@typescript-eslint/eslint-plugin": "8.46.2", "@typescript-eslint/eslint-plugin": "8.46.3",
"@typescript-eslint/parser": "8.46.2", "@typescript-eslint/parser": "8.46.3",
"aws-sdk-client-mock": "4.1.0", "aws-sdk-client-mock": "4.1.0",
"cross-env": "7.0.3", "cross-env": "7.0.3",
"eslint-plugin-import": "2.32.0", "eslint-plugin-import": "2.32.0",

4
packages/backend/src/server/web/ClientServerService.ts
View File

@ -50,7 +50,7 @@ import { AnnouncementEntityService } from '@/core/entities/AnnouncementEntitySer
import { FeedService } from './FeedService.js'; import { FeedService } from './FeedService.js';
import { UrlPreviewService } from './UrlPreviewService.js'; import { UrlPreviewService } from './UrlPreviewService.js';
import { ClientLoggerService } from './ClientLoggerService.js'; import { ClientLoggerService } from './ClientLoggerService.js';
import type { FastifyInstance, FastifyPluginOptions, FastifyReply } from 'fastify'; import type { FastifyError, FastifyInstance, FastifyPluginOptions, FastifyReply } from 'fastify';
const _filename = fileURLToPath(import.meta.url); const _filename = fileURLToPath(import.meta.url);
const _dirname = dirname(_filename); const _dirname = dirname(_filename);
@ -918,7 +918,7 @@ export class ClientServerService {
return await renderBase(reply); return await renderBase(reply);
}); });
fastify.setErrorHandler(async (error, request, reply) => { fastify.setErrorHandler<FastifyError>(async (error, request, reply) => {
const errId = randomUUID(); const errId = randomUUID();
this.clientLoggerService.logger.error(`Internal error occurred in ${request.routeOptions.url}: ${error.message}`, { this.clientLoggerService.logger.error(`Internal error occurred in ${request.routeOptions.url}: ${error.message}`, {
path: request.routeOptions.url, path: request.routeOptions.url,

1019
pnpm-lock.yaml
View File

File diff suppressed because it is too large Load Diff