Microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2025-11-18 17:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into vfs

Browse Source
This commit is contained in:
Ron Buckton
2018-01-31 15:41:47 -08:00
parent bb05381695 d0ab1642fe
commit 3de96306de
4 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compiler/commandLineParser.ts
+1 -1
View File
@@ -1796,7 +1796,7 @@ namespace ts {
function getDefaultCompilerOptions(configFileName?: string) {
const options: CompilerOptions = getBaseFileName(configFileName) === "jsconfig.json"
? { allowJs: true, maxNodeModuleJsDepth: 2, allowSyntheticDefaultImports: true, skipLibCheck: true }
? { allowJs: true, maxNodeModuleJsDepth: 2, allowSyntheticDefaultImports: true, skipLibCheck: true, noEmit: true }
: {};
return options;
}
src/harness/unittests/convertCompilerOptionsFromJson.ts
+6 -2
View File
@@ -459,6 +459,7 @@ namespace ts {
maxNodeModuleJsDepth: 2,
allowSyntheticDefaultImports: true,
skipLibCheck: true,
noEmit: true,
module: ModuleKind.CommonJS,
target: ScriptTarget.ES5,
noImplicitAny: false,
@@ -488,6 +489,7 @@ namespace ts {
maxNodeModuleJsDepth: 2,
allowSyntheticDefaultImports: true,
skipLibCheck: true,
noEmit: true,
module: ModuleKind.CommonJS,
target: ScriptTarget.ES5,
noImplicitAny: false,
@@ -512,7 +514,8 @@ namespace ts {
allowJs: true,
maxNodeModuleJsDepth: 2,
allowSyntheticDefaultImports: true,
skipLibCheck: true
skipLibCheck: true,
noEmit: true
},
errors: [{
file: undefined,
@@ -534,7 +537,8 @@ namespace ts {
allowJs: true,
maxNodeModuleJsDepth: 2,
allowSyntheticDefaultImports: true,
skipLibCheck: true
skipLibCheck: true,
noEmit: true
},
errors: []
}
src/harness/unittests/telemetry.ts
+1
View File
@@ -205,6 +205,7 @@ namespace ts.projectSystem {
allowSyntheticDefaultImports: true,
maxNodeModuleJsDepth: 2,
skipLibCheck: true,
noEmit: true
};
it("sends telemetry for typeAcquisition settings", () => {