@strapi/strapi 4.0.0-next.8 → 4.0.2

package/lib/commands/build.js

@@ -1,23 +1,32 @@
 'use strict';
 const { green } = require('chalk');
 
-// eslint-disable-next-line node/no-extraneous-require
 const strapiAdmin = require('@strapi/admin');
 const { getConfigUrls } = require('@strapi/utils');
-const loadConfiguration = require('../core/app-configuration');
-const ee = require('../utils/ee');
 
+const ee = require('../utils/ee');
 const addSlash = require('../utils/addSlash');
+const strapi = require('../index');
+const getEnabledPlugins = require('../core/loaders/plugins/get-enabled-plugins');
+
 /**
  * `$ strapi build`
  */
-module.exports = async ({ clean, optimization }) => {
+module.exports = async ({ clean, optimization, forceBuild = true }) => {
   const dir = process.cwd();
-  const config = loadConfiguration(dir);
 
-  const { serverUrl, adminPath } = getConfigUrls(config.server, true);
+  const strapiInstance = strapi({
+    dir,
+    autoReload: true,
+    serveAdminPanel: false,
+  });
+
+  const plugins = await getEnabledPlugins(strapiInstance);
+
+  const env = strapiInstance.config.get('environment');
+  const { serverUrl, adminPath } = getConfigUrls(strapiInstance.config, true);
 
-  console.log(`Building your admin UI with ${green(config.environment)} configuration ...`);
+  console.log(`Building your admin UI with ${green(env)} configuration ...`);
 
   if (clean) {
     await strapiAdmin.clean({ dir });
@@ -27,7 +36,9 @@ module.exports = async ({ clean, optimization }) => {
 
   return strapiAdmin
     .build({
+      forceBuild,
       dir,
+      plugins,
       // front end build env is always production for now
       env: 'production',
       optimize: optimization,
@@ -37,7 +48,7 @@ module.exports = async ({ clean, optimization }) => {
       },
     })
     .then(() => {
-      process.exit();
+      console.log('Admin UI built successfully');
     })
     .catch(err => {
       console.error(err);

package/lib/commands/console.js

@@ -10,7 +10,7 @@ module.exports = () => {
   // Now load up the Strapi framework for real.
   const app = strapi();
 
-  app.start(() => {
+  app.start().then(() => {
     const repl = REPL.start(app.config.info.name + ' > ' || 'strapi > '); // eslint-disable-line prefer-template
 
     repl.on('exit', function(err) {

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

@@ -10,6 +10,7 @@ const { getOr } = require('lodash/fp');
 const { createLogger } = require('@strapi/logger');
 const loadConfiguration = require('../core/app-configuration');
 const strapi = require('../index');
+const buildAdmin = require('./build');
 
 /**
  * `$ strapi develop`
@@ -20,23 +21,20 @@ 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 buildExists = fs.existsSync(path.join(dir, 'build'));
-  // Don't run the build process if the admin is in watch mode
-  if (build && !watchAdmin && serveAdminPanel && !buildExists) {
-    try {
-      execa.shellSync('npm run -s build -- --no-optimization', {
-        stdio: 'inherit',
-      });
-    } catch (err) {
-      process.exit(1);
-    }
-  }
-
   try {
     if (cluster.isMaster) {
+      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
+      if (build && !watchAdmin && serveAdminPanel && !buildExists) {
+        try {
+          await buildAdmin({ clean: false, optimization: false, forceBuild: false });
+        } catch (err) {
+          process.exit(1);
+        }
+      }
+
       if (watchAdmin) {
         try {
           execa('npm', ['run', '-s', 'strapi', 'watch-admin', '--', '--browser', browser], {
@@ -51,14 +49,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;
@@ -75,6 +71,7 @@ module.exports = async function({ build, watchAdmin, polling, browser }) {
         serveAdminPanel: watchAdmin ? false : true,
       });
 
+      const adminWatchIgnoreFiles = getOr([], 'admin.watchIgnoreFiles')(config);
       watchFileChanges({
         dir,
         strapiInstance,
@@ -84,10 +81,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.
         }
@@ -122,10 +119,8 @@ function watchFileChanges({ dir, strapiInstance, watchIgnoreFiles, polling }) {
     ignored: [
       /(^|[/\\])\../, // dot files
       /tmp/,
-      '**/admin',
-      '**/admin/**',
-      'extensions/**/admin',
-      'extensions/**/admin/**',
+      '**/src/admin/**',
+      '**/src/plugins/**/admin/',
       '**/documentation',
       '**/documentation/**',
       '**/node_modules',

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

@@ -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('hooks').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/middlewares/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('middlewares').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/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

@@ -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('policies').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/routes/list.js

@@ -0,0 +1,28 @@
+'use strict';
+
+const CLITable = require('cli-table3');
+const chalk = require('chalk');
+const { toUpper } = require('lodash/fp');
+
+const strapi = require('../../index');
+
+module.exports = async function() {
+  const app = await strapi().load();
+
+  const list = app.server.listRoutes();
+
+  const infoTable = new CLITable({
+    head: [chalk.blue('Method'), chalk.blue('Path')],
+    colWidths: [20],
+  });
+
+  list
+    .filter(route => route.methods.length)
+    .forEach(route => {
+      infoTable.push([route.methods.map(toUpper).join('|'), route.path]);
+    });
+
+  console.log(infoTable.toString());
+
+  await app.destroy();
+};

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

@@ -1,33 +1,42 @@
 'use strict';
 
-// eslint-disable-next-line node/no-extraneous-require
 const strapiAdmin = require('@strapi/admin');
-const { getOr } = require('lodash/fp');
 const { getConfigUrls, getAbsoluteServerUrl } = require('@strapi/utils');
-const loadConfiguration = require('../core/app-configuration');
+
 const ee = require('../utils/ee');
 const addSlash = require('../utils/addSlash');
+const strapi = require('../index');
+const getEnabledPlugins = require('../core/loaders/plugins/get-enabled-plugins');
 
 module.exports = async function({ browser }) {
   const dir = process.cwd();
 
-  const config = loadConfiguration(dir);
+  const strapiInstance = strapi({
+    dir,
+    autoReload: true,
+    serveAdminPanel: false,
+  });
+
+  const plugins = await getEnabledPlugins(strapiInstance);
+
+  const { adminPath } = getConfigUrls(strapiInstance.config, true);
 
-  const { adminPath } = getConfigUrls(config.server, true);
+  const adminPort = strapiInstance.config.get('admin.port', 8000);
+  const adminHost = strapiInstance.config.get('admin.host', 'localhost');
+  const adminWatchIgnoreFiles = strapiInstance.config.get('admin.watchIgnoreFiles', []);
 
-  const adminPort = getOr(8000, 'server.admin.port')(config);
-  const adminHost = getOr('localhost', 'server.admin.host')(config);
-  const adminWatchIgnoreFiles = getOr([], 'server.admin.watchIgnoreFiles')(config);
+  const backendURL = getAbsoluteServerUrl(strapiInstance.config, true);
 
   ee({ dir });
 
   strapiAdmin.watchAdmin({
     dir,
+    plugins,
     port: adminPort,
     host: adminHost,
     browser,
     options: {
-      backend: getAbsoluteServerUrl(config, true),
+      backend: backendURL,
       adminPath: addSlash(adminPath),
       watchIgnoreFiles: adminWatchIgnoreFiles,
       features: ee.isEE ? ee.features.getEnabled() : [],

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

@@ -10,18 +10,10 @@ dotenv.config({ path: process.env.ENV_PATH });
 
 process.env.NODE_ENV = process.env.NODE_ENV || 'development';
 
-const getPrefixedDeps = require('../../utils/get-prefixed-dependencies');
 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',
@@ -31,14 +23,10 @@ const defaultConfig = {
     admin: { autoOpen: false },
   },
   admin: {},
-  middleware: {
-    timeout: 1000,
-    load: {
-      before: ['responseTime', 'logger', 'cors', 'responses', 'gzip'],
-      order: [],
-      after: ['parser', 'router'],
+  api: {
+    rest: {
+      prefix: '/api',
     },
-    settings: {},
   },
 };
 
@@ -51,8 +39,6 @@ module.exports = (dir, initialConfig = {}) => {
 
   const rootConfig = {
     launchedAt: Date.now(),
-    appPath: dir,
-    paths: CONFIG_PATHS,
     serveAdminPanel,
     autoReload,
     environment: process.env.NODE_ENV,
@@ -62,8 +48,6 @@ module.exports = (dir, initialConfig = {}) => {
       ...pkgJSON,
       strapi: strapiVersion,
     },
-    functions: loadFunction(path.join(configDir, 'functions')),
-    installedMiddlewares: getPrefixedDeps('@strapi/middleware', pkgJSON),
   };
 
   const baseConfig = omit('plugins', loadConfigDir(configDir)); // plugin config will be loaded later

package/lib/core/bootstrap.js

@@ -1,104 +1,12 @@
 'use strict';
 
-const _ = require('lodash');
-const { toLower, kebabCase } = require('lodash/fp');
 const { getConfigUrls } = require('@strapi/utils');
-const pluralize = require('pluralize');
 
-const { createCoreApi } = require('../core-api');
-
-// TODO: function to be moved next to where the api will be loaded
-const validateContentTypesUnicity = schemas => {
-  const names = [];
-  schemas.forEach(schema => {
-    if (schema.info.singularName) {
-      const singularName = kebabCase(schema.info.singularName);
-      if (names.includes(singularName)) {
-        throw new Error(`The singular name "${schema.info.singularName}" should be unique`);
-      }
-      names.push(singularName);
-    }
-    if (schema.info.pluralName) {
-      const pluralName = kebabCase(schema.info.pluralName);
-      if (names.includes(pluralName)) {
-        throw new Error(`The plural name "${schema.info.pluralName}" should be unique`);
-      }
-      names.push(pluralName);
-    }
-  });
-};
-
-module.exports = function(strapi) {
-  // validate Content-Types unicity
-  const allApisSchemas = Object.values(strapi.api).flatMap(api => Object.values(api.models));
-  validateContentTypesUnicity(allApisSchemas);
-
-  // set default services and default controllers
-  for (const apiName in strapi.api) {
-    const api = strapi.api[apiName];
-    for (const modelName in api.models) {
-      const model = api.models[modelName];
-      model.info.displayName = model.info.displayName || model.info.name;
-      model.info.singularName = model.info.singularName || modelName;
-      model.info.pluralName = model.info.pluralName || pluralize(modelName);
-
-      strapi.container.get('content-types').add(`api::${apiName}`, {
-        [modelName]: { schema: model, actions: model.actions, lifecycles: model.lifecycles },
-      });
-
-      const contentType = strapi.contentType(`api::${apiName}.${modelName}`);
-
-      const { service, controller } = createCoreApi({ model: contentType, api, strapi });
-      _.set(strapi.api[apiName], ['services', modelName], service);
-      _.set(strapi.api[apiName], ['controllers', modelName], controller);
-    }
-  }
-
-  // Set user's controllers.
-  strapi.controllers = Object.keys(strapi.api || []).reduce((acc, apiName) => {
-    strapi.container.get('controllers').add(`api::${apiName}`, strapi.api[apiName].controllers);
-    for (let controllerName in strapi.api[apiName].controllers) {
-      let controller = strapi.api[apiName].controllers[controllerName];
-      acc[controllerName] = controller;
-    }
-
-    return acc;
-  }, {});
-
-  // Set routes.
-  strapi.config.routes = Object.keys(strapi.api || []).reduce((acc, key) => {
-    return acc.concat(_.get(strapi.api[key], 'config.routes') || {});
-  }, []);
-
-  // TODO: delete v3 code
-  _.forEach(strapi.plugins, plugin => {
-    _.forEach(plugin.middlewares, (middleware, middlewareUID) => {
-      const middlewareName = toLower(middlewareUID.split('.')[1]);
-      strapi.middleware[middlewareName] = middleware;
-    });
-  });
-
-  // Preset config in alphabetical order.
-  strapi.config.middleware.settings = Object.keys(strapi.middleware).reduce((acc, current) => {
-    // Try to find the settings in the current environment, then in the main configurations.
-    const currentSettings = _.merge(
-      _.cloneDeep(_.get(strapi.middleware[current], ['defaults', current], {})),
-      strapi.config.get(['middleware', 'settings', current], {})
-    );
-
-    acc[current] = !_.isObject(currentSettings) ? {} : currentSettings;
-
-    // Ensure that enabled key exist by forcing to false.
-    _.defaults(acc[current], { enabled: false });
-
-    return acc;
-  }, {});
-
-  // default settings
+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;
@@ -107,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/content-type/index.js

@@ -2,7 +2,7 @@
 
 const { cloneDeep } = require('lodash/fp');
 const _ = require('lodash');
-const { hasDraftAndPublish } = require('@strapi/utils').contentTypes;
+const { hasDraftAndPublish, getPrivateAttributes } = require('@strapi/utils').contentTypes;
 const {
   CREATED_AT_ATTRIBUTE,
   UPDATED_AT_ATTRIBUTE,
@@ -60,9 +60,7 @@ const createContentType = (uid, definition) => {
 
   Object.defineProperty(schema, 'privateAttributes', {
     get() {
-      // FIXME: to fix
-      // return strapi.getModel(model.uid).privateAttributes;
-      return [];
+      return getPrivateAttributes(schema);
     },
   });
 
@@ -70,12 +68,10 @@ const createContentType = (uid, definition) => {
   Object.assign(schema.attributes, {
     [CREATED_AT_ATTRIBUTE]: {
       type: 'datetime',
-      default: () => new Date(),
     },
     // TODO: handle on edit set to new date
     [UPDATED_AT_ATTRIBUTE]: {
       type: 'datetime',
-      default: () => new Date(),
     },
   });
 
@@ -112,11 +108,9 @@ const createContentType = (uid, definition) => {
     private: isPrivate,
   };
 
-  return {
-    ...schema,
-    actions: actions,
-    lifecycles: lifecycles,
-  };
+  Object.assign(schema, { actions, lifecycles });
+
+  return schema;
 };
 
 const getGlobalId = (model, modelName, prefix) => {