mirror of
https://github.com/microsoft/TypeScript.git
synced 2026-11-18 20:11:14 +00:00
Merge branch 'master' into tscJsFiles
This commit is contained in:
commit
2c3c321593
513 files changed
+3985
-2886
No files matched your search
@@ -529,7 +529,13 @@ namespace ts {
|
||||
let opt = optionNameMap[id];
|
||||
let { hasValidValue, value } = parseJsonCompilerOption(opt, jsonOptions[id], errors);
|
||||
if (hasValidValue) {
|
||||
options[opt.name] = opt.isFilePath ? normalizePath(combinePaths(basePath, <string>value)) : value;
|
||||
if (opt.isFilePath) {
|
||||
value = normalizePath(combinePaths(basePath, <string>value));
|
||||
if (value === "") {
|
||||
value = ".";
|
||||
}
|
||||
}
|
||||
options[opt.name] = value;
|
||||
}
|
||||
}
|
||||
else {
|
||||
@@ -594,4 +600,4 @@ namespace ts {
|
||||
return fileNames;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user