Merge branch 'master' into l10n_master

1 files changed, 35 insertions, 40 deletions

diff --git a/package.json b/package.json
index 544dda6036..6b7f63d6c8 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "2.6.2",
-	"clientVersion": "1.0.5260",
+	"version": "2.10.0",
+	"clientVersion": "1.0.5406",
 	"codename": "nighthike",
 	"main": "./built/index.js",
 	"private": true,
@@ -31,13 +31,11 @@
 		"@prezzemolo/rap": "0.1.2",
 		"@prezzemolo/zip": "0.0.3",
 		"@types/bcryptjs": "2.4.1",
-		"@types/chai": "4.1.3",
-		"@types/chai-http": "3.0.4",
 		"@types/debug": "0.0.30",
 		"@types/deep-equal": "1.0.1",
-		"@types/elasticsearch": "5.0.22",
+		"@types/elasticsearch": "5.0.23",
 		"@types/eventemitter3": "2.0.2",
-		"@types/gm": "1.17.33",
+		"@types/gm": "1.18.0",
 		"@types/gulp": "3.8.36",
 		"@types/gulp-htmlmin": "1.3.32",
 		"@types/gulp-mocha": "0.0.32",
@@ -58,18 +56,18 @@
 		"@types/koa-multer": "1.0.0",
 		"@types/koa-router": "7.0.28",
 		"@types/koa-send": "4.1.1",
-		"@types/koa-views": "^2.0.3",
+		"@types/koa-views": "2.0.3",
 		"@types/koa__cors": "2.2.2",
 		"@types/kue": "0.11.8",
 		"@types/license-checker": "15.0.0",
 		"@types/mkdirp": "0.5.2",
 		"@types/mocha": "5.2.0",
-		"@types/mongodb": "3.0.15",
+		"@types/mongodb": "3.0.18",
 		"@types/monk": "6.0.0",
 		"@types/ms": "0.7.30",
-		"@types/node": "9.6.6",
+		"@types/node": "10.1.0",
 		"@types/nopt": "3.0.29",
-		"@types/parse5": "^3.0.0",
+		"@types/parse5": "3.0.0",
 		"@types/pug": "2.0.4",
 		"@types/qrcode": "0.8.1",
 		"@types/ratelimiter": "2.1.28",
@@ -78,22 +76,20 @@
 		"@types/request-promise-native": "1.0.14",
 		"@types/rimraf": "2.0.2",
 		"@types/seedrandom": "2.4.27",
-		"@types/single-line-log": "^1.1.0",
+		"@types/single-line-log": "1.1.0",
 		"@types/speakeasy": "2.0.2",
 		"@types/tmp": "0.0.33",
 		"@types/uuid": "3.4.3",
-		"@types/webpack": "4.1.4",
+		"@types/webpack": "4.1.7",
 		"@types/webpack-stream": "3.2.10",
-		"@types/websocket": "0.0.38",
-		"@types/ws": "4.0.2",
+		"@types/websocket": "0.0.39",
+		"@types/ws": "5.1.1",
 		"animejs": "2.2.0",
-		"autosize": "4.0.1",
+		"autosize": "4.0.2",
 		"autwh": "0.1.0",
 		"bcryptjs": "2.4.3",
 		"bootstrap-vue": "2.0.0-rc.6",
 		"cafy": "8.0.0",
-		"chai": "4.1.2",
-		"chai-http": "4.0.0",
 		"chalk": "2.4.1",
 		"crc-32": "1.2.0",
 		"css-loader": "0.28.11",
@@ -101,9 +97,9 @@
 		"deep-equal": "1.0.1",
 		"deepcopy": "0.6.3",
 		"diskusage": "0.2.4",
-		"dompurify": "1.0.3",
+		"dompurify": "1.0.4",
 		"elasticsearch": "14.2.2",
-		"element-ui": "2.3.6",
+		"element-ui": "2.3.8",
 		"emojilib": "2.2.12",
 		"escape-regexp": "0.0.1",
 		"eslint": "4.19.1",
@@ -111,7 +107,7 @@
 		"eventemitter3": "3.1.0",
 		"exif-js": "2.3.0",
 		"file-loader": "1.1.11",
-		"file-type": "7.6.0",
+		"file-type": "8.0.0",
 		"fuckadblock": "3.2.1",
 		"gm": "1.23.1",
 		"gulp": "3.9.1",
@@ -120,15 +116,15 @@
 		"gulp-imagemin": "4.1.0",
 		"gulp-mocha": "5.0.0",
 		"gulp-pug": "4.0.1",
