Skip to content

Commit

Permalink
Bump merge from 1.2.0 to 1.2.1
Browse files Browse the repository at this point in the history 
Bumps [merge](https://github.com/yeikos/js.merge) from 1.2.0 to 1.2.1.
- [Release notes](https://github.com/yeikos/js.merge/releases)
- [Commits](swordev/merge@v1.2.0...v1.2.1)

Signed-off-by: dependabot[bot] <[email protected]>
  • Loading branch information
@dependabot
dependabot[bot] authored May 8, 2022
1 parent dbd63d1 commit 13fd2fe
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 47 deletions.
33 changes: 17 additions & 16 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

63 changes: 32 additions & 31 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ babel-messages@^6.23.0:

babel-plugin-istanbul@^4.1.5:
version "4.1.6"
resolved "http://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.6.tgz"
resolved "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.6.tgz"
dependencies:
babel-plugin-syntax-object-rest-spread "^6.13.0"
find-up "^2.1.0"
Expand All @@ -458,7 +458,7 @@ babel-plugin-jest-hoist@^22.4.4:

babel-plugin-syntax-object-rest-spread@^6.13.0:
version "6.13.0"
resolved "http://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz"
resolved "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz"

babel-preset-jest@^22.4.4:
version "22.4.4"
Expand Down Expand Up @@ -618,7 +618,7 @@ browser-resolve@^1.11.2:

browserify-aes@^1.0.0, browserify-aes@^1.0.4:
version "1.2.0"
resolved "http://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz"
resolved "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz"
dependencies:
buffer-xor "^1.0.3"
cipher-base "^1.0.0"
Expand Down Expand Up @@ -646,7 +646,7 @@ browserify-des@^1.0.0:

browserify-rsa@^4.0.0:
version "4.0.1"
resolved "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz"
resolved "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz"
dependencies:
bn.js "^4.1.0"
randombytes "^2.0.1"
Expand Down Expand Up @@ -691,7 +691,7 @@ buffer-xor@^1.0.3:

buffer@^4.3.0:
version "4.9.1"
resolved "http://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz"
resolved "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz"
dependencies:
base64-js "^1.0.2"
ieee754 "^1.1.4"
Expand Down Expand Up @@ -892,7 +892,7 @@ [email protected]:

[email protected]:
version "1.0.6"
resolved "http://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz"
resolved "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz"
dependencies:
delayed-stream "~1.0.0"

Expand Down Expand Up @@ -996,7 +996,7 @@ create-ecdh@^4.0.0:

create-hash@^1.1.0, create-hash@^1.1.2:
version "1.2.0"
resolved "http://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz"
resolved "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz"
dependencies:
cipher-base "^1.0.1"
inherits "^2.0.1"
Expand All @@ -1006,7 +1006,7 @@ create-hash@^1.1.0, create-hash@^1.1.2:

create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
version "1.1.7"
resolved "http://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz"
resolved "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz"
dependencies:
cipher-base "^1.0.3"
create-hash "^1.1.0"
Expand Down Expand Up @@ -1177,7 +1177,7 @@ diff@^3.2.0:

diffie-hellman@^5.0.0:
version "5.0.3"
resolved "http://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz"
resolved "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz"
dependencies:
bn.js "^4.1.0"
miller-rabin "^4.0.0"
Expand Down Expand Up @@ -1421,7 +1421,7 @@ expand-range@^1.8.1:

expect@^22.4.0:
version "22.4.3"
resolved "http://registry.npmjs.org/expect/-/expect-22.4.3.tgz"
resolved "https://registry.npmjs.org/expect/-/expect-22.4.3.tgz"
dependencies:
ansi-styles "^3.2.0"
jest-diff "^22.4.3"
Expand Down Expand Up @@ -1961,7 +1961,7 @@ is-buffer@^1.1.5:

is-builtin-module@^1.0.0:
version "1.0.0"
resolved "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz"
resolved "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz"
dependencies:
builtin-modules "^1.0.0"

Expand Down Expand Up @@ -2305,7 +2305,7 @@ jest-config@^22.4.4:

jest-diff@^22.4.0, jest-diff@^22.4.3:
version "22.4.3"
resolved "http://registry.npmjs.org/jest-diff/-/jest-diff-22.4.3.tgz"
resolved "https://registry.npmjs.org/jest-diff/-/jest-diff-22.4.3.tgz"
dependencies:
chalk "^2.0.1"
diff "^3.2.0"
Expand Down Expand Up @@ -2343,7 +2343,7 @@ jest-get-type@^22.1.0, jest-get-type@^22.4.3:

jest-haste-map@^22.4.2:
version "22.4.3"
resolved "http://registry.npmjs.org/jest-haste-map/-/jest-haste-map-22.4.3.tgz"
resolved "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-22.4.3.tgz"
dependencies:
fb-watchman "^2.0.0"
graceful-fs "^4.1.11"
Expand Down Expand Up @@ -2371,13 +2371,13 @@ jest-jasmine2@^22.4.4:

jest-leak-detector@^22.4.0:
version "22.4.3"
resolved "http://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-22.4.3.tgz"
resolved "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-22.4.3.tgz"
dependencies:
pretty-format "^22.4.3"

jest-matcher-utils@^22.4.0, jest-matcher-utils@^22.4.3:
version "22.4.3"
resolved "http://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-22.4.3.tgz"
resolved "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-22.4.3.tgz"
dependencies:
chalk "^2.0.1"
jest-get-type "^22.4.3"
Expand All @@ -2403,13 +2403,13 @@ jest-regex-util@^22.1.0, jest-regex-util@^22.4.3:

jest-resolve-dependencies@^22.1.0:
version "22.4.3"
resolved "http://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-22.4.3.tgz"
resolved "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-22.4.3.tgz"
dependencies:
jest-regex-util "^22.4.3"

jest-resolve@^22.4.2:
version "22.4.3"
resolved "http://registry.npmjs.org/jest-resolve/-/jest-resolve-22.4.3.tgz"
resolved "https://registry.npmjs.org/jest-resolve/-/jest-resolve-22.4.3.tgz"
dependencies:
browser-resolve "^1.11.2"
chalk "^2.0.1"
Expand Down Expand Up @@ -2461,7 +2461,7 @@ jest-serializer@^22.4.3:

jest-snapshot@^22.4.0:
version "22.4.3"
resolved "http://registry.npmjs.org/jest-snapshot/-/jest-snapshot-22.4.3.tgz"
resolved "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-22.4.3.tgz"
dependencies:
chalk "^2.0.1"
jest-diff "^22.4.3"
Expand Down Expand Up @@ -2749,7 +2749,7 @@ listr@^0.13.0:

load-json-file@^1.0.0:
version "1.1.0"
resolved "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz"
resolved "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz"
dependencies:
graceful-fs "^4.1.2"
parse-json "^2.2.0"
Expand Down Expand Up @@ -2898,8 +2898,9 @@ merge-stream@^1.0.1:
readable-stream "^2.0.1"

merge@^1.2.0:
version "1.2.0"
resolved "https://registry.npmjs.org/merge/-/merge-1.2.0.tgz"
version "1.2.1"
resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145"
integrity sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==

micromatch@^2.3.11:
version "2.3.11"
Expand Down Expand Up @@ -2974,11 +2975,11 @@ minimatch@^3.0.0, minimatch@^3.0.3, minimatch@^3.0.4:

[email protected]:
version "0.0.8"
resolved "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
resolved "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"

minimist@^1.1.1, minimist@^1.2.0:
version "1.2.0"
resolved "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"
resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"

minimist@~0.0.1:
version "0.0.10"
Expand Down Expand Up @@ -3008,7 +3009,7 @@ mixin-deep@^1.2.0:

[email protected], mkdirp@^0.5.1, mkdirp@~0.5.0:
version "0.5.1"
resolved "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"
resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"
dependencies:
minimist "0.0.8"

Expand Down Expand Up @@ -3273,7 +3274,7 @@ p-finally@^1.0.0:

p-is-promise@^1.1.0:
version "1.1.0"
resolved "http://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz"
resolved "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz"

p-limit@^1.1.0:
version "1.3.0"
Expand Down Expand Up @@ -3325,7 +3326,7 @@ parallel-transform@^1.1.0:

parse-asn1@^5.0.0:
version "5.1.1"
resolved "http://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz"
resolved "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz"
dependencies:
asn1.js "^4.0.0"
browserify-aes "^1.0.0"
Expand Down Expand Up @@ -3474,7 +3475,7 @@ pretty-format@^21.2.1:

pretty-format@^22.4.0, pretty-format@^22.4.3:
version "22.4.3"
resolved "http://registry.npmjs.org/pretty-format/-/pretty-format-22.4.3.tgz"
resolved "https://registry.npmjs.org/pretty-format/-/pretty-format-22.4.3.tgz"
dependencies:
ansi-regex "^3.0.0"
ansi-styles "^3.2.0"
Expand Down Expand Up @@ -3509,7 +3510,7 @@ psl@^1.1.24:

public-encrypt@^4.0.0:
version "4.0.2"
resolved "http://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz"
resolved "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz"
dependencies:
bn.js "^4.1.0"
browserify-rsa "^4.0.0"
Expand Down Expand Up @@ -3594,7 +3595,7 @@ read-pkg@^1.0.0:

"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6:
version "2.3.6"
resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz"
resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz"
dependencies:
core-util-is "~1.0.0"
inherits "~2.0.3"
Expand Down Expand Up @@ -3848,7 +3849,7 @@ setimmediate@^1.0.4:

sha.js@^2.4.0, sha.js@^2.4.8:
version "2.4.11"
resolved "http://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz"
resolved "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz"
dependencies:
inherits "^2.0.1"
safe-buffer "^5.0.1"
Expand Down Expand Up @@ -4641,7 +4642,7 @@ worker-farm@^1.5.2:

wrap-ansi@^2.0.0:
version "2.1.0"
resolved "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz"
resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz"
dependencies:
string-width "^1.0.1"
strip-ansi "^3.0.1"
Expand Down

0 comments on commit 13fd2fe

Please sign in to comment.