comment on major version

.gitattributes

@@ -0,0 +1 @@
+*.afdesign filter=lfs diff=lfs merge=lfs -text

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,21 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+<!--  A clear and concise description of what the bug is. -->
+
+**Expected behavior**
+<!-- A clear and concise description of what you expected to happen. -->
+
+**Environment**
+ - OS: [e.g. iOS]
+ - Version: [e.g. 22]
+
+**Additional context**
+<!-- Add any other context about the problem here. -->

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,4 @@
+contact_links:
+  - name: Questions & Help
+    url: https://github.com/cupcakearmy/autorestic/discussions
+    about: Please ask and answer questions here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,14 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
+
+**Describe the solution you'd like**
+<!-- A clear and concise description of what you want to happen. -->

.gitignore

@@ -13,6 +13,7 @@ restore
 docker
 Dockerfile
 build
+dist
 
 # Config
 .autorestic.yml

CHANGELOG.md

@@ -1,3 +1,3 @@
-## 0.21
+## 0.27
 
-- switched to commander
+- fix locking issue

README.md

@@ -19,3 +19,7 @@
 ### Why / What?
 
 Autorestic is a wrapper around the amazing [restic](https://restic.net/). While being amazing the restic cli can be a bit overwhelming and difficult to manage if you have many different location that you want to backup to multiple locations. This utility is aimed at making this easier 🙂
+
+### Questions / Support
+
+Check the [discussions page](https://github.com/cupcakearmy/autorestic/discussions)

docs/_toc.md

@@ -19,6 +19,7 @@
 
 > :Collapse label=CLI
 >
+> [General](/cli/general)
 > [Info](/cli/info)
 > [Check](/cli/check)
 > [Backup](/cli/backup)

docs/cli/backup.md

@@ -4,7 +4,7 @@
 autorestic backup [-l, --location] [-a, --all]
 ```
 
-Performes a backup of all locations if the `-a` flag is passed. To only backup some locations pass one or more `-l` or `--location` flags.
+Performs a backup of all locations if the `-a` flag is passed. To only backup some locations pass one or more `-l` or `--location` flags.
 
 ```bash
 autorestic backup -l my-location

docs/cli/check.md

@@ -1,4 +1,4 @@
-# check
+# Check
 
 ```bash
 autorestic check [-b, --backend]  [-a, --all]

docs/cli/cron.md

@@ -4,7 +4,7 @@
 autorestic cron
 ```
 
-This command is modtly intended to be triggered by an automated system like systemd or crontab.
+This command is mostly intended to be triggered by an automated system like systemd or crontab.
 
 It will run cron jobs es [specified in the cron section](/locations/cron) of a specific location.
 

docs/cli/exec.md

@@ -10,6 +10,6 @@ This is avery handy command which enables you to run any native restic command o
 autorestic exec -a -- snapshots
 ```
 
-With `exec` you can basically run every cli command that you would be able to run with the restic cli. It only prefillst path, key, etc.
+With `exec` you can basically run every cli command that you would be able to run with the restic cli. It only pre-fills path, key, etc.
 
 > :ToCPrevNext

docs/cli/general.md

@@ -0,0 +1,29 @@
+# General
+
+## `--version`
+
+Prints the current version
+
+```bash
+autorestic --version
+```
+
+## `--c, --config`
+
+Specify the config file to be used.
+If omitted `autorestic` will search for for a `.autorestic.yml` in the current directory and your home directory.
+
+```bash
+autorestic -c /path/to/my/config.yml
+```
+
+## `--ci`
+
+> Available since version 0.22
+
+Run the CLI in CI Mode, which means there will be no interactivity.
+This can be useful when you want to run cron e.g. as all the output will be saved.
+
+```bash
+autorestic --ci
+```

docs/cli/info.md

@@ -1,7 +1,7 @@
-# info
+# Info
 
-Displays the config file that autorestic is refering to.
-Usefull when you want to quickly see what locations are being backuped where.
+Displays the config file that autorestic is referring to.
+Useful when you want to quickly see what locations are being backed-up where.
 
 **Pro tip:** if it gets a bit long you can read it more easily with `autorestic info | less` 😉
 

docs/examples.md

@@ -1,19 +1,21 @@
 # 🐣 Examples
 
-## List all the snapshots for all the backends
+## Exec
+
+### List all the snapshots for all the backends
 
 ```bash
-autorestic -a exec snapshots
+autorestic exec -a -- snapshots
 ```
 
-## Unlock a locked repository
+### Unlock a locked repository
 
 If you accidentally cancelled a running operation this could be useful.
 
 Only do this if you know what you are doing.
 
 ```bash
-autorestic -b my-backend exec unlock
+autorestic exec -b my-backend -- unlock
 ```
 
 > :ToCPrevNext

docs/location/cron.md

@@ -39,9 +39,11 @@ Then paste this at the bottom of the file and save it. Note that in this specifi
 PATH="/usr/local/bin:/usr/bin:/bin"
 
 # Example running every 5 minutes
-*/5 * * * * autorestic -c /srv/.autorestic.yml cron
+*/5 * * * * autorestic -c /srv/.autorestic.yml --ci cron
 ```
 
-Now you can add as many `cron` attributes as you wish ⏱
+> The `--ci` option is not required, but recommended
+
+Now you can add as many `cron` attributes as you wish in the config file ⏱
 
 > :ToCPrevNext

install.sh

@@ -19,4 +19,4 @@ curl -s https://api.github.com/repos/cupcakearmy/autorestic/releases/latest \
 chmod +x ${OUT_FILE}
 
 autorestic install
-autorestic
+autorestic --help

package.json

@@ -4,26 +4,27 @@
     "build": "tsc",
     "dev": "tsc -w",
     "move": "mv bin/index-linux bin/autorestic_linux_x64 && mv bin/index-macos bin/autorestic_macos_x64",
-    "bin": "yarn run build && pkg lib/index.js --targets latest-macos-x64,latest-linux-x64 --out-path bin && yarn run move",
+    "bin": "yarn run build && pkg dist/index.js --targets latest-macos-x64,latest-linux-x64 --out-path bin && yarn run move",
     "docs:build": "codedoc install && codedoc build",
     "docs:dev": "codedoc serve"
   },
   "devDependencies": {
-    "@codedoc/cli": "0.2.x",
-    "@types/js-yaml": "3.x.x",
-    "@types/minimist": "1.x.x",
-    "@types/node": "14.x.x",
-    "pkg": "4.4.x",
-    "ts-node-dev": "^1.0.0-pre.40",
-    "typescript": "3.9.x"
+    "@codedoc/cli": "^0.2",
+    "@types/js-yaml": "^3",
+    "@types/node": "^14",
+    "pkg": "^4.4",
+    "ts-node-dev": "^1",
+    "typescript": "^3.9"
   },
   "dependencies": {
-    "axios": "0.19.x",
-    "clitastic": "0.0.1",
-    "colors": "1.x.x",
-    "commander": "^6.2.0",
+    "@types/semver": "^7.3.4",
+    "axios": "^0.19",
+    "clitastic": "^0.1.2",
+    "colors": "^1",
+    "commander": "^6.2",
     "cron-parser": "2.x.x",
     "js-yaml": "3.x.x",
+    "semver": "^7.3.5",
     "uhrwerk": "1.x.x"
   }
 }

