diff options
author | Chocobozzz <me@florianbigard.com> | 2018-05-09 16:47:48 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-05-11 08:48:20 +0200 |
commit | c7b0dacb28e3b5aa9f43a7a0eb683e2af9826cb9 (patch) | |
tree | dd73e39b3207a47a48b7861f171f331de6d47768 /client/yarn.lock | |
parent | 1d6e5dfc376f3c0c2120055cc093161e76419f98 (diff) | |
download | PeerTube-c7b0dacb28e3b5aa9f43a7a0eb683e2af9826cb9.tar.gz PeerTube-c7b0dacb28e3b5aa9f43a7a0eb683e2af9826cb9.tar.zst PeerTube-c7b0dacb28e3b5aa9f43a7a0eb683e2af9826cb9.zip |
Do not bundle two different videojs versions
Diffstat (limited to 'client/yarn.lock')
-rw-r--r-- | client/yarn.lock | 54 |
1 files changed, 5 insertions, 49 deletions
diff --git a/client/yarn.lock b/client/yarn.lock index c889ec703..917c7dbb2 100644 --- a/client/yarn.lock +++ b/client/yarn.lock | |||
@@ -3562,13 +3562,6 @@ global-prefix@^1.0.1: | |||
3562 | is-windows "^1.0.1" | 3562 | is-windows "^1.0.1" |
3563 | which "^1.2.14" | 3563 | which "^1.2.14" |
3564 | 3564 | ||
3565 | global@4.3.0: | ||
3566 | version "4.3.0" | ||
3567 | resolved "https://registry.yarnpkg.com/global/-/global-4.3.0.tgz#ef7ec4beead579b454f5ebd5e7f303db54f42a2b" | ||
3568 | dependencies: | ||
3569 | min-document "^2.6.1" | ||
3570 | process "~0.5.1" | ||
3571 | |||
3572 | global@4.3.2, global@^4.3.1, global@^4.3.2, global@~4.3.0: | 3565 | global@4.3.2, global@^4.3.1, global@^4.3.2, global@~4.3.0: |
3573 | version "4.3.2" | 3566 | version "4.3.2" |
3574 | resolved "https://registry.yarnpkg.com/global/-/global-4.3.2.tgz#e76989268a6c74c38908b1305b10fc0e394e9d0f" | 3567 | resolved "https://registry.yarnpkg.com/global/-/global-4.3.2.tgz#e76989268a6c74c38908b1305b10fc0e394e9d0f" |
@@ -5287,7 +5280,7 @@ mimic-response@^1.0.0: | |||
5287 | version "1.0.0" | 5280 | version "1.0.0" |
5288 | resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.0.tgz#df3d3652a73fded6b9b0b24146e6fd052353458e" | 5281 | resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.0.tgz#df3d3652a73fded6b9b0b24146e6fd052353458e" |
5289 | 5282 | ||
5290 | min-document@^2.19.0, min-document@^2.6.1: | 5283 | min-document@^2.19.0: |
5291 | version "2.19.0" | 5284 | version "2.19.0" |
5292 | resolved "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685" | 5285 | resolved "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685" |
5293 | dependencies: | 5286 | dependencies: |
@@ -8543,23 +8536,9 @@ verror@1.10.0: | |||
8543 | core-util-is "1.0.2" | 8536 | core-util-is "1.0.2" |
8544 | extsprintf "^1.2.0" | 8537 | extsprintf "^1.2.0" |
8545 | 8538 | ||
8546 | video.js@^5.19.2: | 8539 | video.js@^5.19.2, video.js@^6: |
8547 | version "5.20.5" | 8540 | version "6.8.0" |
8548 | resolved "https://registry.yarnpkg.com/video.js/-/video.js-5.20.5.tgz#445cdae204bce459782d86a31b25a32afd6d8eff" | 8541 | resolved "https://registry.yarnpkg.com/video.js/-/video.js-6.8.0.tgz#c3cff35d483595e22efc294ba2e720198151f9c9" |
8549 | dependencies: | ||
8550 | babel-runtime "^6.9.2" | ||
8551 | global "4.3.0" | ||
8552 | safe-json-parse "4.0.0" | ||
8553 | tsml "1.0.1" | ||
8554 | videojs-font "2.0.0" | ||
8555 | videojs-ie8 "1.1.2" | ||
8556 | videojs-swf "5.4.1" | ||
8557 | videojs-vtt.js "0.12.6" | ||
8558 | xhr "2.2.2" | ||
8559 | |||
8560 | video.js@^6.7.3: | ||
8561 | version "6.7.3" | ||
8562 | resolved "https://registry.yarnpkg.com/video.js/-/video.js-6.7.3.tgz#616ab015a74bb1bc8b092e9b4b8022519756f7c0" | ||
8563 | dependencies: | 8542 | dependencies: |
8564 | babel-runtime "^6.9.2" | 8543 | babel-runtime "^6.9.2" |
8565 | global "4.3.2" | 8544 | global "4.3.2" |
@@ -8567,7 +8546,7 @@ video.js@^6.7.3: | |||
8567 | tsml "1.0.1" | 8546 | tsml "1.0.1" |
8568 | videojs-font "2.1.0" | 8547 | videojs-font "2.1.0" |
8569 | videojs-ie8 "1.1.2" | 8548 | videojs-ie8 "1.1.2" |
8570 | videojs-vtt.js "0.12.5" | 8549 | videojs-vtt.js "0.12.6" |
8571 | xhr "2.4.0" | 8550 | xhr "2.4.0" |
8572 | 8551 | ||
8573 | videojs-dock@^2.0.2: | 8552 | videojs-dock@^2.0.2: |
@@ -8577,10 +8556,6 @@ videojs-dock@^2.0.2: | |||
8577 | global "^4.3.2" | 8556 | global "^4.3.2" |
8578 | video.js "^5.19.2" | 8557 | video.js "^5.19.2" |
8579 | 8558 | ||
8580 | videojs-font@2.0.0: | ||
8581 | version "2.0.0" | ||
8582 | resolved "https://registry.yarnpkg.com/videojs-font/-/videojs-font-2.0.0.tgz#af7461ef9d4b95e0334bffb78b2f2ff0364a9034" | ||
8583 | |||
8584 | videojs-font@2.1.0: | 8559 | videojs-font@2.1.0: |
8585 | version "2.1.0" | 8560 | version "2.1.0" |
8586 | resolved "https://registry.yarnpkg.com/videojs-font/-/videojs-font-2.1.0.tgz#a25930a67f6c9cfbf2bb88dacb8c6b451f093379" | 8561 | resolved "https://registry.yarnpkg.com/videojs-font/-/videojs-font-2.1.0.tgz#a25930a67f6c9cfbf2bb88dacb8c6b451f093379" |
@@ -8595,16 +8570,6 @@ videojs-ie8@1.1.2: | |||
8595 | dependencies: | 8570 | dependencies: |
8596 | es5-shim "^4.5.1" | 8571 | es5-shim "^4.5.1" |
8597 | 8572 | ||
8598 | videojs-swf@5.4.1: | ||
8599 | version "5.4.1" | ||
8600 | resolved "https://registry.yarnpkg.com/videojs-swf/-/videojs-swf-5.4.1.tgz#2077ef71c749f2c7823ef49babae4dd2acb08f87" | ||
8601 | |||
8602 | videojs-vtt.js@0.12.5: | ||
8603 | version "0.12.5" | ||
8604 | resolved "https://registry.yarnpkg.com/videojs-vtt.js/-/videojs-vtt.js-0.12.5.tgz#32852732741c8b4e7a4314caa2cd93646a9c2d40" | ||
8605 | dependencies: | ||
8606 | global "^4.3.1" | ||
8607 | |||
8608 | videojs-vtt.js@0.12.6: | 8573 | videojs-vtt.js@0.12.6: |
8609 | version "0.12.6" | 8574 | version "0.12.6" |
8610 | resolved "https://registry.yarnpkg.com/videojs-vtt.js/-/videojs-vtt.js-0.12.6.tgz#e078600bda899eaa6f9c3307134cd0c811947b8e" | 8575 | resolved "https://registry.yarnpkg.com/videojs-vtt.js/-/videojs-vtt.js-0.12.6.tgz#e078600bda899eaa6f9c3307134cd0c811947b8e" |
@@ -8998,15 +8963,6 @@ ws@^5.0.0: | |||
8998 | dependencies: | 8963 | dependencies: |
8999 | async-limiter "~1.0.0" | 8964 | async-limiter "~1.0.0" |
9000 | 8965 | ||
9001 | xhr@2.2.2: | ||
9002 | version "2.2.2" | ||
9003 | resolved "https://registry.yarnpkg.com/xhr/-/xhr-2.2.2.tgz#2ee72571869f8686d41559a9ea286c18971435ff" | ||
9004 | dependencies: | ||
9005 | global "~4.3.0" | ||
9006 | is-function "^1.0.1" | ||
9007 | parse-headers "^2.0.0" | ||
9008 | xtend "^4.0.0" | ||
9009 | |||
9010 | xhr@2.4.0: | 8966 | xhr@2.4.0: |
9011 | version "2.4.0" | 8967 | version "2.4.0" |
9012 | resolved "https://registry.yarnpkg.com/xhr/-/xhr-2.4.0.tgz#e16e66a45f869861eeefab416d5eff722dc40993" | 8968 | resolved "https://registry.yarnpkg.com/xhr/-/xhr-2.4.0.tgz#e16e66a45f869861eeefab416d5eff722dc40993" |