aboutsummaryrefslogtreecommitdiffhomepage
path: root/client
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-05-29 12:05:12 +0200
committerChocobozzz <me@florianbigard.com>2018-05-29 12:05:12 +0200
commitf6d2158fd9b16e304532549cf97440c0d995340b (patch)
tree80530d8643c6d42bea95b8ceac5d1572ec87803b /client
parent230de99e7146f75b0af056a42c54161597c03002 (diff)
downloadPeerTube-f6d2158fd9b16e304532549cf97440c0d995340b.tar.gz
PeerTube-f6d2158fd9b16e304532549cf97440c0d995340b.tar.zst
PeerTube-f6d2158fd9b16e304532549cf97440c0d995340b.zip
Upgarde videojs to v7
Diffstat (limited to 'client')
-rw-r--r--client/package.json6
-rw-r--r--client/yarn.lock85
2 files changed, 62 insertions, 29 deletions
diff --git a/client/package.json b/client/package.json
index 28eff2ab4..0d5acf997 100644
--- a/client/package.json
+++ b/client/package.json
@@ -23,7 +23,7 @@
23 }, 23 },
24 "license": "GPLv3", 24 "license": "GPLv3",
25 "resolutions": { 25 "resolutions": {
26 "videojs-dock/video.js": "^6", 26 "videojs-dock/video.js": "^7",
27 "webtorrent/create-torrent/junk": "^1", 27 "webtorrent/create-torrent/junk": "^1",
28 "simple-get": "^2.8.1" 28 "simple-get": "^2.8.1"
29 }, 29 },
@@ -54,7 +54,7 @@
54 "@types/markdown-it": "^0.0.4", 54 "@types/markdown-it": "^0.0.4",
55 "@types/node": "^9.3.0", 55 "@types/node": "^9.3.0",
56 "@types/sanitize-html": "^1.14.0", 56 "@types/sanitize-html": "^1.14.0",
57 "@types/video.js": "6.2.4", 57 "@types/video.js": "6.2.5",
58 "@types/webtorrent": "^0.98.4", 58 "@types/webtorrent": "^0.98.4",
59 "angular2-notifications": "^1.0.2", 59 "angular2-notifications": "^1.0.2",
60 "awesome-typescript-loader": "5.0.0", 60 "awesome-typescript-loader": "5.0.0",
@@ -98,7 +98,7 @@
98 "tslint-config-standard": "^7.0.0", 98 "tslint-config-standard": "^7.0.0",
99 "typescript": "2.7", 99 "typescript": "2.7",
100 "uglifyjs-webpack-plugin": "^1.1.2", 100 "uglifyjs-webpack-plugin": "^1.1.2",
101 "video.js": "^6", 101 "video.js": "^7.0.3",
102 "videojs-dock": "^2.0.2", 102 "videojs-dock": "^2.0.2",
103 "videojs-hotkeys": "^0.2.21", 103 "videojs-hotkeys": "^0.2.21",
104 "webpack": "^4.5.0", 104 "webpack": "^4.5.0",
diff --git a/client/yarn.lock b/client/yarn.lock
index 8d43ae655..7806611f2 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -359,9 +359,9 @@
359 dependencies: 359 dependencies:
360 "@types/node" "*" 360 "@types/node" "*"
361 361
362"@types/video.js@6.2.4": 362"@types/video.js@6.2.5":
363 version "6.2.4" 363 version "6.2.5"
364 resolved "https://registry.yarnpkg.com/@types/video.js/-/video.js-6.2.4.tgz#d1ded3930b737cb2ffb48ed50edae806c00f917d" 364 resolved "https://registry.yarnpkg.com/@types/video.js/-/video.js-6.2.5.tgz#6105ebd5f99bb2e4d3f300524ff3d3c22f072352"
365 365
366"@types/webtorrent@^0.98.4": 366"@types/webtorrent@^0.98.4":
367 version "0.98.4" 367 version "0.98.4"
@@ -372,6 +372,18 @@
372 "@types/parse-torrent" "*" 372 "@types/parse-torrent" "*"
373 "@types/simple-peer" "*" 373 "@types/simple-peer" "*"
374 374
375"@videojs/http-streaming@^1.0.2":
376 version "1.0.2"
377 resolved "https://registry.yarnpkg.com/@videojs/http-streaming/-/http-streaming-1.0.2.tgz#19c21d4a94ee0021a84cbad1ff3617c14b5bfe06"
378 dependencies:
379 aes-decrypter "3.0.0"
380 global "^4.3.0"
381 m3u8-parser "4.2.0"
382 mpd-parser "0.6.1"
383 mux.js "4.4.1"
384 url-toolkit "^2.1.3"
385 video.js "^6.8.0 || ^7.0.0"
386
375"@webassemblyjs/ast@1.4.3": 387"@webassemblyjs/ast@1.4.3":
376 version "1.4.3" 388 version "1.4.3"
377 resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.4.3.tgz#3b3f6fced944d8660273347533e6d4d315b5934a" 389 resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.4.3.tgz#3b3f6fced944d8660273347533e6d4d315b5934a"
@@ -668,6 +680,14 @@ adm-zip@^0.4.7:
668 version "0.4.11" 680 version "0.4.11"
669 resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.11.tgz#2aa54c84c4b01a9d0fb89bb11982a51f13e3d62a" 681 resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.11.tgz#2aa54c84c4b01a9d0fb89bb11982a51f13e3d62a"
670 682
683aes-decrypter@3.0.0:
684 version "3.0.0"
685 resolved "https://registry.yarnpkg.com/aes-decrypter/-/aes-decrypter-3.0.0.tgz#7848a1c145b9fdbf57ae3e2b5b1bc7cf0644a8fb"
686 dependencies:
687 commander "^2.9.0"
688 global "^4.3.2"
689 pkcs7 "^1.0.2"
690
671after@0.8.2: 691after@0.8.2:
672 version "0.8.2" 692 version "0.8.2"
673 resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f" 693 resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f"
@@ -3404,10 +3424,6 @@ es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
3404 es6-symbol "~3.1.1" 3424 es6-symbol "~3.1.1"
3405 next-tick "1" 3425 next-tick "1"
3406 3426
3407es5-shim@^4.5.1:
3408 version "4.5.10"
3409 resolved "https://registry.yarnpkg.com/es5-shim/-/es5-shim-4.5.10.tgz#b7e17ef4df2a145b821f1497b50c25cf94026205"
3410
3411es6-iterator@~2.0.3: 3427es6-iterator@~2.0.3:
3412 version "2.0.3" 3428 version "2.0.3"
3413 resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7" 3429 resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
@@ -4222,7 +4238,7 @@ global-prefix@^1.0.1:
4222 is-windows "^1.0.1" 4238 is-windows "^1.0.1"
4223 which "^1.2.14" 4239 which "^1.2.14"
4224 4240
4225global@4.3.2, global@^4.3.1, global@^4.3.2, global@~4.3.0: 4241global@4.3.2, global@^4.3.0, global@^4.3.1, global@^4.3.2, global@~4.3.0:
4226 version "4.3.2" 4242 version "4.3.2"
4227 resolved "https://registry.yarnpkg.com/global/-/global-4.3.2.tgz#e76989268a6c74c38908b1305b10fc0e394e9d0f" 4243 resolved "https://registry.yarnpkg.com/global/-/global-4.3.2.tgz#e76989268a6c74c38908b1305b10fc0e394e9d0f"
4228 dependencies: 4244 dependencies:
@@ -6003,6 +6019,10 @@ lru@^3.0.0, lru@^3.1.0:
6003 dependencies: 6019 dependencies:
6004 inherits "^2.0.1" 6020 inherits "^2.0.1"
6005 6021
6022m3u8-parser@4.2.0:
6023 version "4.2.0"
6024 resolved "https://registry.yarnpkg.com/m3u8-parser/-/m3u8-parser-4.2.0.tgz#c8e0785fd17f741f4408b49466889274a9e36447"
6025
6006magnet-uri@^5.1.3: 6026magnet-uri@^5.1.3:
6007 version "5.1.8" 6027 version "5.1.8"
6008 resolved "https://registry.yarnpkg.com/magnet-uri/-/magnet-uri-5.1.8.tgz#4df33a3e97629352781fc6d0774c1cf3e9603abc" 6028 resolved "https://registry.yarnpkg.com/magnet-uri/-/magnet-uri-5.1.8.tgz#4df33a3e97629352781fc6d0774c1cf3e9603abc"
@@ -6359,6 +6379,13 @@ mp4-stream@^2.0.0:
6359 next-event "^1.0.0" 6379 next-event "^1.0.0"
6360 readable-stream "^2.0.3" 6380 readable-stream "^2.0.3"
6361 6381
6382mpd-parser@0.6.1:
6383 version "0.6.1"
6384 resolved "https://registry.yarnpkg.com/mpd-parser/-/mpd-parser-0.6.1.tgz#27e7aafe075817846ce55406ac03711df1ce0eb7"
6385 dependencies:
6386 global "^4.3.0"
6387 url-toolkit "^2.1.1"
6388
6362ms@2.0.0: 6389ms@2.0.0:
6363 version "2.0.0" 6390 version "2.0.0"
6364 resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" 6391 resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -6394,6 +6421,10 @@ mute-stream@0.0.7:
6394 version "0.0.7" 6421 version "0.0.7"
6395 resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" 6422 resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
6396 6423
6424mux.js@4.4.1:
6425 version "4.4.1"
6426 resolved "https://registry.yarnpkg.com/mux.js/-/mux.js-4.4.1.tgz#c9c9a5e7e9f69f1d5670f2cc71c4cefa45aa7aec"
6427
6397nan@^2.10.0, nan@^2.9.2, nan@~2.10.0: 6428nan@^2.10.0, nan@^2.9.2, nan@~2.10.0:
6398 version "2.10.0" 6429 version "2.10.0"
6399 resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f" 6430 resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
@@ -7248,6 +7279,10 @@ pinkie@^2.0.0:
7248 version "2.0.4" 7279 version "2.0.4"
7249 resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" 7280 resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
7250 7281
7282pkcs7@^1.0.2:
7283 version "1.0.2"
7284 resolved "https://registry.yarnpkg.com/pkcs7/-/pkcs7-1.0.2.tgz#b6dba527528c2942bfc122ce2dafcdb5e59074e7"
7285
7251pkg-dir@^2.0.0: 7286pkg-dir@^2.0.0:
7252 version "2.0.0" 7287 version "2.0.0"
7253 resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b" 7288 resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
@@ -9844,6 +9879,10 @@ url-to-options@^1.0.1:
9844 version "1.0.1" 9879 version "1.0.1"
9845 resolved "https://registry.yarnpkg.com/url-to-options/-/url-to-options-1.0.1.tgz#1505a03a289a48cbd7a434efbaeec5055f5633a9" 9880 resolved "https://registry.yarnpkg.com/url-to-options/-/url-to-options-1.0.1.tgz#1505a03a289a48cbd7a434efbaeec5055f5633a9"
9846 9881
9882url-toolkit@^2.1.1, url-toolkit@^2.1.3:
9883 version "2.1.4"
9884 resolved "https://registry.yarnpkg.com/url-toolkit/-/url-toolkit-2.1.4.tgz#e0dac60e5fdd50b8ac984307699e8b72439b3fd3"
9885
9847url@^0.11.0: 9886url@^0.11.0:
9848 version "0.11.0" 9887 version "0.11.0"
9849 resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" 9888 resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
@@ -9954,17 +9993,17 @@ verror@1.10.0:
9954 core-util-is "1.0.2" 9993 core-util-is "1.0.2"
9955 extsprintf "^1.2.0" 9994 extsprintf "^1.2.0"
9956 9995
9957video.js@^5.19.2, video.js@^6: 9996video.js@^5.19.2, "video.js@^6.8.0 || ^7.0.0", video.js@^7, video.js@^7.0.3:
9958 version "6.10.1" 9997 version "7.0.3"
9959 resolved "https://registry.yarnpkg.com/video.js/-/video.js-6.10.1.tgz#d9379f0d2c15e9e72af7a5c81a85effef04c0491" 9998 resolved "https://registry.yarnpkg.com/video.js/-/video.js-7.0.3.tgz#67e67ffbd1c91b9032c3ce2028d3e97c251bfdbe"
9960 dependencies: 9999 dependencies:
10000 "@videojs/http-streaming" "^1.0.2"
9961 babel-runtime "^6.9.2" 10001 babel-runtime "^6.9.2"
9962 global "4.3.2" 10002 global "4.3.2"
9963 safe-json-parse "4.0.0" 10003 safe-json-parse "4.0.0"
9964 tsml "1.0.1" 10004 tsml "1.0.1"
9965 videojs-font "2.1.0" 10005 videojs-font "3.0.0"
9966 videojs-ie8 "1.1.2" 10006 videojs-vtt.js "0.14.1"
9967 videojs-vtt.js "0.12.6"
9968 xhr "2.4.0" 10007 xhr "2.4.0"
9969 10008
9970videojs-dock@^2.0.2: 10009videojs-dock@^2.0.2:
@@ -9974,23 +10013,17 @@ videojs-dock@^2.0.2:
9974 global "^4.3.2" 10013 global "^4.3.2"
9975 video.js "^5.19.2" 10014 video.js "^5.19.2"
9976 10015
9977videojs-font@2.1.0: 10016videojs-font@3.0.0:
9978 version "2.1.0" 10017 version "3.0.0"
9979 resolved "https://registry.yarnpkg.com/videojs-font/-/videojs-font-2.1.0.tgz#a25930a67f6c9cfbf2bb88dacb8c6b451f093379" 10018 resolved "https://registry.yarnpkg.com/videojs-font/-/videojs-font-3.0.0.tgz#90eafddcf26b407448c833523f5ca4ad8d5cc1af"
9980 10019
9981videojs-hotkeys@^0.2.21: 10020videojs-hotkeys@^0.2.21:
9982 version "0.2.21" 10021 version "0.2.21"
9983 resolved "https://registry.yarnpkg.com/videojs-hotkeys/-/videojs-hotkeys-0.2.21.tgz#aa0a0a8484e8a8311ff9f4ba82d0934348566bad" 10022 resolved "https://registry.yarnpkg.com/videojs-hotkeys/-/videojs-hotkeys-0.2.21.tgz#aa0a0a8484e8a8311ff9f4ba82d0934348566bad"
9984 10023
9985videojs-ie8@1.1.2: 10024videojs-vtt.js@0.14.1:
9986 version "1.1.2" 10025 version "0.14.1"
9987 resolved "https://registry.yarnpkg.com/videojs-ie8/-/videojs-ie8-1.1.2.tgz#a23d3d8608ad7192b69c6077fc4eb848998d35d9" 10026 resolved "https://registry.yarnpkg.com/videojs-vtt.js/-/videojs-vtt.js-0.14.1.tgz#da583eb1fc9c81c826a9432b706040e8dea49911"
9988 dependencies:
9989 es5-shim "^4.5.1"
9990
9991videojs-vtt.js@0.12.6:
9992 version "0.12.6"
9993 resolved "https://registry.yarnpkg.com/videojs-vtt.js/-/videojs-vtt.js-0.12.6.tgz#e078600bda899eaa6f9c3307134cd0c811947b8e"
9994 dependencies: 10027 dependencies:
9995 global "^4.3.1" 10028 global "^4.3.1"
9996 10029