@strapi/strapi 0.0.0-d0fee44d6f → 0.0.0-d36609ff26fb4e00a41a7e2b657f16c7466203fe

package/lib/commands/middlewares/list.js

@@ -5,7 +5,7 @@ const chalk = require('chalk');
 
 const strapi = require('../../index');
 
-module.exports = async function() {
+module.exports = async function () {
   const appContext = await strapi.compile();
   const app = await strapi(appContext).register();
 
@@ -15,7 +15,7 @@ module.exports = async function() {
     head: [chalk.blue('Name')],
   });
 
-  list.forEach(name => infoTable.push([name]));
+  list.forEach((name) => infoTable.push([name]));
 
   console.log(infoTable.toString());
 

package/lib/commands/new.js

@@ -8,6 +8,6 @@ const { generateNewApp } = require('@strapi/generate-new');
  * Generate a new Strapi application.
  */
 
-module.exports = function(...args) {
+module.exports = function (...args) {
   return generateNewApp(...args);
 };

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

@@ -7,7 +7,7 @@ const fetch = require('node-fetch');
 const { v4: uuidv4 } = require('uuid');
 const machineID = require('../utils/machine-id');
 
-const readPackageJSON = async path => {
+const readPackageJSON = async (path) => {
   try {
     const packageObj = await fse.readJson(path);
     return packageObj;
@@ -31,7 +31,7 @@ const writePackageJSON = async (path, file, spacing) => {
   }
 };
 
-const generateNewPackageJSON = packageObj => {
+const generateNewPackageJSON = (packageObj) => {
   if (!packageObj.strapi) {
     return {
       ...packageObj,
@@ -40,31 +40,30 @@ const generateNewPackageJSON = packageObj => {
         telemetryDisabled: false,
       },
     };
-  } else {
-    return {
-      ...packageObj,
-      strapi: {
-        ...packageObj.strapi,
-        uuid: packageObj.strapi.uuid ? packageObj.strapi.uuid : uuidv4(),
-        telemetryDisabled: false,
-      },
-    };
   }
+  return {
+    ...packageObj,
+    strapi: {
+      ...packageObj.strapi,
+      uuid: packageObj.strapi.uuid ? packageObj.strapi.uuid : uuidv4(),
+      telemetryDisabled: false,
+    },
+  };
 };
 
-const sendEvent = async uuid => {
+const sendEvent = async (uuid) => {
   try {
-    await fetch('https://analytics.strapi.io/track', {
+    await fetch('https://analytics.strapi.io/api/v2/track', {
       method: 'POST',
       body: JSON.stringify({
         event: 'didOptInTelemetry',
-        uuid,
         deviceId: machineID(),
+        groupProperties: { projectId: uuid },
       }),
       headers: { 'Content-Type': 'application/json' },
     });
   } catch (e) {
-    //...
+    // ...
   }
 };
 

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

@@ -6,7 +6,7 @@ const chalk = require('chalk');
 const fetch = require('node-fetch');
 const machineID = require('../utils/machine-id');
 
-const readPackageJSON = async path => {
+const readPackageJSON = async (path) => {
   try {
     const packageObj = await fse.readJson(path);
     const uuid = packageObj.strapi ? packageObj.strapi.uuid : null;
@@ -26,19 +26,19 @@ const writePackageJSON = async (path, file, spacing) => {
   }
 };
 
-const sendEvent = async uuid => {
+const sendEvent = async (uuid) => {
   try {
-    await fetch('https://analytics.strapi.io/track', {
+    await fetch('https://analytics.strapi.io/api/v2/track', {
       method: 'POST',
       body: JSON.stringify({
         event: 'didOptOutTelemetry',
-        uuid,
         deviceId: machineID(),
+        groupProperties: { projectId: uuid },
       }),
       headers: { 'Content-Type': 'application/json' },
     });
   } catch (e) {
-    //...
+    // ...
   }
 };
 

package/lib/commands/policies/list.js

@@ -5,7 +5,7 @@ const chalk = require('chalk');
 
 const strapi = require('../../index');
 
-module.exports = async function() {
+module.exports = async function () {
   const appContext = await strapi.compile();
   const app = await strapi(appContext).register();
 
@@ -15,7 +15,7 @@ module.exports = async function() {
     head: [chalk.blue('Name')],
   });
 
-  list.forEach(name => infoTable.push([name]));
+  list.forEach((name) => infoTable.push([name]));
 
   console.log(infoTable.toString());
 

package/lib/commands/routes/list.js

@@ -6,7 +6,7 @@ const { toUpper } = require('lodash/fp');
 
 const strapi = require('../../index');
 
-module.exports = async function() {
+module.exports = async function () {
   const appContext = await strapi.compile();
   const app = await strapi(appContext).load();
 
@@ -18,8 +18,8 @@ module.exports = async function() {
   });
 
   list
-    .filter(route => route.methods.length)
-    .forEach(route => {
+    .filter((route) => route.methods.length)
+    .forEach((route) => {
       infoTable.push([route.methods.map(toUpper).join('|'), route.path]);
     });
 

package/lib/commands/services/list.js

@@ -5,7 +5,7 @@ const chalk = require('chalk');
 
 const strapi = require('../../index');
 
-module.exports = async function() {
+module.exports = async function () {
   const appContext = await strapi.compile();
   const app = await strapi(appContext).register();
 
@@ -15,7 +15,7 @@ module.exports = async function() {
     head: [chalk.blue('Name')],
   });
 
-  list.forEach(name => infoTable.push([name]));
+  list.forEach((name) => infoTable.push([name]));
 
   console.log(infoTable.toString());
 

package/lib/commands/start.js

@@ -1,4 +1,5 @@
 'use strict';
+
 const fs = require('fs');
 const tsUtils = require('@strapi/typescript-utils');
 const strapi = require('../index');

package/lib/commands/ts/generate-types.js

@@ -4,7 +4,7 @@ const tsUtils = require('@strapi/typescript-utils');
 
 const strapi = require('../../index');
 
-module.exports = async function({ outDir, file, verbose, silent }) {
+module.exports = async function ({ outDir, file, verbose, silent }) {
   if (verbose && silent) {
     console.error('You cannot enable verbose and silent flags at the same time, exiting...');
     process.exit(1);

package/lib/commands/uninstall.js

@@ -21,13 +21,13 @@ module.exports = async (plugins, { deleteFiles }) => {
   const loader = ora();
   const dir = process.cwd();
 
-  const pluginArgs = plugins.map(name => `@strapi/plugin-${name}`);
+  const pluginArgs = plugins.map((name) => `@strapi/plugin-${name}`);
 
   try {
     // verify should rebuild before removing the pacakge
     let shouldRebuild = false;
-    for (let name of plugins) {
-      let pkgPath = findPackagePath(`@strapi/plugin-${name}`);
+    for (const name of plugins) {
+      const pkgPath = findPackagePath(`@strapi/plugin-${name}`);
       if (existsSync(join(pkgPath, 'admin', 'src', 'index.js'))) {
         shouldRebuild = true;
       }
@@ -46,7 +46,7 @@ module.exports = async (plugins, { deleteFiles }) => {
 
     if (deleteFiles === true || answers.deleteFiles === true) {
       loader.start('Deleting old files');
-      for (let name of plugins) {
+      for (const name of plugins) {
         const pluginDir = join(dir, 'extensions', name);
         if (existsSync(pluginDir)) {
           removeSync(pluginDir);

package/lib/commands/watchAdmin.js

@@ -7,7 +7,7 @@ const getEnabledPlugins = require('../core/loaders/plugins/get-enabled-plugins')
 const addSlash = require('../utils/addSlash');
 const strapi = require('../index');
 
-module.exports = async function({ browser }) {
+module.exports = async function ({ browser }) {
   const appContext = await strapi.compile();
 
   const strapiInstance = strapi({

package/lib/compile.js

@@ -2,7 +2,7 @@
 
 const tsUtils = require('@strapi/typescript-utils');
 
-module.exports = async dir => {
+module.exports = async (dir) => {
   const appDir = dir || process.cwd();
   const isTSProject = await tsUtils.isUsingTypeScript(appDir);
   const outDir = await tsUtils.resolveOutDir(appDir);

package/lib/container.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const createContainer = strapi => {
+const createContainer = (strapi) => {
   const registered = new Map();
   const resolved = new Map();
 

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

@@ -6,12 +6,12 @@ const loadFile = require('./load-config-file');
 
 const VALID_EXTENSIONS = ['.js', '.json'];
 
-module.exports = dir => {
+module.exports = (dir) => {
   if (!fs.existsSync(dir)) return {};
 
   return fs
     .readdirSync(dir, { withFileTypes: true })
-    .filter(file => file.isFile() && VALID_EXTENSIONS.includes(path.extname(file.name)))
+    .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/core/app-configuration/load-config-file.js

@@ -2,11 +2,9 @@
 
 const path = require('path');
 const fs = require('fs');
-const { templateConfiguration, env } = require('@strapi/utils');
+const { templateConfiguration, env, importDefault } = require('@strapi/utils');
 
-const importDefault = require('../../utils/import-default');
-
-const loadJsFile = file => {
+const loadJsFile = (file) => {
   try {
     const jsModule = importDefault(file);
 
@@ -21,7 +19,7 @@ const loadJsFile = file => {
   }
 };
 
-const loadJSONFile = file => {
+const loadJSONFile = (file) => {
   try {
     return templateConfiguration(JSON.parse(fs.readFileSync(file)));
   } catch (error) {
@@ -29,7 +27,7 @@ const loadJSONFile = file => {
   }
 };
 
-const loadFile = file => {
+const loadFile = (file) => {
   const ext = path.extname(file);
 
   switch (ext) {

package/lib/core/bootstrap.js

@@ -3,7 +3,7 @@
 const { getConfigUrls } = require('@strapi/utils');
 const fse = require('fs-extra');
 
-module.exports = async function({ strapi }) {
+module.exports = async function ({ strapi }) {
   strapi.config.port = strapi.config.get('server.port') || strapi.config.port;
   strapi.config.host = strapi.config.get('server.host') || strapi.config.host;
 

package/lib/core/domain/component/validator.js

@@ -7,20 +7,14 @@ const componentSchemaValidator = () =>
     info: yup
       .object()
       .shape({
-        singularName: yup
-          .string()
-          .isCamelCase()
-          .required(),
-        pluralName: yup
-          .string()
-          .isCamelCase()
-          .required(),
+        singularName: yup.string().isCamelCase().required(),
+        pluralName: yup.string().isCamelCase().required(),
         displayName: yup.string().required(),
       })
       .required(),
   });
 
-const validateComponentDefinition = data => {
+const validateComponentDefinition = (data) => {
   return componentSchemaValidator.validateSync(data, { strict: true, abortEarly: false });
 };
 

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

@@ -54,7 +54,7 @@ const createContentType = (uid, definition) => {
     });
   } else {
     throw new Error(
-      `Incorrect Content Type UID "${uid}". The UID should start with api::, plugin:: or strapi::.`
+      `Incorrect Content Type UID "${uid}". The UID should start with api::, plugin:: or admin::.`
     );
   }
 
@@ -114,12 +114,12 @@ const createContentType = (uid, definition) => {
 };
 
 const getGlobalId = (model, modelName, prefix) => {
-  let globalId = prefix ? `${prefix}-${modelName}` : modelName;
+  const globalId = prefix ? `${prefix}-${modelName}` : modelName;
 
   return model.globalId || _.upperFirst(_.camelCase(globalId));
 };
 
-const pickSchema = model => {
+const pickSchema = (model) => {
   const schema = _.cloneDeep(
     _.pick(model, [
       'connection',

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

@@ -36,14 +36,9 @@ const LIFECYCLES = [
  * TODO V5: check if we can avoid this coupling by moving this logic
  * into the GraphQL plugin.
  */
-const GRAPHQL_ENUM_REGEX = new RegExp('^[_A-Za-z][_0-9A-Za-z]*$');
+const GRAPHQL_ENUM_REGEX = /^[_A-Za-z][_0-9A-Za-z]*$/;
 
-const lifecyclesShape = _.mapValues(_.keyBy(LIFECYCLES), () =>
-  yup
-    .mixed()
-    .nullable()
-    .isFunction()
-);
+const lifecyclesShape = _.mapValues(_.keyBy(LIFECYCLES), () => yup.mixed().nullable().isFunction());
 
 const contentTypeSchemaValidator = yup.object().shape({
   schema: yup.object().shape({
@@ -51,34 +46,28 @@ const contentTypeSchemaValidator = yup.object().shape({
       .object()
       .shape({
         displayName: yup.string().required(),
-        singularName: yup
-          .string()
-          .isKebabCase()
-          .required(),
-        pluralName: yup
-          .string()
-          .isKebabCase()
-          .required(),
+        singularName: yup.string().isKebabCase().required(),
+        pluralName: yup.string().isKebabCase().required(),
       })
       .required(),
     attributes: yup.object().test({
       name: 'valuesCollide',
       message: 'Some values collide when normalized',
       test(attributes) {
-        for (const attrName in attributes) {
+        for (const attrName of Object.keys(attributes)) {
           const attr = attributes[attrName];
           if (attr.type === 'enumeration') {
             const regressedValues = attr.enum.map(toRegressedEnumValue);
 
             // should match the GraphQL regex
-            if (!regressedValues.every(value => GRAPHQL_ENUM_REGEX.test(value))) {
+            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}'.`;
 
               return this.createError({ message });
             }
 
             // should not contain empty values
-            if (regressedValues.some(value => value === '')) {
+            if (regressedValues.some((value) => value === '')) {
               return this.createError({
                 message: `At least one value of the enumeration '${attrName}' appears to be empty. Only alphanumerical characters are taken into account.`,
               });
@@ -104,13 +93,10 @@ const contentTypeSchemaValidator = yup.object().shape({
     }),
   }),
   actions: yup.object().onlyContainsFunctions(),
-  lifecycles: yup
-    .object()
-    .shape(lifecyclesShape)
-    .noUnknown(),
+  lifecycles: yup.object().shape(lifecyclesShape).noUnknown(),
 });
 
-const validateContentTypeDefinition = data => {
+const validateContentTypeDefinition = (data) => {
   return contentTypeSchemaValidator.validateSync(data, { strict: true, abortEarly: false });
 };
 

package/lib/core/domain/module/index.js

@@ -4,7 +4,7 @@ const _ = require('lodash');
 const { removeNamespace } = require('../../utils');
 const { validateModule } = require('./validation');
 
-const uidToPath = uid => uid.replace('::', '.');
+const uidToPath = (uid) => uid.replace('::', '.');
 
 // Removes the namespace from a map with keys prefixed with a namespace
 const removeNamespacedKeys = (map, namespace) => {

package/lib/core/domain/module/validation.js

@@ -9,12 +9,11 @@ const strapiServerSchema = yup
     destroy: yup.mixed().isFunction(),
     register: yup.mixed().isFunction(),
     config: yup.object(),
-    routes: yup.lazy(value => {
+    routes: yup.lazy((value) => {
       if (Array.isArray(value)) {
         return yup.array();
-      } else {
-        return yup.object();
       }
+      return yup.object();
     }),
     controllers: yup.object(),
     services: yup.object(),
@@ -24,7 +23,7 @@ const strapiServerSchema = yup
   })
   .noUnknown();
 
-const validateModule = data => {
+const validateModule = (data) => {
   return strapiServerSchema.validateSync(data, { strict: true, abortEarly: false });
 };
 

package/lib/core/loaders/admin.js

@@ -2,7 +2,7 @@
 
 const _ = require('lodash');
 
-module.exports = strapi => {
+module.exports = (strapi) => {
   strapi.admin = require('@strapi/admin/strapi-server');
 
   strapi.container.get('services').add(`admin::`, strapi.admin.services);

package/lib/core/loaders/apis.js

@@ -4,8 +4,7 @@ const { join, extname, basename } = require('path');
 const { existsSync } = require('fs-extra');
 const _ = require('lodash');
 const fse = require('fs-extra');
-const { isKebabCase } = require('@strapi/utils');
-const { importDefault } = require('../../utils');
+const { isKebabCase, importDefault } = require('@strapi/utils');
 
 const DEFAULT_CONTENT_TYPE = {
   schema: {},
@@ -14,12 +13,12 @@ const DEFAULT_CONTENT_TYPE = {
 };
 
 // to handle names with numbers in it we first check if it is already in kebabCase
-const normalizeName = name => (isKebabCase(name) ? name : _.kebabCase(name));
+const normalizeName = (name) => (isKebabCase(name) ? name : _.kebabCase(name));
 
-const isDirectory = fd => fd.isDirectory();
-const isDotFile = fd => fd.name.startsWith('.');
+const isDirectory = (fd) => fd.isDirectory();
+const isDotFile = (fd) => fd.name.startsWith('.');
 
-module.exports = async strapi => {
+module.exports = async (strapi) => {
   if (!existsSync(strapi.dirs.dist.api)) {
     return;
   }
@@ -40,13 +39,13 @@ module.exports = async strapi => {
 
   validateContentTypesUnicity(apis);
 
-  for (const apiName in apis) {
+  for (const apiName of Object.keys(apis)) {
     strapi.container.get('apis').add(apiName, apis[apiName]);
   }
 };
 
-const validateContentTypesUnicity = apis => {
-  const allApisSchemas = Object.values(apis).flatMap(api => Object.values(api.contentTypes));
+const validateContentTypesUnicity = (apis) => {
+  const allApisSchemas = Object.values(apis).flatMap((api) => Object.values(api.contentTypes));
 
   const names = [];
   allApisSchemas.forEach(({ schema }) => {
@@ -68,26 +67,18 @@ const validateContentTypesUnicity = apis => {
   });
 };
 
-const loadAPI = async dir => {
-  const [
-    index,
-    config,
-    routes,
-    controllers,
-    services,
-    policies,
-    middlewares,
-    contentTypes,
-  ] = await Promise.all([
-    loadIndex(dir),
-    loadDir(join(dir, 'config')),
-    loadDir(join(dir, 'routes')),
-    loadDir(join(dir, 'controllers')),
-    loadDir(join(dir, 'services')),
-    loadDir(join(dir, 'policies')),
-    loadDir(join(dir, 'middlewares')),
-    loadContentTypes(join(dir, 'content-types')),
-  ]);
+const loadAPI = async (dir) => {
+  const [index, config, routes, controllers, services, policies, middlewares, contentTypes] =
+    await Promise.all([
+      loadIndex(dir),
+      loadDir(join(dir, 'config')),
+      loadDir(join(dir, 'routes')),
+      loadDir(join(dir, 'controllers')),
+      loadDir(join(dir, 'services')),
+      loadDir(join(dir, 'policies')),
+      loadDir(join(dir, 'middlewares')),
+      loadContentTypes(join(dir, 'content-types')),
+    ]);
 
   return {
     ...(index || {}),
@@ -101,13 +92,13 @@ const loadAPI = async dir => {
   };
 };
 
-const loadIndex = async dir => {
+const loadIndex = async (dir) => {
   if (await fse.pathExists(join(dir, 'index.js'))) {
     return loadFile(join(dir, 'index.js'));
   }
 };
 
-const loadContentTypes = async dir => {
+const loadContentTypes = async (dir) => {
   if (!(await fse.pathExists(dir))) {
     return;
   }
@@ -130,7 +121,7 @@ const loadContentTypes = async dir => {
   return contentTypes;
 };
 
-const loadDir = async dir => {
+const loadDir = async (dir) => {
   if (!(await fse.pathExists(dir))) {
     return;
   }
@@ -139,18 +130,19 @@ const loadDir = async dir => {
 
   const root = {};
   for (const fd of fds) {
-    if (!fd.isFile()) {
+    if (!fd.isFile() || extname(fd.name) === '.map') {
       continue;
     }
 
     const key = basename(fd.name, extname(fd.name));
+
     root[normalizeName(key)] = await loadFile(join(dir, fd.name));
   }
 
   return root;
 };
 
-const loadFile = file => {
+const loadFile = (file) => {
   const ext = extname(file);
 
   switch (ext) {

package/lib/core/loaders/components.js

@@ -5,7 +5,7 @@ const _ = require('lodash');
 const { pathExists } = require('fs-extra');
 const loadFiles = require('../../load/load-files');
 
-module.exports = async strapi => {
+module.exports = async (strapi) => {
   if (!(await pathExists(strapi.dirs.dist.components))) {
     return {};
   }
@@ -13,7 +13,7 @@ module.exports = async strapi => {
   const map = await loadFiles(strapi.dirs.dist.components, '*/*.*(js|json)');
 
   return Object.keys(map).reduce((acc, category) => {
-    Object.keys(map[category]).forEach(key => {
+    Object.keys(map[category]).forEach((key) => {
       const schema = map[category][key];
 
       if (!schema.collectionName) {

package/lib/core/loaders/middlewares.js

@@ -2,8 +2,7 @@
 
 const { join, extname, basename } = require('path');
 const fse = require('fs-extra');
-
-const { importDefault } = require('../../utils');
+const { importDefault } = require('@strapi/utils');
 
 // TODO:: allow folders with index.js inside for bigger policies
 module.exports = async function loadMiddlewares(strapi) {
@@ -14,7 +13,7 @@ module.exports = async function loadMiddlewares(strapi) {
   strapi.container.get('middlewares').add(`strapi::`, internalMiddlewares);
 };
 
-const loadLocalMiddlewares = async strapi => {
+const loadLocalMiddlewares = async (strapi) => {
   const dir = strapi.dirs.dist.middlewares;
 
   if (!(await fse.pathExists(dir))) {