diff --git a/cli.js b/cli.js index 80de01e..2f9b6c6 100644 --- a/cli.js +++ b/cli.js @@ -3,25 +3,26 @@ 'use strict'; const path = require('path'); -const commander = require('commander'); +const { program } = require('commander'); const chalk = require('chalk'); const { version } = require('./package.json'); const fusv = require('.'); -commander +program .usage('[options] ') .version(version, '-v, --version') - .option('-i, --ignore ', 'ignore variables, comma separated') + .option('-i, --ignore ', 'ignore variables, comma separated', '') .parse(process.argv); -function main(args) { - const ignore = commander.ignore ? commander.ignore.split(',') : []; +function main() { + const directories = program.args; + const ignore = program.opts().ignore.split(','); console.log('Looking for unused variables'); let unusedList = []; - const results = Promise.all(args.map(path => executeForPath(path, ignore))); + const results = Promise.all(directories.map(path => executeForPath(path, ignore))); results.catch(error => { console.log(chalk.redBright(error.message)); @@ -70,10 +71,10 @@ const executeForPath = (arg, ignore) => { }); }; -const args = commander.args.filter(arg => typeof arg === 'string'); +const args = program.args.filter(arg => typeof arg === 'string'); if (args.length > 0) { - main(args); + main(); } else { - commander.help(); + program.help(); } diff --git a/package-lock.json b/package-lock.json index db28f7a..e98964a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1316,9 +1316,9 @@ "integrity": "sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==" }, "commander": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz", - "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==" + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-7.1.0.tgz", + "integrity": "sha512-pRxBna3MJe6HKnBGsDyMv8ETbptw3axEdYHoqNh7gu5oDcew8fs0xnivZGm06Ogk8zGAJ9VX+OPEr2GXEQK4dg==" }, "commondir": { "version": "1.0.1", diff --git a/package.json b/package.json index 5915efb..eb07ac7 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "lint": "npm run xo", "test": "npm run xo && npm run test:integration", "test:integration": "node tests/integration.js", + "check": "node ./cli.js tests/ tests2/ -i '$a' ", "xo": "xo" }, "repository": { @@ -29,7 +30,7 @@ "homepage": "https://github.com/XhmikosR/find-unused-sass-variables#readme", "dependencies": { "chalk": "^4.1.0", - "commander": "^5.1.0", + "commander": "^7.1.0", "escape-string-regexp": "^4.0.0", "glob": "^7.1.6", "postcss": "^8.2.6",