@strapi/strapi 4.10.2 → 4.10.5

package/lib/Strapi.js

@@ -110,7 +110,7 @@ class Strapi {
     // Instantiate the Koa app & the HTTP server
     this.server = createServer(this);
 
-    // Strapi utils instanciation
+    // Strapi utils instantiation
     this.fs = createStrapiFs(this);
     this.eventHub = createEventHub();
     this.startupLogger = createStartupLogger(this);

package/lib/commands/actions/export/action.js

@@ -25,6 +25,7 @@ const {
   exitMessageText,
   abortTransfer,
   getTransferTelemetryPayload,
+  setSignalHandler,
 } = require('../../utils/data-transfer');
 const { exitWith } = require('../../utils/helpers');
 
@@ -115,10 +116,7 @@ module.exports = async (opts) => {
   let outFile;
   try {
     // Abort transfer if user interrupts process
-    ['SIGTERM', 'SIGINT', 'SIGQUIT'].forEach((signal) => {
-      process.removeAllListeners(signal);
-      process.on(signal, () => abortTransfer({ engine, strapi }));
-    });
+    setSignalHandler(() => abortTransfer({ engine, strapi }));
 
     results = await engine.transfer();
     outFile = results.destination.file.path;

package/lib/commands/actions/import/action.js

@@ -21,6 +21,8 @@ const {
   exitMessageText,
   abortTransfer,
   getTransferTelemetryPayload,
+  setSignalHandler,
+  getDiffHandler,
 } = require('../../utils/data-transfer');
 const { exitWith } = require('../../utils/helpers');
 
@@ -111,6 +113,8 @@ module.exports = async (opts) => {
 
   const { updateLoader } = loadersFactory();
 
+  engine.onSchemaDiff(getDiffHandler(engine, { force: opts.force, action: 'import' }));
+
   progress.on(`stage::start`, ({ stage, data }) => {
     updateLoader(stage, data).start();
   });
@@ -134,10 +138,7 @@ 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 }));
-    });
+    setSignalHandler(() => abortTransfer({ engine, strapi }));
 
     results = await engine.transfer();
   } catch (e) {

package/lib/commands/actions/import/command.js

@@ -9,7 +9,7 @@ const {
   throttleOption,
   validateExcludeOnly,
 } = require('../../utils/data-transfer');
-const { confirmMessage, forceOption } = require('../../utils/commander');
+const { getCommanderConfirmMessage, forceOption } = require('../../utils/commander');
 const { getLocalScript, exitWith } = require('../../utils/helpers');
 
 /**
@@ -88,7 +88,7 @@ module.exports = ({ command }) => {
     })
     .hook(
       'preAction',
-      confirmMessage(
+      getCommanderConfirmMessage(
         'The import will delete all assets and data in your database. Are you sure you want to proceed?',
         { failMessage: 'Import process aborted' }
       )

package/lib/commands/actions/transfer/action.js

@@ -22,6 +22,8 @@ const {
   exitMessageText,
   abortTransfer,
   getTransferTelemetryPayload,
+  setSignalHandler,
+  getDiffHandler,
 } = require('../../utils/data-transfer');
 const { exitWith } = require('../../utils/helpers');
 
@@ -146,6 +148,8 @@ module.exports = async (opts) => {
 
   const { updateLoader } = loadersFactory();
 
+  engine.onSchemaDiff(getDiffHandler(engine, { force: opts.force, action: 'transfer' }));
+
   progress.on(`stage::start`, ({ stage, data }) => {
     updateLoader(stage, data).start();
   });
@@ -171,10 +175,7 @@ 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 }));
-    });
+    setSignalHandler(() => abortTransfer({ engine, strapi }));
 
     results = await engine.transfer();
   } catch (e) {

package/lib/commands/actions/transfer/command.js

@@ -2,7 +2,7 @@
 
 const inquirer = require('inquirer');
 const { Option } = require('commander');
-const { confirmMessage, forceOption, parseURL } = require('../../utils/commander');
+const { getCommanderConfirmMessage, forceOption, parseURL } = require('../../utils/commander');
 const {
   getLocalScript,
   exitWith,
@@ -76,7 +76,7 @@ module.exports = ({ command }) => {
             thisCommand.opts().fromToken = answers.fromToken;
           }
 
-          await confirmMessage(
+          await getCommanderConfirmMessage(
             'The transfer will delete all the local Strapi assets and its database. Are you sure you want to proceed?',
             { failMessage: 'Transfer process aborted' }
           )(thisCommand);
@@ -104,7 +104,7 @@ module.exports = ({ command }) => {
             thisCommand.opts().toToken = answers.toToken;
           }
 
-          await confirmMessage(
+          await getCommanderConfirmMessage(
             'The transfer will delete all the remote Strapi assets and its database. Are you sure you want to proceed?',
             { failMessage: 'Transfer process aborted' }
           )(thisCommand);

package/lib/commands/utils/commander.js

@@ -111,30 +111,35 @@ const promptEncryptionKey = async (thisCommand) => {
  * @param {object} options Additional options
  * @param {string|undefined} options.failMessage The message to display when prompt is not confirmed
  */
-const confirmMessage = (message, { failMessage } = {}) => {
+const getCommanderConfirmMessage = (message, { failMessage } = {}) => {
   return async (command) => {
-    // if we have a force option, assume yes
-    const opts = command.opts();
-    if (opts?.force === true) {
-      // attempt to mimic the inquirer prompt exactly
-      console.log(`${green('?')} ${bold(message)} ${cyan('Yes')}`);
-      return;
-    }
-
-    const answers = await inquirer.prompt([
-      {
-        type: 'confirm',
-        message,
-        name: `confirm`,
-        default: false,
-      },
-    ]);
-    if (!answers.confirm) {
+    const confirmed = await confirmMessage(message, { force: command.opts().force });
+    if (!confirmed) {
       exitWith(1, failMessage);
     }
   };
 };
 
+const confirmMessage = async (message, { force } = {}) => {
+  // if we have a force option, respond yes
+  if (force === true) {
+    // attempt to mimic the inquirer prompt exactly
+    console.log(`${green('?')} ${bold(message)} ${cyan('Yes')}`);
+    return true;
+  }
+
+  const answers = await inquirer.prompt([
+    {
+      type: 'confirm',
+      message,
+      name: `confirm`,
+      default: false,
+    },
+  ]);
+
+  return answers.confirm;
+};
+
 const forceOption = new Option(
   '--force',
   `Automatically answer "yes" to all prompts, including potentially destructive requests, and run non-interactively.`
@@ -146,6 +151,7 @@ module.exports = {
   parseURL,
   parseInteger,
   promptEncryptionKey,
+  getCommanderConfirmMessage,
   confirmMessage,
   forceOption,
 };

package/lib/commands/utils/data-transfer.js

@@ -12,9 +12,11 @@ const {
   createLogger,
 } = require('@strapi/logger');
 const ora = require('ora');
+const { TransferEngineInitializationError } = require('@strapi/data-transfer/dist/engine/errors');
+const { merge } = require('lodash/fp');
 const { readableBytes, exitWith } = require('./helpers');
 const strapi = require('../../index');
-const { getParseListWithChoices, parseInteger } = require('./commander');
+const { getParseListWithChoices, parseInteger, confirmMessage } = require('./commander');
 
 const exitMessageText = (process, error = false) => {
   const processCapitalized = process[0].toUpperCase() + process.slice(1);
@@ -113,6 +115,15 @@ const abortTransfer = async ({ engine, strapi }) => {
   return true;
 };
 
+const setSignalHandler = async (handler, signals = ['SIGINT', 'SIGTERM', 'SIGQUIT']) => {
+  signals.forEach((signal) => {
+    // We specifically remove ALL listeners because we have to clear the one added in Strapi bootstrap that has a process.exit
+    // TODO: Ideally Strapi bootstrap would not add that listener, and then this could be more flexible and add/remove only what it needs to
+    process.removeAllListeners(signal);
+    process.on(signal, handler);
+  });
+};
+
 const createStrapiInstance = async (opts = {}) => {
   try {
     const appContext = await strapi.compile();
@@ -257,6 +268,79 @@ const getTransferTelemetryPayload = (engine) => {
   };
 };
 
+/**
+ * Get a transfer engine schema diff handler that confirms with the user before bypassing a schema check
+ */
+const getDiffHandler = (engine, { force, action }) => {
+  return async (context, next) => {
+    // if we abort here, we need to actually exit the process because of conflict with inquirer prompt
+    setSignalHandler(async () => {
+      await abortTransfer({ engine, strapi });
+      exitWith(1, exitMessageText(action, true));
+    });
+
+    let workflowsStatus;
+    const source = 'Schema Integrity';
+
+    Object.entries(context.diffs).forEach(([uid, diffs]) => {
+      for (const diff of diffs) {
+        const path = [uid].concat(diff.path).join('.');
+        const endPath = diff.path[diff.path.length - 1];
+
+        // Catch known features
+        if (
+          uid === 'admin::workflow' ||
+          uid === 'admin::workflow-stage' ||
+          endPath?.startsWith('strapi_reviewWorkflows_')
+        ) {
+          workflowsStatus = diff.kind;
+        }
+        // handle generic cases
+        else if (diff.kind === 'added') {
+          engine.reportWarning(chalk.red(`${chalk.bold(path)} does not exist on source`), source);
+        } else if (diff.kind === 'deleted') {
+          engine.reportWarning(
+            chalk.red(`${chalk.bold(path)} does not exist on destination`),
+            source
+          );
+        } else if (diff.kind === 'modified') {
+          engine.reportWarning(chalk.red(`${chalk.bold(path)} has a different data type`), source);
+        }
+      }
+    });
+
+    // output the known feature warnings
+    if (workflowsStatus === 'added') {
+      engine.reportWarning(chalk.red(`Review workflows feature does not exist on source`), source);
+    } else if (workflowsStatus === 'deleted') {
+      engine.reportWarning(
+        chalk.red(`Review workflows feature does not exist on destination`),
+        source
+      );
+    } else if (workflowsStatus === 'modified') {
+      engine.panic(
+        new TransferEngineInitializationError('Unresolved differences in schema [review workflows]')
+      );
+    }
+
+    const confirmed = await confirmMessage(
+      'There are differences in schema between the source and destination, and the data listed above will be lost. Are you sure you want to continue?',
+      {
+        force,
+      }
+    );
+
+    // reset handler back to normal
+    setSignalHandler(() => abortTransfer({ engine, strapi }));
+
+    if (confirmed) {
+      context.ignoredDiffs = merge(context.diffs, context.ignoredDiffs);
+    }
+
+    return next(context);
+  };
+};
+
 module.exports = {
   loadersFactory,
   buildTransferTable,
@@ -271,4 +355,6 @@ module.exports = {
   validateExcludeOnly,
   formatDiagnostic,
   abortTransfer,
+  setSignalHandler,
+  getDiffHandler,
 };

package/lib/services/entity-service/components.js

@@ -49,7 +49,7 @@ const createComponents = async (uid, data) => {
         const components = await mapAsync(
           componentValue,
           (value) => createComponent(componentUID, value),
-          { concurrency: isDialectMySQL() ? 1 : Infinity }
+          { concurrency: isDialectMySQL() && !strapi.db.inTransaction() ? 1 : Infinity }
         );
 
         componentBody[attributeName] = components.map(({ id }) => {
@@ -97,7 +97,7 @@ const createComponents = async (uid, data) => {
       componentBody[attributeName] = await mapAsync(
         dynamiczoneValues,
         createDynamicZoneComponents,
-        { concurrency: isDialectMySQL() ? 1 : Infinity }
+        { concurrency: isDialectMySQL() && !strapi.db.inTransaction() ? 1 : Infinity }
       );
 
       continue;
@@ -151,7 +151,7 @@ const updateComponents = async (uid, entityToUpdate, data) => {
         const components = await mapAsync(
           componentValue,
           (value) => updateOrCreateComponent(componentUID, value),
-          { concurrency: isDialectMySQL() ? 1 : Infinity }
+          { concurrency: isDialectMySQL() && !strapi.db.inTransaction() ? 1 : Infinity }
         );
 
         componentBody[attributeName] = components.filter(_.negate(_.isNil)).map(({ id }) => {
@@ -200,7 +200,7 @@ const updateComponents = async (uid, entityToUpdate, data) => {
             },
           };
         },
-        { concurrency: isDialectMySQL() ? 1 : Infinity }
+        { concurrency: isDialectMySQL() && !strapi.db.inTransaction() ? 1 : Infinity }
       );
 
       continue;
@@ -305,7 +305,7 @@ const deleteComponents = async (uid, entityToDelete, { loadComponents = true } =
         const { component: componentUID } = attribute;
         // MySQL/MariaDB can cause deadlocks here if concurrency higher than 1
         await mapAsync(_.castArray(value), (subValue) => deleteComponent(componentUID, subValue), {
-          concurrency: isDialectMySQL() ? 1 : Infinity,
+          concurrency: isDialectMySQL() && !strapi.db.inTransaction() ? 1 : Infinity,
         });
       } else {
         // delete dynamic zone components
@@ -313,7 +313,7 @@ const deleteComponents = async (uid, entityToDelete, { loadComponents = true } =
         await mapAsync(
           _.castArray(value),
           (subValue) => deleteComponent(subValue.__component, subValue),
-          { concurrency: isDialectMySQL() ? 1 : Infinity }
+          { concurrency: isDialectMySQL() && !strapi.db.inTransaction() ? 1 : Infinity }
         );
       }
 

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

@@ -33,15 +33,14 @@ module.exports = (strapi) => {
 const registerAdminRoutes = (strapi) => {
   const generateRouteScope = createRouteScopeGenerator(`admin::`);
 
-  strapi.admin.routes.forEach((route) => {
-    generateRouteScope(route);
-    route.info = { pluginName: 'admin' };
-  });
-
-  strapi.server.routes({
-    type: 'admin',
-    prefix: '/admin',
-    routes: strapi.admin.routes,
+  _.forEach(strapi.admin.routes, (router) => {
+    router.type = router.type || 'admin';
+    router.prefix = router.prefix || `/admin`;
+    router.routes.forEach((route) => {
+      generateRouteScope(route);
+      route.info = { pluginName: 'admin' };
+    });
+    strapi.server.routes(router);
   });
 };
 

package/lib/types/core/strapi/index.d.ts

@@ -21,6 +21,14 @@ interface CustomFieldServerOptions {
    * The existing Strapi data type the custom field uses
    */
   type: string;
+  
+  /**
+   * Settings for the input size in the Admin UI
+   */
+  inputSize?: {
+    default: 4 | 6 | 8 | 12;
+    isResizable: boolean;
+  };
 }
 
 interface CustomFields {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/strapi",
-  "version": "4.10.2",
+  "version": "4.10.5",
   "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",
@@ -81,19 +81,19 @@
   "dependencies": {
     "@koa/cors": "3.4.3",
     "@koa/router": "10.1.1",
-    "@strapi/admin": "4.10.2",
-    "@strapi/data-transfer": "4.10.2",
-    "@strapi/database": "4.10.2",
-    "@strapi/generate-new": "4.10.2",
-    "@strapi/generators": "4.10.2",
-    "@strapi/logger": "4.10.2",
-    "@strapi/permissions": "4.10.2",
-    "@strapi/plugin-content-manager": "4.10.2",
-    "@strapi/plugin-content-type-builder": "4.10.2",
-    "@strapi/plugin-email": "4.10.2",
-    "@strapi/plugin-upload": "4.10.2",
-    "@strapi/typescript-utils": "4.10.2",
-    "@strapi/utils": "4.10.2",
+    "@strapi/admin": "4.10.5",
+    "@strapi/data-transfer": "4.10.5",
+    "@strapi/database": "4.10.5",
+    "@strapi/generate-new": "4.10.5",
+    "@strapi/generators": "4.10.5",
+    "@strapi/logger": "4.10.5",
+    "@strapi/permissions": "4.10.5",
+    "@strapi/plugin-content-manager": "4.10.5",
+    "@strapi/plugin-content-type-builder": "4.10.5",
+    "@strapi/plugin-email": "4.10.5",
+    "@strapi/plugin-upload": "4.10.5",
+    "@strapi/typescript-utils": "4.10.5",
+    "@strapi/utils": "4.10.5",
     "bcryptjs": "2.4.3",
     "boxen": "5.1.2",
     "chalk": "4.1.2",
@@ -117,7 +117,7 @@
     "koa-compose": "4.1.0",
     "koa-compress": "5.1.0",
     "koa-favicon": "2.1.0",
-    "koa-helmet": "6.1.0",
+    "koa-helmet": "7.0.2",
     "koa-ip": "^2.1.2",
     "koa-session": "6.4.0",
     "koa-static": "5.0.0",
@@ -142,5 +142,5 @@
     "node": ">=14.19.1 <=18.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "a02b19866a3bcc1f30c2395698afae6e9c3e0515"
+  "gitHead": "d9277d616b4478a3839e79e47330a4aaf167a2f1"
 }