Will Browning 3 tahun lalu
induk
melakukan
dfb7809620

+ 2 - 8
app/Http/Controllers/Auth/LoginController.php

@@ -42,15 +42,9 @@ class LoginController extends Controller
 
     public function username()
     {
-        $login = request()->input('username');
+        $userId = Username::firstWhere('username', request()->input('username'))?->user_id;
 
-        $user = Username::firstWhere('username', $login)?->user;
-
-        if ($user) {
-            $login = $user->id;
-        }
-
-        request()->merge(['id' => $login]);
+        request()->merge(['id' => $userId]);
 
         return 'id';
     }

+ 1 - 1
app/Models/Recipient.php

@@ -104,7 +104,7 @@ class Recipient extends Model
     }
 
     /**
-     * Get all of the user's custom domains.
+     * Get all of the user's usernames using this recipient as their default.
      */
     public function usernamesUsingAsDefault()
     {

+ 39 - 39
composer.lock

@@ -1954,16 +1954,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v8.83.4",
+            "version": "v8.83.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "97a549f1a83cfb32dab1eecab4c4d40a984a72b5"
+                "reference": "33b1b981266e3a19fbc826b60c4a6847e311ac95"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/97a549f1a83cfb32dab1eecab4c4d40a984a72b5",
-                "reference": "97a549f1a83cfb32dab1eecab4c4d40a984a72b5",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/33b1b981266e3a19fbc826b60c4a6847e311ac95",
+                "reference": "33b1b981266e3a19fbc826b60c4a6847e311ac95",
                 "shasum": ""
             },
             "require": {
@@ -2123,7 +2123,7 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2022-03-08T16:12:54+00:00"
+            "time": "2022-03-15T13:37:44+00:00"
         },
         {
             "name": "laravel/passport",
@@ -2263,16 +2263,16 @@
         },
         {
             "name": "laravel/tinker",
-            "version": "v2.7.0",
+            "version": "v2.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/tinker.git",
-                "reference": "5f2f9815b7631b9f586a3de7933c25f9327d4073"
+                "reference": "1e2d500585a4e546346fadd3adc6f9c1a97e15f4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/tinker/zipball/5f2f9815b7631b9f586a3de7933c25f9327d4073",
-                "reference": "5f2f9815b7631b9f586a3de7933c25f9327d4073",
+                "url": "https://api.github.com/repos/laravel/tinker/zipball/1e2d500585a4e546346fadd3adc6f9c1a97e15f4",
+                "reference": "1e2d500585a4e546346fadd3adc6f9c1a97e15f4",
                 "shasum": ""
             },
             "require": {
@@ -2325,9 +2325,9 @@
             ],
             "support": {
                 "issues": "https://github.com/laravel/tinker/issues",
-                "source": "https://github.com/laravel/tinker/tree/v2.7.0"
+                "source": "https://github.com/laravel/tinker/tree/v2.7.1"
             },
-            "time": "2022-01-10T08:52:49+00:00"
+            "time": "2022-03-15T15:25:01+00:00"
         },
         {
             "name": "laravel/ui",
@@ -3499,16 +3499,16 @@
         },
         {
             "name": "monolog/monolog",
-            "version": "2.3.5",
+            "version": "2.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "fd4380d6fc37626e2f799f29d91195040137eba9"
+                "reference": "d7fd7450628561ba697b7097d86db72662f54aef"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/fd4380d6fc37626e2f799f29d91195040137eba9",
-                "reference": "fd4380d6fc37626e2f799f29d91195040137eba9",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/d7fd7450628561ba697b7097d86db72662f54aef",
+                "reference": "d7fd7450628561ba697b7097d86db72662f54aef",
                 "shasum": ""
             },
             "require": {
@@ -3530,7 +3530,7 @@
                 "phpstan/phpstan": "^0.12.91",
                 "phpunit/phpunit": "^8.5",
                 "predis/predis": "^1.1",
-                "rollbar/rollbar": "^1.3",
+                "rollbar/rollbar": "^1.3 || ^2 || ^3",
                 "ruflin/elastica": ">=0.90@dev",
                 "swiftmailer/swiftmailer": "^5.3|^6.0"
             },
