require -> import

15 files changed, 22 insertions, 24 deletions

diff --git a/server/controllers/api/clients.ts b/server/controllers/api/clients.ts
index 614163c83..f6499556a 100644
--- a/server/controllers/api/clients.ts
+++ b/server/controllers/api/clients.ts
@@ -1,4 +1,4 @@
-import express = require('express')
+import * as express from 'express'
 
 import { CONFIG } from '../../initializers';
 import { logger } from '../../helpers'
diff --git a/server/controllers/api/config.ts b/server/controllers/api/config.ts
index 8bdde61b3..57c9398ec 100644
--- a/server/controllers/api/config.ts
+++ b/server/controllers/api/config.ts
@@ -1,4 +1,4 @@
-import express = require('express')
+import * as express from 'express'
 
 import { CONFIG } from '../../initializers'
 
diff --git a/server/controllers/api/index.ts b/server/controllers/api/index.ts
index 18bef2d3d..98004544d 100644
--- a/server/controllers/api/index.ts
+++ b/server/controllers/api/index.ts
@@ -1,4 +1,4 @@
-import express = require('express')
+import * as express from 'express'
 
 import { badRequest } from '../../helpers'
 
diff --git a/server/controllers/api/pods.ts b/server/controllers/api/pods.ts
index 4ff1f5d9f..a028c4ab9 100644
--- a/server/controllers/api/pods.ts
+++ b/server/controllers/api/pods.ts
@@ -1,4 +1,4 @@
-import express = require('express')
+import * as express from 'express'
 import { waterfall } from 'async'
 
 import { database as db } from '../../initializers/database'
diff --git a/server/controllers/api/remote/index.ts b/server/controllers/api/remote/index.ts
index b11439204..d3522772b 100644
--- a/server/controllers/api/remote/index.ts
+++ b/server/controllers/api/remote/index.ts
@@ -1,4 +1,4 @@
-import express = require('express')
+import * as express from 'express'
 
 import { badRequest } from '../../../helpers'
 
diff --git a/server/controllers/api/remote/pods.ts b/server/controllers/api/remote/pods.ts
index 7a9a0c4f0..9c9d2164d 100644
--- a/server/controllers/api/remote/pods.ts
+++ b/server/controllers/api/remote/pods.ts
@@ -1,4 +1,4 @@
-import express = require('express')
+import * as express from 'express'
 import * as waterfall from 'async/waterfall'
 
 import { database as db } from '../../../initializers/database'
diff --git a/server/controllers/api/remote/videos.ts b/server/controllers/api/remote/videos.ts
index 178a21e7c..d97a3db31 100644
--- a/server/controllers/api/remote/videos.ts
+++ b/server/controllers/api/remote/videos.ts
@@ -1,4 +1,4 @@
-import express = require('express')
+import * as express from 'express'
 import { eachSeries, waterfall } from 'async'
 
 import { database as db } from '../../../initializers/database'
diff --git a/server/controllers/api/requests.ts b/server/controllers/api/requests.ts
index 304499a4f..ff4b4ac1a 100644
--- a/server/controllers/api/requests.ts
+++ b/server/controllers/api/requests.ts
@@ -1,4 +1,4 @@
-import express = require('express')
+import * as express from 'express'
 import { parallel } from 'async'
 
 import {
diff --git a/server/controllers/api/users.ts b/server/controllers/api/users.ts
index 97a744f54..44c5ec13c 100644
--- a/server/controllers/api/users.ts
+++ b/server/controllers/api/users.ts
@@ -1,4 +1,4 @@
-import express = require('express')
+import * as express from 'express'
 import { waterfall } from 'async'
 
 import { database as db } from '../../initializers/database'
diff --git a/server/controllers/api/videos/abuse.ts b/server/controllers/api/videos/abuse.ts
index 3dd884354..68db025b7 100644
--- a/server/controllers/api/videos/abuse.ts
+++ b/server/controllers/api/videos/abuse.ts
@@ -1,8 +1,8 @@
-import express = require('express')
+import * as express from 'express'
 import { waterfall } from 'async'
 
 import { database as db } from '../../../initializers/database'
-import friends = require('../../../lib/friends')
+import * as friends from '../../../lib/friends'
 import {
   logger,
   getFormatedObjects,
diff --git a/server/controllers/api/videos/blacklist.ts b/server/controllers/api/videos/blacklist.ts
index fb4d57d7b..58960798b 100644
--- a/server/controllers/api/videos/blacklist.ts
+++ b/server/controllers/api/videos/blacklist.ts
@@ -1,4 +1,4 @@
-import express = require('express')
+import * as express from 'express'
 
 import { database as db } from '../../../initializers/database'
 import { logger } from '../../../helpers'
diff --git a/server/controllers/api/videos/index.ts b/server/controllers/api/videos/index.ts
index 6eda7159b..b82b0936f 100644
--- a/server/controllers/api/videos/index.ts
+++ b/server/controllers/api/videos/index.ts
@@ -1,7 +1,7 @@
-import express = require('express')
-import fs = require('fs')
-import multer = require('multer')
-import path = require('path')
+import * as express from 'express'
+import * as fs from 'fs'
+import * as multer from 'multer'
+import * as path from 'path'
 import { waterfall } from 'async'
 
 import { database as db } from '../../../initializers/database'
diff --git a/server/controllers/api/videos/rate.ts b/server/controllers/api/videos/rate.ts
index 571ff68e3..1bc575675 100644
--- a/server/controllers/api/videos/rate.ts
+++ b/server/controllers/api/videos/rate.ts
@@ -1,4 +1,4 @@
-import express = require('express')
+import * as express from 'express'
 import { waterfall } from 'async'
 
 import { database as db } from '../../../initializers/database'
diff --git a/server/controllers/client.ts b/server/controllers/client.ts
index ce5608c9b..c3d28245c 100644
--- a/server/controllers/client.ts
+++ b/server/controllers/client.ts
@@ -1,10 +1,8 @@
 import { parallel } from 'async'
-import express = require('express')
-import fs = require('fs')
+import * as express from 'express'
+import * as fs from 'fs'
 import { join } from 'path'
-import expressValidator = require('express-validator')
-// TODO: use .validator when express-validator typing will have validator field
-const validator = expressValidator['validator']
+import * as validator from 'validator'
 
 import { database as db } from '../initializers/database'
 import {
diff --git a/server/controllers/static.ts b/server/controllers/static.ts
index 51f75c57e..e65282339 100644
--- a/server/controllers/static.ts
+++ b/server/controllers/static.ts
@@ -1,5 +1,5 @@
-import express = require('express')
-import cors = require('cors')
+import * as express from 'express'
+import * as cors from 'cors'
 
 import {
   CONFIG,