Skip to content

Commit 7d64ec9

Browse files
author
Yui T
committed
Update baselines from moving out of es2018
1 parent 75aa4bd commit 7d64ec9

File tree

90 files changed

+350
-350
lines changed

Some content is hidden

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

90 files changed

+350
-350
lines changed

src/harness/unittests/commandLineParsing.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ namespace ts {
113113
start: undefined,
114114
length: undefined,
115115
}, {
116-
messageText: "Argument for '--module' option must be: 'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015', 'es2018'.",
116+
messageText: "Argument for '--module' option must be: 'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015', 'esnext'.",
117117
category: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.category,
118118
code: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.code,
119119

src/harness/unittests/convertCompilerOptionsFromJson.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ namespace ts {
122122
file: undefined,
123123
start: 0,
124124
length: 0,
125-
messageText: "Argument for '--module' option must be: 'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015', 'es2018'.",
125+
messageText: "Argument for '--module' option must be: 'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015', 'esnext'.",
126126
code: Diagnostics.Argument_for_0_option_must_be_Colon_1.code,
127127
category: Diagnostics.Argument_for_0_option_must_be_Colon_1.category
128128
}]
Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
1-
tests/cases/conformance/es2018/dynamicImport/1.ts(4,5): error TS2322: Type 'Promise<typeof "tests/cases/conformance/es2018/dynamicImport/defaultPath">' is not assignable to type 'Promise<typeof "tests/cases/conformance/es2018/dynamicImport/anotherModule">'.
2-
Type 'typeof "tests/cases/conformance/es2018/dynamicImport/defaultPath"' is not assignable to type 'typeof "tests/cases/conformance/es2018/dynamicImport/anotherModule"'.
3-
Property 'D' is missing in type 'typeof "tests/cases/conformance/es2018/dynamicImport/defaultPath"'.
4-
tests/cases/conformance/es2018/dynamicImport/1.ts(5,10): error TS2352: Type 'Promise<typeof "tests/cases/conformance/es2018/dynamicImport/defaultPath">' cannot be converted to type 'Promise<typeof "tests/cases/conformance/es2018/dynamicImport/anotherModule">'.
5-
Type 'typeof "tests/cases/conformance/es2018/dynamicImport/defaultPath"' is not comparable to type 'typeof "tests/cases/conformance/es2018/dynamicImport/anotherModule"'.
6-
Property 'D' is missing in type 'typeof "tests/cases/conformance/es2018/dynamicImport/defaultPath"'.
1+
tests/cases/conformance/dynamicImport/1.ts(4,5): error TS2322: Type 'Promise<typeof "tests/cases/conformance/dynamicImport/defaultPath">' is not assignable to type 'Promise<typeof "tests/cases/conformance/dynamicImport/anotherModule">'.
2+
Type 'typeof "tests/cases/conformance/dynamicImport/defaultPath"' is not assignable to type 'typeof "tests/cases/conformance/dynamicImport/anotherModule"'.
3+
Property 'D' is missing in type 'typeof "tests/cases/conformance/dynamicImport/defaultPath"'.
4+
tests/cases/conformance/dynamicImport/1.ts(5,10): error TS2352: Type 'Promise<typeof "tests/cases/conformance/dynamicImport/defaultPath">' cannot be converted to type 'Promise<typeof "tests/cases/conformance/dynamicImport/anotherModule">'.
5+
Type 'typeof "tests/cases/conformance/dynamicImport/defaultPath"' is not comparable to type 'typeof "tests/cases/conformance/dynamicImport/anotherModule"'.
6+
Property 'D' is missing in type 'typeof "tests/cases/conformance/dynamicImport/defaultPath"'.
77

88

9-
==== tests/cases/conformance/es2018/dynamicImport/anotherModule.ts (0 errors) ====
9+
==== tests/cases/conformance/dynamicImport/anotherModule.ts (0 errors) ====
1010
export class D{}
1111

12-
==== tests/cases/conformance/es2018/dynamicImport/defaultPath.ts (0 errors) ====
12+
==== tests/cases/conformance/dynamicImport/defaultPath.ts (0 errors) ====
1313
export class C {}
1414

15-
==== tests/cases/conformance/es2018/dynamicImport/1.ts (2 errors) ====
15+
==== tests/cases/conformance/dynamicImport/1.ts (2 errors) ====
1616
import * as defaultModule from "./defaultPath";
1717
import * as anotherModule from "./anotherModule";
1818

