From 2acbaa4d8ea3faa2f98234b832673dd8c329146a Mon Sep 17 00:00:00 2001 From: darkalchemy Date: Mon, 24 Jan 2022 13:27:30 -0500 Subject: [PATCH] update: remove support for php 7.4 --- README.md | 2 +- app/Controller/Account/AccountController.php | 2 +- .../Account/AccountPasswordController.php | 2 +- .../Password/PasswordRecoverController.php | 4 +- .../Auth/Password/PasswordResetController.php | 7 +- app/Controller/Auth/SignInController.php | 7 +- app/Controller/Auth/SignUpController.php | 7 +- .../Auth/UserActivateController.php | 3 +- app/Controller/Controller.php | 7 +- .../Dashboard/DashboardController.php | 2 +- app/Controller/HomeController.php | 2 +- app/Exception/ExceptionHandler.php | 5 +- app/Factory/LoggerFactory.php | 25 +- app/Middleware/CheckSettingsMiddleware.php | 3 +- app/Middleware/RedirectIfAuthenticated.php | 7 +- app/Middleware/RedirectIfNotAuthenticated.php | 7 +- app/Migration/Migration.php | 2 +- app/Model/User.php | 5 +- app/Provider/SendMail.php | 4 +- app/Provider/StoreMail.php | 6 +- app/Utility/helpers.php | 23 +- app/Validation/ValidationRules.php | 4 +- app/View/TwigMessagesExtension.php | 2 +- app/View/TwigPhpExtension.php | 50 ++ app/View/TwigUtilities.php | 8 +- bin/utilities.php | 14 +- bootstrap/app.php | 2 +- bootstrap/container.php | 2 + composer.json | 66 +- config/constants.php | 34 +- config/sentinel.php | 2 +- config/settings.example.php | 7 +- package-lock.json | 776 ++++++++++-------- package.json | 4 +- routes/web.php | 2 +- 35 files changed, 601 insertions(+), 504 deletions(-) create mode 100644 app/View/TwigPhpExtension.php diff --git a/README.md b/README.md index 3afdb14..9465de0 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ A Slim 4 Skeleton. This is a simple skeleton to quickly ramp up a slim 4 project. -PHP 7.4, 8.0 or 8.1 is required +PHP 8 is required Composer is required npm/npx is required diff --git a/app/Controller/Account/AccountController.php b/app/Controller/Account/AccountController.php index 0d4b983..8a97824 100644 --- a/app/Controller/Account/AccountController.php +++ b/app/Controller/Account/AccountController.php @@ -59,9 +59,9 @@ public function __construct( /** * @param ResponseInterface $response * - * @throws SyntaxError * @throws LoaderError * @throws RuntimeError + * @throws SyntaxError * * @return ResponseInterface */ diff --git a/app/Controller/Account/AccountPasswordController.php b/app/Controller/Account/AccountPasswordController.php index 1151165..31d9533 100644 --- a/app/Controller/Account/AccountPasswordController.php +++ b/app/Controller/Account/AccountPasswordController.php @@ -59,9 +59,9 @@ public function __construct( /** * @param ResponseInterface $response * - * @throws SyntaxError * @throws LoaderError * @throws RuntimeError + * @throws SyntaxError * * @return ResponseInterface */ diff --git a/app/Controller/Auth/Password/PasswordRecoverController.php b/app/Controller/Auth/Password/PasswordRecoverController.php index a2f9c01..31824d1 100644 --- a/app/Controller/Auth/Password/PasswordRecoverController.php +++ b/app/Controller/Auth/Password/PasswordRecoverController.php @@ -65,9 +65,9 @@ public function __construct( /** * @param ResponseInterface $response * - * @throws SyntaxError * @throws LoaderError * @throws RuntimeError + * @throws SyntaxError * * @return ResponseInterface */ @@ -80,10 +80,10 @@ public function index(ResponseInterface $response): ResponseInterface * @param ServerRequestInterface $request * @param ResponseInterface $response * - * @throws SyntaxError * @throws ValidationException * @throws LoaderError * @throws RuntimeError + * @throws SyntaxError * * @return ResponseInterface */ diff --git a/app/Controller/Auth/Password/PasswordResetController.php b/app/Controller/Auth/Password/PasswordResetController.php index 72ed548..37a6f6d 100644 --- a/app/Controller/Auth/Password/PasswordResetController.php +++ b/app/Controller/Auth/Password/PasswordResetController.php @@ -12,6 +12,7 @@ use Cartalyst\Sentinel\Native\Facades\Sentinel; use Delight\I18n\I18n; use Exception; +use Monolog\Logger; use Odan\Session\SessionInterface; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; @@ -62,7 +63,7 @@ public function __construct( $this->view = $view; $this->flash = $flash; $this->routeParser = $routeParser; - $this->logger = $loggerFactory->addFileHandler('password_reset_controller.log') + $this->logger = $loggerFactory->addFileHandler('password_reset_controller.log', Logger::DEBUG) ->createInstance('password_reset_controller'); $this->rules = $rules; } @@ -71,9 +72,9 @@ public function __construct( * @param ServerRequestInterface $request * @param ResponseInterface $response * - * @throws SyntaxError * @throws LoaderError * @throws RuntimeError + * @throws SyntaxError * * @return ResponseInterface */ @@ -103,7 +104,7 @@ public function index(ServerRequestInterface $request, ResponseInterface $respon */ public function reset(ServerRequestInterface $request, ResponseInterface $response): ResponseInterface { - $data = $this->validate($request, array_merge_recursive( + $data = (array) $this->validate($request, array_merge_recursive( $this->rules->required('email'), $this->rules->required('code'), $this->rules->password(), diff --git a/app/Controller/Auth/SignInController.php b/app/Controller/Auth/SignInController.php index 45ad588..9405c88 100644 --- a/app/Controller/Auth/SignInController.php +++ b/app/Controller/Auth/SignInController.php @@ -11,6 +11,7 @@ use Cartalyst\Sentinel\Native\Facades\Sentinel; use Delight\I18n\I18n; use Exception; +use Monolog\Logger; use Odan\Session\SessionInterface; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; @@ -61,7 +62,7 @@ public function __construct( $this->view = $view; $this->flash = $flash; $this->routeParser = $routeParser; - $this->logger = $loggerFactory->addFileHandler('signin_controller.log') + $this->logger = $loggerFactory->addFileHandler('signin_controller.log', Logger::DEBUG) ->createInstance('signin_controller'); $this->rules = $rules; $this->session->set('current_url', 'auth.signin'); @@ -71,9 +72,9 @@ public function __construct( * @param ServerRequestInterface $request The request * @param ResponseInterface $response The response * - * @throws SyntaxError * @throws LoaderError * @throws RuntimeError + * @throws SyntaxError * * @return ResponseInterface */ @@ -94,7 +95,7 @@ public function index(ServerRequestInterface $request, ResponseInterface $respon */ public function signin(ServerRequestInterface $request, ResponseInterface $response): ResponseInterface { - $data = $this->validate($request, array_merge_recursive( + $data = (array) $this->validate($request, array_merge_recursive( $this->rules->email(), $this->rules->required('password') )); diff --git a/app/Controller/Auth/SignUpController.php b/app/Controller/Auth/SignUpController.php index b5210bd..39ca00f 100644 --- a/app/Controller/Auth/SignUpController.php +++ b/app/Controller/Auth/SignUpController.php @@ -12,6 +12,7 @@ use Cartalyst\Sentinel\Native\Facades\Sentinel; use Delight\I18n\I18n; use Exception; +use Monolog\Logger; use Odan\Session\SessionInterface; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; @@ -65,7 +66,7 @@ public function __construct( $this->view = $view; $this->flash = $flash; $this->routeParser = $routeParser; - $this->logger = $loggerFactory->addFileHandler('signup_controller.log') + $this->logger = $loggerFactory->addFileHandler('signup_controller.log', Logger::DEBUG) ->createInstance('signup_controller'); $this->rules = $rules; $this->storeMail = $storeMail; @@ -75,9 +76,9 @@ public function __construct( /** * @param ResponseInterface $response The response * - * @throws LoaderError * @throws RuntimeError * @throws SyntaxError + * @throws LoaderError * * @return ResponseInterface */ @@ -96,7 +97,7 @@ public function index(ResponseInterface $response): ResponseInterface */ public function signup(ServerRequestInterface $request, ResponseInterface $response): ResponseInterface { - $data = $this->validate($request, array_merge_recursive( + $data = (array) $this->validate($request, array_merge_recursive( $this->rules->email(), $this->rules->email_unique(), $this->rules->username(), diff --git a/app/Controller/Auth/UserActivateController.php b/app/Controller/Auth/UserActivateController.php index 735f5bd..ca0f6e1 100644 --- a/app/Controller/Auth/UserActivateController.php +++ b/app/Controller/Auth/UserActivateController.php @@ -10,6 +10,7 @@ use Cartalyst\Sentinel\Native\Facades\Sentinel; use Delight\I18n\I18n; use Exception; +use Monolog\Logger; use Odan\Session\SessionInterface; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; @@ -49,7 +50,7 @@ public function __construct( parent::__construct($session, $i18n); $this->flash = $flash; $this->routeParser = $routeParser; - $this->logger = $loggerFactory->addFileHandler('activate_controller.log') + $this->logger = $loggerFactory->addFileHandler('activate_controller.log', Logger::DEBUG) ->createInstance('activate_controller'); } diff --git a/app/Controller/Controller.php b/app/Controller/Controller.php index 2b37bbd..6b0c6d8 100644 --- a/app/Controller/Controller.php +++ b/app/Controller/Controller.php @@ -22,7 +22,8 @@ class Controller /** * Controller constructor. * - * @param I18n $i18n + * @param SessionInterface $session + * @param I18n $i18n */ public function __construct(SessionInterface $session, I18n $i18n) { @@ -39,11 +40,11 @@ public function __construct(SessionInterface $session, I18n $i18n) * * @return null|array|object */ - public function validate(ServerRequestInterface $request, array $rules = []) + public function validate(ServerRequestInterface $request, array $rules = []): object|array|null { Validator::langDir(VENDOR_DIR . 'vlucas/valitron/lang/'); Validator::lang(substr($this->locale, 0, 2)); - $params = $request->getParsedBody(); + $params = (array) $request->getParsedBody(); $validator = new Validator($params); $validator->mapFieldsRules($rules); if (!$validator->validate()) { diff --git a/app/Controller/Dashboard/DashboardController.php b/app/Controller/Dashboard/DashboardController.php index 28020dd..83d8f91 100644 --- a/app/Controller/Dashboard/DashboardController.php +++ b/app/Controller/Dashboard/DashboardController.php @@ -30,9 +30,9 @@ public function __construct(Twig $view) /** * @param ResponseInterface $response * - * @throws LoaderError * @throws RuntimeError * @throws SyntaxError + * @throws LoaderError * * @return ResponseInterface */ diff --git a/app/Controller/HomeController.php b/app/Controller/HomeController.php index 54ca4c3..449002c 100644 --- a/app/Controller/HomeController.php +++ b/app/Controller/HomeController.php @@ -30,9 +30,9 @@ public function __construct(Twig $view) /** * @param ResponseInterface $response * - * @throws LoaderError * @throws RuntimeError * @throws SyntaxError + * @throws LoaderError * * @return ResponseInterface */ diff --git a/app/Exception/ExceptionHandler.php b/app/Exception/ExceptionHandler.php index 5b6ed39..e27fe2c 100644 --- a/app/Exception/ExceptionHandler.php +++ b/app/Exception/ExceptionHandler.php @@ -6,6 +6,7 @@ use App\Factory\LoggerFactory; use Exception; +use Monolog\Logger; use Psr\Http\Message\ResponseFactoryInterface; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; @@ -47,7 +48,7 @@ public function __construct( $this->flash = $flash; $this->responseFactory = $responseFactory; $this->view = $view; - $this->logger = $loggerFactory->addFileHandler('exception_handler.log') + $this->logger = $loggerFactory->addFileHandler('exception_handler.log', Logger::DEBUG) ->createInstance('exception_handler'); } @@ -59,7 +60,7 @@ public function __construct( * * @return mixed */ - public function __invoke(ServerRequestInterface $request, Throwable $exception) + public function __invoke(ServerRequestInterface $request, Throwable $exception): mixed { if (method_exists($this, $handle = 'handle' . (new ReflectionClass($exception))->getShortName())) { return $this->{$handle}($exception); diff --git a/app/Factory/LoggerFactory.php b/app/Factory/LoggerFactory.php index c7ebf18..0ee6574 100644 --- a/app/Factory/LoggerFactory.php +++ b/app/Factory/LoggerFactory.php @@ -4,7 +4,6 @@ namespace App\Factory; -use Exception; use Monolog\Formatter\LineFormatter; use Monolog\Handler\RotatingFileHandler; use Monolog\Handler\StreamHandler; @@ -21,11 +20,6 @@ class LoggerFactory */ private string $path; - /** - * @var int - */ - private int $level; - /** * @var array Handler */ @@ -38,8 +32,7 @@ class LoggerFactory */ public function __construct(array $settings) { - $this->path = (string) $settings['path']; - $this->level = (int) $settings['level']; + $this->path = (string) $settings['path']; } /** @@ -63,14 +56,12 @@ public function createInstance(string $name): LoggerInterface } /** - * @param string $filename - * @param null|int $level - * - * @throws Exception + * @param string $filename + * @param int $level * * @return $this */ - public function addFileHandler(string $filename, int $level = null): self + public function addFileHandler(string $filename, int $level): self { if (!is_writeable($this->path)) { exit(_fe( @@ -79,7 +70,7 @@ public function addFileHandler(string $filename, int $level = null): self )); } $filename = sprintf('%s/%s', $this->path, $filename); - $rotatingFileHandler = new RotatingFileHandler($filename, 0, $level ?? $this->level, true, 0755); + $rotatingFileHandler = new RotatingFileHandler($filename, 0, $level, true, 0755); // The last "true" here tells monolog to remove empty []'s $rotatingFileHandler->setFormatter(new LineFormatter(null, null, false, true)); @@ -92,13 +83,11 @@ public function addFileHandler(string $filename, int $level = null): self /** * Add a console logger. * - * @param null|int $level The level (optional) - * * @return self The instance */ - public function addConsoleHandler(int $level = null): self + public function addConsoleHandler(int $level): self { - $streamHandler = new StreamHandler('php://stdout', $level ?? $this->level); + $streamHandler = new StreamHandler('php://stdout', $level); $streamHandler->setFormatter(new LineFormatter(null, null, false, true)); $this->handler[] = $streamHandler; diff --git a/app/Middleware/CheckSettingsMiddleware.php b/app/Middleware/CheckSettingsMiddleware.php index af72282..c40d595 100644 --- a/app/Middleware/CheckSettingsMiddleware.php +++ b/app/Middleware/CheckSettingsMiddleware.php @@ -6,6 +6,7 @@ use App\Factory\LoggerFactory; use Exception; +use Monolog\Logger; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Server\MiddlewareInterface; @@ -34,7 +35,7 @@ class CheckSettingsMiddleware implements MiddlewareInterface public function __construct(array $settings, LoggerFactory $loggerFactory, Messages $flash) { $this->settings = $settings; - $this->logger = $loggerFactory->addFileHandler('settings.log')->createInstance('settings'); + $this->logger = $loggerFactory->addFileHandler('settings.log', Logger::DEBUG)->createInstance('settings'); $this->flash = $flash; } diff --git a/app/Middleware/RedirectIfAuthenticated.php b/app/Middleware/RedirectIfAuthenticated.php index 0a55e88..8d1fb4a 100644 --- a/app/Middleware/RedirectIfAuthenticated.php +++ b/app/Middleware/RedirectIfAuthenticated.php @@ -27,8 +27,11 @@ class RedirectIfAuthenticated * @param Messages $flash The flash * @param RouteParserInterface $routeParser The routeParser */ - public function __construct(Messages $flash, RouteParserInterface $routeParser, ResponseFactoryInterface $responseFactory) - { + public function __construct( + Messages $flash, + RouteParserInterface $routeParser, + ResponseFactoryInterface $responseFactory + ) { $this->flash = $flash; $this->routeParser = $routeParser; $this->responseFactory = $responseFactory; diff --git a/app/Middleware/RedirectIfNotAuthenticated.php b/app/Middleware/RedirectIfNotAuthenticated.php index 14ef747..7677532 100644 --- a/app/Middleware/RedirectIfNotAuthenticated.php +++ b/app/Middleware/RedirectIfNotAuthenticated.php @@ -27,8 +27,11 @@ class RedirectIfNotAuthenticated * @param Messages $flash The flash * @param RouteParserInterface $routeParser The routeParser */ - public function __construct(Messages $flash, RouteParserInterface $routeParser, ResponseFactoryInterface $responseFactory) - { + public function __construct( + Messages $flash, + RouteParserInterface $routeParser, + ResponseFactoryInterface $responseFactory + ) { $this->flash = $flash; $this->routeParser = $routeParser; $this->responseFactory = $responseFactory; diff --git a/app/Migration/Migration.php b/app/Migration/Migration.php index a9a68ca..eb3d34f 100644 --- a/app/Migration/Migration.php +++ b/app/Migration/Migration.php @@ -15,7 +15,7 @@ class Migration extends AbstractMigration { protected Builder $schema; - public function init() + public function init(): void { $this->schema = Capsule::schema(); } diff --git a/app/Model/User.php b/app/Model/User.php index 958481e..5366c0d 100644 --- a/app/Model/User.php +++ b/app/Model/User.php @@ -8,7 +8,10 @@ use Illuminate\Database\Eloquent\Relations\HasMany; /** - * Class User. + * @property string email + * @property string username + * @property string password + * @property string permissions */ class User extends EloquentUser { diff --git a/app/Provider/SendMail.php b/app/Provider/SendMail.php index 440f7c3..d626c0c 100644 --- a/app/Provider/SendMail.php +++ b/app/Provider/SendMail.php @@ -6,6 +6,7 @@ use App\Factory\LoggerFactory; use Exception; +use Monolog\Logger; use PHPMailer\PHPMailer\Exception as ExceptionAlias; use PHPMailer\PHPMailer\PHPMailer; use Psr\Log\LoggerInterface; @@ -32,7 +33,8 @@ class SendMail public function __construct(PHPMailer $mailer, LoggerFactory $loggerFactory) { $this->mailer = $mailer; - $this->logger = $loggerFactory->addFileHandler('sendmail_class.log')->createInstance('sendmail'); + $this->logger = $loggerFactory->addFileHandler('sendmail_class.log', Logger::DEBUG) + ->createInstance('sendmail'); } public function send(): void diff --git a/app/Provider/StoreMail.php b/app/Provider/StoreMail.php index ca8554f..39fd6c0 100644 --- a/app/Provider/StoreMail.php +++ b/app/Provider/StoreMail.php @@ -7,6 +7,7 @@ use App\Factory\LoggerFactory; use App\Model\Email; use Exception; +use Monolog\Logger; use Psr\Log\LoggerInterface; /** @@ -30,8 +31,9 @@ class StoreMail */ public function __construct(LoggerFactory $loggerFactory, Email $email) { - $this->logger = $loggerFactory->addFileHandler('storemail_class.log')->createInstance('storemail'); - $this->email = $email; + $this->logger = $loggerFactory->addFileHandler('storemail_class.log', Logger::DEBUG) + ->createInstance('storemail'); + $this->email = $email; } public function store(): void diff --git a/app/Utility/helpers.php b/app/Utility/helpers.php index 5d5a832..b72ed29 100644 --- a/app/Utility/helpers.php +++ b/app/Utility/helpers.php @@ -21,32 +21,11 @@ function array_clean(array $array, array $keys): array return array_intersect_key($array, array_flip($keys)); } -/** - * @return mixed|string - */ -function get_scheme() -{ - if (isset($_SERVER['REQUEST_SCHEME'])) { - return $_SERVER['REQUEST_SCHEME']; - } - if (isset($_SERVER['HTTPS'])) { - return 'https'; - } - if (isset($_SERVER['REQUEST_URI'])) { - $parsed = parse_url($_SERVER['REQUEST_URI']); - if (!empty($scheme = $parsed['scheme'])) { - return $scheme; - } - } - - return 'http'; -} - /** * @param ContainerInterface $container * - * @throws NotFoundExceptionInterface * @throws ContainerExceptionInterface + * @throws NotFoundExceptionInterface * * @return int */ diff --git a/app/Validation/ValidationRules.php b/app/Validation/ValidationRules.php index 4406bc8..4ad4112 100644 --- a/app/Validation/ValidationRules.php +++ b/app/Validation/ValidationRules.php @@ -67,7 +67,7 @@ public function confirm_password(): array 'required', [ 'lengthMin', - 8, + 12, ], [ 'equals', @@ -129,7 +129,7 @@ public function username(): array 'usernameIsUnique', [ 'lengthMin', - 4, + 5, ], [ 'regex', diff --git a/app/View/TwigMessagesExtension.php b/app/View/TwigMessagesExtension.php index cc366f7..b3b22b2 100644 --- a/app/View/TwigMessagesExtension.php +++ b/app/View/TwigMessagesExtension.php @@ -65,7 +65,7 @@ public function hasMessage(string $key): bool * * @return array|mixed */ - public function getMessages(?string $key = null) + public function getMessages(?string $key = null): mixed { if ($key !== null) { return $this->flash->getMessage($key); diff --git a/app/View/TwigPhpExtension.php b/app/View/TwigPhpExtension.php new file mode 100644 index 0000000..bd8bc1a --- /dev/null +++ b/app/View/TwigPhpExtension.php @@ -0,0 +1,50 @@ +allowFunctions($functions); + } + } + + /** + * @return array + */ + public function getFunctions(): array + { + $twigFunctions = []; + + foreach ($this->functions as $function) { + $twigFunctions[] = new TwigFunction($function, $function); + } + + return $twigFunctions; + } + + /** + * @param array $functions + */ + public function allowFunctions(array $functions): void + { + $this->functions = $functions; + } +} diff --git a/app/View/TwigUtilities.php b/app/View/TwigUtilities.php index b0c3aa8..f91a47d 100644 --- a/app/View/TwigUtilities.php +++ b/app/View/TwigUtilities.php @@ -27,16 +27,16 @@ public function getFunctions(): array */ public function max_mem_usage(bool $real): string { - return human_readable_size(memory_get_peak_usage($real), 2); + return human_readable_size(memory_get_peak_usage($real), 3); } /** - * @return float|int + * @return float */ - public function runtime() + public function runtime(): float { global $startTime; - return round(microtime(true) - $startTime, 5) * 1000; + return round((hrtime(true) - $startTime) / 1e+6, 3); } } diff --git a/bin/utilities.php b/bin/utilities.php index 58f3f43..3a899eb 100644 --- a/bin/utilities.php +++ b/bin/utilities.php @@ -3,6 +3,8 @@ declare(strict_types=1); use Delight\I18n\I18n; +use Psr\Container\ContainerExceptionInterface; +use Psr\Container\NotFoundExceptionInterface; $container = (require __DIR__ . '/../bootstrap/app.php')->getContainer(); @@ -40,11 +42,19 @@ break; case 'clear_cache': - remove_cached_files($container); + try { + remove_cached_files($container); + } catch (NotFoundExceptionInterface|ContainerExceptionInterface $e) { + exit($e->getMessage()); + } break; default: - compile_twig_templates($container); + try { + compile_twig_templates($container); + } catch (NotFoundExceptionInterface|ContainerExceptionInterface $e) { + exit($e->getMessage()); + } break; } diff --git a/bootstrap/app.php b/bootstrap/app.php index d6f95c1..59be41b 100644 --- a/bootstrap/app.php +++ b/bootstrap/app.php @@ -9,7 +9,7 @@ use Slim\App; use UMA\RedisSessionHandler; -$startTime = microtime(true); +$startTime = hrtime(true); require __DIR__ . '/../vendor/autoload.php'; require __DIR__ . '/../config/constants.php'; diff --git a/bootstrap/container.php b/bootstrap/container.php index 4d70a52..9a60c9f 100644 --- a/bootstrap/container.php +++ b/bootstrap/container.php @@ -6,6 +6,7 @@ use App\Middleware\CheckSettingsMiddleware; use App\View\CsrfExtension; use App\View\TwigMessagesExtension; +use App\View\TwigPhpExtension; use App\View\TwigUtilities; use Cartalyst\Sentinel\Native\Facades\Sentinel; use Darkalchemy\Twig\TwigTranslationExtension; @@ -96,6 +97,7 @@ ]); $twig->addExtension(new WebpackExtension($settings['webpack']['manifest'], PUBLIC_DIR)); $twig->addExtension(new TwigUtilities()); + $twig->addExtension(new TwigPhpExtension()); $twig->addExtension(new CsrfExtension($container->get(Guard::class))); $twig->addExtension(new TwigMessagesExtension($container->get(Messages::class))); $twig->addExtension(new TwigTranslationExtension($container->get(I18n::class))); diff --git a/composer.json b/composer.json index fa1e21e..c421aa0 100644 --- a/composer.json +++ b/composer.json @@ -11,43 +11,43 @@ "homepage": "https://github.com/darkalchemy/slim-auth", "license": "MIT", "require": { - "php": "^7.4 || ^8.0", + "php": "^8.0", "ext-gettext": "*", "ext-intl": "*", "ext-json": "*", "ext-pdo": "*", - "cartalyst/sentinel": "^5.0", + "cartalyst/sentinel": "^v5.1.0", "darkalchemy/twig-translate": "^0.3.0", - "delight-im/i18n": "^1.0", - "egulias/email-validator": "^3.1", - "fullpipe/twig-webpack-extension": "^4.0", - "hellogerard/jobby": "^3.5", - "illuminate/database": "^8.0", - "illuminate/events": "^8.0", - "middlewares/trailing-slash": "^2.0", - "monolog/monolog": "^2.1", - "nyholm/psr7": "^1.3", - "nyholm/psr7-server": "^1.0", - "odan/session": "^5.1", - "php-di/slim-bridge": "^3.0", - "phpmailer/phpmailer": "^6.1", - "robmorgan/phinx": "^0.12.3", - "selective/config": "^1.0", - "slim/csrf": "^1.0", + "delight-im/i18n": "^v1.1.0", + "egulias/email-validator": "^3.1.2", + "fullpipe/twig-webpack-extension": "^v4.0.1", + "hellogerard/jobby": "^v3.5.0", + "illuminate/database": "^v8.9.0", + "illuminate/events": "^v8.9.0", + "middlewares/trailing-slash": "^v2.0.1", + "monolog/monolog": "^2.3.5", + "nyholm/psr7": "^1.4.1", + "nyholm/psr7-server": "^1.0.2", + "odan/session": "^5.1.0", + "php-di/slim-bridge": "^3.2.0", + "phpmailer/phpmailer": "^v6.5.3", + "robmorgan/phinx": "^0.12.10", + "selective/config": "^1.1.0", + "slim/csrf": "^1.2.1", "slim/flash": "^0.4.0", - "slim/slim": "^4.5", - "slim/twig-view": "^3.1", - "symfony/http-foundation": "^5.1 || ^6.0", - "uma/redis-session-handler": "^0.9.7", - "umpirsky/composer-permissions-handler": "dev-master", - "vlucas/valitron": "^1.4", - "zeuxisoo/slim-whoops": "^0.7.2" + "slim/slim": "^4.9.0", + "slim/twig-view": "^3.3.0", + "symfony/http-foundation": "^v6.0.2", + "uma/redis-session-handler": "^v0.9.9", + "umpirsky/composer-permissions-handler": "^v1.7", + "vlucas/valitron": "v1.4.10", + "zeuxisoo/slim-whoops": "^0.7.3" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^3.5", - "overtrue/phplint": "^3.0 || ^4.0", - "phpstan/phpstan": "^1.4", - "symfony/var-dumper": "^5.0 || ^6.0" + "friendsofphp/php-cs-fixer": "^v3.5.0", + "overtrue/phplint": "^4.1.0", + "phpstan/phpstan": "^1.4.2", + "symfony/var-dumper": "^v6.0.2" }, "autoload": { "psr-4": { @@ -100,11 +100,5 @@ "var/tmp", "resources/views/cache/" ] - }, - "repositories": [ - { - "type": "vcs", - "url": "https://github.com/darkalchemy/PermissionsHandler.git" - } - ] + } } diff --git a/config/constants.php b/config/constants.php index d959596..393d1e5 100644 --- a/config/constants.php +++ b/config/constants.php @@ -3,21 +3,21 @@ declare(strict_types=1); define('ROOT_DIR', dirname(__DIR__) . DIRECTORY_SEPARATOR); -const CONFIG_DIR = ROOT_DIR . 'config' . DIRECTORY_SEPARATOR; -const BOOTSTRAP_DIR = ROOT_DIR . 'bootstrap' . DIRECTORY_SEPARATOR; -const ROUTES_DIR = ROOT_DIR . 'routes' . DIRECTORY_SEPARATOR; -const VAR_DIR = ROOT_DIR . 'var' . DIRECTORY_SEPARATOR; -const CACHE_DIR = VAR_DIR . 'cache' . DIRECTORY_SEPARATOR; -const LOGS_DIR = VAR_DIR . 'logs' . DIRECTORY_SEPARATOR; -const PROXIES_DIR = VAR_DIR . 'proxies' . DIRECTORY_SEPARATOR; -const RESOURCES_DIR = ROOT_DIR . 'resources' . DIRECTORY_SEPARATOR; -const DATABASE_DIR = ROOT_DIR . 'database' . DIRECTORY_SEPARATOR; -const VIEWS_DIR = RESOURCES_DIR . 'views' . DIRECTORY_SEPARATOR; -const PUBLIC_DIR = ROOT_DIR . 'public' . DIRECTORY_SEPARATOR; -const VENDOR_DIR = ROOT_DIR . 'vendor' . DIRECTORY_SEPARATOR; -const PUBLIC_RESOURCES_DIR = PUBLIC_DIR . 'resources' . DIRECTORY_SEPARATOR; -const LOCALE_DIR = ROOT_DIR . 'locale' . DIRECTORY_SEPARATOR; +const CONFIG_DIR = ROOT_DIR . 'config' . DIRECTORY_SEPARATOR; +const BOOTSTRAP_DIR = ROOT_DIR . 'bootstrap' . DIRECTORY_SEPARATOR; +const ROUTES_DIR = ROOT_DIR . 'routes' . DIRECTORY_SEPARATOR; +const VAR_DIR = ROOT_DIR . 'var' . DIRECTORY_SEPARATOR; +const CACHE_DIR = VAR_DIR . 'cache' . DIRECTORY_SEPARATOR; +const LOGS_DIR = VAR_DIR . 'logs' . DIRECTORY_SEPARATOR; +const PROXIES_DIR = VAR_DIR . 'proxies' . DIRECTORY_SEPARATOR; +const RESOURCES_DIR = ROOT_DIR . 'resources' . DIRECTORY_SEPARATOR; +const DATABASE_DIR = ROOT_DIR . 'database' . DIRECTORY_SEPARATOR; +const VIEWS_DIR = RESOURCES_DIR . 'views' . DIRECTORY_SEPARATOR; +const PUBLIC_DIR = ROOT_DIR . 'public' . DIRECTORY_SEPARATOR; +const VENDOR_DIR = ROOT_DIR . 'vendor' . DIRECTORY_SEPARATOR; +const PUBLIC_RESOURCES_DIR = PUBLIC_DIR . 'resources' . DIRECTORY_SEPARATOR; +const LOCALE_DIR = ROOT_DIR . 'locale' . DIRECTORY_SEPARATOR; -const ENV = 'DEVELOPMENT'; // DEVELOPMENT or PRODUCTION -const SITE_NAME = 'Slim-Auth'; -const SESSION_HANDLER = 'files'; // files, redis, memcached +const ENV = 'DEVELOPMENT'; // DEVELOPMENT or PRODUCTION +const SITE_NAME = 'Slim-Auth'; +const SESSION_HANDLER = 'files'; // files, redis, memcached diff --git a/config/sentinel.php b/config/sentinel.php index 15d3ed1..0c63633 100644 --- a/config/sentinel.php +++ b/config/sentinel.php @@ -43,7 +43,7 @@ | */ - 'cookie' => (get_scheme() === 'https' ? '__Secure-' : '') . 'Sentinel', + 'cookie' => 'Sentinel', /* |-------------------------------------------------------------------------- diff --git a/config/settings.example.php b/config/settings.example.php index 39c0589..7a0e4e8 100644 --- a/config/settings.example.php +++ b/config/settings.example.php @@ -2,8 +2,6 @@ declare(strict_types=1); -use Monolog\Logger; - date_default_timezone_set('UTC'); ini_set('default_charset', 'utf-8'); ini_set('max_execution_time', '300'); @@ -68,9 +66,8 @@ 'manifest' => PUBLIC_RESOURCES_DIR . 'manifest.json', ], 'logger' => [ - 'name' => 'simple', - 'path' => LOGS_DIR, - 'level' => Logger::DEBUG, + 'name' => 'simple', + 'path' => LOGS_DIR, ], 'mail' => [ 'smtp_enable' => false, diff --git a/package-lock.json b/package-lock.json index d2a6f89..903ba19 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "Monday", + "name": "Slim-Auth", "lockfileVersion": 2, "requires": true, "packages": { @@ -25,11 +25,11 @@ "postcss-preset-env": "^7.2.3", "purgecss-webpack-plugin": "^4.1.3", "sass-loader": "^12.4.0", - "stylelint": "^14.2.0", + "stylelint": "^14.3.0", "stylelint-config-standard": "^24.0.0", "stylelint-webpack-plugin": "^3.1.1", "webpack": "^5.67.0", - "webpack-cli": "^4.9.1", + "webpack-cli": "^4.9.2", "webpack-manifest-plugin": "^4.1.1" } }, @@ -437,9 +437,9 @@ } }, "node_modules/@babel/highlight": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.7.tgz", - "integrity": "sha512-aKpPMfLvGO3Q97V0qhw/V2SWNWlwfJknuwAunU7wZLSfrM4xTBvg7E5opUVi1kJTBKihE38CPg4nBiqX83PWYw==", + "version": "7.16.10", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.10.tgz", + "integrity": "sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw==", "dev": true, "dependencies": { "@babel/helper-validator-identifier": "^7.16.7", @@ -1868,9 +1868,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "17.0.8", - "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.8.tgz", - "integrity": "sha512-YofkM6fGv4gDJq78g4j0mMuGMkZVxZDgtU0JRdx6FgiJDG+0fY0GKVolOV8WqVmEhLCXkQRjwDdKyPxJp/uucg==", + "version": "17.0.10", + "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.10.tgz", + "integrity": "sha512-S/3xB4KzyFxYGCppyDt68yzBU9ysL88lSdIah4D6cptdcltc4NCPCAMc0+PCpg/lLIyC7IPvj2Z52OJWeIUkog==", "dev": true }, "node_modules/@types/normalize-package-data": { @@ -2032,9 +2032,9 @@ } }, "node_modules/@webpack-cli/configtest": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.1.0.tgz", - "integrity": "sha512-ttOkEkoalEHa7RaFYpM0ErK1xc4twg3Am9hfHhL7MVqlHebnkYd2wuI/ZqTDj0cVzZho6PdinY0phFZV3O0Mzg==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.1.1.tgz", + "integrity": "sha512-1FBc1f9G4P/AxMqIgfZgeOTuRnwZMten8E7zap5zgpPInnCrP8D4Q81+4CWIch8i/Nf7nXjP0v6CjjbHOrXhKg==", "dev": true, "peerDependencies": { "webpack": "4.x.x || 5.x.x", @@ -2042,9 +2042,9 @@ } }, "node_modules/@webpack-cli/info": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.4.0.tgz", - "integrity": "sha512-F6b+Man0rwE4n0409FyAJHStYA5OIZERxmnUfLVwv0mc0V1wLad3V7jqRlMkgKBeAq07jUvglacNaa6g9lOpuw==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.4.1.tgz", + "integrity": "sha512-PKVGmazEq3oAo46Q63tpMr4HipI3OPfP7LiNOEJg963RMgT0rqheag28NCML0o3GIzA3DmxP1ZIAv9oTX1CUIA==", "dev": true, "dependencies": { "envinfo": "^7.7.3" @@ -2054,9 +2054,9 @@ } }, "node_modules/@webpack-cli/serve": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.6.0.tgz", - "integrity": "sha512-ZkVeqEmRpBV2GHvjjUZqEai2PpUbuq8Bqd//vEYsp63J8WyexI8ppCqVS3Zs0QADf6aWuPdU+0XsPI647PVlQA==", + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.6.1.tgz", + "integrity": "sha512-gNGTiTrjEVQ0OcVnzsRSqTxaBSr+dmTfm+qJsCDluky8uhdLWep7Gcr62QsAKHTMxjCS/8nEITsmFAhfIx+QSw==", "dev": true, "peerDependencies": { "webpack-cli": "4.x.x" @@ -2218,12 +2218,6 @@ "ajv": "^6.9.1" } }, - "node_modules/alphanum-sort": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz", - "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=", - "dev": true - }, "node_modules/ansi-regex": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", @@ -2678,9 +2672,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001299", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001299.tgz", - "integrity": "sha512-iujN4+x7QzqA2NCSrS5VUy+4gLmRd4xv6vbBBsmfVqTx8bLAD8097euLqQgKxSVLvxjSDcvF1T/i9ocgnUFexw==", + "version": "1.0.30001301", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001301.tgz", + "integrity": "sha512-csfD/GpHMqgEL3V3uIgosvh+SVIQvCh43SNu9HRbP1lnxkKm1kjDG4f32PP571JplkLjfS+mg2p1gxR7MYrrIA==", "dev": true, "funding": { "type": "opencollective", @@ -3290,12 +3284,12 @@ } }, "node_modules/cssnano": { - "version": "5.0.15", - "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.0.15.tgz", - "integrity": "sha512-ppZsS7oPpi2sfiyV5+i+NbB/3GtQ+ab2Vs1azrZaXWujUSN4o+WdTxlCZIMcT9yLW3VO/5yX3vpyDaQ1nIn8CQ==", + "version": "5.0.16", + "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.0.16.tgz", + "integrity": "sha512-ryhRI9/B9VFCwPbb1z60LLK5/ldoExi7nwdnJzpkLZkm2/r7j2X3jfY+ZvDVJhC/0fPZlrAguYdHNFg0iglPKQ==", "dev": true, "dependencies": { - "cssnano-preset-default": "^5.1.10", + "cssnano-preset-default": "^5.1.11", "lilconfig": "^2.0.3", "yaml": "^1.10.2" }, @@ -3311,40 +3305,40 @@ } }, "node_modules/cssnano-preset-default": { - "version": "5.1.10", - "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.1.10.tgz", - "integrity": "sha512-BcpSzUVygHMOnp9uG5rfPzTOCb0GAHQkqtUQx8j1oMNF9A1Q8hziOOhiM4bdICpmrBIU85BE64RD5XGYsVQZNA==", + "version": "5.1.11", + "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.1.11.tgz", + "integrity": "sha512-ETet5hqHxmzQq2ynXMOQofKuLm7VOjMiOB7E2zdtm/hSeCKlD9fabzIUV4GoPcRyJRHi+4kGf0vsfGYbQ4nmPw==", "dev": true, "dependencies": { "css-declaration-sorter": "^6.0.3", - "cssnano-utils": "^3.0.0", + "cssnano-utils": "^3.0.1", "postcss-calc": "^8.2.0", - "postcss-colormin": "^5.2.3", - "postcss-convert-values": "^5.0.2", - "postcss-discard-comments": "^5.0.1", - "postcss-discard-duplicates": "^5.0.1", - "postcss-discard-empty": "^5.0.1", - "postcss-discard-overridden": "^5.0.2", - "postcss-merge-longhand": "^5.0.4", - "postcss-merge-rules": "^5.0.4", - "postcss-minify-font-values": "^5.0.2", - "postcss-minify-gradients": "^5.0.4", - "postcss-minify-params": "^5.0.3", - "postcss-minify-selectors": "^5.1.1", - "postcss-normalize-charset": "^5.0.1", + "postcss-colormin": "^5.2.4", + "postcss-convert-values": "^5.0.3", + "postcss-discard-comments": "^5.0.2", + "postcss-discard-duplicates": "^5.0.2", + "postcss-discard-empty": "^5.0.2", + "postcss-discard-overridden": "^5.0.3", + "postcss-merge-longhand": "^5.0.5", + "postcss-merge-rules": "^5.0.5", + "postcss-minify-font-values": "^5.0.3", + "postcss-minify-gradients": "^5.0.5", + "postcss-minify-params": "^5.0.4", + "postcss-minify-selectors": "^5.1.2", + "postcss-normalize-charset": "^5.0.2", "postcss-normalize-display-values": "^5.0.2", - "postcss-normalize-positions": "^5.0.2", - "postcss-normalize-repeat-style": "^5.0.2", - "postcss-normalize-string": "^5.0.2", + "postcss-normalize-positions": "^5.0.3", + "postcss-normalize-repeat-style": "^5.0.3", + "postcss-normalize-string": "^5.0.3", "postcss-normalize-timing-functions": "^5.0.2", - "postcss-normalize-unicode": "^5.0.2", + "postcss-normalize-unicode": "^5.0.3", "postcss-normalize-url": "^5.0.4", - "postcss-normalize-whitespace": "^5.0.2", - "postcss-ordered-values": "^5.0.3", + "postcss-normalize-whitespace": "^5.0.3", + "postcss-ordered-values": "^5.0.4", "postcss-reduce-initial": "^5.0.2", - "postcss-reduce-transforms": "^5.0.2", + "postcss-reduce-transforms": "^5.0.3", "postcss-svgo": "^5.0.3", - "postcss-unique-selectors": "^5.0.2" + "postcss-unique-selectors": "^5.0.3" }, "engines": { "node": "^10 || ^12 || >=14.0" @@ -3354,9 +3348,9 @@ } }, "node_modules/cssnano-utils": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.0.0.tgz", - "integrity": "sha512-Pzs7/BZ6OgT+tXXuF12DKR8SmSbzUeVYCtMBbS8lI0uAm3mrYmkyqCXXPsQESI6kmLfEVBppbdVY/el3hg3nAA==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.0.1.tgz", + "integrity": "sha512-VNCHL364lh++/ono+S3j9NlUK+d97KNkxI77NlqZU2W3xd2/qmyN61dsa47pTpb55zuU4G4lI7qFjAXZJH1OAQ==", "dev": true, "engines": { "node": "^10 || ^12 || >=14.0" @@ -3587,9 +3581,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.4.46", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.46.tgz", - "integrity": "sha512-UtV0xUA/dibCKKP2JMxOpDtXR74zABevuUEH4K0tvduFSIoxRVcYmQsbB51kXsFTX8MmOyWMt8tuZAlmDOqkrQ==", + "version": "1.4.51", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.51.tgz", + "integrity": "sha512-JNEmcYl3mk1tGQmy0EvL5eik/CKSBuzAyGP0QFdG6LIgxQe3II0BL1m2zKc2MZMf3uGqHWE1TFddJML0RpjSHQ==", "dev": true }, "node_modules/emoji-regex": { @@ -5689,9 +5683,9 @@ "dev": true }, "node_modules/negotiator": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", - "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==", + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", + "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", "dev": true, "engines": { "node": ">= 0.6" @@ -6379,9 +6373,9 @@ } }, "node_modules/postcss-colormin": { - "version": "5.2.3", - "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.2.3.tgz", - "integrity": "sha512-dra4xoAjub2wha6RUXAgadHEn2lGxbj8drhFcIGLOMn914Eu7DkPUurugDXgstwttCYkJtZ/+PkWRWdp3UHRIA==", + "version": "5.2.4", + "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.2.4.tgz", + "integrity": "sha512-rYlC5015aNqVQt/B6Cy156g7sH5tRUJGmT9xeagYthtKehetbKx7jHxhyLpulP4bs4vbp8u/B2rac0J7S7qPQg==", "dev": true, "dependencies": { "browserslist": "^4.16.6", @@ -6397,12 +6391,12 @@ } }, "node_modules/postcss-convert-values": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.0.2.tgz", - "integrity": "sha512-KQ04E2yadmfa1LqXm7UIDwW1ftxU/QWZmz6NKnHnUvJ3LEYbbcX6i329f/ig+WnEByHegulocXrECaZGLpL8Zg==", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.0.3.tgz", + "integrity": "sha512-fVkjHm2T0PSMqXUCIhHNWVGjhB9mHEWX2GboVs7j3iCgr6FpIl9c/IdXy0PHWZSQ9LFTRgmj98amxJE6KOnlsA==", "dev": true, "dependencies": { - "postcss-value-parser": "^4.1.0" + "postcss-value-parser": "^4.2.0" }, "engines": { "node": "^10 || ^12 || >=14.0" @@ -6424,9 +6418,9 @@ } }, "node_modules/postcss-custom-properties": { - "version": "12.1.2", - "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-12.1.2.tgz", - "integrity": "sha512-Zvd+k66PHBYYPiXtdjNVx2l54Y9kQC7K1eUHzBND97RW/ayNxfaPOW+9NL3r0nsVbX1asPLdkDj585Wg0NBJCA==", + "version": "12.1.3", + "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-12.1.3.tgz", + "integrity": "sha512-rtu3otIeY532PnEuuBrIIe+N+pcdbX/7JMZfrcL09wc78YayrHw5E8UkDfvnlOhEUrI4ptCuzXQfj+Or6spbGA==", "dev": true, "dependencies": { "postcss-value-parser": "^4.2.0" @@ -6469,9 +6463,9 @@ } }, "node_modules/postcss-discard-comments": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.0.1.tgz", - "integrity": "sha512-lgZBPTDvWrbAYY1v5GYEv8fEO/WhKOu/hmZqmCYfrpD6eyDWWzAOsl2rF29lpvziKO02Gc5GJQtlpkTmakwOWg==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.0.2.tgz", + "integrity": "sha512-6VQ3pYTsJHEsN2Bic88Aa7J/Brn4Bv8j/rqaFQZkH+pcVkKYwxCIvoMQkykEW7fBjmofdTnQgcivt5CCBJhtrg==", "dev": true, "engines": { "node": "^10 || ^12 || >=14.0" @@ -6481,9 +6475,9 @@ } }, "node_modules/postcss-discard-duplicates": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.0.1.tgz", - "integrity": "sha512-svx747PWHKOGpAXXQkCc4k/DsWo+6bc5LsVrAsw+OU+Ibi7klFZCyX54gjYzX4TH+f2uzXjRviLARxkMurA2bA==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.0.2.tgz", + "integrity": "sha512-LKY81YjUjc78p6rbXIsnppsaFo8XzCoMZkXVILJU//sK0DgPkPSpuq/cZvHss3EtdKvWNYgWzQL+wiJFtEET4g==", "dev": true, "engines": { "node": "^10 || ^12 || >=14.0" @@ -6493,9 +6487,9 @@ } }, "node_modules/postcss-discard-empty": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.0.1.tgz", - "integrity": "sha512-vfU8CxAQ6YpMxV2SvMcMIyF2LX1ZzWpy0lqHDsOdaKKLQVQGVP1pzhrI9JlsO65s66uQTfkQBKBD/A5gp9STFw==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.0.2.tgz", + "integrity": "sha512-SxBsbTjlsKUvZLL+dMrdWauuNZU8TBq5IOL/DHa6jBUSXFEwmDqeXRfTIK/FQpPTa8MJMxEHjSV3UbiuyLARPQ==", "dev": true, "engines": { "node": "^10 || ^12 || >=14.0" @@ -6505,9 +6499,9 @@ } }, "node_modules/postcss-discard-overridden": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.0.2.tgz", - "integrity": "sha512-+56BLP6NSSUuWUXjRgAQuho1p5xs/hU5Sw7+xt9S3JSg+7R6+WMGnJW7Hre/6tTuZ2xiXMB42ObkiZJ2hy/Pew==", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.0.3.tgz", + "integrity": "sha512-yRTXknIZA4k8Yo4FiF1xbsLj/VBxfXEWxJNIrtIy6HC9KQ4xJxcPtoaaskh6QptCGrrcGnhKsTsENTRPZOBu4g==", "dev": true, "engines": { "node": "^10 || ^12 || >=14.0" @@ -6704,13 +6698,13 @@ "dev": true }, "node_modules/postcss-merge-longhand": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.0.4.tgz", - "integrity": "sha512-2lZrOVD+d81aoYkZDpWu6+3dTAAGkCKbV5DoRhnIR7KOULVrI/R7bcMjhrH9KTRy6iiHKqmtG+n/MMj1WmqHFw==", + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.0.5.tgz", + "integrity": "sha512-R2BCPJJ/U2oh1uTWEYn9CcJ7MMcQ1iIbj9wfr2s/zHu5om5MP/ewKdaunpfJqR1WYzqCsgnXuRoVXPAzxdqy8g==", "dev": true, "dependencies": { - "postcss-value-parser": "^4.1.0", - "stylehacks": "^5.0.1" + "postcss-value-parser": "^4.2.0", + "stylehacks": "^5.0.2" }, "engines": { "node": "^10 || ^12 || >=14.0" @@ -6720,14 +6714,14 @@ } }, "node_modules/postcss-merge-rules": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.0.4.tgz", - "integrity": "sha512-yOj7bW3NxlQxaERBB0lEY1sH5y+RzevjbdH4DBJurjKERNpknRByFNdNe+V72i5pIZL12woM9uGdS5xbSB+kDQ==", + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.0.5.tgz", + "integrity": "sha512-3Oa26/Pb9VOFVksJjFG45SNoe4nhGvJ2Uc6TlRimqF8uhfOCEhVCaJ3rvEat5UFOn2UZqTY5Da8dFgCh3Iq0Ug==", "dev": true, "dependencies": { "browserslist": "^4.16.6", "caniuse-api": "^3.0.0", - "cssnano-utils": "^3.0.0", + "cssnano-utils": "^3.0.1", "postcss-selector-parser": "^6.0.5" }, "engines": { @@ -6738,9 +6732,9 @@ } }, "node_modules/postcss-minify-font-values": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.0.2.tgz", - "integrity": "sha512-R6MJZryq28Cw0AmnyhXrM7naqJZZLoa1paBltIzh2wM7yb4D45TLur+eubTQ4jCmZU9SGeZdWsc5KcSoqTMeTg==", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.0.3.tgz", + "integrity": "sha512-bC45rVzEwsLhv/cL1eCjoo2OOjbSk9I7HKFBYnBvtyuIZlf7uMipMATXtA0Fc3jwPo3wuPIW1jRJWKzflMh1sA==", "dev": true, "dependencies": { "postcss-value-parser": "^4.2.0" @@ -6753,13 +6747,13 @@ } }, "node_modules/postcss-minify-gradients": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.0.4.tgz", - "integrity": "sha512-RVwZA7NC4R4J76u8X0Q0j+J7ItKUWAeBUJ8oEEZWmtv3Xoh19uNJaJwzNpsydQjk6PkuhRrK+YwwMf+c+68EYg==", + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.0.5.tgz", + "integrity": "sha512-/YjvXs8PepsoiZAIpjstOO4IHKwFAqYNqbA1yVdqklM84tbUUneh6omJxGlRlF3mi6K5Pa067Mg6IwqEnYC8Zg==", "dev": true, "dependencies": { "colord": "^2.9.1", - "cssnano-utils": "^3.0.0", + "cssnano-utils": "^3.0.1", "postcss-value-parser": "^4.2.0" }, "engines": { @@ -6770,14 +6764,13 @@ } }, "node_modules/postcss-minify-params": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.0.3.tgz", - "integrity": "sha512-NY92FUikE+wralaiVexFd5gwb7oJTIDhgTNeIw89i1Ymsgt4RWiPXfz3bg7hDy4NL6gepcThJwOYNtZO/eNi7Q==", + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.0.4.tgz", + "integrity": "sha512-Z0vjod9lRZEmEPfEmA2sCfjbfEEFKefMD3RDIQSUfXK4LpCyWkX1CniUgyNvnjJFLDPSxtgKzozhHhPHKoeGkg==", "dev": true, "dependencies": { - "alphanum-sort": "^1.0.2", "browserslist": "^4.16.6", - "cssnano-utils": "^3.0.0", + "cssnano-utils": "^3.0.1", "postcss-value-parser": "^4.2.0" }, "engines": { @@ -6788,12 +6781,11 @@ } }, "node_modules/postcss-minify-selectors": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.1.1.tgz", - "integrity": "sha512-TOzqOPXt91O2luJInaVPiivh90a2SIK5Nf1Ea7yEIM/5w+XA5BGrZGUSW8aEx9pJ/oNj7ZJBhjvigSiBV+bC1Q==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.1.2.tgz", + "integrity": "sha512-gpn1nJDMCf3g32y/7kl+jsdamhiYT+/zmEt57RoT9GmzlixBNRPohI7k8UIHelLABhdLf3MSZhtM33xuH5eQOQ==", "dev": true, "dependencies": { - "alphanum-sort": "^1.0.2", "postcss-selector-parser": "^6.0.5" }, "engines": { @@ -6878,9 +6870,9 @@ } }, "node_modules/postcss-normalize-charset": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.0.1.tgz", - "integrity": "sha512-6J40l6LNYnBdPSk+BHZ8SF+HAkS4q2twe5jnocgd+xWpz/mx/5Sa32m3W1AA8uE8XaXN+eg8trIlfu8V9x61eg==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.0.2.tgz", + "integrity": "sha512-fEMhYXzO8My+gC009qDc/3bgnFP8Fv1Ic8uw4ec4YTlhIOw63tGPk1YFd7fk9bZUf1DAbkhiL/QPWs9JLqdF2g==", "dev": true, "engines": { "node": "^10 || ^12 || >=14.0" @@ -6905,9 +6897,9 @@ } }, "node_modules/postcss-normalize-positions": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.0.2.tgz", - "integrity": "sha512-tqghWFVDp2btqFg1gYob1etPNxXLNh3uVeWgZE2AQGh6b2F8AK2Gj36v5Vhyh+APwIzNjmt6jwZ9pTBP+/OM8g==", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.0.3.tgz", + "integrity": "sha512-U+rmhjrNBvIGYqr/1tD4wXPFFMKUbXsYXvlUCzLi0tOCUS6LoeEAnmVXXJY/MEB/1CKZZwBSs2tmzGawcygVBA==", "dev": true, "dependencies": { "postcss-value-parser": "^4.2.0" @@ -6920,9 +6912,9 @@ } }, "node_modules/postcss-normalize-repeat-style": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.0.2.tgz", - "integrity": "sha512-/rIZn8X9bBzC7KvY4iKUhXUGW3MmbXwfPF23jC9wT9xTi7kAvgj8sEgwxjixBmoL6MVa4WOgxNz2hAR6wTK8tw==", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.0.3.tgz", + "integrity": "sha512-uk1+xYx0AMbA3nLSNhbDrqbf/rx+Iuq5tVad2VNyaxxJzx79oGieJ6D9F6AfOL2GtiIbP7vTYlpYHtG+ERFXTg==", "dev": true, "dependencies": { "postcss-value-parser": "^4.2.0" @@ -6935,9 +6927,9 @@ } }, "node_modules/postcss-normalize-string": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.0.2.tgz", - "integrity": "sha512-zaI1yzwL+a/FkIzUWMQoH25YwCYxi917J4pYm1nRXtdgiCdnlTkx5eRzqWEC64HtRa06WCJ9TIutpb6GmW4gFw==", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.0.3.tgz", + "integrity": "sha512-Mf2V4JbIDboNGQhW6xW0YREDiYXoX3WrD3EjKkjvnpAJ6W4qqjLnK/c9aioyVFaWWHVdP5zVRw/9DI5S3oLDFw==", "dev": true, "dependencies": { "postcss-value-parser": "^4.2.0" @@ -6965,9 +6957,9 @@ } }, "node_modules/postcss-normalize-unicode": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.0.2.tgz", - "integrity": "sha512-3y/V+vjZ19HNcTizeqwrbZSUsE69ZMRHfiiyLAJb7C7hJtYmM4Gsbajy7gKagu97E8q5rlS9k8FhojA8cpGhWw==", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.0.3.tgz", + "integrity": "sha512-uNC7BmS/7h6to2UWa4RFH8sOTzu2O9dVWPE/F9Vm9GdhONiD/c1kNaCLbmsFHlKWcEx7alNUChQ+jH/QAlqsQw==", "dev": true, "dependencies": { "browserslist": "^4.16.6", @@ -6997,9 +6989,9 @@ } }, "node_modules/postcss-normalize-whitespace": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.0.2.tgz", - "integrity": "sha512-CXBx+9fVlzSgbk0IXA/dcZn9lXixnQRndnsPC5ht3HxlQ1bVh77KQDL1GffJx1LTzzfae8ftMulsjYmO2yegxA==", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.0.3.tgz", + "integrity": "sha512-333JWRnX655fSoUbufJ10HJop3c8mrpKkCCUnEmgz/Cb/QEtW+/TMZwDAUt4lnwqP6tCCk0x0b58jqvDgiQm/A==", "dev": true, "dependencies": { "postcss-value-parser": "^4.2.0" @@ -7012,12 +7004,12 @@ } }, "node_modules/postcss-ordered-values": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.0.3.tgz", - "integrity": "sha512-T9pDS+P9bWeFvqivXd5ACzQmrCmHjv3ZP+djn8E1UZY7iK79pFSm7i3WbKw2VSmFmdbMm8sQ12OPcNpzBo3Z2w==", + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.0.4.tgz", + "integrity": "sha512-taKtGDZtyYUMVYkg+MuJeBUiTF6cGHZmo/qcW7ibvW79UlyKuSHbo6dpCIiqI+j9oJsXWzP+ovIxoyLDOeQFdw==", "dev": true, "dependencies": { - "cssnano-utils": "^3.0.0", + "cssnano-utils": "^3.0.1", "postcss-value-parser": "^4.2.0" }, "engines": { @@ -7142,9 +7134,9 @@ } }, "node_modules/postcss-reduce-transforms": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.0.2.tgz", - "integrity": "sha512-25HeDeFsgiPSUx69jJXZn8I06tMxLQJJNF5h7i9gsUg8iP4KOOJ8EX8fj3seeoLt3SLU2YDD6UPnDYVGUO7DEA==", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.0.3.tgz", + "integrity": "sha512-yDnTUab5i7auHiNwdcL1f+pBnqQFf+7eC4cbC7D8Lc1FkvNZhtpkdad+9U4wDdFb84haupMf0rA/Zc5LcTe/3A==", "dev": true, "dependencies": { "postcss-value-parser": "^4.2.0" @@ -7200,9 +7192,9 @@ } }, "node_modules/postcss-selector-parser": { - "version": "6.0.8", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.8.tgz", - "integrity": "sha512-D5PG53d209Z1Uhcc0qAZ5U3t5HagH3cxu+WLZ22jt3gLUpXM4eXXfiO14jiDWST3NNooX/E8wISfOhZ9eIjGTQ==", + "version": "6.0.9", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.9.tgz", + "integrity": "sha512-UO3SgnZOVTwu4kyLR22UQ1xZh086RyNZppb7lLAKBFK8a32ttG5i87Y/P3+2bRSjZNyJ1B7hfFNo273tKe9YxQ==", "dev": true, "dependencies": { "cssesc": "^3.0.0", @@ -7229,12 +7221,11 @@ } }, "node_modules/postcss-unique-selectors": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.0.2.tgz", - "integrity": "sha512-w3zBVlrtZm7loQWRPVC0yjUwwpty7OM6DnEHkxcSQXO1bMS3RJ+JUS5LFMSDZHJcvGsRwhZinCWVqn8Kej4EDA==", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.0.3.tgz", + "integrity": "sha512-V5tX2hadSSn+miVCluuK1IDGy+7jAXSOfRZ2DQ+s/4uQZb/orDYBjH0CHgFrXsRw78p4QTuEFA9kI6C956UnHQ==", "dev": true, "dependencies": { - "alphanum-sort": "^1.0.2", "postcss-selector-parser": "^6.0.5" }, "engines": { @@ -7631,12 +7622,12 @@ } }, "node_modules/resolve": { - "version": "1.21.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.21.0.tgz", - "integrity": "sha512-3wCbTpk5WJlyE4mSOtDLhqQmGFi0/TD9VPwmiolnk8U0wRgMEktqCXd3vy5buTO3tljvalNvKrjHEfrd2WpEKA==", + "version": "1.22.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz", + "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==", "dev": true, "dependencies": { - "is-core-module": "^2.8.0", + "is-core-module": "^2.8.1", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, @@ -8008,9 +7999,9 @@ } }, "node_modules/source-map-js": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.1.tgz", - "integrity": "sha512-4+TN2b3tqOCd/kaGRJ/sTYA0tR0mdXx26ipdolxcwtJVqEnqNYvlCAt1q3ypy4QMlYus+Zh34RNtYLoq2oQ4IA==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", + "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", "dev": true, "engines": { "node": ">=0.10.0" @@ -8247,12 +8238,12 @@ "dev": true }, "node_modules/stylehacks": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.0.1.tgz", - "integrity": "sha512-Es0rVnHIqbWzveU1b24kbw92HsebBepxfcqe5iix7t9j0PQqhs0IxXVXv0pY2Bxa08CgMkzD6OWql7kbGOuEdA==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.0.2.tgz", + "integrity": "sha512-114zeJdOpTrbQYRD4OU5UWJ99LKUaqCPJTU1HQ/n3q3BwmllFN8kHENaLnOeqVq6AhXrWfxHNZTl33iJ4oy3cQ==", "dev": true, "dependencies": { - "browserslist": "^4.16.0", + "browserslist": "^4.16.6", "postcss-selector-parser": "^6.0.4" }, "engines": { @@ -8263,9 +8254,9 @@ } }, "node_modules/stylelint": { - "version": "14.2.0", - "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.2.0.tgz", - "integrity": "sha512-i0DrmDXFNpDsWiwx6SPRs4/pyw4kvZgqpDGvsTslQMY7hpUl6r33aQvNSn6cnTg2wtZ9rreFElI7XAKpOWi1vQ==", + "version": "14.3.0", + "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.3.0.tgz", + "integrity": "sha512-PZXSwtJe4f4qBPWBwAbHL0M0Qjrv8iHN+cLpUNsffaVMS3YzpDDRI73+2lsqLAYfQEzxRwpll6BDKImREbpHWA==", "dev": true, "dependencies": { "balanced-match": "^2.0.0", @@ -8273,12 +8264,12 @@ "cosmiconfig": "^7.0.1", "debug": "^4.3.3", "execall": "^2.0.0", - "fast-glob": "^3.2.7", + "fast-glob": "^3.2.11", "fastest-levenshtein": "^1.0.12", "file-entry-cache": "^6.0.1", "get-stdin": "^8.0.0", "global-modules": "^2.0.0", - "globby": "^11.0.4", + "globby": "^11.1.0", "globjoin": "^0.1.4", "html-tags": "^3.1.0", "ignore": "^5.2.0", @@ -8292,21 +8283,22 @@ "normalize-path": "^3.0.0", "normalize-selector": "^0.2.0", "picocolors": "^1.0.0", - "postcss": "^8.3.11", + "postcss": "^8.4.5", "postcss-media-query-parser": "^0.2.3", "postcss-resolve-nested-selector": "^0.1.1", "postcss-safe-parser": "^6.0.0", - "postcss-selector-parser": "^6.0.7", - "postcss-value-parser": "^4.1.0", + "postcss-selector-parser": "^6.0.9", + "postcss-value-parser": "^4.2.0", "resolve-from": "^5.0.0", "specificity": "^0.4.1", "string-width": "^4.2.3", "strip-ansi": "^6.0.1", "style-search": "^0.1.0", + "supports-hyperlinks": "^2.2.0", "svg-tags": "^1.0.0", - "table": "^6.7.5", + "table": "^6.8.0", "v8-compile-cache": "^2.3.0", - "write-file-atomic": "^3.0.3" + "write-file-atomic": "^4.0.0" }, "bin": { "stylelint": "bin/stylelint.js" @@ -8514,6 +8506,40 @@ "node": ">=4" } }, + "node_modules/supports-hyperlinks": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz", + "integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0", + "supports-color": "^7.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/supports-hyperlinks/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/supports-hyperlinks/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/supports-preserve-symlinks-flag": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", @@ -8834,13 +8860,24 @@ } }, "node_modules/typedarray-to-buffer": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", - "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-4.0.0.tgz", + "integrity": "sha512-6dOYeZfS3O9RtRD1caom0sMxgK59b27+IwoNy8RDPsmslSGOyU+mpTamlaIW7aNKi90ZQZ9DFaZL3YRoiSCULQ==", "dev": true, - "dependencies": { - "is-typedarray": "^1.0.0" - } + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] }, "node_modules/unicode-canonical-property-names-ecmascript": { "version": "2.0.0", @@ -9016,15 +9053,15 @@ } }, "node_modules/webpack-cli": { - "version": "4.9.1", - "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.9.1.tgz", - "integrity": "sha512-JYRFVuyFpzDxMDB+v/nanUdQYcZtqFPGzmlW4s+UkPMFhSpfRNmf1z4AwYcHJVdvEFAM7FFCQdNTpsBYhDLusQ==", + "version": "4.9.2", + "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.9.2.tgz", + "integrity": "sha512-m3/AACnBBzK/kMTcxWHcZFPrw/eQuY4Df1TxvIWfWM2x7mRqBQCqKEd96oCUa9jkapLBaFfRce33eGDb4Pr7YQ==", "dev": true, "dependencies": { "@discoveryjs/json-ext": "^0.5.0", - "@webpack-cli/configtest": "^1.1.0", - "@webpack-cli/info": "^1.4.0", - "@webpack-cli/serve": "^1.6.0", + "@webpack-cli/configtest": "^1.1.1", + "@webpack-cli/info": "^1.4.1", + "@webpack-cli/serve": "^1.6.1", "colorette": "^2.0.14", "commander": "^7.0.0", "execa": "^5.0.0", @@ -9263,15 +9300,18 @@ "dev": true }, "node_modules/write-file-atomic": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", - "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.0.tgz", + "integrity": "sha512-JhcWoKffJNF7ivO9yflBhc7tn3wKnokMUfWpBriM9yCXj4ePQnRPcWglBkkg1AHC8nsW/EfxwwhqsLtOy59djA==", "dev": true, "dependencies": { "imurmurhash": "^0.1.4", "is-typedarray": "^1.0.0", "signal-exit": "^3.0.2", - "typedarray-to-buffer": "^3.1.5" + "typedarray-to-buffer": "^4.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16" } }, "node_modules/y18n": { @@ -9640,9 +9680,9 @@ } }, "@babel/highlight": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.7.tgz", - "integrity": "sha512-aKpPMfLvGO3Q97V0qhw/V2SWNWlwfJknuwAunU7wZLSfrM4xTBvg7E5opUVi1kJTBKihE38CPg4nBiqX83PWYw==", + "version": "7.16.10", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.10.tgz", + "integrity": "sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.16.7", @@ -10639,9 +10679,9 @@ "dev": true }, "@types/node": { - "version": "17.0.8", - "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.8.tgz", - "integrity": "sha512-YofkM6fGv4gDJq78g4j0mMuGMkZVxZDgtU0JRdx6FgiJDG+0fY0GKVolOV8WqVmEhLCXkQRjwDdKyPxJp/uucg==", + "version": "17.0.10", + "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.10.tgz", + "integrity": "sha512-S/3xB4KzyFxYGCppyDt68yzBU9ysL88lSdIah4D6cptdcltc4NCPCAMc0+PCpg/lLIyC7IPvj2Z52OJWeIUkog==", "dev": true }, "@types/normalize-package-data": { @@ -10803,25 +10843,25 @@ } }, "@webpack-cli/configtest": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.1.0.tgz", - "integrity": "sha512-ttOkEkoalEHa7RaFYpM0ErK1xc4twg3Am9hfHhL7MVqlHebnkYd2wuI/ZqTDj0cVzZho6PdinY0phFZV3O0Mzg==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.1.1.tgz", + "integrity": "sha512-1FBc1f9G4P/AxMqIgfZgeOTuRnwZMten8E7zap5zgpPInnCrP8D4Q81+4CWIch8i/Nf7nXjP0v6CjjbHOrXhKg==", "dev": true, "requires": {} }, "@webpack-cli/info": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.4.0.tgz", - "integrity": "sha512-F6b+Man0rwE4n0409FyAJHStYA5OIZERxmnUfLVwv0mc0V1wLad3V7jqRlMkgKBeAq07jUvglacNaa6g9lOpuw==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.4.1.tgz", + "integrity": "sha512-PKVGmazEq3oAo46Q63tpMr4HipI3OPfP7LiNOEJg963RMgT0rqheag28NCML0o3GIzA3DmxP1ZIAv9oTX1CUIA==", "dev": true, "requires": { "envinfo": "^7.7.3" } }, "@webpack-cli/serve": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.6.0.tgz", - "integrity": "sha512-ZkVeqEmRpBV2GHvjjUZqEai2PpUbuq8Bqd//vEYsp63J8WyexI8ppCqVS3Zs0QADf6aWuPdU+0XsPI647PVlQA==", + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.6.1.tgz", + "integrity": "sha512-gNGTiTrjEVQ0OcVnzsRSqTxaBSr+dmTfm+qJsCDluky8uhdLWep7Gcr62QsAKHTMxjCS/8nEITsmFAhfIx+QSw==", "dev": true, "requires": {} }, @@ -10941,12 +10981,6 @@ "dev": true, "requires": {} }, - "alphanum-sort": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz", - "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=", - "dev": true - }, "ansi-regex": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", @@ -11284,9 +11318,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001299", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001299.tgz", - "integrity": "sha512-iujN4+x7QzqA2NCSrS5VUy+4gLmRd4xv6vbBBsmfVqTx8bLAD8097euLqQgKxSVLvxjSDcvF1T/i9ocgnUFexw==", + "version": "1.0.30001301", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001301.tgz", + "integrity": "sha512-csfD/GpHMqgEL3V3uIgosvh+SVIQvCh43SNu9HRbP1lnxkKm1kjDG4f32PP571JplkLjfS+mg2p1gxR7MYrrIA==", "dev": true }, "caseless": { @@ -11721,57 +11755,57 @@ "dev": true }, "cssnano": { - "version": "5.0.15", - "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.0.15.tgz", - "integrity": "sha512-ppZsS7oPpi2sfiyV5+i+NbB/3GtQ+ab2Vs1azrZaXWujUSN4o+WdTxlCZIMcT9yLW3VO/5yX3vpyDaQ1nIn8CQ==", + "version": "5.0.16", + "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.0.16.tgz", + "integrity": "sha512-ryhRI9/B9VFCwPbb1z60LLK5/ldoExi7nwdnJzpkLZkm2/r7j2X3jfY+ZvDVJhC/0fPZlrAguYdHNFg0iglPKQ==", "dev": true, "requires": { - "cssnano-preset-default": "^5.1.10", + "cssnano-preset-default": "^5.1.11", "lilconfig": "^2.0.3", "yaml": "^1.10.2" } }, "cssnano-preset-default": { - "version": "5.1.10", - "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.1.10.tgz", - "integrity": "sha512-BcpSzUVygHMOnp9uG5rfPzTOCb0GAHQkqtUQx8j1oMNF9A1Q8hziOOhiM4bdICpmrBIU85BE64RD5XGYsVQZNA==", + "version": "5.1.11", + "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.1.11.tgz", + "integrity": "sha512-ETet5hqHxmzQq2ynXMOQofKuLm7VOjMiOB7E2zdtm/hSeCKlD9fabzIUV4GoPcRyJRHi+4kGf0vsfGYbQ4nmPw==", "dev": true, "requires": { "css-declaration-sorter": "^6.0.3", - "cssnano-utils": "^3.0.0", + "cssnano-utils": "^3.0.1", "postcss-calc": "^8.2.0", - "postcss-colormin": "^5.2.3", - "postcss-convert-values": "^5.0.2", - "postcss-discard-comments": "^5.0.1", - "postcss-discard-duplicates": "^5.0.1", - "postcss-discard-empty": "^5.0.1", - "postcss-discard-overridden": "^5.0.2", - "postcss-merge-longhand": "^5.0.4", - "postcss-merge-rules": "^5.0.4", - "postcss-minify-font-values": "^5.0.2", - "postcss-minify-gradients": "^5.0.4", - "postcss-minify-params": "^5.0.3", - "postcss-minify-selectors": "^5.1.1", - "postcss-normalize-charset": "^5.0.1", + "postcss-colormin": "^5.2.4", + "postcss-convert-values": "^5.0.3", + "postcss-discard-comments": "^5.0.2", + "postcss-discard-duplicates": "^5.0.2", + "postcss-discard-empty": "^5.0.2", + "postcss-discard-overridden": "^5.0.3", + "postcss-merge-longhand": "^5.0.5", + "postcss-merge-rules": "^5.0.5", + "postcss-minify-font-values": "^5.0.3", + "postcss-minify-gradients": "^5.0.5", + "postcss-minify-params": "^5.0.4", + "postcss-minify-selectors": "^5.1.2", + "postcss-normalize-charset": "^5.0.2", "postcss-normalize-display-values": "^5.0.2", - "postcss-normalize-positions": "^5.0.2", - "postcss-normalize-repeat-style": "^5.0.2", - "postcss-normalize-string": "^5.0.2", + "postcss-normalize-positions": "^5.0.3", + "postcss-normalize-repeat-style": "^5.0.3", + "postcss-normalize-string": "^5.0.3", "postcss-normalize-timing-functions": "^5.0.2", - "postcss-normalize-unicode": "^5.0.2", + "postcss-normalize-unicode": "^5.0.3", "postcss-normalize-url": "^5.0.4", - "postcss-normalize-whitespace": "^5.0.2", - "postcss-ordered-values": "^5.0.3", + "postcss-normalize-whitespace": "^5.0.3", + "postcss-ordered-values": "^5.0.4", "postcss-reduce-initial": "^5.0.2", - "postcss-reduce-transforms": "^5.0.2", + "postcss-reduce-transforms": "^5.0.3", "postcss-svgo": "^5.0.3", - "postcss-unique-selectors": "^5.0.2" + "postcss-unique-selectors": "^5.0.3" } }, "cssnano-utils": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.0.0.tgz", - "integrity": "sha512-Pzs7/BZ6OgT+tXXuF12DKR8SmSbzUeVYCtMBbS8lI0uAm3mrYmkyqCXXPsQESI6kmLfEVBppbdVY/el3hg3nAA==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.0.1.tgz", + "integrity": "sha512-VNCHL364lh++/ono+S3j9NlUK+d97KNkxI77NlqZU2W3xd2/qmyN61dsa47pTpb55zuU4G4lI7qFjAXZJH1OAQ==", "dev": true, "requires": {} }, @@ -11940,9 +11974,9 @@ } }, "electron-to-chromium": { - "version": "1.4.46", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.46.tgz", - "integrity": "sha512-UtV0xUA/dibCKKP2JMxOpDtXR74zABevuUEH4K0tvduFSIoxRVcYmQsbB51kXsFTX8MmOyWMt8tuZAlmDOqkrQ==", + "version": "1.4.51", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.51.tgz", + "integrity": "sha512-JNEmcYl3mk1tGQmy0EvL5eik/CKSBuzAyGP0QFdG6LIgxQe3II0BL1m2zKc2MZMf3uGqHWE1TFddJML0RpjSHQ==", "dev": true }, "emoji-regex": { @@ -13534,9 +13568,9 @@ "dev": true }, "negotiator": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", - "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==", + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", + "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", "dev": true }, "neo-async": { @@ -14033,9 +14067,9 @@ } }, "postcss-colormin": { - "version": "5.2.3", - "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.2.3.tgz", - "integrity": "sha512-dra4xoAjub2wha6RUXAgadHEn2lGxbj8drhFcIGLOMn914Eu7DkPUurugDXgstwttCYkJtZ/+PkWRWdp3UHRIA==", + "version": "5.2.4", + "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.2.4.tgz", + "integrity": "sha512-rYlC5015aNqVQt/B6Cy156g7sH5tRUJGmT9xeagYthtKehetbKx7jHxhyLpulP4bs4vbp8u/B2rac0J7S7qPQg==", "dev": true, "requires": { "browserslist": "^4.16.6", @@ -14045,12 +14079,12 @@ } }, "postcss-convert-values": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.0.2.tgz", - "integrity": "sha512-KQ04E2yadmfa1LqXm7UIDwW1ftxU/QWZmz6NKnHnUvJ3LEYbbcX6i329f/ig+WnEByHegulocXrECaZGLpL8Zg==", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.0.3.tgz", + "integrity": "sha512-fVkjHm2T0PSMqXUCIhHNWVGjhB9mHEWX2GboVs7j3iCgr6FpIl9c/IdXy0PHWZSQ9LFTRgmj98amxJE6KOnlsA==", "dev": true, "requires": { - "postcss-value-parser": "^4.1.0" + "postcss-value-parser": "^4.2.0" } }, "postcss-custom-media": { @@ -14061,9 +14095,9 @@ "requires": {} }, "postcss-custom-properties": { - "version": "12.1.2", - "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-12.1.2.tgz", - "integrity": "sha512-Zvd+k66PHBYYPiXtdjNVx2l54Y9kQC7K1eUHzBND97RW/ayNxfaPOW+9NL3r0nsVbX1asPLdkDj585Wg0NBJCA==", + "version": "12.1.3", + "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-12.1.3.tgz", + "integrity": "sha512-rtu3otIeY532PnEuuBrIIe+N+pcdbX/7JMZfrcL09wc78YayrHw5E8UkDfvnlOhEUrI4ptCuzXQfj+Or6spbGA==", "dev": true, "requires": { "postcss-value-parser": "^4.2.0" @@ -14088,30 +14122,30 @@ } }, "postcss-discard-comments": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.0.1.tgz", - "integrity": "sha512-lgZBPTDvWrbAYY1v5GYEv8fEO/WhKOu/hmZqmCYfrpD6eyDWWzAOsl2rF29lpvziKO02Gc5GJQtlpkTmakwOWg==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.0.2.tgz", + "integrity": "sha512-6VQ3pYTsJHEsN2Bic88Aa7J/Brn4Bv8j/rqaFQZkH+pcVkKYwxCIvoMQkykEW7fBjmofdTnQgcivt5CCBJhtrg==", "dev": true, "requires": {} }, "postcss-discard-duplicates": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.0.1.tgz", - "integrity": "sha512-svx747PWHKOGpAXXQkCc4k/DsWo+6bc5LsVrAsw+OU+Ibi7klFZCyX54gjYzX4TH+f2uzXjRviLARxkMurA2bA==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.0.2.tgz", + "integrity": "sha512-LKY81YjUjc78p6rbXIsnppsaFo8XzCoMZkXVILJU//sK0DgPkPSpuq/cZvHss3EtdKvWNYgWzQL+wiJFtEET4g==", "dev": true, "requires": {} }, "postcss-discard-empty": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.0.1.tgz", - "integrity": "sha512-vfU8CxAQ6YpMxV2SvMcMIyF2LX1ZzWpy0lqHDsOdaKKLQVQGVP1pzhrI9JlsO65s66uQTfkQBKBD/A5gp9STFw==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.0.2.tgz", + "integrity": "sha512-SxBsbTjlsKUvZLL+dMrdWauuNZU8TBq5IOL/DHa6jBUSXFEwmDqeXRfTIK/FQpPTa8MJMxEHjSV3UbiuyLARPQ==", "dev": true, "requires": {} }, "postcss-discard-overridden": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.0.2.tgz", - "integrity": "sha512-+56BLP6NSSUuWUXjRgAQuho1p5xs/hU5Sw7+xt9S3JSg+7R6+WMGnJW7Hre/6tTuZ2xiXMB42ObkiZJ2hy/Pew==", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.0.3.tgz", + "integrity": "sha512-yRTXknIZA4k8Yo4FiF1xbsLj/VBxfXEWxJNIrtIy6HC9KQ4xJxcPtoaaskh6QptCGrrcGnhKsTsENTRPZOBu4g==", "dev": true, "requires": {} }, @@ -14233,66 +14267,64 @@ "dev": true }, "postcss-merge-longhand": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.0.4.tgz", - "integrity": "sha512-2lZrOVD+d81aoYkZDpWu6+3dTAAGkCKbV5DoRhnIR7KOULVrI/R7bcMjhrH9KTRy6iiHKqmtG+n/MMj1WmqHFw==", + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.0.5.tgz", + "integrity": "sha512-R2BCPJJ/U2oh1uTWEYn9CcJ7MMcQ1iIbj9wfr2s/zHu5om5MP/ewKdaunpfJqR1WYzqCsgnXuRoVXPAzxdqy8g==", "dev": true, "requires": { - "postcss-value-parser": "^4.1.0", - "stylehacks": "^5.0.1" + "postcss-value-parser": "^4.2.0", + "stylehacks": "^5.0.2" } }, "postcss-merge-rules": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.0.4.tgz", - "integrity": "sha512-yOj7bW3NxlQxaERBB0lEY1sH5y+RzevjbdH4DBJurjKERNpknRByFNdNe+V72i5pIZL12woM9uGdS5xbSB+kDQ==", + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.0.5.tgz", + "integrity": "sha512-3Oa26/Pb9VOFVksJjFG45SNoe4nhGvJ2Uc6TlRimqF8uhfOCEhVCaJ3rvEat5UFOn2UZqTY5Da8dFgCh3Iq0Ug==", "dev": true, "requires": { "browserslist": "^4.16.6", "caniuse-api": "^3.0.0", - "cssnano-utils": "^3.0.0", + "cssnano-utils": "^3.0.1", "postcss-selector-parser": "^6.0.5" } }, "postcss-minify-font-values": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.0.2.tgz", - "integrity": "sha512-R6MJZryq28Cw0AmnyhXrM7naqJZZLoa1paBltIzh2wM7yb4D45TLur+eubTQ4jCmZU9SGeZdWsc5KcSoqTMeTg==", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.0.3.tgz", + "integrity": "sha512-bC45rVzEwsLhv/cL1eCjoo2OOjbSk9I7HKFBYnBvtyuIZlf7uMipMATXtA0Fc3jwPo3wuPIW1jRJWKzflMh1sA==", "dev": true, "requires": { "postcss-value-parser": "^4.2.0" } }, "postcss-minify-gradients": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.0.4.tgz", - "integrity": "sha512-RVwZA7NC4R4J76u8X0Q0j+J7ItKUWAeBUJ8oEEZWmtv3Xoh19uNJaJwzNpsydQjk6PkuhRrK+YwwMf+c+68EYg==", + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.0.5.tgz", + "integrity": "sha512-/YjvXs8PepsoiZAIpjstOO4IHKwFAqYNqbA1yVdqklM84tbUUneh6omJxGlRlF3mi6K5Pa067Mg6IwqEnYC8Zg==", "dev": true, "requires": { "colord": "^2.9.1", - "cssnano-utils": "^3.0.0", + "cssnano-utils": "^3.0.1", "postcss-value-parser": "^4.2.0" } }, "postcss-minify-params": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.0.3.tgz", - "integrity": "sha512-NY92FUikE+wralaiVexFd5gwb7oJTIDhgTNeIw89i1Ymsgt4RWiPXfz3bg7hDy4NL6gepcThJwOYNtZO/eNi7Q==", + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.0.4.tgz", + "integrity": "sha512-Z0vjod9lRZEmEPfEmA2sCfjbfEEFKefMD3RDIQSUfXK4LpCyWkX1CniUgyNvnjJFLDPSxtgKzozhHhPHKoeGkg==", "dev": true, "requires": { - "alphanum-sort": "^1.0.2", "browserslist": "^4.16.6", - "cssnano-utils": "^3.0.0", + "cssnano-utils": "^3.0.1", "postcss-value-parser": "^4.2.0" } }, "postcss-minify-selectors": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.1.1.tgz", - "integrity": "sha512-TOzqOPXt91O2luJInaVPiivh90a2SIK5Nf1Ea7yEIM/5w+XA5BGrZGUSW8aEx9pJ/oNj7ZJBhjvigSiBV+bC1Q==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.1.2.tgz", + "integrity": "sha512-gpn1nJDMCf3g32y/7kl+jsdamhiYT+/zmEt57RoT9GmzlixBNRPohI7k8UIHelLABhdLf3MSZhtM33xuH5eQOQ==", "dev": true, "requires": { - "alphanum-sort": "^1.0.2", "postcss-selector-parser": "^6.0.5" } }, @@ -14342,9 +14374,9 @@ } }, "postcss-normalize-charset": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.0.1.tgz", - "integrity": "sha512-6J40l6LNYnBdPSk+BHZ8SF+HAkS4q2twe5jnocgd+xWpz/mx/5Sa32m3W1AA8uE8XaXN+eg8trIlfu8V9x61eg==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.0.2.tgz", + "integrity": "sha512-fEMhYXzO8My+gC009qDc/3bgnFP8Fv1Ic8uw4ec4YTlhIOw63tGPk1YFd7fk9bZUf1DAbkhiL/QPWs9JLqdF2g==", "dev": true, "requires": {} }, @@ -14358,27 +14390,27 @@ } }, "postcss-normalize-positions": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.0.2.tgz", - "integrity": "sha512-tqghWFVDp2btqFg1gYob1etPNxXLNh3uVeWgZE2AQGh6b2F8AK2Gj36v5Vhyh+APwIzNjmt6jwZ9pTBP+/OM8g==", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.0.3.tgz", + "integrity": "sha512-U+rmhjrNBvIGYqr/1tD4wXPFFMKUbXsYXvlUCzLi0tOCUS6LoeEAnmVXXJY/MEB/1CKZZwBSs2tmzGawcygVBA==", "dev": true, "requires": { "postcss-value-parser": "^4.2.0" } }, "postcss-normalize-repeat-style": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.0.2.tgz", - "integrity": "sha512-/rIZn8X9bBzC7KvY4iKUhXUGW3MmbXwfPF23jC9wT9xTi7kAvgj8sEgwxjixBmoL6MVa4WOgxNz2hAR6wTK8tw==", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.0.3.tgz", + "integrity": "sha512-uk1+xYx0AMbA3nLSNhbDrqbf/rx+Iuq5tVad2VNyaxxJzx79oGieJ6D9F6AfOL2GtiIbP7vTYlpYHtG+ERFXTg==", "dev": true, "requires": { "postcss-value-parser": "^4.2.0" } }, "postcss-normalize-string": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.0.2.tgz", - "integrity": "sha512-zaI1yzwL+a/FkIzUWMQoH25YwCYxi917J4pYm1nRXtdgiCdnlTkx5eRzqWEC64HtRa06WCJ9TIutpb6GmW4gFw==", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.0.3.tgz", + "integrity": "sha512-Mf2V4JbIDboNGQhW6xW0YREDiYXoX3WrD3EjKkjvnpAJ6W4qqjLnK/c9aioyVFaWWHVdP5zVRw/9DI5S3oLDFw==", "dev": true, "requires": { "postcss-value-parser": "^4.2.0" @@ -14394,9 +14426,9 @@ } }, "postcss-normalize-unicode": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.0.2.tgz", - "integrity": "sha512-3y/V+vjZ19HNcTizeqwrbZSUsE69ZMRHfiiyLAJb7C7hJtYmM4Gsbajy7gKagu97E8q5rlS9k8FhojA8cpGhWw==", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.0.3.tgz", + "integrity": "sha512-uNC7BmS/7h6to2UWa4RFH8sOTzu2O9dVWPE/F9Vm9GdhONiD/c1kNaCLbmsFHlKWcEx7alNUChQ+jH/QAlqsQw==", "dev": true, "requires": { "browserslist": "^4.16.6", @@ -14414,21 +14446,21 @@ } }, "postcss-normalize-whitespace": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.0.2.tgz", - "integrity": "sha512-CXBx+9fVlzSgbk0IXA/dcZn9lXixnQRndnsPC5ht3HxlQ1bVh77KQDL1GffJx1LTzzfae8ftMulsjYmO2yegxA==", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.0.3.tgz", + "integrity": "sha512-333JWRnX655fSoUbufJ10HJop3c8mrpKkCCUnEmgz/Cb/QEtW+/TMZwDAUt4lnwqP6tCCk0x0b58jqvDgiQm/A==", "dev": true, "requires": { "postcss-value-parser": "^4.2.0" } }, "postcss-ordered-values": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.0.3.tgz", - "integrity": "sha512-T9pDS+P9bWeFvqivXd5ACzQmrCmHjv3ZP+djn8E1UZY7iK79pFSm7i3WbKw2VSmFmdbMm8sQ12OPcNpzBo3Z2w==", + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.0.4.tgz", + "integrity": "sha512-taKtGDZtyYUMVYkg+MuJeBUiTF6cGHZmo/qcW7ibvW79UlyKuSHbo6dpCIiqI+j9oJsXWzP+ovIxoyLDOeQFdw==", "dev": true, "requires": { - "cssnano-utils": "^3.0.0", + "cssnano-utils": "^3.0.1", "postcss-value-parser": "^4.2.0" } }, @@ -14516,9 +14548,9 @@ } }, "postcss-reduce-transforms": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.0.2.tgz", - "integrity": "sha512-25HeDeFsgiPSUx69jJXZn8I06tMxLQJJNF5h7i9gsUg8iP4KOOJ8EX8fj3seeoLt3SLU2YDD6UPnDYVGUO7DEA==", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.0.3.tgz", + "integrity": "sha512-yDnTUab5i7auHiNwdcL1f+pBnqQFf+7eC4cbC7D8Lc1FkvNZhtpkdad+9U4wDdFb84haupMf0rA/Zc5LcTe/3A==", "dev": true, "requires": { "postcss-value-parser": "^4.2.0" @@ -14554,9 +14586,9 @@ } }, "postcss-selector-parser": { - "version": "6.0.8", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.8.tgz", - "integrity": "sha512-D5PG53d209Z1Uhcc0qAZ5U3t5HagH3cxu+WLZ22jt3gLUpXM4eXXfiO14jiDWST3NNooX/E8wISfOhZ9eIjGTQ==", + "version": "6.0.9", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.9.tgz", + "integrity": "sha512-UO3SgnZOVTwu4kyLR22UQ1xZh086RyNZppb7lLAKBFK8a32ttG5i87Y/P3+2bRSjZNyJ1B7hfFNo273tKe9YxQ==", "dev": true, "requires": { "cssesc": "^3.0.0", @@ -14574,12 +14606,11 @@ } }, "postcss-unique-selectors": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.0.2.tgz", - "integrity": "sha512-w3zBVlrtZm7loQWRPVC0yjUwwpty7OM6DnEHkxcSQXO1bMS3RJ+JUS5LFMSDZHJcvGsRwhZinCWVqn8Kej4EDA==", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.0.3.tgz", + "integrity": "sha512-V5tX2hadSSn+miVCluuK1IDGy+7jAXSOfRZ2DQ+s/4uQZb/orDYBjH0CHgFrXsRw78p4QTuEFA9kI6C956UnHQ==", "dev": true, "requires": { - "alphanum-sort": "^1.0.2", "postcss-selector-parser": "^6.0.5" } }, @@ -14886,12 +14917,12 @@ "dev": true }, "resolve": { - "version": "1.21.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.21.0.tgz", - "integrity": "sha512-3wCbTpk5WJlyE4mSOtDLhqQmGFi0/TD9VPwmiolnk8U0wRgMEktqCXd3vy5buTO3tljvalNvKrjHEfrd2WpEKA==", + "version": "1.22.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz", + "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==", "dev": true, "requires": { - "is-core-module": "^2.8.0", + "is-core-module": "^2.8.1", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" } @@ -15146,9 +15177,9 @@ "dev": true }, "source-map-js": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.1.tgz", - "integrity": "sha512-4+TN2b3tqOCd/kaGRJ/sTYA0tR0mdXx26ipdolxcwtJVqEnqNYvlCAt1q3ypy4QMlYus+Zh34RNtYLoq2oQ4IA==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", + "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", "dev": true }, "source-map-support": { @@ -15339,19 +15370,19 @@ "dev": true }, "stylehacks": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.0.1.tgz", - "integrity": "sha512-Es0rVnHIqbWzveU1b24kbw92HsebBepxfcqe5iix7t9j0PQqhs0IxXVXv0pY2Bxa08CgMkzD6OWql7kbGOuEdA==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.0.2.tgz", + "integrity": "sha512-114zeJdOpTrbQYRD4OU5UWJ99LKUaqCPJTU1HQ/n3q3BwmllFN8kHENaLnOeqVq6AhXrWfxHNZTl33iJ4oy3cQ==", "dev": true, "requires": { - "browserslist": "^4.16.0", + "browserslist": "^4.16.6", "postcss-selector-parser": "^6.0.4" } }, "stylelint": { - "version": "14.2.0", - "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.2.0.tgz", - "integrity": "sha512-i0DrmDXFNpDsWiwx6SPRs4/pyw4kvZgqpDGvsTslQMY7hpUl6r33aQvNSn6cnTg2wtZ9rreFElI7XAKpOWi1vQ==", + "version": "14.3.0", + "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.3.0.tgz", + "integrity": "sha512-PZXSwtJe4f4qBPWBwAbHL0M0Qjrv8iHN+cLpUNsffaVMS3YzpDDRI73+2lsqLAYfQEzxRwpll6BDKImREbpHWA==", "dev": true, "requires": { "balanced-match": "^2.0.0", @@ -15359,12 +15390,12 @@ "cosmiconfig": "^7.0.1", "debug": "^4.3.3", "execall": "^2.0.0", - "fast-glob": "^3.2.7", + "fast-glob": "^3.2.11", "fastest-levenshtein": "^1.0.12", "file-entry-cache": "^6.0.1", "get-stdin": "^8.0.0", "global-modules": "^2.0.0", - "globby": "^11.0.4", + "globby": "^11.1.0", "globjoin": "^0.1.4", "html-tags": "^3.1.0", "ignore": "^5.2.0", @@ -15378,21 +15409,22 @@ "normalize-path": "^3.0.0", "normalize-selector": "^0.2.0", "picocolors": "^1.0.0", - "postcss": "^8.3.11", + "postcss": "^8.4.5", "postcss-media-query-parser": "^0.2.3", "postcss-resolve-nested-selector": "^0.1.1", "postcss-safe-parser": "^6.0.0", - "postcss-selector-parser": "^6.0.7", - "postcss-value-parser": "^4.1.0", + "postcss-selector-parser": "^6.0.9", + "postcss-value-parser": "^4.2.0", "resolve-from": "^5.0.0", "specificity": "^0.4.1", "string-width": "^4.2.3", "strip-ansi": "^6.0.1", "style-search": "^0.1.0", + "supports-hyperlinks": "^2.2.0", "svg-tags": "^1.0.0", - "table": "^6.7.5", + "table": "^6.8.0", "v8-compile-cache": "^2.3.0", - "write-file-atomic": "^3.0.3" + "write-file-atomic": "^4.0.0" }, "dependencies": { "array-union": { @@ -15534,6 +15566,33 @@ "has-flag": "^3.0.0" } }, + "supports-hyperlinks": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz", + "integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==", + "dev": true, + "requires": { + "has-flag": "^4.0.0", + "supports-color": "^7.0.0" + }, + "dependencies": { + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, "supports-preserve-symlinks-flag": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", @@ -15762,13 +15821,10 @@ "dev": true }, "typedarray-to-buffer": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", - "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", - "dev": true, - "requires": { - "is-typedarray": "^1.0.0" - } + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-4.0.0.tgz", + "integrity": "sha512-6dOYeZfS3O9RtRD1caom0sMxgK59b27+IwoNy8RDPsmslSGOyU+mpTamlaIW7aNKi90ZQZ9DFaZL3YRoiSCULQ==", + "dev": true }, "unicode-canonical-property-names-ecmascript": { "version": "2.0.0", @@ -15936,15 +15992,15 @@ } }, "webpack-cli": { - "version": "4.9.1", - "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.9.1.tgz", - "integrity": "sha512-JYRFVuyFpzDxMDB+v/nanUdQYcZtqFPGzmlW4s+UkPMFhSpfRNmf1z4AwYcHJVdvEFAM7FFCQdNTpsBYhDLusQ==", + "version": "4.9.2", + "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.9.2.tgz", + "integrity": "sha512-m3/AACnBBzK/kMTcxWHcZFPrw/eQuY4Df1TxvIWfWM2x7mRqBQCqKEd96oCUa9jkapLBaFfRce33eGDb4Pr7YQ==", "dev": true, "requires": { "@discoveryjs/json-ext": "^0.5.0", - "@webpack-cli/configtest": "^1.1.0", - "@webpack-cli/info": "^1.4.0", - "@webpack-cli/serve": "^1.6.0", + "@webpack-cli/configtest": "^1.1.1", + "@webpack-cli/info": "^1.4.1", + "@webpack-cli/serve": "^1.6.1", "colorette": "^2.0.14", "commander": "^7.0.0", "execa": "^5.0.0", @@ -16081,15 +16137,15 @@ "dev": true }, "write-file-atomic": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", - "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.0.tgz", + "integrity": "sha512-JhcWoKffJNF7ivO9yflBhc7tn3wKnokMUfWpBriM9yCXj4ePQnRPcWglBkkg1AHC8nsW/EfxwwhqsLtOy59djA==", "dev": true, "requires": { "imurmurhash": "^0.1.4", "is-typedarray": "^1.0.0", "signal-exit": "^3.0.2", - "typedarray-to-buffer": "^3.1.5" + "typedarray-to-buffer": "^4.0.0" } }, "y18n": { diff --git a/package.json b/package.json index 0795ae5..73394c3 100644 --- a/package.json +++ b/package.json @@ -25,11 +25,11 @@ "postcss-preset-env": "^7.2.3", "purgecss-webpack-plugin": "^4.1.3", "sass-loader": "^12.4.0", - "stylelint": "^14.2.0", + "stylelint": "^14.3.0", "stylelint-config-standard": "^24.0.0", "stylelint-webpack-plugin": "^3.1.1", "webpack": "^5.67.0", - "webpack-cli": "^4.9.1", + "webpack-cli": "^4.9.2", "webpack-manifest-plugin": "^4.1.1" } } diff --git a/routes/web.php b/routes/web.php index 1895a2f..1be4d29 100644 --- a/routes/web.php +++ b/routes/web.php @@ -20,7 +20,7 @@ return function (App $app) { $app->get('/session', function (ResponseInterface $response) { - $response->getBody()->write(json_encode($_SESSION)); + $response->getBody()->write((string) json_encode($_SESSION)); return $response->withHeader('Content-Type', 'application/json'); });