X-Git-Url: https://git.librecmc.org/?p=oweals%2Fpeertube.git;a=blobdiff_plain;f=package.json;h=7f25e1346034450494b654996647bbebc7f26a5b;hp=2118c9dcfd479a348c82550bcbb609905a9f2b0f;hb=df8c65d783cca3258c891f309aad0b8f39b7cda8;hpb=4c72c1cd411b4ff7ed054b584f184117bae91d5b

diff --git a/package.json b/package.json
index 2118c9dcf..7f25e1346 100644
--- a/package.json
+++ b/package.json
@@ -1,11 +1,12 @@
 {
   "name": "peertube",
   "description": "Federated (ActivityPub) video streaming platform using P2P (BitTorrent) directly in the web browser with WebTorrent and Angular.",
-  "version": "1.3.0-rc.2",
+  "version": "2.2.0",
   "private": true,
-  "licence": "AGPLv3",
+  "licence": "AGPL-3.0",
   "engines": {
-    "node": ">=8.x"
+    "node": ">=10.x <13",
+    "yarn": ">=1.x"
   },
   "bin": {
     "peertube": "dist/server/tools/peertube.js"
@@ -24,25 +25,27 @@
     "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",
     "i18n:generate": "scripty",
-    "i18n:xliff2json": "node ./dist/scripts/i18n/xliff2json.js",
+    "plugin:install": "node ./dist/scripts/plugin/install.js",
+    "plugin:uninstall": "node ./dist/scripts/plugin/uninstall.js",
     "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",
     "update-host": "node ./dist/scripts/update-host.js",
@@ -57,167 +60,163 @@
     "postinstall": "test -n \"$NOCLIENT\" || (cd client && yarn install --pure-lockfile)",
     "tsc": "tsc",
     "commander": "commander",
+    "lint": "npm run ci -- lint",
     "ng": "ng",
     "nodemon": "nodemon",
     "ts-node": "ts-node",
-    "tslint": "tslint",
+    "eslint": "eslint",
     "concurrently": "concurrently",
     "sasslint": "sass-lint --verbose --no-exit",
     "sasslint:fix": "sass-lint-auto-fix -c .sass-lint.yml --verbose",
     "mocha": "mocha",
-    "travis": "scripty",
+    "ci": "scripty",
     "release": "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"
-    ]
+    "release-embed-api": "scripty",
+    "nightly": "scripty",
+    "openapi-clients": "scripty",
+    "client-report": "scripty",
+    "swagger-cli": "swagger-cli",
+    "sass-lint": "sass-lint"
   },
   "resolutions": {
-    "@types/bluebird": "3.5.21"
+    "oauth2-server": "^3.1.0-beta.1",
+    "http-signature": "1.3.4"
   },
   "dependencies": {
     "apicache": "^1.4.0",
-    "async": "^2.0.0",
+    "async": "^3.0.1",
     "async-lru": "^1.1.1",
-    "bcrypt": "3.0.5",
+    "bcrypt": "5.0.0",
     "bittorrent-tracker": "^9.0.0",
     "bluebird": "^3.5.0",
     "body-parser": "^1.12.4",
     "bull": "^3.4.2",
     "bytes": "^3.0.0",
-    "cli-table": "^0.3.1",
-    "commander": "^2.13.0",
+    "commander": "^5.0.0",
     "config": "^3.0.0",
     "cookie-parser": "^1.4.3",
     "cors": "^2.8.1",
-    "create-torrent": "^3.24.5",
+    "create-torrent": "^4.0.0",
     "deep-object-diff": "^1.1.0",
+    "email-templates": "^7.0.4",
     "express": "^4.12.4",
     "express-oauth-server": "^2.0.0",
-    "express-rate-limit": "^3.1.0",
-    "express-validator": "^5.0.0",
-    "flat": "^4.1.0",
+    "express-rate-limit": "^5.0.0",
+    "express-validator": "^6.4.0",
+    "flat": "^5.0.0",
     "fluent-ffmpeg": "^2.1.0",
-    "fs-extra": "^7.0.0",
+    "fs-extra": "^9.0.0",
     "helmet": "^3.12.1",
-    "http-signature": "^1.2.0",
-    "ip-anonymize": "^0.0.6",
-    "ipaddr.js": "1.9.0",
-    "is-cidr": "^3.0.0",
-    "iso-639-3": "^1.0.1",
+    "http-signature": "1.3.4",
+    "ip-anonymize": "^0.1.0",
+    "ipaddr.js": "1.9.1",
+    "is-cidr": "^4.0.0",
+    "iso-639-3": "^2.0.0",
+    "jimp": "^0.13.0",
     "js-yaml": "^3.5.4",
-    "jsonld": "~1.1.0",
-    "jsonld-signatures": "https://github.com/Chocobozzz/jsonld-signatures#rsa2017",
+    "jsonld": "~3.1.1",
     "lodash": "^4.17.10",
+    "lru-cache": "^5.1.1",
     "magnet-uri": "^5.1.4",
     "memoizee": "^0.4.14",
     "morgan": "^1.5.3",
     "multer": "^1.1.0",
-    "netrc-parser": "^3.1.6",
     "nodemailer": "^6.0.0",
-    "parse-torrent": "^6.0.0",
+    "oauth2-server": "3.1.0-beta.1",
+    "parse-torrent": "^7.0.0",
     "password-generator": "^2.0.2",
     "pem": "^1.12.3",
-    "pfeed": "^1.1.6",
-    "pg": "^7.4.1",
+    "pfeed": "1.1.11",
+    "pg": "^8.2.1",
     "prompt": "^1.0.0",
-    "redis": "^2.8.0",
+    "pug": "^3.0.0",
+    "redis": "^3.0.2",
     "reflect-metadata": "^0.1.12",
     "request": "^2.81.0",
-    "scripty": "^1.5.0",
-    "sequelize": "5.7.4",
-    "sequelize-typescript": "1.0.0-beta.2",
-    "sharp": "^0.22.0",
-    "sitemap": "^2.1.0",
+    "scripty": "^2.0.0",
+    "sequelize": "5.21.13",
+    "sequelize-typescript": "^1.0.0-beta.4",
+    "sitemap": "^6.1.0",
     "socket.io": "^2.2.0",
     "srt-to-vtt": "^1.1.2",
+    "tsconfig-paths": "^3.9.0",
+    "tslib": "^2.0.0",
     "useragent": "^2.3.0",
-    "uuid": "^3.1.0",
-    "validator": "^10.2.0",
+    "uuid": "^8.1.0",
+    "validator": "^13.0.0",
     "webfinger.js": "^2.6.6",
-    "webtorrent": "^0.103.0",
+    "webtorrent": "^0.108.6",
     "winston": "3.2.1",
-    "ws": "^6.0.0",
-    "youtube-dl": "^1.12.2"
+    "ws": "^7.0.0",
+    "youtube-dl": "^3.0.2"
   },
   "devDependencies": {
+    "@openapitools/openapi-generator-cli": "^1.0.13-4.3.1",
     "@types/apicache": "^1.2.0",
-    "@types/async": "^2.0.40",
+    "@types/async": "^3.0.0",
     "@types/async-lock": "^1.1.0",
     "@types/bcrypt": "^3.0.0",
-    "@types/bluebird": "3.5.21",
+    "@types/bluebird": "3.5.32",
     "@types/body-parser": "^1.16.3",
-    "@types/bull": "3.4.0",
+    "@types/bull": "3.14.0",
     "@types/bytes": "^3.0.0",
     "@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/express-rate-limit": "^5.0.0",
     "@types/fluent-ffmpeg": "^2.1.8",
-    "@types/fs-extra": "^5.0.4",
+    "@types/fs-extra": "^9.0.1",
     "@types/libxmljs": "^0.18.0",
     "@types/lodash": "^4.14.64",
+    "@types/lru-cache": "^5.1.0",
     "@types/magnet-uri": "^5.1.1",
     "@types/maildev": "^0.0.1",
     "@types/memoizee": "^0.4.2",
-    "@types/mkdirp": "^0.5.1",
-    "@types/mocha": "^5.0.0",
+    "@types/mkdirp": "^1.0.0",
+    "@types/mocha": "^7.0.1",
     "@types/morgan": "^1.7.32",
     "@types/multer": "^1.3.3",
-    "@types/node": "^10.0.8",
-    "@types/nodemailer": "^4.3.1",
+    "@types/node": "^14.0.13",
+    "@types/nodemailer": "^6.2.0",
     "@types/oauth2-server": "^3.0.8",
     "@types/pem": "^1.9.3",
     "@types/redis": "^2.8.5",
     "@types/request": "^2.0.3",
-    "@types/sharp": "^0.22.1",
     "@types/socket.io": "^2.1.2",
     "@types/supertest": "^2.0.3",
-    "@types/validator": "^10.9.0",
-    "@types/webtorrent": "^0.98.4",
-    "@types/ws": "^6.0.0",
+    "@types/validator": "^13.0.0",
+    "@types/webtorrent": "^0.107.0",
+    "@types/ws": "^7.2.1",
+    "@typescript-eslint/eslint-plugin": "^3.3.0",
     "chai": "^4.1.1",
     "chai-json-schema": "^1.5.0",
     "chai-xml": "^0.3.2",
-    "concurrently": "^4.1.0",
-    "husky": "^1.0.0-rc.4",
-    "libxmljs": "0.19.5",
-    "lint-staged": "^8.0.4",
+    "concurrently": "^5.0.0",
+    "eslint": "^7.2.0",
+    "eslint-config-standard-with-typescript": "^18.0.2",
+    "eslint-plugin-import": "^2.20.1",
+    "eslint-plugin-node": "^11.0.0",
+    "eslint-plugin-promise": "^4.2.1",
+    "eslint-plugin-standard": "^4.0.1",
+    "libxmljs": "0.19.7",
     "maildev": "^1.0.0-rc3",
-    "marked-man": "^0.4.2",
-    "mocha": "^6.0.0",
-    "mocha-parallel-tests": "^2.1.0",
-    "nodemon": "^1.18.6",
-    "sass-lint": "^1.12.1",
+    "marked": "^1.1.0",
+    "marked-man": "^0.7.0",
+    "mocha": "^8.0.1",
+    "nodemon": "^2.0.1",
     "source-map-support": "^0.5.0",
     "supertest": "^4.0.2",
-    "swagger-cli": "^2.2.0",
-    "ts-node": "8.0.3",
-    "tslint": "^5.7.0",
-    "tslint-config-standard": "^8.0.1",
-    "typescript": "^3.4.3",
-    "xliff": "^4.0.0"
+    "swagger-cli": "^4.0.2",
+    "ts-node": "8.10.2",
+    "typescript": "^3.7.2"
   },
   "scripty": {
     "silent": true
   },
-  "sasslintConfig": "client/.sass-lint.yml"
+  "sasslintConfig": "client/.sass-lint.yml",
+  "_moduleAliases": {
+    "@server": "dist/server"
+  }
 }