Merge pull request #8469 from Microsoft/tsconfigParsingImprovements
Add propertybag to parsed tsconfig.json file.
This commit is contained in:
commit
fad25747a7
|
@ -667,6 +667,7 @@ namespace ts {
|
|||
const compilerOptions: CompilerOptions = convertCompilerOptionsFromJsonWorker(json["compilerOptions"], basePath, errors, configFileName);
|
||||
const options = extend(existingOptions, compilerOptions);
|
||||
const typingOptions: TypingOptions = convertTypingOptionsFromJsonWorker(json["typingOptions"], basePath, errors, configFileName);
|
||||
|
||||
options.configFilePath = configFileName;
|
||||
|
||||
const fileNames = getFileNames(errors);
|
||||
|
@ -675,6 +676,7 @@ namespace ts {
|
|||
options,
|
||||
fileNames,
|
||||
typingOptions,
|
||||
raw: json,
|
||||
errors
|
||||
};
|
||||
|
||||
|
|
|
@ -2596,6 +2596,7 @@ namespace ts {
|
|||
options: CompilerOptions;
|
||||
typingOptions?: TypingOptions;
|
||||
fileNames: string[];
|
||||
raw?: any;
|
||||
errors: Diagnostic[];
|
||||
}
|
||||
|
||||
|
|
|
@ -1001,6 +1001,7 @@ namespace ts {
|
|||
options: {},
|
||||
typingOptions: {},
|
||||
files: [],
|
||||
raw: {},
|
||||
errors: [realizeDiagnostic(result.error, "\r\n")]
|
||||
};
|
||||
}
|
||||
|
@ -1012,6 +1013,7 @@ namespace ts {
|
|||
options: configFile.options,
|
||||
typingOptions: configFile.typingOptions,
|
||||
files: configFile.fileNames,
|
||||
raw: configFile.raw,
|
||||
errors: realizeDiagnostics(configFile.errors, "\r\n")
|
||||
};
|
||||
});
|
||||
|
|
Loading…
Reference in a new issue