From 469104d5928f8cad4aee56c061d16176c142fdbf Mon Sep 17 00:00:00 2001
From: Chrystian Huot <chrystian.huot@saubeo.solutions>
Date: Tue, 20 Jul 2021 06:59:41 -0400
Subject: [PATCH] Version 5.2.1

---
 CHANGELOG.md                                  |   7 +
 client/package-lock.json                      | 342 +++++++++---------
 client/package.json                           |  34 +-
 .../rdio-scanner/admin/admin.service.ts       |   2 +
 .../config/dir-watch/dir-watch.component.html |   6 +-
 .../config/options/options.component.html     |  16 +
 .../rdio-scanner/search/search.component.html |   2 +-
 package.json                                  |   2 +-
 server/lib/rdio-scanner/config.js             |  14 +-
 server/lib/rdio-scanner/controller.js         |  13 +-
 server/lib/rdio-scanner/defaults.js           |   1 +
 server/lib/rdio-scanner/dir-watch.js          | 125 ++++---
 server/lib/rdio-scanner/version.js            |   2 +-
 server/package-lock.json                      | 270 +++++++++-----
 server/package.json                           |  10 +-
 15 files changed, 487 insertions(+), 359 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 46edc2c..63b428e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,13 @@
 - Fix issue with iframe.
 - Node modules updated for security fixes.
 
