Merge pull request #75 from aomran/upgradeto2133

upgrade ember-CLI and Chart.js

Author: aomran

.bowerrc

@@ -1,7 +1,7 @@
 module.exports = {
   root: true,
   parserOptions: {
-    ecmaVersion: 6,
+    ecmaVersion: 2017,
     sourceType: 'module'
   },
   extends: 'eslint:recommended',

.eslintrc.js

@@ -8,7 +8,6 @@ sudo: false
 cache:
   directories:
     - $HOME/.npm
-    - $HOME/.cache # includes bowers cache
 
 env:
   # we recommend testing LTS's and latest stable release (bonus points to beta/canary)

.travis.yml

@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.org/aomran/ember-cli-chart.svg)](https://travis-ci.org/aomran/ember-cli-chart)
 
-This Ember CLI addon is a simple wrapper for [ChartJS](http://www.chartjs.org/) (v2.5.0). This addon uses Ember-CLI v2.12.1.
+This Ember CLI addon is a simple wrapper for [ChartJS](http://www.chartjs.org/) (v2.6.0).
 
 ### Installation
 

README.md

@@ -1,6 +1,6 @@
 {
   "name": "ember-cli-chart",
-  "version": "3.2.2",
+  "version": "3.3.0",
   "description": "Ember component for ChartJS",
   "directories": {
     "doc": "doc",
@@ -11,9 +11,6 @@
     "start": "ember server",
     "test": "ember try:each"
   },
-  "engines": {
-    "node": ">= 4"
-  },
   "repository": {
     "type": "git",
     "url": "https://github.com/aomran/ember-cli-chart.git"
@@ -29,28 +26,31 @@
   "homepage": "https://github.com/aomran/ember-cli-chart",
   "devDependencies": {
     "broccoli-asset-rev": "^2.4.5",
-    "ember-ajax": "^2.4.1",
-    "ember-cli": "2.12.1",
+    "ember-ajax": "^3.0.0",
+    "ember-cli": "2.13.3",
     "ember-cli-dependency-checker": "^1.3.0",
     "ember-cli-eslint": "^3.0.0",
     "ember-cli-htmlbars": "^1.1.1",
-    "ember-cli-htmlbars-inline-precompile": "^0.3.6",
+    "ember-cli-htmlbars-inline-precompile": "^0.4.0",
     "ember-cli-inject-live-reload": "^1.4.1",
-    "ember-cli-qunit": "^3.1.0",
-    "ember-cli-shims": "^1.0.2",
+    "ember-cli-qunit": "^4.0.0",
+    "ember-cli-shims": "^1.1.0",
     "ember-cli-sri": "^2.1.0",
     "ember-cli-uglify": "^1.2.0",
-    "ember-disable-prototype-extensions": "^1.1.0",
-    "ember-export-application-global": "^1.0.5",
-    "ember-load-initializers": "^0.6.0",
-    "ember-resolver": "^2.0.3",
-    "ember-source": "~2.12.0",
-    "ember-welcome-page": "^2.0.2",
+    "ember-disable-prototype-extensions": "^1.1.2",
+    "ember-export-application-global": "^2.0.0",
+    "ember-load-initializers": "^1.0.0",
+    "ember-resolver": "^4.0.0",
+    "ember-source": "~2.13.3",
+    "ember-welcome-page": "^3.0.0",
     "loader.js": "^4.2.3"
   },
   "dependencies": {
-    "chart.js": "^2.5.0",
-    "ember-cli-babel": "^5.1.7"
+    "chart.js": "^2.6.0",
+    "ember-cli-babel": "^6.3.0"
+  },
+  "engines": {
+    "node": "^4.5 || 6.* || >= 7.*"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config"

package.json

@@ -0,0 +1,10 @@
+/* eslint-env node */
+
+module.exports = {
+  browsers: [
+    'ie 9',
+    'last 1 Chrome versions',
+    'last 1 Firefox versions',
+    'last 1 Safari versions'
+  ]
+};

testem.json

@@ -2,5 +2,7 @@ import resolver from './helpers/resolver';
 import {
   setResolver
 } from 'ember-qunit';
+import { start } from 'ember-cli-qunit';
 
 setResolver(resolver);
+start();