wip

Author: alexandrebodin

packages/strapi-database/lib/database-manager.js

@@ -9,8 +9,8 @@ class DatabaseManager {
   constructor(strapi) {
     this.strapi = strapi;
 
-    // throw if connections and schemas aren't arrays
     this.initialized = false;
+
     this.queries = new Map();
     this.connectors = new Map();
     this.models = new Map();

packages/strapi-database/lib/naming.js

@@ -12,10 +12,7 @@ const parseType = require('./parse-type');
 
 module.exports = {
   cli: require('./cli'),
-  commander: require('./commander'),
   finder: require('./finder'),
-  joijson: require('./joi-json'),
-  json: require('./json'),
   knex: require('./knex'),
   logger: require('./logger'),
   models: require('./models'),

packages/strapi-utils/lib/commander.js

@@ -18,9 +18,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "commander": "^2.20.0",
     "date-fns": "^2.8.1",
-    "joi-json": "^2.1.0",
     "knex": "^0.16.5",
     "lodash": "^4.17.11",
     "pino": "^4.7.1",

packages/strapi-utils/lib/index.js

@@ -4,10 +4,18 @@
 const _ = require('lodash');
 const resolveCwd = require('resolve-cwd');
 const { yellow } = require('chalk');
+const program = require('commander');
 
-const program = require('strapi-utils').commander;
 const packageJSON = require('../package.json');
 
+// Allow us to display `help()`, but omit the wildcard (`*`) command.
+program.Command.prototype.usageMinusWildcard = program.usageMinusWildcard = () => {
+  program.commands = _.reject(program.commands, {
+    _name: '*',
+  });
+  program.help();
+};
+
 const checkCwdIsStrapiApp = name => {
   let logErrorAndExit = () => {
     console.log(

packages/strapi-utils/lib/joi-json.js

@@ -8,9 +8,7 @@
 const _ = require('lodash');
 
 // Strapi utilities.
-const finder = require('strapi-utils').finder;
-const regex = require('strapi-utils').regex;
-const policyUtils = require('strapi-utils').policy;
+const { finder, regex, policy: policyUtils } = require('strapi-utils');
 
 module.exports = strapi =>
   function routerChecker(value, endpoint, plugin) {

packages/strapi-utils/lib/json.js

@@ -18,6 +18,7 @@
     "chalk": "^2.4.1",
     "chokidar": "^2.1.2",
     "cli-table3": "^0.5.1",
+    "commander": "^2.20.0",
     "cross-spawn": "^6.0.5",
     "delegates": "^1.0.0",
     "execa": "^1.0.0",