@strapi/strapi 4.10.0-beta.0 → 4.10.0-beta.1

package/.eslintignore

@@ -0,0 +1,2 @@
+node_modules/
+.eslintrc.js

package/.eslintrc.js

@@ -0,0 +1,4 @@
+module.exports = {
+  root: true,
+  extends: ['custom/back'],
+};

package/bin/strapi.js

@@ -24,13 +24,10 @@ const { exitWith, ifOptions, assertUrlHasProtocol } = require('../lib/commands/u
 const {
   excludeOption,
   onlyOption,
+  throttleOption,
   validateExcludeOnly,
 } = require('../lib/commands/transfer/utils');
 
-process.on('SIGINT', () => {
-  process.exit();
-});
-
 const checkCwdIsStrapiApp = (name) => {
   const logErrorAndExit = () => {
     console.log(
@@ -261,6 +258,14 @@ program
   .description('Enable anonymous telemetry and metadata sending to Strapi analytics')
   .action(getLocalScript('opt-in-telemetry'));
 
+program
+  .command('report')
+  .description('Get system stats for debugging and submitting issues')
+  .option('-u, --uuid', 'Include Project UUID')
+  .option('-d, --dependencies', 'Include Project Dependencies')
+  .option('--all', 'Include All Information')
+  .action(getLocalScript('report'));
+
 program
   .command('ts:generate-types')
   .description(`Generate TypeScript typings for your schemas`)
@@ -279,13 +284,12 @@ program
   .description('Transfer data from one source to another')
   .allowExcessArguments(false)
   .addOption(
-    new Option('--from <sourceURL>', `URL of the remote Strapi instance to get data from`)
-      .argParser(parseURL)
-      .hideHelp() // Hidden until pull feature is released
-  )
-  .addOption(
-    new Option('--from-token <token>', `Transfer token for the remote Strapi source`).hideHelp() // Hidden until pull feature is released
+    new Option(
+      '--from <sourceURL>',
+      `URL of the remote Strapi instance to get data from`
+    ).argParser(parseURL)
   )
+  .addOption(new Option('--from-token <token>', `Transfer token for the remote Strapi source`))
   .addOption(
     new Option(
       '--to <destinationURL>',
@@ -296,7 +300,16 @@ program
   .addOption(forceOption)
   .addOption(excludeOption)
   .addOption(onlyOption)
+  .addOption(throttleOption)
   .hook('preAction', validateExcludeOnly)
+  .hook(
+    'preAction',
+    ifOptions(
+      (opts) => !(opts.from || opts.to) || (opts.from && opts.to),
+      () =>
+        exitWith(1, 'Exactly one remote source (from) or destination (to) option must be provided')
+    )
+  )
   // If --from is used, validate the URL and token
   .hook(
     'preAction',
@@ -313,10 +326,15 @@ program
             },
           ]);
           if (!answers.fromToken?.length) {
-            exitWith(1, 'No token entered, aborting transfer.');
+            exitWith(1, 'No token provided for remote source, aborting transfer.');
           }
           thisCommand.opts().fromToken = answers.fromToken;
         }
+
+        await confirmMessage(
+          'The transfer will delete all the local Strapi assets and its database. Are you sure you want to proceed?',
+          { failMessage: 'Transfer process aborted' }
+        )(thisCommand);
       }
     )
   )
@@ -336,25 +354,18 @@ program
             },
           ]);
           if (!answers.toToken?.length) {
-            exitWith(1, 'No token entered, aborting transfer.');
+            exitWith(1, 'No token provided for remote destination, aborting transfer.');
           }
           thisCommand.opts().toToken = answers.toToken;
         }
 
         await confirmMessage(
-          'The transfer will delete all data in the remote database and media files. Are you sure you want to proceed?',
+          'The transfer will delete all the remote Strapi assets and its database. Are you sure you want to proceed?',
           { failMessage: 'Transfer process aborted' }
         )(thisCommand);
       }
     )
   )
-  // .hook(
-  //   'preAction',
-  //   ifOptions(
-  //     (opts) => !opts.from && !opts.to,
-  //     () => exitWith(1, 'At least one source (from) or destination (to) option must be provided')
-  //   )
-  // )
   .action(getLocalScript('transfer/transfer'));
 
 // `$ strapi export`
@@ -375,6 +386,7 @@ program
   .addOption(new Option('-f, --file <file>', 'name to use for exported file (without extensions)'))
   .addOption(excludeOption)
   .addOption(onlyOption)
+  .addOption(throttleOption)
   .hook('preAction', validateExcludeOnly)
   .hook('preAction', promptEncryptionKey)
   .action(getLocalScript('transfer/export'));
@@ -397,6 +409,7 @@ program
   .addOption(forceOption)
   .addOption(excludeOption)
   .addOption(onlyOption)
