Skip to content

Allow 'export default's in JS files without incorrect error #6797

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 1, 2016
Merged

Allow 'export default's in JS files without incorrect error #6797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e5adec9
Added tests.
DanielRosenwasser Feb 1, 2016
34a0deb
Only error on 'export =' declarations.
DanielRosenwasser Feb 1, 2016
67a77b6
Accepted baselines.
DanielRosenwasser Feb 1, 2016
abf9239
Accepted that other baseline.
DanielRosenwasser Feb 1, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/compiler/program.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -734,8 +734,11 @@ namespace ts {
diagnostics.push(createDiagnosticForNode(node, Diagnostics.import_can_only_be_used_in_a_ts_file));
return true;
case SyntaxKind.ExportAssignment:
diagnostics.push(createDiagnosticForNode(node, Diagnostics.export_can_only_be_used_in_a_ts_file));
return true;
if ((<ExportAssignment>node).isExportEquals) {
diagnostics.push(createDiagnosticForNode(node, Diagnostics.export_can_only_be_used_in_a_ts_file));
return true;
}
break;
case SyntaxKind.ClassDeclaration:
let classDeclaration = <ClassDeclaration>node;
if (checkModifiers(classDeclaration.modifiers) ||
Expand Down
7 changes: 7 additions & 0 deletions tests/baselines/reference/exportDefaultInJsFile01.errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
error TS5055: Cannot write file 'tests/cases/conformance/salsa/myFile01.js' because it would overwrite input file.


!!! error TS5055: Cannot write file 'tests/cases/conformance/salsa/myFile01.js' because it would overwrite input file.
==== tests/cases/conformance/salsa/myFile01.js (0 errors) ====

export default "hello";
7 changes: 7 additions & 0 deletions tests/baselines/reference/exportDefaultInJsFile02.errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
error TS5055: Cannot write file 'tests/cases/conformance/salsa/myFile02.js' because it would overwrite input file.


!!! error TS5055: Cannot write file 'tests/cases/conformance/salsa/myFile02.js' because it would overwrite input file.
==== tests/cases/conformance/salsa/myFile02.js (0 errors) ====

export default "hello";
5 changes: 1 addition & 4 deletions tests/baselines/reference/jsFileCompilationBindMultipleDefaultExports.errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
tests/cases/compiler/a.js(1,22): error TS2528: A module cannot have multiple default exports.
tests/cases/compiler/a.js(3,1): error TS2528: A module cannot have multiple default exports.
tests/cases/compiler/a.js(3,1): error TS8003: 'export=' can only be used in a .ts file.
tests/cases/compiler/a.js(3,16): error TS1109: Expression expected.


==== tests/cases/compiler/a.js (4 errors) ====
==== tests/cases/compiler/a.js (3 errors) ====
export default class a {
~
!!! error TS2528: A module cannot have multiple default exports.
}
export default var a = 10;
~~~~~~~~~~~~~~
!!! error TS2528: A module cannot have multiple default exports.
~~~~~~~~~~~~~~
!!! error TS8003: 'export=' can only be used in a .ts file.
~~~
!!! error TS1109: Expression expected.
6 changes: 6 additions & 0 deletions tests/cases/conformance/salsa/exportDefaultInJsFile01.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// @allowJS: true
// @target: es3
// @module: commonjs

// @filename: myFile01.js
export default "hello";
6 changes: 6 additions & 0 deletions tests/cases/conformance/salsa/exportDefaultInJsFile02.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// @allowJS: true
// @target: es2015
// @module: es2015

// @filename: myFile02.js
export default "hello";