From cb616f18341680f39f29920063d75ebd6a68b407 Mon Sep 17 00:00:00 2001 From: Lucas Di Pentima Date: Tue, 11 May 2021 16:21:56 -0300 Subject: [PATCH] 17653: Upgrades merge. Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima --- package.json | 1 + yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index cb7cca32..4e14a290 100644 --- 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 d435b298..4fab1ca5 100644 --- 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" -- 2.30.2