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

Changed node_modules and module defaults

Browse Source 
(cherry picked from commit b791fd89cd)
This commit is contained in:
Bill Ticehurst
2016-02-06 17:27:32 -08:00
parent 20f7b18d99
commit 3cf96529e7
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/compiler/commandLineParser.ts
View File

@@ -551,7 +551,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");

2
src/services/services.ts
View File

@@ -1713,7 +1713,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
};
}