Merge pull request #11200 from firefly-iii/develop

🤖 Automatically merge the PR into the main branch.

.ci/rector.php

@@ -57,26 +57,26 @@ return RectorConfig::configure()
     // uncomment to reach your current PHP version
     ->withPhpSets()
     ->withPreparedSets(
+        deadCode: true,
+        codeQuality: true,
         codingStyle: false, // leave false
+        typeDeclarations: true,
+        typeDeclarationDocblocks: false,
         privatization: false, // leave false.
         naming: false, // leave false
         instanceOf: true,
         earlyReturn: true,
-        strictBooleans: true,
+        // strictBooleans: true, // has a new thingie.
         carbon: true,
         rectorPreset: true,
         phpunitCodeQuality: true,
         doctrineCodeQuality: true,
         symfonyCodeQuality: true,
-        symfonyConfigs: true
+        symfonyConfigs: true,
-
     )
     ->withComposerBased(
         twig: true,
         doctrine: true,
         phpunit: true,
         symfony: true)
-    ->withTypeCoverageLevel(0)
-    ->withDeadCodeLevel(0)
-    ->withCodeQualityLevel(0)
     ->withImportNames(removeUnusedImports: true);// import statements instead of full classes.

app/Http/Controllers/HomeController.php

@@ -69,7 +69,7 @@ class HomeController extends Controller
             $stringStart = e((string) $request->get('start'));
             $start       = Carbon::createFromFormat('Y-m-d', $stringStart);
         } catch (InvalidFormatException) {
-            app('log')->error(sprintf('Start: could not parse date string "%s" so ignore it.', $stringStart));
+            Log::error(sprintf('Start: could not parse date string "%s" so ignore it.', $stringStart));
             $start = Carbon::now()->startOfMonth();
         }
 
@@ -77,7 +77,7 @@ class HomeController extends Controller
             $stringEnd = e((string) $request->get('end'));
             $end       = Carbon::createFromFormat('Y-m-d', $stringEnd);
         } catch (InvalidFormatException) {
-            app('log')->error(sprintf('End could not parse date string "%s" so ignore it.', $stringEnd));
+            Log::error(sprintf('End could not parse date string "%s" so ignore it.', $stringEnd));
             $end = Carbon::now()->endOfMonth();
         }
         if (null === $start) {
@@ -90,12 +90,12 @@ class HomeController extends Controller
         $label         = $request->get('label');
         $isCustomRange = false;
 
-        app('log')->debug('dateRange: Received dateRange', ['start' => $stringStart, 'end' => $stringEnd, 'label' => $request->get('label')]);
+        Log::debug('dateRange: Received dateRange', ['start' => $stringStart, 'end' => $stringEnd, 'label' => $request->get('label')]);
         // check if the label is "everything" or "Custom range" which will betray
         // a possible problem with the budgets.
         if ($label === (string) trans('firefly.everything') || $label === (string) trans('firefly.customRange')) {
             $isCustomRange = true;
-            app('log')->debug('Range is now marked as "custom".');
+            Log::debug('Range is now marked as "custom".');
         }
 
         $diff          = $start->diffInDays($end, true) + 1;
@@ -105,11 +105,11 @@ class HomeController extends Controller
         }
 
         $request->session()->put('is_custom_range', $isCustomRange);
-        app('log')->debug(sprintf('Set is_custom_range to %s', var_export($isCustomRange, true)));
+        Log::debug(sprintf('Set is_custom_range to %s', var_export($isCustomRange, true)));
         $request->session()->put('start', $start);
-        app('log')->debug(sprintf('Set start to %s', $start->format('Y-m-d H:i:s')));
+        Log::debug(sprintf('Set start to %s', $start->format('Y-m-d H:i:s')));
         $request->session()->put('end', $end);
-        app('log')->debug(sprintf('Set end to %s', $end->format('Y-m-d H:i:s')));
+        Log::debug(sprintf('Set end to %s', $end->format('Y-m-d H:i:s')));
 
         return response()->json(['ok' => 'ok']);
     }
@@ -161,7 +161,7 @@ class HomeController extends Controller
         $today          = today(config('app.timezone'));
         $accounts       = $accounts->sortBy('order'); // sort frontpage accounts by order
 
-        app('log')->debug('Frontpage accounts are ', $frontpageArray);
+        Log::debug('Frontpage accounts are ', $frontpageArray);
 
         /** @var BillRepositoryInterface $billRepository */
         $billRepository = app(BillRepositoryInterface::class);

