Merge pull request #119 from aomran/version-3-7-upgrade-dependencies

Version 3.7: upgrade dependencies

Author: aomran

.editorconfig

@@ -4,7 +4,6 @@
 
 root = true
 
-
 [*]
 end_of_line = lf
 charset = utf-8

.eslintrc.js

@@ -1,9 +1,14 @@
+'use strict';
+
 module.exports = {
   root: true,
   parser: 'babel-eslint',
   parserOptions: {
     ecmaVersion: 2018,
-    sourceType: 'module'
+    sourceType: 'module',
+    ecmaFeatures: {
+      legacyDecorators: true
+    }
   },
   plugins: [
     'ember'
@@ -15,9 +20,7 @@ module.exports = {
   env: {
     browser: true
   },
-  rules: {
-    'ember/no-jquery': 'error'
-  },
+  rules: {},
   overrides: [
     // node files
     {
@@ -45,9 +48,7 @@ module.exports = {
         node: true
       },
       plugins: ['node'],
-      rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
-        // add your custom rules and overrides for node files here
-      })
+      extends: ['plugin:node/recommended']
     }
   ]
 };

.template-lintrc.js

@@ -1,5 +1,5 @@
 'use strict';
 
 module.exports = {
-  extends: 'recommended'
+  extends: 'octane'
 };

.travis.yml

@@ -3,10 +3,9 @@ language: node_js
 node_js:
   # we recommend testing addons with the same minimum supported node version as Ember CLI
   # so that your addon works for all apps
-  - "8"
+  - "10"
 
-sudo: false
-dist: trusty
+dist: xenial
 
 addons:
   chrome: stable
@@ -27,29 +26,34 @@ branches:
     - /^v\d+\.\d+\.\d+/
 
 jobs:
-  fail_fast: true
+  fast_finish: true
   allow_failures:
     - env: EMBER_TRY_SCENARIO=ember-canary
 
   include:
     # runs linting and tests with current locked deps
-
     - stage: "Tests"
       name: "Tests"
       script:
-        - npm run lint:hbs
-        - npm run lint:js
-        - npm test
+        - npm run lint
+        - npm run test:ember
+
+    - stage: "Additional Tests"
+      name: "Floating Dependencies"
+      install:
+        - npm install --no-package-lock
+      script:
+        - npm run test:ember
 
     # we recommend new addons test the current and previous LTS
     # as well as latest stable release (bonus points to beta/canary)
-    - stage: "Additional Tests"
-      env: EMBER_TRY_SCENARIO=ember-lts-3.4
-    - env: EMBER_TRY_SCENARIO=ember-lts-3.8
+    - env: EMBER_TRY_SCENARIO=ember-lts-3.12
+    - env: EMBER_TRY_SCENARIO=ember-lts-3.16
     - env: EMBER_TRY_SCENARIO=ember-release
     - env: EMBER_TRY_SCENARIO=ember-beta
     - env: EMBER_TRY_SCENARIO=ember-canary
     - env: EMBER_TRY_SCENARIO=ember-default-with-jquery
+    - env: EMBER_TRY_SCENARIO=ember-classic
 
 script:
   - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO

CONTRIBUTING.md

@@ -23,4 +23,4 @@
 * `ember serve`
 * Visit the dummy application at [http://localhost:4200](http://localhost:4200).
 
-For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
+For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).

README.md