src/backup.ts

@@ -1,7 +1,7 @@
 import { Writer } from 'clitastic'
 import { mkdirSync } from 'fs'
 
-import { config, VERBOSE } from './'
+import { config, hasError, VERBOSE } from './'
 import { getEnvFromBackend } from './backend'
 import { LocationFromPrefixes } from './config'
 import { Locations, Location, Backend } from './types'
@@ -68,6 +68,7 @@ export const backupSingle = (name: string, to: string, location: Location) => {
 
     writer.done(`${name}${to.blue} : ${'Done ✓'.green} (${delta.finished(true)})`)
   } catch (e) {
+    hasError()
     writer.done(`${name}${to.blue} : ${'Failed!'.red} (${delta.finished(true)}) ${e.message}`)
   }
 }

src/handlers/upgrade.ts

@@ -2,6 +2,7 @@ import { chmodSync } from 'fs'
 
 import axios from 'axios'
 import { Writer } from 'clitastic'
+import semver from 'semver'
 
 import { INSTALL_DIR, VERSION } from '..'
 import { checkIfResticIsAvailable, downloadFile, exec } from '../utils'
@@ -18,19 +19,27 @@ export async function upgrade() {
     responseType: 'json',
   })
 
-  if (json.tag_name != VERSION) {
-    const platformMap: { [key: string]: string } = {
-      darwin: 'macos',
+  const latest = semver.coerce(json.tag_name)
+  const current = semver.coerce(VERSION)
+  if (!latest || !current) throw new Error('Could not parse versions numbers.')
+  if (semver.gt(latest, current)) {
+    if (semver.major(latest) === semver.major(current)) {
+      // Update to compatible
+      const platformMap: { [key: string]: string } = {
+        darwin: 'macos',
+      }
+
+      const name = `autorestic_${platformMap[process.platform] || process.platform}_${process.arch}`
+      const dl = json.assets.find((asset: any) => asset.name === name)
+
+      const to = INSTALL_DIR + '/autorestic'
+      w.replaceLn('Downloading binary... 🌎')
+      await downloadFile(dl.browser_download_url, to)
+
+      chmodSync(to, 0o755)
+    } else {
+      w.appendLn('Newer major version available, will not install automatically.')
     }
-
-    const name = `autorestic_${platformMap[process.platform] || process.platform}_${process.arch}`
-    const dl = json.assets.find((asset: any) => asset.name === name)
-
-    const to = INSTALL_DIR + '/autorestic'
-    w.replaceLn('Downloading binary... 🌎')
-    await downloadFile(dl.browser_download_url, to)
-
-    chmodSync(to, 0o755)
   }
 
   w.done('All up to date! 🚀')

src/index.ts

@@ -1,7 +1,8 @@
-import 'colors'
+import colors from 'colors'
 import { program } from 'commander'
+import { setCIMode } from 'clitastic'
 
-import { unlock, readLock, writeLock } from './lock'
+import { unlock, readLock, writeLock, lock } from './lock'
 import { Config } from './types'
 import { init } from './config'
 
@@ -16,24 +17,33 @@ import install from './handlers/install'
 import { uninstall } from './handlers/uninstall'
 import { upgrade } from './handlers/upgrade'
 
-export const VERSION = '0.21'
+export const VERSION = '0.29'
 export const INSTALL_DIR = '/usr/local/bin'
 
+let requireConfig: boolean = true
+let error: boolean = false
+
+export function hasError() {
+  error = true
+}
+
 process.on('uncaughtException', (err) => {
   console.log(err.message)
   unlock()
   process.exit(1)
 })
 
-let queue: Function = () => {}
+let queue: () => Promise<void> = async () => {}
 const enqueue = (fn: Function) => (cmd: any) => {
-  queue = () => fn(cmd.opts())
+  queue = async () => fn(cmd.opts())
 }
 
 program.storeOptionsAsProperties()
 program.name('autorestic').description('Easy Restic CLI Utility').version(VERSION)
 
-program.option('-c, --config <path>', 'Config file').option('-v, --verbose', 'Verbosity', false)
+program.option('-c, --config <path>', 'Config file')
+program.option('-v, --verbose', 'Verbosity', false)
+program.option('--ci', 'CI Mode. Removes interactivity from the shell', false)
 
 program.command('info').action(enqueue(info))
 
@@ -50,7 +60,7 @@ program
   .option('-a, --all')
   .action(enqueue(check))
 
-program.command('backup').description('Performs a backup').option('-b, --backend <backends...>').option('-a, --all').action(enqueue(backup))
+program.command('backup').description('Performs a backup').option('-l, --location <locations...>').option('-a, --all').action(enqueue(backup))
 
 program
   .command('restore')
@@ -80,31 +90,46 @@ program
   .option('-b, --backend <backends...>')
   .option('-a, --all')
   .action(({ args, all, backend }) => {
-    queue = () => exec({ all, backend }, args)
+    queue = async () => exec({ all, backend }, args)
   })
 
 program.command('install').description('Installs both restic and autorestic to /usr/local/bin').action(enqueue(install))
 
 program.command('uninstall').description('Uninstalls autorestic from the system').action(enqueue(uninstall))
 
-program.command('upgrade').alias('update').description('Checks and installs new autorestic versions').action(enqueue(upgrade))
+program
+  .command('upgrade')
+  .alias('update')
+  .description('Checks and installs new autorestic versions')
+  .action(() => {
+    requireConfig = false
+    queue = upgrade
+  })
 
-const { verbose, config: configFile } = program.parse(process.argv)
+const { verbose, config: configFile, ci } = program.parse(process.argv)
 
 export const VERBOSE = verbose
-export let config: Config = init(configFile)
+export let config: Config
+setCIMode(ci)
+if (ci) colors.disable()
 
-try {
-  const lock = readLock()
-  if (lock.running) throw new Error('An instance of autorestic is already running for this config file'.red)
-
-  writeLock({
-    ...lock,
-    running: true,
-  })
-  queue()
-} catch (e) {
-  console.error(e.message)
-} finally {
-  unlock()
+async function main() {
+  try {
+    if (requireConfig) {
+      config = init(configFile)
+      const { running } = readLock()
+      if (running) {
+        console.log('An instance of autorestic is already running for this config file'.red)
+        process.exit(1)
+      }
+      lock()
+    }
+    await queue()
+  } catch (e) {
+    console.error(e.message)
+  } finally {
+    if (requireConfig) unlock()
+  }
+  if (error) process.exit(1)
 }
+main()

src/lock.ts

@@ -30,3 +30,10 @@ export const unlock = () => {
     running: false,
   })
 }
+
+export const lock = () => {
+  writeLock({
+    ...readLock(),
+    running: true,
+  })
+}

tsconfig.json

@@ -1,10 +1,13 @@
 {
   "compilerOptions": {
-    "target": "esnext",
+    "target": "es2019",
     "module": "commonjs",
-    "outDir": "./lib",
-    "rootDir": "./src",
+    "outDir": "./dist",
     "strict": true,
-    "esModuleInterop": true
-  }
+    "esModuleInterop": true,
+    "resolveJsonModule": true,
+    "alwaysStrict": true,
+    "strictNullChecks": true
+  },
+  "include": ["./src"]
 }

