Skip to content

Commit

Permalink
Merge pull request #1626 from bcardarella/bc-addon-generation-start-a…
Browse files Browse the repository at this point in the history
…pp-location

Fix start-app.js location from addon generator
  • Loading branch information
bcardarella committed Aug 10, 2014
2 parents e73740f + 02c3262 commit 1c3bec8
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
* [BUGFIX] Fix EmberAddon vendor tree [#1606](https://github.com/stefanpenner/ember-cli/pull/1606)
* [ENHANCEMENT] Addon blueprint [#1374](https://github.com/stefanpenner/ember-cli/pull/1374)
* [BUGFIX] Fix addons with empty directories [#]()
* [BUGFIX] Fix tests/helpers/start-app.js location from addon generator [#1626](https://github.com/stefanpenner/ember-cli/pull/1626)

### 0.0.40

Expand Down
8 changes: 4 additions & 4 deletions blueprints/addon/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ module.exports = Blueprint.extend({
},
fileMap: {
'^.jshintrc': 'tests/dummy/:path',
'app/.gitkeep': 'app/.gitkeep',
'app.*': 'tests/dummy/:path',
'config.*': 'tests/dummy/:path',
'public.*': 'tests/dummy/:path'
'^app/.gitkeep': 'app/.gitkeep',
'^app.*': 'tests/dummy/:path',
'^config.*': 'tests/dummy/:path',
'^public.*': 'tests/dummy/:path'
},
fileMapper: function(path) {
for(pattern in this.fileMap) {
Expand Down

0 comments on commit 1c3bec8

Please sign in to comment.