fix(options): fix CLI options

nfroidure · May 26, 2022 · 6f5fc2f · 6f5fc2f
1 parent 03b480e
commit 6f5fc2f
Show file tree

Hide file tree

Showing 4 changed files with 194 additions and 105 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -53,18 +53,17 @@
   },
   "homepage": "https://github.com/nfroidure/metapak#readme",
   "dependencies": {
-    "bluebird": "^3.7.2",
     "chalk": "^4.1.0",
-    "commander": "^7.2.0",
+    "commander": "^9.2.0",
     "debug": "^4.3.4",
     "deep-strict-equal": "^0.2.0",
     "diff": "^5.1.0",
-    "glob": "^7.1.6",
-    "knifecycle": "^12.0.2",
+    "glob": "^8.0.3",
+    "knifecycle": "^12.0.4",
     "mkdirp": "^1.0.4",
     "pkg-dir": "^5.0.0",
     "sort-keys": "^4.2.0",
-    "yerror": "^6.0.1"
+    "yerror": "^6.0.2"
   },
   "devDependencies": {
     "commitizen": "^4.2.4",
@@ -73,7 +72,7 @@
     "cz-conventional-changelog": "^3.3.0",
     "eslint": "^8.16.0",
     "eslint-plugin-prettier": "^4.0.0",
-    "metapak-nfroidure": "11.2.0",
+    "metapak-nfroidure": "11.2.1",
     "mocha": "^10.0.0",
     "nyc": "^15.1.0",
     "prettier": "^2.6.2",

diff --git a/src/metapak.js b/src/metapak.js
@@ -1,5 +1,4 @@
 const path = require('path');
-const Promise = require('bluebird');
 const YError = require('yerror').default;
 const { autoService } = require('knifecycle');
 
@@ -185,40 +184,44 @@ function _reorderMetapakModulesNames(
   return metapakModulesNames;
 }
 
-function _getPackageMetapakModulesConfigs(
+async function _getPackageMetapakModulesConfigs(
   { fs, log },
   metapakModulesSequence,
   metapackConfigsSequence,
   resolveModule,
   packageConf
 ) {
-  return Promise.props(
-    metapakModulesSequence.reduce(
-      (metapakModulesConfigs, metapakModuleName) => {
-        const modulePath = path.join(
-          resolveModule(metapakModuleName, packageConf),
-          'src'
-        );
+  const allModulesConfigs = metapakModulesSequence.reduce(
+    (metapakModulesConfigs, metapakModuleName) => {
+      const modulePath = path.join(
+        resolveModule(metapakModuleName, packageConf),
+        'src'
+      );
 
-        metapakModulesConfigs[metapakModuleName] = fs
-          .readdirAsync(modulePath)
-          .then((metapakModuleConfigs) => {
-            metapakModuleConfigs = metapackConfigsSequence.filter(
-              (metapakModuleConfig) =>
-                metapakModuleConfigs.includes(metapakModuleConfig)
-            );
-            log(
-              'debug',
-              'Found configs for "' + metapakModuleName + '":',
-              metapakModuleConfigs
-            );
-            return metapakModuleConfigs;
-          });
-        return metapakModulesConfigs;
-      },
-      {}
-    )
+      metapakModulesConfigs[metapakModuleName] = fs
+        .readdirAsync(modulePath)
+        .then((metapakModuleConfigs) => {
+          metapakModuleConfigs = metapackConfigsSequence.filter(
+            (metapakModuleConfig) =>
+              metapakModuleConfigs.includes(metapakModuleConfig)
+          );
+          log(
+            'debug',
+            'Found configs for "' + metapakModuleName + '":',
+            metapakModuleConfigs
+          );
+          return metapakModuleConfigs;
+        });
+      return metapakModulesConfigs;
+    },
+    {}
   );
+  return await Object.keys(allModulesConfigs).reduce(async (p, key) => {
+    return {
+      ...(await p),
+      [key]: await allModulesConfigs[key],
+    };
+  }, Promise.resolve({}));
 }
 
 function _awaitPromisesFullfil(promises) {