@strapi/strapi 4.9.0 → 4.10.0-beta.0

package/bin/strapi.js

@@ -24,10 +24,13 @@ 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(
@@ -276,12 +279,13 @@ 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)
+    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
   )
-  .addOption(new Option('--from-token <token>', `Transfer token for the remote Strapi source`))
   .addOption(
     new Option(
       '--to <destinationURL>',
@@ -292,16 +296,7 @@ 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',
@@ -318,15 +313,10 @@ program
             },
           ]);
           if (!answers.fromToken?.length) {
-            exitWith(1, 'No token provided for remote source, aborting transfer.');
+            exitWith(1, 'No token entered, 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);
       }
     )
   )
@@ -346,18 +336,25 @@ program
             },
           ]);
           if (!answers.toToken?.length) {
-            exitWith(1, 'No token provided for remote destination, aborting transfer.');
+            exitWith(1, 'No token entered, aborting transfer.');
           }
           thisCommand.opts().toToken = answers.toToken;
         }
 
         await confirmMessage(
-          'The transfer will delete all the remote Strapi assets and its database. Are you sure you want to proceed?',
+          'The transfer will delete all data in the remote database and media files. 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`
@@ -378,7 +375,6 @@ 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'));
@@ -401,7 +397,6 @@ program
   .addOption(forceOption)
   .addOption(excludeOption)
   .addOption(onlyOption)
-  .addOption(throttleOption)
   .hook('preAction', validateExcludeOnly)
   .hook('preAction', async (thisCommand) => {
     const opts = thisCommand.opts();
@@ -456,7 +451,7 @@ program
   .hook(
     'preAction',
     confirmMessage(
-      'The import will delete all assets and data in your database. Are you sure you want to proceed?',
+      'The import will delete all data in your database and media files. Are you sure you want to proceed?',
       { failMessage: 'Import process aborted' }
     )
   )

package/ee/index.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { pick, isEqual } = require('lodash/fp');
+const { pick } = require('lodash/fp');
 
 const { readLicense, verifyLicense, fetchLicense, LicenseCheckError } = require('./license');
 const { shiftCronExpression } = require('../lib/utils/cron');
@@ -13,31 +13,10 @@ 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;
@@ -62,7 +41,7 @@ const init = (licenseDir, logger) => {
 
     if (license) {
       ee.licenseInfo = verifyLicense(license);
-      enable();
+      ee.enabled = true;
     }
   } catch (error) {
     disable(error.message);
@@ -110,22 +89,8 @@ const onlineUpdate = async ({ strapi }) => {
 
     if (license) {
       try {
-        // 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;
+        ee.licenseInfo = verifyLicense(license);
         validateInfo();
-
-        // Notify EE features
-        if (licenseInfoChanged && wasEnabled) {
-          strapi.eventHub.emit('ee.update');
-        }
       } catch (error) {
         disable(error.message);
       }
@@ -160,7 +125,7 @@ const validateInfo = () => {
     return disable('License expired.');
   }
 
-  enable();
+  ee.enabled = true;
 };
 
 const checkLicense = async ({ strapi }) => {

package/ee/license.js

@@ -10,9 +10,7 @@ const machineId = require('../lib/utils/machine-id');
 const DEFAULT_FEATURES = {
   bronze: [],
   silver: [],
-  // 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 } }],
+  gold: ['sso', { name: 'audit-logs', options: { retentionDays: 90 } }, 'review-workflows'],
 };
 
 const publicKey = fs.readFileSync(join(__dirname, 'resources/key.pub'));

package/lib/commands/transfer/export.js

@@ -22,20 +22,15 @@ const {
   createStrapiInstance,
   formatDiagnostic,
   loadersFactory,
-  exitMessageText,
-  abortTransfer,
 } = require('./utils');
 const { exitWith } = require('../utils/helpers');
 /**
  * @typedef ExportCommandOptions Options given to the CLI import command
  *
- * @property {string} [file] The file path to export to
+ * @property {string} [file] The file path to import
  * @property {boolean} [encrypt] Used to encrypt the final archive
- * @property {string} [key] Encryption key, used only when encryption is enabled
+ * @property {string} [key] Encryption key, only useful 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;
@@ -63,7 +58,6 @@ 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: [
         {
@@ -114,19 +108,12 @@ module.exports = async (opts) => {
 
   progress.on('transfer::start', async () => {
     console.log(`Starting export...`);
-
     await strapi.telemetry.send('didDEITSProcessStart', getTelemetryPayload());
   });
 
   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);
@@ -135,7 +122,7 @@ module.exports = async (opts) => {
     }
   } catch {
     await strapi.telemetry.send('didDEITSProcessFail', getTelemetryPayload());
-    exitWith(1, exitMessageText('export', true));
+    exitWith(1, 'Export process failed.');
   }
 
   await strapi.telemetry.send('didDEITSProcessFinish', getTelemetryPayload());
@@ -146,8 +133,8 @@ module.exports = async (opts) => {
     console.error('There was an error displaying the results of the transfer.');
   }
 
-  console.log(`Export archive is in ${chalk.green(outFile)}`);
-  exitWith(0, exitMessageText('export'));
+  console.log(`${chalk.bold('Export process has been completed successfully!')}`);
+  exitWith(0, `Export archive is in ${chalk.green(outFile)}`);
 };
 
 /**

package/lib/commands/transfer/import.js

@@ -18,32 +18,13 @@ const {
   createStrapiInstance,
   formatDiagnostic,
   loadersFactory,
-  exitMessageText,
-  abortTransfer,
 } = require('./utils');
 const { exitWith } = require('../utils/helpers');
 
 /**
- * @typedef {import('@strapi/data-transfer/src/file/providers').ILocalFileSourceProviderOptions} ILocalFileSourceProviderOptions
+ * @typedef {import('@strapi/data-transfer').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)) {
@@ -82,7 +63,6 @@ module.exports = async (opts) => {
     schemaStrategy: opts.schemaStrategy || DEFAULT_SCHEMA_STRATEGY,
     exclude: opts.exclude,
     only: opts.only,
-    throttle: opts.throttle,
     rules: {
       links: [
         {
@@ -138,16 +118,11 @@ module.exports = async (opts) => {
 
   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());
-    exitWith(1, exitMessageText('import', true));
+    console.error('Import process failed.');
+    process.exit(1);
   }
 
   try {
@@ -160,7 +135,7 @@ module.exports = async (opts) => {
   await strapiInstance.telemetry.send('didDEITSProcessFinish', getTelemetryPayload());
   await strapiInstance.destroy();
 
-  exitWith(0, exitMessageText('import'));
+  exitWith(0, 'Import process has been completed successfully!');
 };
 
 /**

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,8 +19,6 @@ const {
   DEFAULT_IGNORED_CONTENT_TYPES,
   formatDiagnostic,
   loadersFactory,
-  exitMessageText,
-  abortTransfer,
 } = require('./utils');
 const { exitWith } = require('../utils/helpers');
 
@@ -31,9 +29,6 @@ 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
  */
 
 /**
@@ -49,14 +44,15 @@ module.exports = async (opts) => {
     exitWith(1, 'Could not parse command arguments');
   }
 
-  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({
@@ -65,28 +61,13 @@ module.exports = async (opts) => {
   }
   // if URL provided, set up a remote source provider
   else {
-    if (!opts.fromToken) {
-      exitWith(1, 'Missing token for remote destination');
-    }
-
-    source = createRemoteStrapiSourceProvider({
-      getStrapi: () => strapi,
-      url: opts.from,
-      auth: {
-        type: 'token',
-        token: opts.fromToken,
-      },
-    });
+    exitWith(1, `Remote Strapi source provider not yet implemented`);
   }
 
   // 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
@@ -115,9 +96,6 @@ module.exports = async (opts) => {
   const engine = createTransferEngine(source, destination, {
     versionStrategy: 'exact',
     schemaStrategy: 'strict',
-    exclude: opts.exclude,
-    only: opts.only,
-    throttle: opts.throttle,
     transforms: {
       links: [
         {
@@ -157,26 +135,15 @@ module.exports = async (opts) => {
     updateLoader(stage, data);
   });
 
-  progress.on('stage::error', ({ stage, data }) => {
-    updateLoader(stage, data).fail();
-  });
-
   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, exitMessageText('transfer', true));
+    exitWith(1, 'Transfer process failed.');
   }
 
   const table = buildTransferTable(results.engine);
   console.log(table.toString());
-  exitWith(0, exitMessageText('transfer'));
+  exitWith(0, `${chalk.bold('Transfer process has been completed successfully!')}`);
 };

package/lib/commands/transfer/utils.js

@@ -14,19 +14,7 @@ const {
 const ora = require('ora');
 const { readableBytes, exitWith } = require('../utils/helpers');
 const strapi = require('../../index');
-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 { getParseListWithChoices } = require('../utils/commander');
 
 const pad = (n) => {
   return (n < 10 ? '0' : '') + String(n);
@@ -102,23 +90,12 @@ const DEFAULT_IGNORED_CONTENT_TYPES = [
   'admin::audit-log',
 ];
 
-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 = {}) => {
+const createStrapiInstance = async (logLevel = 'error') => {
   try {
     const appContext = await strapi.compile();
-    const app = strapi({ ...opts, ...appContext });
+    const app = strapi(appContext);
 
-    app.log.level = opts.logLevel || 'error';
+    app.log.level = logLevel;
     return await app.load();
   } catch (err) {
     if (err.code === 'ECONNREFUSED') {
@@ -130,13 +107,6 @@ const createStrapiInstance = async (opts = {}) => {
 
 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(',')}`
@@ -249,10 +219,7 @@ module.exports = {
   DEFAULT_IGNORED_CONTENT_TYPES,
   createStrapiInstance,
   excludeOption,
-  exitMessageText,
   onlyOption,
-  throttleOption,
   validateExcludeOnly,
   formatDiagnostic,
-  abortTransfer,
 };

package/lib/commands/utils/commander.js

@@ -7,7 +7,6 @@
 const inquirer = require('inquirer');
 const { InvalidOptionArgumentError, Option } = require('commander');
 const { bold, green, cyan } = require('chalk');
-const { isNaN } = require('lodash/fp');
 const { exitWith } = require('./helpers');
 
 /**
@@ -41,18 +40,6 @@ 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
  */
@@ -144,7 +131,6 @@ module.exports = {
   getParseListWithChoices,
   parseList,
   parseURL,
-  parseInteger,
   promptEncryptionKey,
   confirmMessage,
   forceOption,

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

@@ -2,7 +2,7 @@
 
 const { join } = require('path');
 const fse = require('fs-extra');
-const { defaultsDeep, defaults, getOr, get } = require('lodash/fp');
+const { defaultsDeep, 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,12 +101,7 @@ const loadPlugins = async (strapi) => {
     }
 
     const pluginServer = loadConfigFile(serverEntrypointPath);
-    plugins[pluginName] = {
-      ...defaultPlugin,
-      ...pluginServer,
-      config: defaults(defaultPlugin.config, pluginServer.config),
-      routes: pluginServer.routes ?? defaultPlugin.routes,
-    };
+    plugins[pluginName] = defaultsDeep(defaultPlugin, pluginServer);
   }
 
   // TODO: validate plugin format

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

@@ -22,6 +22,7 @@ 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 });
     },
 
-    async sanitizeOutput(data, ctx) {
+    sanitizeOutput(data, ctx) {
       const auth = getAuthFromKoaContext(ctx);
 
       return sanitize.contentAPI.output(data, contentType, { auth });

package/lib/factories.js

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

package/lib/middlewares/logger.js

@@ -1,5 +1,21 @@
 '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}
  */
@@ -9,6 +25,6 @@ module.exports = (_, { strapi }) => {
     await next();
     const delta = Math.ceil(Date.now() - start);
 
-    strapi.log.http(`${ctx.method} ${ctx.url} (${delta} ms) ${ctx.status}`);
+    strapi.log.http(`${ctx.method} ${ctx.url} (${delta} ms) ${codeToColor(ctx.status)}`);
   };
 };

package/lib/services/event-hub.js

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

package/lib/services/metrics/index.js

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

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 = router.prefix || `/${pluginName}`;
+        router.prefix = `/${pluginName}`;
         router.routes.forEach((route) => {
           generateRouteScope(route);
           route.info = { pluginName };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/strapi",
-  "version": "4.9.0",
+  "version": "4.10.0-beta.0",
   "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,7 +66,9 @@
   ],
   "main": "./lib",
   "types": "./lib/index.d.ts",
-  "bin": "./bin/strapi.js",
+  "bin": {
+    "strapi": "./bin/strapi.js"
+  },
   "directories": {
     "lib": "./lib",
     "bin": "./bin",
@@ -74,26 +76,24 @@
   },
   "scripts": {
     "postinstall": "node lib/utils/success.js",
-    "test:unit": "jest",
-    "test:unit:watch": "jest --watch",
-    "lint": "eslint ."
+    "test:unit": "jest --verbose"
   },
   "dependencies": {
     "@koa/cors": "3.4.3",
     "@koa/router": "10.1.1",
-    "@strapi/admin": "4.9.0",
-    "@strapi/data-transfer": "4.9.0",
-    "@strapi/database": "4.9.0",
-    "@strapi/generate-new": "4.9.0",
-    "@strapi/generators": "4.9.0",
-    "@strapi/logger": "4.9.0",
-    "@strapi/permissions": "4.9.0",
-    "@strapi/plugin-content-manager": "4.9.0",
-    "@strapi/plugin-content-type-builder": "4.9.0",
-    "@strapi/plugin-email": "4.9.0",
-    "@strapi/plugin-upload": "4.9.0",
-    "@strapi/typescript-utils": "4.9.0",
-    "@strapi/utils": "4.9.0",
+    "@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",
     "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.1",
+    "qs": "6.11.0",
     "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": "ffe3f4621ccc968ce56fda9a8317ec30d4bad205"
+  "gitHead": "1519ef0e56d27b738f24fc88223797651ad47aaf"
 }

package/.eslintignore

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

package/.eslintrc.js

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