Skip to content

Commit b791fd8

Browse files
committed
Changed node_modules and module defaults
1 parent 1256352 commit b791fd8

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

src/compiler/commandLineParser.ts

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,21 @@ namespace ts {
525525
}
526526
else {
527527
const filesSeen: Map<boolean> = {};
528-
const exclude = json["exclude"] instanceof Array ? map(<string[]>json["exclude"], normalizeSlashes) : undefined;
528+
529+
let exclude: string[] = [];
530+
if(json["exclude"] instanceof Array){
531+
exclude = json["exclude"];
532+
}
533+
else {
534+
// by default exclude node_modules, and any specificied output directory
535+
exclude = ["./node_modules"]
536+
let outDir = json["compilerOptions"] && json["compilerOptions"]["outDir"];
537+
if(outDir) {
538+
exclude.push(outDir);
539+
}
540+
}
541+
exclude = map(exclude, normalizeSlashes);
542+
529543
const supportedExtensions = getSupportedExtensions(options);
530544
Debug.assert(indexOf(supportedExtensions, ".ts") < indexOf(supportedExtensions, ".d.ts"), "Changed priority of extensions to pick");
531545

src/services/services.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1712,7 +1712,7 @@ namespace ts {
17121712
// Always default to "ScriptTarget.ES5" for the language service
17131713
return {
17141714
target: ScriptTarget.ES5,
1715-
module: ModuleKind.None,
1715+
module: ModuleKind.CommonJS,
17161716
jsx: JsxEmit.Preserve
17171717
};
17181718
}

0 commit comments

Comments
 (0)