Upgrade server dependencies

package.json

@@ -78,7 +78,6 @@
     "@types/bluebird": "3.5.21"
   },
   "dependencies": {
-    "@types/oauth2-server": "^3.0.8",
     "async": "^2.0.0",
     "async-lock": "^1.1.2",
     "async-lru": "^1.1.1",
@@ -88,22 +87,22 @@
     "body-parser": "^1.12.4",
     "bull": "^3.4.2",
     "commander": "^2.13.0",
-    "concurrently": "^3.5.1",
-    "config": "^1.14.0",
+    "concurrently": "^4.0.1",
+    "config": "^2.0.1",
     "cookie-parser": "^1.4.3",
     "cors": "^2.8.1",
     "create-torrent": "^3.24.5",
     "deep-object-diff": "^1.1.0",
     "express": "^4.12.4",
     "express-oauth-server": "^2.0.0",
-    "express-rate-limit": "^2.11.0",
+    "express-rate-limit": "^3.1.0",
     "express-validator": "^5.0.0",
     "flat": "^4.1.0",
     "fluent-ffmpeg": "^2.1.0",
     "fs-extra": "^7.0.0",
     "helmet": "^3.12.1",
     "ip-anonymize": "^0.0.6",
-    "ipaddr.js": "https://github.com/whitequark/ipaddr.js.git#8e69afeb4053ee32447a101845f860848280eca5",
+    "ipaddr.js": "1.8.1",
     "is-cidr": "^2.0.5",
     "iso-639-3": "^1.0.1",
     "js-yaml": "^3.5.4",
@@ -128,16 +127,16 @@
     "safe-buffer": "^5.0.1",
     "scripty": "^1.5.0",
     "sequelize": "4.38.0",
-    "sequelize-typescript": "0.6.6-beta.1",
+    "sequelize-typescript": "0.6.6",
     "sharp": "^0.20.0",
     "srt-to-vtt": "^1.1.2",
     "useragent": "^2.3.0",
     "uuid": "^3.1.0",
     "validator": "^10.2.0",
     "webfinger.js": "^2.6.6",
-    "webtorrent": "^0.100.0",
+    "webtorrent": "^0.102.1",
     "winston": "3.0.0",
-    "ws": "^5.0.0",
+    "ws": "^6.0.0",
     "youtube-dl": "^1.12.2"
   },
   "devDependencies": {
@@ -164,6 +163,7 @@
     "@types/multer": "^1.3.3",
     "@types/node": "^10.0.8",
     "@types/nodemailer": "^4.3.1",
+    "@types/oauth2-server": "^3.0.8",
     "@types/pem": "^1.9.3",
     "@types/redis": "^2.8.5",
     "@types/request": "^2.0.3",
@@ -171,26 +171,26 @@
     "@types/supertest": "^2.0.3",
     "@types/validator": "^9.4.0",
     "@types/webtorrent": "^0.98.4",
-    "@types/ws": "^5.1.1",
+    "@types/ws": "^6.0.0",
     "chai": "^4.1.1",
     "chai-json-schema": "^1.5.0",
     "chai-xml": "^0.3.2",
     "husky": "^1.0.0-rc.4",
-    "libxmljs": "0.19.0",
+    "libxmljs": "0.19.3",
     "lint-staged": "^7.1.0",
     "maildev": "^1.0.0-rc3",
     "mocha": "^5.0.0",
     "nodemon": "^1.11.0",
-    "prettier": "1.13.7",
+    "prettier": "1.14.2",
     "sass-lint": "^1.12.1",
     "source-map-support": "^0.5.0",
     "spectacle-docs": "^1.0.2",
     "supertest": "^3.0.0",
-    "ts-node": "7.0.0",
+    "ts-node": "7.0.1",
     "tslint": "^5.7.0",
     "tslint-config-standard": "^7.0.0",
     "typescript": "^2.5.2",
-    "xliff": "^3.0.1"
+    "xliff": "^4.0.0"
   },
   "scripty": {
     "silent": true

scripts/watch/server.sh

@@ -7,7 +7,7 @@ mkdir -p "./client/dist"
 rm -rf "./client/dist/locale"
 cp -r "./client/src/locale/target" "./client/dist/locale"
 
-rm -r "./dist"
+rm -rf "./dist"
 
 NODE_ENV=test npm run concurrently -- -k \
   "npm run tsc -- --sourceMap && npm run nodemon -- --delay 2 --watch ./dist dist/server" \