@@ -3582,7 +3582,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Seldaek/monolog/issues",
-                "source": "https://github.com/Seldaek/monolog/tree/2.3.5"
+                "source": "https://github.com/Seldaek/monolog/tree/2.4.0"
             },
             "funding": [
                 {
@@ -3594,7 +3594,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-10-01T21:08:31+00:00"
+            "time": "2022-03-14T12:44:37+00:00"
         },
         {
             "name": "myclabs/php-enum",
@@ -9166,16 +9166,16 @@
         },
         {
             "name": "composer/semver",
-            "version": "3.2.9",
+            "version": "3.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/semver.git",
-                "reference": "a951f614bd64dcd26137bc9b7b2637ddcfc57649"
+                "reference": "f79c90ad4e9b41ac4dfc5d77bf398cf61fbd718b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/semver/zipball/a951f614bd64dcd26137bc9b7b2637ddcfc57649",
-                "reference": "a951f614bd64dcd26137bc9b7b2637ddcfc57649",
+                "url": "https://api.github.com/repos/composer/semver/zipball/f79c90ad4e9b41ac4dfc5d77bf398cf61fbd718b",
+                "reference": "f79c90ad4e9b41ac4dfc5d77bf398cf61fbd718b",
                 "shasum": ""
             },
             "require": {
@@ -9227,7 +9227,7 @@
             "support": {
                 "irc": "irc://irc.freenode.org/composer",
                 "issues": "https://github.com/composer/semver/issues",
-                "source": "https://github.com/composer/semver/tree/3.2.9"
+                "source": "https://github.com/composer/semver/tree/3.3.0"
             },
             "funding": [
                 {
@@ -9243,7 +9243,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-02-04T13:58:43+00:00"
+            "time": "2022-03-15T08:35:57+00:00"
         },
         {
             "name": "composer/xdebug-handler",
@@ -10855,16 +10855,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.5.18",
+            "version": "9.5.19",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "1b5856028273bfd855e60a887278857d872ec67a"
+                "reference": "35ea4b7f3acabb26f4bb640f8c30866c401da807"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/1b5856028273bfd855e60a887278857d872ec67a",
-                "reference": "1b5856028273bfd855e60a887278857d872ec67a",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/35ea4b7f3acabb26f4bb640f8c30866c401da807",
+                "reference": "35ea4b7f3acabb26f4bb640f8c30866c401da807",
                 "shasum": ""
             },
             "require": {
@@ -10894,7 +10894,7 @@
                 "sebastian/global-state": "^5.0.1",
                 "sebastian/object-enumerator": "^4.0.3",
                 "sebastian/resource-operations": "^3.0.3",
-                "sebastian/type": "^2.3.4",
+                "sebastian/type": "^3.0",
                 "sebastian/version": "^3.0.2"
             },
             "require-dev": {
@@ -10942,7 +10942,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.18"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.19"
             },
             "funding": [
                 {
@@ -10954,7 +10954,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-03-08T06:52:28+00:00"
+            "time": "2022-03-15T09:57:31+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -11813,28 +11813,28 @@
         },
         {
             "name": "sebastian/type",
-            "version": "2.3.4",
+            "version": "3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "b8cd8a1c753c90bc1a0f5372170e3e489136f914"
+                "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/b8cd8a1c753c90bc1a0f5372170e3e489136f914",
-                "reference": "b8cd8a1c753c90bc1a0f5372170e3e489136f914",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/b233b84bc4465aff7b57cf1c4bc75c86d00d6dad",
+                "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^9.5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.3-dev"
+                    "dev-master": "3.0-dev"
                 }
             },
             "autoload": {
@@ -11857,7 +11857,7 @@
             "homepage": "https://github.com/sebastianbergmann/type",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/type/issues",
-                "source": "https://github.com/sebastianbergmann/type/tree/2.3.4"
+                "source": "https://github.com/sebastianbergmann/type/tree/3.0.0"
             },
             "funding": [
                 {
@@ -11865,7 +11865,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-06-15T12:49:02+00:00"
+            "time": "2022-03-15T09:54:48+00:00"
         },
         {
             "name": "sebastian/version",

+ 3 - 3
config/version.yml

@@ -4,10 +4,10 @@ current:
   label: v
   major: 0
   minor: 11
-  patch: 0
-  prerelease: 1-gc784c7e
+  patch: 1
+  prerelease: 1-g2340e25
   buildmetadata: ''
-  commit: c784c7
+  commit: '2340e2'
   timestamp:
     year: 2020
     month: 10

+ 213 - 172
package-lock.json

@@ -56,25 +56,25 @@
             }
         },
         "node_modules/@babel/compat-data": {
-            "version": "7.17.0",
-            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.0.tgz",
-            "integrity": "sha512-392byTlpGWXMv4FbyWw3sAZ/FrW/DrwqLGXpy0mbyNe9Taqv1mg9yON5/o0cnr8XYCkFTZbC1eV+c+LAROgrng==",
+            "version": "7.17.7",
+            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.7.tgz",
+            "integrity": "sha512-p8pdE6j0a29TNGebNm7NzYZWB3xVZJBZ7XGs42uAKzQo8VQ3F0By/cQCtUEABwIqw5zo6WA4NbmxsfzADzMKnQ==",
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/core": {
-            "version": "7.17.5",
-            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.17.5.tgz",
-            "integrity": "sha512-/BBMw4EvjmyquN5O+t5eh0+YqB3XXJkYD2cjKpYtWOfFy4lQ4UozNSmxAcWT8r2XtZs0ewG+zrfsqeR15i1ajA==",
+            "version": "7.17.7",
+            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.17.7.tgz",
+            "integrity": "sha512-djHlEfFHnSnTAcPb7dATbiM5HxGOP98+3JLBZtjRb5I7RXrw7kFRoG2dXM8cm3H+o11A8IFH/uprmJpwFynRNQ==",
             "dependencies": {
                 "@ampproject/remapping": "^2.1.0",
                 "@babel/code-frame": "^7.16.7",
-                "@babel/generator": "^7.17.3",
-                "@babel/helper-compilation-targets": "^7.16.7",
-                "@babel/helper-module-transforms": "^7.16.7",
-                "@babel/helpers": "^7.17.2",
-                "@babel/parser": "^7.17.3",
+                "@babel/generator": "^7.17.7",
+                "@babel/helper-compilation-targets": "^7.17.7",
+                "@babel/helper-module-transforms": "^7.17.7",
+                "@babel/helpers": "^7.17.7",
+                "@babel/parser": "^7.17.7",
                 "@babel/template": "^7.16.7",
                 "@babel/traverse": "^7.17.3",
                 "@babel/types": "^7.17.0",
@@ -101,9 +101,9 @@
             }
         },
         "node_modules/@babel/generator": {
-            "version": "7.17.3",
-            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.3.tgz",
-            "integrity": "sha512-+R6Dctil/MgUsZsZAkYgK+ADNSZzJRRy0TvY65T71z/CR854xHQ1EweBYXdfT+HNeN7w0cSJJEzgxZMv40pxsg==",
+            "version": "7.17.7",
+            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.7.tgz",
+            "integrity": "sha512-oLcVCTeIFadUoArDTwpluncplrYBmTCCZZgXCbgNGvOBBiSDDK3eWO4b/+eOTli5tKv1lg+a5/NAXg+nTcei1w==",
             "dependencies": {
                 "@babel/types": "^7.17.0",
                 "jsesc": "^2.5.1",
@@ -137,11 +137,11 @@
             }
         },
         "node_modules/@babel/helper-compilation-targets": {
-            "version": "7.16.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.7.tgz",
-            "integrity": "sha512-mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA==",
+            "version": "7.17.7",
+            "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.7.tgz",
+            "integrity": "sha512-UFzlz2jjd8kroj0hmCFV5zr+tQPi1dpC2cRsDV/3IEW8bJfCPrPpmcSN6ZS8RqIq4LXcmpipCQFPddyFA5Yc7w==",
             "dependencies": {
-                "@babel/compat-data": "^7.16.4",
+                "@babel/compat-data": "^7.17.7",
                 "@babel/helper-validator-option": "^7.16.7",
                 "browserslist": "^4.17.5",
                 "semver": "^6.3.0"
@@ -280,11 +280,11 @@
             }
         },
         "node_modules/@babel/helper-member-expression-to-functions": {
-            "version": "7.16.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.7.tgz",
-            "integrity": "sha512-VtJ/65tYiU/6AbMTDwyoXGPKHgTsfRarivm+YbB5uAzKUyuPjgZSgAFeG87FCigc7KNHu2Pegh1XIT3lXjvz3Q==",
+            "version": "7.17.7",
+            "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz",
+            "integrity": "sha512-thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw==",
             "dependencies": {
-                "@babel/types": "^7.16.7"
+                "@babel/types": "^7.17.0"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -302,13 +302,13 @@
             }
         },
         "node_modules/@babel/helper-module-transforms": {
-            "version": "7.17.6",
-            "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.6.tgz",
-            "integrity": "sha512-2ULmRdqoOMpdvkbT8jONrZML/XALfzxlb052bldftkicAUy8AxSCkD5trDPQcwHNmolcl7wP6ehNqMlyUw6AaA==",
+            "version": "7.17.7",
+            "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz",
+            "integrity": "sha512-VmZD99F3gNTYB7fJRDTi+u6l/zxY0BE6OIxPSU7a50s6ZUQkHwSDmV92FfM+oCG0pZRVojGYhkR8I0OGeCVREw==",
             "dependencies": {
                 "@babel/helper-environment-visitor": "^7.16.7",
                 "@babel/helper-module-imports": "^7.16.7",
-                "@babel/helper-simple-access": "^7.16.7",
+                "@babel/helper-simple-access": "^7.17.7",
                 "@babel/helper-split-export-declaration": "^7.16.7",
                 "@babel/helper-validator-identifier": "^7.16.7",
                 "@babel/template": "^7.16.7",
@@ -367,11 +367,11 @@
             }
         },
         "node_modules/@babel/helper-simple-access": {
-            "version": "7.16.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.16.7.tgz",
-            "integrity": "sha512-ZIzHVyoeLMvXMN/vok/a4LWRy8G2v205mNP0XOuf9XRLyX5/u9CnVulUtDgUTama3lT+bf/UqucuZjqiGuTS1g==",
+            "version": "7.17.7",
+            "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz",
+            "integrity": "sha512-txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA==",
             "dependencies": {
-                "@babel/types": "^7.16.7"
+                "@babel/types": "^7.17.0"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -430,12 +430,12 @@
             }
         },
         "node_modules/@babel/helpers": {
-            "version": "7.17.2",
-            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.2.tgz",
-            "integrity": "sha512-0Qu7RLR1dILozr/6M0xgj+DFPmi6Bnulgm9M8BVa9ZCWxDqlSnqt3cf8IDPB5m45sVXUZ0kuQAgUrdSFFH79fQ==",
+            "version": "7.17.7",
+            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.7.tgz",
+            "integrity": "sha512-TKsj9NkjJfTBxM7Phfy7kv6yYc4ZcOo+AaWGqQOKTPDOmcGkIFb5xNA746eKisQkm4yavUYh4InYM9S+VnO01w==",
             "dependencies": {
                 "@babel/template": "^7.16.7",
-                "@babel/traverse": "^7.17.0",
+                "@babel/traverse": "^7.17.3",
                 "@babel/types": "^7.17.0"
             },
             "engines": {
@@ -512,9 +512,9 @@
             }
         },
         "node_modules/@babel/parser": {
-            "version": "7.17.3",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.17.3.tgz",
-            "integrity": "sha512-7yJPvPV+ESz2IUTPbOL+YkIGyCqOyNIzdguKQuJGnH7bg1WTIifuM21YqokFt/THWh1AkCRn9IgoykTRCBVpzA==",
+            "version": "7.17.7",
+            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.17.7.tgz",
+            "integrity": "sha512-bm3AQf45vR4gKggRfvJdYJ0gFLoCbsPxiFLSH6hTVYABptNHY6l9NrhnucVjQ/X+SPtLANT9lc0fFhikj+VBRA==",
             "bin": {
                 "parser": "bin/babel-parser.js"
             },
@@ -1042,9 +1042,9 @@
             }
         },
         "node_modules/@babel/plugin-transform-destructuring": {
-            "version": "7.17.3",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.17.3.tgz",
-            "integrity": "sha512-dDFzegDYKlPqa72xIlbmSkly5MluLoaC1JswABGktyt6NTXSBcUuse/kWE/wvKFWJHPETpi158qJZFS3JmykJg==",
+            "version": "7.17.7",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.17.7.tgz",
+            "integrity": "sha512-XVh0r5yq9sLR4vZ6eVZe8FKfIcSgaTBxVBRSYokRj2qksf6QerYnTxz9/GTuKTH/n/HwLP7t6gtlybHetJ/6hQ==",
             "dependencies": {
                 "@babel/helper-plugin-utils": "^7.16.7"
             },
@@ -1174,13 +1174,13 @@
             }
         },
         "node_modules/@babel/plugin-transform-modules-commonjs": {
-            "version": "7.16.8",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.8.tgz",
-            "integrity": "sha512-oflKPvsLT2+uKQopesJt3ApiaIS2HW+hzHFcwRNtyDGieAeC/dIHZX8buJQ2J2X1rxGPy4eRcUijm3qcSPjYcA==",
+            "version": "7.17.7",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.17.7.tgz",
+            "integrity": "sha512-ITPmR2V7MqioMJyrxUo2onHNC3e+MvfFiFIR0RP21d3PtlVb6sfzoxNKiphSZUOM9hEIdzCcZe83ieX3yoqjUA==",
             "dependencies": {
-                "@babel/helper-module-transforms": "^7.16.7",
+                "@babel/helper-module-transforms": "^7.17.7",
                 "@babel/helper-plugin-utils": "^7.16.7",
-                "@babel/helper-simple-access": "^7.16.7",
+                "@babel/helper-simple-access": "^7.17.7",
                 "babel-plugin-dynamic-import-node": "^2.3.3"
             },
             "engines": {
@@ -1560,9 +1560,9 @@
             }
         },
         "node_modules/@babel/runtime": {
-            "version": "7.17.2",
-            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.2.tgz",
-            "integrity": "sha512-hzeyJyMA1YGdJTuWU0e/j4wKXrU4OMFvY2MSlaI9B7VQb0r5cxTE3EAIS2Q7Tn2RIcDkRvTA/v2JsAEhxe99uw==",
+            "version": "7.17.7",
+            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.7.tgz",
+            "integrity": "sha512-L6rvG9GDxaLgFjg41K+5Yv9OMrU98sWe+Ykmc6FDJW/+vYZMhdOMKkISgzptMaERHvS2Y2lw9MDRm2gHhlQQoA==",
             "dependencies": {
                 "regenerator-runtime": "^0.13.4"
             },
@@ -2468,13 +2468,23 @@
             }
         },
         "node_modules/autoprefixer": {
-            "version": "10.4.2",
-            "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.2.tgz",
-            "integrity": "sha512-9fOPpHKuDW1w/0EKfRmVnxTDt8166MAnLI3mgZ1JCnhNtYWxcJ6Ud5CO/AVOZi/AvFa8DY9RTy3h3+tFBlrrdQ==",
+            "version": "10.4.4",
+            "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.4.tgz",
+            "integrity": "sha512-Tm8JxsB286VweiZ5F0anmbyGiNI3v3wGv3mz9W+cxEDYB/6jbnj6GM9H9mK3wIL8ftgl+C07Lcwb8PG5PCCPzA==",
+            "funding": [
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/postcss/"
+                },
+                {
+                    "type": "tidelift",
+                    "url": "https://tidelift.com/funding/github/npm/autoprefixer"
+                }
+            ],
             "dependencies": {
-                "browserslist": "^4.19.1",
-                "caniuse-lite": "^1.0.30001297",
-                "fraction.js": "^4.1.2",
+                "browserslist": "^4.20.2",
+                "caniuse-lite": "^1.0.30001317",
+                "fraction.js": "^4.2.0",
                 "normalize-range": "^0.1.2",
                 "picocolors": "^1.0.0",
                 "postcss-value-parser": "^4.2.0"
@@ -2485,10 +2495,6 @@
             "engines": {
                 "node": "^10 || ^12 || >=14"
             },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/postcss/"
-            },
             "peerDependencies": {
                 "postcss": "^8.1.0"
             }
