Fix error when running setup:cli

diff --git a/package.json b/package.json
index 5eeca42a9e3a856c136e51e635a10ad918adca30..dd913896d812b71f3106a7a5f55f318db813d677 100644 (file)
--- a/package.json
+++ b/package.json
@@ -63,9 +63,7 @@
     "ts-node": "ts-node",
     "eslint": "eslint",
     "resolve-tspaths": "resolve-tspaths",
-    "resolve-tspaths:all": "npm run resolve-tspaths:server && npm run resolve-tspaths:cli",
     "resolve-tspaths:server": "npm run resolve-tspaths -- --project tsconfig.json --src . --out dist",
-    "resolve-tspaths:cli": "npm run resolve-tspaths -- --project ./server/tools/tsconfig.json --src ./server/tools --out ./dist/server/tools",
     "concurrently": "concurrently",
     "mocha": "mocha",
     "ci": "bash ./scripts/ci.sh",

diff --git a/scripts/dev/cli.sh b/scripts/dev/cli.sh
index 327792a193586bff91f862941638a0fe42f2842c..39ecaad94486cbef4be9cfff18c88ffe786e27ae 100755 (executable)
--- a/scripts/dev/cli.sh
+++ b/scripts/dev/cli.sh
@@ -13,4 +13,4 @@ mkdir -p "./dist/server/tools"
 cp -r "./server/tools/node_modules" "./dist/server/tools"
 
 cd ./server/tools
-../../node_modules/.bin/tsc-watch --build --verbose --onSuccess 'sh -c "cd ../../ && npm run resolve-tspaths:all"'
+../../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 f84260f23849d42bb92f9bd00bab26c25be5b1f0..2e9b8a5053920d35cb76cfea6cbe82f1588104bc 100755 (executable)
--- a/scripts/setup/cli.sh
+++ b/scripts/setup/cli.sh
@@ -14,5 +14,4 @@ rm -rf ./dist/server/tools/
 
 cp -r "./server/tools/node_modules" "./dist/server/tools"
 
-npm run resolve-tspaths:cli
 npm run resolve-tspaths:server