@strapi/strapi 4.3.4 → 4.4.0-alpha.0

package/README.md

@@ -13,7 +13,7 @@
     <img src="https://img.shields.io/npm/v/@strapi/strapi/latest.svg" alt="NPM Version" />
   </a>
   <a href="https://github.com/strapi/strapi/actions/workflows/tests.yml">
-    <img src="https://github.com/strapi/strapi/actions/workflows/tests.yml/badge.svg?branch=master" alt="Tests" />
+    <img src="https://github.com/strapi/strapi/actions/workflows/tests.yml/badge.svg?branch=main" alt="Tests" />
   </a>
   <a href="https://discord.strapi.io">
     <img src="https://img.shields.io/discord/811989166782021633?label=Discord" alt="Strapi on Discord" />

package/bin/strapi.js

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+
 'use strict';
 
 // FIXME
@@ -12,8 +13,8 @@ const program = new Command();
 
 const packageJSON = require('../package.json');
 
-const checkCwdIsStrapiApp = name => {
-  let logErrorAndExit = () => {
+const checkCwdIsStrapiApp = (name) => {
+  const logErrorAndExit = () => {
     console.log(
       `You need to run ${yellow(
         `strapi ${name}`
@@ -23,7 +24,7 @@ const checkCwdIsStrapiApp = name => {
   };
 
   try {
-    const pkgJSON = require(process.cwd() + '/package.json');
+    const pkgJSON = require(`${process.cwd()}/package.json`);
     if (!_.has(pkgJSON, 'dependencies.@strapi/strapi')) {
       logErrorAndExit(name);
     }
@@ -32,30 +33,32 @@ const checkCwdIsStrapiApp = name => {
   }
 };
 
-const getLocalScript = name => (...args) => {
-  checkCwdIsStrapiApp(name);
-
-  const cmdPath = resolveCwd.silent(`@strapi/strapi/lib/commands/${name}`);
-  if (!cmdPath) {
-    console.log(
-      `Error loading the local ${yellow(
-        name
-      )} command. Strapi might not be installed in your "node_modules". You may need to run "yarn install".`
-    );
-    process.exit(1);
-  }
+const getLocalScript =
+  (name) =>
+  (...args) => {
+    checkCwdIsStrapiApp(name);
+
+    const cmdPath = resolveCwd.silent(`@strapi/strapi/lib/commands/${name}`);
+    if (!cmdPath) {
+      console.log(
+        `Error loading the local ${yellow(
+          name
+        )} command. Strapi might not be installed in your "node_modules". You may need to run "yarn install".`
+      );
+      process.exit(1);
+    }
 
-  const script = require(cmdPath);
+    const script = require(cmdPath);
 
-  Promise.resolve()
-    .then(() => {
-      return script(...args);
-    })
-    .catch(error => {
-      console.error(error);
-      process.exit(1);
-    });
-};
+    Promise.resolve()
+      .then(() => {
+        return script(...args);
+      })
+      .catch((error) => {
+        console.error(error);
+        process.exit(1);
+      });
+  };
 
 // Initial program setup
 program.storeOptionsAsProperties(false).allowUnknownOption(true);
@@ -69,7 +72,7 @@ program
   .command('version')
   .description('Output the version of Strapi')
   .action(() => {
-    process.stdout.write(packageJSON.version + '\n');
+    process.stdout.write(`${packageJSON.version}\n`);
     process.exit(0);
   });
 

package/lib/Strapi.js

@@ -22,6 +22,7 @@ const createCronService = require('./services/cron');
 const entityValidator = require('./services/entity-validator');
 const createTelemetry = require('./services/metrics');
 const createAuth = require('./services/auth');
+const createCustomFields = require('./services/custom-fields');
 const createUpdateNotifier = require('./utils/update-notifier');
 const createStartupLogger = require('./utils/startup-logger');
 const { LIFECYCLES } = require('./utils/lifecycles');
@@ -34,12 +35,14 @@ const hooksRegistry = require('./core/registries/hooks');
 const controllersRegistry = require('./core/registries/controllers');
 const modulesRegistry = require('./core/registries/modules');
 const pluginsRegistry = require('./core/registries/plugins');
+const customFieldsRegistry = require('./core/registries/custom-fields');
 const createConfigProvider = require('./core/registries/config');
 const apisRegistry = require('./core/registries/apis');
 const bootstrap = require('./core/bootstrap');
 const loaders = require('./core/loaders');
 const { destroyOnSignal } = require('./utils/signals');
 const sanitizersRegistry = require('./core/registries/sanitizers');
+const convertCustomFieldType = require('./utils/convert-custom-field-type');
 
 // TODO: move somewhere else
 const draftAndPublishSync = require('./migrations/draft-publish');
@@ -55,7 +58,7 @@ const draftAndPublishSync = require('./migrations/draft-publish');
  * - If `appDir` is `undefined`, it'll be set to `process.cwd()`
  * - If `distDir` is `undefined`, it'll be set to `appDir`
  */
-const resolveWorkingDirectories = opts => {
+const resolveWorkingDirectories = (opts) => {
   const cwd = process.cwd();
 
   const appDir = opts.appDir ? path.resolve(cwd, opts.appDir) : cwd;
@@ -87,6 +90,7 @@ class Strapi {
     this.container.register('controllers', controllersRegistry(this));
     this.container.register('modules', modulesRegistry(this));
     this.container.register('plugins', pluginsRegistry(this));
+    this.container.register('custom-fields', customFieldsRegistry(this));
     this.container.register('apis', apisRegistry(this));
     this.container.register('auth', createAuth(this));
     this.container.register('sanitizers', sanitizersRegistry(this));
@@ -109,6 +113,8 @@ class Strapi {
     this.cron = createCronService();
     this.telemetry = createTelemetry(this);
 
+    this.customFields = createCustomFields(this);
+
     createUpdateNotifier(this).notify();
   }
 
@@ -265,7 +271,7 @@ class Strapi {
    */
   async listen() {
     return new Promise((resolve, reject) => {
-      const onListen = async error => {
+      const onListen = async (error) => {
         if (error) {
           return reject(error);
         }
@@ -282,11 +288,11 @@ class Strapi {
       const listenSocket = this.config.get('server.socket');
 
       if (listenSocket) {
-        return this.server.listen(listenSocket, onListen);
+        this.server.listen(listenSocket, onListen);
+      } else {
+        const { host, port } = this.config.get('server');
+        this.server.listen(port, host, onListen);
       }
-
-      const { host, port } = this.config.get('server');
-      return this.server.listen(port, host, onListen);
     });
   }
 
@@ -454,6 +460,8 @@ class Strapi {
 
   async load() {
     await this.register();
+    // Swap type customField for underlying data type
+    convertCustomFieldType(this);
     await this.bootstrap();
 
     this.isLoaded = true;
@@ -463,7 +471,7 @@ class Strapi {
 
   async startWebhooks() {
     const webhooks = await this.webhookStore.findWebhooks();
-    webhooks.forEach(webhook => this.webhookRunner.add(webhook));
+    webhooks.forEach((webhook) => this.webhookRunner.add(webhook));
   }
 
   reload() {
@@ -471,7 +479,7 @@ class Strapi {
       shouldReload: 0,
     };
 
-    const reload = function() {
+    const reload = function () {
       if (state.shouldReload > 0) {
         // Reset the reloading state
         state.shouldReload -= 1;
@@ -535,7 +543,7 @@ class Strapi {
   }
 }
 
-module.exports = options => {
+module.exports = (options) => {
   const strapi = new Strapi(options);
   global.strapi = strapi;
   return strapi;

package/lib/commands/admin-create.js

@@ -5,10 +5,7 @@ const _ = require('lodash');
 const inquirer = require('inquirer');
 const strapi = require('../index');
 
-const emailValidator = yup
-  .string()
-  .email('Invalid email address')
-  .lowercase();
+const emailValidator = yup.string().email('Invalid email address').lowercase();
 
 const passwordValidator = yup
   .string()
@@ -60,7 +57,7 @@ const promptQuestions = [
  * @param {string} cmdOptions.firstname - new admin's first name
  * @param {string} [cmdOptions.lastname] - new admin's last name
  */
-module.exports = async function(cmdOptions = {}) {
+module.exports = async function (cmdOptions = {}) {
   let { email, password, firstname, lastname } = cmdOptions;
 
   if (

package/lib/commands/admin-reset.js

@@ -20,7 +20,7 @@ const promptQuestions = [
  * @param {string} cmdOptions.email - user's email
  * @param {string} cmdOptions.password - user's new password
  */
-module.exports = async function(cmdOptions = {}) {
+module.exports = async function (cmdOptions = {}) {
   const { email, password } = cmdOptions;
 
   if (_.isEmpty(email) && _.isEmpty(password) && process.stdin.isTTY) {

package/lib/commands/build.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const strapi = require('../');
+const strapi = require('..');
 const { buildAdmin } = require('./builders');
 
 /**

package/lib/commands/builders/admin.js

@@ -49,7 +49,7 @@ module.exports = async ({ buildDestDir, forceBuild = true, optimization, srcDir
     .then(() => {
       console.log('Admin UI built successfully');
     })
-    .catch(err => {
+    .catch((err) => {
       console.error(err);
       process.exit(1);
     });

package/lib/commands/builders/typescript.js

@@ -4,7 +4,7 @@ const path = require('path');
 const fs = require('fs-extra');
 const tsUtils = require('@strapi/typescript-utils');
 
-const cleanupDistDirectory = async distDir => {
+const cleanupDistDirectory = async (distDir) => {
   if (!(await fs.pathExists(distDir))) {
     return;
   }
@@ -12,7 +12,7 @@ const cleanupDistDirectory = async distDir => {
   const dirContent = await fs.readdir(distDir);
   const validFilenames = dirContent
     // Ignore the admin build folder
-    .filter(filename => filename !== 'build');
+    .filter((filename) => filename !== 'build');
 
   for (const filename of validFilenames) {
     await fs.remove(path.resolve(distDir, filename));

package/lib/commands/configurationDump.js

@@ -9,7 +9,7 @@ const CHUNK_SIZE = 100;
  * Will dump configurations to a file or stdout
  * @param {string} file filepath to use as output
  */
-module.exports = async function({ file: filePath, pretty }) {
+module.exports = async function ({ file: filePath, pretty }) {
   const output = filePath ? fs.createWriteStream(filePath) : process.stdout;
 
   const appContext = await strapi.compile();
@@ -27,8 +27,8 @@ module.exports = async function({ file: filePath, pretty }) {
       .findMany({ limit: CHUNK_SIZE, offset: page * CHUNK_SIZE, orderBy: 'key' });
 
     results
-      .filter(result => result.key.startsWith('plugin_'))
-      .forEach(result => {
+      .filter((result) => result.key.startsWith('plugin_'))
+      .forEach((result) => {
         exportData.push({
           key: result.key,
           value: result.value,

package/lib/commands/configurationRestore.js

@@ -10,7 +10,7 @@ const strapi = require('../index');
  * @param {string} file filepath to use as input
  * @param {string} strategy import strategy. one of (replace, merge, keep, default: replace)
  */
-module.exports = async function({ file: filePath, strategy = 'replace' }) {
+module.exports = async ({ file: filePath, strategy = 'replace' }) => {
   const input = filePath ? fs.readFileSync(filePath) : await readStdin(process.stdin);
 
   const appContext = await strapi.compile();
@@ -50,6 +50,7 @@ const readStdin = () => {
     stdin.setEncoding('utf8');
     stdin.on('readable', () => {
       let chunk;
+      // eslint-disable-next-line no-cond-assign
       while ((chunk = stdin.read())) {
         result += chunk;
       }
@@ -80,7 +81,7 @@ const createImporter = (db, strategy) => {
  * Replace importer. Will replace the keys that already exist and create the new ones
  * @param {Object} db - DatabaseManager instance
  */
-const createReplaceImporter = db => {
+const createReplaceImporter = (db) => {
   const stats = {
     created: 0,
     replaced: 0,
@@ -111,7 +112,7 @@ const createReplaceImporter = db => {
  * Merge importer. Will merge the keys that already exist with their new value and create the new ones
  * @param {Object} db - DatabaseManager instance
  */
-const createMergeImporter = db => {
+const createMergeImporter = (db) => {
   const stats = {
     created: 0,
     merged: 0,
@@ -145,7 +146,7 @@ const createMergeImporter = db => {
  * Merge importer. Will keep the keys that already exist without changing them and create the new ones
  * @param {Object} db - DatabaseManager instance
  */
-const createKeepImporter = db => {
+const createKeepImporter = (db) => {
   const stats = {
     created: 0,
     untouched: 0,

package/lib/commands/console.js

@@ -14,7 +14,7 @@ module.exports = async () => {
   app.start().then(() => {
     const repl = REPL.start(app.config.info.name + ' > ' || 'strapi > '); // eslint-disable-line prefer-template
 
-    repl.on('exit', function(err) {
+    repl.on('exit', function (err) {
       if (err) {
         app.log.error(err);
         process.exit(1);

package/lib/commands/content-types/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/controllers/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/develop.js

@@ -18,7 +18,7 @@ const { buildTypeScript, buildAdmin } = require('./builders');
  *
  */
 
-module.exports = async function({ build, watchAdmin, polling, browser }) {
+module.exports = async ({ build, watchAdmin, polling, browser }) => {
   const appDir = process.cwd();
 
   const isTSProject = await tsUtils.isUsingTypeScript(appDir);
@@ -96,8 +96,10 @@ const primaryProcess = async ({ distDir, appDir, build, isTSProject, watchAdmin,
         break;
       case 'stop':
         process.exit(1);
-      default:
-        return;
+        break;
+      default: {
+        break;
+      }
     }
   });
 
@@ -108,7 +110,7 @@ const workerProcess = ({ appDir, distDir, watchAdmin, polling, isTSProject }) =>
   const strapiInstance = strapi({
     distDir,
     autoReload: true,
-    serveAdminPanel: watchAdmin ? false : true,
+    serveAdminPanel: !watchAdmin,
   });
 
   const adminWatchIgnoreFiles = strapiInstance.config.get('admin.watchIgnoreFiles', []);
@@ -120,13 +122,17 @@ const workerProcess = ({ appDir, distDir, watchAdmin, polling, isTSProject }) =>
     isTSProject,
   });
 
-  process.on('message', async message => {
+  process.on('message', async (message) => {
     switch (message) {
-      case 'kill':
+      case 'kill': {
         await strapiInstance.destroy();
         process.send('killed');
         process.exit();
-      default:
+        break;
+      }
+      default: {
+        break;
+      }
       // Do nothing.
     }
   });
@@ -178,15 +184,15 @@ function watchFileChanges({ appDir, strapiInstance, watchIgnoreFiles, polling })
   });
 
   watcher
-    .on('add', path => {
+    .on('add', (path) => {
       strapiInstance.log.info(`File created: ${path}`);
       restart();
     })
-    .on('change', path => {
+    .on('change', (path) => {
       strapiInstance.log.info(`File changed: ${path}`);
       restart();
     })
-    .on('unlink', path => {
+    .on('unlink', (path) => {
       strapiInstance.log.info(`File deleted: ${path}`);
       restart();
     });

package/lib/commands/hooks/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/install.js

@@ -6,13 +6,13 @@ const ora = require('ora');
 const execa = require('execa');
 const findPackagePath = require('../load/package-path');
 
-module.exports = async plugins => {
+module.exports = async (plugins) => {
   const loader = ora();
   const dir = process.cwd();
 
   const version = require(join(dir, 'package.json')).dependencies['@strapi/strapi'];
 
-  const pluginArgs = plugins.map(name => `@strapi/plugin-${name}@${version}`);
+  const pluginArgs = plugins.map((name) => `@strapi/plugin-${name}@${version}`);
 
   try {
     loader.start(`Installing dependencies`);
@@ -28,8 +28,8 @@ module.exports = async plugins => {
 
     // check if rebuild is necessary
     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;
       }

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,19 +40,18 @@ 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', {
       method: 'POST',
@@ -64,7 +63,7 @@ const sendEvent = async 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,7 +26,7 @@ const writePackageJSON = async (path, file, spacing) => {
   }
 };
 
-const sendEvent = async uuid => {
+const sendEvent = async (uuid) => {
   try {
     await fetch('https://analytics.strapi.io/track', {
       method: 'POST',
@@ -38,7 +38,7 @@ const sendEvent = async 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());