app/Http/Controllers/Recurring/EditController.php

@@ -44,7 +44,6 @@ use Illuminate\Http\Request;
 use Illuminate\Routing\Redirector;
 use Illuminate\Support\Facades\Log;
 use Illuminate\View\View;
-use Symfony\Component\HttpFoundation\ParameterBag;
 
 /**
  * Class EditController
@@ -90,30 +89,29 @@ class EditController extends Controller
     public function edit(Request $request, Recurrence $recurrence)
     {
         // TODO this should be in the repository.
-        $count                            = $recurrence->recurrenceTransactions()->count();
+        $count                              = $recurrence->recurrenceTransactions()->count();
         if (0 === $count) {
             throw new FireflyException('This recurring transaction has no meta-data. You will have to delete it and recreate it. Sorry!');
         }
 
         // enrich
         /** @var User $admin */
-        $admin                            = auth()->user();
+        $admin                              = auth()->user();
-        $enrichment                       = new RecurringEnrichment();
+        $enrichment                         = new RecurringEnrichment();
         $enrichment->setUser($admin);
 
         /** @var Recurrence $recurrence */
-        $recurrence                       = $enrichment->enrichSingle($recurrence);
+        $recurrence                         = $enrichment->enrichSingle($recurrence);
 
         /** @var RecurrenceTransformer $transformer */
-        $transformer                      = app(RecurrenceTransformer::class);
+        $transformer                        = app(RecurrenceTransformer::class);
-        $transformer->setParameters(new ParameterBag());
+        $array                              = $transformer->transform($recurrence);
-        $array                            = $transformer->transform($recurrence);
+        $budgets                            = ExpandedForm::makeSelectListWithEmpty($this->budgetRepos->getActiveBudgets());
-        $budgets                          = ExpandedForm::makeSelectListWithEmpty($this->budgetRepos->getActiveBudgets());
+        $bills                              = ExpandedForm::makeSelectListWithEmpty($this->billRepository->getActiveBills());
-        $bills                            = ExpandedForm::makeSelectListWithEmpty($this->billRepository->getActiveBills());
 
         /** @var RecurrenceRepetition $repetition */
-        $repetition                       = $recurrence->recurrenceRepetitions()->first();
+        $repetition                         = $recurrence->recurrenceRepetitions()->first();
-        $currentRepType                   = $repetition->repetition_type;
+        $currentRepType                     = $repetition->repetition_type;
         if ('' !== $repetition->repetition_moment) {
             $currentRepType = sprintf('%s,%s', $currentRepType, $repetition->repetition_moment);
         }
@@ -124,8 +122,8 @@ class EditController extends Controller
         }
         $request->session()->forget('recurrences.edit.fromUpdate');
 
