aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/package.json
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2019-02-11 14:09:23 +0100
committerChocobozzz <me@florianbigard.com>2019-02-11 14:09:23 +0100
commitb718fd22374d64534bcfe69932cf562894abed6a (patch)
tree311d3c67e2a4d1f33ebdd1dc163527de9d33d0f7 /client/package.json
parentadb115f5522bea4d52456a9fc5eb4140bb064476 (diff)
parent501e961199578129629cf0567033d13efced9904 (diff)
downloadPeerTube-b718fd22374d64534bcfe69932cf562894abed6a.tar.gz
PeerTube-b718fd22374d64534bcfe69932cf562894abed6a.tar.zst
PeerTube-b718fd22374d64534bcfe69932cf562894abed6a.zip
Merge branch 'develop' into pr/1285
Diffstat (limited to 'client/package.json')
-rw-r--r--client/package.json39
1 files changed, 22 insertions, 17 deletions
diff --git a/client/package.json b/client/package.json
index 5fe1f3d5f..3eea661f1 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
1{ 1{
2 "name": "peertube-client", 2 "name": "peertube-client",
3 "version": "1.1.0", 3 "version": "1.2.0",
4 "private": true, 4 "private": true,
5 "licence": "GPLv3", 5 "licence": "GPLv3",
6 "author": { 6 "author": {
@@ -28,7 +28,8 @@
28 "resolutions": { 28 "resolutions": {
29 "video.js": "^7", 29 "video.js": "^7",
30 "webtorrent/create-torrent/junk": "^1", 30 "webtorrent/create-torrent/junk": "^1",
31 "simple-get": "^2.8.1" 31 "simple-get": "^2.8.1",
32 "punycode": "^1.4.1"
32 }, 33 },
33 "jest": { 34 "jest": {
34 "globals": { 35 "globals": {
@@ -63,20 +64,20 @@
63 "setupTestFrameworkScriptFile": "<rootDir>/src/setupJest.ts" 64 "setupTestFrameworkScriptFile": "<rootDir>/src/setupJest.ts"
64 }, 65 },
65 "devDependencies": { 66 "devDependencies": {
66 "@angular-devkit/build-angular": "~0.11.1", 67 "@angular-devkit/build-angular": "~0.13.1",
67 "@angular/animations": "~7.1.1", 68 "@angular/animations": "~7.2.4",
68 "@angular/cli": "~7.1.1", 69 "@angular/cli": "~7.3.1",
69 "@angular/common": "~7.1.1", 70 "@angular/common": "~7.2.4",
70 "@angular/compiler": "~7.1.1", 71 "@angular/compiler": "~7.2.4",
71 "@angular/compiler-cli": "~7.1.1", 72 "@angular/compiler-cli": "~7.2.4",
72 "@angular/core": "~7.1.1", 73 "@angular/core": "~7.2.4",
73 "@angular/forms": "~7.1.1", 74 "@angular/forms": "~7.2.4",
74 "@angular/http": "~7.1.1", 75 "@angular/http": "~7.2.4",
75 "@angular/language-service": "~7.1.1", 76 "@angular/language-service": "~7.2.4",
76 "@angular/platform-browser": "~7.1.1", 77 "@angular/platform-browser": "~7.2.4",
77 "@angular/platform-browser-dynamic": "~7.1.1", 78 "@angular/platform-browser-dynamic": "~7.2.4",
78 "@angular/router": "~7.1.1", 79 "@angular/router": "~7.2.4",
79 "@angular/service-worker": "~7.1.1", 80 "@angular/service-worker": "~7.2.4",
80 "@angularclass/hmr": "^2.1.3", 81 "@angularclass/hmr": "^2.1.3",
81 "@neos21/bootstrap3-glyphicons": "^1.0.1", 82 "@neos21/bootstrap3-glyphicons": "^1.0.1",
82 "@ng-bootstrap/ng-bootstrap": "^4.0.0", 83 "@ng-bootstrap/ng-bootstrap": "^4.0.0",
@@ -85,7 +86,9 @@
85 "@ngx-loading-bar/router": "^3.0.0", 86 "@ngx-loading-bar/router": "^3.0.0",
86 "@ngx-meta/core": "^6.0.0-rc.1", 87 "@ngx-meta/core": "^6.0.0-rc.1",
87 "@ngx-translate/i18n-polyfill": "^1.0.0", 88 "@ngx-translate/i18n-polyfill": "^1.0.0",
89 "@streamroot/videojs-hlsjs-plugin": "^1.0.7",
88 "@types/core-js": "^2.5.0", 90 "@types/core-js": "^2.5.0",
91 "@types/hls.js": "^0.12.0",
89 "@types/jasmine": "^2.8.7", 92 "@types/jasmine": "^2.8.7",
90 "@types/jasminewd2": "^2.0.3", 93 "@types/jasminewd2": "^2.0.3",
91 "@types/jest": "^23.3.1", 94 "@types/jest": "^23.3.1",
@@ -109,6 +112,7 @@
109 "extract-text-webpack-plugin": "4.0.0-beta.0", 112 "extract-text-webpack-plugin": "4.0.0-beta.0",
110 "file-loader": "^2.0.0", 113 "file-loader": "^2.0.0",
111 "focus-visible": "^4.1.5", 114 "focus-visible": "^4.1.5",
115 "hls.js": "^0.12.2",
112 "html-loader": "^0.5.5", 116 "html-loader": "^0.5.5",
113 "html-webpack-plugin": "^3.2.0", 117 "html-webpack-plugin": "^3.2.0",
114 "https-browserify": "^1.0.0", 118 "https-browserify": "^1.0.0",
@@ -131,6 +135,7 @@
131 "ngx-qrcode2": "^0.0.9", 135 "ngx-qrcode2": "^0.0.9",
132 "node-sass": "^4.9.3", 136 "node-sass": "^4.9.3",
133 "npm-font-source-sans-pro": "^1.0.2", 137 "npm-font-source-sans-pro": "^1.0.2",
138 "p2p-media-loader-hlsjs": "^0.4.0",
134 "path-browserify": "^1.0.0", 139 "path-browserify": "^1.0.0",
135 "primeng": "^7.0.0", 140 "primeng": "^7.0.0",
136 "process": "^0.11.10", 141 "process": "^0.11.10",
@@ -152,9 +157,9 @@
152 "typescript": "3.1.6", 157 "typescript": "3.1.6",
153 "video.js": "^7", 158 "video.js": "^7",
154 "videojs-contextmenu-ui": "^5.0.0", 159 "videojs-contextmenu-ui": "^5.0.0",
160 "videojs-contrib-quality-levels": "^2.0.9",
155 "videojs-dock": "^2.0.2", 161 "videojs-dock": "^2.0.2",
156 "videojs-hotkeys": "^0.2.21", 162 "videojs-hotkeys": "^0.2.21",
157 "webpack": "^4.17.1",
158 "webpack-bundle-analyzer": "^3.0.2", 163 "webpack-bundle-analyzer": "^3.0.2",
159 "webpack-cli": "^3.0.8", 164 "webpack-cli": "^3.0.8",
160 "webtorrent": "https://github.com/webtorrent/webtorrent#e9b209c7970816fc29e0cc871157a4918d66001d", 165 "webtorrent": "https://github.com/webtorrent/webtorrent#e9b209c7970816fc29e0cc871157a4918d66001d",