Commit graph

5 commits

Author SHA1 Message Date
Mohamed Hegazy f90253f73e Merge branch 'master' into exportEquals
Conflicts:
	src/compiler/checker.ts
	src/compiler/diagnosticInformationMap.generated.ts
	src/compiler/emitter.ts
	tests/baselines/reference/es6ImportDefaultBinding.errors.txt
	tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.errors.txt
	tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.errors.txt
	tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding.errors.txt
	tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.errors.txt
	tests/baselines/reference/es6ImportDefaultBindingInEs5.errors.txt
2015-03-23 11:06:44 -07:00
Mohamed Hegazy b3c8bcb319 Emit export default in ES6 2015-03-12 17:14:33 -07:00
Mohamed Hegazy 8c26507bd5 Support for emitting import declaration in es6 format
Conflicts:
	src/compiler/emitter.ts
	tests/baselines/reference/es6ImportDefaultBinding.js
	tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js
	tests/baselines/reference/es6ImportNameSpaceImport.js
	tests/baselines/reference/es6ImportNamedImport.js
2015-03-12 00:17:40 -07:00
Mohamed Hegazy 7b3e50fb98 Emit in ES6 module if script target is es6 or higher
Conflicts:
	src/compiler/emitter.ts
	tests/baselines/reference/es6ImportDefaultBinding.js
	tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js
	tests/baselines/reference/es6ImportNameSpaceImport.js
	tests/baselines/reference/es6ImportNamedImport.js
2015-03-11 23:29:30 -07:00
Mohamed Hegazy 4ef687c5fa Add tests 2015-03-11 22:55:09 -07:00