Skip to content

Commit c947be2

Browse files
committed
Remove node20 option value
1 parent 4eafe0d commit c947be2

File tree

452 files changed

+460
-31093
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

452 files changed

+460
-31093
lines changed

src/compiler/checker.ts

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39215,7 +39215,6 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
3921539215
switch (moduleKind) {
3921639216
case ModuleKind.Node16:
3921739217
case ModuleKind.Node18:
39218-
case ModuleKind.Node20:
3921939218
case ModuleKind.NodeNext:
3922039219
if (sourceFile.impliedNodeFormat === ModuleKind.CommonJS) {
3922139220
span ??= getSpanOfTokenAtPosition(sourceFile, node.pos);
@@ -39236,8 +39235,8 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
3923639235
// fallthrough
3923739236
default:
3923839237
span ??= getSpanOfTokenAtPosition(sourceFile, node.pos);
39239-
const message = isAwaitExpression(node) ? Diagnostics.Top_level_await_expressions_are_only_allowed_when_the_module_option_is_set_to_es2022_esnext_system_node16_node18_node20_nodenext_or_preserve_and_the_target_option_is_set_to_es2017_or_higher :
39240-
Diagnostics.Top_level_await_using_statements_are_only_allowed_when_the_module_option_is_set_to_es2022_esnext_system_node16_node18_node20_nodenext_or_preserve_and_the_target_option_is_set_to_es2017_or_higher;
39238+
const message = isAwaitExpression(node) ? Diagnostics.Top_level_await_expressions_are_only_allowed_when_the_module_option_is_set_to_es2022_esnext_system_node16_node18_nodenext_or_preserve_and_the_target_option_is_set_to_es2017_or_higher :
39239+
Diagnostics.Top_level_await_using_statements_are_only_allowed_when_the_module_option_is_set_to_es2022_esnext_system_node16_node18_nodenext_or_preserve_and_the_target_option_is_set_to_es2017_or_higher;
3924139240
diagnostics.add(createFileDiagnostic(sourceFile, span.start, span.length, message));
3924239241
hasError = true;
3924339242
break;
@@ -48072,8 +48071,8 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
4807248071
return grammarErrorOnNode(
4807348072
node,
4807448073
isImportAttributes
48075-
? Diagnostics.Import_attributes_are_only_supported_when_the_module_option_is_set_to_esnext_node18_node20_nodenext_or_preserve
48076-
: Diagnostics.Import_assertions_are_only_supported_when_the_module_option_is_set_to_esnext_node18_node20_nodenext_or_preserve,
48074+
? Diagnostics.Import_attributes_are_only_supported_when_the_module_option_is_set_to_esnext_node18_nodenext_or_preserve
48075+
: Diagnostics.Import_assertions_are_only_supported_when_the_module_option_is_set_to_esnext_node18_nodenext_or_preserve,
4807748076
);
4807848077
}
4807948078

@@ -52077,7 +52076,6 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
5207752076
switch (moduleKind) {
5207852077
case ModuleKind.Node16:
5207952078
case ModuleKind.Node18:
52080-
case ModuleKind.Node20:
5208152079
case ModuleKind.NodeNext:
5208252080
if (sourceFile.impliedNodeFormat === ModuleKind.CommonJS) {
5208352081
diagnostics.add(
@@ -52096,7 +52094,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
5209652094
// fallthrough
5209752095
default:
5209852096
diagnostics.add(
52099-
createDiagnosticForNode(forInOrOfStatement.awaitModifier, Diagnostics.Top_level_for_await_loops_are_only_allowed_when_the_module_option_is_set_to_es2022_esnext_system_node16_node18_node20_nodenext_or_preserve_and_the_target_option_is_set_to_es2017_or_higher),
52097+
createDiagnosticForNode(forInOrOfStatement.awaitModifier, Diagnostics.Top_level_for_await_loops_are_only_allowed_when_the_module_option_is_set_to_es2022_esnext_system_node16_node18_nodenext_or_preserve_and_the_target_option_is_set_to_es2017_or_higher),
5210052098
);
5210152099
break;
5210252100
}
@@ -52898,7 +52896,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
5289852896
}
5289952897

5290052898
if (moduleKind === ModuleKind.ES2015) {
52901-
return grammarErrorOnNode(node, Diagnostics.Dynamic_imports_are_only_supported_when_the_module_flag_is_set_to_es2020_es2022_esnext_commonjs_amd_system_umd_node16_node18_node20_or_nodenext);
52899+
return grammarErrorOnNode(node, Diagnostics.Dynamic_imports_are_only_supported_when_the_module_flag_is_set_to_es2020_es2022_esnext_commonjs_amd_system_umd_node16_node18_or_nodenext);
5290252900
}
5290352901

5290452902
if (node.typeArguments) {
@@ -52912,7 +52910,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
5291252910

5291352911
if (nodeArguments.length > 1) {
5291452912
const importAttributesArgument = nodeArguments[1];
52915-
return grammarErrorOnNode(importAttributesArgument, Diagnostics.Dynamic_imports_only_support_a_second_argument_when_the_module_option_is_set_to_esnext_node16_node18_node20_nodenext_or_preserve);
52913+
return grammarErrorOnNode(importAttributesArgument, Diagnostics.Dynamic_imports_only_support_a_second_argument_when_the_module_option_is_set_to_esnext_node16_node18_nodenext_or_preserve);
5291652914
}
5291752915
}
5291852916

src/compiler/commandLineParser.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,6 @@ export const moduleOptionDeclaration: CommandLineOptionOfCustomType = {
601601
esnext: ModuleKind.ESNext,
602602
node16: ModuleKind.Node16,
603603
node18: ModuleKind.Node18,
604-
node20: ModuleKind.Node20,
605604
nodenext: ModuleKind.NodeNext,
606605
preserve: ModuleKind.Preserve,
607606
})),

