4 files changed, 25 insertions, 12 deletions

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
 }