@akemona-org/strapi 3.7.0 → 3.7.2

package/bin/strapi.js

@@ -8,9 +8,12 @@ const { Command } = require('commander');
 
 const program = new Command();
 
+// eslint-disable-next-line import/extensions
 const packageJSON = require('../package.json');
 
-const checkCwdIsStrapiApp = name => {
+const strapiPackageName = '@akemona-org/strapi';
+
+const checkCwdIsStrapiApp = (name) => {
   let logErrorAndExit = () => {
     console.log(
       `You need to run ${yellow(
@@ -22,7 +25,7 @@ const checkCwdIsStrapiApp = name => {
 
   try {
     const pkgJSON = require(process.cwd() + '/package.json');
-    if (!_.has(pkgJSON, 'dependencies.strapi')) {
+    if (!_.has(pkgJSON, `dependencies.${strapiPackageName}`)) {
       logErrorAndExit(name);
     }
   } catch (err) {
@@ -30,36 +33,35 @@ const checkCwdIsStrapiApp = name => {
   }
 };
 
-const getLocalScript = name => (...args) => {
-  checkCwdIsStrapiApp(name);
-
-  const cmdPath = resolveCwd.silent(`strapi/lib/commands/${name}`);
-  if (!cmdPath) {
-    console.log(
-      `Error loading the local ${yellow(
-        name
-      )} command. Strapi might not be installed in your "node_modules". You may need to run "npm install"`
-    );
-    process.exit(1);
-  }
+const getLocalScript =
+  (name) =>
+  (...args) => {
+    checkCwdIsStrapiApp(name);
+
+    const cmdPath = resolveCwd.silent(`${strapiPackageName}/lib/commands/${name}`);
+    if (!cmdPath) {
+      console.log(
+        `Error loading the local ${yellow(
+          name
+        )} command. Strapi might not be installed in your "node_modules". You may need to run "npm install"`
+      );
+      process.exit(1);
+    }
 
-  const script = require(cmdPath);
+    const script = require(cmdPath);
 
-  Promise.resolve()
-    .then(() => {
-      return script(...args);
-    })
-    .catch(error => {
-      console.error(`Error while running command ${name}: ${error.message || error}`);
-      process.exit(1);
-    });
-};
+    Promise.resolve()
+      .then(() => {
+        return script(...args);
+      })
+      .catch((error) => {
+        console.error(`Error while running command ${name}: ${error.message || error}`);
+        process.exit(1);
+      });
+  };
 
 // Initial program setup
-program
-  .storeOptionsAsProperties(false)
-  .passCommandToAction(false)
-  .allowUnknownOption(true);
+program.storeOptionsAsProperties(false).passCommandToAction(false).allowUnknownOption(true);
 
 program.helpOption('-h, --help', 'Display help for command');
 program.addHelpCommand('help [command]', 'Display help for command');

package/lib/commands/admin-reset.js

@@ -20,7 +20,7 @@ const promptQuestions = [
  * @param {string} cmdOptions.email - user's email
  * @param {string} cmdOptions.password - user's new password
  */
-module.exports = async function(cmdOptions = {}) {
+module.exports = async function (cmdOptions = {}) {
   const { email, password } = cmdOptions;
 
   if (_.isEmpty(email) && _.isEmpty(password) && process.stdin.isTTY) {

package/lib/commands/configurationDump.js

@@ -9,7 +9,7 @@ const CHUNK_SIZE = 100;
  * Will dump configurations to a file or stdout
  * @param {string} file filepath to use as output
  */
-module.exports = async function({ file: filePath, pretty }) {
+module.exports = async function ({ file: filePath, pretty }) {
   const output = filePath ? fs.createWriteStream(filePath) : process.stdout;
 
   const app = await strapi().load();
@@ -26,8 +26,8 @@ module.exports = async function({ file: filePath, pretty }) {
       .find({ _limit: CHUNK_SIZE, _start: page * CHUNK_SIZE, _sort: 'key' });
 
     results
-      .filter(result => result.key.startsWith('plugin_'))
-      .forEach(result => {
+      .filter((result) => result.key.startsWith('plugin_'))
+      .forEach((result) => {
         exportData.push({
           key: result.key,
           value: result.value,

package/lib/commands/configurationRestore.js

@@ -9,7 +9,7 @@ const strapi = require('../index');
  * @param {string} file filepath to use as input
  * @param {string} strategy import strategy. one of (replace, merge, keep, default: replace)
  */
-module.exports = async function({ file: filePath, strategy = 'replace' }) {
+module.exports = async function ({ file: filePath, strategy = 'replace' }) {
   const input = filePath ? fs.readFileSync(filePath) : await readStdin(process.stdin);
 
   const app = await strapi().load();
@@ -78,7 +78,7 @@ const createImporter = (db, strategy) => {
  * Replace importer. Will replace the keys that already exist and create the new ones
  * @param {Object} db - DatabaseManager instance
  */
-const createReplaceImporter = db => {
+const createReplaceImporter = (db) => {
   const stats = {
     created: 0,
     replaced: 0,
@@ -106,7 +106,7 @@ const createReplaceImporter = db => {
  * Merge importer. Will merge the keys that already exist with their new value and create the new ones
  * @param {Object} db - DatabaseManager instance
  */
-const createMergeImporter = db => {
+const createMergeImporter = (db) => {
   const stats = {
     created: 0,
     merged: 0,
@@ -134,7 +134,7 @@ const createMergeImporter = db => {
  * Merge importer. Will keep the keys that already exist without changing them and create the new ones
  * @param {Object} db - DatabaseManager instance
  */
-const createKeepImporter = db => {
+const createKeepImporter = (db) => {
   const stats = {
     created: 0,
     untouched: 0,

package/lib/commands/console.js

@@ -13,7 +13,7 @@ module.exports = () => {
   app.start(() => {
     const repl = REPL.start(app.config.info.name + ' > ' || 'strapi > '); // eslint-disable-line prefer-template
 
-    repl.on('exit', function(err) {
+    repl.on('exit', function (err) {
       if (err) {
         app.log.error(err);
         process.exit(1);

package/lib/commands/generate.js

@@ -14,6 +14,7 @@ const generate = require('@akemona-org/strapi-generate');
 const { logger } = require('@akemona-org/strapi-utils');
 
 // Local Strapi dependencies.
+// eslint-disable-next-line import/extensions
 const packageJSON = require('../../package.json');
 
 /**

package/lib/commands/install.js

@@ -6,13 +6,13 @@ const ora = require('ora');
 const execa = require('execa');
 const findPackagePath = require('../load/package-path');
 
-module.exports = async plugins => {
+module.exports = async (plugins) => {
   const loader = ora();
   const dir = process.cwd();
 
   const version = require(join(dir, 'package.json')).dependencies.strapi;
 
-  const pluginArgs = plugins.map(name => `strapi-plugin-${name}@${version}`);
+  const pluginArgs = plugins.map((name) => `strapi-plugin-${name}@${version}`);
 
   try {
     loader.start(`Installing dependencies`);
@@ -29,7 +29,7 @@ module.exports = async plugins => {
     // check if rebuild is necessary
     let shouldRebuild = false;
     for (let name of plugins) {
-      let pkgPath = findPackagePath(`strapi-plugin-${name}`);
+      let pkgPath = findPackagePath(`@akemona-org/strapi-plugin-${name}`);
       if (existsSync(join(pkgPath, 'admin', 'src', 'index.js'))) {
         shouldRebuild = true;
       }

package/lib/commands/uninstall.js

@@ -21,13 +21,13 @@ module.exports = async (plugins, { deleteFiles }) => {
   const loader = ora();
   const dir = process.cwd();
 
-  const pluginArgs = plugins.map(name => `strapi-plugin-${name}`);
+  const pluginArgs = plugins.map((name) => `strapi-plugin-${name}`);
 
   try {
     // verify should rebuild before removing the pacakge
     let shouldRebuild = false;
     for (let name of plugins) {
-      let pkgPath = findPackagePath(`strapi-plugin-${name}`);
+      let pkgPath = findPackagePath(`@akemona-org/strapi-plugin-${name}`);
       if (existsSync(join(pkgPath, 'admin', 'src', 'index.js'))) {
         shouldRebuild = true;
       }

package/lib/core/fs.js

@@ -6,7 +6,7 @@ const fse = require('fs-extra');
 /**
  * create strapi fs layer
  */
-module.exports = strapi => {
+module.exports = (strapi) => {
   function normalizePath(optPath) {
     const filePath = Array.isArray(optPath) ? optPath.join('/') : optPath;
 
@@ -23,9 +23,7 @@ module.exports = strapi => {
      */
     writeAppFile(optPath, data) {
       const writePath = normalizePath(optPath);
-      return fse
-        .ensureFile(writePath)
-        .then(() => fse.writeFile(writePath, data));
+      return fse.ensureFile(writePath).then(() => fse.writeFile(writePath, data));
     },
 
     /**

package/lib/core/load-admin.js

@@ -9,8 +9,8 @@ const loadConfig = require('../load/load-config-files');
 const mergeRoutes = (a, b, key) =>
   _.isArray(a) && _.isArray(b) && key === 'routes' ? a.concat(b) : undefined;
 
-module.exports = async strapi => {
-  const adminPath = findPackagePath('strapi-admin');
+module.exports = async (strapi) => {
+  const adminPath = findPackagePath('@akemona-org/strapi-admin');
   const [files, config] = await Promise.all([
     loadFiles(adminPath, '!(config|node_modules|tests|ee|scripts)/*.*(js|json)'),
     loadConfig(adminPath),

package/lib/core/load-apis.js

@@ -10,9 +10,7 @@ module.exports = async ({ dir }) => {
   const apiDir = join(dir, 'api');
 
   if (!existsSync(apiDir)) {
-    throw new Error(
-      `Missing api folder. Please create one in your app root directory`
-    );
+    throw new Error(`Missing api folder. Please create one in your app root directory`);
   }
 
   const apis = await loadFiles(apiDir, '*/!(config)/**/*.*(js|json)');

package/lib/core/load-components.js

@@ -5,7 +5,7 @@ const _ = require('lodash');
 const { exists } = require('fs-extra');
 const loadFiles = require('../load/load-files');
 
-module.exports = async strapi => {
+module.exports = async (strapi) => {
   const componentsDir = join(strapi.dir, 'components');
 
   if (!(await exists(componentsDir))) {
@@ -15,7 +15,7 @@ module.exports = async strapi => {
   const map = await loadFiles(componentsDir, '*/*.*(js|json)');
 
   return Object.keys(map).reduce((acc, category) => {
-    Object.keys(map[category]).forEach(key => {
+    Object.keys(map[category]).forEach((key) => {
       const schema = map[category][key];
 
       const filePath = join(componentsDir, category, schema.__filename__);

package/lib/core/load-extensions.js

@@ -12,7 +12,7 @@ const filePathToPath = require('../load/filepath-to-prop-path');
 /**
  * Loads the extensions folder
  */
-module.exports = async function({ appPath }) {
+module.exports = async function ({ appPath }) {
   const extensionsDir = path.resolve(appPath, 'extensions');
 
   if (!existsSync(extensionsDir)) {
@@ -35,13 +35,13 @@ module.exports = async function({ appPath }) {
 
 const OVERWRITABLE_FOLDERS_GLOB = 'models';
 // returns a list of path and module to overwrite
-const loadOverwrites = async extensionsDir => {
+const loadOverwrites = async (extensionsDir) => {
   const files = await glob(`*/${OVERWRITABLE_FOLDERS_GLOB}/*.*(js|json)`, {
     cwd: extensionsDir,
   });
 
   const overwrites = {};
-  files.forEach(file => {
+  files.forEach((file) => {
     const absolutePath = path.resolve(extensionsDir, file);
 
     // load module
@@ -64,7 +64,7 @@ const loadOverwrites = async extensionsDir => {
     }
   });
 
-  return Object.keys(overwrites).map(strPath => ({
+  return Object.keys(overwrites).map((strPath) => ({
     path: strPath.split('.'),
     mod: overwrites[strPath],
   }));

package/lib/core/load-functions.js

@@ -4,13 +4,13 @@ const fse = require('fs-extra');
 
 const walk = require('./walk');
 
-const loadFunctions = dir => {
+const loadFunctions = (dir) => {
   if (!fse.existsSync(dir)) return {};
 
   return walk(dir, { loader: loadFunction });
 };
 
-const loadFunction = file => {
+const loadFunction = (file) => {
   try {
     return require(file);
   } catch (error) {

package/lib/core/load-hooks.js

@@ -10,7 +10,7 @@ const findPackagePath = require('../load/package-path');
 /**
  * Load hooks
  */
-module.exports = async function({ installedHooks, installedPlugins, appPath }) {
+module.exports = async function ({ installedHooks, installedPlugins, appPath }) {
   let hooks = {};
 
   await Promise.all([
@@ -33,7 +33,7 @@ const loadHooksInDir = async (dir, hooks) => {
     cwd: dir,
   });
 
-  files.forEach(f => {
+  files.forEach((f) => {
     const name = f.split('/')[0];
     mountHooks(name, [path.resolve(dir, f)], hooks);
   });
@@ -43,14 +43,14 @@ const loadLocalHooks = (appPath, hooks) => loadHooksInDir(path.resolve(appPath,
 
 const loadPluginsHooks = async (plugins, hooks) => {
   for (let pluginName of plugins) {
-    const dir = path.resolve(findPackagePath(`strapi-plugin-${pluginName}`), 'hooks');
+    const dir = path.resolve(findPackagePath(`@akemona-org/strapi-plugin-${pluginName}`), 'hooks');
     await loadHooksInDir(dir, hooks);
   }
 };
 
-const loadAdminHooks = async hooks => {
+const loadAdminHooks = async (hooks) => {
   const hooksDir = 'hooks';
-  const dir = path.resolve(findPackagePath('strapi-admin'), hooksDir);
+  const dir = path.resolve(findPackagePath('@akemona-org/strapi-admin'), hooksDir);
   await loadHooksInDir(dir, hooks);
 
   // load ee admin hooks if they exist
@@ -89,7 +89,7 @@ const loadHookDependencies = async (installedHooks, hooks) => {
 };
 
 const mountHooks = (name, files, hooks) => {
-  files.forEach(file => {
+  files.forEach((file) => {
     hooks[name] = hooks[name] || { loaded: false };
 
     let dependencies = [];

package/lib/core/load-middlewares.js

@@ -10,7 +10,7 @@ const findPackagePath = require('../load/package-path');
 /**
  * Load middlewares
  */
-module.exports = async function(strapi) {
+module.exports = async function (strapi) {
   const { installedMiddlewares, installedPlugins, appPath } = strapi.config;
 
   let middlewares = {};
@@ -36,19 +36,19 @@ module.exports = async function(strapi) {
  * Build loader functions
  * @param {*} strapi - strapi instance
  */
-const createLoaders = strapi => {
+const createLoaders = (strapi) => {
   const loadMiddlewaresInDir = async (dir, middlewares) => {
     const files = await glob('*/*(index|defaults).*(js|json)', {
       cwd: dir,
     });
 
-    files.forEach(f => {
+    files.forEach((f) => {
       const name = f.split('/')[0];
       mountMiddleware(name, [path.resolve(dir, f)], middlewares);
     });
   };
 
-  const loadInternalMiddlewares = middlewares =>
+  const loadInternalMiddlewares = (middlewares) =>
     loadMiddlewaresInDir(path.resolve(__dirname, '..', 'middlewares'), middlewares);
 
   const loadLocalMiddlewares = (appPath, middlewares) =>
@@ -56,7 +56,10 @@ const createLoaders = strapi => {
 
   const loadPluginsMiddlewares = async (plugins, middlewares) => {
     for (let pluginName of plugins) {
-      const dir = path.resolve(findPackagePath(`strapi-plugin-${pluginName}`), 'middlewares');
+      const dir = path.resolve(
+        findPackagePath(`@akemona-org/strapi-plugin-${pluginName}`),
+        'middlewares'
+      );
       await loadMiddlewaresInDir(dir, middlewares);
     }
   };
@@ -77,9 +80,9 @@ const createLoaders = strapi => {
     }
   };
 
-  const loadAdminMiddlewares = async middlewares => {
+  const loadAdminMiddlewares = async (middlewares) => {
     const middlewaresDir = 'middlewares';
-    const dir = path.resolve(findPackagePath(`strapi-admin`), middlewaresDir);
+    const dir = path.resolve(findPackagePath(`@akemona-org/strapi-admin`), middlewaresDir);
     await loadMiddlewaresInDir(dir, middlewares);
 
     // load ee admin middlewares if they exist
@@ -101,7 +104,7 @@ const createLoaders = strapi => {
   };
 
   const mountMiddleware = (name, files, middlewares) => {
-    files.forEach(file => {
+    files.forEach((file) => {
       middlewares[name] = middlewares[name] || { loaded: false };
 
       if (_.endsWith(file, 'index.js') && !middlewares[name].load) {

package/lib/core/load-modules.js

@@ -20,7 +20,7 @@ const loadExtensions = require('./load-extensions');
 const loadHooks = require('./load-hooks');
 const loadComponents = require('./load-components');
 
-module.exports = async strapi => {
+module.exports = async (strapi) => {
   const [api, admin, plugins, middlewares, hook, extensions, components] = await Promise.all([
     loadApis(strapi),
     loadAdmin(strapi),

package/lib/core/load-plugins.js

@@ -19,7 +19,7 @@ module.exports = async ({ dir, config }) => {
   if (pluginsIntersection.length > 0) {
     throw new Error(
       `You have some local plugins with the same name as npm installed plugins:\n${pluginsIntersection
-        .map(p => `- ${p}`)
+        .map((p) => `- ${p}`)
         .join('\n')}`
     );
   }
@@ -48,7 +48,7 @@ const loadPlugins = async ({ installedPlugins, config }) => {
   let plugins = {};
 
   for (let plugin of installedPlugins) {
-    const pluginPath = findPackagePath(`strapi-plugin-${plugin}`);
+    const pluginPath = findPackagePath(`@akemona-org/strapi-plugin-${plugin}`);
 
     const files = await loadFiles(
       pluginPath,

package/lib/core/load-policies.js

@@ -5,11 +5,11 @@ const path = require('path');
 const _ = require('lodash');
 const fse = require('fs-extra');
 
-module.exports = dir => {
+module.exports = (dir) => {
   if (!fse.existsSync(dir)) return {};
 
   const root = {};
-  const paths = fse.readdirSync(dir, { withFileTypes: true }).filter(fd => fd.isFile());
+  const paths = fse.readdirSync(dir, { withFileTypes: true }).filter((fd) => fd.isFile());
 
   for (let fd of paths) {
     const { name } = fd;
@@ -23,7 +23,7 @@ module.exports = dir => {
   return root;
 };
 
-const loadPolicy = file => {
+const loadPolicy = (file) => {
   try {
     const policy = require(file);
 

package/lib/hooks/index.js

@@ -2,24 +2,24 @@
 
 const { uniq, difference, get, isUndefined, merge } = require('lodash');
 
-module.exports = async function() {
+module.exports = async function () {
   /** Utils */
 
   const hookConfig = this.config.hook;
 
   // check if a hook exists
-  const hookExists = key => {
+  const hookExists = (key) => {
     return !isUndefined(this.hook[key]);
   };
 
   // check if a hook is enabled
-  const hookEnabled = key => get(hookConfig, ['settings', key, 'enabled'], false) === true;
+  const hookEnabled = (key) => get(hookConfig, ['settings', key, 'enabled'], false) === true;
 
   // list of enabled hooks
   const enableddHook = Object.keys(this.hook).filter(hookEnabled);
 
   // Method to initialize hooks and emit an event.
-  const initialize = hookKey => {
+  const initialize = (hookKey) => {
     if (this.hook[hookKey].loaded === true) return;
 
     const module = this.hook[hookKey].load;
@@ -40,7 +40,7 @@ module.exports = async function() {
           this.hook[hookKey].loaded = true;
           resolve();
         })
-        .catch(err => {
+        .catch((err) => {
           clearTimeout(timeout);
 
           if (err) {
@@ -56,7 +56,7 @@ module.exports = async function() {
 
   // Run beforeInitialize of every hook
   await Promise.all(
-    enableddHook.map(key => {
+    enableddHook.map((key) => {
       const { beforeInitialize } = this.hook[key].load;
       if (typeof beforeInitialize === 'function') {
         return beforeInitialize();
@@ -65,23 +65,17 @@ module.exports = async function() {
   );
 
   // run the initialization of an array of hooks sequentially
-  const initdHookSeq = async hookArr => {
+  const initdHookSeq = async (hookArr) => {
     for (let key of uniq(hookArr)) {
       await initialize(key);
     }
   };
 
-  const hooksBefore = get(hookConfig, 'load.before', [])
-    .filter(hookExists)
-    .filter(hookEnabled);
+  const hooksBefore = get(hookConfig, 'load.before', []).filter(hookExists).filter(hookEnabled);
 
-  const hooksAfter = get(hookConfig, 'load.after', [])
-    .filter(hookExists)
-    .filter(hookEnabled);
+  const hooksAfter = get(hookConfig, 'load.after', []).filter(hookExists).filter(hookEnabled);
 
-  const hooksOrder = get(hookConfig, 'load.order', [])
-    .filter(hookExists)
-    .filter(hookEnabled);
+  const hooksOrder = get(hookConfig, 'load.order', []).filter(hookExists).filter(hookEnabled);
 
   const unspecifieddHook = difference(enableddHook, hooksBefore, hooksOrder, hooksAfter);
 

package/lib/load/check-reserved-filename.js

@@ -14,5 +14,5 @@ const prefixedPaths = [
 ];
 
 module.exports = function checkReservedFilenames(file) {
-  return _.some(prefixedPaths, e => file.indexOf(`config/${e}`) >= 0) ? true : false;
+  return _.some(prefixedPaths, (e) => file.indexOf(`config/${e}`) >= 0) ? true : false;
 };

package/lib/load/filepath-to-prop-path.js

@@ -14,7 +14,7 @@ module.exports = (filePath, useFileNameAsKey = true) => {
     .replace(/(\.settings|\.json|\.js)/g, '')
     .toLowerCase()
     .split('/')
-    .map(p => _.trimStart(p, '.'))
+    .map((p) => _.trimStart(p, '.'))
     .join('.')
     .split('.');
 

package/lib/load/package-path.js

@@ -6,4 +6,4 @@ const path = require('path');
  * Returns the path to a node modules root directory (not the main file path)
  * @param {string} moduleName - name of a node module
  */
-module.exports = moduleName => path.dirname(require.resolve(`${moduleName}/package.json`));
+module.exports = (moduleName) => path.dirname(require.resolve(`${moduleName}/package.json`));

package/lib/middlewares/boom/index.js

@@ -42,7 +42,7 @@ const boomMethods = [
   'gatewayTimeout',
 ];
 
-const formatBoomPayload = boomError => {
+const formatBoomPayload = (boomError) => {
   if (!Boom.isBoom(boomError)) {
     boomError = Boom.boomify(boomError, {
       statusCode: boomError.status || 500,
@@ -58,7 +58,7 @@ const formatBoomPayload = boomError => {
   return { status: output.statusCode, body: output.payload };
 };
 
-module.exports = strapi => {
+module.exports = (strapi) => {
   return {
     /**
      * Initialize the hook
@@ -103,8 +103,8 @@ module.exports = strapi => {
 
     // Custom function to avoid ctx.body repeat
     createResponses() {
-      boomMethods.forEach(method => {
-        strapi.app.response[method] = function(msg, ...rest) {
+      boomMethods.forEach((method) => {
+        strapi.app.response[method] = function (msg, ...rest) {
           const boomError = Boom[method](msg, ...rest) || {};
 
           const { status, body } = formatBoomPayload(boomError);
@@ -119,17 +119,17 @@ module.exports = strapi => {
         this.delegator.method(method);
       });
 
-      strapi.app.response.send = function(data, status = 200) {
+      strapi.app.response.send = function (data, status = 200) {
         this.status = status;
         this.body = data;
       };
 
-      strapi.app.response.created = function(data) {
+      strapi.app.response.created = function (data) {
         this.status = 201;
         this.body = data;
       };
 
-      strapi.app.response.deleted = function(data) {
+      strapi.app.response.deleted = function (data) {
         if (_.isNil(data)) {
           this.status = 204;
         } else {
@@ -138,10 +138,7 @@ module.exports = strapi => {
         }
       };
 
-      this.delegator
-        .method('send')
-        .method('created')
-        .method('deleted');
+      this.delegator.method('send').method('created').method('deleted');
     },
   };
 };