Skip to content

Commit 4bc8790

Browse files
committed
build: update dependency merge2 to v1.2.4
1 parent 9ba07d2 commit 4bc8790

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"gulp-typescript": "5.0.1",
2626
"jest": "24.8.0",
2727
"lerna": "3.16.4",
28-
"merge2": "1.2.3",
28+
"merge2": "1.2.4",
2929
"prettier": "1.18.2",
3030
"react": "16.5.2",
3131
"react-test-renderer": "16.5.2",

yarn.lock

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6501,15 +6501,20 @@ merge-stream@^1.0.1:
65016501
dependencies:
65026502
readable-stream "^2.0.1"
65036503

6504-
merge2@1.2.3, merge2@^1.2.3:
6505-
version "1.2.3"
6506-
resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.3.tgz#7ee99dbd69bb6481689253f018488a1b902b0ed5"
6507-
integrity sha512-gdUU1Fwj5ep4kplwcmftruWofEFt6lfpkkr3h860CXbAB9c3hGb55EOL2ali0Td5oebvW0E1+3Sr+Ur7XfKpRA==
6504+
merge2@1.2.4:
6505+
version "1.2.4"
6506+
resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.4.tgz#c9269589e6885a60cf80605d9522d4b67ca646e3"
6507+
integrity sha512-FYE8xI+6pjFOhokZu0We3S5NKCirLbCzSh2Usf3qEyr4X8U+0jNg9P8RZ4qz+V2UoECLVwSyzU3LxXBaLGtD3A==
65086508

65096509
merge2@^1.2.1:
65106510
version "1.2.1"
65116511
resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.1.tgz#271d2516ff52d4af7f7b710b8bf3e16e183fef66"
65126512

6513+
merge2@^1.2.3:
6514+
version "1.2.3"
6515+
resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.3.tgz#7ee99dbd69bb6481689253f018488a1b902b0ed5"
6516+
integrity sha512-gdUU1Fwj5ep4kplwcmftruWofEFt6lfpkkr3h860CXbAB9c3hGb55EOL2ali0Td5oebvW0E1+3Sr+Ur7XfKpRA==
6517+
65136518
micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8:
65146519
version "3.1.10"
65156520
resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"

0 commit comments

Comments
 (0)