Merge remote-tracking branch 'origin/master' into 2.6.0

This commit is contained in:
Jeremy Benoist 2022-11-03 10:30:17 +01:00
commit 8d3fcd4635
No known key found for this signature in database
GPG key ID: 7168D5DD29F38552
18 changed files with 606 additions and 318 deletions

1
.github/release.yml vendored
View file

@ -4,3 +4,4 @@ changelog:
- Dependencies
authors:
- dependabot
- weblate

View file

@ -1,5 +1,20 @@
# Changelog
## [2.5.2](https://github.com/wallabag/wallabag/tree/2.5.2)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.5.1...2.5.2)
### Fixes
* Add `nbEntries` to the API tags list response by @j0k3r in https://github.com/wallabag/wallabag/pull/5984
* Typofixes by @nexxai in https://github.com/wallabag/wallabag/pull/6004
* Add `domain_name` to entries api endpoint by @yotamN in https://github.com/wallabag/wallabag/pull/6019
* Add support to download SVG locally by @j0k3r in https://github.com/wallabag/wallabag/pull/5992
### Meta
* Automatically create the package after a release by @j0k3r in https://github.com/wallabag/wallabag/pull/5851
* Add .gitattributes, exclude tests from archive by @iamvar in https://github.com/wallabag/wallabag/pull/5910
* Allow auto merging of Dependabot JS minor or patch by @j0k3r in https://github.com/wallabag/wallabag/pull/6003
* Fix random failing tests by @j0k3r in https://github.com/wallabag/wallabag/pull/6013
## [2.5.1](https://github.com/wallabag/wallabag/tree/2.5.1)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.5.0...2.5.1)

View file

@ -2,7 +2,7 @@ settings_changed: 設定を更新しました
download_pictures: サーバー上の画像をダウンロード
diaspora_url: diaspora* URL、サービスが有効になっている場合
export_epub: ePub のエクスポートを有効にする
export_mobi: .mobi のエクスポートを有効にする
export_mobi: .mobi のエクスポートを有効にする(非推奨、近日中に削除されます)
export_pdf: PDF のエクスポートを有効にする
export_csv: CSV のエクスポートを有効にする
export_json: JSON のエクスポートを有効にする

View file

@ -1,5 +1,5 @@
wallabag_core:
version: 2.5.1
version: 2.5.2
paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
languages:
en: 'English'

View file

@ -51,6 +51,7 @@
"ext-tidy": "*",
"ext-tokenizer": "*",
"ext-xml": "*",
"composer": "< 2.3",
"babdev/pagerfanta-bundle": "^2.5",
"bdunogier/guzzle-site-authenticator": "^1.0.0",
"craue/config-bundle": "^2.3.0",
@ -65,6 +66,7 @@
"doctrine/migrations": "^1.8",
"doctrine/orm": "^2.6",
"doctrine/persistence": "^1.3",
"enshrined/svg-sanitize": "^0.15.4",
"friendsofsymfony/jsrouting-bundle": "^2.2",
"friendsofsymfony/oauth-server-bundle": "^1.5",
"friendsofsymfony/rest-bundle": "~2.1",

