fix: bump mail templates version + deps upgrade (#56)

fix: bump mail templates version + deps upgrade

Author: pajgo

package.json

@@ -32,47 +32,48 @@
   },
   "homepage": "https://github.com/makeomatic/ms-mailer#readme",
   "devDependencies": {
-    "@babel/cli": "^7.8.4",
-    "@babel/core": "^7.8.4",
-    "@babel/plugin-proposal-class-properties": "^7.8.3",
-    "@babel/plugin-proposal-object-rest-spread": "^7.8.3",
-    "@babel/plugin-transform-strict-mode": "^7.8.3",
-    "@babel/register": "^7.8.3",
-    "@makeomatic/deploy": "^10.1.1",
-    "@semantic-release/changelog": "^5.0.0",
+    "@babel/cli": "^7.12.7",
+    "@babel/core": "^7.12.7",
+    "@babel/plugin-proposal-class-properties": "^7.12.1",
+    "@babel/plugin-proposal-object-rest-spread": "^7.12.1",
+    "@babel/plugin-transform-strict-mode": "^7.12.1",
+    "@babel/register": "^7.12.1",
+    "@makeomatic/deploy": "^10.3.2",
+    "@semantic-release/changelog": "^5.0.1",
     "@semantic-release/exec": "^5.0.0",
     "@semantic-release/git": "^9.0.0",
     "babel-plugin-istanbul": "^6.0.0",
     "chai": "^4.2.0",
-    "codecov": "^3.6.4",
-    "cross-env": "^7.0.0",
-    "eslint": "^6.8.0",
-    "eslint-config-makeomatic": "^4.0.0",
-    "eslint-plugin-import": "^2.20.1",
+    "codecov": "^3.8.1",
+    "cross-env": "^7.0.2",
+    "eslint": "^7.14.0",
+    "eslint-config-makeomatic": "^5.0.3",
+    "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-promise": "^4.2.1",
-    "mocha": "^7.0.1",
-    "nyc": "^15.0.0",
-    "smtp-server": "^3.5.0"
+    "eslint-plugin-unicorn": "^23.0.0",
+    "mocha": "^8.2.1",
+    "nyc": "^15.1.0",
+    "smtp-server": "^3.8.0"
   },
   "dependencies": {
-    "@hapi/hapi": "^19.1.0",
-    "@microfleet/core": "^16.0.2",
-    "@microfleet/transport-amqp": "^15.2.0",
-    "@microfleet/validation": "^8.1.2",
+    "@hapi/hapi": "^20.0.2",
+    "@microfleet/core": "^17.5.3",
+    "@microfleet/transport-amqp": "^15.2.3",
+    "@microfleet/validation": "^9.0.1",
     "bluebird": "^3.7.2",
-    "common-errors": "^1.0.5",
+    "common-errors": "^1.2.0",
     "is": "^3.2.0",
-    "lodash": "^4.17.15",
-    "ms-conf": "^6.0.0",
-    "ms-mailer-templates": "^1.15.0",
-    "nodemailer": "^6.4.2",
+    "lodash": "^4.17.20",
+    "ms-conf": "^7.0.2",
+    "ms-mailer-templates": "^1.19.0",
+    "nodemailer": "^6.4.16",
     "nodemailer-html-to-text": "^3.1.0",
-    "nodemailer-mailgun-transport": "^2.0.0",
+    "nodemailer-mailgun-transport": "^2.0.1",
     "nodemailer-plugin-inline-base64": "^2.1.1",
     "nodemailer-sparkpost-transport": "^2.1.0",
-    "prom-client": "^11.5.3",
+    "prom-client": "^12.0.0",
     "stdout-stream": "^1.4.1",
-    "yargs": "^15.1.0"
+    "yargs": "^16.1.1"
   },
   "engine": {
     "node": ">= 12.14.0",

schemas/common-mailer.json

@@ -90,19 +90,18 @@
         { "required": ["service"] },
         { "required": ["transport"] }
       ],
-      "switch": [{
-        "if": {
-          "required": ["transport"],
-          "properties": {
-            "transport": {
-              "const": "sparkpost"
-            }
+      "if": {
+        "required": ["transport"],
+        "properties": {
+          "transport": {
+            "const": "sparkpost"
           }
-        },
-        "then": {
-          "required": ["sparkPostApiKey"]
         }
-      }, {
+      },
+      "then": {
+        "required": ["sparkPostApiKey"]
+      },
+      "else": {
         "if": {
           "required": ["transport"],
           "properties": {
@@ -118,9 +117,8 @@
               "required": ["api_key", "domain"]
             }
           }
-        }
-      }, {
-        "then": {
+        },
+        "else": {
           "required": ["auth"],
           "properties": {
             "auth": {
@@ -131,7 +129,7 @@
             }
           }
         }
-      }]
+      }
     },
     "email": {
       "type": "object",

src/configuration/core.js

@@ -44,7 +44,6 @@ exports.http = {
   },
 };
 
-
 // https://www.npmjs.com/package/html-to-text
 exports.htmlToText = {
   wordwrap: 140,