@strapi/strapi 4.6.0 → 4.6.2

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/core/registries/hooks.d.ts

@@ -1,4 +1,3 @@
-
 type Handler = (context: any) => any;
 
 type AsyncHook = {
@@ -8,7 +7,6 @@ type AsyncHook = {
   call(): Promise<void>;
 };
 
-
 type SyncHook = {
   get handlers(): Handler[];
   register(handler: Handler): this;
@@ -16,5 +14,4 @@ type SyncHook = {
   call(): void;
 };
 
-
-export type Hook = AsyncHook|SyncHook
+export type Hook = AsyncHook | SyncHook;

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

@@ -6,4 +6,8 @@ interface PolicyContext extends BaseContext {
   is(name): boolean;
 }
 
-export type Policy<T=unknown> = (ctx: PolicyContext,cfg:T, { strapi: Strapi }) => boolean | undefined;
+export type Policy<T = unknown> = (
+  ctx: PolicyContext,
+  cfg: T,
+  { strapi: Strapi }
+) => boolean | undefined;

package/lib/global.d.ts

@@ -1,5 +1,10 @@
 import type { Strapi as StrapiInterface } from './types/core';
-import type { CollectionTypeSchema, SingleTypeSchema, ComponentSchema, ContentTypeSchema } from './types/core/schemas';
+import type {
+  CollectionTypeSchema,
+  SingleTypeSchema,
+  ComponentSchema,
+  ContentTypeSchema,
+} from './types/core/schemas';
 import type { KeysBy } from './types/utils';
 
 declare global {
@@ -7,7 +12,7 @@ declare global {
     /**
      * Map of UID / schemas used as a schemas database for other types.
      * It must be extended by the user application or plugins.
-     * 
+     *
      * @example
      * ```ts
      * declare global {
@@ -39,12 +44,12 @@ declare global {
     /**
      * Literal union type of every component registered in Strapi.Schemas
      */
-     type ComponentUIDs = KeysBy<Schemas, ComponentSchema>;
+    type ComponentUIDs = KeysBy<Schemas, ComponentSchema>;
 
-     /**
-      * Global shorthand to access the `StrapiInterface` type
-      */
-     type Strapi = StrapiInterface;
+    /**
+     * Global shorthand to access the `StrapiInterface` type
+     */
+    type Strapi = StrapiInterface;
   }
 
   /**

package/lib/index.d.ts

@@ -2,4 +2,4 @@ import './global';
 
 export * from './types';
 
-export default function(opts): Strapi;
+export default function (opts): Strapi;

package/lib/middlewares/cors.js

@@ -19,6 +19,14 @@ module.exports = (config) => {
   const { origin, expose, maxAge, credentials, methods, headers, keepHeadersOnError } =
     defaultsDeep(defaults, config);
 
+  if (config.enabled !== undefined) {
+    strapi.log.warn(
+      'The strapi::cors middleware no longer supports the `enabled` option. Using it' +
+        ' to conditionally enable CORS might cause an insecure default. To disable strapi::cors, remove it from' +
+        ' the exported array in config/middleware.js'
+    );
+  }
+
   return cors({
     async origin(ctx) {
       let originList;

package/lib/middlewares/public/index.js

@@ -77,9 +77,10 @@ module.exports = (config, { strapi }) => {
         }),
         config: { auth: false },
       },
+      // All other public GET-routes except /uploads/(.*) which is handled in upload middleware
       {
         method: 'GET',
-        path: '/(.*)',
+        path: '/((?!uploads/).+)',
         handler: koaStatic(strapi.dirs.static.public, {
           maxage: maxAge,
           defer: true,

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/entity-service/index.d.ts

@@ -88,7 +88,7 @@ export interface EntityService {
   ): Promise<any>;
 }
 
-export default function(opts: {
+export default function (opts: {
   strapi: Strapi;
   db: Database;
   // TODO: define types

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/lib/types/core/attributes/component.d.ts

@@ -25,13 +25,10 @@ export type ComponentAttribute<
   PrivateOption &
   RequiredOption;
 
-export type ComponentValue<T extends Strapi.ComponentUIDs, R extends boolean> = GetAttributesValues<
-  T
-> extends infer V
-  ? R extends true
-    ? V[]
-    : V
-  : never;
+export type ComponentValue<
+  T extends Strapi.ComponentUIDs,
+  R extends boolean
+> = GetAttributesValues<T> extends infer V ? (R extends true ? V[] : V) : never;
 
 export type GetComponentAttributeValue<T extends Attribute> = T extends ComponentAttribute<
   infer U,

package/lib/types/core/attributes/utils.d.ts

@@ -83,11 +83,10 @@ export type GetAttributeValueByKey<
 export type GetAttributesValues<T extends SchemaUID> = {
   // Handle required attributes
   [key in GetAttributesRequiredKeys<T>]-?: GetAttributeValueByKey<T, key>;
-} &
-  {
-    // Handle optional attributes
-    [key in GetAttributesOptionalKeys<T>]?: GetAttributeValueByKey<T, key>;
-  };
+} & {
+  // Handle optional attributes
+  [key in GetAttributesOptionalKeys<T>]?: GetAttributeValueByKey<T, key>;
+};
 
 export type GetAttributesRequiredKeys<T extends SchemaUID> = KeysBy<
   GetAttributes<T>,

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

@@ -1,3 +1,3 @@
 export * from './attributes';
-export * from  './schemas';
-export * from './strapi'
+export * from './schemas';
+export * from './strapi';

package/lib/types/index.d.ts

@@ -1,4 +1,4 @@
 export * from './core';
 
-export * as utils from './utils'
-export * as factories from './factories';
+export * as utils from './utils';
+export * as factories from './factories';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/strapi",
-  "version": "4.6.0",
+  "version": "4.6.2",
   "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.2",
+    "@strapi/data-transfer": "4.6.2",
+    "@strapi/database": "4.6.2",
+    "@strapi/generate-new": "4.6.2",
+    "@strapi/generators": "4.6.2",
+    "@strapi/logger": "4.6.2",
+    "@strapi/permissions": "4.6.2",
+    "@strapi/plugin-content-manager": "4.6.2",
+    "@strapi/plugin-content-type-builder": "4.6.2",
+    "@strapi/plugin-email": "4.6.2",
+    "@strapi/plugin-upload": "4.6.2",
+    "@strapi/typescript-utils": "4.6.2",
+    "@strapi/utils": "4.6.2",
     "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",
@@ -118,11 +118,11 @@
     "koa-favicon": "2.1.0",
     "koa-helmet": "6.1.0",
     "koa-ip": "^2.1.2",
-    "koa-session": "6.2.0",
+    "koa-session": "6.4.0",
     "koa-static": "5.0.0",
     "lodash": "4.17.21",
     "mime-types": "2.1.35",
-    "node-fetch": "2.6.7",
+    "node-fetch": "2.6.9",
     "node-machine-id": "1.1.12",
     "node-schedule": "2.1.0",
     "open": "8.4.0",
@@ -135,12 +135,12 @@
     "uuid": "^8.3.2"
   },
   "devDependencies": {
-    "supertest": "6.2.4",
+    "supertest": "6.3.3",
     "typescript": "4.6.2"
   },
   "engines": {
     "node": ">=14.19.1 <=18.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "a9e55435c489f3379d88565bf3f729deb29bfb45"
+  "gitHead": "bae505f44c3a779905f6b8dbc0c497e24d9eabfb"
 }