+_v.5.2.1_
+
+- Fix talkgroup header on the search panel (issue #47).
+- Update dirwatch meta tags #DATE, #TIME and #ZTIME for SDRSharp compatibility (issue #48).
+- Fix dirwath date and time parsing bug.
+- Configurable call duplicate detection time frame.
+
 # Version 5.1
 
 This one is a big one... **Be sure to backup your config.json and your database.sqlite before updating.**
diff --git a/client/package-lock.json b/client/package-lock.json
index 54fe933..7edf60a 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -1,16 +1,16 @@
 {
     "name": "rdio-scanner-client",
-    "version": "5.2.0",
+    "version": "5.2.1",
     "lockfileVersion": 1,
     "requires": true,
     "dependencies": {
         "@angular-devkit/architect": {
-            "version": "0.1201.1",
-            "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1201.1.tgz",
-            "integrity": "sha512-n7ycxrIPbtnV7q8PH5Uvs8Jd++u6hWUiB+8EUxznSfdHGA+fE7TTnJTkc27LoMlYZAImc/Axp/uyYZ6Awt72ZQ==",
+            "version": "0.1201.2",
+            "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1201.2.tgz",
+            "integrity": "sha512-hR5kI03WoeEY9dkAsQNLlhL1iEFC2L77ansaKquN+HCAeOGHby4w95suSlZUAg0r6ZhPhPH0tkIRZXU9NMa09g==",
             "dev": true,
             "requires": {
-                "@angular-devkit/core": "12.1.1",
+                "@angular-devkit/core": "12.1.2",
                 "rxjs": "6.6.7"
             },
             "dependencies": {
@@ -32,15 +32,15 @@
             }
         },
         "@angular-devkit/build-angular": {
-            "version": "12.1.1",
-            "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-12.1.1.tgz",
-            "integrity": "sha512-mJjpPuJlS55gwi/W2g8CIMjPVtUjKCKJdjn34eeYk1Kgw9JYRIsiEivx1hcGyLmiSTF8gRGvW1TEyO+k55/QqA==",
+            "version": "12.1.2",
+            "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-12.1.2.tgz",
+            "integrity": "sha512-tclYPz2fT422D7dCwAY0+NzGlWGaDbOzba4SJs4klbluzfl0vLyBq+mbKGc5HtDj8NMwvd/1yIcBiCJYEYXwiA==",
             "dev": true,
             "requires": {
-                "@angular-devkit/architect": "0.1201.1",
-                "@angular-devkit/build-optimizer": "0.1201.1",
-                "@angular-devkit/build-webpack": "0.1201.1",
-                "@angular-devkit/core": "12.1.1",
+                "@angular-devkit/architect": "0.1201.2",
+                "@angular-devkit/build-optimizer": "0.1201.2",
+                "@angular-devkit/build-webpack": "0.1201.2",
+                "@angular-devkit/core": "12.1.2",
                 "@babel/core": "7.14.6",
                 "@babel/generator": "7.14.5",
                 "@babel/helper-annotate-as-pure": "7.14.5",
@@ -52,7 +52,7 @@
                 "@babel/template": "7.14.5",
                 "@discoveryjs/json-ext": "0.5.3",
                 "@jsdevtools/coverage-istanbul-loader": "3.0.5",
-                "@ngtools/webpack": "12.1.1",
+                "@ngtools/webpack": "12.1.2",
                 "ansi-colors": "4.1.1",
                 "babel-loader": "8.2.2",
                 "browserslist": "^4.9.1",
@@ -72,7 +72,7 @@
                 "karma-source-map-support": "1.4.0",
                 "less": "4.1.1",
                 "less-loader": "10.0.0",
-                "license-webpack-plugin": "2.3.19",
+                "license-webpack-plugin": "2.3.20",
                 "loader-utils": "2.0.0",
                 "mini-css-extract-plugin": "1.6.2",
                 "minimatch": "3.0.4",
@@ -101,7 +101,7 @@
                 "text-table": "0.2.0",
                 "tree-kill": "1.2.2",
                 "tslib": "2.3.0",
-                "webpack": "5.41.1",
+                "webpack": "5.42.0",
                 "webpack-dev-middleware": "5.0.0",
                 "webpack-dev-server": "3.11.2",
                 "webpack-merge": "5.8.0",
@@ -128,9 +128,9 @@
             }
         },
         "@angular-devkit/build-optimizer": {
-            "version": "0.1201.1",
-            "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.1201.1.tgz",
-            "integrity": "sha512-SdAffCpjRNFKwnEq8xdPdCWPgdrfY8rlmTZXGY7e1whR4vnyZi+afk1BAsmbNyWlHYVv0Zcnh+Q1VH3OBDLwhw==",
+            "version": "0.1201.2",
+            "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.1201.2.tgz",
+            "integrity": "sha512-ScrxpIiTbexs0iH64TeJv2NUh403X/NK/ConxDojxmQ7a2qZYXYKVm8F1d/AtUNfIPRZpWWmwoFlSmFhHGNWPw==",
             "dev": true,
             "requires": {
                 "source-map": "0.7.3",
@@ -147,12 +147,12 @@
             }
         },
         "@angular-devkit/build-webpack": {
-            "version": "0.1201.1",
-            "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1201.1.tgz",
-            "integrity": "sha512-isgj6bSFr16tuXEoX0VypvsQmg3uDOdvYDQZvkwzUrIyvQo5TeoOy/MLgrb9v+tXjEA7oZrzuigE4Hjzn466bQ==",
+            "version": "0.1201.2",
+            "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1201.2.tgz",
+            "integrity": "sha512-dQWInUvuQ5VTBxXGQBamekF4lRkiAlp0LxybYItAnSMRs7tXfPKtILg5RpJet1hnwvP33HFnu1AhNOCeBYu2bg==",
             "dev": true,
             "requires": {
-                "@angular-devkit/architect": "0.1201.1",
+                "@angular-devkit/architect": "0.1201.2",
                 "rxjs": "6.6.7"
             },
             "dependencies": {
@@ -174,9 +174,9 @@
             }
         },
         "@angular-devkit/core": {
-            "version": "12.1.1",
-            "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-12.1.1.tgz",
-            "integrity": "sha512-z5+O3ugXbo8djKPjUtf/UfnYCmco2K1LVhQ6cWLhKi3NKRBiHeNmZh5nAycqFD8/Q+oI/+Ao40MkmkK1Tq0jsw==",
+            "version": "12.1.2",
+            "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-12.1.2.tgz",
+            "integrity": "sha512-TeaRbvsNEeAkRJcIBlT6yUNh0vaVVBGBYfXYFIMg/I04ex/HI0ApEowu78GeTzCqlE0r4t+WaGT46m7+NIljKg==",
             "dev": true,
             "requires": {
                 "ajv": "8.6.0",
@@ -205,12 +205,12 @@
             }
         },
         "@angular-devkit/schematics": {
-            "version": "12.1.1",
-            "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.1.1.tgz",
-            "integrity": "sha512-oRsvlhJQLXkGWdJvArOby+G4j8UX2uCHwrN4EC1hXUKs84UsD+UATYOAh4h2auy+I+sdrmELUaHwdI4wdKpqnw==",
+            "version": "12.1.2",
+            "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.1.2.tgz",
+            "integrity": "sha512-/UGcAJChq+g7wf46Exr5iIyuVw3j4TxTIntTpuKg/z/xf9Y+8mzJAZgGittu/yFcHAJ9aYcOHctffrfEdV7QSA==",
             "dev": true,
             "requires": {
-                "@angular-devkit/core": "12.1.1",
+                "@angular-devkit/core": "12.1.2",
                 "ora": "5.4.1",
                 "rxjs": "6.6.7"
             },
@@ -233,32 +233,32 @@
             }
         },
         "@angular/animations": {
-            "version": "12.1.1",
-            "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-12.1.1.tgz",
-            "integrity": "sha512-79TfDx1AAxrVNM56oY+OwRpku9eCF6w3ko2DWDeQpgCvqM6/a53B5rPhz6yuwgadIqUdQH0T4CeE/v5hXYdOMA==",
+            "version": "12.1.2",
+            "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-12.1.2.tgz",
+            "integrity": "sha512-gFRObY32h33tHI60NS0A6DXKL/Y9h8Efo3s2leIsInuYdxZBb7/vlJu4i5AJWEdFZNcY6TDBxK1vi37xlLdLlQ==",
             "requires": {
                 "tslib": "^2.2.0"
             }
         },
         "@angular/cdk": {
-            "version": "12.1.1",
-            "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-12.1.1.tgz",
-            "integrity": "sha512-MJENa8qmfLAr6t59u1+mEC2YPbCn4n3vsY6k8fKyf+ILXwwGHWNZlYblaRMBjrF/crSx1Kd5vb30RCqIcNTGsA==",
+            "version": "12.1.2",
+            "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-12.1.2.tgz",
+            "integrity": "sha512-ALupZejZDsVYcbNZcEH1cV8SDgVBL40FAwDnlSZxCgd0HOBHH0ZqQV+8z0uCQeMatoNM+SwmJ8Y1JXYh9Bqfiw==",
             "requires": {
                 "parse5": "^5.0.0",
                 "tslib": "^2.2.0"
             }
         },
         "@angular/cli": {
-            "version": "12.1.1",
-            "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-12.1.1.tgz",
-            "integrity": "sha512-rQZItn3kpYEX6tH7wquAEhJuxVpW6sYKO2tSi8Suxrm+iz1RPRnfhSwS1WIEumnwpFRtH/8P+lOrScax1ldYkg==",
+            "version": "12.1.2",
+            "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-12.1.2.tgz",
+            "integrity": "sha512-oBJcSqXJyPzWGYft5/nD3hJhunxTGXlI4++9ehzdF/fRipOLLMqf77vi/4rUA2DGuaPMbYJeunBnIsgXRGIHIg==",
             "dev": true,
             "requires": {
-                "@angular-devkit/architect": "0.1201.1",
-                "@angular-devkit/core": "12.1.1",
-                "@angular-devkit/schematics": "12.1.1",
-                "@schematics/angular": "12.1.1",
+                "@angular-devkit/architect": "0.1201.2",
+                "@angular-devkit/core": "12.1.2",
+                "@angular-devkit/schematics": "12.1.2",
+                "@schematics/angular": "12.1.2",
                 "@yarnpkg/lockfile": "1.1.0",
                 "ansi-colors": "4.1.1",
                 "debug": "4.3.1",
@@ -294,25 +294,25 @@
             }
         },
         "@angular/common": {
-            "version": "12.1.1",
-            "resolved": "https://registry.npmjs.org/@angular/common/-/common-12.1.1.tgz",
-            "integrity": "sha512-NnRwGMatzjthvDQ4+8tm09Ak5i27Qga8x4BdzINN1RjLmzQ0zW00Mn2AUGYEDZHt9HXVHff5stsZGqj+Ne4QJw==",
+            "version": "12.1.2",
+            "resolved": "https://registry.npmjs.org/@angular/common/-/common-12.1.2.tgz",
+            "integrity": "sha512-/sf8iPZwHceMD4xNH4E8qjxXWAypjxmJBlv+9OczS1pGvYATBB9CaKCJQ73c6Yks9Cqz37q1DMWK3S376YWZMQ==",
             "requires": {
                 "tslib": "^2.2.0"
             }
         },
         "@angular/compiler": {
-            "version": "12.1.1",
-            "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-12.1.1.tgz",
-            "integrity": "sha512-QV56c+A18vdY8AB/SoWq0UkHhJxYDWY+VUY75RM2dxcsXoNeO5FTCjBRkA7yMiX6Q6cahH2ivC7tmqVU2mYHuA==",
+            "version": "12.1.2",
+            "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-12.1.2.tgz",
+            "integrity": "sha512-G0KKpV4jL/qErUN9i/tKHHIO0P6GGtoDyexz4qh4m+K7dxn5WHd9FcqbTTLHbnGg7RnfuKou3muAWhvSoPqhSw==",
             "requires": {
                 "tslib": "^2.2.0"
             }
         },
         "@angular/compiler-cli": {
-            "version": "12.1.1",
-            "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-12.1.1.tgz",
-            "integrity": "sha512-3PEi7dol8sU0TVEjnBubJXgwDALBk85XlIhmZ9lZa7okUM8Su6dQ9uFi+PXCosn/SlbpUnOizs8wBRqScCX5ug==",
+            "version": "12.1.2",
+            "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-12.1.2.tgz",
+            "integrity": "sha512-+29dnsU6w5CWkMOCFIUQNAKqI9y1mKT7bPNaVgqEgWWlloY5D2myE9ceBuIt7WDQhxz5kfAOSIgy6Chw1bqpMg==",
             "dev": true,
             "requires": {
                 "@babel/core": "^7.8.6",
@@ -413,57 +413,57 @@
             }
         },
         "@angular/core": {
-            "version": "12.1.1",
-            "resolved": "https://registry.npmjs.org/@angular/core/-/core-12.1.1.tgz",
-            "integrity": "sha512-7Q4na8zCXi4ITBG8kgbS+vnnVK0GDU2WXU80/il096+8YPFKfj6MyDWZH79KA3jrIg9/yhLwSQx8x8wnj8dqBA==",
+            "version": "12.1.2",
+            "resolved": "https://registry.npmjs.org/@angular/core/-/core-12.1.2.tgz",
+            "integrity": "sha512-+JvM9fNICKMdfXpaKR0zSWMrrMCp78N1056Di2/RxLxvycm/TegjHq0IXVqpY9hMccZXjjCTl0EUNVMFZ2mkcg==",
             "requires": {
                 "tslib": "^2.2.0"
             }
         },
         "@angular/forms": {
-            "version": "12.1.1",
-            "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-12.1.1.tgz",
-            "integrity": "sha512-up5P9jdqsPjrX3YgNMSIkTCwRzVNJbAlDiKrnww7pt5RL2fZGq+x/ddvtTSjdne9oknRKitADFkjuPozPH+LOg==",
+            "version": "12.1.2",
+            "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-12.1.2.tgz",
+            "integrity": "sha512-cJ8zoaQpOtjTwPc0ObH6qXM0k9MWl+8eGL3jDtf01n0ByZXWFZ+2oQHmU64rO8sJntUR8LPvbXFJRMNd0ZpdsQ==",
             "requires": {
                 "tslib": "^2.2.0"
             }
         },
         "@angular/material": {
-            "version": "12.1.1",
-            "resolved": "https://registry.npmjs.org/@angular/material/-/material-12.1.1.tgz",
-            "integrity": "sha512-q2vhbVQfjr+88beqCotCVlaPRyy9y2O2asiR3+0BU9OJ1DjTo1QpBmMpck5InP7Es49t9RTk9RzzC0t18p45yA==",
+            "version": "12.1.2",
+            "resolved": "https://registry.npmjs.org/@angular/material/-/material-12.1.2.tgz",
+            "integrity": "sha512-DpqnvwnVqaudFRXTNyJR8r/gbKG4RtE3RGc6q4FgdN9SOfRh/q/yYyNnOUnbCwPgLTmkfGz+bj7++GA8gzhSkg==",
             "requires": {
                 "tslib": "^2.2.0"
             }
         },
         "@angular/platform-browser": {
-            "version": "12.1.1",
-            "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-12.1.1.tgz",
-            "integrity": "sha512-R78K0DYxplYUvctq/7MvoBjuMDgMNrL1h8Bov0g7lN5hQWBQwBjl//CiJgx8H7uSiba9DQ0Jwu5Xxvkzkr8ggA==",
+            "version": "12.1.2",
+            "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-12.1.2.tgz",
+            "integrity": "sha512-QDtRZQDn0yrcuNoxDLrawCG8Pe5DdhJFy4tmMEpUYBpFZT+9qsRf5RD01QbzvbDKxwxgsce/783WZoPImMqaIA==",
             "requires": {
                 "tslib": "^2.2.0"
             }
         },
         "@angular/platform-browser-dynamic": {
-            "version": "12.1.1",
-            "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-12.1.1.tgz",
-            "integrity": "sha512-x8bIQzRvrdA/LfnIp5/Fo15BqD7g5j+XQe/KyWM+jBnpKr9queet0xvSAWD+KGkdrebI1xIgNtNNTxPCxREbiQ==",
+            "version": "12.1.2",
+            "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-12.1.2.tgz",
+            "integrity": "sha512-y7O2vu6p2shnO2kKoyaIjsQP1seg73ky3ORur2oaLTIfa1Uxeho2Ow0V6O0RUL230ol4qGetL64TMK7SjyoPhQ==",
             "requires": {
                 "tslib": "^2.2.0"
             }
         },
         "@angular/router": {
-            "version": "12.1.1",
-            "resolved": "https://registry.npmjs.org/@angular/router/-/router-12.1.1.tgz",
-            "integrity": "sha512-rv4I9uVQq7gunEGzGFkJDlu4fetOCSAGKPr83Q0Ekx+MuMr6zK0VbRgymMW/5LUaDl5Pobi+XeC3Y5tfjCI3Lg==",
+            "version": "12.1.2",
+            "resolved": "https://registry.npmjs.org/@angular/router/-/router-12.1.2.tgz",
+            "integrity": "sha512-iYf8c5HMdchHiEhZ01HCXyZjUmxUWI+es17V/GnsR1+S1NeF3TeYhGf3X2wdhVDvPfxq/4kZZRSddM0PAm0Lfw==",
             "requires": {
                 "tslib": "^2.2.0"
             }
         },
         "@angular/service-worker": {
-            "version": "12.1.1",
-            "resolved": "https://registry.npmjs.org/@angular/service-worker/-/service-worker-12.1.1.tgz",
-            "integrity": "sha512-qZJqDPvGz8dHfVY/5xhPBOBFsXz1oLVasdYflE3fi6kPabkAUOmB7NwW/ezWskkgX028adzSOzSxR3dPHQGcXQ==",
+            "version": "12.1.2",
+            "resolved": "https://registry.npmjs.org/@angular/service-worker/-/service-worker-12.1.2.tgz",
+            "integrity": "sha512-4j40Sj/ujdy8Ualbx3aJlweE0YtHQnZxbiIVp4zir26imOQoVvxwBQoLohaUknyKbLNxWggQDrunEJ6Kd5R6HQ==",
             "requires": {
                 "tslib": "^2.2.0"
             }
@@ -1625,9 +1625,9 @@
             }
         },
         "@ngtools/webpack": {
-            "version": "12.1.1",
-            "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-12.1.1.tgz",
-            "integrity": "sha512-NOHTBEjUkawQSU6sHA7EJSi5Ixw+oVmlYi17HXAhGRY1czasLQMiKQPnigbSgMLBR9Jhez7TttqAUtx6Pey2FQ==",
+            "version": "12.1.2",
+            "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-12.1.2.tgz",
+            "integrity": "sha512-7anwzgkVz3A6QV7IdtiqYrFRXwjO4jQHYk02EpVA+m6Pk7skpz6MjHpgJqSGUm27z1RRyR9zaLjJ/Zlaot60DA==",
             "dev": true,
             "requires": {
                 "enhanced-resolve": "5.8.2"
@@ -1650,9 +1650,9 @@
             "dev": true
         },
         "@nodelib/fs.walk": {
-            "version": "1.2.7",
-            "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.7.tgz",
-            "integrity": "sha512-BTIhocbPBSrRmHxOAJFtR18oLhxTtAFDAvL8hY1S3iU8k+E60W/YFs4jrixGzQjMpF4qPXxIQHcjVD9dz1C2QA==",
+            "version": "1.2.8",
+            "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+            "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
             "dev": true,
             "requires": {
                 "@nodelib/fs.scandir": "2.1.5",
@@ -1735,13 +1735,13 @@
             }
         },
         "@schematics/angular": {
-            "version": "12.1.1",
-            "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-12.1.1.tgz",
-            "integrity": "sha512-ukSKoAWfXt28TiHlRrEzKFW63V3jroRF3xnBKtsaL3AZ4MVJiHzOWXkzDAZBaEOLUH/l6Xhm64NMgOqMEAg1rQ==",
+            "version": "12.1.2",
+            "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-12.1.2.tgz",
+            "integrity": "sha512-nnFPp9uHLinP05r9TFsWT+fwlbwbLHg3yzJr+0aIOX1OsZQFV8hblEFEqdzFQJyx1uGMp4nvBHvCUlYv9GVQLg==",
             "dev": true,
             "requires": {
-                "@angular-devkit/core": "12.1.1",
-                "@angular-devkit/schematics": "12.1.1",
+                "@angular-devkit/core": "12.1.2",
+                "@angular-devkit/schematics": "12.1.2",
                 "jsonc-parser": "3.0.0"
             }
         },
@@ -1758,21 +1758,21 @@
             "dev": true
         },
         "@tsconfig/node10": {
-            "version": "1.0.7",
-            "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.7.tgz",
-            "integrity": "sha512-aBvUmXLQbayM4w3A8TrjwrXs4DZ8iduJnuJLLRGdkWlyakCf1q6uHZJBzXoRA/huAEknG5tcUyQxN3A+In5euQ==",
+            "version": "1.0.8",
+            "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.8.tgz",
+            "integrity": "sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg==",
             "dev": true
         },
         "@tsconfig/node12": {
-            "version": "1.0.7",
-            "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.7.tgz",
-            "integrity": "sha512-dgasobK/Y0wVMswcipr3k0HpevxFJLijN03A8mYfEPvWvOs14v0ZlYTR4kIgMx8g4+fTyTFv8/jLCIfRqLDJ4A==",
+            "version": "1.0.9",
+            "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.9.tgz",
+            "integrity": "sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw==",
             "dev": true
         },
         "@tsconfig/node14": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.0.tgz",
-            "integrity": "sha512-RKkL8eTdPv6t5EHgFKIVQgsDapugbuOptNd9OOunN/HAkzmmTnZELx1kNCK0rSdUYGmiFMM3rRQMAWiyp023LQ==",
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.1.tgz",
+            "integrity": "sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg==",
             "dev": true
         },
         "@tsconfig/node16": {
@@ -1782,9 +1782,9 @@
             "dev": true
         },
         "@types/eslint": {
-            "version": "7.2.14",
-            "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.14.tgz",
-            "integrity": "sha512-pESyhSbUOskqrGcaN+bCXIQDyT5zTaRWfj5ZjjSlMatgGjIn3QQPfocAu4WSabUR7CGyLZ2CQaZyISOEX7/saw==",
+            "version": "7.28.0",
+            "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.28.0.tgz",
+            "integrity": "sha512-07XlgzX0YJUn4iG1ocY4IX9DzKSmMGUs6ESKlxWhZRaa0fatIWaHWUVapcuGa8r5HFnTqzj+4OCjd5f7EZ/i/A==",
             "dev": true,
             "requires": {
                 "@types/estree": "*",
@@ -1830,9 +1830,9 @@
             "dev": true
         },
         "@types/node": {
-            "version": "16.0.1",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-16.0.1.tgz",
-            "integrity": "sha512-hBOx4SUlEPKwRi6PrXuTGw1z6lz0fjsibcWCM378YxsSu/6+C30L6CR49zIBKHiwNWCYIcOLjg4OHKZaFeLAug==",
+            "version": "16.3.3",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-16.3.3.tgz",
+            "integrity": "sha512-8h7k1YgQKxKXWckzFCMfsIwn0Y61UK6tlD6y2lOb3hTOIMlK3t9/QwHOhc81TwU+RMf0As5fj7NPjroERCnejQ==",
             "dev": true
         },
         "@types/parse-json": {
@@ -2782,9 +2782,9 @@
             }
         },
         "caniuse-lite": {
-            "version": "1.0.30001243",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001243.tgz",
-            "integrity": "sha512-vNxw9mkTBtkmLFnJRv/2rhs1yufpDfCkBZexG3Y0xdOH2Z/eE/85E4Dl5j1YUN34nZVsSp6vVRFQRrez9wJMRA==",
+            "version": "1.0.30001245",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001245.tgz",
+            "integrity": "sha512-768fM9j1PKXpOCKws6eTo3RHmvTUsG9UrpT4WoREFeZgJBTi4/X9g565azS/rVUGtqb8nt7FjLeF5u4kukERnA==",
             "dev": true
         },
         "canonical-path": {
@@ -3011,9 +3011,9 @@
             "dev": true
         },
         "colord": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/colord/-/colord-2.1.0.tgz",
