Commit 3649fa75 authored by Øyvind Evju's avatar Øyvind Evju

[yarn] Force merge version 1.2.1, to avoid security issue in merge 1.2.0

parent b559d41e
......@@ -55,6 +55,9 @@
"webpack-deadcode-plugin": "^0.1.7",
"xhr-mock": "^2.3.2"
},
"resolutions": {
"merge": "1.2.1"
},
"jest": {
"testURL": "http://localhost/",
"moduleFileExtensions": [
......
......@@ -6889,10 +6889,10 @@ merge2@^1.2.1:
resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.3.tgz#7ee99dbd69bb6481689253f018488a1b902b0ed5"
integrity sha512-gdUU1Fwj5ep4kplwcmftruWofEFt6lfpkkr3h860CXbAB9c3hGb55EOL2ali0Td5oebvW0E1+3Sr+Ur7XfKpRA==
merge@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da"
integrity sha1-dTHjnUlJwoGma4xabgJl6LBYlNo=
merge@1.2.1, merge@^1.2.0:
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"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment