Remove Brocfile from blueprint

joefiorini · stefanpenner · commit 16385cdbfefd · 2014-03-19T20:39:31.000-04:00
Now that we have internal support for preprocessors, we can remove the Brocfile from the generated build, thus addressing #75 & #96. As people try it out and open issues for things they wish were more configurable, I think we'll start to get a better idea for what we need to include.
diff --git a/Brocfile.js b/Brocfile.js
@@ -1,11 +1,13 @@
 /* global require, module */
-var filterTemplates = require('broccoli-template');
+var requireLocal = require('./lib/utilities/require-local');
 var uglifyJavaScript = require('broccoli-uglify-js');
 var compileES6 = require('broccoli-es6-concatenator');
-var p = require('ember-cli/lib/preprocessors');
+var p = require('./lib/preprocessors');
 var pickFiles = require('broccoli-static-compiler');
 var env = require('broccoli-env').getEnv();
 
+var localApp = requireLocal('../package');
+
 var preprocessCss = p.preprocessCss;
 var preprocessTemplates = p.preprocessTemplates;
 var preprocessJs = p.preprocessJs;
@@ -20,20 +22,20 @@ module.exports = function (broccoli) {
 
   app = pickFiles(app, {
     srcDir: '/',
-    destDir: '<%= modulePrefix %>/'
+    destDir: localApp.name + '/'
   });
 
   app = preprocessTemplates(app);
 
   config = pickFiles(config, {
     srcDir: '/',
     files: ['environment.*', 'environments/' + env + '.*'],
-    destDir: '<%= modulePrefix %>/config'
+    destDir: localApp.name + '/config'
   });
 
   tests = pickFiles(tests, {
     srcDir: '/',
-    destDir: '<%= modulePrefix %>/tests'
+    destDir: localApp.name + '/tests'
   });
 
   tests = preprocessTemplates(tests);
@@ -60,11 +62,11 @@ module.exports = function (broccoli) {
       'ember/resolver'
     ],
     inputFiles: [
-      '<%= modulePrefix %>/**/*.js'
+      localApp.name + '/**/*.js'
     ],
     legacyFilesToAppend: [
-      '<%= modulePrefix %>/config/environment.js',
-      '<%= modulePrefix %>/config/environments/' + env + '.js',
+      localApp.name + '/config/environment.js',
+      localApp.name + '/config/environments/' + env + '.js',
       'jquery.js',
       'handlebars.js',
       'ember.js',
@@ -77,7 +79,7 @@ module.exports = function (broccoli) {
     outputFile: '/assets/app.js'
   });
 
-  styles = preprocessCss(sourceTrees, '<%= modulePrefix %>/styles', '/assets');
+  styles = preprocessCss(sourceTrees, localApp.name + '/styles', '/assets');
 
   if (env === 'production') {
     applicationJs = uglifyJavaScript(applicationJs, {
diff --git a/lib/adapters/broccoli/build.js b/lib/adapters/broccoli/build.js
@@ -5,16 +5,12 @@ var fs = require('fs');
 var RSVP = require('rsvp');
 var ncp = require('ncp');
 var rimraf = require('rimraf');
+var builder = require('./builder');
 
 ncp.limit = 1;
 
-function getBuilder () {
-  var tree = broccoli.loadBrocfile();
-  return new broccoli.Builder(tree);
-}
-
 module.exports = function build(options) {
-  return getBuilder().build()
+  return builder(broccoli, options.appRoot).build()
     .then(function (dir) {
       var outputDir = options.outputPath || 'dist/';
 
diff --git a/lib/adapters/broccoli/builder.js b/lib/adapters/broccoli/builder.js
@@ -0,0 +1,13 @@
+module.exports = function getBuilder(broccoli, appRoot) {
+  var brocfile = require('../../../Brocfile');
+
+  process.chdir(appRoot);
+
+  var tree = brocfile(broccoli);
+
+  if(Array.isArray(tree)) {
+    tree = new broccoli.MergedTree(tree);
+  }
+
+  return new broccoli.Builder(tree);
+}
diff --git a/lib/adapters/broccoli/server.js b/lib/adapters/broccoli/server.js
@@ -3,15 +3,11 @@
 var broccoli = require('broccoli');
 var Promise = require('rsvp').Promise;
 var Server = require('../../server');
+var builder = require('./builder');
 var Watcher =  require('../../../node_modules/broccoli/lib/watcher');
 
-function getBuilder () {
-  var tree = broccoli.loadBrocfile();
-  return new broccoli.Builder(tree);
-}
-
 module.exports = function server(options) {
-  var watcher = new Watcher(getBuilder());
+  var watcher = new Watcher(builder(broccoli, options.appRoot));
 
   options.watcher = watcher;
 
diff --git a/lib/preprocessors/javascript.js b/lib/preprocessors/javascript.js
@@ -8,7 +8,6 @@ module.exports.supportedPlugins = {
 };
 
 module.exports.coffee = function(tree, inputPath, outputPath, options) {
-  console.log('compiling coffeescript to: ', outputPath);
   var compiler = requireLocal('broccoli-coffee');
   options = options || {};
   options.bare = true;
