Merge pull request #15976 from strapi/chore/fix-invalid-path

Fix invalid require using internal paths

packages/core/admin/server/controllers/api-token.js

@@ -1,7 +1,9 @@
 'use strict';
 
-const { stringEquals } = require('@strapi/utils/lib');
-const { ApplicationError } = require('@strapi/utils').errors;
+const {
+  stringEquals,
+  errors: { ApplicationError },
+} = require('@strapi/utils');
 const { trim, has } = require('lodash/fp');
 const { getService } = require('../utils');
 const {

packages/core/admin/server/controllers/transfer/runner.js

@@ -1,7 +1,9 @@
 'use strict';
 
-const { remote } = require('@strapi/data-transfer/lib/strapi');
-const { UnauthorizedError } = require('@strapi/utils/lib/errors');
+const { createTransferHandler } = require('@strapi/data-transfer').strapi.remote.handlers;
+const {
+  errors: { UnauthorizedError },
+} = require('@strapi/utils');
 
 const dataTransferAuthStrategy = require('../../strategies/data-transfer');
 
@@ -20,5 +22,5 @@ const verify = async (ctx, scope) => {
 };
 
 module.exports = {
-  connect: remote.handlers.createTransferHandler({ verify }),
+  connect: createTransferHandler({ verify }),
 };

packages/core/admin/server/services/__tests__/api-token.test.js

@@ -1,6 +1,8 @@
 'use strict';
 
-const { NotFoundError, ApplicationError } = require('@strapi/utils/lib/errors');
+const {
+  errors: { NotFoundError, ApplicationError },
+} = require('@strapi/utils');
 const crypto = require('crypto');
 const { omit, uniq } = require('lodash/fp');
 const apiTokenService = require('../api-token');

packages/core/admin/server/services/__tests__/transfer/token.test.js

@@ -1,6 +1,8 @@
 'use strict';
 
-const { NotFoundError, ApplicationError } = require('@strapi/utils/lib/errors');
+const {
+  errors: { NotFoundError, ApplicationError },
+} = require('@strapi/utils');
 const crypto = require('crypto');
 const { omit, uniq } = require('lodash/fp');
 const transferTokenService = require('../../transfer/token');

packages/core/admin/server/strategies/__tests__/api-token.test.js

@@ -1,6 +1,8 @@
 'use strict';
 
-const { UnauthorizedError } = require('@strapi/utils/lib/errors');
+const {
+  errors: { UnauthorizedError },
+} = require('@strapi/utils');
 const createContext = require('../../../../../../test/helpers/create-context');
 const apiTokenStrategy = require('../api-token');
 

packages/core/admin/server/strategies/data-transfer.js

@@ -1,6 +1,8 @@
 'use strict';
 
-const { UnauthorizedError, ForbiddenError } = require('@strapi/utils/lib/errors');
+const {
+  errors: { UnauthorizedError, ForbiddenError },
+} = require('@strapi/utils');
 const { castArray, isNil } = require('lodash/fp');
 
 const { getService } = require('../utils');

packages/core/data-transfer/src/engine/index.ts

@@ -729,3 +729,5 @@ export const createTransferEngine = <S extends ISourceProvider, D extends IDesti
 ): TransferEngine<S, D> => {
   return new TransferEngine<S, D>(sourceProvider, destinationProvider, options);
 };
+
+export * as errors from './errors';

packages/core/email/server/services/email.js

