Use shorthand ES6 re-export for addon-imports as well, which landed in …

…ember-cli#3690

README.md

@@ -1,115 +1 @@
-
-## ember-cli [![Build Status][travis-badge]][travis-badge-url] [![Dependency Status][david-badge]][david-badge-url] [![Build status][appveyor-badge]][appveyor-badge-url] [![Code Climate](https://codeclimate.com/github/ember-cli/ember-cli/badges/gpa.svg)](https://codeclimate.com/github/ember-cli/ember-cli) [![Test Coverage](https://codeclimate.com/github/ember-cli/ember-cli/badges/coverage.svg)](https://codeclimate.com/github/ember-cli/ember-cli) [![Inline docs](http://inch-ci.org/github/ember-cli/ember-cli.svg?branch=master)](http://inch-ci.org/github/ember-cli/ember-cli)
-
-The Ember.js command line utility.
-
-Supports node 0.12.x and npm 2.6.x.
-
-## Community
-* irc: #ember-cli on freenode
-* issues: [ember-cli/issues](https://github.com/ember-cli/ember-cli/issues)
-* website: [ember-cli.com](http://www.ember-cli.com)
-
-[![ScreenShot](http://static.iamstef.net/ember-conf-2014-video.jpg)](https://www.youtube.com/watch?v=4D8z3972h64)
-
-
-## Project Elements
-Additional components of this project which are used at runtime in your application:
-* [ember-resolver](https://github.com/ember-cli/ember-resolver)
-* [loader](https://github.com/ember-cli/loader.js)
-* [ember-cli-shims](https://github.com/ember-cli/ember-cli-shims)
-* [ember-load-initializers](https://github.com/ember-cli/ember-load-initializers)
-
-## Development Hints
-### Working with master
-
-``` sh
-git clone https://github.com/ember-cli/ember-cli.git
-cd ember-cli
-npm link
-```
-
-`npm link` is very similar to `npm install -g` except that instead of downloading the package from the repo the just cloned `ember-cli/` folder becomes the global package. Any changes to the files in the `ember-cli/` folder will immediately affect the global ember-cli package.
-
-Now you can use `ember-cli` via the command line:
-
-``` sh
-ember new foo
-cd foo
-npm link ember-cli
-ember server
-```
-
-`npm link ember-cli` is needed because by default the globally installed `ember-cli` just loads the local `ember-cli` from the project. `npm link ember-cli` symlinks the global `ember-cli` package to the local `ember-cli` package. Now the `ember-cli` you cloned before is in three places: The folder you cloned it into, npm's folder where it stores global packages and the `ember-cli` project you just created.
-
-If you upgrade an app running against Ember CLI master you will need to re-link to your checkout of Ember CLI by running `npm link ember-cli` in your project again.
-
-Please read the official [npm-link documentation](https://www.npmjs.org/doc/cli/npm-link.html) and the [npm-link cheatsheet](http://browsenpm.org/help#linkinganynpmpackagelocally) for more information.
-
-### Working with the tests
-
-Use `npm run autotest` to run the tests after every file change (Runs only fast tests). Use `npm test` to run them once.
-
-For a full test run which includes some very slow acceptance tests,
-please run: `npm run test-all`. Please note, this is what travis
-runs.
-
-To exclude a test or test suite append a `.skip` to `it()` or `describe()` respectively (e.g. `it.skip(...)`). To focus on a certain test or test suite append `.only`.
-
-Please read the official [mocha documentation](http://mochajs.org/) for more information.
-
-## Problems
-
-When running ember cli it could happen that a lack of file watches can occur. You will get an error message like:
-
-```sh
-Serving on http://localhost:4200
-watch ENOSPC
-Error: watch ENOSPC
-    at errnoException (fs.js:1019:11)
-    at FSWatcher.start (fs.js:1051:11)
-  ...
-```
-
-This problem will be corrected in future releases. The following line is a workaround to get the server up and running until this problem is fixed. See [Issue 1054](https://github.com/ember-cli/ember-cli/issues/1054).
-
-```sh
-echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p
-```
-
-For Arch Linux or Manjaro Linux, in order for the parameters to be loaded at boot, the kernel sysctl parameters have to be saved in a drop-in directory instead of `sysctl.conf`.
-
-```sh
-echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.d/99-sysctl.conf && sudo sysctl --system
-```
-
-## Inline Documentation
-
-Use `npm run docs` to build HTML and JSON documentation with YUIDoc and place it in `docs/build/`. Please help by improving this documentation.
-
-## Contribution
-
-[See `CONTRIBUTING.md`](https://github.com/ember-cli/ember-cli/blob/master/CONTRIBUTING.md)
-
-## Upgrading
-
-* [Change history of new Ember-CLI apps](https://github.com/kellyselden/ember-cli-output)
-* [Change history of new Ember-CLI addons](https://github.com/kellyselden/ember-addon-output)
-
-## Donating
-
-All donations will support this project and treats for contributors.
-
-[![Support via Gittip](https://rawgithub.com/twolfson/gittip-badge/0.2.0/dist/gittip.png)](https://www.gittip.com/stefanpenner/)
-
-## License
-
-ember-cli is [MIT Licensed](https://github.com/ember-cli/ember-cli/blob/master/LICENSE.md).
-
-
-[travis-badge]: https://travis-ci.org/ember-cli/ember-cli.svg?branch=master
-[travis-badge-url]: https://travis-ci.org/ember-cli/ember-cli
-[david-badge]: https://david-dm.org/ember-cli/ember-cli.svg
-[david-badge-url]: https://david-dm.org/ember-cli/ember-cli
-[appveyor-badge]: https://ci.appveyor.com/api/projects/status/7owf61lo8uujbjok/branch/master?svg=true
-[appveyor-badge-url]: https://ci.appveyor.com/project/embercli/ember-cli/branch/master
+Appveyor makes me mad

blueprints/addon-import/files/__root__/__path__/__name__.js

@@ -1,3 +1 @@
-import <%= camelizedModuleName %> from '<%= modulePath %>';
-
-export default <%= camelizedModuleName %>;
+export { default } from '<%= modulePath %>';

tests/acceptance/addon-generate-test.js

@@ -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', {
@@ -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', {
@@ -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', {
@@ -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', {
@@ -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', {
@@ -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', {
@@ -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', {
@@ -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', {
@@ -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', {
@@ -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');
@@ -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');
@@ -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', {
@@ -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', {
@@ -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';"
         ]
       });
     });
@@ -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', {
@@ -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', {
@@ -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', {
@@ -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', {
@@ -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', {
@@ -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', {
@@ -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', {
@@ -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', {