Merge pull request ember-cli#3851 from jayphelps/reexport-addon

Use shorthand ES6 syntax for addon -> app re-exports
jayphelps · Apr 8, 2015 · 2ef2f55 · 2ef2f55
2 parents e2786b5 + 975ac6e
commit 2ef2f55
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 17 deletions.
diff --git a/blueprints/component-addon/files/__root__/__path__/__name__.js b/blueprints/component-addon/files/__root__/__path__/__name__.js
@@ -1,3 +1 @@
-import <%= camelizedModuleName %> from '<%= modulePath %>';
-
-export default <%= camelizedModuleName %>;
+export { default } from '<%= modulePath %>';
diff --git a/tests/acceptance/addon-generate-test.js b/tests/acceptance/addon-generate-test.js
@@ -125,8 +125,7 @@ describe('Acceptance: ember generate in-addon', function() {
       });
       assertFile('app/components/x-foo.js', {
         contains: [
-          "import xFoo from 'my-addon/components/x-foo';",
-          "export default xFoo;"
+          "export { default } from 'my-addon/components/x-foo';"
         ]
       });
       assertFile('tests/unit/components/x-foo-test.js', {
@@ -157,8 +156,7 @@ describe('Acceptance: ember generate in-addon', function() {
       });
       assertFile('app/components/nested/x-foo.js', {
         contains: [
-          "import nestedXFoo from 'my-addon/components/nested/x-foo';",
-          "export default nestedXFoo;"
+          "export { default } from 'my-addon/components/nested/x-foo';"
         ]
       });
       assertFile('tests/unit/components/nested/x-foo-test.js', {

diff --git a/tests/acceptance/in-repo-addon-generate-test.js b/tests/acceptance/in-repo-addon-generate-test.js
@@ -135,8 +135,7 @@ describe('Acceptance: ember generate in-repo-addon', function() {
       });
       assertFile('lib/my-addon/app/components/x-foo.js', {
         contains: [
-          "import xFoo from 'my-addon/components/x-foo';",
-          "export default xFoo;"
+          "export { default } from 'my-addon/components/x-foo';"
         ]
       });
       assertFile('tests/unit/components/x-foo-test.js', {
@@ -167,8 +166,7 @@ describe('Acceptance: ember generate in-repo-addon', function() {
       });
       assertFile('lib/my-addon/app/components/nested/x-foo.js', {
         contains: [
-          "import nestedXFoo from 'my-addon/components/nested/x-foo';",
-          "export default nestedXFoo;"
+          "export { default } from 'my-addon/components/nested/x-foo';"
         ]
       });
       assertFile('tests/unit/components/nested/x-foo-test.js', {

diff --git a/tests/acceptance/pods-generate-test.js b/tests/acceptance/pods-generate-test.js
@@ -1442,8 +1442,7 @@ describe('Acceptance: ember generate pod', function() {
       });
       assertFile('app/components/x-foo/component.js', {
         contains: [
-          "import xFoo from 'my-addon/components/x-foo/component';",
-          "export default xFoo;"
+          "export { default } from 'my-addon/components/x-foo/component';"
         ]
       });
       assertFile('tests/unit/components/x-foo/component-test.js', {
@@ -1474,8 +1473,7 @@ describe('Acceptance: ember generate pod', function() {
       });
       assertFile('lib/my-addon/app/components/x-foo/component.js', {
         contains: [
-          "import xFoo from 'my-addon/components/x-foo/component';",
-          "export default xFoo;"
+          "export { default } from 'my-addon/components/x-foo/component';"
         ]
       });
       assertFile('tests/unit/components/x-foo/component-test.js', {
@@ -1506,8 +1504,7 @@ describe('Acceptance: ember generate pod', function() {
       });
       assertFile('lib/my-addon/app/components/nested/x-foo/component.js', {
         contains: [
-          "import nestedXFoo from 'my-addon/components/nested/x-foo/component';",
-          "export default nestedXFoo;"
+          "export { default } from 'my-addon/components/nested/x-foo/component';"
         ]
       });
       assertFile('tests/unit/components/nested/x-foo/component-test.js', {