402
composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "90217dc4c89a9ab455cfa9faf9d597c9",
"content-hash": "afdc6df715094b1ce1ccbaabafbf507f",
"packages": [
{
"name": "babdev/pagerfanta-bundle",
@ -713,26 +713,27 @@
},
{
"name": "doctrine/collections",
"version": "1.6.8",
"version": "1.8.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/collections.git",
"reference": "1958a744696c6bb3bb0d28db2611dc11610e78af"
"reference": "2b44dd4cbca8b5744327de78bafef5945c7e7b5e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/collections/zipball/1958a744696c6bb3bb0d28db2611dc11610e78af",
"reference": "1958a744696c6bb3bb0d28db2611dc11610e78af",
"url": "https://api.github.com/repos/doctrine/collections/zipball/2b44dd4cbca8b5744327de78bafef5945c7e7b5e",
"reference": "2b44dd4cbca8b5744327de78bafef5945c7e7b5e",
"shasum": ""
},
"require": {
"doctrine/deprecations": "^0.5.3 || ^1",
"php": "^7.1.3 || ^8.0"
},
"require-dev": {
"doctrine/coding-standard": "^9.0",
"phpstan/phpstan": "^0.12",
"doctrine/coding-standard": "^9.0 || ^10.0",
"phpstan/phpstan": "^1.4.8",
"phpunit/phpunit": "^7.5 || ^8.5 || ^9.1.5",
"vimeo/psalm": "^4.2.1"
"vimeo/psalm": "^4.22"
},
"type": "library",
"autoload": {
@ -776,9 +777,9 @@
],
"support": {
"issues": "https://github.com/doctrine/collections/issues",
"source": "https://github.com/doctrine/collections/tree/1.6.8"
"source": "https://github.com/doctrine/collections/tree/1.8.0"
},
"time": "2021-08-10T18:51:53+00:00"
"time": "2022-09-01T20:12:10+00:00"
},
{
"name": "doctrine/common",
@ -1308,37 +1309,35 @@
},
{
"name": "doctrine/event-manager",
"version": "1.1.1",
"version": "1.2.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/event-manager.git",
"reference": "41370af6a30faa9dc0368c4a6814d596e81aba7f"
"reference": "95aa4cb529f1e96576f3fda9f5705ada4056a520"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/event-manager/zipball/41370af6a30faa9dc0368c4a6814d596e81aba7f",
"reference": "41370af6a30faa9dc0368c4a6814d596e81aba7f",
"url": "https://api.github.com/repos/doctrine/event-manager/zipball/95aa4cb529f1e96576f3fda9f5705ada4056a520",
"reference": "95aa4cb529f1e96576f3fda9f5705ada4056a520",
"shasum": ""
},
"require": {
"doctrine/deprecations": "^0.5.3 || ^1",
"php": "^7.1 || ^8.0"
},
"conflict": {
"doctrine/common": "<2.9@dev"
"doctrine/common": "<2.9"
},
"require-dev": {
"doctrine/coding-standard": "^6.0",
"phpunit/phpunit": "^7.0"
"doctrine/coding-standard": "^9 || ^10",
"phpstan/phpstan": "~1.4.10 || ^1.8.8",
"phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
"vimeo/psalm": "^4.24"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
}
},
"autoload": {
"psr-4": {
"Doctrine\\Common\\": "lib/Doctrine/Common"
"Doctrine\\Common\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
@ -1382,7 +1381,7 @@
],
"support": {
"issues": "https://github.com/doctrine/event-manager/issues",
"source": "https://github.com/doctrine/event-manager/tree/1.1.x"
"source": "https://github.com/doctrine/event-manager/tree/1.2.0"
},
"funding": [
{
@ -1398,7 +1397,7 @@
"type": "tidelift"
}
],
"time": "2020-05-29T18:28:51+00:00"
"time": "2022-10-12T20:51:15+00:00"
},
{
"name": "doctrine/inflector",
@ -2060,6 +2059,51 @@
],
"time": "2022-06-18T20:57:19+00:00"
},
{
"name": "enshrined/svg-sanitize",
"version": "0.15.4",
"source": {
"type": "git",
"url": "https://github.com/darylldoyle/svg-sanitizer.git",
"reference": "e50b83a2f1f296ca61394fe88fbfe3e896a84cf4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/darylldoyle/svg-sanitizer/zipball/e50b83a2f1f296ca61394fe88fbfe3e896a84cf4",
"reference": "e50b83a2f1f296ca61394fe88fbfe3e896a84cf4",
"shasum": ""
},
"require": {
"ext-dom": "*",
"ext-libxml": "*",
"php": "^7.0 || ^8.0"
},
"require-dev": {
"phpunit/phpunit": "^6.5 || ^8.5"
},
"type": "library",
"autoload": {
"psr-4": {
"enshrined\\svgSanitize\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-2.0-or-later"
],
"authors": [
{
"name": "Daryll Doyle",
"email": "daryll@enshrined.co.uk"
}
],
"description": "An SVG sanitizer for PHP",
"support": {
"issues": "https://github.com/darylldoyle/svg-sanitizer/issues",
"source": "https://github.com/darylldoyle/svg-sanitizer/tree/0.15.4"
},
"time": "2022-02-21T09:13:59+00:00"
},
{
"name": "fig/link-util",
"version": "1.1.2",
@ -2936,16 +2980,16 @@
},
{
"name": "guzzlehttp/promises",
"version": "1.5.1",
"version": "1.5.2",
"source": {
"type": "git",
"url": "https://github.com/guzzle/promises.git",
"reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da"
"reference": "b94b2807d85443f9719887892882d0329d1e2598"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/promises/zipball/fe752aedc9fd8fcca3fe7ad05d419d32998a06da",
"reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da",
"url": "https://api.github.com/repos/guzzle/promises/zipball/b94b2807d85443f9719887892882d0329d1e2598",
"reference": "b94b2807d85443f9719887892882d0329d1e2598",
"shasum": ""
},
"require": {
@ -3000,7 +3044,7 @@
],
"support": {
"issues": "https://github.com/guzzle/promises/issues",
"source": "https://github.com/guzzle/promises/tree/1.5.1"
"source": "https://github.com/guzzle/promises/tree/1.5.2"
},
"funding": [
{
@ -3016,7 +3060,7 @@
"type": "tidelift"
}
],
"time": "2021-10-22T20:56:57+00:00"
"time": "2022-08-28T14:55:35+00:00"
},
{
"name": "guzzlehttp/psr7",
@ -4447,16 +4491,16 @@
},
{
"name": "j0k3r/graby-site-config",
"version": "1.0.154",
"version": "1.0.159",
"source": {
"type": "git",
"url": "https://github.com/j0k3r/graby-site-config.git",
"reference": "b6aa77e4da5a90be8ee1426b64f48baeea62247e"
"reference": "e5bfb9d608f0ce6390d6791ede196c769216ee84"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/j0k3r/graby-site-config/zipball/b6aa77e4da5a90be8ee1426b64f48baeea62247e",
"reference": "b6aa77e4da5a90be8ee1426b64f48baeea62247e",
"url": "https://api.github.com/repos/j0k3r/graby-site-config/zipball/e5bfb9d608f0ce6390d6791ede196c769216ee84",
"reference": "e5bfb9d608f0ce6390d6791ede196c769216ee84",
"shasum": ""
},
"require": {
@ -4485,9 +4529,9 @@
"description": "Graby site config files",
"support": {
"issues": "https://github.com/j0k3r/graby-site-config/issues",
"source": "https://github.com/j0k3r/graby-site-config/tree/1.0.154"
"source": "https://github.com/j0k3r/graby-site-config/tree/1.0.159"
},
"time": "2022-07-01T02:50:45+00:00"
"time": "2022-11-01T02:53:54+00:00"
},
{
"name": "j0k3r/httplug-ssrf-plugin",
@ -4815,16 +4859,16 @@
},
{
"name": "jms/metadata",
"version": "2.6.1",
"version": "2.7.0",
"source": {
"type": "git",
"url": "https://github.com/schmittjoh/metadata.git",
"reference": "c3a3214354b5a765a19875f7b7c5ebcd94e462e5"
"reference": "283c714831d272d78ddd6e52e08ac16d76be30fd"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/schmittjoh/metadata/zipball/c3a3214354b5a765a19875f7b7c5ebcd94e462e5",
"reference": "c3a3214354b5a765a19875f7b7c5ebcd94e462e5",
"url": "https://api.github.com/repos/schmittjoh/metadata/zipball/283c714831d272d78ddd6e52e08ac16d76be30fd",
"reference": "283c714831d272d78ddd6e52e08ac16d76be30fd",
"shasum": ""
},
"require": {
@ -4873,22 +4917,22 @@
],
"support": {
"issues": "https://github.com/schmittjoh/metadata/issues",
"source": "https://github.com/schmittjoh/metadata/tree/2.6.1"
"source": "https://github.com/schmittjoh/metadata/tree/2.7.0"
},
"time": "2021-11-22T12:27:42+00:00"
"time": "2022-09-13T19:18:27+00:00"
},
{
"name": "jms/serializer",
"version": "3.17.1",
"version": "3.18.2",
"source": {
"type": "git",
"url": "https://github.com/schmittjoh/serializer.git",
"reference": "190f64b051795d447ec755acbfdb1bff330a6707"
"reference": "329e29c323fb1e5c65b4ae4c77ba747678755a6c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/schmittjoh/serializer/zipball/190f64b051795d447ec755acbfdb1bff330a6707",
"reference": "190f64b051795d447ec755acbfdb1bff330a6707",
"url": "https://api.github.com/repos/schmittjoh/serializer/zipball/329e29c323fb1e5c65b4ae4c77ba747678755a6c",
"reference": "329e29c323fb1e5c65b4ae4c77ba747678755a6c",
"shasum": ""
},
"require": {
@ -4916,6 +4960,7 @@
"symfony/filesystem": "^3.0|^4.0|^5.0|^6.0",
"symfony/form": "^3.0|^4.0|^5.0|^6.0",
"symfony/translation": "^3.0|^4.0|^5.0|^6.0",
"symfony/uid": "^5.1|^6.0",
"symfony/validator": "^3.1.9|^4.0|^5.0|^6.0",
"symfony/yaml": "^3.3|^4.0|^5.0|^6.0",
"twig/twig": "~1.34|~2.4|^3.0"
@ -4923,6 +4968,7 @@
"suggest": {
"doctrine/collections": "Required if you like to use doctrine collection types as ArrayCollection.",
"symfony/cache": "Required if you like to use cache functionality.",
"symfony/uid": "Required if you'd like to serialize UID objects.",
"symfony/yaml": "Required if you'd like to use the YAML metadata format."
},
"type": "library",
@ -4961,7 +5007,7 @@
],
"support": {
"issues": "https://github.com/schmittjoh/serializer/issues",
"source": "https://github.com/schmittjoh/serializer/tree/3.17.1"
"source": "https://github.com/schmittjoh/serializer/tree/3.18.2"
},
"funding": [
{
@ -4969,7 +5015,7 @@
"type": "github"
}
],
"time": "2021-12-28T20:59:55+00:00"
"time": "2022-09-12T08:40:16+00:00"
},
{
"name": "jms/serializer-bundle",
@ -5323,25 +5369,24 @@
},
{
"name": "laminas/laminas-diactoros",
"version": "2.13.0",
"version": "2.17.0",
"source": {
"type": "git",
"url": "https://github.com/laminas/laminas-diactoros.git",
"reference": "34ba65010be9aa74e159d168c5ecfa5c01e4d956"
"reference": "5b32597aa46b83c8b85bb1cf9a6ed4fe7dd980c5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/34ba65010be9aa74e159d168c5ecfa5c01e4d956",
"reference": "34ba65010be9aa74e159d168c5ecfa5c01e4d956",
"url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/5b32597aa46b83c8b85bb1cf9a6ed4fe7dd980c5",
"reference": "5b32597aa46b83c8b85bb1cf9a6ed4fe7dd980c5",
"shasum": ""
},
"require": {
"php": "^7.3 || ~8.0.0 || ~8.1.0",
"php": "^7.4 || ~8.0.0 || ~8.1.0",
"psr/http-factory": "^1.0",
"psr/http-message": "^1.0"
},
"conflict": {
"phpspec/prophecy": "<1.9.0",
"zendframework/zend-diactoros": "*"
},
"provide": {
@ -5354,10 +5399,9 @@
"ext-gd": "*",
"ext-libxml": "*",
"http-interop/http-factory-tests": "^0.9.0",
"laminas/laminas-coding-standard": "~2.3.0",
"laminas/laminas-coding-standard": "^2.4.0",
"php-http/psr7-integration-tests": "^1.1.1",
"phpspec/prophecy-phpunit": "^2.0",
"phpunit/phpunit": "^9.5",
"phpunit/phpunit": "^9.5.23",
"psalm/plugin-phpunit": "^0.17.0",
"vimeo/psalm": "^4.24.0"
},
@ -5418,7 +5462,7 @@
"type": "community_bridge"
}
],
"time": "2022-07-07T12:31:03+00:00"
"time": "2022-08-30T17:01:46+00:00"
},
{
"name": "laminas/laminas-eventmanager",
@ -5489,16 +5533,16 @@
},
{
"name": "laminas/laminas-zendframework-bridge",
"version": "1.6.0",
"version": "1.6.1",
"source": {
"type": "git",
"url": "https://github.com/laminas/laminas-zendframework-bridge.git",
"reference": "d74d2da21beae5aceff1e8c07b901066b0e1b719"
"reference": "e112dd2c099f4f6142c16fc65fda89a638e06885"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/d74d2da21beae5aceff1e8c07b901066b0e1b719",
"reference": "d74d2da21beae5aceff1e8c07b901066b0e1b719",
"url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/e112dd2c099f4f6142c16fc65fda89a638e06885",
"reference": "e112dd2c099f4f6142c16fc65fda89a638e06885",
"shasum": ""
},
"require": {
@ -5547,7 +5591,7 @@
"type": "community_bridge"
}
],
"time": "2022-07-14T16:30:30+00:00"
"time": "2022-07-29T13:28:29+00:00"
},
{
"name": "lcobucci/jwt",
@ -5763,16 +5807,16 @@
},
{
"name": "masterminds/html5",
"version": "2.7.5",
"version": "2.7.6",
"source": {
"type": "git",
"url": "https://github.com/Masterminds/html5-php.git",
"reference": "f640ac1bdddff06ea333a920c95bbad8872429ab"
"reference": "897eb517a343a2281f11bc5556d6548db7d93947"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Masterminds/html5-php/zipball/f640ac1bdddff06ea333a920c95bbad8872429ab",
"reference": "f640ac1bdddff06ea333a920c95bbad8872429ab",
"url": "https://api.github.com/repos/Masterminds/html5-php/zipball/897eb517a343a2281f11bc5556d6548db7d93947",
"reference": "897eb517a343a2281f11bc5556d6548db7d93947",
"shasum": ""
},
"require": {
@ -5826,9 +5870,9 @@
],
"support": {
"issues": "https://github.com/Masterminds/html5-php/issues",
"source": "https://github.com/Masterminds/html5-php/tree/2.7.5"
"source": "https://github.com/Masterminds/html5-php/tree/2.7.6"
},
"time": "2021-07-01T14:25:37+00:00"
"time": "2022-08-18T16:18:26+00:00"
},
{
"name": "mgargano/simplehtmldom",
@ -7353,16 +7397,16 @@
},
{
"name": "phpseclib/phpseclib",
"version": "3.0.14",
"version": "3.0.17",
"source": {
"type": "git",
"url": "https://github.com/phpseclib/phpseclib.git",
"reference": "2f0b7af658cbea265cbb4a791d6c29a6613f98ef"
"reference": "dbc2307d5c69aeb22db136c52e91130d7f2ca761"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/2f0b7af658cbea265cbb4a791d6c29a6613f98ef",
"reference": "2f0b7af658cbea265cbb4a791d6c29a6613f98ef",
"url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/dbc2307d5c69aeb22db136c52e91130d7f2ca761",
"reference": "dbc2307d5c69aeb22db136c52e91130d7f2ca761",
"shasum": ""
},
"require": {
@ -7374,6 +7418,7 @@
"phpunit/phpunit": "*"
},
"suggest": {
"ext-dom": "Install the DOM extension to load XML formatted public keys.",
"ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations.",
"ext-libsodium": "SSH2/SFTP can make use of some algorithms provided by the libsodium-php extension.",
"ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.",
@ -7442,7 +7487,7 @@
],
"support": {
"issues": "https://github.com/phpseclib/phpseclib/issues",
"source": "https://github.com/phpseclib/phpseclib/tree/3.0.14"
"source": "https://github.com/phpseclib/phpseclib/tree/3.0.17"
},
"funding": [
{
@ -7458,20 +7503,20 @@
"type": "tidelift"
}
],
"time": "2022-04-04T05:15:45+00:00"
"time": "2022-10-24T10:51:50+00:00"
},
{
"name": "phpstan/phpdoc-parser",
"version": "1.6.4",
"version": "1.13.0",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpdoc-parser.git",
"reference": "135607f9ccc297d6923d49c2bcf309f509413215"
"reference": "33aefcdab42900e36366d0feab6206e2dd68f947"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/135607f9ccc297d6923d49c2bcf309f509413215",
"reference": "135607f9ccc297d6923d49c2bcf309f509413215",
"url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/33aefcdab42900e36366d0feab6206e2dd68f947",
"reference": "33aefcdab42900e36366d0feab6206e2dd68f947",
"shasum": ""
},
"require": {
@ -7501,9 +7546,9 @@
"description": "PHPDoc parser with support for nullable, intersection and generic types",
"support": {
"issues": "https://github.com/phpstan/phpdoc-parser/issues",
"source": "https://github.com/phpstan/phpdoc-parser/tree/1.6.4"
"source": "https://github.com/phpstan/phpdoc-parser/tree/1.13.0"
},
"time": "2022-06-26T13:09:08+00:00"
"time": "2022-10-21T09:57:39+00:00"
},
{
"name": "phpzip/phpzip",
@ -8709,16 +8754,16 @@
},
{
"name": "simplepie/simplepie",
"version": "1.6.0",
"version": "1.7.0",
"source": {
"type": "git",
"url": "https://github.com/simplepie/simplepie.git",
"reference": "2bdbc51ed1010941c9c5f2cddca433e79665bfe1"
"reference": "9e9add3428ce86aede874bcf9a59c78e272f8dc1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/simplepie/simplepie/zipball/2bdbc51ed1010941c9c5f2cddca433e79665bfe1",
"reference": "2bdbc51ed1010941c9c5f2cddca433e79665bfe1",
"url": "https://api.github.com/repos/simplepie/simplepie/zipball/9e9add3428ce86aede874bcf9a59c78e272f8dc1",
"reference": "9e9add3428ce86aede874bcf9a59c78e272f8dc1",
"shasum": ""
},
"require": {
@ -8728,6 +8773,7 @@
"php": ">=5.6.0"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^2.19 || ^3.8",
"yoast/phpunit-polyfills": "^1.0.1"
},
"suggest": {
@ -8777,9 +8823,9 @@
],
"support": {
"issues": "https://github.com/simplepie/simplepie/issues",
"source": "https://github.com/simplepie/simplepie/tree/1.6.0"
"source": "https://github.com/simplepie/simplepie/tree/1.7.0"
},
"time": "2022-04-21T11:05:19+00:00"
"time": "2022-09-30T06:49:48+00:00"
},
{
"name": "smalot/pdfparser",
@ -9120,16 +9166,16 @@
},
{
"name": "symfony/http-client",
"version": "v5.4.9",
"version": "v5.4.15",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-client.git",
"reference": "dc0b15e42b762c040761c1eb9ce86a55d47cf672"
"reference": "8f29b0f06c9ff48c8431e78eb90c8bd6f82cb12b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-client/zipball/dc0b15e42b762c040761c1eb9ce86a55d47cf672",
"reference": "dc0b15e42b762c040761c1eb9ce86a55d47cf672",
"url": "https://api.github.com/repos/symfony/http-client/zipball/8f29b0f06c9ff48c8431e78eb90c8bd6f82cb12b",
"reference": "8f29b0f06c9ff48c8431e78eb90c8bd6f82cb12b",
"shasum": ""
},
"require": {
@ -9187,7 +9233,7 @@
"description": "Provides powerful methods to fetch HTTP resources synchronously or asynchronously",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/http-client/tree/v5.4.9"
"source": "https://github.com/symfony/http-client/tree/v5.4.15"
},
"funding": [
{
@ -9203,7 +9249,7 @@
"type": "tidelift"
}
],
"time": "2022-05-21T08:57:05+00:00"
"time": "2022-10-25T16:22:13+00:00"
},
{
"name": "symfony/http-client-contracts",
@ -9283,89 +9329,6 @@
],
"time": "2022-04-12T15:48:08+00:00"
},
{
"name": "symfony/mime",
"version": "v5.4.10",
"source": {
"type": "git",
"url": "https://github.com/symfony/mime.git",
"reference": "02265e1e5111c3cd7480387af25e82378b7ab9cc"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/mime/zipball/02265e1e5111c3cd7480387af25e82378b7ab9cc",
"reference": "02265e1e5111c3cd7480387af25e82378b7ab9cc",
"shasum": ""
},
"require": {
"php": ">=7.2.5",
"symfony/deprecation-contracts": "^2.1|^3",
"symfony/polyfill-intl-idn": "^1.10",
"symfony/polyfill-mbstring": "^1.0",
"symfony/polyfill-php80": "^1.16"
},
"conflict": {
"egulias/email-validator": "~3.0.0",
"phpdocumentor/reflection-docblock": "<3.2.2",
"phpdocumentor/type-resolver": "<1.4.0",
"symfony/mailer": "<4.4"
},
"require-dev": {
"egulias/email-validator": "^2.1.10|^3.1",
"phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
"symfony/dependency-injection": "^4.4|^5.0|^6.0",
"symfony/property-access": "^4.4|^5.1|^6.0",
"symfony/property-info": "^4.4|^5.1|^6.0",
"symfony/serializer": "^5.2|^6.0"
},
"type": "library",
"autoload": {
"psr-4": {
"Symfony\\Component\\Mime\\": ""
},
"exclude-from-classmap": [
"/Tests/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Allows manipulating MIME messages",
"homepage": "https://symfony.com",
"keywords": [
"mime",
"mime-type"
],
"support": {
"source": "https://github.com/symfony/mime/tree/v5.4.10"
},
"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": "2022-06-09T12:22:40+00:00"
},
{
"name": "symfony/monolog-bundle",
"version": "v3.6.0",
@ -10813,16 +10776,16 @@
},
{
"name": "tecnickcom/tcpdf",
"version": "6.4.4",
"version": "6.5.0",
"source": {
"type": "git",
"url": "https://github.com/tecnickcom/TCPDF.git",
"reference": "42cd0f9786af7e5db4fcedaa66f717b0d0032320"
"reference": "cc54c1503685e618b23922f53635f46e87653662"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/42cd0f9786af7e5db4fcedaa66f717b0d0032320",
"reference": "42cd0f9786af7e5db4fcedaa66f717b0d0032320",
"url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/cc54c1503685e618b23922f53635f46e87653662",
"reference": "cc54c1503685e618b23922f53635f46e87653662",
"shasum": ""
},
"require": {
@ -10873,7 +10836,7 @@
],
"support": {
"issues": "https://github.com/tecnickcom/TCPDF/issues",
"source": "https://github.com/tecnickcom/TCPDF/tree/6.4.4"
"source": "https://github.com/tecnickcom/TCPDF/tree/6.5.0"
},
"funding": [
{
@ -10881,7 +10844,7 @@
"type": "custom"
}
],
"time": "2021-12-31T08:39:24+00:00"
"time": "2022-08-12T07:50:54+00:00"
},
{
"name": "thecodingmachine/safe",
@ -11070,6 +11033,7 @@
"issues": "https://github.com/true/php-punycode/issues",
"source": "https://github.com/true/php-punycode/tree/master"
},
"abandoned": true,
"time": "2016-11-16T10:37:54+00:00"
},
{
@ -11134,16 +11098,16 @@
},
{
"name": "twig/twig",
"version": "v2.15.1",
"version": "v2.15.3",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
"reference": "3b7cedb2f736899a7dbd0ba3d6da335a015f5cc4"
"reference": "ab402673db8746cb3a4c46f3869d6253699f614a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/3b7cedb2f736899a7dbd0ba3d6da335a015f5cc4",
"reference": "3b7cedb2f736899a7dbd0ba3d6da335a015f5cc4",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/ab402673db8746cb3a4c46f3869d6253699f614a",
"reference": "ab402673db8746cb3a4c46f3869d6253699f614a",
"shasum": ""
},
"require": {
@ -11198,7 +11162,7 @@
],
"support": {
"issues": "https://github.com/twigphp/Twig/issues",
"source": "https://github.com/twigphp/Twig/tree/v2.15.1"
"source": "https://github.com/twigphp/Twig/tree/v2.15.3"
},
"funding": [
{
@ -11210,7 +11174,7 @@
"type": "tidelift"
}
],
"time": "2022-05-17T05:46:24+00:00"
"time": "2022-09-28T08:40:08+00:00"
},
{
"name": "wallabag/php-mobi",
@ -11464,20 +11428,20 @@
},
{
"name": "willdurand/hateoas-bundle",
"version": "2.4.0",
"version": "2.5.0",
"source": {
"type": "git",
"url": "https://github.com/willdurand/BazingaHateoasBundle.git",
"reference": "e1faa8f86dfea873fe1683acbbfac1f756ca70ef"
"reference": "f9f09f02c464469ff4deb5dfe6619c4c1409ef44"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/willdurand/BazingaHateoasBundle/zipball/e1faa8f86dfea873fe1683acbbfac1f756ca70ef",
"reference": "e1faa8f86dfea873fe1683acbbfac1f756ca70ef",
"url": "https://api.github.com/repos/willdurand/BazingaHateoasBundle/zipball/f9f09f02c464469ff4deb5dfe6619c4c1409ef44",
"reference": "f9f09f02c464469ff4deb5dfe6619c4c1409ef44",
"shasum": ""
},
"require": {
"jms/serializer-bundle": "^3.1 || ^4.0",
"jms/serializer-bundle": "^3.1 || ^4.0 || ^5.0@beta",
"php": "^7.2 || ^8.0",
"symfony/expression-language": "~3.0 || ~4.0 || ~5.0 || ~6.0",
"symfony/framework-bundle": "~3.0 || ~4.0 || ~5.0 || ~6.0",
@ -11518,9 +11482,9 @@
],
"support": {
"issues": "https://github.com/willdurand/BazingaHateoasBundle/issues",
"source": "https://github.com/willdurand/BazingaHateoasBundle/tree/2.4.0"
"source": "https://github.com/willdurand/BazingaHateoasBundle/tree/2.5.0"
},
"time": "2021-11-06T22:20:09+00:00"
"time": "2022-09-14T09:43:38+00:00"
},
{
"name": "willdurand/jsonp-callback-validator",
@ -12279,16 +12243,16 @@
},
{
"name": "nikic/php-parser",
"version": "v4.14.0",
"version": "v4.15.1",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
"reference": "34bea19b6e03d8153165d8f30bba4c3be86184c1"
"reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/34bea19b6e03d8153165d8f30bba4c3be86184c1",
"reference": "34bea19b6e03d8153165d8f30bba4c3be86184c1",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/0ef6c55a3f47f89d7a374e6f835197a0b5fcf900",
"reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900",
"shasum": ""
},
"require": {
@ -12329,9 +12293,9 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
"source": "https://github.com/nikic/PHP-Parser/tree/v4.14.0"
"source": "https://github.com/nikic/PHP-Parser/tree/v4.15.1"
},
"time": "2022-05-31T20:59:12+00:00"
"time": "2022-09-04T07:30:47+00:00"
},
{
"name": "php-cs-fixer/diff",
@ -12386,6 +12350,7 @@
"issues": "https://github.com/PHP-CS-Fixer/diff/issues",
"source": "https://github.com/PHP-CS-Fixer/diff/tree/v1.3.1"
},
"abandoned": true,
"time": "2020-10-14T08:39:05+00:00"
},
{
@ -12503,16 +12468,16 @@
},
{
"name": "phpstan/phpstan",
"version": "0.12.99",
"version": "0.12.100",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
"reference": "b4d40f1d759942f523be267a1bab6884f46ca3f7"
"reference": "48236ddf823547081b2b153d1cd2994b784328c3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/b4d40f1d759942f523be267a1bab6884f46ca3f7",
"reference": "b4d40f1d759942f523be267a1bab6884f46ca3f7",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/48236ddf823547081b2b153d1cd2994b784328c3",
"reference": "48236ddf823547081b2b153d1cd2994b784328c3",
"shasum": ""
},
"require": {
@ -12543,7 +12508,7 @@
"description": "PHPStan - PHP Static Analysis Tool",
"support": {
"issues": "https://github.com/phpstan/phpstan/issues",
"source": "https://github.com/phpstan/phpstan/tree/0.12.99"
"source": "https://github.com/phpstan/phpstan/tree/0.12.100"
},
"funding": [
{
@ -12554,16 +12519,12 @@
"url": "https://github.com/phpstan",
"type": "github"
},
{
"url": "https://www.patreon.com/phpstan",
"type": "patreon"
},
{
"url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan",
"type": "tidelift"
}
],
"time": "2021-09-12T20:09:55+00:00"
"time": "2022-11-01T09:52:08+00:00"
},
{
"name": "phpstan/phpstan-doctrine",
@ -12846,16 +12807,16 @@
},
{
"name": "symfony/phpunit-bridge",
"version": "v6.1.2",
"version": "v6.1.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/phpunit-bridge.git",
"reference": "899fdec151add3dc339cf394a15100a1acc177ad"
"reference": "07cf788ac9ae83b59d46599bb5098c3add88c68b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/899fdec151add3dc339cf394a15100a1acc177ad",
"reference": "899fdec151add3dc339cf394a15100a1acc177ad",
"url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/07cf788ac9ae83b59d46599bb5098c3add88c68b",
"reference": "07cf788ac9ae83b59d46599bb5098c3add88c68b",
"shasum": ""
},
"require": {
@ -12909,7 +12870,7 @@
"description": "Provides utilities for PHPUnit, especially user deprecation notices management",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/phpunit-bridge/tree/v6.1.2"
"source": "https://github.com/symfony/phpunit-bridge/tree/v6.1.6"
},
"funding": [
{
@ -12925,7 +12886,7 @@
"type": "tidelift"
}
],
"time": "2022-06-20T12:01:07+00:00"
"time": "2022-10-07T08:04:03+00:00"
}
],
"aliases": [],
@ -12951,11 +12912,12 @@
"ext-simplexml": "*",
"ext-tidy": "*",
"ext-tokenizer": "*",
"ext-xml": "*"
"ext-xml": "*",
"composer": "< 2.3"
},
"platform-dev": [],
"platform-overrides": {
"php": "7.4.29"
},
"plugin-api-version": "2.3.0"
"plugin-api-version": "2.2.0"
}

