Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into ed25519

Browse source
This commit is contained in:
tamaina 2024-03-01 07:20:22 +00:00
parent 743b740775 2f31606eff
commit 0aa316ee12
3 changed files with 60 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
packages/backend/package.json
View file

@ -82,9 +82,9 @@
"@misskey-dev/node-http-message-signatures": "0.0.0-alpha.7",
"@misskey-dev/sharp-read-bmp": "1.2.0",
"@misskey-dev/summaly": "5.0.3",
"@nestjs/common": "10.2.10",
"@nestjs/core": "10.2.10",
"@nestjs/testing": "10.2.10",
"@nestjs/common": "10.3.3",
"@nestjs/core": "10.3.3",
"@nestjs/testing": "10.3.3",
"@simplewebauthn/server": "9.0.3",
"@sinonjs/fake-timers": "11.2.2",
"@smithy/node-http-handler": "2.1.10",
@ -159,7 +159,7 @@
"ratelimiter": "3.4.1",
"re2": "1.20.9",
"redis-lock": "0.1.4",
"reflect-metadata": "0.1.14",
"reflect-metadata": "0.2.1",
"rename": "1.0.4",
"rss-parser": "3.13.0",
"rxjs": "7.8.1",

8
packages/frontend/package.json
View file

@ -33,7 +33,7 @@
"astring": "1.8.6",
"broadcast-channel": "7.0.0",
"buraha": "0.0.1",
"canvas-confetti": "1.6.1",
"canvas-confetti": "1.9.2",
"chart.js": "4.4.2",
"chartjs-adapter-date-fns": "3.0.0",
"chartjs-chart-matrix": "2.0.1",
@ -60,17 +60,17 @@
"rollup": "4.12.0",
"sanitize-html": "2.12.1",
"sass": "1.71.1",
"shiki": "1.0.0-beta.3",
"shiki": "1.1.7",
"strict-event-emitter-types": "2.0.0",
"textarea-caret": "3.1.0",
"three": "0.161.0",
"three": "0.162.0",
"throttle-debounce": "5.0.0",
"tinycolor2": "1.6.0",
"tsc-alias": "1.8.8",
"tsconfig-paths": "4.2.0",
"typescript": "5.3.3",
"uuid": "9.0.1",
"v-code-diff": "1.7.2",
"v-code-diff": "1.9.0",
"vite": "5.1.4",
"vue": "3.4.21",
"vuedraggable": "next"

108
pnpm-lock.yaml
View file

