diff options
-rwxr-xr-x | scripts/ci.sh | 2 | ||||
-rw-r--r-- | server/tests/api/ci-4.sh | 2 | ||||
-rw-r--r-- | server/typings/express/index.d.ts (renamed from server/typings/express.d.ts) | 10 | ||||
-rw-r--r-- | tsconfig.json | 1 |
4 files changed, 8 insertions, 7 deletions
diff --git a/scripts/ci.sh b/scripts/ci.sh index 7854d88fc..f75e457fd 100755 --- a/scripts/ci.sh +++ b/scripts/ci.sh | |||
@@ -13,7 +13,7 @@ perl -0777 -i -pe 's#proxy:(\n\s+)enabled: false\n\s+url: ""#proxy:$1enabled: t | |||
13 | 13 | ||
14 | if [ "$1" = "misc" ]; then | 14 | if [ "$1" = "misc" ]; then |
15 | npm run build -- --light | 15 | npm run build -- --light |
16 | mocha --timeout 5000 --exit --require ts-node/register --require tsconfig-paths/register --bail server/tests/client.ts \ | 16 | mocha --timeout 5000 --exit --require ts-node/register --files --require tsconfig-paths/register --bail server/tests/client.ts \ |
17 | server/tests/feeds/index.ts \ | 17 | server/tests/feeds/index.ts \ |
18 | server/tests/misc-endpoints.ts \ | 18 | server/tests/misc-endpoints.ts \ |
19 | server/tests/helpers/index.ts \ | 19 | server/tests/helpers/index.ts \ |
diff --git a/server/tests/api/ci-4.sh b/server/tests/api/ci-4.sh index 7d83cbdfc..e71b9b154 100644 --- a/server/tests/api/ci-4.sh +++ b/server/tests/api/ci-4.sh | |||
@@ -6,5 +6,5 @@ redundancyFiles=$(find server/tests/api/redundancy -type f | grep -v index.ts | | |||
6 | activitypubFiles=$(find server/tests/api/activitypub -type f | grep -v index.ts | xargs echo) | 6 | activitypubFiles=$(find server/tests/api/activitypub -type f | grep -v index.ts | xargs echo) |
7 | 7 | ||
8 | MOCHA_PARALLEL=true npm run mocha -- --parallel --jobs $1 --timeout 30000 --exit \ | 8 | MOCHA_PARALLEL=true npm run mocha -- --parallel --jobs $1 --timeout 30000 --exit \ |
9 | --require ts-node/register --require tsconfig-paths/register --bail \ | 9 | --require ts-node/register --files --require tsconfig-paths/register --bail \ |
10 | $redundancyFiles $activitypubFiles | 10 | $redundancyFiles $activitypubFiles |
diff --git a/server/typings/express.d.ts b/server/typings/express/index.d.ts index 451bf9103..ad3212340 100644 --- a/server/typings/express.d.ts +++ b/server/typings/express/index.d.ts | |||
@@ -1,4 +1,4 @@ | |||
1 | import { RegisteredPlugin } from '../lib/plugins/plugin-manager' | 1 | import { RegisteredPlugin } from '../../lib/plugins/plugin-manager' |
2 | import { | 2 | import { |
3 | MAccountDefault, | 3 | MAccountDefault, |
4 | MActorAccountChannelId, | 4 | MActorAccountChannelId, |
@@ -18,15 +18,15 @@ import { | |||
18 | MVideoShareActor, | 18 | MVideoShareActor, |
19 | MVideoThumbnail, | 19 | MVideoThumbnail, |
20 | MVideoWithRights | 20 | MVideoWithRights |
21 | } from '../types/models' | 21 | } from '../../types/models' |
22 | import { MVideoPlaylistFull, MVideoPlaylistFullSummary } from '../types/models/video/video-playlist' | 22 | import { MVideoPlaylistFull, MVideoPlaylistFullSummary } from '../../types/models/video/video-playlist' |
23 | import { MVideoImportDefault } from '@server/types/models/video/video-import' | 23 | import { MVideoImportDefault } from '@server/types/models/video/video-import' |
24 | import { MAccountBlocklist, MActorUrl, MStreamingPlaylist, MVideoFile, MVideoImmutable } from '@server/types/models' | 24 | import { MAccountBlocklist, MActorUrl, MStreamingPlaylist, MVideoFile, MVideoImmutable } from '@server/types/models' |
25 | import { MVideoPlaylistElement, MVideoPlaylistElementVideoUrlPlaylistPrivacy } from '@server/types/models/video/video-playlist-element' | 25 | import { MVideoPlaylistElement, MVideoPlaylistElementVideoUrlPlaylistPrivacy } from '@server/types/models/video/video-playlist-element' |
26 | import { MAccountVideoRateAccountVideo } from '@server/types/models/video/video-rate' | 26 | import { MAccountVideoRateAccountVideo } from '@server/types/models/video/video-rate' |
27 | import { MVideoChangeOwnershipFull } from '../types/models/video/video-change-ownership' | 27 | import { MVideoChangeOwnershipFull } from '../../types/models/video/video-change-ownership' |
28 | import { MPlugin, MServer } from '@server/types/models/server' | 28 | import { MPlugin, MServer } from '@server/types/models/server' |
29 | import { MServerBlocklist } from '../types/models/server/server-blocklist' | 29 | import { MServerBlocklist } from '../../types/models/server/server-blocklist' |
30 | import { MOAuthTokenUser } from '@server/types/models/oauth/oauth-token' | 30 | import { MOAuthTokenUser } from '@server/types/models/oauth/oauth-token' |
31 | import { UserRole } from '@shared/models' | 31 | import { UserRole } from '@shared/models' |
32 | import { RegisterServerAuthExternalOptions } from '@shared/models/plugins/register-server-auth.model' | 32 | import { RegisterServerAuthExternalOptions } from '@shared/models/plugins/register-server-auth.model' |
diff --git a/tsconfig.json b/tsconfig.json index d305722c4..aa129c1d9 100644 --- a/tsconfig.json +++ b/tsconfig.json | |||
@@ -28,6 +28,7 @@ | |||
28 | "@shared/*": [ "shared/*" ] | 28 | "@shared/*": [ "shared/*" ] |
29 | } | 29 | } |
30 | }, | 30 | }, |
31 | "include": [ "." ], | ||
31 | "exclude": [ | 32 | "exclude": [ |
32 | "server/tools/", | 33 | "server/tools/", |
33 | "node_modules", | 34 | "node_modules", |