-        $repetitionEnd                    = 'forever';
+        $repetitionEnd                      = 'forever';
-        $repetitionEnds                   = [
+        $repetitionEnds                     = [
             'forever'    => (string) trans('firefly.repeat_forever'),
             'until_date' => (string) trans('firefly.repeat_until_date'),
             'times'      => (string) trans('firefly.repeat_times'),
@@ -137,24 +135,28 @@ class EditController extends Controller
             $repetitionEnd = 'times';
         }
 
-        $weekendResponses                 = [
+        $weekendResponses                   = [
             RecurrenceRepetitionWeekend::WEEKEND_DO_NOTHING->value    => (string) trans('firefly.do_nothing'),
             RecurrenceRepetitionWeekend::WEEKEND_SKIP_CREATION->value => (string) trans('firefly.skip_transaction'),
             RecurrenceRepetitionWeekend::WEEKEND_TO_FRIDAY->value     => (string) trans('firefly.jump_to_friday'),
             RecurrenceRepetitionWeekend::WEEKEND_TO_MONDAY->value     => (string) trans('firefly.jump_to_monday'),
         ];
 
-        $hasOldInput                      = null !== $request->old('_token');
+        $hasOldInput                        = null !== $request->old('_token');
-        $preFilled                        = [
+        $preFilled                          = [
             'transaction_type'          => strtolower((string) $recurrence->transactionType->type),
             'active'                    => $hasOldInput ? (bool) $request->old('active') : $recurrence->active,
             'apply_rules'               => $hasOldInput ? (bool) $request->old('apply_rules') : $recurrence->apply_rules,
             'deposit_source_id'         => $array['transactions'][0]['source_id'],
             'withdrawal_destination_id' => $array['transactions'][0]['destination_id'],
         ];
-        $array['first_date']              = substr((string) $array['first_date'], 0, 10);
+        $array['first_date']                = substr((string) $array['first_date'], 0, 10);
-        $array['repeat_until']            = substr((string) $array['repeat_until'], 0, 10);
+        $array['repeat_until']              = substr((string) $array['repeat_until'], 0, 10);
-        $array['transactions'][0]['tags'] = implode(',', $array['transactions'][0]['tags'] ?? []);
+        $array['transactions'][0]['tags']   = implode(',', $array['transactions'][0]['tags'] ?? []);
+        $array['transactions'][0]['amount'] = round((float) $array['transactions'][0]['amount'], $array['transactions'][0]['currency_decimal_places']);
+        if (null !== $array['transactions'][0]['foreign_amount'] && '' !== $array['transactions'][0]['foreign_amount']) {
+            $array['transactions'][0]['foreign_amount'] = round((float) $array['transactions'][0]['foreign_amount'], $array['transactions'][0]['foreign_currency_decimal_places'] ?? 2);
+        }
 
         return view(
             'recurring.edit',

app/Http/Controllers/ReportController.php

@@ -155,16 +155,7 @@ class ReportController extends Controller
         $start->endOfDay(); // end of day so the final balance is at the end of that day.
         $end->endOfDay();
 
-        app('view')->share(
+        app('view')->share('subTitle', trans('firefly.report_category', ['start' => $start->isoFormat($this->monthAndDayFormat), 'end'   => $end->isoFormat($this->monthAndDayFormat)]));
-            'subTitle',
-            trans(
-                'firefly.report_category',
-                [
-                    'start' => $start->isoFormat($this->monthAndDayFormat),
-                    'end'   => $end->isoFormat($this->monthAndDayFormat),
-                ]
-            )
-        );
 
         $generator = ReportGeneratorFactory::reportGenerator('Category', $start, $end);
         $generator->setAccounts($accounts);

app/Support/Twig/General.php

@@ -157,6 +157,14 @@ class General extends AbstractExtension
 
                 /** @var Carbon $date */
                 $date             = now();
+
+                // get the date from the current session. If it's in the future, keep `now()`.
+                /** @var Carbon $session */
+                $session          = clone session('end', today(config('app.timezone'))->endOfMonth());
+                if ($session->lt($date)) {
+                    $date = $session->copy();
+                    $date->endOfDay();
+                }
                 Log::debug(sprintf('twig balance: Call finalAccountBalance with date/time "%s"', $date->toIso8601String()));
 
                 // 2025-10-08 replace finalAccountBalance with accountsBalancesOptimized.

app/TransactionRules/Engine/SearchRuleEngine.php

@@ -376,15 +376,14 @@ class SearchRuleEngine implements RuleEngineInterface
         $collection = $this->findStrictRule($rule);
 
         $this->processResults($rule, $collection);
-        Log::debug(sprintf('SearchRuleEngine:: done processing strict rule #%d', $rule->id));
 
         $result     = $collection->count() > 0;
         if (true === $result) {
-            Log::debug(sprintf('SearchRuleEngine:: rule #%d was triggered (on %d transaction(s)).', $rule->id, $collection->count()));
+            Log::debug(sprintf('SearchRuleEngine:: Done. Rule #%d was triggered (on %d transaction(s)).', $rule->id, $collection->count()));
 
             return true;
         }
-        Log::debug(sprintf('SearchRuleEngine:: rule #%d was not triggered (on %d transaction(s)).', $rule->id, $collection->count()));
+        Log::debug(sprintf('SearchRuleEngine:: Done. Rule #%d was not triggered (on %d transaction(s)).', $rule->id, $collection->count()));
 
         return false;
     }
@@ -496,7 +495,7 @@ class SearchRuleEngine implements RuleEngineInterface
         $collection = $this->findNonStrictRule($rule);
 
         $this->processResults($rule, $collection);
-        Log::debug(sprintf('SearchRuleEngine:: done processing non-strict rule #%d', $rule->id));
+        Log::debug(sprintf('SearchRuleEngine:: Done processing non-strict rule #%d', $rule->id));
 
         return $collection->count() > 0;
     }
@@ -534,6 +533,7 @@ class SearchRuleEngine implements RuleEngineInterface
                 return;
             }
         }