@@ -2810,12 +2816,22 @@
             }
         },
         "node_modules/browserslist": {
-            "version": "4.20.0",
-            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.0.tgz",
-            "integrity": "sha512-bnpOoa+DownbciXj0jVGENf8VYQnE2LNWomhYuCsMmmx9Jd9lwq0WXODuwpSsp8AVdKM2/HorrzxAfbKvWTByQ==",
+            "version": "4.20.2",
+            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.2.tgz",
+            "integrity": "sha512-CQOBCqp/9pDvDbx3xfMi+86pr4KXIf2FDkTTdeuYw8OxS9t898LA1Khq57gtufFILXpfgsSx5woNgsBgvGjpsA==",
+            "funding": [
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/browserslist"
+                },
+                {
+                    "type": "tidelift",
+                    "url": "https://tidelift.com/funding/github/npm/browserslist"
+                }
+            ],
             "dependencies": {
-                "caniuse-lite": "^1.0.30001313",
-                "electron-to-chromium": "^1.4.76",
+                "caniuse-lite": "^1.0.30001317",
+                "electron-to-chromium": "^1.4.84",
                 "escalade": "^3.1.1",
                 "node-releases": "^2.0.2",
                 "picocolors": "^1.0.0"
@@ -2825,10 +2841,6 @@
             },
             "engines": {
                 "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/browserslist"
             }
         },
         "node_modules/buffer": {
@@ -2918,9 +2930,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001316",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001316.tgz",
-            "integrity": "sha512-JgUdNoZKxPZFzbzJwy4hDSyGuH/gXz2rN51QmoR8cBQsVo58llD3A0vlRKKRt8FGf5u69P9eQyIH8/z9vN/S0Q==",
+            "version": "1.0.30001317",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001317.tgz",
+            "integrity": "sha512-xIZLh8gBm4dqNX0gkzrBeyI86J2eCjWzYAs40q88smG844YIrN4tVQl/RhquHvKEKImWWFIVh1Lxe5n1G/N+GQ==",
             "funding": {
                 "type": "opencollective",
                 "url": "https://opencollective.com/browserslist"
@@ -3691,9 +3703,9 @@
             }
         },
         "node_modules/dayjs": {
-            "version": "1.10.8",
-            "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.10.8.tgz",
-            "integrity": "sha512-wbNwDfBHHur9UOzNUjeKUOJ0fCb0a52Wx0xInmQ7Y8FstyajiV1NmK1e00cxsr9YrE9r7yAChE0VvpuY5Rnlow=="
+            "version": "1.11.0",
+            "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.0.tgz",
+            "integrity": "sha512-JLC809s6Y948/FuCZPm5IX8rRhQwOiyMb2TfVVQEixG7P8Lm/gt5S7yoQZmC8x1UehI9Pb7sksEt4xx14m+7Ug=="
         },
         "node_modules/de-indent": {
             "version": "1.0.2",
@@ -4030,9 +4042,9 @@
             "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.4.82",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.82.tgz",
-            "integrity": "sha512-Ks+ANzLoIrFDUOJdjxYMH6CMKB8UQo5modAwvSZTxgF+vEs/U7G5IbWFUp6dS4klPkTDVdxbORuk8xAXXhMsWw=="
+            "version": "1.4.85",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.85.tgz",
+            "integrity": "sha512-K9AsQ41WS2bjZUFpRWfvaS4RjEcRCamEkBJN1Z1TQILBfP1H8QnJ9ti0wiLiMv0sRjX3EHKzgs9jDnmGFx2jXg=="
         },
         "node_modules/elliptic": {
             "version": "6.5.4",
@@ -5665,9 +5677,9 @@
             "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
         },
         "node_modules/lint-staged": {
-            "version": "12.3.5",
-            "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-12.3.5.tgz",
-            "integrity": "sha512-oOH36RUs1It7b9U/C7Nl/a0sLfoIBcMB8ramiB3nuJ6brBqzsWiUAFSR5DQ3yyP/OR7XKMpijtgKl2DV1lQ3lA==",
+            "version": "12.3.6",
+            "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-12.3.6.tgz",
+            "integrity": "sha512-tVNyl/HsAnplKh4oaoRNzyZLm0PE/6VaBUXvd/gA9zhYCC/+ivZwiwpoT6jOxcLzuIOjP19wW+mfOi7/Bw4c1A==",
             "dev": true,
             "dependencies": {
                 "cli-truncate": "^3.1.0",
@@ -5680,6 +5692,7 @@
                 "micromatch": "^4.0.4",
                 "normalize-path": "^3.0.0",
                 "object-inspect": "^1.12.0",
+                "pidtree": "^0.5.0",
                 "string-argv": "^0.3.1",
                 "supports-color": "^9.2.1",
                 "yaml": "^1.10.2"
@@ -6699,6 +6712,18 @@
                 "url": "https://github.com/sponsors/jonschlinkert"
             }
         },
