Use broccoli-merge-trees plugin

broccolijs · Apr 1, 2014 · b6b30d5 · b6b30d5
1 parent ccd03da
commit b6b30d5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/Brocfile.js b/Brocfile.js
@@ -5,6 +5,7 @@ module.exports = function (broccoli) {
   var compileES6 = require('broccoli-es6-concatenator')
   var compileSass = require('broccoli-sass')
   var pickFiles = require('broccoli-static-compiler')
+  var mergeTrees = require('broccoli-merge-trees')
   var env = require('broccoli-env').getEnv()
 
   function preprocess (tree) {
@@ -47,7 +48,7 @@ module.exports = function (broccoli) {
   }
   sourceTrees = sourceTrees.concat(broccoli.bowerTrees())
 
-  var appAndDependencies = new broccoli.MergedTree(sourceTrees)
+  var appAndDependencies = new mergeTrees(sourceTrees, { overwrite: true })
 
   var appJs = compileES6(appAndDependencies, {
     loaderFile: 'loader.js',
@@ -79,5 +80,5 @@ module.exports = function (broccoli) {
 
   var publicFiles = 'public'
 
-  return [appJs, appCss, publicFiles]
+  return mergeTrees([appJs, appCss, publicFiles])
 }
diff --git a/package.json b/package.json
@@ -21,6 +21,7 @@
     "broccoli-es6-concatenator": "^0.1.0",
     "broccoli-template": "^0.1.0",
     "broccoli-coffee": "^0.1.0",
-    "broccoli-sass": "^0.1.0"
+    "broccoli-sass": "^0.1.0",
+    "broccoli-merge-trees": "^0.1.0"
   }
 }