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

Properly detect explicitly-set targets (#51834)

Browse Source
This commit is contained in:
Ryan Cavanaugh
2022-12-09 10:31:51 -08:00
committed by GitHub
parent 86e0fc92af
commit 4978b3ebeb
41 changed files with 181 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/compiler/commandLineParser.ts
View File

@@ -522,7 +522,7 @@ export const targetOptionDeclaration: CommandLineOptionOfCustomType = {
showInSimplifiedHelpView: true,
category: Diagnostics.Language_and_Environment,
description: Diagnostics.Set_the_JavaScript_language_version_for_emitted_JavaScript_and_include_compatible_library_declarations,
defaultValueDescription: ScriptTarget.ES3,
defaultValueDescription: ScriptTarget.ES5,
};
/** @internal */

6
src/compiler/utilities.ts
View File

@@ -7515,10 +7515,10 @@ export function getSetExternalModuleIndicator(options: CompilerOptions): (file:
/** @internal */
export function getEmitScriptTarget(compilerOptions: {module?: CompilerOptions["module"], target?: CompilerOptions["target"]}): ScriptTarget {
return compilerOptions.target ||
(compilerOptions.module === ModuleKind.Node16 && ScriptTarget.ES2022) ||
return compilerOptions.target ??
((compilerOptions.module === ModuleKind.Node16 && ScriptTarget.ES2022) ||
(compilerOptions.module === ModuleKind.NodeNext && ScriptTarget.ESNext) ||
ScriptTarget.ES5;
ScriptTarget.ES5);
}
/** @internal */