@strapi/strapi 4.2.0 → 4.2.3

package/bin/strapi.js

@@ -230,7 +230,13 @@ program
 //    `$ strapi opt-out-telemetry`
 program
   .command('telemetry:disable')
-  .description('Stop Strapi from sending anonymous telemetry and metadata')
+  .description('Disable anonymous telemetry and metadata sending to Strapi analytics')
   .action(getLocalScript('opt-out-telemetry'));
 
+//    `$ strapi opt-in-telemetry`
+program
+  .command('telemetry:enable')
+  .description('Enable anonymous telemetry and metadata sending to Strapi analytics')
+  .action(getLocalScript('opt-in-telemetry'));
+
 program.parseAsync(process.argv);

package/lib/commands/opt-in-telemetry.js

@@ -0,0 +1,100 @@
+'use strict';
+
+const { resolve } = require('path');
+const fse = require('fs-extra');
+const chalk = require('chalk');
+const fetch = require('node-fetch');
+const { v4: uuidv4 } = require('uuid');
+const machineID = require('../utils/machine-id');
+
+const readPackageJSON = async path => {
+  try {
+    const packageObj = await fse.readJson(path);
+    return packageObj;
+  } catch (err) {
+    console.error(`${chalk.red('Error')}: ${err.message}`);
+  }
+};
+
+const writePackageJSON = async (path, file, spacing) => {
+  try {
+    await fse.writeJson(path, file, { spaces: spacing });
+    return true;
+  } catch (err) {
+    console.error(`${chalk.red('Error')}: ${err.message}`);
+    console.log(
+      `${chalk.yellow(
+        'Warning'
+      )}: There has been an error, please set "telemetryDisabled": false in the "strapi" object of your package.json manually.`
+    );
+    return false;
+  }
+};
+
+const generateNewPackageJSON = packageObj => {
+  if (!packageObj.strapi) {
+    return {
+      ...packageObj,
+      strapi: {
+        uuid: uuidv4(),
+        telemetryDisabled: false,
+      },
+    };
+  } else {
+    return {
+      ...packageObj,
+      strapi: {
+        ...packageObj.strapi,
+        uuid: packageObj.strapi.uuid ? packageObj.strapi.uuid : uuidv4(),
+        telemetryDisabled: false,
+      },
+    };
+  }
+};
+
+const sendEvent = async uuid => {
+  try {
+    await fetch('https://analytics.strapi.io/track', {
+      method: 'POST',
+      body: JSON.stringify({
+        event: 'didOptInTelemetry',
+        uuid,
+        deviceId: machineID(),
+      }),
+      headers: { 'Content-Type': 'application/json' },
+    });
+  } catch (e) {
+    //...
+  }
+};
+
+module.exports = async function optInTelemetry() {
+  const packageJSONPath = resolve(process.cwd(), 'package.json');
+  const exists = await fse.pathExists(packageJSONPath);
+
+  if (!exists) {
+    console.log(`${chalk.yellow('Warning')}: could not find package.json`);
+    process.exit(0);
+  }
+
+  const packageObj = await readPackageJSON(packageJSONPath);
+
+  if (packageObj.strapi && packageObj.strapi.uuid) {
+    if (packageObj.strapi.telemetryDisabled === false) {
+      console.log(`${chalk.yellow('Warning:')} telemetry is already enabled`);
+      process.exit(0);
+    }
+  }
+
+  const updatedPackageJSON = generateNewPackageJSON(packageObj);
+
+  const write = await writePackageJSON(packageJSONPath, updatedPackageJSON, 2);
+
+  if (!write) {
+    process.exit(0);
+  }
+
+  await sendEvent(updatedPackageJSON.strapi.uuid);
+  console.log(`${chalk.green('Successfully opted into and enabled Strapi telemetry')}`);
+  process.exit(0);
+};

package/lib/core/app-configuration/config-loader.js

