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' into mkjs-n

This commit is contained in:
tamaina 2023-05-02 21:19:38 +09:00 committed by GitHub
parent e9355bf918 43593603f1
commit 6c53d1fdb7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 1213 additions and 1134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
package.json
View File

@ -56,11 +56,11 @@
"devDependencies": { "devDependencies": {
"@types/gulp": "4.0.10", "@types/gulp": "4.0.10",
"@types/gulp-rename": "2.0.1", "@types/gulp-rename": "2.0.1",
"@typescript-eslint/eslint-plugin": "5.59.0", "@typescript-eslint/eslint-plugin": "5.59.2",
"@typescript-eslint/parser": "5.59.0", "@typescript-eslint/parser": "5.59.2",
"cross-env": "7.0.3", "cross-env": "7.0.3",
"cypress": "12.10.0", "cypress": "12.11.0",
"eslint": "8.38.0", "eslint": "8.39.0",
"start-server-and-test": "2.0.0" "start-server-and-test": "2.0.0"
}, },
"optionalDependencies": { "optionalDependencies": {

68
packages/backend/package.json
View File

@ -23,26 +23,26 @@
}, },
"optionalDependencies": { "optionalDependencies": {
"@swc/core-android-arm64": "1.3.11", "@swc/core-android-arm64": "1.3.11",
"@swc/core-darwin-arm64": "1.3.51", "@swc/core-darwin-arm64": "1.3.56",
"@swc/core-darwin-x64": "1.3.51", "@swc/core-darwin-x64": "1.3.56",
"@swc/core-linux-arm-gnueabihf": "1.3.51", "@swc/core-linux-arm-gnueabihf": "1.3.56",
"@swc/core-linux-arm64-gnu": "1.3.51", "@swc/core-linux-arm64-gnu": "1.3.56",
"@swc/core-linux-arm64-musl": "1.3.51", "@swc/core-linux-arm64-musl": "1.3.56",
"@swc/core-linux-x64-gnu": "1.3.51", "@swc/core-linux-x64-gnu": "1.3.56",
"@swc/core-linux-x64-musl": "1.3.51", "@swc/core-linux-x64-musl": "1.3.56",
"@swc/core-win32-arm64-msvc": "1.3.51", "@swc/core-win32-arm64-msvc": "1.3.56",
"@swc/core-win32-ia32-msvc": "1.3.51", "@swc/core-win32-ia32-msvc": "1.3.56",
"@swc/core-win32-x64-msvc": "1.3.51", "@swc/core-win32-x64-msvc": "1.3.56",
"@tensorflow/tfjs": "4.4.0", "@tensorflow/tfjs": "4.4.0",
"@tensorflow/tfjs-node": "4.4.0" "@tensorflow/tfjs-node": "4.4.0"
}, },
"dependencies": { "dependencies": {
"@aws-sdk/client-s3": "3.315.0", "@aws-sdk/client-s3": "3.321.1",
"@aws-sdk/lib-storage": "3.315.0", "@aws-sdk/lib-storage": "3.321.1",
"@aws-sdk/node-http-handler": "3.310.0", "@aws-sdk/node-http-handler": "3.321.1",
"@bull-board/api": "5.0.1", "@bull-board/api": "5.1.2",
"@bull-board/fastify": "5.0.1", "@bull-board/fastify": "5.1.2",
"@bull-board/ui": "5.0.1", "@bull-board/ui": "5.1.2",
"@discordapp/twemoji": "14.1.2", "@discordapp/twemoji": "14.1.2",
"@fastify/accepts": "4.1.0", "@fastify/accepts": "4.1.0",
"@fastify/cookie": "8.3.0", "@fastify/cookie": "8.3.0",
@ -57,7 +57,7 @@
"@peertube/http-signature": "1.7.0", "@peertube/http-signature": "1.7.0",
"@sinonjs/fake-timers": "10.0.2", "@sinonjs/fake-timers": "10.0.2",
"@swc/cli": "0.1.62", "@swc/cli": "0.1.62",
"@swc/core": "1.3.51", "@swc/core": "1.3.56",
"accepts": "1.3.8", "accepts": "1.3.8",
"ajv": "8.12.0", "ajv": "8.12.0",
"archiver": "5.3.1", "archiver": "5.3.1",
@ -73,16 +73,16 @@
"cli-highlight": "2.1.11", "cli-highlight": "2.1.11",
"color-convert": "2.0.1", "color-convert": "2.0.1",
"content-disposition": "0.5.4", "content-disposition": "0.5.4",
"date-fns": "2.29.3", "date-fns": "2.30.0",
"deep-email-validator": "0.1.21", "deep-email-validator": "0.1.21",
"escape-regexp": "0.0.1", "escape-regexp": "0.0.1",
"fastify": "4.15.0", "fastify": "4.17.0",
"feed": "4.2.2", "feed": "4.2.2",
"file-type": "18.2.1", "file-type": "18.3.0",
"fluent-ffmpeg": "2.1.2", "fluent-ffmpeg": "2.1.2",
"form-data": "4.0.0", "form-data": "4.0.0",
"got": "12.6.0", "got": "12.6.0",
"happy-dom": "9.8.2", "happy-dom": "9.10.2",
"hpagent": "1.2.0", "hpagent": "1.2.0",
"ioredis": "5.3.2", "ioredis": "5.3.2",
"ip-cidr": "3.1.0", "ip-cidr": "3.1.0",
@ -91,7 +91,7 @@
"jsdom": "21.1.1", "jsdom": "21.1.1",
"json5": "2.2.3", "json5": "2.2.3",
"jsonld": "8.1.1", "jsonld": "8.1.1",
"jsrsasign": "10.8.2", "jsrsasign": "10.8.6",
"mfm-js": "0.23.3", "mfm-js": "0.23.3",
"mime-types": "2.1.35", "mime-types": "2.1.35",
"misskey-js": "workspace:*", "misskey-js": "workspace:*",
@ -111,7 +111,7 @@
"pug": "3.0.2", "pug": "3.0.2",
"punycode": "2.3.0", "punycode": "2.3.0",
"pureimage": "0.3.17", "pureimage": "0.3.17",
"qrcode": "1.5.1", "qrcode": "1.5.3",
"random-seed": "0.3.0", "random-seed": "0.3.0",
"ratelimiter": "3.4.1", "ratelimiter": "3.4.1",
"re2": "1.18.0", "re2": "1.18.0",
@ -120,12 +120,12 @@
"rename": "1.0.4", "rename": "1.0.4",
"rndstr": "1.0.0", "rndstr": "1.0.0",
"rss-parser": "3.13.0", "rss-parser": "3.13.0",
"rxjs": "7.8.0", "rxjs": "7.8.1",
"s-age": "1.1.2", "s-age": "1.1.2",
"sanitize-html": "2.10.0", "sanitize-html": "2.10.0",
"seedrandom": "3.0.5", "seedrandom": "3.0.5",
"semver": "7.3.8", "semver": "7.5.0",
"sharp": "0.32.0", "sharp": "0.32.1",
"sharp-read-bmp": "github:misskey-dev/sharp-read-bmp", "sharp-read-bmp": "github:misskey-dev/sharp-read-bmp",
"strict-event-emitter-types": "2.0.0", "strict-event-emitter-types": "2.0.0",
"stringz": "2.1.0", "stringz": "2.1.0",
@ -133,7 +133,7 @@
"systeminformation": "5.17.12", "systeminformation": "5.17.12",
"tinycolor2": "1.6.0", "tinycolor2": "1.6.0",
"tmp": "0.2.1", "tmp": "0.2.1",
"tsc-alias": "1.8.5", "tsc-alias": "1.8.6",
"tsconfig-paths": "4.2.0", "tsconfig-paths": "4.2.0",
"twemoji-parser": "14.0.0", "twemoji-parser": "14.0.0",
"typeorm": "0.3.15", "typeorm": "0.3.15",
@ -142,7 +142,7 @@
"unzipper": "0.10.11", "unzipper": "0.10.11",
"uuid": "9.0.0", "uuid": "9.0.0",
"vary": "1.1.2", "vary": "1.1.2",
"web-push": "3.5.0", "web-push": "3.6.1",
"websocket": "1.0.34", "websocket": "1.0.34",
"ws": "8.13.0", "ws": "8.13.0",
"xev": "3.0.2" "xev": "3.0.2"
@ -159,13 +159,13 @@
"@types/content-disposition": "0.5.5", "@types/content-disposition": "0.5.5",
"@types/escape-regexp": "0.0.1", "@types/escape-regexp": "0.0.1",
"@types/fluent-ffmpeg": "2.1.21", "@types/fluent-ffmpeg": "2.1.21",
"@types/jest": "29.5.0", "@types/jest": "29.5.1",
"@types/js-yaml": "4.0.5", "@types/js-yaml": "4.0.5",
"@types/jsdom": "21.1.1", "@types/jsdom": "21.1.1",
"@types/jsonld": "1.5.8", "@types/jsonld": "1.5.8",
"@types/jsrsasign": "10.5.8", "@types/jsrsasign": "10.5.8",
"@types/mime-types": "2.1.1", "@types/mime-types": "2.1.1",
"@types/node": "18.15.11", "@types/node": "18.16.3",
"@types/node-fetch": "3.0.3", "@types/node-fetch": "3.0.3",
"@types/nodemailer": "6.4.7", "@types/nodemailer": "6.4.7",
"@types/oauth": "0.9.1", "@types/oauth": "0.9.1",
@ -179,7 +179,7 @@
"@types/rename": "1.0.4", "@types/rename": "1.0.4",
"@types/sanitize-html": "2.9.0", "@types/sanitize-html": "2.9.0",
"@types/semver": "7.3.13", "@types/semver": "7.3.13",
"@types/sharp": "0.31.1", "@types/sharp": "0.32.0",
"@types/sinonjs__fake-timers": "8.1.2", "@types/sinonjs__fake-timers": "8.1.2",
"@types/tinycolor2": "1.4.3", "@types/tinycolor2": "1.4.3",
"@types/tmp": "0.2.3", "@types/tmp": "0.2.3",
@ -189,11 +189,11 @@
"@types/web-push": "3.3.2", "@types/web-push": "3.3.2",
"@types/websocket": "1.0.5", "@types/websocket": "1.0.5",
"@types/ws": "8.5.4", "@types/ws": "8.5.4",
"@typescript-eslint/eslint-plugin": "5.59.0", "@typescript-eslint/eslint-plugin": "5.59.2",
"@typescript-eslint/parser": "5.59.0", "@typescript-eslint/parser": "5.59.2",
"aws-sdk-client-mock": "^2.1.1", "aws-sdk-client-mock": "^2.1.1",
"cross-env": "7.0.3", "cross-env": "7.0.3",
"eslint": "8.38.0", "eslint": "8.39.0",
"eslint-plugin-import": "2.27.5", "eslint-plugin-import": "2.27.5",
"execa": "6.1.0", "execa": "6.1.0",
"jest": "29.5.0", "jest": "29.5.0",

2
packages/backend/src/models/json-schema/user.ts
View File

@ -148,6 +148,7 @@ export const packedUserDetailedNotMeOnlySchema = {
fields: { fields: {
type: 'array', type: 'array',
nullable: false, optional: false, nullable: false, optional: false,
maxItems: 16,
items: { items: {
type: 'object', type: 'object',
nullable: false, optional: false, nullable: false, optional: false,
@ -161,7 +162,6 @@ export const packedUserDetailedNotMeOnlySchema = {
nullable: false, optional: false, nullable: false, optional: false,
}, },
}, },
maxLength: 4,
}, },
}, },
followersCount: { followersCount: {

2
packages/backend/src/server/web/views/base.pug
View File

@ -36,7 +36,7 @@ html
link(rel='prefetch' href='https://xn--931a.moe/assets/not-found.jpg') link(rel='prefetch' href='https://xn--931a.moe/assets/not-found.jpg')
link(rel='prefetch' href='https://xn--931a.moe/assets/error.jpg') link(rel='prefetch' href='https://xn--931a.moe/assets/error.jpg')
//- https://github.com/misskey-dev/misskey/issues/9842 //- https://github.com/misskey-dev/misskey/issues/9842
link(rel='stylesheet' href='/assets/tabler-icons/tabler-icons.min.css?v2.12.0') link(rel='stylesheet' href='/assets/tabler-icons/tabler-icons.min.css?v2.17.0')
link(rel='modulepreload' href=`/vite/${clientEntry.file}`) link(rel='modulepreload' href=`/vite/${clientEntry.file}`)
if !config.clientManifestExists if !config.clientManifestExists

70
packages/frontend/package.json
View File

@ -20,8 +20,8 @@
"@rollup/plugin-replace": "^5.0.2", "@rollup/plugin-replace": "^5.0.2",
"@rollup/pluginutils": "5.0.2", "@rollup/pluginutils": "5.0.2",
"@syuilo/aiscript": "0.13.1", "@syuilo/aiscript": "0.13.1",
"@tabler/icons-webfont": "2.16.0", "@tabler/icons-webfont": "2.17.0",
"@vitejs/plugin-vue": "4.1.0", "@vitejs/plugin-vue": "4.2.1",
"@vue-macros/reactivity-transform": "^0.3.5", "@vue-macros/reactivity-transform": "^0.3.5",
"@vue/compiler-sfc": "3.2.47", "@vue/compiler-sfc": "3.2.47",
"autosize": "5.0.2", "autosize": "5.0.2",
@ -29,7 +29,7 @@
"broadcast-channel": "4.20.2", "broadcast-channel": "4.20.2",
"browser-image-resizer": "github:misskey-dev/browser-image-resizer#v2.2.1-misskey.3", "browser-image-resizer": "github:misskey-dev/browser-image-resizer#v2.2.1-misskey.3",
"canvas-confetti": "1.6.0", "canvas-confetti": "1.6.0",
"chart.js": "4.2.1", "chart.js": "4.3.0",
"chartjs-adapter-date-fns": "3.0.0", "chartjs-adapter-date-fns": "3.0.0",
"chartjs-chart-matrix": "2.0.1", "chartjs-chart-matrix": "2.0.1",
"chartjs-plugin-gradient": "0.6.1", "chartjs-plugin-gradient": "0.6.1",
@ -37,9 +37,9 @@
"chromatic": "6.17.3", "chromatic": "6.17.3",
"compare-versions": "5.0.1", "compare-versions": "5.0.1",
"cropperjs": "2.0.0-beta.2", "cropperjs": "2.0.0-beta.2",
"date-fns": "2.29.3", "date-fns": "2.30.0",
"escape-regexp": "0.0.1", "escape-regexp": "0.0.1",
"eventemitter3": "5.0.0", "eventemitter3": "5.0.1",
"gsap": "3.11.5", "gsap": "3.11.5",
"idb-keyval": "6.2.0", "idb-keyval": "6.2.0",
"insert-text-at-cursor": "0.3.0", "insert-text-at-cursor": "0.3.0",
@ -53,10 +53,10 @@
"punycode": "2.3.0", "punycode": "2.3.0",
"querystring": "0.2.1", "querystring": "0.2.1",
"rndstr": "1.0.0", "rndstr": "1.0.0",
"rollup": "3.20.6", "rollup": "3.21.3",
"s-age": "1.1.2", "s-age": "1.1.2",
"sanitize-html": "2.10.0", "sanitize-html": "2.10.0",
"sass": "1.62.0", "sass": "1.62.1",
"seedrandom": "3.0.5", "seedrandom": "3.0.5",
"strict-event-emitter-types": "2.0.0", "strict-event-emitter-types": "2.0.0",
"syuilo-password-strength": "0.0.1", "syuilo-password-strength": "0.0.1",
@ -64,37 +64,37 @@
"three": "0.151.3", "three": "0.151.3",
"throttle-debounce": "5.0.0", "throttle-debounce": "5.0.0",
"tinycolor2": "1.6.0", "tinycolor2": "1.6.0",
"tsc-alias": "1.8.5", "tsc-alias": "1.8.6",
"tsconfig-paths": "4.2.0", "tsconfig-paths": "4.2.0",
"twemoji-parser": "14.0.0", "twemoji-parser": "14.0.0",
"typescript": "5.0.4", "typescript": "5.0.4",
"uuid": "9.0.0", "uuid": "9.0.0",
"vanilla-tilt": "1.8.0", "vanilla-tilt": "1.8.0",
"vite": "4.2.2", "vite": "4.3.4",
"vue": "3.2.47", "vue": "3.2.47",
"vue-plyr": "7.0.0", "vue-plyr": "7.0.0",
"vue-prism-editor": "2.0.0-alpha.2", "vue-prism-editor": "2.0.0-alpha.2",
"vuedraggable": "next" "vuedraggable": "next"
}, },
"devDependencies": { "devDependencies": {
"@storybook/addon-actions": "7.0.6", "@storybook/addon-actions": "7.0.7",
"@storybook/addon-essentials": "7.0.6", "@storybook/addon-essentials": "7.0.7",
"@storybook/addon-interactions": "7.0.6", "@storybook/addon-interactions": "7.0.7",
"@storybook/addon-links": "7.0.6", "@storybook/addon-links": "7.0.7",
"@storybook/addon-storysource": "7.0.6", "@storybook/addon-storysource": "7.0.7",
"@storybook/addons": "7.0.6", "@storybook/addons": "7.0.7",
"@storybook/blocks": "7.0.6", "@storybook/blocks": "7.0.7",
"@storybook/core-events": "7.0.6", "@storybook/core-events": "7.0.7",
"@storybook/jest": "0.1.0", "@storybook/jest": "0.1.0",
"@storybook/manager-api": "7.0.6", "@storybook/manager-api": "7.0.7",
"@storybook/preview-api": "7.0.6", "@storybook/preview-api": "7.0.7",
"@storybook/react": "7.0.6", "@storybook/react": "7.0.7",
"@storybook/react-vite": "7.0.6", "@storybook/react-vite": "7.0.7",
"@storybook/testing-library": "0.1.0", "@storybook/testing-library": "0.1.0",
"@storybook/theming": "7.0.6", "@storybook/theming": "7.0.7",
"@storybook/types": "7.0.2", "@storybook/types": "7.0.7",
"@storybook/vue3": "7.0.6", "@storybook/vue3": "7.0.7",
"@storybook/vue3-vite": "7.0.6", "@storybook/vue3-vite": "7.0.7",
"@testing-library/jest-dom": "5.16.5", "@testing-library/jest-dom": "5.16.5",
"@testing-library/vue": "7.0.0", "@testing-library/vue": "7.0.0",
"@types/escape-regexp": "0.0.1", "@types/escape-regexp": "0.0.1",
@ -103,7 +103,7 @@
"@types/gulp-rename": "2.0.1", "@types/gulp-rename": "2.0.1",
"@types/matter-js": "0.18.2", "@types/matter-js": "0.18.2",
"@types/micromatch": "4.0.2", "@types/micromatch": "4.0.2",
"@types/node": "18.15.12", "@types/node": "18.16.3",
"@types/punycode": "2.1.0", "@types/punycode": "2.1.0",
"@types/sanitize-html": "2.9.0", "@types/sanitize-html": "2.9.0",
"@types/seedrandom": "3.0.5", "@types/seedrandom": "3.0.5",
@ -113,33 +113,33 @@
"@types/uuid": "9.0.1", "@types/uuid": "9.0.1",
"@types/websocket": "1.0.5", "@types/websocket": "1.0.5",
"@types/ws": "8.5.4", "@types/ws": "8.5.4",
"@typescript-eslint/eslint-plugin": "5.59.0", "@typescript-eslint/eslint-plugin": "5.59.2",
"@typescript-eslint/parser": "5.59.0", "@typescript-eslint/parser": "5.59.2",
"@vitest/coverage-c8": "0.30.1", "@vitest/coverage-c8": "0.30.1",
"@vue/runtime-core": "3.2.47", "@vue/runtime-core": "3.2.47",
"astring": "1.8.4", "astring": "1.8.4",
"chokidar-cli": "3.0.0", "chokidar-cli": "3.0.0",
"cross-env": "7.0.3", "cross-env": "7.0.3",
"cypress": "12.10.0", "cypress": "12.11.0",
"eslint": "8.38.0", "eslint": "8.39.0",
"eslint-plugin-import": "2.27.5", "eslint-plugin-import": "2.27.5",
"eslint-plugin-vue": "9.11.0", "eslint-plugin-vue": "9.11.0",
"fast-glob": "3.2.12", "fast-glob": "3.2.12",
"happy-dom": "9.8.4", "happy-dom": "9.10.2",
"micromatch": "3.1.10", "micromatch": "3.1.10",
"msw": "1.2.1", "msw": "1.2.1",
"msw-storybook-addon": "1.8.0", "msw-storybook-addon": "1.8.0",
"prettier": "2.8.7", "prettier": "2.8.8",
"react": "18.2.0", "react": "18.2.0",
"react-dom": "18.2.0", "react-dom": "18.2.0",
"start-server-and-test": "2.0.0", "start-server-and-test": "2.0.0",
"storybook": "7.0.6", "storybook": "7.0.7",
"storybook-addon-misskey-theme": "github:misskey-dev/storybook-addon-misskey-theme", "storybook-addon-misskey-theme": "github:misskey-dev/storybook-addon-misskey-theme",
"summaly": "github:misskey-dev/summaly", "summaly": "github:misskey-dev/summaly",
"vite-plugin-turbosnap": "^1.0.1", "vite-plugin-turbosnap": "1.0.2",
"vitest": "0.30.1", "vitest": "0.30.1",
"vitest-fetch-mock": "0.2.2", "vitest-fetch-mock": "0.2.2",
"vue-eslint-parser": "9.1.1", "vue-eslint-parser": "9.1.1",
"vue-tsc": "1.4.0" "vue-tsc": "1.6.3"
} }
} }

