diff --git a/Brocfile.js b/Brocfile.js index de24f2f5..4392c149 100644 --- a/Brocfile.js +++ b/Brocfile.js @@ -1,5 +1,5 @@ var concat = require('broccoli-concat'); -var pickFiles = require('broccoli-static-compiler'); +var Funnel = require('broccoli-funnel'); var mergeTrees = require('broccoli-merge-trees'); var compileES6 = require('broccoli-es6-concatenator'); var jshintTree = require('broccoli-jshint'); @@ -8,34 +8,34 @@ var gitInfo = require('git-repo-info'); // --- Compile ES6 modules --- -var loader = pickFiles('bower_components', { +var loader = new Funnel('bower_components', { srcDir: 'loader', files: ['loader.js'], destDir: '/assets/' }); // TODO - this manual dependency management has got to go! -var klassy = pickFiles('bower_components', { +var klassy = new Funnel('bower_components', { srcDir: '/klassy/lib', files: ['klassy.js'], destDir: '/' }); -var emberTestHelpers = pickFiles('bower_components', { +var emberTestHelpers = new Funnel('bower_components', { srcDir: '/ember-test-helpers/lib', - files: ['**/*.js'], + include: [/.js$/], destDir: '/' }); var deps = mergeTrees([klassy, emberTestHelpers]); -var lib = pickFiles('lib', { +var lib = new Funnel('lib', { srcDir: '/', - files: ['**/*.js'], + include: [/.js$/], destDir: '/' }); -var tests = pickFiles('tests', { +var tests = new Funnel('tests', { srcDir: '/', - files: ['test-support/*.js', '*.js'], + include: [/test-support\/.+.js$/, /.js$/], destDir: '/tests' }); @@ -47,7 +47,7 @@ main = compileES6(main, { wrapInEval: false }); -var generatedBowerConfig = pickFiles('build-support', { +var generatedBowerConfig = new Funnel('build-support', { srcDir: '/', destDir: '/', files: ['bower.json'] @@ -62,7 +62,7 @@ generatedBowerConfig = replace(generatedBowerConfig, { } }); -var globalizedBuildSupport = pickFiles('build-support', { +var globalizedBuildSupport = new Funnel('build-support', { srcDir: '/', files: ['iife-start.js', 'globalize.js', 'iife-stop.js'], destDir: '/' @@ -95,13 +95,13 @@ var vendor = concat('bower_components', { outputFile: '/assets/vendor.js' }); -var qunit = pickFiles('bower_components', { +var qunit = new Funnel('bower_components', { srcDir: '/qunit/qunit', files: ['qunit.js', 'qunit.css'], destDir: '/assets' }); -var testIndex = pickFiles('tests', { +var testIndex = new Funnel('tests', { srcDir: '/', files: ['index.html'], destDir: '/tests' diff --git a/package.json b/package.json index 4d9012f8..383bc35b 100644 --- a/package.json +++ b/package.json @@ -22,11 +22,11 @@ "broccoli": "^0.13.0", "broccoli-concat": "^0.0.11", "broccoli-es6-concatenator": "^0.1.7", + "broccoli-funnel": "^0.1.6", "broccoli-jshint": "^0.5.3", "broccoli-merge-trees": "^0.1.4", - "broccoli-static-compiler": "^0.1.4", "broccoli-string-replace": "0.0.2", "git-repo-info": "^1.0.2", - "testem": "0.6.19" + "testem": "0.6.22" } }