Skip to content

Commit

Permalink
upgrading packages
Browse files Browse the repository at this point in the history
  • Loading branch information
davglass committed Apr 30, 2018
1 parent 442aee6 commit e5eb49b
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 17 deletions.
1 change: 1 addition & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"eqeqeq": [2, "always"],
"no-console": 0,
"no-irregular-whitespace": 2,
"no-useless-escape": 0,
"indent": ["error", 4],
"space-before-function-paren": ["error", "never"],
"brace-style": [2, "1tbs", { "allowSingleLine": true }],
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@ CVS/
coverage/
.idea/
artifacts
.nyc_output
package-lock.json
3 changes: 2 additions & 1 deletion bin/license-checker
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ var mkdirp = require('mkdirp');
var path = require('path');
var chalk = require('chalk');
var fs = require('fs');
var stripColor = require('strip-ansi');

if (!args.color && (args.json || args.csv || args.out)) {
args.color = false;
Expand Down Expand Up @@ -87,7 +88,7 @@ checker.init(args, function(err, json) {
var dir = path.dirname(args.out);
mkdirp.sync(dir);
//Remove the color tags
formattedOutput = chalk.stripColor(formattedOutput);
formattedOutput = stripColor(formattedOutput);
fs.writeFileSync(args.out, formattedOutput, 'utf8');
} else {
console.log(formattedOutput);
Expand Down
3 changes: 2 additions & 1 deletion lib/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ var debug = require('debug');
var mkdirp = require('mkdirp');
var spdxSatisfies = require('spdx-satisfies');
var spdxCorrect =require('spdx-correct');
var stripColor = require('strip-ansi');

// Set up debug logging
// https://www.npmjs.com/package/debug#stderr-vs-stdout
Expand Down Expand Up @@ -555,7 +556,7 @@ exports.asFiles = function(json, outDir) {

if (licenseFile && fs.existsSync(licenseFile)) {
fileContents = fs.readFileSync(licenseFile);
outFileName = chalk.stripColor(moduleName).replace(/(\s+|@|\/)/g, "") + "-LICENSE.txt";
outFileName = stripColor(moduleName).replace(/(\s+|@|\/)/g, "") + "-LICENSE.txt";
outPath = path.join(outDir, outFileName);
baseDir = path.dirname(outPath);
mkdirp.sync(baseDir);
Expand Down
2 changes: 1 addition & 1 deletion lib/stack.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Stack.prototype = {
test: function() {
if (this.finished >= this.total && this.callback) {
this.callback.call(null, this.errors.length ? this.errors : null,
this.results, this.data);
this.results, this.data);
}
},

Expand Down
27 changes: 14 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,30 +49,31 @@
"tbbstny <tbbstny@users.noreply.github.com>"
],
"dependencies": {
"chalk": "~0.5.1",
"chalk": "^2.4.1",
"debug": "^3.1.0",
"mkdirp": "^0.3.5",
"nopt": "^2.2.0",
"mkdirp": "^0.5.1",
"nopt": "^4.0.1",
"read-installed": "~4.0.3",
"semver": "^5.3.0",
"semver": "^5.5.0",
"spdx": "^0.5.1",
"spdx-correct": "^2.0.3",
"spdx-satisfies": "^0.1.3",
"treeify": "^1.0.1"
"spdx-correct": "^3.0.0",
"spdx-satisfies": "^4.0.0",
"strip-ansi": "^4.0.0",
"treeify": "^1.1.0"
},
"devDependencies": {
"camden.jshint": "github:cfjedimaster/brackets-jshint",
"detectionizr": "*",
"eslint": "^3.19.0",
"eslint": "^4.19.1",
"format-package-json": "^0.2.0",
"git-contributors": "^0.2.3",
"github-changes": "^1.0.4",
"github-changes": "^1.1.2",
"istanbul": "^0.4.3",
"jenkins-mocha": "^2.6.0",
"jenkins-mocha": "^6.0.0",
"locale": "^0.1.0",
"queue": "^1.0.0",
"request": "^2.34.0",
"rimraf": "^2.5.4"
"queue": "^4.4.2",
"request": "^2.85.0",
"rimraf": "^2.6.2"
},
"keywords": [
"license",
Expand Down
1 change: 0 additions & 1 deletion tests/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,6 @@ describe('main tests', function() {
};
def[type] = true;
var result = args.defaults(def);
assert.equal(result.color, false);
assert.equal(result.start, path.resolve(path.join(__dirname, '../')));
});
});
Expand Down

0 comments on commit e5eb49b

Please sign in to comment.