+        Log::debug(sprintf('Done with rule group #%d.', $group->id));
     }
 
     /**

changelog.md

@@ -3,11 +3,21 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## 6.4.5 - 2025-11-xx
+## 6.4.6 - 2025-11-09
 
 ### Fixed
 
 - [Issue 11157](https://github.com/firefly-iii/firefly-iii/issues/11157) (Redacted amounts misbehave with Reports) reported by @barreeeiroo
+- [Issue 11166](https://github.com/firefly-iii/firefly-iii/issues/11166) (Optional transaction information field not saved when updating a recuring transaction) reported by @Old-Veeh
+- [Issue 11185](https://github.com/firefly-iii/firefly-iii/issues/11185) (Internal server error after apply rule) reported by @Citroene
+- [Issue 11196](https://github.com/firefly-iii/firefly-iii/issues/11196) (Exception when editing recurring transaction) reported by @Insprill
+
+## 6.4.5 - 2025-11-09
+
+### Fixed
+
+- [Issue 11157](https://github.com/firefly-iii/firefly-iii/issues/11157) (Redacted amounts misbehave with Reports) reported by @barreeeiroo
+- [Issue 11166](https://github.com/firefly-iii/firefly-iii/issues/11166) (Optional transaction information field not saved when updating a recuring transaction) reported by @Old-Veeh
 - [Issue 11185](https://github.com/firefly-iii/firefly-iii/issues/11185) (Internal server error after apply rule) reported by @Citroene
 
 ## 6.4.4 - 2025-11-02

config/firefly.php

@@ -78,8 +78,8 @@ return [
         'running_balance_column' => env('USE_RUNNING_BALANCE', false),
         // see cer.php for exchange rates feature flag.
     ],
-    'version'                              => 'develop/2025-11-07',
+    'version'                              => '6.4.6',
-    'build_time'                           => 1762545905,
+    'build_time'                           => 1762641809,
     'api_version'                          => '2.1.0', // field is no longer used.
     'db_version'                           => 28, // field is no longer used.
 

package-lock.json

@@ -2589,9 +2589,9 @@
             }
         },
         "node_modules/@rollup/rollup-android-arm-eabi": {
-            "version": "4.53.0",
+            "version": "4.53.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.53.0.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.53.1.tgz",
-            "integrity": "sha512-MX3DD/o2W36nlgQb8KA5QtUw/bK5aR9YDzNmX1PRHZAa6LF/MQCWMN477CgBMg8gH1vEiEZsjWRIZeL/7ttUVA==",
+            "integrity": "sha512-bxZtughE4VNVJlL1RdoSE545kc4JxL7op57KKoi59/gwuU5rV6jLWFXXc8jwgFoT6vtj+ZjO+Z2C5nrY0Cl6wA==",
             "cpu": [
                 "arm"
             ],
@@ -2603,9 +2603,9 @@
             ]
         },
         "node_modules/@rollup/rollup-android-arm64": {
-            "version": "4.53.0",
+            "version": "4.53.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.53.0.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.53.1.tgz",
-            "integrity": "sha512-U4/R8ZvikDYLkl+hyAGP23SRHp3LwYSRy9SvJqsnva7TYLhVMy39RTVCYn1DdRNxXl1CyCQgE/mXKm9jaQT4ig==",
+            "integrity": "sha512-44a1hreb02cAAfAKmZfXVercPFaDjqXCK+iKeVOlJ9ltvnO6QqsBHgKVPTu+MJHSLLeMEUbeG2qiDYgbFPU48g==",
             "cpu": [
                 "arm64"
             ],
@@ -2617,9 +2617,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-arm64": {
-            "version": "4.53.0",
+            "version": "4.53.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.53.0.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.53.1.tgz",
-            "integrity": "sha512-nBG2BXRU3ifdK0HdqBKaT5VI6ScoIpABYZ+dWwQkIOYd8Suo4iykgPikjhsTd7NeHgJJ3OqlKYCcNkZtB1iLVQ==",
+            "integrity": "sha512-usmzIgD0rf1syoOZ2WZvy8YpXK5G1V3btm3QZddoGSa6mOgfXWkkv+642bfUUldomgrbiLQGrPryb7DXLovPWQ==",
             "cpu": [
                 "arm64"
             ],
@@ -2631,9 +2631,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-x64": {
-            "version": "4.53.0",
+            "version": "4.53.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.53.0.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.53.1.tgz",
-            "integrity": "sha512-QuZ5hYStB/vW7b8zQYtdIPpIfNNlUXtGk8zVTkoTMKzMhE2/6tVvcCWqdWqCVhx6eguJJjKjtZ9lAAG/D3yNeA==",
+            "integrity": "sha512-is3r/k4vig2Gt8mKtTlzzyaSQ+hd87kDxiN3uDSDwggJLUV56Umli6OoL+/YZa/KvtdrdyNfMKHzL/P4siOOmg==",
             "cpu": [
                 "x64"
             ],
@@ -2645,9 +2645,9 @@
             ]
         },
         "node_modules/@rollup/rollup-freebsd-arm64": {
-            "version": "4.53.0",
+            "version": "4.53.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.53.0.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.53.1.tgz",
-            "integrity": "sha512-4yYPm1PJwK/HKI4FzElAPj2EAAFaaLUWzXV3S3edKy71JcEVzBCpgaXyEcDh3blBIjLml+aMkj6HEVGSuzpz+g==",
+            "integrity": "sha512-QJ1ksgp/bDJkZB4daldVmHaEQkG4r8PUXitCOC2WRmRaSaHx5RwPoI3DHVfXKwDkB+Sk6auFI/+JHacTekPRSw==",
             "cpu": [
                 "arm64"
             ],
@@ -2659,9 +2659,9 @@
             ]
         },
         "node_modules/@rollup/rollup-freebsd-x64": {
-            "version": "4.53.0",
+            "version": "4.53.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.53.0.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.53.1.tgz",
-            "integrity": "sha512-1SvE5euwWV8JqFc4zEAqHbJbf2yJl00EoHVcnlFqLzjrIExYttLxfZeMDIXY6Yx+bskphrQakpChZKzE2JECEg==",
+            "integrity": "sha512-J6ma5xgAzvqsnU6a0+jgGX/gvoGokqpkx6zY4cWizRrm0ffhHDpJKQgC8dtDb3+MqfZDIqs64REbfHDMzxLMqQ==",
             "cpu": [
                 "x64"
             ],
@@ -2673,9 +2673,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-            "version": "4.53.0",
+            "version": "4.53.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.53.0.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.53.1.tgz",
-            "integrity": "sha512-9tS4QyfU5NF5CdUugEi7kWbcGD7pbu6Fm8SunuePH6beeQgtcRZ9K9KVwKHEgfBHeeyrr5OvfV1qWs7PMDOf5w==",
+            "integrity": "sha512-JzWRR41o2U3/KMNKRuZNsDUAcAVUYhsPuMlx5RUldw0E4lvSIXFUwejtYz1HJXohUmqs/M6BBJAUBzKXZVddbg==",
             "cpu": [
                 "arm"
             ],
@@ -2687,9 +2687,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-            "version": "4.53.0",
+            "version": "4.53.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.53.0.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.53.1.tgz",
-            "integrity": "sha512-U+0ovxGU9bVJIHfW+oALpHd0ho1YDwhj0yHASDzIj+bOeo+VzEpNtHxcjhFab0YcHUorIMoqyxckC98+81oTJw==",
+            "integrity": "sha512-L8kRIrnfMrEoHLHtHn+4uYA52fiLDEDyezgxZtGUTiII/yb04Krq+vk3P2Try+Vya9LeCE9ZHU8CXD6J9EhzHQ==",
             "cpu": [
                 "arm"
             ],
@@ -2701,9 +2701,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-gnu": {
-            "version": "4.53.0",
+            "version": "4.53.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.53.0.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.53.1.tgz",
-            "integrity": "sha512-Cp/TQ+wLjRTqTuiVwLz4XPZMo3ROl7EJYMF8HhMp8Uf+9kOOATB3/p4gGZPpuQ4BP7qEXG29ET24u9+F0ERYkQ==",
+            "integrity": "sha512-ysAc0MFRV+WtQ8li8hi3EoFi7us6d1UzaS/+Dp7FYZfg3NdDljGMoVyiIp6Ucz7uhlYDBZ/zt6XI0YEZbUO11Q==",
             "cpu": [
                 "arm64"
             ],
@@ -2715,9 +2715,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-musl": {
-            "version": "4.53.0",
+            "version": "4.53.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.53.0.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.53.1.tgz",
-            "integrity": "sha512-SuGoAwhsSonrSTEZTiQOGC3+XZfq7rc/qAdAOBrYYIp8pu+Wh4EFFXl6+QYYNbNrHL3DnVoWACLwnfwlTa0neA==",
+            "integrity": "sha512-UV6l9MJpDbDZZ/fJvqNcvO1PcivGEf1AvKuTcHoLjVZVFeAMygnamCTDikCVMRnA+qJe+B3pSbgX2+lBMqgBhA==",
             "cpu": [
                 "arm64"
             ],
@@ -2729,9 +2729,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-loong64-gnu": {
-            "version": "4.53.0",
+            "version": "4.53.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.53.0.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.53.1.tgz",
-            "integrity": "sha512-EOKej1x0WoePnJWfg7ZbnUqiuiQunshzsKZSIfTHFDiCY9pnsr3Weit1GjcpGnun7H5HuRREqkT2c9CcKxNwSg==",
+            "integrity": "sha512-UDUtelEprkA85g95Q+nj3Xf0M4hHa4DiJ+3P3h4BuGliY4NReYYqwlc0Y8ICLjN4+uIgCEvaygYlpf0hUj90Yg==",
             "cpu": [
                 "loong64"
             ],
@@ -2743,9 +2743,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-ppc64-gnu": {
-            "version": "4.53.0",
+            "version": "4.53.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.53.0.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.53.1.tgz",
-            "integrity": "sha512-YAvv2aMFlfiawJ97lutomuehG2Yowd4YgsAqI85XNiMK9eBA1vEMZHt3BShg8cUvak71BM+VFRHddqc+OrRdVA==",
+            "integrity": "sha512-vrRn+BYhEtNOte/zbc2wAUQReJXxEx2URfTol6OEfY2zFEUK92pkFBSXRylDM7aHi+YqEPJt9/ABYzmcrS4SgQ==",
             "cpu": [
                 "ppc64"
             ],
@@ -2757,9 +2757,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-            "version": "4.53.0",
+            "version": "4.53.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.53.0.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.53.1.tgz",
-            "integrity": "sha512-DxZe/sMVaqN+s5kVk3Iq619Rgyl1JCTob7xOLSNC84mbzg3NYTSheqqrtVllYjLYo4wm9YyqjVS57miuzNyXbQ==",
+            "integrity": "sha512-gto/1CxHyi4A7YqZZNznQYrVlPSaodOBPKM+6xcDSCMVZN/Fzb4K+AIkNz/1yAYz9h3Ng+e2fY9H6bgawVq17w==",
             "cpu": [
                 "riscv64"
             ],
@@ -2771,9 +2771,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-riscv64-musl": {
-            "version": "4.53.0",
+            "version": "4.53.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.53.0.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.53.1.tgz",
-            "integrity": "sha512-N7+iZ0jEhwLY1FEsjbCR9lAxIZP0k+3Cghx9vSQWn+rcW8SgN8VcCmwJDoPDaGKTzWWB791U1s79BSLnEhUa0Q==",
+            "integrity": "sha512-KZ6Vx7jAw3aLNjFR8eYVcQVdFa/cvBzDNRFM3z7XhNNunWjA03eUrEwJYPk0G8V7Gs08IThFKcAPS4WY/ybIrQ==",
             "cpu": [
                 "riscv64"
             ],
@@ -2785,9 +2785,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-s390x-gnu": {
-            "version": "4.53.0",
+            "version": "4.53.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.53.0.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.53.1.tgz",
-            "integrity": "sha512-MA/NVneZyIskjvXdh2NR9YcPi7eHWBlQOWP2X8OymzyeUEB0JfUpmbKQZngHmOlyleV2IoR5nHIgMSRjLskOnA==",
+            "integrity": "sha512-HvEixy2s/rWNgpwyKpXJcHmE7om1M89hxBTBi9Fs6zVuLU4gOrEMQNbNsN/tBVIMbLyysz/iwNiGtMOpLAOlvA==",
             "cpu": [
                 "s390x"
             ],
@@ -2799,9 +2799,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-gnu": {
-            "version": "4.53.0",
+            "version": "4.53.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.53.0.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.53.1.tgz",
-            "integrity": "sha512-iYEYzYpfaSCkunVD0LOYrD9OMc357be7+rBuCxW1qvsjCGl+95iWnYAFfyEoxAm6koasNN3tFxFYze5MKl5S3A==",
+            "integrity": "sha512-E/n8x2MSjAQgjj9IixO4UeEUeqXLtiA7pyoXCFYLuXpBA/t2hnbIdxHfA7kK9BFsYAoNU4st1rHYdldl8dTqGA==",
             "cpu": [
                 "x64"
             ],
@@ -2813,9 +2813,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-musl": {
-            "version": "4.53.0",
+            "version": "4.53.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.53.0.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.53.1.tgz",
-            "integrity": "sha512-FoRekOqhRUKbJMsB5LvhQchDeFeNlS6UGUwi0p3860sxE4zE+lp07FnkuR+yQH0rSn6iLXsnr44jnorgl8mGlQ==",
+            "integrity": "sha512-IhJ087PbLOQXCN6Ui/3FUkI9pWNZe/Z7rEIVOzMsOs1/HSAECCvSZ7PkIbkNqL/AZn6WbZvnoVZw/qwqYMo4/w==",
             "cpu": [
                 "x64"
             ],
@@ -2827,9 +2827,9 @@
             ]
         },
         "node_modules/@rollup/rollup-openharmony-arm64": {
-            "version": "4.53.0",
+            "version": "4.53.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.53.0.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.53.1.tgz",
-            "integrity": "sha512-mEN2k1zKO5PUzW8W15hKpLh+zZI2by1onX2GfI93OekGbKN5aTjWGo7yAjwRZLjhAgs2UQcXmEWbIw0R5B4RnQ==",
+            "integrity": "sha512-0++oPNgLJHBblreu0SFM7b3mAsBJBTY0Ksrmu9N6ZVrPiTkRgda52mWR7TKhHAsUb9noCjFvAw9l6ZO1yzaVbA==",
             "cpu": [
                 "arm64"
             ],
@@ -2841,9 +2841,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-arm64-msvc": {
-            "version": "4.53.0",
+            "version": "4.53.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.53.0.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.53.1.tgz",
-            "integrity": "sha512-V1dEKUXqevG0wxo6ysGrL7g2T6tndmo6Uqw5vzOqCXv+DHc8m0RRgcCm+96iigDniwpvV6o4HZtkRUnuTz9XiA==",
+            "integrity": "sha512-VJXivz61c5uVdbmitLkDlbcTk9Or43YC2QVLRkqp86QoeFSqI81bNgjhttqhKNMKnQMWnecOCm7lZz4s+WLGpQ==",
             "cpu": [
                 "arm64"
             ],
@@ -2855,9 +2855,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-ia32-msvc": {
-            "version": "4.53.0",
+            "version": "4.53.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.53.0.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.53.1.tgz",
-            "integrity": "sha512-93mJ8Hm9+vbhtu+A1VtmwptSqCYojtMQkBGDjLytCWC8muxmZLGo/MA/4CMAWf6+QpKlxTTMDAHdTC+kxn9ZcQ==",
+            "integrity": "sha512-NmZPVTUOitCXUH6erJDzTQ/jotYw4CnkMDjCYRxNHVD9bNyfrGoIse684F9okwzKCV4AIHRbUkeTBc9F2OOH5Q==",
             "cpu": [
                 "ia32"
             ],
@@ -2869,9 +2869,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-x64-gnu": {
-            "version": "4.53.0",
+            "version": "4.53.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.53.0.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.53.1.tgz",
-            "integrity": "sha512-1OrYs0p/deXEFLUW1gvyjIabmsJKY3I/9fCUA1K6demaNc4iEhXDW6RnyPv/BWqb7NRmQ9+i+SKoi1HgJxWcwg==",
+            "integrity": "sha512-2SNj7COIdAf6yliSpLdLG8BEsp5lgzRehgfkP0Av8zKfQFKku6JcvbobvHASPJu4f3BFxej5g+HuQPvqPhHvpQ==",
             "cpu": [
                 "x64"
             ],
@@ -2883,9 +2883,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-x64-msvc": {
-            "version": "4.53.0",
+            "version": "4.53.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.53.0.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.53.1.tgz",
-            "integrity": "sha512-xtSei8paPcLy3GzeeOjoRrllJn6EN8PB+/bXnhZ4R0AaviJsRwtKxFZRVnfFXNZTTp0nLeDo+BcEuIfdZS14/A==",
+            "integrity": "sha512-rLarc1Ofcs3DHtgSzFO31pZsCh8g05R2azN1q3fF+H423Co87My0R+tazOEvYVKXSLh8C4LerMK41/K7wlklcg==",
             "cpu": [
                 "x64"
             ],
@@ -5736,9 +5736,9 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.248",
+            "version": "1.5.249",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.248.tgz",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.249.tgz",
-            "integrity": "sha512-zsur2yunphlyAO4gIubdJEXCK6KOVvtpiuDfCIqbM9FjcnMYiyn0ICa3hWfPr0nc41zcLWobgy1iL7VvoOyA2Q==",
+            "integrity": "sha512-5vcfL3BBe++qZ5kuFhD/p8WOM1N9m3nwvJPULJx+4xf2usSlZFJ0qoNYO2fOX4hi3ocuDcmDobtA+5SFr4OmBg==",
             "dev": true,
             "license": "ISC"
         },
@@ -10110,11 +10110,10 @@
             }
         },
         "node_modules/rollup": {
-            "version": "4.53.0",
+            "version": "4.53.1",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.53.0.tgz",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.53.1.tgz",
-            "integrity": "sha512-43Z5T+4YTdfYkkA6CStU2DUYh7Ha9dLtvK+K3n0yEE/QS+4i28vSxrQsM59KqpvmT4tbOwJsFnRGMj/tvmQwWw==",
+            "integrity": "sha512-n2I0V0lN3E9cxxMqBCT3opWOiQBzRN7UG60z/WDKqdX2zHUS/39lezBcsckZFsV6fUTSnfqI7kHf60jDAPGKug==",
             "dev": true,
-            "hasInstallScript": true,
             "license": "MIT",
             "dependencies": {
                 "@types/estree": "1.0.8"
@@ -10127,28 +10126,28 @@
                 "npm": ">=8.0.0"
             },
             "optionalDependencies": {
-                "@rollup/rollup-android-arm-eabi": "4.53.0",
+                "@rollup/rollup-android-arm-eabi": "4.53.1",
-                "@rollup/rollup-android-arm64": "4.53.0",
+                "@rollup/rollup-android-arm64": "4.53.1",
-                "@rollup/rollup-darwin-arm64": "4.53.0",
+                "@rollup/rollup-darwin-arm64": "4.53.1",
-                "@rollup/rollup-darwin-x64": "4.53.0",
+                "@rollup/rollup-darwin-x64": "4.53.1",
-                "@rollup/rollup-freebsd-arm64": "4.53.0",
+                "@rollup/rollup-freebsd-arm64": "4.53.1",
-                "@rollup/rollup-freebsd-x64": "4.53.0",
+                "@rollup/rollup-freebsd-x64": "4.53.1",
-                "@rollup/rollup-linux-arm-gnueabihf": "4.53.0",
+                "@rollup/rollup-linux-arm-gnueabihf": "4.53.1",
-                "@rollup/rollup-linux-arm-musleabihf": "4.53.0",
+                "@rollup/rollup-linux-arm-musleabihf": "4.53.1",
-                "@rollup/rollup-linux-arm64-gnu": "4.53.0",
+                "@rollup/rollup-linux-arm64-gnu": "4.53.1",
-                "@rollup/rollup-linux-arm64-musl": "4.53.0",
+                "@rollup/rollup-linux-arm64-musl": "4.53.1",
-                "@rollup/rollup-linux-loong64-gnu": "4.53.0",
+                "@rollup/rollup-linux-loong64-gnu": "4.53.1",
-                "@rollup/rollup-linux-ppc64-gnu": "4.53.0",
+                "@rollup/rollup-linux-ppc64-gnu": "4.53.1",
-                "@rollup/rollup-linux-riscv64-gnu": "4.53.0",
+                "@rollup/rollup-linux-riscv64-gnu": "4.53.1",
-                "@rollup/rollup-linux-riscv64-musl": "4.53.0",
+                "@rollup/rollup-linux-riscv64-musl": "4.53.1",
-                "@rollup/rollup-linux-s390x-gnu": "4.53.0",
+                "@rollup/rollup-linux-s390x-gnu": "4.53.1",
-                "@rollup/rollup-linux-x64-gnu": "4.53.0",
+                "@rollup/rollup-linux-x64-gnu": "4.53.1",
-                "@rollup/rollup-linux-x64-musl": "4.53.0",
+                "@rollup/rollup-linux-x64-musl": "4.53.1",
-                "@rollup/rollup-openharmony-arm64": "4.53.0",
+                "@rollup/rollup-openharmony-arm64": "4.53.1",
-                "@rollup/rollup-win32-arm64-msvc": "4.53.0",
+                "@rollup/rollup-win32-arm64-msvc": "4.53.1",
-                "@rollup/rollup-win32-ia32-msvc": "4.53.0",
+                "@rollup/rollup-win32-ia32-msvc": "4.53.1",
-                "@rollup/rollup-win32-x64-gnu": "4.53.0",
+                "@rollup/rollup-win32-x64-gnu": "4.53.1",
-                "@rollup/rollup-win32-x64-msvc": "4.53.0",
+                "@rollup/rollup-win32-x64-msvc": "4.53.1",
                 "fsevents": "~2.3.2"
             }
         },