@strapi/strapi 4.6.0 → 4.6.1

package/bin/strapi.js

@@ -409,6 +409,13 @@ program
     } else {
       thisCommand.opts().decompress = false;
     }
+
+    if (extname(file) !== '.tar') {
+      exitWith(
+        1,
+        `The file '${opts.file}' does not appear to be a valid Strapi data file. It must have an extension ending in .tar[.gz][.enc]`
+      );
+    }
   })
   .hook(
     'preAction',

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

@@ -3,10 +3,12 @@
 const _ = require('lodash');
 const { has, prop, omit, toString, pipe, assign } = require('lodash/fp');
 
-const { contentTypes: contentTypesUtils } = require('@strapi/utils');
+const { contentTypes: contentTypesUtils, mapAsync } = require('@strapi/utils');
 const { ApplicationError } = require('@strapi/utils').errors;
 const { getComponentAttributes } = require('@strapi/utils').contentTypes;
 
+const isDialectMySQL = () => strapi.db.dialect.client === 'mysql';
+
 const omitComponentData = (contentType, data) => {
   const { attributes } = contentType;
   const componentAttributes = Object.keys(attributes).filter((attributeName) =>
@@ -43,10 +45,12 @@ const createComponents = async (uid, data) => {
           throw new Error('Expected an array to create repeatable component');
         }
 
-        const components = [];
-        for (const value of componentValue) {
-          components.push(await createComponent(componentUID, value));
-        }
+        // MySQL/MariaDB can cause deadlocks here if concurrency higher than 1
+        const components = await mapAsync(
+          componentValue,
+          (value) => createComponent(componentUID, value),
+          { concurrency: isDialectMySQL() ? 1 : Infinity }
+        );
 
         componentBody[attributeName] = components.map(({ id }) => {
           return {
@@ -78,19 +82,23 @@ const createComponents = async (uid, data) => {
         throw new Error('Expected an array to create repeatable component');
       }
 
-      const dynamicZoneData = [];
-      for (const value of dynamiczoneValues) {
+      const createDynamicZoneComponents = async (value) => {
         const { id } = await createComponent(value.__component, value);
-        dynamicZoneData.push({
+        return {
           id,
           __component: value.__component,
           __pivot: {
             field: attributeName,
           },
-        });
-      }
+        };
+      };
 
-      componentBody[attributeName] = dynamicZoneData;
+      // MySQL/MariaDB can cause deadlocks here if concurrency higher than 1
+      componentBody[attributeName] = await mapAsync(
+        dynamiczoneValues,
+        createDynamicZoneComponents,
+        { concurrency: isDialectMySQL() ? 1 : Infinity }
+      );
 
       continue;
     }
@@ -139,10 +147,12 @@ const updateComponents = async (uid, entityToUpdate, data) => {
           throw new Error('Expected an array to create repeatable component');
         }
 
-        const components = [];
-        for (const value of componentValue) {
-          components.push(await updateOrCreateComponent(componentUID, value));
-        }
+        // MySQL/MariaDB can cause deadlocks here if concurrency higher than 1
+        const components = await mapAsync(
+          componentValue,
+          (value) => updateOrCreateComponent(componentUID, value),
+          { concurrency: isDialectMySQL() ? 1 : Infinity }
+        );
 
         componentBody[attributeName] = components.filter(_.negate(_.isNil)).map(({ id }) => {
           return {
@@ -176,19 +186,22 @@ const updateComponents = async (uid, entityToUpdate, data) => {
         throw new Error('Expected an array to create repeatable component');
       }
 
-      const dynamicZoneData = [];
-      for (const value of dynamiczoneValues) {
-        const { id } = await updateOrCreateComponent(value.__component, value);
-        dynamicZoneData.push({
-          id,
-          __component: value.__component,
-          __pivot: {
-            field: attributeName,
-          },
-        });
-      }
+      // MySQL/MariaDB can cause deadlocks here if concurrency higher than 1
+      componentBody[attributeName] = await mapAsync(
+        dynamiczoneValues,
+        async (value) => {
+          const { id } = await updateOrCreateComponent(value.__component, value);
 
-      componentBody[attributeName] = dynamicZoneData;
+          return {
+            id,
+            __component: value.__component,
+            __pivot: {
+              field: attributeName,
+            },
+          };
+        },
+        { concurrency: isDialectMySQL() ? 1 : Infinity }
+      );
 
       continue;
     }
@@ -290,14 +303,18 @@ const deleteComponents = async (uid, entityToDelete, { loadComponents = true } =
 
       if (attribute.type === 'component') {
         const { component: componentUID } = attribute;
-        for (const subValue of _.castArray(value)) {
-          await deleteComponent(componentUID, subValue);
-        }
+        // MySQL/MariaDB can cause deadlocks here if concurrency higher than 1
+        await mapAsync(_.castArray(value), (subValue) => deleteComponent(componentUID, subValue), {
+          concurrency: isDialectMySQL() ? 1 : Infinity,
+        });
       } else {
         // delete dynamic zone components
-        for (const subValue of _.castArray(value)) {
-          await deleteComponent(subValue.__component, subValue);
-        }
+        // MySQL/MariaDB can cause deadlocks here if concurrency higher than 1
+        await mapAsync(
+          _.castArray(value),
+          (subValue) => deleteComponent(subValue.__component, subValue),
+          { concurrency: isDialectMySQL() ? 1 : Infinity }
+        );
       }
 
       continue;

package/lib/services/metrics/sender.js

@@ -3,6 +3,7 @@
 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');
@@ -40,6 +41,14 @@ 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(),
@@ -57,6 +66,9 @@ 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/types/core/attributes/common.d.ts

@@ -30,7 +30,10 @@ export type ConfigurableAttribute = { configurable: true };
 export type NonConfigurableAttribute = { configurable: false };
 
 // custom field
-export type CustomField<T extends string, P extends object = undefined> = { customField: T, options?: P };
+export type CustomField<T extends string, P extends object = undefined> = {
+  customField: T;
+  options?: P;
+};
 
 // min/max
 export type SetMinMax<T extends MinMaxOption<U>, U = number> = T;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/strapi",
-  "version": "4.6.0",
+  "version": "4.6.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",
@@ -81,19 +81,19 @@
   "dependencies": {
     "@koa/cors": "3.4.3",
     "@koa/router": "10.1.1",
-    "@strapi/admin": "4.6.0",
-    "@strapi/data-transfer": "4.6.0",
-    "@strapi/database": "4.6.0",
-    "@strapi/generate-new": "4.6.0",
-    "@strapi/generators": "4.6.0",
-    "@strapi/logger": "4.6.0",
-    "@strapi/permissions": "4.6.0",
-    "@strapi/plugin-content-manager": "4.6.0",
-    "@strapi/plugin-content-type-builder": "4.6.0",
-    "@strapi/plugin-email": "4.6.0",
-    "@strapi/plugin-upload": "4.6.0",
-    "@strapi/typescript-utils": "4.6.0",
-    "@strapi/utils": "4.6.0",
+    "@strapi/admin": "4.6.1",
+    "@strapi/data-transfer": "4.6.1",
+    "@strapi/database": "4.6.1",
+    "@strapi/generate-new": "4.6.1",
+    "@strapi/generators": "4.6.1",
+    "@strapi/logger": "4.6.1",
+    "@strapi/permissions": "4.6.1",
+    "@strapi/plugin-content-manager": "4.6.1",
+    "@strapi/plugin-content-type-builder": "4.6.1",
+    "@strapi/plugin-email": "4.6.1",
+    "@strapi/plugin-upload": "4.6.1",
+    "@strapi/typescript-utils": "4.6.1",
+    "@strapi/utils": "4.6.1",
     "bcryptjs": "2.4.3",
     "boxen": "5.1.2",
     "chalk": "4.1.2",
@@ -109,7 +109,7 @@
     "fs-extra": "10.0.0",
     "glob": "7.2.0",
     "http-errors": "1.8.1",
-    "inquirer": "8.2.4",
+    "inquirer": "8.2.5",
     "is-docker": "2.2.1",
     "koa": "2.13.4",
     "koa-body": "4.2.0",
@@ -142,5 +142,5 @@
     "node": ">=14.19.1 <=18.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "a9e55435c489f3379d88565bf3f729deb29bfb45"
+  "gitHead": "17a7845e3d453ea2e7911bda6ec25ed196dd5f16"
 }