+        "node_modules/pidtree": {
+            "version": "0.5.0",
+            "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.5.0.tgz",
+            "integrity": "sha512-9nxspIM7OpZuhBxPg73Zvyq7j1QMPMPsGKTqRc2XOaFQauDvoNz9fM1Wdkjmeo7l9GXOZiRs97sPkuayl39wjA==",
+            "dev": true,
+            "bin": {
+                "pidtree": "bin/pidtree.js"
+            },
+            "engines": {
+                "node": ">=0.10"
+            }
+        },
         "node_modules/pify": {
             "version": "2.3.0",
             "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
@@ -6748,9 +6773,19 @@
             }
         },
         "node_modules/postcss": {
-            "version": "8.4.8",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.8.tgz",
-            "integrity": "sha512-2tXEqGxrjvAO6U+CJzDL2Fk2kPHTv1jQsYkSoMeOis2SsYaXRO2COxTdQp99cYvif9JTXaAk9lYGc3VhJt7JPQ==",
+            "version": "8.4.12",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.12.tgz",
+            "integrity": "sha512-lg6eITwYe9v6Hr5CncVbK70SoioNQIq81nsaG86ev5hAidQvmOeETBqs7jm43K2F5/Ley3ytDtriImV6TpNiSg==",
+            "funding": [
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/postcss/"
+                },
+                {
+                    "type": "tidelift",
+                    "url": "https://tidelift.com/funding/github/npm/postcss"
+                }
+            ],
             "dependencies": {
                 "nanoid": "^3.3.1",
                 "picocolors": "^1.0.0",
@@ -6758,10 +6793,6 @@
             },
             "engines": {
                 "node": "^10 || ^12 || >=14"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/postcss/"
             }
         },
         "node_modules/postcss-calc": {
@@ -7311,15 +7342,18 @@
             "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
         },
         "node_modules/prettier": {
-            "version": "2.5.1",
-            "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.5.1.tgz",
-            "integrity": "sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg==",
+            "version": "2.6.0",
+            "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.6.0.tgz",
+            "integrity": "sha512-m2FgJibYrBGGgQXNzfd0PuDGShJgRavjUoRCw1mZERIWVSXF0iLzLm+aOqTAbLnC3n6JzUhAA8uZnFVghHJ86A==",
             "devOptional": true,
             "bin": {
                 "prettier": "bin-prettier.js"
             },
             "engines": {
                 "node": ">=10.13.0"
+            },
+            "funding": {
+                "url": "https://github.com/prettier/prettier?sponsor=1"
             }
         },
         "node_modules/pretty-time": {
@@ -8522,9 +8556,9 @@
             }
         },
         "node_modules/terser": {
-            "version": "5.12.0",
-            "resolved": "https://registry.npmjs.org/terser/-/terser-5.12.0.tgz",
-            "integrity": "sha512-R3AUhNBGWiFc77HXag+1fXpAxTAFRQTJemlJKjAgD9r8xXTpjNKqIXwHM/o7Rh+O0kUJtS3WQVdBeMKFk5sw9A==",
+            "version": "5.12.1",
+            "resolved": "https://registry.npmjs.org/terser/-/terser-5.12.1.tgz",
+            "integrity": "sha512-NXbs+7nisos5E+yXwAD+y7zrcTkMqb0dEJxIGtSKPdCBzopf7ni4odPul2aechpV7EXNvOudYOX2bb5tln1jbQ==",
             "dependencies": {
                 "acorn": "^8.5.0",
                 "commander": "^2.20.0",
@@ -9511,22 +9545,22 @@
             }
         },
         "@babel/compat-data": {
-            "version": "7.17.0",
-            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.0.tgz",
-            "integrity": "sha512-392byTlpGWXMv4FbyWw3sAZ/FrW/DrwqLGXpy0mbyNe9Taqv1mg9yON5/o0cnr8XYCkFTZbC1eV+c+LAROgrng=="
+            "version": "7.17.7",
+            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.7.tgz",
+            "integrity": "sha512-p8pdE6j0a29TNGebNm7NzYZWB3xVZJBZ7XGs42uAKzQo8VQ3F0By/cQCtUEABwIqw5zo6WA4NbmxsfzADzMKnQ=="
         },
         "@babel/core": {
-            "version": "7.17.5",
-            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.17.5.tgz",
-            "integrity": "sha512-/BBMw4EvjmyquN5O+t5eh0+YqB3XXJkYD2cjKpYtWOfFy4lQ4UozNSmxAcWT8r2XtZs0ewG+zrfsqeR15i1ajA==",
+            "version": "7.17.7",
+            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.17.7.tgz",
+            "integrity": "sha512-djHlEfFHnSnTAcPb7dATbiM5HxGOP98+3JLBZtjRb5I7RXrw7kFRoG2dXM8cm3H+o11A8IFH/uprmJpwFynRNQ==",
             "requires": {
                 "@ampproject/remapping": "^2.1.0",
                 "@babel/code-frame": "^7.16.7",
-                "@babel/generator": "^7.17.3",
-                "@babel/helper-compilation-targets": "^7.16.7",
-                "@babel/helper-module-transforms": "^7.16.7",
-                "@babel/helpers": "^7.17.2",
-                "@babel/parser": "^7.17.3",
+                "@babel/generator": "^7.17.7",
+                "@babel/helper-compilation-targets": "^7.17.7",
+                "@babel/helper-module-transforms": "^7.17.7",
+                "@babel/helpers": "^7.17.7",
+                "@babel/parser": "^7.17.7",
                 "@babel/template": "^7.16.7",
                 "@babel/traverse": "^7.17.3",
                 "@babel/types": "^7.17.0",
@@ -9545,9 +9579,9 @@
             }
         },
         "@babel/generator": {
-            "version": "7.17.3",
-            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.3.tgz",
-            "integrity": "sha512-+R6Dctil/MgUsZsZAkYgK+ADNSZzJRRy0TvY65T71z/CR854xHQ1EweBYXdfT+HNeN7w0cSJJEzgxZMv40pxsg==",
+            "version": "7.17.7",
+            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.7.tgz",
+            "integrity": "sha512-oLcVCTeIFadUoArDTwpluncplrYBmTCCZZgXCbgNGvOBBiSDDK3eWO4b/+eOTli5tKv1lg+a5/NAXg+nTcei1w==",
             "requires": {
                 "@babel/types": "^7.17.0",
                 "jsesc": "^2.5.1",
@@ -9572,11 +9606,11 @@
             }
         },
         "@babel/helper-compilation-targets": {
-            "version": "7.16.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.7.tgz",
-            "integrity": "sha512-mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA==",
+            "version": "7.17.7",
+            "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.7.tgz",
+            "integrity": "sha512-UFzlz2jjd8kroj0hmCFV5zr+tQPi1dpC2cRsDV/3IEW8bJfCPrPpmcSN6ZS8RqIq4LXcmpipCQFPddyFA5Yc7w==",
             "requires": {
-                "@babel/compat-data": "^7.16.4",
+                "@babel/compat-data": "^7.17.7",
                 "@babel/helper-validator-option": "^7.16.7",
                 "browserslist": "^4.17.5",
                 "semver": "^6.3.0"
@@ -9677,11 +9711,11 @@
             }
         },
         "@babel/helper-member-expression-to-functions": {
-            "version": "7.16.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.7.tgz",
-            "integrity": "sha512-VtJ/65tYiU/6AbMTDwyoXGPKHgTsfRarivm+YbB5uAzKUyuPjgZSgAFeG87FCigc7KNHu2Pegh1XIT3lXjvz3Q==",
+            "version": "7.17.7",
+            "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz",
+            "integrity": "sha512-thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw==",
             "requires": {
-                "@babel/types": "^7.16.7"
+                "@babel/types": "^7.17.0"
             }
         },
         "@babel/helper-module-imports": {
@@ -9693,13 +9727,13 @@
             }
         },
         "@babel/helper-module-transforms": {
-            "version": "7.17.6",
-            "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.6.tgz",
-            "integrity": "sha512-2ULmRdqoOMpdvkbT8jONrZML/XALfzxlb052bldftkicAUy8AxSCkD5trDPQcwHNmolcl7wP6ehNqMlyUw6AaA==",
+            "version": "7.17.7",
+            "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz",
+            "integrity": "sha512-VmZD99F3gNTYB7fJRDTi+u6l/zxY0BE6OIxPSU7a50s6ZUQkHwSDmV92FfM+oCG0pZRVojGYhkR8I0OGeCVREw==",
             "requires": {
                 "@babel/helper-environment-visitor": "^7.16.7",
                 "@babel/helper-module-imports": "^7.16.7",
-                "@babel/helper-simple-access": "^7.16.7",
+                "@babel/helper-simple-access": "^7.17.7",
                 "@babel/helper-split-export-declaration": "^7.16.7",
                 "@babel/helper-validator-identifier": "^7.16.7",
                 "@babel/template": "^7.16.7",
@@ -9743,11 +9777,11 @@
             }
         },
         "@babel/helper-simple-access": {
-            "version": "7.16.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.16.7.tgz",
-            "integrity": "sha512-ZIzHVyoeLMvXMN/vok/a4LWRy8G2v205mNP0XOuf9XRLyX5/u9CnVulUtDgUTama3lT+bf/UqucuZjqiGuTS1g==",
+            "version": "7.17.7",
+            "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz",
+            "integrity": "sha512-txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA==",
             "requires": {
-                "@babel/types": "^7.16.7"
+                "@babel/types": "^7.17.0"
             }
         },
         "@babel/helper-skip-transparent-expression-wrappers": {
@@ -9788,12 +9822,12 @@
             }
         },
         "@babel/helpers": {
-            "version": "7.17.2",
-            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.2.tgz",
-            "integrity": "sha512-0Qu7RLR1dILozr/6M0xgj+DFPmi6Bnulgm9M8BVa9ZCWxDqlSnqt3cf8IDPB5m45sVXUZ0kuQAgUrdSFFH79fQ==",
+            "version": "7.17.7",
+            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.7.tgz",
+            "integrity": "sha512-TKsj9NkjJfTBxM7Phfy7kv6yYc4ZcOo+AaWGqQOKTPDOmcGkIFb5xNA746eKisQkm4yavUYh4InYM9S+VnO01w==",
             "requires": {
                 "@babel/template": "^7.16.7",
-                "@babel/traverse": "^7.17.0",
+                "@babel/traverse": "^7.17.3",
                 "@babel/types": "^7.17.0"
             }
         },
