@strapi/strapi 4.0.0-next.8 → 4.0.2

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,13 +79,13 @@ Complete installation requirements can be found in the documentation under <a hr
 
 **Node:**
 
-- NodeJS >= 10.16 <=14
+- NodeJS >= 12 <= 16
 - NPM >= 6.x
 
 **Database:**
 
-- MySQL >= 5.6
-- MariaDB >= 10.1
+- MySQL >= 5.7.8
+- MariaDB >= 10.2.7
 - PostgreSQL >= 10
 - SQLite >= 3
 
@@ -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

@@ -58,10 +58,7 @@ const getLocalScript = name => (...args) => {
 };
 
 // Initial program setup
-program
-  .storeOptionsAsProperties(false)
-  .passCommandToAction(false)
-  .allowUnknownOption(true);
+program.storeOptionsAsProperties(false).allowUnknownOption(true);
 
 program.helpOption('-h, --help', 'Display help for command');
 program.addHelpCommand('help [command]', 'Display help for command');
@@ -118,68 +115,22 @@ program
   .description('Start your Strapi application in development mode')
   .action(getLocalScript('develop'));
 
-// `$ strapi generate:api`
-program
-  .command('generate:api <id> [attributes...]')
-  .option('-a, --api <api>', 'API name to generate the files in')
-  .option('-p, --plugin <api>', 'Name of the local plugin')
-  .option('-e, --extend <api>', 'Name of the plugin to extend')
-  .option('--draft-and-publish', 'Enable draft/publish', false)
-  .description('Generate a basic API')
-  .action((id, attributes, cliArguments) => {
-    cliArguments.attributes = attributes;
-    getLocalScript('generate')(id, cliArguments);
-  });
-
-// `$ strapi generate:controller`
-program
-  .command('generate:controller <id>')
-  .option('-a, --api <api>', 'API name to generate the files in')
-  .option('-p, --plugin <api>', 'Name of the local plugin')
-  .option('-e, --extend <api>', 'Name of the plugin to extend')
-  .description('Generate a controller for an API')
-  .action(getLocalScript('generate'));
-
-// `$ strapi generate:model`
-program
-  .command('generate:model <id> [attributes...]')
-  .option('-a, --api <api>', 'API name to generate a sub API')
-  .option('-p, --plugin <api>', 'plugin name')
-  .option('--draft-and-publish', 'Enable draft/publish', false)
-  .description('Generate a model for an API')
-  .action((id, attributes, cliArguments) => {
-    cliArguments.attributes = attributes;
-    getLocalScript('generate')(id, cliArguments);
-  });
-
-// `$ strapi generate:policy`
-program
-  .command('generate:policy <id>')
-  .option('-a, --api <api>', 'API name')
-  .option('-p, --plugin <api>', 'plugin name')
-  .description('Generate a policy for an API')
-  .action(getLocalScript('generate'));
-
-// `$ strapi generate:service`
+// $ strapi generate
 program
-  .command('generate:service <id>')
-  .option('-a, --api <api>', 'API name')
-  .option('-p, --plugin <api>', 'plugin name')
-  .description('Generate a service for an API')
-  .action(getLocalScript('generate'));
-
-// `$ strapi generate:plugin`
-program
-  .command('generate:plugin <id>')
-  .option('-n, --name <name>', 'Plugin name')
-  .description('Generate a basic plugin')
-  .action(getLocalScript('generate'));
+  .command('generate')
+  .description('Launch interactive API generator')
+  .action(() => {
+    checkCwdIsStrapiApp('generate');
+    process.argv.splice(2, 1);
+    require('@strapi/generators').runCLI();
+  });
 
 // `$ strapi generate:template <directory>`
 program
-  .command('generate:template <directory>')
+  .command('templates:generate <directory>')
   .description('Generate template from Strapi project')
   .action(getLocalScript('generate-template'));
+
 program
   .command('build')
   .option('--clean', 'Remove the build and .cache folders', false)
@@ -232,4 +183,39 @@ program
   .option('-p, --password <password>', 'New password for the user')
   .action(getLocalScript('admin-reset'));
 
