aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/package.json
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-05-09 16:47:48 +0200
committerChocobozzz <me@florianbigard.com>2018-05-11 08:48:20 +0200
commitc7b0dacb28e3b5aa9f43a7a0eb683e2af9826cb9 (patch)
treedd73e39b3207a47a48b7861f171f331de6d47768 /client/package.json
parent1d6e5dfc376f3c0c2120055cc093161e76419f98 (diff)
downloadPeerTube-c7b0dacb28e3b5aa9f43a7a0eb683e2af9826cb9.tar.gz
PeerTube-c7b0dacb28e3b5aa9f43a7a0eb683e2af9826cb9.tar.zst
PeerTube-c7b0dacb28e3b5aa9f43a7a0eb683e2af9826cb9.zip
Do not bundle two different videojs versions
Diffstat (limited to 'client/package.json')
-rw-r--r--client/package.json5
1 files changed, 4 insertions, 1 deletions
diff --git a/client/package.json b/client/package.json
index f35386560..e9f84b593 100644
--- a/client/package.json
+++ b/client/package.json
@@ -21,6 +21,9 @@
21 "webpack-bundle-analyzer": "webpack-bundle-analyzer" 21 "webpack-bundle-analyzer": "webpack-bundle-analyzer"
22 }, 22 },
23 "license": "GPLv3", 23 "license": "GPLv3",
24 "resolutions": {
25 "videojs-dock/video.js": "^6"
26 },
24 "devDependencies": { 27 "devDependencies": {
25 "@angular/animations": "~5.2.2", 28 "@angular/animations": "~5.2.2",
26 "@angular/cli": "1.7.4", 29 "@angular/cli": "1.7.4",
@@ -78,7 +81,7 @@
78 "tslint-config-standard": "^7.0.0", 81 "tslint-config-standard": "^7.0.0",
79 "typescript": "2.8.1", 82 "typescript": "2.8.1",
80 "uglifyjs-webpack-plugin": "^1.1.2", 83 "uglifyjs-webpack-plugin": "^1.1.2",
81 "video.js": "^6.7.3", 84 "video.js": "^6",
82 "videojs-dock": "^2.0.2", 85 "videojs-dock": "^2.0.2",
83 "videojs-hotkeys": "^0.2.21", 86 "videojs-hotkeys": "^0.2.21",
84 "webpack": "^4.5.0", 87 "webpack": "^4.5.0",