Skip to content

Commit

Permalink
Merge pull request #773 from update-host
Browse files Browse the repository at this point in the history
  • Loading branch information
@u1-liquid
u1-liquid authored Oct 21, 2024
2 parents 385b4b5 + d25c7bf commit 0b2dcfe
Show file tree
Hide file tree
Showing 20 changed files with 3,862 additions and 5,085 deletions.
32 changes: 16 additions & 16 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "misskey",
"version": "2024.5.0-host.3b",
"version": "2024.5.0-host.3c",
"codename": "nasubi",
"repository": {
"type": "git",
"url": "https://github.com/MisskeyIO/misskey.git"
},
"packageManager": "pnpm@9.7.1",
"packageManager": "pnpm@9.12.2",
"workspaces": [
"packages/frontend",
"packages/backend",
Expand Down Expand Up @@ -46,31 +46,31 @@
"cleanall": "pnpm clean-all"
},
"resolutions": {
"@tensorflow/tfjs-core": "4.20.0",
"chokidar": "3.6.0",
"esbuild": "0.23.0",
"@tensorflow/tfjs-core": "4.21.0",
"chokidar": "4.0.1",
"esbuild": "0.24.0",
"lodash": "4.17.21",
"sharp": "0.33.4"
"sharp": "0.33.5"
},
"dependencies": {
"cssnano": "7.0.5",
"execa": "9.3.0",
"cssnano": "7.0.6",
"execa": "9.4.1",
"js-yaml": "4.1.0",
"postcss": "8.4.41",
"terser": "5.31.5",
"typescript": "5.5.4"
"postcss": "8.4.47",
"terser": "5.36.0",
"typescript": "5.6.3"
},
"devDependencies": {
"@types/node": "22.2.0",
"@types/node": "22.7.7",
"@typescript-eslint/eslint-plugin": "7.10.0",
"@typescript-eslint/parser": "7.10.0",
"cross-env": "7.0.3",
"cypress": "13.13.2",
"eslint": "8.57.0",
"cypress": "13.15.0",
"eslint": "8.57.1",
"ncp": "2.0.0",
"start-server-and-test": "2.0.5"
"start-server-and-test": "2.0.8"
},
"optionalDependencies": {
"@tensorflow/tfjs-core": "4.19.0"
"@tensorflow/tfjs-core": "4.21.0"
}
}
94 changes: 47 additions & 47 deletions packages/backend/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
"@swc/core-win32-arm64-msvc": "1.5.7",
"@swc/core-win32-ia32-msvc": "1.5.7",
"@swc/core-win32-x64-msvc": "1.5.7",
"@tensorflow/tfjs": "4.19.0",
"@tensorflow/tfjs-node": "4.19.0",
"@tensorflow/tfjs": "4.21.0",
"@tensorflow/tfjs-node": "4.21.0",
"bufferutil": "4.0.8",
"slacc-android-arm-eabi": "0.0.10",
"slacc-android-arm64": "0.0.10",
Expand All @@ -66,15 +66,15 @@
},
"dependencies": {
"@authenio/samlify-node-xmllint": "2.0.0",
"@aws-sdk/client-s3": "3.627.0",
"@aws-sdk/lib-storage": "3.627.0",
"@bull-board/api": "5.21.3",
"@bull-board/fastify": "5.21.3",
"@bull-board/ui": "5.21.3",
"@discordapp/twemoji": "15.0.3",
"@elastic/elasticsearch": "^8.14.0",
"@aws-sdk/client-s3": "3.675.0",
"@aws-sdk/lib-storage": "3.675.0",
"@bull-board/api": "5.23.0",
"@bull-board/fastify": "5.23.0",
"@bull-board/ui": "5.23.0",
"@discordapp/twemoji": "15.1.0",
"@elastic/elasticsearch": "8.15.1",
"@fastify/accepts": "4.3.0",
"@fastify/cookie": "9.3.1",
"@fastify/cookie": "9.4.0",
"@fastify/cors": "9.0.1",
"@fastify/express": "3.0.0",
"@fastify/formbody": "7.4.0",
Expand All @@ -84,14 +84,14 @@
"@fastify/view": "9.1.0",
"@misskey-dev/sharp-read-bmp": "1.2.0",
"@misskey-dev/summaly": "5.1.0",
"@napi-rs/canvas": "0.1.53",
"@nestjs/common": "10.3.10",
"@nestjs/core": "10.3.10",
"@nestjs/testing": "10.3.10",
"@napi-rs/canvas": "0.1.58",
"@nestjs/common": "10.4.5",
"@nestjs/core": "10.4.5",
"@nestjs/testing": "10.4.5",
"@peertube/http-signature": "1.7.0",
"@simplewebauthn/server": "10.0.1",
"@sinonjs/fake-timers": "11.2.2",
"@smithy/node-http-handler": "3.1.4",
"@sinonjs/fake-timers": "11.3.1",
"@smithy/node-http-handler": "3.2.4",
"@swc/cli": "0.3.12",
"@swc/core": "1.5.7",
"@twemoji/parser": "15.1.1",
Expand All @@ -102,36 +102,36 @@
"bcryptjs": "2.4.3",
"blurhash": "2.0.5",
"body-parser": "1.20.2",
"bullmq": "5.12.3",
"bullmq": "5.21.1",
"cacheable-lookup": "7.0.0",
"cbor": "9.0.2",
"chalk": "5.3.0",
"chalk-template": "1.1.0",
"chokidar": "3.6.0",
"chokidar": "4.0.1",
"cli-highlight": "2.1.11",
"color-convert": "2.0.1",
"content-disposition": "0.5.4",
"date-fns": "3.6.0",
"date-fns": "4.1.0",
"deep-email-validator": "0.1.21",
"fastify": "4.28.1",
"fastify-http-errors-enhanced": "5.0.4",
"fastify-raw-body": "4.3.0",
"feed": "4.2.2",
"file-type": "19.4.0",
"fluent-ffmpeg": "2.1.3",
"form-data": "4.0.0",
"got": "14.4.2",
"happy-dom": "14.12.3",
"form-data": "4.0.1",
"got": "14.4.3",
"happy-dom": "15.7.4",
"hpagent": "1.2.0",
"htmlescape": "1.1.1",
"http-link-header": "1.1.3",
"ioredis": "5.4.1",
"ip-cidr": "3.1.0",
"ipaddr.js": "2.2.0",
"is-svg": "5.1.0",
"jose": "5.6.3",
"jose": "5.9.6",
"js-yaml": "4.1.0",
"jsdom": "24.1.1",
"jsdom": "25.0.1",
"json5": "2.2.3",
"jsonld": "8.3.2",
"jsrsasign": "11.1.0",
Expand All @@ -146,17 +146,17 @@
"nested-property": "4.0.0",
"node-fetch": "3.3.2",
"node-forge": "1.3.1",
"nodemailer": "6.9.14",
"nodemailer": "6.9.15",
"nsfwjs": "2.4.2",
"oauth": "0.10.0",
"oauth2orize": "1.12.0",
"oauth2orize-pkce": "0.1.2",
"os-utils": "0.0.14",
"otpauth": "9.3.1",
"otpauth": "9.3.4",
"parse5": "7.1.2",
"pg": "8.12.0",
"pino": "9.3.2",
"pino-pretty": "11.2.2",
"pg": "8.13.0",
"pino": "9.5.0",
"pino-pretty": "11.3.0",
"pkce-challenge": "4.1.0",
"probe-image-size": "7.2.3",
"promise-limit": "2.7.0",
Expand All @@ -165,7 +165,7 @@
"qrcode": "1.5.4",
"random-seed": "0.3.0",
"ratelimiter": "3.4.1",
"re2": "1.21.3",
"re2": "1.21.4",
"redis-lock": "0.1.4",
"reflect-metadata": "0.2.2",
"rename": "1.0.4",
Expand All @@ -174,17 +174,17 @@
"samlify": "2.8.11",
"sanitize-html": "2.13.0",
"secure-json-parse": "2.7.0",
"sharp": "0.33.4",
"sharp": "0.33.5",
"slacc": "0.0.10",
"strict-event-emitter-types": "2.0.0",
"stringz": "2.1.0",
"systeminformation": "5.23.4",
"systeminformation": "5.23.5",
"tinycolor2": "1.6.0",
"tmp": "0.2.3",
"tsc-alias": "1.8.10",
"tsconfig-paths": "4.2.0",
"typeorm": "0.3.20",
"typescript": "5.5.4",
"typescript": "5.6.3",
"ulid": "2.3.0",
"vary": "1.1.2",
"web-push": "3.6.7",
Expand All @@ -195,39 +195,39 @@
"devDependencies": {
"@jest/globals": "29.7.0",
"@misskey-dev/eslint-plugin": "1.0.0",
"@nestjs/platform-express": "10.3.10",
"@nestjs/platform-express": "10.4.5",
"@simplewebauthn/types": "10.0.0",
"@swc/jest": "0.2.36",
"@types/accepts": "1.3.7",
"@types/archiver": "6.0.2",
"@types/bcryptjs": "2.4.6",
"@types/body-parser": "1.19.5",
"@types/color-convert": "2.0.3",
"@types/color-convert": "2.0.4",
"@types/content-disposition": "0.5.8",
"@types/fluent-ffmpeg": "2.1.25",
"@types/fluent-ffmpeg": "2.1.26",
"@types/htmlescape": "^1.1.3",
"@types/http-link-header": "1.0.7",
"@types/jest": "29.5.12",
"@types/jest": "29.5.13",
"@types/js-yaml": "4.0.9",
"@types/jsdom": "21.1.7",
"@types/jsonld": "1.5.15",
"@types/jsrsasign": "10.5.14",
"@types/mime-types": "2.1.4",
"@types/ms": "0.7.34",
"@types/node": "22.2.0",
"@types/node": "22.7.7",
"@types/node-forge": "1.3.11",
"@types/nodemailer": "6.4.15",
"@types/oauth": "0.9.5",
"@types/nodemailer": "6.4.16",
"@types/oauth": "0.9.6",
"@types/oauth2orize": "1.11.5",
"@types/oauth2orize-pkce": "0.1.2",
"@types/pg": "8.11.6",
"@types/pg": "8.11.10",
"@types/pug": "2.0.10",
"@types/punycode": "2.1.4",
"@types/qrcode": "1.5.5",
"@types/random-seed": "0.3.5",
"@types/ratelimiter": "3.4.6",
"@types/rename": "1.0.7",
"@types/sanitize-html": "2.11.0",
"@types/sanitize-html": "2.13.0",
"@types/semver": "7.5.8",
"@types/simple-oauth2": "5.0.7",
"@types/sinonjs__fake-timers": "8.1.5",
Expand All @@ -238,15 +238,15 @@
"@types/ws": "8.5.12",
"@typescript-eslint/eslint-plugin": "7.10.0",
"@typescript-eslint/parser": "7.10.0",
"aws-sdk-client-mock": "4.0.1",
"aws-sdk-client-mock": "4.1.0",
"cross-env": "7.0.3",
"eslint": "8.57.0",
"eslint-plugin-import": "2.29.1",
"execa": "9.3.0",
"eslint": "8.57.1",
"eslint-plugin-import": "2.31.0",
"execa": "9.4.1",
"fkill": "^9.0.0",
"jest": "29.7.0",
"jest-mock": "29.7.0",
"nodemon": "3.1.4",
"nodemon": "3.1.7",
"pid-port": "1.0.0",
"simple-oauth2": "5.1.0"
}
Expand Down
5 changes: 1 addition & 4 deletions packages/backend/src/core/FileInfoService.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -266,10 +266,7 @@ export class FileInfoService {
}

private async *asyncIterateFrames(cwd: string, command: FFmpeg.FfmpegCommand): AsyncGenerator<string, void> {
const watcher = new FSWatcher({
cwd,
disableGlobbing: true,
});
const watcher = new FSWatcher({ cwd });
let finished = false;
command.once('end', () => {
finished = true;
Expand Down
Loading

0 comments on commit 0b2dcfe

Please sign in to comment.