Merge pull request #200 from rwjblue/update-for-latest-ember-data

Updates to ensure ember-data from npm works properly.

.travis.yml

@@ -1,7 +1,7 @@
 sudo: false
 language: node_js
 node_js:
-- 'stable'
+- '6'
 
 install:
   - npm install -g npm

ember-cli-build.js

@@ -9,14 +9,26 @@ module.exports = function(options) {
   var project = options.project;
   project.initializeAddons();
 
-  function addonTreesFor(type) {
+  function eachAddonInvoke(method, args) {
     return project.addons.map(function(addon) {
-      if (addon.treeFor) {
-        return addon.treeFor(type);
+      if (addon[method]) {
+        return addon[method].apply(addon, args);
       }
-    }).filter(Boolean);
+    });
   }
 
+  function addonTreesFor(type) {
+    return eachAddonInvoke('treeFor', [type]).filter(Boolean);
+  }
+
+  var fakeApp = {
+    import() { }
+  };
+
+  project.addons.map(function(addon) { addon.app = fakeApp; });
+
+  eachAddonInvoke('included', [{ import() { }}]);
+
   // --- Dependencies ---
   var addonVendorTrees = mergeTrees(addonTreesFor('vendor'));
   var loader = new Funnel(addonVendorTrees, {
@@ -44,13 +56,8 @@ module.exports = function(options) {
 
   var mainTrees = [lib, tests, libESLint, testESLint];
   var addonTree = mergeTrees(addonTreesFor('addon'));
-  var addonModulesTree = new Funnel(addonTree, {
-    srcDir: 'modules',
-    destDir: '/',
-    allowEmpty: true,
-  });
 
-  var main = mergeTrees(mainTrees.concat(addonModulesTree));
+  var main = mergeTrees(mainTrees);
   // --- Compile ES6 modules ---
 
   main = new Babel(main, {
@@ -59,6 +66,8 @@ module.exports = function(options) {
     modules: 'amdStrict'
   });
 
+  main = mergeTrees([main, addonTree]);
+
   main = concat(main, {
     inputFiles: ['**/*.js'],
     outputFile: '/assets/ember-test-helpers-tests.amd.js'