@@ -9854,9 +9888,9 @@
             }
         },
         "@babel/parser": {
-            "version": "7.17.3",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.17.3.tgz",
-            "integrity": "sha512-7yJPvPV+ESz2IUTPbOL+YkIGyCqOyNIzdguKQuJGnH7bg1WTIifuM21YqokFt/THWh1AkCRn9IgoykTRCBVpzA=="
+            "version": "7.17.7",
+            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.17.7.tgz",
+            "integrity": "sha512-bm3AQf45vR4gKggRfvJdYJ0gFLoCbsPxiFLSH6hTVYABptNHY6l9NrhnucVjQ/X+SPtLANT9lc0fFhikj+VBRA=="
         },
         "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
             "version": "7.16.7",
@@ -10189,9 +10223,9 @@
             }
         },
         "@babel/plugin-transform-destructuring": {
-            "version": "7.17.3",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.17.3.tgz",
-            "integrity": "sha512-dDFzegDYKlPqa72xIlbmSkly5MluLoaC1JswABGktyt6NTXSBcUuse/kWE/wvKFWJHPETpi158qJZFS3JmykJg==",
+            "version": "7.17.7",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.17.7.tgz",
+            "integrity": "sha512-XVh0r5yq9sLR4vZ6eVZe8FKfIcSgaTBxVBRSYokRj2qksf6QerYnTxz9/GTuKTH/n/HwLP7t6gtlybHetJ/6hQ==",
             "requires": {
                 "@babel/helper-plugin-utils": "^7.16.7"
             }
@@ -10267,13 +10301,13 @@
             }
         },
         "@babel/plugin-transform-modules-commonjs": {
-            "version": "7.16.8",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.8.tgz",
-            "integrity": "sha512-oflKPvsLT2+uKQopesJt3ApiaIS2HW+hzHFcwRNtyDGieAeC/dIHZX8buJQ2J2X1rxGPy4eRcUijm3qcSPjYcA==",
+            "version": "7.17.7",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.17.7.tgz",
+            "integrity": "sha512-ITPmR2V7MqioMJyrxUo2onHNC3e+MvfFiFIR0RP21d3PtlVb6sfzoxNKiphSZUOM9hEIdzCcZe83ieX3yoqjUA==",
             "requires": {
-                "@babel/helper-module-transforms": "^7.16.7",
+                "@babel/helper-module-transforms": "^7.17.7",
                 "@babel/helper-plugin-utils": "^7.16.7",
-                "@babel/helper-simple-access": "^7.16.7",
+                "@babel/helper-simple-access": "^7.17.7",
                 "babel-plugin-dynamic-import-node": "^2.3.3"
             }
         },
