Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
This commit is contained in:
commit
d268b0e5bb
3 changed files with 66 additions and 66 deletions
|
@ -30,8 +30,6 @@
|
||||||
"cleanall": "npm run clean-all"
|
"cleanall": "npm run clean-all"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@types/gulp": "4.0.9",
|
|
||||||
"@types/gulp-rename": "2.0.1",
|
|
||||||
"execa": "5.1.1",
|
"execa": "5.1.1",
|
||||||
"gulp": "4.0.2",
|
"gulp": "4.0.2",
|
||||||
"gulp-cssnano": "2.1.3",
|
"gulp-cssnano": "2.1.3",
|
||||||
|
@ -41,6 +39,8 @@
|
||||||
"js-yaml": "4.1.0"
|
"js-yaml": "4.1.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
"@types/gulp": "4.0.9",
|
||||||
|
"@types/gulp-rename": "2.0.1",
|
||||||
"@typescript-eslint/parser": "5.18.0",
|
"@typescript-eslint/parser": "5.18.0",
|
||||||
"cross-env": "7.0.3",
|
"cross-env": "7.0.3",
|
||||||
"cypress": "9.5.3",
|
"cypress": "9.5.3",
|
||||||
|
|
|
@ -21,49 +21,6 @@
|
||||||
"@koa/router": "9.0.1",
|
"@koa/router": "9.0.1",
|
||||||
"@sinonjs/fake-timers": "9.1.1",
|
"@sinonjs/fake-timers": "9.1.1",
|
||||||
"@syuilo/aiscript": "0.11.1",
|
"@syuilo/aiscript": "0.11.1",
|
||||||
"@types/bcryptjs": "2.4.2",
|
|
||||||
"@types/bull": "3.15.8",
|
|
||||||
"@types/cbor": "6.0.0",
|
|
||||||
"@types/escape-regexp": "0.0.1",
|
|
||||||
"@types/is-url": "1.2.30",
|
|
||||||
"@types/js-yaml": "4.0.5",
|
|
||||||
"@types/jsdom": "16.2.14",
|
|
||||||
"@types/jsonld": "1.5.6",
|
|
||||||
"@types/koa": "2.13.4",
|
|
||||||
"@types/koa-bodyparser": "4.3.7",
|
|
||||||
"@types/koa-cors": "0.0.2",
|
|
||||||
"@types/koa-favicon": "2.0.21",
|
|
||||||
"@types/koa-logger": "3.1.2",
|
|
||||||
"@types/koa-mount": "4.0.1",
|
|
||||||
"@types/koa-send": "4.1.3",
|
|
||||||
"@types/koa-views": "7.0.0",
|
|
||||||
"@types/koa__cors": "3.1.1",
|
|
||||||
"@types/koa__multer": "2.0.4",
|
|
||||||
"@types/koa__router": "8.0.11",
|
|
||||||
"@types/mocha": "9.1.0",
|
|
||||||
"@types/node": "17.0.23",
|
|
||||||
"@types/node-fetch": "3.0.3",
|
|
||||||
"@types/nodemailer": "6.4.4",
|
|
||||||
"@types/oauth": "0.9.1",
|
|
||||||
"@types/parse5": "6.0.3",
|
|
||||||
"@types/portscanner": "2.1.1",
|
|
||||||
"@types/pug": "2.0.6",
|
|
||||||
"@types/punycode": "2.1.0",
|
|
||||||
"@types/qrcode": "1.4.2",
|
|
||||||
"@types/random-seed": "0.3.3",
|
|
||||||
"@types/ratelimiter": "3.4.3",
|
|
||||||
"@types/redis": "4.0.11",
|
|
||||||
"@types/rename": "1.0.4",
|
|
||||||
"@types/sanitize-html": "2.6.2",
|
|
||||||
"@types/sharp": "0.30.1",
|
|
||||||
"@types/sinonjs__fake-timers": "8.1.2",
|
|
||||||
"@types/speakeasy": "2.0.7",
|
|
||||||
"@types/tinycolor2": "1.4.3",
|
|
||||||
"@types/tmp": "0.2.3",
|
|
||||||
"@types/uuid": "8.3.4",
|
|
||||||
"@types/web-push": "3.3.2",
|
|
||||||
"@types/websocket": "1.0.5",
|
|
||||||
"@types/ws": "8.5.3",
|
|
||||||
"@typescript-eslint/eslint-plugin": "5.18.0",
|
"@typescript-eslint/eslint-plugin": "5.18.0",
|
||||||
"@typescript-eslint/parser": "5.18.0",
|
"@typescript-eslint/parser": "5.18.0",
|
||||||
"@bull-board/koa": "3.10.3",
|
"@bull-board/koa": "3.10.3",
|
||||||
|
@ -172,7 +129,50 @@
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@redocly/openapi-core": "1.0.0-beta.93",
|
"@redocly/openapi-core": "1.0.0-beta.93",
|
||||||
|
"@types/bcryptjs": "2.4.2",
|
||||||
|
"@types/bull": "3.15.8",
|
||||||
|
"@types/cbor": "6.0.0",
|
||||||
|
"@types/escape-regexp": "0.0.1",
|
||||||
"@types/fluent-ffmpeg": "2.1.20",
|
"@types/fluent-ffmpeg": "2.1.20",
|
||||||
|
"@types/is-url": "1.2.30",
|
||||||
|
"@types/js-yaml": "4.0.5",
|
||||||
|
"@types/jsdom": "16.2.14",
|
||||||
|
"@types/jsonld": "1.5.6",
|
||||||
|
"@types/koa": "2.13.4",
|
||||||
|
"@types/koa-bodyparser": "4.3.7",
|
||||||
|
"@types/koa-cors": "0.0.2",
|
||||||
|
"@types/koa-favicon": "2.0.21",
|
||||||
|
"@types/koa-logger": "3.1.2",
|
||||||
|
"@types/koa-mount": "4.0.1",
|
||||||
|
"@types/koa-send": "4.1.3",
|
||||||
|
"@types/koa-views": "7.0.0",
|
||||||
|
"@types/koa__cors": "3.1.1",
|
||||||
|
"@types/koa__multer": "2.0.4",
|
||||||
|
"@types/koa__router": "8.0.11",
|
||||||
|
"@types/mocha": "9.1.0",
|
||||||
|
"@types/node": "17.0.23",
|
||||||
|
"@types/node-fetch": "3.0.3",
|
||||||
|
"@types/nodemailer": "6.4.4",
|
||||||
|
"@types/oauth": "0.9.1",
|
||||||
|
"@types/parse5": "6.0.3",
|
||||||
|
"@types/portscanner": "2.1.1",
|
||||||
|
"@types/pug": "2.0.6",
|
||||||
|
"@types/punycode": "2.1.0",
|
||||||
|
"@types/qrcode": "1.4.2",
|
||||||
|
"@types/random-seed": "0.3.3",
|
||||||
|
"@types/ratelimiter": "3.4.3",
|
||||||
|
"@types/redis": "4.0.11",
|
||||||
|
"@types/rename": "1.0.4",
|
||||||
|
"@types/sanitize-html": "2.6.2",
|
||||||
|
"@types/sharp": "0.30.1",
|
||||||
|
"@types/sinonjs__fake-timers": "8.1.2",
|
||||||
|
"@types/speakeasy": "2.0.7",
|
||||||
|
"@types/tinycolor2": "1.4.3",
|
||||||
|
"@types/tmp": "0.2.3",
|
||||||
|
"@types/uuid": "8.3.4",
|
||||||
|
"@types/web-push": "3.3.2",
|
||||||
|
"@types/websocket": "1.0.5",
|
||||||
|
"@types/ws": "8.5.3",
|
||||||
"cross-env": "7.0.3",
|
"cross-env": "7.0.3",
|
||||||
"execa": "6.1.0"
|
"execa": "6.1.0"
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,27 +13,6 @@
|
||||||
"@discordapp/twemoji": "13.1.1",
|
"@discordapp/twemoji": "13.1.1",
|
||||||
"@fortawesome/fontawesome-free": "6.1.1",
|
"@fortawesome/fontawesome-free": "6.1.1",
|
||||||
"@syuilo/aiscript": "0.11.1",
|
"@syuilo/aiscript": "0.11.1",
|
||||||
"@types/escape-regexp": "0.0.1",
|
|
||||||
"@types/glob": "7.2.0",
|
|
||||||
"@types/gulp": "4.0.9",
|
|
||||||
"@types/gulp-rename": "2.0.1",
|
|
||||||
"@types/is-url": "1.2.30",
|
|
||||||
"@types/katex": "0.14.0",
|
|
||||||
"@types/matter-js": "0.17.7",
|
|
||||||
"@types/mocha": "9.1.0",
|
|
||||||
"@types/oauth": "0.9.1",
|
|
||||||
"@types/parse5": "6.0.3",
|
|
||||||
"@types/punycode": "2.1.0",
|
|
||||||
"@types/qrcode": "1.4.2",
|
|
||||||
"@types/random-seed": "0.3.3",
|
|
||||||
"@types/seedrandom": "3.0.2",
|
|
||||||
"@types/throttle-debounce": "2.1.0",
|
|
||||||
"@types/tinycolor2": "1.4.3",
|
|
||||||
"@types/uuid": "8.3.4",
|
|
||||||
"@types/webpack": "5.28.0",
|
|
||||||
"@types/webpack-stream": "3.2.12",
|
|
||||||
"@types/websocket": "1.0.5",
|
|
||||||
"@types/ws": "8.5.3",
|
|
||||||
"@typescript-eslint/parser": "5.18.0",
|
"@typescript-eslint/parser": "5.18.0",
|
||||||
"@vue/compiler-sfc": "3.2.31",
|
"@vue/compiler-sfc": "3.2.31",
|
||||||
"abort-controller": "3.0.0",
|
"abort-controller": "3.0.0",
|
||||||
|
@ -117,6 +96,27 @@
|
||||||
"ws": "8.5.0"
|
"ws": "8.5.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
"@types/escape-regexp": "0.0.1",
|
||||||
|
"@types/glob": "7.2.0",
|
||||||
|
"@types/gulp": "4.0.9",
|
||||||
|
"@types/gulp-rename": "2.0.1",
|
||||||
|
"@types/is-url": "1.2.30",
|
||||||
|
"@types/katex": "0.14.0",
|
||||||
|
"@types/matter-js": "0.17.7",
|
||||||
|
"@types/mocha": "9.1.0",
|
||||||
|
"@types/oauth": "0.9.1",
|
||||||
|
"@types/parse5": "6.0.3",
|
||||||
|
"@types/punycode": "2.1.0",
|
||||||
|
"@types/qrcode": "1.4.2",
|
||||||
|
"@types/random-seed": "0.3.3",
|
||||||
|
"@types/seedrandom": "3.0.2",
|
||||||
|
"@types/throttle-debounce": "2.1.0",
|
||||||
|
"@types/tinycolor2": "1.4.3",
|
||||||
|
"@types/uuid": "8.3.4",
|
||||||
|
"@types/webpack": "5.28.0",
|
||||||
|
"@types/webpack-stream": "3.2.12",
|
||||||
|
"@types/websocket": "1.0.5",
|
||||||
|
"@types/ws": "8.5.3",
|
||||||
"@typescript-eslint/eslint-plugin": "5.18.0",
|
"@typescript-eslint/eslint-plugin": "5.18.0",
|
||||||
"cross-env": "7.0.3",
|
"cross-env": "7.0.3",
|
||||||
"cypress": "9.5.3",
|
"cypress": "9.5.3",
|
||||||
|
|
Loading…
Reference in a new issue