fix(upload-local-provider): use package require instead of absolute path

strapi · Feb 8, 2023 · 5316123 · 5316123
1 parent c62c140
commit 5316123
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 6 deletions.
diff --git a/packages/core/upload/server/graphql.js b/packages/core/upload/server/graphql.js
@@ -4,8 +4,8 @@ const path = require('path');
 const os = require('os');
 const mime = require('mime-types');
 const fse = require('fs-extra');
+const { getStreamSize } = require('@strapi/utils/lib/file');
 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,9 @@
 'use strict';
 
 const { PayloadTooLargeError } = require('@strapi/utils/lib/errors');
+const { kbytesToBytes, bytesToHumanReadable } = require('@strapi/utils/lib/file');
 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,8 @@ const fs = require('fs');
 const { join } = require('path');
 const sharp = require('sharp');
 
+const { bytesToKbytes, writableDiscardStream } = require('@strapi/utils/lib/file');
 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,7 @@
 'use strict';
 
 const { isFunction } = require('lodash/fp');
-const { streamToBuffer } = require('../utils/file');
+const { streamToBuffer } = require('@strapi/utils/lib/file');
 
 module.exports = ({ strapi }) => ({
   async checkFileSize(file) {

diff --git a/packages/core/upload/server/services/upload.js b/packages/core/upload/server/services/upload.js
@@ -24,9 +24,9 @@ const { NotFoundError } = require('@strapi/utils').errors;
 const { MEDIA_UPDATE, MEDIA_CREATE, MEDIA_DELETE } = webhookUtils.webhookEvents;
 
 const { ApplicationError } = require('@strapi/utils/lib/errors');
+const { bytesToKbytes } = require('@strapi/utils/lib/file');
 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/providers/upload-local/lib/index.js b/packages/providers/upload-local/lib/index.js
@@ -10,7 +10,7 @@ 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 { kbytesToBytes, bytesToHumanReadable } = require('@strapi/utils/lib/file');
 
 const UPLOADS_FOLDER_NAME = 'uploads';