aboutsummaryrefslogtreecommitdiffhomepage
path: root/package.json
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2019-02-11 11:52:34 +0100
committerChocobozzz <me@florianbigard.com>2019-02-11 11:52:34 +0100
commit88108880bbdba473cfe36ecbebc1c3c4f972e102 (patch)
treeb242efb3b4f0d7e49d88f2d1f2063b5b3b0489c0 /package.json
parent53a94c7cfa8368da4cd248d65df8346905938f0c (diff)
parent9b712a2017e4ab3cf12cd6bd58278905520159d0 (diff)
downloadPeerTube-88108880bbdba473cfe36ecbebc1c3c4f972e102.tar.gz
PeerTube-88108880bbdba473cfe36ecbebc1c3c4f972e102.tar.zst
PeerTube-88108880bbdba473cfe36ecbebc1c3c4f972e102.zip
Merge branch 'develop' into pr/1217
Diffstat (limited to 'package.json')
-rw-r--r--package.json51
1 files changed, 32 insertions, 19 deletions
diff --git a/package.json b/package.json
index 80d5a04ac..0cf39c7ee 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
1{ 1{
2 "name": "peertube", 2 "name": "peertube",
3 "description": "Federated (ActivityPub) video streaming platform using P2P (BitTorrent) directly in the web browser with WebTorrent and Angular.", 3 "description": "Federated (ActivityPub) video streaming platform using P2P (BitTorrent) directly in the web browser with WebTorrent and Angular.",
4 "version": "1.0.0-rc.2", 4 "version": "1.2.0",
5 "private": true, 5 "private": true,
6 "licence": "AGPLv3", 6 "licence": "AGPLv3",
7 "engines": { 7 "engines": {
@@ -43,17 +43,18 @@
43 "dev:server": "scripty", 43 "dev:server": "scripty",
44 "dev:client": "scripty", 44 "dev:client": "scripty",
45 "start": "node dist/server", 45 "start": "node dist/server",
46 "start:server": "node dist/server --no-client",
46 "update-host": "node ./dist/scripts/update-host.js", 47 "update-host": "node ./dist/scripts/update-host.js",
47 "create-transcoding-job": "node ./dist/scripts/create-transcoding-job.js", 48 "create-transcoding-job": "node ./dist/scripts/create-transcoding-job.js",
48 "create-import-video-file-job": "node ./dist/scripts/create-import-video-file-job.js", 49 "create-import-video-file-job": "node ./dist/scripts/create-import-video-file-job.js",
49 "test": "scripty", 50 "test": "scripty",
50 "help": "scripty", 51 "help": "scripty",
51 "generate-api-doc": "scripty", 52 "generate-cli-doc": "scripty",
52 "parse-log": "node ./dist/scripts/parse-log.js", 53 "parse-log": "node ./dist/scripts/parse-log.js",
53 "prune-storage": "node ./dist/scripts/prune-storage.js", 54 "prune-storage": "node ./dist/scripts/prune-storage.js",
55 "optimize-old-videos": "node ./dist/scripts/optimize-old-videos.js",
54 "postinstall": "cd client && yarn install --pure-lockfile", 56 "postinstall": "cd client && yarn install --pure-lockfile",
55 "tsc": "tsc", 57 "tsc": "tsc",
56 "spectacle-docs": "node_modules/spectacle-docs/bin/spectacle.js",
57 "commander": "commander", 58 "commander": "commander",
58 "ng": "ng", 59 "ng": "ng",
59 "nodemon": "nodemon", 60 "nodemon": "nodemon",
@@ -76,6 +77,14 @@
76 "*.scss": [ 77 "*.scss": [
77 "sass-lint -c client/.sass-lint.yml", 78 "sass-lint -c client/.sass-lint.yml",
78 "git add" 79 "git add"
80 ],
81 "support/doc/api/*.yaml": [
82 "node ./node_modules/swagger-cli/bin/swagger-cli.js validate support/doc/api/openapi.yaml",
83 "git add"
84 ],
85 "server/tools/README.md": [
86 "npm run generate-cli-doc",
87 "git add"
79 ] 88 ]
80 }, 89 },
81 "resolutions": { 90 "resolutions": {
@@ -86,7 +95,7 @@
86 "async": "^2.0.0", 95 "async": "^2.0.0",
87 "async-lock": "^1.1.2", 96 "async-lock": "^1.1.2",
88 "async-lru": "^1.1.1", 97 "async-lru": "^1.1.1",
89 "bcrypt": "2", 98 "bcrypt": "3.0.2",
90 "bittorrent-tracker": "^9.0.0", 99 "bittorrent-tracker": "^9.0.0",
91 "bluebird": "^3.5.0", 100 "bluebird": "^3.5.0",
92 "body-parser": "^1.12.4", 101 "body-parser": "^1.12.4",
@@ -95,7 +104,7 @@
95 "cli-table": "^0.3.1", 104 "cli-table": "^0.3.1",
96 "commander": "^2.13.0", 105 "commander": "^2.13.0",
97 "concurrently": "^4.0.1", 106 "concurrently": "^4.0.1",
98 "config": "^2.0.1", 107 "config": "^3.0.0",
99 "cookie-parser": "^1.4.3", 108 "cookie-parser": "^1.4.3",
100 "cors": "^2.8.1", 109 "cors": "^2.8.1",
101 "create-torrent": "^3.24.5", 110 "create-torrent": "^3.24.5",
@@ -108,9 +117,10 @@
108 "fluent-ffmpeg": "^2.1.0", 117 "fluent-ffmpeg": "^2.1.0",
109 "fs-extra": "^7.0.0", 118 "fs-extra": "^7.0.0",
110 "helmet": "^3.12.1", 119 "helmet": "^3.12.1",
120 "http-signature": "^1.2.0",
111 "ip-anonymize": "^0.0.6", 121 "ip-anonymize": "^0.0.6",
112 "ipaddr.js": "1.8.1", 122 "ipaddr.js": "1.8.1",
113 "is-cidr": "^2.0.5", 123 "is-cidr": "^3.0.0",
114 "iso-639-3": "^1.0.1", 124 "iso-639-3": "^1.0.1",
115 "js-yaml": "^3.5.4", 125 "js-yaml": "^3.5.4",
116 "jsonld": "^1.0.1", 126 "jsonld": "^1.0.1",
@@ -127,16 +137,16 @@
127 "pem": "^1.12.3", 137 "pem": "^1.12.3",
128 "pfeed": "^1.1.6", 138 "pfeed": "^1.1.6",
129 "pg": "^7.4.1", 139 "pg": "^7.4.1",
130 "pg-hstore": "^2.3.2",
131 "prompt": "^1.0.0", 140 "prompt": "^1.0.0",
132 "redis": "^2.8.0", 141 "redis": "^2.8.0",
133 "reflect-metadata": "^0.1.10", 142 "reflect-metadata": "^0.1.12",
134 "request": "^2.81.0", 143 "request": "^2.81.0",
135 "safe-buffer": "^5.0.1",
136 "scripty": "^1.5.0", 144 "scripty": "^1.5.0",
137 "sequelize": "4.38.0", 145 "sequelize": "4.41.2",
138 "sequelize-typescript": "0.6.6", 146 "sequelize-typescript": "0.6.6",
139 "sharp": "^0.20.0", 147 "sharp": "^0.21.0",
148 "sitemap": "^2.1.0",
149 "socket.io": "^2.2.0",
140 "srt-to-vtt": "^1.1.2", 150 "srt-to-vtt": "^1.1.2",
141 "summon-install": "^0.4.3", 151 "summon-install": "^0.4.3",
142 "useragent": "^2.3.0", 152 "useragent": "^2.3.0",
@@ -151,10 +161,10 @@
151 "devDependencies": { 161 "devDependencies": {
152 "@types/async": "^2.0.40", 162 "@types/async": "^2.0.40",
153 "@types/async-lock": "^1.1.0", 163 "@types/async-lock": "^1.1.0",
154 "@types/bcrypt": "^2.0.0", 164 "@types/bcrypt": "^3.0.0",
155 "@types/bluebird": "3.5.21", 165 "@types/bluebird": "3.5.21",
156 "@types/body-parser": "^1.16.3", 166 "@types/body-parser": "^1.16.3",
157 "@types/bull": "^3.3.12", 167 "@types/bull": "3.4.0",
158 "@types/bytes": "^3.0.0", 168 "@types/bytes": "^3.0.0",
159 "@types/chai": "^4.0.4", 169 "@types/chai": "^4.0.4",
160 "@types/chai-json-schema": "^1.4.3", 170 "@types/chai-json-schema": "^1.4.3",
@@ -162,6 +172,7 @@
162 "@types/config": "^0.0.34", 172 "@types/config": "^0.0.34",
163 "@types/express": "^4.0.35", 173 "@types/express": "^4.0.35",
164 "@types/express-rate-limit": "^2.9.3", 174 "@types/express-rate-limit": "^2.9.3",
175 "@types/fluent-ffmpeg": "^2.1.8",
165 "@types/fs-extra": "^5.0.4", 176 "@types/fs-extra": "^5.0.4",
166 "@types/libxmljs": "^0.18.0", 177 "@types/libxmljs": "^0.18.0",
167 "@types/lodash": "^4.14.64", 178 "@types/lodash": "^4.14.64",
@@ -178,7 +189,8 @@
178 "@types/pem": "^1.9.3", 189 "@types/pem": "^1.9.3",
179 "@types/redis": "^2.8.5", 190 "@types/redis": "^2.8.5",
180 "@types/request": "^2.0.3", 191 "@types/request": "^2.0.3",
181 "@types/sharp": "^0.17.6", 192 "@types/sharp": "^0.21.0",
193 "@types/socket.io": "^2.1.2",
182 "@types/supertest": "^2.0.3", 194 "@types/supertest": "^2.0.3",
183 "@types/validator": "^9.4.0", 195 "@types/validator": "^9.4.0",
184 "@types/webtorrent": "^0.98.4", 196 "@types/webtorrent": "^0.98.4",
@@ -187,19 +199,20 @@
187 "chai-json-schema": "^1.5.0", 199 "chai-json-schema": "^1.5.0",
188 "chai-xml": "^0.3.2", 200 "chai-xml": "^0.3.2",
189 "husky": "^1.0.0-rc.4", 201 "husky": "^1.0.0-rc.4",
190 "libxmljs": "0.19.3", 202 "libxmljs": "0.19.5",
191 "lint-staged": "^7.1.0", 203 "lint-staged": "^8.0.4",
192 "maildev": "^1.0.0-rc3", 204 "maildev": "^1.0.0-rc3",
205 "marked-man": "^0.2.1",
193 "mocha": "^5.0.0", 206 "mocha": "^5.0.0",
194 "nodemon": "^1.11.0", 207 "nodemon": "^1.18.6",
195 "sass-lint": "^1.12.1", 208 "sass-lint": "^1.12.1",
196 "source-map-support": "^0.5.0", 209 "source-map-support": "^0.5.0",
197 "spectacle-docs": "^1.0.2",
198 "supertest": "^3.0.0", 210 "supertest": "^3.0.0",
211 "swagger-cli": "^2.2.0",
199 "ts-node": "7.0.1", 212 "ts-node": "7.0.1",
200 "tslint": "^5.7.0", 213 "tslint": "^5.7.0",
201 "tslint-config-standard": "^8.0.1", 214 "tslint-config-standard": "^8.0.1",
202 "typescript": "^2.5.2", 215 "typescript": "^3.1.6",
203 "xliff": "^4.0.0" 216 "xliff": "^4.0.0"
204 }, 217 },
205 "scripty": { 218 "scripty": {