retire 3.1.2 → 3.2.0

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [3.2.0]
+
+- Add `--ext` to allow specifying other file extensions
+
+## [3.1.3]
+
+- Fixes a typo
+
 ## [3.1.2]
 
 - Remove some unused variables and tmp files

package/README.md

@@ -30,7 +30,7 @@ Options:
   --jsrepo <path|url>      Local or internal version of repo
   --noderepo <path|url>    Local or internal version of repo
   --cachedir <path>        Path to use for local cache instead of /tmp/.retire-cache
-  --proxy <url>            Proxy url (http://some.sever:8080)
+  --proxy <url>            Proxy url (http://some.host:8080)
   --outputformat <format>  Valid formats: text, json, jsonsimple, depcheck (experimental), cyclonedx and cyclonedxJSON
   --outputpath <path>      File to which output should be written
   --ignore <paths>         Comma delimited list of paths to ignore
@@ -39,6 +39,7 @@ Options:
   --exitwith <code>        Custom exit code (default: 13) when vulnerabilities are found
   --colors                 Enable color output (console output only)
   --insecure               Enable fetching remote jsrepo/noderepo files from hosts using an insecure or self-signed SSL (TLS) certificate
+  --ext <extensions>       Comman separated list of file extensions for javascript files. The default is "js"
   --cacert <path>          Use the specified certificate file to verify the peer used for fetching remote jsrepo/noderepo files
 ````
 

package/bin/retire

@@ -51,7 +51,7 @@ program
   .option('--jsrepo <path|url>', 'Local or internal version of repo')
   .option('--noderepo <path|url>', 'Local or internal version of repo')
   .option('--cachedir <path>', 'Path to use for local cache instead of /tmp/.retire-cache')
-  .option('--proxy <url>', 'Proxy url (http://some.sever:8080)')
+  .option('--proxy <url>', 'Proxy url (http://some.host:8080)')
   .option('--outputformat <format>', 'Valid formats: text, json, jsonsimple, depcheck (experimental), cyclonedx and cyclonedxJSON')
   .option('--outputpath <path>', 'File to which output should be written')
   .option('--ignore <paths>', 'Comma delimited list of paths to ignore')
@@ -60,13 +60,14 @@ program
   .option('--exitwith <code>', 'Custom exit code (default: 13) when vulnerabilities are found')
   .option('--colors', 'Enable color output (console output only)')
   .option('--insecure', 'Enable fetching remote jsrepo/noderepo files from hosts using an insecure or self-signed SSL (TLS) certificate')
+  .option('--ext <extensions>', 'Comman separated list of file extensions for javascript files. The default is "js"')
   .option('--cacert <path>', 'Use the specified certificate file to verify the peer used for fetching remote jsrepo/noderepo files')
   .parse(process.argv);
 
 var config = utils.extend({ path: '.' }, utils.pick(program, [
   'package', 'node', 'js', 'jspath', 'verbose', 'nodepath', 'path', 'jsrepo', 'noderepo',
   'dropexternal', 'nocache', 'proxy', 'ignore', 'ignorefile', 'outputformat', 'outputpath',
-  'severity', 'exitwith', 'colors', 'includemeta', 'cachedir', 'insecure', 'cacert'
+  'severity', 'exitwith', 'colors', 'includemeta', 'cachedir', 'insecure', 'cacert', 'ext'
 ]));
 
 if (!config.nocache && !config.cachedir) {

package/lib/resolve.js

@@ -69,8 +69,9 @@ function getNodeDependencies(path, limit) {
 
 function scanJsFiles(path, options) {
 	var finder = walkdir.find(path, { "follow_symlinks" : false, "no_return": true });
+	var ext = (options.ext || "js").split(",").map(e => "." + e);
 	function onFile(file){
-		if (file.match(/\.js$/)) {
+		if (ext.some(e => file.endsWith(e))) {
 			finder.emit('jsfile', file);
 		}
 		if (file.match(/\/bower.json$/)) {

package/lib/retire.js

@@ -4,7 +4,7 @@
  */
 
 var exports = exports || {};
-exports.version = '3.1.2';
+exports.version = '3.2.0';
 
 function isDefined(o) {
 	return typeof o !== 'undefined';

package/package.json

@@ -2,7 +2,7 @@
   "author": "Erlend Oftedal <erlend@oftedal.no>",
   "name": "retire",
   "description": "Retire is a tool for detecting use of vulnerable libraries",
-  "version": "3.1.2",
+  "version": "3.2.0",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",