Mohamed Hegazy
|
b52d9ec23e
|
Report error if module gen target is specified in es6
Conflicts:
src/compiler/diagnosticInformationMap.generated.ts
src/compiler/diagnosticMessages.json
src/compiler/program.ts
tests/baselines/reference/constDeclarations-access5.errors.txt
tests/baselines/reference/es6ExportAssignment.errors.txt
tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding.errors.txt
tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding.js
tests/baselines/reference/es6ImportDefaultBindingMergeErrors.errors.txt
tests/baselines/reference/es6ImportEqualsDeclaration.errors.txt
tests/cases/compiler/es6ImportDefaultBinding.ts
tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport.ts
tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport1.ts
tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportDts.ts
tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding.ts
tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding1.ts
tests/cases/compiler/es6ImportDefaultBindingMergeErrors.ts
tests/cases/compiler/es6ImportDefaultBindingNoDefaultProperty.ts
tests/cases/compiler/es6ImportNameSpaceImport.ts
tests/cases/compiler/es6ImportNamedImport.ts
tests/cases/compiler/es6ImportNamedImportMergeErrors.ts
tests/cases/compiler/es6ImportNamedImportNoExportMember.ts
tests/cases/compiler/es6ImportWithoutFromClause.ts
tests/cases/compiler/es6ImportWithoutFromClauseNonInstantiatedModule.ts
|
2015-03-11 22:53:36 -07:00 |
|