Skip to content

Commit

Permalink
Bump lodash.merge from 4.6.1 to 4.6.2
Browse files Browse the repository at this point in the history
Bumps [lodash.merge](https://github.com/lodash/lodash) from 4.6.1 to 4.6.2.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/commits)

Signed-off-by: dependabot[bot] <[email protected]>
  • Loading branch information
dependabot[bot] authored Jul 10, 2019
1 parent b9de9a9 commit 13d2241
Showing 1 changed file with 52 additions and 5 deletions.
57 changes: 52 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1013,6 +1013,15 @@ hexo-generator-index@^0.2.1:
hexo-pagination "0.0.2"
object-assign "^4.0.1"

hexo-generator-json-content@^4.1.3:
version "4.1.6"
resolved "https://registry.yarnpkg.com/hexo-generator-json-content/-/hexo-generator-json-content-4.1.6.tgz#5b754d181afca82190102082e37df84a675bcec9"
integrity sha512-53NOlya3k54lOMt3++Mejc+IiZAC8He5mioCuMMvHar1uzjAX86laBP8ymnHvX1nKXkayNsTALZlHxIr+afu8w==
dependencies:
hexo-util latest
keyword-extractor latest
moment latest

hexo-generator-tag@^0.2.0:
version "0.2.0"
resolved "http://registry.npm.taobao.org/hexo-generator-tag/download/hexo-generator-tag-0.2.0.tgz#c5715846bb41e57d9c20c1d66d7db21a1abf7a62"
Expand Down Expand Up @@ -1096,6 +1105,18 @@ hexo-util@^0.6.0, hexo-util@^0.6.2, hexo-util@^0.6.3:
html-entities "^1.2.0"
striptags "^2.1.1"

hexo-util@latest:
version "0.6.3"
resolved "https://registry.yarnpkg.com/hexo-util/-/hexo-util-0.6.3.tgz#16a2ade457bef955af0dfd22a3fe6f0a49a9137c"
integrity sha512-zPxaqCWZz3/25SAB4FlrRtWktJ+Pr+vBiv/nyHpXKgXPt1m70liViKlRwWLqDmRjJ72x6/k4qCEeXHajvcGHUw==
dependencies:
bluebird "^3.4.0"
camel-case "^3.0.0"
cross-spawn "^4.0.0"
highlight.js "^9.4.0"
html-entities "^1.2.0"
striptags "^2.1.1"

hexo@^3.8.0:
version "3.8.0"
resolved "http://registry.npm.taobao.org/hexo/download/hexo-3.8.0.tgz#4d05cce558ded5c14dfa1516bbae3971747f9747"
Expand Down Expand Up @@ -1404,6 +1425,14 @@ jsonparse@^1.2.0:
resolved "http://registry.npm.taobao.org/jsonparse/download/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=

keyword-extractor@latest:
version "0.0.16"
resolved "https://registry.yarnpkg.com/keyword-extractor/-/keyword-extractor-0.0.16.tgz#225342f85de31ef3087fd58f951d655d59e1d492"
integrity sha512-Dbp8sgZjpwYoYc2AIkKZfLsSPjnsDYhZ9/tVGjodoS/EbgrYEuwsOgJfWYT+GDYXQGU2LIGBbgGlYdHj06iYLg==
dependencies:
underscore "1.9.1"
underscore.string "3.3.5"

kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
version "3.2.2"
resolved "http://registry.npm.taobao.org/kind-of/download/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
Expand Down Expand Up @@ -1476,9 +1505,9 @@ lodash.map@^4.4.0:
integrity sha1-dx7Hg540c9nEzeKLGTlMNWL09tM=

lodash.merge@^4.4.0:
version "4.6.1"
resolved "http://registry.npm.taobao.org/lodash.merge/download/lodash.merge-4.6.1.tgz#adc25d9cb99b9391c59624f379fbba60d7111d54"
integrity sha1-rcJdnLmbk5HFliTzefu6YNcRHVQ=
version "4.6.2"
resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==

lodash.pick@^4.2.1:
version "4.4.0"
Expand Down Expand Up @@ -1676,6 +1705,11 @@ moment-timezone@^0.5.14:
resolved "http://registry.npm.taobao.org/moment/download/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
integrity sha1-DQVdU/UFKqZTyfbraLtdEr9cK1s=

moment@latest:
version "2.24.0"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==

morgan@^1.9.0:
version "1.9.1"
resolved "http://registry.npm.taobao.org/morgan/download/morgan-1.9.1.tgz#0a8d16734a1d9afbc824b99df87e738e58e2da59"
Expand Down Expand Up @@ -2304,7 +2338,7 @@ split-string@^3.0.1, split-string@^3.0.2:
dependencies:
extend-shallow "^3.0.0"

sprintf-js@^1.0.2:
sprintf-js@^1.0.2, sprintf-js@^1.0.3:
version "1.1.2"
resolved "http://registry.npm.taobao.org/sprintf-js/download/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673"
integrity sha1-2hdlJiv4wPVxdJ8q1sJjACB65nM=
Expand Down Expand Up @@ -2511,6 +2545,19 @@ uglify-to-browserify@~1.0.0:
resolved "http://registry.npm.taobao.org/uglify-to-browserify/download/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
integrity sha1-bgkk1r2mta/jSeOabWMoUKD4grc=

[email protected]:
version "3.3.5"
resolved "https://registry.yarnpkg.com/underscore.string/-/underscore.string-3.3.5.tgz#fc2ad255b8bd309e239cbc5816fd23a9b7ea4023"
integrity sha512-g+dpmgn+XBneLmXXo+sGlW5xQEt4ErkS3mgeN2GFbremYeMBSJKr9Wf2KJplQVaiPY/f7FN6atosWYNm9ovrYg==
dependencies:
sprintf-js "^1.0.3"
util-deprecate "^1.0.2"

[email protected]:
version "1.9.1"
resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.9.1.tgz#06dce34a0e68a7babc29b365b8e74b8925203961"
integrity sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg==

union-value@^1.0.0:
version "1.0.0"
resolved "http://registry.npm.taobao.org/union-value/download/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
Expand Down Expand Up @@ -2554,7 +2601,7 @@ use@^3.1.0:
resolved "http://registry.npm.taobao.org/use/download/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
integrity sha1-1QyMrHmhn7wg8pEfVuuXP04QBw8=

util-deprecate@^1.0.1, util-deprecate@~1.0.1:
util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
version "1.0.2"
resolved "http://registry.npm.taobao.org/util-deprecate/download/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
Expand Down

0 comments on commit 13d2241

Please sign in to comment.