View file

@ -36,13 +36,13 @@
"url": "https://github.com/wallabag/wallabag/issues"
},
"devDependencies": {
"@babel/core": "^7.19.3",
"@babel/core": "^7.19.6",
"@babel/eslint-parser": "^7.19.1",
"@babel/preset-env": "^7.19.4",
"autoprefixer": "^10.4.12",
"babel-loader": "^8.2.5",
"autoprefixer": "^10.4.13",
"babel-loader": "^9.0.0",
"css-loader": "^6.7.1",
"eslint": "^8.25.0",
"eslint": "^8.26.0",
"eslint-config-airbnb-base": "^15.0.0",
"eslint-plugin-import": "^2.26.0",
"eslint-webpack-plugin": "^3.2.0",
@ -57,7 +57,7 @@
"sass-loader": "^13.1.0",
"style-loader": "^3.3.1",
"stylelint": "^14.14.0",
"stylelint-config-standard": "^28.0.0",
"stylelint-config-standard": "^29.0.0",
"stylelint-scss": "^4.3.0",
"stylelint-webpack-plugin": "^3.3.0",
"terser-webpack-plugin": "^5.3.6",

View file

@ -2,6 +2,7 @@
namespace Wallabag\CoreBundle\Helper;
use enshrined\svgSanitize\Sanitizer;
use GuzzleHttp\Psr7\Uri;
use GuzzleHttp\Psr7\UriResolver;
use Http\Client\Common\HttpMethodsClient;
@ -146,6 +147,32 @@ class DownloadImages
$hashImage = hash('crc32', $absolutePath);
$localPath = $folderPath . '/' . $hashImage . '.' . $ext;
$urlPath = $this->wallabagUrl . '/assets/images/' . $relativePath . '/' . $hashImage . '.' . $ext;
// custom case for SVG (because GD doesn't support SVG)
if ('svg' === $ext) {
try {
$sanitizer = new Sanitizer();
$sanitizer->minify(true);
$sanitizer->removeRemoteReferences(true);
$cleanSVG = $sanitizer->sanitize((string) $res->getBody());
// add an extra validation by checking about `<svg `
if (false === $cleanSVG || false === strpos($cleanSVG, '<svg ')) {
$this->logger->error('DownloadImages: Bad SVG given', ['path' => $imagePath]);
return false;
}
file_put_contents($localPath, $cleanSVG);
return $urlPath;
} catch (\Exception $e) {
$this->logger->error('DownloadImages: Error while sanitize SVG', ['path' => $imagePath, 'message' => $e->getMessage()]);
return false;
}
}
try {
$im = imagecreatefromstring((string) $res->getBody());
@ -196,7 +223,7 @@ class DownloadImages
imagedestroy($im);
return $this->wallabagUrl . '/assets/images/' . $relativePath . '/' . $hashImage . '.' . $ext;
return $urlPath;
}
/**
@ -351,7 +378,7 @@ class DownloadImages
$this->logger->debug('DownloadImages: Checking extension (alternative)', ['ext' => $ext]);
}
if (!\in_array($ext, ['jpeg', 'jpg', 'gif', 'png', 'webp'], true)) {
if (!\in_array($ext, ['jpeg', 'jpg', 'gif', 'png', 'webp', 'svg'], true)) {
$this->logger->error('DownloadImages: Processed image with not allowed extension. Skipping: ' . $imagePath);
return false;

View file

@ -0,0 +1 @@
{}

View file

@ -37,6 +37,7 @@ menu:
theme_toggle_auto: テーマを自動切換
theme_toggle_dark: ダークテーマ
theme_toggle_light: ライトテーマ
with_annotations: 注釈付きのアイテム
top:
add_new_entry: 新しい記事を追加
search: 検索

View file

@ -0,0 +1 @@
{}

View file

@ -0,0 +1,10 @@
auth_code:
on: activat
mailer:
subject: codi d'autenticació wallabag
body:
hello: Hola %user%,
second_para: 'Aquí tens el codi:'
support: 'No dubtis a posar-te en contacte amb nosaltres si tens algun problema:'
first_para: Com que necessites una autenticació de dos factors per iniciar la sessió al teu compte de wallabag i un dispositiu nou l'acaba d'utilitzar, t'enviem un codi per validar la teva connexió.
signature: L'equip de wallabag

View file

@ -220,4 +220,32 @@ class DownloadImagesTest extends TestCase
$this->assertSame('<img src="http://wallabag.io/assets/images/9/b/9b0ead26/6bef06fe.png" srcset="http://wallabag.io/assets/images/9/b/9b0ead26/43cc0123.png 1290w" height="573" width="860" alt="" referrerpolicy="no-referrer">', $res);
}
public function testProcessSingleImageWithSvg()
{
$httpMockClient = new HttpMockClient();
$httpMockClient->addResponse(new Response(200, ['content-type' => 'image/svg+xml'], file_get_contents(__DIR__ . '/../fixtures/modal-content.svg')));
$logHandler = new TestHandler();
$logger = new Logger('test', [$logHandler]);
$download = new DownloadImages($httpMockClient, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
$res = $download->processSingleImage(123, 'modal-content.svg', 'http://imgur.com/gallery/WxtWY');
$this->assertStringContainsString('/assets/images/9/b/9b0ead26/400e29f9.svg', $res);
}
public function testProcessSingleImageWithBadSvg()
{
$httpMockClient = new HttpMockClient();
$httpMockClient->addResponse(new Response(200, ['content-type' => 'image/svg+xml'], file_get_contents(__DIR__ . '/../fixtures/unnamed.png')));
$logHandler = new TestHandler();
$logger = new Logger('test', [$logHandler]);
$download = new DownloadImages($httpMockClient, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
$res = $download->processSingleImage(123, 'modal-content.svg', 'http://imgur.com/gallery/WxtWY');
$this->assertFalse($res);
}
}

View file

@ -0,0 +1,237 @@
<svg width="120" height="125" viewBox="0 0 120 125" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0)">
<g filter="url(#filter0_d)">
<path d="M82.7311 12.7383H26.7744C23.5022 12.7383 20.8496 15.4119 20.8496 18.7099V105.63C20.8496 108.928 23.5022 111.601 26.7744 111.601H82.7311C86.0033 111.601 88.6559 108.928 88.6559 105.63V18.7099C88.6559 15.4119 86.0033 12.7383 82.7311 12.7383Z" fill="black"/>
</g>
<path d="M82.7311 12.7383H26.7744C23.5022 12.7383 20.8496 15.4119 20.8496 18.7099V105.63C20.8496 108.928 23.5022 111.601 26.7744 111.601H82.7311C86.0033 111.601 88.6559 108.928 88.6559 105.63V18.7099C88.6559 15.4119 86.0033 12.7383 82.7311 12.7383Z" fill="white"/>
<path d="M80.8066 28.9941H26.9237C25.8329 28.9941 24.9487 29.8853 24.9487 30.9847V64.492C24.9487 65.5913 25.8329 66.4825 26.9237 66.4825H80.8066C81.8974 66.4825 82.7816 65.5913 82.7816 64.492V30.9847C82.7816 29.8853 81.8974 28.9941 80.8066 28.9941Z" fill="#ECF1F5" fill-opacity="0.49"/>
<path d="M80.9927 69.3936H27.1097C26.019 69.3936 25.1348 70.2847 25.1348 71.3841V86.479C25.1348 87.5783 26.019 88.4695 27.1097 88.4695H80.9927C82.0834 88.4695 82.9676 87.5783 82.9676 86.479V71.3841C82.9676 70.2847 82.0834 69.3936 80.9927 69.3936Z" fill="#ECF1F5" fill-opacity="0.49"/>
<path d="M80.9927 91.3809H27.1097C26.019 91.3809 25.1348 92.2721 25.1348 93.3714V95.0302C25.1348 96.1295 26.019 97.0207 27.1097 97.0207H80.9927C82.0834 97.0207 82.9676 96.1295 82.9676 95.0302V93.3714C82.9676 92.2721 82.0834 91.3809 80.9927 91.3809Z" fill="#ECF1F5" fill-opacity="0.49"/>
<path d="M75.6812 99.9316H27.6995C26.6088 99.9316 25.7246 100.823 25.7246 101.922V103.581C25.7246 104.68 26.6088 105.571 27.6995 105.571H75.6812C76.7719 105.571 77.6561 104.68 77.6561 103.581V101.922C77.6561 100.823 76.7719 99.9316 75.6812 99.9316Z" fill="#ECF1F5" fill-opacity="0.49"/>
<path d="M26.5945 23.5549C27.5035 23.5549 28.2403 22.8122 28.2403 21.8961C28.2403 20.98 27.5035 20.2373 26.5945 20.2373C25.6856 20.2373 24.9487 20.98 24.9487 21.8961C24.9487 22.8122 25.6856 23.5549 26.5945 23.5549Z" fill="#ECF1F5" fill-opacity="0.49"/>
<path d="M36.469 23.5549C37.378 23.5549 38.1148 22.8122 38.1148 21.8961C38.1148 20.98 37.378 20.2373 36.469 20.2373C35.5601 20.2373 34.8232 20.98 34.8232 21.8961C34.8232 22.8122 35.5601 23.5549 36.469 23.5549Z" fill="#ECF1F5" fill-opacity="0.49"/>
<path d="M31.532 23.5549C32.441 23.5549 33.1778 22.8122 33.1778 21.8961C33.1778 20.98 32.441 20.2373 31.532 20.2373C30.6231 20.2373 29.8862 20.98 29.8862 21.8961C29.8862 22.8122 30.6231 23.5549 31.532 23.5549Z" fill="#ECF1F5" fill-opacity="0.49"/>
<g opacity="0.541969">
<g opacity="0.541969" filter="url(#filter1_f)">
<path d="M33.9366 58.0879H30.0588C29.5134 58.0879 29.0713 58.5335 29.0713 59.0832V62.9916C29.0713 63.5412 29.5134 63.9868 30.0588 63.9868H33.9366C34.4819 63.9868 34.924 63.5412 34.924 62.9916V59.0832C34.924 58.5335 34.4819 58.0879 33.9366 58.0879Z" fill="#C0C0C0"/>
<path d="M33.9366 58.0879H30.0588C29.5134 58.0879 29.0713 58.5335 29.0713 59.0832V62.9916C29.0713 63.5412 29.5134 63.9868 30.0588 63.9868H33.9366C34.4819 63.9868 34.924 63.5412 34.924 62.9916V59.0832C34.924 58.5335 34.4819 58.0879 33.9366 58.0879Z" stroke="white" stroke-width="0.588656"/>
</g>
<path opacity="0.541969" d="M34.3017 56.5303H29.6935C29.1482 56.5303 28.7061 56.9759 28.7061 57.5255V62.1701C28.7061 62.7198 29.1482 63.1654 29.6935 63.1654H34.3017C34.8471 63.1654 35.2892 62.7198 35.2892 62.1701V57.5255C35.2892 56.9759 34.8471 56.5303 34.3017 56.5303Z" fill="#E4EBF1" stroke="white" stroke-opacity="0.695558" stroke-width="0.588656"/>
</g>
<g opacity="0.541969">
<g opacity="0.541969" filter="url(#filter2_f)">
<path d="M33.9366 69.9834H30.0588C29.5134 69.9834 29.0713 70.429 29.0713 70.9787V74.8871C29.0713 75.4368 29.5134 75.8824 30.0588 75.8824H33.9366C34.4819 75.8824 34.924 75.4368 34.924 74.8871V70.9787C34.924 70.429 34.4819 69.9834 33.9366 69.9834Z" fill="#C0C0C0"/>
<path d="M33.9366 69.9834H30.0588C29.5134 69.9834 29.0713 70.429 29.0713 70.9787V74.8871C29.0713 75.4368 29.5134 75.8824 30.0588 75.8824H33.9366C34.4819 75.8824 34.924 75.4368 34.924 74.8871V70.9787C34.924 70.429 34.4819 69.9834 33.9366 69.9834Z" stroke="white" stroke-width="0.588656"/>
</g>
<path opacity="0.541969" d="M34.3017 68.4258H29.6935C29.1482 68.4258 28.7061 68.8714 28.7061 69.4211V74.0656C28.7061 74.6153 29.1482 75.0609 29.6935 75.0609H34.3017C34.8471 75.0609 35.2892 74.6153 35.2892 74.0656V69.4211C35.2892 68.8714 34.8471 68.4258 34.3017 68.4258Z" fill="#E4EBF1" stroke="white" stroke-opacity="0.695558" stroke-width="0.588656"/>
</g>
<g opacity="0.541969">
<g opacity="0.541969" filter="url(#filter3_f)">
<path d="M33.9366 81.6152H30.0588C29.5134 81.6152 29.0713 82.0608 29.0713 82.6105V86.5189C29.0713 87.0686 29.5134 87.5142 30.0588 87.5142H33.9366C34.4819 87.5142 34.924 87.0686 34.924 86.5189V82.6105C34.924 82.0608 34.4819 81.6152 33.9366 81.6152Z" fill="#C0C0C0"/>
<path d="M33.9366 81.6152H30.0588C29.5134 81.6152 29.0713 82.0608 29.0713 82.6105V86.5189C29.0713 87.0686 29.5134 87.5142 30.0588 87.5142H33.9366C34.4819 87.5142 34.924 87.0686 34.924 86.5189V82.6105C34.924 82.0608 34.4819 81.6152 33.9366 81.6152Z" stroke="white" stroke-width="0.588656"/>
</g>
<path opacity="0.541969" d="M34.3017 80.0576H29.6935C29.1482 80.0576 28.7061 80.5032 28.7061 81.0529V85.6975C28.7061 86.2471 29.1482 86.6927 29.6935 86.6927H34.3017C34.8471 86.6927 35.2892 86.2471 35.2892 85.6975V81.0529C35.2892 80.5032 34.8471 80.0576 34.3017 80.0576Z" fill="#E4EBF1" stroke="white" stroke-opacity="0.695558" stroke-width="0.588656"/>
</g>
<g filter="url(#filter4_d)">
<path d="M109.293 61.5762H71.5871C69.9611 61.5762 68.6431 62.3515 68.6431 63.3079V69.369C68.6431 70.3254 69.9611 71.1008 71.5871 71.1008H109.293C110.919 71.1008 112.237 70.3254 112.237 69.369V63.3079C112.237 62.3515 110.919 61.5762 109.293 61.5762Z" fill="black"/>
</g>
<path d="M110.098 59.3086H71.1762C69.4978 59.3086 68.1372 60.4162 68.1372 61.7825V70.4413C68.1372 71.8076 69.4978 72.9152 71.1762 72.9152H110.098C111.777 72.9152 113.137 71.8076 113.137 70.4413V61.7825C113.137 60.4162 111.777 59.3086 110.098 59.3086Z" fill="white"/>
<path d="M105.265 63.0889H81.5132V65.4828H105.265V63.0889Z" fill="#8AEBE3" fill-opacity="0.3"/>
<path d="M93.389 67.2783H81.5132V69.6722H93.389V67.2783Z" fill="#8AEBE3" fill-opacity="0.3"/>
<g filter="url(#filter5_d)">
<path d="M56.7928 89.21H19.0871C17.4611 89.21 16.1431 89.9853 16.1431 90.9417V97.0028C16.1431 97.9593 17.4611 98.7346 19.0871 98.7346H56.7928C58.4188 98.7346 59.7368 97.9593 59.7368 97.0028V90.9417C59.7368 89.9853 58.4188 89.21 56.7928 89.21Z" fill="black"/>
</g>
<path d="M56.9302 87.2783H17.5552C16.0019 87.2783 14.7427 88.4967 14.7427 89.9996V98.1636C14.7427 99.6665 16.0019 100.885 17.5552 100.885H56.9302C58.4835 100.885 59.7427 99.6665 59.7427 98.1636V89.9996C59.7427 88.4967 58.4835 87.2783 56.9302 87.2783Z" fill="white"/>
<path d="M51.75 91.0576H29.25V93.5178H51.75V91.0576Z" fill="#1DB868" fill-opacity="0.16226"/>
<path d="M39.75 95.5928H29.25V97.8605H39.75V95.5928Z" fill="#1DB868" fill-opacity="0.16226"/>
<g filter="url(#filter6_d)">
<path d="M70.6744 74.8701C74.9376 74.8701 78.3937 71.3867 78.3937 67.0898C78.3937 62.7929 74.9376 59.3096 70.6744 59.3096C66.4111 59.3096 62.9551 62.7929 62.9551 67.0898C62.9551 71.3867 66.4111 74.8701 70.6744 74.8701Z" fill="black"/>
</g>
<path d="M70.6744 74.8701C74.9376 74.8701 78.3937 71.3867 78.3937 67.0898C78.3937 62.7929 74.9376 59.3096 70.6744 59.3096C66.4111 59.3096 62.9551 62.7929 62.9551 67.0898C62.9551 71.3867 66.4111 74.8701 70.6744 74.8701Z" fill="#0CA090"/>
<mask id="mask0" mask-type="alpha" maskUnits="userSpaceOnUse" x="55" y="50" width="20" height="24">
<path d="M74.25 54.7431V72.3759C74.25 73.0916 73.6711 73.6718 72.9569 73.6718H56.7931C56.0789 73.6718 55.5 73.0916 55.5 72.3759V52.29C55.5 51.5743 56.0789 50.9941 56.7931 50.9941H71.0322L74.25 54.7431Z" fill="white"/>
</mask>
<g mask="url(#mask0)">
<g filter="url(#filter7_d)">
<path d="M74.25 54.7431V72.3759C74.25 73.0916 73.6711 73.6718 72.9569 73.6718H56.7931C56.0789 73.6718 55.5 73.0916 55.5 72.3759V52.29C55.5 51.5743 56.0789 50.9941 56.7931 50.9941H71.0322L74.25 54.7431Z" fill="black"/>
</g>
<path d="M74.25 54.7431V72.3759C74.25 73.0916 73.6711 73.6718 72.9569 73.6718H56.7931C56.0789 73.6718 55.5 73.0916 55.5 72.3759V52.29C55.5 51.5743 56.0789 50.9941 56.7931 50.9941H71.0322L74.25 54.7431Z" fill="url(#paint0_linear)"/>
<g filter="url(#filter8_d)">
<path d="M74.7579 54.3307H71.9518C71.5642 54.3307 71.25 54.014 71.25 53.6234V50.2383L74.7579 54.3307Z" fill="black"/>
</g>
<path d="M74.4313 54.774H71.6251C71.2375 54.774 70.9233 54.4574 70.9233 54.0667V50.6816L74.4313 54.774Z" fill="#D0FFFA"/>
</g>
<g filter="url(#filter9_d)">
<path fill-rule="evenodd" clip-rule="evenodd" d="M66.2193 67.6725L63.7757 65.0544L69.5705 57.2429L66.2193 67.6725Z" fill="url(#paint1_linear)"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M63.7756 65.0539L63.6674 62.8067L69.5703 57.2424L63.7756 65.0539Z" fill="#9BE6BF"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M59.25 60.6495L61.7872 62.8084L69.5704 57.2441L59.25 60.6495Z" fill="url(#paint2_linear)"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M61.7871 62.8084H63.6674L69.5704 57.2441L61.7871 62.8084Z" fill="url(#paint3_linear)"/>
</g>
<g filter="url(#filter10_d)">
<path d="M14.0331 104.067C19.459 104.067 23.8576 99.6336 23.8576 94.1648C23.8576 88.696 19.459 84.2627 14.0331 84.2627C8.6071 84.2627 4.2085 88.696 4.2085 94.1648C4.2085 99.6336 8.6071 104.067 14.0331 104.067Z" fill="black"/>
</g>
<path d="M14.0331 104.059C19.459 104.059 23.8576 99.6258 23.8576 94.157C23.8576 88.6882 19.459 84.2549 14.0331 84.2549C8.6071 84.2549 4.2085 88.6882 4.2085 94.157C4.2085 99.6258 8.6071 104.059 14.0331 104.059Z" fill="url(#paint4_linear)"/>
<g filter="url(#filter11_d)">
<path fill-rule="evenodd" clip-rule="evenodd" d="M14.1968 89.873C16.6837 89.873 18.6997 91.7203 18.6997 93.9989C18.6997 96.2776 16.6837 98.1248 14.1968 98.1248C13.4439 98.1248 12.7343 97.9555 12.1106 97.6563L10.4774 98.8638L10.4769 96.3247C9.98281 95.6625 9.69385 94.8616 9.69385 93.9989C9.69385 91.7203 11.7099 89.873 14.1968 89.873Z" fill="#EFFFF7"/>
</g>
<g filter="url(#filter12_d)">
<path d="M23.737 35.876H10.763C10.2035 35.876 9.75 37.1067 9.75 38.6248V48.2456C9.75 49.7637 10.2035 50.9944 10.763 50.9944H23.737C24.2965 50.9944 24.75 49.7637 24.75 48.2456V38.6248C24.75 37.1067 24.2965 35.876 23.737 35.876Z" fill="black"/>
</g>
<path d="M18.534 55.6747C24.9289 55.6747 30.113 50.4497 30.113 44.0043C30.113 37.559 24.9289 32.334 18.534 32.334C12.1391 32.334 6.95508 37.559 6.95508 44.0043C6.95508 50.4497 12.1391 55.6747 18.534 55.6747Z" fill="url(#paint5_linear)"/>
<path d="M35.9351 41.249H21.4126C20.8873 41.249 20.4614 41.6782 20.4614 42.2077C20.4614 42.7371 20.8873 43.1663 21.4126 43.1663H35.9351C36.4604 43.1663 36.8862 42.7371 36.8862 42.2077C36.8862 41.6782 36.4604 41.249 35.9351 41.249Z" fill="#FFE9CC"/>
<path d="M29.5593 45.29H21.4126C20.8873 45.29 20.4614 45.7192 20.4614 46.2487C20.4614 46.7781 20.8873 47.2073 21.4126 47.2073H29.5593C30.0846 47.2073 30.5105 46.7781 30.5105 46.2487C30.5105 45.7192 30.0846 45.29 29.5593 45.29Z" fill="#FFE9CC"/>
<g filter="url(#filter13_d)">
<path d="M17.2503 51.8505C16.0075 51.8505 15 50.8351 15 49.5825V40.3627C15 39.1102 16.0075 38.0947 17.2503 38.0947H35.2497C36.4925 38.0947 37.5 39.1102 37.5 40.3627V49.5825C37.5 50.8351 36.4925 51.8505 35.2497 51.8505H21.6485L19.991 53.3851C19.7758 53.5844 19.445 53.5844 19.2298 53.3851L17.5723 51.8505H17.2503Z" fill="black"/>
</g>
<path d="M17.2503 51.8505C16.0075 51.8505 15 50.8351 15 49.5825V40.3627C15 39.1102 16.0075 38.0947 17.2503 38.0947H35.2497C36.4925 38.0947 37.5 39.1102 37.5 40.3627V49.5825C37.5 50.8351 36.4925 51.8505 35.2497 51.8505H21.6485L19.991 53.3851C19.7758 53.5844 19.445 53.5844 19.2298 53.3851L17.5723 51.8505H17.2503Z" fill="url(#paint6_linear)"/>
<path d="M31.031 42.8271H19.3889C18.9678 42.8271 18.6265 43.1712 18.6265 43.5956C18.6265 44.0201 18.9678 44.3641 19.3889 44.3641H31.031C31.4521 44.3641 31.7935 44.0201 31.7935 43.5956C31.7935 43.1712 31.4521 42.8271 31.031 42.8271Z" fill="#FFE9CC"/>
<path d="M25.9198 46.0674H19.3889C18.9678 46.0674 18.6265 46.4115 18.6265 46.8359C18.6265 47.2603 18.9678 47.6044 19.3889 47.6044H25.9198C26.3409 47.6044 26.6823 47.2603 26.6823 46.8359C26.6823 46.4115 26.3409 46.0674 25.9198 46.0674Z" fill="#FFE9CC"/>
</g>
<defs>
<filter id="filter0_d" x="8.84961" y="2.73828" width="91.8063" height="122.863" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
<feOffset dy="2"/>
<feGaussianBlur stdDeviation="6"/>
<feColorMatrix type="matrix" values="0 0 0 0 0.832587 0 0 0 0 0.899956 0 0 0 0 0.904167 0 0 0 0.7 0"/>
<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/>
<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/>
</filter>
<filter id="filter1_f" x="27.9359" y="56.953" width="8.12326" height="8.16946" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
<feGaussianBlur stdDeviation="0.420468" result="effect1_foregroundBlur"/>
</filter>
<filter id="filter2_f" x="27.9359" y="68.8485" width="8.12326" height="8.16949" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
<feGaussianBlur stdDeviation="0.420468" result="effect1_foregroundBlur"/>
</filter>
<filter id="filter3_f" x="27.9359" y="80.4804" width="8.12326" height="8.16948" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
<feGaussianBlur stdDeviation="0.420468" result="effect1_foregroundBlur"/>
</filter>
<filter id="filter4_d" x="56.6431" y="51.5762" width="67.5938" height="33.5246" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
<feOffset dy="2"/>
<feGaussianBlur stdDeviation="6"/>
<feColorMatrix type="matrix" values="0 0 0 0 0.891304 0 0 0 0 0.891304 0 0 0 0 0.891304 0 0 0 1 0"/>
<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/>
<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/>
</filter>
<filter id="filter5_d" x="4.14307" y="79.21" width="67.5938" height="33.5246" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
<feOffset dy="2"/>
<feGaussianBlur stdDeviation="6"/>
<feColorMatrix type="matrix" values="0 0 0 0 0.891304 0 0 0 0 0.891304 0 0 0 0 0.891304 0 0 0 1 0"/>
<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/>
<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/>
</filter>
<filter id="filter6_d" x="58.9551" y="57.3096" width="23.4386" height="23.5605" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
<feOffset dy="2"/>
<feGaussianBlur stdDeviation="2"/>
<feColorMatrix type="matrix" values="0 0 0 0 0.0470588 0 0 0 0 0.627451 0 0 0 0 0.564706 0 0 0 0.406441 0"/>
<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/>
<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/>
</filter>
<filter id="filter7_d" x="50.5" y="45.9941" width="28.75" height="32.6776" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
<feOffset/>
<feGaussianBlur stdDeviation="2.5"/>
<feColorMatrix type="matrix" values="0 0 0 0 0.0509804 0 0 0 0 0.768627 0 0 0 0 0.705882 0 0 0 0.8 0"/>
<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/>
<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/>
</filter>
<filter id="filter8_d" x="69.25" y="49.2383" width="7.50792" height="8.09238" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
<feOffset dy="1"/>
<feGaussianBlur stdDeviation="1"/>
<feColorMatrix type="matrix" values="0 0 0 0 0.0735419 0 0 0 0 0.599298 0 0 0 0 0.544595 0 0 0 1 0"/>
<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/>
<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/>
</filter>
<filter id="filter9_d" x="57.25" y="57.2422" width="14.3206" height="14.4305" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
<feOffset dy="2"/>
<feGaussianBlur stdDeviation="1"/>
<feColorMatrix type="matrix" values="0 0 0 0 0.0693481 0 0 0 0 0.648154 0 0 0 0 0.595253 0 0 0 1 0"/>
<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/>
<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/>
</filter>
<filter id="filter10_d" x="-0.791504" y="79.2627" width="29.6491" height="29.8042" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
<feOffset/>
<feGaussianBlur stdDeviation="2.5"/>
<feColorMatrix type="matrix" values="0 0 0 0 0.0117647 0 0 0 0 0.866667 0 0 0 0 0.423529 0 0 0 0.447279 0"/>
<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/>
<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/>
</filter>
<filter id="filter11_d" x="7.69385" y="89.873" width="13.0058" height="12.9907" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
<feOffset dy="2"/>
<feGaussianBlur stdDeviation="1"/>
<feColorMatrix type="matrix" values="0 0 0 0 0.0693481 0 0 0 0 0.648154 0 0 0 0 0.595253 0 0 0 0.3 0"/>
<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/>
<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/>
</filter>
<filter id="filter12_d" x="-2.25" y="25.876" width="39" height="39.1184" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
<feOffset dy="2"/>
<feGaussianBlur stdDeviation="6"/>
<feColorMatrix type="matrix" values="0 0 0 0 0.891304 0 0 0 0 0.891304 0 0 0 0 0.891304 0 0 0 1 0"/>
<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/>
<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/>
</filter>
<filter id="filter13_d" x="10" y="33.0947" width="32.5" height="25.4398" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
<feOffset/>
<feGaussianBlur stdDeviation="2.5"/>
<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 0.589163 0 0 0 0 0.0862745 0 0 0 0.4 0"/>
<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/>
<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/>
</filter>
<linearGradient id="paint0_linear" x1="64.875" y1="50.9941" x2="72.615" y2="72.8737" gradientUnits="userSpaceOnUse">
<stop stop-color="#21C3B0"/>
<stop offset="1" stop-color="#07C7B7" stop-opacity="0.951568"/>
</linearGradient>
<linearGradient id="paint1_linear" x1="67.5909" y1="57.2777" x2="64.0443" y2="65.877" gradientUnits="userSpaceOnUse">
<stop stop-color="#8EFAD9"/>
<stop offset="1" stop-color="#E8FFF4"/>
</linearGradient>
<linearGradient id="paint2_linear" x1="62.1065" y1="58.6431" x2="63.8688" y2="62.3316" gradientUnits="userSpaceOnUse">
<stop stop-color="#CFFFE6"/>
<stop offset="0.4914" stop-color="#EDFFF6"/>
</linearGradient>
<linearGradient id="paint3_linear" x1="69.2728" y1="58.6265" x2="64.4964" y2="62.9103" gradientUnits="userSpaceOnUse">
<stop stop-color="#DDFFD0"/>
<stop offset="1" stop-color="#BBFCDF"/>
</linearGradient>
<linearGradient id="paint4_linear" x1="14.0331" y1="84.2549" x2="14.0331" y2="104.059" gradientUnits="userSpaceOnUse">
<stop stop-color="#02E26E"/>
<stop offset="1" stop-color="#08C362"/>
</linearGradient>
<linearGradient id="paint5_linear" x1="18.534" y1="55.6747" x2="12.201" y2="32.359" gradientUnits="userSpaceOnUse">
<stop stop-color="#FFC000"/>
<stop offset="1" stop-color="#FE6E00"/>
</linearGradient>
<linearGradient id="paint6_linear" x1="18.7983" y1="55.4826" x2="20.2852" y2="36.758" gradientUnits="userSpaceOnUse">
<stop stop-color="#FFDB78"/>
<stop offset="1" stop-color="#FDAC43"/>
</linearGradient>
<clipPath id="clip0">
<rect width="120" height="123.971" fill="white" transform="translate(0 0.347656)"/>
</clipPath>
</defs>
</svg>

After

Width:  |  Height:  |  Size: 22 KiB

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

176
yarn.lock
View file

@ -22,21 +22,21 @@
resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.19.4.tgz#95c86de137bf0317f3a570e1b6e996b427299747"
integrity sha512-CHIGpJcUQ5lU9KrPHTjBMhVwQG6CQjxfg36fGXl3qk/Gik1WwWachaXFuo0uCWJT/mStOKtcbFJCaVLihC1CMw==
"@babel/core@^7.19.3":
version "7.19.3"
resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.19.3.tgz#2519f62a51458f43b682d61583c3810e7dcee64c"
integrity sha512-WneDJxdsjEvyKtXKsaBGbDeiyOjR5vYq4HcShxnIbG0qixpoHjI3MqeZM9NDvsojNCEBItQE4juOo/bU6e72gQ==
"@babel/core@^7.19.6":
version "7.19.6"
resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.19.6.tgz#7122ae4f5c5a37c0946c066149abd8e75f81540f"
integrity sha512-D2Ue4KHpc6Ys2+AxpIx1BZ8+UegLLLE2p3KJEuJRKmokHOtl49jQ5ny1773KsGLZs8MQvBidAF6yWUJxRqtKtg==
dependencies:
"@ampproject/remapping" "^2.1.0"
"@babel/code-frame" "^7.18.6"
"@babel/generator" "^7.19.3"
"@babel/generator" "^7.19.6"
"@babel/helper-compilation-targets" "^7.19.3"
"@babel/helper-module-transforms" "^7.19.0"
"@babel/helpers" "^7.19.0"
"@babel/parser" "^7.19.3"
"@babel/helper-module-transforms" "^7.19.6"
"@babel/helpers" "^7.19.4"
"@babel/parser" "^7.19.6"
"@babel/template" "^7.18.10"
"@babel/traverse" "^7.19.3"
"@babel/types" "^7.19.3"
"@babel/traverse" "^7.19.6"
"@babel/types" "^7.19.4"
convert-source-map "^1.7.0"
debug "^4.1.0"
gensync "^1.0.0-beta.2"
@ -52,12 +52,12 @@
eslint-visitor-keys "^2.1.0"
semver "^6.3.0"
"@babel/generator@^7.19.3":
version "7.19.3"
resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.19.3.tgz#d7f4d1300485b4547cb6f94b27d10d237b42bf59"
integrity sha512-fqVZnmp1ncvZU757UzDheKZpfPgatqY59XtW2/j/18H7u76akb8xqvjw82f+i2UKd/ksYsSick/BCLQUUtJ/qQ==
"@babel/generator@^7.19.6":
version "7.19.6"
resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.19.6.tgz#9e481a3fe9ca6261c972645ae3904ec0f9b34a1d"
integrity sha512-oHGRUQeoX1QrKeJIKVe0hwjGqNnVYsM5Nep5zo0uE0m42sLH+Fsd2pStJ5sRM1bNyTUUoz0pe2lTeMJrb/taTA==
dependencies:
"@babel/types" "^7.19.3"
"@babel/types" "^7.19.4"
"@jridgewell/gen-mapping" "^0.3.2"
jsesc "^2.5.1"
@ -196,19 +196,19 @@
dependencies:
"@babel/types" "^7.18.6"
"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.19.0":
version "7.19.0"
resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.19.0.tgz#309b230f04e22c58c6a2c0c0c7e50b216d350c30"
integrity sha512-3HBZ377Fe14RbLIA+ac3sY4PTgpxHVkFrESaWhoI5PuyXPBBX8+C34qblV9G89ZtycGJCmCI/Ut+VUDK4bltNQ==
"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.19.0", "@babel/helper-module-transforms@^7.19.6":
version "7.19.6"
resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.19.6.tgz#6c52cc3ac63b70952d33ee987cbee1c9368b533f"
integrity sha512-fCmcfQo/KYr/VXXDIyd3CBGZ6AFhPFy1TfSEJ+PilGVlQT6jcbqtHAM4C1EciRqMza7/TpOUZliuSH+U6HAhJw==
dependencies:
"@babel/helper-environment-visitor" "^7.18.9"
"@babel/helper-module-imports" "^7.18.6"
"@babel/helper-simple-access" "^7.18.6"
"@babel/helper-simple-access" "^7.19.4"
"@babel/helper-split-export-declaration" "^7.18.6"
"@babel/helper-validator-identifier" "^7.18.6"
"@babel/helper-validator-identifier" "^7.19.1"
"@babel/template" "^7.18.10"
"@babel/traverse" "^7.19.0"
"@babel/types" "^7.19.0"
"@babel/traverse" "^7.19.6"
"@babel/types" "^7.19.4"
"@babel/helper-optimise-call-expression@^7.18.6":
version "7.18.6"
@ -271,6 +271,13 @@
dependencies:
"@babel/types" "^7.18.6"
"@babel/helper-simple-access@^7.19.4":
version "7.19.4"
resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.19.4.tgz#be553f4951ac6352df2567f7daa19a0ee15668e7"
integrity sha512-f9Xq6WqBFqaDfbCzn2w85hwklswz5qsKlh7f08w4Y9yhJHpnNC0QemtSkK5YyOY8kPGvyiwdzZksGUhnGdaUIg==
dependencies:
"@babel/types" "^7.19.4"
"@babel/helper-skip-transparent-expression-wrappers@^7.18.9":
version "7.18.9"
resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.18.9.tgz#778d87b3a758d90b471e7b9918f34a9a02eb5818"
@ -325,14 +332,14 @@
"@babel/traverse" "^7.18.11"
"@babel/types" "^7.18.10"
"@babel/helpers@^7.19.0":
version "7.19.0"
resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.19.0.tgz#f30534657faf246ae96551d88dd31e9d1fa1fc18"
integrity sha512-DRBCKGwIEdqY3+rPJgG/dKfQy9+08rHIAJx8q2p+HSWP87s2HCrQmaAMMyMll2kIXKCW0cO1RdQskx15Xakftg==
"@babel/helpers@^7.19.4":
version "7.19.4"
resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.19.4.tgz#42154945f87b8148df7203a25c31ba9a73be46c5"
integrity sha512-G+z3aOx2nfDHwX/kyVii5fJq+bgscg89/dJNWpYeKeBv3v9xX8EIabmx1k6u9LS04H7nROFVRVK+e3k0VHp+sw==
dependencies:
"@babel/template" "^7.18.10"
"@babel/traverse" "^7.19.0"
"@babel/types" "^7.19.0"
"@babel/traverse" "^7.19.4"
"@babel/types" "^7.19.4"
"@babel/highlight@^7.18.6":
version "7.18.6"
@ -343,10 +350,10 @@
chalk "^2.0.0"
js-tokens "^4.0.0"
"@babel/parser@^7.18.10", "@babel/parser@^7.19.3":
version "7.19.3"
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.19.3.tgz#8dd36d17c53ff347f9e55c328710321b49479a9a"
integrity sha512-pJ9xOlNWHiy9+FuFP09DEAFbAn4JskgRsVcc169w2xRBC3FRGuQEwjeIMMND9L2zc0iEhO/tGv4Zq+km+hxNpQ==
"@babel/parser@^7.18.10", "@babel/parser@^7.19.6":
version "7.19.6"
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.19.6.tgz#b923430cb94f58a7eae8facbffa9efd19130e7f8"
integrity sha512-h1IUp81s2JYJ3mRkdxJgs4UvmSsRvDrx5ICSJbPvtWYv5i1nTBGcBpnog+89rAFMwvvru6E5NUHdBe01UeSzYA==
"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6":
version "7.18.6"
@ -959,23 +966,23 @@
"@babel/parser" "^7.18.10"
"@babel/types" "^7.18.10"
"@babel/traverse@^7.18.11", "@babel/traverse@^7.18.6", "@babel/traverse@^7.18.9", "@babel/traverse@^7.19.0", "@babel/traverse@^7.19.3":
version "7.19.3"
resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.19.3.tgz#3a3c5348d4988ba60884e8494b0592b2f15a04b4"
integrity sha512-qh5yf6149zhq2sgIXmwjnsvmnNQC2iw70UFjp4olxucKrWd/dvlUsBI88VSLUsnMNF7/vnOiA+nk1+yLoCqROQ==
"@babel/traverse@^7.18.11", "@babel/traverse@^7.18.6", "@babel/traverse@^7.18.9", "@babel/traverse@^7.19.4", "@babel/traverse@^7.19.6":
version "7.19.6"
resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.19.6.tgz#7b4c865611df6d99cb131eec2e8ac71656a490dc"
integrity sha512-6l5HrUCzFM04mfbG09AagtYyR2P0B71B1wN7PfSPiksDPz2k5H9CBC1tcZpz2M8OxbKTPccByoOJ22rUKbpmQQ==
dependencies:
"@babel/code-frame" "^7.18.6"
"@babel/generator" "^7.19.3"
"@babel/generator" "^7.19.6"
"@babel/helper-environment-visitor" "^7.18.9"
"@babel/helper-function-name" "^7.19.0"
"@babel/helper-hoist-variables" "^7.18.6"
"@babel/helper-split-export-declaration" "^7.18.6"
"@babel/parser" "^7.19.3"
"@babel/types" "^7.19.3"
"@babel/parser" "^7.19.6"
"@babel/types" "^7.19.4"
debug "^4.1.0"
globals "^11.1.0"
"@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.19.3", "@babel/types@^7.19.4", "@babel/types@^7.4.4":
"@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.19.4", "@babel/types@^7.4.4":
version "7.19.4"
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.19.4.tgz#0dd5c91c573a202d600490a35b33246fed8a41c7"
integrity sha512-M5LK7nAeS6+9j7hAq+b3fQs+pNfUtTGq+yFFfHnauFA8zQtLRfmuipmsKDKKLuyG+wC8ABW43A153YNawNTEtw==
@ -1014,10 +1021,10 @@
resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
"@humanwhocodes/config-array@^0.10.5":
version "0.10.5"
resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.10.5.tgz#bb679745224745fff1e9a41961c1d45a49f81c04"
integrity sha512-XVVDtp+dVvRxMoxSiSfasYaG02VEe1qH5cKgMQJWhol6HwzbcqoCMJi8dAGoYAO57jhUyhI6cWuRiTcRaDaYug==
"@humanwhocodes/config-array@^0.11.6":
version "0.11.6"
resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.6.tgz#6a51d603a3aaf8d4cf45b42b3f2ac9318a4adc4b"
integrity sha512-jJr+hPTJYKyDILJfhNSHsjiwXYf26Flsz8DvNndOsHs5pwSnpGUEy8yzF0JYhCEvTDdV2vuOK5tt8BVhwO5/hg==
dependencies:
"@humanwhocodes/object-schema" "^1.2.1"
debug "^4.1.1"
@ -1111,7 +1118,7 @@
resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
"@nodelib/fs.walk@^1.2.3":
"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8":
version "1.2.8"
resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
@ -1217,7 +1224,7 @@
dependencies:
"@types/node" "*"
"@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
"@types/json-schema@*", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
version "7.0.11"
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==
@ -1673,13 +1680,13 @@ asynckit@^0.4.0:
resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
autoprefixer@^10.4.12:
version "10.4.12"
resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.12.tgz#183f30bf0b0722af54ee5ef257f7d4320bb33129"
integrity sha512-WrCGV9/b97Pa+jtwf5UGaRjgQIg7OK3D06GnoYoZNcG1Xb8Gt3EfuKjlhh9i/VtT16g6PYjZ69jdJ2g8FxSC4Q==
autoprefixer@^10.4.13:
version "10.4.13"
resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.13.tgz#b5136b59930209a321e9fa3dca2e7c4d223e83a8"
integrity sha512-49vKpMqcZYsJjwotvt4+h/BCjJVnhGwcLpDt5xkcaOG3eLrG/HUYLagrihYsQ+qrIBgIzX1Rw7a6L8I/ZA1Atg==
dependencies:
browserslist "^4.21.4"
caniuse-lite "^1.0.30001407"
caniuse-lite "^1.0.30001426"
fraction.js "^4.2.0"
normalize-range "^0.1.2"
picocolors "^1.0.0"
@ -1695,15 +1702,13 @@ aws4@^1.8.0:
resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
babel-loader@^8.2.5:
version "8.2.5"
resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.5.tgz#d45f585e654d5a5d90f5350a779d7647c5ed512e"
integrity sha512-OSiFfH89LrEMiWd4pLNqGz4CwJDtbs2ZVc+iGu2HrkRfPxId9F2anQj38IxWpmRfsUY0aBZYi1EFcd3mhtRMLQ==
babel-loader@^9.0.0:
version "9.0.0"
resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-9.0.0.tgz#b90f48b49f5360e4678733755d1413e16cfee48e"
integrity sha512-qVGQb0PNw/B1sGhPf0/KKsHZAPfa2Bk+JbjkW7yGjAHZyvjAULXYq0et0+/+7DL/rGYU+y8UoGPzA32NP29pVQ==
dependencies:
find-cache-dir "^3.3.1"
loader-utils "^2.0.0"
make-dir "^3.1.0"
schema-utils "^2.6.5"
find-cache-dir "^3.3.2"
schema-utils "^4.0.0"
babel-plugin-dynamic-import-node@^2.3.3:
version "2.3.3"
@ -1899,10 +1904,10 @@ camelcase@^5.3.1:
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
caniuse-lite@^1.0.30001400, caniuse-lite@^1.0.30001407:
version "1.0.30001412"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001412.tgz#30f67d55a865da43e0aeec003f073ea8764d5d7c"
integrity sha512-+TeEIee1gS5bYOiuf+PS/kp2mrXic37Hl66VY6EAfxasIk5fELTktK2oOezYed12H8w7jt3s512PpulQidPjwA==
caniuse-lite@^1.0.30001400, caniuse-lite@^1.0.30001426:
version "1.0.30001427"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001427.tgz#d3a749f74be7ae0671fbec3a4eea18576e8ad646"
integrity sha512-lfXQ73oB9c8DP5Suxaszm+Ta2sr/4tf8+381GkIm1MLj/YdLf+rEDyDSRCzeltuyTVGm+/s18gdZ0q+Wmp8VsQ==
caseless@~0.12.0:
version "0.12.0"
@ -2561,14 +2566,15 @@ eslint-webpack-plugin@^3.2.0:
normalize-path "^3.0.0"
schema-utils "^4.0.0"
eslint@^8.25.0:
version "8.25.0"
resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.25.0.tgz#00eb962f50962165d0c4ee3327708315eaa8058b"
integrity sha512-DVlJOZ4Pn50zcKW5bYH7GQK/9MsoQG2d5eDH0ebEkE8PbgzTTmtt/VTH9GGJ4BfeZCpBLqFfvsjX35UacUL83A==
eslint@^8.26.0:
version "8.26.0"
resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.26.0.tgz#2bcc8836e6c424c4ac26a5674a70d44d84f2181d"
integrity sha512-kzJkpaw1Bfwheq4VXUezFriD1GxszX6dUekM7Z3aC2o4hju+tsR/XyTC3RcoSD7jmy9VkPU3+N6YjVU2e96Oyg==
dependencies:
"@eslint/eslintrc" "^1.3.3"
"@humanwhocodes/config-array" "^0.10.5"
"@humanwhocodes/config-array" "^0.11.6"
"@humanwhocodes/module-importer" "^1.0.1"
"@nodelib/fs.walk" "^1.2.8"
ajv "^6.10.0"
chalk "^4.0.0"
cross-spawn "^7.0.2"
@ -2584,14 +2590,14 @@ eslint@^8.25.0:
fast-deep-equal "^3.1.3"
file-entry-cache "^6.0.1"
find-up "^5.0.0"
glob-parent "^6.0.1"
glob-parent "^6.0.2"
globals "^13.15.0"
globby "^11.1.0"
grapheme-splitter "^1.0.4"
ignore "^5.2.0"
import-fresh "^3.0.0"
imurmurhash "^0.1.4"
is-glob "^4.0.0"
is-path-inside "^3.0.3"
js-sdsl "^4.1.4"
js-yaml "^4.1.0"
json-stable-stringify-without-jsonify "^1.0.1"
@ -2805,7 +2811,7 @@ finalhandler@1.2.0:
statuses "2.0.1"
unpipe "~1.0.0"
find-cache-dir@^3.3.1:
find-cache-dir@^3.3.2:
version "3.3.2"
resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b"
integrity sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==
@ -3023,7 +3029,7 @@ glob-parent@^5.1.2, glob-parent@~5.1.2:
dependencies:
is-glob "^4.0.1"
glob-parent@^6.0.1:
glob-parent@^6.0.2:
version "6.0.2"
resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
@ -3552,6 +3558,11 @@ is-number@^7.0.0:
resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
is-path-inside@^3.0.3:
version "3.0.3"
resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
is-plain-obj@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
@ -3880,7 +3891,7 @@ lru-cache@^6.0.0:
dependencies:
yallist "^4.0.0"
make-dir@^3.0.2, make-dir@^3.1.0:
make-dir@^3.0.2:
version "3.1.0"
resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
@ -4996,15 +5007,6 @@ sass@^1.55.0:
immutable "^4.0.0"
source-map-js ">=0.6.2 <2.0.0"
schema-utils@^2.6.5:
version "2.7.1"
resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7"
integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==
dependencies:
"@types/json-schema" "^7.0.5"
ajv "^6.12.4"
ajv-keywords "^3.5.2"
schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1:
version "3.1.1"
resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281"
@ -5409,10 +5411,10 @@ stylelint-config-recommended@^9.0.0:
resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-9.0.0.tgz#1c9e07536a8cd875405f8ecef7314916d94e7e40"
integrity sha512-9YQSrJq4NvvRuTbzDsWX3rrFOzOlYBmZP+o513BJN/yfEmGSr0AxdvrWs0P/ilSpVV/wisamAHu5XSk8Rcf4CQ==
stylelint-config-standard@^28.0.0:
version "28.0.0"
resolved "https://registry.yarnpkg.com/stylelint-config-standard/-/stylelint-config-standard-28.0.0.tgz#7e1926c232631a8445eafee7b186d276d42d7b15"
integrity sha512-q/StuowDdDmFCravzGHAwgS9pjX0bdOQUEBBDIkIWsQuYGgYz/xsO8CM6eepmIQ1fc5bKdDVimlJZ6MoOUcJ5Q==
stylelint-config-standard@^29.0.0:
version "29.0.0"
resolved "https://registry.yarnpkg.com/stylelint-config-standard/-/stylelint-config-standard-29.0.0.tgz#4cc0e0f05512a39bb8b8e97853247d3a95d66fa2"
integrity sha512-uy8tZLbfq6ZrXy4JKu3W+7lYLgRQBxYTUUB88vPgQ+ZzAxdrvcaSUW9hOMNLYBnwH+9Kkj19M2DHdZ4gKwI7tg==
dependencies:
stylelint-config-recommended "^9.0.0"