Update webpack stack

7 files changed, 30 insertions, 18 deletions

diff --git a/server/controllers/api/videos/index.ts b/server/controllers/api/videos/index.ts
index bfa018031..3b2ac4a6c 100644
--- a/server/controllers/api/videos/index.ts
+++ b/server/controllers/api/videos/index.ts
@@ -86,7 +86,6 @@ videosRouter.get('/',
 )
 videosRouter.put('/:id',
   authenticate,
-  reqFiles,
   videosUpdateValidator,
   updateVideoRetryWrapper
 )
diff --git a/server/helpers/core-utils.ts b/server/helpers/core-utils.ts
new file mode 100644
index 000000000..32b89b6dd
--- /dev/null
+++ b/server/helpers/core-utils.ts
@@ -0,0 +1,22 @@
+/*
+  Different from 'utils' because we don't not import other PeerTube modules.
+  Useful to avoid circular dependencies.
+*/
+
+import { join } from 'path'
+
+function isTestInstance () {
+  return process.env.NODE_ENV === 'test'
+}
+
+function root () {
+  // We are in /dist/helpers/utils.js
+  return join(__dirname, '..', '..', '..')
+}
+
+// ---------------------------------------------------------------------------
+
+export {
+  isTestInstance,
+  root
+}
diff --git a/server/helpers/custom-validators/videos.ts b/server/helpers/custom-validators/videos.ts
index c5ef4cb5f..8904975c0 100644
--- a/server/helpers/custom-validators/videos.ts
+++ b/server/helpers/custom-validators/videos.ts
@@ -1,5 +1,6 @@
 import { values } from 'lodash'
 import * as validator from 'validator'
+import 'multer'
 
 import {
   CONSTRAINTS_FIELDS,
diff --git a/server/helpers/index.ts b/server/helpers/index.ts
index e56bd21ad..78215fe10 100644
--- a/server/helpers/index.ts
+++ b/server/helpers/index.ts
@@ -1,3 +1,4 @@
+export * from './core-utils'
 export * from './logger'
 export * from './custom-validators'
 export * from './database-utils'
diff --git a/server/helpers/utils.ts b/server/helpers/utils.ts
index 1dcbd31c4..8e489de96 100644
--- a/server/helpers/utils.ts
+++ b/server/helpers/utils.ts
@@ -23,10 +23,6 @@ function createEmptyCallback () {
   }
 }
 
-function isTestInstance () {
-  return process.env.NODE_ENV === 'test'
-}
-
 function getFormatedObjects (objects: any[], objectsTotal: number) {
   const formatedObjects = []
 
@@ -40,18 +36,11 @@ function getFormatedObjects (objects: any[], objectsTotal: number) {
   }
 }
 
-function root () {
-  // We are in /dist/helpers/utils.js
-  return join(__dirname, '..', '..', '..')
-}
-
 // ---------------------------------------------------------------------------
 
 export {
   badRequest,
   createEmptyCallback,
   generateRandomString,
-  isTestInstance,
-  getFormatedObjects,
-  root
+  getFormatedObjects
 }
diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts
index 6dcb4bb91..b476ef928 100644
--- a/server/initializers/constants.ts
+++ b/server/initializers/constants.ts
@@ -2,7 +2,7 @@ import * as config from 'config'
 import { join } from 'path'
 
 // Do not use barrels, remain constants as independent as possible
-import { root, isTestInstance } from '../helpers/utils'
+import { root, isTestInstance } from '../helpers/core-utils'
 
 // ---------------------------------------------------------------------------
 
diff --git a/server/initializers/database.ts b/server/initializers/database.ts
index 78ca5ab84..0ab9e98db 100644
--- a/server/initializers/database.ts
+++ b/server/initializers/database.ts
@@ -5,7 +5,7 @@ import * as Sequelize from 'sequelize'
 import { CONFIG } from './constants'
 // Do not use barrel, we need to load database first
 import { logger } from '../helpers/logger'
-import { isTestInstance } from '../helpers/utils'
+import { isTestInstance } from '../helpers/core-utils'
 import {
   ApplicationModel,
   AuthorModel,
@@ -80,9 +80,9 @@ database.init = function (silent: boolean, callback: (err: Error) => void) {
     files.filter(function (file) {
       // For all models but not utils.js
       if (
-        file === 'index.js' ||
-        file === 'utils.js' ||
-        file.endsWith('-interface.js') ||
+        file === 'index.js' || file === 'index.ts' ||
+        file === 'utils.js' || file === 'utils.ts' ||
+        file.endsWith('-interface.js') || file.endsWith('-interface.ts') ||
         file.endsWith('.js.map')
       ) return false