@akemona-org/strapi 3.7.1 → 3.7.2

package/bin/strapi.js

@@ -11,6 +11,8 @@ const program = new Command();
 // eslint-disable-next-line import/extensions
 const packageJSON = require('../package.json');
 
+const strapiPackageName = '@akemona-org/strapi';
+
 const checkCwdIsStrapiApp = (name) => {
   let logErrorAndExit = () => {
     console.log(
@@ -23,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) {
@@ -36,7 +38,7 @@ const getLocalScript =
   (...args) => {
     checkCwdIsStrapiApp(name);
 
-    const cmdPath = resolveCwd.silent(`strapi/lib/commands/${name}`);
+    const cmdPath = resolveCwd.silent(`${strapiPackageName}/lib/commands/${name}`);
     if (!cmdPath) {
       console.log(
         `Error loading the local ${yellow(

package/lib/commands/install.js

@@ -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

@@ -27,7 +27,7 @@ module.exports = async (plugins, { deleteFiles }) => {
     // 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/load-admin.js

@@ -10,7 +10,7 @@ const mergeRoutes = (a, b, key) =>
   _.isArray(a) && _.isArray(b) && key === 'routes' ? a.concat(b) : undefined;
 
 module.exports = async (strapi) => {
-  const adminPath = findPackagePath('strapi-admin');
+  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-hooks.js

@@ -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 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

package/lib/core/load-middlewares.js

@@ -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);
     }
   };
@@ -79,7 +82,7 @@ const createLoaders = (strapi) => {
 
   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

package/lib/core/load-plugins.js

@@ -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/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "3.7.1",
+  "version": "3.7.2",
   "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: MongoDB, MySQL, MariaDB, PostgreSQL, SQLite",
   "homepage": "https://strapi.akemona.com",
   "directories": {
@@ -15,16 +15,16 @@
     "strapi": "./bin/strapi.js"
   },
   "dependencies": {
-    "@akemona-org/strapi-database": "3.7.1",
-    "@akemona-org/strapi-generate": "3.7.1",
-    "@akemona-org/strapi-generate-api": "3.7.1",
-    "@akemona-org/strapi-generate-controller": "3.7.1",
-    "@akemona-org/strapi-generate-model": "3.7.1",
-    "@akemona-org/strapi-generate-new": "3.7.1",
-    "@akemona-org/strapi-generate-plugin": "3.7.1",
-    "@akemona-org/strapi-generate-policy": "3.7.1",
-    "@akemona-org/strapi-generate-service": "3.7.1",
-    "@akemona-org/strapi-utils": "3.7.1",
+    "@akemona-org/strapi-database": "3.7.2",
+    "@akemona-org/strapi-generate": "3.7.2",
+    "@akemona-org/strapi-generate-api": "3.7.2",
+    "@akemona-org/strapi-generate-controller": "3.7.2",
+    "@akemona-org/strapi-generate-model": "3.7.2",
+    "@akemona-org/strapi-generate-new": "3.7.2",
+    "@akemona-org/strapi-generate-plugin": "3.7.2",
+    "@akemona-org/strapi-generate-policy": "3.7.2",
+    "@akemona-org/strapi-generate-service": "3.7.2",
+    "@akemona-org/strapi-utils": "3.7.2",
     "@koa/cors": "^3.0.0",
     "async": "^2.1.2",
     "boom": "^7.3.0",
@@ -139,5 +139,5 @@
     "react",
     "reactjs"
   ],
-  "gitHead": "5545ca033e2fb1aa3afbd546c370972426058525"
+  "gitHead": "4ab59dbae5135819558c6ae27b45a556ff27cf55"
 }