@strapi/strapi 4.0.0 → 4.0.4

package/README.md

@@ -84,8 +84,8 @@ Complete installation requirements can be found in the documentation under <a hr
 
 **Database:**
 
-- MySQL >= 5.6
-- MariaDB >= 10.1
+- MySQL >= 5.7.8
+- MariaDB >= 10.2.7
 - PostgreSQL >= 10
 - SQLite >= 3
 

package/bin/strapi.js

@@ -133,7 +133,6 @@ program
 
 program
   .command('build')
-  .option('--clean', 'Remove the build and .cache folders', false)
   .option('--no-optimization', 'Build the Administration without assets optimization')
   .description('Builds the strapi admin app')
   .action(getLocalScript('build'));
@@ -213,4 +212,9 @@ program
   .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/commands/build.js

@@ -12,7 +12,7 @@ const getEnabledPlugins = require('../core/loaders/plugins/get-enabled-plugins')
 /**
  * `$ strapi build`
  */
-module.exports = async ({ clean, optimization }) => {
+module.exports = async ({ optimization, forceBuild = true }) => {
   const dir = process.cwd();
 
   const strapiInstance = strapi({
@@ -28,14 +28,14 @@ module.exports = async ({ clean, optimization }) => {
 
   console.log(`Building your admin UI with ${green(env)} configuration ...`);
 
-  if (clean) {
-    await strapiAdmin.clean({ dir });
-  }
+  // Always remove the .cache and build folders
+  await strapiAdmin.clean({ dir });
 
   ee({ dir });
 
   return strapiAdmin
     .build({
+      forceBuild,
       dir,
       plugins,
       // front end build env is always production for now
@@ -47,7 +47,7 @@ module.exports = async ({ clean, optimization }) => {
       },
     })
     .then(() => {
-      process.exit();
+      console.log('Admin UI built successfully');
     })
     .catch(err => {
       console.error(err);

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,24 +21,20 @@ module.exports = async function({ build, watchAdmin, polling, browser }) {
   const config = loadConfiguration(dir);
   const logger = createLogger(config.logger, {});
 
-  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.sync('npm run -s build -- --no-optimization', {
-        stdio: 'inherit',
-        shell: true,
-      });
-    } 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({ optimization: false, forceBuild: false });
+        } catch (err) {
+          process.exit(1);
+        }
+      }
+
       if (watchAdmin) {
         try {
           execa('npm', ['run', '-s', 'strapi', 'watch-admin', '--', '--browser', browser], {
@@ -74,6 +71,7 @@ module.exports = async function({ build, watchAdmin, polling, browser }) {
         serveAdminPanel: watchAdmin ? false : true,
       });
 
+      const adminWatchIgnoreFiles = getOr([], 'admin.watchIgnoreFiles')(config);
       watchFileChanges({
         dir,
         strapiInstance,
@@ -121,15 +119,15 @@ function watchFileChanges({ dir, strapiInstance, watchIgnoreFiles, polling }) {
     ignored: [
       /(^|[/\\])\../, // dot files
       /tmp/,
-      'admin',
-      'admin/**',
-      'src/extensions/**/admin',
-      'src/extensions/**/admin/**',
+      '**/src/admin/**',
+      '**/src/plugins/**/admin/',
       '**/documentation',
       '**/documentation/**',
       '**/node_modules',
       '**/node_modules/**',
       '**/plugins.json',
+      '**/build',
+      '**/build/**',
       '**/index.html',
       '**/public',
       '**/public/**',

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

@@ -5,7 +5,7 @@ const { statSync, existsSync } = require('fs');
 const _ = require('lodash');
 const { get, has, pick, pickBy, defaultsDeep, map, prop, pipe } = require('lodash/fp');
 const { isKebabCase } = require('@strapi/utils');
-const loadConfigFile = require('../../app-configuration/load-config-file');
+const getUserPluginsConfig = require('./get-user-plugins-config');
 
 const isStrapiPlugin = info => get('strapi.kind', info) === 'plugin';
 const INTERNAL_PLUGINS = [
@@ -60,7 +60,12 @@ const getEnabledPlugins = async strapi => {
   const installedPlugins = {};
   for (const dep in strapi.config.get('info.dependencies', {})) {
     const packagePath = join(dep, 'package.json');
-    const packageInfo = require(packagePath);
+    let packageInfo;
+    try {
+      packageInfo = require(packagePath);
+    } catch {
+      continue;
+    }
 
     if (isStrapiPlugin(packageInfo)) {
       validatePluginName(packageInfo.strapi.name);
@@ -72,10 +77,7 @@ const getEnabledPlugins = async strapi => {
   }
 
   const declaredPlugins = {};
-  const userPluginConfigPath = join(strapi.dirs.config, 'plugins.js');
-  const userPluginsConfig = existsSync(userPluginConfigPath)
-    ? loadConfigFile(userPluginConfigPath)
-    : {};
+  const userPluginsConfig = await getUserPluginsConfig();
 
   _.forEach(userPluginsConfig, (declaration, pluginName) => {
     validatePluginName(pluginName);

package/lib/core/loaders/plugins/get-user-plugins-config.js

@@ -0,0 +1,37 @@
+'use strict';
+
+const { join } = require('path');
+const fse = require('fs-extra');
+const { merge } = require('lodash/fp');
+const loadConfigFile = require('../../app-configuration/load-config-file');
+
+/**
+ * Return user defined plugins' config
+ * first load config from `config/plugins.js`
+ * and then merge config from `config/env/{env}/plugins.js`
+ * @return {Promise<{}>}
+ */
+const getUserPluginsConfig = async () => {
+  const globalUserConfigPath = join(strapi.dirs.config, 'plugins.js');
+  const currentEnvUserConfigPath = join(
+    strapi.dirs.config,
+    'env',
+    process.env.NODE_ENV,
+    'plugins.js'
+  );
+  let config = {};
+
+  // assign global user config if exists
+  if (await fse.pathExists(globalUserConfigPath)) {
+    config = loadConfigFile(globalUserConfigPath);
+  }
+
+  // and merge user config by environment if exists
+  if (await fse.pathExists(currentEnvUserConfigPath)) {
+    config = merge(config, loadConfigFile(currentEnvUserConfigPath));
+  }
+
+  return config;
+};
+
+module.exports = getUserPluginsConfig;

package/lib/core/loaders/plugins/index.js

@@ -7,6 +7,7 @@ const { env } = require('@strapi/utils');
 const loadConfigFile = require('../../app-configuration/load-config-file');
 const loadFiles = require('../../../load/load-files');
 const getEnabledPlugins = require('./get-enabled-plugins');
+const getUserPluginsConfig = require('./get-user-plugins-config');
 
 const defaultPlugin = {
   bootstrap() {},
@@ -66,10 +67,7 @@ const formatContentTypes = plugins => {
 };
 
 const applyUserConfig = async plugins => {
-  const userPluginConfigPath = join(strapi.dirs.config, 'plugins.js');
-  const userPluginsConfig = (await fse.pathExists(userPluginConfigPath))
-    ? loadConfigFile(userPluginConfigPath)
-    : {};
+  const userPluginsConfig = await getUserPluginsConfig();
 
   for (const pluginName in plugins) {
     const plugin = plugins[pluginName];

package/lib/core-api/service/pagination.js

@@ -13,18 +13,13 @@ const getLimitConfigDefaults = () => ({
 });
 
 /**
- * if there is max limit set and limit exceeds this number, return configured max limit
+ * Should maxLimit be used as the limit or not
  * @param {number} limit - limit you want to cap
  * @param {number?} maxLimit - maxlimit used has capping
- * @returns {number}
+ * @returns {boolean}
  */
-const applyMaxLimit = (limit, maxLimit) => {
-  if (maxLimit && (limit === -1 || limit > maxLimit)) {
-    return maxLimit;
-  }
-
-  return limit;
-};
+const shouldApplyMaxLimit = (limit, maxLimit = null, { isPagedPagination = false } = {}) =>
+  (!isPagedPagination && limit === -1) || (maxLimit && limit > maxLimit);
 
 const shouldCount = params => {
   if (has('pagination.withCount', params)) {
@@ -81,17 +76,17 @@ const getPaginationInfo = params => {
 
     return {
       page: Math.max(1, toNumber(pagination.page || 1)),
-      pageSize: applyMaxLimit(pageSize, maxLimit),
+      pageSize: shouldApplyMaxLimit(pageSize, maxLimit, { isPagedPagination: true })
+        ? maxLimit
+        : Math.max(1, pageSize),
     };
   }
 
-  const limit = isUndefined(pagination.limit)
-    ? defaultLimit
-    : Math.max(1, toNumber(pagination.limit));
+  const limit = isUndefined(pagination.limit) ? defaultLimit : toNumber(pagination.limit);
 
   return {
     start: Math.max(0, toNumber(pagination.start || 0)),
-    limit: applyMaxLimit(limit, maxLimit),
+    limit: shouldApplyMaxLimit(limit, maxLimit) ? maxLimit || -1 : Math.max(1, limit),
   };
 };
 

package/lib/middlewares/public/index.js

@@ -89,35 +89,5 @@ module.exports = (config, { strapi }) => {
     ]);
   }
 
-  if (!strapi.config.serveAdminPanel) return async (ctx, next) => next();
-
-  const buildDir = path.resolve(strapi.dirs.root, 'build');
-  const serveAdmin = async (ctx, next) => {
-    await next();
-
-    if (ctx.method !== 'HEAD' && ctx.method !== 'GET') {
-      return;
-    }
-
-    if (ctx.body != null || ctx.status !== 404) {
-      return;
-    }
-
-    ctx.type = 'html';
-    ctx.body = fs.createReadStream(path.join(buildDir + '/index.html'));
-  };
-
-  strapi.server.routes([
-    {
-      method: 'GET',
-      path: `${strapi.config.admin.path}/:path*`,
-      handler: [
-        serveAdmin,
-        serveStatic(buildDir, { maxage: maxAge, defer: false, index: 'index.html' }),
-      ],
-      config: { auth: false },
-    },
-  ]);
-
   return null;
 };

package/lib/services/entity-validator/validators.js

@@ -104,7 +104,9 @@ const addMaxFloatValidator = (validator, { attr }) =>
  * @returns {StringSchema}
  */
 const addStringRegexValidator = (validator, { attr }) =>
-  _.isUndefined(attr.regex) ? validator : validator.matches(new RegExp(attr.regex));
+  _.isUndefined(attr.regex)
+    ? validator
+    : validator.matches(new RegExp(attr.regex), { excludeEmptyString: !attr.required });
 
 /**
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/strapi",
-  "version": "4.0.0",
+  "version": "4.0.4",
   "description": "An open source headless CMS solution to create and manage your own API. It provides a powerful dashboard and features to make your life easier. Databases supported: MySQL, MariaDB, PostgreSQL, SQLite",
   "keywords": [
     "strapi",
@@ -74,27 +74,28 @@
     "bin": "./bin"
   },
   "scripts": {
-    "postinstall": "node lib/utils/success.js"
+    "postinstall": "node lib/utils/success.js",
+    "test:unit": "jest --verbose"
   },
   "dependencies": {
     "@koa/cors": "3.1.0",
     "@koa/router": "10.1.1",
-    "@strapi/admin": "4.0.0",
-    "@strapi/database": "4.0.0",
-    "@strapi/generate-new": "4.0.0",
-    "@strapi/generators": "4.0.0",
-    "@strapi/logger": "4.0.0",
-    "@strapi/plugin-content-manager": "4.0.0",
-    "@strapi/plugin-content-type-builder": "4.0.0",
-    "@strapi/plugin-email": "4.0.0",
-    "@strapi/plugin-upload": "4.0.0",
-    "@strapi/utils": "4.0.0",
+    "@strapi/admin": "4.0.4",
+    "@strapi/database": "4.0.4",
+    "@strapi/generate-new": "4.0.4",
+    "@strapi/generators": "4.0.4",
+    "@strapi/logger": "4.0.4",
+    "@strapi/plugin-content-manager": "4.0.4",
+    "@strapi/plugin-content-type-builder": "4.0.4",
+    "@strapi/plugin-email": "4.0.4",
+    "@strapi/plugin-upload": "4.0.4",
+    "@strapi/utils": "4.0.4",
     "bcryptjs": "2.4.3",
     "boxen": "5.1.2",
     "chalk": "4.1.2",
     "chokidar": "3.5.2",
     "ci-info": "3.2.0",
-    "cli-table3": "0.6.0",
+    "cli-table3": "0.6.1",
     "commander": "8.2.0",
     "configstore": "5.0.1",
     "debug": "4.3.2",
@@ -131,8 +132,8 @@
     "supertest": "^6.1.6"
   },
   "engines": {
-    "node": ">=12.x.x <=16.x.x",
+    "node": ">=12.22.0 <=16.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "b181702f0202b2c6d645d42b195a831f25cd0b03"
+  "gitHead": "d81919ac2272948b3f5d3b25a4cf8cc7b6994460"
 }