yarn.lock

@@ -3,9 +3,9 @@
 
 
 "@babel/parser@^7.9.4":
-  version "7.12.5"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.5.tgz#b4af32ddd473c0bfa643bd7ff0728b8e71b81ea0"
-  integrity sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ==
+  version "7.12.7"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.7.tgz#fee7b39fe809d0e73e5b25eecaf5780ef3d73056"
+  integrity sha512-oWR02Ubp4xTLCAqPRiNIuMVgNO5Aif/xpXtabhzW2HWUD47XJsAB4Zd/Rg30+XeQA3juXigV7hlquOTmwqLiwg==
 
 "@babel/runtime@^7.9.2":
   version "7.12.5"
@@ -14,7 +14,7 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@codedoc/cli@0.2.x":
+"@codedoc/cli@^0.2":
   version "0.2.6"
   resolved "https://registry.yarnpkg.com/@codedoc/cli/-/cli-0.2.6.tgz#5e6e981f8eafefcab2b8c81ee6c14815baf2732c"
   integrity sha512-zn92PvMamXCteZudz1i606qa4bPXcXveNgb6oQTAiW7Lq+bRMZHUyKvA3Q3jVwlQtV7SidJg3jA4RwkMllktog==
@@ -46,20 +46,20 @@
     "@nodelib/fs.scandir" "2.1.3"
     fastq "^1.6.0"
 
