HERO-10791: upgrade merge to ^2.1.1 to fix CVE (#52)

Author: matthewhartstonge

package.json

@@ -57,24 +57,25 @@
     "qunit-dom": "^0.8.0"
   },
   "resolutions": {
+    "**/fsevents": "npm:[email protected]",
     "@babel/core": "^7.26.9",
-    "@babel/traverse": "^7.26.9",
-    "@babel/types": "^7.26.9",
+    "@babel/helper-define-polyfill-provider": "^0.4.3",
     "@babel/plugin-transform-runtime": "^7.26.9",
     "@babel/preset-env": "^7.26.9",
-    "@babel/helper-define-polyfill-provider": "^0.4.3",
+    "@babel/traverse": "^7.26.9",
+    "@babel/types": "^7.26.9",
+    "ansi-html": "0.0.8",
     "babel-plugin-polyfill-corejs2": "^0.4.6",
     "babel-plugin-polyfill-corejs3": "^0.8.5",
     "babel-plugin-polyfill-es-shims": "^0.10.0",
     "babel-plugin-polyfill-regenerator": "^0.5.3",
-    "**/fsevents": "npm:[email protected]",
-    "cross-spawn": "7.0.5",
-    "path-to-regexp": "0.1.12",
-    "ansi-html": "0.0.8",
     "braces": "3.0.3",
+    "cross-spawn": "7.0.5",
+    "http-cache-semantics": "4.1.1",
     "json5": "1.0.2",
-    "terser": "4.8.1",
-    "http-cache-semantics": "4.1.1"
+    "merge": "^2.1.1",
+    "path-to-regexp": "0.1.12",
+    "terser": "4.8.1"
   },
   "engines": {
     "node": "6.* || 8.* || >= 10.*"

yarn.lock

@@ -6730,10 +6730,10 @@ merge2@^1.2.3, merge2@^1.3.0:
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
-merge@^1.2.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145"
-  integrity sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==
+merge@^1.2.0, merge@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/merge/-/merge-2.1.1.tgz#59ef4bf7e0b3e879186436e8481c06a6c162ca98"
+  integrity sha512-jz+Cfrg9GWOZbQAnDQ4hlVnQky+341Yk5ru8bZSe6sIDTCIg8n9i/u7hSQGSVOF3C7lH6mGtqjkiT9G4wFLL0w==
 
 methods@~1.1.2:
   version "1.1.2"