-		"gulp-rename": "1.2.2",
-		"gulp-replace": "0.6.1",
+		"gulp-rename": "1.2.3",
+		"gulp-replace": "1.0.0",
 		"gulp-sourcemaps": "2.6.4",
 		"gulp-stylus": "2.7.0",
 		"gulp-tslint": "8.1.3",
 		"gulp-typescript": "4.0.2",
 		"gulp-uglify": "3.0.0",
 		"gulp-util": "3.0.8",
-		"hard-source-webpack-plugin": "0.6.4",
+		"hard-source-webpack-plugin": "0.6.7",
 		"highlight.js": "9.12.0",
 		"html-minifier": "3.5.15",
 		"http-signature": "1.2.0",
@@ -136,7 +132,7 @@
 		"is-root": "2.0.0",
 		"is-url": "1.2.4",
 		"js-yaml": "3.11.0",
-		"jsdom": "11.9.0",
+		"jsdom": "11.10.0",
 		"koa": "2.5.1",
 		"koa-bodyparser": "4.2.0",
 		"koa-compress": "3.0.0",
@@ -148,16 +144,16 @@
 		"koa-router": "7.4.0",
 		"koa-send": "4.1.3",
 		"koa-slow": "2.1.0",
-		"koa-views": "^6.1.4",
+		"koa-views": "6.1.4",
 		"kue": "0.11.6",
-		"license-checker": "18.0.0",
+		"license-checker": "19.0.0",
 		"loader-utils": "1.1.0",
 		"mecab-async": "0.1.2",
 		"mkdirp": "0.5.1",
 		"mocha": "5.1.1",
 		"moji": "0.5.1",
-		"mongodb": "3.0.7",
-		"monk": "6.0.5",
+		"mongodb": "3.0.8",
+		"monk": "6.0.6",
 		"ms": "2.1.1",
 		"nan": "2.10.0",
 		"node-sass": "4.9.0",
@@ -167,10 +163,10 @@
 		"object-assign-deep": "0.4.0",
 		"on-build-webpack": "0.1.0",
 		"os-utils": "0.0.14",
-		"parse5": "^4.0.0",
+		"parse5": "4.0.0",
 		"progress-bar-webpack-plugin": "1.11.0",
 		"prominence": "0.2.0",
-		"promise-sequential": "^1.1.1",
+		"promise-sequential": "1.1.1",
 		"pug": "2.0.3",
 		"punycode": "2.1.0",
 		"qrcode": "1.2.0",
@@ -178,14 +174,14 @@
 		"recaptcha-promise": "0.1.3",
 		"reconnecting-websocket": "3.2.2",
 		"redis": "2.8.0",
-		"request": "2.85.0",
+		"request": "2.86.0",
 		"request-promise-native": "1.0.5",
 		"rimraf": "2.6.2",
 		"rndstr": "1.0.0",
 		"s-age": "1.1.2",
 		"sass-loader": "7.0.1",
 		"seedrandom": "2.4.3",
-		"single-line-log": "^1.1.2",
+		"single-line-log": "1.1.2",
 		"speakeasy": "2.0.0",
 		"style-loader": "0.21.0",
 		"stylus": "0.54.5",
@@ -196,9 +192,9 @@
 		"tcp-port-used": "0.1.2",
 		"textarea-caret": "3.1.0",
 		"tmp": "0.0.33",
-		"ts-loader": "4.2.0",
-		"ts-node": "6.0.1",
-		"tslint": "5.9.1",
+		"ts-loader": "4.3.0",
+		"ts-node": "6.0.3",
+		"tslint": "5.10.0",
 		"typescript": "2.8.3",
 		"typescript-eslint-parser": "15.0.0",
 		"uglify-es": "3.3.9",
@@ -209,16 +205,15 @@
 		"vue-cropperjs": "2.2.0",
 		"vue-js-modal": "1.3.13",
 		"vue-json-tree-view": "2.1.4",
-		"vue-loader": "15.0.3",
+		"vue-loader": "15.0.11",
 		"vue-router": "3.0.1",
 		"vue-template-compiler": "2.5.16",
 		"vuedraggable": "2.16.0",
 		"vuex": "3.0.1",
-		"web-push": "3.3.0",
+		"web-push": "3.3.1",
 		"webfinger.js": "2.6.6",
-		"webpack": "4.6.0",
-		"webpack-cli": "2.0.15",
-		"webpack-replace-loader": "1.3.0",
+		"webpack": "4.8.3",
+		"webpack-cli": "2.1.3",
 		"websocket": "1.0.26",
 		"ws": "5.1.1",
 		"xev": "2.0.0"