@@ -4,12 +4,14 @@ const path = require('path');
 const fs = require('fs');
 const loadFile = require('./load-config-file');
 
+const VALID_EXTENSIONS = ['.js', '.json'];
+
 module.exports = dir => {
   if (!fs.existsSync(dir)) return {};
 
   return fs
     .readdirSync(dir, { withFileTypes: true })
-    .filter(file => file.isFile())
+    .filter(file => file.isFile() && VALID_EXTENSIONS.includes(path.extname(file.name)))
     .reduce((acc, file) => {
       const key = path.basename(file.name, path.extname(file.name));
 

package/lib/services/webhook-runner.js

@@ -29,7 +29,7 @@ class WebhookRunner {
 
     this.config = _.merge(defaultConfiguration, configuration);
 
-    this.queue = new WorkerQueue({ logger, concurency: 5 });
+    this.queue = new WorkerQueue({ logger, concurrency: 5 });
     this.queue.subscribe(this.executeListener.bind(this));
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/strapi",
-  "version": "4.2.0",
+  "version": "4.2.3",
   "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,22 +80,22 @@
   "dependencies": {
     "@koa/cors": "3.1.0",
     "@koa/router": "10.1.1",
-    "@strapi/admin": "4.2.0",
-    "@strapi/database": "4.2.0",
-    "@strapi/generate-new": "4.2.0",
-    "@strapi/generators": "4.2.0",
-    "@strapi/logger": "4.2.0",
-    "@strapi/plugin-content-manager": "4.2.0",
-    "@strapi/plugin-content-type-builder": "4.2.0",
-    "@strapi/plugin-email": "4.2.0",
-    "@strapi/plugin-upload": "4.2.0",
-    "@strapi/utils": "4.2.0",
+    "@strapi/admin": "4.2.3",
+    "@strapi/database": "4.2.3",
+    "@strapi/generate-new": "4.2.3",
+    "@strapi/generators": "4.2.3",
+    "@strapi/logger": "4.2.3",
+    "@strapi/plugin-content-manager": "4.2.3",
+    "@strapi/plugin-content-type-builder": "4.2.3",
+    "@strapi/plugin-email": "4.2.3",
+    "@strapi/plugin-upload": "4.2.3",
+    "@strapi/utils": "4.2.3",
     "bcryptjs": "2.4.3",
     "boxen": "5.1.2",
     "chalk": "4.1.2",
     "chokidar": "3.5.2",
     "ci-info": "3.2.0",
-    "cli-table3": "0.6.1",
+    "cli-table3": "0.6.2",
     "commander": "8.2.0",
     "configstore": "5.0.1",
     "debug": "4.3.2",
@@ -104,8 +104,8 @@
     "execa": "5.1.1",
     "fs-extra": "10.0.0",
     "glob": "7.2.0",
-    "http-errors": "1.8.0",
-    "inquirer": "8.2.0",
+    "http-errors": "1.8.1",
+    "inquirer": "8.2.4",
     "is-docker": "2.2.1",
     "koa": "2.13.3",
     "koa-body": "4.2.0",
@@ -121,21 +121,21 @@
     "node-fetch": "2.6.7",
     "node-machine-id": "1.1.12",
     "node-schedule": "2.0.0",
-    "open": "8.2.1",
+    "open": "8.4.0",
     "ora": "5.4.1",
     "package-json": "7.0.0",
     "qs": "6.10.1",
     "resolve-cwd": "3.0.0",
-    "semver": "7.3.5",
+    "semver": "7.3.7",
     "statuses": "2.0.1",
     "uuid": "^3.3.2"
   },
   "devDependencies": {
-    "supertest": "^6.1.6"
+    "supertest": "6.2.4"
   },
   "engines": {
     "node": ">=14.19.1 <=16.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "12c8ee3b2d95fe417de4d939db0311a0513bd8da"
+  "gitHead": "fe296baf71cb932d45183d5335285eaf30a6fad6"
 }