Skip to content

Commit 4db61d8

Browse files
mhegazymhegazy
committed
Accept baselines
1 parent 477189d commit 4db61d8

12 files changed

+24
-110
lines changed

‎tests/baselines/reference/constDeclarations-access5.errors.txt

+2-10
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
<<<<<<< HEAD
2-
error TS1204: Cannot compile modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
3-
=======
4-
error TS1204: Cannot compile external modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.
5-
>>>>>>> master
1+
error TS1204: Cannot compile modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.
62
tests/cases/compiler/constDeclarations_access_2.ts(2,1): error TS1202: Import assignment cannot be used when targeting ECMAScript 6 or higher. Consider using 'import * as ns from "mod"', 'import {a} from "mod"' or 'import d from "mod"' instead.
73
tests/cases/compiler/constDeclarations_access_2.ts(4,1): error TS2450: Left-hand side of assignment expression cannot be a constant.
84
tests/cases/compiler/constDeclarations_access_2.ts(5,1): error TS2450: Left-hand side of assignment expression cannot be a constant.
@@ -24,11 +20,7 @@ tests/cases/compiler/constDeclarations_access_2.ts(22,3): error TS2449: The oper
2420
tests/cases/compiler/constDeclarations_access_2.ts(24,1): error TS2450: Left-hand side of assignment expression cannot be a constant.
2521

2622

27-
<<<<<<< HEAD
28-
!!! error TS1204: Cannot compile modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
29-
=======
30-
!!! error TS1204: Cannot compile external modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.
31-
>>>>>>> master
23+
!!! error TS1204: Cannot compile modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.
3224
==== tests/cases/compiler/constDeclarations_access_2.ts (19 errors) ====
3325
///<reference path='constDeclarations_access_1.ts'/>
3426
import m = require('constDeclarations_access_1');

‎tests/baselines/reference/es6-amd.errors.txt

+2-9
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
1-
<<<<<<< HEAD
2-
error TS1204: Cannot compile modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
1+
error TS1204: Cannot compile modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.
32

43

5-
!!! error TS1204: Cannot compile modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
6-
=======
7-
error TS1204: Cannot compile external modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.
8-
9-
10-
!!! error TS1204: Cannot compile external modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.
11-
>>>>>>> master
4+
!!! error TS1204: Cannot compile modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.
125
==== tests/cases/compiler/es6-amd.ts (0 errors) ====
136

147
class A

‎tests/baselines/reference/es6-declaration-amd.errors.txt

+2-9
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
1-
<<<<<<< HEAD
2-
error TS1204: Cannot compile modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
1+
error TS1204: Cannot compile modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.
32

43

5-
!!! error TS1204: Cannot compile modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
6-
=======
7-
error TS1204: Cannot compile external modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.
8-
9-
10-
!!! error TS1204: Cannot compile external modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.
11-
>>>>>>> master
4+
!!! error TS1204: Cannot compile modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.
125
==== tests/cases/compiler/es6-declaration-amd.ts (0 errors) ====
136

147
class A

‎tests/baselines/reference/es6-sourcemap-amd.errors.txt

+2-9
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
1-
<<<<<<< HEAD
2-
error TS1204: Cannot compile modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
1+
error TS1204: Cannot compile modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.
32

43

5-
!!! error TS1204: Cannot compile modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
6-
=======
7-
error TS1204: Cannot compile external modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.
8-
9-
10-
!!! error TS1204: Cannot compile external modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.
11-
>>>>>>> master
4+
!!! error TS1204: Cannot compile modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.
125
==== tests/cases/compiler/es6-sourcemap-amd.ts (0 errors) ====
136

147
class A

‎tests/baselines/reference/es6-umd.errors.txt

+2-9
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
1-
<<<<<<< HEAD
2-
error TS1204: Cannot compile modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
1+
error TS1204: Cannot compile modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.
32

43

5-
!!! error TS1204: Cannot compile modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
6-
=======
7-
error TS1204: Cannot compile external modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.
8-
9-
10-
!!! error TS1204: Cannot compile external modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.
11-
>>>>>>> master
4+
!!! error TS1204: Cannot compile modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.
125
==== tests/cases/compiler/es6-umd.ts (0 errors) ====
136

147
class A

‎tests/baselines/reference/es6-umd2.errors.txt

+2-9
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
1-
<<<<<<< HEAD
2-
error TS1204: Cannot compile modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
1+
error TS1204: Cannot compile modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.
32

43