+program
+  .command('routes:list')
+  .description('List all the application routes')
+  .action(getLocalScript('routes/list'));
+
+program
+  .command('middlewares:list')
+  .description('List all the application middlewares')
+  .action(getLocalScript('middlewares/list'));
+
+program
+  .command('policies:list')
+  .description('List all the application policies')
+  .action(getLocalScript('policies/list'));
+
+program
+  .command('content-types:list')
+  .description('List all the application content-types')
+  .action(getLocalScript('content-types/list'));
+
+program
+  .command('hooks:list')
+  .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
+  .command('controllers:list')
+  .description('List all the application controllers')
+  .action(getLocalScript('controllers/list'));
+
 program.parseAsync(process.argv);

package/lib/Strapi.js

@@ -1,25 +1,26 @@
 'use strict';
 
-const Koa = require('koa');
-const Router = require('koa-router');
 const _ = require('lodash');
+const { isFunction } = require('lodash/fp');
 const { createLogger } = require('@strapi/logger');
 const { Database } = require('@strapi/database');
+const { createAsyncParallelHook } = require('@strapi/utils').hooks;
 
 const loadConfiguration = require('./core/app-configuration');
 
-const { createHTTPServer } = require('./server');
 const { createContainer } = require('./container');
 const utils = require('./utils');
-const initializeMiddlewares = require('./middlewares');
 const createStrapiFs = require('./services/fs');
 const createEventHub = require('./services/event-hub');
+const { createServer } = require('./services/server');
 const createWebhookRunner = require('./services/webhook-runner');
 const { webhookModel, createWebhookStore } = require('./services/webhook-store');
 const { createCoreStore, coreStoreModel } = require('./services/core-store');
 const createEntityService = require('./services/entity-service');
+const createCronService = require('./services/cron');
 const entityValidator = require('./services/entity-validator');
 const createTelemetry = require('./services/metrics');
+const createAuth = require('./services/auth');
 const createUpdateNotifier = require('./utils/update-notifier');
 const createStartupLogger = require('./utils/startup-logger');
 const ee = require('./utils/ee');
@@ -27,42 +28,53 @@ const contentTypesRegistry = require('./core/registries/content-types');
 const servicesRegistry = require('./core/registries/services');
 const policiesRegistry = require('./core/registries/policies');
 const middlewaresRegistry = require('./core/registries/middlewares');
