Merge branch 'release/5.6.10'

2026-01-10 04:21:20 +00:00 · 2022-01-09 08:30:18 +01:00
parent 9795f46bea 206397cc81
commit 3c1192643c
53 changed files with 702 additions and 377 deletions
--- a/.env.example
+++ b/.env.example
@@ -89,6 +89,9 @@ PGSQL_SSL_CERT=null
 PGSQL_SSL_KEY=null
 PGSQL_SSL_CRL_FILE=null

+# more PostgreSQL settings
+PGSQL_SCHEMA=public
+
 # If you're looking for performance improvements, you could install memcached or redis
 CACHE_DRIVER=file
 SESSION_DRIVER=file
--- a/app/Console/Commands/Correction/CorrectDatabase.php
+++ b/app/Console/Commands/Correction/CorrectDatabase.php
@@ -69,6 +69,7 @@ class CorrectDatabase extends Command
            'firefly-iii:delete-empty-journals',
            'firefly-iii:delete-empty-groups',
            'firefly-iii:fix-account-types',
+            'firefly-iii:fix-ibans',
            'firefly-iii:fix-account-order',
            'firefly-iii:rename-meta-fields',
            'firefly-iii:fix-ob-currencies',
--- a/app/Console/Commands/Correction/CorrectOpeningBalanceCurrencies.php
+++ b/app/Console/Commands/Correction/CorrectOpeningBalanceCurrencies.php
@@ -72,9 +72,7 @@ class CorrectOpeningBalanceCurrencies extends Command
        $count = 0;
        /** @var TransactionJournal $journal */
        foreach ($set as $journal) {
-            Log::debug(sprintf('Going to fix journal #%d', $journal->id));
            $count += $this->correctJournal($journal);
-            Log::debug(sprintf('Done, count is now %d', $count));
        }

        if ($count > 0) {
@@ -100,7 +98,6 @@ class CorrectOpeningBalanceCurrencies extends Command
     */
    private function correctJournal(TransactionJournal $journal): int
    {
-        Log::debug(sprintf('Going to correct journal #%d', $journal->id));
        // get the asset account for this opening balance:
        $account = $this->getAccount($journal);
        if (null === $account) {
@@ -110,9 +107,7 @@ class CorrectOpeningBalanceCurrencies extends Command

            return 0;
        }
-        Log::debug(sprintf('Found "%s" #%d "%s".', $account->accountType->type, $account->id, $account->name));
        $currency = $this->getCurrency($account);
-        Log::debug(sprintf('Found currency #%d (%s)', $currency->id, $currency->code));

        // update journal and all transactions:
        return $this->setCurrency($journal, $currency);
@@ -126,20 +121,14 @@ class CorrectOpeningBalanceCurrencies extends Command
    private function getAccount(TransactionJournal $journal): ?Account
    {
        $transactions = $journal->transactions()->get();
-        Log::debug(sprintf('Found %d transactions for journal #%d.', $transactions->count(), $journal->id));
        /** @var Transaction $transaction */
        foreach ($transactions as $transaction) {
-            Log::debug(sprintf('Testing transaction #%d', $transaction->id));
            /** @var Account $account */
            $account = $transaction->account()->first();
            if (null !== $account && AccountType::INITIAL_BALANCE !== $account->accountType()->first()->type) {
-                Log::debug(sprintf('Account of transaction #%d is opposite of IB account (%s).', $transaction->id, $account->accountType()->first()->type));
-
                return $account;
            }
        }
-        Log::debug('Found no IB account in transactions of journal.');
-
        return null;
    }

@@ -165,10 +154,8 @@ class CorrectOpeningBalanceCurrencies extends Command
     */
    private function setCurrency(TransactionJournal $journal, TransactionCurrency $currency): int
    {
-        Log::debug('Now in setCurrency');
        $count = 0;
        if ((int)$journal->transaction_currency_id !== (int)$currency->id) {
-            Log::debug(sprintf('Currency ID of journal #%d was #%d, now set to #%d', $journal->id, $journal->transaction_currency_id, $currency->id));
            $journal->transaction_currency_id = $currency->id;
            $journal->save();
            $count = 1;
@@ -177,15 +164,11 @@ class CorrectOpeningBalanceCurrencies extends Command
        /** @var Transaction $transaction */
        foreach ($journal->transactions as $transaction) {
            if ((int)$transaction->transaction_currency_id !== (int)$currency->id) {
-                Log::debug(
-                    sprintf('Currency ID of transaction #%d was #%d, now set to #%d', $transaction->id, $transaction->transaction_currency_id, $currency->id)
-                );
                $transaction->transaction_currency_id = $currency->id;
                $transaction->save();
                $count = 1;
            }
        }
-        Log::debug(sprintf('Return %d', $count));

        return $count;
    }
--- a/app/Console/Commands/Correction/CorrectionSkeleton.php.stub
+++ b/app/Console/Commands/Correction/CorrectionSkeleton.php.stub
@@ -6,6 +6,7 @@ use Illuminate\Console\Command;

 /**
 * Class CorrectionSkeleton
+ * TODO DONT FORGET TO ADD THIS TO THE DOCKER BUILD
 */
 class CorrectionSkeleton extends Command
 {
--- a/app/Console/Commands/Correction/FixIbans.php
+++ b/app/Console/Commands/Correction/FixIbans.php
@@ -0,0 +1,51 @@
+<?php
+declare(strict_types=1);
+
+namespace FireflyIII\Console\Commands\Correction;
+
+use FireflyIII\Models\Account;
+use Illuminate\Console\Command;
+
+/**
+ * Class FixIbans
+ */
+class FixIbans extends Command
+{
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Removes spaces from IBANs';
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'firefly-iii:fix-ibans';
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle(): int
+    {
+        $accounts = Account::whereNotNull('iban')->get();
+        /** @var Account $account */
+        foreach ($accounts as $account) {
+            $iban = $account->iban;
+            if (str_contains($iban, ' ')) {
+
+                $iban = app('steam')->filterSpaces((string)$account->iban);
+                if ('' !== $iban) {
+                    $account->iban = $iban;
+                    $account->save();
+                    $this->line(sprintf('Removed spaces from IBAN of account #%d', $account->id));
+                }
+            }
+        }
+
+        return 0;
+    }
+}
--- a/app/Console/Commands/Integrity/ReportSkeleton.php.stub
+++ b/app/Console/Commands/Integrity/ReportSkeleton.php.stub
@@ -6,6 +6,7 @@ use Illuminate\Console\Command;

 /**
 * Class ReportSkeleton
+ * TODO DONT FORGET TO ADD THIS TO THE DOCKER BUILD
 */
 class ReportSkeleton extends Command
 {
--- a/app/Console/Commands/Upgrade/UpgradeDatabase.php
+++ b/app/Console/Commands/Upgrade/UpgradeDatabase.php
@@ -98,6 +98,7 @@ class UpgradeDatabase extends Command
            'firefly-iii:unify-group-accounts',
            'firefly-iii:fix-transaction-types',
            'firefly-iii:fix-frontpage-accounts',
+            'firefly-iii:fix-ibans',

            // two report commands
            'firefly-iii:report-empty-objects',
--- a/app/Console/Commands/Upgrade/UpgradeSkeleton.php.stub
+++ b/app/Console/Commands/Upgrade/UpgradeSkeleton.php.stub
@@ -5,7 +5,8 @@ namespace FireflyIII\Console\Commands\Upgrade;
 use Illuminate\Console\Command;

 /**
- * Class UpgradeSkeleton
+ * Class UpgradeSkeleton.
+ * TODO DONT FORGET TO ADD THIS TO THE DOCKER BUILD
 */
 class UpgradeSkeleton extends Command
 {
--- a/app/Handlers/Events/UpdatedGroupEventHandler.php
+++ b/app/Handlers/Events/UpdatedGroupEventHandler.php
@@ -123,7 +123,6 @@ class UpdatedGroupEventHandler
        if (1 === $group->transactionJournals->count()) {
            return;
        }
-        Log::debug(sprintf('Validating inconsistent accounts in group #%d', $group->id));
        // first journal:
        /** @var TransactionJournal $first */
        $first = $group->transactionJournals()
--- a/app/Http/Controllers/Account/EditController.php
+++ b/app/Http/Controllers/Account/EditController.php
@@ -153,6 +153,9 @@ class EditController extends Controller
            'notes'                   => $this->repository->getNoteText($account),
            'active'                  => $hasOldInput ? (bool)$request->old('active') : $account->active,
        ];
+        if('' === $openingBalanceAmount) {
+            $preFilled['opening_balance'] = '';
+        }

        $request->session()->flash('preFilled', $preFilled);

--- a/app/Http/Controllers/Account/IndexController.php
+++ b/app/Http/Controllers/Account/IndexController.php
@@ -109,6 +109,7 @@ class IndexController extends Controller
                $account->interestPeriod    = (string)trans(sprintf('firefly.interest_calc_%s', $this->repository->getMetaValue($account, 'interest_period')));
                $account->accountTypeString = (string)trans(sprintf('firefly.account_type_%s', $account->accountType->type));
                $account->current_debt      = '0';
+                $account->iban              = implode(' ', str_split((string)$account->iban, 4));
            }
        );

@@ -175,6 +176,7 @@ class IndexController extends Controller
                $account->location            = $this->repository->getLocation($account);
                $account->liability_direction = $this->repository->getMetaValue($account, 'liability_direction');
                $account->current_debt        = $this->repository->getMetaValue($account, 'current_debt') ?? '-';
+                $account->iban              = implode(' ', str_split((string)$account->iban, 4));
            }
        );
        // make paginator:
--- a/app/Http/Controllers/DebugController.php
+++ b/app/Http/Controllers/DebugController.php
@@ -148,10 +148,10 @@ class DebugController extends Controller
        $buildDate            = '(unknown)';

        if (file_exists('/var/www/counter-main.txt')) {
-            $buildNr = file_get_contents('/var/www/counter-main.txt');
+            $buildNr = trim(file_get_contents('/var/www/counter-main.txt'));
        }
        if (file_exists('/var/www/build-date-main.txt')) {
-            $buildDate = file_get_contents('/var/www/build-date-main.txt');
+            $buildDate = trim(file_get_contents('/var/www/build-date-main.txt'));
        }

        // expected + found DB version:
--- a/app/Http/Controllers/System/InstallController.php
+++ b/app/Http/Controllers/System/InstallController.php
@@ -109,6 +109,7 @@ class InstallController extends Controller
            'firefly-iii:unify-group-accounts'         => [],
            'firefly-iii:fix-transaction-types'        => [],
            'firefly-iii:fix-frontpage-accounts'       => [],
+            'firefly-iii:fix-ibans'                    => [],

            // final command to set latest version in DB
            'firefly-iii:set-latest-version'           => ['--james-is-cool' => true],
--- a/app/Repositories/TransactionGroup/TransactionGroupRepository.php
+++ b/app/Repositories/TransactionGroup/TransactionGroupRepository.php
@@ -141,7 +141,7 @@ class TransactionGroupRepository implements TransactionGroupRepositoryInterface
            )
            ->with(['source', 'destination', 'source.transactions'])
            ->leftJoin('link_types', 'link_types.id', '=', 'journal_links.link_type_id')
-            ->get(['journal_links.*', 'link_types.inward', 'link_types.outward']);
+            ->get(['journal_links.*', 'link_types.inward', 'link_types.outward', 'link_types.editable']);
        /** @var TransactionJournalLink $entry */
        foreach ($set as $entry) {
            $journalId          = in_array($entry->source_id, $journals, true) ? $entry->source_id : $entry->destination_id;
@@ -155,6 +155,7 @@ class TransactionGroupRepository implements TransactionGroupRepositoryInterface
                    'link'           => $entry->outward,
                    'group'          => $entry->destination->transaction_group_id,
                    'description'    => $entry->destination->description,
+                    'editable'       => 1===$entry->editable,
                    'amount'         => $amount,
                    'foreign_amount' => $foreignAmount,
                ];
@@ -167,6 +168,7 @@ class TransactionGroupRepository implements TransactionGroupRepositoryInterface
                    'link'           => $entry->inward,
                    'group'          => $entry->source->transaction_group_id,
                    'description'    => $entry->source->description,
+                    'editable'       => 1===$entry->editable,
                    'amount'         => $amount,
                    'foreign_amount' => $foreignAmount,
                ];
--- a/app/Services/Internal/Support/AccountServiceTrait.php
+++ b/app/Services/Internal/Support/AccountServiceTrait.php
@@ -69,7 +69,8 @@ trait AccountServiceTrait
            return null;
        }

-        return $iban;
+
+        return app('steam')->filterSpaces($iban);
    }

    /**
--- a/app/Services/Internal/Update/AccountUpdateService.php
+++ b/app/Services/Internal/Update/AccountUpdateService.php
@@ -135,7 +135,7 @@ class AccountUpdateService
            $account->active = $data['active'];
        }
        if (array_key_exists('iban', $data)) {
-            $account->iban = $data['iban'];
+            $account->iban = app('steam')->filterSpaces((string)$data['iban']);
        }

        // set liability, but account must already be a liability.
--- a/app/Support/Steam.php
+++ b/app/Support/Steam.php
@@ -540,4 +540,62 @@ class Steam
        return $amount;
    }

+    /**
+     * @param string $string
+     *
+     * @return string
+     */
+    public function filterSpaces(string $string): string
+    {
+        $search = [
+            "\u{0001}", // start of heading
+            "\u{0002}", // start of text
+            "\u{0003}", // end of text
+            "\u{0004}", // end of transmission
+            "\u{0005}", // enquiry
+            "\u{0006}", // ACK
+            "\u{0007}", // BEL
+            "\u{0008}", // backspace
+            "\u{000E}", // shift out
+            "\u{000F}", // shift in
+            "\u{0010}", // data link escape
+            "\u{0011}", // DC1
+            "\u{0012}", // DC2
+            "\u{0013}", // DC3
+            "\u{0014}", // DC4
+            "\u{0015}", // NAK
+            "\u{0016}", // SYN
+            "\u{0017}", // ETB
+            "\u{0018}", // CAN
+            "\u{0019}", // EM
+            "\u{001A}", // SUB
+            "\u{001B}", // escape
+            "\u{001C}", // file separator
+            "\u{001D}", // group separator
+            "\u{001E}", // record separator
+            "\u{001F}", // unit separator
+            "\u{007F}", // DEL
+            "\u{00A0}", // non-breaking space
+            "\u{1680}", // ogham space mark
+            "\u{180E}", // mongolian vowel separator
+            "\u{2000}", // en quad
+            "\u{2001}", // em quad
+            "\u{2002}", // en space
+            "\u{2003}", // em space
+            "\u{2004}", // three-per-em space
+            "\u{2005}", // four-per-em space
+            "\u{2006}", // six-per-em space
+            "\u{2007}", // figure space
+            "\u{2008}", // punctuation space
+            "\u{2009}", // thin space
+            "\u{200A}", // hair space
+            "\u{200B}", // zero width space
+            "\u{202F}", // narrow no-break space
+            "\u{3000}", // ideographic space
+            "\u{FEFF}", // zero width no -break space
+            "\x20", // plain old normal space
+        ];
+
+        return str_replace($search, '', $string);
+    }
 }