src/compiler/diagnosticMessages.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1028,11 +1028,11 @@
10281028
"category": "Error",
10291029
"code": 1322
10301030
},
1031-
"Dynamic imports are only supported when the '--module' flag is set to 'es2020', 'es2022', 'esnext', 'commonjs', 'amd', 'system', 'umd', 'node16', 'node18', 'node20', or 'nodenext'.": {
1031+
"Dynamic imports are only supported when the '--module' flag is set to 'es2020', 'es2022', 'esnext', 'commonjs', 'amd', 'system', 'umd', 'node16', 'node18', or 'nodenext'.": {
10321032
"category": "Error",
10331033
"code": 1323
10341034
},
1035-
"Dynamic imports only support a second argument when the '--module' option is set to 'esnext', 'node16', 'node18', 'node20', 'nodenext', or 'preserve'.": {
1035+
"Dynamic imports only support a second argument when the '--module' option is set to 'esnext', 'node16', 'node18', 'nodenext', or 'preserve'.": {
10361036
"category": "Error",
10371037
"code": 1324
10381038
},
@@ -1220,7 +1220,7 @@
12201220
"category": "Message",
12211221
"code": 1377
12221222
},
1223-
"Top-level 'await' expressions are only allowed when the 'module' option is set to 'es2022', 'esnext', 'system', 'node16', 'node18', 'node20', 'nodenext', or 'preserve', and the 'target' option is set to 'es2017' or higher.": {
1223+
"Top-level 'await' expressions are only allowed when the 'module' option is set to 'es2022', 'esnext', 'system', 'node16', 'node18', 'nodenext', or 'preserve', and the 'target' option is set to 'es2017' or higher.": {
12241224
"category": "Error",
12251225
"code": 1378
12261226
},
@@ -1424,7 +1424,7 @@
14241424
"category": "Error",
14251425
"code": 1431
14261426
},
1427-
"Top-level 'for await' loops are only allowed when the 'module' option is set to 'es2022', 'esnext', 'system', 'node16', 'node18', 'node20', 'nodenext', or 'preserve', and the 'target' option is set to 'es2017' or higher.": {
1427+
"Top-level 'for await' loops are only allowed when the 'module' option is set to 'es2022', 'esnext', 'system', 'node16', 'node18', 'nodenext', or 'preserve', and the 'target' option is set to 'es2017' or higher.": {
14281428
"category": "Error",
14291429
"code": 1432
14301430
},
@@ -3788,15 +3788,15 @@
37883788
"category": "Error",
37893789
"code": 2820
37903790
},
3791-
"Import assertions are only supported when the '--module' option is set to 'esnext', 'node18', 'node20', 'nodenext', or 'preserve'.": {
3791+
"Import assertions are only supported when the '--module' option is set to 'esnext', 'node18', 'nodenext', or 'preserve'.": {
37923792
"category": "Error",
37933793
"code": 2821
37943794
},
37953795
"Import assertions cannot be used with type-only imports or exports.": {
37963796
"category": "Error",
37973797
"code": 2822
37983798
},
3799-
"Import attributes are only supported when the '--module' option is set to 'esnext', 'node18', 'node20', 'nodenext', or 'preserve'.": {
3799+
"Import attributes are only supported when the '--module' option is set to 'esnext', 'node18', 'nodenext', or 'preserve'.": {
38003800
"category": "Error",
38013801
"code": 2823
38023802
},
@@ -3876,7 +3876,7 @@
38763876
"category": "Error",
38773877
"code": 2853
38783878
},
3879-
"Top-level 'await using' statements are only allowed when the 'module' option is set to 'es2022', 'esnext', 'system', 'node16', 'node18', 'node20', 'nodenext', or 'preserve', and the 'target' option is set to 'es2017' or higher.": {
3879+
"Top-level 'await using' statements are only allowed when the 'module' option is set to 'es2022', 'esnext', 'system', 'node16', 'node18', 'nodenext', or 'preserve', and the 'target' option is set to 'es2017' or higher.": {
38803880
"category": "Error",
38813881
"code": 2854
38823882
},

src/compiler/transformer.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ function getModuleTransformer(moduleKind: ModuleKind): TransformerFactory<Source
8787
case ModuleKind.ES2015:
8888
case ModuleKind.Node16:
8989
case ModuleKind.Node18:
90-
case ModuleKind.Node20:
9190
case ModuleKind.NodeNext:
9291
case ModuleKind.CommonJS:
9392
// Wraps `transformModule` and `transformECMAScriptModule` and

src/compiler/types.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7546,7 +7546,6 @@ export enum ModuleKind {
75467546
// Node16+ is an amalgam of commonjs (albeit updated) and es2022+, and represents a distinct module system from es2020/esnext
75477547
Node16 = 100,
75487548
Node18 = 101,
7549-
Node20 = 102,
75507549
NodeNext = 199,
75517550

75527551
// Emit as written

src/compiler/utilities.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8941,7 +8941,6 @@ const _computedOptions = createComputedCompilerOptions({
89418941
return target ??
89428942
((compilerOptions.module === ModuleKind.Node16 && ScriptTarget.ES2022) ||
89438943
(compilerOptions.module === ModuleKind.Node18 && ScriptTarget.ES2022) ||
8944-
(compilerOptions.module === ModuleKind.Node20 && ScriptTarget.ES2023) ||
89458944
(compilerOptions.module === ModuleKind.NodeNext && ScriptTarget.ESNext) ||
89468945
ScriptTarget.ES5);
89478946
},
@@ -8965,7 +8964,6 @@ const _computedOptions = createComputedCompilerOptions({
89658964
break;
89668965
case ModuleKind.Node16:
89678966
case ModuleKind.Node18:
8968-
case ModuleKind.Node20:
89698967
moduleResolution = ModuleResolutionKind.Node16;
89708968
break;
89718969
case ModuleKind.NodeNext:
@@ -9009,7 +9007,6 @@ const _computedOptions = createComputedCompilerOptions({
90099007
switch (_computedOptions.module.computeValue(compilerOptions)) {
90109008
case ModuleKind.Node16:
90119009
case ModuleKind.Node18:
9012-
case ModuleKind.Node20:
90139010
case ModuleKind.NodeNext:
90149011
case ModuleKind.Preserve:
90159012
return true;

src/server/protocol.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3255,7 +3255,6 @@ export const enum ModuleKind {
32553255
ESNext = "esnext",
32563256
Node16 = "node16",
32573257
Node18 = "node18",
3258-
Node20 = "node20",
32593258
NodeNext = "nodenext",
32603259
Preserve = "preserve",
32613260
}

src/services/codefixes/fixModuleAndTargetOptions.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ import {
1919

2020
registerCodeFix({
2121
errorCodes: [
22-
Diagnostics.Top_level_await_expressions_are_only_allowed_when_the_module_option_is_set_to_es2022_esnext_system_node16_node18_node20_nodenext_or_preserve_and_the_target_option_is_set_to_es2017_or_higher.code,
23-
Diagnostics.Top_level_await_using_statements_are_only_allowed_when_the_module_option_is_set_to_es2022_esnext_system_node16_node18_node20_nodenext_or_preserve_and_the_target_option_is_set_to_es2017_or_higher.code,
24-
Diagnostics.Top_level_for_await_loops_are_only_allowed_when_the_module_option_is_set_to_es2022_esnext_system_node16_node18_node20_nodenext_or_preserve_and_the_target_option_is_set_to_es2017_or_higher.code,
22+
Diagnostics.Top_level_await_expressions_are_only_allowed_when_the_module_option_is_set_to_es2022_esnext_system_node16_node18_nodenext_or_preserve_and_the_target_option_is_set_to_es2017_or_higher.code,
23+
Diagnostics.Top_level_await_using_statements_are_only_allowed_when_the_module_option_is_set_to_es2022_esnext_system_node16_node18_nodenext_or_preserve_and_the_target_option_is_set_to_es2017_or_higher.code,
24+
Diagnostics.Top_level_for_await_loops_are_only_allowed_when_the_module_option_is_set_to_es2022_esnext_system_node16_node18_nodenext_or_preserve_and_the_target_option_is_set_to_es2017_or_higher.code,
2525
],
2626
getCodeActions: function getCodeActionsToFixModuleAndTarget(context) {
2727
const compilerOptions = context.program.getCompilerOptions();

src/services/codefixes/importFixes.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1559,7 +1559,6 @@ function getUmdImportKind(importingFile: SourceFile | FutureSourceFile, program:
15591559
return ImportKind.Namespace;
15601560
case ModuleKind.Node16:
15611561
case ModuleKind.Node18:
1562-
case ModuleKind.Node20:
15631562
case ModuleKind.NodeNext:
15641563
return getImpliedNodeFormatForEmit(importingFile, program) === ModuleKind.ESNext ? ImportKind.Namespace : ImportKind.CommonJS;
15651564
default:

tests/baselines/reference/api/typescript.d.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2517,7 +2517,6 @@ declare namespace ts {
25172517
ESNext = "esnext",
25182518
Node16 = "node16",
25192519
Node18 = "node18",
2520-
Node20 = "node20",
25212520
NodeNext = "nodenext",
25222521
Preserve = "preserve",
25232522
}
@@ -7134,7 +7133,6 @@ declare namespace ts {
71347133
ESNext = 99,
71357134
Node16 = 100,
71367135
Node18 = 101,
7137-
Node20 = 102,
71387136
NodeNext = 199,
71397137
Preserve = 200,
71407138
}

0 commit comments

Comments
 (0)