tom-microservice 3.9.8 → 3.9.10

package/package.json

@@ -2,7 +2,7 @@
   "name": "tom-microservice",
   "description": "Tom creates customers, subscriptions plans & send notifications.",
   "homepage": "https://tom.js.org",
-  "version": "3.9.8",
+  "version": "3.9.10",
   "main": "src",
   "bin": {
     "tom": "bin/index.js"
@@ -40,12 +40,13 @@
   ],
   "dependencies": {
     "@kikobeats/time-span": "~1.0.2",
+    "@lukeed/ms": "~2.0.2",
     "acho": "~4.0.6",
     "beauty-error": "~1.2.15",
     "cors": "~2.8.5",
     "country-vat": "~1.0.8",
     "got": "~11.8.6",
-    "helmet": "~7.0.0",
+    "helmet": "~7.1.0",
     "http-body": "~1.0.4",
     "http-compression": "~1.0.5",
     "import-modules": "~2.1.0",
@@ -64,7 +65,7 @@
     "p-retry": "~4.6.1",
     "p-waterfall": "~2.1.1",
     "picocolors": "~1.0.0",
-    "pretty-ms": "~7.0.1",
+    "pupa": "~2.1.1",
     "req-country": "~1.2.7",
     "request-ip": "~3.3.0",
     "router-http": "~1.0.1",
@@ -79,17 +80,17 @@
     "@faker-js/faker": "latest",
     "@ksmithut/prettier-standard": "latest",
     "async-listen": "latest",
-    "ava": "latest",
+    "ava": "5",
     "browser-sync": "latest",
     "c8": "latest",
     "ci-env": "latest",
     "ci-publish": "latest",
     "concurrently": "latest",
-    "conventional-github-releaser": "latest",
     "coveralls": "latest",
     "finepack": "latest",
     "git-authors-cli": "latest",
     "git-dirty": "latest",
+    "github-generate-release": "latest",
     "gulp": "latest",
     "gulp-autoprefixer": "latest",
     "gulp-concat": "latest",
@@ -124,7 +125,7 @@
     "prerelease": "npm run update:check",
     "pretest": "npm run lint",
     "release": "git-authors-cli && git add package.json && standard-version -a",
-    "release:github": "conventional-github-releaser -p angular",
+    "release:github": "github-generate-release",
     "release:tags": "git push --follow-tags origin HEAD:master",
     "start": "tom",
     "test": "NODE_ENV=test c8 ava",

package/src/commands/notification/email.js

@@ -3,6 +3,7 @@
 const { pick, isNil, get } = require('lodash')
 const nodemailer = require('nodemailer')
 const Mailgen = require('mailgen')
+const pupa = require('pupa')
 
 const { wardCredential, ward, is } = require('../../ward')
 const compile = require('../../compile')
@@ -25,7 +26,10 @@ module.exports = ({ config }) => {
       name: get(config, 'company.site'),
       link: get(config, 'company.link'),
       logo: get(config, 'company.logo'),
-      copyright: get(config, 'company.copyright')
+      copyright: pupa(get(config, 'company.copyright'), {
+        company: get(config, 'company'),
+        year: new Date().getFullYear()
+      })
     }
   })
 

package/src/interface/action.js

@@ -1,12 +1,13 @@
 'use strict'
 
-const timeSpan = require('@kikobeats/time-span')({
-  format: require('pretty-ms')
-})
 const { omit, isEmpty, split, first, reduce } = require('lodash')
 const { randomUUID } = require('crypto')
 const pRetry = require('p-retry')
 
+const timeSpan = require('@kikobeats/time-span')({
+  format: require('@lukeed/ms').format
+})
+
 const printError = require('../log/print-error')
 const createLog = require('../log/create-log')
 
@@ -42,11 +43,9 @@ module.exports = ({ eventName, fn, tom }) => {
       }
 
       return output
-    } catch (err) {
-      console.log('ERROR', err)
-      console.log('ERROR', err.message)
-      printError({ log, err })
-      throw err
+    } catch (error) {
+      printError({ log, error })
+      throw error
     }
   }
 }

package/src/log/print-error.js

@@ -2,4 +2,4 @@
 
 const beautyError = require('beauty-error')
 
-module.exports = ({ log, err }) => log.error(beautyError(err))
+module.exports = ({ log, error }) => log.error(beautyError(error))