From 31ee48d579c9e43bae8c16e6ba6568f99aecc146 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 28 Sep 2022 14:55:15 +0200 Subject: Fix error when running setup:cli --- package.json | 2 -- scripts/dev/cli.sh | 2 +- scripts/setup/cli.sh | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/package.json b/package.json index 5eeca42a9..dd913896d 100644 --- 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 327792a19..39ecaad94 100755 --- 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 f84260f23..2e9b8a505 100755 --- 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 -- cgit v1.2.3