From 3cf96529e770f1cdb177c2859aed80292e937f99 Mon Sep 17 00:00:00 2001 From: Bill Ticehurst Date: Sat, 6 Feb 2016 17:27:32 -0800 Subject: [PATCH] Changed node_modules and module defaults (cherry picked from commit b791fd89cdce0fd1eee7c9d1ee9c6767d2ca4ebe) --- src/compiler/commandLineParser.ts | 16 +++++++++++++++- src/services/services.ts | 2 +- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts index 065fb3a9737..131b01cb4c3 100644 --- a/src/compiler/commandLineParser.ts +++ b/src/compiler/commandLineParser.ts @@ -551,7 +551,21 @@ namespace ts { } else { const filesSeen: Map = {}; - const exclude = json["exclude"] instanceof Array ? map(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"); diff --git a/src/services/services.ts b/src/services/services.ts index 78c0f57ccf8..33ed659fcae 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -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 }; }