5-
!!! error TS1204: Cannot compile modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
6-
=======
7-
error TS1204: Cannot compile external modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.
8-
9-
10-
!!! error TS1204: Cannot compile external modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.
11-
>>>>>>> master
4+
!!! error TS1204: Cannot compile modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.
125
==== tests/cases/compiler/es6-umd2.ts (0 errors) ====
136

147
export class A

‎tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.errors.txt

+2-9
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
1-
<<<<<<< HEAD
2-
error TS1204: Cannot compile modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
1+
error TS1204: Cannot compile modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.
32

43

5-
!!! error TS1204: Cannot compile modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
6-
=======
7-
error TS1204: Cannot compile external modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.
8-
9-
10-
!!! error TS1204: Cannot compile external modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.
11-
>>>>>>> master
4+
!!! error TS1204: Cannot compile modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.
125
==== tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport_0.ts (0 errors) ====
136

147
export var a = 10;

‎tests/baselines/reference/es6ImportNameSpaceImport.errors.txt

+2-9
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
1-
<<<<<<< HEAD
2-
error TS1204: Cannot compile modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
1+
error TS1204: Cannot compile modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.
32

43

5-
!!! error TS1204: Cannot compile modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
6-
=======
7-
error TS1204: Cannot compile external modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.
8-
9-
10-
!!! error TS1204: Cannot compile external modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.
11-
>>>>>>> master
4+
!!! error TS1204: Cannot compile modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.
125
==== tests/cases/compiler/es6ImportNameSpaceImport_0.ts (0 errors) ====
136

147
export var a = 10;

‎tests/baselines/reference/es6ImportNamedImport.errors.txt

+2-9
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
1-
<<<<<<< HEAD
2-
error TS1204: Cannot compile modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
1+
error TS1204: Cannot compile modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.
32

43

5-
!!! error TS1204: Cannot compile modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
6-
=======
7-
error TS1204: Cannot compile external modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.
8-
9-
10-
!!! error TS1204: Cannot compile external modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.
11-
>>>>>>> master
4+
!!! error TS1204: Cannot compile modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.
125
==== tests/cases/compiler/es6ImportNamedImport_0.ts (0 errors) ====
136

147
export var a = 10;

‎tests/baselines/reference/es6ImportNamedImportInExportAssignment.errors.txt

+2-10
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
1-
<<<<<<< HEAD
2-
error TS1204: Cannot compile modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
1+
error TS1204: Cannot compile modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.
32
tests/cases/compiler/es6ImportNamedImportInExportAssignment_1.ts(2,1): error TS1203: Export assignment cannot be used when targeting ECMAScript 6 or higher. Consider using 'export default' instead.
43

54

6-
!!! error TS1204: Cannot compile modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
7-
=======
8-
error TS1204: Cannot compile external modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.
9-
tests/cases/compiler/es6ImportNamedImportInExportAssignment_1.ts(2,1): error TS1203: Export assignment cannot be used when targeting ECMAScript 6 or higher. Consider using 'export default' instead.
10-
11-
12-
!!! error TS1204: Cannot compile external modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.
13-
>>>>>>> master
5+
!!! error TS1204: Cannot compile modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.
146
==== tests/cases/compiler/es6ImportNamedImportInExportAssignment_0.ts (0 errors) ====
157

168
export var a = 10;

‎tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.errors.txt

+2-9
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
1-
<<<<<<< HEAD
2-
error TS1204: Cannot compile modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
1+
error TS1204: Cannot compile modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.
32

43

5-
!!! error TS1204: Cannot compile modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
6-
=======
7-
error TS1204: Cannot compile external modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.
8-
9-
10-
!!! error TS1204: Cannot compile external modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.
11-
>>>>>>> master
4+
!!! error TS1204: Cannot compile modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.
125
==== tests/cases/compiler/es6ModuleWithModuleGenTargetAmd.ts (0 errors) ====
136
export class A
147
{

‎tests/baselines/reference/es6ModuleWithModuleGenTargetCommonjs.errors.txt

+2-9
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
1-
<<<<<<< HEAD
2-
error TS1204: Cannot compile modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
1+
error TS1204: Cannot compile modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.
32

43

5-
!!! error TS1204: Cannot compile modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
6-
=======
7-
error TS1204: Cannot compile external modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.
8-
9-
10-
!!! error TS1204: Cannot compile external modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.
11-
>>>>>>> master
4+
!!! error TS1204: Cannot compile modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.
125
==== tests/cases/compiler/es6ModuleWithModuleGenTargetCommonjs.ts (0 errors) ====
136
export class A
147
{

0 commit comments

Comments
 (0)