@@ -5,6 +5,12 @@
 
 This Ember CLI addon is a simple wrapper for [ChartJS](http://www.chartjs.org/) (v2.8.0).
 
+### Compatibility
+
+- Ember.js v3.12 or above
+- Ember CLI v2.13 or above
+- Node.js v10 or above
+
 ### Installation
 
 ```
@@ -16,24 +22,24 @@ $ ember install ember-cli-chart
 In your handlebars template just do:
 
 ```hbs
-{{ember-chart 
-  type=CHARTTYPE 
-  data=CHARTDATA 
-  options=CHARTOPTIONS 
-  width=CHARTWIDTH 
-  height=CHARTHEIGHT 
+{{ember-chart
+  type=CHARTTYPE
+  data=CHARTDATA
+  options=CHARTOPTIONS
+  width=CHARTWIDTH
+  height=CHARTHEIGHT
   plugins=CHARTPLUGINS
   customLegendElement=CUSTOMLEGENDELEMENT
 }}
 ```
 
-* CHARTTYPE: String; one of the following -- `line`, `bar`, `radar`, `polarArea`, `pie` or `doughnut`.
-* CHARTDATA: Array; refer to the ChartJS documentation
-* CHARTOPTIONS: Object; refer to the ChartJS documentation. This is optional.
-* CHARTWIDTH: Number; pixel width of the canvas element. Only applies if the chart is NOT responsive.
-* CHARTHEIGHT: Number; pixel height of the canvas element. Only applies if the chart is NOT responsive.
-* CHARTPLUGINS: Array; refer to ChartJS documentaion. This is optional.
-* CUSTOMLEGENDELEMENT: HTMLElement; A custom element to put a custom legend in, when using `legendCallback`. This is optional.
+- CHARTTYPE: String; one of the following -- `line`, `bar`, `radar`, `polarArea`, `pie` or `doughnut`.
+- CHARTDATA: Array; refer to the ChartJS documentation
+- CHARTOPTIONS: Object; refer to the ChartJS documentation. This is optional.
+- CHARTWIDTH: Number; pixel width of the canvas element. Only applies if the chart is NOT responsive.
+- CHARTHEIGHT: Number; pixel height of the canvas element. Only applies if the chart is NOT responsive.
+- CHARTPLUGINS: Array; refer to ChartJS documentaion. This is optional.
+- CUSTOMLEGENDELEMENT: HTMLElement; A custom element to put a custom legend in, when using `legendCallback`. This is optional.
 
 #### Example
 
@@ -43,4 +49,4 @@ In your handlebars template just do:
 
 #### More Resources
 
-* [Screencast on creating bar charts with ember-cli-chart](https://www.emberscreencasts.com/posts/46-bar-charts-with-ember-cli-chart)
+- [Screencast on creating bar charts with ember-cli-chart](https://www.emberscreencasts.com/posts/46-bar-charts-with-ember-cli-chart)

addon/components/ember-chart.js

@@ -1,9 +1,9 @@
 /* global Chart */
-import Component from '@ember/component';
+import Component from "@ember/component";
 
 export default Component.extend({
-  tagName: 'canvas',
-  attributeBindings: ['width', 'height'],
+  tagName: "canvas",
+  attributeBindings: ["width", "height"],
 
   init() {
     this._super(...arguments);
@@ -14,11 +14,11 @@ export default Component.extend({
   didInsertElement() {
     this._super(...arguments);
 
-    let context = this.get('element');
-    let data    = this.get('data');
-    let type    = this.get('type');
-    let options = this.get('options');
-    let plugins = this.get('plugins');
+    let context = this.element;
+    let data = this.data;
+    let type = this.type;
+    let options = this.options;
+    let plugins = this.plugins;
 
     let chart = new Chart(context, {
       type: type,
@@ -27,12 +27,12 @@ export default Component.extend({
       plugins: plugins
     });
 
-    this.set('chart', chart);
+    this.set("chart", chart);
   },
 
   willDestroyElement() {
     this._super(...arguments);
-    this.get('chart').destroy();
+    this.chart.destroy();
   },
 
   didUpdateAttrs() {
@@ -41,23 +41,23 @@ export default Component.extend({
   },
 
   updateChart() {
-    let chart   = this.get('chart');
-    let data    = this.get('data');
-    let options = this.get('options');
-    let animate = this.get('animate');
-
-		if (chart) {
-			chart.data = data;
-			chart.options = options;
-			if (animate) {
-				chart.update();
-			} else {
-				chart.update(0);
-			}
-
-      if (options.legendCallback && this.get('customLegendElement')) {
-        this.get('customLegendElement').innerHTML = chart.generateLegend();
+    let chart = this.chart;
+    let data = this.data;
+    let options = this.options;
+    let animate = this.animate;
+
+    if (chart) {
+      chart.data = data;
+      chart.options = options;
+      if (animate) {
+        chart.update();
+      } else {
+        chart.update(0);
       }
-		}
+
+      if (options.legendCallback && this.customLegendElement) {
+        this.customLegendElement.innerHTML = chart.generateLegend();
+      }
+    }
   }
 });

app/components/ember-chart.js

@@ -1,3 +1,3 @@
-import EmberChart from 'ember-cli-chart/components/ember-chart';
+import EmberChart from "ember-cli-chart/components/ember-chart";
 
 export default EmberChart;

config/ember-try.js

@@ -6,18 +6,18 @@ module.exports = async function() {
   return {
     scenarios: [
       {
-        name: 'ember-lts-3.4',
+        name: 'ember-lts-3.12',
         npm: {
           devDependencies: {
-            'ember-source': '~3.4.0'
+            'ember-source': '~3.12.0'
           }
         }
       },
       {
-        name: 'ember-lts-3.8',
+        name: 'ember-lts-3.16',
         npm: {
           devDependencies: {
-            'ember-source': '~3.8.0'
+            'ember-source': '~3.16.0'
           }
         }
       },
@@ -67,6 +67,21 @@ module.exports = async function() {
             '@ember/jquery': '^0.5.1'
           }
         }
+      },
+      {
+        name: 'ember-classic',
+        env: {
+          EMBER_OPTIONAL_FEATURES: JSON.stringify({
+            'application-template-wrapper': true,
+            'default-async-observers': false,
+            'template-only-glimmer-components': false
+          })
+        },
+        npm: {
+          ember: {
+            edition: 'classic'
+          }
+        }
       }
     ]
   };