Merge pull request #15750 from strapi/fix/require-plugin-upload-in-up…

…load-local-provider
strapi · Feb 8, 2023 · 33a721f · 33a721f
2 parents c62c140 + 548ad3e
commit 33a721f
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 10 deletions.
diff --git a/packages/core/upload/server/graphql.js b/packages/core/upload/server/graphql.js
@@ -4,8 +4,10 @@ const path = require('path');
 const os = require('os');
 const mime = require('mime-types');
 const fse = require('fs-extra');
+const {
+  file: { getStreamSize },
+} = require('@strapi/utils');
 const { FILE_MODEL_UID } = require('./constants');
-const { getStreamSize } = require('./utils/file');
 
 const UPLOAD_MUTATION_NAME = 'upload';
 const MULTIPLE_UPLOAD_MUTATION_NAME = 'multipleUpload';

diff --git a/packages/core/upload/server/register.js b/packages/core/upload/server/register.js
@@ -1,9 +1,11 @@
 'use strict';
 
-const { PayloadTooLargeError } = require('@strapi/utils/lib/errors');
+const {
+  errors: { PayloadTooLargeError },
+  file: { kbytesToBytes, bytesToHumanReadable },
+} = require('@strapi/utils');
 const _ = require('lodash');
 const registerUploadMiddleware = require('./middlewares/upload');
-const { kbytesToBytes, bytesToHumanReadable } = require('./utils/file');
 
 /**
  * Register upload plugin

diff --git a/packages/core/upload/server/services/image-manipulation.js b/packages/core/upload/server/services/image-manipulation.js
@@ -7,8 +7,10 @@ const fs = require('fs');
 const { join } = require('path');
 const sharp = require('sharp');
 
+const {
+  file: { bytesToKbytes, writableDiscardStream },
+} = require('@strapi/utils');
 const { getService } = require('../utils');
-const { bytesToKbytes, writableDiscardStream } = require('../utils/file');
 
 const FORMATS_TO_PROCESS = ['jpeg', 'png', 'webp', 'tiff', 'svg', 'gif', 'avif'];
 const FORMATS_TO_OPTIMIZE = ['jpeg', 'png', 'webp', 'tiff', 'avif'];

diff --git a/packages/core/upload/server/services/provider.js b/packages/core/upload/server/services/provider.js
@@ -1,7 +1,9 @@
 'use strict';
 
 const { isFunction } = require('lodash/fp');
-const { streamToBuffer } = require('../utils/file');
+const {
+  file: { streamToBuffer },
+} = require('@strapi/utils');
 
 module.exports = ({ strapi }) => ({
   async checkFileSize(file) {

diff --git a/packages/core/upload/server/services/upload.js b/packages/core/upload/server/services/upload.js
@@ -18,15 +18,14 @@ const {
   nameToSlug,
   contentTypes: contentTypesUtils,
   webhook: webhookUtils,
+  errors: { ApplicationError, NotFoundError },
+  file: { bytesToKbytes },
 } = require('@strapi/utils');
-const { NotFoundError } = require('@strapi/utils').errors;
 
 const { MEDIA_UPDATE, MEDIA_CREATE, MEDIA_DELETE } = webhookUtils.webhookEvents;
 
-const { ApplicationError } = require('@strapi/utils/lib/errors');
 const { FILE_MODEL_UID } = require('../constants');
 const { getService } = require('../utils');
-const { bytesToKbytes } = require('../utils/file');
 
 const { UPDATED_BY_ATTRIBUTE, CREATED_BY_ATTRIBUTE } = contentTypesUtils.constants;
 

diff --git a/packages/core/upload/server/utils/file.js → packages/core/utils/lib/file.js b/packages/core/upload/server/utils/file.js → packages/core/utils/lib/file.js
diff --git a/packages/core/utils/lib/index.js b/packages/core/utils/lib/index.js
@@ -41,6 +41,7 @@ const { pipeAsync, mapAsync, forEachAsync } = require('./async');
 const convertQueryParams = require('./convert-query-params');
 const importDefault = require('./import-default');
 const template = require('./template');
+const file = require('./file');
 
 module.exports = {
   yup,
@@ -88,4 +89,5 @@ module.exports = {
   validateYupSchemaSync,
   convertQueryParams,
   importDefault,
+  file,
 };
diff --git a/packages/providers/upload-local/lib/index.js b/packages/providers/upload-local/lib/index.js
@@ -9,8 +9,10 @@ const { pipeline } = require('stream');
 const fs = require('fs');
 const path = require('path');
 const fse = require('fs-extra');
-const { PayloadTooLargeError } = require('@strapi/utils/lib/errors');
-const { kbytesToBytes, bytesToHumanReadable } = require('../../../core/upload/server/utils/file');
+const {
+  errors: { PayloadTooLargeError },
+  file: { kbytesToBytes, bytesToHumanReadable },
+} = require('@strapi/utils');
 
 const UPLOADS_FOLDER_NAME = 'uploads';