From 07aea1a2642fc9868cb01e30c322514029d5b95a Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 18 Jun 2020 17:12:24 +0200 Subject: [PATCH] Use TS_NODE_FILES instead of --files Because --files does not work --- scripts/ci.sh | 3 ++- server/tests/api/ci-4.sh | 4 ++-- tsconfig.json | 1 - 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/ci.sh b/scripts/ci.sh index f75e457fd..f5bd0bdc9 100755 --- a/scripts/ci.sh +++ b/scripts/ci.sh @@ -13,7 +13,8 @@ perl -0777 -i -pe 's#proxy:(\n\s+)enabled: false\n\s+url: ""#proxy:$1enabled: t if [ "$1" = "misc" ]; then npm run build -- --light - mocha --timeout 5000 --exit --require ts-node/register --files --require tsconfig-paths/register --bail server/tests/client.ts \ + TS_NODE_FILES=true mocha --timeout 5000 --exit --require ts-node/register --require tsconfig-paths/register --bail \ + server/tests/client.ts \ server/tests/feeds/index.ts \ server/tests/misc-endpoints.ts \ server/tests/helpers/index.ts \ diff --git a/server/tests/api/ci-4.sh b/server/tests/api/ci-4.sh index e71b9b154..14a014f07 100644 --- a/server/tests/api/ci-4.sh +++ b/server/tests/api/ci-4.sh @@ -5,6 +5,6 @@ set -eu redundancyFiles=$(find server/tests/api/redundancy -type f | grep -v index.ts | xargs echo) activitypubFiles=$(find server/tests/api/activitypub -type f | grep -v index.ts | xargs echo) -MOCHA_PARALLEL=true npm run mocha -- --parallel --jobs $1 --timeout 30000 --exit \ - --require ts-node/register --files --require tsconfig-paths/register --bail \ +TS_NODE_FILES=true MOCHA_PARALLEL=true npm run mocha -- --parallel --jobs $1 --timeout 30000 --exit \ + --require ts-node/register --require tsconfig-paths/register --bail \ $redundancyFiles $activitypubFiles diff --git a/tsconfig.json b/tsconfig.json index aa129c1d9..d305722c4 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -28,7 +28,6 @@ "@shared/*": [ "shared/*" ] } }, - "include": [ "." ], "exclude": [ "server/tools/", "node_modules", -- 2.25.1