From 975ac6e962b2418e62813bef4d1e364708de28ef Mon Sep 17 00:00:00 2001
From: Jay Phelps <hello@jayphelps.com>
Date: Wed, 8 Apr 2015 12:34:51 -0700
Subject: [PATCH] Use shorthand ES6 re-export for addon components

---
 .../component-addon/files/__root__/__path__/__name__.js  | 4 +---
 tests/acceptance/addon-generate-test.js                  | 6 ++----
 tests/acceptance/in-repo-addon-generate-test.js          | 6 ++----
 tests/acceptance/pods-generate-test.js                   | 9 +++------
 4 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/blueprints/component-addon/files/__root__/__path__/__name__.js b/blueprints/component-addon/files/__root__/__path__/__name__.js
index a33a3c7571..71a8b71c1c 100644
--- 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 %>';
\ No newline at end of file
diff --git a/tests/acceptance/addon-generate-test.js b/tests/acceptance/addon-generate-test.js
index 945627ef75..7ca79ca3f9 100644
--- 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
index 76b28f09df..0cc8dbed40 100644
--- 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
index 93e35eeb98..b7ed69549e 100644
--- 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', {