-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Bump lodash.merge from 4.6.1 to 4.6.2
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
1 parent
5a80f1e
commit 9bac3b3
Showing
2 changed files
with
174 additions
and
6 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -135,6 +135,63 @@ atob@^2.1.1: | |
| version "2.1.2" | ||
| resolved "http://registry.npm.taobao.org/atob/download/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" | ||
|
|
||
| babel-code-frame@^6.22.0, babel-code-frame@^6.26.0: | ||
| version "6.26.0" | ||
| resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b" | ||
| dependencies: | ||
| chalk "^1.1.3" | ||
| esutils "^2.0.2" | ||
| js-tokens "^3.0.2" | ||
|
|
||
| babel-eslint@^7.2.1: | ||
| version "7.2.3" | ||
| resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-7.2.3.tgz#b2fe2d80126470f5c19442dc757253a897710827" | ||
| dependencies: | ||
| babel-code-frame "^6.22.0" | ||
| babel-traverse "^6.23.1" | ||
| babel-types "^6.23.0" | ||
| babylon "^6.17.0" | ||
|
|
||
| babel-messages@^6.23.0: | ||
| version "6.23.0" | ||
| resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e" | ||
| dependencies: | ||
| babel-runtime "^6.22.0" | ||
|
|
||
| babel-runtime@^6.22.0, babel-runtime@^6.26.0: | ||
| version "6.26.0" | ||
| resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" | ||
| dependencies: | ||
| core-js "^2.4.0" | ||
| regenerator-runtime "^0.11.0" | ||
|
|
||
| babel-traverse@^6.23.1: | ||
| version "6.26.0" | ||
| resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee" | ||
| dependencies: | ||
| babel-code-frame "^6.26.0" | ||
| babel-messages "^6.23.0" | ||
| babel-runtime "^6.26.0" | ||
| babel-types "^6.26.0" | ||
| babylon "^6.18.0" | ||
| debug "^2.6.8" | ||
| globals "^9.18.0" | ||
| invariant "^2.2.2" | ||
| lodash "^4.17.4" | ||
|
|
||
| babel-types@^6.23.0, babel-types@^6.26.0: | ||
| version "6.26.0" | ||
| resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497" | ||
| dependencies: | ||
| babel-runtime "^6.26.0" | ||
| esutils "^2.0.2" | ||
| lodash "^4.17.4" | ||
| to-fast-properties "^1.0.3" | ||
|
|
||
| babylon@^6.17.0, babylon@^6.18.0: | ||
| version "6.18.0" | ||
| resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3" | ||
|
|
||
| balanced-match@^1.0.0: | ||
| version "1.0.0" | ||
| resolved "http://registry.npm.taobao.org/balanced-match/download/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" | ||
|
|
@@ -165,6 +222,10 @@ bluebird@^3.0.6, bluebird@^3.2.2, bluebird@^3.4.0: | |
| version "3.5.1" | ||
| resolved "http://registry.npm.taobao.org/bluebird/download/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9" | ||
|
|
||
| bluebird@^3.5.0: | ||
| version "3.7.2" | ||
| resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" | ||
|
|
||
| boolbase@~1.0.0: | ||
| version "1.0.0" | ||
| resolved "http://registry.npm.taobao.org/boolbase/download/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" | ||
|
|
@@ -417,6 +478,10 @@ core-js@^1.1.1: | |
| version "1.2.7" | ||
| resolved "http://registry.npm.taobao.org/core-js/download/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636" | ||
|
|
||
| core-js@^2.4.0: | ||
| version "2.6.11" | ||
| resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c" | ||
|
|
||
| core-util-is@~1.0.0: | ||
| version "1.0.2" | ||
| resolved "http://registry.npm.taobao.org/core-util-is/download/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" | ||
|
|
@@ -453,7 +518,7 @@ cuid@~1.3.8: | |
| core-js "^1.1.1" | ||
| node-fingerprint "0.0.2" | ||
|
|
||
| debug@*, [email protected], debug@^2.1.2, debug@^2.2.0, debug@^2.3.3: | ||
| debug@*, [email protected], debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8: | ||
| version "2.6.9" | ||
| resolved "http://registry.npm.taobao.org/debug/download/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" | ||
| dependencies: | ||
|
|
@@ -562,6 +627,10 @@ esprima@^4.0.0: | |
| version "4.0.1" | ||
| resolved "http://registry.npm.taobao.org/esprima/download/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" | ||
|
|
||
| esutils@^2.0.2: | ||
| version "2.0.3" | ||
| resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" | ||
|
|
||
| etag@~1.8.1: | ||
| version "1.8.1" | ||
| resolved "http://registry.npm.taobao.org/etag/download/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" | ||
|
|
@@ -752,6 +821,10 @@ glob@^6.0.1: | |
| once "^1.3.0" | ||
| path-is-absolute "^1.0.0" | ||
|
|
||
| globals@^9.18.0: | ||
| version "9.18.0" | ||
| resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a" | ||
|
|
||
| graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.4: | ||
| version "4.1.11" | ||
| resolved "http://registry.npm.taobao.org/graceful-fs/download/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658" | ||
|
|
@@ -821,6 +894,18 @@ hexo-cli@^1.1.0: | |
| resolve "^1.5.0" | ||
| tildify "^1.2.0" | ||
|
|
||
| hexo-deployer-git@^0.3.1: | ||
| version "0.3.1" | ||
| resolved "https://registry.yarnpkg.com/hexo-deployer-git/-/hexo-deployer-git-0.3.1.tgz#26b085ecc50e2cc99ecd33d56c254c5544c02d21" | ||
| dependencies: | ||
| babel-eslint "^7.2.1" | ||
| bluebird "^3.5.0" | ||
| chalk "^1.1.3" | ||
| hexo-fs "^0.2.0" | ||
| hexo-util "^0.6.0" | ||
| moment "^2.18.0" | ||
| swig "^1.4.2" | ||
|
|
||
| hexo-front-matter@^0.2.2: | ||
| version "0.2.3" | ||
| resolved "http://registry.npm.taobao.org/hexo-front-matter/download/hexo-front-matter-0.2.3.tgz#c7ca8ef420ea36bd85e8408a2e8c9bf49efa605e" | ||
|
|
@@ -857,6 +942,12 @@ hexo-generator-index@^0.2.1: | |
| hexo-pagination "0.0.2" | ||
| object-assign "^4.0.1" | ||
|
|
||
| hexo-generator-searchdb@^1.0.8: | ||
| version "1.2.0" | ||
| resolved "https://registry.yarnpkg.com/hexo-generator-searchdb/-/hexo-generator-searchdb-1.2.0.tgz#ebf1ec38be78d447d4ae7b7f358d312473a7a90b" | ||
| dependencies: | ||
| nunjucks "^3.2.0" | ||
|
|
||
| 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" | ||
|
|
@@ -1018,6 +1109,12 @@ ini@~1.3.0: | |
| version "1.3.5" | ||
| resolved "http://registry.npm.taobao.org/ini/download/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" | ||
|
|
||
| invariant@^2.2.2: | ||
| version "2.2.4" | ||
| resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6" | ||
| dependencies: | ||
| loose-envify "^1.0.0" | ||
|
|
||
| invert-kv@^1.0.0: | ||
| version "1.0.0" | ||
| resolved "http://registry.npm.taobao.org/invert-kv/download/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6" | ||
|
|
@@ -1180,6 +1277,14 @@ isobject@^3.0.0, isobject@^3.0.1: | |
| version "3.0.1" | ||
| resolved "http://registry.npm.taobao.org/isobject/download/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" | ||
|
|
||
| "js-tokens@^3.0.0 || ^4.0.0": | ||
| version "4.0.0" | ||
| resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" | ||
|
|
||
| js-tokens@^3.0.2: | ||
| version "3.0.2" | ||
| resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" | ||
|
|
||
| js-yaml@^3.6.1: | ||
| version "3.12.0" | ||
| resolved "http://registry.npm.taobao.org/js-yaml/download/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1" | ||
|
|
@@ -1254,8 +1359,8 @@ lodash.map@^4.4.0: | |
| resolved "http://registry.npm.taobao.org/lodash.map/download/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3" | ||
|
|
||
| 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" | ||
| version "4.6.2" | ||
| resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" | ||
|
|
||
| lodash.pick@^4.2.1: | ||
| version "4.4.0" | ||
|
|
@@ -1273,6 +1378,10 @@ lodash.some@^4.4.0: | |
| version "4.6.0" | ||
| resolved "http://registry.npm.taobao.org/lodash.some/download/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d" | ||
|
|
||
| lodash@^4.17.4: | ||
| version "4.17.15" | ||
| resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" | ||
|
|
||
| lodash@^4.17.5, lodash@^4.2.1: | ||
| version "4.17.10" | ||
| resolved "http://registry.npm.taobao.org/lodash/download/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7" | ||
|
|
@@ -1281,6 +1390,12 @@ longest@^1.0.1: | |
| version "1.0.1" | ||
| resolved "http://registry.npm.taobao.org/longest/download/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097" | ||
|
|
||
| loose-envify@^1.0.0: | ||
| version "1.4.0" | ||
| resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" | ||
| dependencies: | ||
| js-tokens "^3.0.0 || ^4.0.0" | ||
|
|
||
| lower-case@^1.1.1: | ||
| version "1.1.4" | ||
| resolved "http://registry.npm.taobao.org/lower-case/download/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac" | ||
|
|
@@ -1424,6 +1539,10 @@ moment-timezone@^0.5.14: | |
| version "2.22.2" | ||
| resolved "http://registry.npm.taobao.org/moment/download/moment-2.22.2.tgz#3c257f9839fc0e93ff53149632239eb90783ff66" | ||
|
|
||
| moment@^2.18.0: | ||
| version "2.24.0" | ||
| resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b" | ||
|
|
||
| morgan@^1.6.1: | ||
| version "1.9.0" | ||
| resolved "http://registry.npm.taobao.org/morgan/download/morgan-1.9.0.tgz#d01fa6c65859b76fcf31b3cb53a3821a311d8051" | ||
|
|
@@ -1573,6 +1692,16 @@ nunjucks@^3.1.2: | |
| optionalDependencies: | ||
| chokidar "^2.0.0" | ||
|
|
||
| nunjucks@^3.2.0: | ||
| version "3.2.0" | ||
| resolved "https://registry.yarnpkg.com/nunjucks/-/nunjucks-3.2.0.tgz#53e95f43c9555e822e8950008a201b1002d49933" | ||
| dependencies: | ||
| a-sync-waterfall "^1.0.0" | ||
| asap "^2.0.3" | ||
| yargs "^3.32.0" | ||
| optionalDependencies: | ||
| chokidar "^2.0.0" | ||
|
|
||
| object-assign@^2.0.0: | ||
| version "2.1.1" | ||
| resolved "http://registry.npm.taobao.org/object-assign/download/object-assign-2.1.1.tgz#43c36e5d569ff8e4816c4efa8be02d26967c18aa" | ||
|
|
@@ -1753,6 +1882,10 @@ readdirp@^2.0.0: | |
| readable-stream "^2.0.2" | ||
| set-immediate-shim "^1.0.1" | ||
|
|
||
| regenerator-runtime@^0.11.0: | ||
| version "0.11.1" | ||
| resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" | ||
|
|
||
| regex-cache@^0.4.2: | ||
| version "0.4.4" | ||
| resolved "http://registry.npm.taobao.org/regex-cache/download/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd" | ||
|
|
@@ -1946,6 +2079,12 @@ source-map-url@^0.4.0: | |
| version "0.4.0" | ||
| resolved "http://registry.npm.taobao.org/source-map-url/download/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3" | ||
|
|
||
| [email protected]: | ||
| version "0.1.34" | ||
| resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.34.tgz#a7cfe89aec7b1682c3b198d0acfb47d7d090566b" | ||
| dependencies: | ||
| amdefine ">=0.0.4" | ||
|
|
||
| [email protected]: | ||
| version "0.1.43" | ||
| resolved "http://registry.npm.taobao.org/source-map/download/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346" | ||
|
|
@@ -2057,6 +2196,13 @@ swig-templates@^2.0.2: | |
| optimist "~0.6" | ||
| uglify-js "2.6.0" | ||
|
|
||
| swig@^1.4.2: | ||
| version "1.4.2" | ||
| resolved "https://registry.yarnpkg.com/swig/-/swig-1.4.2.tgz#4085ca0453369104b5d483e2841b39b7ae1aaba5" | ||
| dependencies: | ||
| optimist "~0.6" | ||
| uglify-js "~2.4" | ||
|
|
||
| tar@^4: | ||
| version "4.4.6" | ||
| resolved "http://registry.npm.taobao.org/tar/download/tar-4.4.6.tgz#63110f09c00b4e60ac8bcfe1bf3c8660235fbc9b" | ||
|
|
@@ -2087,6 +2233,10 @@ titlecase@^1.1.2: | |
| version "1.1.2" | ||
| resolved "http://registry.npm.taobao.org/titlecase/download/titlecase-1.1.2.tgz#78113d1108086b8326331a3247dea8f5a49ea853" | ||
|
|
||
| to-fast-properties@^1.0.3: | ||
| version "1.0.3" | ||
| resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47" | ||
|
|
||
| to-object-path@^0.3.0: | ||
| version "0.3.0" | ||
| resolved "http://registry.npm.taobao.org/to-object-path/download/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" | ||
|
|
@@ -2118,6 +2268,15 @@ [email protected]: | |
| uglify-to-browserify "~1.0.0" | ||
| yargs "~3.10.0" | ||
|
|
||
| uglify-js@~2.4: | ||
| version "2.4.24" | ||
| resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.4.24.tgz#fad5755c1e1577658bb06ff9ab6e548c95bebd6e" | ||
| dependencies: | ||
| async "~0.2.6" | ||
| source-map "0.1.34" | ||
| uglify-to-browserify "~1.0.0" | ||
| yargs "~3.5.4" | ||
|
|
||
| uglify-to-browserify@~1.0.0: | ||
| version "1.0.2" | ||
| resolved "http://registry.npm.taobao.org/uglify-to-browserify/download/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7" | ||
|
|
@@ -2252,3 +2411,12 @@ yargs@~3.10.0: | |
| cliui "^2.1.0" | ||
| decamelize "^1.0.0" | ||
| window-size "0.1.0" | ||
|
|
||
| yargs@~3.5.4: | ||
| version "3.5.4" | ||
| resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.5.4.tgz#d8aff8f665e94c34bd259bdebd1bfaf0ddd35361" | ||
| dependencies: | ||
| camelcase "^1.0.2" | ||
| decamelize "^1.0.0" | ||
| window-size "0.1.0" | ||
| wordwrap "0.0.2" | ||