Merge remote-tracking branch 'origin/version3'

Author: aomran

addon/components/ember-chart.js

@@ -1,5 +1,5 @@
 import Ember from 'ember';
-/* global Chart */
+import Chart from 'npm:chart.js';
 
 export default Ember.Component.extend({
   tagName: 'canvas',

app/components/ember-chart.js

@@ -1,3 +1,4 @@
 import EmberChart from 'ember-cli-chart/components/ember-chart';
+import Chart from 'npm:chart.js';
 
 export default EmberChart;

blueprints/ember-cli-chart/index.js

@@ -1,7 +1,12 @@
+const RSVP = require('rsvp');
+
 module.exports = {
   normalizeEntityName: function() {},
 
   afterInstall: function() {
-    return this.addBowerPackageToProject('chartjs', '2.1.1');
+    return RSVP.all([
+      this.addPackageToProject('chart.js', '2.2.1'),
+      this.addAddonToProject('ember-browserify')
+    ]);
   }
 };

bower.json

@@ -4,7 +4,6 @@
     "ember": "~2.5.0",
     "ember-cli-shims": "0.1.1",
     "ember-cli-test-loader": "0.2.2",
-    "ember-qunit-notifications": "0.1.0",
-    "chartjs": "2.1.1"
+    "ember-qunit-notifications": "0.1.0"
   }
 }

index.js

@@ -2,11 +2,5 @@
 'use strict';
 
 module.exports = {
-  name: 'ember-cli-chart',
-
-  included: function included(app) {
-    this._super.included(app);
-
-    app.import(app.bowerDirectory + '/chartjs/dist/Chart.js');
-  }
+  name: 'ember-cli-chart'
 };

package.json

@@ -29,7 +29,9 @@
   "homepage": "https://github.com/aomran/ember-cli-chart",
   "devDependencies": {
     "broccoli-asset-rev": "^2.4.2",
+    "chart.js": "^2.2.1",
     "ember-ajax": "0.7.1",
+    "ember-browserify": "1.1.11",
     "ember-cli": "2.5.0",
     "ember-cli-app-version": "^1.0.0",
     "ember-cli-dependency-checker": "^1.2.0",