-"@types/js-yaml@3.x.x":
+"@types/js-yaml@^3":
   version "3.12.5"
   resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-3.12.5.tgz#136d5e6a57a931e1cce6f9d8126aa98a9c92a6bb"
   integrity sha512-JCcp6J0GV66Y4ZMDAQCXot4xprYB+Zfd3meK9+INSJeVZwJmHAW30BBEEkPzXswMXuiyReUGOP3GxrADc9wPww==
 
-"@types/minimist@1.x.x":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.0.tgz#69a23a3ad29caf0097f06eda59b361ee2f0639f6"
-  integrity sha1-aaI6OtKcrwCX8G7aWbNh7i8GOfY=
+"@types/node@^14":
+  version "14.14.10"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.10.tgz#5958a82e41863cfc71f2307b3748e3491ba03785"
+  integrity sha512-J32dgx2hw8vXrSbu4ZlVhn1Nm3GbeCFNw2FWL8S5QKucHGY0cyNwjdQdO+KMBZ4wpmC7KhLCiNsdk1RFRIYUQQ==
 
-"@types/node@14.x.x":
-  version "14.14.6"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.6.tgz#146d3da57b3c636cc0d1769396ce1cfa8991147f"
-  integrity sha512-6QlRuqsQ/Ox/aJEQWBEJG7A9+u7oSYl3mem/K8IzxXG/kAGbV1YPD9Bg9Zw3vyxC/YP+zONKwy8hGkSt1jxFMw==
+"@types/semver@^7.3.4":
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.4.tgz#43d7168fec6fa0988bb1a513a697b29296721afb"
+  integrity sha512-+nVsLKlcUCeMzD2ufHEYuJ9a2ovstb6Dp52A5VsoKxDXgvE051XgHI/33I1EymwkRGQkwnA0LkhnUzituGs4EQ==
 
 "@types/strip-bom@^3.0.0":
   version "3.0.0"
