Merge branch 'release/v1.3.0' into develop

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

diff --git a/package.json b/package.json
index 41a040c59724862ad7c430ea8b8d418ebc039989..caacec808948f8f57b344f5f5bb2aa56d4516e14 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-rc.2",
   "private": true,
   "licence": "AGPLv3",
   "engines": {
@@ -91,9 +91,9 @@
     "@types/bluebird": "3.5.21"
   },
   "dependencies": {
+    "apicache": "^1.4.0",
     "application-config": "^1.0.1",
     "async": "^2.0.0",
-    "async-lock": "^1.1.2",
     "async-lru": "^1.1.1",
     "bcrypt": "3.0.5",
     "bittorrent-tracker": "^9.0.0",
@@ -159,6 +159,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",
@@ -204,6 +205,7 @@
     "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",