@strapi/strapi 4.10.2 → 4.10.4

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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/strapi",
-  "version": "4.10.2",
+  "version": "4.10.4",
   "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.4",
+    "@strapi/data-transfer": "4.10.4",
+    "@strapi/database": "4.10.4",
+    "@strapi/generate-new": "4.10.4",
+    "@strapi/generators": "4.10.4",
+    "@strapi/logger": "4.10.4",
+    "@strapi/permissions": "4.10.4",
+    "@strapi/plugin-content-manager": "4.10.4",
+    "@strapi/plugin-content-type-builder": "4.10.4",
+    "@strapi/plugin-email": "4.10.4",
+    "@strapi/plugin-upload": "4.10.4",
+    "@strapi/typescript-utils": "4.10.4",
+    "@strapi/utils": "4.10.4",
     "bcryptjs": "2.4.3",
     "boxen": "5.1.2",
     "chalk": "4.1.2",
@@ -142,5 +142,5 @@
     "node": ">=14.19.1 <=18.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "a02b19866a3bcc1f30c2395698afae6e9c3e0515"
+  "gitHead": "3f55bac2e7fc3b15c85ac6910be1e95bb7eed9e5"
 }