@strapi/strapi 4.0.0-beta.2 → 4.0.0-beta.20

package/README.md

@@ -9,11 +9,11 @@
 <br />
 
 <p align="center">
-  <a href="https://www.npmjs.org/package/strapi">
-    <img src="https://img.shields.io/npm/v/strapi/latest.svg" alt="NPM Version" />
+  <a href="https://www.npmjs.org/package/@strapi/strapi">
+    <img src="https://img.shields.io/npm/v/@strapi/strapi/latest.svg" alt="NPM Version" />
   </a>
-  <a href="https://www.npmjs.org/package/strapi">
-    <img src="https://img.shields.io/npm/dm/strapi.svg" alt="Monthly download on NPM" />
+  <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" />
   </a>
   <a href="https://discord.strapi.io">
     <img src="https://img.shields.io/discord/811989166782021633?label=Discord" alt="Strapi on Discord" />
@@ -24,7 +24,7 @@
 
 <p align="center">
   <a href="https://strapi.io">
-    <img src="https://raw.githubusercontent.com/strapi/strapi/master/public/assets/administration_panel.png" alt="Administration panel" />
+    <img src="https://raw.githubusercontent.com/strapi/strapi/0bcebf77b37182fe021cb59cc19be8f5db4a18ac/public/assets/administration_panel.png" alt="Administration panel" />
   </a>
 </p>
 
@@ -39,7 +39,7 @@ Strapi is a free and open-source headless CMS delivering your content anywhere y
 
 ## Getting Started
 
-<a href="https://strapi.io/documentation/developer-docs/latest/getting-started/quick-start.html" target="_blank">Read the Getting Started tutorial</a> or follow the steps below:
+<a href="https://docs.strapi.io/developer-docs/latest/getting-started/quick-start.html" target="_blank">Read the Getting Started tutorial</a> or follow the steps below:
 
 ### ⏳ Installation
 
@@ -65,7 +65,7 @@ Enjoy 🎉
 
 ### 🖐 Requirements
 
-Complete installation requirements can be found in the documentation under <a href="https://strapi.io/documentation/developer-docs/latest/setup-deployment-guides/deployment.html#recommended-requirements">Installation Requirements</a>.
+Complete installation requirements can be found in the documentation under <a href="https://docs.strapi.io/developer-docs/latest/setup-deployment-guides/deployment.html">Installation Requirements</a>.
 
 **Supported operating systems**:
 
@@ -79,7 +79,7 @@ Complete installation requirements can be found in the documentation under <a hr
 
 **Node:**
 
-- NodeJS >= 10.16 <=14
+- NodeJS >= 12 <= 16
 - NPM >= 6.x
 
 **Database:**
@@ -109,7 +109,7 @@ Please read our [Contributing Guide](./CONTRIBUTING.md) before submitting a Pull
 
 ## Community support
 
