Skip to content

Commit 1593168

Browse files
RyanCavanaughjakebailey
authored andcommitted
Deprecate ES3 in commandline parser (#56304)
Co-authored-by: Jake Bailey <[email protected]>
1 parent f88ee26 commit 1593168

9 files changed

+11
-8
lines changed

src/compiler/commandLineParser.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -529,6 +529,7 @@ export const targetOptionDeclaration: CommandLineOptionOfCustomType = {
529529
affectsModuleResolution: true,
530530
affectsEmit: true,
531531
affectsBuildInfo: true,
532+
deprecatedKeys: new Set(["es3"]),
532533
paramType: Diagnostics.VERSION,
533534
showInSimplifiedHelpView: true,
534535
category: Diagnostics.Language_and_Environment,

src/executeCommandLine/executeCommandLine.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,9 @@ function generateOptionOutput(sys: System, option: CommandLineOption, rightAlign
395395
// Group synonyms: es6/es2015
396396
const inverted: { [value: string]: string[]; } = {};
397397
option.type.forEach((value, name) => {
398-
(inverted[value] ||= []).push(name);
398+
if (!option.deprecatedKeys?.has(name)) {
399+
(inverted[value] ||= []).push(name);
400+
}
399401
});
400402
return Object.entries(inverted)
401403
.map(([, synonyms]) => synonyms.join("/"))

tests/baselines/reference/config/commandLineParsing/parseCommandLine/Parse empty options of --target.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ FileNames::
77
0.ts
88
Errors::
99
error TS6044: Compiler option 'target' expects an argument.
10-
error TS6046: Argument for '--target' option must be: 'es3', 'es5', 'es6', 'es2015', 'es2016', 'es2017', 'es2018', 'es2019', 'es2020', 'es2021', 'es2022', 'esnext'.
10+
error TS6046: Argument for '--target' option must be: 'es5', 'es6', 'es2015', 'es2016', 'es2017', 'es2018', 'es2019', 'es2020', 'es2021', 'es2022', 'esnext'.

tests/baselines/reference/config/convertCompilerOptionsFromJson/Convert incorrect option of target to compiler-options with json api.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ CompilerOptions::
2323
"configFilePath": "tsconfig.json"
2424
}
2525
Errors::
26-
[91merror[0m[90m TS6046: [0mArgument for '--target' option must be: 'es3', 'es5', 'es6', 'es2015', 'es2016', 'es2017', 'es2018', 'es2019', 'es2020', 'es2021', 'es2022', 'esnext'.
26+
[91merror[0m[90m TS6046: [0mArgument for '--target' option must be: 'es5', 'es6', 'es2015', 'es2016', 'es2017', 'es2018', 'es2019', 'es2020', 'es2021', 'es2022', 'esnext'.
2727

tests/baselines/reference/config/convertCompilerOptionsFromJson/Convert incorrect option of target to compiler-options with jsonSourceFile api.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ CompilerOptions::
2323
"configFilePath": "tsconfig.json"
2424
}
2525
Errors::
26-
[96mtsconfig.json[0m:[93m3[0m:[93m15[0m - [91merror[0m[90m TS6046: [0mArgument for '--target' option must be: 'es3', 'es5', 'es6', 'es2015', 'es2016', 'es2017', 'es2018', 'es2019', 'es2020', 'es2021', 'es2022', 'esnext'.
26+
[96mtsconfig.json[0m:[93m3[0m:[93m15[0m - [91merror[0m[90m TS6046: [0mArgument for '--target' option must be: 'es5', 'es6', 'es2015', 'es2016', 'es2017', 'es2018', 'es2019', 'es2020', 'es2021', 'es2022', 'esnext'.
2727

2828
3 "target": "",
2929
   ~~

tests/baselines/reference/config/convertCompilerOptionsFromJson/Convert tsconfig options when there are multiple invalid strings with jsonSourceFile api.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Errors::
4747
  ~~~
4848
 19 }
4949
  ~
50-
[96mtsconfig.json[0m:[93m3[0m:[93m15[0m - [91merror[0m[90m TS6046: [0mArgument for '--target' option must be: 'es3', 'es5', 'es6', 'es2015', 'es2016', 'es2017', 'es2018', 'es2019', 'es2020', 'es2021', 'es2022', 'esnext'.
50+
[96mtsconfig.json[0m:[93m3[0m:[93m15[0m - [91merror[0m[90m TS6046: [0mArgument for '--target' option must be: 'es5', 'es6', 'es2015', 'es2016', 'es2017', 'es2018', 'es2019', 'es2020', 'es2021', 'es2022', 'esnext'.
5151

5252
3 "target": "<%- options.useTsWithBabel ? 'esnext' : 'es5' %>",
5353
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

tests/baselines/reference/tsc/runWithoutArgs/does-not-add-color-when-NO_COLOR-is-set.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ default: false
101101

102102
--target, -t
103103
Set the JavaScript language version for emitted JavaScript and include compatible library declarations.
104-
one of: es3, es5, es6/es2015, es2016, es2017, es2018, es2019, es2020, es2021, es2022, esnext
104+
one of: es5, es6/es2015, es2016, es2017, es2018, es2019, es2020, es2021, es2022, esnext
105105
default: es5
106106

107107
--module, -m

tests/baselines/reference/tsc/runWithoutArgs/show-help-with-ExitStatus.DiagnosticsPresent_OutputsSkipped-when-host-can't-provide-terminal-width.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ default: false
101101

102102
--target, -t
103103
Set the JavaScript language version for emitted JavaScript and include compatible library declarations.
104-
one of: es3, es5, es6/es2015, es2016, es2017, es2018, es2019, es2020, es2021, es2022, esnext
104+
one of: es5, es6/es2015, es2016, es2017, es2018, es2019, es2020, es2021, es2022, esnext
105105
default: es5
106106

107107
--module, -m

tests/baselines/reference/tsc/runWithoutArgs/show-help-with-ExitStatus.DiagnosticsPresent_OutputsSkipped.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ default: false
101101

102102
--target, -t
103103
Set the JavaScript language version for emitted JavaScript and include compatible library declarations.
104-
one of: es3, es5, es6/es2015, es2016, es2017, es2018, es2019, es2020, es2021, es2022, esnext
104+
one of: es5, es6/es2015, es2016, es2017, es2018, es2019, es2020, es2021, es2022, esnext
105105
default: es5
106106

107107
--module, -m

0 commit comments

Comments
 (0)