From f6d2158fd9b16e304532549cf97440c0d995340b Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 29 May 2018 12:05:12 +0200 Subject: [PATCH] Upgarde videojs to v7 --- client/package.json | 6 ++-- client/yarn.lock | 85 +++++++++++++++++++++++++++++++-------------- 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 @@ }, "license": "GPLv3", "resolutions": { - "videojs-dock/video.js": "^6", + "videojs-dock/video.js": "^7", "webtorrent/create-torrent/junk": "^1", "simple-get": "^2.8.1" }, @@ -54,7 +54,7 @@ "@types/markdown-it": "^0.0.4", "@types/node": "^9.3.0", "@types/sanitize-html": "^1.14.0", - "@types/video.js": "6.2.4", + "@types/video.js": "6.2.5", "@types/webtorrent": "^0.98.4", "angular2-notifications": "^1.0.2", "awesome-typescript-loader": "5.0.0", @@ -98,7 +98,7 @@ "tslint-config-standard": "^7.0.0", "typescript": "2.7", "uglifyjs-webpack-plugin": "^1.1.2", - "video.js": "^6", + "video.js": "^7.0.3", "videojs-dock": "^2.0.2", "videojs-hotkeys": "^0.2.21", "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 @@ dependencies: "@types/node" "*" -"@types/video.js@6.2.4": - version "6.2.4" - resolved "https://registry.yarnpkg.com/@types/video.js/-/video.js-6.2.4.tgz#d1ded3930b737cb2ffb48ed50edae806c00f917d" +"@types/video.js@6.2.5": + version "6.2.5" + resolved "https://registry.yarnpkg.com/@types/video.js/-/video.js-6.2.5.tgz#6105ebd5f99bb2e4d3f300524ff3d3c22f072352" "@types/webtorrent@^0.98.4": version "0.98.4" @@ -372,6 +372,18 @@ "@types/parse-torrent" "*" "@types/simple-peer" "*" +"@videojs/http-streaming@^1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@videojs/http-streaming/-/http-streaming-1.0.2.tgz#19c21d4a94ee0021a84cbad1ff3617c14b5bfe06" + dependencies: + aes-decrypter "3.0.0" + global "^4.3.0" + m3u8-parser "4.2.0" + mpd-parser "0.6.1" + mux.js "4.4.1" + url-toolkit "^2.1.3" + video.js "^6.8.0 || ^7.0.0" + "@webassemblyjs/ast@1.4.3": version "1.4.3" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.4.3.tgz#3b3f6fced944d8660273347533e6d4d315b5934a" @@ -668,6 +680,14 @@ adm-zip@^0.4.7: version "0.4.11" resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.11.tgz#2aa54c84c4b01a9d0fb89bb11982a51f13e3d62a" +aes-decrypter@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/aes-decrypter/-/aes-decrypter-3.0.0.tgz#7848a1c145b9fdbf57ae3e2b5b1bc7cf0644a8fb" + dependencies: + commander "^2.9.0" + global "^4.3.2" + pkcs7 "^1.0.2" + after@0.8.2: version "0.8.2" 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: es6-symbol "~3.1.1" next-tick "1" -es5-shim@^4.5.1: - version "4.5.10" - resolved "https://registry.yarnpkg.com/es5-shim/-/es5-shim-4.5.10.tgz#b7e17ef4df2a145b821f1497b50c25cf94026205" - es6-iterator@~2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7" @@ -4222,7 +4238,7 @@ global-prefix@^1.0.1: is-windows "^1.0.1" which "^1.2.14" -global@4.3.2, global@^4.3.1, global@^4.3.2, global@~4.3.0: +global@4.3.2, global@^4.3.0, global@^4.3.1, global@^4.3.2, global@~4.3.0: version "4.3.2" resolved "https://registry.yarnpkg.com/global/-/global-4.3.2.tgz#e76989268a6c74c38908b1305b10fc0e394e9d0f" dependencies: @@ -6003,6 +6019,10 @@ lru@^3.0.0, lru@^3.1.0: dependencies: inherits "^2.0.1" +m3u8-parser@4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/m3u8-parser/-/m3u8-parser-4.2.0.tgz#c8e0785fd17f741f4408b49466889274a9e36447" + magnet-uri@^5.1.3: version "5.1.8" resolved "https://registry.yarnpkg.com/magnet-uri/-/magnet-uri-5.1.8.tgz#4df33a3e97629352781fc6d0774c1cf3e9603abc" @@ -6359,6 +6379,13 @@ mp4-stream@^2.0.0: next-event "^1.0.0" readable-stream "^2.0.3" +mpd-parser@0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/mpd-parser/-/mpd-parser-0.6.1.tgz#27e7aafe075817846ce55406ac03711df1ce0eb7" + dependencies: + global "^4.3.0" + url-toolkit "^2.1.1" + ms@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" @@ -6394,6 +6421,10 @@ mute-stream@0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" +mux.js@4.4.1: + version "4.4.1" + resolved "https://registry.yarnpkg.com/mux.js/-/mux.js-4.4.1.tgz#c9c9a5e7e9f69f1d5670f2cc71c4cefa45aa7aec" + nan@^2.10.0, nan@^2.9.2, nan@~2.10.0: version "2.10.0" resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f" @@ -7248,6 +7279,10 @@ pinkie@^2.0.0: version "2.0.4" resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" +pkcs7@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/pkcs7/-/pkcs7-1.0.2.tgz#b6dba527528c2942bfc122ce2dafcdb5e59074e7" + pkg-dir@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b" @@ -9844,6 +9879,10 @@ url-to-options@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/url-to-options/-/url-to-options-1.0.1.tgz#1505a03a289a48cbd7a434efbaeec5055f5633a9" +url-toolkit@^2.1.1, url-toolkit@^2.1.3: + version "2.1.4" + resolved "https://registry.yarnpkg.com/url-toolkit/-/url-toolkit-2.1.4.tgz#e0dac60e5fdd50b8ac984307699e8b72439b3fd3" + url@^0.11.0: version "0.11.0" resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" @@ -9954,17 +9993,17 @@ verror@1.10.0: core-util-is "1.0.2" extsprintf "^1.2.0" -video.js@^5.19.2, video.js@^6: - version "6.10.1" - resolved "https://registry.yarnpkg.com/video.js/-/video.js-6.10.1.tgz#d9379f0d2c15e9e72af7a5c81a85effef04c0491" +video.js@^5.19.2, "video.js@^6.8.0 || ^7.0.0", video.js@^7, video.js@^7.0.3: + version "7.0.3" + resolved "https://registry.yarnpkg.com/video.js/-/video.js-7.0.3.tgz#67e67ffbd1c91b9032c3ce2028d3e97c251bfdbe" dependencies: + "@videojs/http-streaming" "^1.0.2" babel-runtime "^6.9.2" global "4.3.2" safe-json-parse "4.0.0" tsml "1.0.1" - videojs-font "2.1.0" - videojs-ie8 "1.1.2" - videojs-vtt.js "0.12.6" + videojs-font "3.0.0" + videojs-vtt.js "0.14.1" xhr "2.4.0" videojs-dock@^2.0.2: @@ -9974,23 +10013,17 @@ videojs-dock@^2.0.2: global "^4.3.2" video.js "^5.19.2" -videojs-font@2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/videojs-font/-/videojs-font-2.1.0.tgz#a25930a67f6c9cfbf2bb88dacb8c6b451f093379" +videojs-font@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/videojs-font/-/videojs-font-3.0.0.tgz#90eafddcf26b407448c833523f5ca4ad8d5cc1af" videojs-hotkeys@^0.2.21: version "0.2.21" resolved "https://registry.yarnpkg.com/videojs-hotkeys/-/videojs-hotkeys-0.2.21.tgz#aa0a0a8484e8a8311ff9f4ba82d0934348566bad" -videojs-ie8@1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/videojs-ie8/-/videojs-ie8-1.1.2.tgz#a23d3d8608ad7192b69c6077fc4eb848998d35d9" - dependencies: - es5-shim "^4.5.1" - -videojs-vtt.js@0.12.6: - version "0.12.6" - resolved "https://registry.yarnpkg.com/videojs-vtt.js/-/videojs-vtt.js-0.12.6.tgz#e078600bda899eaa6f9c3307134cd0c811947b8e" +videojs-vtt.js@0.14.1: + version "0.14.1" + resolved "https://registry.yarnpkg.com/videojs-vtt.js/-/videojs-vtt.js-0.14.1.tgz#da583eb1fc9c81c826a9432b706040e8dea49911" dependencies: global "^4.3.1" -- 2.25.1