From 9bc2ab29a1662bf7b766b0b19cd2775a87bd7b64 Mon Sep 17 00:00:00 2001 From: uvjustin <46082645+uvjustin@users.noreply.github.com> Date: Mon, 19 Apr 2021 23:25:19 +0800 Subject: [PATCH] Version bump hls.js to v1.0.1 (#8951) Co-authored-by: Bram Kragten --- package.json | 3 +-- src/components/ha-hls-player.ts | 15 +++++++-------- yarn.lock | 26 ++++---------------------- 3 files changed, 12 insertions(+), 32 deletions(-) diff --git a/package.json b/package.json index 67964e7bf3..39a6c837e3 100644 --- a/package.json +++ b/package.json @@ -108,7 +108,7 @@ "fecha": "^4.2.0", "fuse.js": "^6.0.0", "google-timezones-json": "^1.0.2", - "hls.js": "^0.13.2", + "hls.js": "^1.0.1", "home-assistant-js-websocket": "^5.9.0", "idb-keyval": "^3.2.0", "intl-messageformat": "^8.3.9", @@ -167,7 +167,6 @@ "@types/chromecast-caf-receiver": "^5.0.11", "@types/chromecast-caf-sender": "^1.0.3", "@types/codemirror": "^0.0.97", - "@types/hls.js": "^0.12.3", "@types/js-yaml": "^3.12.1", "@types/leaflet": "^1.4.3", "@types/leaflet-draw": "^1.0.1", diff --git a/src/components/ha-hls-player.ts b/src/components/ha-hls-player.ts index 777684d187..e841993c1b 100644 --- a/src/components/ha-hls-player.ts +++ b/src/components/ha-hls-player.ts @@ -1,3 +1,4 @@ +import type HlsType from "hls.js"; import { css, CSSResult, @@ -15,8 +16,6 @@ import { nextRender } from "../common/util/render-status"; import { getExternalConfig } from "../external_app/external_config"; import type { HomeAssistant } from "../types"; -type HLSModule = typeof import("hls.js"); - @customElement("ha-hls-player") class HaHLSPlayer extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; @@ -43,7 +42,7 @@ class HaHLSPlayer extends LitElement { @internalProperty() private _attached = false; - private _hlsPolyfillInstance?: Hls; + private _hlsPolyfillInstance?: HlsType; private _useExoPlayer = false; @@ -107,8 +106,8 @@ class HaHLSPlayer extends LitElement { const useExoPlayerPromise = this._getUseExoPlayer(); const masterPlaylistPromise = fetch(this.url); - const hls = ((await import("hls.js")) as any).default as HLSModule; - let hlsSupported = hls.isSupported(); + const Hls = (await import("hls.js")).default; + let hlsSupported = Hls.isSupported(); if (!hlsSupported) { hlsSupported = @@ -144,8 +143,8 @@ class HaHLSPlayer extends LitElement { // If codec is HEVC and ExoPlayer is supported, use ExoPlayer. if (this._useExoPlayer && match !== null && match[1] !== undefined) { this._renderHLSExoPlayer(playlist_url); - } else if (hls.isSupported()) { - this._renderHLSPolyfill(videoEl, hls, playlist_url); + } else if (Hls.isSupported()) { + this._renderHLSPolyfill(videoEl, Hls, playlist_url); } else { this._renderHLSNative(videoEl, playlist_url); } @@ -182,7 +181,7 @@ class HaHLSPlayer extends LitElement { private async _renderHLSPolyfill( videoEl: HTMLVideoElement, - Hls: HLSModule, + Hls: typeof HlsType, url: string ) { const hls = new Hls({ diff --git a/yarn.lock b/yarn.lock index 5abd1ee959..8d389e3cf9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3649,11 +3649,6 @@ resolved "https://registry.yarnpkg.com/@types/har-format/-/har-format-1.2.4.tgz#3275842095abb60d14b47fa798cc9ff708dab6d4" integrity sha512-iUxzm1meBm3stxUMzRqgOVHjj4Kgpgu5w9fm4X7kPRfSgVRzythsucEN7/jtOo8SQzm+HfcxWWzJS0mJDH/3DQ== -"@types/hls.js@^0.12.3": - version "0.12.3" - resolved "https://registry.yarnpkg.com/@types/hls.js/-/hls.js-0.12.3.tgz#09d5d1dbcd78d7dd46deff6db02bd2af9721a4cf" - integrity sha512-1QbxVTp7v9bn8MjvbMXV4YbMntC9Dv8v9bI9LgWxfg9Mgib0/jI2XITUEKGgG5Cde48ktyA1UHTSWld7QKKNnQ== - "@types/http-assert@*": version "1.5.1" resolved "https://registry.yarnpkg.com/@types/http-assert/-/http-assert-1.5.1.tgz#d775e93630c2469c2f980fc27e3143240335db3b" @@ -7182,11 +7177,6 @@ event-target-shim@^5.0.1: resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789" integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ== -eventemitter3@3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.0.tgz#090b4d6cdbd645ed10bf750d4b5407942d7ba163" - integrity sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA== - eventemitter3@^4.0.0: version "4.0.7" resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" @@ -8323,13 +8313,10 @@ he@1.2.0, he@^1.2.0: resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== -hls.js@^0.13.2: - version "0.13.2" - resolved "https://registry.yarnpkg.com/hls.js/-/hls.js-0.13.2.tgz#3e7dd28e3787c69c6aba42b64b11eb2c3c8c29f1" - integrity sha512-sIg2t4uGpWQLzuK1Iid9614WOKqxj4OYg+EbFbhhTDCsxpENBN+Du3yBFnoi+a83DuOOHdiQd1ydnti9loSGXw== - dependencies: - eventemitter3 "3.1.0" - url-toolkit "^2.1.6" +hls.js@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/hls.js/-/hls.js-1.0.1.tgz#d92bd0a9c78760f0f0e90d53c60192800ebc629f" + integrity sha512-ElPUW9VMY2uXdX07N872BSrVUcVd4jZGav4nqlY3vinpdMpW8esmdpUaeVA5vv3oIRSmiC/XtL9K+mSt6rlBpA== hmac-drbg@^1.0.1: version "1.0.1" @@ -13642,11 +13629,6 @@ url-parse@^1.4.7: querystringify "^2.1.1" requires-port "^1.0.0" -url-toolkit@^2.1.6: - version "2.1.6" - resolved "https://registry.yarnpkg.com/url-toolkit/-/url-toolkit-2.1.6.tgz#6d03246499e519aad224c44044a4ae20544154f2" - integrity sha512-UaZ2+50am4HwrV2crR/JAf63Q4VvPYphe63WGeoJxeu8gmOm0qxPt+KsukfakPNrX9aymGNEkkaoICwn+OuvBw== - url@^0.11.0: version "0.11.0" resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"