-            "integrity": "sha512-H5sDP9XDk2uP+x/xSGkgB9SEFc1bojdI5DMKU0jmSXQtml2GIe48dj1DcSS0e53QQAHn+JKqUXbGeGX24xWD7w==",
+            "version": "2.2.0",
+            "resolved": "https://registry.npmjs.org/colord/-/colord-2.2.0.tgz",
+            "integrity": "sha512-LNYryRuHYAiq+5/22oIblna5nWztTm6LM4xGvvpB42jYQgE1AhmW/dN+rhem8L3tVz0B/Ej2zuDB8zlaS1OSWw==",
             "dev": true
         },
         "colorette": {
@@ -3202,12 +3202,12 @@
                     }
                 },
                 "schema-utils": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.0.tgz",
-                    "integrity": "sha512-tTEaeYkyIhEZ9uWgAjDerWov3T9MgX8dhhy2r0IGeeX4W8ngtGl1++dUve/RUqzuaASSh7shwCDJjEzthxki8w==",
+                    "version": "3.1.1",
+                    "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+                    "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
                     "dev": true,
                     "requires": {
-                        "@types/json-schema": "^7.0.7",
+                        "@types/json-schema": "^7.0.8",
                         "ajv": "^6.12.5",
                         "ajv-keywords": "^3.5.2"
                     }
@@ -3517,12 +3517,12 @@
                     "dev": true
                 },
                 "schema-utils": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.0.tgz",
-                    "integrity": "sha512-tTEaeYkyIhEZ9uWgAjDerWov3T9MgX8dhhy2r0IGeeX4W8ngtGl1++dUve/RUqzuaASSh7shwCDJjEzthxki8w==",
+                    "version": "3.1.1",
+                    "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+                    "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
                     "dev": true,
                     "requires": {
-                        "@types/json-schema": "^7.0.7",
+                        "@types/json-schema": "^7.0.8",
                         "ajv": "^6.12.5",
                         "ajv-keywords": "^3.5.2"
                     }
@@ -3572,12 +3572,12 @@
                     }
                 },
                 "schema-utils": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.0.tgz",
-                    "integrity": "sha512-tTEaeYkyIhEZ9uWgAjDerWov3T9MgX8dhhy2r0IGeeX4W8ngtGl1++dUve/RUqzuaASSh7shwCDJjEzthxki8w==",
+                    "version": "3.1.1",
+                    "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+                    "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
                     "dev": true,
                     "requires": {
-                        "@types/json-schema": "^7.0.7",
+                        "@types/json-schema": "^7.0.8",
                         "ajv": "^6.12.5",
                         "ajv-keywords": "^3.5.2"
                     }
@@ -4092,9 +4092,9 @@
             "dev": true
         },
         "electron-to-chromium": {
-            "version": "1.3.770",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.770.tgz",
-            "integrity": "sha512-Kyh8DGK1KfEZuYKIHvuOmrKotsKZQ+qBkDIWHciE3QoFkxXB1KzPP+tfLilSHAfxTON0yYMnFCWkQtUOR7g6KQ==",
+            "version": "1.3.780",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.780.tgz",
+            "integrity": "sha512-2KQ9OYm9WMUNpAPA/4aerURl3hwRc9tNlpsiEj3Y8Gf7LVf26NzyLIX2v0hSagQwrS9+cWab+28A2GPKDoVNRA==",
             "dev": true
         },
         "emoji-regex": {
@@ -4524,9 +4524,9 @@
             "dev": true
         },
         "fast-glob": {
-            "version": "3.2.6",
-            "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.6.tgz",
-            "integrity": "sha512-GnLuqj/pvQ7pX8/L4J84nijv6sAnlwvSDpMkJi9i7nPmPxGtRPkBSStfvDW5l6nMdX9VWe+pkKWFTgD+vF2QSQ==",
+            "version": "3.2.7",
+            "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz",
+            "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==",
             "dev": true,
             "requires": {
                 "@nodelib/fs.stat": "^2.0.2",
@@ -4854,9 +4854,9 @@
             }
         },
         "glob-parent": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.0.tgz",
-            "integrity": "sha512-Hdd4287VEJcZXUwv1l8a+vXC1GjOQqXe+VS30w/ypihpcnu9M1n3xeYeJu5CBpeEQj2nAab2xxz28GuA3vp4Ww==",
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.1.tgz",
+            "integrity": "sha512-kEVjS71mQazDBHKcsq4E9u/vUzaLcw1A8EtUeydawvIWQCJM0qQ08G1H7/XTjFUulla6XQiDOG6MXSaG0HDKog==",
             "dev": true,
             "requires": {
                 "is-glob": "^4.0.1"
@@ -5643,9 +5643,9 @@
             }
         },
         "is-core-module": {
-            "version": "2.4.0",
-            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.4.0.tgz",
-            "integrity": "sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A==",
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.5.0.tgz",
+            "integrity": "sha512-TXCMSDsEHMEEZ6eCA8rwRDbLu55MRGmrctljsBX/2v1d9/GzqHOxW5c5oPSgrUt2vBFXebu9rGqckXGPWOlYpg==",
             "dev": true,
             "requires": {
                 "has": "^1.0.3"
@@ -6088,9 +6088,9 @@
             }
         },
         "license-webpack-plugin": {
-            "version": "2.3.19",
-            "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-2.3.19.tgz",
-            "integrity": "sha512-z/izhwFRYHs1sCrDgrTUsNJpd+Xsd06OcFWSwHz/TiZygm5ucweVZi1Hu14Rf6tOj/XAl1Ebyc7GW6ZyyINyWA==",
+            "version": "2.3.20",
+            "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-2.3.20.tgz",
+            "integrity": "sha512-AHVueg9clOKACSHkhmEI+PCC9x8+qsQVuKECZD3ETxETK5h/PCv5/MUzyG1gm8OMcip/s1tcNxqo9Qb7WhjGsg==",
             "dev": true,
             "requires": {
                 "@types/webpack-sources": "^0.1.5",
@@ -6262,9 +6262,9 @@
             "dev": true
         },
         "make-fetch-happen": {
-            "version": "9.0.3",
-            "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.0.3.tgz",
-            "integrity": "sha512-uZ/9Cf2vKqsSWZyXhZ9wHHyckBrkntgbnqV68Bfe8zZenlf7D6yuGMXvHZQ+jSnzPkjosuNP1HGasj1J4h8OlQ==",
+            "version": "9.0.4",
+            "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.0.4.tgz",
+            "integrity": "sha512-sQWNKMYqSmbAGXqJg2jZ+PmHh5JAybvwu0xM8mZR/bsTjGiTASj3ldXJV7KFHy1k/IJIBkjxQFoWIVsv9+PQMg==",
             "dev": true,
             "requires": {
                 "agentkeepalive": "^4.1.3",
@@ -6492,12 +6492,12 @@
                     "dev": true
                 },
                 "schema-utils": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.0.tgz",
-                    "integrity": "sha512-tTEaeYkyIhEZ9uWgAjDerWov3T9MgX8dhhy2r0IGeeX4W8ngtGl1++dUve/RUqzuaASSh7shwCDJjEzthxki8w==",
+                    "version": "3.1.1",
+                    "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+                    "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
                     "dev": true,
                     "requires": {
-                        "@types/json-schema": "^7.0.7",
+                        "@types/json-schema": "^7.0.8",
                         "ajv": "^6.12.5",
                         "ajv-keywords": "^3.5.2"
                     }
@@ -6544,9 +6544,9 @@
             }
         },
         "minipass-fetch": {
-            "version": "1.3.3",
-            "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.3.3.tgz",
-            "integrity": "sha512-akCrLDWfbdAWkMLBxJEeWTdNsjML+dt5YgOI4gJ53vuO0vrmYQkUPxa6j6V65s9CcePIr2SSWqjT2EcrNseryQ==",
+            "version": "1.3.4",
+            "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.3.4.tgz",
+            "integrity": "sha512-TielGogIzbUEtd1LsjZFs47RWuHHfhl6TiCx1InVxApBAmQ8bL0dL5ilkLGcRvuyW/A9nE+Lvn855Ewz8S0PnQ==",
             "dev": true,
             "requires": {
                 "encoding": "^0.1.12",
@@ -9181,12 +9181,12 @@
                     "dev": true
                 },
                 "schema-utils": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.0.tgz",
-                    "integrity": "sha512-tTEaeYkyIhEZ9uWgAjDerWov3T9MgX8dhhy2r0IGeeX4W8ngtGl1++dUve/RUqzuaASSh7shwCDJjEzthxki8w==",
+                    "version": "3.1.1",
+                    "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+                    "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
                     "dev": true,
                     "requires": {
-                        "@types/json-schema": "^7.0.7",
+                        "@types/json-schema": "^7.0.8",
                         "ajv": "^6.12.5",
                         "ajv-keywords": "^3.5.2"
                     }
@@ -10322,12 +10322,12 @@
                     "dev": true
                 },
                 "schema-utils": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.0.tgz",
