Skip to content

Commit

Permalink
Update chart.js
Browse files Browse the repository at this point in the history
Get rid of custom moment dependency resolutions as chart.js stopped
having a fixed moment version in its dependencies: see
chartjs/Chart.js#4891.
  • Loading branch information
tusbar committed Mar 22, 2018
1 parent 7965949 commit 421e1e0
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 14 deletions.
5 changes: 1 addition & 4 deletions package.json
Expand Up @@ -13,7 +13,7 @@
"heroku-postbuild": "yarn install --production=false && yarn build"
},
"dependencies": {
"chart.js": "^2.7.1",
"chart.js": "^2.7.2",
"compression": "^1.7.1",
"cross-env": "^5.1.3",
"express": "^4.16.2",
Expand All @@ -40,9 +40,6 @@
"react-table": "^6.7.5",
"underscore.string": "^3.3.4"
},
"resolutions": {
"chart.js/moment": "^2.19.4"
},
"devDependencies": {
"babel-eslint": "^8.0.3",
"babel-plugin-dotenv-import": "^1.3.1",
Expand Down
20 changes: 10 additions & 10 deletions yarn.lock
Expand Up @@ -1485,20 +1485,20 @@ chalk@^2.1.0:
escape-string-regexp "^1.0.5"
supports-color "^4.0.0"

chart.js@^2.7.1:
version "2.7.1"
resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-2.7.1.tgz#ae90b4aa4ff1f02decd6b1a2a8dabfd73c9f9886"
chart.js@^2.7.2:
version "2.7.2"
resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-2.7.2.tgz#3c9fde4dc5b95608211bdefeda7e5d33dffa5714"
dependencies:
chartjs-color "~2.2.0"
moment "~2.18.0"
chartjs-color "^2.1.0"
moment "^2.10.2"

chartjs-color-string@^0.5.0:
version "0.5.0"
resolved "https://registry.yarnpkg.com/chartjs-color-string/-/chartjs-color-string-0.5.0.tgz#8d3752d8581d86687c35bfe2cb80ac5213ceb8c1"
dependencies:
color-name "^1.0.0"

chartjs-color@~2.2.0:
chartjs-color@^2.1.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/chartjs-color/-/chartjs-color-2.2.0.tgz#84a2fb755787ed85c39dd6dd8c7b1d88429baeae"
dependencies:
Expand Down Expand Up @@ -4703,14 +4703,14 @@ mock-local-storage@^1.0.5:
core-js "^0.8.3"
global "^4.3.2"

moment@^2.10.2, moment@^2.19.4:
version "2.19.4"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.19.4.tgz#17e5e2c6ead8819c8ecfad83a0acccb312e94682"

moment@^2.11.2:
version "2.18.1"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.18.1.tgz#c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f"

moment@^2.19.4, moment@~2.18.0:
version "2.19.4"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.19.4.tgz#17e5e2c6ead8819c8ecfad83a0acccb312e94682"

move-concurrently@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
Expand Down

0 comments on commit 421e1e0

Please sign in to comment.