From 5585523e1741fb09daa168acd209320c8e6fdee1 Mon Sep 17 00:00:00 2001
From: snyk-bot <snyk-bot@snyk.io>
Date: Tue, 2 Mar 2021 23:37:19 +0000
Subject: [PATCH] fix: package.json & package-lock.json to reduce
 vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-MERGE-1040469
- https://snyk.io/vuln/SNYK-JS-MERGE-1042987
---
 package-lock.json | 22 +++++++++++-----------
 package.json      |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5ac469f..13fb95f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3737,9 +3737,9 @@
       "dev": true
     },
     "core-js": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.9.0.tgz",
-      "integrity": "sha512-PyFBJaLq93FlyYdsndE5VaueA9K5cNB7CGzeCj191YYLhkQM0gdZR2SKihM70oF0wdqKSKClv/tEBOpoRmdOVQ=="
+      "version": "3.9.1",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.9.1.tgz",
+      "integrity": "sha512-gSjRvzkxQc1zjM/5paAmL4idJBFzuJoo+jDjF1tStYFMV2ERfD02HhahhCGXUyHxQRG4yFKVSdO6g62eoRMcDg=="
     },
     "core-js-compat": {
       "version": "3.9.0",
@@ -8734,9 +8734,9 @@
       }
     },
     "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",
@@ -12154,16 +12154,16 @@
       }
     },
     "typescript-rest-swagger": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/typescript-rest-swagger/-/typescript-rest-swagger-1.1.5.tgz",
-      "integrity": "sha512-IR4rSzlyZWbhtn8Abu4rjbDqbqktDWL2mLfMa8eOfEF7jZpZ4lqcZxM/9MJ7yuud0BgCwU70IYFBq1XPa8iMNw==",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/typescript-rest-swagger/-/typescript-rest-swagger-1.1.6.tgz",
+      "integrity": "sha512-7IS7v+hLcyTuOQebF5q/rvLtgW4RmD2TSj1UdLBRTE5fFi8PIRDQyr5N7Ho/tuWUSsRcSx6smo4pcVS2Oi1IXQ==",
       "requires": {
         "argparse": "^1.0.10",
         "debug": "^4.2.0",
         "fs-extra-promise": "^1.0.1",
         "glob": "^7.1.6",
-        "lodash": "^4.17.20",
-        "merge": "^1.2.1",
+        "lodash": "^4.17.21",
+        "merge": "^2.1.1",
         "minimatch": "^3.0.4",
         "mkdirp": "^1.0.4",
         "path": "^0.12.7",
diff --git a/package.json b/package.json
index bb5d80b..fb796cb 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
     "typescript-ioc": "^3.2.2",
     "typescript-rest": "^3.0.2",
     "typescript-rest-ioc": "^1.0.0",
-    "typescript-rest-swagger": "^1.1.5"
+    "typescript-rest-swagger": "^1.1.6"
   },
   "devDependencies": {
     "@babel/core": "^7.13.1",