Merge branch 'develop' into pr/1217

1 files changed, 32 insertions, 19 deletions

diff --git a/package.json b/package.json
index 80d5a04ac..0cf39c7ee 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "peertube",
   "description": "Federated (ActivityPub) video streaming platform using P2P (BitTorrent) directly in the web browser with WebTorrent and Angular.",
-  "version": "1.0.0-rc.2",
+  "version": "1.2.0",
   "private": true,
   "licence": "AGPLv3",
   "engines": {
@@ -43,17 +43,18 @@
     "dev:server": "scripty",
     "dev:client": "scripty",
     "start": "node dist/server",
+    "start:server": "node dist/server --no-client",
     "update-host": "node ./dist/scripts/update-host.js",
     "create-transcoding-job": "node ./dist/scripts/create-transcoding-job.js",
     "create-import-video-file-job": "node ./dist/scripts/create-import-video-file-job.js",
     "test": "scripty",
     "help": "scripty",
-    "generate-api-doc": "scripty",
+    "generate-cli-doc": "scripty",
     "parse-log": "node ./dist/scripts/parse-log.js",
     "prune-storage": "node ./dist/scripts/prune-storage.js",
+    "optimize-old-videos": "node ./dist/scripts/optimize-old-videos.js",
     "postinstall": "cd client && yarn install --pure-lockfile",
     "tsc": "tsc",
-    "spectacle-docs": "node_modules/spectacle-docs/bin/spectacle.js",
     "commander": "commander",
     "ng": "ng",
     "nodemon": "nodemon",
@@ -76,6 +77,14 @@
     "*.scss": [
       "sass-lint -c client/.sass-lint.yml",
       "git add"
+    ],
+    "support/doc/api/*.yaml": [
+      "node ./node_modules/swagger-cli/bin/swagger-cli.js validate support/doc/api/openapi.yaml",
+      "git add"
+    ],
+    "server/tools/README.md": [
+      "npm run generate-cli-doc",
+      "git add"
     ]
   },
   "resolutions": {
@@ -86,7 +95,7 @@
     "async": "^2.0.0",
     "async-lock": "^1.1.2",
     "async-lru": "^1.1.1",
-    "bcrypt": "2",
+    "bcrypt": "3.0.2",
     "bittorrent-tracker": "^9.0.0",
     "bluebird": "^3.5.0",
     "body-parser": "^1.12.4",
@@ -95,7 +104,7 @@
     "cli-table": "^0.3.1",
     "commander": "^2.13.0",
     "concurrently": "^4.0.1",
-    "config": "^2.0.1",
+    "config": "^3.0.0",
     "cookie-parser": "^1.4.3",
     "cors": "^2.8.1",
     "create-torrent": "^3.24.5",
@@ -108,9 +117,10 @@
     "fluent-ffmpeg": "^2.1.0",
     "fs-extra": "^7.0.0",
     "helmet": "^3.12.1",
+    "http-signature": "^1.2.0",
     "ip-anonymize": "^0.0.6",
     "ipaddr.js": "1.8.1",
-    "is-cidr": "^2.0.5",
+    "is-cidr": "^3.0.0",
     "iso-639-3": "^1.0.1",
     "js-yaml": "^3.5.4",
     "jsonld": "^1.0.1",
@@ -127,16 +137,16 @@
     "pem": "^1.12.3",
     "pfeed": "^1.1.6",
     "pg": "^7.4.1",
-    "pg-hstore": "^2.3.2",
     "prompt": "^1.0.0",
     "redis": "^2.8.0",
-    "reflect-metadata": "^0.1.10",
+    "reflect-metadata": "^0.1.12",
     "request": "^2.81.0",
-    "safe-buffer": "^5.0.1",
     "scripty": "^1.5.0",
-    "sequelize": "4.38.0",
+    "sequelize": "4.41.2",
     "sequelize-typescript": "0.6.6",
-    "sharp": "^0.20.0",
+    "sharp": "^0.21.0",
+    "sitemap": "^2.1.0",
+    "socket.io": "^2.2.0",
     "srt-to-vtt": "^1.1.2",
     "summon-install": "^0.4.3",
     "useragent": "^2.3.0",
@@ -151,10 +161,10 @@
   "devDependencies": {
     "@types/async": "^2.0.40",
     "@types/async-lock": "^1.1.0",
-    "@types/bcrypt": "^2.0.0",
+    "@types/bcrypt": "^3.0.0",
     "@types/bluebird": "3.5.21",
     "@types/body-parser": "^1.16.3",
-    "@types/bull": "^3.3.12",
+    "@types/bull": "3.4.0",
     "@types/bytes": "^3.0.0",
     "@types/chai": "^4.0.4",
     "@types/chai-json-schema": "^1.4.3",
@@ -162,6 +172,7 @@
     "@types/config": "^0.0.34",
     "@types/express": "^4.0.35",
     "@types/express-rate-limit": "^2.9.3",
+    "@types/fluent-ffmpeg": "^2.1.8",
     "@types/fs-extra": "^5.0.4",
     "@types/libxmljs": "^0.18.0",
     "@types/lodash": "^4.14.64",
@@ -178,7 +189,8 @@
     "@types/pem": "^1.9.3",
     "@types/redis": "^2.8.5",
     "@types/request": "^2.0.3",
-    "@types/sharp": "^0.17.6",
+    "@types/sharp": "^0.21.0",
+    "@types/socket.io": "^2.1.2",
     "@types/supertest": "^2.0.3",
     "@types/validator": "^9.4.0",
     "@types/webtorrent": "^0.98.4",
@@ -187,19 +199,20 @@
     "chai-json-schema": "^1.5.0",
     "chai-xml": "^0.3.2",
     "husky": "^1.0.0-rc.4",
-    "libxmljs": "0.19.3",
-    "lint-staged": "^7.1.0",
+    "libxmljs": "0.19.5",
+    "lint-staged": "^8.0.4",
     "maildev": "^1.0.0-rc3",
+    "marked-man": "^0.2.1",
     "mocha": "^5.0.0",
-    "nodemon": "^1.11.0",
+    "nodemon": "^1.18.6",
     "sass-lint": "^1.12.1",
     "source-map-support": "^0.5.0",
-    "spectacle-docs": "^1.0.2",
     "supertest": "^3.0.0",
+    "swagger-cli": "^2.2.0",
     "ts-node": "7.0.1",
     "tslint": "^5.7.0",
     "tslint-config-standard": "^8.0.1",
-    "typescript": "^2.5.2",
+    "typescript": "^3.1.6",
     "xliff": "^4.0.0"
   },
   "scripty": {