From 1363bf5bca3892a3af74a69adea5c89b54fb44d1 Mon Sep 17 00:00:00 2001
From: flashwave <me@flash.moe>
Date: Thu, 20 Mar 2025 21:25:39 +0000
Subject: [PATCH] Updated Index.
---
composer.json | 8 +-
composer.lock | 274 +++++++++++++++-----------------
package-lock.json | 259 +++++++++++++++++++-----------
package.json | 2 +-
src/AssetsRoutes.php | 7 +-
src/CSRFPContainer.php | 6 +-
src/DeveloperRoutes.php | 13 +-
src/RoutingContext.php | 10 +-
src/RoutingErrorHandler.php | 20 ++-
src/SSHKeys/SSHKeysRoutes.php | 15 +-
src/Tools/Ascii/AsciiRoutes.php | 11 +-
src/Tools/ToolsRoutes.php | 15 +-
src/Tools/Whois/WhoisRoutes.php | 11 +-
13 files changed, 356 insertions(+), 295 deletions(-)
diff --git a/composer.json b/composer.json
index 3110492..612d787 100644
--- a/composer.json
+++ b/composer.json
@@ -1,9 +1,9 @@
{
"require": {
- "flashwave/index": "^0.2410",
- "erusev/parsedown": "~1.6",
+ "flashwave/index": "^0.2503",
+ "erusev/parsedown": "~1.7",
"sentry/sdk": "^4.0",
- "nesbot/carbon": "^3.7"
+ "nesbot/carbon": "^3.8"
},
"autoload": {
"classmap": [
@@ -17,6 +17,6 @@
"preferred-install": "dist"
},
"require-dev": {
- "phpstan/phpstan": "^1.11"
+ "phpstan/phpstan": "^2.1"
}
}
diff --git a/composer.lock b/composer.lock
index 94b4ee4..342adc0 100644
--- a/composer.lock
+++ b/composer.lock
@@ -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": "95007e8e6950a46ba5ccde993824d8ca",
+ "content-hash": "ac6c95ded3b66e81fc4310d17149cc25",
"packages": [
{
"name": "carbonphp/carbon-doctrine-types",
@@ -127,21 +127,23 @@
},
{
"name": "flashwave/index",
- "version": "v0.2410.630140",
+ "version": "v0.2503.201929",
"source": {
"type": "git",
"url": "https://patchii.net/flash/index.git",
- "reference": "469391f9b601bf30553252470f175588744d4c18"
+ "reference": "1ba9e8fa34fbd30c84c23b2a9b6beb2152ca54f0"
},
"require": {
"ext-mbstring": "*",
- "php": ">=8.3",
- "twig/html-extra": "^3.13",
- "twig/twig": "^3.14"
+ "php": ">=8.4",
+ "psr/http-message": "^2.0",
+ "psr/http-server-handler": "^1.0",
+ "twig/html-extra": "^3.20",
+ "twig/twig": "^3.20"
},
"require-dev": {
- "phpstan/phpstan": "^2.0",
- "phpunit/phpunit": "^11.4"
+ "phpstan/phpstan": "^2.1",
+ "phpunit/phpunit": "^12.0"
},
"suggest": {
"ext-memcache": "Support for the Index\\Cache\\Memcached namespace (only if you can't use ext-memcached for some reason).",
@@ -178,7 +180,7 @@
],
"description": "Composer package for the common library for my projects.",
"homepage": "https://railgun.sh/index",
- "time": "2024-12-02T01:41:44+00:00"
+ "time": "2025-03-20T19:29:51+00:00"
},
{
"name": "guzzlehttp/psr7",
@@ -298,16 +300,16 @@
},
{
"name": "jean85/pretty-package-versions",
- "version": "2.1.0",
+ "version": "2.1.1",
"source": {
"type": "git",
"url": "https://github.com/Jean85/pretty-package-versions.git",
- "reference": "3c4e5f62ba8d7de1734312e4fff32f67a8daaf10"
+ "reference": "4d7aa5dab42e2a76d99559706022885de0e18e1a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Jean85/pretty-package-versions/zipball/3c4e5f62ba8d7de1734312e4fff32f67a8daaf10",
- "reference": "3c4e5f62ba8d7de1734312e4fff32f67a8daaf10",
+ "url": "https://api.github.com/repos/Jean85/pretty-package-versions/zipball/4d7aa5dab42e2a76d99559706022885de0e18e1a",
+ "reference": "4d7aa5dab42e2a76d99559706022885de0e18e1a",
"shasum": ""
},
"require": {
@@ -317,8 +319,9 @@
"require-dev": {
"friendsofphp/php-cs-fixer": "^3.2",
"jean85/composer-provided-replaced-stub-package": "^1.0",
- "phpstan/phpstan": "^1.4",
+ "phpstan/phpstan": "^2.0",
"phpunit/phpunit": "^7.5|^8.5|^9.6",
+ "rector/rector": "^2.0",
"vimeo/psalm": "^4.3 || ^5.0"
},
"type": "library",
@@ -351,22 +354,22 @@
],
"support": {
"issues": "https://github.com/Jean85/pretty-package-versions/issues",
- "source": "https://github.com/Jean85/pretty-package-versions/tree/2.1.0"
+ "source": "https://github.com/Jean85/pretty-package-versions/tree/2.1.1"
},
- "time": "2024-11-18T16:19:46+00:00"
+ "time": "2025-03-19T14:43:43+00:00"
},
{
"name": "nesbot/carbon",
- "version": "3.8.2",
+ "version": "3.8.6",
"source": {
"type": "git",
- "url": "https://github.com/briannesbitt/Carbon.git",
- "reference": "e1268cdbc486d97ce23fef2c666dc3c6b6de9947"
+ "url": "https://github.com/CarbonPHP/carbon.git",
+ "reference": "ff2f20cf83bd4d503720632ce8a426dc747bf7fd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/e1268cdbc486d97ce23fef2c666dc3c6b6de9947",
- "reference": "e1268cdbc486d97ce23fef2c666dc3c6b6de9947",
+ "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/ff2f20cf83bd4d503720632ce8a426dc747bf7fd",
+ "reference": "ff2f20cf83bd4d503720632ce8a426dc747bf7fd",
"shasum": ""
},
"require": {
@@ -398,10 +401,6 @@
],
"type": "library",
"extra": {
- "branch-alias": {
- "dev-master": "3.x-dev",
- "dev-2.x": "2.x-dev"
- },
"laravel": {
"providers": [
"Carbon\\Laravel\\ServiceProvider"
@@ -411,6 +410,10 @@
"includes": [
"extension.neon"
]
+ },
+ "branch-alias": {
+ "dev-2.x": "2.x-dev",
+ "dev-master": "3.x-dev"
}
},
"autoload": {
@@ -442,8 +445,8 @@
],
"support": {
"docs": "https://carbon.nesbot.com/docs",
- "issues": "https://github.com/briannesbitt/Carbon/issues",
- "source": "https://github.com/briannesbitt/Carbon"
+ "issues": "https://github.com/CarbonPHP/carbon/issues",
+ "source": "https://github.com/CarbonPHP/carbon"
},
"funding": [
{
@@ -459,7 +462,7 @@
"type": "tidelift"
}
],
- "time": "2024-11-07T17:46:48+00:00"
+ "time": "2025-02-20T17:33:38+00:00"
},
{
"name": "psr/clock",
@@ -617,6 +620,62 @@
},
"time": "2023-04-04T09:54:51+00:00"
},
+ {
+ "name": "psr/http-server-handler",
+ "version": "1.0.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/php-fig/http-server-handler.git",
+ "reference": "84c4fb66179be4caaf8e97bd239203245302e7d4"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/php-fig/http-server-handler/zipball/84c4fb66179be4caaf8e97bd239203245302e7d4",
+ "reference": "84c4fb66179be4caaf8e97bd239203245302e7d4",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=7.0",
+ "psr/http-message": "^1.0 || ^2.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Psr\\Http\\Server\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "PHP-FIG",
+ "homepage": "https://www.php-fig.org/"
+ }
+ ],
+ "description": "Common interface for HTTP server-side request handler",
+ "keywords": [
+ "handler",
+ "http",
+ "http-interop",
+ "psr",
+ "psr-15",
+ "psr-7",
+ "request",
+ "response",
+ "server"
+ ],
+ "support": {
+ "source": "https://github.com/php-fig/http-server-handler/tree/1.0.2"
+ },
+ "time": "2023-04-10T20:06:20+00:00"
+ },
{
"name": "psr/log",
"version": "3.0.2",
@@ -948,12 +1007,12 @@
},
"type": "library",
"extra": {
+ "thanks": {
+ "url": "https://github.com/symfony/contracts",
+ "name": "symfony/contracts"
+ },
"branch-alias": {
"dev-main": "3.5-dev"
- },
- "thanks": {
- "name": "symfony/contracts",
- "url": "https://github.com/symfony/contracts"
}
},
"autoload": {
@@ -998,16 +1057,16 @@
},
{
"name": "symfony/mime",
- "version": "v7.2.1",
+ "version": "v7.2.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/mime.git",
- "reference": "7f9617fcf15cb61be30f8b252695ed5e2bfac283"
+ "reference": "87ca22046b78c3feaff04b337f33b38510fd686b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/mime/zipball/7f9617fcf15cb61be30f8b252695ed5e2bfac283",
- "reference": "7f9617fcf15cb61be30f8b252695ed5e2bfac283",
+ "url": "https://api.github.com/repos/symfony/mime/zipball/87ca22046b78c3feaff04b337f33b38510fd686b",
+ "reference": "87ca22046b78c3feaff04b337f33b38510fd686b",
"shasum": ""
},
"require": {
@@ -1062,7 +1121,7 @@
"mime-type"
],
"support": {
- "source": "https://github.com/symfony/mime/tree/v7.2.1"
+ "source": "https://github.com/symfony/mime/tree/v7.2.4"
},
"funding": [
{
@@ -1078,7 +1137,7 @@
"type": "tidelift"
}
],
- "time": "2024-12-07T08:50:44+00:00"
+ "time": "2025-02-19T08:51:20+00:00"
},
{
"name": "symfony/options-resolver",
@@ -1470,82 +1529,6 @@
],
"time": "2024-09-09T11:45:10+00:00"
},
- {
- "name": "symfony/polyfill-php81",
- "version": "v1.31.0",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/polyfill-php81.git",
- "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c",
- "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c",
- "shasum": ""
- },
- "require": {
- "php": ">=7.2"
- },
- "type": "library",
- "extra": {
- "thanks": {
- "url": "https://github.com/symfony/polyfill",
- "name": "symfony/polyfill"
- }
- },
- "autoload": {
- "files": [
- "bootstrap.php"
- ],
- "psr-4": {
- "Symfony\\Polyfill\\Php81\\": ""
- },
- "classmap": [
- "Resources/stubs"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Nicolas Grekas",
- "email": "p@tchwork.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions",
- "homepage": "https://symfony.com",
- "keywords": [
- "compatibility",
- "polyfill",
- "portable",
- "shim"
- ],
- "support": {
- "source": "https://github.com/symfony/polyfill-php81/tree/v1.31.0"
- },
- "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": "2024-09-09T11:45:10+00:00"
- },
{
"name": "symfony/polyfill-php83",
"version": "v1.31.0",
@@ -1624,16 +1607,16 @@
},
{
"name": "symfony/translation",
- "version": "v7.2.0",
+ "version": "v7.2.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
- "reference": "dc89e16b44048ceecc879054e5b7f38326ab6cc5"
+ "reference": "283856e6981286cc0d800b53bd5703e8e363f05a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/translation/zipball/dc89e16b44048ceecc879054e5b7f38326ab6cc5",
- "reference": "dc89e16b44048ceecc879054e5b7f38326ab6cc5",
+ "url": "https://api.github.com/repos/symfony/translation/zipball/283856e6981286cc0d800b53bd5703e8e363f05a",
+ "reference": "283856e6981286cc0d800b53bd5703e8e363f05a",
"shasum": ""
},
"require": {
@@ -1699,7 +1682,7 @@
"description": "Provides tools to internationalize your application",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/translation/tree/v7.2.0"
+ "source": "https://github.com/symfony/translation/tree/v7.2.4"
},
"funding": [
{
@@ -1715,7 +1698,7 @@
"type": "tidelift"
}
],
- "time": "2024-11-12T20:47:56+00:00"
+ "time": "2025-02-13T10:27:23+00:00"
},
{
"name": "symfony/translation-contracts",
@@ -1736,12 +1719,12 @@
},
"type": "library",
"extra": {
+ "thanks": {
+ "url": "https://github.com/symfony/contracts",
+ "name": "symfony/contracts"
+ },
"branch-alias": {
"dev-main": "3.5-dev"
- },
- "thanks": {
- "name": "symfony/contracts",
- "url": "https://github.com/symfony/contracts"
}
},
"autoload": {
@@ -1797,20 +1780,20 @@
},
{
"name": "twig/html-extra",
- "version": "v3.17.0",
+ "version": "v3.20.0",
"source": {
"type": "git",
"url": "https://github.com/twigphp/html-extra.git",
- "reference": "2086023d3ffc4bae2b1115f715d17f97fd013665"
+ "reference": "f7d54d4de1b64182af745cfb66777f699b599734"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/twigphp/html-extra/zipball/2086023d3ffc4bae2b1115f715d17f97fd013665",
- "reference": "2086023d3ffc4bae2b1115f715d17f97fd013665",
+ "url": "https://api.github.com/repos/twigphp/html-extra/zipball/f7d54d4de1b64182af745cfb66777f699b599734",
+ "reference": "f7d54d4de1b64182af745cfb66777f699b599734",
"shasum": ""
},
"require": {
- "php": ">=8.0.2",
+ "php": ">=8.1.0",
"symfony/deprecation-contracts": "^2.5|^3",
"symfony/mime": "^5.4|^6.4|^7.0",
"twig/twig": "^3.13|^4.0"
@@ -1849,7 +1832,7 @@
"twig"
],
"support": {
- "source": "https://github.com/twigphp/html-extra/tree/v3.17.0"
+ "source": "https://github.com/twigphp/html-extra/tree/v3.20.0"
},
"funding": [
{
@@ -1861,28 +1844,27 @@
"type": "tidelift"
}
],
- "time": "2024-09-30T06:41:48+00:00"
+ "time": "2025-01-31T20:45:36+00:00"
},
{
"name": "twig/twig",
- "version": "v3.17.1",
+ "version": "v3.20.0",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
- "reference": "677ef8da6497a03048192aeeb5aa3018e379ac71"
+ "reference": "3468920399451a384bef53cf7996965f7cd40183"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/twigphp/Twig/zipball/677ef8da6497a03048192aeeb5aa3018e379ac71",
- "reference": "677ef8da6497a03048192aeeb5aa3018e379ac71",
+ "url": "https://api.github.com/repos/twigphp/Twig/zipball/3468920399451a384bef53cf7996965f7cd40183",
+ "reference": "3468920399451a384bef53cf7996965f7cd40183",
"shasum": ""
},
"require": {
- "php": ">=8.0.2",
+ "php": ">=8.1.0",
"symfony/deprecation-contracts": "^2.5|^3",
"symfony/polyfill-ctype": "^1.8",
- "symfony/polyfill-mbstring": "^1.3",
- "symfony/polyfill-php81": "^1.29"
+ "symfony/polyfill-mbstring": "^1.3"
},
"require-dev": {
"phpstan/phpstan": "^2.0",
@@ -1929,7 +1911,7 @@
],
"support": {
"issues": "https://github.com/twigphp/Twig/issues",
- "source": "https://github.com/twigphp/Twig/tree/v3.17.1"
+ "source": "https://github.com/twigphp/Twig/tree/v3.20.0"
},
"funding": [
{
@@ -1941,26 +1923,26 @@
"type": "tidelift"
}
],
- "time": "2024-12-12T09:58:10+00:00"
+ "time": "2025-02-13T08:34:43+00:00"
}
],
"packages-dev": [
{
"name": "phpstan/phpstan",
- "version": "1.12.12",
+ "version": "2.1.8",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
- "reference": "b5ae1b88f471d3fd4ba1aa0046234b5ca3776dd0"
+ "reference": "f9adff3b87c03b12cc7e46a30a524648e497758f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpstan/zipball/b5ae1b88f471d3fd4ba1aa0046234b5ca3776dd0",
- "reference": "b5ae1b88f471d3fd4ba1aa0046234b5ca3776dd0",
+ "url": "https://api.github.com/repos/phpstan/phpstan/zipball/f9adff3b87c03b12cc7e46a30a524648e497758f",
+ "reference": "f9adff3b87c03b12cc7e46a30a524648e497758f",
"shasum": ""
},
"require": {
- "php": "^7.2|^8.0"
+ "php": "^7.4|^8.0"
},
"conflict": {
"phpstan/phpstan-shim": "*"
@@ -2001,7 +1983,7 @@
"type": "github"
}
],
- "time": "2024-11-28T22:13:23+00:00"
+ "time": "2025-03-09T09:30:48+00:00"
}
],
"aliases": [],
diff --git a/package-lock.json b/package-lock.json
index 4989e70..d77c53c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,7 +5,7 @@
"packages": {
"": {
"dependencies": {
- "@railcomm/assproc": "^1.0.0"
+ "@railcomm/assproc": "^1.1.0"
}
},
"node_modules/@jridgewell/gen-mapping": {
@@ -67,27 +67,27 @@
}
},
"node_modules/@railcomm/assproc": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/@railcomm/assproc/-/assproc-1.0.0.tgz",
- "integrity": "sha512-u8BQht9di9yps7eVYYXbUaOeHCcbR8dKNLuc/KZ+E4uhPnFJ414WaIMH6h4QsMbDY7tAFehqFims7zM949nHGg==",
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@railcomm/assproc/-/assproc-1.1.0.tgz",
+ "integrity": "sha512-i5dcFv4XtUsJTAT7PB/rqzN3sPnMYOOFvyRyTt6xlfM/+AFhYXHxbhtcq80UsIBpuWDADXctjZ1Qk9x3AYI96A==",
"license": "BSD-3-Clause",
"dependencies": {
- "@swc/core": "^1.5.25",
- "autoprefixer": "^10.4.19",
- "cssnano": "^7.0.2",
+ "@swc/core": "^1.10.17",
+ "autoprefixer": "^10.4.20",
+ "cssnano": "^7.0.6",
"html-minifier-terser": "^7.2.0",
- "postcss": "^8.4.38"
+ "postcss": "^8.5.2"
}
},
"node_modules/@swc/core": {
- "version": "1.10.1",
- "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.10.1.tgz",
- "integrity": "sha512-rQ4dS6GAdmtzKiCRt3LFVxl37FaY1cgL9kSUTnhQ2xc3fmHOd7jdJK/V4pSZMG1ruGTd0bsi34O2R0Olg9Zo/w==",
+ "version": "1.11.11",
+ "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.11.11.tgz",
+ "integrity": "sha512-pCVY2Wn6dV/labNvssk9b3Owi4WOYsapcbWm90XkIj4xH/56Z6gzja9fsU+4MdPuEfC2Smw835nZHcdCFGyX6A==",
"hasInstallScript": true,
"license": "Apache-2.0",
"dependencies": {
"@swc/counter": "^0.1.3",
- "@swc/types": "^0.1.17"
+ "@swc/types": "^0.1.19"
},
"engines": {
"node": ">=10"
@@ -97,16 +97,16 @@
"url": "https://opencollective.com/swc"
},
"optionalDependencies": {
- "@swc/core-darwin-arm64": "1.10.1",
- "@swc/core-darwin-x64": "1.10.1",
- "@swc/core-linux-arm-gnueabihf": "1.10.1",
- "@swc/core-linux-arm64-gnu": "1.10.1",
- "@swc/core-linux-arm64-musl": "1.10.1",
- "@swc/core-linux-x64-gnu": "1.10.1",
- "@swc/core-linux-x64-musl": "1.10.1",
- "@swc/core-win32-arm64-msvc": "1.10.1",
- "@swc/core-win32-ia32-msvc": "1.10.1",
- "@swc/core-win32-x64-msvc": "1.10.1"
+ "@swc/core-darwin-arm64": "1.11.11",
+ "@swc/core-darwin-x64": "1.11.11",
+ "@swc/core-linux-arm-gnueabihf": "1.11.11",
+ "@swc/core-linux-arm64-gnu": "1.11.11",
+ "@swc/core-linux-arm64-musl": "1.11.11",
+ "@swc/core-linux-x64-gnu": "1.11.11",
+ "@swc/core-linux-x64-musl": "1.11.11",
+ "@swc/core-win32-arm64-msvc": "1.11.11",
+ "@swc/core-win32-ia32-msvc": "1.11.11",
+ "@swc/core-win32-x64-msvc": "1.11.11"
},
"peerDependencies": {
"@swc/helpers": "*"
@@ -118,9 +118,9 @@
}
},
"node_modules/@swc/core-darwin-arm64": {
- "version": "1.10.1",
- "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.10.1.tgz",
- "integrity": "sha512-NyELPp8EsVZtxH/mEqvzSyWpfPJ1lugpTQcSlMduZLj1EASLO4sC8wt8hmL1aizRlsbjCX+r0PyL+l0xQ64/6Q==",
+ "version": "1.11.11",
+ "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.11.11.tgz",
+ "integrity": "sha512-vJcjGVDB8cZH7zyOkC0AfpFYI/7GHKG0NSsH3tpuKrmoAXJyCYspKPGid7FT53EAlWreN7+Pew+bukYf5j+Fmg==",
"cpu": [
"arm64"
],
@@ -134,9 +134,9 @@
}
},
"node_modules/@swc/core-darwin-x64": {
- "version": "1.10.1",
- "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.10.1.tgz",
- "integrity": "sha512-L4BNt1fdQ5ZZhAk5qoDfUnXRabDOXKnXBxMDJ+PWLSxOGBbWE6aJTnu4zbGjJvtot0KM46m2LPAPY8ttknqaZA==",
+ "version": "1.11.11",
+ "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.11.11.tgz",
+ "integrity": "sha512-/N4dGdqEYvD48mCF3QBSycAbbQd3yoZ2YHSzYesQf8usNc2YpIhYqEH3sql02UsxTjEFOJSf1bxZABDdhbSl6A==",
"cpu": [
"x64"
],
@@ -150,9 +150,9 @@
}
},
"node_modules/@swc/core-linux-arm-gnueabihf": {
- "version": "1.10.1",
- "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.10.1.tgz",
- "integrity": "sha512-Y1u9OqCHgvVp2tYQAJ7hcU9qO5brDMIrA5R31rwWQIAKDkJKtv3IlTHF0hrbWk1wPR0ZdngkQSJZple7G+Grvw==",
+ "version": "1.11.11",
+ "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.11.11.tgz",
+ "integrity": "sha512-hsBhKK+wVXdN3x9MrL5GW0yT8o9GxteE5zHAI2HJjRQel3HtW7m5Nvwaq+q8rwMf4YQRd8ydbvwl4iUOZx7i2Q==",
"cpu": [
"arm"
],
@@ -166,9 +166,9 @@
}
},
"node_modules/@swc/core-linux-arm64-gnu": {
- "version": "1.10.1",
- "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.10.1.tgz",
- "integrity": "sha512-tNQHO/UKdtnqjc7o04iRXng1wTUXPgVd8Y6LI4qIbHVoVPwksZydISjMcilKNLKIwOoUQAkxyJ16SlOAeADzhQ==",
+ "version": "1.11.11",
+ "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.11.11.tgz",
+ "integrity": "sha512-YOCdxsqbnn/HMPCNM6nrXUpSndLXMUssGTtzT7ffXqr7WuzRg2e170FVDVQFIkb08E7Ku5uOnnUVAChAJQbMOQ==",
"cpu": [
"arm64"
],
@@ -182,9 +182,9 @@
}
},
"node_modules/@swc/core-linux-arm64-musl": {
- "version": "1.10.1",
- "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.10.1.tgz",
- "integrity": "sha512-x0L2Pd9weQ6n8dI1z1Isq00VHFvpBClwQJvrt3NHzmR+1wCT/gcYl1tp9P5xHh3ldM8Cn4UjWCw+7PaUgg8FcQ==",
+ "version": "1.11.11",
+ "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.11.11.tgz",
+ "integrity": "sha512-nR2tfdQRRzwqR2XYw9NnBk9Fdvff/b8IiJzDL28gRR2QiJWLaE8LsRovtWrzCOYq6o5Uu9cJ3WbabWthLo4jLw==",
"cpu": [
"arm64"
],
@@ -198,9 +198,9 @@
}
},
"node_modules/@swc/core-linux-x64-gnu": {
- "version": "1.10.1",
- "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.10.1.tgz",
- "integrity": "sha512-yyYEwQcObV3AUsC79rSzN9z6kiWxKAVJ6Ntwq2N9YoZqSPYph+4/Am5fM1xEQYf/kb99csj0FgOelomJSobxQA==",
+ "version": "1.11.11",
+ "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.11.11.tgz",
+ "integrity": "sha512-b4gBp5HA9xNWNC5gsYbdzGBJWx4vKSGybGMGOVWWuF+ynx10+0sA/o4XJGuNHm8TEDuNh9YLKf6QkIO8+GPJ1g==",
"cpu": [
"x64"
],
@@ -214,9 +214,9 @@
}
},
"node_modules/@swc/core-linux-x64-musl": {
- "version": "1.10.1",
- "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.10.1.tgz",
- "integrity": "sha512-tcaS43Ydd7Fk7sW5ROpaf2Kq1zR+sI5K0RM+0qYLYYurvsJruj3GhBCaiN3gkzd8m/8wkqNqtVklWaQYSDsyqA==",
+ "version": "1.11.11",
+ "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.11.11.tgz",
+ "integrity": "sha512-dEvqmQVswjNvMBwXNb8q5uSvhWrJLdttBSef3s6UC5oDSwOr00t3RQPzyS3n5qmGJ8UMTdPRmsopxmqaODISdg==",
"cpu": [
"x64"
],
@@ -230,9 +230,9 @@
}
},
"node_modules/@swc/core-win32-arm64-msvc": {
- "version": "1.10.1",
- "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.10.1.tgz",
- "integrity": "sha512-D3Qo1voA7AkbOzQ2UGuKNHfYGKL6eejN8VWOoQYtGHHQi1p5KK/Q7V1ku55oxXBsj79Ny5FRMqiRJpVGad7bjQ==",
+ "version": "1.11.11",
+ "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.11.11.tgz",
+ "integrity": "sha512-aZNZznem9WRnw2FbTqVpnclvl8Q2apOBW2B316gZK+qxbe+ktjOUnYaMhdCG3+BYggyIBDOnaJeQrXbKIMmNdw==",
"cpu": [
"arm64"
],
@@ -246,9 +246,9 @@
}
},
"node_modules/@swc/core-win32-ia32-msvc": {
- "version": "1.10.1",
- "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.10.1.tgz",
- "integrity": "sha512-WalYdFoU3454Og+sDKHM1MrjvxUGwA2oralknXkXL8S0I/8RkWZOB++p3pLaGbTvOO++T+6znFbQdR8KRaa7DA==",
+ "version": "1.11.11",
+ "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.11.11.tgz",
+ "integrity": "sha512-DjeJn/IfjgOddmJ8IBbWuDK53Fqw7UvOz7kyI/728CSdDYC3LXigzj3ZYs4VvyeOt+ZcQZUB2HA27edOifomGw==",
"cpu": [
"ia32"
],
@@ -262,9 +262,9 @@
}
},
"node_modules/@swc/core-win32-x64-msvc": {
- "version": "1.10.1",
- "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.10.1.tgz",
- "integrity": "sha512-JWobfQDbTnoqaIwPKQ3DVSywihVXlQMbDuwik/dDWlj33A8oEHcjPOGs4OqcA3RHv24i+lfCQpM3Mn4FAMfacA==",
+ "version": "1.11.11",
+ "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.11.11.tgz",
+ "integrity": "sha512-Gp/SLoeMtsU4n0uRoKDOlGrRC6wCfifq7bqLwSlAG8u8MyJYJCcwjg7ggm0rhLdC2vbiZ+lLVl3kkETp+JUvKg==",
"cpu": [
"x64"
],
@@ -284,9 +284,9 @@
"license": "Apache-2.0"
},
"node_modules/@swc/types": {
- "version": "0.1.17",
- "resolved": "https://registry.npmjs.org/@swc/types/-/types-0.1.17.tgz",
- "integrity": "sha512-V5gRru+aD8YVyCOMAjMpWR1Ui577DD5KSJsHP8RAxopAH22jFz6GZd/qxqjO6MJHQhcsjvjOFXyDhyLQUnMveQ==",
+ "version": "0.1.19",
+ "resolved": "https://registry.npmjs.org/@swc/types/-/types-0.1.19.tgz",
+ "integrity": "sha512-WkAZaAfj44kh/UFdAQcrMP1I0nwRqpt27u+08LMBYMqmQfwwMofYoMh/48NGkMMRfC4ynpfwRbJuu8ErfNloeA==",
"license": "Apache-2.0",
"dependencies": {
"@swc/counter": "^0.1.3"
@@ -302,9 +302,9 @@
}
},
"node_modules/acorn": {
- "version": "8.14.0",
- "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
- "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
+ "version": "8.14.1",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
+ "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
"license": "MIT",
"bin": {
"acorn": "bin/acorn"
@@ -314,9 +314,9 @@
}
},
"node_modules/autoprefixer": {
- "version": "10.4.20",
- "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.20.tgz",
- "integrity": "sha512-XY25y5xSv/wEoqzDyXXME4AFfkZI0P23z6Fs3YgymDnKJkCGOnkL0iTxCa85UTqaSgfcqyf3UA6+c7wUvx/16g==",
+ "version": "10.4.21",
+ "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.21.tgz",
+ "integrity": "sha512-O+A6LWV5LDHSJD3LjHYoNi4VLsj/Whi7k6zG12xTYaU4cQ8oxQGckXNX8cRHK5yOZ/ppVHe0ZBXGzSV9jXdVbQ==",
"funding": [
{
"type": "opencollective",
@@ -333,11 +333,11 @@
],
"license": "MIT",
"dependencies": {
- "browserslist": "^4.23.3",
- "caniuse-lite": "^1.0.30001646",
+ "browserslist": "^4.24.4",
+ "caniuse-lite": "^1.0.30001702",
"fraction.js": "^4.3.7",
"normalize-range": "^0.1.2",
- "picocolors": "^1.0.1",
+ "picocolors": "^1.1.1",
"postcss-value-parser": "^4.2.0"
},
"bin": {
@@ -357,9 +357,9 @@
"license": "ISC"
},
"node_modules/browserslist": {
- "version": "4.24.3",
- "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.3.tgz",
- "integrity": "sha512-1CPmv8iobE2fyRMV97dAcMVegvvWKxmq94hkLiAkUGwKVTyDLw33K+ZxiFrREKmmps4rIw6grcCFCnTMSZ/YiA==",
+ "version": "4.24.4",
+ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz",
+ "integrity": "sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==",
"funding": [
{
"type": "opencollective",
@@ -417,9 +417,9 @@
}
},
"node_modules/caniuse-lite": {
- "version": "1.0.30001689",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001689.tgz",
- "integrity": "sha512-CmeR2VBycfa+5/jOfnp/NpWPGd06nf1XYiefUvhXFfZE4GkRc9jv+eGPS4nT558WS/8lYCzV8SlANCIPvbWP1g==",
+ "version": "1.0.30001706",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001706.tgz",
+ "integrity": "sha512-3ZczoTApMAZwPKYWmwVbQMFpXBDds3/0VciVoUwPUbldlYyVLmRVuRs/PcUZtHpbLRpzzDvrvnFuREsGt6lUug==",
"funding": [
{
"type": "opencollective",
@@ -679,9 +679,9 @@
}
},
"node_modules/domutils": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz",
- "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==",
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.2.2.tgz",
+ "integrity": "sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==",
"license": "BSD-2-Clause",
"dependencies": {
"dom-serializer": "^2.0.0",
@@ -703,9 +703,9 @@
}
},
"node_modules/electron-to-chromium": {
- "version": "1.5.73",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.73.tgz",
- "integrity": "sha512-8wGNxG9tAG5KhGd3eeA0o6ixhiNdgr0DcHWm85XPCphwZgD1lIEoi6t3VERayWao7SF7AAZTw6oARGJeVjH8Kg==",
+ "version": "1.5.123",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.123.tgz",
+ "integrity": "sha512-refir3NlutEZqlKaBLK0tzlVLe5P2wDKS7UQt/3SpibizgsRAPOsqQC3ffw1nlv3ze5gjRQZYHoPymgVZkplFA==",
"license": "ISC"
},
"node_modules/entities": {
@@ -803,9 +803,9 @@
"license": "CC0-1.0"
},
"node_modules/nanoid": {
- "version": "3.3.8",
- "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
- "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
+ "version": "3.3.11",
+ "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
+ "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
"funding": [
{
"type": "github",
@@ -884,9 +884,9 @@
"license": "ISC"
},
"node_modules/postcss": {
- "version": "8.4.49",
- "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz",
- "integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==",
+ "version": "8.5.3",
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz",
+ "integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==",
"funding": [
{
"type": "opencollective",
@@ -903,7 +903,7 @@
],
"license": "MIT",
"dependencies": {
- "nanoid": "^3.3.7",
+ "nanoid": "^3.3.8",
"picocolors": "^1.1.1",
"source-map-js": "^1.2.1"
},
@@ -912,12 +912,12 @@
}
},
"node_modules/postcss-calc": {
- "version": "10.0.2",
- "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-10.0.2.tgz",
- "integrity": "sha512-DT/Wwm6fCKgpYVI7ZEWuPJ4az8hiEHtCUeYjZXqU7Ou4QqYh1Df2yCQ7Ca6N7xqKPFkxN3fhf+u9KSoOCJNAjg==",
+ "version": "10.1.1",
+ "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-10.1.1.tgz",
+ "integrity": "sha512-NYEsLHh8DgG/PRH2+G9BTuUdtf9ViS+vdoQ0YA5OQdGsfN4ztiwtDWNtBl9EKeqNMFnIu8IKZ0cLxEQ5r5KVMw==",
"license": "MIT",
"dependencies": {
- "postcss-selector-parser": "^6.1.2",
+ "postcss-selector-parser": "^7.0.0",
"postcss-value-parser": "^4.2.0"
},
"engines": {
@@ -976,6 +976,19 @@
"postcss": "^8.4.31"
}
},
+ "node_modules/postcss-discard-comments/node_modules/postcss-selector-parser": {
+ "version": "6.1.2",
+ "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+ "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+ "license": "MIT",
+ "dependencies": {
+ "cssesc": "^3.0.0",
+ "util-deprecate": "^1.0.2"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
"node_modules/postcss-discard-duplicates": {
"version": "7.0.1",
"resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-7.0.1.tgz",
@@ -1046,6 +1059,19 @@
"postcss": "^8.4.31"
}
},
+ "node_modules/postcss-merge-rules/node_modules/postcss-selector-parser": {
+ "version": "6.1.2",
+ "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+ "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+ "license": "MIT",
+ "dependencies": {
+ "cssesc": "^3.0.0",
+ "util-deprecate": "^1.0.2"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
"node_modules/postcss-minify-font-values": {
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-7.0.0.tgz",
@@ -1111,6 +1137,19 @@
"postcss": "^8.4.31"
}
},
+ "node_modules/postcss-minify-selectors/node_modules/postcss-selector-parser": {
+ "version": "6.1.2",
+ "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+ "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+ "license": "MIT",
+ "dependencies": {
+ "cssesc": "^3.0.0",
+ "util-deprecate": "^1.0.2"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
"node_modules/postcss-normalize-charset": {
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-7.0.0.tgz",
@@ -1292,9 +1331,9 @@
}
},
"node_modules/postcss-selector-parser": {
- "version": "6.1.2",
- "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
- "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
+ "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
"license": "MIT",
"dependencies": {
"cssesc": "^3.0.0",
@@ -1335,6 +1374,19 @@
"postcss": "^8.4.31"
}
},
+ "node_modules/postcss-unique-selectors/node_modules/postcss-selector-parser": {
+ "version": "6.1.2",
+ "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+ "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+ "license": "MIT",
+ "dependencies": {
+ "cssesc": "^3.0.0",
+ "util-deprecate": "^1.0.2"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
"node_modules/postcss-value-parser": {
"version": "4.2.0",
"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
@@ -1394,6 +1446,19 @@
"postcss": "^8.4.31"
}
},
+ "node_modules/stylehacks/node_modules/postcss-selector-parser": {
+ "version": "6.1.2",
+ "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+ "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+ "license": "MIT",
+ "dependencies": {
+ "cssesc": "^3.0.0",
+ "util-deprecate": "^1.0.2"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
"node_modules/svgo": {
"version": "3.3.2",
"resolved": "https://registry.npmjs.org/svgo/-/svgo-3.3.2.tgz",
@@ -1429,9 +1494,9 @@
}
},
"node_modules/terser": {
- "version": "5.37.0",
- "resolved": "https://registry.npmjs.org/terser/-/terser-5.37.0.tgz",
- "integrity": "sha512-B8wRRkmre4ERucLM/uXx4MOV5cbnOlVAqUst+1+iLKPI0dOgFO28f84ptoQt9HEI537PMzfYa/d+GEPKTRXmYA==",
+ "version": "5.39.0",
+ "resolved": "https://registry.npmjs.org/terser/-/terser-5.39.0.tgz",
+ "integrity": "sha512-LBAhFyLho16harJoWMg/nZsQYgTrg5jXOn2nCYjRUcZZEdE3qa2zb8QEDRUGVZBW4rlazf2fxkg8tztybTaqWw==",
"license": "BSD-2-Clause",
"dependencies": {
"@jridgewell/source-map": "^0.3.3",
@@ -1459,9 +1524,9 @@
"license": "0BSD"
},
"node_modules/update-browserslist-db": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz",
- "integrity": "sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==",
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz",
+ "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==",
"funding": [
{
"type": "opencollective",
@@ -1479,7 +1544,7 @@
"license": "MIT",
"dependencies": {
"escalade": "^3.2.0",
- "picocolors": "^1.1.0"
+ "picocolors": "^1.1.1"
},
"bin": {
"update-browserslist-db": "cli.js"
diff --git a/package.json b/package.json
index 83e7da3..e784619 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
{
"dependencies": {
- "@railcomm/assproc": "^1.0.0"
+ "@railcomm/assproc": "^1.1.0"
}
}
diff --git a/src/AssetsRoutes.php b/src/AssetsRoutes.php
index af1ee32..29d8a0d 100644
--- a/src/AssetsRoutes.php
+++ b/src/AssetsRoutes.php
@@ -1,16 +1,17 @@
<?php
namespace Makai;
-use Index\Http\Routing\{HttpGet,RouteHandler,RouteHandlerTrait};
+use Index\Http\Routing\{RouteHandler,RouteHandlerCommon};
+use Index\Http\Routing\Routes\ExactRoute;
class AssetsRoutes implements RouteHandler {
- use RouteHandlerTrait;
+ use RouteHandlerCommon;
public function __construct(
private SiteInfo $siteInfo
) {}
- #[HttpGet('/header-bgs.json')]
+ #[ExactRoute('GET', '/header-bgs.json')]
public function getHeaderImages(): array {
return $this->siteInfo->headerImages;
}
diff --git a/src/CSRFPContainer.php b/src/CSRFPContainer.php
index 7476b3b..760d3e5 100644
--- a/src/CSRFPContainer.php
+++ b/src/CSRFPContainer.php
@@ -25,17 +25,17 @@ final class CSRFPContainer {
|| ($this->secretKey !== '' && $this->identity !== '');
}
- public function getInstance(): ?CsrfToken {
+ public function getInstance(): CsrfToken {
if($this->instance === null)
$this->instance = new CsrfToken($this->secretKey, $this->identity);
return $this->instance;
}
public function createToken(...$args): string {
- return $this->getInstance()?->createToken(...$args) ?? '';
+ return $this->getInstance()->createToken(...$args);
}
public function verifyToken(...$args): bool {
- return $this->getInstance()?->verifyToken(...$args) ?? false;
+ return $this->getInstance()->verifyToken(...$args);
}
}
diff --git a/src/DeveloperRoutes.php b/src/DeveloperRoutes.php
index 695f940..a8f8435 100644
--- a/src/DeveloperRoutes.php
+++ b/src/DeveloperRoutes.php
@@ -1,13 +1,14 @@
<?php
namespace Makai;
-use Index\Http\Routing\{HttpGet,RouteHandler,RouteHandlerTrait};
+use Index\Http\Routing\{RouteHandler,RouteHandlerCommon};
+use Index\Http\Routing\Routes\ExactRoute;
use Index\Templating\TplEnvironment;
use Makai\Contacts\Contacts;
use Makai\Projects\Projects;
class DeveloperRoutes implements RouteHandler {
- use RouteHandlerTrait;
+ use RouteHandlerCommon;
public function __construct(
private TplEnvironment $templating,
@@ -15,7 +16,7 @@ class DeveloperRoutes implements RouteHandler {
private Projects $projects
) {}
- #[HttpGet('/')]
+ #[ExactRoute('GET', '/')]
public function getIndex($response, $request) {
$projectInfos = $this->projects->getProjects(
featuredOnly: true,
@@ -35,7 +36,7 @@ class DeveloperRoutes implements RouteHandler {
]);
}
- #[HttpGet('/projects')]
+ #[ExactRoute('GET', '/projects')]
public function getProjects(): string {
$projectInfos = $this->projects->getProjects(deleted: false);
$projects = [];
@@ -52,12 +53,12 @@ class DeveloperRoutes implements RouteHandler {
]);
}
- #[HttpGet('/tools')]
+ #[ExactRoute('GET', '/tools')]
public function temporaryRedirect($response): void {
$response->redirect('/');
}
- #[HttpGet('/contact')]
+ #[ExactRoute('GET', '/contact')]
public function permanentRedirect($response): void {
$response->redirect('/', true);
}
diff --git a/src/RoutingContext.php b/src/RoutingContext.php
index 7c10db8..5b6f3d7 100644
--- a/src/RoutingContext.php
+++ b/src/RoutingContext.php
@@ -1,14 +1,16 @@
<?php
namespace Makai;
-use Index\Http\Routing\{HttpRouter,Router,RouteHandler};
+use Index\Http\HttpResponseBuilder;
+use Index\Http\Routing\{Router,RouteHandler};
+use Index\Http\Routing\Filters\FilterInfo;
class RoutingContext {
- public private(set) HttpRouter $router;
+ public private(set) Router $router;
public function __construct() {
- $this->router = new HttpRouter(errorHandler: new RoutingErrorHandler);
- $this->router->use('/', fn($resp) => $resp->setPoweredBy('Makai'));
+ $this->router = new Router(errorHandler: new RoutingErrorHandler);
+ $this->router->filter(FilterInfo::prefix('/', fn(HttpResponseBuilder $resp) => $resp->setPoweredBy('Makai')));
}
public function register(RouteHandler $handler): void {
diff --git a/src/RoutingErrorHandler.php b/src/RoutingErrorHandler.php
index 0c9f79f..fd40cd4 100644
--- a/src/RoutingErrorHandler.php
+++ b/src/RoutingErrorHandler.php
@@ -1,16 +1,22 @@
<?php
namespace Makai;
-use Index\Http\{HtmlHttpErrorHandler,HttpResponseBuilder,HttpRequest};
+use Index\Http\Routing\HandlerContext;
+use Index\Http\Routing\ErrorHandling\HtmlErrorHandler;
+use Index\Http\Streams\Stream;
-class RoutingErrorHandler extends HtmlHttpErrorHandler {
- public function handle(HttpResponseBuilder $response, HttpRequest $request, int $code, string $message): void {
- if($code === 401 || $code === 403 || $code === 404 || $code === 500 || $code === 503) {
- $response->setTypeHTML();
- $response->setContent(file_get_contents(sprintf('%s/error-%s.html', MKI_DIR_PUBLIC, $code)));
+class RoutingErrorHandler extends HtmlErrorHandler {
+ public function handle(HandlerContext $context): void {
+ if(!$context->response->needsBody)
+ return;
+
+ $path = sprintf('%s/error-%s.html', MKI_DIR_PUBLIC, $context->response->statusCode);
+ if(is_file($path)) {
+ $context->response->setTypeHTML();
+ $context->response->body = Stream::createStreamFromFile($path, 'rb');
return;
}
- parent::handle($response, $request, $code, $message);
+ parent::handle($context);
}
}
diff --git a/src/SSHKeys/SSHKeysRoutes.php b/src/SSHKeys/SSHKeysRoutes.php
index 2ad08f1..1e576cb 100644
--- a/src/SSHKeys/SSHKeysRoutes.php
+++ b/src/SSHKeys/SSHKeysRoutes.php
@@ -2,16 +2,17 @@
namespace Makai\SSHKeys;
use DateTimeInterface;
-use Index\Http\Routing\{HttpGet,RouteHandler,RouteHandlerTrait};
+use Index\Http\Routing\{RouteHandler,RouteHandlerCommon};
+use Index\Http\Routing\Routes\ExactRoute;
class SSHKeysRoutes implements RouteHandler {
- use RouteHandlerTrait;
+ use RouteHandlerCommon;
public function __construct(
private SSHKeys $sshKeys
) {}
- #[HttpGet('/ssh_keys')]
+ #[ExactRoute('GET', '/ssh_keys')]
public function getSshKeys($response, $request): array|string {
$minLevel = (int)$request->getParam('l', FILTER_SANITIZE_NUMBER_INT);
$includeComment = $request->hasParam('c');
@@ -45,7 +46,7 @@ class SSHKeysRoutes implements RouteHandler {
return $body;
}
- #[HttpGet('/authorized_keys')]
+ #[ExactRoute('GET', '/authorized_keys')]
public function getAuthorisedKeys($response, $request): string {
$response->setTypePlain();
$body = '';
@@ -57,7 +58,7 @@ class SSHKeysRoutes implements RouteHandler {
return $body;
}
- #[HttpGet('/git_keys_ro')]
+ #[ExactRoute('GET', '/git_keys_ro')]
public function getGitKeysReadOnly($response, $request): string {
$response->setTypePlain();
$body = '';
@@ -69,7 +70,7 @@ class SSHKeysRoutes implements RouteHandler {
return $body;
}
- #[HttpGet('/git_keys_rw')]
+ #[ExactRoute('GET', '/git_keys_rw')]
public function getGitKeysReadWrite($response, $request): string {
$response->setTypePlain();
$body = '';
@@ -81,7 +82,7 @@ class SSHKeysRoutes implements RouteHandler {
return $body;
}
- #[HttpGet('/ssh.php')]
+ #[ExactRoute('GET', '/ssh.php')]
public function getSshPhp($response, $request): void {
$query = [];
diff --git a/src/Tools/Ascii/AsciiRoutes.php b/src/Tools/Ascii/AsciiRoutes.php
index b71f475..5ef9d56 100644
--- a/src/Tools/Ascii/AsciiRoutes.php
+++ b/src/Tools/Ascii/AsciiRoutes.php
@@ -1,25 +1,26 @@
<?php
namespace Makai\Tools\Ascii;
-use Index\Http\Routing\{HttpGet,RouteHandler,RouteHandlerTrait};
+use Index\Http\Routing\{RouteHandler,RouteHandlerCommon};
+use Index\Http\Routing\Routes\ExactRoute;
use Index\Templating\TplEnvironment;
class AsciiRoutes implements RouteHandler {
- use RouteHandlerTrait;
+ use RouteHandlerCommon;
public function __construct(
private TplEnvironment $templating
) {}
- #[HttpGet('/tools/ascii')]
+ #[ExactRoute('GET', '/tools/ascii')]
public function getAsciiTable($response, $request): string {
return $this->templating->render('tools/ascii/index', [
'chars' => AsciiCharacter::all(),
]);
}
- #[HttpGet('/ascii')]
- #[HttpGet('/ascii.php')]
+ #[ExactRoute('GET', '/ascii')]
+ #[ExactRoute('GET', '/ascii.php')]
public function getAsciiPHP($response, $request): void {
$response->redirect('/tools/ascii', true);
}
diff --git a/src/Tools/ToolsRoutes.php b/src/Tools/ToolsRoutes.php
index c28f184..ac80da7 100644
--- a/src/Tools/ToolsRoutes.php
+++ b/src/Tools/ToolsRoutes.php
@@ -2,12 +2,13 @@
namespace Makai\Tools;
use Index\XString;
-use Index\Http\Routing\{HttpGet,RouteHandler,RouteHandlerTrait};
+use Index\Http\Routing\{RouteHandler,RouteHandlerCommon};
+use Index\Http\Routing\Routes\ExactRoute;
class ToolsRoutes implements RouteHandler {
- use RouteHandlerTrait;
+ use RouteHandlerCommon;
- #[HttpGet('/tools/random')]
+ #[ExactRoute('GET', '/tools/random')]
public function getRandomString($response, $request): string {
$response->setTypePlain();
@@ -24,8 +25,8 @@ class ToolsRoutes implements RouteHandler {
return $out;
}
- #[HttpGet('/tools/hajime-hash')]
- #[HttpGet('/tools/hidoi-hash')]
+ #[ExactRoute('GET', '/tools/hajime-hash')]
+ #[ExactRoute('GET', '/tools/hidoi-hash')]
public function getHajimeHash($response, $request): string {
$response->setTypePlain();
if(!$request->hasParam('text'))
@@ -34,8 +35,8 @@ class ToolsRoutes implements RouteHandler {
return hash('sha256', strrev(hash('sha256', (string)$request->getParam('text'))));
}
- #[HttpGet('/key.php')]
- #[HttpGet('/rngstr')]
+ #[ExactRoute('GET', '/key.php')]
+ #[ExactRoute('GET', '/rngstr')]
public function getRedirect($response, $request): void {
$url = '/tools/random';
diff --git a/src/Tools/Whois/WhoisRoutes.php b/src/Tools/Whois/WhoisRoutes.php
index 6f7b483..e421749 100644
--- a/src/Tools/Whois/WhoisRoutes.php
+++ b/src/Tools/Whois/WhoisRoutes.php
@@ -4,29 +4,30 @@ namespace Makai\Tools\Whois;
use Exception;
use Memcached;
use Index\Cache\CacheBackends;
-use Index\Http\Routing\{HttpGet,HttpPost,RouteHandler,RouteHandlerTrait};
+use Index\Http\Routing\{RouteHandler,RouteHandlerCommon};
+use Index\Http\Routing\Routes\ExactRoute;
use Index\Templating\TplEnvironment;
use Makai\CSRFPContainer;
class WhoisRoutes implements RouteHandler {
- use RouteHandlerTrait;
+ use RouteHandlerCommon;
public function __construct(
private TplEnvironment $templating,
private CSRFPContainer $csrfp,
) {}
- #[HttpGet('/tools/whois')]
+ #[ExactRoute('GET', '/tools/whois')]
public function getIndex(): string {
return $this->templating->render('tools/whois/index');
}
- #[HttpGet('/whois')]
+ #[ExactRoute('GET', '/whois')]
public function getWhoisPHP($response, $request): void {
$response->redirect('/tools/whois', true);
}
- #[HttpPost('/tools/whois/lookup')]
+ #[ExactRoute('POST', '/tools/whois/lookup')]
public function postLookup($response, $request) {
if(!$request->isFormContent())
return 400;