Skip to content

Commit b71cd6c

Browse files
committed
Merge branch 'feature/dependencies' into develop
* feature/dependencies: Update peerDependencies ⬆️ Update dependencies
2 parents 37a9281 + 3fea6f4 commit b71cd6c

File tree

2 files changed

+32
-25
lines changed

2 files changed

+32
-25
lines changed

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@
6060
"lodash.merge": "^4.6.0"
6161
},
6262
"peerDependencies": {
63-
"chart.js": "^2.6.0",
64-
"vue": "^2.4.2"
63+
"chart.js": "^2.7.0",
64+
"vue": "^2.4.4"
6565
},
6666
"devDependencies": {
6767
"babel-cli": "^6.24.1",
@@ -73,7 +73,7 @@
7373
"babel-preset-stage-2": "^6.24.1",
7474
"babel-runtime": "^6.23.0",
7575
"chai": "^3.5.0",
76-
"chart.js": "^2.6.0",
76+
"chart.js": "^2.7.0",
7777
"chromedriver": "^2.28.0",
7878
"connect-history-api-fallback": "^1.1.0",
7979
"cross-env": "^3.2.4",
@@ -118,7 +118,7 @@
118118
"sinon": "^2.1.0",
119119
"sinon-chai": "^2.9.0",
120120
"url-loader": "^0.5.8",
121-
"vue": "^2.4.2",
121+
"vue": "^2.4.4",
122122
"vue-hot-reload-api": "^2.1.0",
123123
"vue-html-loader": "^1.2.4",
124124
"vue-loader": "^12.2.2",

yarn.lock

Lines changed: 28 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1129,24 +1129,24 @@ [email protected]:
11291129
upper-case "^1.1.1"
11301130
upper-case-first "^1.1.0"
11311131

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

1139-
chartjs-color-string@^0.4.0:
1140-
version "0.4.0"
1141-
resolved "https://registry.yarnpkg.com/chartjs-color-string/-/chartjs-color-string-0.4.0.tgz#57748d4530ae28d8db0a5492182ba06dfdf2f468"
1139+
chartjs-color-string@^0.5.0:
1140+
version "0.5.0"
1141+
resolved "https://registry.yarnpkg.com/chartjs-color-string/-/chartjs-color-string-0.5.0.tgz#8d3752d8581d86687c35bfe2cb80ac5213ceb8c1"
11421142
dependencies:
11431143
color-name "^1.0.0"
11441144

1145-
chartjs-color@^2.1.0:
1146-
version "2.1.0"
1147-
resolved "https://registry.yarnpkg.com/chartjs-color/-/chartjs-color-2.1.0.tgz#9c39ac830ccd98996ae80c9f11086ff12c98a756"
1145+
chartjs-color@~2.2.0:
1146+
version "2.2.0"
1147+
resolved "https://registry.yarnpkg.com/chartjs-color/-/chartjs-color-2.2.0.tgz#84a2fb755787ed85c39dd6dd8c7b1d88429baeae"
11481148
dependencies:
1149-
chartjs-color-string "^0.4.0"
1149+
chartjs-color-string "^0.5.0"
11501150
color-convert "^0.5.3"
11511151

11521152
chokidar@^1.0.0, chokidar@^1.4.1, chokidar@^1.6.1:
@@ -3790,9 +3790,9 @@ mocha@^3.1.0:
37903790
mkdirp "0.5.1"
37913791
supports-color "3.1.2"
37923792

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

37973797
37983798
version "0.7.1"
@@ -5735,16 +5735,23 @@ vue-loader@^12.2.2:
57355735
vue-style-loader "^3.0.0"
57365736
vue-template-es2015-compiler "^1.2.2"
57375737

5738-
vue-style-loader@^3.0.0, vue-style-loader@^3.0.1:
5738+
vue-style-loader@^3.0.0:
57395739
version "3.0.1"
57405740
resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-3.0.1.tgz#c8b639bb2f24baf9d78274dc17e4f264c1deda08"
57415741
dependencies:
57425742
hash-sum "^1.0.2"
57435743
loader-utils "^1.0.2"
57445744

5745+
vue-style-loader@^3.0.1:
5746+
version "3.0.3"
5747+
resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-3.0.3.tgz#623658f81506aef9d121cdc113a4f5c9cac32df7"
5748+
dependencies:
5749+
hash-sum "^1.0.2"
5750+
loader-utils "^1.0.2"
5751+
57455752
vue-template-compiler@^2.4.2:
5746-
version "2.4.2"
5747-
resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.4.2.tgz#5a45d843f148b098f6c1d1e35ac20c4956d30ad1"
5753+
version "2.4.4"
5754+
resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.4.4.tgz#2cde3b704124985c27d50b5387c9691ba515fb57"
57485755
dependencies:
57495756
de-indent "^1.0.2"
57505757
he "^1.1.0"
@@ -5753,9 +5760,9 @@ vue-template-es2015-compiler@^1.2.2:
57535760
version "1.4.0"
57545761
resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.4.0.tgz#7b88853ca4bf8d84ae54ab9e56771de271e60198"
57555762

5756-
vue@^2.4.2:
5757-
version "2.4.2"
5758-
resolved "https://registry.yarnpkg.com/vue/-/vue-2.4.2.tgz#a9855261f191c978cc0dc1150531b8d08149b58c"
5763+
vue@^2.4.4:
5764+
version "2.4.4"
5765+
resolved "https://registry.yarnpkg.com/vue/-/vue-2.4.4.tgz#ea9550b96a71465fd2b8b17b61673b3561861789"
57595766

57605767
watchpack@^0.2.1:
57615768
version "0.2.9"

0 commit comments

Comments
 (0)