@strapi/strapi 4.9.0 → 4.9.2

package/bin/strapi.js

@@ -258,6 +258,14 @@ program
   .description('Enable anonymous telemetry and metadata sending to Strapi analytics')
   .action(getLocalScript('opt-in-telemetry'));
 
+program
+  .command('report')
+  .description('Get system stats for debugging and submitting issues')
+  .option('-u, --uuid', 'Include Project UUID')
+  .option('-d, --dependencies', 'Include Project Dependencies')
+  .option('--all', 'Include All Information')
+  .action(getLocalScript('report'));
+
 program
   .command('ts:generate-types')
   .description(`Generate TypeScript typings for your schemas`)

package/lib/Strapi.js

@@ -43,6 +43,7 @@ const apisRegistry = require('./core/registries/apis');
 const bootstrap = require('./core/bootstrap');
 const loaders = require('./core/loaders');
 const { destroyOnSignal } = require('./utils/signals');
+const getNumberOfDynamicZones = require('./services/utils/dynamic-zones');
 const sanitizersRegistry = require('./core/registries/sanitizers');
 const convertCustomFieldType = require('./utils/convert-custom-field-type');
 
@@ -249,6 +250,9 @@ class Strapi {
       groupProperties: {
         database: strapi.config.get('database.connection.client'),
         plugins: Object.keys(strapi.plugins),
+        numberOfAllContentTypes: _.size(this.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(this.components),
+        numberOfDynamicZones: getNumberOfDynamicZones(),
         // TODO: to add back
         // providers: this.config.installedProviders,
       },
@@ -468,7 +472,7 @@ class Strapi {
     await this.startWebhooks();
 
     await this.server.initMiddlewares();
-    await this.server.initRouting();
+    this.server.initRouting();
 
     await this.contentAPI.permissions.registerActions();
 
@@ -536,17 +540,17 @@ class Strapi {
     // plugins
     await this.container.get('modules')[lifecycleName]();
 
-    // user
-    const userLifecycleFunction = this.app && this.app[lifecycleName];
-    if (isFunction(userLifecycleFunction)) {
-      await userLifecycleFunction({ strapi: this });
-    }
-
     // admin
     const adminLifecycleFunction = this.admin && this.admin[lifecycleName];
     if (isFunction(adminLifecycleFunction)) {
       await adminLifecycleFunction({ strapi: this });
     }
+
+    // user
+    const userLifecycleFunction = this.app && this.app[lifecycleName];
+    if (isFunction(userLifecycleFunction)) {
+      await userLifecycleFunction({ strapi: this });
+    }
   }
 
   getModel(uid) {

package/lib/commands/report.js

@@ -0,0 +1,35 @@
+'use strict';
+
+const { EOL } = require('os');
+const strapi = require('../index');
+
+module.exports = async ({ uuid, dependencies, all }) => {
+  const config = {
+    reportUUID: Boolean(all || uuid),
+    reportDependencies: Boolean(all || dependencies),
+  };
+
+  const appContext = await strapi.compile();
+  const app = await strapi(appContext).register();
+
+  let debugInfo = `Launched In: ${Date.now() - app.config.launchedAt} ms
+Environment: ${app.config.environment}
+OS: ${process.platform}-${process.arch}
+Strapi Version: ${app.config.info.strapi}
+Node/Yarn Version: ${process.env.npm_config_user_agent}
+Edition: ${app.EE ? 'Enterprise' : 'Community'}
+Database: ${app?.config?.database?.connection?.client ?? 'unknown'}`;
+
+  if (config.reportUUID) {
+    debugInfo += `${EOL}UUID: ${app.config.uuid}`;
+  }
+
+  if (config.reportDependencies) {
+    debugInfo += `${EOL}Dependencies: ${JSON.stringify(app.config.info.dependencies, null, 2)}
+Dev Dependencies: ${JSON.stringify(app.config.info.devDependencies, null, 2)}`;
+  }
+
+  console.log(debugInfo);
+
+  await app.destroy();
+};

package/lib/commands/transfer/export.js

@@ -24,6 +24,7 @@ const {
   loadersFactory,
   exitMessageText,
   abortTransfer,
+  getTransferTelemetryPayload,
 } = require('./utils');
 const { exitWith } = require('../utils/helpers');
 /**
@@ -103,19 +104,10 @@ module.exports = async (opts) => {
     updateLoader(stage, data);
   });
 
-  const getTelemetryPayload = (/* payload */) => {
-    return {
-      eventProperties: {
-        source: engine.sourceProvider.name,
-        destination: engine.destinationProvider.name,
-      },
-    };
-  };
-
   progress.on('transfer::start', async () => {
     console.log(`Starting export...`);
 
-    await strapi.telemetry.send('didDEITSProcessStart', getTelemetryPayload());
+    await strapi.telemetry.send('didDEITSProcessStart', getTransferTelemetryPayload(engine));
   });
 
   let results;
@@ -134,11 +126,13 @@ module.exports = async (opts) => {
       throw new TransferEngineTransferError(`Export file not created "${outFile}"`);
     }
   } catch {
-    await strapi.telemetry.send('didDEITSProcessFail', getTelemetryPayload());
+    await strapi.telemetry.send('didDEITSProcessFail', getTransferTelemetryPayload(engine));
     exitWith(1, exitMessageText('export', true));
   }
 
-  await strapi.telemetry.send('didDEITSProcessFinish', getTelemetryPayload());
+  // Note: we need to await telemetry or else the process ends before it is sent
+  await strapi.telemetry.send('didDEITSProcessFinish', getTransferTelemetryPayload(engine));
+
   try {
     const table = buildTransferTable(results.engine);
     console.log(table.toString());

package/lib/commands/transfer/import.js

@@ -20,6 +20,7 @@ const {
   loadersFactory,
   exitMessageText,
   abortTransfer,
+  getTransferTelemetryPayload,
 } = require('./utils');
 const { exitWith } = require('../utils/helpers');
 
@@ -122,18 +123,12 @@ module.exports = async (opts) => {
     updateLoader(stage, data);
   });
 
-  const getTelemetryPayload = () => {
-    return {
-      eventProperties: {
-        source: engine.sourceProvider.name,
-        destination: engine.destinationProvider.name,
-      },
-    };
-  };
-
   progress.on('transfer::start', async () => {
     console.log('Starting import...');
-    await strapiInstance.telemetry.send('didDEITSProcessStart', getTelemetryPayload());
+    await strapiInstance.telemetry.send(
+      'didDEITSProcessStart',
+      getTransferTelemetryPayload(engine)
+    );
   });
 
   let results;
@@ -146,7 +141,7 @@ module.exports = async (opts) => {
 
     results = await engine.transfer();
   } catch (e) {
-    await strapiInstance.telemetry.send('didDEITSProcessFail', getTelemetryPayload());
+    await strapiInstance.telemetry.send('didDEITSProcessFail', getTransferTelemetryPayload(engine));
     exitWith(1, exitMessageText('import', true));
   }
 
@@ -157,7 +152,8 @@ module.exports = async (opts) => {
     console.error('There was an error displaying the results of the transfer.');
   }
 
-  await strapiInstance.telemetry.send('didDEITSProcessFinish', getTelemetryPayload());
+  // Note: we need to await telemetry or else the process ends before it is sent
+  await strapiInstance.telemetry.send('didDEITSProcessFinish', getTransferTelemetryPayload(engine));
   await strapiInstance.destroy();
 
   exitWith(0, exitMessageText('import'));

package/lib/commands/transfer/transfer.js

@@ -21,6 +21,7 @@ const {
   loadersFactory,
   exitMessageText,
   abortTransfer,
+  getTransferTelemetryPayload,
 } = require('./utils');
 const { exitWith } = require('../utils/helpers');
 
@@ -161,10 +162,14 @@ module.exports = async (opts) => {
     updateLoader(stage, data).fail();
   });
 
-  let results;
-  try {
+  progress.on('transfer::start', async () => {
     console.log(`Starting transfer...`);
 
+    await strapi.telemetry.send('didDEITSProcessStart', getTransferTelemetryPayload(engine));
+  });
+
+  let results;
+  try {
     // Abort transfer if user interrupts process
     ['SIGTERM', 'SIGINT', 'SIGQUIT'].forEach((signal) => {
       process.removeAllListeners(signal);
@@ -173,10 +178,19 @@ module.exports = async (opts) => {
 
     results = await engine.transfer();
   } catch (e) {
+    await strapi.telemetry.send('didDEITSProcessFail', getTransferTelemetryPayload(engine));
     exitWith(1, exitMessageText('transfer', true));
   }
 
-  const table = buildTransferTable(results.engine);
-  console.log(table.toString());
+  // Note: we need to await telemetry or else the process ends before it is sent
+  await strapi.telemetry.send('didDEITSProcessFinish', getTransferTelemetryPayload(engine));
+
+  try {
+    const table = buildTransferTable(results.engine);
+    console.log(table.toString());
+  } catch (e) {
+    console.error('There was an error displaying the results of the transfer.');
+  }
+
   exitWith(0, exitMessageText('transfer'));
 };

package/lib/commands/transfer/utils.js

@@ -242,10 +242,26 @@ const loadersFactory = (defaultLoaders = {}) => {
   };
 };
 
+/**
+ * Get the telemetry data to be sent for a didDEITSProcess* event from an initialized transfer engine object
+ *
+ * @param {import('@strapi/data-transfer/types').ITransferEngine} engine Initialized transfer engine
+ * @returns {object} Telemetry properties object
+ */
+const getTransferTelemetryPayload = (engine) => {
+  return {
+    eventProperties: {
+      source: engine?.sourceProvider?.name,
+      destination: engine?.destinationProvider?.name,
+    },
+  };
+};
+
 module.exports = {
   loadersFactory,
   buildTransferTable,
   getDefaultExportName,
+  getTransferTelemetryPayload,
   DEFAULT_IGNORED_CONTENT_TYPES,
   createStrapiInstance,
   excludeOption,

package/lib/core/domain/content-type/validator.js

@@ -61,7 +61,7 @@ const contentTypeSchemaValidator = yup.object().shape({
 
             // should match the GraphQL regex
             if (!regressedValues.every((value) => GRAPHQL_ENUM_REGEX.test(value))) {
-              const message = `Invalid enumeration value. Values should have at least one alphabetical character preceeding the first occurence of a number. Update your enumeration '${attrName}'.`;
+              const message = `Invalid enumeration value. Values should have at least one alphabetical character preceding the first occurence of a number. Update your enumeration '${attrName}'.`;
 
               return this.createError({ message });
             }

package/lib/middlewares/security.js

@@ -12,7 +12,7 @@ const defaults = {
     useDefaults: true,
     directives: {
       'connect-src': ["'self'", 'https:'],
-      'img-src': ["'self'", 'data:', 'blob:', 'https://dl.airtable.com'],
+      'img-src': ["'self'", 'data:', 'blob:', 'https://market-assets.strapi.io'],
       'media-src': ["'self'", 'data:', 'blob:'],
       upgradeInsecureRequests: null,
     },

package/lib/services/metrics/sender.js

@@ -3,7 +3,6 @@
 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');
@@ -41,14 +40,6 @@ 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(),
@@ -66,9 +57,6 @@ 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/services/server/index.js

@@ -92,8 +92,8 @@ const createServer = (strapi) => {
       return this;
     },
 
-    async initRouting() {
-      await registerAllRoutes(strapi);
+    initRouting() {
+      registerAllRoutes(strapi);
 
       return this;
     },

package/lib/services/utils/dynamic-zones.js

@@ -0,0 +1,13 @@
+'use strict';
+
+const { map, values, sumBy, pipe, flatMap, propEq } = require('lodash/fp');
+
+const getNumberOfDynamicZones = () => {
+  return pipe(
+    map('attributes'),
+    flatMap(values),
+    sumBy(propEq('type', 'dynamiczone'))
+  )(strapi.contentTypes);
+};
+
+module.exports = getNumberOfDynamicZones;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/strapi",
-  "version": "4.9.0",
+  "version": "4.9.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",
@@ -74,26 +74,26 @@
   },
   "scripts": {
     "postinstall": "node lib/utils/success.js",
-    "test:unit": "jest",
-    "test:unit:watch": "jest --watch",
-    "lint": "eslint ."
+    "test:unit": "run -T jest",
+    "test:unit:watch": "run -T jest --watch",
+    "lint": "run -T eslint ."
   },
   "dependencies": {
     "@koa/cors": "3.4.3",
     "@koa/router": "10.1.1",
-    "@strapi/admin": "4.9.0",
-    "@strapi/data-transfer": "4.9.0",
-    "@strapi/database": "4.9.0",
-    "@strapi/generate-new": "4.9.0",
-    "@strapi/generators": "4.9.0",
-    "@strapi/logger": "4.9.0",
-    "@strapi/permissions": "4.9.0",
-    "@strapi/plugin-content-manager": "4.9.0",
-    "@strapi/plugin-content-type-builder": "4.9.0",
-    "@strapi/plugin-email": "4.9.0",
-    "@strapi/plugin-upload": "4.9.0",
-    "@strapi/typescript-utils": "4.9.0",
-    "@strapi/utils": "4.9.0",
+    "@strapi/admin": "4.9.2",
+    "@strapi/data-transfer": "4.9.2",
+    "@strapi/database": "4.9.2",
+    "@strapi/generate-new": "4.9.2",
+    "@strapi/generators": "4.9.2",
+    "@strapi/logger": "4.9.2",
+    "@strapi/permissions": "4.9.2",
+    "@strapi/plugin-content-manager": "4.9.2",
+    "@strapi/plugin-content-type-builder": "4.9.2",
+    "@strapi/plugin-email": "4.9.2",
+    "@strapi/plugin-upload": "4.9.2",
+    "@strapi/typescript-utils": "4.9.2",
+    "@strapi/utils": "4.9.2",
     "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": "ffe3f4621ccc968ce56fda9a8317ec30d4bad205"
+  "gitHead": "91e0be2708e4d1e8ec731c75e73e54c0dfacb67d"
 }