Skip to content

Commit 7b974d5

Browse files
authored
Merge branch 'master' into dependabot/npm_and_yarn/examples/plugin-development-101/project-example/webpack-dev-server-3.10.1
2 parents 8f3afa4 + 25fb341 commit 7b974d5

File tree

2 files changed

+19
-15
lines changed

2 files changed

+19
-15
lines changed

examples/plugin-development-101/project-example/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"lint": "vue-cli-service lint"
99
},
1010
"dependencies": {
11-
"axios": "^0.18.0",
11+
"axios": "^0.18.1",
1212
"vue": "^2.5.17"
1313
},
1414
"devDependencies": {

examples/plugin-development-101/project-example/yarn.lock

+18-14
Original file line numberDiff line numberDiff line change
@@ -1224,12 +1224,12 @@ aws4@^1.8.0:
12241224
version "1.8.0"
12251225
resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
12261226

1227-
axios@^0.18.0:
1228-
version "0.18.0"
1229-
resolved "https://registry.npmjs.org/axios/-/axios-0.18.0.tgz#32d53e4851efdc0a11993b6cd000789d70c05102"
1227+
axios@^0.18.1:
1228+
version "0.18.1"
1229+
resolved "https://registry.yarnpkg.com/axios/-/axios-0.18.1.tgz#ff3f0de2e7b5d180e757ad98000f1081b87bcea3"
12301230
dependencies:
1231-
follow-redirects "^1.3.0"
1232-
is-buffer "^1.1.5"
1231+
follow-redirects "1.5.10"
1232+
is-buffer "^2.0.2"
12331233

12341234
babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
12351235
version "6.26.0"
@@ -3234,8 +3234,8 @@ fsevents@^1.2.7:
32343234
node-pre-gyp "*"
32353235

32363236
fstream@^1.0.0, fstream@^1.0.2:
3237-
version "1.0.11"
3238-
resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
3237+
version "1.0.12"
3238+
resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045"
32393239
dependencies:
32403240
graceful-fs "^4.1.2"
32413241
inherits "~2.0.0"
@@ -3846,6 +3846,10 @@ is-buffer@^1.1.5:
38463846
version "1.1.6"
38473847
resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
38483848

3849+
is-buffer@^2.0.2:
3850+
version "2.0.4"
3851+
resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.4.tgz#3e572f23c8411a5cfd9557c849e3665e0b290623"
3852+
38493853
is-builtin-module@^1.0.0:
38503854
version "1.0.0"
38513855
resolved "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
@@ -4154,8 +4158,8 @@ js-tokens@^3.0.0, js-tokens@^3.0.2:
41544158
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
41554159

41564160
js-yaml@^3.12.0, js-yaml@^3.9.0, js-yaml@^3.9.1:
4157-
version "3.12.0"
4158-
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
4161+
version "3.13.1"
4162+
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
41594163
dependencies:
41604164
argparse "^1.0.7"
41614165
esprima "^4.0.0"
@@ -4353,8 +4357,8 @@ lodash.clonedeep@^4.3.2:
43534357
resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
43544358

43554359
lodash.defaultsdeep@^4.6.0:
4356-
version "4.6.0"
4357-
resolved "https://registry.yarnpkg.com/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.0.tgz#bec1024f85b1bd96cbea405b23c14ad6443a6f81"
4360+
version "4.6.1"
4361+
resolved "https://registry.yarnpkg.com/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.1.tgz#512e9bd721d272d94e3d3a63653fa17516741ca6"
43584362

43594363
lodash.mapvalues@^4.6.0:
43604364
version "4.6.0"
@@ -4381,8 +4385,8 @@ lodash.uniq@^4.5.0:
43814385
resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
43824386

43834387
lodash@^4.0.0, lodash@^4.13.1, lodash@^4.17.10, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.3.0, lodash@~4.17.10:
4384-
version "4.17.11"
4385-
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
4388+
version "4.17.15"
4389+
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
43864390

43874391
lodash@^4.17.11, lodash@^4.17.14:
43884392
version "4.17.15"
@@ -6168,7 +6172,7 @@ rimraf@2, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.2:
61686172
version "2.6.2"
61696173
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
61706174
dependencies:
6171-
glob "^7.0.5"
6175+
glob "^7.1.3"
61726176

61736177
rimraf@^2.6.1, rimraf@^2.6.3:
61746178
version "2.7.1"

0 commit comments

Comments
 (0)