diff --git a/package.json b/package.json index d0e7aa9c1..7042a8136 100644 --- a/package.json +++ b/package.json @@ -95,12 +95,12 @@ "webpack-dev-server": "latest" }, "dependencies": { - "@playkit-js/playkit-js": "^0.53.0", + "@playkit-js/playkit-js": "^0.54.0-canary.5056ca0", "@playkit-js/playkit-js-dash": "^1.15.0", "@playkit-js/playkit-js-hls": "^1.17.0", "@playkit-js/playkit-js-kava": "^0.11.3", "@playkit-js/playkit-js-ott-analytics": "^0.5.2", - "@playkit-js/playkit-js-ui": "^0.44.0", + "@playkit-js/playkit-js-ui": "^0.45.0-canary.1eea3a1", "babel-polyfill": "^6.23.0", "hls.js": "^0.12.2", "js-logger": "^1.3.0", diff --git a/src/common/ui-wrapper.js b/src/common/ui-wrapper.js index ebacb5900..50e0e95e5 100644 --- a/src/common/ui-wrapper.js +++ b/src/common/ui-wrapper.js @@ -10,6 +10,7 @@ class UIWrapper { constructor(player: KalturaPlayer, options: KPOptionsObject) { const config: UIOptionsObject = options.ui; + config.uiComponents = [...(player._localPlayer.uiComponents || []), ...(config.uiComponents || [])]; if (config.disable) { this._disabled = true; appendPlayerViewToTargetContainer(config.targetId, player.getView()); diff --git a/yarn.lock b/yarn.lock index dc06f8423..cc5f9fd03 100644 --- a/yarn.lock +++ b/yarn.lock @@ -19,22 +19,23 @@ version "0.5.2" resolved "https://registry.yarnpkg.com/@playkit-js/playkit-js-ott-analytics/-/playkit-js-ott-analytics-0.5.2.tgz#a6e14c3d51e8448bf8c93e0ece503c6853741a27" -"@playkit-js/playkit-js-ui@^0.44.0": - version "0.44.0" - resolved "https://registry.yarnpkg.com/@playkit-js/playkit-js-ui/-/playkit-js-ui-0.44.0.tgz#f3fdb1b5758cbd7580feb37f883f15263bece360" +"@playkit-js/playkit-js-ui@^0.45.0-canary.1eea3a1": + version "0.45.0-canary.1eea3a1" + resolved "https://registry.yarnpkg.com/@playkit-js/playkit-js-ui/-/playkit-js-ui-0.45.0-canary.1eea3a1.tgz#c201be146e2331c626e6f8bc2a186709cf8aef8c" + integrity sha512-JIAVH9MULp/X/R0jnbhaDI9YQeuoEia8BJMFv9H7rNAcllrQlVtffWsRtTBgWTr2bZekD9Aksi/jY4QtnU75BQ== dependencies: empty "^0.10.1" - js-logger "^1.3.0" + js-logger "^1.6.0" preact "^8.1.0" preact-i18n "^1.0.0" preact-portal "^1.1.2" preact-redux "^2.0.1" redux "^3.6.0" -"@playkit-js/playkit-js@^0.53.0": - version "0.53.0" - resolved "https://registry.yarnpkg.com/@playkit-js/playkit-js/-/playkit-js-0.53.0.tgz#d738e58fee3104b057b04440a4dce7b87ca7e2ce" - integrity sha512-gia09cQU4Zu27TU/SaSk0aD4yyLWCR4qm/pnksJs6/0+3EtCTYf0y93xDfsp+t/bCTveFm3LXtLo3Dnsz1/fow== +"@playkit-js/playkit-js@^0.54.0-canary.5056ca0": + version "0.54.0-canary.5056ca0" + resolved "https://registry.yarnpkg.com/@playkit-js/playkit-js/-/playkit-js-0.54.0-canary.5056ca0.tgz#8f8872238f8277eafb85ec0a1900dbedec9d687e" + integrity sha512-3KMcduxDWAGdjUGSFz9ylk+bwNBabQxV7bvNZ4oDxIEBGezjxcdc99DVlU10hqBjoLFbS8LXzADOrsljJnyEyA== dependencies: js-logger "^1.3.0" ua-parser-js "^0.7.13" @@ -340,6 +341,7 @@ assign-symbols@^1.0.0: ast-types@0.9.6: version "0.9.6" resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.9.6.tgz#102c9e9e9005d3e7e3829bf0c4fa24ee862ee9b9" + integrity sha1-ECyenpAF0+fjgpvwxPok7oYu6bk= async-each@^1.0.0: version "1.0.1" @@ -1197,6 +1199,7 @@ balanced-match@^1.0.0: base62@^1.1.0: version "1.2.8" resolved "https://registry.yarnpkg.com/base62/-/base62-1.2.8.tgz#1264cb0fb848d875792877479dbe8bae6bae3428" + integrity sha512-V6YHUbjLxN1ymqNLb1DPHoU1CpfdL7d2YTIp5W3U4hhoG4hhxNmsFDs66M9EXxBiSEke5Bt5dwdfMwwZF70iLA== base64-arraybuffer@0.1.5: version "0.1.5" @@ -1851,8 +1854,9 @@ commander@^2.14.1, commander@^2.9.0: resolved "https://registry.yarnpkg.com/commander/-/commander-2.16.0.tgz#f16390593996ceb4f3eeb020b31d78528f7f8a50" commander@^2.5.0: - version "2.19.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a" + version "2.20.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422" + integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ== commondir@^1.0.1: version "1.0.1" @@ -1861,6 +1865,7 @@ commondir@^1.0.1: commoner@^0.10.1: version "0.10.8" resolved "https://registry.yarnpkg.com/commoner/-/commoner-0.10.8.tgz#34fc3672cd24393e8bb47e70caa0293811f4f2c5" + integrity sha1-NPw2cs0kOT6LtH5wyqApOBH08sU= dependencies: commander "^2.5.0" detective "^4.3.1" @@ -2580,9 +2585,10 @@ disparity@^2.0.0: ansi-styles "^2.0.1" diff "^1.3.2" -dlv@^1.0.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/dlv/-/dlv-1.1.2.tgz#270f6737b30d25b6657a7e962c784403f85137e5" +dlv@^1.1.2: + version "1.1.3" + resolved "https://registry.yarnpkg.com/dlv/-/dlv-1.1.3.tgz#5c198a8a11453596e751494d49874bc7732f2e79" + integrity sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA== dns-equal@^1.0.0: version "1.0.0" @@ -2763,6 +2769,7 @@ emojis-list@^2.0.0: empty@^0.10.1: version "0.10.1" resolved "https://registry.yarnpkg.com/empty/-/empty-0.10.1.tgz#de22fbe9fd0c0bc60cd904943a30eb222b67e042" + integrity sha1-3iL76f0MC8YM2QSUOjDrIitn4EI= dependencies: envify "^3.4.0" @@ -2831,6 +2838,7 @@ ent@~2.2.0: envify@^3.4.0: version "3.4.1" resolved "https://registry.yarnpkg.com/envify/-/envify-3.4.1.tgz#d7122329e8df1688ba771b12501917c9ce5cbce8" + integrity sha1-1xIjKejfFoi6dxsSUBkXyc5cvOg= dependencies: jstransform "^11.0.3" through "~2.3.4" @@ -3076,6 +3084,7 @@ espree@^3.4.0: esprima-fb@^15001.1.0-dev-harmony-fb: version "15001.1.0-dev-harmony-fb" resolved "https://registry.yarnpkg.com/esprima-fb/-/esprima-fb-15001.1.0-dev-harmony-fb.tgz#30a947303c6b8d5e955bee2b99b1d233206a6901" + integrity sha1-MKlHMDxrjV6VW+4rmbHSMyBqaQE= esprima@2.7.x, esprima@^2.6.0, esprima@^2.7.0, esprima@^2.7.1: version "2.7.3" @@ -3088,6 +3097,7 @@ esprima@^4.0.0: esprima@~3.1.0: version "3.1.3" resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633" + integrity sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM= esquery@^1.0.0: version "1.0.0" @@ -4688,6 +4698,11 @@ js-logger@^1.3.0: version "1.4.1" resolved "https://registry.yarnpkg.com/js-logger/-/js-logger-1.4.1.tgz#f0230dc5e84e120f213d6e5a6b767a913d290335" +js-logger@^1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/js-logger/-/js-logger-1.6.0.tgz#7abae5cfaf208c965f3ef20754533bb9e79c7aef" + integrity sha512-K4kt2AdD0jUYINbe00BPPpsL65u/rdYOgfaBBVWm/mid+ANk7qxDnoXgKI5ilm49Sjmach2Dzlc+5VxKdRA3tw== + js-tokens@^3.0.0, js-tokens@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" @@ -4695,6 +4710,7 @@ js-tokens@^3.0.0, js-tokens@^3.0.2: "js-tokens@^3.0.0 || ^4.0.0": version "4.0.0" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" + integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== js-yaml@3.x, js-yaml@^3.5.1: version "3.10.0" @@ -4793,6 +4809,7 @@ jsprim@^1.2.2: jstransform@^11.0.3: version "11.0.3" resolved "https://registry.yarnpkg.com/jstransform/-/jstransform-11.0.3.tgz#09a78993e0ae4d4ef4487f6155a91f6190cb4223" + integrity sha1-CaeJk+CuTU70SH9hVakfYZDLQiM= dependencies: base62 "^1.1.0" commoner "^0.10.1" @@ -5106,8 +5123,9 @@ locate-path@^3.0.0: path-exists "^3.0.0" lodash-es@^4.2.1: - version "4.17.11" - resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.11.tgz#145ab4a7ac5c5e52a3531fb4f310255a152b4be0" + version "4.17.15" + resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.15.tgz#21bd96839354412f23d7a10340e5eac6ee455d78" + integrity sha512-rlrc3yU3+JNOpZ9zj5pQtxnx2THmvRykwL4Xlxoa8I9lHBlVbbyPhgyPMioxVZ4NqyxaVVtaJnzsyOidQIhyyQ== lodash._baseassign@^3.0.0: version "3.2.0" @@ -5260,6 +5278,7 @@ loose-envify@^1.0.0: loose-envify@^1.1.0: version "1.4.0" resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" + integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== dependencies: js-tokens "^3.0.0 || ^4.0.0" @@ -5860,6 +5879,7 @@ object-assign@4.1.0: object-assign@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-2.1.1.tgz#43c36e5d569ff8e4816c4efa8be02d26967c18aa" + integrity sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo= object-assign@^4.0.1, object-assign@^4.1.0: version "4.1.1" @@ -6606,22 +6626,26 @@ postcss@^6.0.1: supports-color "^4.4.0" preact-i18n@^1.0.0: - version "1.2.2" - resolved "https://registry.yarnpkg.com/preact-i18n/-/preact-i18n-1.2.2.tgz#7bd0b4233aa27c290cb4b4600bbbb4d19273d312" + version "1.4.1" + resolved "https://registry.yarnpkg.com/preact-i18n/-/preact-i18n-1.4.1.tgz#f9454485bbd589a5cee9064132cfbf4f4ab8ee0f" + integrity sha512-FA0lVb3b3EVR1nJSglh/Bgg38ntRdp9VV1ewvpn46Pz7yuwOnJQBC8CddemmQjl9jdFCj5gUOgkJR8//9WZDSw== dependencies: - dlv "^1.0.2" + dlv "^1.1.2" preact-portal@^1.1.2: version "1.1.3" resolved "https://registry.yarnpkg.com/preact-portal/-/preact-portal-1.1.3.tgz#22cdd3ecf6ad9aaa3f830607a9c6591de90aedb7" + integrity sha512-rE0KG2b7ggIly4VVsSm7+WmQmG/EoUZzBOed2IbycyaFIArOvz+yab/8RBoDogA0JWZuTsbMTStR41Ghc+5m7Q== preact-redux@^2.0.1: - version "2.0.3" - resolved "https://registry.yarnpkg.com/preact-redux/-/preact-redux-2.0.3.tgz#960a535c322643cd35998f33f0c2e67bc1e7eaab" + version "2.1.0" + resolved "https://registry.yarnpkg.com/preact-redux/-/preact-redux-2.1.0.tgz#f9bf88cdfbb0b09323d50e15410693c7d72bc6c7" + integrity sha512-IFjT1f5I7siBtb/jsqQbOY6QUoYHHfiHhVaxvT+C9Q++h2C7YULSC30B4gVru3Phgwgs+qWb+GUiS5EKIQb19g== preact@^8.1.0: - version "8.3.1" - resolved "https://registry.yarnpkg.com/preact/-/preact-8.3.1.tgz#ed34f79d09edc5efd32a378a3416ef5dc531e3ac" + version "8.5.2" + resolved "https://registry.yarnpkg.com/preact/-/preact-8.5.2.tgz#2f532da485287c07369e08150cf4d23921a09789" + integrity sha512-37tlDJGq5IQKqGUbqPZ7qPtsTOWFyxe+ojAOFfzKo0dEPreenqrqgJuS83zGpeGAqD9h9L9Yr7QuxH2W4ZrKxg== prelude-ls@~1.1.2: version "1.1.2" @@ -6985,6 +7009,7 @@ readline2@^1.0.1: recast@^0.11.17: version "0.11.23" resolved "https://registry.yarnpkg.com/recast/-/recast-0.11.23.tgz#451fd3004ab1e4df9b4e4b66376b2a21912462d3" + integrity sha1-RR/TAEqx5N+bTktmN2sqIZEkYtM= dependencies: ast-types "0.9.6" esprima "~3.1.0" @@ -7021,6 +7046,7 @@ reduce-function-call@^1.0.1: redux@^3.6.0: version "3.7.2" resolved "https://registry.yarnpkg.com/redux/-/redux-3.7.2.tgz#06b73123215901d25d065be342eb026bc1c8537b" + integrity sha512-pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A== dependencies: lodash "^4.2.1" lodash-es "^4.2.1" @@ -8289,8 +8315,9 @@ typedarray@^0.0.6, typedarray@~0.0.5: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" ua-parser-js@^0.7.13: - version "0.7.19" - resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.19.tgz#94151be4c0a7fb1d001af7022fdaca4642659e4b" + version "0.7.20" + resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.20.tgz#7527178b82f6a62a0f243d1f94fd30e3e3c21098" + integrity sha512-8OaIKfzL5cpx8eCMAhhvTlft8GYF8b2eQr6JkCyVdrgjcytyOmPCXrqXFcUnhonRpLlh5yxEZVohm6mzaowUOw== uglify-js@^2.6, uglify-js@^2.8.29: version "2.8.29"