Merge branch 'master' into greenkeeper/@types/serve-favicon-2.2.29

1 files changed, 58 insertions, 52 deletions

diff --git a/package.json b/package.json
index 639261cb99..efaec30f72 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "misskey",
   "author": "syuilo <i@syuilo.com>",
-  "version": "0.0.2380",
+  "version": "0.0.2807",
   "license": "MIT",
   "description": "A miniblog-based SNS",
   "bugs": "https://github.com/syuilo/misskey/issues",
@@ -18,22 +18,22 @@
     "clean": "gulp clean",
     "cleanall": "gulp cleanall",
     "lint": "gulp lint",
-    "test": "gulp test"
+		"test": "gulp test"
   },
   "devDependencies": {
-    "@types/bcryptjs": "2.4.0",
+    "@types/bcryptjs": "2.4.1",
     "@types/body-parser": "1.16.5",
     "@types/chai": "4.0.4",
-    "@types/chai-http": "3.0.2",
-    "@types/chalk": "0.4.31",
+    "@types/chai-http": "3.0.3",
+    "@types/chalk": "2.2.0",
     "@types/compression": "0.0.34",
     "@types/cors": "2.8.1",
     "@types/debug": "0.0.30",
     "@types/deep-equal": "1.0.1",
     "@types/elasticsearch": "5.0.14",
-    "@types/event-stream": "3.3.31",
-    "@types/express": "4.0.36",
-    "@types/gm": "1.17.32",
+    "@types/event-stream": "3.3.32",
+    "@types/express": "4.0.37",
+    "@types/gm": "1.17.33",
     "@types/gulp": "4.0.3",
     "@types/gulp-htmlmin": "1.3.30",
     "@types/gulp-mocha": "0.0.30",
@@ -47,82 +47,88 @@
     "@types/is-root": "1.0.0",
     "@types/is-url": "1.2.28",
     "@types/js-yaml": "3.9.0",
-    "@types/mocha": "2.2.41",
-    "@types/mongodb": "2.2.10",
-    "@types/monk": "1.0.5",
-    "@types/morgan": "1.7.32",
-    "@types/ms": "0.7.29",
-    "@types/multer": "1.3.2",
-    "@types/node": "8.0.24",
+    "@types/mocha": "2.2.44",
+    "@types/mongodb": "2.2.13",
+    "@types/monk": "1.0.6",
+    "@types/morgan": "1.7.35",
+    "@types/ms": "0.7.30",
+    "@types/multer": "1.3.5",
+    "@types/node": "8.0.47",
     "@types/ratelimiter": "2.1.28",
-    "@types/redis": "2.6.0",
-    "@types/request": "2.0.1",
+    "@types/redis": "2.8.1",
+    "@types/request": "2.0.7",
     "@types/rimraf": "2.0.0",
-    "@types/riot": "3.6.0",
+    "@types/riot": "3.6.1",
     "@types/serve-favicon": "2.2.29",
-    "@types/uuid": "3.4.0",
-    "@types/webpack": "3.0.9",
-    "@types/webpack-stream": "3.2.7",
+    "@types/uuid": "3.4.3",
+    "@types/webpack": "3.0.14",
+    "@types/uuid": "3.4.3",
+    "@types/webpack": "3.0.13",
+    "@types/webpack-stream": "3.2.8",
     "@types/websocket": "0.0.34",
-    "chai": "4.1.1",
+    "awesome-typescript-loader": "3.3.0",
+    "chai": "4.1.2",
     "chai-http": "3.0.0",
-    "css-loader": "0.28.5",
+    "css-loader": "0.28.7",
     "event-stream": "3.3.4",
     "gulp": "3.9.1",
     "gulp-cssnano": "2.1.2",
-    "gulp-imagemin": "3.3.0",
     "gulp-htmlmin": "3.0.0",
+    "gulp-imagemin": "3.4.0",
     "gulp-mocha": "4.3.1",
     "gulp-pug": "3.3.0",
     "gulp-rename": "1.2.2",
     "gulp-replace": "0.6.1",
     "gulp-tslint": "8.1.2",
-    "gulp-typescript": "3.2.1",
+    "gulp-typescript": "3.2.2",
     "gulp-uglify": "3.0.0",
     "gulp-util": "3.0.8",
-    "mocha": "3.5.0",
+    "mocha": "3.5.3",
     "riot-tag-loader": "1.0.0",
     "string-replace-webpack-plugin": "0.1.3",
-    "style-loader": "0.18.2",
+    "style-loader": "0.19.0",
     "stylus": "0.54.5",
     "stylus-loader": "3.0.1",
     "swagger-jsdoc": "1.9.7",
-    "tslint": "5.6.0",
+    "tslint": "5.7.0",
     "uglify-es": "3.0.27",
-    "uglify-es-webpack-plugin": "0.10.0",
     "uglify-js": "git+https://github.com/mishoo/UglifyJS2.git#harmony",
-    "webpack": "3.5.5"
+    "uglifyjs-webpack-plugin": "1.0.1",
+    "webpack": "3.8.1"
   },
   "dependencies": {
+    "@prezzemolo/rap": "0.1.2",
     "accesses": "2.5.0",
-    "animejs": "2.0.2",
+    "animejs": "2.2.0",
     "autwh": "0.0.1",
     "bcryptjs": "2.4.3",
-    "body-parser": "1.17.2",
-    "cafy": "2.4.0",
-    "chalk": "2.1.0",
-    "compression": "1.7.0",
+    "body-parser": "1.18.2",
+    "cafy": "3.0.0",
+    "chalk": "2.3.0",
+    "compression": "1.7.1",
     "cors": "2.8.4",
-    "cropperjs": "1.0.0-rc.3",
+    "cropperjs": "1.1.3",
     "crypto": "1.0.1",
-    "debug": "3.0.0",
+    "debug": "3.1.0",
     "deep-equal": "1.0.1",
     "deepcopy": "0.6.3",
-    "diskusage": "^0.2.2",
+    "diskusage": "0.2.2",
     "download": "6.2.5",
     "elasticsearch": "13.3.1",
     "escape-regexp": "0.0.1",
     "express": "4.15.4",
-    "file-type": "6.1.0",
+    "file-type": "7.2.0",
     "fuckadblock": "3.2.1",
     "gm": "1.23.0",
-    "inquirer": "3.2.2",
+    "inquirer": "3.3.0",
     "is-root": "1.0.0",
     "is-url": "1.2.2",
-    "js-yaml": "3.9.1",
-    "mongodb": "2.2.31",
-    "monk": "6.0.3",
-    "morgan": "1.8.2",
+    "js-yaml": "3.10.0",
+    "mecab-async": "^0.1.0",
+    "moji": "^0.5.1",
+    "mongodb": "2.2.33",
+    "monk": "6.0.5",
+    "morgan": "1.9.0",
     "ms": "2.0.0",
     "multer": "1.3.0",
     "nprogress": "0.2.0",
@@ -130,26 +136,26 @@
     "page": "1.7.1",
     "pictograph": "2.0.4",
     "prominence": "0.2.0",
-    "pug": "2.0.0-rc.3",
+    "pug": "2.0.0-rc.4",
     "ratelimiter": "3.0.3",
     "recaptcha-promise": "0.1.3",
-    "reconnecting-websocket": "3.2.0",
+    "reconnecting-websocket": "3.2.2",
     "redis": "2.8.0",
-    "request": "2.81.0",
-    "rimraf": "2.6.1",
-    "riot": "3.6.2",
+    "request": "2.83.0",
+    "rimraf": "2.6.2",
+    "riot": "3.7.4",
     "rndstr": "1.0.0",
     "s-age": "1.1.0",
-    "serve-favicon": "2.4.3",
+    "serve-favicon": "2.4.5",
     "summaly": "2.0.3",
     "syuilo-password-strength": "0.0.1",
     "tcp-port-used": "0.1.2",
     "textarea-caret": "3.0.2",
     "ts-node": "3.3.0",
-    "typescript": "2.4.2",
+    "typescript": "2.6.1",
     "uuid": "3.1.0",
     "vhost": "3.0.2",
-    "websocket": "1.0.24",
+    "websocket": "1.0.25",
     "xev": "2.0.0"
   }
 }