@@ -10534,9 +10568,9 @@
             }
         },
         "@babel/runtime": {
-            "version": "7.17.2",
-            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.2.tgz",
-            "integrity": "sha512-hzeyJyMA1YGdJTuWU0e/j4wKXrU4OMFvY2MSlaI9B7VQb0r5cxTE3EAIS2Q7Tn2RIcDkRvTA/v2JsAEhxe99uw==",
+            "version": "7.17.7",
+            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.7.tgz",
+            "integrity": "sha512-L6rvG9GDxaLgFjg41K+5Yv9OMrU98sWe+Ykmc6FDJW/+vYZMhdOMKkISgzptMaERHvS2Y2lw9MDRm2gHhlQQoA==",
             "requires": {
                 "regenerator-runtime": "^0.13.4"
             }
@@ -11323,13 +11357,13 @@
             }
         },
         "autoprefixer": {
-            "version": "10.4.2",
-            "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.2.tgz",
-            "integrity": "sha512-9fOPpHKuDW1w/0EKfRmVnxTDt8166MAnLI3mgZ1JCnhNtYWxcJ6Ud5CO/AVOZi/AvFa8DY9RTy3h3+tFBlrrdQ==",
+            "version": "10.4.4",
+            "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.4.tgz",
+            "integrity": "sha512-Tm8JxsB286VweiZ5F0anmbyGiNI3v3wGv3mz9W+cxEDYB/6jbnj6GM9H9mK3wIL8ftgl+C07Lcwb8PG5PCCPzA==",
             "requires": {
-                "browserslist": "^4.19.1",
-                "caniuse-lite": "^1.0.30001297",
-                "fraction.js": "^4.1.2",
+                "browserslist": "^4.20.2",
+                "caniuse-lite": "^1.0.30001317",
+                "fraction.js": "^4.2.0",
                 "normalize-range": "^0.1.2",
                 "picocolors": "^1.0.0",
                 "postcss-value-parser": "^4.2.0"
@@ -11593,12 +11627,12 @@
             }
         },
         "browserslist": {
-            "version": "4.20.0",
-            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.0.tgz",
-            "integrity": "sha512-bnpOoa+DownbciXj0jVGENf8VYQnE2LNWomhYuCsMmmx9Jd9lwq0WXODuwpSsp8AVdKM2/HorrzxAfbKvWTByQ==",
+            "version": "4.20.2",
+            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.2.tgz",
+            "integrity": "sha512-CQOBCqp/9pDvDbx3xfMi+86pr4KXIf2FDkTTdeuYw8OxS9t898LA1Khq57gtufFILXpfgsSx5woNgsBgvGjpsA==",
             "requires": {
-                "caniuse-lite": "^1.0.30001313",
-                "electron-to-chromium": "^1.4.76",
+                "caniuse-lite": "^1.0.30001317",
+                "electron-to-chromium": "^1.4.84",
                 "escalade": "^3.1.1",
                 "node-releases": "^2.0.2",
                 "picocolors": "^1.0.0"
@@ -11679,9 +11713,9 @@
             }
         },
         "caniuse-lite": {
-            "version": "1.0.30001316",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001316.tgz",
-            "integrity": "sha512-JgUdNoZKxPZFzbzJwy4hDSyGuH/gXz2rN51QmoR8cBQsVo58llD3A0vlRKKRt8FGf5u69P9eQyIH8/z9vN/S0Q=="
+            "version": "1.0.30001317",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001317.tgz",
+            "integrity": "sha512-xIZLh8gBm4dqNX0gkzrBeyI86J2eCjWzYAs40q88smG844YIrN4tVQl/RhquHvKEKImWWFIVh1Lxe5n1G/N+GQ=="
         },
         "chalk": {
             "version": "4.1.2",
@@ -12247,9 +12281,9 @@
             "integrity": "sha512-8d35hViGYx/QH0icHYCeLmsLmMUheMmTyV9Fcm6gvNwdw31yXXH+O85sOBJ+OLnLQMKZowvpKb6FgMIQjcpvQw=="
         },
         "dayjs": {
-            "version": "1.10.8",
-            "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.10.8.tgz",
-            "integrity": "sha512-wbNwDfBHHur9UOzNUjeKUOJ0fCb0a52Wx0xInmQ7Y8FstyajiV1NmK1e00cxsr9YrE9r7yAChE0VvpuY5Rnlow=="
+            "version": "1.11.0",
+            "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.0.tgz",
+            "integrity": "sha512-JLC809s6Y948/FuCZPm5IX8rRhQwOiyMb2TfVVQEixG7P8Lm/gt5S7yoQZmC8x1UehI9Pb7sksEt4xx14m+7Ug=="
         },
         "de-indent": {
             "version": "1.0.2",
@@ -12513,9 +12547,9 @@
             "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
         },
         "electron-to-chromium": {
-            "version": "1.4.82",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.82.tgz",
-            "integrity": "sha512-Ks+ANzLoIrFDUOJdjxYMH6CMKB8UQo5modAwvSZTxgF+vEs/U7G5IbWFUp6dS4klPkTDVdxbORuk8xAXXhMsWw=="
+            "version": "1.4.85",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.85.tgz",
+            "integrity": "sha512-K9AsQ41WS2bjZUFpRWfvaS4RjEcRCamEkBJN1Z1TQILBfP1H8QnJ9ti0wiLiMv0sRjX3EHKzgs9jDnmGFx2jXg=="
         },
         "elliptic": {
             "version": "6.5.4",
@@ -13675,9 +13709,9 @@
             "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
         },
         "lint-staged": {
-            "version": "12.3.5",
-            "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-12.3.5.tgz",
-            "integrity": "sha512-oOH36RUs1It7b9U/C7Nl/a0sLfoIBcMB8ramiB3nuJ6brBqzsWiUAFSR5DQ3yyP/OR7XKMpijtgKl2DV1lQ3lA==",
+            "version": "12.3.6",
+            "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-12.3.6.tgz",
+            "integrity": "sha512-tVNyl/HsAnplKh4oaoRNzyZLm0PE/6VaBUXvd/gA9zhYCC/+ivZwiwpoT6jOxcLzuIOjP19wW+mfOi7/Bw4c1A==",
             "dev": true,
             "requires": {
                 "cli-truncate": "^3.1.0",
@@ -13690,6 +13724,7 @@
                 "micromatch": "^4.0.4",
                 "normalize-path": "^3.0.0",
                 "object-inspect": "^1.12.0",
+                "pidtree": "^0.5.0",
                 "string-argv": "^0.3.1",
                 "supports-color": "^9.2.1",
                 "yaml": "^1.10.2"
@@ -14445,6 +14480,12 @@
             "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
             "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="
         },
+        "pidtree": {
+            "version": "0.5.0",
+            "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.5.0.tgz",
+            "integrity": "sha512-9nxspIM7OpZuhBxPg73Zvyq7j1QMPMPsGKTqRc2XOaFQauDvoNz9fM1Wdkjmeo7l9GXOZiRs97sPkuayl39wjA==",
+            "dev": true
+        },
         "pify": {
             "version": "2.3.0",
             "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
@@ -14485,9 +14526,9 @@
             }
         },
         "postcss": {
-            "version": "8.4.8",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.8.tgz",
-            "integrity": "sha512-2tXEqGxrjvAO6U+CJzDL2Fk2kPHTv1jQsYkSoMeOis2SsYaXRO2COxTdQp99cYvif9JTXaAk9lYGc3VhJt7JPQ==",
+            "version": "8.4.12",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.12.tgz",
+            "integrity": "sha512-lg6eITwYe9v6Hr5CncVbK70SoioNQIq81nsaG86ev5hAidQvmOeETBqs7jm43K2F5/Ley3ytDtriImV6TpNiSg==",
             "requires": {
                 "nanoid": "^3.3.1",
                 "picocolors": "^1.0.0",
@@ -14809,9 +14850,9 @@
             "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
         },
         "prettier": {
-            "version": "2.5.1",
-            "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.5.1.tgz",
-            "integrity": "sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg==",
+            "version": "2.6.0",
+            "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.6.0.tgz",
+            "integrity": "sha512-m2FgJibYrBGGgQXNzfd0PuDGShJgRavjUoRCw1mZERIWVSXF0iLzLm+aOqTAbLnC3n6JzUhAA8uZnFVghHJ86A==",
             "devOptional": true
         },
         "pretty-time": {
@@ -15725,9 +15766,9 @@
             "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ=="
         },
         "terser": {
-            "version": "5.12.0",
-            "resolved": "https://registry.npmjs.org/terser/-/terser-5.12.0.tgz",
-            "integrity": "sha512-R3AUhNBGWiFc77HXag+1fXpAxTAFRQTJemlJKjAgD9r8xXTpjNKqIXwHM/o7Rh+O0kUJtS3WQVdBeMKFk5sw9A==",
+            "version": "5.12.1",
+            "resolved": "https://registry.npmjs.org/terser/-/terser-5.12.1.tgz",
+            "integrity": "sha512-NXbs+7nisos5E+yXwAD+y7zrcTkMqb0dEJxIGtSKPdCBzopf7ni4odPul2aechpV7EXNvOudYOX2bb5tln1jbQ==",
             "requires": {
                 "acorn": "^8.5.0",
                 "commander": "^2.20.0",

+ 2 - 7
resources/js/pages/Domains.vue

@@ -616,13 +616,8 @@ export default {
           }
         )
         .then(({ data }) => {
-          this.addDomainLoading = false
-          this.rows.push(data.data)
-          this.newDomain = ''
-
-          this.domainToCheck = data.data
-
-          this.success('Custom domain added')
+          // In order to get new TXT verification value
+          location.reload()
         })
         .catch(error => {
           this.addDomainLoading = false

+ 1 - 0
resources/js/pages/Recipients.vue

@@ -396,6 +396,7 @@ export default {
         {
           label: 'Key',
           field: 'key',
+          sortable: false,
           type: 'number',
         },
         {

+ 2 - 2
resources/js/pages/Usernames.vue

@@ -182,8 +182,8 @@
           and personal emails.
         </p>
         <p>
-          You can add a maximum of {{ usernameCount }} usernames. Deleted usernames still count
-          towards your limit so please choose carefully.
+          You can add a maximum of {{ usernameCount }} usernames. In order to prevent abuse, deleted
+          usernames still count towards your limit, so please choose carefully.
         </p>
       </div>
     </div>

+ 1 - 1
tests/Feature/Api/AliasesTest.php

@@ -17,7 +17,7 @@ class AliasesTest extends TestCase
     {
         parent::setUp();
         parent::setUpPassport();
-        $this->user->update(['username' => 'johndoe']);
+
         $this->user->recipients()->save($this->user->defaultRecipient);
         $this->user->usernames()->save($this->user->defaultUsername);
         $this->user->defaultUsername->username = 'johndoe';

+ 0 - 4
tests/Feature/Api/ApiTokensTest.php

@@ -23,10 +23,6 @@ class ApiTokensTest extends TestCase
         Passport::actingAs($this->user, [], 'web');
         $this->user->recipients()->save($this->user->defaultRecipient);
 
-        $this->user->usernames()->save($this->user->defaultUsername);
-        $this->user->defaultUsername->username = 'johndoe';
-        $this->user->defaultUsername->save();
-
         $clientRepository = new ClientRepository();
         $client = $clientRepository->createPersonalAccessClient(
             null,

+ 0 - 4
tests/Feature/Api/FailedDeliveriesTest.php

@@ -15,11 +15,7 @@ class FailedDeliveriesTest extends TestCase
         parent::setUp();
         parent::setUpPassport();
 
-        $this->user->update(['username' => 'johndoe']);
         $this->user->recipients()->save($this->user->defaultRecipient);
-        $this->user->usernames()->save($this->user->defaultUsername);
-        $this->user->defaultUsername->username = 'johndoe';
-        $this->user->defaultUsername->save();
     }
 
     /** @test */

+ 0 - 1
tests/Feature/Api/RulesTest.php

@@ -20,7 +20,6 @@ class RulesTest extends TestCase
         parent::setUp();
         parent::setUpPassport();
 
-        $this->user->update(['username' => 'johndoe']);
         $this->user->recipients()->save($this->user->defaultRecipient);
         $this->user->usernames()->save($this->user->defaultUsername);
         $this->user->defaultUsername->username = 'johndoe';

+ 0 - 3
tests/Unit/AliasTest.php

@@ -21,9 +21,6 @@ class AliasTest extends TestCase
 
         $this->user = User::factory()->create();
         $this->user->recipients()->save($this->user->defaultRecipient);
-        $this->user->usernames()->save($this->user->defaultUsername);
-        $this->user->defaultUsername->username = 'johndoe';
-        $this->user->defaultUsername->save();
     }
 
     /** @test */