mirror of
https://github.com/microsoft/TypeScript.git
synced 2025-11-18 17:21:48 +00:00
Merge pull request #8469 from Microsoft/tsconfigParsingImprovements
And fix tslint and typescript compiler versions
This commit is contained in:
+2
-2
@@ -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": {
|
||||
|
||||
@@ -516,6 +516,7 @@ namespace ts {
|
||||
options,
|
||||
fileNames: getFileNames(),
|
||||
typingOptions: getTypingOptions(),
|
||||
raw: json,
|
||||
errors
|
||||
};
|
||||
|
||||
|
||||
@@ -2530,6 +2530,7 @@ namespace ts {
|
||||
options: CompilerOptions;
|
||||
typingOptions?: TypingOptions;
|
||||
fileNames: string[];
|
||||
raw?: any;
|
||||
errors: Diagnostic[];
|
||||
}
|
||||
|
||||
|
||||
@@ -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")
|
||||
};
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user