IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/5.2.4'

Browse Source
This commit is contained in:
James Cole 2020-04-26 10:02:42 +02:00
commit e6442dd8af
14 changed files with 200 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.github/ISSUE_TEMPLATE/Bug_report.md vendored
View File

@ -16,10 +16,10 @@ I am running Firefly III version x.x.x, and my problem is:
<!-- Please add extra info here, such as OS, browser, and the output from the /debug page of your Firefly III installation (click the version at the bottom). --> <!-- Please add extra info here, such as OS, browser, and the output from the /debug page of your Firefly III installation (click the version at the bottom). -->
**Bonus points** **Bonus points**
<!-- Earn bonus points by checking the boxes --> <!-- Before you submit, verify the following please: -->
- [ ] Nobody reported this bug before - I searched and nobody reported this bug before
- [ ] I have added a stack trace from my log files <!-- (see https://bit.ly/FF3-get-debug-info) --> - I have added a stack trace from my log files <!-- (see https://bit.ly/FF3-get-debug-info) -->
- [ ] I have added a screenshot. - I have added a screenshot.
- [ ] I was able to replicate it on the demo site https://demo.firefly-iii.org/ - I was able to replicate it on the demo site https://demo.firefly-iii.org/
<!-- - [ ] I donated money (this is a joke :wink:)--> <!-- - I donated money (this is a joke ;)-->

10
.github/ISSUE_TEMPLATE/Custom.md vendored
View File

@ -16,8 +16,8 @@ I am running Firefly III version x.x.x.
<!-- Complete the following checklist for bonus points --> <!-- Complete the following checklist for bonus points -->
- [ ] I have read the FAQ at https://bit.ly/FF3-FAQ - I have read the FAQ at https://bit.ly/FF3-FAQ
- [ ] I added a screenshot - I added a screenshot
- [ ] I added log files <!-- (see https://bit.ly/FF3-get-debug-info) --> - I added log files <!-- (see https://bit.ly/FF3-get-debug-info) -->
- [ ] I was able to replicate the issue on the demo site. - I was able to replicate the issue on the demo site.
<!-- - [ ] I donated money (this is a joke :wink:)--> <!-- - I donated money (this is a joke :wink:)-->

2
app/Http/Controllers/Budget/IndexController.php
View File

@ -86,7 +86,6 @@ class IndexController extends Controller
} }
/** /**
* TODO the "budgeted" progress bar doesn't update.
* Show all budgets. * Show all budgets.
* *
* @param Request $request * @param Request $request
@ -106,7 +105,6 @@ class IndexController extends Controller
$budgeted = '0'; $budgeted = '0';
$spent = '0'; $spent = '0';
// new period stuff: // new period stuff:
$periodTitle = app('navigation')->periodShow($start, $range); $periodTitle = app('navigation')->periodShow($start, $range);
$prevLoop = $this->getPreviousPeriods($start, $range); $prevLoop = $this->getPreviousPeriods($start, $range);

4
app/Http/Controllers/DebugController.php
View File

@ -126,7 +126,6 @@ class DebugController extends Controller
$phpOs = str_replace($search, $replace, PHP_OS); $phpOs = str_replace($search, $replace, PHP_OS);
$interface = PHP_SAPI; $interface = PHP_SAPI;
$now = Carbon::now()->format('Y-m-d H:i:s e'); $now = Carbon::now()->format('Y-m-d H:i:s e');
$extensions = implode(', ', get_loaded_extensions());
$drivers = implode(', ', DB::availableDrivers()); $drivers = implode(', ', DB::availableDrivers());
$currentDriver = DB::getDriverName(); $currentDriver = DB::getDriverName();
$userAgent = $request->header('user-agent'); $userAgent = $request->header('user-agent');
@ -143,7 +142,7 @@ class DebugController extends Controller
// set languages, see what happens: // set languages, see what happens:
$original = setlocale(LC_ALL, 0); $original = setlocale(LC_ALL, 0);
$localeAttempts = []; $localeAttempts = [];
$parts = explode(',', (string) trans('config.locale')); $parts = app('steam')->getLocaleArray(app('steam')->getLocale());
foreach ($parts as $code) { foreach ($parts as $code) {
$code = trim($code); $code = trim($code);
$localeAttempts[$code] = var_export(setlocale(LC_ALL, $code), true); $localeAttempts[$code] = var_export(setlocale(LC_ALL, $code), true);
@ -178,7 +177,6 @@ class DebugController extends Controller
'debug', 'debug',
compact( compact(
'phpVersion', 'phpVersion',
'extensions',
'localeAttempts', 'localeAttempts',
'appEnv', 'appEnv',
'appDebug', 'appDebug',

17
app/Repositories/Budget/BudgetRepository.php
View File

@ -79,6 +79,8 @@ class BudgetRepository implements BudgetRepositoryInterface
$budget->order = $index + 1; $budget->order = $index + 1;
$budget->save(); $budget->save();
} }
// other budgets, set to 0.
$this->user->budgets()->where('active', 0)->update(['order' => 0]);
return true; return true;
} }
@ -187,12 +189,12 @@ class BudgetRepository implements BudgetRepositoryInterface
*/ */
public function getActiveBudgets(): Collection public function getActiveBudgets(): Collection
{ {
//throw new \RuntimeException;
/** @var Collection $set */ /** @var Collection $set */
$set = $this->user->budgets()->where('active', 1) $set = $this->user->budgets()->where('active', 1)
->orderBy('order', 'DESC') ->orderBy('order', 'ASC')
->orderBy('name', 'ASC') ->orderBy('name', 'ASC')
->get(); ->get();
return $set; return $set;
} }
@ -202,7 +204,7 @@ class BudgetRepository implements BudgetRepositoryInterface
public function getBudgets(): Collection public function getBudgets(): Collection
{ {
/** @var Collection $set */ /** @var Collection $set */
$set = $this->user->budgets()->orderBy('order', 'DESC') $set = $this->user->budgets()->orderBy('order', 'ASC')
->orderBy('name', 'ASC')->get(); ->orderBy('name', 'ASC')->get();
return $set; return $set;
@ -227,7 +229,7 @@ class BudgetRepository implements BudgetRepositoryInterface
{ {
/** @var Collection $set */ /** @var Collection $set */
$set = $this->user->budgets() $set = $this->user->budgets()
->orderBy('order', 'DESC') ->orderBy('order', 'ASC')
->orderBy('name', 'ASC')->where('active', 0)->get(); ->orderBy('name', 'ASC')->where('active', 0)->get();
return $set; return $set;
@ -277,11 +279,13 @@ class BudgetRepository implements BudgetRepositoryInterface
*/ */
public function store(array $data): Budget public function store(array $data): Budget
{ {
$order = $this->getMaxOrder();
try { try {
$newBudget = Budget::create( $newBudget = Budget::create(
[ [
'user_id' => $this->user->id, 'user_id' => $this->user->id,
'name' => $data['name'], 'name' => $data['name'],
'order' => $order + 1,
] ]
); );
} catch (QueryException $e) { } catch (QueryException $e) {
@ -487,4 +491,9 @@ class BudgetRepository implements BudgetRepositoryInterface
{ {
return $budget->attachments()->get(); return $budget->attachments()->get();
} }
public function getMaxOrder(): int
{
return (int)$this->user->budgets()->max('order');
}
} }

5
app/Repositories/Budget/BudgetRepositoryInterface.php
View File

@ -58,6 +58,11 @@ interface BudgetRepositoryInterface
*/ */
public function destroyAutoBudget(Budget $budget): void; public function destroyAutoBudget(Budget $budget): void;
/**
* @return int
*/
public function getMaxOrder(): int;
/** /**
* @return bool * @return bool

1
app/Support/Steam.php
View File

@ -617,7 +617,6 @@ class Steam
*/ */
public function getLocaleArray(string $locale): array { public function getLocaleArray(string $locale): array {
return [ return [
sprintf('%s', $locale),
sprintf('%s.utf8', $locale), sprintf('%s.utf8', $locale),
sprintf('%s.UTF-8', $locale), sprintf('%s.UTF-8', $locale),
]; ];

7
changelog.md
View File

@ -2,9 +2,14 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/). This project adheres to [Semantic Versioning](http://semver.org/).
## [5.2.4 (API 1.1.0)] - 2020-04-26
### Fixed
- [Issue 3287](https://github.com/firefly-iii/firefly-iii/issues/3287) Locale issue
- [Issue 3251](https://github.com/firefly-iii/firefly-iii/issues/3251) Budget order
## [5.2.3 (API 1.1.0)] - 2020-04-22 ## [5.2.3 (API 1.1.0)] - 2020-04-22
## [3.4.2] - 2015-05-25
### Added ### Added
- Support for British English! 🇬🇧 - Support for British English! 🇬🇧
- You can set your locale *and* your language now. - You can set your locale *and* your language now.

128
composer.lock generated
View File

@ -1739,16 +1739,16 @@
}, },
{ {
"name": "league/commonmark", "name": "league/commonmark",
"version": "1.4.1", "version": "1.4.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/thephpleague/commonmark.git", "url": "https://github.com/thephpleague/commonmark.git",
"reference": "c995966d35424bae20f76f8b31248099487a3f57" "reference": "9e780d972185e4f737a03bade0fd34a9e67bbf31"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/thephpleague/commonmark/zipball/c995966d35424bae20f76f8b31248099487a3f57", "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/9e780d972185e4f737a03bade0fd34a9e67bbf31",
"reference": "c995966d35424bae20f76f8b31248099487a3f57", "reference": "9e780d972185e4f737a03bade0fd34a9e67bbf31",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1809,7 +1809,33 @@
"md", "md",
"parser" "parser"
], ],
"time": "2020-04-20T13:36:51+00:00" "funding": [
{
"url": "https://enjoy.gitstore.app/repositories/thephpleague/commonmark",
"type": "custom"
},
{
"url": "https://www.colinodell.com/sponsor",
"type": "custom"
},
{
"url": "https://www.paypal.me/colinpodell/10.00",
"type": "custom"
},
{
"url": "https://github.com/colinodell",
"type": "github"
},
{
"url": "https://www.patreon.com/colinodell",
"type": "patreon"
},
{
"url": "https://tidelift.com/funding/github/packagist/league/commonmark",
"type": "tidelift"
}
],
"time": "2020-04-24T13:39:56+00:00"
}, },
{ {
"name": "league/csv", "name": "league/csv",
@ -5780,16 +5806,16 @@
}, },
{ {
"name": "barryvdh/laravel-ide-helper", "name": "barryvdh/laravel-ide-helper",
"version": "v2.6.7", "version": "v2.7.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/barryvdh/laravel-ide-helper.git", "url": "https://github.com/barryvdh/laravel-ide-helper.git",
"reference": "edd69c5e0508972c81f1f7173236de2459c45814" "reference": "5f677edc14bdcfdcac36633e6eea71b2728a4dbc"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/edd69c5e0508972c81f1f7173236de2459c45814", "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/5f677edc14bdcfdcac36633e6eea71b2728a4dbc",
"reference": "edd69c5e0508972c81f1f7173236de2459c45814", "reference": "5f677edc14bdcfdcac36633e6eea71b2728a4dbc",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -5805,7 +5831,7 @@
"illuminate/config": "^5.5|^6|^7", "illuminate/config": "^5.5|^6|^7",
"illuminate/view": "^5.5|^6|^7", "illuminate/view": "^5.5|^6|^7",
"mockery/mockery": "^1.3", "mockery/mockery": "^1.3",
"orchestra/testbench": "^3|^4", "orchestra/testbench": "^3|^4|^5",
"phpro/grumphp": "^0.17.1", "phpro/grumphp": "^0.17.1",
"squizlabs/php_codesniffer": "^3" "squizlabs/php_codesniffer": "^3"
}, },
@ -5847,7 +5873,13 @@
"phpstorm", "phpstorm",
"sublime" "sublime"
], ],
"time": "2020-02-25T20:41:32+00:00" "funding": [
{
"url": "https://github.com/barryvdh",
"type": "github"
}
],
"time": "2020-04-22T09:57:26+00:00"
}, },
{ {
"name": "barryvdh/reflection-docblock", "name": "barryvdh/reflection-docblock",
@ -6042,6 +6074,16 @@
"dependency", "dependency",
"package" "package"
], ],
"funding": [
{
"url": "https://packagist.com",
"type": "custom"
},
{
"url": "https://tidelift.com/funding/github/packagist/composer/composer",
"type": "tidelift"
}
],
"time": "2020-04-10T09:44:22+00:00" "time": "2020-04-10T09:44:22+00:00"
}, },
{ {
@ -7076,6 +7118,16 @@
"orchestral", "orchestral",
"testing" "testing"
], ],
"funding": [
{
"url": "https://paypal.me/crynobone",
"type": "custom"
},
{
"url": "https://www.patreon.com/crynobone",
"type": "patreon"
}
],
"time": "2020-04-11T10:37:21+00:00" "time": "2020-04-11T10:37:21+00:00"
}, },
{ {
@ -7648,16 +7700,16 @@
}, },
{ {
"name": "phpunit/phpunit", "name": "phpunit/phpunit",
"version": "8.5.3", "version": "8.5.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git", "url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "67750516bc02f300e2742fed2f50177f8f37bedf" "reference": "8474e22d7d642f665084ba5ec780626cbd1efd23"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/67750516bc02f300e2742fed2f50177f8f37bedf", "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/8474e22d7d642f665084ba5ec780626cbd1efd23",
"reference": "67750516bc02f300e2742fed2f50177f8f37bedf", "reference": "8474e22d7d642f665084ba5ec780626cbd1efd23",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -7727,7 +7779,17 @@
"testing", "testing",
"xunit" "xunit"
], ],
"time": "2020-03-31T08:52:04+00:00" "funding": [
{
"url": "https://phpunit.de/donate.html",
"type": "custom"
},
{
"url": "https://github.com/sebastianbergmann",
"type": "github"
}
],
"time": "2020-04-23T04:39:42+00:00"
}, },
{ {
"name": "psalm/plugin-laravel", "name": "psalm/plugin-laravel",
@ -7778,12 +7840,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/Roave/SecurityAdvisories.git", "url": "https://github.com/Roave/SecurityAdvisories.git",
"reference": "2bdae3cc8428d637d5c86c8c33d0a3354ce93f7f" "reference": "81541a731da2f245a08666de73169cb5da7ac573"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/2bdae3cc8428d637d5c86c8c33d0a3354ce93f7f", "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/81541a731da2f245a08666de73169cb5da7ac573",
"reference": "2bdae3cc8428d637d5c86c8c33d0a3354ce93f7f", "reference": "81541a731da2f245a08666de73169cb5da7ac573",
"shasum": "" "shasum": ""
}, },
"conflict": { "conflict": {
@ -7919,7 +7981,7 @@
"silverstripe/userforms": "<3", "silverstripe/userforms": "<3",
"simple-updates/phpwhois": "<=1", "simple-updates/phpwhois": "<=1",
"simplesamlphp/saml2": "<1.10.6|>=2,<2.3.8|>=3,<3.1.4", "simplesamlphp/saml2": "<1.10.6|>=2,<2.3.8|>=3,<3.1.4",
"simplesamlphp/simplesamlphp": "<1.18.4", "simplesamlphp/simplesamlphp": "<1.18.6",
"simplesamlphp/simplesamlphp-module-infocard": "<1.0.1", "simplesamlphp/simplesamlphp-module-infocard": "<1.0.1",
"simplito/elliptic-php": "<1.0.6", "simplito/elliptic-php": "<1.0.6",
"slim/slim": "<2.6", "slim/slim": "<2.6",
@ -8036,7 +8098,17 @@
} }
], ],
"description": "Prevents installation of composer packages with known security vulnerabilities: no API, simply require it", "description": "Prevents installation of composer packages with known security vulnerabilities: no API, simply require it",
"time": "2020-04-21T14:24:08+00:00" "funding": [
{
"url": "https://github.com/Ocramius",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/roave/security-advisories",
"type": "tidelift"
}
],
"time": "2020-04-23T00:01:30+00:00"
}, },
{ {
"name": "sebastian/code-unit-reverse-lookup", "name": "sebastian/code-unit-reverse-lookup",
@ -8794,6 +8866,20 @@
], ],
"description": "Symfony Filesystem Component", "description": "Symfony Filesystem Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-03-27T16:56:45+00:00" "time": "2020-03-27T16:56:45+00:00"
}, },
{ {

2
config/firefly.php
View File

@ -138,7 +138,7 @@ return [
], ],
'encryption' => null === env('USE_ENCRYPTION') || true === env('USE_ENCRYPTION'), 'encryption' => null === env('USE_ENCRYPTION') || true === env('USE_ENCRYPTION'),
'version' => '5.2.3', 'version' => '5.2.4',
'api_version' => '1.1.0', 'api_version' => '1.1.0',
'db_version' => 13, 'db_version' => 13,
'maxUploadSize' => 15242880, 'maxUploadSize' => 15242880,

10
resources/lang/el_GR/form.php
View File

@ -194,7 +194,7 @@ return [
'blocked' => 'Έχει αποκλειστεί;', 'blocked' => 'Έχει αποκλειστεί;',
'blocked_code' => 'Αιτία αποκλεισμού', 'blocked_code' => 'Αιτία αποκλεισμού',
'login_name' => 'Είσοδος', 'login_name' => 'Είσοδος',
'is_owner' => 'Is admin?', 'is_owner' => 'Είναι διαχειριστής;',
// import // import
'apply_rules' => 'Εφαρμογή κανόνων', 'apply_rules' => 'Εφαρμογή κανόνων',
@ -266,10 +266,10 @@ return [
'auto_budget_amount' => 'Ποσό αυτόματου προϋπολογισμού', 'auto_budget_amount' => 'Ποσό αυτόματου προϋπολογισμού',
'auto_budget_period' => 'Περίοδος αυτόματου προϋπολογισμού', 'auto_budget_period' => 'Περίοδος αυτόματου προϋπολογισμού',
'collected' => 'Collected', 'collected' => 'Συλλέχθηκε',
'submitted' => 'Submitted', 'submitted' => 'Υποβλήθηκε',
'key' => 'Key', 'key' => 'Κλειδί',
'value' => 'Content of record' 'value' => 'Περιεχόμενο της εγγραφής'
]; ];

6
resources/lang/es_ES/firefly.php
View File

@ -307,7 +307,7 @@ return [
'created_new_rule_group' => 'Nuevo grupo de reglas ":title" guardado!', 'created_new_rule_group' => 'Nuevo grupo de reglas ":title" guardado!',
'updated_rule_group' => 'Grupo de reglas actualizado exitosamente ":title".', 'updated_rule_group' => 'Grupo de reglas actualizado exitosamente ":title".',
'edit_rule_group' => 'Editar grupo de reglas ":title"', 'edit_rule_group' => 'Editar grupo de reglas ":title"',
'duplicate_rule' => 'Duplicate rule ":title"', 'duplicate_rule' => 'Duplicar regla ":title"',
'rule_copy_of' => 'Copia de ":title"', 'rule_copy_of' => 'Copia de ":title"',
'duplicated_rule' => 'Regla ":title" duplicada en ":newTitle"', 'duplicated_rule' => 'Regla ":title" duplicada en ":newTitle"',
'delete_rule_group' => 'Eliminar grupo de reglas ":title"', 'delete_rule_group' => 'Eliminar grupo de reglas ":title"',
@ -526,7 +526,7 @@ return [
'create_rule_from_transaction' => 'Crear regla basada en la transacción', 'create_rule_from_transaction' => 'Crear regla basada en la transacción',
// preferences // preferences
'equal_to_language' => '(equal to language)', 'equal_to_language' => '(igual al idioma)',
'pref_home_screen_accounts' => 'Cuentas de la pantalla de inicio', 'pref_home_screen_accounts' => 'Cuentas de la pantalla de inicio',
'pref_home_screen_accounts_help' => '¿Qué cuentas se deben mostrar en la página de inicio?', 'pref_home_screen_accounts_help' => '¿Qué cuentas se deben mostrar en la página de inicio?',
'pref_view_range' => 'Rango de vision', 'pref_view_range' => 'Rango de vision',
@ -538,7 +538,7 @@ return [
'pref_6M' => 'Seis meses', 'pref_6M' => 'Seis meses',
'pref_1Y' => 'Un año', 'pref_1Y' => 'Un año',
'pref_languages' => 'Idiomas', 'pref_languages' => 'Idiomas',
'pref_locale' => 'Locale settings', 'pref_locale' => 'Configuración del idioma',
'pref_languages_help' => 'Firefly III apoya varios idiomas. cual usted prefiere?', 'pref_languages_help' => 'Firefly III apoya varios idiomas. cual usted prefiere?',
'pref_locale_help' => 'Firefly III allows you to set other local settings, like how currencies, numbers and dates are formatted. Entries in this list may not be supported by your system. Firefly III doesn\'t have the correct date settings for every locale; contact me for improvements.', 'pref_locale_help' => 'Firefly III allows you to set other local settings, like how currencies, numbers and dates are formatted. Entries in this list may not be supported by your system. Firefly III doesn\'t have the correct date settings for every locale; contact me for improvements.',
'pref_custom_fiscal_year' => 'Configuraciónes del año fiscal', 'pref_custom_fiscal_year' => 'Configuraciónes del año fiscal',

1
resources/views/v1/debug.twig
View File

@ -41,7 +41,6 @@ Debug information generated at {{ now }} for Firefly III version **{{ FF_VERSION
| Login provider | {{ loginProvider }} | | Login provider | {{ loginProvider }} |
| Trusted proxies (.env) | {{ trustedProxies }} | | Trusted proxies (.env) | {{ trustedProxies }} |
| User agent | {{ userAgent }} | | User agent | {{ userAgent }} |
| Loaded extensions | {{ extensions }} |
</textarea> </textarea>
<p style="font-family:Arial, Arial, Helvetica, sans-serif;font-size:12pt;width:600px;color:#a00;"> <p style="font-family:Arial, Arial, Helvetica, sans-serif;font-size:12pt;width:600px;color:#a00;">

91
yarn.lock
View File

@ -1580,9 +1580,9 @@ caniuse-api@^3.0.0:
lodash.uniq "^4.5.0" lodash.uniq "^4.5.0"
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001039, caniuse-lite@^1.0.30001043: caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001039, caniuse-lite@^1.0.30001043:
version "1.0.30001045" version "1.0.30001048"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001045.tgz#a770df9de36ad6ca0c34f90eaa797a2dbbb1b619" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001048.tgz#4bb4f1bc2eb304e5e1154da80b93dee3f1cf447e"
integrity sha512-Y8o2Iz1KPcD6FjySbk1sPpvJqchgxk/iow0DABpGyzA1UeQAuxh63Xh0Enj5/BrsYbXtCN32JmR4ZxQTCQ6E6A== integrity sha512-g1iSHKVxornw0K8LG9LLdf+Fxnv7T1Z+mMsf0/YYLclQX4Cd522Ap0Lrw6NFqHgezit78dtyWxzlV2Xfc7vgRg==
chalk@2.4.2, chalk@^2.0.0, chalk@^2.4.1, chalk@^2.4.2: chalk@2.4.2, chalk@^2.0.0, chalk@^2.4.1, chalk@^2.4.2:
version "2.4.2" version "2.4.2"
@ -1703,9 +1703,9 @@ code-point-at@^1.0.0:
integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
collect.js@^4.12.8: collect.js@^4.12.8:
version "4.23.0" version "4.25.0"
resolved "https://registry.yarnpkg.com/collect.js/-/collect.js-4.23.0.tgz#0e55d0721329c969afae182ab7b97bfa0775fa99" resolved "https://registry.yarnpkg.com/collect.js/-/collect.js-4.25.0.tgz#3cc9580935997263ab283488d760f9956c420e8b"
integrity sha512-EjdXlyRdvISTEXBWzpNEtygkfJGyUVkOuNYblBvcgjdbWnAs7xb4f5rE22HKHHBFKLkgeRwhvNPBbyldTut1VQ== integrity sha512-Wk+cWM9iQouzCe2RulakcE6BKweADOHYcz3pVcO2e6jRPfTuZWiLmAjJ2+lI3K9ldFyp77GZVheKjaGnoTAofw==
collection-visit@^1.0.0: collection-visit@^1.0.0:
version "1.0.0" version "1.0.0"
@ -2397,9 +2397,9 @@ ee-first@1.1.1:
integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
electron-to-chromium@^1.3.413: electron-to-chromium@^1.3.413:
version "1.3.414" version "1.3.418"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.414.tgz#9d0a92defefda7cc1cf8895058b892795ddd6b41" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.418.tgz#840021191f466b803a873e154113620c9f53cec6"
integrity sha512-UfxhIvED++qLwWrAq9uYVcqF8FdeV9sU2S7qhiHYFODxzXRrd1GZRl/PjITHsTEejgibcWDraD8TQqoHb1aCBQ== integrity sha512-i2QrQtHes5fK/F9QGG5XacM5WKEuR322fxTYF9e8O9Gu0mc0WmjjwGpV8c7Htso6Zf2Di18lc3SIPxmMeRFBug==
elliptic@^6.0.0: elliptic@^6.0.0:
version "6.5.2" version "6.5.2"
@ -2798,7 +2798,7 @@ find-cache-dir@^2.1.0:
make-dir "^2.0.0" make-dir "^2.0.0"
pkg-dir "^3.0.0" pkg-dir "^3.0.0"
find-cache-dir@^3.2.0: find-cache-dir@^3.3.1:
version "3.3.1" version "3.3.1"
resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz#89b33fad4a4670daa94f855f7fbe31d6d84fe880" resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz#89b33fad4a4670daa94f855f7fbe31d6d84fe880"
integrity sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ== integrity sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==
@ -3778,7 +3778,7 @@ isobject@^3.0.0, isobject@^3.0.1:
resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
jest-worker@^25.1.0: jest-worker@^25.4.0:
version "25.4.0" version "25.4.0"
resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-25.4.0.tgz#ee0e2ceee5a36ecddf5172d6d7e0ab00df157384" resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-25.4.0.tgz#ee0e2ceee5a36ecddf5172d6d7e0ab00df157384"
integrity sha512-ghAs/1FtfYpMmYQ0AHqxV62XPvKdUDIBBApMZfly+E9JEmYh2K45G0R5dWxx986RN12pRCxsViwQVtGl+N4whw== integrity sha512-ghAs/1FtfYpMmYQ0AHqxV62XPvKdUDIBBApMZfly+E9JEmYh2K45G0R5dWxx986RN12pRCxsViwQVtGl+N4whw==
@ -4064,9 +4064,9 @@ make-dir@^2.0.0:
semver "^5.6.0" semver "^5.6.0"
make-dir@^3.0.2: make-dir@^3.0.2:
version "3.0.2" version "3.1.0"
resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.0.2.tgz#04a1acbf22221e1d6ef43559f43e05a90dbb4392" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
integrity sha512-rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w== integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
dependencies: dependencies:
semver "^6.0.0" semver "^6.0.0"
@ -4201,17 +4201,17 @@ miller-rabin@^4.0.0:
bn.js "^4.0.0" bn.js "^4.0.0"
brorand "^1.0.1" brorand "^1.0.1"
mime-db@1.43.0, "mime-db@>= 1.43.0 < 2": mime-db@1.44.0, "mime-db@>= 1.43.0 < 2":
version "1.43.0" version "1.44.0"
resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.43.0.tgz#0a12e0502650e473d735535050e7c8f4eb4fae58" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"
integrity sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ== integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==
mime-types@~2.1.17, mime-types@~2.1.24: mime-types@~2.1.17, mime-types@~2.1.24:
version "2.1.26" version "2.1.27"
resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.26.tgz#9c921fc09b7e149a65dfdc0da4d20997200b0a06" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f"
integrity sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ== integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==
dependencies: dependencies:
mime-db "1.43.0" mime-db "1.44.0"
mime@1.6.0: mime@1.6.0:
version "1.6.0" version "1.6.0"
@ -4749,7 +4749,7 @@ p-limit@^1.1.0:
dependencies: dependencies:
p-try "^1.0.0" p-try "^1.0.0"
p-limit@^2.0.0, p-limit@^2.2.0, p-limit@^2.2.2: p-limit@^2.0.0, p-limit@^2.2.0, p-limit@^2.3.0:
version "2.3.0" version "2.3.0"
resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
@ -5671,9 +5671,9 @@ resolve-url@^0.2.1:
integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
resolve@^1.3.2, resolve@^1.8.1: resolve@^1.3.2, resolve@^1.8.1:
version "1.16.1" version "1.17.0"
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.16.1.tgz#49fac5d8bacf1fd53f200fa51247ae736175832c" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444"
integrity sha512-rmAglCSqWWMrrBv/XM6sW0NuRFiKViw/W4d9EbC4pt+49H8JwHy+mcGmALTEg504AUDcLTvb1T2q3E9AnmY+ig== integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==
dependencies: dependencies:
path-parse "^1.0.6" path-parse "^1.0.6"
@ -5763,7 +5763,7 @@ schema-utils@^1.0.0:
ajv-errors "^1.0.0" ajv-errors "^1.0.0"
ajv-keywords "^3.1.0" ajv-keywords "^3.1.0"
schema-utils@^2.6.4, schema-utils@^2.6.5: schema-utils@^2.6.5, schema-utils@^2.6.6:
version "2.6.6" version "2.6.6"
resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.6.tgz#299fe6bd4a3365dc23d99fd446caff8f1d6c330c" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.6.tgz#299fe6bd4a3365dc23d99fd446caff8f1d6c330c"
integrity sha512-wHutF/WPSbIi9x6ctjGGk2Hvl0VOz5l3EKEuKbjPlB30mKZUzb9A5k9yEXRX3pwyqVLPvpfZZEllaFq/M718hA== integrity sha512-wHutF/WPSbIi9x6ctjGGk2Hvl0VOz5l3EKEuKbjPlB30mKZUzb9A5k9yEXRX3pwyqVLPvpfZZEllaFq/M718hA==
@ -5822,6 +5822,11 @@ serialize-javascript@^2.1.2:
resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61" resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61"
integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ== integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==
serialize-javascript@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-3.0.0.tgz#492e489a2d77b7b804ad391a5f5d97870952548e"
integrity sha512-skZcHYw2vEX4bw90nAr2iTTsz6x2SrHEnfxgKYmZlvJYBEZrvbKtobJWlQ20zczKb3bsHHXXTYt48zBA7ni9cw==
serve-index@^1.9.1: serve-index@^1.9.1:
version "1.9.1" version "1.9.1"
resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239" resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
@ -5984,9 +5989,9 @@ source-map-resolve@^0.5.0:
urix "^0.1.0" urix "^0.1.0"
source-map-support@~0.5.10, source-map-support@~0.5.12: source-map-support@~0.5.10, source-map-support@~0.5.12:
version "0.5.18" version "0.5.19"
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.18.tgz#f5f33489e270bd7f7d7e7b8debf283f3a4066960" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
integrity sha512-9luZr/BZ2QeU6tO2uG8N2aZpVSli4TSAOAqFOyTO51AJcD9P99c0K1h6dD6r6qo5dyT44BR5exweOaLLeldTkQ== integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
dependencies: dependencies:
buffer-from "^1.0.0" buffer-from "^1.0.0"
source-map "^0.6.0" source-map "^0.6.0"
@ -6312,18 +6317,18 @@ terser-webpack-plugin@^1.4.3:
worker-farm "^1.7.0" worker-farm "^1.7.0"
terser-webpack-plugin@^2.2.3: terser-webpack-plugin@^2.2.3:
version "2.3.5" version "2.3.6"
resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.3.5.tgz#5ad971acce5c517440ba873ea4f09687de2f4a81" resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.3.6.tgz#a4014b311a61f87c6a1b217ef4f5a75bd0665a69"
integrity sha512-WlWksUoq+E4+JlJ+h+U+QUzXpcsMSSNXkDy9lBVkSqDn1w23Gg29L/ary9GeJVYCGiNJJX7LnVc4bwL1N3/g1w== integrity sha512-I8IDsQwZrqjdmOicNeE8L/MhwatAap3mUrtcAKJuilsemUNcX+Hier/eAzwStVqhlCxq0aG3ni9bK/0BESXkTg==
dependencies: dependencies:
cacache "^13.0.1" cacache "^13.0.1"
find-cache-dir "^3.2.0" find-cache-dir "^3.3.1"
jest-worker "^25.1.0" jest-worker "^25.4.0"
p-limit "^2.2.2" p-limit "^2.3.0"
schema-utils "^2.6.4" schema-utils "^2.6.6"
serialize-javascript "^2.1.2" serialize-javascript "^3.0.0"
source-map "^0.6.1" source-map "^0.6.1"
terser "^4.4.3" terser "^4.6.12"
webpack-sources "^1.4.3" webpack-sources "^1.4.3"
terser@^3.11.0: terser@^3.11.0:
@ -6335,10 +6340,10 @@ terser@^3.11.0:
source-map "~0.6.1" source-map "~0.6.1"
source-map-support "~0.5.10" source-map-support "~0.5.10"
terser@^4.1.2, terser@^4.4.3: terser@^4.1.2, terser@^4.6.12:
version "4.6.11" version "4.6.12"
resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.11.tgz#12ff99fdd62a26de2a82f508515407eb6ccd8a9f" resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.12.tgz#44b98aef8703fdb09a3491bf79b43faffc5b4fee"
integrity sha512-76Ynm7OXUG5xhOpblhytE7X58oeNSmC8xnNhjWVo8CksHit0U0kO4hfNbPrrYwowLWFgM2n9L176VNx2QaHmtA== integrity sha512-fnIwuaKjFPANG6MAixC/k1TDtnl1YlPLUlLVIxxGZUn1gfUx2+l3/zGNB72wya+lgsb50QBi2tUV75RiODwnww==
dependencies: dependencies:
commander "^2.20.0" commander "^2.20.0"
source-map "~0.6.1" source-map "~0.6.1"