Merge branch 'release/v1.3.0' into develop

[github/Chocobozzz/PeerTube.git] / package.json

diff --git a/package.json b/package.json
index a4a545b54db9c43719ad535fefee098f6f058ae0..7533339b200236aff781dd9865de4cf6d428ebd3 100644 (file)
--- 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.2.1",
+  "version": "1.3.0",
   "private": true,
   "licence": "AGPLv3",
   "engines": {
@@ -23,6 +23,7 @@
   "scripts": {
     "e2e": "scripty",
     "e2e:local": "scripty",
+    "setup:cli": "scripty",
     "build": "SCRIPTY_PARALLEL=true scripty",
     "build:server": "scripty",
     "build:client": "scripty",
@@ -53,7 +54,7 @@
     "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",
+    "postinstall": "test -n \"$NOCLIENT\" || (cd client && yarn install --pure-lockfile)",
     "tsc": "tsc",
     "commander": "commander",
     "ng": "ng",
@@ -91,11 +92,10 @@
     "@types/bluebird": "3.5.21"
   },
   "dependencies": {
-    "application-config": "^1.0.1",
+    "apicache": "^1.4.0",
     "async": "^2.0.0",
-    "async-lock": "^1.1.2",
     "async-lru": "^1.1.1",
-    "bcrypt": "3.0.4",
+    "bcrypt": "3.0.5",
     "bittorrent-tracker": "^9.0.0",
     "bluebird": "^3.5.0",
     "body-parser": "^1.12.4",
@@ -103,7 +103,6 @@
     "bytes": "^3.0.0",
     "cli-table": "^0.3.1",
     "commander": "^2.13.0",
-    "concurrently": "^4.0.1",
     "config": "^3.0.0",
     "cookie-parser": "^1.4.3",
     "cors": "^2.8.1",
@@ -131,7 +130,7 @@
     "morgan": "^1.5.3",
     "multer": "^1.1.0",
     "netrc-parser": "^3.1.6",
-    "nodemailer": "^5.1.1",
+    "nodemailer": "^6.0.0",
     "parse-torrent": "^6.0.0",
     "password-generator": "^2.0.2",
     "pem": "^1.12.3",
@@ -142,13 +141,12 @@
     "reflect-metadata": "^0.1.12",
     "request": "^2.81.0",
     "scripty": "^1.5.0",
-    "sequelize": "4.41.2",
-    "sequelize-typescript": "0.6.6",
-    "sharp": "^0.21.0",
+    "sequelize": "5.7.4",
+    "sequelize-typescript": "1.0.0-beta.2",
+    "sharp": "^0.22.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",
     "uuid": "^3.1.0",
     "validator": "^10.2.0",
@@ -159,6 +157,7 @@
     "youtube-dl": "^1.12.2"
   },
   "devDependencies": {
+    "@types/apicache": "^1.2.0",
     "@types/async": "^2.0.40",
     "@types/async-lock": "^1.1.0",
     "@types/bcrypt": "^3.0.0",
@@ -189,7 +188,7 @@
     "@types/pem": "^1.9.3",
     "@types/redis": "^2.8.5",
     "@types/request": "^2.0.3",
-    "@types/sharp": "^0.21.0",
+    "@types/sharp": "^0.22.1",
     "@types/socket.io": "^2.1.2",
     "@types/supertest": "^2.0.3",
     "@types/validator": "^10.9.0",
@@ -198,28 +197,27 @@
     "chai": "^4.1.1",
     "chai-json-schema": "^1.5.0",
     "chai-xml": "^0.3.2",
+    "concurrently": "^4.1.0",
     "husky": "^1.0.0-rc.4",
     "libxmljs": "0.19.5",
     "lint-staged": "^8.0.4",
     "maildev": "^1.0.0-rc3",
     "marked-man": "^0.4.2",
     "mocha": "^6.0.0",
+    "mocha-parallel-tests": "^2.1.0",
     "nodemon": "^1.18.6",
     "sass-lint": "^1.12.1",
     "source-map-support": "^0.5.0",
-    "supertest": "^3.0.0",
+    "supertest": "^4.0.2",
     "swagger-cli": "^2.2.0",
-    "ts-node": "8.0.2",
+    "ts-node": "8.0.3",
     "tslint": "^5.7.0",
     "tslint-config-standard": "^8.0.1",
-    "typescript": "^3.1.6",
+    "typescript": "^3.4.3",
     "xliff": "^4.0.0"
   },
   "scripty": {
     "silent": true
   },
-  "summon": {
-    "silent": true
-  },
   "sasslintConfig": "client/.sass-lint.yml"
 }