diff --git a/bun.lockb b/bun.lockb index a8f6bb2f..a8559fb1 100644 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/package.json b/package.json index 92b4b302..88a5a8ab 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,6 @@ "dependencies": { "bowser": "^2.11.0", "lit": "^3.1.4", - "requestidlecallback-polyfill": "^1.0.2", - "vot.js": "^1.0.0" + "requestidlecallback-polyfill": "^1.0.2" } } diff --git a/patches/vot.js+1.0.0+001+vot-localized-errors.patch b/patches/vot.js+1.0.1+001+vot-localized-errors.patch similarity index 100% rename from patches/vot.js+1.0.0+001+vot-localized-errors.patch rename to patches/vot.js+1.0.1+001+vot-localized-errors.patch diff --git a/patches/vot.js+1.0.0+002+sites-selectors.patch b/patches/vot.js+1.0.1+002+sites-selectors.patch similarity index 97% rename from patches/vot.js+1.0.0+002+sites-selectors.patch rename to patches/vot.js+1.0.1+002+sites-selectors.patch index 1b5083a7..55b69681 100644 --- a/patches/vot.js+1.0.0+002+sites-selectors.patch +++ b/patches/vot.js+1.0.1+002+sites-selectors.patch @@ -1,9 +1,9 @@ diff --git a/node_modules/vot.js/dist/config/sites.js b/node_modules/vot.js/dist/config/sites.js -index 99d23b1..8843c66 100644 +index 80a2809..4ccf3f8 100644 --- a/node_modules/vot.js/dist/config/sites.js +++ b/node_modules/vot.js/dist/config/sites.js -@@ -2,29 +2,63 @@ import { VideoService } from "../types/yandex.js"; - import { sitesInvidious, sitesPiped, sitesProxiTok, sitesPeertube, } from "./alternativeUrls.js"; +@@ -2,34 +2,68 @@ import { VideoService } from "../types/yandex.js"; + import { sitesInvidious, sitesPiped, sitesProxiTok, sitesPeertube, sitesPoketube, } from "./alternativeUrls.js"; export default [ { + additionalData: "mobile", @@ -37,7 +37,12 @@ index 99d23b1..8843c66 100644 url: "https://youtu.be/", match: sitesPiped, + selector: ".shaka-video-container", -+ }, + }, + { + host: VideoService.poketube, + url: "https://youtu.be/", + match: sitesPoketube, + }, + { + additionalData: "mobile", + host: VideoService.vk, @@ -52,7 +57,7 @@ index 99d23b1..8843c66 100644 + url: "https://vk.com/video?z=", + match: /^(www.|m.)?vk.(com|ru)$/, + selector: 'div[data-testid="clipcontainer-video"]', - }, ++ }, { host: VideoService.vk, url: "https://vk.com/video?z=", @@ -67,7 +72,7 @@ index 99d23b1..8843c66 100644 }, { host: VideoService.twitch, -@@ -35,162 +69,249 @@ export default [ +@@ -40,162 +74,249 @@ export default [ /^clips.twitch.tv$/, /^player.twitch.tv$/, ], diff --git a/patches/vot.js+1.0.0+003+change-imports.patch b/patches/vot.js+1.0.1+003+change-imports.patch similarity index 100% rename from patches/vot.js+1.0.0+003+change-imports.patch rename to patches/vot.js+1.0.1+003+change-imports.patch diff --git a/patches/vot.js+1.0.0+004+some-fixes.patch b/patches/vot.js+1.0.1+004+some-fixes.patch similarity index 100% rename from patches/vot.js+1.0.0+004+some-fixes.patch rename to patches/vot.js+1.0.1+004+some-fixes.patch diff --git a/patches/vot.js+1.0.0+005+improve-videodata-logic.patch b/patches/vot.js+1.0.1+005+improve-videodata-logic.patch similarity index 100% rename from patches/vot.js+1.0.0+005+improve-videodata-logic.patch rename to patches/vot.js+1.0.1+005+improve-videodata-logic.patch diff --git a/patches/vot.js+1.0.0+006+fix-udemy.patch b/patches/vot.js+1.0.1+006+fix-udemy.patch similarity index 100% rename from patches/vot.js+1.0.0+006+fix-udemy.patch rename to patches/vot.js+1.0.1+006+fix-udemy.patch diff --git a/patches/vot.js+1.0.0+007+added-udemy-helper.patch b/patches/vot.js+1.0.1+007+added-udemy-helper.patch similarity index 100% rename from patches/vot.js+1.0.0+007+added-udemy-helper.patch rename to patches/vot.js+1.0.1+007+added-udemy-helper.patch diff --git a/patches/vot.js+1.0.0+008+added-coursehunter-helper.patch b/patches/vot.js+1.0.1+008+added-coursehunter-helper.patch similarity index 100% rename from patches/vot.js+1.0.0+008+added-coursehunter-helper.patch rename to patches/vot.js+1.0.1+008+added-coursehunter-helper.patch diff --git a/patches/vot.js+1.0.0+009+added-coursera-helper.patch b/patches/vot.js+1.0.1+009+added-coursera-helper.patch similarity index 100% rename from patches/vot.js+1.0.0+009+added-coursera-helper.patch rename to patches/vot.js+1.0.1+009+added-coursera-helper.patch diff --git a/patches/vot.js+1.0.0+010+updated-twitch-clips-method.patch b/patches/vot.js+1.0.1+010+updated-twitch-clips-method.patch similarity index 100% rename from patches/vot.js+1.0.0+010+updated-twitch-clips-method.patch rename to patches/vot.js+1.0.1+010+updated-twitch-clips-method.patch diff --git a/patches/vot.js+1.0.0+011+added-apple-developer.patch b/patches/vot.js+1.0.1+011+added-apple-developer.patch similarity index 100% rename from patches/vot.js+1.0.0+011+added-apple-developer.patch rename to patches/vot.js+1.0.1+011+added-apple-developer.patch diff --git a/patches/vot.js+1.0.0+012+fix-kick-clips.patch b/patches/vot.js+1.0.1+012+fix-kick-clips.patch similarity index 100% rename from patches/vot.js+1.0.0+012+fix-kick-clips.patch rename to patches/vot.js+1.0.1+012+fix-kick-clips.patch diff --git a/yarn.lock b/yarn.lock index a2a3beda..3a101aae 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1,6 +1,6 @@ # THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. # yarn lockfile v1 -# bun ./bun.lockb --hash: B14F319B4C7EB33B-715360cf8f27d734-34FEA83BB28707E3-8e41b673f89f219b +# bun ./bun.lockb --hash: E735B96DBEFEFEC9-c828ebcb10d1ce6c-25A4E0BD75E4F113-3f787626d73238d5 "@aashutoshrathi/word-wrap@^1.2.3": @@ -256,45 +256,45 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" -"@oxlint/darwin-arm64@0.6.1": - version "0.6.1" - resolved "https://registry.npmjs.org/@oxlint/darwin-arm64/-/darwin-arm64-0.6.1.tgz" - integrity sha512-qnPtdpX4a2wZJYHo/7pO5oHGFfA1t47M+gN9d/ds2+C7UzfZyp1kgE6cjeBidnkpSnFWUPfOmuoOOrFs8Ig+Sw== - -"@oxlint/darwin-x64@0.6.1": - version "0.6.1" - resolved "https://registry.npmjs.org/@oxlint/darwin-x64/-/darwin-x64-0.6.1.tgz" - integrity sha512-/M126TTjEfzNRwYgopJ1qMxbJMUzzrMY64PjbXTID7ig7nLyxcMSAp454Znf8Sh/3uulPODynmkCdkReiGqPvw== - -"@oxlint/linux-arm64-gnu@0.6.1": - version "0.6.1" - resolved "https://registry.npmjs.org/@oxlint/linux-arm64-gnu/-/linux-arm64-gnu-0.6.1.tgz" - integrity sha512-120Qbek2yJz59iIzS0bwoM2717UTd6MRggDBgRw70rN0zdzkAZhORSywuC+EPq8U6ltIqYeMfcl+sGq7ZyhPyg== - -"@oxlint/linux-arm64-musl@0.6.1": - version "0.6.1" - resolved "https://registry.npmjs.org/@oxlint/linux-arm64-musl/-/linux-arm64-musl-0.6.1.tgz" - integrity sha512-wT0T+YOW8Ng2WGcLnWCylEpHwUDRun2HomTNslRed4RQzTWOisyp6hNB8sS6JZlRGYoCGUePgwBy7GM2P0IQYw== - -"@oxlint/linux-x64-gnu@0.6.1": - version "0.6.1" - resolved "https://registry.npmjs.org/@oxlint/linux-x64-gnu/-/linux-x64-gnu-0.6.1.tgz" - integrity sha512-4qUcfTDXGOrm3/ohiCG09ZvjpCZImg1yI/IaOo25ij9VXLoaWUYJ6vbxY1GqPQegqZhli7fbFXQ5FP6AwjhBtQ== - -"@oxlint/linux-x64-musl@0.6.1": - version "0.6.1" - resolved "https://registry.npmjs.org/@oxlint/linux-x64-musl/-/linux-x64-musl-0.6.1.tgz" - integrity sha512-v0O46xwi0EW+J3QxIZAU1h+2voIsq+BZc6/mPKzkSlnyYSPECBDFOG6IJF/rf7qzsjvIeFqdYB+sGGCxoxM5mg== - -"@oxlint/win32-arm64@0.6.1": - version "0.6.1" - resolved "https://registry.npmjs.org/@oxlint/win32-arm64/-/win32-arm64-0.6.1.tgz" - integrity sha512-51NQgkd/XDQzAvFHKanjhFyKoPXvomNBHJnQF3iEYKmAGT2+VOOF9N6ism/FTLn+xGdzLBVU51xwRlmpCXt3kQ== - -"@oxlint/win32-x64@0.6.1": - version "0.6.1" - resolved "https://registry.npmjs.org/@oxlint/win32-x64/-/win32-x64-0.6.1.tgz" - integrity sha512-T8uLmIxbs1X2wbiZzIjxHJgtYEOGl7d+wZTzj701JsKHsY8DWtOCvMMgmd3EoO0XX8PPxpJYdZDWupdiIlYQ4Q== +"@oxlint/darwin-arm64@0.7.0": + version "0.7.0" + resolved "https://registry.npmjs.org/@oxlint/darwin-arm64/-/darwin-arm64-0.7.0.tgz" + integrity sha512-BlKKozOOJb5q37mqAyTQhFHMEh8KBUsQvynrO0aBKOzHqkhVQ62eTtd064XsDym+qZCNlKeNR4363wBPRZWgZw== + +"@oxlint/darwin-x64@0.7.0": + version "0.7.0" + resolved "https://registry.npmjs.org/@oxlint/darwin-x64/-/darwin-x64-0.7.0.tgz" + integrity sha512-GSBgglTBEecG0ri9YbQcxxu62/FxnhFScbbx6tgT9qjzKNAtpogrgx5uvi22yq0XjyD8XT3SY7oVOz8wg6GZxQ== + +"@oxlint/linux-arm64-gnu@0.7.0": + version "0.7.0" + resolved "https://registry.npmjs.org/@oxlint/linux-arm64-gnu/-/linux-arm64-gnu-0.7.0.tgz" + integrity sha512-xrX1qpnQvFbCnyfD0OvapoqR3S7kWHbCUb7PfGI8q2n5lB1CBf55FcFapcqwbxBzzC7/JaafRJu8qEiEdRH8oA== + +"@oxlint/linux-arm64-musl@0.7.0": + version "0.7.0" + resolved "https://registry.npmjs.org/@oxlint/linux-arm64-musl/-/linux-arm64-musl-0.7.0.tgz" + integrity sha512-W3NBZiJ50Y+pPeB/qFTsspjvlRrzbq+ZiwWmNJfIDJD3eJWjICS4ehUm9qd+ZNUOtgakcG8xa69xoOg9NFE3Lg== + +"@oxlint/linux-x64-gnu@0.7.0": + version "0.7.0" + resolved "https://registry.npmjs.org/@oxlint/linux-x64-gnu/-/linux-x64-gnu-0.7.0.tgz" + integrity sha512-gHQusonVYFwlhgWKgismXRGlAVynDIk4G2lNRKXt+sQOauIEDJTH/Kgk7xlKJmu8J1Ztrb4xjR5meDeeIgyxRg== + +"@oxlint/linux-x64-musl@0.7.0": + version "0.7.0" + resolved "https://registry.npmjs.org/@oxlint/linux-x64-musl/-/linux-x64-musl-0.7.0.tgz" + integrity sha512-tT5VivFnhDS2vov8h1Hmn+Rv4vWoIQuS3I+HMaQbItMkDeh6mLanE7faeg+h9p5RqV2KLjRRDm49sdRvF05s4Q== + +"@oxlint/win32-arm64@0.7.0": + version "0.7.0" + resolved "https://registry.npmjs.org/@oxlint/win32-arm64/-/win32-arm64-0.7.0.tgz" + integrity sha512-Bt6D5eOC0Gb6TB4USXIAgZKXwuA1RVv96Und6z7GGryfDM53KpLrgAaeNXytx+u2yq74QuAtkkdsHh9wRosFFA== + +"@oxlint/win32-x64@0.7.0": + version "0.7.0" + resolved "https://registry.npmjs.org/@oxlint/win32-x64/-/win32-x64-0.7.0.tgz" + integrity sha512-Mjmw9fTpuW1iBFt1BxacM1WK4CVzHY15esx8RKOGCJD09kcxMpMvYE0ILtlXEQkTB62iJegtHav2uwkZoazkmg== "@pkgjs/parseargs@^0.11.0": version "0.11.0" @@ -3900,19 +3900,19 @@ os-tmpdir@~1.0.2: resolved "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz" integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g== -oxlint@0.6.1: - version "0.6.1" - resolved "https://registry.npmjs.org/oxlint/-/oxlint-0.6.1.tgz" - integrity sha512-V66/akd9Gu2+KE6zP/QNTqlmBChL2Q9tPYR9CguKML1SaR/URXmgpvx+0ZfFIA+pDz/VzOOM0w79ozfakbW82w== +oxlint@0.7.0: + version "0.7.0" + resolved "https://registry.npmjs.org/oxlint/-/oxlint-0.7.0.tgz" + integrity sha512-oZI76dyBPW+cETjci4Rm56nfumbNsUcjJoPXomaC+FBzCi2fB5gV6ibnwRnVilt9yJXWGNvloB7c8/Mmmc9B5w== optionalDependencies: - "@oxlint/win32-x64" "0.6.1" - "@oxlint/win32-arm64" "0.6.1" - "@oxlint/linux-x64-gnu" "0.6.1" - "@oxlint/linux-arm64-gnu" "0.6.1" - "@oxlint/linux-x64-musl" "0.6.1" - "@oxlint/linux-arm64-musl" "0.6.1" - "@oxlint/darwin-x64" "0.6.1" - "@oxlint/darwin-arm64" "0.6.1" + "@oxlint/win32-x64" "0.7.0" + "@oxlint/win32-arm64" "0.7.0" + "@oxlint/linux-x64-gnu" "0.7.0" + "@oxlint/linux-arm64-gnu" "0.7.0" + "@oxlint/linux-x64-musl" "0.7.0" + "@oxlint/linux-arm64-musl" "0.7.0" + "@oxlint/darwin-x64" "0.7.0" + "@oxlint/darwin-arm64" "0.7.0" p-limit@^2.2.0: version "2.3.0" @@ -5143,10 +5143,10 @@ vary@~1.1.2: resolved "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz" integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg== -vot.js@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/vot.js/-/vot.js-1.0.0.tgz" - integrity sha512-BL5d8qo8d6JrG89Vh+Q/Lv/9Kt6U1jEGiS4txjBMxmPS18UXB550C8+phuwUkVHXm2vQ+Osj9knBGHBhLll/Qw== +vot.js@^1.0.1: + version "1.0.1" + resolved "https://registry.npmjs.org/vot.js/-/vot.js-1.0.1.tgz" + integrity sha512-XwzJpjdJzGNl3A11TFe77tiitHT/DC5Rfcyfr5gxKa+4Rc+3gSfVmeaXTxiIVPWGtlyLHs4WG2f17GYXkkw3yg== dependencies: dom-parser "^1.1.5" protobufjs "^7.3.2"