@@ -145,7 +145,7 @@ aws4@^1.8.0:
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
   integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
 
-axios@0.19.x:
+axios@^0.19:
   version "0.19.2"
   resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.2.tgz#3ea36c5d8818d0d5f8a8a97a6d36b86cdc00cb27"
   integrity sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==
@@ -243,12 +243,10 @@ chokidar@^3.4.0:
   optionalDependencies:
     fsevents "~2.1.2"
 
-clitastic@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/clitastic/-/clitastic-0.0.1.tgz#4b1a571447191cc311f5043b3ed49f3b6a0381d9"
-  integrity sha512-Akvm5MK1x+vyHyyUlTCKGjkPFK0fuJe/wMf634grLZdopsys1vzv24d4MCU7O9DQldPM+TbIeExm2Wz7jSYaOA==
-  dependencies:
-    colors "^1.3.3"
+clitastic@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/clitastic/-/clitastic-0.1.2.tgz#a2d4d14fe9c76fd4a180a2a0a4cccb2d27c2bcaf"
+  integrity sha512-xBvBTAuDys0u4aLoBZ+pGIPeTM3cqykylRxmaGv78QdMKo/uq3jgbiZGBUWkWufHfLXPlkSb0nDQq4+oXbTHug==
 
 color-convert@^2.0.1:
   version "2.0.1"
@@ -262,7 +260,7 @@ color-name@~1.1.4:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
-colors@1.x.x, colors@^1.3.3:
+colors@^1:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
   integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
@@ -274,7 +272,7 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@^6.2.0:
+commander@^6.2:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.0.tgz#b990bfb8ac030aedc6d11bc04d1488ffef56db75"
   integrity sha512-zP4jEKbe8SHzKJYQmq8Y9gYjtO/POJLgIdKgV7B9qNmABVFVc+ctqSX6iXh4mCpJfRBOabiZ2YKPg8ciDw6C+Q==
@@ -290,9 +288,9 @@ core-util-is@1.0.2, core-util-is@~1.0.0:
   integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
 
 cron-parser@2.x.x:
-  version "2.17.0"
-  resolved "https://registry.yarnpkg.com/cron-parser/-/cron-parser-2.17.0.tgz#5707421a7e0a73ee74675d1c032a2f14123f2cf8"
-  integrity sha512-oTmzVEwlurRe51HqTm4afshVr8Rkxy9kFiWxh5e6SmrY2o9NDYU4S6SduanBZYXLgkLy0skA98y7/tztW/DmjQ==
+  version "2.18.0"
+  resolved "https://registry.yarnpkg.com/cron-parser/-/cron-parser-2.18.0.tgz#de1bb0ad528c815548371993f81a54e5a089edcf"
+  integrity sha512-s4odpheTyydAbTBQepsqd2rNWGa2iV3cyo8g7zbI2QQYGLVsfbhmwukayS1XHppe02Oy1fg7mg6xoaraVJeEcg==
   dependencies:
     is-nan "^1.3.0"
     moment-timezone "^0.5.31"
@@ -668,10 +666,10 @@ is-binary-path@~2.1.0:
   dependencies:
     binary-extensions "^2.0.0"
 
-is-core-module@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.1.0.tgz#a4cc031d9b1aca63eecbd18a650e13cb4eeab946"
-  integrity sha512-YcV7BgVMRFRua2FqQzKtTDMz8iCuLEyGKjr70q8Zm1yy2qKcurbFEd79PAdHV77oL3NrAaOVQIbMmiHQCHB7ZA==
+is-core-module@^2.1.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a"
+  integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==
   dependencies:
     has "^1.0.3"
 
@@ -796,6 +794,13 @@ loud-rejection@^1.0.0:
     currently-unhandled "^0.4.1"
     signal-exit "^3.0.0"
 
