Use TS_NODE_FILES instead of --files

Because --files does not work

diff --git a/scripts/ci.sh b/scripts/ci.sh
index f75e457fdf69335c0d49b427b8344626281835a1..f5bd0bdc9b62190b61764913010154559a855c6a 100755 (executable)
--- 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 e71b9b1546195b499c0413c99f6f053e1c5c04d1..14a014f07faa4385f2c0d2207320612e18ea36a3 100644 (file)
--- 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 aa129c1d9e332c92e0c3dfab0df676a71764f757..d305722c465456b57b7143ef56845b0f8b8b46a4 100644 (file)
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -28,7 +28,6 @@
       "@shared/*": [ "shared/*" ]
     }
   },
-  "include": [ "." ],
   "exclude": [
     "server/tools/",
     "node_modules",