aboutsummaryrefslogtreecommitdiffhomepage
path: root/client
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2022-12-28 16:11:39 +0100
committerChocobozzz <me@florianbigard.com>2022-12-28 16:11:39 +0100
commit4afc70239d62b3e033c0bb42153a39ed7dbe0106 (patch)
tree714bde17676a83b9ebb780674b08684b8804d0b9 /client
parent7ce2eac8fca8ea373a0e61a9a0348a8568b76b16 (diff)
downloadPeerTube-4afc70239d62b3e033c0bb42153a39ed7dbe0106.tar.gz
PeerTube-4afc70239d62b3e033c0bb42153a39ed7dbe0106.tar.zst
PeerTube-4afc70239d62b3e033c0bb42153a39ed7dbe0106.zip
Fix incorrect merge with hls.js dependency
Diffstat (limited to 'client')
-rw-r--r--client/package.json2
-rw-r--r--client/yarn.lock8
2 files changed, 5 insertions, 5 deletions
diff --git a/client/package.json b/client/package.json
index 116f7f2f2..5e962550c 100644
--- a/client/package.json
+++ b/client/package.json
@@ -96,7 +96,7 @@
96 "expect-webdriverio": "^3.4.0", 96 "expect-webdriverio": "^3.4.0",
97 "focus-visible": "^5.0.2", 97 "focus-visible": "^5.0.2",
98 "geckodriver": "^3.2.0", 98 "geckodriver": "^3.2.0",
99 "hls.js": "1.2.9", 99 "hls.js": "1.2.5",
100 "html-loader": "^4.1.0", 100 "html-loader": "^4.1.0",
101 "html-webpack-plugin": "^5.3.1", 101 "html-webpack-plugin": "^5.3.1",
102 "https-browserify": "^1.0.0", 102 "https-browserify": "^1.0.0",
diff --git a/client/yarn.lock b/client/yarn.lock
index 231de6857..6a5456283 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -6136,10 +6136,10 @@ he@1.2.0, he@^1.2.0:
6136 resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" 6136 resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
6137 integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== 6137 integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
6138 6138
6139hls.js@1.2.9: 6139hls.js@1.2.5:
6140 version "1.2.9" 6140 version "1.2.5"
6141 resolved "https://registry.yarnpkg.com/hls.js/-/hls.js-1.2.9.tgz#2f25e42ec4c2ea8c88ab23c0f854f39062d45ac9" 6141 resolved "https://registry.yarnpkg.com/hls.js/-/hls.js-1.2.5.tgz#f5ae78095754d8f894e2f65b6a4b09c870b7707c"
6142 integrity sha512-SPjm8ix0xe6cYzwDvdVGh2QvQPDkCYrGWpZu6bRaKNNVyEGWM9uF0pooh/Lqj/g8QBQgPFEx1vHzW8SyMY9rqg== 6142 integrity sha512-1xW5PBJcQu2MsQDnqoFtCfaxxJ1hHwJHRThxDtrKRcrltTtSi4A62xgOsey+KK8MTMD6i4w5fcmBBz1U62ihvQ==
6143 6143
6144hosted-git-info@^2.1.4: 6144hosted-git-info@^2.1.4:
6145 version "2.8.9" 6145 version "2.8.9"