@@ -4,7 +4,7 @@ const _ = require('lodash');
 const {
   template: { createStrictInterpolationRegExp },
   keysDeep,
-} = require('@strapi/utils/');
+} = require('@strapi/utils');
 
 const getProviderSettings = () => {
   return strapi.config.get('plugin.email');

packages/core/strapi/lib/commands/__tests__/data-transfer/export.test.js

@@ -21,6 +21,7 @@ describe('Export', () => {
       },
     },
     engine: {
+      errors: {},
       createTransferEngine() {
         return {
           transfer: jest.fn(() => {
@@ -50,9 +51,7 @@ describe('Export', () => {
     },
   };
 
-  jest.mock('@strapi/data-transfer/lib/engine', () => mockDataTransfer.engine, { virtual: true });
-  jest.mock('@strapi/data-transfer/lib/strapi', () => mockDataTransfer.strapi, { virtual: true });
-  jest.mock('@strapi/data-transfer/lib/file', () => mockDataTransfer.file, { virtual: true });
+  jest.mock('@strapi/data-transfer', () => mockDataTransfer);
 
   // mock utils
   const mockUtils = {

packages/core/strapi/lib/commands/__tests__/data-transfer/import.test.js

@@ -1,9 +1,10 @@
 'use strict';
 
 const {
-  DEFAULT_CONFLICT_STRATEGY,
-  DEFAULT_SCHEMA_STRATEGY,
-  DEFAULT_VERSION_STRATEGY,
+  strapi: {
+    providers: { DEFAULT_CONFLICT_STRATEGY },
+  },
+  engine: { DEFAULT_SCHEMA_STRATEGY, DEFAULT_VERSION_STRATEGY },
 } = require('@strapi/data-transfer');
 
 const { expectExit } = require('./shared/transfer.test.utils');
@@ -45,19 +46,20 @@ describe('Import', () => {
     },
     strapi: {
       providers: {
+        DEFAULT_CONFLICT_STRATEGY,
         createLocalStrapiDestinationProvider: jest
           .fn()
           .mockReturnValue({ name: 'testStrapiDest', type: 'destination', getMetadata: jest.fn() }),
       },
     },
     engine: {
+      DEFAULT_SCHEMA_STRATEGY,
+      DEFAULT_VERSION_STRATEGY,
       createTransferEngine,
     },
   };
 
-  jest.mock('@strapi/data-transfer/lib/engine', () => mockDataTransfer.engine, { virtual: true });
-  jest.mock('@strapi/data-transfer/lib/strapi', () => mockDataTransfer.strapi, { virtual: true });
-  jest.mock('@strapi/data-transfer/lib/file', () => mockDataTransfer.file, { virtual: true });
+  jest.mock('@strapi/data-transfer', () => mockDataTransfer);
 
   // mock utils
   const mockUtils = {

packages/core/strapi/lib/commands/__tests__/data-transfer/transfer.test.js

@@ -65,9 +65,7 @@ describe('Transfer', () => {
     },
   };
 
-  jest.mock('@strapi/data-transfer/lib/engine', () => mockDataTransfer.engine, { virtual: true });
-  jest.mock('@strapi/data-transfer/lib/strapi', () => mockDataTransfer.strapi, { virtual: true });
-  jest.mock('@strapi/data-transfer/lib/file', () => mockDataTransfer.file, { virtual: true });
+  jest.mock('@strapi/data-transfer', () => mockDataTransfer);
 
   const transferCommand = require('../../transfer/transfer');
 

packages/core/strapi/lib/commands/transfer/export.js

@@ -1,17 +1,20 @@
 'use strict';
 
 const {
-  providers: { createLocalFileDestinationProvider },
-} = require('@strapi/data-transfer/lib/file');
-const {
-  providers: { createLocalStrapiSourceProvider },
-} = require('@strapi/data-transfer/lib/strapi');
-const { createTransferEngine } = require('@strapi/data-transfer/lib/engine');
+  file: {
+    providers: { createLocalFileDestinationProvider },
+  },
+  strapi: {
+    providers: { createLocalStrapiSourceProvider },
+  },
+  engine: { createTransferEngine },
+} = require('@strapi/data-transfer');
+
 const { isObject, isString, isFinite, toNumber } = require('lodash/fp');
 const fs = require('fs-extra');
 const chalk = require('chalk');
 
-const { TransferEngineTransferError } = require('@strapi/data-transfer/lib/engine/errors');
+const { TransferEngineTransferError } = require('@strapi/data-transfer').engine.errors;
 const {
   getDefaultExportName,
   buildTransferTable,

packages/core/strapi/lib/commands/transfer/import.js

@@ -1,16 +1,14 @@
 'use strict';
 
 const {
-  providers: { createLocalFileSourceProvider },
-} = require('@strapi/data-transfer/lib/file');
-const {
-  providers: { createLocalStrapiDestinationProvider, DEFAULT_CONFLICT_STRATEGY },
-} = require('@strapi/data-transfer/lib/strapi');
-const {
-  createTransferEngine,
-  DEFAULT_VERSION_STRATEGY,
-  DEFAULT_SCHEMA_STRATEGY,
-} = require('@strapi/data-transfer/lib/engine');
+  file: {
+    providers: { createLocalFileSourceProvider },
+  },
+  strapi: {
+    providers: { createLocalStrapiDestinationProvider, DEFAULT_CONFLICT_STRATEGY },
+  },
+  engine: { createTransferEngine, DEFAULT_VERSION_STRATEGY, DEFAULT_SCHEMA_STRATEGY },
+} = require('@strapi/data-transfer');
 
 const { isObject } = require('lodash/fp');
 

packages/core/strapi/lib/commands/transfer/transfer.js

@@ -1,13 +1,15 @@
 'use strict';
 
-const { createTransferEngine } = require('@strapi/data-transfer/lib/engine');
 const {
-  providers: {
-    createRemoteStrapiDestinationProvider,
-    createLocalStrapiSourceProvider,
-    createLocalStrapiDestinationProvider,
+  engine: { createTransferEngine },
+  strapi: {
+    providers: {
+      createRemoteStrapiDestinationProvider,
+      createLocalStrapiSourceProvider,
+      createLocalStrapiDestinationProvider,
+    },
   },
-} = require('@strapi/data-transfer/lib/strapi');
+} = require('@strapi/data-transfer');
 const { isObject } = require('lodash/fp');
 const chalk = require('chalk');
 

packages/core/strapi/lib/commands/transfer/utils.js

@@ -3,7 +3,9 @@
 const chalk = require('chalk');
 const Table = require('cli-table3');
 const { Option } = require('commander');
-const { TransferGroupPresets } = require('@strapi/data-transfer/lib/engine');
+const {
+  engine: { TransferGroupPresets },
+} = require('@strapi/data-transfer');
 
 const {
   configs: { createOutputFileConfiguration },

packages/core/strapi/lib/services/entity-validator/__tests__/biginteger-validators.test.js

@@ -1,7 +1,9 @@
 'use strict';
 
 const strapiUtils = require('@strapi/utils');
-const { YupValidationError } = require('@strapi/utils/lib/errors');
+const {
+  errors: { YupValidationError },
+} = require('@strapi/utils');
 const validators = require('../validators');
 
 describe('BigInteger validator', () => {

packages/core/strapi/lib/services/entity-validator/__tests__/date-validators.test.js

@@ -1,7 +1,9 @@
 'use strict';
 
 const strapiUtils = require('@strapi/utils');
-const { YupValidationError } = require('@strapi/utils/lib/errors');
+const {
+  errors: { YupValidationError },
+} = require('@strapi/utils');
 const validators = require('../validators');
 
 describe('Date validator', () => {

packages/core/strapi/lib/services/entity-validator/__tests__/datetime-validators.test.js

@@ -1,7 +1,9 @@
 'use strict';
 
 const strapiUtils = require('@strapi/utils');
-const { YupValidationError } = require('@strapi/utils/lib/errors');
+const {
+  errors: { YupValidationError },
+} = require('@strapi/utils');
 const validators = require('../validators');
 
 describe('Datetime validator', () => {

packages/core/strapi/lib/services/entity-validator/__tests__/email-validators.test.js

@@ -1,7 +1,9 @@
 'use strict';
 
 const strapiUtils = require('@strapi/utils');
-const { YupValidationError } = require('@strapi/utils/lib/errors');
+const {
+  errors: { YupValidationError },
+} = require('@strapi/utils');
 const validators = require('../validators');
 
 describe('Email validator', () => {

packages/core/strapi/lib/services/entity-validator/__tests__/enumeration-validators.test.js

@@ -1,7 +1,9 @@
 'use strict';
 
 const strapiUtils = require('@strapi/utils');
-const { YupValidationError } = require('@strapi/utils/lib/errors');
+const {
+  errors: { YupValidationError },
+} = require('@strapi/utils');
 const validators = require('../validators');
 
 describe('Enumeration validator', () => {

packages/core/strapi/lib/services/entity-validator/__tests__/float-validators.test.js

@@ -1,7 +1,9 @@
 'use strict';
 
 const strapiUtils = require('@strapi/utils');
-const { YupValidationError } = require('@strapi/utils/lib/errors');
+const {
+  errors: { YupValidationError },
+} = require('@strapi/utils');
 const validators = require('../validators');
 
 describe('Float validator', () => {

packages/core/strapi/lib/services/entity-validator/__tests__/integer-validators.test.js

@@ -1,7 +1,9 @@
 'use strict';
 
 const strapiUtils = require('@strapi/utils');
-const { YupValidationError } = require('@strapi/utils/lib/errors');
+const {
+  errors: { YupValidationError },
+} = require('@strapi/utils');
 const validators = require('../validators');
 
 describe('Integer validator', () => {

packages/core/strapi/lib/services/entity-validator/__tests__/string-validators.test.js

@@ -1,7 +1,9 @@
 'use strict';
 
 const strapiUtils = require('@strapi/utils');
-const { YupValidationError } = require('@strapi/utils/lib/errors');
+const {
+  errors: { YupValidationError },
+} = require('@strapi/utils');
 const validators = require('../validators');
 
 describe('String validator', () => {

packages/core/strapi/lib/services/entity-validator/__tests__/time-validators.test.js

@@ -1,7 +1,9 @@
 'use strict';
 
 const strapiUtils = require('@strapi/utils');
-const { YupValidationError } = require('@strapi/utils/lib/errors');
+const {
+  errors: { YupValidationError },
+} = require('@strapi/utils');
 const validators = require('../validators');
 
 describe('Time validator', () => {

packages/core/strapi/lib/services/entity-validator/__tests__/timestamp-validators.test.js

@@ -1,7 +1,9 @@
 'use strict';
 
 const strapiUtils = require('@strapi/utils');
-const { YupValidationError } = require('@strapi/utils/lib/errors');
+const {
+  errors: { YupValidationError },
+} = require('@strapi/utils');
 const validators = require('../validators');
 
 describe('Time validator', () => {

packages/core/strapi/lib/services/entity-validator/__tests__/uid-validators.test.js

@@ -1,7 +1,9 @@
 'use strict';
 
 const strapiUtils = require('@strapi/utils');
-const { YupValidationError } = require('@strapi/utils/lib/errors');
+const {
+  errors: { YupValidationError },
+} = require('@strapi/utils');
 const validators = require('../validators');
 
 describe('UID validator', () => {