4c5aeaf0c9
Conflicts: src/compiler/diagnosticInformationMap.generated.ts src/compiler/diagnosticMessages.json src/compiler/program.ts tests/baselines/reference/constDeclarations-access5.errors.txt tests/baselines/reference/es6-amd.errors.txt tests/baselines/reference/es6-declaration-amd.errors.txt tests/baselines/reference/es6-sourcemap-amd.errors.txt tests/baselines/reference/es6-umd.errors.txt tests/baselines/reference/es6-umd2.errors.txt tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.errors.txt tests/baselines/reference/es6ImportNameSpaceImport.errors.txt tests/baselines/reference/es6ImportNamedImport.errors.txt tests/baselines/reference/es6ImportNamedImportInExportAssignment.errors.txt tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.errors.txt tests/baselines/reference/es6ModuleWithModuleGenTargetCommonjs.errors.txt
32 lines
No EOL
1.5 KiB
Text
32 lines
No EOL
1.5 KiB
Text
<<<<<<< HEAD
|
|
error TS1204: Cannot compile modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
|
|
|
|
|
|
!!! error TS1204: Cannot compile modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
|
|
=======
|
|
error TS1204: Cannot compile external modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.
|
|
|
|
|
|
!!! error TS1204: Cannot compile external modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.
|
|
>>>>>>> master
|
|
==== tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport_0.ts (0 errors) ====
|
|
|
|
export var a = 10;
|
|
export var x = a;
|
|
export var m = a;
|
|
export default {};
|
|
|
|
==== tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport_1.ts (0 errors) ====
|
|
import defaultBinding1, { } from "es6ImportDefaultBindingFollowedWithNamedImport_0";
|
|
import defaultBinding2, { a } from "es6ImportDefaultBindingFollowedWithNamedImport_0";
|
|
var x1: number = a;
|
|
import defaultBinding3, { a as b } from "es6ImportDefaultBindingFollowedWithNamedImport_0";
|
|
var x1: number = b;
|
|
import defaultBinding4, { x, a as y } from "es6ImportDefaultBindingFollowedWithNamedImport_0";
|
|
var x1: number = x;
|
|
var x1: number = y;
|
|
import defaultBinding5, { x as z, } from "es6ImportDefaultBindingFollowedWithNamedImport_0";
|
|
var x1: number = z;
|
|
import defaultBinding6, { m, } from "es6ImportDefaultBindingFollowedWithNamedImport_0";
|
|
var x1: number = m;
|
|
|