microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-17 11:24:29 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Merge branch 'master' into libReference

Browse Source
This commit is contained in:
Ron Buckton
2018-05-11 20:05:26 -07:00
parent 698f229bb4 dfef2fa9a2
commit 8548fb835a
560 changed files with 23479 additions and 23442 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/compiler/commandLineParser.ts
View File

@@ -1620,10 +1620,12 @@ namespace ts {
createCompilerDiagnosticOnlyIfJson(Diagnostics.Compiler_option_0_requires_a_value_of_type_1, "exclude", "Array");
}
}
else {
const outDir = raw.compilerOptions && raw.compilerOptions.outDir;
if (outDir) {
excludeSpecs = [outDir];
else if (raw.compilerOptions) {
const outDir = raw.compilerOptions.outDir;
const declarationDir = raw.compilerOptions.declarationDir;
if (outDir || declarationDir) {
excludeSpecs = [outDir, declarationDir].filter(d => !!d);
}
}