-                    "integrity": "sha512-tTEaeYkyIhEZ9uWgAjDerWov3T9MgX8dhhy2r0IGeeX4W8ngtGl1++dUve/RUqzuaASSh7shwCDJjEzthxki8w==",
+                    "version": "3.1.1",
+                    "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+                    "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
                     "dev": true,
                     "requires": {
-                        "@types/json-schema": "^7.0.7",
+                        "@types/json-schema": "^7.0.8",
                         "ajv": "^6.12.5",
                         "ajv-keywords": "^3.5.2"
                     }
@@ -10556,12 +10556,12 @@
                     }
                 },
                 "schema-utils": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.0.tgz",
-                    "integrity": "sha512-tTEaeYkyIhEZ9uWgAjDerWov3T9MgX8dhhy2r0IGeeX4W8ngtGl1++dUve/RUqzuaASSh7shwCDJjEzthxki8w==",
+                    "version": "3.1.1",
+                    "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+                    "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
                     "dev": true,
                     "requires": {
-                        "@types/json-schema": "^7.0.7",
+                        "@types/json-schema": "^7.0.8",
                         "ajv": "^6.12.5",
                         "ajv-keywords": "^3.5.2"
                     }
@@ -10677,9 +10677,9 @@
             "dev": true
         },
         "ts-node": {
-            "version": "10.0.0",
-            "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.0.0.tgz",
-            "integrity": "sha512-ROWeOIUvfFbPZkoDis0L/55Fk+6gFQNZwwKPLinacRl6tsxstTF1DbAcLKkovwnpKMVvOMHP1TIbnwXwtLg1gg==",
+            "version": "10.1.0",
+            "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.1.0.tgz",
+            "integrity": "sha512-6szn3+J9WyG2hE+5W8e0ruZrzyk1uFLYye6IGMBadnOzDh8aP7t8CbFpsfCiEx2+wMixAhjFt7lOZC4+l+WbEA==",
             "dev": true,
             "requires": {
                 "@tsconfig/node10": "^1.0.7",
@@ -10986,9 +10986,9 @@
             }
         },
         "webpack": {
-            "version": "5.41.1",
-            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.41.1.tgz",
-            "integrity": "sha512-AJZIIsqJ/MVTmegEq9Tlw5mk5EHdGiJbDdz9qP15vmUH+oxI1FdWcL0E9EO8K/zKaRPWqEs7G/OPxq1P61u5Ug==",
+            "version": "5.42.0",
+            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.42.0.tgz",
+            "integrity": "sha512-Ln8HL0F831t1x/yPB/qZEUVmZM4w9BnHZ1EQD/sAUHv8m22hthoPniWTXEzFMh/Sf84mhrahut22TX5KxWGuyQ==",
             "dev": true,
             "requires": {
                 "@types/eslint-scope": "^3.7.0",
@@ -10996,7 +10996,7 @@
                 "@webassemblyjs/ast": "1.11.0",
                 "@webassemblyjs/wasm-edit": "1.11.0",
                 "@webassemblyjs/wasm-parser": "1.11.0",
-                "acorn": "^8.2.1",
+                "acorn": "^8.4.1",
                 "browserslist": "^4.14.5",
                 "chrome-trace-event": "^1.0.2",
                 "enhanced-resolve": "^5.8.0",
@@ -11035,12 +11035,12 @@
                     "dev": true
                 },
                 "schema-utils": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.0.tgz",
-                    "integrity": "sha512-tTEaeYkyIhEZ9uWgAjDerWov3T9MgX8dhhy2r0IGeeX4W8ngtGl1++dUve/RUqzuaASSh7shwCDJjEzthxki8w==",
+                    "version": "3.1.1",
+                    "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+                    "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
                     "dev": true,
                     "requires": {
-                        "@types/json-schema": "^7.0.7",
+                        "@types/json-schema": "^7.0.8",
                         "ajv": "^6.12.5",
                         "ajv-keywords": "^3.5.2"
                     }
@@ -11052,9 +11052,9 @@
                     "dev": true
                 },
                 "webpack-sources": {
-                    "version": "2.3.0",
-                    "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.3.0.tgz",
-                    "integrity": "sha512-WyOdtwSvOML1kbgtXbTDnEW0jkJ7hZr/bDByIwszhWd/4XX1A3XMkrbFMsuH4+/MfLlZCUzlAdg4r7jaGKEIgQ==",
+                    "version": "2.3.1",
+                    "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.3.1.tgz",
+                    "integrity": "sha512-y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA==",
                     "dev": true,
                     "requires": {
                         "source-list-map": "^2.0.1",
@@ -11096,12 +11096,12 @@
                     "dev": true
                 },
                 "schema-utils": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.0.tgz",
-                    "integrity": "sha512-tTEaeYkyIhEZ9uWgAjDerWov3T9MgX8dhhy2r0IGeeX4W8ngtGl1++dUve/RUqzuaASSh7shwCDJjEzthxki8w==",
+                    "version": "3.1.1",
+                    "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+                    "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
                     "dev": true,
                     "requires": {
-                        "@types/json-schema": "^7.0.7",
+                        "@types/json-schema": "^7.0.8",
                         "ajv": "^6.12.5",
                         "ajv-keywords": "^3.5.2"
                     }
diff --git a/client/package.json b/client/package.json
index 17e0f1f..124a0f6 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,27 +1,27 @@
 {
     "author": "Chrystian Huot <chrystian.huot@saubeo.solutions>",
     "dependencies": {
-        "@angular/animations": "^12.1.1",
-        "@angular/cdk": "^12.1.1",
-        "@angular/common": "~12.1.1",
-        "@angular/compiler": "~12.1.1",
-        "@angular/core": "~12.1.1",
-        "@angular/forms": "~12.1.1",
-        "@angular/material": "^12.1.1",
-        "@angular/platform-browser": "~12.1.1",
-        "@angular/platform-browser-dynamic": "~12.1.1",
-        "@angular/router": "^12.1.1",
-        "@angular/service-worker": "^12.1.1",
+        "@angular/animations": "^12.1.2",
+        "@angular/cdk": "^12.1.2",
+        "@angular/common": "~12.1.2",
+        "@angular/compiler": "~12.1.2",
+        "@angular/core": "~12.1.2",
+        "@angular/forms": "~12.1.2",
+        "@angular/material": "^12.1.2",
+        "@angular/platform-browser": "~12.1.2",
+        "@angular/platform-browser-dynamic": "~12.1.2",
+        "@angular/router": "^12.1.2",
+        "@angular/service-worker": "^12.1.2",
         "rxjs": "~6.5.5",
         "tslib": "^2.3.0",
         "zone.js": "~0.11.4"
     },
     "devDependencies": {
-        "@angular-devkit/build-angular": "~12.1.1",
-        "@angular/cli": "^12.1.1",
-        "@angular/compiler-cli": "~12.1.1",
-        "@types/node": "~16.0.1",
-        "ts-node": "~10.0.0",
+        "@angular-devkit/build-angular": "~12.1.2",
+        "@angular/cli": "^12.1.2",
+        "@angular/compiler-cli": "~12.1.2",
+        "@types/node": "~16.3.3",
+        "ts-node": "~10.1.0",
         "typescript": "~4.2.4"
     },
     "engines": {
@@ -34,5 +34,5 @@
         "build": "ng build --base-href ./ --configuration production",
         "start": "ng serve"
     },
-    "version": "5.2.0"
+    "version": "5.2.1"
 }
diff --git a/client/src/app/components/rdio-scanner/admin/admin.service.ts b/client/src/app/components/rdio-scanner/admin/admin.service.ts
index ca09a0c..29b0aa6 100644
--- a/client/src/app/components/rdio-scanner/admin/admin.service.ts
+++ b/client/src/app/components/rdio-scanner/admin/admin.service.ts
@@ -87,6 +87,7 @@ export interface Options {
     dimmerDelay?: number;
     disableAudioConversion?: boolean;
     disableDuplicateDetection?: boolean;
+    duplicateDetectionTimeFrame?: number;
     keypadBeeps?: string;
     pruneDays?: number;
     sortTalkgroups?: boolean;
@@ -475,6 +476,7 @@ export class RdioScannerAdminService implements OnDestroy {
             dimmerDelay: [options?.dimmerDelay, [Validators.required, Validators.min(0)]],
             disableAudioConversion: [options?.disableAudioConversion],
             disableDuplicateDetection: [options?.disableDuplicateDetection],
+            duplicateDetectionTimeFrame: [options?.duplicateDetectionTimeFrame, [Validators.required, Validators.min(0)]],
             keypadBeeps: [options?.keypadBeeps, Validators.required],
             pruneDays: [options?.pruneDays, [Validators.required, Validators.min(0)]],
             sortTalkgroups: [options?.sortTalkgroups],
diff --git a/client/src/app/components/rdio-scanner/admin/config/dir-watch/dir-watch.component.html b/client/src/app/components/rdio-scanner/admin/config/dir-watch/dir-watch.component.html
index 570ddbf..2da30b6 100644
--- a/client/src/app/components/rdio-scanner/admin/config/dir-watch/dir-watch.component.html
+++ b/client/src/app/components/rdio-scanner/admin/config/dir-watch/dir-watch.component.html
@@ -124,16 +124,16 @@
                     <span class="mat-caption">Some metadata can be extracted from the file name of the audio file using
                         specific META tags. Possible META tags:
                         <ul>
-                            <li><b>#DATE</b> - extract the date like 20201231 (YYYYMMMDD) or 2020-12-31 (YYYY-MM-DD).
+                            <li><b>#DATE</b> - extract the date like 20201231&nbsp;(YYYYMMMDD), 2020-12-31&nbsp;(YYYY-MM-DD) or 2020_12_31&nbsp;(YYYY_MM_DD).
                             </li>
                             <li><b>#HZ</b> - extract the frequency in hertz like 119100000.</li>
                             <li><b>#KHZ</b> - extract the frequency in kilohertz like 119100.</li>
                             <li><b>#MHZ</b> - extract the frequency in megahertz like 119.100.</li>
                             <li><b>#SYS</b> - extract the system id like 11.</li>
-                            <li><b>#TIME</b> - extract the local time like 0853439 or 08:34:39.</li>
+                            <li><b>#TIME</b> - extract the local time like 0853439&nbsp;(HHMMSS), 08-34-39&nbsp;(HH-MM-SS) or 08:34:39&nbsp;(HH:MM:SS).</li>
                             <li><b>#TG</b> - extract the talkgroup id like 54241.</li>
                             <li><b>#UNIT</b> - extract the unit id like 4424001.</li>
-                            <li><b>#ZTIME</b> - extract the zulu time like 0453439 or 04:34:39.</li>
+                            <li><b>#ZTIME</b> - extract the zulu time like 0453439, 08-34-39 or 04:34:39.</li>
                         </ul>
                         Example: cymx_#TG_#DATE_#TIME_#HZ
                     </span>
diff --git a/client/src/app/components/rdio-scanner/admin/config/options/options.component.html b/client/src/app/components/rdio-scanner/admin/config/options/options.component.html
index 3b202cf..9d4e9f7 100644
--- a/client/src/app/components/rdio-scanner/admin/config/options/options.component.html
+++ b/client/src/app/components/rdio-scanner/admin/config/options/options.component.html
@@ -44,6 +44,22 @@
             <mat-slide-toggle color="primary" formControlName="disableDuplicateDetection"></mat-slide-toggle>
         </div>
     </div>
+    <div class="row">
+        <p>
+            <span class="mat-body">Duplicate Call Detection Time Frame</span><br>
+            <span class="mat-caption">New incoming calls will be rejected if a call already exists in the database with
+                a start time of +/- this delay in milliseconds.</span>
+        </p>
+        <mat-form-field>
+            <input matInput formControlName="duplicateDetectionTimeFrame" type="number">
+            <mat-error *ngIf="form?.get('duplicateDetectionTimeFrame')?.hasError('required')">
+                Duplicate call time frame is required
+            </mat-error>
+            <mat-error *ngIf="form?.get('duplicateDetectionTimeFrame')?.hasError('min')">
+                Duplicate call time frame is invalid
+            </mat-error>
+        </mat-form-field>
+    </div>
     <div class="row">
         <p>
             <span class="mat-body">Keypad Beep Style</span><br>
diff --git a/client/src/app/components/rdio-scanner/search/search.component.html b/client/src/app/components/rdio-scanner/search/search.component.html
index 3aa29e1..e7182b7 100644
--- a/client/src/app/components/rdio-scanner/search/search.component.html
+++ b/client/src/app/components/rdio-scanner/search/search.component.html
@@ -45,7 +45,7 @@
         </ng-container>
         <ng-container matColumnDef="alpha">
             <mat-header-cell *matHeaderCellDef>
-                <span>Tag</span>
+                <span>Talkgroup</span>
             </mat-header-cell>
             <mat-cell *matCellDef="let row">
                 <span>{{ row?.talkgroupData?.label || row?.talkgroup }}</span>
diff --git a/package.json b/package.json
index d75d7d4..a2657d5 100644
--- a/package.json
+++ b/package.json
@@ -14,5 +14,5 @@
         "update": "node update"
     },
     "type": "module",
-    "version": "5.2.0"
+    "version": "5.2.1"
 }
\ No newline at end of file
diff --git a/server/lib/rdio-scanner/config.js b/server/lib/rdio-scanner/config.js
index d71be00..edbbb4a 100644
--- a/server/lib/rdio-scanner/config.js
+++ b/server/lib/rdio-scanner/config.js
@@ -156,7 +156,16 @@ export class Config extends EventEmitter {
     }
 
     get options() {
-        return Object.assign({}, this._options);
+        return {
+            autoPopulate: this._options.autoPopulate ?? defaults.options.autoPopulate,
+            dimmerDelay: this._options.dimmerDelay ?? defaults.options.dimmerDelay,
+            disableAudioConversion: this._options.disableAudioConversion ?? defaults.options.disableAudioConversion,
+            disableDuplicateDetection: this._options.disableDuplicateDetection ?? defaults.options.disableDuplicateDetection,
+            duplicateDetectionTimeFrame: this._options.duplicateDetectionTimeFrame ?? defaults.options.duplicateDetectionTimeFrame,
+            keypadBeeps: this._options.keypadBeeps ?? defaults.options.keypadBeeps,
+            pruneDays: this._options.pruneDays ?? defaults.options.pruneDays,
+            sortTalkgroups: this._options.sortTalkgroups ?? defaults.options.sortTalkgroups,
+        };
     }
 
     set options(options) {
@@ -167,11 +176,12 @@ export class Config extends EventEmitter {
                     'dimmerDelay',
                     'disableAudioConversion',
                     'disableDuplicateDetection',
+                    'duplicateDetectionTimeFrame',
                     'keypadBeeps',
                     'pruneDays',
                     'sortTalkgroups',
                 ].includes(k)) {
-                    o[k] = options[k];
+                    o[k] = options[k] ?? defaults.options[k];
                 }
 
                 return o;
diff --git a/server/lib/rdio-scanner/controller.js b/server/lib/rdio-scanner/controller.js
index e3928e3..f67e8ed 100644
--- a/server/lib/rdio-scanner/controller.js
+++ b/server/lib/rdio-scanner/controller.js
@@ -716,13 +716,14 @@ export class Controller extends EventEmitter {
             return;
         }
 
-        const dateFrom = new Date(call.dateTime);
-        const dateTo = new Date(call.dateTime);
-
-        dateFrom.setMilliseconds(dateFrom.getMilliseconds() - 500);
-        dateTo.setMilliseconds(dateTo.getMilliseconds() + 500);
-
         if (!this.config.options.disableDuplicateDetection) {
+            const dateFrom = new Date(call.dateTime);
+            const dateTo = new Date(call.dateTime);
+            const delay = this.config.options.duplicateDetectionTimeFrame ?? defaults.options.duplicateDetectionTimeFrame;
+
+            dateFrom.setMilliseconds(dateFrom.getMilliseconds() - delay);
+            dateTo.setMilliseconds(dateTo.getMilliseconds() + delay);
+
             const duplicateCall = await this.models.call.findOne({
                 where: {
                     dateTime: {
diff --git a/server/lib/rdio-scanner/defaults.js b/server/lib/rdio-scanner/defaults.js
index c47246c..64ca03c 100644
--- a/server/lib/rdio-scanner/defaults.js
+++ b/server/lib/rdio-scanner/defaults.js
@@ -115,6 +115,7 @@ export const defaults = {
         dimmerDelay: 5000,
         disableAudioConversion: false,
         disableDuplicateDetection: false,
+        duplicateDetectionTimeFrame: 500,
         keypadBeeps: 'uniden',
         pruneDays: 7,
         sortTalkgroups: false,
diff --git a/server/lib/rdio-scanner/dir-watch.js b/server/lib/rdio-scanner/dir-watch.js
index 416e927..9b8bd15 100644
--- a/server/lib/rdio-scanner/dir-watch.js
+++ b/server/lib/rdio-scanner/dir-watch.js
@@ -329,15 +329,15 @@ export class DirWatch {
         }
 
         const meta = {
-            date: { tag: '#DATE', regex: '[\\d-]+' },
+            date: { tag: '#DATE', regex: '[\\d-_]+' },
             hz: { tag: '#HZ', regex: '[\\d]+' },
             khz: { tag: '#KHZ', regex: '[\\d\\.]+' },
             mhz: { tag: '#MHZ', regex: '[\\d\\.]+' },
-            time: { tag: '#TIME', regex: '[\\d:]+' },
+            time: { tag: '#TIME', regex: '[\\d-:]+' },
             system: { tag: '#SYS', regex: '\\d+' },
             talkgroup: { tag: '#TG', regex: '\\d+' },
             unit: { tag: '#UNIT', regex: '\\d+' },
-            ztime: { tag: '#ZTIME', regex: '[\\d:]+' },
+            ztime: { tag: '#ZTIME', regex: '[\\d-:]+' },
         };
 
         let data = [];
@@ -356,68 +356,67 @@ export class DirWatch {
 
         const match = filename.match(regex);
 
-        if (Array.isArray(match)) {
-            data = data.sort((a, b) => a[1] - b[1]).reduce((obj, val, index) => {
-                obj[val[0]] = match[index + 1];
-
-                return obj;
-            }, {});
-
-            if (data.date && data.time) {
-                const date = data.date.replace(/[^\d]]+/g, '').replace(/(\d{4})(\d{2})(\d{2})/g, '$1-$2-$3');
-                const time = data.time.replace(/[^\\d]]+/g, '').replace(/(\d)(?=(\d{2})+$)/g, '$1:');
-
-                const dateTime = new Date(`${date}T${time}`);
-
-                if (!isNaN(dateTime.getTime())) {
-                    call.dateTime = dateTime;
-                }
-
-            } else if (data.date && data.ztime) {
-                const date = data.date.replace(/[^\d]]+/g, '').replace(/(\d{4})(\d{2})(\d{2})/g, '$1-$2-$3');
-                const time = data.ztime.replace(/[^\\d]]+/g, '').replace(/(\d)(?=(\d{2})+$)/g, '$1:');
-
-                const dateTime = new Date(`${date}T${time}Z`);
-
-                if (!isNaN(dateTime.getTime())) {
-                    call.dateTime = dateTime;
-                }
-
-            } else if (data.date) {
-                const val = parseInt(data.date, 10);
-
-                if (val > 999999) {
-                    call.dateTime = new Date(1970, 0, 1);
-
-                    call.dateTime.setSeconds(val);
-                }
-            }
-
-            if (data.hz || data.khz || data.mhz) {
-                const freq = +(data.hz || data.khz || data.mhz);
-
-                if (freq) {
-                    call.frequency = data.hz ? freq : data.khz ? freq * 1000 : data.mhz * 1000000;
-                }
-            }
-
-            if (data.system) {
-                call.system = parseInt(data.system, 10);
-            }
-
-            if (data.talkgroup) {
-                call.talkgroup = parseInt(data.talkgroup, 10);
-            }
-
-            if (data.unit) {
-                call.sources = [{ pos: 0, src: parseInt(data.unit, 10) }];
-            }
-
-            return call;
-
-        } else {
+        if (!Array.isArray(match)) {
             return null;
         }
+
+        data = data.sort((a, b) => a[1] - b[1]).reduce((obj, val, index) => {
+            obj[val[0]] = match[index + 1];
+
+            return obj;
+        }, {});
+
+        if (data.date && data.time) {
+            const date = data.date.replace(/[^\d]+/g, '').replace(/(\d{4})(\d{2})(\d{2})/g, '$1-$2-$3');
+            const time = data.time.replace(/[^\d]+/g, '').replace(/(\d)(?=(\d{2})+$)/g, '$1:');
+
+            const dateTime = new Date(`${date}T${time}`);
+
+            if (!isNaN(dateTime.getTime())) {
+                call.dateTime = dateTime;
+            }
+
+        } else if (data.date && data.ztime) {
+            const date = data.date.replace(/[^\d]+/g, '').replace(/(\d{4})(\d{2})(\d{2})/g, '$1-$2-$3');
+            const time = data.ztime.replace(/[^\d]+/g, '').replace(/(\d)(?=(\d{2})+$)/g, '$1:');
+
+            const dateTime = new Date(`${date}T${time}Z`);
+
+            if (!isNaN(dateTime.getTime())) {
+                call.dateTime = dateTime;
+            }
+
+        } else if (data.date) {
+            const val = parseInt(data.date, 10);
+
+            if (val > 999999) {
+                call.dateTime = new Date(1970, 0, 1);
+
+                call.dateTime.setSeconds(val);
+            }
+        }
+
+        if (data.hz || data.khz || data.mhz) {
+            const freq = +(data.hz || data.khz || data.mhz);
+
+            if (freq) {
+                call.frequency = data.hz ? freq : data.khz ? freq * 1000 : data.mhz * 1000000;
+            }
+        }
+
+        if (data.system) {
+            call.system = parseInt(data.system, 10);
+        }
+
+        if (data.talkgroup) {
+            call.talkgroup = parseInt(data.talkgroup, 10);
+        }
+
+        if (data.unit) {
+            call.sources = [{ pos: 0, src: parseInt(data.unit, 10) }];
+        }
+
+        return call;
     }
 
     exists(filename) {
diff --git a/server/lib/rdio-scanner/version.js b/server/lib/rdio-scanner/version.js
index cf97ccc..c5ef9ee 100644
--- a/server/lib/rdio-scanner/version.js
+++ b/server/lib/rdio-scanner/version.js
@@ -19,6 +19,6 @@
 
 'use strict';
 
-export const version = '5.2.0';
+export const version = '5.2.1';
 
 export default version;
\ No newline at end of file
diff --git a/server/package-lock.json b/server/package-lock.json
index 51f0345..e3ff802 100644
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -1,6 +1,6 @@
 {
     "name": "rdio-scanner-server",
-    "version": "5.2.0",
+    "version": "5.2.1",
     "lockfileVersion": 1,
     "requires": true,
     "dependencies": {
@@ -80,9 +80,9 @@
             "dev": true
         },
         "@eslint/eslintrc": {
-            "version": "0.4.2",
-            "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.2.tgz",
-            "integrity": "sha512-8nmGq/4ycLpIwzvhI4tNDmQztZ8sp+hI7cyG8i1nQDhkAbRzHpXPidRAHlNvCZQpJTKw5ItIpMw9RSToGF00mg==",
+            "version": "0.4.3",
+            "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
+            "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==",
             "dev": true,
             "requires": {
                 "ajv": "^6.12.4",
@@ -140,20 +140,22 @@
         "@sindresorhus/is": {
             "version": "0.14.0",
             "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz",
-            "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ=="
+            "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==",
+            "dev": true
         },
         "@szmarczak/http-timer": {
             "version": "1.1.2",
             "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz",
             "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==",
+            "dev": true,
             "requires": {
                 "defer-to-connect": "^1.0.1"
             }
         },
         "@types/eslint": {
-            "version": "7.2.14",
-            "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.14.tgz",
-            "integrity": "sha512-pESyhSbUOskqrGcaN+bCXIQDyT5zTaRWfj5ZjjSlMatgGjIn3QQPfocAu4WSabUR7CGyLZ2CQaZyISOEX7/saw==",
+            "version": "7.28.0",
+            "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.28.0.tgz",
+            "integrity": "sha512-07XlgzX0YJUn4iG1ocY4IX9DzKSmMGUs6ESKlxWhZRaa0fatIWaHWUVapcuGa8r5HFnTqzj+4OCjd5f7EZ/i/A==",
             "dev": true,
             "requires": {
                 "@types/estree": "*",
@@ -171,9 +173,9 @@
             }
         },
         "@types/estree": {
-            "version": "0.0.49",
-            "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.49.tgz",
-            "integrity": "sha512-K1AFuMe8a+pXmfHTtnwBvqoEylNKVeaiKYkjmcEAdytMQVJ/i9Fu7sc13GxgXdO49gkE7Hy8SyJonUZUn+eVaw==",
+            "version": "0.0.50",
+            "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz",
+            "integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==",
             "dev": true
         },
         "@types/geojson": {
@@ -392,9 +394,9 @@
             "dev": true
         },
         "acorn-jsx": {
-            "version": "5.3.1",
-            "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz",
-            "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==",
+            "version": "5.3.2",
+            "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+            "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
             "dev": true
         },
         "agent-base": {
@@ -426,6 +428,7 @@
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz",
             "integrity": "sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw==",
+            "dev": true,
             "requires": {
                 "string-width": "^3.0.0"
             },
@@ -433,17 +436,20 @@
                 "ansi-regex": {
                     "version": "4.1.0",
                     "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-                    "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
+                    "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+                    "dev": true
                 },
                 "is-fullwidth-code-point": {
                     "version": "2.0.0",
                     "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-                    "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
+                    "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+                    "dev": true
                 },
                 "string-width": {
                     "version": "3.1.0",
                     "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
                     "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+                    "dev": true,
                     "requires": {
                         "emoji-regex": "^7.0.1",
                         "is-fullwidth-code-point": "^2.0.0",
@@ -454,6 +460,7 @@
                     "version": "5.2.0",
                     "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
                     "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+                    "dev": true,
                     "requires": {
                         "ansi-regex": "^4.1.0"
                     }
@@ -475,6 +482,7 @@
             "version": "4.3.0",
             "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
             "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+            "dev": true,
             "requires": {
                 "color-convert": "^2.0.1"
             }
@@ -642,6 +650,7 @@
             "version": "4.2.0",
             "resolved": "https://registry.npmjs.org/boxen/-/boxen-4.2.0.tgz",
             "integrity": "sha512-eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ==",
+            "dev": true,
             "requires": {
                 "ansi-align": "^3.0.0",
                 "camelcase": "^5.3.1",
@@ -656,22 +665,26 @@
                 "ansi-regex": {
                     "version": "5.0.0",
                     "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-                    "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
+                    "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+                    "dev": true
                 },
                 "emoji-regex": {
                     "version": "8.0.0",
                     "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-                    "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+                    "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+                    "dev": true
                 },
                 "is-fullwidth-code-point": {
                     "version": "3.0.0",
                     "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-                    "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
+                    "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+                    "dev": true
                 },
                 "string-width": {
                     "version": "4.2.2",
                     "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
                     "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+                    "dev": true,
                     "requires": {
                         "emoji-regex": "^8.0.0",
                         "is-fullwidth-code-point": "^3.0.0",
@@ -682,6 +695,7 @@
                     "version": "6.0.0",
                     "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
                     "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+                    "dev": true,
                     "requires": {
                         "ansi-regex": "^5.0.0"
                     }
@@ -774,6 +788,7 @@
             "version": "6.1.0",
             "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz",
             "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==",
+            "dev": true,
             "requires": {
                 "clone-response": "^1.0.2",
                 "get-stream": "^5.1.0",
@@ -788,6 +803,7 @@
                     "version": "5.2.0",
                     "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
                     "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+                    "dev": true,
                     "requires": {
                         "pump": "^3.0.0"
                     }
@@ -795,7 +811,8 @@
                 "lowercase-keys": {
                     "version": "2.0.0",
                     "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
-                    "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA=="
+                    "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
+                    "dev": true
                 }
             }
         },
@@ -808,12 +825,13 @@
         "camelcase": {
             "version": "5.3.1",
             "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-            "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
+            "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+            "dev": true
         },
         "caniuse-lite": {
-            "version": "1.0.30001243",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001243.tgz",
-            "integrity": "sha512-vNxw9mkTBtkmLFnJRv/2rhs1yufpDfCkBZexG3Y0xdOH2Z/eE/85E4Dl5j1YUN34nZVsSp6vVRFQRrez9wJMRA==",
+            "version": "1.0.30001245",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001245.tgz",
+            "integrity": "sha512-768fM9j1PKXpOCKws6eTo3RHmvTUsG9UrpT4WoREFeZgJBTi4/X9g565azS/rVUGtqb8nt7FjLeF5u4kukERnA==",
             "dev": true
         },
         "caseless": {
@@ -826,6 +844,7 @@
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
             "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+            "dev": true,
             "requires": {
                 "ansi-styles": "^4.1.0",
                 "supports-color": "^7.1.0"
@@ -834,12 +853,14 @@
                 "has-flag": {
                     "version": "4.0.0",
                     "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
+                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+                    "dev": true
                 },
                 "supports-color": {
                     "version": "7.2.0",
                     "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
                     "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+                    "dev": true,
                     "requires": {
                         "has-flag": "^4.0.0"
                     }
@@ -875,12 +896,14 @@
         "ci-info": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-            "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="
+            "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
+            "dev": true
         },
         "cli-boxes": {
             "version": "2.2.1",
             "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz",
-            "integrity": "sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw=="
+            "integrity": "sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==",
+            "dev": true
         },
         "clone-deep": {
             "version": "4.0.1",
@@ -897,6 +920,7 @@
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
             "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=",
+            "dev": true,
             "requires": {
                 "mimic-response": "^1.0.0"
             }
@@ -910,6 +934,7 @@
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
             "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+            "dev": true,
             "requires": {
                 "color-name": "~1.1.4"
             }
@@ -917,7 +942,8 @@
         "color-name": {
             "version": "1.1.4",
             "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+            "dev": true
         },
         "colorette": {
             "version": "1.2.2",
@@ -1001,6 +1027,7 @@
             "version": "5.0.1",
             "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz",
             "integrity": "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==",
+            "dev": true,
             "requires": {
                 "dot-prop": "^5.2.0",
                 "graceful-fs": "^4.1.2",
@@ -1077,7 +1104,8 @@
         "crypto-random-string": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz",
-            "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA=="
+            "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==",
+            "dev": true
         },
         "dashdash": {
             "version": "1.14.1",
@@ -1100,6 +1128,7 @@
             "version": "3.3.0",
             "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
             "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
+            "dev": true,
             "requires": {
                 "mimic-response": "^1.0.0"
             }
@@ -1118,7 +1147,8 @@
         "defer-to-connect": {
             "version": "1.1.3",
             "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz",
-            "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ=="
+            "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==",
+            "dev": true
         },
         "delayed-stream": {
             "version": "1.0.0",
@@ -1195,6 +1225,7 @@
             "version": "5.3.0",
             "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
             "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==",
+            "dev": true,
             "requires": {
                 "is-obj": "^2.0.0"
             }
@@ -1212,7 +1243,8 @@
         "duplexer3": {
             "version": "0.1.4",
             "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
-            "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI="
+            "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=",
+            "dev": true
         },
         "ecc-jsbn": {
             "version": "0.1.2",
@@ -1238,15 +1270,16 @@
             "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
         },
         "electron-to-chromium": {
-            "version": "1.3.770",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.770.tgz",
-            "integrity": "sha512-Kyh8DGK1KfEZuYKIHvuOmrKotsKZQ+qBkDIWHciE3QoFkxXB1KzPP+tfLilSHAfxTON0yYMnFCWkQtUOR7g6KQ==",
+            "version": "1.3.780",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.780.tgz",
+            "integrity": "sha512-2KQ9OYm9WMUNpAPA/4aerURl3hwRc9tNlpsiEj3Y8Gf7LVf26NzyLIX2v0hSagQwrS9+cWab+28A2GPKDoVNRA==",
             "dev": true
         },
         "emoji-regex": {
             "version": "7.0.3",
             "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-            "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
+            "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+            "dev": true
         },
         "encodeurl": {
             "version": "1.0.2",
@@ -1257,6 +1290,7 @@
             "version": "1.4.4",
             "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
             "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+            "dev": true,
             "requires": {
                 "once": "^1.4.0"
             }
@@ -1301,7 +1335,8 @@
         "escape-goat": {
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz",
-            "integrity": "sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q=="
+            "integrity": "sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==",
+            "dev": true
         },
         "escape-html": {
             "version": "1.0.3",
@@ -1315,13 +1350,13 @@
             "dev": true
         },
         "eslint": {
-            "version": "7.30.0",
-            "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.30.0.tgz",
-            "integrity": "sha512-VLqz80i3as3NdloY44BQSJpFw534L9Oh+6zJOUaViV4JPd+DaHwutqP7tcpkW3YiXbK6s05RZl7yl7cQn+lijg==",
+            "version": "7.31.0",
+            "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.31.0.tgz",
+            "integrity": "sha512-vafgJpSh2ia8tnTkNUkwxGmnumgckLh5aAbLa1xRmIn9+owi8qBNGKL+B881kNKNTy7FFqTEkpNkUvmw0n6PkA==",
             "dev": true,
             "requires": {
                 "@babel/code-frame": "7.12.11",
-                "@eslint/eslintrc": "^0.4.2",
+                "@eslint/eslintrc": "^0.4.3",
                 "@humanwhocodes/config-array": "^0.5.0",
                 "ajv": "^6.10.0",
                 "chalk": "^4.0.0",
@@ -1824,6 +1859,7 @@
             "version": "4.1.0",
             "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
             "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+            "dev": true,
             "requires": {
                 "pump": "^3.0.0"
             }
@@ -1868,6 +1904,7 @@
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-2.1.0.tgz",
             "integrity": "sha512-MG6kdOUh/xBnyo9cJFeIKkLEc1AyFq42QTU4XiX51i2NEdxLxLWXIjEjmqKeSuKR7pAZjTqUVoT2b2huxVLgYQ==",
+            "dev": true,
             "requires": {
                 "ini": "1.3.7"
             }
@@ -1893,6 +1930,7 @@
             "version": "9.6.0",
             "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz",
             "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==",
+            "dev": true,
             "requires": {
                 "@sindresorhus/is": "^0.14.0",
                 "@szmarczak/http-timer": "^1.1.2",
@@ -1940,7 +1978,8 @@
         "has-flag": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-            "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+            "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+            "dev": true
         },
         "has-unicode": {
             "version": "2.0.1",
@@ -1950,7 +1989,8 @@
         "has-yarn": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz",
-            "integrity": "sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw=="
+            "integrity": "sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==",
+            "dev": true
         },
         "helmet": {
             "version": "4.6.0",
@@ -1960,7 +2000,8 @@
         "http-cache-semantics": {
             "version": "4.1.0",
             "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
-            "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="
+            "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==",
+            "dev": true
         },
         "http-errors": {
             "version": "1.7.2",
@@ -2024,7 +2065,8 @@
         "ignore-by-default": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz",
-            "integrity": "sha1-SMptcvbGo68Aqa1K5odr44ieKwk="
+            "integrity": "sha1-SMptcvbGo68Aqa1K5odr44ieKwk=",
+            "dev": true
         },
         "ignore-walk": {
             "version": "3.0.3",
@@ -2047,7 +2089,8 @@
         "import-lazy": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz",
-            "integrity": "sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM="
+            "integrity": "sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=",
+            "dev": true
         },
         "import-local": {
             "version": "3.0.2",
@@ -2062,7 +2105,8 @@
         "imurmurhash": {
             "version": "0.1.4",
             "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-            "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
+            "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+            "dev": true
         },
         "inflection": {
             "version": "1.13.1",
@@ -2111,6 +2155,7 @@
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
             "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
+            "dev": true,
             "requires": {
                 "ci-info": "^2.0.0"
             }
@@ -2149,6 +2194,7 @@
             "version": "0.3.2",
             "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.3.2.tgz",
             "integrity": "sha512-wZ8x1js7Ia0kecP/CHM/3ABkAmujX7WPvQk6uu3Fly/Mk44pySulQpnHG46OMjHGXApINnV4QhY3SWnECO2z5g==",
+            "dev": true,
             "requires": {
                 "global-dirs": "^2.0.1",
                 "is-path-inside": "^3.0.1"
@@ -2157,7 +2203,8 @@
         "is-npm": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-4.0.0.tgz",
-            "integrity": "sha512-96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig=="
+            "integrity": "sha512-96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig==",
+            "dev": true
         },
         "is-number": {
             "version": "7.0.0",
@@ -2167,12 +2214,14 @@
         "is-obj": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
-            "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w=="
+            "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
+            "dev": true
         },
         "is-path-inside": {
             "version": "3.0.3",
             "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-            "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ=="
+            "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
+            "dev": true
         },
         "is-plain-object": {
             "version": "2.0.4",
@@ -2202,7 +2251,8 @@
         "is-yarn-global": {
             "version": "0.3.0",
             "resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz",
-            "integrity": "sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw=="
+            "integrity": "sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==",
+            "dev": true
         },
         "isarray": {
             "version": "1.0.0",
@@ -2279,7 +2329,8 @@
         "json-buffer": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
-            "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg="
+            "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=",
+            "dev": true
         },
         "json-parse-better-errors": {
             "version": "1.0.2",
@@ -2369,6 +2420,7 @@
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz",
             "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==",
+            "dev": true,
             "requires": {
                 "json-buffer": "3.0.0"
             }
@@ -2383,6 +2435,7 @@
             "version": "5.1.0",
             "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz",
             "integrity": "sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==",
+            "dev": true,
             "requires": {
                 "package-json": "^6.3.0"
             }
@@ -2478,7 +2531,8 @@
         "lowercase-keys": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
-            "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="
+            "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
+            "dev": true
         },
         "lru-cache": {
             "version": "6.0.0",
@@ -2582,7 +2636,8 @@
         "mimic-response": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
-            "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ=="
+            "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
+            "dev": true
         },
         "minimatch": {
             "version": "3.0.4",
@@ -2831,9 +2886,10 @@
             "dev": true
         },
         "nodemon": {
-            "version": "2.0.9",
-            "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.9.tgz",
-            "integrity": "sha512-6O4k7C8f2HQArGpaPBOqGGddjzDLQAqCYmq3tKMeNIbz7Is/hOphMHy2dcY10sSq5wl3cqyn9Iz+Ep2j51JOLg==",
+            "version": "2.0.12",
+            "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.12.tgz",
+            "integrity": "sha512-egCTmNZdObdBxUBw6ZNwvZ/xzk24CKRs5K6d+5zbmrMr7rOpPmfPeF6OxM3DDpaRx331CQRFEktn+wrFFfBSOA==",
+            "dev": true,
             "requires": {
                 "chokidar": "^3.2.2",
                 "debug": "^3.2.6",
@@ -2851,6 +2907,7 @@
                     "version": "3.2.7",
                     "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
                     "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+                    "dev": true,
                     "requires": {
                         "ms": "^2.1.1"
                     }
@@ -2858,7 +2915,8 @@
                 "semver": {
                     "version": "5.7.1",
                     "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-                    "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+                    "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+                    "dev": true
                 }
             }
         },
@@ -2878,7 +2936,8 @@
         "normalize-url": {
             "version": "4.5.1",
             "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz",
-            "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA=="
+            "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==",
+            "dev": true
         },
         "npm-bundled": {
             "version": "1.1.1",
@@ -3005,7 +3064,8 @@
         "p-cancelable": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz",
-            "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw=="
+            "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==",
+            "dev": true
         },
         "p-limit": {
             "version": "3.1.0",
@@ -3046,6 +3106,7 @@
             "version": "6.5.0",
             "resolved": "https://registry.npmjs.org/package-json/-/package-json-6.5.0.tgz",
             "integrity": "sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==",
+            "dev": true,
             "requires": {
                 "got": "^9.6.0",
                 "registry-auth-token": "^4.0.0",
@@ -3056,7 +3117,8 @@
                 "semver": {
                     "version": "6.3.0",
                     "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+                    "dev": true
                 }
             }
         },
@@ -3221,7 +3283,8 @@
         "prepend-http": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
-            "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc="
+            "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=",
+            "dev": true
         },
         "process-nextick-args": {
             "version": "2.0.1",
@@ -3257,12 +3320,14 @@
         "pstree.remy": {
             "version": "1.1.8",
             "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz",
-            "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w=="
+            "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==",
+            "dev": true
         },
         "pump": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
             "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+            "dev": true,
             "requires": {
                 "end-of-stream": "^1.1.0",
                 "once": "^1.3.1"
@@ -3277,6 +3342,7 @@
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/pupa/-/pupa-2.1.1.tgz",
             "integrity": "sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==",
+            "dev": true,
             "requires": {
                 "escape-goat": "^2.0.0"
             }
@@ -3363,6 +3429,7 @@
             "version": "4.2.1",
             "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.1.tgz",
             "integrity": "sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw==",
+            "dev": true,
             "requires": {
                 "rc": "^1.2.8"
             }
@@ -3371,6 +3438,7 @@
             "version": "5.1.0",
             "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz",
             "integrity": "sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==",
+            "dev": true,
             "requires": {
                 "rc": "^1.2.8"
             }
@@ -3471,6 +3539,7 @@
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz",
             "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=",
+            "dev": true,
             "requires": {
                 "lowercase-keys": "^1.0.0"
             }
@@ -3507,12 +3576,12 @@
             "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
         },
         "schema-utils": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.0.tgz",
-            "integrity": "sha512-tTEaeYkyIhEZ9uWgAjDerWov3T9MgX8dhhy2r0IGeeX4W8ngtGl1++dUve/RUqzuaASSh7shwCDJjEzthxki8w==",
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+            "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
             "dev": true,
             "requires": {
-                "@types/json-schema": "^7.0.7",
+                "@types/json-schema": "^7.0.8",
                 "ajv": "^6.12.5",
                 "ajv-keywords": "^3.5.2"
             }
@@ -3534,6 +3603,7 @@
             "version": "3.1.1",
             "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-3.1.1.tgz",
             "integrity": "sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg==",
+            "dev": true,
             "requires": {
                 "semver": "^6.3.0"
             },
@@ -3541,7 +3611,8 @@
                 "semver": {
                     "version": "6.3.0",
                     "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+                    "dev": true
                 }
             }
         },
@@ -3924,6 +3995,7 @@
             "version": "5.5.0",
             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
             "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+            "dev": true,
             "requires": {
                 "has-flag": "^3.0.0"
             }
@@ -3943,9 +4015,9 @@
             },
             "dependencies": {
                 "ajv": {
-                    "version": "8.6.1",
-                    "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.1.tgz",
-                    "integrity": "sha512-42VLtQUOLefAvKFAQIxIZDaThq6om/PrfP0CYk3/vn+y4BMNkKnbli8ON2QCiHov4KkzOSJ/xSoBJdayiiYvVQ==",
+                    "version": "8.6.2",
+                    "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.2.tgz",
+                    "integrity": "sha512-9807RlWAgT564wT+DjeyU5OFMPjmzxVobvDFmNAhY+5zD6A2ly3jDp6sgnfyDtlIQ+7H97oc/DGCzzfu9rjw9w==",
                     "dev": true,
                     "requires": {
                         "fast-deep-equal": "^3.1.1",
@@ -4022,7 +4094,8 @@
         "term-size": {
             "version": "2.2.1",
             "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.1.tgz",
-            "integrity": "sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg=="
+            "integrity": "sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg==",
+            "dev": true
         },
         "terser": {
             "version": "5.7.1",
@@ -4066,7 +4139,8 @@
         "to-readable-stream": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz",
-            "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q=="
+            "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==",
+            "dev": true
         },
         "to-regex-range": {
             "version": "5.0.1",
@@ -4090,6 +4164,7 @@
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz",
             "integrity": "sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==",
+            "dev": true,
             "requires": {
                 "nopt": "~1.0.10"
             },
@@ -4098,6 +4173,7 @@
                     "version": "1.0.10",
                     "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz",
                     "integrity": "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=",
+                    "dev": true,
                     "requires": {
                         "abbrev": "1"
                     }
@@ -4141,7 +4217,8 @@
         "type-fest": {
             "version": "0.8.1",
             "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-            "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="
+            "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+            "dev": true
         },
         "type-is": {
             "version": "1.6.18",
@@ -4161,6 +4238,7 @@
             "version": "3.1.5",
             "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
             "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
+            "dev": true,
             "requires": {
                 "is-typedarray": "^1.0.0"
             }
@@ -4177,6 +4255,7 @@
             "version": "2.0.3",
             "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.3.tgz",
             "integrity": "sha512-nrXZwwXrD/T/JXeygJqdCO6NZZ1L66HrxM/Z7mIq2oPanoN0F1nLx3lwJMu6AwJY69hdixaFQOuoYsMjE5/C2A==",
+            "dev": true,
             "requires": {
                 "debug": "^2.2.0"
             },
@@ -4185,6 +4264,7 @@
                     "version": "2.6.9",
                     "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
                     "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+                    "dev": true,
                     "requires": {
                         "ms": "2.0.0"
                     }
@@ -4192,7 +4272,8 @@
                 "ms": {
                     "version": "2.0.0",
                     "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-                    "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+                    "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+                    "dev": true
                 }
             }
         },
@@ -4200,6 +4281,7 @@
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz",
             "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==",
+            "dev": true,
             "requires": {
                 "crypto-random-string": "^2.0.0"
             }
@@ -4213,6 +4295,7 @@
             "version": "4.1.3",
             "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-4.1.3.tgz",
             "integrity": "sha512-Yld6Z0RyCYGB6ckIjffGOSOmHXj1gMeE7aROz4MG+XMkmixBX4jUngrGXNYz7wPKBmtoD4MnBa2Anu7RSKht/A==",
+            "dev": true,
             "requires": {
                 "boxen": "^4.2.0",
                 "chalk": "^3.0.0",
@@ -4241,6 +4324,7 @@
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz",
             "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=",
+            "dev": true,
             "requires": {
                 "prepend-http": "^2.0.0"
             }
@@ -4298,13 +4382,13 @@
             }
         },
         "webpack": {
-            "version": "5.43.0",
-            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.43.0.tgz",
-            "integrity": "sha512-ex3nB9uxNI0azzb0r3xGwi+LS5Gw1RCRSKk0kg3kq9MYdIPmLS6UI3oEtG7esBaB51t9I+5H+vHmL3htaxqMSw==",
+            "version": "5.45.1",
+            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.45.1.tgz",
+            "integrity": "sha512-68VT2ZgG9EHs6h6UxfV2SEYewA9BA3SOLSnC2NEbJJiEwbAiueDL033R1xX0jzjmXvMh0oSeKnKgbO2bDXIEyQ==",
             "dev": true,
             "requires": {
                 "@types/eslint-scope": "^3.7.0",
-                "@types/estree": "^0.0.49",
+                "@types/estree": "^0.0.50",
                 "@webassemblyjs/ast": "1.11.1",
                 "@webassemblyjs/wasm-edit": "1.11.1",
                 "@webassemblyjs/wasm-parser": "1.11.1",
@@ -4321,7 +4405,7 @@
                 "loader-runner": "^4.2.0",
                 "mime-types": "^2.1.27",
                 "neo-async": "^2.6.2",
-                "schema-utils": "^3.0.0",
+                "schema-utils": "^3.1.0",
                 "tapable": "^2.1.1",
                 "terser-webpack-plugin": "^5.1.3",
                 "watchpack": "^2.2.0",
@@ -4382,9 +4466,9 @@
             "dev": true
         },
         "webpack-sources": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.3.0.tgz",
-            "integrity": "sha512-WyOdtwSvOML1kbgtXbTDnEW0jkJ7hZr/bDByIwszhWd/4XX1A3XMkrbFMsuH4+/MfLlZCUzlAdg4r7jaGKEIgQ==",
+            "version": "2.3.1",
+            "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.3.1.tgz",
+            "integrity": "sha512-y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA==",
             "dev": true,
             "requires": {
                 "source-list-map": "^2.0.1",
@@ -4412,6 +4496,7 @@
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz",
             "integrity": "sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==",
+            "dev": true,
             "requires": {
                 "string-width": "^4.0.0"
             },
@@ -4419,22 +4504,26 @@
                 "ansi-regex": {
                     "version": "5.0.0",
                     "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-                    "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
+                    "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+                    "dev": true
                 },
                 "emoji-regex": {
                     "version": "8.0.0",
                     "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-                    "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+                    "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+                    "dev": true
                 },
                 "is-fullwidth-code-point": {
                     "version": "3.0.0",
                     "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-                    "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
+                    "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+                    "dev": true
                 },
                 "string-width": {
                     "version": "4.2.2",
                     "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
                     "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+                    "dev": true,
                     "requires": {
                         "emoji-regex": "^8.0.0",
                         "is-fullwidth-code-point": "^3.0.0",
@@ -4445,6 +4534,7 @@
                     "version": "6.0.0",
                     "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
                     "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+                    "dev": true,
                     "requires": {
                         "ansi-regex": "^5.0.0"
                     }
@@ -4480,6 +4570,7 @@
             "version": "3.0.3",
             "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
             "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
+            "dev": true,
             "requires": {
                 "imurmurhash": "^0.1.4",
                 "is-typedarray": "^1.0.0",
@@ -4488,14 +4579,15 @@
             }
         },
         "ws": {
-            "version": "7.5.2",
-            "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.2.tgz",
-            "integrity": "sha512-lkF7AWRicoB9mAgjeKbGqVUekLnSNO4VjKVnuPHpQeOxZOErX6BPXwJk70nFslRCEEA8EVW7ZjKwXaP9N+1sKQ=="
+            "version": "7.5.3",
+            "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz",
+            "integrity": "sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg=="
         },
         "xdg-basedir": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz",
-            "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q=="
+            "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==",
+            "dev": true
         },
         "xtend": {
             "version": "4.0.2",
diff --git a/server/package.json b/server/package.json
index 3da41c7..c779343 100644
--- a/server/package.json
+++ b/server/package.json
@@ -14,17 +14,17 @@
         "mime-types": "^2.1.31",
         "multer": "^1.4.2",
         "mysql2": "^2.2.5",
-        "nodemon": "^2.0.9",
         "pg": "^8.6.0",
         "sequelize": "^6.6.5",
         "sqlite3": "^5.0.2",
         "umzug": "^2.3.0",
         "uuid": "^8.3.2",
-        "ws": "^7.5.2"
+        "ws": "^7.5.3"
     },
     "devDependencies": {
-        "eslint": "^7.30.0",
-        "webpack": "^5.43.0",
+        "eslint": "^7.31.0",
+        "nodemon": "^2.0.12",
+        "webpack": "^5.45.1",
         "webpack-cli": "^4.7.2",
         "webpack-node-externals": "^3.0.0"
     },
@@ -46,5 +46,5 @@
         "start": "nodemon"
     },
     "type": "module",
-    "version": "5.2.0"
+    "version": "5.2.1"
 }