Merge pull request #187 from Turbo87/update-deps

Update dependencies

.gitignore

@@ -3,3 +3,4 @@ bower_components
 tmp
 dist
 build
+/.node_modules.ember-try

.travis.yml

@@ -8,6 +8,3 @@ install:
   - npm install -g bower
   - npm install --no-optional
   - bower install
-
-script:
-  - ./node_modules/.bin/ember try:each

bower.json

@@ -28,7 +28,7 @@
   },
   "devDependencies": {
     "qunit": "^1.23.1",
-    "pretender": "~0.10.1",
+    "pretender": "^1.4.1",
     "ember-cli-shims": "0.0.6",
     "ember-cli-test-loader": "0.0.4",
     "jquery": "~2.1.4"

ember-cli-build.js

@@ -1,7 +1,7 @@
 var Funnel = require('broccoli-funnel');
 var mergeTrees = require('broccoli-merge-trees');
 var Babel = require('broccoli-babel-transpiler');
-var concat   = require('broccoli-sourcemap-concat');
+var concat   = require('broccoli-concat');
 var JSHint = require('broccoli-jshint');
 var existsSync = require('exists-sync');
 
@@ -46,7 +46,8 @@ module.exports = function(options) {
   var addonTree = mergeTrees(addonTreesFor('addon'));
   var addonModulesTree = new Funnel(addonTree, {
     srcDir: 'modules',
-    destDir: '/'
+    destDir: '/',
+    allowEmpty: true,
   });
 
   var main = mergeTrees(mainTrees.concat(addonModulesTree));
@@ -77,7 +78,7 @@ module.exports = function(options) {
   }
 
   var vendor = concat('bower_components', {
-    inputFiles: inputFiles,
+    headerFiles: inputFiles,
     outputFile: '/assets/vendor.js'
   });
 
@@ -94,7 +95,7 @@ module.exports = function(options) {
   });
 
   var testSupport = concat('bower_components', {
-    inputFiles: ['ember-cli-shims/app-shims.js',
+    headerFiles: ['ember-cli-shims/app-shims.js',
                  'ember-cli-test-loader/test-loader.js'],
     outputFile: '/assets/test-support.js'
   });

package.json

@@ -9,7 +9,7 @@
   },
   "scripts": {
     "start": "ember serve",
-    "test": "ember test"
+    "test": "ember try:each"
   },
   "authors": [
     "Dan Gebhardt",
@@ -22,13 +22,12 @@
   "readmeFilename": "README.md",
   "devDependencies": {
     "broccoli-babel-transpiler": "^5.5.0",
-    "broccoli-funnel": "^0.2.15",
+    "broccoli-concat": "^3.0.5",
+    "broccoli-funnel": "^1.0.5",
     "broccoli-jshint": "^1.1.2",
-    "broccoli-merge-trees": "^0.2.4",
-    "broccoli-sourcemap-concat": "^0.4.4",
-    "ember-cli": "1.13.13",
+    "broccoli-merge-trees": "^1.1.5",
+    "ember-cli": "^2.10.0",
     "ember-cli-release": "^1.0.0-beta.1",
-    "ember-try": "0.2.2",
     "exists-sync": "0.0.3",
     "loader.js": "^4.0.10"
   },