Skip to content

Commit

Permalink
Use new broccoli-bower plugin
Browse files Browse the repository at this point in the history
  • Loading branch information
joliss committed Apr 11, 2014
1 parent 1debb4d commit 829e869
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion Brocfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ module.exports = function (broccoli) {
var compileSass = require('broccoli-sass')
var pickFiles = require('broccoli-static-compiler')
var mergeTrees = require('broccoli-merge-trees')
var findBowerTrees = require('broccoli-bower')
var env = require('broccoli-env').getEnv()

function preprocess (tree) {
Expand Down Expand Up @@ -46,7 +47,7 @@ module.exports = function (broccoli) {
if (env !== 'production') {
sourceTrees.push(tests)
}
sourceTrees = sourceTrees.concat(broccoli.bowerTrees())
sourceTrees = sourceTrees.concat(findBowerTrees())

var appAndDependencies = new mergeTrees(sourceTrees, { overwrite: true })

Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"broccoli-template": "^0.1.0",
"broccoli-coffee": "^0.1.0",
"broccoli-sass": "^0.1.0",
"broccoli-merge-trees": "^0.1.3"
"broccoli-merge-trees": "^0.1.3",
"broccoli-bower": "^0.2.0"
}
}

0 comments on commit 829e869

Please sign in to comment.