diff --git a/packages/core/upload/server/graphql.js b/packages/core/upload/server/graphql.js index 27950ee87b..a0fb2100ac 100644 --- a/packages/core/upload/server/graphql.js +++ b/packages/core/upload/server/graphql.js @@ -4,7 +4,9 @@ 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: { getStreamSize }, +} = require('@strapi/utils'); const { FILE_MODEL_UID } = require('./constants'); const UPLOAD_MUTATION_NAME = 'upload'; diff --git a/packages/core/upload/server/register.js b/packages/core/upload/server/register.js index 1597d84a26..093327b938 100644 --- a/packages/core/upload/server/register.js +++ b/packages/core/upload/server/register.js @@ -1,7 +1,9 @@ 'use strict'; -const { PayloadTooLargeError } = require('@strapi/utils/lib/errors'); -const { kbytesToBytes, bytesToHumanReadable } = require('@strapi/utils/lib/file'); +const { + errors: { PayloadTooLargeError }, + file: { kbytesToBytes, bytesToHumanReadable }, +} = require('@strapi/utils'); const _ = require('lodash'); const registerUploadMiddleware = require('./middlewares/upload'); diff --git a/packages/core/upload/server/services/provider.js b/packages/core/upload/server/services/provider.js index cac57f8c88..ea13be83cc 100644 --- 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('@strapi/utils/lib/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 index 709dd01206..346e1ee7a2 100644 --- a/packages/core/upload/server/services/upload.js +++ b/packages/core/upload/server/services/upload.js @@ -18,13 +18,12 @@ 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 { bytesToKbytes } = require('@strapi/utils/lib/file'); const { FILE_MODEL_UID } = require('../constants'); const { getService } = require('../utils'); diff --git a/packages/core/utils/lib/index.js b/packages/core/utils/lib/index.js index 2af7787146..d6a3ccfad3 100644 --- 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 index e3ecfce1a6..230d920c3a 100644 --- 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('@strapi/utils/lib/file'); +const { + errors: { PayloadTooLargeError }, + file: { kbytesToBytes, bytesToHumanReadable }, +} = require('@strapi/utils'); const UPLOADS_FOLDER_NAME = 'uploads';