Merge remote-tracking branch 'origin/master' into pathMappingModuleResolution

This commit is contained in:
Vladimir Matveev
2015-11-25 21:23:35 -08:00
117 changed files with 1260 additions and 548 deletions

View File

@@ -311,7 +311,12 @@ namespace ts {
{
name: "allowJs",
type: "boolean",
description: Diagnostics.Allow_javascript_files_to_be_compiled,
description: Diagnostics.Allow_javascript_files_to_be_compiled
},
{
name: "allowSyntheticDefaultImports",
type: "boolean",
description: Diagnostics.Allow_default_imports_from_modules_with_no_default_export_This_does_not_affect_code_emit_just_typechecking
}
];