+lru-cache@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
+  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
+  dependencies:
+    yallist "^4.0.0"
+
 make-error@^1.1.1:
   version "1.3.6"
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
@@ -872,9 +877,9 @@ mkdirp@^1.0.4:
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
 
 moment-timezone@^0.5.31:
-  version "0.5.31"
-  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.31.tgz#9c40d8c5026f0c7ab46eda3d63e49c155148de05"
-  integrity sha512-+GgHNg8xRhMXfEbv81iDtrVeTcWt0kWmTEY1XQK14dICTXnWJnT0dxdlPspwqF3keKMVPXwayEsk1DI0AA/jdA==
+  version "0.5.32"
+  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.32.tgz#db7677cc3cc680fd30303ebd90b0da1ca0dfecc2"
+  integrity sha512-Z8QNyuQHQAmWucp8Knmgei8YNo28aLjJq6Ma+jy1ZSpSk5nyfRT8xgUbSQvD2+2UajISfenndwvFuH3NGS+nvA==
   dependencies:
     moment ">= 2.9.0"
 
@@ -1037,7 +1042,7 @@ pkg-fetch@^2.6.9:
     semver "^6.3.0"
     unique-temp-dir "^1.0.0"
 
-pkg@4.4.x:
+pkg@^4.4:
   version "4.4.9"
   resolved "https://registry.yarnpkg.com/pkg/-/pkg-4.4.9.tgz#be04f8d03795772b7c4394724ae7252d7c2a4519"
   integrity sha512-FK4GqHtcCY2PPPVaKViU0NyRzpo6gCS7tPKN5b7AkElqjAOCH1bsRKgohEnxThr6DWfTGByGqba2YHGR/BqbmA==
@@ -1184,11 +1189,11 @@ request@^2.88.0:
     uuid "^3.3.2"
 
 resolve@^1.0.0, resolve@^1.1.6, resolve@^1.10.0, resolve@^1.15.1:
-  version "1.18.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.18.1.tgz#018fcb2c5b207d2a6424aee361c5a266da8f4130"
-  integrity sha512-lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA==
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c"
+  integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==
   dependencies:
-    is-core-module "^2.0.0"
+    is-core-module "^2.1.0"
     path-parse "^1.0.6"
 
 reusify@^1.0.4:
@@ -1233,6 +1238,13 @@ semver@^6.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
+semver@^7.3.5:
+  version "7.3.5"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
+  integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
+  dependencies:
+    lru-cache "^6.0.0"
+
 shelljs@^0.8.3:
   version "0.8.4"
   resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.4.tgz#de7684feeb767f8716b326078a8a00875890e3c2"
@@ -1287,9 +1299,9 @@ spdx-expression-parse@^3.0.0:
     spdx-license-ids "^3.0.0"
 
 spdx-license-ids@^3.0.0:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz#c80757383c28abf7296744998cbc106ae8b854ce"
-  integrity sha512-+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw==
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz#e9c18a410e5ed7e12442a549fbd8afa767038d65"
+  integrity sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==
 
 sprintf-js@~1.0.2:
   version "1.0.3"
@@ -1386,7 +1398,7 @@ trim-newlines@^1.0.0:
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
   integrity sha1-WIeWa7WCpFA6QetST301ARgVphM=
 
-ts-node-dev@^1.0.0-pre.40, ts-node-dev@^1.0.0-pre.44:
+ts-node-dev@^1, ts-node-dev@^1.0.0-pre.44:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/ts-node-dev/-/ts-node-dev-1.0.0.tgz#24a2270d225c29ce269de2a31f88b1b259fc84cb"
   integrity sha512-leA/3TgGtnVU77fGngBwVZztqyDRXirytR7dMtMWZS5b2hGpLl+VDnB0F/gf3A+HEPSzS/KwxgXFP7/LtgX4MQ==
@@ -1454,7 +1466,7 @@ type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
-typescript@3.9.x, typescript@^3.8.3:
+typescript@^3.8.3, typescript@^3.9:
   version "3.9.7"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz#98d600a5ebdc38f40cb277522f12dc800e9e25fa"
   integrity sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==
@@ -1532,6 +1544,11 @@ xtend@^4.0.0:
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
   integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
 
+yallist@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
+  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
+
 yn@3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"