Changed node_modules and module defaults

This commit is contained in:
Bill Ticehurst 2016-02-06 17:27:32 -08:00
parent 1256352872
commit b791fd89cd
2 changed files with 16 additions and 2 deletions

View File

@ -525,7 +525,21 @@ namespace ts {
}
else {
const filesSeen: Map<boolean> = {};
const exclude = json["exclude"] instanceof Array ? map(<string[]>json["exclude"], normalizeSlashes) : undefined;
let exclude: string[] = [];
if(json["exclude"] instanceof Array){
exclude = json["exclude"];
}
else {
// by default exclude node_modules, and any specificied output directory
exclude = ["./node_modules"]
let outDir = json["compilerOptions"] && json["compilerOptions"]["outDir"];
if(outDir) {
exclude.push(outDir);
}
}
exclude = map(exclude, normalizeSlashes);
const supportedExtensions = getSupportedExtensions(options);
Debug.assert(indexOf(supportedExtensions, ".ts") < indexOf(supportedExtensions, ".d.ts"), "Changed priority of extensions to pick");

View File

@ -1712,7 +1712,7 @@ namespace ts {
// Always default to "ScriptTarget.ES5" for the language service
return {
target: ScriptTarget.ES5,
module: ModuleKind.None,
module: ModuleKind.CommonJS,
jsx: JsxEmit.Preserve
};
}