Merge pull request #8469 from Microsoft/tsconfigParsingImprovements

And fix tslint and typescript compiler versions
This commit is contained in:
Paul van Brenk
2016-06-07 14:14:52 -07:00
parent 794c57478e
commit 5110eb36df
4 changed files with 6 additions and 2 deletions
+2 -2
View File
@@ -35,8 +35,8 @@
"browserify": "latest",
"istanbul": "latest",
"mocha-fivemat-progress-reporter": "latest",
"tslint": "next",
"typescript": "next",
"tslint": "3.7.1",
"typescript": "1.8.10",
"tsd": "latest"
},
"scripts": {
+1
View File
@@ -516,6 +516,7 @@ namespace ts {
options,
fileNames: getFileNames(),
typingOptions: getTypingOptions(),
raw: json,
errors
};
+1
View File
@@ -2530,6 +2530,7 @@ namespace ts {
options: CompilerOptions;
typingOptions?: TypingOptions;
fileNames: string[];
raw?: any;
errors: Diagnostic[];
}
+2
View File
@@ -962,6 +962,7 @@ namespace ts {
options: {},
typingOptions: {},
files: [],
raw: {},
errors: [realizeDiagnostic(result.error, "\r\n")]
};
}
@@ -973,6 +974,7 @@ namespace ts {
options: configFile.options,
typingOptions: configFile.typingOptions,
files: configFile.fileNames,
raw: configFile.raw,
errors: realizeDiagnostics(configFile.errors, "\r\n")
};
});