chore: lock down merge2

SimenB · SimenB · commit 77fc7fbef6fd · 2021-05-10T22:27:23.000+02:00
diff --git a/package.json b/package.json
@@ -141,6 +141,7 @@
     ]
   },
   "resolutions": {
-    "**/@types/webpack-sources/source-map": "0.6.1"
+    "**/@types/webpack-sources/source-map": "0.6.1",
+    "merge2": "~1.2.3"
   }
 }
diff --git a/yarn.lock b/yarn.lock
@@ -5375,10 +5375,10 @@ merge-stream@^2.0.0:
   resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
   integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
 
-merge2@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.3.tgz#7ee99dbd69bb6481689253f018488a1b902b0ed5"
-  integrity sha512-gdUU1Fwj5ep4kplwcmftruWofEFt6lfpkkr3h860CXbAB9c3hGb55EOL2ali0Td5oebvW0E1+3Sr+Ur7XfKpRA==
+merge2@^1.2.3, merge2@~1.2.3:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.4.tgz#c9269589e6885a60cf80605d9522d4b67ca646e3"
+  integrity sha512-FYE8xI+6pjFOhokZu0We3S5NKCirLbCzSh2Usf3qEyr4X8U+0jNg9P8RZ4qz+V2UoECLVwSyzU3LxXBaLGtD3A==
 
 methods@~1.1.2:
   version "1.1.2"

Original file line number	Diff line number	Diff line change
`@@ -141,6 +141,7 @@`
`141`	`141`	`]`
`142`	`142`	`},`
`143`	`143`	`"resolutions": {`
`144`		`- "**/@types/webpack-sources/source-map": "0.6.1"`
	`144`	`+ "**/@types/webpack-sources/source-map": "0.6.1",`
	`145`	`+ "merge2": "~1.2.3"`
`145`	`146`	`}`
`146`	`147`	`}`