Skip to content

Commit

Permalink
Use shorthand ES6 re-export for addon-imports as well, which landed in …
Browse files Browse the repository at this point in the history 
…ember-cli#3690
  • Loading branch information
@jayphelps
jayphelps committed Apr 8, 2015
1 parent 975ac6e commit 45045d9
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 91 deletions.
4 changes: 1 addition & 3 deletions blueprints/addon-import/files/__root__/__path__/__name__.js
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
import <%= camelizedModuleName %> from '<%= modulePath %>';

export default <%= camelizedModuleName %>;
export { default } from '<%= modulePath %>';
66 changes: 22 additions & 44 deletions tests/acceptance/addon-generate-test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,7 @@ describe('Acceptance: ember generate in-addon', function() {
});
assertFile('app/controllers/foo.js', {
contains: [
"import foo from 'my-addon/controllers/foo';",
"export default foo;"
"export { default } from 'my-addon/controllers/foo';"
]
});
assertFile('tests/unit/controllers/foo-test.js', {
Expand All @@ -93,8 +92,7 @@ describe('Acceptance: ember generate in-addon', function() {
});
assertFile('app/controllers/foo/bar.js', {
contains: [
"import fooBar from 'my-addon/controllers/foo/bar';",
"export default fooBar;"
"export { default } from 'my-addon/controllers/foo/bar';"
]
});
assertFile('tests/unit/controllers/foo/bar-test.js', {
Expand Down Expand Up @@ -182,8 +180,7 @@ describe('Acceptance: ember generate in-addon', function() {
});
assertFile('app/helpers/foo-bar.js', {
contains: [
"import fooBar from 'my-addon/helpers/foo-bar';",
"export default fooBar;"
"export { default } from 'my-addon/helpers/foo-bar';"
]
});
assertFile('tests/unit/helpers/foo-bar-test.js', {
Expand All @@ -205,8 +202,7 @@ describe('Acceptance: ember generate in-addon', function() {
});
assertFile('app/helpers/foo/bar-baz.js', {
contains: [
"import fooBarBaz from 'my-addon/helpers/foo/bar-baz';",
"export default fooBarBaz;"
"export { default } from 'my-addon/helpers/foo/bar-baz';"
]
});
assertFile('tests/unit/helpers/foo/bar-baz-test.js', {
Expand All @@ -227,8 +223,7 @@ describe('Acceptance: ember generate in-addon', function() {
});
assertFile('app/models/foo.js', {
contains: [
"import foo from 'my-addon/models/foo';",
"export default foo;"
"export { default } from 'my-addon/models/foo';"
]
});
assertFile('tests/unit/models/foo-test.js', {
Expand Down Expand Up @@ -284,8 +279,7 @@ describe('Acceptance: ember generate in-addon', function() {
});
assertFile('app/models/foo.js', {
contains: [
"import foo from 'my-addon/models/foo';",
"export default foo;"
"export { default } from 'my-addon/models/foo';"
]
});
assertFile('tests/unit/models/foo-test.js', {
Expand Down Expand Up @@ -317,8 +311,7 @@ describe('Acceptance: ember generate in-addon', function() {
});
assertFile('app/models/foo/bar.js', {
contains: [
"import fooBar from 'my-addon/models/foo/bar';",
"export default fooBar;"
"export { default } from 'my-addon/models/foo/bar';"
]
});
assertFile('tests/unit/models/foo/bar-test.js', {
Expand Down Expand Up @@ -362,8 +355,7 @@ describe('Acceptance: ember generate in-addon', function() {
});
assertFile('app/views/foo.js', {
contains: [
"import foo from 'my-addon/views/foo';",
"export default foo;"
"export { default } from 'my-addon/views/foo';"
]
});
assertFile('tests/unit/views/foo-test.js', {
Expand All @@ -388,8 +380,7 @@ describe('Acceptance: ember generate in-addon', function() {
});
assertFile('app/views/foo/bar.js', {
contains: [
"import fooBar from 'my-addon/views/foo/bar';",
"export default fooBar;"
"export { default } from 'my-addon/views/foo/bar';"
]
});
assertFile('tests/unit/views/foo/bar-test.js', {
Expand Down Expand Up @@ -425,8 +416,7 @@ describe('Acceptance: ember generate in-addon', function() {
});
assertFile('app/initializers/foo.js', {
contains: [
"import foo from 'my-addon/initializers/foo';",
"export default foo;"
"export { default } from 'my-addon/initializers/foo';"
]
});
assertFile('tests/unit/initializers/foo-test.js');
Expand All @@ -447,8 +437,7 @@ describe('Acceptance: ember generate in-addon', function() {
});
assertFile('app/initializers/foo/bar.js', {
contains: [
"import fooBar from 'my-addon/initializers/foo/bar';",
"export default fooBar;"
"export { default } from 'my-addon/initializers/foo/bar';"
]
});
assertFile('tests/unit/initializers/foo/bar-test.js');
Expand Down Expand Up @@ -507,8 +496,7 @@ describe('Acceptance: ember generate in-addon', function() {
});
assertFile('app/adapters/application.js', {
contains: [
"import application from 'my-addon/adapters/application';",
"export default application;"
"export { default } from 'my-addon/adapters/application';"
]
});
assertFile('tests/unit/adapters/application-test.js', {
Expand All @@ -533,8 +521,7 @@ describe('Acceptance: ember generate in-addon', function() {
});
assertFile('app/adapters/foo.js', {
contains: [
"import foo from 'my-addon/adapters/foo';",
"export default foo;"
"export { default } from 'my-addon/adapters/foo';"
]
});
assertFile('tests/unit/adapters/foo-test.js', {
Expand All @@ -559,8 +546,7 @@ describe('Acceptance: ember generate in-addon', function() {
});
assertFile('app/adapters/foo/bar.js', {
contains: [
"import fooBar from 'my-addon/adapters/foo/bar';",
"export default fooBar;"
"export { default } from 'my-addon/adapters/foo/bar';"
]
});
});
Expand All @@ -577,8 +563,7 @@ describe('Acceptance: ember generate in-addon', function() {
});
assertFile('app/serializers/foo.js', {
contains: [
"import foo from 'my-addon/serializers/foo';",
"export default foo;"
"export { default } from 'my-addon/serializers/foo';"
]
});
assertFile('tests/unit/serializers/foo-test.js', {
Expand All @@ -602,8 +587,7 @@ describe('Acceptance: ember generate in-addon', function() {
});
assertFile('app/serializers/foo/bar.js', {
contains: [
"import fooBar from 'my-addon/serializers/foo/bar';",
"export default fooBar;"
"export { default } from 'my-addon/serializers/foo/bar';"
]
});
assertFile('tests/unit/serializers/foo/bar-test.js', {
Expand Down Expand Up @@ -636,8 +620,7 @@ describe('Acceptance: ember generate in-addon', function() {
});
assertFile('app/transforms/foo.js', {
contains: [
"import foo from 'my-addon/transforms/foo';",
"export default foo;"
"export { default } from 'my-addon/transforms/foo';"
]
});
assertFile('tests/unit/transforms/foo-test.js', {
Expand Down Expand Up @@ -670,8 +653,7 @@ describe('Acceptance: ember generate in-addon', function() {
});
assertFile('app/transforms/foo/bar.js', {
contains: [
"import fooBar from 'my-addon/transforms/foo/bar';",
"export default fooBar;"
"export { default } from 'my-addon/transforms/foo/bar';"
]
});
assertFile('tests/unit/transforms/foo/bar-test.js', {
Expand All @@ -695,8 +677,7 @@ describe('Acceptance: ember generate in-addon', function() {
});
assertFile('app/utils/foo-bar.js', {
contains: [
"import fooBar from 'my-addon/utils/foo-bar';",
"export default fooBar;"
"export { default } from 'my-addon/utils/foo-bar';"
]
});
assertFile('tests/unit/utils/foo-bar-test.js', {
Expand All @@ -716,8 +697,7 @@ describe('Acceptance: ember generate in-addon', function() {
});
assertFile('app/utils/foo/bar-baz.js', {
contains: [
"import fooBarBaz from 'my-addon/utils/foo/bar-baz';",
"export default fooBarBaz;"
"export { default } from 'my-addon/utils/foo/bar-baz';"
]
});
assertFile('tests/unit/utils/foo/bar-baz-test.js', {
Expand All @@ -738,8 +718,7 @@ describe('Acceptance: ember generate in-addon', function() {
});
assertFile('app/services/foo.js', {
contains: [
"import foo from 'my-addon/services/foo';",
"export default foo;"
"export { default } from 'my-addon/services/foo';"
]
});
assertFile('tests/unit/services/foo-test.js', {
Expand All @@ -764,8 +743,7 @@ describe('Acceptance: ember generate in-addon', function() {
});
assertFile('app/services/foo/bar.js', {
contains: [
"import fooBar from 'my-addon/services/foo/bar';",
"export default fooBar;"
"export { default } from 'my-addon/services/foo/bar';"
]
});
assertFile('tests/unit/services/foo/bar-test.js', {
Expand Down
Loading

0 comments on commit 45045d9

Please sign in to comment.