Skip to content

Commit

Permalink
Merge branch 'feature/dependencies' into develop
Browse files Browse the repository at this point in the history
* feature/dependencies:
  Update peerDependencies
  ⬆️ Update dependencies
  • Loading branch information
apertureless committed Sep 16, 2017
2 parents 37a9281 + 3fea6f4 commit b71cd6c
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 25 deletions.
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@
"lodash.merge": "^4.6.0"
},
"peerDependencies": {
"chart.js": "^2.6.0",
"vue": "^2.4.2"
"chart.js": "^2.7.0",
"vue": "^2.4.4"
},
"devDependencies": {
"babel-cli": "^6.24.1",
Expand All @@ -73,7 +73,7 @@
"babel-preset-stage-2": "^6.24.1",
"babel-runtime": "^6.23.0",
"chai": "^3.5.0",
"chart.js": "^2.6.0",
"chart.js": "^2.7.0",
"chromedriver": "^2.28.0",
"connect-history-api-fallback": "^1.1.0",
"cross-env": "^3.2.4",
Expand Down Expand Up @@ -118,7 +118,7 @@
"sinon": "^2.1.0",
"sinon-chai": "^2.9.0",
"url-loader": "^0.5.8",
"vue": "^2.4.2",
"vue": "^2.4.4",
"vue-hot-reload-api": "^2.1.0",
"vue-html-loader": "^1.2.4",
"vue-loader": "^12.2.2",
Expand Down
49 changes: 28 additions & 21 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1129,24 +1129,24 @@ [email protected]:
upper-case "^1.1.1"
upper-case-first "^1.1.0"

chart.js@^2.6.0:
version "2.6.0"
resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-2.6.0.tgz#308f9a4b0bfed5a154c14f5deb1d9470d22abe71"
chart.js@^2.7.0:
version "2.7.0"
resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-2.7.0.tgz#330dbbee0c66199eb715f60fbf8ca4029609a529"
dependencies:
chartjs-color "^2.1.0"
moment "^2.10.6"
chartjs-color "~2.2.0"
moment "~2.18.0"

chartjs-color-string@^0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/chartjs-color-string/-/chartjs-color-string-0.4.0.tgz#57748d4530ae28d8db0a5492182ba06dfdf2f468"
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.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/chartjs-color/-/chartjs-color-2.1.0.tgz#9c39ac830ccd98996ae80c9f11086ff12c98a756"
chartjs-color@~2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/chartjs-color/-/chartjs-color-2.2.0.tgz#84a2fb755787ed85c39dd6dd8c7b1d88429baeae"
dependencies:
chartjs-color-string "^0.4.0"
chartjs-color-string "^0.5.0"
color-convert "^0.5.3"

chokidar@^1.0.0, chokidar@^1.4.1, chokidar@^1.6.1:
Expand Down Expand Up @@ -3790,9 +3790,9 @@ mocha@^3.1.0:
mkdirp "0.5.1"
supports-color "3.1.2"

moment@^2.10.6:
version "2.17.1"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.17.1.tgz#fed9506063f36b10f066c8b59a144d7faebe1d82"
moment@~2.18.0:
version "2.18.1"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.18.1.tgz#c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f"

[email protected]:
version "0.7.1"
Expand Down Expand Up @@ -5735,16 +5735,23 @@ vue-loader@^12.2.2:
vue-style-loader "^3.0.0"
vue-template-es2015-compiler "^1.2.2"

vue-style-loader@^3.0.0, vue-style-loader@^3.0.1:
vue-style-loader@^3.0.0:
version "3.0.1"
resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-3.0.1.tgz#c8b639bb2f24baf9d78274dc17e4f264c1deda08"
dependencies:
hash-sum "^1.0.2"
loader-utils "^1.0.2"

vue-style-loader@^3.0.1:
version "3.0.3"
resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-3.0.3.tgz#623658f81506aef9d121cdc113a4f5c9cac32df7"
dependencies:
hash-sum "^1.0.2"
loader-utils "^1.0.2"

vue-template-compiler@^2.4.2:
version "2.4.2"
resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.4.2.tgz#5a45d843f148b098f6c1d1e35ac20c4956d30ad1"
version "2.4.4"
resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.4.4.tgz#2cde3b704124985c27d50b5387c9691ba515fb57"
dependencies:
de-indent "^1.0.2"
he "^1.1.0"
Expand All @@ -5753,9 +5760,9 @@ vue-template-es2015-compiler@^1.2.2:
version "1.4.0"
resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.4.0.tgz#7b88853ca4bf8d84ae54ab9e56771de271e60198"

vue@^2.4.2:
version "2.4.2"
resolved "https://registry.yarnpkg.com/vue/-/vue-2.4.2.tgz#a9855261f191c978cc0dc1150531b8d08149b58c"
vue@^2.4.4:
version "2.4.4"
resolved "https://registry.yarnpkg.com/vue/-/vue-2.4.4.tgz#ea9550b96a71465fd2b8b17b61673b3561861789"

watchpack@^0.2.1:
version "0.2.9"
Expand Down

0 comments on commit b71cd6c

Please sign in to comment.