16
packages/misskey-js/package.json
View File

@ -20,13 +20,13 @@
"url": "git+https://github.com/misskey-dev/misskey.js.git" "url": "git+https://github.com/misskey-dev/misskey.js.git"
}, },
"devDependencies": { "devDependencies": {
"@microsoft/api-extractor": "7.34.4", "@microsoft/api-extractor": "7.34.7",
"@swc/jest": "0.2.26", "@swc/jest": "0.2.26",
"@types/jest": "29.5.0", "@types/jest": "29.5.1",
"@types/node": "18.15.11", "@types/node": "18.16.3",
"@typescript-eslint/eslint-plugin": "5.59.0", "@typescript-eslint/eslint-plugin": "5.59.2",
"@typescript-eslint/parser": "5.59.0", "@typescript-eslint/parser": "5.59.2",
"eslint": "8.38.0", "eslint": "8.39.0",
"jest": "29.5.0", "jest": "29.5.0",
"jest-fetch-mock": "3.0.3", "jest-fetch-mock": "3.0.3",
"jest-websocket-mock": "2.4.0", "jest-websocket-mock": "2.4.0",
@ -39,8 +39,8 @@
], ],
"dependencies": { "dependencies": {
"@swc/cli": "0.1.62", "@swc/cli": "0.1.62",
"@swc/core": "1.3.51", "@swc/core": "1.3.56",
"eventemitter3": "5.0.0", "eventemitter3": "5.0.1",
"reconnecting-websocket": "4.4.0" "reconnecting-websocket": "4.4.0"
} }
} }

6
packages/sw/package.json
View File

@ -9,14 +9,14 @@
"lint": "pnpm typecheck && pnpm eslint" "lint": "pnpm typecheck && pnpm eslint"
}, },
"dependencies": { "dependencies": {
"esbuild": "0.17.17", "esbuild": "0.17.18",
"idb-keyval": "6.2.0", "idb-keyval": "6.2.0",
"misskey-js": "workspace:*" "misskey-js": "workspace:*"
}, },
"devDependencies": { "devDependencies": {
"@typescript-eslint/parser": "5.59.0", "@typescript-eslint/parser": "5.59.2",
"@typescript/lib-webworker": "npm:@types/serviceworker@0.0.67", "@typescript/lib-webworker": "npm:@types/serviceworker@0.0.67",
"eslint": "8.38.0", "eslint": "8.39.0",
"eslint-plugin-import": "2.27.5", "eslint-plugin-import": "2.27.5",
"typescript": "5.0.4" "typescript": "5.0.4"
} }

2175
pnpm-lock.yaml
View File

File diff suppressed because it is too large Load Diff