@strapi/strapi 4.6.0-beta.0 → 4.6.0-beta.2

package/lib/services/metrics/sender.js

@@ -10,7 +10,7 @@ const { isUsingTypeScriptSync } = require('@strapi/typescript-utils');
 const { env } = require('@strapi/utils');
 const ee = require('../../utils/ee');
 const machineID = require('../../utils/machine-id');
-const stringifyDeep = require('./stringify-deep');
+const { generateAdminUserHash } = require('./admin-user-hash');
 
 const defaultQueryOpts = {
   timeout: 1000,
@@ -42,41 +42,49 @@ module.exports = (strapi) => {
   const serverRootPath = strapi.dirs.app.root;
   const adminRootPath = path.join(strapi.dirs.app.root, 'src', 'admin');
 
-  const anonymousMetadata = {
+  const anonymousUserProperties = {
     environment: strapi.config.environment,
     os: os.type(),
     osPlatform: os.platform(),
     osArch: os.arch(),
     osRelease: os.release(),
     nodeVersion: process.versions.node,
+  };
+
+  const anonymousGroupProperties = {
     docker: process.env.DOCKER || isDocker(),
     isCI: ciEnv.isCI,
     version: strapi.config.get('info.strapi'),
     projectType: isEE ? 'Enterprise' : 'Community',
     useTypescriptOnServer: isUsingTypeScriptSync(serverRootPath),
     useTypescriptOnAdmin: isUsingTypeScriptSync(adminRootPath),
+    projectId: uuid,
     isHostedOnStrapiCloud: env('STRAPI_HOSTING', null) === 'strapi.cloud',
   };
 
-  addPackageJsonStrapiMetadata(anonymousMetadata, strapi);
+  addPackageJsonStrapiMetadata(anonymousGroupProperties, strapi);
 
   return async (event, payload = {}, opts = {}) => {
+    const userId = generateAdminUserHash(strapi);
+
     const reqParams = {
       method: 'POST',
       body: JSON.stringify({
         event,
-        uuid,
+        userId,
         deviceId,
-        properties: stringifyDeep({
-          ...payload,
-          ...anonymousMetadata,
-        }),
+        eventProperties: payload.eventProperties,
+        userProperties: userId ? { ...anonymousUserProperties, ...payload.userProperties } : {},
+        groupProperties: {
+          ...anonymousGroupProperties,
+          ...payload.groupProperties,
+        },
       }),
       ..._.merge({}, defaultQueryOpts, opts),
     };
 
     try {
-      const res = await fetch(`${ANALYTICS_URI}/track`, reqParams);
+      const res = await fetch(`${ANALYTICS_URI}/api/v2/track`, reqParams);
       return res.ok;
     } catch (err) {
       return false;

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

@@ -3,7 +3,7 @@ import { Attribute, ConfigurableOption, PrivateOption } from './base';
 import { GetAttributesByType, GetAttributesValues } from './utils';
 
 export type BasicRelationsType = 'oneToOne' | 'oneToMany' | 'manyToOne' | 'manyToMany';
-export type PolymorphicRelationsType =  'morphToOne' | 'morphToMany' | 'morphOne' | 'morphMany';
+export type PolymorphicRelationsType = 'morphToOne' | 'morphToMany' | 'morphOne' | 'morphMany';
 export type RelationsType = BasicRelationsType | PolymorphicRelationsType;
 
 export interface BasicRelationAttributeProperties<
@@ -17,16 +17,14 @@ export interface BasicRelationAttributeProperties<
   mappedBy?: RelationsKeysFromTo<T, S>;
 }
 
-export interface PolymorphicRelationAttributeProperties<
-  R extends RelationsType,
-> {
+export interface PolymorphicRelationAttributeProperties<R extends RelationsType> {
   relation: R;
 }
 
 export type RelationAttribute<
   S extends SchemaUID,
   R extends RelationsType,
-  T extends R extends PolymorphicRelationsType ? never: SchemaUID = never
+  T extends R extends PolymorphicRelationsType ? never : SchemaUID = never
 > = Attribute<'relation'> &
   // Properties
   (R extends BasicRelationsType
@@ -34,22 +32,21 @@ export type RelationAttribute<
     : PolymorphicRelationAttributeProperties<R>) &
   // Options
   ConfigurableOption &
-  PrivateOption
+  PrivateOption;
 
 export type RelationsKeysFromTo<
   TTarget extends SchemaUID,
   TSource extends SchemaUID
 > = keyof PickRelationsFromTo<TTarget, TSource>;
 
-export type PickRelationsFromTo<TTarget extends SchemaUID, TSource extends SchemaUID> = GetAttributesByType<
-  TTarget,
-  'relation',
-  { target: TSource }
->;
+export type PickRelationsFromTo<
+  TTarget extends SchemaUID,
+  TSource extends SchemaUID
+> = GetAttributesByType<TTarget, 'relation', { target: TSource }>;
 
 export type RelationPluralityModifier<
   TRelation extends RelationsType,
-  TValue extends Object
+  TValue extends Record<string, unknown>
 > = TRelation extends `${string}Many` ? TValue[] : TValue;
 
 export type RelationValue<

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

@@ -1,5 +1,5 @@
 import { Attribute, ComponentAttribute } from '../attributes';
-import { KeysBy, StringRecord } from '../../utils';
+import { KeysBy, SchemaUID, StringRecord } from '../../utils';
 
 /**
  * Literal union type representing the possible natures of a content type
@@ -98,6 +98,11 @@ export interface PluginOptions {}
 export interface ContentTypeSchema extends Schema {
   modelType: 'contentType';
 
+  /**
+   * Unique identifier of the schema
+   */
+  uid: SchemaUID;
+
   /**
    * Determine the type of the content type (single-type or collection-type)
    */

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

@@ -2,8 +2,8 @@ import type Koa from 'koa';
 import { Database } from '@strapi/database';
 
 import type { StringMap } from './utils';
-import type { GenericController } from '../../../core-api/controller'
-import type { GenericService } from '../../../core-api/service'
+import type { GenericController } from '../../../core-api/controller';
+import type { GenericService } from '../../../core-api/service';
 
 // TODO move custom fields types to a separate file
 interface CustomFieldServerOptions {
@@ -92,9 +92,16 @@ export interface Strapi {
    */
   contentType(uid: string): any;
 
+  /**
+   * Getter for the Strapi component container
+   *
+   * It returns all the registered components
+   */
+  readonly components: any;
+
   /**
    * The custom fields registry
-   * 
+   *
    * It returns the custom fields interface
    */
   readonly customFields: CustomFields;
@@ -361,7 +368,6 @@ export interface Strapi {
    */
   log: any;
 
-
   /**
    * Used to manage cron within Strapi
    */
@@ -372,6 +378,11 @@ export interface Strapi {
    */
   telemetry: any;
 
+  /**
+   * Used to access ctx from anywhere within the Strapi application
+   */
+  requestContext: any;
+
   /**
    * Strapi DB layer instance
    */

package/lib/types/factories.d.ts

@@ -1,8 +1,8 @@
-import { Service,GenericService } from '../core-api/service';
+import { Service, GenericService } from '../core-api/service';
 import { Controller, GenericController } from '../core-api/controller';
 import { Middleware } from '../middlewares';
 import { Policy } from '../core/registries/policies';
-import { Strapi } from '@strapi/strapi';
+import { Strapi } from './core/strapi';
 
 type ControllerConfig<T extends Controller = Controller> = T;
 
@@ -30,7 +30,7 @@ type CollectionTypeRouterConfig = {
 
 type RouterConfig = {
   prefix?: string;
-  only: string[];
+  only?: string[];
   except?: string[];
   config: SingleTypeRouterConfig | CollectionTypeRouterConfig;
 };

package/lib/utils/ee.js

@@ -18,7 +18,7 @@ const internals = {};
 const features = {
   bronze: [],
   silver: [],
-  gold: ['sso'],
+  gold: ['sso', 'audit-logs'],
 };
 
 module.exports = ({ dir, logger = noLog }) => {

package/lib/utils/success.js

@@ -17,7 +17,7 @@ try {
     process.env.npm_config_global === 'true' ||
     JSON.parse(process.env.npm_config_argv).original.includes('global')
   ) {
-    fetch('https://analytics.strapi.io/track', {
+    fetch('https://analytics.strapi.io/api/v2/track', {
       method: 'POST',
       body: JSON.stringify({
         event: 'didInstallStrapi',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/strapi",
-  "version": "4.6.0-beta.0",
+  "version": "4.6.0-beta.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",
@@ -80,18 +80,19 @@
   "dependencies": {
     "@koa/cors": "3.4.3",
     "@koa/router": "10.1.1",
-    "@strapi/admin": "4.6.0-beta.0",
-    "@strapi/database": "4.6.0-beta.0",
-    "@strapi/generate-new": "4.6.0-beta.0",
-    "@strapi/generators": "4.6.0-beta.0",
-    "@strapi/logger": "4.6.0-beta.0",
-    "@strapi/permissions": "4.6.0-beta.0",
-    "@strapi/plugin-content-manager": "4.6.0-beta.0",
-    "@strapi/plugin-content-type-builder": "4.6.0-beta.0",
-    "@strapi/plugin-email": "4.6.0-beta.0",
-    "@strapi/plugin-upload": "4.6.0-beta.0",
-    "@strapi/typescript-utils": "4.6.0-beta.0",
-    "@strapi/utils": "4.6.0-beta.0",
+    "@strapi/admin": "4.6.0-beta.2",
+    "@strapi/data-transfer": "4.6.0-beta.2",
+    "@strapi/database": "4.6.0-beta.2",
+    "@strapi/generate-new": "4.6.0-beta.2",
+    "@strapi/generators": "4.6.0-beta.2",
+    "@strapi/logger": "4.6.0-beta.2",
+    "@strapi/permissions": "4.6.0-beta.2",
+    "@strapi/plugin-content-manager": "4.6.0-beta.2",
+    "@strapi/plugin-content-type-builder": "4.6.0-beta.2",
+    "@strapi/plugin-email": "4.6.0-beta.2",
+    "@strapi/plugin-upload": "4.6.0-beta.2",
+    "@strapi/typescript-utils": "4.6.0-beta.2",
+    "@strapi/utils": "4.6.0-beta.2",
     "bcryptjs": "2.4.3",
     "boxen": "5.1.2",
     "chalk": "4.1.2",
@@ -126,7 +127,7 @@
     "open": "8.4.0",
     "ora": "5.4.1",
     "package-json": "7.0.0",
-    "qs": "6.10.1",
+    "qs": "6.11.0",
     "resolve-cwd": "3.0.0",
     "semver": "7.3.8",
     "statuses": "2.0.1",
@@ -140,5 +141,5 @@
     "node": ">=14.19.1 <=18.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "c0c3365ad801d088a6ab6c4eb95a014078429747"
+  "gitHead": "b852090f931cd21868c4016f24db2f9fdfc7a7ab"
 }