6 files changed, 7 insertions, 8 deletions

diff --git a/shared/extra-utils/mock-servers/mock-email.ts b/shared/extra-utils/mock-servers/mock-email.ts
index ffd62e325..c13d3dc0f 100644
--- a/shared/extra-utils/mock-servers/mock-email.ts
+++ b/shared/extra-utils/mock-servers/mock-email.ts
@@ -1,9 +1,8 @@
 import { ChildProcess } from 'child_process'
+import MailDev from 'maildev'
 import { randomInt } from '@shared/core-utils'
 import { parallelTests } from '../miscs'
 
-const MailDev = require('maildev')
-
 class MockSmtpServer {
 
   private static instance: MockSmtpServer
diff --git a/shared/extra-utils/mock-servers/mock-instances-index.ts b/shared/extra-utils/mock-servers/mock-instances-index.ts
index c9e33087d..2aabef9d2 100644
--- a/shared/extra-utils/mock-servers/mock-instances-index.ts
+++ b/shared/extra-utils/mock-servers/mock-instances-index.ts
@@ -1,4 +1,4 @@
-import * as express from 'express'
+import express from 'express'
 import { randomInt } from '@shared/core-utils'
 
 export class MockInstancesIndex {
diff --git a/shared/extra-utils/mock-servers/mock-joinpeertube-versions.ts b/shared/extra-utils/mock-servers/mock-joinpeertube-versions.ts
index 5ea432ecf..5106fc66a 100644
--- a/shared/extra-utils/mock-servers/mock-joinpeertube-versions.ts
+++ b/shared/extra-utils/mock-servers/mock-joinpeertube-versions.ts
@@ -1,4 +1,4 @@
-import * as express from 'express'
+import express from 'express'
 import { randomInt } from '@shared/core-utils'
 
 export class MockJoinPeerTubeVersions {
diff --git a/shared/extra-utils/mock-servers/mock-object-storage.ts b/shared/extra-utils/mock-servers/mock-object-storage.ts
index 19ea7c87c..f1c5a6123 100644
--- a/shared/extra-utils/mock-servers/mock-object-storage.ts
+++ b/shared/extra-utils/mock-servers/mock-object-storage.ts
@@ -1,4 +1,4 @@
-import * as express from 'express'
+import express from 'express'
 import got, { RequestError } from 'got'
 import { Server } from 'http'
 import { pipeline } from 'stream'
diff --git a/shared/extra-utils/mock-servers/mock-plugin-blocklist.ts b/shared/extra-utils/mock-servers/mock-plugin-blocklist.ts
index d18f8224f..6f66bf4f0 100644
--- a/shared/extra-utils/mock-servers/mock-plugin-blocklist.ts
+++ b/shared/extra-utils/mock-servers/mock-plugin-blocklist.ts
@@ -1,4 +1,4 @@
-import * as express from 'express'
+import express, { Request, Response } from 'express'
 import { Server } from 'http'
 import { randomInt } from '@shared/core-utils'
 
@@ -18,7 +18,7 @@ export class MockBlocklist {
     return new Promise<number>(res => {
       const app = express()
 
-      app.get('/blocklist', (req: express.Request, res: express.Response) => {
+      app.get('/blocklist', (req: Request, res: Response) => {
         return res.json(this.body)
       })
 
diff --git a/shared/extra-utils/mock-servers/mock-proxy.ts b/shared/extra-utils/mock-servers/mock-proxy.ts
index 5365f87d1..eb5f177c7 100644
--- a/shared/extra-utils/mock-servers/mock-proxy.ts
+++ b/shared/extra-utils/mock-servers/mock-proxy.ts
@@ -1,6 +1,6 @@
 
 import { createServer, Server } from 'http'
-import * as proxy from 'proxy'
+import proxy from 'proxy'
 import { randomInt } from '@shared/core-utils'
 
 class MockProxy {