chore: merge master

2021-12-29 16:45:52 -05:00
parent 14e5d0977f 932116e953
commit d70d33fb27
17 changed files with 140 additions and 27 deletions
--- a/src/uploads/uploadFile.ts
+++ b/src/uploads/uploadFile.ts
@@ -1,4 +1,3 @@
-import { UploadedFile } from 'express-fileupload';
 import mkdirp from 'mkdirp';
 import path from 'path';
 import { SanitizedConfig } from '../config/types';
@@ -39,7 +38,7 @@ const uploadFile = async ({

    const { staticDir, imageSizes, disableLocalStorage } = collectionConfig.upload;

-    const file = ((req.files && req.files.file) ? req.files.file : req.file) as UploadedFile;
+    const { file } = req.files || {};

    if (throwOnMissingFile && !file) {
      throw new MissingFile();