aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--package.json53
-rwxr-xr-xscripts/clean/client/index.sh (renamed from scripts/clean/client/dist.sh)0
-rwxr-xr-xscripts/clean/server/dist.sh5
-rw-r--r--scripts/danger/clean/cleaner.ts34
-rwxr-xr-xscripts/danger/clean/dev.sh10
-rwxr-xr-xscripts/danger/clean/modules.sh9
-rwxr-xr-xscripts/danger/clean/prod.sh10
-rwxr-xr-xscripts/help.sh5
-rwxr-xr-xscripts/play.sh15
-rw-r--r--yarn.lock33
10 files changed, 24 insertions, 150 deletions
diff --git a/package.json b/package.json
index ebfd192cf..8552a9d60 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
5 "private": true, 5 "private": true,
6 "licence": "AGPL-3.0", 6 "licence": "AGPL-3.0",
7 "engines": { 7 "engines": {
8 "node": ">=10.x <=15", 8 "node": ">=10.x",
9 "yarn": ">=1.x", 9 "yarn": ">=1.x",
10 "postgres": ">=10.x", 10 "postgres": ">=10.x",
11 "redis-server": ">=2.8.18", 11 "redis-server": ">=2.8.18",
@@ -25,30 +25,25 @@
25 }, 25 },
26 "typings": "*.d.ts", 26 "typings": "*.d.ts",
27 "scripts": { 27 "scripts": {
28 "e2e": "scripty", 28 "e2e": "sh ./scripts/e2e/index.sh",
29 "e2e:local": "scripty", 29 "e2e:local": "sh ./scripts/e2e/local.sh",
30 "setup:cli": "scripty", 30 "setup:cli": "sh ./scripts/setup/cli.sh",
31 "build": "scripty", 31 "build": "sh ./scripts/build/index.sh",
32 "build:embed": "scripty", 32 "build:embed": "sh ./scripts/build/embed.sh",
33 "build:server": "scripty", 33 "build:server": "sh ./scripts/build/server.sh",
34 "build:client": "scripty", 34 "build:client": "sh ./scripts/build/client.sh",
35 "clean:client": "scripty", 35 "clean:client": "sh ./scripts/clean/client/index.sh",
36 "clean:server": "scripty", 36 "clean:server:test": "sh ./scripts/clean/server/test.sh",
37 "clean:server:test": "scripty", 37 "i18n:update": "sh ./scripts/i18n/update.sh",
38 "danger:clean:dev": "scripty",
39 "danger:clean:prod": "scripty",
40 "danger:clean:modules": "scripty",
41 "i18n:update": "scripty",
42 "plugin:install": "node ./dist/scripts/plugin/install.js", 38 "plugin:install": "node ./dist/scripts/plugin/install.js",
43 "plugin:uninstall": "node ./dist/scripts/plugin/uninstall.js", 39 "plugin:uninstall": "node ./dist/scripts/plugin/uninstall.js",
44 "i18n:create-custom-files": "node ./dist/scripts/i18n/create-custom-files.js", 40 "i18n:create-custom-files": "node ./dist/scripts/i18n/create-custom-files.js",
45 "reset-password": "node ./dist/scripts/reset-password.js", 41 "reset-password": "node ./dist/scripts/reset-password.js",
46 "play": "scripty",
47 "dev": "sh ./scripts/dev/index.sh", 42 "dev": "sh ./scripts/dev/index.sh",
48 "dev:server": "sh ./scripts/dev/server.sh", 43 "dev:server": "sh ./scripts/dev/server.sh",
49 "dev:embed": "scripty", 44 "dev:embed": "sh ./scripts/dev/embed.sh",
50 "dev:client": "sh ./scripts/dev/client.sh", 45 "dev:client": "sh ./scripts/dev/client.sh",
51 "dev:cli": "scripty", 46 "dev:cli": "sh ./scripts/dev/cli.sh",
52 "start": "node dist/server", 47 "start": "node dist/server",
53 "start:server": "node dist/server --no-client", 48 "start:server": "node dist/server --no-client",
54 "update-host": "node ./dist/scripts/update-host.js", 49 "update-host": "node ./dist/scripts/update-host.js",
@@ -56,9 +51,9 @@
56 "regenerate-thumbnails": "node ./dist/scripts/regenerate-thumbnails.js", 51 "regenerate-thumbnails": "node ./dist/scripts/regenerate-thumbnails.js",
57 "create-import-video-file-job": "node ./dist/scripts/create-import-video-file-job.js", 52 "create-import-video-file-job": "node ./dist/scripts/create-import-video-file-job.js",
58 "print-transcode-command": "node ./dist/scripts/print-transcode-command.js", 53 "print-transcode-command": "node ./dist/scripts/print-transcode-command.js",
59 "test": "scripty", 54 "test": "sh ./scripts/test.sh",
60 "help": "scripty", 55 "help": "sh ./scripts/help.sh",
61 "generate-cli-doc": "scripty", 56 "generate-cli-doc": "sh ./scripts/generate-cli-doc.sh",
62 "parse-log": "node ./dist/scripts/parse-log.js", 57 "parse-log": "node ./dist/scripts/parse-log.js",
63 "prune-storage": "node ./dist/scripts/prune-storage.js", 58 "prune-storage": "node ./dist/scripts/prune-storage.js",
64 "optimize-old-videos": "node ./dist/scripts/optimize-old-videos.js", 59 "optimize-old-videos": "node ./dist/scripts/optimize-old-videos.js",
@@ -72,12 +67,12 @@
72 "eslint": "eslint", 67 "eslint": "eslint",
73 "concurrently": "concurrently", 68 "concurrently": "concurrently",
74 "mocha": "mocha", 69 "mocha": "mocha",
75 "ci": "scripty", 70 "ci": "sh ./scripts/ci.sh",
76 "release": "scripty", 71 "release": "sh ./scripts/release.sh",
77 "release-embed-api": "scripty", 72 "release-embed-api": "sh ./scripts/release-embed-api.sh",
78 "nightly": "scripty", 73 "nightly": "sh ./scripts/nightly.sh",
79 "openapi-clients": "scripty", 74 "openapi-clients": "sh ./scripts/openapi-clients.sh",
80 "client-report": "scripty", 75 "client-report": "sh ./scripts/client-report.sh",
81 "swagger-cli": "swagger-cli" 76 "swagger-cli": "swagger-cli"
82 }, 77 },
83 "dependencies": { 78 "dependencies": {
@@ -136,7 +131,6 @@
136 "redis": "^3.0.2", 131 "redis": "^3.0.2",
137 "reflect-metadata": "^0.1.12", 132 "reflect-metadata": "^0.1.12",
138 "sanitize-html": "2.x", 133 "sanitize-html": "2.x",
139 "scripty": "^2.0.0",
140 "sequelize": "6.6.2", 134 "sequelize": "6.6.2",
141 "sequelize-typescript": "^2.0.0-beta.1", 135 "sequelize-typescript": "^2.0.0-beta.1",
142 "sitemap": "^6.1.0", 136 "sitemap": "^6.1.0",
@@ -216,9 +210,6 @@
216 "ts-node": "9.1.1", 210 "ts-node": "9.1.1",
217 "typescript": "^4.0.5" 211 "typescript": "^4.0.5"
218 }, 212 },
219 "scripty": {
220 "silent": true
221 },
222 "bundlewatch": { 213 "bundlewatch": {
223 "files": [ 214 "files": [
224 { 215 {
diff --git a/scripts/clean/client/dist.sh b/scripts/clean/client/index.sh
index 19b89de77..19b89de77 100755
--- a/scripts/clean/client/dist.sh
+++ b/scripts/clean/client/index.sh
diff --git a/scripts/clean/server/dist.sh b/scripts/clean/server/dist.sh
deleted file mode 100755
index 50722cb44..000000000
--- a/scripts/clean/server/dist.sh
+++ /dev/null
@@ -1,5 +0,0 @@
1#!/bin/sh
2
3set -eu
4
5rm -rf dist/
diff --git a/scripts/danger/clean/cleaner.ts b/scripts/danger/clean/cleaner.ts
deleted file mode 100644
index 69e8a63a0..000000000
--- a/scripts/danger/clean/cleaner.ts
+++ /dev/null
@@ -1,34 +0,0 @@
1import { registerTSPaths } from '../../../server/helpers/register-ts-paths'
2registerTSPaths()
3
4import * as Promise from 'bluebird'
5import * as rimraf from 'rimraf'
6import { initDatabaseModels, sequelizeTypescript } from '../../../server/initializers/database'
7import { CONFIG } from '../../../server/initializers/config'
8
9initDatabaseModels(true)
10 .then(() => {
11 return sequelizeTypescript.drop()
12 })
13 .then(() => {
14 console.info('Tables of %s deleted.', CONFIG.DATABASE.DBNAME)
15
16 const STORAGE = CONFIG.STORAGE
17 return Promise.mapSeries(Object.keys(STORAGE), storage => {
18 const storageDir = STORAGE[storage]
19
20 return new Promise((res, rej) => {
21 rimraf(storageDir, err => {
22 if (err) return rej(err)
23
24 console.info('%s deleted.', storageDir)
25 return res()
26 })
27 })
28 })
29 .then(() => process.exit(0))
30 })
31 .catch(err => {
32 console.error(err)
33 process.exit(-1)
34 })
diff --git a/scripts/danger/clean/dev.sh b/scripts/danger/clean/dev.sh
deleted file mode 100755
index 14b45e13b..000000000
--- a/scripts/danger/clean/dev.sh
+++ /dev/null
@@ -1,10 +0,0 @@
1#!/bin/bash
2
3set -eu
4
5read -p "This will remove all directories and SQL tables. Are you sure? (y/*) " -n 1 -r
6echo
7
8if [[ "$REPLY" =~ ^[Yy]$ ]]; then
9 NODE_ENV=test npm run ts-node -- --type-check "scripts/danger/clean/cleaner"
10fi
diff --git a/scripts/danger/clean/modules.sh b/scripts/danger/clean/modules.sh
deleted file mode 100755
index f59d6b675..000000000
--- a/scripts/danger/clean/modules.sh
+++ /dev/null
@@ -1,9 +0,0 @@
1#!/bin/bash
2
3set -eu
4
5read -p "This will remove all node server and client modules. Are you sure? " -n 1 -r
6
7if [[ "$REPLY" =~ ^[Yy]$ ]]; then
8 rm -rf node_modules client/node_modules
9fi
diff --git a/scripts/danger/clean/prod.sh b/scripts/danger/clean/prod.sh
deleted file mode 100755
index 0675600c4..000000000
--- a/scripts/danger/clean/prod.sh
+++ /dev/null
@@ -1,10 +0,0 @@
1#!/bin/bash
2
3set -eu
4
5read -p "This will remove all directories and SQL tables. Are you sure? (y/*) " -n 1 -r
6echo
7
8if [[ "$REPLY" =~ ^[Yy]$ ]]; then
9 NODE_ENV=production npm run ts-node -- --type-check "./scripts/danger/clean/cleaner"
10fi
diff --git a/scripts/help.sh b/scripts/help.sh
index bc38bdb40..da127092d 100755
--- a/scripts/help.sh
+++ b/scripts/help.sh
@@ -9,11 +9,6 @@ printf " build:server -> Build the server for production\n"
9printf " build:client -> Build the client for production\n" 9printf " build:client -> Build the client for production\n"
10printf " clean:client -> Clean the client build files (dist directory)\n" 10printf " clean:client -> Clean the client build files (dist directory)\n"
11printf " clean:server:test -> Clean logs, uploads, database... of the test instances\n" 11printf " clean:server:test -> Clean logs, uploads, database... of the test instances\n"
12printf " watch:client -> Watch and compile on the fly the client files\n"
13printf " danger:clean:dev -> /!\ Clean certificates, logs, uploads, thumbnails, torrents and database specified in the development environment\n"
14printf " danger:clean:prod -> /!\ Clean certificates, logs, uploads, thumbnails, torrents and database specified by the production environment\n"
15printf " danger:clean:modules -> /!\ Clean node and typescript modules\n"
16printf " play -> Run 3 fresh nodes so that you can test the communication between them\n"
17printf " reset-password -- -u [user] -> Reset the password of user [user]\n" 12printf " reset-password -- -u [user] -> Reset the password of user [user]\n"
18printf " create-transcoding-job -- -v [video UUID] \n" 13printf " create-transcoding-job -- -v [video UUID] \n"
19printf " -> Create a transcoding job for a particular video\n" 14printf " -> Create a transcoding job for a particular video\n"
diff --git a/scripts/play.sh b/scripts/play.sh
deleted file mode 100755
index 69725da93..000000000
--- a/scripts/play.sh
+++ /dev/null
@@ -1,15 +0,0 @@
1#!/bin/sh
2
3set -eu
4
5if [ ! -f "dist/server.js" ]; then
6 echo "Missing server file (server.js)."
7 exit -1
8fi
9
10max=${1:-3}
11
12for i in $(seq 1 "$max"); do
13 NODE_ENV=test NODE_APP_INSTANCE=$i node dist/server.js &
14 sleep 1
15done
diff --git a/yarn.lock b/yarn.lock
index 99a316f71..3ce730fbd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1349,13 +1349,6 @@ async@>=0.2.9, async@^3.0.1, async@^3.1.0:
1349 resolved "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz#b3a2685c5ebb641d3de02d161002c60fc9f85720" 1349 resolved "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz#b3a2685c5ebb641d3de02d161002c60fc9f85720"
1350 integrity sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw== 1350 integrity sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==
1351 1351
1352async@^2.6.1:
1353 version "2.6.3"
1354 resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
1355 integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
1356 dependencies:
1357 lodash "^4.17.14"
1358
1359async@~0.9.0: 1352async@~0.9.0:
1360 version "0.9.2" 1353 version "0.9.2"
1361 resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d" 1354 resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d"
@@ -3837,7 +3830,7 @@ glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@~5.1.0:
3837 dependencies: 3830 dependencies:
3838 is-glob "^4.0.1" 3831 is-glob "^4.0.1"
3839 3832
3840glob@7.1.6, glob@^7.0.3, glob@^7.1.3: 3833glob@7.1.6, glob@^7.1.3:
3841 version "7.1.6" 3834 version "7.1.6"
3842 resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" 3835 resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
3843 integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== 3836 integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
@@ -5014,7 +5007,7 @@ lodash@4.17.19:
5014 resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b" 5007 resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
5015 integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ== 5008 integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
5016 5009
5017lodash@4.17.21, lodash@>=4.17.13, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21: 5010lodash@4.17.21, lodash@>=4.17.13, lodash@^4.17.10, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21:
5018 version "4.17.21" 5011 version "4.17.21"
5019 resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" 5012 resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
5020 integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== 5013 integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -6902,23 +6895,11 @@ resolve-alpn@^1.0.0:
6902 resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.1.1.tgz#4a006a7d533c81a5dd04681612090fde227cd6e1" 6895 resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.1.1.tgz#4a006a7d533c81a5dd04681612090fde227cd6e1"
6903 integrity sha512-0KbFjFPR2bnJhNx1t8Ad6RqVc8+QPJC4y561FYyC/Q/6OzB3fhUzB5PEgitYhPK6aifwR5gXBSnDMllaDWixGQ== 6896 integrity sha512-0KbFjFPR2bnJhNx1t8Ad6RqVc8+QPJC4y561FYyC/Q/6OzB3fhUzB5PEgitYhPK6aifwR5gXBSnDMllaDWixGQ==
6904 6897
6905resolve-from@^2.0.0:
6906 version "2.0.0"
6907 resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-2.0.0.tgz#9480ab20e94ffa1d9e80a804c7ea147611966b57"
6908 integrity sha1-lICrIOlP+h2egKgEx+oUdhGWa1c=
6909
6910resolve-from@^4.0.0: 6898resolve-from@^4.0.0:
6911 version "4.0.0" 6899 version "4.0.0"
6912 resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" 6900 resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
6913 integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== 6901 integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
6914 6902
6915resolve-pkg@^1.0.0:
6916 version "1.0.0"
6917 resolved "https://registry.yarnpkg.com/resolve-pkg/-/resolve-pkg-1.0.0.tgz#e19a15e78aca2e124461dc92b2e3943ef93494d9"
6918 integrity sha1-4ZoV54rKLhJEYdySsuOUPvk0lNk=
6919 dependencies:
6920 resolve-from "^2.0.0"
6921
6922resolve@^1.10.0, resolve@^1.10.1, resolve@^1.13.1, resolve@^1.15.1, resolve@^1.17.0: 6903resolve@^1.10.0, resolve@^1.10.1, resolve@^1.13.1, resolve@^1.15.1, resolve@^1.17.0:
6923 version "1.20.0" 6904 version "1.20.0"
6924 resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" 6905 resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
@@ -7054,16 +7035,6 @@ sax@>=0.6.0, sax@^1.2.4:
7054 resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" 7035 resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
7055 integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== 7036 integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
7056 7037
7057scripty@^2.0.0:
7058 version "2.0.0"
7059 resolved "https://registry.yarnpkg.com/scripty/-/scripty-2.0.0.tgz#25761bb2e237a7563f705d87357db07791d38459"
7060 integrity sha512-vbd4FPeuNwYNGtRtYa1wDZLPCx5PpW6VrldCEiBGqPz7Je1xZOgNvVPD2axymvqNghBIRiXxAU+JwYrOzvuLJg==
7061 dependencies:
7062 async "^2.6.1"
7063 glob "^7.0.3"
7064 lodash "^4.17.11"
7065 resolve-pkg "^1.0.0"
7066
7067semver-diff@^3.1.1: 7038semver-diff@^3.1.1:
7068 version "3.1.1" 7039 version "3.1.1"
7069 resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b" 7040 resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b"