Merge pull request #123 from rwjblue/update-ember-cli

Update ember-cli to latest released version.

.travis.yml

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

ember-cli-build.js

@@ -0,0 +1,82 @@
+var Funnel = require('broccoli-funnel');
+var mergeTrees = require('broccoli-merge-trees');
+var Babel = require('broccoli-babel-transpiler');
+var concat   = require('broccoli-sourcemap-concat');
+
+
+module.exports = function() {
+  // --- Dependencies ---
+  var loader = new Funnel('bower_components', {
+    srcDir: 'loader.js',
+    files: ['loader.js'],
+    destDir: '/assets'
+  });
+
+  var klassy = new Funnel('bower_components', {
+    srcDir: '/klassy/lib',
+    files: ['klassy.js'],
+    destDir: '/'
+  });
+
+  // --- Project Files  ---
+
+  var lib = new Funnel('lib', {
+    srcDir: '/',
+    include: ['**/*.js'],
+    destDir: '/'
+  });
+
+  var tests = new Funnel('tests', {
+    srcDir: '/',
+    include: ['**/*.js'],
+    destDir: '/tests'
+  });
+
+  var main = mergeTrees([klassy, lib, tests]);
+
+  // --- Compile ES6 modules ---
+
+  main = new Babel(main, {
+    loose: true,
+    moduleIds: true,
+    modules: 'amdStrict'
+  });
+
+  main = concat(main, {
+    inputFiles: ['**/*.js'],
+    outputFile: '/assets/ember-test-helpers-tests.amd.js'
+  });
+
+  // --- Select and concat vendor / support files ---
+
+  var vendor = concat('bower_components', {
+    inputFiles: ['jquery/dist/jquery.js',
+                 'ember/ember-template-compiler.js',
+                 'ember/ember.debug.js',
+                 'ember-data/ember-data.js',
+                 'FakeXMLHttpRequest/fake_xml_http_request.js',
+                 'route-recognizer/dist/route-recognizer.js',
+                 'pretender/pretender.js'],
+    outputFile: '/assets/vendor.js'
+  });
+
+  var qunit = new Funnel('bower_components', {
+    srcDir: '/qunit/qunit',
+    files: ['qunit.js', 'qunit.css'],
+    destDir: '/assets'
+  });
+
+  var testIndex = new Funnel('tests', {
+    srcDir: '/',
+    files: ['index.html'],
+    destDir: '/tests'
+  });
+
+  var testSupport = concat('bower_components', {
+    inputFiles: ['ember-cli-shims/app-shims.js',
+                 'ember-cli-test-loader/test-loader.js'],
+    outputFile: '/assets/test-support.js'
+  });
+
+  return mergeTrees([main, vendor, testIndex, qunit, loader, testSupport]);
+};

package.json

@@ -21,14 +21,12 @@
   "license": "Apache Version 2.0 and MIT",
   "readmeFilename": "README.md",
   "devDependencies": {
-    "broccoli": "^0.13.0",
     "broccoli-babel-transpiler": "^5.4.5",
     "broccoli-funnel": "^0.2.13",
     "broccoli-merge-trees": "^0.1.4",
     "broccoli-sourcemap-concat": "^0.4.3",
-    "ember-cli": "^0.2.7",
+    "ember-cli": "1.13.13",
     "ember-cli-release": "^0.2.4",
-    "ember-try": "0.0.8",
-    "testem": "^0.6.19"
+    "ember-try": "0.0.8"
   }
 }

testem.json

@@ -1,6 +1,5 @@
 {
   "framework": "qunit",
-  "cwd": "build/",
   "serve_files": [
     "assets/loader.js",
     "assets/vendor.js",