17653: Upgrades merge.

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas@di-pentima.com.ar>

diff --git a/package.json b/package.json
index cb7cca3259c8ce7f5b299656bf39df3b7bff68b8..4e14a29026c2effc66d6ad2895e78cd604ae84c8 100644 (file)
--- a/package.json
+++ b/package.json
@@ -124,6 +124,7 @@
     "react-scripts-ts/**/**/**/**/js-yaml": "^3.13.1",
     "react-scripts-ts/uglifyjs-webpack-plugin/serialize-javascript": "^2.1.1",
     "react-scripts-ts/**/handlebars": "^4.7.7",
+    "react-scripts-ts/**/merge": "^2.1.1",
     "webpack/terser-webpack-plugin/serialize-javascript": "^2.1.1",
     "cypress/minimist": "1.2.5"
   }

diff --git a/yarn.lock b/yarn.lock
index d435b29889e2c5813ce3e6dd3ed3a61e4c9057d6..4fab1ca5e068d89f70285bda828af812e0dc3556 100644 (file)
--- a/yarn.lock
+++ b/yarn.lock
@@ -7249,10 +7249,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==
 
-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"