From 33227b61ddd397f41d43b0d6abfa380162cac362 Mon Sep 17 00:00:00 2001
From: snyk-bot <snyk-bot@snyk.io>
Date: Wed, 24 Feb 2021 08:42:26 +0000
Subject: [PATCH] fix: large-file/package.json & large-file/package-lock.json
 to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-MERGE-1042987
---
 large-file/package-lock.json | 30 +++++++++++++++++++++---------
 large-file/package.json      |  4 ++--
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/large-file/package-lock.json b/large-file/package-lock.json
index fa2bba082..c9351fdef 100644
--- a/large-file/package-lock.json
+++ b/large-file/package-lock.json
@@ -15464,12 +15464,9 @@
       }
     },
     "exec-sh": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.2.1.tgz",
-      "integrity": "sha512-aLt95pexaugVtQerpmE51+4QfWrNc304uez7jvj6fWnN8GeEHpttB8F36n8N7uVhUMbH/1enbxQ9HImZ4w/9qg==",
-      "requires": {
-        "merge": "^1.1.3"
-      }
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.2.tgz",
+      "integrity": "sha512-9sLAvzhI5nc8TpuQUh4ahMdCrWT00wPWz7j47/emR5+2qEfoZP5zzUXvx+vdx+H6ohhnsYC31iX04QLYJK8zTg=="
     },
     "execa": {
       "version": "0.7.0",
@@ -23274,9 +23271,9 @@
       "integrity": "sha512-Mf9OHV/Y7h6YWDxTzX/b4ZZ4oh9NSXblQL8dtPCOomOtZciEHxePR78+uHFLLlsk01A6jVHhHsQZZ/WcIPpnzg=="
     },
     "merge": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz",
-      "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ=="
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/merge/-/merge-2.1.1.tgz",
+      "integrity": "sha512-jz+Cfrg9GWOZbQAnDQ4hlVnQky+341Yk5ru8bZSe6sIDTCIg8n9i/u7hSQGSVOF3C7lH6mGtqjkiT9G4wFLL0w=="
     },
     "merge-descriptors": {
       "version": "1.0.1",
@@ -37953,6 +37950,21 @@
       "requires": {
         "exec-sh": "^0.2.0",
         "minimist": "^1.2.0"
+      },
+      "dependencies": {
+        "exec-sh": {
+          "version": "0.2.2",
+          "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.2.2.tgz",
+          "integrity": "sha512-FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw==",
+          "requires": {
+            "merge": "^1.2.0"
+          }
+        },
+        "merge": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz",
+          "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ=="
+        }
       }
     },
     "watchify": {
diff --git a/large-file/package.json b/large-file/package.json
index 0e6486e35..eeed64ff0 100644
--- a/large-file/package.json
+++ b/large-file/package.json
@@ -599,7 +599,7 @@
     "eventemitter3": "3.1.0",
     "events": "1.1.1",
     "evp_bytestokey": "1.0.3",
-    "exec-sh": "^0.2.1",
+    "exec-sh": "^0.3.2",
     "execa": "0.7.0",
     "executable": "4.1.1",
     "exit-hook": "1.1.1",
@@ -984,7 +984,7 @@
     "memoizee": "0.3.10",
     "memory-fs": "0.4.1",
     "memory-pager": "1.1.0",
-    "merge": "^1.2.1",
+    "merge": "^2.1.1",
     "merge-descriptors": "1.0.1",
     "merge2": "1.2.2",
     "methods": "1.1.2",