Merge branch 'master' into lint_better

This commit is contained in:
Andy Hanson committed 2017-03-06 06:20:48 -08:00
commit d58cfa238b
69 files changed
+638 -267

No files matched your search

+2 -1
View File
@@ -1,5 +1,6 @@
var tslint = require("tslint");
var fs = require("fs");
var path = require("path");
function getLinterOptions() {
return {
@@ -9,7 +10,7 @@ function getLinterOptions() {
};
}
function getLinterConfiguration() {
return require("../tslint.json");
return tslint.Configuration.loadConfigurationFromPath(path.join(__dirname, "../tslint.json"));
}
function lintFileContents(options, configuration, path, contents) {