OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Do not bundle two different videojs versions

pull/559/head
Chocobozzz 2018-05-09 16:47:48 +02:00
parent 1d6e5dfc37
commit c7b0dacb28
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
3 changed files with 10 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/package.json
View File

@ -21,6 +21,9 @@
"webpack-bundle-analyzer": "webpack-bundle-analyzer"
},
"license": "GPLv3",
"resolutions": {
"videojs-dock/video.js": "^6"
},
"devDependencies": {
"@angular/animations": "~5.2.2",
"@angular/cli": "1.7.4",
@ -78,7 +81,7 @@
"tslint-config-standard": "^7.0.0",
"typescript": "2.8.1",
"uglifyjs-webpack-plugin": "^1.1.2",
"video.js": "^6.7.3",
"video.js": "^6",
"videojs-dock": "^2.0.2",
"videojs-hotkeys": "^0.2.21",
"webpack": "^4.5.0",

2
client/src/assets/player/peertube-player.ts
View File

@ -1,7 +1,7 @@
import { VideoFile } from '../../../../shared/models/videos'
import 'videojs-hotkeys'
import 'videojs-dock/dist/videojs-dock.es.js'
import 'videojs-dock'
import './peertube-link-button'
import './resolution-menu-button'
import './settings-menu-button'

54
client/yarn.lock
View File

@ -3562,13 +3562,6 @@ global-prefix@^1.0.1:
is-windows "^1.0.1"
which "^1.2.14"
global@4.3.0:
version "4.3.0"
resolved "https://registry.yarnpkg.com/global/-/global-4.3.0.tgz#ef7ec4beead579b454f5ebd5e7f303db54f42a2b"
dependencies:
min-document "^2.6.1"
process "~0.5.1"
global@4.3.2, global@^4.3.1, global@^4.3.2, global@~4.3.0:
version "4.3.2"
resolved "https://registry.yarnpkg.com/global/-/global-4.3.2.tgz#e76989268a6c74c38908b1305b10fc0e394e9d0f"
@ -5287,7 +5280,7 @@ mimic-response@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.0.tgz#df3d3652a73fded6b9b0b24146e6fd052353458e"
min-document@^2.19.0, min-document@^2.6.1:
min-document@^2.19.0:
version "2.19.0"
resolved "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685"
dependencies:
@ -8543,23 +8536,9 @@ verror@1.10.0:
core-util-is "1.0.2"
extsprintf "^1.2.0"
video.js@^5.19.2:
version "5.20.5"
resolved "https://registry.yarnpkg.com/video.js/-/video.js-5.20.5.tgz#445cdae204bce459782d86a31b25a32afd6d8eff"
dependencies:
babel-runtime "^6.9.2"
global "4.3.0"
safe-json-parse "4.0.0"
tsml "1.0.1"
videojs-font "2.0.0"
videojs-ie8 "1.1.2"
videojs-swf "5.4.1"
videojs-vtt.js "0.12.6"
xhr "2.2.2"
video.js@^6.7.3:
version "6.7.3"
resolved "https://registry.yarnpkg.com/video.js/-/video.js-6.7.3.tgz#616ab015a74bb1bc8b092e9b4b8022519756f7c0"
video.js@^5.19.2, video.js@^6:
version "6.8.0"
resolved "https://registry.yarnpkg.com/video.js/-/video.js-6.8.0.tgz#c3cff35d483595e22efc294ba2e720198151f9c9"
dependencies:
babel-runtime "^6.9.2"
global "4.3.2"
@ -8567,7 +8546,7 @@ video.js@^6.7.3:
tsml "1.0.1"
videojs-font "2.1.0"
videojs-ie8 "1.1.2"
videojs-vtt.js "0.12.5"
videojs-vtt.js "0.12.6"
xhr "2.4.0"
videojs-dock@^2.0.2:
@ -8577,10 +8556,6 @@ videojs-dock@^2.0.2:
global "^4.3.2"
video.js "^5.19.2"
videojs-font@2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/videojs-font/-/videojs-font-2.0.0.tgz#af7461ef9d4b95e0334bffb78b2f2ff0364a9034"
videojs-font@2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/videojs-font/-/videojs-font-2.1.0.tgz#a25930a67f6c9cfbf2bb88dacb8c6b451f093379"
@ -8595,16 +8570,6 @@ videojs-ie8@1.1.2:
dependencies:
es5-shim "^4.5.1"
videojs-swf@5.4.1:
version "5.4.1"
resolved "https://registry.yarnpkg.com/videojs-swf/-/videojs-swf-5.4.1.tgz#2077ef71c749f2c7823ef49babae4dd2acb08f87"
videojs-vtt.js@0.12.5:
version "0.12.5"
resolved "https://registry.yarnpkg.com/videojs-vtt.js/-/videojs-vtt.js-0.12.5.tgz#32852732741c8b4e7a4314caa2cd93646a9c2d40"
dependencies:
global "^4.3.1"
videojs-vtt.js@0.12.6:
version "0.12.6"
resolved "https://registry.yarnpkg.com/videojs-vtt.js/-/videojs-vtt.js-0.12.6.tgz#e078600bda899eaa6f9c3307134cd0c811947b8e"
@ -8998,15 +8963,6 @@ ws@^5.0.0:
dependencies:
async-limiter "~1.0.0"
xhr@2.2.2:
version "2.2.2"
resolved "https://registry.yarnpkg.com/xhr/-/xhr-2.2.2.tgz#2ee72571869f8686d41559a9ea286c18971435ff"
dependencies:
global "~4.3.0"
is-function "^1.0.1"
parse-headers "^2.0.0"
xtend "^4.0.0"
xhr@2.4.0:
version "2.4.0"
resolved "https://registry.yarnpkg.com/xhr/-/xhr-2.4.0.tgz#e16e66a45f869861eeefab416d5eff722dc40993"