Skip to content

Commit 617a5ff

Browse files
authored
Merge pull request #71 from tylergets/master
Use Chart.js from NPM instead of Bower
2 parents 25f7272 + 43bf38d commit 617a5ff

File tree

4 files changed

+3
-10
lines changed

4 files changed

+3
-10
lines changed

.travis.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,11 @@ matrix:
2626

2727
before_install:
2828
- npm config set spin false
29-
- npm install -g bower phantomjs-prebuilt
30-
- bower --version
29+
- npm install -g phantomjs-prebuilt
3130
- phantomjs --version
3231

3332
install:
3433
- npm install
35-
- bower install
3634

3735
script:
3836
# Usually, it's ok to finish the test scenario without reverting

bower.json

-6
This file was deleted.

index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ module.exports = {
55
name: 'ember-cli-chart',
66
included: function included(app) {
77
this._super.included(app);
8-
app.import(app.bowerDirectory + '/chartjs/dist/Chart.js');
8+
app.import(app.project.nodeModulesPath + '/chart.js/dist/Chart.js');
99
}
1010
};

package.json

+1
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
"loader.js": "^4.2.3"
5050
},
5151
"dependencies": {
52+
"chart.js": "^2.5.0",
5253
"ember-cli-babel": "^5.1.7"
5354
},
5455
"ember-addon": {

0 commit comments

Comments
 (0)