From 9b3294a8496c89c7880054de1f1f09c9990f1b46 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 14 Dec 2021 13:48:13 +0100 Subject: Fix some build scripts and lint --- scripts/ci.sh | 2 ++ scripts/dev/server.sh | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/ci.sh b/scripts/ci.sh index a628cbced..7ad6f38e9 100755 --- a/scripts/ci.sh +++ b/scripts/ci.sh @@ -98,6 +98,8 @@ elif [ "$1" = "external-plugins" ]; then runTest "$1" 1 $externalPluginsFiles elif [ "$1" = "lint" ]; then + npm run build:server + npm run eslint -- --ext .ts "./server/**/*.ts" "shared/**/*.ts" "scripts/**/*.ts" npm run swagger-cli -- validate support/doc/api/openapi.yaml diff --git a/scripts/dev/server.sh b/scripts/dev/server.sh index 5aac470eb..07d88eb2f 100755 --- a/scripts/dev/server.sh +++ b/scripts/dev/server.sh @@ -19,10 +19,10 @@ rm -rf "./dist" mkdir "./dist" cp "./tsconfig.json" "./dist" -npm run tsc -- --incremental --sourceMap +npm run tsc -- -b -v --incremental cp -r ./server/static ./server/assets ./dist/server cp -r "./server/lib/emails" "./dist/server/lib" NODE_ENV=test node node_modules/.bin/concurrently -k \ "node_modules/.bin/nodemon --delay 1 --watch ./dist dist/server" \ - "node_modules/.bin/tsc --incremental --sourceMap --preserveWatchOutput -w" + "node_modules/.bin/tsc -b -w --preserveWatchOutput" -- cgit v1.2.3