aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2022-09-28 14:55:15 +0200
committerChocobozzz <me@florianbigard.com>2022-09-28 14:55:15 +0200
commit31ee48d579c9e43bae8c16e6ba6568f99aecc146 (patch)
treefd39b295d5401d318045b16a828bf646d8053012
parent3fca30a7ef5de53dff7ef7b3122daa0849e4bdc0 (diff)
downloadPeerTube-31ee48d579c9e43bae8c16e6ba6568f99aecc146.tar.gz
PeerTube-31ee48d579c9e43bae8c16e6ba6568f99aecc146.tar.zst
PeerTube-31ee48d579c9e43bae8c16e6ba6568f99aecc146.zip
Fix error when running setup:cli
-rw-r--r--package.json2
-rwxr-xr-xscripts/dev/cli.sh2
-rwxr-xr-xscripts/setup/cli.sh1
3 files changed, 1 insertions, 4 deletions
diff --git a/package.json b/package.json
index 5eeca42a9..dd913896d 100644
--- a/package.json
+++ b/package.json
@@ -63,9 +63,7 @@
63 "ts-node": "ts-node", 63 "ts-node": "ts-node",
64 "eslint": "eslint", 64 "eslint": "eslint",
65 "resolve-tspaths": "resolve-tspaths", 65 "resolve-tspaths": "resolve-tspaths",
66 "resolve-tspaths:all": "npm run resolve-tspaths:server && npm run resolve-tspaths:cli",
67 "resolve-tspaths:server": "npm run resolve-tspaths -- --project tsconfig.json --src . --out dist", 66 "resolve-tspaths:server": "npm run resolve-tspaths -- --project tsconfig.json --src . --out dist",
68 "resolve-tspaths:cli": "npm run resolve-tspaths -- --project ./server/tools/tsconfig.json --src ./server/tools --out ./dist/server/tools",
69 "concurrently": "concurrently", 67 "concurrently": "concurrently",
70 "mocha": "mocha", 68 "mocha": "mocha",
71 "ci": "bash ./scripts/ci.sh", 69 "ci": "bash ./scripts/ci.sh",
diff --git a/scripts/dev/cli.sh b/scripts/dev/cli.sh
index 327792a19..39ecaad94 100755
--- a/scripts/dev/cli.sh
+++ b/scripts/dev/cli.sh
@@ -13,4 +13,4 @@ mkdir -p "./dist/server/tools"
13cp -r "./server/tools/node_modules" "./dist/server/tools" 13cp -r "./server/tools/node_modules" "./dist/server/tools"
14 14
15cd ./server/tools 15cd ./server/tools
16../../node_modules/.bin/tsc-watch --build --verbose --onSuccess 'sh -c "cd ../../ && npm run resolve-tspaths:all"' 16../../node_modules/.bin/tsc-watch --build --verbose --onSuccess 'sh -c "cd ../../ && npm run resolve-tspaths:server"'
diff --git a/scripts/setup/cli.sh b/scripts/setup/cli.sh
index f84260f23..2e9b8a505 100755
--- a/scripts/setup/cli.sh
+++ b/scripts/setup/cli.sh
@@ -14,5 +14,4 @@ rm -rf ./dist/server/tools/
14 14
15cp -r "./server/tools/node_modules" "./dist/server/tools" 15cp -r "./server/tools/node_modules" "./dist/server/tools"
16 16
17npm run resolve-tspaths:cli
18npm run resolve-tspaths:server 17npm run resolve-tspaths:server