1 files changed, 50 insertions, 39 deletions

diff --git a/package.json b/package.json
index 7573232a1..89f8fd4ed 100644
--- a/package.json
+++ b/package.json
@@ -8,9 +8,7 @@
     "node": ">=16.x",
     "yarn": ">=1.x"
   },
-  "bin": {
-    "peertube": "dist/server/tools/peertube.js"
-  },
+  "type": "module",
   "author": {
     "name": "Chocobozzz",
     "email": "chocobozzz@framasoft.org",
@@ -21,49 +19,60 @@
     "url": "git+https://github.com/Chocobozzz/PeerTube.git"
   },
   "typings": "*.d.ts",
+  "workspaces": [
+    "packages/*",
+    "server"
+  ],
   "scripts": {
     "e2e:browserstack": "bash ./scripts/e2e/browserstack.sh",
     "e2e:local": "bash ./scripts/e2e/local.sh",
-    "setup:cli": "bash ./scripts/setup/cli.sh",
     "build": "bash ./scripts/build/index.sh",
     "build:embed": "bash ./scripts/build/embed.sh",
     "build:server": "bash ./scripts/build/server.sh",
     "build:client": "bash ./scripts/build/client.sh",
     "build:peertube-runner": "bash ./scripts/build/peertube-runner.sh",
+    "build:peertube-cli": "bash ./scripts/build/peertube-cli.sh",
+    "build:tests": "bash ./scripts/build/tests.sh",
     "clean:client": "bash ./scripts/clean/client/index.sh",
     "clean:server:test": "bash ./scripts/clean/server/test.sh",
     "i18n:update": "bash ./scripts/i18n/update.sh",
-    "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",
     "dev": "bash ./scripts/dev/index.sh",
     "dev:server": "bash ./scripts/dev/server.sh",
     "dev:embed": "bash ./scripts/dev/embed.sh",
     "dev:client": "bash ./scripts/dev/client.sh",
-    "dev:cli": "bash ./scripts/dev/cli.sh",
+    "dev:peertube-cli": "bash ./scripts/dev/peertube-cli.sh",
     "dev:peertube-runner": "bash ./scripts/dev/peertube-runner.sh",
     "start": "node dist/server",
     "start:server": "node dist/server --no-client",
+    "plugin:install": "node ./dist/scripts/plugin/install.js",
+    "plugin:uninstall": "node ./dist/scripts/plugin/uninstall.js",
+    "reset-password": "node ./dist/scripts/reset-password.js",
     "update-host": "node ./dist/scripts/update-host.js",
     "regenerate-thumbnails": "node ./dist/scripts/regenerate-thumbnails.js",
     "create-import-video-file-job": "node ./dist/scripts/create-import-video-file-job.js",
     "create-move-video-storage-job": "node ./dist/scripts/create-move-video-storage-job.js",
     "create-generate-storyboard-job": "node ./dist/scripts/create-generate-storyboard-job.js",
-    "test": "bash ./scripts/test.sh",
-    "generate-cli-doc": "bash ./scripts/generate-cli-doc.sh",
-    "generate-types-package": "ts-node ./packages/types/generate-package.ts",
     "parse-log": "node ./dist/scripts/parse-log.js",
     "prune-storage": "node ./dist/scripts/prune-storage.js",
+    "test": "bash ./scripts/test.sh",
+    "generate-cli-doc": "bash ./scripts/generate-cli-doc.sh",
+    "generate-types-package": "tsx --conditions=peertube:tsx ./packages/types-generator/generate-package.ts",
+    "i18n:create-custom-files": "tsx --conditions=peertube:tsx ./scripts/i18n/create-custom-files.ts",
+    "benchmark-server": "tsx --conditions=peertube:tsx ./scripts/benchmark.ts",
+    "client:build-stats": "tsx --conditions=peertube:tsx ./scripts/client-build-stats.ts",
+    "generate-code-contributors": "tsx --conditions=peertube:tsx ./scripts/generate-code-contributors.ts",
+    "simulate-many-viewers": "tsx --conditions=peertube:tsx ./scripts/simulate-many-viewers.ts",
     "postinstall": "test -n \"$NOCLIENT\" || (cd client && yarn install --pure-lockfile)",
     "tsc": "tsc",
     "commander": "commander",
     "lint": "npm run ci -- lint",
     "ng": "ng",
-    "ts-node": "ts-node",
+    "tsx": "tsx",
     "eslint": "eslint",
     "resolve-tspaths": "resolve-tspaths",
-    "resolve-tspaths:server": "npm run resolve-tspaths -- --project tsconfig.json --src . --out dist",
+    "resolve-tspaths:server": "npm run resolve-tspaths -- --project server/tsconfig.json --src server --out dist",
+    "resolve-tspaths:server-lib": "npm run resolve-tspaths -- --project server/tsconfig.lib.json --src server --out server/dist",
+    "resolve-tspaths:tests": "npm run resolve-tspaths -- --project packages/tests/tsconfig.json --src packages/tests/src --out packages/tests/dist",
     "concurrently": "concurrently",
     "mocha": "mocha",
     "ci": "bash ./scripts/ci.sh",
@@ -80,29 +89,30 @@
     "@aws-sdk/node-http-handler": "^3.190.0",
     "@aws-sdk/s3-request-presigner": "^3.345.0",
     "@babel/parser": "^7.17.8",
+    "@commander-js/extra-typings": "^11.0.0",
     "@node-oauth/oauth2-server": "^4.2.0",
     "@opentelemetry/api": "^1.1.0",
-    "@opentelemetry/exporter-jaeger": "^1.3.1",
-    "@opentelemetry/exporter-prometheus": "~0.39.1",
-    "@opentelemetry/instrumentation": "^0.39.1",
-    "@opentelemetry/instrumentation-dns": "^0.31.2",
-    "@opentelemetry/instrumentation-express": "^0.32.1",
-    "@opentelemetry/instrumentation-fs": "^0.7.0",
-    "@opentelemetry/instrumentation-http": "^0.39.1",
-    "@opentelemetry/instrumentation-ioredis": "^0.34.2",
-    "@opentelemetry/instrumentation-pg": "^0.35.2",
-    "@opentelemetry/resources": "^1.3.1",
-    "@opentelemetry/sdk-metrics": "^1.8.0",
-    "@opentelemetry/sdk-trace-base": "^1.3.1",
-    "@opentelemetry/sdk-trace-node": "^1.3.1",
-    "@opentelemetry/semantic-conventions": "^1.3.1",
+    "@opentelemetry/exporter-jaeger": "^1.15.1",
+    "@opentelemetry/exporter-prometheus": "~0.41.1",
+    "@opentelemetry/instrumentation": "^0.41.1",
+    "@opentelemetry/instrumentation-dns": "^0.32.0",
+    "@opentelemetry/instrumentation-express": "^0.33.0",
+    "@opentelemetry/instrumentation-fs": "^0.8.0",
+    "@opentelemetry/instrumentation-http": "^0.41.1",
+    "@opentelemetry/instrumentation-ioredis": "^0.35.0",
+    "@opentelemetry/instrumentation-pg": "^0.36.0",
+    "@opentelemetry/resources": "^1.15.1",
+    "@opentelemetry/sdk-metrics": "^1.15.1",
+    "@opentelemetry/sdk-trace-base": "^1.15.1",
+    "@opentelemetry/sdk-trace-node": "^1.15.1",
+    "@opentelemetry/semantic-conventions": "^1.15.1",
     "@peertube/feed": "^5.1.0",
     "@peertube/http-signature": "^1.7.0",
     "@uploadx/core": "^6.0.0",
     "async-lru": "^1.1.1",
     "async-mutex": "^0.4.0",
     "bcrypt": "5.1.0",
-    "bencode": "^2.0.2",
+    "bencode": "^3.1.1",
     "bittorrent-tracker": "^9",
     "bluebird": "^3.5.0",
     "bullmq": "^3.6.6",
@@ -122,7 +132,7 @@
     "flat": "^5.0.0",
     "fluent-ffmpeg": "^2.1.0",
     "fs-extra": "^11.1.0",
-    "got": "^11.8.2",
+    "got": "^13.0.0",
     "helmet": "^7.0.0",
     "hpagent": "^1.0.0",
     "http-problem-details": "^0.1.5",
@@ -130,11 +140,11 @@
     "ip-anonymize": "^0.1.0",
     "ipaddr.js": "2.0.1",
     "is-cidr": "^4.0.0",
-    "iso-639-3": "2.2.0",
+    "iso-639-3": "3.0.1",
     "jimp": "^0.22.4",
     "js-yaml": "^4.0.0",
     "jsonld": "~8.2.0",
-    "lodash": "^4.17.21",
+    "lodash-es": "^4.17.21",
     "lru-cache": "^9.1.1",
     "magnet-uri": "^6",
     "markdown-it": "^13.0.1",
@@ -145,9 +155,9 @@
     "multer": "^1.4.5-lts.1",
     "node-media-server": "^2.1.4",
     "nodemailer": "^6.0.0",
-    "opentelemetry-instrumentation-sequelize": "^0.35.0",
+    "opentelemetry-instrumentation-sequelize": "^0.39.1",
     "otpauth": "^9.0.2",
-    "p-queue": "^6",
+    "p-queue": "^7.3.4",
     "parse-torrent": "^9",
     "password-generator": "^2.0.2",
     "pg": "^8.2.1",
@@ -164,7 +174,6 @@
     "socket.io": "^4.5.4",
     "sql-formatter": "^12.0.1",
     "srt-to-vtt": "^1.1.2",
-    "tsconfig-paths": "^4.0.0",
     "tslib": "^2.0.0",
     "useragent": "^2.3.0",
     "validator": "^13.0.0",
@@ -175,6 +184,7 @@
   },
   "devDependencies": {
     "@peertube/maildev": "^1.2.0",
+    "@peertube/resolve-tspaths": "^0.8.14",
     "@types/bcrypt": "^5.0.0",
     "@types/bencode": "^2.0.0",
     "@types/bluebird": "^3.5.33",
@@ -188,7 +198,8 @@
     "@types/express": "4.17.9",
     "@types/fluent-ffmpeg": "^2.1.16",
     "@types/fs-extra": "^11.0.1",
-    "@types/lodash": "^4.14.64",
+    "@types/jsonld": "^1.5.9",
+    "@types/lodash-es": "^4.17.8",
     "@types/magnet-uri": "^5.1.1",
     "@types/maildev": "^0.0.4",
     "@types/memoizee": "^0.4.2",
@@ -200,7 +211,7 @@
     "@types/oauth2-server": "^3.0.8",
     "@types/request": "^2.0.3",
     "@types/supertest": "^2.0.3",
-    "@types/validator": "^13.0.0",
+    "@types/validator": "^13.9.0",
     "@types/webtorrent": "^0.109.0",
     "@types/ws": "^8.2.0",
     "@typescript-eslint/eslint-plugin": "^5.0.0",
@@ -210,6 +221,7 @@
     "chai-xml": "^0.4.0",
     "concurrently": "^8.0.1",
     "depcheck": "^1.4.2",
+    "esbuild": "^0.19.0",
     "eslint": "8.41.0",
     "eslint-config-standard-with-typescript": "34.0.1",
     "eslint-plugin-import": "^2.20.1",
@@ -222,12 +234,11 @@
     "pixelmatch": "^5.3.0",
     "pngjs": "^7.0.0",
     "proxy": "^2.1.1",
-    "resolve-tspaths": "^0.8.8",
     "socket.io-client": "^4.5.4",
     "supertest": "^6.0.1",
     "swagger-cli": "^4.0.2",
-    "ts-node": "^10.8.1",
     "tsc-watch": "^6.0.0",
+    "tsx": "^3.12.7",
     "typescript": "~5.0.4"
   },
   "bundlewatch": {