--- a/app/Validation/AccountValidator.php
+++ b/app/Validation/AccountValidator.php
@@ -221,7 +221,7 @@ class AccountValidator
        }

        // find by iban
-        if (null !== $accountIban && '' !== $accountIban) {
+        if (null !== $accountIban && '' !== (string) $accountIban) {
            $first = $this->accountRepository->findByIbanNull($accountIban, $validTypes);
            if ((null !== $first) && in_array($first->accountType->type, $validTypes, true)) {
                return $first;
@@ -229,7 +229,7 @@ class AccountValidator
        }

        // find by number
-        if (null !== $accountNumber && '' !== $accountNumber) {
+        if (null !== $accountNumber && '' !== (string) $accountNumber) {
            $first = $this->accountRepository->findByAccountNumber($accountNumber, $validTypes);
            if ((null !== $first) && in_array($first->accountType->type, $validTypes, true)) {
                return $first;
@@ -237,7 +237,7 @@ class AccountValidator
        }

        // find by name:
-        if ('' !== $accountName) {
+        if ('' !== (string) $accountName) {
            return $this->accountRepository->findByName($accountName, $validTypes);
        }

--- a/changelog.md
+++ b/changelog.md
@@ -2,6 +2,25 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).

+## 5.6.10 - 2022-01-10
+
+### Added
+- Add currency MXN
+- [Issue 5503](https://github.com/firefly-iii/firefly-iii/issues/5503) option to set PostgreSQL schema.
+
+### Changed
+- All IBANs will get their spaces stripped, but displayed with spaces.
+
+### Removed
+- Remove confirmation popup from rule selection.
+- Remove some debug logging
+
+### Fixed
+- Empty opening balance won't show as "0.00"
+- Display of build and date had a newline.
+- Nullpointer in account validator
+- [Issue 5510](https://github.com/firefly-iii/firefly-iii/issues/5510) Fix bad translation
+
 ## 5.6.9 - 2022-01-02

 ### Added
@@ -17,13 +36,6 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - [Issue 5458](https://github.com/firefly-iii/firefly-iii/issues/5458) Firefly III would create an opposing account of the wrong type.
 - [Issue 5467](https://github.com/firefly-iii/firefly-iii/issues/5467) Disabling currencies did not report properly.

-### Security
- Initial release.
-
-### API
- Initial release
-
-
 ## 5.6.8 - 2021-12-19

 ### Fixed
--- a/composer.json
+++ b/composer.json
@@ -193,6 +193,7 @@
      "@php artisan firefly-iii:unify-group-accounts",
      "@php artisan firefly-iii:fix-transaction-types",
      "@php artisan firefly-iii:fix-frontpage-accounts",
+      "@php artisan firefly-iii:fix-ibans",
      "@php artisan firefly-iii:report-empty-objects",
      "@php artisan firefly-iii:report-sum",
      "@php artisan firefly-iii:restore-oauth-keys",
@@ -209,6 +210,9 @@
  "config": {
    "preferred-install": "dist",
    "sort-packages": true,
-    "optimize-autoloader": true
+    "optimize-autoloader": true,
+    "allow-plugins": {
+      "composer/package-versions-deprecated": true
+    }
  }
 }
--- a/composer.lock
+++ b/composer.lock
@@ -552,16 +552,16 @@
        },
        {
            "name": "doctrine/dbal",
-            "version": "3.2.0",
+            "version": "3.2.1",
            "source": {
                "type": "git",
                "url": "https://github.com/doctrine/dbal.git",
-                "reference": "5d54f63541d7bed1156cb5c9b79274ced61890e4"
+                "reference": "4caf37acf14b513a91dd4f087f7eda424fa25542"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/dbal/zipball/5d54f63541d7bed1156cb5c9b79274ced61890e4",
-                "reference": "5d54f63541d7bed1156cb5c9b79274ced61890e4",
+                "url": "https://api.github.com/repos/doctrine/dbal/zipball/4caf37acf14b513a91dd4f087f7eda424fa25542",
+                "reference": "4caf37acf14b513a91dd4f087f7eda424fa25542",
                "shasum": ""
            },
            "require": {
@@ -576,14 +576,14 @@
            "require-dev": {
                "doctrine/coding-standard": "9.0.0",
                "jetbrains/phpstorm-stubs": "2021.1",
-                "phpstan/phpstan": "1.2.0",
+                "phpstan/phpstan": "1.3.0",
                "phpstan/phpstan-strict-rules": "^1.1",
-                "phpunit/phpunit": "9.5.10",
+                "phpunit/phpunit": "9.5.11",
                "psalm/plugin-phpunit": "0.16.1",
-                "squizlabs/php_codesniffer": "3.6.1",
+                "squizlabs/php_codesniffer": "3.6.2",
                "symfony/cache": "^5.2|^6.0",
                "symfony/console": "^2.0.5|^3.0|^4.0|^5.0|^6.0",
-                "vimeo/psalm": "4.13.0"
+                "vimeo/psalm": "4.16.1"
            },
            "suggest": {
                "symfony/console": "For helpful console commands such as SQL execution and import of files."
@@ -643,7 +643,7 @@
            ],
            "support": {
                "issues": "https://github.com/doctrine/dbal/issues",
-                "source": "https://github.com/doctrine/dbal/tree/3.2.0"
+                "source": "https://github.com/doctrine/dbal/tree/3.2.1"
            },
            "funding": [
                {
@@ -659,7 +659,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-11-26T21:00:12+00:00"
+            "time": "2022-01-05T08:52:06+00:00"
        },
        {
            "name": "doctrine/deprecations",
@@ -971,16 +971,16 @@
        },
        {
            "name": "dragonmantank/cron-expression",
-            "version": "v3.1.0",
+            "version": "v3.2.3",
            "source": {
                "type": "git",
                "url": "https://github.com/dragonmantank/cron-expression.git",
-                "reference": "7a8c6e56ab3ffcc538d05e8155bb42269abf1a0c"
+                "reference": "47c53bbb260d3c398fba9bfa9683dcf67add2579"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/7a8c6e56ab3ffcc538d05e8155bb42269abf1a0c",
-                "reference": "7a8c6e56ab3ffcc538d05e8155bb42269abf1a0c",
+                "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/47c53bbb260d3c398fba9bfa9683dcf67add2579",
+                "reference": "47c53bbb260d3c398fba9bfa9683dcf67add2579",
                "shasum": ""
            },
            "require": {
@@ -1020,7 +1020,7 @@
            ],
            "support": {
                "issues": "https://github.com/dragonmantank/cron-expression/issues",
-                "source": "https://github.com/dragonmantank/cron-expression/tree/v3.1.0"
+                "source": "https://github.com/dragonmantank/cron-expression/tree/v3.2.3"
            },
            "funding": [
                {
@@ -1028,7 +1028,7 @@
                    "type": "github"
                }
            ],
-            "time": "2020-11-24T19:55:57+00:00"
+            "time": "2022-01-06T05:35:07+00:00"
        },
        {
            "name": "egulias/email-validator",
@@ -1847,16 +1847,16 @@
        },
        {
            "name": "laravel/framework",
-            "version": "v8.77.1",
+            "version": "v8.78.1",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/framework.git",
-                "reference": "994dbac5c6da856c77c81a411cff5b7d31519ca8"
+                "reference": "16359b5ebafba6579b397d7505b082a6d1bb2e31"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/994dbac5c6da856c77c81a411cff5b7d31519ca8",
-                "reference": "994dbac5c6da856c77c81a411cff5b7d31519ca8",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/16359b5ebafba6579b397d7505b082a6d1bb2e31",
+                "reference": "16359b5ebafba6579b397d7505b082a6d1bb2e31",
                "shasum": ""
            },
            "require": {
@@ -2015,7 +2015,7 @@
                "issues": "https://github.com/laravel/framework/issues",
                "source": "https://github.com/laravel/framework"
            },
-            "time": "2021-12-21T20:22:29+00:00"
+            "time": "2022-01-05T14:52:50+00:00"
        },
        {
            "name": "laravel/passport",
@@ -2486,16 +2486,16 @@
        },
        {
            "name": "league/commonmark",
-            "version": "2.1.0",
+            "version": "2.1.1",
            "source": {
                "type": "git",
                "url": "https://github.com/thephpleague/commonmark.git",
-                "reference": "819276bc54e83c160617d3ac0a436c239e479928"
+                "reference": "17d2b9cb5161a2ea1a8dd30e6991d668e503fb9d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/819276bc54e83c160617d3ac0a436c239e479928",
-                "reference": "819276bc54e83c160617d3ac0a436c239e479928",
+                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/17d2b9cb5161a2ea1a8dd30e6991d668e503fb9d",
+                "reference": "17d2b9cb5161a2ea1a8dd30e6991d668e503fb9d",
                "shasum": ""
            },
            "require": {
@@ -2585,7 +2585,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-12-05T18:25:20+00:00"
+            "time": "2022-01-02T18:25:06+00:00"
        },
        {
            "name": "league/config",
@@ -2671,31 +2671,31 @@
        },
        {
            "name": "league/csv",
-            "version": "9.7.4",
+            "version": "9.8.0",
            "source": {
                "type": "git",
                "url": "https://github.com/thephpleague/csv.git",
-                "reference": "002f55f649e7511710dc7154ff44c7be32c8195c"
+                "reference": "9d2e0265c5d90f5dd601bc65ff717e05cec19b47"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/csv/zipball/002f55f649e7511710dc7154ff44c7be32c8195c",
-                "reference": "002f55f649e7511710dc7154ff44c7be32c8195c",
+                "url": "https://api.github.com/repos/thephpleague/csv/zipball/9d2e0265c5d90f5dd601bc65ff717e05cec19b47",
+                "reference": "9d2e0265c5d90f5dd601bc65ff717e05cec19b47",
                "shasum": ""
            },
            "require": {
                "ext-json": "*",
                "ext-mbstring": "*",
-                "php": "^7.3 || ^8.0"
+                "php": "^7.4 || ^8.0"
            },
            "require-dev": {
                "ext-curl": "*",
                "ext-dom": "*",
-                "friendsofphp/php-cs-fixer": "^3.0",
-                "phpstan/phpstan": "^1.0",
+                "friendsofphp/php-cs-fixer": "^v3.4.0",
+                "phpstan/phpstan": "^1.3.0",
                "phpstan/phpstan-phpunit": "^1.0.0",
-                "phpstan/phpstan-strict-rules": "^1.0",
-                "phpunit/phpunit": "^9.5"
+                "phpstan/phpstan-strict-rules": "^1.1.0",
+                "phpunit/phpunit": "^9.5.11"
            },
            "suggest": {
                "ext-dom": "Required to use the XMLConverter and or the HTMLConverter classes",
@@ -2728,7 +2728,7 @@
                }
            ],
            "description": "CSV data manipulation made easy in PHP",
-            "homepage": "http://csv.thephpleague.com",
+            "homepage": "https://csv.thephpleague.com",
            "keywords": [
                "convert",
                "csv",
@@ -2751,7 +2751,7 @@
                    "type": "github"
                }
            ],
-            "time": "2021-11-30T07:09:34+00:00"
+            "time": "2022-01-04T00:13:07+00:00"
        },
        {
            "name": "league/event",
@@ -4132,16 +4132,16 @@
        },
        {
            "name": "predis/predis",
-            "version": "v1.1.9",
+            "version": "v1.1.10",
            "source": {
                "type": "git",
                "url": "https://github.com/predis/predis.git",
-                "reference": "c50c3393bb9f47fa012d0cdfb727a266b0818259"
+                "reference": "a2fb02d738bedadcffdbb07efa3a5e7bd57f8d6e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/predis/predis/zipball/c50c3393bb9f47fa012d0cdfb727a266b0818259",
-                "reference": "c50c3393bb9f47fa012d0cdfb727a266b0818259",
+                "url": "https://api.github.com/repos/predis/predis/zipball/a2fb02d738bedadcffdbb07efa3a5e7bd57f8d6e",
+                "reference": "a2fb02d738bedadcffdbb07efa3a5e7bd57f8d6e",
                "shasum": ""
            },
            "require": {
@@ -4186,7 +4186,7 @@
            ],
            "support": {
                "issues": "https://github.com/predis/predis/issues",
-                "source": "https://github.com/predis/predis/tree/v1.1.9"
+                "source": "https://github.com/predis/predis/tree/v1.1.10"
            },
            "funding": [
                {
@@ -4194,7 +4194,7 @@
                    "type": "github"
                }
            ],
-            "time": "2021-10-05T19:02:38+00:00"
+            "time": "2022-01-05T17:46:08+00:00"
        },
        {
            "name": "psr/cache",
@@ -5840,21 +5840,24 @@
        },
        {
            "name": "symfony/polyfill-ctype",
-            "version": "v1.23.0",
+            "version": "v1.24.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce"
+                "reference": "30885182c981ab175d4d034db0f6f469898070ab"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/46cd95797e9df938fdd2b03693b5fca5e64b01ce",
-                "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/30885182c981ab175d4d034db0f6f469898070ab",
+                "reference": "30885182c981ab175d4d034db0f6f469898070ab",
                "shasum": ""
            },
            "require": {
                "php": ">=7.1"
            },
+            "provide": {
+                "ext-ctype": "*"
+            },
            "suggest": {
                "ext-ctype": "For best performance"
            },
@@ -5899,7 +5902,7 @@
                "portable"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.23.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.24.0"
            },
            "funding": [
                {
@@ -5915,25 +5918,28 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-02-19T12:13:01+00:00"
+            "time": "2021-10-20T20:35:02+00:00"
        },
        {
            "name": "symfony/polyfill-iconv",
-            "version": "v1.23.0",
+            "version": "v1.24.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-iconv.git",
-                "reference": "63b5bb7db83e5673936d6e3b8b3e022ff6474933"
+                "reference": "f1aed619e28cb077fc83fac8c4c0383578356e40"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/63b5bb7db83e5673936d6e3b8b3e022ff6474933",
-                "reference": "63b5bb7db83e5673936d6e3b8b3e022ff6474933",
+                "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/f1aed619e28cb077fc83fac8c4c0383578356e40",
+                "reference": "f1aed619e28cb077fc83fac8c4c0383578356e40",
                "shasum": ""
            },
            "require": {
                "php": ">=7.1"
            },
+            "provide": {
+                "ext-iconv": "*"
+            },
            "suggest": {
                "ext-iconv": "For best performance"
            },
@@ -5979,7 +5985,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-iconv/tree/v1.23.0"
+                "source": "https://github.com/symfony/polyfill-iconv/tree/v1.24.0"
            },
            "funding": [
                {
@@ -5995,20 +6001,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-05-27T09:27:20+00:00"
+            "time": "2022-01-04T09:04:05+00:00"
        },
        {
            "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.23.1",
+            "version": "v1.24.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
-                "reference": "16880ba9c5ebe3642d1995ab866db29270b36535"
+                "reference": "81b86b50cf841a64252b439e738e97f4a34e2783"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/16880ba9c5ebe3642d1995ab866db29270b36535",
-                "reference": "16880ba9c5ebe3642d1995ab866db29270b36535",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/81b86b50cf841a64252b439e738e97f4a34e2783",
+                "reference": "81b86b50cf841a64252b439e738e97f4a34e2783",
                "shasum": ""
            },
            "require": {
@@ -6060,7 +6066,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.23.1"
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.24.0"
            },
            "funding": [
                {
@@ -6076,20 +6082,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-05-27T12:26:48+00:00"
+            "time": "2021-11-23T21:10:46+00:00"
        },
        {
            "name": "symfony/polyfill-intl-idn",
-            "version": "v1.23.0",
+            "version": "v1.24.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-intl-idn.git",
-                "reference": "65bd267525e82759e7d8c4e8ceea44f398838e65"
+                "reference": "749045c69efb97c70d25d7463abba812e91f3a44"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/65bd267525e82759e7d8c4e8ceea44f398838e65",
-                "reference": "65bd267525e82759e7d8c4e8ceea44f398838e65",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/749045c69efb97c70d25d7463abba812e91f3a44",
+                "reference": "749045c69efb97c70d25d7463abba812e91f3a44",
                "shasum": ""
            },
            "require": {
@@ -6147,7 +6153,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.23.0"
+                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.24.0"
            },
            "funding": [
                {
@@ -6163,11 +6169,11 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-05-27T09:27:20+00:00"
+            "time": "2021-09-14T14:02:44+00:00"
        },
        {
            "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.23.0",
+            "version": "v1.24.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
@@ -6231,7 +6237,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.23.0"
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.24.0"
            },
            "funding": [
                {
@@ -6251,21 +6257,24 @@
        },
        {
            "name": "symfony/polyfill-mbstring",
-            "version": "v1.23.1",
+            "version": "v1.24.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6"
+                "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9174a3d80210dca8daa7f31fec659150bbeabfc6",
-                "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0abb51d2f102e00a4eefcf46ba7fec406d245825",
+                "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825",
                "shasum": ""
            },
            "require": {
                "php": ">=7.1"
            },
+            "provide": {
+                "ext-mbstring": "*"
+            },
            "suggest": {
                "ext-mbstring": "For best performance"
            },
@@ -6311,7 +6320,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.23.1"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.24.0"
            },
            "funding": [
                {
@@ -6327,11 +6336,11 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-05-27T12:26:48+00:00"
+            "time": "2021-11-30T18:21:41+00:00"
        },
        {
            "name": "symfony/polyfill-php72",
-            "version": "v1.23.0",
+            "version": "v1.24.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-php72.git",
@@ -6387,7 +6396,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-php72/tree/v1.23.0"
+                "source": "https://github.com/symfony/polyfill-php72/tree/v1.24.0"
            },
            "funding": [
                {
@@ -6407,16 +6416,16 @@
        },
        {
            "name": "symfony/polyfill-php73",
-            "version": "v1.23.0",
+            "version": "v1.24.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-php73.git",
-                "reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010"
+                "reference": "cc5db0e22b3cb4111010e48785a97f670b350ca5"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fba8933c384d6476ab14fb7b8526e5287ca7e010",
-                "reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010",
+                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/cc5db0e22b3cb4111010e48785a97f670b350ca5",
+                "reference": "cc5db0e22b3cb4111010e48785a97f670b350ca5",
                "shasum": ""
            },
            "require": {
@@ -6466,7 +6475,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-php73/tree/v1.23.0"
+                "source": "https://github.com/symfony/polyfill-php73/tree/v1.24.0"
            },
            "funding": [
                {
@@ -6482,20 +6491,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-02-19T12:13:01+00:00"
+            "time": "2021-06-05T21:20:04+00:00"
        },
        {
            "name": "symfony/polyfill-php80",
-            "version": "v1.23.1",
+            "version": "v1.24.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be"
+                "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/1100343ed1a92e3a38f9ae122fc0eb21602547be",
-                "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/57b712b08eddb97c762a8caa32c84e037892d2e9",
+                "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9",
                "shasum": ""
            },
            "require": {
@@ -6549,7 +6558,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.23.1"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.24.0"
            },
            "funding": [
                {
@@ -6565,20 +6574,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-07-28T13:41:28+00:00"
+            "time": "2021-09-13T13:58:33+00:00"
        },
        {
            "name": "symfony/polyfill-php81",
-            "version": "v1.23.0",
+            "version": "v1.24.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-php81.git",
-                "reference": "e66119f3de95efc359483f810c4c3e6436279436"
+                "reference": "5de4ba2d41b15f9bd0e19b2ab9674135813ec98f"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/e66119f3de95efc359483f810c4c3e6436279436",
-                "reference": "e66119f3de95efc359483f810c4c3e6436279436",
+                "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/5de4ba2d41b15f9bd0e19b2ab9674135813ec98f",
+                "reference": "5de4ba2d41b15f9bd0e19b2ab9674135813ec98f",
                "shasum": ""
            },
            "require": {
@@ -6628,7 +6637,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-php81/tree/v1.23.0"
+                "source": "https://github.com/symfony/polyfill-php81/tree/v1.24.0"
            },
            "funding": [
                {
@@ -6644,7 +6653,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-05-21T13:25:03+00:00"
+            "time": "2021-09-13T13:58:11+00:00"
        },
        {
            "name": "symfony/process",
@@ -7370,16 +7379,16 @@
        },
        {
            "name": "twig/twig",
-            "version": "v3.3.4",
+            "version": "v3.3.7",
            "source": {
                "type": "git",
                "url": "https://github.com/twigphp/Twig.git",
-                "reference": "65cb6f0b956485e1664f13d023c55298a4bb59ca"
+                "reference": "8f168c6ffa3ce76d1786b3cd52275424a3fc675b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/65cb6f0b956485e1664f13d023c55298a4bb59ca",
-                "reference": "65cb6f0b956485e1664f13d023c55298a4bb59ca",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/8f168c6ffa3ce76d1786b3cd52275424a3fc675b",
+                "reference": "8f168c6ffa3ce76d1786b3cd52275424a3fc675b",
                "shasum": ""
            },
            "require": {
@@ -7430,7 +7439,7 @@
            ],
            "support": {
                "issues": "https://github.com/twigphp/Twig/issues",
-                "source": "https://github.com/twigphp/Twig/tree/v3.3.4"
+                "source": "https://github.com/twigphp/Twig/tree/v3.3.7"
            },
            "funding": [
                {
@@ -7442,7 +7451,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-11-25T13:46:55+00:00"
+            "time": "2022-01-03T21:15:37+00:00"
        },
        {
            "name": "vlucas/phpdotenv",
@@ -7745,21 +7754,21 @@
        },
        {
            "name": "barryvdh/laravel-ide-helper",
-            "version": "v2.10.0",
+            "version": "v2.11.0",
            "source": {
                "type": "git",
                "url": "https://github.com/barryvdh/laravel-ide-helper.git",
-                "reference": "73b1012b927633a1b4cd623c2e6b1678e6faef08"
+                "reference": "f2a7f9d84f628cb50e1b0dc302f10d2ba945b0ea"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/73b1012b927633a1b4cd623c2e6b1678e6faef08",
-                "reference": "73b1012b927633a1b4cd623c2e6b1678e6faef08",
+                "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/f2a7f9d84f628cb50e1b0dc302f10d2ba945b0ea",
+                "reference": "f2a7f9d84f628cb50e1b0dc302f10d2ba945b0ea",
                "shasum": ""
            },
            "require": {
                "barryvdh/reflection-docblock": "^2.0.6",
-                "composer/composer": "^1.6 || ^2",
+                "composer/composer": "^1.10.23 || ^2.1.9",
                "doctrine/dbal": "^2.6 || ^3",
                "ext-json": "*",
                "illuminate/console": "^8",
@@ -7823,15 +7832,19 @@
            ],
            "support": {
                "issues": "https://github.com/barryvdh/laravel-ide-helper/issues",
-                "source": "https://github.com/barryvdh/laravel-ide-helper/tree/v2.10.0"
+                "source": "https://github.com/barryvdh/laravel-ide-helper/tree/v2.11.0"
            },
            "funding": [
+                {
+                    "url": "https://fruitcake.nl",
+                    "type": "custom"
+                },
                {
                    "url": "https://github.com/barryvdh",
                    "type": "github"
                }
            ],
-            "time": "2021-04-09T06:17:55+00:00"
+            "time": "2022-01-03T20:47:54+00:00"
        },
        {
            "name": "barryvdh/reflection-docblock",
@@ -7963,16 +7976,16 @@
        },
        {
            "name": "composer/composer",
-            "version": "2.2.3",
+            "version": "2.2.4",
            "source": {
                "type": "git",
                "url": "https://github.com/composer/composer.git",
-                "reference": "3c92ba5cdc7d48b7db2dcd197e6fa0e8fa6d9f4a"
+                "reference": "8a5ad75194f901e3b39ece4bbd22cbdabc79ae8f"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/composer/composer/zipball/3c92ba5cdc7d48b7db2dcd197e6fa0e8fa6d9f4a",
-                "reference": "3c92ba5cdc7d48b7db2dcd197e6fa0e8fa6d9f4a",
+                "url": "https://api.github.com/repos/composer/composer/zipball/8a5ad75194f901e3b39ece4bbd22cbdabc79ae8f",
+                "reference": "8a5ad75194f901e3b39ece4bbd22cbdabc79ae8f",
                "shasum": ""
            },
            "require": {
@@ -8042,7 +8055,7 @@
            "support": {
                "irc": "ircs://irc.libera.chat:6697/composer",
                "issues": "https://github.com/composer/composer/issues",
-                "source": "https://github.com/composer/composer/tree/2.2.3"
+                "source": "https://github.com/composer/composer/tree/2.2.4"
            },
            "funding": [
                {
@@ -8058,7 +8071,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-12-31T11:18:53+00:00"
+            "time": "2022-01-08T11:30:42+00:00"
        },
        {
            "name": "composer/metadata-minifier",
@@ -8202,16 +8215,16 @@
        },
        {
            "name": "composer/semver",
-            "version": "3.2.6",
+            "version": "3.2.7",
            "source": {
                "type": "git",
                "url": "https://github.com/composer/semver.git",
-                "reference": "83e511e247de329283478496f7a1e114c9517506"
+                "reference": "deac27056b57e46faf136fae7b449eeaa71661ee"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/composer/semver/zipball/83e511e247de329283478496f7a1e114c9517506",
-                "reference": "83e511e247de329283478496f7a1e114c9517506",
+                "url": "https://api.github.com/repos/composer/semver/zipball/deac27056b57e46faf136fae7b449eeaa71661ee",
+                "reference": "deac27056b57e46faf136fae7b449eeaa71661ee",
                "shasum": ""
            },
            "require": {
@@ -8263,7 +8276,7 @@
            "support": {
                "irc": "irc://irc.freenode.org/composer",
                "issues": "https://github.com/composer/semver/issues",
-                "source": "https://github.com/composer/semver/tree/3.2.6"
+                "source": "https://github.com/composer/semver/tree/3.2.7"
            },
            "funding": [
                {
@@ -8279,7 +8292,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-10-25T11:34:17+00:00"
+            "time": "2022-01-04T09:57:54+00:00"
        },
        {
            "name": "composer/spdx-licenses",
@@ -8363,16 +8376,16 @@
        },
        {
            "name": "composer/xdebug-handler",
-            "version": "2.0.3",
+            "version": "2.0.4",
            "source": {
                "type": "git",
                "url": "https://github.com/composer/xdebug-handler.git",
-                "reference": "6555461e76962fd0379c444c46fd558a0fcfb65e"
+                "reference": "0c1a3925ec58a4ec98e992b9c7d171e9e184be0a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/6555461e76962fd0379c444c46fd558a0fcfb65e",
-                "reference": "6555461e76962fd0379c444c46fd558a0fcfb65e",
+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/0c1a3925ec58a4ec98e992b9c7d171e9e184be0a",
+                "reference": "0c1a3925ec58a4ec98e992b9c7d171e9e184be0a",
                "shasum": ""
            },
            "require": {
@@ -8409,7 +8422,7 @@
            "support": {
                "irc": "irc://irc.freenode.org/composer",
                "issues": "https://github.com/composer/xdebug-handler/issues",
-                "source": "https://github.com/composer/xdebug-handler/tree/2.0.3"
+                "source": "https://github.com/composer/xdebug-handler/tree/2.0.4"
            },
            "funding": [
                {
@@ -8425,7 +8438,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-12-08T13:07:32+00:00"
+            "time": "2022-01-04T17:06:45+00:00"
        },
        {
            "name": "doctrine/instantiator",
@@ -8563,16 +8576,16 @@
        },
        {
            "name": "filp/whoops",
-            "version": "2.14.4",
+            "version": "2.14.5",
            "source": {
                "type": "git",
                "url": "https://github.com/filp/whoops.git",
-                "reference": "f056f1fe935d9ed86e698905a957334029899895"
+                "reference": "a63e5e8f26ebbebf8ed3c5c691637325512eb0dc"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/filp/whoops/zipball/f056f1fe935d9ed86e698905a957334029899895",
-                "reference": "f056f1fe935d9ed86e698905a957334029899895",
+                "url": "https://api.github.com/repos/filp/whoops/zipball/a63e5e8f26ebbebf8ed3c5c691637325512eb0dc",
+                "reference": "a63e5e8f26ebbebf8ed3c5c691637325512eb0dc",
                "shasum": ""
            },
            "require": {
@@ -8622,7 +8635,7 @@
            ],
            "support": {
                "issues": "https://github.com/filp/whoops/issues",
-                "source": "https://github.com/filp/whoops/tree/2.14.4"
+                "source": "https://github.com/filp/whoops/tree/2.14.5"
            },
            "funding": [
                {
@@ -8630,7 +8643,7 @@
                    "type": "github"
                }
            ],
-            "time": "2021-10-03T12:00:00+00:00"
+            "time": "2022-01-07T12:00:00+00:00"
        },
        {
            "name": "hamcrest/hamcrest-php",
@@ -8907,9 +8920,6 @@
            "require": {
                "php": "^7.1 || ^8.0"
            },
-            "replace": {
-                "myclabs/deep-copy": "self.version"
-            },
            "require-dev": {
                "doctrine/collections": "^1.0",
                "doctrine/common": "^2.6",
@@ -9227,16 +9237,16 @@
        },
        {
            "name": "phpdocumentor/type-resolver",
-            "version": "1.5.1",
+            "version": "1.6.0",
            "source": {
                "type": "git",
                "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "a12f7e301eb7258bb68acd89d4aefa05c2906cae"
+                "reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/a12f7e301eb7258bb68acd89d4aefa05c2906cae",
-                "reference": "a12f7e301eb7258bb68acd89d4aefa05c2906cae",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/93ebd0014cab80c4ea9f5e297ea48672f1b87706",
+                "reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706",
                "shasum": ""
            },
            "require": {
@@ -9271,9 +9281,9 @@
            "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
            "support": {
                "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
-                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.5.1"
+                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.0"
            },
-            "time": "2021-10-02T14:08:47+00:00"
+            "time": "2022-01-04T19:58:01+00:00"
        },
        {
            "name": "phpspec/prophecy",
@@ -11095,5 +11105,5 @@
        "ext-xmlwriter": "*"
    },
    "platform-dev": [],
-    "plugin-api-version": "2.1.0"
+    "plugin-api-version": "2.2.0"
 }
--- a/config/database.php
+++ b/config/database.php
@@ -109,7 +109,7 @@ return [
            'password'    => env('DB_PASSWORD', $password),
            'charset'     => 'utf8',
            'prefix'      => '',
-            'schema'      => 'public',
+            'schema'      => envNonEmpty('PGSQL_SCHEMA', 'public'),
            'sslmode'     => envNonEmpty('PGSQL_SSL_MODE', 'prefer'),
            'sslcert'     => envNonEmpty('PGSQL_SSL_CERT'),
            'sslkey'      => envNonEmpty('PGSQL_SSL_KEY'),
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -101,7 +101,7 @@ return [
        'webhooks'     => true,
        'handle_debts' => true,
    ],
-    'version'                      => '5.6.9',
+    'version'                      => '5.6.10',
    'api_version'                  => '1.5.5',
    'db_version'                   => 18,

--- a/database/seeders/TransactionCurrencySeeder.php
+++ b/database/seeders/TransactionCurrencySeeder.php
@@ -51,6 +51,7 @@ class TransactionCurrencySeeder extends Seeder
        $currencies[] = ['code' => 'USD', 'name' => 'US Dollar', 'symbol' => '$', 'decimal_places' => 2];
        $currencies[] = ['code' => 'BRL', 'name' => 'Brazilian real', 'symbol' => 'R$', 'decimal_places' => 2];
        $currencies[] = ['code' => 'CAD', 'name' => 'Canadian dollar', 'symbol' => 'C$', 'decimal_places' => 2];
+        $currencies[] = ['code' => 'MXN', 'name' => 'Mexican peso', 'symbol' => 'MX$', 'decimal_places' => 2];

        // oceanian currencies
        $currencies[] = ['code' => 'IDR', 'name' => 'Indonesian rupiah', 'symbol' => 'Rp', 'decimal_places' => 2];
--- a/public/v1/js/ff/rules/select-transactions.js
+++ b/public/v1/js/ff/rules/select-transactions.js
@@ -29,7 +29,7 @@ $(document).ready(function () {
            }
        );
    }
-    $('form.form-horizontal').on('submit', function () {
-        return confirm(askReadWarning);
-    });
+    // $('form.form-horizontal').on('submit', function () {
+    //     return confirm(askReadWarning);
+    // });
 });
--- a/resources/lang/bg_BG/firefly.php
+++ b/resources/lang/bg_BG/firefly.php
@@ -654,6 +654,13 @@ return [
    'pref_3M'                                   => 'Три месеца (тримесечие)',
    'pref_6M'                                   => 'Шест месеца',
    'pref_1Y'                                   => 'Една година',
+    'pref_last365'                              => 'Last year',
+    'pref_last90'                               => 'Last 90 days',
+    'pref_last30'                               => 'Last 30 days',
+    'pref_last7'                                => 'Last 7 days',
+    'pref_YTD'                                  => 'Year to date',
+    'pref_QTD'                                  => 'Quarter to date',
+    'pref_MTD'                                  => 'Month to date',
    'pref_languages'                            => 'Езици',
    'pref_locale'                               => 'Локални настройки',
    'pref_languages_help'                       => 'Firefly III поддържа няколко езика. Кой предпочиташ?',
--- a/resources/lang/cs_CZ/firefly.php
+++ b/resources/lang/cs_CZ/firefly.php
@@ -654,6 +654,13 @@ return [
    'pref_3M'                                   => 'Tři měsíce (čtvrtletí)',
    'pref_6M'                                   => 'Šest měsíců',
    'pref_1Y'                                   => 'Jeden rok',
+    'pref_last365'                              => 'Last year',
+    'pref_last90'                               => 'Last 90 days',
+    'pref_last30'                               => 'Last 30 days',
+    'pref_last7'                                => 'Last 7 days',
+    'pref_YTD'                                  => 'Year to date',
+    'pref_QTD'                                  => 'Quarter to date',
+    'pref_MTD'                                  => 'Month to date',
    'pref_languages'                            => 'Jazyky',
    'pref_locale'                               => 'Místní nastavení',
    'pref_languages_help'                       => 'Firefly III podporuje několik jazyků – ve kterém ho chcete používat?',
--- a/resources/lang/de_DE/firefly.php
+++ b/resources/lang/de_DE/firefly.php
@@ -654,6 +654,13 @@ return [
    'pref_3M'                                   => 'Drei Monate (Quartal)',
    'pref_6M'                                   => 'Sechs Monate',
    'pref_1Y'                                   => 'Ein Jahr',
+    'pref_last365'                              => 'Last year',
+    'pref_last90'                               => 'Last 90 days',
+    'pref_last30'                               => 'Last 30 days',
+    'pref_last7'                                => 'Last 7 days',
+    'pref_YTD'                                  => 'Year to date',
+    'pref_QTD'                                  => 'Quarter to date',
+    'pref_MTD'                                  => 'Month to date',
    'pref_languages'                            => 'Sprachen',
    'pref_locale'                               => 'Lokale Einstellungen',
    'pref_languages_help'                       => 'Firefly III unterstützt mehrere Sprachen. Welche möchten Sie nutzen?',
--- a/resources/lang/el_GR/firefly.php
+++ b/resources/lang/el_GR/firefly.php
@@ -654,6 +654,13 @@ return [
    'pref_3M'                                   => 'Τρεις μήνες (τρίμηνο)',
    'pref_6M'                                   => 'Έξι μήνες (εξάμηνο)',
    'pref_1Y'                                   => 'Ένα έτος',
+    'pref_last365'                              => 'Last year',
+    'pref_last90'                               => 'Last 90 days',
+    'pref_last30'                               => 'Last 30 days',
+    'pref_last7'                                => 'Last 7 days',
+    'pref_YTD'                                  => 'Year to date',
+    'pref_QTD'                                  => 'Quarter to date',
+    'pref_MTD'                                  => 'Month to date',
    'pref_languages'                            => 'Γλώσσες',
    'pref_locale'                               => 'Ρυθμίσεις τοποθεσίας',
    'pref_languages_help'                       => 'Το Firefly III υποστηρίζει διάφορες γλώσσες. Ποιά προτιμάτε;',
--- a/resources/lang/en_GB/firefly.php
+++ b/resources/lang/en_GB/firefly.php
@@ -654,6 +654,13 @@ return [
    'pref_3M'                                   => 'Three months (quarter)',
    'pref_6M'                                   => 'Six months',
    'pref_1Y'                                   => 'One year',
+    'pref_last365'                              => 'Last year',
+    'pref_last90'                               => 'Last 90 days',
+    'pref_last30'                               => 'Last 30 days',
+    'pref_last7'                                => 'Last 7 days',
+    'pref_YTD'                                  => 'Year to date',
+    'pref_QTD'                                  => 'Quarter to date',
+    'pref_MTD'                                  => 'Month to date',
    'pref_languages'                            => 'Languages',
    'pref_locale'                               => 'Locale settings',
    'pref_languages_help'                       => 'Firefly III supports several languages. Which one do you prefer?',
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -654,6 +654,13 @@ return [
    'pref_3M'                                   => 'Three months (quarter)',
    'pref_6M'                                   => 'Six months',
    'pref_1Y'                                   => 'One year',
+    'pref_last365'                              => 'Last year',
+    'pref_last90'                               => 'Last 90 days',
+    'pref_last30'                               => 'Last 30 days',
+    'pref_last7'                                => 'Last 7 days',
+    'pref_YTD'                                  => 'Year to date',
+    'pref_QTD'                                  => 'Quarter to date',
+    'pref_MTD'                                  => 'Month to date',
    'pref_languages'                            => 'Languages',
    'pref_locale'                               => 'Locale settings',
    'pref_languages_help'                       => 'Firefly III supports several languages. Which one do you prefer?',
--- a/resources/lang/es_ES/firefly.php
+++ b/resources/lang/es_ES/firefly.php
@@ -654,6 +654,13 @@ return [
    'pref_3M'                                   => 'Tres meses (trimestre)',
    'pref_6M'                                   => 'Seis meses',
    'pref_1Y'                                   => 'Un año',
+    'pref_last365'                              => 'Last year',
+    'pref_last90'                               => 'Last 90 days',
+    'pref_last30'                               => 'Last 30 days',
+    'pref_last7'                                => 'Last 7 days',
+    'pref_YTD'                                  => 'Year to date',
+    'pref_QTD'                                  => 'Quarter to date',
+    'pref_MTD'                                  => 'Month to date',
    'pref_languages'                            => 'Idiomas',
    'pref_locale'                               => 'Configuración del idioma',
    'pref_languages_help'                       => 'Firefly III soporta varios idiomas. ¿Cuál prefieres?',
--- a/resources/lang/fi_FI/firefly.php
+++ b/resources/lang/fi_FI/firefly.php
@@ -654,6 +654,13 @@ return [
    'pref_3M'                                   => 'Kolme kuukautta (vuosineljännes)',
    'pref_6M'                                   => 'Kuusi kuukautta',
    'pref_1Y'                                   => 'Yksi vuosi',
+    'pref_last365'                              => 'Last year',
+    'pref_last90'                               => 'Last 90 days',
+    'pref_last30'                               => 'Last 30 days',
+    'pref_last7'                                => 'Last 7 days',
+    'pref_YTD'                                  => 'Year to date',
+    'pref_QTD'                                  => 'Quarter to date',
+    'pref_MTD'                                  => 'Month to date',
    'pref_languages'                            => 'Kielet',
    'pref_locale'                               => 'Alueasetukset',
    'pref_languages_help'                       => 'Firefly III tukee useita kieliä. Mitä niistä haluat käyttää?',
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -654,6 +654,13 @@ return [
    'pref_3M'                                   => 'Trois mois (trimestre)',
    'pref_6M'                                   => 'Six mois',
    'pref_1Y'                                   => 'Un an',
+    'pref_last365'                              => 'Last year',
+    'pref_last90'                               => 'Last 90 days',
+    'pref_last30'                               => 'Last 30 days',
+    'pref_last7'                                => 'Last 7 days',
+    'pref_YTD'                                  => 'Year to date',
+    'pref_QTD'                                  => 'Quarter to date',
+    'pref_MTD'                                  => 'Month to date',
    'pref_languages'                            => 'Langues',
    'pref_locale'                               => 'Paramètres régionaux',
    'pref_languages_help'                       => 'Firefly III prend en charge plusieurs langues. Laquelle préférez-vous ?',
--- a/resources/lang/hu_HU/firefly.php
+++ b/resources/lang/hu_HU/firefly.php
@@ -654,6 +654,13 @@ return [
    'pref_3M'                                   => 'Három hónap (negyedév)',
    'pref_6M'                                   => 'Hat hónap',
    'pref_1Y'                                   => 'Egy év',
+    'pref_last365'                              => 'Last year',
+    'pref_last90'                               => 'Last 90 days',
+    'pref_last30'                               => 'Last 30 days',
+    'pref_last7'                                => 'Last 7 days',
+    'pref_YTD'                                  => 'Year to date',
+    'pref_QTD'                                  => 'Quarter to date',
+    'pref_MTD'                                  => 'Month to date',
    'pref_languages'                            => 'Nyelvek',
    'pref_locale'                               => 'Területi beállítások',
    'pref_languages_help'                       => 'A Firefly III több nyelven is elérhető. Melyiket szeretné használni?',
--- a/resources/lang/id_ID/firefly.php
+++ b/resources/lang/id_ID/firefly.php
@@ -654,6 +654,13 @@ return [
    'pref_3M'                                   => 'Tiga bulan (seperempat)',
    'pref_6M'                                   => 'Enam bulan',
    'pref_1Y'                                   => 'Satu tahun',
+    'pref_last365'                              => 'Last year',
+    'pref_last90'                               => 'Last 90 days',
+    'pref_last30'                               => 'Last 30 days',
+    'pref_last7'                                => 'Last 7 days',
+    'pref_YTD'                                  => 'Year to date',
+    'pref_QTD'                                  => 'Quarter to date',
+    'pref_MTD'                                  => 'Month to date',
    'pref_languages'                            => 'Bahasa',
    'pref_locale'                               => 'Locale settings',
    'pref_languages_help'                       => 'Firefly III mendukung beberapa bahasa. Mana yang kamu suka?',
--- a/resources/lang/it_IT/firefly.php
+++ b/resources/lang/it_IT/firefly.php
@@ -654,6 +654,13 @@ return [
    'pref_3M'                                   => 'Tre mesi (trimestre)',
    'pref_6M'                                   => 'Sei mesi',
    'pref_1Y'                                   => 'Un anno',
+    'pref_last365'                              => 'Last year',
+    'pref_last90'                               => 'Last 90 days',
+    'pref_last30'                               => 'Last 30 days',
+    'pref_last7'                                => 'Last 7 days',
+    'pref_YTD'                                  => 'Year to date',
+    'pref_QTD'                                  => 'Quarter to date',
+    'pref_MTD'                                  => 'Month to date',
    'pref_languages'                            => 'Lingue',
    'pref_locale'                               => 'Impostazioni regionali',
    'pref_languages_help'                       => 'Firefly III supporta diverse lingue. Quale di queste preferisci?',
--- a/resources/lang/ja_JP/firefly.php
+++ b/resources/lang/ja_JP/firefly.php
@@ -190,7 +190,7 @@ return [
    'transfer_exchange_rate_instructions'                 => '出金元資産口座「@source_name」は @source_currency の取引のみ受け付けます。 送金先資産口座「@dest_name」は @dest_currency でのみ取引を受け付けます。両方の通貨で正しく送金額を入力する必要があります。',
    'transaction_data'                                    => '取引データ',
    'invalid_server_configuration'                        => '無効なサーバー構成',
-    'invalid_locale_settings'                             => 'Firefly III に必要なパッケージが不足しているため、金額を整形できません。 これを行う<a href="https://github.com/firefly-iii/help/wiki/Missing-locale-packages">説明はここ</a>にあります。',
+    'invalid_locale_settings'                             => 'Firefly III に必要なパッケージが不足しているため、金額を整形できません。 解決するための<a href="https://github.com/firefly-iii/help/wiki/Missing-locale-packages">説明はここ</a>にあります。',
    'quickswitch'                                         => 'クイックスイッチ',
    'sign_in_to_start'                                    => 'サインインしてセッションを開始',
    'sign_in'                                             => 'サインイン',
@@ -347,10 +347,10 @@ return [
    'search_modifier_date_is_day'                         => ':value月内日の取引',
    'search_modifier_date_before_year'                    => ':value年以前または年内の取引',
    'search_modifier_date_before_month'                   => ':value月以前または月内の取引',
-    'search_modifier_date_before_day'                     => 'Transaction before or on day of month ":value"',
-    'search_modifier_date_after_year'                     => 'Transaction is in or after year ":value"',
-    'search_modifier_date_after_month'                    => 'Transaction is in or after month ":value"',
-    'search_modifier_date_after_day'                      => 'Transaction is after or on day of month ":value"',
+    'search_modifier_date_before_day'                     => '「:value」中またはそれ以前の取引',
+    'search_modifier_date_after_year'                     => '「:value」中またはそれ以降の取引',
+    'search_modifier_date_after_month'                    => '「:value」中またはそれ以降の取引',
+    'search_modifier_date_after_day'                      => '「:value」日以降の取引',
    'update_rule_from_query'                              => '検索クエリからルール「:rule」を更新',
    'create_rule_from_query'                              => '検索クエリから新しいルールを作成',
    'rule_from_search_words'                              => 'ルールエンジンは「:string」をうまく扱えません。 検索クエリに提案されたルールは、異なる結果をもたらす可能性があります。ルールのトリガーは慎重に検証してください。',
@@ -650,10 +650,17 @@ return [
    'pref_view_range_help'                      => 'いくつかのチャートは自動的に期間でグループ化されます。予算も期間にグループ化されます。どの期間を設定しますか？',
    'pref_1D'                                   => '1日',
    'pref_1W'                                   => 'YYYY年w[週目]',
-    'pref_1M'                                   => '一か月',
+    'pref_1M'                                   => '1ヵ月',
    'pref_3M'                                   => '3ヶ月 (四半期)',
    'pref_6M'                                   => '6ヶ月',
    'pref_1Y'                                   => '1年',
+    'pref_last365'                              => 'Last year',
+    'pref_last90'                               => 'Last 90 days',
+    'pref_last30'                               => 'Last 30 days',
+    'pref_last7'                                => 'Last 7 days',
+    'pref_YTD'                                  => 'Year to date',
+    'pref_QTD'                                  => 'Quarter to date',
+    'pref_MTD'                                  => 'Month to date',
    'pref_languages'                            => '言語',
    'pref_locale'                               => 'ロケール設定',
    'pref_languages_help'                       => 'Firefly III は多言語に対応しています。どれがお好みですか？',
@@ -686,9 +693,9 @@ return [
    'pref_home_show_deposits_info'              => 'ホーム画面にはすでに支出口座が表示されています。収入口座も表示しますか？',
    'pref_home_do_show_deposits'                => 'はい、表示します',
    'successful_count'                          => ':count 通のエラーがあります',
-    'list_page_size_title'                      => 'このページのヘルプ',
+    'list_page_size_title'                      => 'ページの表示件数',
    'list_page_size_help'                       => 'あらゆるリスト (アカウント、取引など) のページあたりの最大表示数です。',
-    'list_page_size_label'                      => 'このページのヘルプ',
+    'list_page_size_label'                      => 'ページの表示件数',
    'between_dates'                             => ':nameカテゴリの:startから:endまでのすべての取引',
    'pref_optional_fields_transaction'          => '取引間のリンクを削除する',
    'pref_optional_fields_transaction_help'     => 'デフォルトでは、新しい取引を作成するとき、すべての項目が有効ではありません (乱雑になるため)。 以下にて、あなたが便利と思う項目を有効にすることができます。すでに入力されている項目は、無効であっても設定に関係なく表示されます。',
@@ -760,7 +767,7 @@ return [
    'delete_your_account'                       => '削除',
    'delete_your_account_help'                  => 'アカウントを削除すると、口座や取引など Firefly III に保存した<em>すべてのもの</em> が削除されます。',
    'delete_your_account_password'              => 'パスワードを変更する',
-    'password'                                  => 'パスワードがリセットされました！',
+    'password'                                  => 'パスワード',
    'are_you_sure'                              => '本当によろしいですか？これを元に戻すことはできません。',
    'delete_account_button'                     => '削除',
    'invalid_current_password'                  => 'パスワードリセットトークンが正しくありません。',
@@ -1245,7 +1252,7 @@ return [
    'create_new_object'                         => '作成',
    'empty'                                     => 'この自動補完ドロップダウン/テキストボックスで支払いを選択または入力します。現金入金を行う場合は空のままにします。',
    'all_other_budgets'                         => '(その他の予算すべて)',
-    'all_other_accounts'                        => 'この欄のすべてのアカウントは一致している必要があります。',
+    'all_other_accounts'                        => '(その他のアカウントすべて)',
    'expense_per_source_account'                => '支出アカウント（資産勘定）',
    'expense_per_destination_account'           => '支出先アカウント（支出元アカウント
 ）',
@@ -1430,11 +1437,11 @@ return [
    'quick_link_examples'                       => 'これらは始めるためのリンクの例です。 (？)ボタンからのヘルプページで、すべてのレポートと使用できるマジックワードについての情報を確認してください。',
    'quick_link_default_report'                 => 'デフォルト',
    'quick_link_audit_report'                   => '取引',
-    'report_this_month_quick'                   => 'この欄のすべてのアカウントは一致している必要があります。',
-    'report_last_month_quick'                   => 'この欄のすべてのアカウントは一致している必要があります。',
-    'report_this_year_quick'                    => 'この欄のすべてのアカウントは一致している必要があります。',
+    'report_this_month_quick'                   => '今月の全アカウント',
+    'report_last_month_quick'                   => '先月の全アカウント',
+    'report_this_year_quick'                    => '今年の全アカウント',
    'report_this_fiscal_year_quick'             => '現在の会計年度のすべての口座',
-    'report_all_time_quick'                     => 'この欄のすべてのアカウントは一致している必要があります。',
+    'report_all_time_quick'                     => '全期間の全アカウント',
    'reports_can_bookmark'                      => 'レポートはブックマークできることを忘れないでください。',
    'incomeVsExpenses'                          => '支出',
    'accountBalances'                           => '貯蓄口座',
--- a/resources/lang/nb_NO/firefly.php
+++ b/resources/lang/nb_NO/firefly.php
@@ -654,6 +654,13 @@ return [
    'pref_3M'                                   => 'Tre måneder (kvartal)',
    'pref_6M'                                   => 'Seks måneder',
    'pref_1Y'                                   => 'Ett år',
+    'pref_last365'                              => 'Last year',
+    'pref_last90'                               => 'Last 90 days',
+    'pref_last30'                               => 'Last 30 days',
+    'pref_last7'                                => 'Last 7 days',
+    'pref_YTD'                                  => 'Year to date',
+    'pref_QTD'                                  => 'Quarter to date',
+    'pref_MTD'                                  => 'Month to date',
    'pref_languages'                            => 'Språk',
    'pref_locale'                               => 'Locale settings',
    'pref_languages_help'                       => 'Firefly III støtter flere språk. Hvilket foretrekker du?',
--- a/resources/lang/nl_NL/firefly.php
+++ b/resources/lang/nl_NL/firefly.php
@@ -654,6 +654,13 @@ return [
    'pref_3M'                                   => 'Drie maanden (kwartaal)',
    'pref_6M'                                   => 'Zes maanden',
    'pref_1Y'                                   => 'Eén jaar',
+    'pref_last365'                              => 'Last year',
+    'pref_last90'                               => 'Last 90 days',
+    'pref_last30'                               => 'Last 30 days',
+    'pref_last7'                                => 'Last 7 days',
+    'pref_YTD'                                  => 'Year to date',
+    'pref_QTD'                                  => 'Quarter to date',
+    'pref_MTD'                                  => 'Month to date',
    'pref_languages'                            => 'Talen',
    'pref_locale'                               => 'Lokale instellingen',
    'pref_languages_help'                       => 'Firefly III ondersteunt meerdere talen. Welke heeft jouw voorkeur?',
--- a/resources/lang/pl_PL/firefly.php
+++ b/resources/lang/pl_PL/firefly.php
@@ -654,6 +654,13 @@ return [
    'pref_3M'                                   => 'Trzy miesiące (kwartał)',
    'pref_6M'                                   => 'Sześć miesięcy',
    'pref_1Y'                                   => 'Rok',
+    'pref_last365'                              => 'Last year',
+    'pref_last90'                               => 'Last 90 days',
+    'pref_last30'                               => 'Last 30 days',
+    'pref_last7'                                => 'Last 7 days',
+    'pref_YTD'                                  => 'Year to date',
+    'pref_QTD'                                  => 'Quarter to date',
+    'pref_MTD'                                  => 'Month to date',
    'pref_languages'                            => 'Języki',
    'pref_locale'                               => 'Ustawienia regionalne',
    'pref_languages_help'                       => 'Firefly III obsługuje kilka języków. Który wolisz?',
--- a/resources/lang/pt_BR/firefly.php
+++ b/resources/lang/pt_BR/firefly.php
@@ -654,6 +654,13 @@ return [
    'pref_3M'                                   => 'Trimestral',
    'pref_6M'                                   => 'Semestral',
    'pref_1Y'                                   => 'Um ano',
+    'pref_last365'                              => 'Last year',
+    'pref_last90'                               => 'Last 90 days',
+    'pref_last30'                               => 'Last 30 days',
+    'pref_last7'                                => 'Last 7 days',
+    'pref_YTD'                                  => 'Year to date',
+    'pref_QTD'                                  => 'Quarter to date',
+    'pref_MTD'                                  => 'Month to date',
    'pref_languages'                            => 'Idiomas',
    'pref_locale'                               => 'Configurações regionais',
    'pref_languages_help'                       => 'Firefly III suporta muitos idiomas. Qual você prefere?',
--- a/resources/lang/pt_PT/firefly.php
+++ b/resources/lang/pt_PT/firefly.php
@@ -654,6 +654,13 @@ return [
    'pref_3M'                                   => 'Três meses (trimestre)',
    'pref_6M'                                   => 'Seis meses',
    'pref_1Y'                                   => 'Um ano',
+    'pref_last365'                              => 'Last year',
+    'pref_last90'                               => 'Last 90 days',
+    'pref_last30'                               => 'Last 30 days',
+    'pref_last7'                                => 'Last 7 days',
+    'pref_YTD'                                  => 'Year to date',
+    'pref_QTD'                                  => 'Quarter to date',
+    'pref_MTD'                                  => 'Month to date',
    'pref_languages'                            => 'Idiomas',
    'pref_locale'                               => 'Definições locais',
    'pref_languages_help'                       => 'Firefly III suporta vários idiomas. Qual prefere?',
--- a/resources/lang/ro_RO/firefly.php
+++ b/resources/lang/ro_RO/firefly.php
@@ -654,6 +654,13 @@ return [
    'pref_3M'                                   => 'Trei luni (trimestru)',
    'pref_6M'                                   => 'Șase luni',
    'pref_1Y'                                   => 'Un an',
+    'pref_last365'                              => 'Last year',
+    'pref_last90'                               => 'Last 90 days',
+    'pref_last30'                               => 'Last 30 days',
+    'pref_last7'                                => 'Last 7 days',
+    'pref_YTD'                                  => 'Year to date',
+    'pref_QTD'                                  => 'Quarter to date',
+    'pref_MTD'                                  => 'Month to date',
    'pref_languages'                            => 'Limbi',
    'pref_locale'                               => 'Setările locale',
    'pref_languages_help'                       => 'Firefly III acceptă mai multe limbi. Pe care o preferați?',
--- a/resources/lang/ru_RU/firefly.php
+++ b/resources/lang/ru_RU/firefly.php
@@ -654,6 +654,13 @@ return [
    'pref_3M'                                   => 'Три месяца (квартал)',
    'pref_6M'                                   => 'Шесть месяцев',
    'pref_1Y'                                   => 'Один год',
+    'pref_last365'                              => 'Last year',
+    'pref_last90'                               => 'Last 90 days',
+    'pref_last30'                               => 'Last 30 days',
+    'pref_last7'                                => 'Last 7 days',
+    'pref_YTD'                                  => 'Year to date',
+    'pref_QTD'                                  => 'Quarter to date',
+    'pref_MTD'                                  => 'Month to date',
    'pref_languages'                            => 'Языки',
    'pref_locale'                               => 'Региональные настройки',
    'pref_languages_help'                       => 'Firefly III поддерживает несколько языков. Какой язык вы предпочитаете?',
--- a/resources/lang/sk_SK/firefly.php
+++ b/resources/lang/sk_SK/firefly.php
@@ -654,6 +654,13 @@ return [
    'pref_3M'                                   => 'Tri mesiace (štvrťrok)',
    'pref_6M'                                   => 'Šesť mesiacov',
    'pref_1Y'                                   => 'Jeden rok',
+    'pref_last365'                              => 'Last year',
+    'pref_last90'                               => 'Last 90 days',
+    'pref_last30'                               => 'Last 30 days',
+    'pref_last7'                                => 'Last 7 days',
+    'pref_YTD'                                  => 'Year to date',
+    'pref_QTD'                                  => 'Quarter to date',
+    'pref_MTD'                                  => 'Month to date',
    'pref_languages'                            => 'Jazyky',
    'pref_locale'                               => 'Miestne nastavenia',
    'pref_languages_help'                       => 'Firefly III podporuje niekoľko jazykov – v ktorom ho chcete používať?',
--- a/resources/lang/sv_SE/firefly.php
+++ b/resources/lang/sv_SE/firefly.php
@@ -654,6 +654,13 @@ return [
    'pref_3M'                                   => 'Tre månader (kvartal)',
    'pref_6M'                                   => 'Sex månader',
    'pref_1Y'                                   => 'Ett år',
+    'pref_last365'                              => 'Last year',
+    'pref_last90'                               => 'Last 90 days',
+    'pref_last30'                               => 'Last 30 days',
+    'pref_last7'                                => 'Last 7 days',
+    'pref_YTD'                                  => 'Year to date',
+    'pref_QTD'                                  => 'Quarter to date',
+    'pref_MTD'                                  => 'Month to date',
    'pref_languages'                            => 'Språk',
    'pref_locale'                               => 'Nationella inställningar',
    'pref_languages_help'                       => 'Firefly III stödjer flera språk. Vilket föredrar du?',
--- a/resources/lang/tr_TR/firefly.php
+++ b/resources/lang/tr_TR/firefly.php
@@ -655,6 +655,13 @@ return [
    'pref_3M'                                   => 'Üç ay (çeyrek)',
    'pref_6M'                                   => 'Altı ay',
    'pref_1Y'                                   => 'Bir yıl',
+    'pref_last365'                              => 'Last year',
+    'pref_last90'                               => 'Last 90 days',
+    'pref_last30'                               => 'Last 30 days',
+    'pref_last7'                                => 'Last 7 days',
+    'pref_YTD'                                  => 'Year to date',
+    'pref_QTD'                                  => 'Quarter to date',
+    'pref_MTD'                                  => 'Month to date',
    'pref_languages'                            => 'Diller',
    'pref_locale'                               => 'Locale settings',
    'pref_languages_help'                       => 'Firefly III birçok dili destekliyor. Hangisini tercih edersiniz?',
--- a/resources/lang/vi_VN/firefly.php
+++ b/resources/lang/vi_VN/firefly.php
@@ -654,6 +654,13 @@ return [
    'pref_3M'                                   => 'Ba tháng (quý)',
    'pref_6M'                                   => 'Sáu tháng',
    'pref_1Y'                                   => 'Một năm',
+    'pref_last365'                              => 'Last year',
+    'pref_last90'                               => 'Last 90 days',
+    'pref_last30'                               => 'Last 30 days',
+    'pref_last7'                                => 'Last 7 days',
+    'pref_YTD'                                  => 'Year to date',
+    'pref_QTD'                                  => 'Quarter to date',
+    'pref_MTD'                                  => 'Month to date',
    'pref_languages'                            => 'Ngôn ngữ',
    'pref_locale'                               => 'Thiết lập địa phương',
    'pref_languages_help'                       => 'Firefly III hỗ trợ một số ngôn ngữ. Bạn thích cái nào hơn?',
--- a/resources/lang/zh_CN/firefly.php
+++ b/resources/lang/zh_CN/firefly.php
@@ -654,6 +654,13 @@ return [
    'pref_3M'                                   => '3个月 (1季度)',
    'pref_6M'                                   => '6个月',
    'pref_1Y'                                   => '1年',
+    'pref_last365'                              => 'Last year',
+    'pref_last90'                               => 'Last 90 days',
+    'pref_last30'                               => 'Last 30 days',
+    'pref_last7'                                => 'Last 7 days',
+    'pref_YTD'                                  => 'Year to date',
+    'pref_QTD'                                  => 'Quarter to date',
+    'pref_MTD'                                  => 'Month to date',
    'pref_languages'                            => '语言',
    'pref_locale'                               => '区域设置',
    'pref_languages_help'                       => 'Firefly III 支持多语言，请问您倾向于哪个语言？',
--- a/resources/lang/zh_TW/firefly.php
+++ b/resources/lang/zh_TW/firefly.php
@@ -654,6 +654,13 @@ return [
    'pref_3M'                                   => '3個月 (季)',
    'pref_6M'                                   => '6個月',
    'pref_1Y'                                   => '1年',
+    'pref_last365'                              => 'Last year',
+    'pref_last90'                               => 'Last 90 days',
+    'pref_last30'                               => 'Last 30 days',
+    'pref_last7'                                => 'Last 7 days',
+    'pref_YTD'                                  => 'Year to date',
+    'pref_QTD'                                  => 'Quarter to date',
+    'pref_MTD'                                  => 'Month to date',
    'pref_languages'                            => '語言',
    'pref_locale'                               => 'Locale settings',
    'pref_languages_help'                       => 'Firefly III 支援多種語言，您想顯示哪一種？',
--- a/resources/views/v1/transactions/show.twig
+++ b/resources/views/v1/transactions/show.twig
@@ -362,7 +362,13 @@
                                                <a href="{{ route('transactions.link.delete', [link.id]) }}" class="btn btn-danger"><span class="fa fa-trash"></span></a>
                                            </div>
                                        </td>
-                                        <td>{{ trans('firefly.'~link.link) }} "<a href="{{ route('transactions.show', link.group) }}"
+                                        <td>
+                                            {% if link.editable %}
+                                            {{ link.link }}
+                                            {% else %}
+                                                {{ trans('firefly.'~link.link) }}
+                                                {% endif %}
+                                            "<a href="{{ route('transactions.show', link.group) }}"
                                                                title="{{ link.description }}">{{ link.description }}</a>"

                                            ({{ link.amount|raw }})
--- a/yarn.lock
+++ b/yarn.lock
@@ -988,9 +988,9 @@
    "@types/estree" "*"

 "@types/eslint@*":
-  version "8.2.1"
-  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.2.1.tgz#13f3d69bac93c2ae008019c28783868d0a1d6605"
-  integrity sha512-UP9rzNn/XyGwb5RQ2fok+DzcIRIYwc16qTXse5+Smsy8MOIccCChT15KAwnsgQx4PzJkaMq4myFyZ4CL5TjhIQ==
+  version "8.2.2"
+  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.2.2.tgz#b64dbdb64b1957cfc8a698c68297fcf8983e94c7"
+  integrity sha512-nQxgB8/Sg+QKhnV8e0WzPpxjIGT3tuJDDzybkDi8ItE/IgTlHo07U0shaIjzhcvQxlq9SDRE42lsJ23uvEgJ2A==
  dependencies:
    "@types/estree" "*"
    "@types/json-schema" "*"
@@ -1062,9 +1062,9 @@
  integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==

 "@types/node@*":
-  version "17.0.6"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.6.tgz#cc1589c9ee853b389e67e8fb4384e0f250a139b9"
-  integrity sha512-+XBAjfZmmivILUzO0HwBJoYkAyyySSLg5KCGBDFLomJo0sV6szvVLAf4ANZZ0pfWzgEds5KmGLG9D5hfEqOhaA==
+  version "17.0.8"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.8.tgz#50d680c8a8a78fe30abe6906453b21ad8ab0ad7b"
+  integrity sha512-YofkM6fGv4gDJq78g4j0mMuGMkZVxZDgtU0JRdx6FgiJDG+0fY0GKVolOV8WqVmEhLCXkQRjwDdKyPxJp/uucg==

 "@types/parse-json@^4.0.0":
  version "4.0.0"
@@ -1451,12 +1451,12 @@ async@^2.6.2:
    lodash "^4.17.14"

 autoprefixer@^10.4.0:
-  version "10.4.1"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.1.tgz#1735959d6462420569bc42408016acbc56861c12"
-  integrity sha512-B3ZEG7wtzXDRCEFsan7HmR2AeNsxdJB0+sEC0Hc5/c2NbhJqPwuZm+tn233GBVw82L+6CtD6IPSfVruwKjfV3A==
+  version "10.4.2"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.2.tgz#25e1df09a31a9fba5c40b578936b90d35c9d4d3b"
+  integrity sha512-9fOPpHKuDW1w/0EKfRmVnxTDt8166MAnLI3mgZ1JCnhNtYWxcJ6Ud5CO/AVOZi/AvFa8DY9RTy3h3+tFBlrrdQ==
  dependencies:
    browserslist "^4.19.1"
-    caniuse-lite "^1.0.30001294"
+    caniuse-lite "^1.0.30001297"
    fraction.js "^4.1.2"
    normalize-range "^0.1.2"
    picocolors "^1.0.0"
@@ -1750,10 +1750,10 @@ caniuse-api@^3.0.0:
    lodash.memoize "^4.1.2"
    lodash.uniq "^4.5.0"

-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001286, caniuse-lite@^1.0.30001294:
-  version "1.0.30001295"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001295.tgz#68a60f8f0664f342b2835c5d8898b4faea7b3d51"
-  integrity sha512-lSP16vcyC0FEy0R4ECc9duSPoKoZy+YkpGkue9G4D81OfPnliopaZrU10+qtPdT8PbGXad/PNx43TIQrOmJZSQ==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001286, caniuse-lite@^1.0.30001297:
+  version "1.0.30001298"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001298.tgz#0e690039f62e91c3ea581673d716890512e7ec52"
+  integrity sha512-AcKqikjMLlvghZL/vfTHorlQsLDhGRalYf1+GmWCf5SCMziSGjRYQW/JEksj14NaYHIR6KIhrFAy0HV5C25UzQ==

 chalk@^2.0.0:
  version "2.4.2"
@@ -1853,9 +1853,9 @@ clone-deep@^4.0.1:
    shallow-clone "^3.0.0"

 collect.js@^4.28.5:
-  version "4.30.3"
-  resolved "https://registry.yarnpkg.com/collect.js/-/collect.js-4.30.3.tgz#8325272f48ad7c87bd3801d288a33d34f1c42921"
-  integrity sha512-u/+RntU9wk+B5dBfaZRZ0PsmjzBEd3rPfpB36A45cnjiufNACzFCjAB7D4MuE8fAaayxJbjLnq9ewQtMBTnPiw==
+  version "4.30.7"
+  resolved "https://registry.yarnpkg.com/collect.js/-/collect.js-4.30.7.tgz#9500b31e315c809d2bfebffb87053e56f081ee0a"
+  integrity sha512-5+G52m+yBOk9olVUdtiMZK4tJvAEj/FkKanHrVDCqaUmt3QDSjXQl1QaluhnISYAZTDGzlp0QjRB5UujgyPqcQ==

 color-convert@^1.9.0:
  version "1.9.3"
@@ -1892,9 +1892,9 @@ colorette@^2.0.10, colorette@^2.0.14:
  integrity sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==

 colors@^1.1.2:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
-  integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.1.tgz#57e798423c5fa9182f7531e4c587bfce9483175d"
+  integrity sha512-urbBmMVnD1vk0mUwCpnWv06P3f16EF+RMTtIXTkylJk5mAdfrMepu9B3hhSnL8DGkc1Ra6pENJHrXTKvcAZ0wA==

 commander@^2.20.0, commander@^2.9.0:
  version "2.20.3"
@@ -2098,9 +2098,9 @@ crypto-browserify@^3.11.0:
    randomfill "^1.0.3"

 css-declaration-sorter@^6.0.3:
-  version "6.1.3"
-  resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.1.3.tgz#e9852e4cf940ba79f509d9425b137d1f94438dc2"
-  integrity sha512-SvjQjNRZgh4ULK1LDJ2AduPKUKxIqmtU7ZAyi47BTV+M90Qvxr9AB6lKlLbDUfXqI9IQeYA8LbAsCZPpJEV3aA==
+  version "6.1.4"
+  resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.1.4.tgz#b9bfb4ed9a41f8dcca9bf7184d849ea94a8294b4"
+  integrity sha512-lpfkqS0fctcmZotJGhnxkIyJWvBXgpyi2wsFd4J8VB7wzyrT6Ch/3Q+FMNJpjK4gu1+GN5khOnpU2ZVKrLbhCw==
  dependencies:
    timsort "^0.3.0"

@@ -2149,52 +2149,52 @@ cssesc@^3.0.0:
  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
  integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==

-cssnano-preset-default@^5.1.9:
-  version "5.1.9"
-  resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.1.9.tgz#79628ac48eccbdad570f70b4018cc38d43d1b7df"
-  integrity sha512-RhkEucqlQ+OxEi14K1p8gdXcMQy1mSpo7P1oC44oRls7BYIj8p+cht4IFBFV3W4iOjTP8EUB33XV1fX9KhDzyA==
+cssnano-preset-default@^5.1.10:
+  version "5.1.10"
+  resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.1.10.tgz#9350765fdf3c49bf78fac7673354fa58fa95daa4"
+  integrity sha512-BcpSzUVygHMOnp9uG5rfPzTOCb0GAHQkqtUQx8j1oMNF9A1Q8hziOOhiM4bdICpmrBIU85BE64RD5XGYsVQZNA==
  dependencies:
    css-declaration-sorter "^6.0.3"
-    cssnano-utils "^2.0.1"
-    postcss-calc "^8.0.0"
-    postcss-colormin "^5.2.2"
+    cssnano-utils "^3.0.0"
+    postcss-calc "^8.2.0"
+    postcss-colormin "^5.2.3"
    postcss-convert-values "^5.0.2"
    postcss-discard-comments "^5.0.1"
    postcss-discard-duplicates "^5.0.1"
    postcss-discard-empty "^5.0.1"
-    postcss-discard-overridden "^5.0.1"
+    postcss-discard-overridden "^5.0.2"
    postcss-merge-longhand "^5.0.4"
-    postcss-merge-rules "^5.0.3"
-    postcss-minify-font-values "^5.0.1"
-    postcss-minify-gradients "^5.0.3"
-    postcss-minify-params "^5.0.2"
-    postcss-minify-selectors "^5.1.0"
+    postcss-merge-rules "^5.0.4"
+    postcss-minify-font-values "^5.0.2"
+    postcss-minify-gradients "^5.0.4"
+    postcss-minify-params "^5.0.3"
+    postcss-minify-selectors "^5.1.1"
    postcss-normalize-charset "^5.0.1"
-    postcss-normalize-display-values "^5.0.1"
-    postcss-normalize-positions "^5.0.1"
-    postcss-normalize-repeat-style "^5.0.1"
-    postcss-normalize-string "^5.0.1"
-    postcss-normalize-timing-functions "^5.0.1"
-    postcss-normalize-unicode "^5.0.1"
+    postcss-normalize-display-values "^5.0.2"
+    postcss-normalize-positions "^5.0.2"
+    postcss-normalize-repeat-style "^5.0.2"
+    postcss-normalize-string "^5.0.2"
+    postcss-normalize-timing-functions "^5.0.2"
+    postcss-normalize-unicode "^5.0.2"
    postcss-normalize-url "^5.0.4"
-    postcss-normalize-whitespace "^5.0.1"
-    postcss-ordered-values "^5.0.2"
+    postcss-normalize-whitespace "^5.0.2"
+    postcss-ordered-values "^5.0.3"
    postcss-reduce-initial "^5.0.2"
-    postcss-reduce-transforms "^5.0.1"
+    postcss-reduce-transforms "^5.0.2"
    postcss-svgo "^5.0.3"
    postcss-unique-selectors "^5.0.2"

-cssnano-utils@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-2.0.1.tgz#8660aa2b37ed869d2e2f22918196a9a8b6498ce2"
-  integrity sha512-i8vLRZTnEH9ubIyfdZCAdIdgnHAUeQeByEeQ2I7oTilvP9oHO6RScpeq3GsFUVqeB8uZgOQ9pw8utofNn32hhQ==
+cssnano-utils@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-3.0.0.tgz#c0b9fcd6e4f05c5155b07e9ab11bf94b97163057"
+  integrity sha512-Pzs7/BZ6OgT+tXXuF12DKR8SmSbzUeVYCtMBbS8lI0uAm3mrYmkyqCXXPsQESI6kmLfEVBppbdVY/el3hg3nAA==

 cssnano@^5.0.8:
-  version "5.0.14"
-  resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.0.14.tgz#99bc550f663b48c38e9b8e0ae795697c9de84b47"
-  integrity sha512-qzhRkFvBhv08tbyKCIfWbxBXmkIpLl1uNblt8SpTHkgLfON5OCPX/CCnkdNmEosvo8bANQYmTTMEgcVBlisHaw==
+  version "5.0.15"
+  resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.0.15.tgz#8779eaf60e3665e6a12687c814d375cc9f78db76"
+  integrity sha512-ppZsS7oPpi2sfiyV5+i+NbB/3GtQ+ab2Vs1azrZaXWujUSN4o+WdTxlCZIMcT9yLW3VO/5yX3vpyDaQ1nIn8CQ==
  dependencies:
-    cssnano-preset-default "^5.1.9"
+    cssnano-preset-default "^5.1.10"
    lilconfig "^2.0.3"
    yaml "^1.10.2"

@@ -2401,9 +2401,9 @@ ee-first@1.1.1:
  integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=

 electron-to-chromium@^1.4.17:
-  version "1.4.31"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.31.tgz#8d5ccc3f8253cd142b07afaa84f200fd33a7f2a6"
-  integrity sha512-t3XVQtk+Frkv6aTD4RRk0OqosU+VLe1dQFW83MDer78ZD6a52frgXuYOIsLYTQiH2Lm+JB2OKYcn7zrX+YGAiQ==
+  version "1.4.38"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.38.tgz#10ea58d73d36b13e78d5024f3b74a352d3958d01"
+  integrity sha512-WhHt3sZazKj0KK/UpgsbGQnUUoFeAHVishzHFExMxagpZgjiGYSC9S0ZlbhCfSH2L2i+2A1yyqOIliTctMx7KQ==

 elliptic@^6.5.3:
  version "6.5.4"
@@ -2592,10 +2592,10 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==

-fast-glob@^3.0.3, fast-glob@^3.1.1:
-  version "3.2.7"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1"
-  integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==
+fast-glob@^3.0.3, fast-glob@^3.2.9:
+  version "3.2.9"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.9.tgz#8f55f664b68a236bd29fa165817fc44f2b11faba"
+  integrity sha512-MBwILhhD92sziIrMQwpqcuGERF+BH99ei2a3XsGJuqEKcSycAL+w0HWokFenZXona+kjFr82Lf71eTxNRC06XQ==
  dependencies:
    "@nodelib/fs.stat" "^2.0.2"
    "@nodelib/fs.walk" "^1.2.3"
@@ -2799,21 +2799,21 @@ globby@^10.0.0:
    slash "^3.0.0"

 globby@^11.0.1:
-  version "11.0.4"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5"
-  integrity sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
+  integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
  dependencies:
    array-union "^2.1.0"
    dir-glob "^3.0.1"
-    fast-glob "^3.1.1"
-    ignore "^5.1.4"
-    merge2 "^1.3.0"
+    fast-glob "^3.2.9"
+    ignore "^5.2.0"
+    merge2 "^1.4.1"
    slash "^3.0.0"

 graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.4, graceful-fs@^4.2.6:
-  version "4.2.8"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a"
-  integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==
+  version "4.2.9"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96"
+  integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==

 growly@^1.3.0:
  version "1.3.0"
@@ -3016,7 +3016,7 @@ ieee754@^1.1.4:
  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==

-ignore@^5.1.1, ignore@^5.1.4:
+ignore@^5.1.1, ignore@^5.2.0:
  version "5.2.0"
  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
  integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
@@ -3050,9 +3050,9 @@ import-fresh@^3.2.1:
    resolve-from "^4.0.0"

 import-local@^3.0.2:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.0.3.tgz#4d51c2c495ca9393da259ec66b62e022920211e0"
-  integrity sha512-bE9iaUY3CXH8Cwfan/abDKAxe1KGT9kyGsBPqf6DMK/z0a2OzAsrukeYNgIH6cH5Xr452jb1TUL8rSfCLjZ9uA==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4"
+  integrity sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==
  dependencies:
    pkg-dir "^4.2.0"
    resolve-cwd "^3.0.0"
@@ -3145,10 +3145,10 @@ is-buffer@~1.1.6:
  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==

-is-core-module@^2.2.0:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.0.tgz#0321336c3d0925e497fd97f5d95cb114a5ccd548"
-  integrity sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==
+is-core-module@^2.8.0:
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211"
+  integrity sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==
  dependencies:
    has "^1.0.3"

@@ -3251,9 +3251,9 @@ isobject@^3.0.1:
  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=

 jest-worker@^27.4.1:
-  version "27.4.5"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.4.5.tgz#d696e3e46ae0f24cff3fa7195ffba22889262242"
-  integrity sha512-f2s8kEdy15cv9r7q4KkzGXvlY0JTcmCbMHZBfSQDwW77REr45IDWwd0lksDFeVHH2jJ5pqb90T77XscrjeGzzg==
+  version "27.4.6"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.4.6.tgz#5d2d93db419566cb680752ca0792780e71b3273e"
+  integrity sha512-gHWJF/6Xi5CTG5QCvROr6GcmpIqNYpDJyc8A1h/DyXqH1tD6SnRCM0d3U5msV31D2LB/U+E0M+W4oyvKV44oNw==
  dependencies:
    "@types/node" "*"
    merge-stream "^2.0.0"
@@ -3541,7 +3541,7 @@ merge-stream@^2.0.0:
  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
  integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==

-merge2@^1.2.3, merge2@^1.3.0:
+merge2@^1.2.3, merge2@^1.3.0, merge2@^1.4.1:
  version "1.4.1"
  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
  integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
@@ -3963,7 +3963,7 @@ path-key@^3.0.0, path-key@^3.1.0:
  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==

-path-parse@^1.0.6:
+path-parse@^1.0.7:
  version "1.0.7"
  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
  integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
@@ -4000,9 +4000,9 @@ picocolors@^1.0.0:
  integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==

 picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972"
-  integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
+  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==

 pkg-dir@^4.1.0, pkg-dir@^4.2.0:
  version "4.2.0"
@@ -4025,18 +4025,18 @@ portfinder@^1.0.28:
    debug "^3.1.1"
    mkdirp "^0.5.5"

-postcss-calc@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-8.0.0.tgz#a05b87aacd132740a5db09462a3612453e5df90a"
-  integrity sha512-5NglwDrcbiy8XXfPM11F3HeC6hoT9W7GUH/Zi5U/p7u3Irv4rHhdDcIZwG0llHXV4ftsBjpfWMXAnXNl4lnt8g==
+postcss-calc@^8.2.0:
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-8.2.0.tgz#e67ef8c8456d091c0802968faecf79d0e6e00d24"
+  integrity sha512-PueXCv288diX7OXyJicGNA6Q3+L4xYb2cALTAeFj9X6PXnj+s4pUf1vkZnwn+rldfu2taCA9ondjF93lhRTPFA==
  dependencies:
    postcss-selector-parser "^6.0.2"
    postcss-value-parser "^4.0.2"

-postcss-colormin@^5.2.2:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-5.2.2.tgz#019cd6912bef9e7e0924462c5e4ffae241e2f437"
-  integrity sha512-tSEe3NpqWARUTidDlF0LntPkdlhXqfDFuA1yslqpvvGAfpZ7oBaw+/QXd935NKm2U9p4PED0HDZlzmMk7fVC6g==
+postcss-colormin@^5.2.3:
+  version "5.2.3"
+  resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-5.2.3.tgz#da7fb80e81ad80d2867ea9e38672a892add5df15"
+  integrity sha512-dra4xoAjub2wha6RUXAgadHEn2lGxbj8drhFcIGLOMn914Eu7DkPUurugDXgstwttCYkJtZ/+PkWRWdp3UHRIA==
  dependencies:
    browserslist "^4.16.6"
    caniuse-api "^3.0.0"
@@ -4065,10 +4065,10 @@ postcss-discard-empty@^5.0.1:
  resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-5.0.1.tgz#ee136c39e27d5d2ed4da0ee5ed02bc8a9f8bf6d8"
  integrity sha512-vfU8CxAQ6YpMxV2SvMcMIyF2LX1ZzWpy0lqHDsOdaKKLQVQGVP1pzhrI9JlsO65s66uQTfkQBKBD/A5gp9STFw==

-postcss-discard-overridden@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-5.0.1.tgz#454b41f707300b98109a75005ca4ab0ff2743ac6"
-  integrity sha512-Y28H7y93L2BpJhrdUR2SR2fnSsT+3TVx1NmVQLbcnZWwIUpJ7mfcTC6Za9M2PG6w8j7UQRfzxqn8jU2VwFxo3Q==
+postcss-discard-overridden@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-5.0.2.tgz#e6f51d83e66feffcf05ed94c4ad20b814d0aab5f"
+  integrity sha512-+56BLP6NSSUuWUXjRgAQuho1p5xs/hU5Sw7+xt9S3JSg+7R6+WMGnJW7Hre/6tTuZ2xiXMB42ObkiZJ2hy/Pew==

 postcss-load-config@^3.1.0:
  version "3.1.1"
@@ -4095,46 +4095,46 @@ postcss-merge-longhand@^5.0.4:
    postcss-value-parser "^4.1.0"
    stylehacks "^5.0.1"

-postcss-merge-rules@^5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.0.3.tgz#b5cae31f53129812a77e3eb1eeee448f8cf1a1db"
-  integrity sha512-cEKTMEbWazVa5NXd8deLdCnXl+6cYG7m2am+1HzqH0EnTdy8fRysatkaXb2dEnR+fdaDxTvuZ5zoBdv6efF6hg==
+postcss-merge-rules@^5.0.4:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.0.4.tgz#a50640fd832380f322bd2861a9b33fbde4219f9b"
+  integrity sha512-yOj7bW3NxlQxaERBB0lEY1sH5y+RzevjbdH4DBJurjKERNpknRByFNdNe+V72i5pIZL12woM9uGdS5xbSB+kDQ==
  dependencies:
    browserslist "^4.16.6"
    caniuse-api "^3.0.0"
-    cssnano-utils "^2.0.1"
+    cssnano-utils "^3.0.0"
    postcss-selector-parser "^6.0.5"

-postcss-minify-font-values@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-5.0.1.tgz#a90cefbfdaa075bd3dbaa1b33588bb4dc268addf"
-  integrity sha512-7JS4qIsnqaxk+FXY1E8dHBDmraYFWmuL6cgt0T1SWGRO5bzJf8sUoelwa4P88LEWJZweHevAiDKxHlofuvtIoA==
+postcss-minify-font-values@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-5.0.2.tgz#4603e956d85cd0719156e2b3eb68e3cd2f917092"
+  integrity sha512-R6MJZryq28Cw0AmnyhXrM7naqJZZLoa1paBltIzh2wM7yb4D45TLur+eubTQ4jCmZU9SGeZdWsc5KcSoqTMeTg==
  dependencies:
-    postcss-value-parser "^4.1.0"
+    postcss-value-parser "^4.2.0"

-postcss-minify-gradients@^5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-5.0.3.tgz#f970a11cc71e08e9095e78ec3a6b34b91c19550e"
-  integrity sha512-Z91Ol22nB6XJW+5oe31+YxRsYooxOdFKcbOqY/V8Fxse1Y3vqlNRpi1cxCqoACZTQEhl+xvt4hsbWiV5R+XI9Q==
+postcss-minify-gradients@^5.0.4:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-5.0.4.tgz#f13146950513f5a201015306914e3c76d10b591d"
+  integrity sha512-RVwZA7NC4R4J76u8X0Q0j+J7ItKUWAeBUJ8oEEZWmtv3Xoh19uNJaJwzNpsydQjk6PkuhRrK+YwwMf+c+68EYg==
  dependencies:
    colord "^2.9.1"
-    cssnano-utils "^2.0.1"
-    postcss-value-parser "^4.1.0"
+    cssnano-utils "^3.0.0"
+    postcss-value-parser "^4.2.0"

-postcss-minify-params@^5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.0.2.tgz#1b644da903473fbbb18fbe07b8e239883684b85c"
-  integrity sha512-qJAPuBzxO1yhLad7h2Dzk/F7n1vPyfHfCCh5grjGfjhi1ttCnq4ZXGIW77GSrEbh9Hus9Lc/e/+tB4vh3/GpDg==
+postcss-minify-params@^5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.0.3.tgz#9f933d37098ef1dcf007e159a47bb2c1cf06989d"
+  integrity sha512-NY92FUikE+wralaiVexFd5gwb7oJTIDhgTNeIw89i1Ymsgt4RWiPXfz3bg7hDy4NL6gepcThJwOYNtZO/eNi7Q==
  dependencies:
    alphanum-sort "^1.0.2"
    browserslist "^4.16.6"
-    cssnano-utils "^2.0.1"
-    postcss-value-parser "^4.1.0"
+    cssnano-utils "^3.0.0"
+    postcss-value-parser "^4.2.0"

-postcss-minify-selectors@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-5.1.0.tgz#4385c845d3979ff160291774523ffa54eafd5a54"
-  integrity sha512-NzGBXDa7aPsAcijXZeagnJBKBPMYLaJJzB8CQh6ncvyl2sIndLVWfbcDi0SBjRWk5VqEjXvf8tYwzoKf4Z07og==
+postcss-minify-selectors@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-5.1.1.tgz#20ae03b411f7fb397451e3d7d85b989f944b871c"
+  integrity sha512-TOzqOPXt91O2luJInaVPiivh90a2SIK5Nf1Ea7yEIM/5w+XA5BGrZGUSW8aEx9pJ/oNj7ZJBhjvigSiBV+bC1Q==
  dependencies:
    alphanum-sort "^1.0.2"
    postcss-selector-parser "^6.0.5"
@@ -4172,51 +4172,48 @@ postcss-normalize-charset@^5.0.1:
  resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-5.0.1.tgz#121559d1bebc55ac8d24af37f67bd4da9efd91d0"
  integrity sha512-6J40l6LNYnBdPSk+BHZ8SF+HAkS4q2twe5jnocgd+xWpz/mx/5Sa32m3W1AA8uE8XaXN+eg8trIlfu8V9x61eg==

-postcss-normalize-display-values@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-5.0.1.tgz#62650b965981a955dffee83363453db82f6ad1fd"
-  integrity sha512-uupdvWk88kLDXi5HEyI9IaAJTE3/Djbcrqq8YgjvAVuzgVuqIk3SuJWUisT2gaJbZm1H9g5k2w1xXilM3x8DjQ==
+postcss-normalize-display-values@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-5.0.2.tgz#8b5273c6c7d0a445e6ef226b8a5bb3204a55fb99"
+  integrity sha512-RxXoJPUR0shSjkMMzgEZDjGPrgXUVYyWA/YwQRicb48H15OClPuaDR7tYokLAlGZ2tCSENEN5WxjgxSD5m4cUw==
  dependencies:
-    cssnano-utils "^2.0.1"
-    postcss-value-parser "^4.1.0"
+    postcss-value-parser "^4.2.0"

-postcss-normalize-positions@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-5.0.1.tgz#868f6af1795fdfa86fbbe960dceb47e5f9492fe5"
-  integrity sha512-rvzWAJai5xej9yWqlCb1OWLd9JjW2Ex2BCPzUJrbaXmtKtgfL8dBMOOMTX6TnvQMtjk3ei1Lswcs78qKO1Skrg==
+postcss-normalize-positions@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-5.0.2.tgz#799fa494b352a5da183be8f050024af6d92fa29c"
+  integrity sha512-tqghWFVDp2btqFg1gYob1etPNxXLNh3uVeWgZE2AQGh6b2F8AK2Gj36v5Vhyh+APwIzNjmt6jwZ9pTBP+/OM8g==
  dependencies:
-    postcss-value-parser "^4.1.0"
+    postcss-value-parser "^4.2.0"

-postcss-normalize-repeat-style@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.0.1.tgz#cbc0de1383b57f5bb61ddd6a84653b5e8665b2b5"
-  integrity sha512-syZ2itq0HTQjj4QtXZOeefomckiV5TaUO6ReIEabCh3wgDs4Mr01pkif0MeVwKyU/LHEkPJnpwFKRxqWA/7O3w==
+postcss-normalize-repeat-style@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.0.2.tgz#fd9bddba3e6fd5f5d95c18dfb42a09ecd563adea"
+  integrity sha512-/rIZn8X9bBzC7KvY4iKUhXUGW3MmbXwfPF23jC9wT9xTi7kAvgj8sEgwxjixBmoL6MVa4WOgxNz2hAR6wTK8tw==
  dependencies:
-    cssnano-utils "^2.0.1"
-    postcss-value-parser "^4.1.0"
+    postcss-value-parser "^4.2.0"

-postcss-normalize-string@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-5.0.1.tgz#d9eafaa4df78c7a3b973ae346ef0e47c554985b0"
-  integrity sha512-Ic8GaQ3jPMVl1OEn2U//2pm93AXUcF3wz+OriskdZ1AOuYV25OdgS7w9Xu2LO5cGyhHCgn8dMXh9bO7vi3i9pA==
+postcss-normalize-string@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-5.0.2.tgz#1b2bbf91526f61266f28abf7f773e4136b2c4bd2"
+  integrity sha512-zaI1yzwL+a/FkIzUWMQoH25YwCYxi917J4pYm1nRXtdgiCdnlTkx5eRzqWEC64HtRa06WCJ9TIutpb6GmW4gFw==
  dependencies:
-    postcss-value-parser "^4.1.0"
+    postcss-value-parser "^4.2.0"

-postcss-normalize-timing-functions@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.0.1.tgz#8ee41103b9130429c6cbba736932b75c5e2cb08c"
-  integrity sha512-cPcBdVN5OsWCNEo5hiXfLUnXfTGtSFiBU9SK8k7ii8UD7OLuznzgNRYkLZow11BkQiiqMcgPyh4ZqXEEUrtQ1Q==
+postcss-normalize-timing-functions@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.0.2.tgz#db4f4f49721f47667afd1fdc5edb032f8d9cdb2e"
+  integrity sha512-Ao0PP6MoYsRU1LxeVUW740ioknvdIUmfr6uAA3xWlQJ9s69/Tupy8qwhuKG3xWfl+KvLMAP9p2WXF9cwuk/7Bg==
  dependencies:
-    cssnano-utils "^2.0.1"
-    postcss-value-parser "^4.1.0"
+    postcss-value-parser "^4.2.0"

-postcss-normalize-unicode@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-5.0.1.tgz#82d672d648a411814aa5bf3ae565379ccd9f5e37"
-  integrity sha512-kAtYD6V3pK0beqrU90gpCQB7g6AOfP/2KIPCVBKJM2EheVsBQmx/Iof+9zR9NFKLAx4Pr9mDhogB27pmn354nA==
+postcss-normalize-unicode@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-5.0.2.tgz#c4db89a0116066716b9e9fcb6444ce63178f5ced"
+  integrity sha512-3y/V+vjZ19HNcTizeqwrbZSUsE69ZMRHfiiyLAJb7C7hJtYmM4Gsbajy7gKagu97E8q5rlS9k8FhojA8cpGhWw==
  dependencies:
-    browserslist "^4.16.0"
-    postcss-value-parser "^4.1.0"
+    browserslist "^4.16.6"
+    postcss-value-parser "^4.2.0"

 postcss-normalize-url@^5.0.4:
  version "5.0.4"
@@ -4226,20 +4223,20 @@ postcss-normalize-url@^5.0.4:
    normalize-url "^6.0.1"
    postcss-value-parser "^4.2.0"

-postcss-normalize-whitespace@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.0.1.tgz#b0b40b5bcac83585ff07ead2daf2dcfbeeef8e9a"
-  integrity sha512-iPklmI5SBnRvwceb/XH568yyzK0qRVuAG+a1HFUsFRf11lEJTiQQa03a4RSCQvLKdcpX7XsI1Gen9LuLoqwiqA==
-  dependencies:
-    postcss-value-parser "^4.1.0"
-
-postcss-ordered-values@^5.0.2:
+postcss-normalize-whitespace@^5.0.2:
  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.0.2.tgz#1f351426977be00e0f765b3164ad753dac8ed044"
-  integrity sha512-8AFYDSOYWebJYLyJi3fyjl6CqMEG/UVworjiyK1r573I56kb3e879sCJLGvR3merj+fAdPpVplXKQZv+ey6CgQ==
+  resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.0.2.tgz#92c5eaffe5255b5c43fca0baf19227e607c534db"
+  integrity sha512-CXBx+9fVlzSgbk0IXA/dcZn9lXixnQRndnsPC5ht3HxlQ1bVh77KQDL1GffJx1LTzzfae8ftMulsjYmO2yegxA==
  dependencies:
-    cssnano-utils "^2.0.1"
-    postcss-value-parser "^4.1.0"
+    postcss-value-parser "^4.2.0"
+
+postcss-ordered-values@^5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.0.3.tgz#d80a8565f2e21efe8a06abacd60629a783bbcf54"
+  integrity sha512-T9pDS+P9bWeFvqivXd5ACzQmrCmHjv3ZP+djn8E1UZY7iK79pFSm7i3WbKw2VSmFmdbMm8sQ12OPcNpzBo3Z2w==
+  dependencies:
+    cssnano-utils "^3.0.0"
+    postcss-value-parser "^4.2.0"

 postcss-reduce-initial@^5.0.2:
  version "5.0.2"
@@ -4249,13 +4246,12 @@ postcss-reduce-initial@^5.0.2:
    browserslist "^4.16.6"
    caniuse-api "^3.0.0"

-postcss-reduce-transforms@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-5.0.1.tgz#93c12f6a159474aa711d5269923e2383cedcf640"
-  integrity sha512-a//FjoPeFkRuAguPscTVmRQUODP+f3ke2HqFNgGPwdYnpeC29RZdCBvGRGTsKpMURb/I3p6jdKoBQ2zI+9Q7kA==
+postcss-reduce-transforms@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-5.0.2.tgz#9242758629f9ad4d90312eadbc921259d15bee4d"
+  integrity sha512-25HeDeFsgiPSUx69jJXZn8I06tMxLQJJNF5h7i9gsUg8iP4KOOJ8EX8fj3seeoLt3SLU2YDD6UPnDYVGUO7DEA==
  dependencies:
-    cssnano-utils "^2.0.1"
-    postcss-value-parser "^4.1.0"
+    postcss-value-parser "^4.2.0"

 postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5:
  version "6.0.8"
@@ -4548,12 +4544,13 @@ resolve-from@^5.0.0:
  integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==

 resolve@^1.14.2, resolve@^1.9.0:
-  version "1.20.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
-  integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
+  version "1.21.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.21.0.tgz#b51adc97f3472e6a5cf4444d34bc9d6b9037591f"
+  integrity sha512-3wCbTpk5WJlyE4mSOtDLhqQmGFi0/TD9VPwmiolnk8U0wRgMEktqCXd3vy5buTO3tljvalNvKrjHEfrd2WpEKA==
  dependencies:
-    is-core-module "^2.2.0"
-    path-parse "^1.0.6"
+    is-core-module "^2.8.0"
+    path-parse "^1.0.7"
+    supports-preserve-symlinks-flag "^1.0.0"

 retry@^0.13.1:
  version "0.13.1"
@@ -4948,6 +4945,11 @@ supports-color@^8.0.0:
  dependencies:
    has-flag "^4.0.0"

+supports-preserve-symlinks-flag@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
+  integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
+
 svgo@^2.7.0:
  version "2.8.0"
  resolved "https://registry.yarnpkg.com/svgo/-/svgo-2.8.0.tgz#4ff80cce6710dc2795f0c7c74101e6764cfccd24"