From e187e2b92ff4d2d965b60481d70ca66c6ef5cf09 Mon Sep 17 00:00:00 2001
From: Mark Moffat <mark@192-168-1-105.tpgi.com.au>
Date: Sun, 14 Jul 2019 16:01:00 +0930
Subject: [PATCH] Dependency fixes

---
 package-lock.json | 46 +++++++++++-----------------------------------
 package.json      |  4 ++--
 2 files changed, 13 insertions(+), 37 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1181171..361af05 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6454,9 +6454,9 @@
       }
     },
     "mixin-deep": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz",
-      "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
+      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
       "dev": true,
       "requires": {
         "for-in": "^1.0.2",
@@ -6558,8 +6558,7 @@
     "mongodb-uri": {
       "version": "0.9.7",
       "resolved": "https://registry.npmjs.org/mongodb-uri/-/mongodb-uri-0.9.7.tgz",
-      "integrity": "sha1-D3ca0W9IOuZfQoeWlCjp+8SqYYE=",
-      "dev": true
+      "integrity": "sha1-D3ca0W9IOuZfQoeWlCjp+8SqYYE="
     },
     "morgan": {
       "version": "1.9.1",
@@ -8245,9 +8244,9 @@
       "dev": true
     },
     "set-value": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz",
-      "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
       "dev": true,
       "requires": {
         "extend-shallow": "^2.0.1",
@@ -9167,38 +9166,15 @@
       "dev": true
     },
     "union-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz",
-      "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
+      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
       "dev": true,
       "requires": {
         "arr-union": "^3.1.0",
         "get-value": "^2.0.6",
         "is-extendable": "^0.1.1",
-        "set-value": "^0.4.3"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
-        "set-value": {
-          "version": "0.4.3",
-          "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz",
-          "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-extendable": "^0.1.1",
-            "is-plain-object": "^2.0.1",
-            "to-object-path": "^0.3.0"
-          }
-        }
+        "set-value": "^2.0.1"
       }
     },
     "unique-stream": {
diff --git a/package.json b/package.json
index 7e3ab47..e21f49e 100644
--- a/package.json
+++ b/package.json
@@ -10,8 +10,8 @@
     "test": "NODE_ENV=test ava --verbose"
   },
   "dependencies": {
-    "ajv-keywords": "^3.4.1",
     "ajv": "^6.10.1",
+    "ajv-keywords": "^3.4.1",
     "async": "^2.6.2",
     "axios": "^0.19.0",
     "bcrypt-nodejs": "0.0.3",
@@ -33,6 +33,7 @@
     "mime-type": "^3.0.7",
     "moment": "^2.24.0",
     "mongodb": "2.2.3",
+    "mongodb-uri": "^0.9.7",
     "morgan": "^1.9.1",
     "multer": "^1.4.1",
     "node-cron": "^2.0.3",
@@ -61,7 +62,6 @@
     "gulp-clean-css": "^3.10.0",
     "gulp-minify": "^3.1.0",
     "gulp-rename": "^1.4.0",
-    "mongodb-uri": "^0.9.7",
     "supertest": "^3.4.2",
     "supertest-session": "^4.0.0",
     "wait.for": "^0.6.6"