Skip to content

Commit c765dce

Browse files
typescript-botbillyjanitsch
typescript-bot
and
billyjanitsch
authored
🤖 Pick PR #60622 (Fix library inclusions for ES2024 t...) into release-5.7 (#60681)
Co-authored-by: Billy Janitsch <billyjanitsch@gmail.com>
1 parent 68b84f0 commit c765dce

File tree

54 files changed

+803
-797
lines changed

Some content is hidden

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

54 files changed

+803
-797
lines changed

‎src/compiler/commandLineParser.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@ export const inverseJsxOptionMap: Map<string, string> = new Map(mapIterator(jsxO
147147
// augmented in another lib.
148148
// NOTE: We must reevaluate the target for upcoming features when each successive TC39 edition is ratified in
149149
// June of each year. This includes changes to `LanguageFeatureMinimumTarget`, `ScriptTarget`,
150-
// `ScriptTargetFeatures` transformers/esnext.ts, compiler/commandLineParser.ts and the contents of each
151-
// lib/esnext.*.d.ts file.
150+
// `ScriptTargetFeatures` transformers/esnext.ts, compiler/commandLineParser.ts,
151+
// compiler/utilitiesPublic.ts, and the contents of each lib/esnext.*.d.ts file.
152152
const libEntries: [string, string][] = [
153153
// JavaScript only
154154
["es5", "lib.es5.d.ts"],

‎src/compiler/transformers/esnext.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ const enum UsingKind {
7474
export function transformESNext(context: TransformationContext): (x: SourceFile | Bundle) => SourceFile | Bundle {
7575
// NOTE: We must reevaluate the target for upcoming features when each successive TC39 edition is ratified in
7676
// June of each year. This includes changes to `LanguageFeatureMinimumTarget`, `ScriptTarget`,
77-
// `ScriptTargetFeatures` transformers/esnext.ts, compiler/commandLineParser.ts and the contents of each
78-
// lib/esnext.*.d.ts file.
77+
// `ScriptTargetFeatures` transformers/esnext.ts, compiler/commandLineParser.ts,
78+
// compiler/utilitiesPublic.ts, and the contents of each lib/esnext.*.d.ts file.
7979

8080
const {
8181
factory,

‎src/compiler/types.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7581,8 +7581,8 @@ export const enum ScriptKind {
75817581

75827582
// NOTE: We must reevaluate the target for upcoming features when each successive TC39 edition is ratified in
75837583
// June of each year. This includes changes to `LanguageFeatureMinimumTarget`, `ScriptTarget`,
7584-
// `ScriptTargetFeatures` transformers/esnext.ts, compiler/commandLineParser.ts and the contents of each
7585-
// lib/esnext.*.d.ts file.
7584+
// `ScriptTargetFeatures` transformers/esnext.ts, compiler/commandLineParser.ts,
7585+
// compiler/utilitiesPublic.ts, and the contents of each lib/esnext.*.d.ts file.
75867586
export const enum ScriptTarget {
75877587
/** @deprecated */
75887588
ES3 = 0,
@@ -8390,8 +8390,8 @@ export type LanugageFeatures =
83908390
// Upcoming Features
83918391
// NOTE: We must reevaluate the target for upcoming features when each successive TC39 edition is ratified in
83928392
// June of each year. This includes changes to `LanguageFeatureMinimumTarget`, `ScriptTarget`,
8393-
// `ScriptTargetFeatures` transformers/esnext.ts, compiler/commandLineParser.ts and the contents of each
8394-
// lib/esnext.*.d.ts file.
8393+
// `ScriptTargetFeatures` transformers/esnext.ts, compiler/commandLineParser.ts,
8394+
// compiler/utilitiesPublic.ts, and the contents of each lib/esnext.*.d.ts file.
83958395
| "UsingAndAwaitUsing" // `using x = y`, `await using x = y`
83968396
| "ClassAndClassElementDecorators" // `@dec class C {}`, `class C { @dec m() {} }`
83978397
;

‎src/compiler/utilities.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1374,8 +1374,8 @@ export type ScriptTargetFeatures = ReadonlyMap<string, ReadonlyMap<string, strin
13741374

13751375
// NOTE: We must reevaluate the target for upcoming features when each successive TC39 edition is ratified in
13761376
// June of each year. This includes changes to `LanguageFeatureMinimumTarget`, `ScriptTarget`,
1377-
// `ScriptTargetFeatures` transformers/esnext.ts, compiler/commandLineParser.ts and the contents of each
1378-
// lib/esnext.*.d.ts file.
1377+
// `ScriptTargetFeatures` transformers/esnext.ts, compiler/commandLineParser.ts,
1378+
// compiler/utilitiesPublic.ts, and the contents of each lib/esnext.*.d.ts file.
13791379
/** @internal */
13801380
export const getScriptTargetFeatures: () => ScriptTargetFeatures = /* @__PURE__ */ memoize((): ScriptTargetFeatures =>
13811381
new Map(Object.entries({

‎src/compiler/utilitiesPublic.ts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,8 +305,13 @@ export function sortAndDeduplicateDiagnostics<T extends Diagnostic>(diagnostics:
305305
}
306306

307307
/** @internal */
308+
// NOTE: We must reevaluate the target for upcoming features when each successive TC39 edition is ratified in
309+
// June of each year. This includes changes to `LanguageFeatureMinimumTarget`, `ScriptTarget`,
310+
// `ScriptTargetFeatures` transformers/esnext.ts, compiler/commandLineParser.ts,
311+
// compiler/utilitiesPublic.ts, and the contents of each lib/esnext.*.d.ts file.
308312
export const targetToLibMap: Map<ScriptTarget, string> = new Map([
309313
[ScriptTarget.ESNext, "lib.esnext.full.d.ts"],
314+
[ScriptTarget.ES2024, "lib.es2024.full.d.ts"],
310315
[ScriptTarget.ES2023, "lib.es2023.full.d.ts"],
311316
[ScriptTarget.ES2022, "lib.es2022.full.d.ts"],
312317
[ScriptTarget.ES2021, "lib.es2021.full.d.ts"],
@@ -322,6 +327,7 @@ export function getDefaultLibFileName(options: CompilerOptions): string {
322327
const target = getEmitScriptTarget(options);
323328
switch (target) {
324329
case ScriptTarget.ESNext:
330+
case ScriptTarget.ES2024:
325331
case ScriptTarget.ES2023:
326332
case ScriptTarget.ES2022:
327333
case ScriptTarget.ES2021:

‎tests/baselines/reference/tscWatch/symlinks/monorepo-style-sibling-packages-symlinked-Linux.js‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -200,14 +200,14 @@ DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/project/packages/packag
200200
Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/project/packages/package2 1 undefined Wild card directory
201201
202202
203-
//// [/home/src/tslibs/TS/Lib/lib.es2016.full.d.ts] *Lib* Inode:: 30
203+
//// [/home/src/tslibs/TS/Lib/lib.es2016.full.d.ts] *Lib* Inode:: 31
204204
205-
//// [/home/src/projects/project/packages/package2/dist/index.js] Inode:: 117
205+
//// [/home/src/projects/project/packages/package2/dist/index.js] Inode:: 118
206206
"use strict";
207207
Object.defineProperty(exports, "__esModule", { value: true });
208208
209209
210-
//// [/home/src/projects/project/packages/package2/dist/index.d.ts] Inode:: 118
210+
//// [/home/src/projects/project/packages/package2/dist/index.d.ts] Inode:: 119
211211
export {};
212212
213213
@@ -242,15 +242,15 @@ FsWatches::
242242
/home/src/projects/project/packages/package2: *new*
243243
{"inode":11}
244244
/home/src/projects/project/packages/package2/dist: *new*
245-
{"inode":116}
245+
{"inode":117}
246246
/home/src/projects/project/packages/package2/src: *new*
247247
{"inode":14}
248248
/home/src/projects/project/packages/package2/src/index.ts: *new*
249249
{"inode":15}
250250
/home/src/projects/project/packages/package2/tsconfig.json: *new*
251251
{"inode":13}
252252
/home/src/tslibs/TS/Lib/lib.es2016.full.d.ts: *new*
253-
{"inode":30}
253+
{"inode":31}
254254
255255
Program root files: [
256256
"/home/src/projects/project/packages/package2/src/index.ts"
@@ -290,20 +290,20 @@ exitCode:: ExitStatus.undefined
290290
Change:: Build dependencies
291291
292292
Input::
293-
//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 120
293+
//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 121
294294
"use strict";
295295
Object.defineProperty(exports, "__esModule", { value: true });
296296
297297
298-
//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 121
298+
//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 122
299299
export type FooType = "foo";
300300
export type BarType = "bar";
301301
302302
303-
//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] Inode:: 122
303+
//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] Inode:: 123
304304
{"root":["./src/index.ts"],"version":"FakeTSVersion"}
305305
306-
//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 123
306+
//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 124
307307
{
308308
"root": [
309309
"./src/index.ts"
@@ -355,23 +355,23 @@ FsWatches::
355355
/home/src/projects/project/packages/package1:
356356
{"inode":6}
357357
/home/src/projects/project/packages/package1/dist: *new*
358-
{"inode":119}
358+
{"inode":120}
359359
/home/src/projects/project/packages/package1/package.json:
360360
{"inode":7}
361361
/home/src/projects/project/packages/package1/src:
362362
{"inode":9}
363363
/home/src/projects/project/packages/package2:
364364
{"inode":11}
365365
/home/src/projects/project/packages/package2/dist:
366-
{"inode":116}
366+
{"inode":117}
367367
/home/src/projects/project/packages/package2/src:
368368
{"inode":14}
369369
/home/src/projects/project/packages/package2/src/index.ts:
370370
{"inode":15}
371371
/home/src/projects/project/packages/package2/tsconfig.json:
372372
{"inode":13}
373373
/home/src/tslibs/TS/Lib/lib.es2016.full.d.ts:
374-
{"inode":30}
374+
{"inode":31}
375375
376376
Timeout callback:: count: 1
377377
8: timerToInvalidateFailedLookupResolutions *new*
@@ -436,8 +436,8 @@ packages/package2/src/index.ts
436436

437437

438438

439-
//// [/home/src/projects/project/packages/package2/dist/index.js] file written with same contents Inode:: 117
440-
//// [/home/src/projects/project/packages/package2/dist/index.d.ts] file written with same contents Inode:: 118
439+
//// [/home/src/projects/project/packages/package2/dist/index.js] file written with same contents Inode:: 118
440+
//// [/home/src/projects/project/packages/package2/dist/index.d.ts] file written with same contents Inode:: 119
441441

442442
PolledWatches::
443443
/home/src/projects/node_modules/@types:
@@ -465,25 +465,25 @@ FsWatches::
465465
/home/src/projects/project/packages/package1:
466466
{"inode":6}
467467
/home/src/projects/project/packages/package1/dist:
468-
{"inode":119}
468+
{"inode":120}
469469
/home/src/projects/project/packages/package1/dist/index.d.ts: *new*
470-
{"inode":121}
470+
{"inode":122}
471471
/home/src/projects/project/packages/package1/package.json:
472472
{"inode":7}
473473
/home/src/projects/project/packages/package1/src:
474474
{"inode":9}
475475
/home/src/projects/project/packages/package2:
476476
{"inode":11}
477477
/home/src/projects/project/packages/package2/dist:
478-
{"inode":116}
478+
{"inode":117}
479479
/home/src/projects/project/packages/package2/src:
480480
{"inode":14}
481481
/home/src/projects/project/packages/package2/src/index.ts:
482482
{"inode":15}
483483
/home/src/projects/project/packages/package2/tsconfig.json:
484484
{"inode":13}
485485
/home/src/tslibs/TS/Lib/lib.es2016.full.d.ts:
486-
{"inode":30}
486+
{"inode":31}
487487

488488

489489
Program root files: [
@@ -568,21 +568,21 @@ FsWatches::
568568
/home/src/projects/project/packages/package2:
569569
{"inode":11}
570570
/home/src/projects/project/packages/package2/dist:
571-
{"inode":116}
571+
{"inode":117}
572572
/home/src/projects/project/packages/package2/src:
573573
{"inode":14}
574574
/home/src/projects/project/packages/package2/src/index.ts:
575575
{"inode":15}
576576
/home/src/projects/project/packages/package2/tsconfig.json:
577577
{"inode":13}
578578
/home/src/tslibs/TS/Lib/lib.es2016.full.d.ts:
579-
{"inode":30}
579+
{"inode":31}
580580

581581
FsWatches *deleted*::
582582
/home/src/projects/project/packages/package1/dist:
583-
{"inode":119}
583+
{"inode":120}
584584
/home/src/projects/project/packages/package1/dist/index.d.ts:
585-
{"inode":121}
585+
{"inode":122}
586586

587587
Timeout callback:: count: 2
588588
10: timerToUpdateProgram *new*
@@ -690,8 +690,8 @@ Scheduling invalidateFailedLookup, Cancelled earlier one
690690
Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/project/node_modules/package1 :: WatchInfo: /home/src/projects/project/node_modules/package1 1 undefined Failed Lookup Locations
691691

692692

693-
//// [/home/src/projects/project/packages/package2/dist/index.js] file written with same contents Inode:: 117
694-
//// [/home/src/projects/project/packages/package2/dist/index.d.ts] file written with same contents Inode:: 118
693+
//// [/home/src/projects/project/packages/package2/dist/index.js] file written with same contents Inode:: 118
694+
//// [/home/src/projects/project/packages/package2/dist/index.d.ts] file written with same contents Inode:: 119
695695

696696
PolledWatches::
697697
/home/src/projects/node_modules: *new*
@@ -729,15 +729,15 @@ FsWatches::
729729
/home/src/projects/project/packages/package2:
730730
{"inode":11}
731731
/home/src/projects/project/packages/package2/dist:
732-
{"inode":116}
732+
{"inode":117}
733733
/home/src/projects/project/packages/package2/src:
734734
{"inode":14}
735735
/home/src/projects/project/packages/package2/src/index.ts:
736736
{"inode":15}
737737
/home/src/projects/project/packages/package2/tsconfig.json:
738738
{"inode":13}
739739
/home/src/tslibs/TS/Lib/lib.es2016.full.d.ts:
740-
{"inode":30}
740+
{"inode":31}
741741

742742
Timeout callback:: count: 1
743743
16: timerToInvalidateFailedLookupResolutions *new*
@@ -927,14 +927,14 @@ exitCode:: ExitStatus.undefined
927927
Change:: Build dependencies
928928

929929
Input::
930-
//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] file written with same contents Inode:: 122
931-
//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 123
932-
//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 125
930+
//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] file written with same contents Inode:: 123
931+
//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 124
932+
//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 126
933933
"use strict";
934934
Object.defineProperty(exports, "__esModule", { value: true });
935935

936936

937-
//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 126
937+
//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 127
938938
export type FooType = "foo";
939939
export type BarType = "bar";
940940

@@ -981,23 +981,23 @@ FsWatches::
981981
/home/src/projects/project/packages/package1:
982982
{"inode":6}
983983
/home/src/projects/project/packages/package1/dist: *new*
984-
{"inode":124}
984+
{"inode":125}
985985
/home/src/projects/project/packages/package1/package.json:
986986
{"inode":7}
987987
/home/src/projects/project/packages/package1/src:
988988
{"inode":9}
989989
/home/src/projects/project/packages/package2:
990990
{"inode":11}
991991
/home/src/projects/project/packages/package2/dist:
992-
{"inode":116}
992+
{"inode":117}
993993
/home/src/projects/project/packages/package2/src:
994994
{"inode":14}
995995
/home/src/projects/project/packages/package2/src/index.ts:
996996
{"inode":15}
997997
/home/src/projects/project/packages/package2/tsconfig.json:
998998
{"inode":13}
999999
/home/src/tslibs/TS/Lib/lib.es2016.full.d.ts:
1000-
{"inode":30}
1000+
{"inode":31}
10011001

10021002
Timeout callback:: count: 1
10031003
21: timerToInvalidateFailedLookupResolutions *new*
@@ -1062,8 +1062,8 @@ packages/package2/src/index.ts
10621062

10631063

10641064

1065-
//// [/home/src/projects/project/packages/package2/dist/index.js] file written with same contents Inode:: 117
1066-
//// [/home/src/projects/project/packages/package2/dist/index.d.ts] file written with same contents Inode:: 118
1065+
//// [/home/src/projects/project/packages/package2/dist/index.js] file written with same contents Inode:: 118
1066+
//// [/home/src/projects/project/packages/package2/dist/index.d.ts] file written with same contents Inode:: 119
10671067

10681068
PolledWatches::
10691069
/home/src/projects/node_modules/@types:
@@ -1091,25 +1091,25 @@ FsWatches::
10911091
/home/src/projects/project/packages/package1:
10921092
{"inode":6}
10931093
/home/src/projects/project/packages/package1/dist:
1094-
{"inode":124}
1094+
{"inode":125}
10951095
/home/src/projects/project/packages/package1/dist/index.d.ts: *new*
1096-
{"inode":126}
1096+
{"inode":127}
10971097
/home/src/projects/project/packages/package1/package.json:
10981098
{"inode":7}
10991099
/home/src/projects/project/packages/package1/src:
11001100
{"inode":9}
11011101
/home/src/projects/project/packages/package2:
11021102
{"inode":11}
11031103
/home/src/projects/project/packages/package2/dist:
1104-
{"inode":116}
1104+
{"inode":117}
11051105
/home/src/projects/project/packages/package2/src:
11061106
{"inode":14}
11071107
/home/src/projects/project/packages/package2/src/index.ts:
11081108
{"inode":15}
11091109
/home/src/projects/project/packages/package2/tsconfig.json:
11101110
{"inode":13}
11111111
/home/src/tslibs/TS/Lib/lib.es2016.full.d.ts:
1112-
{"inode":30}
1112+
{"inode":31}
11131113

11141114

11151115
Program root files: [

0 commit comments

Comments
 (0)