@ -120,14 +120,14 @@ importers:
specifier: 5.0.3
version: 5.0.3
'@nestjs/common':
specifier: 10.2.10
version: 10.2.10(reflect-metadata@0.1.14)(rxjs@7.8.1)
specifier: 10.3.3
version: 10.3.3(reflect-metadata@0.2.1)(rxjs@7.8.1)
'@nestjs/core':
specifier: 10.2.10
version: 10.2.10(@nestjs/common@10.2.10)(@nestjs/platform-express@10.3.3)(reflect-metadata@0.1.14)(rxjs@7.8.1)
specifier: 10.3.3
version: 10.3.3(@nestjs/common@10.3.3)(@nestjs/platform-express@10.3.3)(reflect-metadata@0.2.1)(rxjs@7.8.1)
'@nestjs/testing':
specifier: 10.2.10
version: 10.2.10(@nestjs/common@10.2.10)(@nestjs/core@10.2.10)(@nestjs/platform-express@10.3.3)
specifier: 10.3.3
version: 10.3.3(@nestjs/common@10.3.3)(@nestjs/core@10.3.3)(@nestjs/platform-express@10.3.3)
'@simplewebauthn/server':
specifier: 9.0.3
version: 9.0.3
@ -351,8 +351,8 @@ importers:
specifier: 0.1.4
version: 0.1.4
reflect-metadata:
specifier: 0.1.14
version: 0.1.14
specifier: 0.2.1
version: 0.2.1
rename:
specifier: 1.0.4
version: 1.0.4
@ -513,7 +513,7 @@ importers:
version: 1.0.0(@typescript-eslint/eslint-plugin@7.1.0)(@typescript-eslint/parser@7.1.0)(eslint-plugin-import@2.29.1)(eslint@8.57.0)
'@nestjs/platform-express':
specifier: 10.3.3
version: 10.3.3(@nestjs/common@10.2.10)(@nestjs/core@10.2.10)
version: 10.3.3(@nestjs/common@10.3.3)(@nestjs/core@10.3.3)
'@simplewebauthn/types':
specifier: 9.0.1
version: 9.0.1
@ -725,8 +725,8 @@ importers:
specifier: 0.0.1
version: 0.0.1
canvas-confetti:
specifier: 1.6.1
version: 1.6.1
specifier: 1.9.2
version: 1.9.2
chart.js:
specifier: 4.4.2
version: 4.4.2
@ -806,8 +806,8 @@ importers:
specifier: 1.71.1
version: 1.71.1
shiki:
specifier: 1.0.0-beta.3
version: 1.0.0-beta.3
specifier: 1.1.7
version: 1.1.7
strict-event-emitter-types:
specifier: 2.0.0
version: 2.0.0
@ -815,8 +815,8 @@ importers:
specifier: 3.1.0
version: 3.1.0
three:
specifier: 0.161.0
version: 0.161.0
specifier: 0.162.0
version: 0.162.0
throttle-debounce:
specifier: 5.0.0
version: 5.0.0
@ -836,8 +836,8 @@ importers:
specifier: 9.0.1
version: 9.0.1
v-code-diff:
specifier: 1.7.2
version: 1.7.2(vue@3.4.21)
specifier: 1.9.0
version: 1.9.0(vue@3.4.21)
vite:
specifier: 5.1.4
version: 5.1.4(@types/node@20.11.22)(sass@1.71.1)(terser@5.28.1)
@ -4861,12 +4861,12 @@ packages:
tar-fs: 2.1.1
dev: true
/@nestjs/common@10.2.10(reflect-metadata@0.1.14)(rxjs@7.8.1):
resolution: {integrity: sha512-fwAk931rjW8CNH2Mgwawq/7HWHH1dxkOLdcgs7U52ddLk8CtHXjejm1cbNahewlSbNhvlOl7y1STLHutE6sUqw==}
/@nestjs/common@10.3.3(reflect-metadata@0.2.1)(rxjs@7.8.1):
resolution: {integrity: sha512-LAkTe8/CF0uNWM0ecuDwUNTHCi1lVSITmmR4FQ6Ftz1E7ujQCnJ5pMRzd8JRN14vdBkxZZ8VbVF0BDUKoKNxMQ==}
peerDependencies:
class-transformer: '*'
class-validator: '*'
reflect-metadata: ^0.1.12
reflect-metadata: ^0.1.12 || ^0.2.0
rxjs: ^7.1.0
peerDependenciesMeta:
class-transformer:
@ -4875,20 +4875,20 @@ packages:
optional: true
dependencies:
iterare: 1.2.1
reflect-metadata: 0.1.14
reflect-metadata: 0.2.1
rxjs: 7.8.1
tslib: 2.6.2
uid: 2.0.2
/@nestjs/core@10.2.10(@nestjs/common@10.2.10)(@nestjs/platform-express@10.3.3)(reflect-metadata@0.1.14)(rxjs@7.8.1):
resolution: {integrity: sha512-+ckOI6BPi2ZMHikT9MCG4ctHDc4OnjhoIytrn7f2AYMMXI4bnutJhqyQKc30VDka5x3Wq6QAD57pgSP7y+JjJg==}
/@nestjs/core@10.3.3(@nestjs/common@10.3.3)(@nestjs/platform-express@10.3.3)(reflect-metadata@0.2.1)(rxjs@7.8.1):
resolution: {integrity: sha512-kxJWggQAPX3RuZx9JVec69eSLaYLNIox2emkZJpfBJ5Qq7cAq7edQIt1r4LGjTKq6kFubNTPsqhWf5y7yFRBPw==}
requiresBuild: true
peerDependencies:
'@nestjs/common': ^10.0.0
'@nestjs/microservices': ^10.0.0
'@nestjs/platform-express': ^10.0.0
'@nestjs/websockets': ^10.0.0
reflect-metadata: ^0.1.12
reflect-metadata: ^0.1.12 || ^0.2.0
rxjs: ^7.1.0
peerDependenciesMeta:
'@nestjs/microservices':
@ -4898,27 +4898,27 @@ packages:
'@nestjs/websockets':
optional: true
dependencies:
'@nestjs/common': 10.2.10(reflect-metadata@0.1.14)(rxjs@7.8.1)
'@nestjs/platform-express': 10.3.3(@nestjs/common@10.2.10)(@nestjs/core@10.2.10)
'@nestjs/common': 10.3.3(reflect-metadata@0.2.1)(rxjs@7.8.1)
'@nestjs/platform-express': 10.3.3(@nestjs/common@10.3.3)(@nestjs/core@10.3.3)
'@nuxtjs/opencollective': 0.3.2
fast-safe-stringify: 2.1.1
iterare: 1.2.1
path-to-regexp: 3.2.0
reflect-metadata: 0.1.14
reflect-metadata: 0.2.1
rxjs: 7.8.1
tslib: 2.6.2
uid: 2.0.2
transitivePeerDependencies:
- encoding
/@nestjs/platform-express@10.3.3(@nestjs/common@10.2.10)(@nestjs/core@10.2.10):
/@nestjs/platform-express@10.3.3(@nestjs/common@10.3.3)(@nestjs/core@10.3.3):
resolution: {integrity: sha512-GGKSEU48Os7nYFIsUM0nutuFUGn5AbeP8gzFBiBCAtiuJWrXZXpZ58pMBYxAbMf7IrcOZFInHEukjHGAQU0OZw==}
peerDependencies:
'@nestjs/common': ^10.0.0
'@nestjs/core': ^10.0.0
dependencies:
'@nestjs/common': 10.2.10(reflect-metadata@0.1.14)(rxjs@7.8.1)
'@nestjs/core': 10.2.10(@nestjs/common@10.2.10)(@nestjs/platform-express@10.3.3)(reflect-metadata@0.1.14)(rxjs@7.8.1)
'@nestjs/common': 10.3.3(reflect-metadata@0.2.1)(rxjs@7.8.1)
'@nestjs/core': 10.3.3(@nestjs/common@10.3.3)(@nestjs/platform-express@10.3.3)(reflect-metadata@0.2.1)(rxjs@7.8.1)
body-parser: 1.20.2
cors: 2.8.5
express: 4.18.2
@ -4927,8 +4927,8 @@ packages:
transitivePeerDependencies:
- supports-color
/@nestjs/testing@10.2.10(@nestjs/common@10.2.10)(@nestjs/core@10.2.10)(@nestjs/platform-express@10.3.3):
resolution: {integrity: sha512-IVLUnPz/+fkBtPATYfqTIP+phN9yjkXejmj+JyhmcfPJZpxBmD1i9VSMqa4u54l37j0xkGPscQ0IXpbhqMYUKw==}
/@nestjs/testing@10.3.3(@nestjs/common@10.3.3)(@nestjs/core@10.3.3)(@nestjs/platform-express@10.3.3):
resolution: {integrity: sha512-kX20GfjAImL5grd/i69uD/x7sc00BaqGcP2dRG3ilqshQUuy5DOmspLCr3a2C8xmVU7kzK4spT0oTxhe6WcCAA==}
peerDependencies:
'@nestjs/common': ^10.0.0
'@nestjs/core': ^10.0.0
@ -4940,9 +4940,9 @@ packages:
'@nestjs/platform-express':
optional: true
dependencies:
'@nestjs/common': 10.2.10(reflect-metadata@0.1.14)(rxjs@7.8.1)
'@nestjs/core': 10.2.10(@nestjs/common@10.2.10)(@nestjs/platform-express@10.3.3)(reflect-metadata@0.1.14)(rxjs@7.8.1)
'@nestjs/platform-express': 10.3.3(@nestjs/common@10.2.10)(@nestjs/core@10.2.10)
'@nestjs/common': 10.3.3(reflect-metadata@0.2.1)(rxjs@7.8.1)
'@nestjs/core': 10.3.3(@nestjs/common@10.3.3)(@nestjs/platform-express@10.3.3)(reflect-metadata@0.2.1)(rxjs@7.8.1)
'@nestjs/platform-express': 10.3.3(@nestjs/common@10.3.3)(@nestjs/core@10.3.3)
tslib: 2.6.2
dev: false
@ -5319,8 +5319,8 @@ packages:
string-argv: 0.3.1
dev: true
/@shikijs/core@1.0.0-beta.3:
resolution: {integrity: sha512-SCwPom2Wn8XxNlEeqdzycU93SKgzYeVsedjqDsgZaz4XiiPpZUzlHt2NAEQTwTnPcHNZapZ6vbkwJ8P11ggL3Q==}
/@shikijs/core@1.1.7:
resolution: {integrity: sha512-gTYLUIuD1UbZp/11qozD3fWpUTuMqPSf3svDMMrL0UmlGU7D9dPw/V1FonwAorCUJBltaaESxq90jrSjQyGixg==}
dev: false
/@sideway/address@4.1.4:
@ -9461,8 +9461,8 @@ packages:
resolution: {integrity: sha512-0CNTVCLZggSh7bc5VkX5WWPWO+cyZbNd07IHIsSXLia/eAq+r836hgk+8BKoEh7949Mda87VUOitx5OddVj64A==}
dev: false
/canvas-confetti@1.6.1:
resolution: {integrity: sha512-CgGR5DL9+dkne4AwcpvWQc0LIQq43yDIxlwdZcyrq3yklricNfuPHoOSoM6Ya7yCQ+sXmZ2iNV2feiKjVG8C1g==}
/canvas-confetti@1.9.2:
resolution: {integrity: sha512-6Xi7aHHzKwxZsem4mCKoqP6YwUG3HamaHHAlz1hTNQPCqXhARFpSXnkC9TWlahHY5CG6hSL5XexNjxK8irVErg==}
dev: false
/caseless@0.12.0:
@ -12488,8 +12488,8 @@ packages:
resolution: {integrity: sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==}
dev: false
/highlight.js@11.8.0:
resolution: {integrity: sha512-MedQhoqVdr0U6SSnWPzfiadUcDHfN/Wzq25AkXiQv9oiOO/sG0S7XkvpFIqWBl9Yq1UYyYOOVORs5UW2XlPyzg==}
/highlight.js@11.9.0:
resolution: {integrity: sha512-fJ7cW7fQGCYAkgv4CPfwFHrfd/cLS4Hau96JuJ+ZTOWhjnhoeN1ub1tFmALm/+lW5z4WCAuAV9bm05AP0mS6Gw==}
engines: {node: '>=12.0.0'}
dev: false
@ -17098,12 +17098,8 @@ packages:
redis-errors: 1.2.0
dev: false
/reflect-metadata@0.1.14:
resolution: {integrity: sha512-ZhYeb6nRaXCfhnndflDK8qI6ZQ/YcWZCISRAWICW9XYqMUwjZM9Z0DveWX/ABN01oxSHwVxKQmxeYZSsm0jh5A==}
/reflect-metadata@0.2.1:
resolution: {integrity: sha512-i5lLI6iw9AU3Uu4szRNPPEkomnkjRTaVt9hy/bn5g/oSzekBSMeLZblcjP74AW0vBabqERLLIrz+gR8QYR54Tw==}
dev: false
/regenerate-unicode-properties@10.1.0:
resolution: {integrity: sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==}
@ -17657,10 +17653,10 @@ packages:
resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
engines: {node: '>=8'}
/shiki@1.0.0-beta.3:
resolution: {integrity: sha512-z7cHTNSSvwGx2DfeLwjSNLo+HcVxifgNIzLm6Ye52eXcIwNHXT0wHbhy7FDOKSKveuEHBwt9opfj3Hoc8LE1Yg==}
/shiki@1.1.7:
resolution: {integrity: sha512-9kUTMjZtcPH3i7vHunA6EraTPpPOITYTdA5uMrvsJRexktqP0s7P3s9HVK80b4pP42FRVe03D7fT3NmJv2yYhw==}
dependencies:
'@shikijs/core': 1.0.0-beta.3
'@shikijs/core': 1.1.7
dev: false
/side-channel@1.0.4:
@ -18495,8 +18491,8 @@ packages:
real-require: 0.2.0
dev: false
/three@0.161.0:
resolution: {integrity: sha512-LC28VFtjbOyEu5b93K0bNRLw1rQlMJ85lilKsYj6dgTu+7i17W+JCCEbvrpmNHF1F3NAUqDSWq50UD7w9H2xQw==}
/three@0.162.0:
resolution: {integrity: sha512-xfCYj4RnlozReCmUd+XQzj6/5OjDNHBy5nT6rVwrOKGENAvpXe2z1jL+DZYaMu4/9pNsjH/4Os/VvS9IrH7IOQ==}
dev: false
/throttle-debounce@5.0.0:
@ -19175,8 +19171,8 @@ packages:
resolution: {integrity: sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==}
hasBin: true
/v-code-diff@1.7.2(vue@3.4.21):
resolution: {integrity: sha512-y+q8ZHf8GfphYLhcZbjAKcId/h6vZujS71Ryq5u+dI6Jg4ZLTdLrBNVSzYpHywHSSFFfBMdilm6XvVryEaH4+A==}
/v-code-diff@1.9.0(vue@3.4.21):
resolution: {integrity: sha512-alg6krCxFvwTob/rJq+3LzjdIbLb/ni8tS8YmBbI0wckOkbJuN1cShFJ6XEkm82tMgpv5NYEeWLEWhggeV7BDg==}
requiresBuild: true
peerDependencies:
'@vue/composition-api': ^1.4.9
@ -19187,9 +19183,9 @@ packages:
dependencies:
diff: 5.1.0
diff-match-patch: 1.0.5
highlight.js: 11.8.0
highlight.js: 11.9.0
vue: 3.4.21(typescript@5.3.3)
vue-demi: 0.13.11(vue@3.4.21)
vue-demi: 0.14.7(vue@3.4.21)
dev: false
/v8-to-istanbul@9.2.0:
@ -19444,8 +19440,8 @@ packages:
resolution: {integrity: sha512-6bnLkn8O0JJyiFSIF0EfCogzeqNXpnjJ0vW/SZzNHfe6sPx30lTtTXlE5TFs2qhJlAtDFybStVNpL73cPe3OMQ==}
dev: true
/vue-demi@0.13.11(vue@3.4.21):
resolution: {integrity: sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==}
/vue-demi@0.14.7(vue@3.4.21):
resolution: {integrity: sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA==}
engines: {node: '>=12'}
hasBin: true
requiresBuild: true