Adds ability to use CLI default expiration AND config default expiration

closes #79
ominestre · Apr 13, 2022 · a086329 · a086329
1 parent 1630463
commit a086329
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/bin/rotten-deps.ts b/src/bin/rotten-deps.ts
@@ -44,10 +44,8 @@ yargs
     requiresArg: false,
   })
   .option('default-expiration', {
-    description: `sets a default grace period for all dependencies. this cannot be used with a configuration file.
-      you should specifiy this there instead`,
+    description: 'sets a default grace period for all dependencies',
     type: 'number',
-    conflicts: 'config-path',
   })
   .option('progress', {
     description: 'displays a progress bar',
@@ -143,6 +141,7 @@ yargs
       new Promise(
         (resolve) => {
           const parsed = JSON.parse(raw);
+          if (defaultExpiration) parsed.defaultExpiration = defaultExpiration;
           resolve(parsed);
         },
       );