X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=package.json;h=fed390c82bd09c78dfef2cf2fc0d21651c3c88f4;hb=b764380ac23f4e9d4677d08acdc3474c2931a16d;hp=38c40bcf0788f48aca8122f8e89162b84d2f3217;hpb=00aab0666c6f772548c160fdfa871a8843b88f37;p=oweals%2Fpeertube.git

diff --git a/package.json b/package.json
index 38c40bcf0..fed390c82 100644
--- a/package.json
+++ b/package.json
@@ -1,9 +1,9 @@
 {
   "name": "peertube",
   "description": "Federated (ActivityPub) video streaming platform using P2P (BitTorrent) directly in the web browser with WebTorrent and Angular.",
-  "version": "1.4.0",
+  "version": "2.1.0-rc.1",
   "private": true,
-  "licence": "AGPLv3",
+  "licence": "AGPL-3.0",
   "engines": {
     "node": ">=8.x"
   },
@@ -24,14 +24,13 @@
     "e2e": "scripty",
     "e2e:local": "scripty",
     "setup:cli": "scripty",
-    "build": "SCRIPTY_PARALLEL=true scripty",
+    "build": "scripty",
+    "build:embed": "scripty",
     "build:server": "scripty",
     "build:client": "scripty",
     "clean:client": "scripty",
     "clean:server": "scripty",
     "clean:server:test": "scripty",
-    "watch:client": "scripty",
-    "watch:server": "scripty",
     "danger:clean:dev": "scripty",
     "danger:clean:prod": "scripty",
     "danger:clean:modules": "scripty",
@@ -42,9 +41,10 @@
     "i18n:create-custom-files": "node ./dist/scripts/i18n/create-custom-files.js",
     "reset-password": "node ./dist/scripts/reset-password.js",
     "play": "scripty",
-    "dev": "scripty",
-    "dev:server": "scripty",
-    "dev:client": "scripty",
+    "dev": "sh ./scripts/dev/index.sh",
+    "dev:server": "sh ./scripts/dev/server.sh",
+    "dev:embed": "scripty",
+    "dev:client": "sh ./scripts/dev/client.sh",
     "dev:cli": "scripty",
     "start": "node dist/server",
     "start:server": "node dist/server --no-client",
@@ -72,27 +72,11 @@
     "mocha": "mocha",
     "ci": "scripty",
     "release": "scripty",
+    "release-embed-api": "scripty",
     "nightly": "scripty",
-    "client-report": "scripty"
-  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
-  },
-  "lint-staged": {
-    "*.scss": [
-      "sass-lint -c client/.sass-lint.yml",
-      "git add"
-    ],
-    "support/doc/api/*.yaml": [
-      "node ./node_modules/swagger-cli/bin/swagger-cli.js validate support/doc/api/openapi.yaml",
-      "git add"
-    ],
-    "server/tools/README.md": [
-      "npm run generate-cli-doc",
-      "git add"
-    ]
+    "client-report": "scripty",
+    "swagger-cli": "swagger-cli",
+    "sass-lint": "sass-lint"
   },
   "resolutions": {
     "@types/bluebird": "3.5.27"
@@ -101,13 +85,13 @@
     "apicache": "^1.4.0",
     "async": "^3.0.1",
     "async-lru": "^1.1.1",
-    "bcrypt": "3.0.6",
+    "bcrypt": "3.0.7",
     "bittorrent-tracker": "^9.0.0",
     "bluebird": "^3.5.0",
     "body-parser": "^1.12.4",
     "bull": "^3.4.2",
     "bytes": "^3.0.0",
-    "commander": "^2.13.0",
+    "commander": "^4.0.1",
     "config": "^3.0.0",
     "cookie-parser": "^1.4.3",
     "cors": "^2.8.1",
@@ -117,46 +101,46 @@
     "express-oauth-server": "^2.0.0",
     "express-rate-limit": "^4.0.4",
     "express-validator": "^6.1.1",
-    "flat": "^4.1.0",
+    "flat": "^5.0.0",
     "fluent-ffmpeg": "^2.1.0",
     "fs-extra": "^8.0.1",
     "helmet": "^3.12.1",
-    "http-signature": "^1.2.0",
+    "http-signature": "1.3.1",
     "ip-anonymize": "^0.1.0",
     "ipaddr.js": "1.9.1",
     "is-cidr": "^3.0.0",
     "iso-639-3": "^1.0.1",
     "js-yaml": "^3.5.4",
-    "jsonld": "~1.1.0",
+    "jsonld": "~2.0.1",
     "lodash": "^4.17.10",
     "lru-cache": "^5.1.1",
     "magnet-uri": "^5.1.4",
     "memoizee": "^0.4.14",
-    "module-alias": "^2.2.1",
     "morgan": "^1.5.3",
     "multer": "^1.1.0",
     "nodemailer": "^6.0.0",
     "parse-torrent": "^7.0.0",
     "password-generator": "^2.0.2",
     "pem": "^1.12.3",
-    "pfeed": "^1.1.6",
+    "pfeed": "1.1.11",
     "pg": "^7.4.1",
     "prompt": "^1.0.0",
     "redis": "^2.8.0",
     "reflect-metadata": "^0.1.12",
     "request": "^2.81.0",
     "scripty": "^1.5.0",
-    "sequelize": "5.13.1",
+    "sequelize": "5.21.3",
     "sequelize-typescript": "^1.0.0-beta.4",
-    "sharp": "^0.22.0",
-    "sitemap": "^2",
+    "sharp": "^0.23.3",
+    "sitemap": "^5.0.0",
     "socket.io": "^2.2.0",
     "srt-to-vtt": "^1.1.2",
+    "tsconfig-paths": "^3.9.0",
     "useragent": "^2.3.0",
     "uuid": "^3.1.0",
-    "validator": "^11.0.0",
+    "validator": "^12.1.0",
     "webfinger.js": "^2.6.6",
-    "webtorrent": "^0.105.1",
+    "webtorrent": "^0.107.16",
     "winston": "3.2.1",
     "ws": "^7.0.0",
     "youtube-dl": "^2.0.0"
@@ -173,7 +157,7 @@
     "@types/chai": "^4.0.4",
     "@types/chai-json-schema": "^1.4.3",
     "@types/chai-xml": "^0.3.1",
-    "@types/config": "^0.0.34",
+    "@types/config": "^0.0.36",
     "@types/express": "^4.0.35",
     "@types/express-rate-limit": "^3.3.0",
     "@types/fluent-ffmpeg": "^2.1.8",
@@ -194,32 +178,31 @@
     "@types/pem": "^1.9.3",
     "@types/redis": "^2.8.5",
     "@types/request": "^2.0.3",
-    "@types/sharp": "^0.22.1",
+    "@types/sharp": "^0.23.0",
     "@types/socket.io": "^2.1.2",
     "@types/supertest": "^2.0.3",
-    "@types/validator": "^10.9.0",
-    "@types/webtorrent": "^0.98.4",
+    "@types/validator": "^12.0.1",
+    "@types/webtorrent": "^0.107.0",
     "@types/ws": "^6.0.0",
     "chai": "^4.1.1",
     "chai-json-schema": "^1.5.0",
     "chai-xml": "^0.3.2",
-    "concurrently": "^4.1.0",
-    "husky": "^3.0.1",
-    "libxmljs": "0.19.5",
+    "concurrently": "^5.0.0",
+    "libxmljs": "0.19.7",
     "lint-staged": "^9.2.0",
     "maildev": "^1.0.0-rc3",
-    "marked-man": "^0.6.0",
-    "mocha": "^6.0.0",
+    "marked": "^0.8.0",
+    "marked-man": "^0.7.0",
+    "mocha": "^7.0.0",
     "mocha-parallel-tests": "^2.2.1",
-    "nodemon": "^1.18.6",
-    "sass-lint": "^1.12.1",
+    "nodemon": "^2.0.1",
     "source-map-support": "^0.5.0",
     "supertest": "^4.0.2",
     "swagger-cli": "^2.2.0",
-    "ts-node": "8.3.0",
+    "ts-node": "8.5.4",
     "tslint": "^5.7.0",
-    "tslint-config-standard": "^8.0.1",
-    "typescript": "^3.4.3",
+    "tslint-config-standard": "^9.0.0",
+    "typescript": "^3.7.2",
     "xliff": "^4.0.0"
   },
   "scripty": {