-For general help using Strapi, please refer to [the official Strapi documentation](https://strapi.io/documentation/). For additional help, you can use one of these channels to ask a question:
+For general help using Strapi, please refer to [the official Strapi documentation](https://docs.strapi.io). For additional help, you can use one of these channels to ask a question:
 
 - [Discord](https://discord.strapi.io) (For live discussion with the Community and Strapi team)
 - [GitHub](https://github.com/strapi/strapi) (Bug reports, Contributions)
@@ -122,7 +122,7 @@ For general help using Strapi, please refer to [the official Strapi documentatio
 
 ## Migration
 
-Follow our [migration guides](https://strapi.io/documentation/developer-docs/latest/update-migration-guides/migration-guides.html) on the documentation to keep your projects up-to-date.
+Follow our [migration guides](https://docs.strapi.io/developer-docs/latest/update-migration-guides/migration-guides.html) on the documentation to keep your projects up-to-date.
 
 ## Roadmap
 
@@ -132,8 +132,8 @@ Check out our [roadmap](https://portal.productboard.com/strapi) to get informed
 
 See our dedicated [repository](https://github.com/strapi/documentation) for the Strapi documentation, or view our documentation live:
 
-- [Developer docs](https://strapi.io/documentation/developer-docs/latest/getting-started/introduction.html)
-- [User docs](https://strapi.io/documentation/user-docs/latest/getting-started/introduction.html)
+- [Developer docs](https://docs.strapi.io/developer-docs/latest/getting-started/introduction.html)
+- [User guide](https://docs.strapi.io/user-docs/latest/getting-started/introduction.html)
 
 ## Try live demo
 

package/bin/strapi.js

@@ -127,7 +127,7 @@ program
 
 // `$ strapi generate:template <directory>`
 program
-  .command('generate:template <directory>')
+  .command('templates:generate <directory>')
   .description('Generate template from Strapi project')
   .action(getLocalScript('generate-template'));
 
@@ -208,4 +208,9 @@ program
   .description('List all the application hooks')
   .action(getLocalScript('hooks/list'));
 
+program
+  .command('services:list')
+  .description('List all the application services')
+  .action(getLocalScript('services/list'));
+
 program.parseAsync(process.argv);

package/lib/Strapi.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const _ = require('lodash');
+const { isFunction } = require('lodash/fp');
 const { createLogger } = require('@strapi/logger');
 const { Database } = require('@strapi/database');
 const { createAsyncParallelHook } = require('@strapi/utils').hooks;
@@ -35,6 +36,7 @@ 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');
 
 // TODO: move somewhere else
 const draftAndPublishSync = require('./migrations/draft-publish');
@@ -42,10 +44,12 @@ const draftAndPublishSync = require('./migrations/draft-publish');
 const LIFECYCLES = {
   REGISTER: 'register',
   BOOTSTRAP: 'bootstrap',
+  DESTROY: 'destroy',
 };
 
 class Strapi {
   constructor(opts = {}) {
+    destroyOnSignal(this);
     this.dirs = utils.getDirs(opts.dir || process.cwd());
     const appConfig = loadConfiguration(this.dirs.root, opts);
     this.container = createContainer(this);
@@ -70,6 +74,7 @@ class Strapi {
     this.startupLogger = createStartupLogger(this);
     this.log = createLogger(this.config.get('logger', {}));
     this.cron = createCronService();
+    this.telemetry = createTelemetry(this);
 
     createUpdateNotifier(this).notify();
   }
@@ -167,17 +172,7 @@ class Strapi {
   async destroy() {
     await this.server.destroy();
 
-    await Promise.all(
-      Object.values(this.plugins).map(plugin => {
-        if (_.has(plugin, 'destroy') && typeof plugin.destroy === 'function') {
-          return plugin.destroy();
-        }
-      })
-    );
-
-    if (_.has(this, 'admin')) {
-      await this.admin.destroy();
-    }
+    await this.runLifecyclesFunctions(LIFECYCLES.DESTROY);
 
     this.eventHub.removeAllListeners();
 
@@ -188,6 +183,8 @@ class Strapi {
     this.telemetry.destroy();
     this.cron.destroy();
 
+    process.removeAllListeners();
+
     delete global.strapi;
   }
 
@@ -207,7 +204,7 @@ class Strapi {
   async openAdmin({ isInitialized }) {
     const shouldOpenAdmin =
       this.config.get('environment') === 'development' &&
-      this.config.get('server.admin.autoOpen', true) !== false;
+      this.config.get('admin.autoOpen', true) !== false;
 
     if (shouldOpenAdmin && !isInitialized) {
       await utils.openBrowser(this.config);
@@ -264,7 +261,7 @@ class Strapi {
   }
 
   stop(exitCode = 1) {
-    this.server.destroy();
+    this.destroy();
 
     if (this.config.get('autoReload')) {
       process.send('stop');
@@ -310,7 +307,7 @@ class Strapi {
     this.hook('strapi::content-types.afterSync').register(draftAndPublishSync.enable);
   }
 
-  async load() {
+  async register() {
     await Promise.all([
       this.loadApp(),
       this.loadPlugins(),
@@ -332,8 +329,14 @@ class Strapi {
 
     this.registerInternalHooks();
 
+    this.telemetry.register();
+
     await this.runLifecyclesFunctions(LIFECYCLES.REGISTER);
 
+    return this;
+  }
+
+  async bootstrap() {
     const contentTypes = [
       coreStoreModel,
       webhookModel,
@@ -360,10 +363,10 @@ class Strapi {
     const cronTasks = this.config.get('server.cron.tasks', {});
     this.cron.add(cronTasks);
 
-    this.telemetry = createTelemetry(this);
+    this.telemetry.bootstrap();
 
     let oldContentTypes;
-    if (await this.db.connection.schema.hasTable(coreStoreModel.collectionName)) {
+    if (await this.db.getSchemaConnection().hasTable(coreStoreModel.collectionName)) {
       oldContentTypes = await this.store.get({
         type: 'strapi',
         name: 'content_types',
@@ -399,6 +402,13 @@ class Strapi {
 
     this.cron.start();
 
+    return this;
+  }
+
+  async load() {
+    await this.register();
+    await this.bootstrap();
+
     this.isLoaded = true;
 
     return this;
@@ -423,7 +433,6 @@ class Strapi {
       }
 
       if (this.config.get('autoReload')) {
-        this.server.destroy();
         process.send('reload');
       }
     };
@@ -454,13 +463,16 @@ class Strapi {
     await this.container.get('modules')[lifecycleName]();
 
     // user
-    const lifecycleFunction = this.app[lifecycleName];
-    if (lifecycleFunction) {
-      await lifecycleFunction({ strapi: this });
+    const userLifecycleFunction = this.app && this.app[lifecycleName];
+    if (isFunction(userLifecycleFunction)) {
+      await userLifecycleFunction({ strapi: this });
     }
 
     // admin
-    await this.admin[lifecycleName]({ strapi: this });
+    const adminLifecycleFunction = this.admin && this.admin[lifecycleName];
+    if (isFunction(adminLifecycleFunction)) {
+      await adminLifecycleFunction({ strapi: this });
+    }
   }
 
   getModel(uid) {

package/lib/commands/build.js

@@ -24,7 +24,7 @@ module.exports = async ({ clean, optimization }) => {
   const plugins = await getEnabledPlugins(strapiInstance);
 
   const env = strapiInstance.config.get('environment');
-  const { serverUrl, adminPath } = getConfigUrls(strapiInstance.config.get('server'), true);
+  const { serverUrl, adminPath } = getConfigUrls(strapiInstance.config, true);
 
   console.log(`Building your admin UI with ${green(env)} configuration ...`);
 

package/lib/commands/content-types/list.js

@@ -6,17 +6,15 @@ const chalk = require('chalk');
 const strapi = require('../../index');
 
 module.exports = async function() {
-  const app = await strapi().load();
+  const app = await strapi().register();
 
-  const list = app.contentTypes;
+  const list = app.container.get('content-types').keys();
 
   const infoTable = new CLITable({
     head: [chalk.blue('Name')],
   });
 
-  Object.keys(list).forEach(name => {
-    infoTable.push([name]);
-  });
+  list.forEach(name => infoTable.push([name]));
 
   console.log(infoTable.toString());
 

package/lib/commands/develop.js

@@ -20,8 +20,8 @@ module.exports = async function({ build, watchAdmin, polling, browser }) {
   const config = loadConfiguration(dir);
   const logger = createLogger(config.logger, {});
 
-  const adminWatchIgnoreFiles = getOr([], 'server.admin.watchIgnoreFiles')(config);
-  const serveAdminPanel = getOr(true, 'server.admin.serveAdminPanel')(config);
+  const adminWatchIgnoreFiles = getOr([], 'admin.watchIgnoreFiles')(config);
+  const serveAdminPanel = getOr(true, 'admin.serveAdminPanel')(config);
 
   const buildExists = fs.existsSync(path.join(dir, 'build'));
   // Don't run the build process if the admin is in watch mode
@@ -52,14 +52,12 @@ module.exports = async function({ build, watchAdmin, polling, browser }) {
         switch (message) {
           case 'reload':
             logger.info('The server is restarting\n');
-            worker.send('isKilled');
+            worker.send('kill');
             break;
-          case 'kill':
-            worker.kill();
+          case 'killed':
             cluster.fork();
             break;
           case 'stop':
-            worker.kill();
             process.exit(1);
           default:
             return;
@@ -85,10 +83,10 @@ module.exports = async function({ build, watchAdmin, polling, browser }) {
 
       process.on('message', async message => {
         switch (message) {
-          case 'isKilled':
-            await strapiInstance.server.destroy();
-            process.send('kill');
-            break;
+          case 'kill':
+            await strapiInstance.destroy();
+            process.send('killed');
+            process.exit();
           default:
           // Do nothing.
         }

package/lib/commands/generate-template.js

@@ -6,7 +6,7 @@ const chalk = require('chalk');
 const inquirer = require('inquirer');
 
 // All directories that a template could need
-const TEMPLATE_CONTENT = ['api', 'components', 'config/functions/bootstrap.js', 'data'];
+const TEMPLATE_CONTENT = ['src', 'data'];
 
 /**
  *
@@ -54,10 +54,9 @@ async function writeTemplateJson(rootPath) {
  * @returns boolean
  */
 async function templateConfigExists(rootPath) {
-  const jsonConfig = await fse.pathExists(join(rootPath, 'template.json'));
-  const functionConfig = await fse.pathExists(join(rootPath, 'template.js'));
-
-  return jsonConfig || functionConfig;
+  const configExists = await fse.pathExists(join(rootPath, 'template.json'));
+  console.log(`checking: ${join(rootPath, 'template.json')}. result ${configExists}`);
+  return configExists;
 }
 
 module.exports = async function generateTemplate(directory) {

package/lib/commands/hooks/list.js

@@ -6,17 +6,15 @@ const chalk = require('chalk');
 const strapi = require('../../index');
 
 module.exports = async function() {
-  const app = await strapi().load();
+  const app = await strapi().register();
 
-  const list = app.hooks;
+  const list = app.container.get('hooks').keys();
 
   const infoTable = new CLITable({
     head: [chalk.blue('Name')],
   });
 
-  Object.keys(list).forEach(name => {
-    infoTable.push([name]);
-  });
+  list.forEach(name => infoTable.push([name]));
 
   console.log(infoTable.toString());
 

package/lib/commands/middlewares/list.js

@@ -6,17 +6,15 @@ const chalk = require('chalk');
 const strapi = require('../../index');
 
 module.exports = async function() {
-  const app = await strapi().load();
+  const app = await strapi().register();
 
-  const list = app.middlewares;
+  const list = app.container.get('middlewares').keys();
 
   const infoTable = new CLITable({
     head: [chalk.blue('Name')],
   });
 
-  Object.keys(list).forEach(name => {
-    infoTable.push([name]);
-  });
+  list.forEach(name => infoTable.push([name]));
 
   console.log(infoTable.toString());
 

package/lib/commands/new.js

@@ -1,5 +1,7 @@
 'use strict';
 
+const { generateNewApp } = require('@strapi/generate-new');
+
 /**
  * `$ strapi new`
  *
@@ -7,5 +9,5 @@
  */
 
 module.exports = function(...args) {
-  return require('@strapi/generate-new')(...args);
+  return generateNewApp(...args);
 };

package/lib/commands/policies/list.js

@@ -6,17 +6,15 @@ const chalk = require('chalk');
 const strapi = require('../../index');
 
 module.exports = async function() {
-  const app = await strapi().load();
+  const app = await strapi().register();
 
-  const list = app.policies;
+  const list = app.container.get('policies').keys();
 
   const infoTable = new CLITable({
     head: [chalk.blue('Name')],
   });
 
-  Object.keys(list).forEach(name => {
-    infoTable.push([name]);
-  });
+  list.forEach(name => infoTable.push([name]));
 
   console.log(infoTable.toString());
 

package/lib/commands/services/list.js

@@ -0,0 +1,22 @@
+'use strict';
+
+const CLITable = require('cli-table3');
+const chalk = require('chalk');
+
+const strapi = require('../../index');
+
+module.exports = async function() {
+  const app = await strapi().register();
+
+  const list = app.container.get('services').keys();
+
+  const infoTable = new CLITable({
+    head: [chalk.blue('Name')],
+  });
+
+  list.forEach(name => infoTable.push([name]));
+
+  console.log(infoTable.toString());
+
+  await app.destroy();
+};

package/lib/commands/watchAdmin.js

@@ -19,11 +19,11 @@ module.exports = async function({ browser }) {
 
   const plugins = await getEnabledPlugins(strapiInstance);
 
-  const { adminPath } = getConfigUrls(strapiInstance.config.get('server'), true);
+  const { adminPath } = getConfigUrls(strapiInstance.config, true);
 
-  const adminPort = strapiInstance.config.get('server.admin.port', 8000);
-  const adminHost = strapiInstance.config.get('server.admin.host', 'localhost');
-  const adminWatchIgnoreFiles = strapiInstance.config.get('server.admin.watchIgnoreFiles', []);
+  const adminPort = strapiInstance.config.get('admin.port', 8000);
+  const adminHost = strapiInstance.config.get('admin.host', 'localhost');
+  const adminWatchIgnoreFiles = strapiInstance.config.get('admin.watchIgnoreFiles', []);
 
   const backendURL = getAbsoluteServerUrl(strapiInstance.config, true);
 

package/lib/core/app-configuration/index.js

@@ -11,16 +11,9 @@ dotenv.config({ path: process.env.ENV_PATH });
 process.env.NODE_ENV = process.env.NODE_ENV || 'development';
 
 const loadConfigDir = require('./config-loader');
-const loadFunction = require('./load-functions');
 
 const { version: strapiVersion } = require(path.join(__dirname, '../../../package.json'));
 
-const CONFIG_PATHS = {
-  config: 'config',
-  static: 'public',
-  views: 'views',
-};
-
 const defaultConfig = {
   server: {
     host: process.env.HOST || os.hostname() || 'localhost',
@@ -30,6 +23,11 @@ const defaultConfig = {
     admin: { autoOpen: false },
   },
   admin: {},
+  api: {
+    rest: {
+      prefix: '/api',
+    },
+  },
 };
 
 module.exports = (dir, initialConfig = {}) => {
@@ -41,8 +39,6 @@ module.exports = (dir, initialConfig = {}) => {
 
   const rootConfig = {
     launchedAt: Date.now(),
-    appPath: dir,
-    paths: CONFIG_PATHS,
     serveAdminPanel,
     autoReload,
     environment: process.env.NODE_ENV,
@@ -52,7 +48,6 @@ module.exports = (dir, initialConfig = {}) => {
       ...pkgJSON,
       strapi: strapiVersion,
     },
-    functions: loadFunction(path.join(configDir, 'functions')),
   };
 
   const baseConfig = omit('plugins', loadConfigDir(configDir)); // plugin config will be loaded later

package/lib/core/bootstrap.js

@@ -6,7 +6,7 @@ module.exports = function({ strapi }) {
   strapi.config.port = strapi.config.get('server.port') || strapi.config.port;
   strapi.config.host = strapi.config.get('server.host') || strapi.config.host;
 
-  const { serverUrl, adminUrl, adminPath } = getConfigUrls(strapi.config.get('server'));
+  const { serverUrl, adminUrl, adminPath } = getConfigUrls(strapi.config);
 
   strapi.config.server = strapi.config.server || {};
   strapi.config.server.url = serverUrl;
@@ -15,7 +15,7 @@ module.exports = function({ strapi }) {
 
   // check if we should serve admin panel
   const shouldServeAdmin = strapi.config.get(
-    'server.admin.serveAdminPanel',
+    'admin.serveAdminPanel',
     strapi.config.get('serveAdminPanel')
   );
 

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

@@ -61,7 +61,9 @@ const createModule = (namespace, rawModule, strapi) => {
       strapi.container.get('controllers').add(namespace, rawModule.controllers);
       strapi.container.get('config').set(uidToPath(namespace), rawModule.config);
     },
-    routes: rawModule.routes,
+    get routes() {
+      return rawModule.routes;
+    },
     config(path, defaultValue) {
       return strapi.container.get('config').get(`${uidToPath(namespace)}.${path}`, defaultValue);
     },

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

@@ -1,6 +1,5 @@
 'use strict';
 
-const _ = require('lodash');
 const { yup } = require('@strapi/utils');
 
 const strapiServerSchema = yup
@@ -14,9 +13,7 @@ const strapiServerSchema = yup
       if (Array.isArray(value)) {
         return yup.array();
       } else {
-        const shape = _.mapValues(value, () => yup.object({ routes: yup.array().required() }));
-
-        return yup.object(shape);
+        return yup.object();
       }
     }),
     controllers: yup.object(),

package/lib/core/loaders/admin.js

@@ -11,6 +11,6 @@ module.exports = strapi => {
   strapi.container.get('policies').add(`admin::`, strapi.admin.policies);
   strapi.container.get('middlewares').add(`admin::`, strapi.admin.middlewares);
 
-  const userAdminConfig = strapi.config.get('server.admin');
-  strapi.container.get('config').set('server.admin', _.merge(strapi.admin.config, userAdminConfig));
+  const userAdminConfig = strapi.config.get('admin');
+  strapi.container.get('config').set('admin', _.merge(strapi.admin.config, userAdminConfig));
 };

package/lib/core/loaders/apis.js

@@ -4,8 +4,10 @@ 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 normalizeName = _.kebabCase;
+// 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 DEFAULT_CONTENT_TYPE = {
   schema: {},

package/lib/core/loaders/plugins/get-enabled-plugins.js

@@ -51,10 +51,10 @@ const getEnabledPlugins = async strapi => {
     const packageInfo = require(packagePath);
 
     validatePluginName(packageInfo.strapi.name);
-    internalPlugins[packageInfo.strapi.name] = toDetailedDeclaration({
-      enabled: true,
-      resolve: packagePath,
-    });
+    internalPlugins[packageInfo.strapi.name] = {
+      ...toDetailedDeclaration({ enabled: true, resolve: packagePath }),
+      info: packageInfo.strapi,
+    };
   }
 
   const installedPlugins = {};
@@ -64,10 +64,10 @@ const getEnabledPlugins = async strapi => {
 
     if (isStrapiPlugin(packageInfo)) {
       validatePluginName(packageInfo.strapi.name);
-      installedPlugins[packageInfo.strapi.name] = toDetailedDeclaration({
-        enabled: true,
-        resolve: packagePath,
-      });
+      installedPlugins[packageInfo.strapi.name] = {
+        ...toDetailedDeclaration({ enabled: true, resolve: packagePath }),
+        info: packageInfo.strapi,
+      };
     }
   }
 
@@ -79,7 +79,23 @@ const getEnabledPlugins = async strapi => {
 
   _.forEach(userPluginsConfig, (declaration, pluginName) => {
     validatePluginName(pluginName);
-    declaredPlugins[pluginName] = toDetailedDeclaration(declaration);
+
+    declaredPlugins[pluginName] = {
+      ...toDetailedDeclaration(declaration),
+      info: {},
+    };
+
+    const { pathToPlugin } = declaredPlugins[pluginName];
+
+    // for manually resolved plugins
+    if (pathToPlugin) {
+      const packagePath = join(pathToPlugin, 'package.json');
+      const packageInfo = require(packagePath);
+
+      if (isStrapiPlugin(packageInfo)) {
+        declaredPlugins[pluginName].info = packageInfo.strapi || {};
+      }
+    }
   });
 
   const declaredPluginsResolves = map(prop('pathToPlugin'), declaredPlugins);