Merge branch 'develop' into pr/1285

1 files changed, 22 insertions, 17 deletions

diff --git a/client/package.json b/client/package.json
index 5fe1f3d5f..3eea661f1 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "peertube-client",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "private": true,
   "licence": "GPLv3",
   "author": {
@@ -28,7 +28,8 @@
   "resolutions": {
     "video.js": "^7",
     "webtorrent/create-torrent/junk": "^1",
-    "simple-get": "^2.8.1"
+    "simple-get": "^2.8.1",
+    "punycode": "^1.4.1"
   },
   "jest": {
     "globals": {
@@ -63,20 +64,20 @@
     "setupTestFrameworkScriptFile": "<rootDir>/src/setupJest.ts"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.11.1",
-    "@angular/animations": "~7.1.1",
-    "@angular/cli": "~7.1.1",
-    "@angular/common": "~7.1.1",
-    "@angular/compiler": "~7.1.1",
-    "@angular/compiler-cli": "~7.1.1",
-    "@angular/core": "~7.1.1",
-    "@angular/forms": "~7.1.1",
-    "@angular/http": "~7.1.1",
-    "@angular/language-service": "~7.1.1",
-    "@angular/platform-browser": "~7.1.1",
-    "@angular/platform-browser-dynamic": "~7.1.1",
-    "@angular/router": "~7.1.1",
-    "@angular/service-worker": "~7.1.1",
+    "@angular-devkit/build-angular": "~0.13.1",
+    "@angular/animations": "~7.2.4",
+    "@angular/cli": "~7.3.1",
+    "@angular/common": "~7.2.4",
+    "@angular/compiler": "~7.2.4",
+    "@angular/compiler-cli": "~7.2.4",
+    "@angular/core": "~7.2.4",
+    "@angular/forms": "~7.2.4",
+    "@angular/http": "~7.2.4",
+    "@angular/language-service": "~7.2.4",
+    "@angular/platform-browser": "~7.2.4",
+    "@angular/platform-browser-dynamic": "~7.2.4",
+    "@angular/router": "~7.2.4",
+    "@angular/service-worker": "~7.2.4",
     "@angularclass/hmr": "^2.1.3",
     "@neos21/bootstrap3-glyphicons": "^1.0.1",
     "@ng-bootstrap/ng-bootstrap": "^4.0.0",
@@ -85,7 +86,9 @@
     "@ngx-loading-bar/router": "^3.0.0",
     "@ngx-meta/core": "^6.0.0-rc.1",
     "@ngx-translate/i18n-polyfill": "^1.0.0",
+    "@streamroot/videojs-hlsjs-plugin": "^1.0.7",
     "@types/core-js": "^2.5.0",
+    "@types/hls.js": "^0.12.0",
     "@types/jasmine": "^2.8.7",
     "@types/jasminewd2": "^2.0.3",
     "@types/jest": "^23.3.1",
@@ -109,6 +112,7 @@
     "extract-text-webpack-plugin": "4.0.0-beta.0",
     "file-loader": "^2.0.0",
     "focus-visible": "^4.1.5",
+    "hls.js": "^0.12.2",
     "html-loader": "^0.5.5",
     "html-webpack-plugin": "^3.2.0",
     "https-browserify": "^1.0.0",
@@ -131,6 +135,7 @@
     "ngx-qrcode2": "^0.0.9",
     "node-sass": "^4.9.3",
     "npm-font-source-sans-pro": "^1.0.2",
+    "p2p-media-loader-hlsjs": "^0.4.0",
     "path-browserify": "^1.0.0",
     "primeng": "^7.0.0",
     "process": "^0.11.10",
@@ -152,9 +157,9 @@
     "typescript": "3.1.6",
     "video.js": "^7",
     "videojs-contextmenu-ui": "^5.0.0",
+    "videojs-contrib-quality-levels": "^2.0.9",
     "videojs-dock": "^2.0.2",
     "videojs-hotkeys": "^0.2.21",
-    "webpack": "^4.17.1",
     "webpack-bundle-analyzer": "^3.0.2",
     "webpack-cli": "^3.0.8",
     "webtorrent": "https://github.com/webtorrent/webtorrent#e9b209c7970816fc29e0cc871157a4918d66001d",