@strapi/strapi 4.0.0-next.9 → 4.0.0

package/lib/commands/develop.js

@@ -20,15 +20,16 @@ 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
   if (build && !watchAdmin && serveAdminPanel && !buildExists) {
     try {
-      execa.shellSync('npm run -s build -- --no-optimization', {
+      execa.sync('npm run -s build -- --no-optimization', {
         stdio: 'inherit',
+        shell: true,
       });
     } catch (err) {
       process.exit(1);
@@ -51,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;
@@ -84,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.
         }
@@ -122,10 +121,10 @@ function watchFileChanges({ dir, strapiInstance, watchIgnoreFiles, polling }) {
     ignored: [
       /(^|[/\\])\../, // dot files
       /tmp/,
-      '**/admin',
-      '**/admin/**',
-      'extensions/**/admin',
-      'extensions/**/admin/**',
+      'admin',
+      'admin/**',
+      'src/extensions/**/admin',
+      'src/extensions/**/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,43 +1,12 @@
 'use strict';
 
-const _ = require('lodash');
 const { getConfigUrls } = require('@strapi/utils');
 
-module.exports = function(strapi) {
-  // TODO: delete v3 code
-  _.forEach(strapi.api, api => {
-    _.forEach(api.middlewares, (middleware, middlewareName) => {
-      strapi.middleware[middlewareName] = middleware;
-    });
-  });
-
-  _.forEach(strapi.plugins, plugin => {
-    _.forEach(plugin.middlewares, (middleware, middlewareName) => {
-      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;
@@ -46,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

@@ -68,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(),
     },
   });
 
@@ -110,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) => {

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

@@ -37,21 +37,21 @@ const createModule = (namespace, rawModule, strapi) => {
         throw new Error(`Bootstrap for ${namespace} has already been called`);
       }
       called.bootstrap = true;
-      await (rawModule.bootstrap && rawModule.bootstrap(strapi));
+      await (rawModule.bootstrap && rawModule.bootstrap({ strapi }));
     },
     async register() {
       if (called.register) {
         throw new Error(`Register for ${namespace} has already been called`);
       }
       called.register = true;
-      await (rawModule.register && rawModule.register(strapi));
+      await (rawModule.register && rawModule.register({ strapi }));
     },
     async destroy() {
       if (called.destroy) {
         throw new Error(`Destroy for ${namespace} has already been called`);
       }
       called.destroy = true;
-      await (rawModule.destroy && rawModule.destroy(strapi));
+      await (rawModule.destroy && rawModule.destroy({ strapi }));
     },
     load() {
       strapi.container.get('content-types').add(namespace, rawModule.contentTypes);
@@ -61,9 +61,11 @@ 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,
-    config(path) {
-      return strapi.container.get('config').get(`${uidToPath(namespace)}.${path}`);
+    get routes() {
+      return rawModule.routes;
+    },
+    config(path, defaultValue) {
+      return strapi.container.get('config').get(`${uidToPath(namespace)}.${path}`, defaultValue);
     },
     contentType(ctName) {
       return strapi.container.get('content-types').get(`${namespace}.${ctName}`);

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: {},
@@ -14,20 +16,18 @@ const DEFAULT_CONTENT_TYPE = {
 };
 
 module.exports = async strapi => {
-  const apisDir = join(strapi.dir, 'api');
-
-  if (!existsSync(apisDir)) {
-    throw new Error(`Missing api folder. Please create one in your app root directory`);
+  if (!existsSync(strapi.dirs.api)) {
+    throw new Error('Missing api folder. Please create one at `./src/api`');
   }
 
-  const apisFDs = await fse.readdir(apisDir, { withFileTypes: true });
+  const apisFDs = await fse.readdir(strapi.dirs.api, { withFileTypes: true });
   const apis = {};
 
   // only load folders
   for (const apiFD of apisFDs) {
     if (apiFD.isDirectory()) {
       const apiName = normalizeName(apiFD.name);
-      const api = await loadAPI(join(apisDir, apiFD.name));
+      const api = await loadAPI(join(strapi.dirs.api, apiFD.name));
 
       apis[apiName] = api;
     }

package/lib/core/loaders/components.js

@@ -6,19 +6,17 @@ const { pathExists } = require('fs-extra');
 const loadFiles = require('../../load/load-files');
 
 module.exports = async strapi => {
-  const componentsDir = join(strapi.dir, 'components');
-
-  if (!(await pathExists(componentsDir))) {
+  if (!(await pathExists(strapi.dirs.components))) {
     return {};
   }
 
-  const map = await loadFiles(componentsDir, '*/*.*(js|json)');
+  const map = await loadFiles(strapi.dirs.components, '*/*.*(js|json)');
 
   return Object.keys(map).reduce((acc, category) => {
     Object.keys(map[category]).forEach(key => {
       const schema = map[category][key];
 
-      const filePath = join(componentsDir, category, schema.__filename__);
+      const filePath = join(strapi.dirs.components, category, schema.__filename__);
 
       if (!schema.collectionName) {
         return strapi.stopWithError(

package/lib/core/loaders/index.js

@@ -1,6 +1,7 @@
 'use strict';
 
 module.exports = {
+  loadSrcIndex: require('./src-index'),
   loadAPIs: require('./apis'),
   loadMiddlewares: require('./middlewares'),
   loadComponents: require('./components'),