aboutsummaryrefslogtreecommitdiffhomepage
path: root/server
diff options
context:
space:
mode:
Diffstat (limited to 'server')
-rw-r--r--server/tests/api/ci-4.sh2
-rw-r--r--server/typings/express/index.d.ts (renamed from server/typings/express.d.ts)10
2 files changed, 6 insertions, 6 deletions
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 |
6activitypubFiles=$(find server/tests/api/activitypub -type f | grep -v index.ts | xargs echo) 6activitypubFiles=$(find server/tests/api/activitypub -type f | grep -v index.ts | xargs echo)
7 7
8MOCHA_PARALLEL=true npm run mocha -- --parallel --jobs $1 --timeout 30000 --exit \ 8MOCHA_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 @@
1import { RegisteredPlugin } from '../lib/plugins/plugin-manager' 1import { RegisteredPlugin } from '../../lib/plugins/plugin-manager'
2import { 2import {
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'
22import { MVideoPlaylistFull, MVideoPlaylistFullSummary } from '../types/models/video/video-playlist' 22import { MVideoPlaylistFull, MVideoPlaylistFullSummary } from '../../types/models/video/video-playlist'
23import { MVideoImportDefault } from '@server/types/models/video/video-import' 23import { MVideoImportDefault } from '@server/types/models/video/video-import'
24import { MAccountBlocklist, MActorUrl, MStreamingPlaylist, MVideoFile, MVideoImmutable } from '@server/types/models' 24import { MAccountBlocklist, MActorUrl, MStreamingPlaylist, MVideoFile, MVideoImmutable } from '@server/types/models'
25import { MVideoPlaylistElement, MVideoPlaylistElementVideoUrlPlaylistPrivacy } from '@server/types/models/video/video-playlist-element' 25import { MVideoPlaylistElement, MVideoPlaylistElementVideoUrlPlaylistPrivacy } from '@server/types/models/video/video-playlist-element'
26import { MAccountVideoRateAccountVideo } from '@server/types/models/video/video-rate' 26import { MAccountVideoRateAccountVideo } from '@server/types/models/video/video-rate'
27import { MVideoChangeOwnershipFull } from '../types/models/video/video-change-ownership' 27import { MVideoChangeOwnershipFull } from '../../types/models/video/video-change-ownership'
28import { MPlugin, MServer } from '@server/types/models/server' 28import { MPlugin, MServer } from '@server/types/models/server'
29import { MServerBlocklist } from '../types/models/server/server-blocklist' 29import { MServerBlocklist } from '../../types/models/server/server-blocklist'
30import { MOAuthTokenUser } from '@server/types/models/oauth/oauth-token' 30import { MOAuthTokenUser } from '@server/types/models/oauth/oauth-token'
31import { UserRole } from '@shared/models' 31import { UserRole } from '@shared/models'
32import { RegisterServerAuthExternalOptions } from '@shared/models/plugins/register-server-auth.model' 32import { RegisterServerAuthExternalOptions } from '@shared/models/plugins/register-server-auth.model'