From 6123ce8dccf9144200c318d4cb8934f50f67322e Mon Sep 17 00:00:00 2001
From: snyk-bot <snyk-bot@snyk.io>
Date: Mon, 27 Jul 2020 02:16:04 +0000
Subject: [PATCH] fix: garden-service/package.json &
 garden-service/package-lock.json to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-TYPEORM-590152
---
 garden-service/package-lock.json | 29 ++++++++++++++++++++++-------
 garden-service/package.json      |  2 +-
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/garden-service/package-lock.json b/garden-service/package-lock.json
index bba2db3ea2..63d9b8ce80 100644
--- a/garden-service/package-lock.json
+++ b/garden-service/package-lock.json
@@ -4737,9 +4737,9 @@
       "integrity": "sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg=="
     },
     "figlet": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/figlet/-/figlet-1.2.4.tgz",
-      "integrity": "sha512-mv8YA9RruB4C5QawPaD29rEVx3N97ZTyNrE4DAfbhuo6tpcMdKnPVo8MlyT3RP5uPcg5M14bEJBq7kjFf4kAWg=="
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/figlet/-/figlet-1.5.0.tgz",
+      "integrity": "sha512-ZQJM4aifMpz6H19AW1VqvZ7l4pOE9p7i/3LyxgO2kp+PO/VcDYNqIHEMtkccqIhTXMKci4kjueJr/iCQEaT/Ww=="
     },
     "figures": {
       "version": "3.1.0",
@@ -10816,6 +10816,15 @@
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
       "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
     },
+    "sha.js": {
+      "version": "2.4.11",
+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
     "shebang-command": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
@@ -12083,9 +12092,9 @@
       "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
     },
     "typeorm": {
-      "version": "0.2.21",
-      "resolved": "https://registry.npmjs.org/typeorm/-/typeorm-0.2.21.tgz",
-      "integrity": "sha512-4abj5aFjwt4Y+Gs3VmykcjURUZwIezwPWYVMNl2swRk8/iluGZZ9Lbwd4tdzJ7ZdsgKyHsT8zf8zPZPL5jH+EQ==",
+      "version": "0.2.25",
+      "resolved": "https://registry.npmjs.org/typeorm/-/typeorm-0.2.25.tgz",
+      "integrity": "sha512-yzQ995fyDy5wolSLK9cmjUNcmQdixaeEm2TnXB5HN++uKbs9TiR6Y7eYAHpDlAE8s9J1uniDBgytecCZVFergQ==",
       "requires": {
         "app-root-path": "^3.0.0",
         "buffer": "^5.1.0",
@@ -12095,8 +12104,9 @@
         "dotenv": "^6.2.0",
         "glob": "^7.1.2",
         "js-yaml": "^3.13.1",
-        "mkdirp": "^0.5.1",
+        "mkdirp": "^1.0.3",
         "reflect-metadata": "^0.1.13",
+        "sha.js": "^2.4.11",
         "tslib": "^1.9.0",
         "xml2js": "^0.4.17",
         "yargonaut": "^1.1.2",
@@ -12131,6 +12141,11 @@
           "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
           "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
         },
+        "mkdirp": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
+        },
         "ms": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
diff --git a/garden-service/package.json b/garden-service/package.json
index 29c9a45e85..6940968188 100644
--- a/garden-service/package.json
+++ b/garden-service/package.json
@@ -116,7 +116,7 @@
     "tmp-promise": "^2.0.2",
     "toposort": "^2.0.2",
     "ts-stream": "^2.0.1",
-    "typeorm": "^0.2.21",
+    "typeorm": "^0.2.25",
     "typescript-memoize": "^1.0.0-alpha.3",
     "uniqid": "^5.2.0",
     "unzipper": "^0.10.5",