+  .addOption(throttleOption)
   .hook('preAction', validateExcludeOnly)
   .hook('preAction', async (thisCommand) => {
     const opts = thisCommand.opts();
@@ -451,7 +464,7 @@ program
   .hook(
     'preAction',
     confirmMessage(
-      'The import will delete all data in your database and media files. Are you sure you want to proceed?',
+      'The import will delete all assets and data in your database. Are you sure you want to proceed?',
       { failMessage: 'Import process aborted' }
     )
   )

package/ee/index.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { pick } = require('lodash/fp');
+const { pick, isEqual } = require('lodash/fp');
 
 const { readLicense, verifyLicense, fetchLicense, LicenseCheckError } = require('./license');
 const { shiftCronExpression } = require('../lib/utils/cron');
@@ -13,10 +13,31 @@ const ee = {
 };
 
 const disable = (message) => {
+  // Prevent emitting ee.disable if it was already disabled
+  const shouldEmitEvent = ee.enabled !== false;
+
   ee.logger?.warn(`${message} Switching to CE.`);
   // Only keep the license key for potential re-enabling during a later check
   ee.licenseInfo = pick('licenseKey', ee.licenseInfo);
+
   ee.enabled = false;
+
+  if (shouldEmitEvent) {
+    // Notify EE features that they should be disabled
+    strapi.eventHub.emit('ee.disable');
+  }
+};
+
+const enable = () => {
+  // Prevent emitting ee.enable if it was already enabled
+  const shouldEmitEvent = ee.enabled !== true;
+
+  ee.enabled = true;
+
+  if (shouldEmitEvent) {
+    // Notify EE features that they should be disabled
+    strapi.eventHub.emit('ee.enable');
+  }
 };
 
 let initialized = false;
@@ -41,7 +62,7 @@ const init = (licenseDir, logger) => {
 
     if (license) {
       ee.licenseInfo = verifyLicense(license);
-      ee.enabled = true;
+      enable();
     }
   } catch (error) {
     disable(error.message);
@@ -89,8 +110,22 @@ const onlineUpdate = async ({ strapi }) => {
 
     if (license) {
       try {
-        ee.licenseInfo = verifyLicense(license);
+        // Verify license and check if its info changed
+        const newLicenseInfo = verifyLicense(license);
+        const licenseInfoChanged =
+          !isEqual(newLicenseInfo.features, ee.licenseInfo.features) ||
+          newLicenseInfo.seats !== ee.licenseInfo.seats ||
+          newLicenseInfo.type !== ee.licenseInfo.type;
+
+        // Store the new license info
+        ee.licenseInfo = newLicenseInfo;
+        const wasEnabled = ee.enabled;
         validateInfo();
+
+        // Notify EE features
+        if (licenseInfoChanged && wasEnabled) {
+          strapi.eventHub.emit('ee.update');
+        }
       } catch (error) {
         disable(error.message);
       }
@@ -125,7 +160,7 @@ const validateInfo = () => {
     return disable('License expired.');
   }
 
-  ee.enabled = true;
+  enable();
 };
 
 const checkLicense = async ({ strapi }) => {

package/ee/license.js

@@ -10,7 +10,9 @@ const machineId = require('../lib/utils/machine-id');
 const DEFAULT_FEATURES = {
   bronze: [],
   silver: [],
-  gold: ['sso', { name: 'audit-logs', options: { retentionDays: 90 } }, 'review-workflows'],
+  // Set a null retention duration to allow the user to override it
+  // The default of 90 days is set in the audit logs service
+  gold: ['sso', { name: 'audit-logs', options: { retentionDays: null } }, 'review-workflows'],
 };
 
 const publicKey = fs.readFileSync(join(__dirname, 'resources/key.pub'));

package/lib/Strapi.js

@@ -43,6 +43,7 @@ const apisRegistry = require('./core/registries/apis');
 const bootstrap = require('./core/bootstrap');
 const loaders = require('./core/loaders');
 const { destroyOnSignal } = require('./utils/signals');
+const getNumberOfDynamicZones = require('./services/utils/dynamic-zones');
 const sanitizersRegistry = require('./core/registries/sanitizers');
 const convertCustomFieldType = require('./utils/convert-custom-field-type');
 
@@ -249,6 +250,9 @@ class Strapi {
       groupProperties: {
         database: strapi.config.get('database.connection.client'),
         plugins: Object.keys(strapi.plugins),
+        numberOfAllContentTypes: _.size(this.contentTypes), // TODO: V5: This event should be renamed numberOfContentTypes in V5 as the name is already taken to describe the number of content types using i18n.
+        numberOfComponents: _.size(this.components),
+        numberOfDynamicZones: getNumberOfDynamicZones(),
         // TODO: to add back
         // providers: this.config.installedProviders,
       },
@@ -468,7 +472,7 @@ class Strapi {
     await this.startWebhooks();
 
     await this.server.initMiddlewares();
-    await this.server.initRouting();
+    this.server.initRouting();
 
     await this.contentAPI.permissions.registerActions();
 
@@ -536,17 +540,17 @@ class Strapi {
     // plugins
     await this.container.get('modules')[lifecycleName]();
 
-    // user
-    const userLifecycleFunction = this.app && this.app[lifecycleName];
-    if (isFunction(userLifecycleFunction)) {
-      await userLifecycleFunction({ strapi: this });
-    }
-
     // admin
     const adminLifecycleFunction = this.admin && this.admin[lifecycleName];
     if (isFunction(adminLifecycleFunction)) {
       await adminLifecycleFunction({ strapi: this });
     }
+
+    // user
+    const userLifecycleFunction = this.app && this.app[lifecycleName];
+    if (isFunction(userLifecycleFunction)) {
+      await userLifecycleFunction({ strapi: this });
+    }
   }
 
   getModel(uid) {

package/lib/commands/report.js

@@ -0,0 +1,35 @@
+'use strict';
+
+const { EOL } = require('os');
+const strapi = require('../index');
+
+module.exports = async ({ uuid, dependencies, all }) => {
+  const config = {
+    reportUUID: Boolean(all || uuid),
+    reportDependencies: Boolean(all || dependencies),
+  };
+
+  const appContext = await strapi.compile();
+  const app = await strapi(appContext).register();
+
+  let debugInfo = `Launched In: ${Date.now() - app.config.launchedAt} ms
+Environment: ${app.config.environment}
+OS: ${process.platform}-${process.arch}
+Strapi Version: ${app.config.info.strapi}
+Node/Yarn Version: ${process.env.npm_config_user_agent}
+Edition: ${app.EE ? 'Enterprise' : 'Community'}
+Database: ${app?.config?.database?.connection?.client ?? 'unknown'}`;
+
+  if (config.reportUUID) {
+    debugInfo += `${EOL}UUID: ${app.config.uuid}`;
+  }
+
+  if (config.reportDependencies) {
+    debugInfo += `${EOL}Dependencies: ${JSON.stringify(app.config.info.dependencies, null, 2)}
+Dev Dependencies: ${JSON.stringify(app.config.info.devDependencies, null, 2)}`;
+  }
+
+  console.log(debugInfo);
+
+  await app.destroy();
+};

package/lib/commands/transfer/export.js

@@ -22,15 +22,21 @@ const {
   createStrapiInstance,
   formatDiagnostic,
   loadersFactory,
+  exitMessageText,
+  abortTransfer,
+  getTransferTelemetryPayload,
 } = require('./utils');
 const { exitWith } = require('../utils/helpers');
 /**
  * @typedef ExportCommandOptions Options given to the CLI import command
  *
- * @property {string} [file] The file path to import
+ * @property {string} [file] The file path to export to
  * @property {boolean} [encrypt] Used to encrypt the final archive
- * @property {string} [key] Encryption key, only useful when encryption is enabled
+ * @property {string} [key] Encryption key, used only when encryption is enabled
  * @property {boolean} [compress] Used to compress the final archive
+ * @property {(keyof import('@strapi/data-transfer/src/engine').TransferGroupFilter)[]} [only] If present, only include these filtered groups of data
+ * @property {(keyof import('@strapi/data-transfer/src/engine').TransferGroupFilter)[]} [exclude] If present, exclude these filtered groups of data
+ * @property {number|undefined} [throttle] Delay in ms after each record
  */
 
 const BYTES_IN_MB = 1024 * 1024;
@@ -58,6 +64,7 @@ module.exports = async (opts) => {
     schemaStrategy: 'ignore', // for an export to file, schemaStrategy will always be skipped
     exclude: opts.exclude,
     only: opts.only,
+    throttle: opts.throttle,
     transforms: {
       links: [
         {
@@ -97,23 +104,21 @@ module.exports = async (opts) => {
     updateLoader(stage, data);
   });
 
-  const getTelemetryPayload = (/* payload */) => {
-    return {
-      eventProperties: {
-        source: engine.sourceProvider.name,
-        destination: engine.destinationProvider.name,
-      },
-    };
-  };
-
   progress.on('transfer::start', async () => {
     console.log(`Starting export...`);
-    await strapi.telemetry.send('didDEITSProcessStart', getTelemetryPayload());
+
+    await strapi.telemetry.send('didDEITSProcessStart', getTransferTelemetryPayload(engine));
   });
 
   let results;
   let outFile;
   try {
+    // Abort transfer if user interrupts process
+    ['SIGTERM', 'SIGINT', 'SIGQUIT'].forEach((signal) => {
+      process.removeAllListeners(signal);
+      process.on(signal, () => abortTransfer({ engine, strapi }));
+    });
+
     results = await engine.transfer();
     outFile = results.destination.file.path;
     const outFileExists = await fs.pathExists(outFile);
@@ -121,11 +126,13 @@ module.exports = async (opts) => {
       throw new TransferEngineTransferError(`Export file not created "${outFile}"`);
     }
   } catch {
-    await strapi.telemetry.send('didDEITSProcessFail', getTelemetryPayload());
-    exitWith(1, 'Export process failed.');
+    await strapi.telemetry.send('didDEITSProcessFail', getTransferTelemetryPayload(engine));
+    exitWith(1, exitMessageText('export', true));
   }
 
-  await strapi.telemetry.send('didDEITSProcessFinish', getTelemetryPayload());
+  // Note: we need to await telemetry or else the process ends before it is sent
+  await strapi.telemetry.send('didDEITSProcessFinish', getTransferTelemetryPayload(engine));
+
   try {
     const table = buildTransferTable(results.engine);
     console.log(table.toString());
@@ -133,8 +140,8 @@ module.exports = async (opts) => {
     console.error('There was an error displaying the results of the transfer.');
   }
 
-  console.log(`${chalk.bold('Export process has been completed successfully!')}`);
-  exitWith(0, `Export archive is in ${chalk.green(outFile)}`);
+  console.log(`Export archive is in ${chalk.green(outFile)}`);
+  exitWith(0, exitMessageText('export'));
 };
 
 /**

package/lib/commands/transfer/import.js

@@ -18,13 +18,33 @@ const {
   createStrapiInstance,
   formatDiagnostic,
   loadersFactory,
+  exitMessageText,
+  abortTransfer,
+  getTransferTelemetryPayload,
 } = require('./utils');
 const { exitWith } = require('../utils/helpers');
 
 /**
- * @typedef {import('@strapi/data-transfer').ILocalFileSourceProviderOptions} ILocalFileSourceProviderOptions
+ * @typedef {import('@strapi/data-transfer/src/file/providers').ILocalFileSourceProviderOptions} ILocalFileSourceProviderOptions
  */
 
+/**
+ * @typedef ImportCommandOptions Options given to the CLI import command
+ *
+ * @property {string} [file] The file path to import
+ * @property {string} [key] Encryption key, used when encryption is enabled
+ * @property {(keyof import('@strapi/data-transfer/src/engine').TransferGroupFilter)[]} [only] If present, only include these filtered groups of data
+ * @property {(keyof import('@strapi/data-transfer/src/engine').TransferGroupFilter)[]} [exclude] If present, exclude these filtered groups of data
+ * @property {number|undefined} [throttle] Delay in ms after each record
+ */
+
+/**
+ * Import command.
+ *
+ * It transfers data from a file to a local Strapi instance
+ *
+ * @param {ImportCommandOptions} opts
+ */
 module.exports = async (opts) => {
   // validate inputs from Commander
   if (!isObject(opts)) {
@@ -63,6 +83,7 @@ module.exports = async (opts) => {
     schemaStrategy: opts.schemaStrategy || DEFAULT_SCHEMA_STRATEGY,
     exclude: opts.exclude,
     only: opts.only,
+    throttle: opts.throttle,
     rules: {
       links: [
         {
@@ -102,27 +123,26 @@ module.exports = async (opts) => {
     updateLoader(stage, data);
   });
 
-  const getTelemetryPayload = () => {
-    return {
-      eventProperties: {
-        source: engine.sourceProvider.name,
-        destination: engine.destinationProvider.name,
-      },
-    };
-  };
-
   progress.on('transfer::start', async () => {
     console.log('Starting import...');
-    await strapiInstance.telemetry.send('didDEITSProcessStart', getTelemetryPayload());
+    await strapiInstance.telemetry.send(
+      'didDEITSProcessStart',
+      getTransferTelemetryPayload(engine)
+    );
   });
 
   let results;
   try {
+    // Abort transfer if user interrupts process
+    ['SIGTERM', 'SIGINT', 'SIGQUIT'].forEach((signal) => {
+      process.removeAllListeners(signal);
+      process.on(signal, () => abortTransfer({ engine, strapi }));
+    });
+
     results = await engine.transfer();
   } catch (e) {
-    await strapiInstance.telemetry.send('didDEITSProcessFail', getTelemetryPayload());
-    console.error('Import process failed.');
-    process.exit(1);
+    await strapiInstance.telemetry.send('didDEITSProcessFail', getTransferTelemetryPayload(engine));
+    exitWith(1, exitMessageText('import', true));
   }
 
   try {
@@ -132,10 +152,11 @@ module.exports = async (opts) => {
     console.error('There was an error displaying the results of the transfer.');
   }
 
-  await strapiInstance.telemetry.send('didDEITSProcessFinish', getTelemetryPayload());
+  // Note: we need to await telemetry or else the process ends before it is sent
+  await strapiInstance.telemetry.send('didDEITSProcessFinish', getTransferTelemetryPayload(engine));
   await strapiInstance.destroy();
 
-  exitWith(0, 'Import process has been completed successfully!');
+  exitWith(0, exitMessageText('import'));
 };
 
 /**

package/lib/commands/transfer/transfer.js

@@ -7,11 +7,11 @@ const {
       createRemoteStrapiDestinationProvider,
       createLocalStrapiSourceProvider,
       createLocalStrapiDestinationProvider,
+      createRemoteStrapiSourceProvider,
     },
   },
 } = require('@strapi/data-transfer');
 const { isObject } = require('lodash/fp');
-const chalk = require('chalk');
 
 const {
   buildTransferTable,
@@ -19,6 +19,9 @@ const {
   DEFAULT_IGNORED_CONTENT_TYPES,
   formatDiagnostic,
   loadersFactory,
+  exitMessageText,
+  abortTransfer,
+  getTransferTelemetryPayload,
 } = require('./utils');
 const { exitWith } = require('../utils/helpers');
 
@@ -29,6 +32,9 @@ const { exitWith } = require('../utils/helpers');
  * @property {URL|undefined} [from] The url of a remote Strapi to use as remote source
  * @property {string|undefined} [toToken] The transfer token for the remote Strapi destination
  * @property {string|undefined} [fromToken] The transfer token for the remote Strapi source
+ * @property {(keyof import('@strapi/data-transfer/src/engine').TransferGroupFilter)[]} [only] If present, only include these filtered groups of data
+ * @property {(keyof import('@strapi/data-transfer/src/engine').TransferGroupFilter)[]} [exclude] If present, exclude these filtered groups of data
+ * @property {number|undefined} [throttle] Delay in ms after each record
  */
 
 /**
@@ -44,15 +50,14 @@ module.exports = async (opts) => {
     exitWith(1, 'Could not parse command arguments');
   }
 
-  const strapi = await createStrapiInstance();
+  if (!(opts.from || opts.to) || (opts.from && opts.to)) {
+    exitWith(1, 'Exactly one source (from) or destination (to) option must be provided');
+  }
 
+  const strapi = await createStrapiInstance();
   let source;
   let destination;
 
-  if (!opts.from && !opts.to) {
-    exitWith(1, 'At least one source (from) or destination (to) option must be provided');
-  }
-
   // if no URL provided, use local Strapi
   if (!opts.from) {
     source = createLocalStrapiSourceProvider({
@@ -61,13 +66,28 @@ module.exports = async (opts) => {
   }
   // if URL provided, set up a remote source provider
   else {
-    exitWith(1, `Remote Strapi source provider not yet implemented`);
+    if (!opts.fromToken) {
+      exitWith(1, 'Missing token for remote destination');
+    }
+
+    source = createRemoteStrapiSourceProvider({
+      getStrapi: () => strapi,
+      url: opts.from,
+      auth: {
+        type: 'token',
+        token: opts.fromToken,
+      },
+    });
   }
 
   // if no URL provided, use local Strapi
   if (!opts.to) {
     destination = createLocalStrapiDestinationProvider({
       getStrapi: () => strapi,
+      strategy: 'restore',
+      restore: {
+        entities: { exclude: DEFAULT_IGNORED_CONTENT_TYPES },
+      },
     });
   }
   // if URL provided, set up a remote destination provider
@@ -96,6 +116,9 @@ module.exports = async (opts) => {
   const engine = createTransferEngine(source, destination, {
     versionStrategy: 'exact',
     schemaStrategy: 'strict',
+    exclude: opts.exclude,
+    only: opts.only,
+    throttle: opts.throttle,
     transforms: {
       links: [
         {
@@ -135,15 +158,39 @@ module.exports = async (opts) => {
     updateLoader(stage, data);
   });
 
+  progress.on('stage::error', ({ stage, data }) => {
+    updateLoader(stage, data).fail();
+  });
+
+  progress.on('transfer::start', async () => {
+    console.log(`Starting transfer...`);
+
+    await strapi.telemetry.send('didDEITSProcessStart', getTransferTelemetryPayload(engine));
+  });
+
   let results;
   try {
-    console.log(`Starting transfer...`);
+    // Abort transfer if user interrupts process
+    ['SIGTERM', 'SIGINT', 'SIGQUIT'].forEach((signal) => {
+      process.removeAllListeners(signal);
+      process.on(signal, () => abortTransfer({ engine, strapi }));
+    });
+
     results = await engine.transfer();
   } catch (e) {
-    exitWith(1, 'Transfer process failed.');
+    await strapi.telemetry.send('didDEITSProcessFail', getTransferTelemetryPayload(engine));
+    exitWith(1, exitMessageText('transfer', true));
+  }
+
+  // Note: we need to await telemetry or else the process ends before it is sent
+  await strapi.telemetry.send('didDEITSProcessFinish', getTransferTelemetryPayload(engine));
+
+  try {
+    const table = buildTransferTable(results.engine);
+    console.log(table.toString());
+  } catch (e) {
+    console.error('There was an error displaying the results of the transfer.');
   }
 
-  const table = buildTransferTable(results.engine);
-  console.log(table.toString());
-  exitWith(0, `${chalk.bold('Transfer process has been completed successfully!')}`);
+  exitWith(0, exitMessageText('transfer'));
 };

package/lib/commands/transfer/utils.js

@@ -14,7 +14,19 @@ const {
 const ora = require('ora');
 const { readableBytes, exitWith } = require('../utils/helpers');
 const strapi = require('../../index');
-const { getParseListWithChoices } = require('../utils/commander');
+const { getParseListWithChoices, parseInteger } = require('../utils/commander');
+
+const exitMessageText = (process, error = false) => {
+  const processCapitalized = process[0].toUpperCase() + process.slice(1);
+
+  if (!error) {
+    return chalk.bold(
+      chalk.green(`${processCapitalized} process has been completed successfully!`)
+    );
+  }
+
+  return chalk.bold(chalk.red(`${processCapitalized} process failed.`));
+};
 
 const pad = (n) => {
   return (n < 10 ? '0' : '') + String(n);
@@ -90,12 +102,23 @@ const DEFAULT_IGNORED_CONTENT_TYPES = [
   'admin::audit-log',
 ];
 
-const createStrapiInstance = async (logLevel = 'error') => {
+const abortTransfer = async ({ engine, strapi }) => {
+  try {
+    await engine.abortTransfer();
+    await strapi.destroy();
+  } catch (e) {
+    // ignore because there's not much else we can do
+    return false;
+  }
+  return true;
+};
+
+const createStrapiInstance = async (opts = {}) => {
   try {
     const appContext = await strapi.compile();
-    const app = strapi(appContext);
+    const app = strapi({ ...opts, ...appContext });
 
-    app.log.level = logLevel;
+    app.log.level = opts.logLevel || 'error';
     return await app.load();
   } catch (err) {
     if (err.code === 'ECONNREFUSED') {
@@ -107,6 +130,13 @@ const createStrapiInstance = async (logLevel = 'error') => {
 
 const transferDataTypes = Object.keys(TransferGroupPresets);
 
+const throttleOption = new Option(
+  '--throttle <delay after each entity>',
+  `Add a delay in milliseconds between each transferred entity`
+)
+  .argParser(parseInteger)
+  .hideHelp(); // This option is not publicly documented
+
 const excludeOption = new Option(
   '--exclude <comma-separated data types>',
   `Exclude data using comma-separated types. Available types: ${transferDataTypes.join(',')}`
@@ -212,14 +242,33 @@ const loadersFactory = (defaultLoaders = {}) => {
   };
 };
 
+/**
+ * Get the telemetry data to be sent for a didDEITSProcess* event from an initialized transfer engine object
+ *
+ * @param {import('@strapi/data-transfer/types').ITransferEngine} engine Initialized transfer engine
+ * @returns {object} Telemetry properties object
+ */
+const getTransferTelemetryPayload = (engine) => {
+  return {
+    eventProperties: {
+      source: engine?.sourceProvider?.name,
+      destination: engine?.destinationProvider?.name,
+    },
+  };
+};
+
 module.exports = {
   loadersFactory,
   buildTransferTable,
   getDefaultExportName,
+  getTransferTelemetryPayload,
   DEFAULT_IGNORED_CONTENT_TYPES,
   createStrapiInstance,
   excludeOption,
+  exitMessageText,
   onlyOption,
+  throttleOption,
   validateExcludeOnly,
   formatDiagnostic,
+  abortTransfer,
 };

package/lib/commands/utils/commander.js

@@ -7,6 +7,7 @@
 const inquirer = require('inquirer');
 const { InvalidOptionArgumentError, Option } = require('commander');
 const { bold, green, cyan } = require('chalk');
+const { isNaN } = require('lodash/fp');
 const { exitWith } = require('./helpers');
 
 /**
@@ -40,6 +41,18 @@ const getParseListWithChoices = (choices, errorMessage = 'Invalid options:') =>
   };
 };
 
+/**
+ * argParser: Parse a string as an integer
+ */
+const parseInteger = (value) => {
+  // parseInt takes a string and a radix
+  const parsedValue = parseInt(value, 10);
+  if (isNaN(parsedValue)) {
+    throw new InvalidOptionArgumentError(`Not an integer: ${value}`);
+  }
+  return parsedValue;
+};
+
 /**
  * argParser: Parse a string as a URL object
  */
@@ -131,6 +144,7 @@ module.exports = {
   getParseListWithChoices,
   parseList,
   parseURL,
+  parseInteger,
   promptEncryptionKey,
   confirmMessage,
   forceOption,

package/lib/core/domain/content-type/validator.js

@@ -61,7 +61,7 @@ const contentTypeSchemaValidator = yup.object().shape({
 
             // should match the GraphQL regex
             if (!regressedValues.every((value) => GRAPHQL_ENUM_REGEX.test(value))) {
-              const message = `Invalid enumeration value. Values should have at least one alphabetical character preceeding the first occurence of a number. Update your enumeration '${attrName}'.`;
+              const message = `Invalid enumeration value. Values should have at least one alphabetical character preceding the first occurence of a number. Update your enumeration '${attrName}'.`;
 
               return this.createError({ message });
             }

package/lib/core/loaders/plugins/index.js

@@ -2,7 +2,7 @@
 
 const { join } = require('path');
 const fse = require('fs-extra');
-const { defaultsDeep, getOr, get } = require('lodash/fp');
+const { defaultsDeep, defaults, getOr, get } = require('lodash/fp');
 const { env } = require('@strapi/utils');
 const loadConfigFile = require('../../app-configuration/load-config-file');
 const loadFiles = require('../../../load/load-files');
@@ -101,7 +101,12 @@ const loadPlugins = async (strapi) => {
     }
 
     const pluginServer = loadConfigFile(serverEntrypointPath);
-    plugins[pluginName] = defaultsDeep(defaultPlugin, pluginServer);
+    plugins[pluginName] = {
+      ...defaultPlugin,
+      ...pluginServer,
+      config: defaults(defaultPlugin.config, pluginServer.config),
+      routes: pluginServer.routes ?? defaultPlugin.routes,
+    };
   }
 
   // TODO: validate plugin format

package/lib/core/registries/policies.d.ts

@@ -1,9 +1,9 @@
-import { BaseContext } from 'koa';
+import { ExtendableContext } from 'koa';
 import { Strapi } from '../../';
 
-interface PolicyContext extends BaseContext {
+interface PolicyContext extends ExtendableContext {
   type: string;
-  is(name): boolean;
+  is(name: string): boolean;
 }
 
 export type Policy<T = unknown> = (

package/lib/core-api/controller/collection-type.js

@@ -22,7 +22,6 @@ const createCollectionTypeController = ({ contentType }) => {
       const sanitizedQuery = await this.sanitizeQuery(ctx);
       const { results, pagination } = await strapi.service(uid).find(sanitizedQuery);
       const sanitizedResults = await this.sanitizeOutput(results, ctx);
-
       return this.transformResponse(sanitizedResults, { pagination });
     },
 

package/lib/core-api/controller/index.js

@@ -18,7 +18,7 @@ const createController = ({ contentType }) => {
       return transformResponse(data, meta, { contentType });
     },
 
-    sanitizeOutput(data, ctx) {
+    async sanitizeOutput(data, ctx) {
       const auth = getAuthFromKoaContext(ctx);
 
       return sanitize.contentAPI.output(data, contentType, { auth });

package/lib/factories.js

@@ -45,13 +45,12 @@ const createCoreService = (uid, cfg = {}) => {
 };
 
 const createCoreRouter = (uid, cfg = {}) => {
-  const { prefix, config = {}, only, except } = cfg;
+  const { prefix, config = {}, only, except, type } = cfg;
   let routes;
 
   return {
-    get prefix() {
-      return prefix;
-    },
+    type,
+    prefix,
     get routes() {
       if (!routes) {
         const contentType = strapi.contentType(uid);

package/lib/middlewares/logger.js

@@ -1,21 +1,5 @@
 'use strict';
 
-/* eslint-disable no-nested-ternary */
-
-const chalk = require('chalk');
-
-const codeToColor = (code) => {
-  return code >= 500
-    ? chalk.red(code)
-    : code >= 400
-    ? chalk.yellow(code)
-    : code >= 300
-    ? chalk.cyan(code)
-    : code >= 200
-    ? chalk.green(code)
-    : code;
-};
-
 /**
  * @type {import('./').MiddlewareFactory}
  */
@@ -25,6 +9,6 @@ module.exports = (_, { strapi }) => {
     await next();
     const delta = Math.ceil(Date.now() - start);
 
-    strapi.log.http(`${ctx.method} ${ctx.url} (${delta} ms) ${codeToColor(ctx.status)}`);
+    strapi.log.http(`${ctx.method} ${ctx.url} (${delta} ms) ${ctx.status}`);
   };
 };

package/lib/middlewares/security.js

@@ -12,7 +12,7 @@ const defaults = {
     useDefaults: true,
     directives: {
       'connect-src': ["'self'", 'https:'],
-      'img-src': ["'self'", 'data:', 'blob:', 'https://dl.airtable.com'],
+      'img-src': ["'self'", 'data:', 'blob:', 'https://market-assets.strapi.io'],
       'media-src': ["'self'", 'data:', 'blob:'],
       upgradeInsecureRequests: null,
     },

package/lib/services/event-hub.js

@@ -35,7 +35,12 @@ module.exports = function createEventHub() {
     },
 
     unsubscribe(subscriber) {
-      subscribers.splice(subscribers.indexOf(subscriber), 1);
+      const subscriberIndex = subscribers.indexOf(subscriber);
+
+      // Only remove the subscriber if it exists
+      if (subscriberIndex >= 0) {
+        subscribers.splice(subscriberIndex, 1);
+      }
     },
 
     on(eventName, listener) {

package/lib/services/metrics/index.js

@@ -17,6 +17,7 @@ const LIMITED_EVENTS = [
   'didSaveMediaWithCaption',
   'didDisableResponsiveDimensions',
   'didEnableResponsiveDimensions',
+  'didInitializePluginUpload',
 ];
 
 const createTelemetryInstance = (strapi) => {

package/lib/services/metrics/sender.js

@@ -3,7 +3,6 @@
 const os = require('os');
 const path = require('path');
 const _ = require('lodash');
-const { map, values, sumBy, pipe, flatMap, propEq } = require('lodash/fp');
 const isDocker = require('is-docker');
 const fetch = require('node-fetch');
 const ciEnv = require('ci-info');
@@ -41,14 +40,6 @@ module.exports = (strapi) => {
   const serverRootPath = strapi.dirs.app.root;
   const adminRootPath = path.join(strapi.dirs.app.root, 'src', 'admin');
 
-  const getNumberOfDynamicZones = () => {
-    return pipe(
-      map('attributes'),
-      flatMap(values),
-      sumBy(propEq('type', 'dynamiczone'))
-    )(strapi.contentTypes);
-  };
-
   const anonymousUserProperties = {
     environment: strapi.config.environment,
     os: os.type(),
@@ -66,9 +57,6 @@ module.exports = (strapi) => {
     useTypescriptOnAdmin: isUsingTypeScriptSync(adminRootPath),
     projectId: uuid,
     isHostedOnStrapiCloud: env('STRAPI_HOSTING', null) === 'strapi.cloud',
-    numberOfAllContentTypes: _.size(strapi.contentTypes), // TODO: V5: This event should be renamed numberOfContentTypes in V5 as the name is already taken to describe the number of content types using i18n.
-    numberOfComponents: _.size(strapi.components),
-    numberOfDynamicZones: getNumberOfDynamicZones(),
   };
 
   addPackageJsonStrapiMetadata(anonymousGroupProperties, strapi);

package/lib/services/server/index.js

@@ -92,8 +92,8 @@ const createServer = (strapi) => {
       return this;
     },
 
-    async initRouting() {
-      await registerAllRoutes(strapi);
+    initRouting() {
+      registerAllRoutes(strapi);
 
       return this;
     },

package/lib/services/server/register-routes.js

@@ -69,7 +69,7 @@ const registerPluginRoutes = (strapi) => {
     } else {
       _.forEach(plugin.routes, (router) => {
         router.type = router.type || 'admin';
-        router.prefix = `/${pluginName}`;
+        router.prefix = router.prefix || `/${pluginName}`;
         router.routes.forEach((route) => {
           generateRouteScope(route);
           route.info = { pluginName };

package/lib/services/utils/dynamic-zones.js

@@ -0,0 +1,13 @@
+'use strict';
+
+const { map, values, sumBy, pipe, flatMap, propEq } = require('lodash/fp');
+
+const getNumberOfDynamicZones = () => {
+  return pipe(
+    map('attributes'),
+    flatMap(values),
+    sumBy(propEq('type', 'dynamiczone'))
+  )(strapi.contentTypes);
+};
+
+module.exports = getNumberOfDynamicZones;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/strapi",
-  "version": "4.10.0-beta.0",
+  "version": "4.10.0-beta.1",
   "description": "An open source headless CMS solution to create and manage your own API. It provides a powerful dashboard and features to make your life easier. Databases supported: MySQL, MariaDB, PostgreSQL, SQLite",
   "keywords": [
     "strapi",
@@ -66,9 +66,7 @@
   ],
   "main": "./lib",
   "types": "./lib/index.d.ts",
-  "bin": {
-    "strapi": "./bin/strapi.js"
-  },
+  "bin": "./bin/strapi.js",
   "directories": {
     "lib": "./lib",
     "bin": "./bin",
@@ -76,24 +74,26 @@
   },
   "scripts": {
     "postinstall": "node lib/utils/success.js",
-    "test:unit": "jest --verbose"
+    "test:unit": "run -T jest",
+    "test:unit:watch": "run -T jest --watch",
+    "lint": "run -T eslint ."
   },
   "dependencies": {
     "@koa/cors": "3.4.3",
     "@koa/router": "10.1.1",
-    "@strapi/admin": "4.10.0-beta.0",
-    "@strapi/data-transfer": "4.10.0-beta.0",
-    "@strapi/database": "4.10.0-beta.0",
-    "@strapi/generate-new": "4.10.0-beta.0",
-    "@strapi/generators": "4.10.0-beta.0",
-    "@strapi/logger": "4.10.0-beta.0",
-    "@strapi/permissions": "4.10.0-beta.0",
-    "@strapi/plugin-content-manager": "4.10.0-beta.0",
-    "@strapi/plugin-content-type-builder": "4.10.0-beta.0",
-    "@strapi/plugin-email": "4.10.0-beta.0",
-    "@strapi/plugin-upload": "4.10.0-beta.0",
-    "@strapi/typescript-utils": "4.10.0-beta.0",
-    "@strapi/utils": "4.10.0-beta.0",
+    "@strapi/admin": "4.10.0-beta.1",
+    "@strapi/data-transfer": "4.10.0-beta.1",
+    "@strapi/database": "4.10.0-beta.1",
+    "@strapi/generate-new": "4.10.0-beta.1",
+    "@strapi/generators": "4.10.0-beta.1",
+    "@strapi/logger": "4.10.0-beta.1",
+    "@strapi/permissions": "4.10.0-beta.1",
+    "@strapi/plugin-content-manager": "4.10.0-beta.1",
+    "@strapi/plugin-content-type-builder": "4.10.0-beta.1",
+    "@strapi/plugin-email": "4.10.0-beta.1",
+    "@strapi/plugin-upload": "4.10.0-beta.1",
+    "@strapi/typescript-utils": "4.10.0-beta.1",
+    "@strapi/utils": "4.10.0-beta.1",
     "bcryptjs": "2.4.3",
     "boxen": "5.1.2",
     "chalk": "4.1.2",
@@ -128,7 +128,7 @@
     "open": "8.4.0",
     "ora": "5.4.1",
     "package-json": "7.0.0",
-    "qs": "6.11.0",
+    "qs": "6.11.1",
     "resolve-cwd": "3.0.0",
     "semver": "7.3.8",
     "statuses": "2.0.1",
@@ -142,5 +142,5 @@
     "node": ">=14.19.1 <=18.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "1519ef0e56d27b738f24fc88223797651ad47aaf"
+  "gitHead": "95d581b31bee464af42e5d8db408fa578d8532c7"
 }