+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 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');
 
 const LIFECYCLES = {
   REGISTER: 'register',
   BOOTSTRAP: 'bootstrap',
+  DESTROY: 'destroy',
 };
 
 class Strapi {
   constructor(opts = {}) {
-    this.dir = opts.dir || process.cwd();
-    const appConfig = loadConfiguration(this.dir, opts);
+    destroyOnSignal(this);
+    this.dirs = utils.getDirs(opts.dir || process.cwd());
+    const appConfig = loadConfiguration(this.dirs.root, opts);
     this.container = createContainer(this);
     this.container.register('config', createConfigProvider(appConfig));
     this.container.register('content-types', contentTypesRegistry(this));
     this.container.register('services', servicesRegistry(this));
     this.container.register('policies', policiesRegistry(this));
     this.container.register('middlewares', middlewaresRegistry(this));
+    this.container.register('hooks', hooksRegistry(this));
     this.container.register('controllers', controllersRegistry(this));
     this.container.register('modules', modulesRegistry(this));
     this.container.register('plugins', pluginsRegistry(this));
+    this.container.register('apis', apisRegistry(this));
+    this.container.register('auth', createAuth(this));
 
     this.isLoaded = false;
     this.reload = this.reload();
-    this.app = new Koa();
-    this.router = new Router();
-    this.server = createHTTPServer(this, this.app);
+    this.server = createServer(this);
+
     this.fs = createStrapiFs(this);
     this.eventHub = createEventHub();
     this.startupLogger = createStartupLogger(this);
-    this.app.proxy = this.config.get('server.proxy');
     this.log = createLogger(this.config.get('logger', {}));
+    this.cron = createCronService();
+    this.telemetry = createTelemetry(this);
 
     createUpdateNotifier(this).notify();
   }
@@ -72,39 +84,75 @@ class Strapi {
   }
 
   get EE() {
-    return ee({ dir: this.dir, logger: this.log });
+    return ee({ dir: this.dirs.root, logger: this.log });
+  }
+
+  get services() {
+    return this.container.get('services').getAll();
   }
 
   service(uid) {
     return this.container.get('services').get(uid);
   }
 
+  get controllers() {
+    return this.container.get('controllers').getAll();
+  }
+
   controller(uid) {
     return this.container.get('controllers').get(uid);
   }
 
+  get contentTypes() {
+    return this.container.get('content-types').getAll();
+  }
+
   contentType(name) {
     return this.container.get('content-types').get(name);
   }
 
-  get contentTypes() {
-    return this.container.get('content-types').getAll();
+  get policies() {
+    return this.container.get('policies').getAll();
   }
 
   policy(name) {
     return this.container.get('policies').get(name);
   }
 
+  get middlewares() {
+    return this.container.get('middlewares').getAll();
+  }
+
   middleware(name) {
     return this.container.get('middlewares').get(name);
   }
 
+  get plugins() {
+    return this.container.get('plugins').getAll();
+  }
+
   plugin(name) {
     return this.container.get('plugins').get(name);
   }
 
-  get plugins() {
-    return this.container.get('plugins').getAll();
+  get hooks() {
+    return this.container.get('hooks').getAll();
+  }
+
+  hook(name) {
+    return this.container.get('hooks').get(name);
+  }
+
+  // api(name) {
+  //   return this.container.get('apis').get(name);
+  // }
+
+  get api() {
+    return this.container.get('apis').getAll();
+  }
+
+  get auth() {
+    return this.container.get('auth');
   }
 
   async start() {
@@ -113,9 +161,6 @@ class Strapi {
         await this.load();
       }
 
-      this.app.use(this.router.routes()).use(this.router.allowedMethods());
-
-      // Launch server.
       await this.listen();
 
       return this;
@@ -127,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();
 
@@ -146,6 +181,9 @@ class Strapi {
     }
 
     this.telemetry.destroy();
+    this.cron.destroy();
+
+    process.removeAllListeners();
 
     delete global.strapi;
   }
@@ -165,10 +203,10 @@ class Strapi {
 
   async openAdmin({ isInitialized }) {
     const shouldOpenAdmin =
-      this.config.environment === 'development' &&
-      this.config.get('server.admin.autoOpen', true) !== false;
+      this.config.get('environment') === 'development' &&
+      this.config.get('admin.autoOpen', true) !== false;
 
-    if (shouldOpenAdmin || !isInitialized) {
+    if (shouldOpenAdmin && !isInitialized) {
       await utils.openBrowser(this.config);
     }
   }
@@ -223,7 +261,7 @@ class Strapi {
   }
 
   stop(exitCode = 1) {
-    this.server.destroy();
+    this.destroy();
 
     if (this.config.get('autoReload')) {
       process.send('stop');
@@ -246,7 +284,7 @@ class Strapi {
   }
 
   async loadAPIs() {
-    this.api = await loaders.loadAPIs(this);
+    await loaders.loadAPIs(this);
   }
 
   async loadComponents() {
@@ -254,20 +292,24 @@ class Strapi {
   }
 
   async loadMiddlewares() {
-    this.middleware = await loaders.loadMiddlewares(this);
+    await loaders.loadMiddlewares(this);
   }
 
-  async load() {
-    this.app.use(async (ctx, next) => {
-      if (ctx.request.url === '/_health' && ['HEAD', 'GET'].includes(ctx.request.method)) {
-        ctx.set('strapi', 'You are so French!');
-        ctx.status = 204;
-      } else {
-        await next();
-      }
-    });
+  async loadApp() {
+    this.app = await loaders.loadSrcIndex(this);
+  }
+
+  registerInternalHooks() {
+    this.container.get('hooks').set('strapi::content-types.beforeSync', createAsyncParallelHook());
+    this.container.get('hooks').set('strapi::content-types.afterSync', createAsyncParallelHook());
 
+    this.hook('strapi::content-types.beforeSync').register(draftAndPublishSync.disable);
+    this.hook('strapi::content-types.afterSync').register(draftAndPublishSync.enable);
+  }
+
+  async register() {
     await Promise.all([
+      this.loadApp(),
       this.loadPlugins(),
       this.loadAdmin(),
       this.loadAPIs(),
@@ -276,7 +318,7 @@ class Strapi {
       this.loadPolicies(),
     ]);
 
-    await bootstrap(this);
+    await bootstrap({ strapi: this });
 
     // init webhook runner
     this.webhookRunner = createWebhookRunner({
@@ -285,8 +327,16 @@ class Strapi {
       configuration: this.config.get('server.webhooks', {}),
     });
 
+    this.registerInternalHooks();
+
+    this.telemetry.register();
+
     await this.runLifecyclesFunctions(LIFECYCLES.REGISTER);
 
+    return this;
+  }
+
+  async bootstrap() {
     const contentTypes = [
       coreStoreModel,
       webhookModel,
@@ -299,19 +349,10 @@ class Strapi {
       models: Database.transformContentTypes(contentTypes),
     });
 
-    await this.db.schema.sync();
-
-    this.store = createCoreStore({
-      environment: this.config.environment,
-      db: this.db,
-    });
-
+    this.store = createCoreStore({ db: this.db });
     this.webhookStore = createWebhookStore({ db: this.db });
 
-    await this.startWebhooks();
-
     this.entityValidator = entityValidator;
-
     this.entityService = createEntityService({
       strapi: this,
       db: this.db,
@@ -319,14 +360,57 @@ class Strapi {
       entityValidator: this.entityValidator,
     });
 
-    this.telemetry = createTelemetry(this);
+    const cronTasks = this.config.get('server.cron.tasks', {});
+    this.cron.add(cronTasks);
+
+    this.telemetry.bootstrap();
+
+    let oldContentTypes;
+    if (await this.db.getSchemaConnection().hasTable(coreStoreModel.collectionName)) {
+      oldContentTypes = await this.store.get({
+        type: 'strapi',
+        name: 'content_types',
+        key: 'schema',
+      });
+    }
 
-    // Initialize middlewares.
-    await initializeMiddlewares.call(this);
+    await this.hook('strapi::content-types.beforeSync').call({
+      oldContentTypes,
+      contentTypes: strapi.contentTypes,
+    });
+
+    await this.db.schema.sync();
+
+    await this.hook('strapi::content-types.afterSync').call({
+      oldContentTypes,
+      contentTypes: strapi.contentTypes,
+    });
+
+    await this.store.set({
+      type: 'strapi',
+      name: 'content_types',
+      key: 'schema',
+      value: strapi.contentTypes,
+    });
+
+    await this.startWebhooks();
+
+    await this.server.initMiddlewares();
+    await this.server.initRouting();
 
     await this.runLifecyclesFunctions(LIFECYCLES.BOOTSTRAP);
 
+    this.cron.start();
+
+    return this;
+  }
+
+  async load() {
+    await this.register();
+    await this.bootstrap();
+
     this.isLoaded = true;
+
     return this;
   }
 
@@ -349,7 +433,6 @@ class Strapi {
       }
 
       if (this.config.get('autoReload')) {
-        this.server.destroy();
         process.send('reload');
       }
     };
@@ -357,14 +440,14 @@ class Strapi {
     Object.defineProperty(reload, 'isWatching', {
       configurable: true,
       enumerable: true,
-      set: value => {
+      set(value) {
         // Special state when the reloader is disabled temporarly (see GraphQL plugin example).
         if (state.isWatching === false && value === true) {
           state.shouldReload += 1;
         }
         state.isWatching = value;
       },
-      get: () => {
+      get() {
         return state.isWatching;
       },
     });
@@ -376,24 +459,20 @@ class Strapi {
   }
 
   async runLifecyclesFunctions(lifecycleName) {
-    const execLifecycle = async fn => {
-      if (!fn) {
-        return;
-      }
-
-      return fn();
-    };
-
-    const configPath = `functions.${lifecycleName}`;
-
     // plugins
     await this.container.get('modules')[lifecycleName]();
 
     // user
-    await execLifecycle(this.config.get(configPath));
+    const userLifecycleFunction = this.app && this.app[lifecycleName];
+    if (isFunction(userLifecycleFunction)) {
+      await userLifecycleFunction({ strapi: this });
+    }
 
     // admin
-    await this.admin[lifecycleName]();
+    const adminLifecycleFunction = this.admin && this.admin[lifecycleName];
+    if (isFunction(adminLifecycleFunction)) {
+      await adminLifecycleFunction({ strapi: this });
+    }
   }
 
   getModel(uid) {
@@ -403,7 +482,6 @@ class Strapi {
   /**
    * Binds queries with a specific model
    * @param {string} uid
-   * @returns {}
    */
   query(uid) {
     return this.db.query(uid);