Merge pull request #3 from beatle/fix-addon-merge

Fix addon build configuration

Author: Asaf Shakarchi

Brocfile.js

@@ -1,6 +1,8 @@
 /* jshint node: true */
 /* global require, module */
 
+var mergeTrees = require( 'broccoli-merge-trees' ),
+    pickFiles  = require( 'broccoli-static-compiler' );
 var EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
 
 var app = new EmberAddon();
@@ -18,4 +20,17 @@ var app = new EmberAddon();
 // please specify an object with the list of modules as keys
 // along with the exports of each module as its value.
 
-module.exports = app.toTree();
+app.import( 'bower_components/bootstrap/dist/css/bootstrap-theme.css.map' );
+app.import('bower_components/bootstrap/dist/css/bootstrap.css');
+app.import('bower_components/fontawesome/css/font-awesome.min.css');
+app.import('bower_components/highlightjs/highlight.pack.js');
+app.import('bower_components/highlightjs/styles/tomorrow.css');
+
+var extraAssets = pickFiles( 'bower_components/fontawesome/fonts', {
+    srcDir  : '/',
+    files   : [ 'fontawesome-webfont.woff' ],
+    destDir : '/fonts'
+});
+
+module.exports = mergeTrees([app.toTree(), extraAssets]);
+// module.exports = app.toTree();

index.js

@@ -1,40 +1,6 @@
 /* jshint node: true */
 'use strict';
-var mergeTrees = require( 'broccoli-merge-trees' ),
-    pickFiles  = require( 'broccoli-static-compiler' );
 
 module.exports = {
-    name: 'ember-idx-tree',
-
-    included: function( app ) {
-        this._super.included( app );
-        var isDummy = app.name === 'dummy'
-
-        if (isDummy) {
-            app.import( 'bower_components/bootstrap/dist/css/bootstrap-theme.css.map' );
-
-            app.import({
-                development : 'bower_components/bootstrap/dist/css/bootstrap.css'
-            });
-            app.import({
-                development : 'bower_components/fontawesome/css/font-awesome.min.css'
-            });
-            app.import({
-                development : 'bower_components/highlightjs/highlight.pack.js'
-            });
-            app.import({
-                development : 'bower_components/highlightjs/styles/tomorrow.css'
-            });
-        }
-    },
-
-    postprocessTree: function( type, tree ) {
-        return mergeTrees([ tree,
-            pickFiles( 'bower_components/fontawesome/fonts', {
-                srcDir  : '/',
-                files   : [ 'fontawesome-webfont.woff' ],
-                destDir : '/fonts'
-            })
-        ]);
-    },
+    name: 'ember-idx-tree'
 };

package.json

@@ -15,6 +15,9 @@
     "node": ">= 0.10.0"
   },
   "license": "ASF2",
+  "dependencies": {
+    "ember-idx-utils": "^0.2.0"
+  },
   "devDependencies": {
     "broccoli-asset-rev": "^1.0.0",
     "broccoli-ember-hbs-template-compiler": "^1.6.1",
@@ -29,7 +32,6 @@
     "ember-cli-qunit": "0.1.2",
     "ember-data": "1.0.0-beta.12",
     "ember-export-application-global": "^1.0.0",
-    "ember-idx-utils": "^0.2.0",
     "express": "^4.8.5",
     "glob": "^4.0.5"
   },
@@ -42,5 +44,8 @@
   ],
   "ember-addon": {
     "configPath": "tests/dummy/config"
-  }
+  },
+  "readmeFilename": "README.md",
+  "_id": "ember-idx-tree@0.1.0",
+  "_from": "ember-idx-tree@*"
 }