Merge pull request #17 from Exelord/update-packages

Update packages

Author: Exelord

.npmignore

@@ -8,7 +8,7 @@
 .editorconfig
 .ember-cli
 .gitignore
-.jshintrc
+.eslintrc.js
 .watchmanconfig
 .travis.yml
 bower.json

.travis.yml

@@ -1,7 +1,7 @@
 ---
 language: node_js
 node_js:
-  - "4"
+  - "6"
 
 sudo: false
 

app/.gitkeep

@@ -1,6 +1,3 @@
 {
-  "name": "ember-custom-actions",
-  "devDependencies": {
-    "bootstrap": "^3.3.7"
-  }
+  "name": "ember-custom-actions"
 }

bower.json

@@ -1,4 +1,4 @@
-/* eslint no-undef: 0 no-var: 0 */
+/* eslint-env node */
 module.exports = {
   scenarios: [
     {

config/ember-try.js

@@ -1,4 +1,4 @@
-/* eslint no-undef: 0 no-var: 0 */
+/* eslint-env node */
 'use strict';
 
 module.exports = function(/* environment, appConfig */) {

config/environment.js

@@ -1,7 +1,6 @@
 /* eslint no-var:0*/
-/* global require, module */
-
-var EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
+/* eslint-env node */
+const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
 
 module.exports = function(defaults) {
   var config = defaults.project.config(EmberAddon.env());
@@ -30,6 +29,5 @@ module.exports = function(defaults) {
     behave. You most likely want to be modifying `./index.js` or app's build file
   */
 
-  app.import('bower_components/bootstrap/dist/js/bootstrap.min.js');
   return app.toTree();
 };

ember-cli-build.js

@@ -1,4 +1,4 @@
-/* jshint node: true */
+/* eslint-env node */
 'use strict';
 
 module.exports = {

index.js

@@ -31,46 +31,46 @@
   "devDependencies": {
     "bootstrap-sass": "^3.3.7",
     "broccoli-asset-rev": "^2.4.5",
-    "ember-ajax": "^2.4.1",
-    "ember-bootstrap": "1.0.0-alpha.4",
+    "ember-ajax": "^2.5.6",
+    "ember-bootstrap": "1.0.0-alpha.9",
     "ember-browserify": "1.1.13",
-    "ember-cli": "2.11.0",
-    "ember-cli-app-version": "^2.0.0",
+    "ember-cli": "2.12.1",
+    "ember-cli-app-version": "3.0.0",
     "ember-cli-dependency-checker": "^1.3.0",
-    "ember-cli-eslint": "3.0.0",
+    "ember-cli-eslint": "^3.0.0",
     "ember-cli-favicon": "1.0.0-beta.4",
     "ember-cli-github-pages": "0.1.2",
     "ember-cli-htmlbars": "^1.1.1",
-    "ember-cli-htmlbars-inline-precompile": "^0.3.3",
+    "ember-cli-htmlbars-inline-precompile": "^0.3.6",
     "ember-cli-inject-live-reload": "^1.4.1",
     "ember-cli-pretender": "1.0.1",
     "ember-cli-qunit": "^3.0.1",
-    "ember-cli-release": "^0.2.9",
-    "ember-cli-sass": "6.1.1",
+    "ember-cli-release": "^1.0.0-beta.2",
+    "ember-cli-sass": "6.1.2",
     "ember-cli-shims": "^1.0.2",
     "ember-cli-sri": "^2.1.0",
-    "ember-cli-test-loader": "^1.1.0",
+    "ember-cli-test-loader": "^2.1.0",
     "ember-cli-uglify": "^1.2.0",
-    "ember-data": "^2.11.0",
+    "ember-data": "~2.12.0",
     "ember-disable-prototype-extensions": "^1.1.0",
-    "ember-export-application-global": "^1.0.5",
-    "ember-font-awesome": "3.0.3",
-    "ember-initials": "2.4.0",
-    "ember-load-initializers": "^0.6.0",
-    "ember-resolver": "^2.0.3",
-    "ember-scroll-to": "0.5.4",
-    "ember-source": "^2.11.0",
+    "ember-export-application-global": "^2.0.0",
+    "ember-font-awesome": "3.0.5",
+    "ember-initials": "3.1.0",
+    "ember-load-initializers": "^1.0.0",
+    "ember-resolver": "^4.1.0",
+    "ember-scroll-to": "0.6.4",
+    "ember-source": "~2.12.0",
     "ember-suave": "4.0.1",
     "eslint-plugin-ember-suave": "^1.0.0",
     "express": "^4.14.1",
-    "faker": "^3.1.0",
-    "glob": "^4.5.3",
-    "loader.js": "^4.0.10",
+    "faker": "^4.1.0",
+    "glob": "^7.1.1",
+    "loader.js": "^4.2.3",
     "morgan": "^1.8.0",
     "pretender": "1.4.2"
   },
   "engines": {
-    "node": ">= 0.12.0"
+    "node": ">= 4"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config",

package.json

@@ -1,13 +1,13 @@
-/*jshint node:true*/
+/* eslint-env node */
 module.exports = {
-  "framework": "qunit",
-  "test_page": "tests/index.html?hidepassed",
-  "disable_watching": true,
-  "launch_in_ci": [
-    "PhantomJS"
+  'framework': 'qunit',
+  'test_page': 'tests/index.html?hidepassed',
+  'disable_watching': true,
+  'launch_in_ci': [
+    'PhantomJS'
   ],
-  "launch_in_dev": [
-    "PhantomJS",
-    "Chrome"
+  'launch_in_dev': [
+    'PhantomJS',
+    'Chrome'
   ]
 };

testem.js

@@ -1,5 +1,5 @@
-/* jshint node: true */
-/* eslint no-undef: 0 no-var: 0 */
+/* eslint no-var: 0 */
+/* eslint-env node */
 
 module.exports = function(environment) {
   var ENV = {