1919
let p1: Promise<typeof anotherModule> = import("./defaultPath");
2020
~~
21-
!!! error TS2322: Type 'Promise<typeof "tests/cases/conformance/es2018/dynamicImport/defaultPath">' is not assignable to type 'Promise<typeof "tests/cases/conformance/es2018/dynamicImport/anotherModule">'.
22-
!!! error TS2322: Type 'typeof "tests/cases/conformance/es2018/dynamicImport/defaultPath"' is not assignable to type 'typeof "tests/cases/conformance/es2018/dynamicImport/anotherModule"'.
23-
!!! error TS2322: Property 'D' is missing in type 'typeof "tests/cases/conformance/es2018/dynamicImport/defaultPath"'.
21+
!!! error TS2322: Type 'Promise<typeof "tests/cases/conformance/dynamicImport/defaultPath">' is not assignable to type 'Promise<typeof "tests/cases/conformance/dynamicImport/anotherModule">'.
22+
!!! error TS2322: Type 'typeof "tests/cases/conformance/dynamicImport/defaultPath"' is not assignable to type 'typeof "tests/cases/conformance/dynamicImport/anotherModule"'.
23+
!!! error TS2322: Property 'D' is missing in type 'typeof "tests/cases/conformance/dynamicImport/defaultPath"'.
2424
let p2 = import("./defaultPath") as Promise<typeof anotherModule>;
2525
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
26-
!!! error TS2352: Type 'Promise<typeof "tests/cases/conformance/es2018/dynamicImport/defaultPath">' cannot be converted to type 'Promise<typeof "tests/cases/conformance/es2018/dynamicImport/anotherModule">'.
27-
!!! error TS2352: Type 'typeof "tests/cases/conformance/es2018/dynamicImport/defaultPath"' is not comparable to type 'typeof "tests/cases/conformance/es2018/dynamicImport/anotherModule"'.
28-
!!! error TS2352: Property 'D' is missing in type 'typeof "tests/cases/conformance/es2018/dynamicImport/defaultPath"'.
26+
!!! error TS2352: Type 'Promise<typeof "tests/cases/conformance/dynamicImport/defaultPath">' cannot be converted to type 'Promise<typeof "tests/cases/conformance/dynamicImport/anotherModule">'.
27+
!!! error TS2352: Type 'typeof "tests/cases/conformance/dynamicImport/defaultPath"' is not comparable to type 'typeof "tests/cases/conformance/dynamicImport/anotherModule"'.
28+
!!! error TS2352: Property 'D' is missing in type 'typeof "tests/cases/conformance/dynamicImport/defaultPath"'.
2929
let p3: Promise<any> = import("./defaultPath");
3030

tests/baselines/reference/importCallExpressionCheckReturntype1.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//// [tests/cases/conformance/es2018/dynamicImport/importCallExpressionCheckReturntype1.ts] ////
1+
//// [tests/cases/conformance/dynamicImport/importCallExpressionCheckReturntype1.ts] ////
22

33
//// [anotherModule.ts]
44
export class D{}

tests/baselines/reference/importCallExpressionDeclarationEmit1.symbols

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
=== tests/cases/conformance/es2018/dynamicImport/importCallExpressionDeclarationEmit1.ts ===
1+
=== tests/cases/conformance/dynamicImport/importCallExpressionDeclarationEmit1.ts ===
22
declare function getSpecifier(): string;
33
>getSpecifier : Symbol(getSpecifier, Decl(importCallExpressionDeclarationEmit1.ts, 0, 0))
44

tests/baselines/reference/importCallExpressionDeclarationEmit1.types

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
=== tests/cases/conformance/es2018/dynamicImport/importCallExpressionDeclarationEmit1.ts ===
1+
=== tests/cases/conformance/dynamicImport/importCallExpressionDeclarationEmit1.ts ===
22
declare function getSpecifier(): string;
33
>getSpecifier : () => string
44

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
tests/cases/conformance/es2018/dynamicImport/1.ts(1,5): error TS4023: Exported variable 'p1' has or is using name '"tests/cases/conformance/es2018/dynamicImport/0"' from external module "tests/cases/conformance/es2018/dynamicImport/0" but cannot be named.
1+
tests/cases/conformance/dynamicImport/1.ts(1,5): error TS4023: Exported variable 'p1' has or is using name '"tests/cases/conformance/dynamicImport/0"' from external module "tests/cases/conformance/dynamicImport/0" but cannot be named.
22

33

4-
==== tests/cases/conformance/es2018/dynamicImport/0.ts (0 errors) ====
4+
==== tests/cases/conformance/dynamicImport/0.ts (0 errors) ====
55
export function foo() { return "foo"; }
66

7-
==== tests/cases/conformance/es2018/dynamicImport/1.ts (1 errors) ====
7+
==== tests/cases/conformance/dynamicImport/1.ts (1 errors) ====
88
var p1 = import("./0");
99
~~
10-
!!! error TS4023: Exported variable 'p1' has or is using name '"tests/cases/conformance/es2018/dynamicImport/0"' from external module "tests/cases/conformance/es2018/dynamicImport/0" but cannot be named.
10+
!!! error TS4023: Exported variable 'p1' has or is using name '"tests/cases/conformance/dynamicImport/0"' from external module "tests/cases/conformance/dynamicImport/0" but cannot be named.

tests/baselines/reference/importCallExpressionDeclarationEmit2.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//// [tests/cases/conformance/es2018/dynamicImport/importCallExpressionDeclarationEmit2.ts] ////
1+
//// [tests/cases/conformance/dynamicImport/importCallExpressionDeclarationEmit2.ts] ////
22

33
//// [0.ts]
44
export function foo() { return "foo"; }

tests/baselines/reference/importCallExpressionDeclarationEmit3.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//// [tests/cases/conformance/es2018/dynamicImport/importCallExpressionDeclarationEmit3.ts] ////
1+
//// [tests/cases/conformance/dynamicImport/importCallExpressionDeclarationEmit3.ts] ////
22

33
//// [0.ts]
44
export function foo() { return "foo"; }

tests/baselines/reference/importCallExpressionDeclarationEmit3.symbols

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
=== tests/cases/conformance/es2018/dynamicImport/0.ts ===
1+
=== tests/cases/conformance/dynamicImport/0.ts ===
22
export function foo() { return "foo"; }
33
>foo : Symbol(foo, Decl(0.ts, 0, 0))
44

5-
=== tests/cases/conformance/es2018/dynamicImport/1.ts ===
5+
=== tests/cases/conformance/dynamicImport/1.ts ===
66
declare function getPath(): string;
77
>getPath : Symbol(getPath, Decl(1.ts, 0, 0))
88

0 commit comments

Comments
 (0)