Commit graph

4 commits

Author SHA1 Message Date
Mohamed Hegazy cb012e01fd Merge branch 'master' into es6ImportExportEmit
Conflicts:
	src/compiler/diagnosticInformationMap.generated.ts
	src/compiler/diagnosticMessages.json
2015-03-16 20:47:08 -07:00
Mohamed Hegazy 6bcbe824aa Emit export class declaration in es6 format.
Note since we havent yet changed the emitting of class declaration to es6 format,
we are just exporting the constructor function

Conflicts:
	src/compiler/emitter.ts
2015-03-12 10:27:46 -07:00
Sheetal Nandi 006ed82730 Remove references with exports.id as es6 module doesnt have exports.id
Conflicts:
	tests/baselines/reference/es6ExportAll.js
	tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.js
	tests/baselines/reference/es6ImportNamedImport.js
2015-03-12 00:52:14 -07:00
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