From b65ac006284bd696af4b195feaa8a56ebdec4336 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Andr=C3=A9?= Date: Fri, 26 Apr 2024 08:04:31 +0200 Subject: [PATCH] [Site] Grouped fixes --- ux.symfony.com/.platform.app.yaml | 2 +- ux.symfony.com/assets/styles/app.scss | 1 + .../assets/styles/components/_Banner.scss | 2 +- .../assets/styles/components/_Changelog.scss | 34 +- .../assets/styles/components/_Pagination.scss | 27 + ux.symfony.com/composer.json | 20 +- ux.symfony.com/composer.lock | 506 +++++------------- ux.symfony.com/config/bundles.php | 1 - ux.symfony.com/importmap.php | 16 +- .../Controller/UxPackage/SwupController.php | 19 +- ux.symfony.com/symfony.lock | 9 - .../components/Icon/IconModal.html.twig | 2 +- .../components/PrevNextDemo.html.twig | 4 +- .../templates/icons/index.html.twig | 2 +- .../templates/liveDemoBase.html.twig | 34 +- .../templates/ux_packages/swup.html.twig | 15 +- .../Functional/LiveComponentDemosTest.php | 2 +- .../tests/Functional/UxPackagesTest.php | 2 +- 18 files changed, 237 insertions(+), 461 deletions(-) create mode 100644 ux.symfony.com/assets/styles/components/_Pagination.scss diff --git a/ux.symfony.com/.platform.app.yaml b/ux.symfony.com/.platform.app.yaml index d52d81c3843..c14dba22f39 100644 --- a/ux.symfony.com/.platform.app.yaml +++ b/ux.symfony.com/.platform.app.yaml @@ -57,4 +57,4 @@ hooks: php bin/console app:load-data # needed because StimulusBundle / asset mapper will currently # expect this asset mapper directory to exist at runtime - mkdir var/translations + mkdir -p var/translations diff --git a/ux.symfony.com/assets/styles/app.scss b/ux.symfony.com/assets/styles/app.scss index bc12154f682..4cf1949b35d 100644 --- a/ux.symfony.com/assets/styles/app.scss +++ b/ux.symfony.com/assets/styles/app.scss @@ -78,6 +78,7 @@ @import "components/IconModal"; @import "components/IconSearch"; @import "components/IconSetCard"; +@import "components/Pagination"; @import "components/ProductGrid"; @import "components/PackageHeader"; @import "components/PackageBox"; diff --git a/ux.symfony.com/assets/styles/components/_Banner.scss b/ux.symfony.com/assets/styles/components/_Banner.scss index 4f662a09d21..2821acc26b2 100644 --- a/ux.symfony.com/assets/styles/components/_Banner.scss +++ b/ux.symfony.com/assets/styles/components/_Banner.scss @@ -113,7 +113,7 @@ } .BannerInner { flex-direction: row; - padding: 4rem 2rem; + padding: 2rem; gap: 4rem; } .BannerTitle { diff --git a/ux.symfony.com/assets/styles/components/_Changelog.scss b/ux.symfony.com/assets/styles/components/_Changelog.scss index 97b7dffd49c..69f0a7ff863 100644 --- a/ux.symfony.com/assets/styles/components/_Changelog.scss +++ b/ux.symfony.com/assets/styles/components/_Changelog.scss @@ -7,6 +7,7 @@ position: relative; --left-pane: 10rem; } + .Changelog::before { content: ''; position: absolute; @@ -27,6 +28,7 @@ .ChangelogItem summary { list-style: none; } + .ChangelogItem summary::-webkit-details-marker { display: none; } @@ -42,6 +44,7 @@ justify-content: center; text-align: center; } + .ChangelogItem__Anchor::after { content: ''; position: absolute; @@ -60,6 +63,7 @@ opacity: .90; transition: all 150ms ease-in-out; } + .ChangelogItem__Version:hover { opacity: 1; } @@ -78,6 +82,7 @@ background-color: #eef0f91a; border: 1px solid var(--bs-secondary-bg); } + [data-bs-theme="dark"] .ChangelogItem__Content { background-color: #1c2024; } @@ -89,11 +94,13 @@ gap: 1rem; justify-content: space-between; } + .ChangelogItem__Head svg { transition: 150ms ease-in-out; transform: rotate(0deg); opacity: .5; } + .ChangelogItem [open] .ChangelogItem__Head svg { transform: rotate(180deg); opacity: .75; @@ -106,6 +113,7 @@ color: var(--bs-body-color); margin-block-end: 0; } + .ChangelogItem [open] .ChangelogItem__Title { font-size: 1.25rem; } @@ -140,35 +148,31 @@ padding-left: 0.25rem; margin-inline-start: .5rem; } + .ChangelogItem__Text a { color: #a3bfe8; } + .ChangelogItem__Text a:hover { color: #2072ea; } + .ChangelogItem__Text p:last-child { margin-bottom: 0; } @media screen and (max-width: 980px) { - .Changelog { - --left-pane: 2rem; - } - .ChangelogItem { - gap: 2rem; - grid-template-columns: auto 1fr; + .Changelog { + --left-pane: 0rem; } - .ChangelogItem { + .ChangelogItem { + gap: 0; grid-template-columns: auto 1fr; } - .ChangelogItem__Anchor::after { - right: 2rem; - scale: 0.6; + .ChangelogItem__Anchor { + display: none; } - .ChangelogItem::before { - left: 2rem; + .Changelog::before { + display: none; } - .Changelog::before { - left: var(--left-pane); - } } diff --git a/ux.symfony.com/assets/styles/components/_Pagination.scss b/ux.symfony.com/assets/styles/components/_Pagination.scss new file mode 100644 index 00000000000..8a50820be71 --- /dev/null +++ b/ux.symfony.com/assets/styles/components/_Pagination.scss @@ -0,0 +1,27 @@ +// ----------------------------------------------------------------- +// Pagination +// ----------------------------------------------------------------- + +.Pagination { + display: flex; + flex-direction: row; + align-items: center; + justify-content: center; + gap: 2rem; +} + +.Pagination a { + display: grid; + place-content: center; + width: 3rem; + height: 3rem; + border-radius: 1rem; + transition: opacity 0.3s; + background: var(--bs-body-bg); + opacity: .5; + + &[aria-current="true"], + &:hover { + opacity: 1; + } +} diff --git a/ux.symfony.com/composer.json b/ux.symfony.com/composer.json index c31e6dac70b..8c5f5bd774d 100644 --- a/ux.symfony.com/composer.json +++ b/ux.symfony.com/composer.json @@ -1,13 +1,14 @@ { "type": "project", + "description": "Symfony UX website & demos", "license": "proprietary", "prefer-stable": true, "minimum-stability": "dev", + "homepage": "https://ux.symfony.com", "require": { "php": ">=8.3", "ext-ctype": "*", "ext-iconv": "*", - "babdev/pagerfanta-bundle": "^4.4", "composer/semver": "^3.4", "doctrine/doctrine-bundle": "^2.10", "doctrine/doctrine-migrations-bundle": "^3.2.4", @@ -15,13 +16,12 @@ "intervention/image": "^2.7.2", "kornrunner/blurhash": "^1.2.2", "league/commonmark": "^2.4", - "pagerfanta/twig": "^3.8", "symfony/asset": "7.0.*", "symfony/asset-mapper": "7.0.*", "symfony/console": "7.0.*", "symfony/dotenv": "7.0.*", "symfony/expression-language": "7.0.*", - "symfony/flex": "^2.3.1", + "symfony/flex": "^2.4", "symfony/form": "7.0.*", "symfony/framework-bundle": "7.0.*", "symfony/http-client": "7.0.*", @@ -44,7 +44,7 @@ "symfony/ux-react": "2.x-dev", "symfony/ux-svelte": "2.x-dev", "symfony/ux-swup": "2.x-dev", - "symfony/ux-toggle-password": "@dev", + "symfony/ux-toggle-password": "2.x-dev", "symfony/ux-translator": "2.x-dev", "symfony/ux-turbo": "2.x-dev", "symfony/ux-twig-component": "2.x-dev", @@ -55,12 +55,12 @@ "symfonycasts/dynamic-forms": "^0.1.0", "symfonycasts/sass-bundle": "^0.6.0", "twbs/bootstrap": "^5.3", - "twig/extra-bundle": "^2.12|^3.6.1", + "twig/extra-bundle": "^3.8", "twig/html-extra": "^3.8", - "twig/intl-extra": "^3.6", - "twig/markdown-extra": "^3.6", + "twig/intl-extra": "^3.8", + "twig/markdown-extra": "^3.8", "twig/string-extra": "^3.8", - "twig/twig": "^2.12|^3.6.1" + "twig/twig": "^3.8" }, "config": { "allow-plugins": { @@ -91,7 +91,9 @@ "symfony/polyfill-php73": "*", "symfony/polyfill-php74": "*", "symfony/polyfill-php80": "*", - "symfony/polyfill-php81": "*" + "symfony/polyfill-php81": "*", + "symfony/polyfill-php82": "*", + "symfony/polyfill-php83": "*" }, "scripts": { "auto-scripts": { diff --git a/ux.symfony.com/composer.lock b/ux.symfony.com/composer.lock index 2fc3b03c50d..26da232a8fd 100644 --- a/ux.symfony.com/composer.lock +++ b/ux.symfony.com/composer.lock @@ -4,95 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "5d219c5b3338a027537ef6c02c4b72aa", + "content-hash": "e3bf9a90112df53b2a003340258431b5", "packages": [ - { - "name": "babdev/pagerfanta-bundle", - "version": "v4.4.0", - "source": { - "type": "git", - "url": "https://github.com/BabDev/PagerfantaBundle.git", - "reference": "b2f0d87ed0592830ebea54238ffe9702e8524972" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/BabDev/PagerfantaBundle/zipball/b2f0d87ed0592830ebea54238ffe9702e8524972", - "reference": "b2f0d87ed0592830ebea54238ffe9702e8524972", - "shasum": "" - }, - "require": { - "pagerfanta/core": "^3.7 || ^4.0", - "php": "^8.1", - "psr/container": "^1.0 || ^2.0", - "symfony/config": "^5.4 || ^6.3 || ^7.0", - "symfony/dependency-injection": "^5.4 || ^6.3 || ^7.0", - "symfony/http-foundation": "^5.4 || ^6.3 || ^7.0", - "symfony/http-kernel": "^5.4 || ^6.3 || ^7.0", - "symfony/property-access": "^5.4 || ^6.3 || ^7.0", - "symfony/routing": "^5.4 || ^6.3 || ^7.0" - }, - "conflict": { - "jms/serializer": "<3.18", - "jms/serializer-bundle": "<4.2", - "pagerfanta/twig": "<3.7", - "symfony/serializer": "<5.4 || >=6.0,<6.3", - "symfony/translation": "<5.4 || >=6.0,<6.3", - "symfony/twig-bridge": "<5.4 || >=6.0,<6.3", - "symfony/twig-bundle": "<5.4 || >=6.0,<6.3", - "twig/twig": "<2.13", - "white-october/pagerfanta-bundle": "*" - }, - "require-dev": { - "jms/serializer": "^3.18", - "jms/serializer-bundle": "^4.2 || ^5.0", - "matthiasnoback/symfony-dependency-injection-test": "^5.0", - "pagerfanta/twig": "^3.7 || ^4.0", - "phpstan/extension-installer": "^1.2", - "phpstan/phpstan": "1.10.49", - "phpstan/phpstan-phpunit": "1.3.15", - "phpstan/phpstan-symfony": "1.3.5", - "phpunit/phpunit": "9.6.15", - "symfony/phpunit-bridge": "^5.4 || ^6.3 || ^7.0", - "symfony/serializer": "^5.4 || ^6.3 || ^7.0", - "symfony/translation": "^5.4 || ^6.3 || ^7.0", - "symfony/twig-bridge": "^5.4 || ^6.3 || ^7.0", - "symfony/twig-bundle": "^5.4 || ^6.3 || ^7.0", - "twig/twig": "^2.13 || ^3.0" - }, - "suggest": { - "jms/serializer-bundle": "To use the Pagerfanta class with the JMS Serializer", - "symfony/serializer": "To use the Pagerfanta class with the Symfony Serializer", - "symfony/translation": "To use the Twig templates with translation support", - "twig/twig": "To integrate Pagerfanta with Twig through extensions" - }, - "type": "symfony-bundle", - "autoload": { - "psr-4": { - "BabDev\\PagerfantaBundle\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "Bundle integrating Pagerfanta with Symfony", - "keywords": [ - "pagerfanta", - "pagination", - "symfony" - ], - "support": { - "issues": "https://github.com/BabDev/PagerfantaBundle/issues", - "source": "https://github.com/BabDev/PagerfantaBundle/tree/v4.4.0" - }, - "funding": [ - { - "url": "https://github.com/mbabker", - "type": "github" - } - ], - "time": "2023-12-20T23:40:09+00:00" - }, { "name": "composer/semver", "version": "3.4.0", @@ -344,16 +257,16 @@ }, { "name": "doctrine/collections", - "version": "2.2.1", + "version": "2.2.2", "source": { "type": "git", "url": "https://github.com/doctrine/collections.git", - "reference": "420480fc085bc65f3c956af13abe8e7546f94813" + "reference": "d8af7f248c74f195f7347424600fd9e17b57af59" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/collections/zipball/420480fc085bc65f3c956af13abe8e7546f94813", - "reference": "420480fc085bc65f3c956af13abe8e7546f94813", + "url": "https://api.github.com/repos/doctrine/collections/zipball/d8af7f248c74f195f7347424600fd9e17b57af59", + "reference": "d8af7f248c74f195f7347424600fd9e17b57af59", "shasum": "" }, "require": { @@ -410,7 +323,7 @@ ], "support": { "issues": "https://github.com/doctrine/collections/issues", - "source": "https://github.com/doctrine/collections/tree/2.2.1" + "source": "https://github.com/doctrine/collections/tree/2.2.2" }, "funding": [ { @@ -426,7 +339,7 @@ "type": "tidelift" } ], - "time": "2024-03-05T22:28:45+00:00" + "time": "2024-04-18T06:56:21+00:00" }, { "name": "doctrine/common", @@ -521,16 +434,16 @@ }, { "name": "doctrine/dbal", - "version": "3.8.3", + "version": "3.8.4", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "db922ba9436b7b18a23d1653a0b41ff2369ca41c" + "reference": "b05e48a745f722801f55408d0dbd8003b403dbbd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/db922ba9436b7b18a23d1653a0b41ff2369ca41c", - "reference": "db922ba9436b7b18a23d1653a0b41ff2369ca41c", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/b05e48a745f722801f55408d0dbd8003b403dbbd", + "reference": "b05e48a745f722801f55408d0dbd8003b403dbbd", "shasum": "" }, "require": { @@ -614,7 +527,7 @@ ], "support": { "issues": "https://github.com/doctrine/dbal/issues", - "source": "https://github.com/doctrine/dbal/tree/3.8.3" + "source": "https://github.com/doctrine/dbal/tree/3.8.4" }, "funding": [ { @@ -630,7 +543,7 @@ "type": "tidelift" } ], - "time": "2024-03-03T15:55:06+00:00" + "time": "2024-04-25T07:04:44+00:00" }, { "name": "doctrine/deprecations", @@ -2330,96 +2243,6 @@ }, "time": "2024-01-17T16:50:36+00:00" }, - { - "name": "pagerfanta/core", - "version": "v3.8.0", - "source": { - "type": "git", - "url": "https://github.com/Pagerfanta/core.git", - "reference": "a995f69ff9af64a45c3dc3d8217100624ae214f2" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Pagerfanta/core/zipball/a995f69ff9af64a45c3dc3d8217100624ae214f2", - "reference": "a995f69ff9af64a45c3dc3d8217100624ae214f2", - "shasum": "" - }, - "require": { - "ext-json": "*", - "php": "^7.4 || ^8.0", - "symfony/deprecation-contracts": "^2.1 || ^3.0", - "symfony/polyfill-php80": "^1.15" - }, - "require-dev": { - "phpunit/phpunit": "^9.6 || ^10.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Pagerfanta\\": "./" - }, - "exclude-from-classmap": [ - "Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "Core Pagerfanta API", - "keywords": [ - "pagerfanta" - ], - "support": { - "source": "https://github.com/Pagerfanta/core/tree/v3.8.0" - }, - "time": "2023-04-15T16:39:14+00:00" - }, - { - "name": "pagerfanta/twig", - "version": "v3.8.0", - "source": { - "type": "git", - "url": "https://github.com/Pagerfanta/twig.git", - "reference": "19ba831401d7bc5249997c09c574e5c922773b12" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Pagerfanta/twig/zipball/19ba831401d7bc5249997c09c574e5c922773b12", - "reference": "19ba831401d7bc5249997c09c574e5c922773b12", - "shasum": "" - }, - "require": { - "pagerfanta/core": "^3.0", - "php": "^7.4 || ^8.0", - "symfony/polyfill-php80": "^1.15", - "twig/twig": "^2.13 || ^3.0" - }, - "require-dev": { - "phpunit/phpunit": "^9.6 || ^10.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Pagerfanta\\Twig\\": "./" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "Twig integration for Pagerfanta", - "keywords": [ - "pagerfanta" - ], - "support": { - "source": "https://github.com/Pagerfanta/twig/tree/v3.8.0" - }, - "time": "2023-04-15T16:39:14+00:00" - }, { "name": "psr/cache", "version": "3.0.0", @@ -5891,83 +5714,6 @@ ], "time": "2024-01-29T20:11:03+00:00" }, - { - "name": "symfony/polyfill-php83", - "version": "v1.29.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php83.git", - "reference": "86fcae159633351e5fd145d1c47de6c528f8caff" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/86fcae159633351e5fd145d1c47de6c528f8caff", - "reference": "86fcae159633351e5fd145d1c47de6c528f8caff", - "shasum": "" - }, - "require": { - "php": ">=7.1", - "symfony/polyfill-php80": "^1.14" - }, - "type": "library", - "extra": { - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Php83\\": "" - }, - "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.3+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-php83/tree/v1.29.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-01-29T20:11:03+00:00" - }, { "name": "symfony/polyfill-uuid", "version": "v1.29.0", @@ -6610,12 +6356,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/stimulus-bundle.git", - "reference": "5432e91c00b58e6c06e2f72cff946db42d103e19" + "reference": "b828a32fe9f75500d26b563cc01874657162c413" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/stimulus-bundle/zipball/5432e91c00b58e6c06e2f72cff946db42d103e19", - "reference": "5432e91c00b58e6c06e2f72cff946db42d103e19", + "url": "https://api.github.com/repos/symfony/stimulus-bundle/zipball/b828a32fe9f75500d26b563cc01874657162c413", + "reference": "b828a32fe9f75500d26b563cc01874657162c413", "shasum": "" }, "require": { @@ -6625,7 +6371,7 @@ "symfony/deprecation-contracts": "^2.0|^3.0", "symfony/finder": "^5.4|^6.0|^7.0", "symfony/http-kernel": "^5.4|^6.0|^7.0", - "twig/twig": "^2.15.3|~3.8.0" + "twig/twig": "^2.15.3|^3.8" }, "require-dev": { "symfony/asset-mapper": "^6.3|^7.0", @@ -6656,7 +6402,7 @@ "symfony-ux" ], "support": { - "source": "https://github.com/symfony/stimulus-bundle/tree/2.x" + "source": "https://github.com/symfony/stimulus-bundle/tree/v2.17.0" }, "funding": [ { @@ -6672,7 +6418,7 @@ "type": "tidelift" } ], - "time": "2024-03-27T15:55:02+00:00" + "time": "2024-04-21T10:23:35+00:00" }, { "name": "symfony/stopwatch", @@ -7266,12 +7012,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/ux-autocomplete.git", - "reference": "702ef828126616625362f578060e6bc181658e50" + "reference": "29bf9449ea839338358d21174217343a7ee745b7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/ux-autocomplete/zipball/702ef828126616625362f578060e6bc181658e50", - "reference": "702ef828126616625362f578060e6bc181658e50", + "url": "https://api.github.com/repos/symfony/ux-autocomplete/zipball/29bf9449ea839338358d21174217343a7ee745b7", + "reference": "29bf9449ea839338358d21174217343a7ee745b7", "shasum": "" }, "require": { @@ -7351,7 +7097,7 @@ "type": "tidelift" } ], - "time": "2024-04-14T16:02:56+00:00" + "time": "2024-04-24T16:39:45+00:00" }, { "name": "symfony/ux-chartjs", @@ -7359,12 +7105,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/ux-chartjs.git", - "reference": "c17eca62703f1e6d0b28e268d9b03582bc7eeadf" + "reference": "962326b44a8c3edf4d8b29e115dc446441bcd662" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/ux-chartjs/zipball/c17eca62703f1e6d0b28e268d9b03582bc7eeadf", - "reference": "c17eca62703f1e6d0b28e268d9b03582bc7eeadf", + "url": "https://api.github.com/repos/symfony/ux-chartjs/zipball/962326b44a8c3edf4d8b29e115dc446441bcd662", + "reference": "962326b44a8c3edf4d8b29e115dc446441bcd662", "shasum": "" }, "require": { @@ -7416,7 +7162,7 @@ "symfony-ux" ], "support": { - "source": "https://github.com/symfony/ux-chartjs/tree/2.x" + "source": "https://github.com/symfony/ux-chartjs/tree/v2.17.0" }, "funding": [ { @@ -7432,7 +7178,7 @@ "type": "tidelift" } ], - "time": "2024-03-20T19:15:48+00:00" + "time": "2024-04-19T06:36:45+00:00" }, { "name": "symfony/ux-cropperjs", @@ -7440,12 +7186,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/ux-cropperjs.git", - "reference": "cab6a2c6f655f48e19f0da725759008ce8d8d611" + "reference": "e32e091fb2b3d36e0bd2bf251b1907cf6b3f88ad" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/ux-cropperjs/zipball/cab6a2c6f655f48e19f0da725759008ce8d8d611", - "reference": "cab6a2c6f655f48e19f0da725759008ce8d8d611", + "url": "https://api.github.com/repos/symfony/ux-cropperjs/zipball/e32e091fb2b3d36e0bd2bf251b1907cf6b3f88ad", + "reference": "e32e091fb2b3d36e0bd2bf251b1907cf6b3f88ad", "shasum": "" }, "require": { @@ -7502,7 +7248,7 @@ "symfony-ux" ], "support": { - "source": "https://github.com/symfony/ux-cropperjs/tree/v2.16.0" + "source": "https://github.com/symfony/ux-cropperjs/tree/v2.17.0" }, "funding": [ { @@ -7518,7 +7264,7 @@ "type": "tidelift" } ], - "time": "2024-01-14T07:27:47+00:00" + "time": "2024-04-19T06:36:45+00:00" }, { "name": "symfony/ux-dropzone", @@ -7526,12 +7272,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/ux-dropzone.git", - "reference": "fb7b5336a51b99b57f116a5a66cf4e6962839e28" + "reference": "b801dd87ad5182c1db5d1ca2b6ed6307220596bb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/ux-dropzone/zipball/fb7b5336a51b99b57f116a5a66cf4e6962839e28", - "reference": "fb7b5336a51b99b57f116a5a66cf4e6962839e28", + "url": "https://api.github.com/repos/symfony/ux-dropzone/zipball/b801dd87ad5182c1db5d1ca2b6ed6307220596bb", + "reference": "b801dd87ad5182c1db5d1ca2b6ed6307220596bb", "shasum": "" }, "require": { @@ -7582,7 +7328,7 @@ "symfony-ux" ], "support": { - "source": "https://github.com/symfony/ux-dropzone/tree/v2.16.0" + "source": "https://github.com/symfony/ux-dropzone/tree/v2.17.0" }, "funding": [ { @@ -7598,7 +7344,7 @@ "type": "tidelift" } ], - "time": "2024-01-14T07:27:47+00:00" + "time": "2024-04-19T06:36:45+00:00" }, { "name": "symfony/ux-lazy-image", @@ -7606,12 +7352,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/ux-lazy-image.git", - "reference": "3d34714eb60d105e32ddbe12234172c05a99c295" + "reference": "fa2d679ba1a02e0c9fc7af3f0e2a7ce8d6bed845" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/ux-lazy-image/zipball/3d34714eb60d105e32ddbe12234172c05a99c295", - "reference": "3d34714eb60d105e32ddbe12234172c05a99c295", + "url": "https://api.github.com/repos/symfony/ux-lazy-image/zipball/fa2d679ba1a02e0c9fc7af3f0e2a7ce8d6bed845", + "reference": "fa2d679ba1a02e0c9fc7af3f0e2a7ce8d6bed845", "shasum": "" }, "require": { @@ -7621,8 +7367,9 @@ "symfony/http-kernel": "^5.4|^6.0|^7.0" }, "require-dev": { - "intervention/image": "^2.5", + "intervention/image": "^2.5|^3.0", "kornrunner/blurhash": "^1.1", + "symfony/cache-contracts": "^2.2", "symfony/framework-bundle": "^5.4|^6.0|^7.0", "symfony/phpunit-bridge": "^5.2|^6.0|^7.0", "symfony/twig-bundle": "^5.4|^6.0|^7.0", @@ -7661,7 +7408,7 @@ "symfony-ux" ], "support": { - "source": "https://github.com/symfony/ux-lazy-image/tree/v2.16.0" + "source": "https://github.com/symfony/ux-lazy-image/tree/v2.17.0" }, "funding": [ { @@ -7677,7 +7424,7 @@ "type": "tidelift" } ], - "time": "2024-02-03T21:01:32+00:00" + "time": "2024-04-23T13:15:58+00:00" }, { "name": "symfony/ux-live-component", @@ -7685,19 +7432,19 @@ "source": { "type": "git", "url": "https://github.com/symfony/ux-live-component.git", - "reference": "3aff6da74c882347d51ad8124fc3d3c52391a4a5" + "reference": "dc3ba3aa0a4f28d6ebf7853622b8e9b3ef5c2c72" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/ux-live-component/zipball/3aff6da74c882347d51ad8124fc3d3c52391a4a5", - "reference": "3aff6da74c882347d51ad8124fc3d3c52391a4a5", + "url": "https://api.github.com/repos/symfony/ux-live-component/zipball/dc3ba3aa0a4f28d6ebf7853622b8e9b3ef5c2c72", + "reference": "dc3ba3aa0a4f28d6ebf7853622b8e9b3ef5c2c72", "shasum": "" }, "require": { "php": ">=8.1", "symfony/property-access": "^5.4.5|^6.0|^7.0", "symfony/ux-twig-component": "^2.8", - "twig/twig": "~3.8.0" + "twig/twig": "^3.8.0" }, "conflict": { "symfony/config": "<5.4.0" @@ -7714,7 +7461,7 @@ "symfony/form": "^5.4|^6.0|^7.0", "symfony/framework-bundle": "^5.4|^6.0|^7.0", "symfony/options-resolver": "^5.4|^6.0|^7.0", - "symfony/phpunit-bridge": "^6.0|^7.0", + "symfony/phpunit-bridge": "^6.1|^7.0", "symfony/property-info": "^5.4|^6.0|^7.0", "symfony/security-bundle": "^5.4|^6.0|^7.0", "symfony/serializer": "^5.4|^6.0|^7.0", @@ -7770,7 +7517,7 @@ "type": "tidelift" } ], - "time": "2024-04-16T14:29:27+00:00" + "time": "2024-04-25T14:13:32+00:00" }, { "name": "symfony/ux-notify", @@ -7778,12 +7525,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/ux-notify.git", - "reference": "a2961bce25881f375bf011f2eeafaeaf2d0f62cf" + "reference": "14e07d0e358dc324e2dc7060eac65a73ab9deb84" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/ux-notify/zipball/a2961bce25881f375bf011f2eeafaeaf2d0f62cf", - "reference": "a2961bce25881f375bf011f2eeafaeaf2d0f62cf", + "url": "https://api.github.com/repos/symfony/ux-notify/zipball/14e07d0e358dc324e2dc7060eac65a73ab9deb84", + "reference": "14e07d0e358dc324e2dc7060eac65a73ab9deb84", "shasum": "" }, "require": { @@ -7837,7 +7584,7 @@ "symfony-ux" ], "support": { - "source": "https://github.com/symfony/ux-notify/tree/v2.16.0" + "source": "https://github.com/symfony/ux-notify/tree/v2.17.0" }, "funding": [ { @@ -7853,7 +7600,7 @@ "type": "tidelift" } ], - "time": "2024-01-14T07:27:47+00:00" + "time": "2024-04-19T06:36:45+00:00" }, { "name": "symfony/ux-react", @@ -7861,12 +7608,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/ux-react.git", - "reference": "b8c852d858e16e568436e168bb62e28d8490d0ad" + "reference": "0c014b97a01d0bd18a5daff7750d1bf19025570f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/ux-react/zipball/b8c852d858e16e568436e168bb62e28d8490d0ad", - "reference": "b8c852d858e16e568436e168bb62e28d8490d0ad", + "url": "https://api.github.com/repos/symfony/ux-react/zipball/0c014b97a01d0bd18a5daff7750d1bf19025570f", + "reference": "0c014b97a01d0bd18a5daff7750d1bf19025570f", "shasum": "" }, "require": { @@ -7914,7 +7661,7 @@ "symfony-ux" ], "support": { - "source": "https://github.com/symfony/ux-react/tree/v2.16.0" + "source": "https://github.com/symfony/ux-react/tree/v2.17.0" }, "funding": [ { @@ -7930,7 +7677,7 @@ "type": "tidelift" } ], - "time": "2024-01-07T03:52:48+00:00" + "time": "2024-04-19T06:36:45+00:00" }, { "name": "symfony/ux-svelte", @@ -7938,12 +7685,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/ux-svelte.git", - "reference": "60befdfd64834b2afa732f1f94adac16132a5e28" + "reference": "b444ca6c1af16c6374a43fcf6991ffefb177cb86" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/ux-svelte/zipball/60befdfd64834b2afa732f1f94adac16132a5e28", - "reference": "60befdfd64834b2afa732f1f94adac16132a5e28", + "url": "https://api.github.com/repos/symfony/ux-svelte/zipball/b444ca6c1af16c6374a43fcf6991ffefb177cb86", + "reference": "b444ca6c1af16c6374a43fcf6991ffefb177cb86", "shasum": "" }, "require": { @@ -7995,7 +7742,7 @@ "symfony-ux" ], "support": { - "source": "https://github.com/symfony/ux-svelte/tree/2.x" + "source": "https://github.com/symfony/ux-svelte/tree/v2.17.0" }, "funding": [ { @@ -8011,7 +7758,7 @@ "type": "tidelift" } ], - "time": "2024-04-09T09:58:18+00:00" + "time": "2024-04-19T06:36:45+00:00" }, { "name": "symfony/ux-swup", @@ -8019,12 +7766,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/ux-swup.git", - "reference": "bbdfa3a95cae826018d59c159021befcbe781b1f" + "reference": "7a93c159b26f02f1ff0d9d64465f7fe6dfc7b78c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/ux-swup/zipball/bbdfa3a95cae826018d59c159021befcbe781b1f", - "reference": "bbdfa3a95cae826018d59c159021befcbe781b1f", + "url": "https://api.github.com/repos/symfony/ux-swup/zipball/7a93c159b26f02f1ff0d9d64465f7fe6dfc7b78c", + "reference": "7a93c159b26f02f1ff0d9d64465f7fe6dfc7b78c", "shasum": "" }, "conflict": { @@ -8063,7 +7810,7 @@ "symfony-ux" ], "support": { - "source": "https://github.com/symfony/ux-swup/tree/v2.16.0" + "source": "https://github.com/symfony/ux-swup/tree/v2.17.0" }, "funding": [ { @@ -8079,20 +7826,20 @@ "type": "tidelift" } ], - "time": "2023-12-12T16:45:17+00:00" + "time": "2024-04-19T06:36:45+00:00" }, { "name": "symfony/ux-toggle-password", - "version": "v2.16.0", + "version": "2.x-dev", "source": { "type": "git", "url": "https://github.com/symfony/ux-toggle-password.git", - "reference": "dc96508e2970fbf73304f6577abcd7efd63d4152" + "reference": "26201b9214a14ba60b3a9e0316ad0fd32e2e229b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/ux-toggle-password/zipball/dc96508e2970fbf73304f6577abcd7efd63d4152", - "reference": "dc96508e2970fbf73304f6577abcd7efd63d4152", + "url": "https://api.github.com/repos/symfony/ux-toggle-password/zipball/26201b9214a14ba60b3a9e0316ad0fd32e2e229b", + "reference": "26201b9214a14ba60b3a9e0316ad0fd32e2e229b", "shasum": "" }, "require": { @@ -8111,6 +7858,7 @@ "symfony/var-dumper": "^5.4|^6.0|^7.0", "twig/twig": "^2.14.7|^3.0.4" }, + "default-branch": true, "type": "symfony-bundle", "extra": { "thanks": { @@ -8143,7 +7891,7 @@ "symfony-ux" ], "support": { - "source": "https://github.com/symfony/ux-toggle-password/tree/v2.16.0" + "source": "https://github.com/symfony/ux-toggle-password/tree/v2.17.0" }, "funding": [ { @@ -8159,7 +7907,7 @@ "type": "tidelift" } ], - "time": "2023-11-14T10:21:35+00:00" + "time": "2024-04-19T06:36:45+00:00" }, { "name": "symfony/ux-translator", @@ -8167,12 +7915,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/ux-translator.git", - "reference": "d825dd3e3dbc4791ac41b1b7bd30bc7edcc2674f" + "reference": "93ad2ca9725e4eb66d64f909c321cc16fafc7b15" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/ux-translator/zipball/d825dd3e3dbc4791ac41b1b7bd30bc7edcc2674f", - "reference": "d825dd3e3dbc4791ac41b1b7bd30bc7edcc2674f", + "url": "https://api.github.com/repos/symfony/ux-translator/zipball/93ad2ca9725e4eb66d64f909c321cc16fafc7b15", + "reference": "93ad2ca9725e4eb66d64f909c321cc16fafc7b15", "shasum": "" }, "require": { @@ -8220,7 +7968,7 @@ "symfony-ux" ], "support": { - "source": "https://github.com/symfony/ux-translator/tree/v2.16.0" + "source": "https://github.com/symfony/ux-translator/tree/v2.17.0" }, "funding": [ { @@ -8236,7 +7984,7 @@ "type": "tidelift" } ], - "time": "2024-02-29T16:20:59+00:00" + "time": "2024-04-19T06:36:45+00:00" }, { "name": "symfony/ux-turbo", @@ -8244,12 +7992,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/ux-turbo.git", - "reference": "d3590a43fee73304855dfc8022ccb57b0df9f03d" + "reference": "2931623bf7bd76b9402c38ef156c46363a7f4679" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/ux-turbo/zipball/d3590a43fee73304855dfc8022ccb57b0df9f03d", - "reference": "d3590a43fee73304855dfc8022ccb57b0df9f03d", + "url": "https://api.github.com/repos/symfony/ux-turbo/zipball/2931623bf7bd76b9402c38ef156c46363a7f4679", + "reference": "2931623bf7bd76b9402c38ef156c46363a7f4679", "shasum": "" }, "require": { @@ -8260,6 +8008,7 @@ "symfony/flex": "<1.13" }, "require-dev": { + "dbrekelmans/bdi": "dev-main", "doctrine/doctrine-bundle": "^2.4.3", "doctrine/orm": "^2.8 | 3.0", "phpstan/phpstan": "^1.10", @@ -8317,7 +8066,7 @@ "turbo-stream" ], "support": { - "source": "https://github.com/symfony/ux-turbo/tree/v2.16.0" + "source": "https://github.com/symfony/ux-turbo/tree/2.x" }, "funding": [ { @@ -8333,7 +8082,7 @@ "type": "tidelift" } ], - "time": "2024-02-20T16:11:17+00:00" + "time": "2024-04-24T17:26:43+00:00" }, { "name": "symfony/ux-twig-component", @@ -8341,12 +8090,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/ux-twig-component.git", - "reference": "7ae4ce4083560b0400fa03673a3e04e2969549c6" + "reference": "47e107b12ab450fed75ae45668a5fef3d736840a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/ux-twig-component/zipball/7ae4ce4083560b0400fa03673a3e04e2969549c6", - "reference": "7ae4ce4083560b0400fa03673a3e04e2969549c6", + "url": "https://api.github.com/repos/symfony/ux-twig-component/zipball/47e107b12ab450fed75ae45668a5fef3d736840a", + "reference": "47e107b12ab450fed75ae45668a5fef3d736840a", "shasum": "" }, "require": { @@ -8355,7 +8104,7 @@ "symfony/deprecation-contracts": "^2.2|^3.0", "symfony/event-dispatcher": "^5.4|^6.0|^7.0", "symfony/property-access": "^5.4|^6.0|^7.0", - "twig/twig": "~3.8.0" + "twig/twig": "^3.8" }, "conflict": { "symfony/config": "<5.4.0" @@ -8418,7 +8167,7 @@ "type": "tidelift" } ], - "time": "2024-04-14T16:38:15+00:00" + "time": "2024-04-25T14:47:41+00:00" }, { "name": "symfony/ux-typed", @@ -8426,12 +8175,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/ux-typed.git", - "reference": "9c8e8f5e1a35750bbe5a718c1fc2d470ad93c0d0" + "reference": "6231fa3ae8802fbabdbbc45590d6c2e70c1a64fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/ux-typed/zipball/9c8e8f5e1a35750bbe5a718c1fc2d470ad93c0d0", - "reference": "9c8e8f5e1a35750bbe5a718c1fc2d470ad93c0d0", + "url": "https://api.github.com/repos/symfony/ux-typed/zipball/6231fa3ae8802fbabdbbc45590d6c2e70c1a64fc", + "reference": "6231fa3ae8802fbabdbbc45590d6c2e70c1a64fc", "shasum": "" }, "conflict": { @@ -8470,7 +8219,7 @@ "symfony-ux" ], "support": { - "source": "https://github.com/symfony/ux-typed/tree/2.x" + "source": "https://github.com/symfony/ux-typed/tree/v2.17.0" }, "funding": [ { @@ -8486,7 +8235,7 @@ "type": "tidelift" } ], - "time": "2024-03-22T11:18:21+00:00" + "time": "2024-04-19T06:36:45+00:00" }, { "name": "symfony/ux-vue", @@ -8494,12 +8243,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/ux-vue.git", - "reference": "781af930f48eab70b158c9ded981acd7e5a39473" + "reference": "e0b8bad2a55d53c9fed4ca64d5e861117f411b15" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/ux-vue/zipball/781af930f48eab70b158c9ded981acd7e5a39473", - "reference": "781af930f48eab70b158c9ded981acd7e5a39473", + "url": "https://api.github.com/repos/symfony/ux-vue/zipball/e0b8bad2a55d53c9fed4ca64d5e861117f411b15", + "reference": "e0b8bad2a55d53c9fed4ca64d5e861117f411b15", "shasum": "" }, "require": { @@ -8551,7 +8300,7 @@ "symfony-ux" ], "support": { - "source": "https://github.com/symfony/ux-vue/tree/2.x" + "source": "https://github.com/symfony/ux-vue/tree/v2.17.0" }, "funding": [ { @@ -8567,7 +8316,7 @@ "type": "tidelift" } ], - "time": "2024-03-22T14:52:38+00:00" + "time": "2024-04-19T06:36:45+00:00" }, { "name": "symfony/validator", @@ -9137,16 +8886,16 @@ }, { "name": "twig/extra-bundle", - "version": "v3.9.0", + "version": "v3.9.3", "source": { "type": "git", "url": "https://github.com/twigphp/twig-extra-bundle.git", - "reference": "3a68ffc7747ecc25823cabe2127710ced516a16a" + "reference": "ef6869adf1fdab66f7e495771a7ba01496ffc0d5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/twig-extra-bundle/zipball/3a68ffc7747ecc25823cabe2127710ced516a16a", - "reference": "3a68ffc7747ecc25823cabe2127710ced516a16a", + "url": "https://api.github.com/repos/twigphp/twig-extra-bundle/zipball/ef6869adf1fdab66f7e495771a7ba01496ffc0d5", + "reference": "ef6869adf1fdab66f7e495771a7ba01496ffc0d5", "shasum": "" }, "require": { @@ -9195,7 +8944,7 @@ "twig" ], "support": { - "source": "https://github.com/twigphp/twig-extra-bundle/tree/v3.9.0" + "source": "https://github.com/twigphp/twig-extra-bundle/tree/v3.9.3" }, "funding": [ { @@ -9207,7 +8956,7 @@ "type": "tidelift" } ], - "time": "2024-02-07T08:24:24+00:00" + "time": "2024-04-18T09:24:21+00:00" }, { "name": "twig/html-extra", @@ -9279,22 +9028,22 @@ }, { "name": "twig/intl-extra", - "version": "v3.9.0", + "version": "v3.9.2", "source": { "type": "git", "url": "https://github.com/twigphp/intl-extra.git", - "reference": "89781f6d97981397c8c8a13ca679919f39628c75" + "reference": "39865e5d13165016a8e7ab8cc648ad2f7aa4b639" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/intl-extra/zipball/89781f6d97981397c8c8a13ca679919f39628c75", - "reference": "89781f6d97981397c8c8a13ca679919f39628c75", + "url": "https://api.github.com/repos/twigphp/intl-extra/zipball/39865e5d13165016a8e7ab8cc648ad2f7aa4b639", + "reference": "39865e5d13165016a8e7ab8cc648ad2f7aa4b639", "shasum": "" }, "require": { "php": ">=7.2.5", "symfony/intl": "^5.4|^6.4|^7.0", - "twig/twig": "^3.0" + "twig/twig": "^3.9" }, "require-dev": { "symfony/phpunit-bridge": "^6.4|^7.0" @@ -9327,7 +9076,7 @@ "twig" ], "support": { - "source": "https://github.com/twigphp/intl-extra/tree/v3.9.0" + "source": "https://github.com/twigphp/intl-extra/tree/v3.9.2" }, "funding": [ { @@ -9339,7 +9088,7 @@ "type": "tidelift" } ], - "time": "2024-04-03T15:08:24+00:00" + "time": "2024-04-17T12:41:53+00:00" }, { "name": "twig/markdown-extra", @@ -9482,30 +9231,37 @@ }, { "name": "twig/twig", - "version": "v3.8.0", + "version": "v3.9.3", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "9d15f0ac07f44dc4217883ec6ae02fd555c6f71d" + "reference": "a842d75fed59cdbcbd3a3ad7fb9eb768fc350d58" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/9d15f0ac07f44dc4217883ec6ae02fd555c6f71d", - "reference": "9d15f0ac07f44dc4217883ec6ae02fd555c6f71d", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/a842d75fed59cdbcbd3a3ad7fb9eb768fc350d58", + "reference": "a842d75fed59cdbcbd3a3ad7fb9eb768fc350d58", "shasum": "" }, "require": { "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.5|^3", "symfony/polyfill-ctype": "^1.8", "symfony/polyfill-mbstring": "^1.3", "symfony/polyfill-php80": "^1.22" }, "require-dev": { "psr/container": "^1.0|^2.0", - "symfony/phpunit-bridge": "^5.4.9|^6.3|^7.0" + "symfony/phpunit-bridge": "^5.4.9|^6.4|^7.0" }, "type": "library", "autoload": { + "files": [ + "src/Resources/core.php", + "src/Resources/debug.php", + "src/Resources/escaper.php", + "src/Resources/string_loader.php" + ], "psr-4": { "Twig\\": "src/" } @@ -9538,7 +9294,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.8.0" + "source": "https://github.com/twigphp/Twig/tree/v3.9.3" }, "funding": [ { @@ -9550,7 +9306,7 @@ "type": "tidelift" } ], - "time": "2023-11-21T18:54:41+00:00" + "time": "2024-04-18T11:59:33+00:00" } ], "packages-dev": [ diff --git a/ux.symfony.com/config/bundles.php b/ux.symfony.com/config/bundles.php index c8101fec914..ca9ec1061d5 100644 --- a/ux.symfony.com/config/bundles.php +++ b/ux.symfony.com/config/bundles.php @@ -18,7 +18,6 @@ Doctrine\Bundle\DoctrineBundle\DoctrineBundle::class => ['all' => true], Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle::class => ['all' => true], Symfony\Bundle\MakerBundle\MakerBundle::class => ['dev' => true], - BabDev\PagerfantaBundle\BabDevPagerfantaBundle::class => ['all' => true], Symfony\UX\Autocomplete\AutocompleteBundle::class => ['all' => true], Symfony\UX\Notify\NotifyBundle::class => ['all' => true], Symfony\UX\React\ReactBundle::class => ['all' => true], diff --git a/ux.symfony.com/importmap.php b/ux.symfony.com/importmap.php index 5425863508c..887aaa3d13b 100644 --- a/ux.symfony.com/importmap.php +++ b/ux.symfony.com/importmap.php @@ -10,8 +10,6 @@ * be used as an "entrypoint" (and passed to the importmap() Twig function). * * The "importmap:require" command can be used to add new entries to this file. - * - * This file has been auto-generated by the importmap commands. */ return [ 'app' => [ @@ -84,25 +82,25 @@ 'package_specifier' => 'vue/dist/vue.esm-bundler.js', ], 'swup' => [ - 'version' => '4.6.0', + 'version' => '3.1.1', ], 'delegate-it' => [ 'version' => '6.0.1', ], '@swup/debug-plugin' => [ - 'version' => '4.0.4', + 'version' => '3.0.0', ], '@swup/fade-theme' => [ - 'version' => '2.0.0', + 'version' => '1.0.5', ], '@swup/forms-plugin' => [ - 'version' => '3.4.2', + 'version' => '2.0.1', ], '@swup/slide-theme' => [ - 'version' => '2.0.0', + 'version' => '1.0.5', ], '@swup/plugin' => [ - 'version' => '4.0.0', + 'version' => '2.0.3', ], '@hotwired/turbo' => [ 'version' => '8.0.3', @@ -126,7 +124,7 @@ 'version' => '4.2.12', ], 'svelte/internal' => [ - 'version' => '4.2.12', + 'version' => '3.59.2', ], 'highlight.js/lib/core' => [ 'version' => '11.9.0', diff --git a/ux.symfony.com/src/Controller/UxPackage/SwupController.php b/ux.symfony.com/src/Controller/UxPackage/SwupController.php index 931ad8408a9..93b283d562b 100644 --- a/ux.symfony.com/src/Controller/UxPackage/SwupController.php +++ b/ux.symfony.com/src/Controller/UxPackage/SwupController.php @@ -12,28 +12,31 @@ namespace App\Controller\UxPackage; use App\Service\UxPackageRepository; -use Pagerfanta\Adapter\ArrayAdapter; -use Pagerfanta\Pagerfanta; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Routing\Attribute\Route; class SwupController extends AbstractController { + private const int PER_PAGE = 4; + #[Route('/swup/{page<\d+>}', name: 'app_swup')] public function __invoke(UxPackageRepository $packageRepository, int $page = 1): Response { $package = $packageRepository->find('swup'); - $pagerfanta = Pagerfanta::createForCurrentPageWithMaxPerPage( - new ArrayAdapter($packageRepository->findAll()), - $page, - 4 - ); + $packages = $packageRepository->findAll(); + $pages = ceil(count($packages) / self::PER_PAGE); + if ($page < 1 || $page > $pages) { + throw $this->createNotFoundException('Page not found'); + } + $results = array_slice($packages, ($page - 1) * self::PER_PAGE, self::PER_PAGE); return $this->render('ux_packages/swup.html.twig', [ 'package' => $package, - 'pager' => $pagerfanta, + 'results' => $results, + 'page' => $page, + 'pages' => $pages, ]); } } diff --git a/ux.symfony.com/symfony.lock b/ux.symfony.com/symfony.lock index 75cfc9e708b..837d59b26e1 100644 --- a/ux.symfony.com/symfony.lock +++ b/ux.symfony.com/symfony.lock @@ -1,7 +1,4 @@ { - "babdev/pagerfanta-bundle": { - "version": "v3.7.0" - }, "behat/mink": { "version": "v1.10.0" }, @@ -110,12 +107,6 @@ "nikic/php-parser": { "version": "v4.14.0" }, - "pagerfanta/core": { - "version": "v3.6.1" - }, - "pagerfanta/twig": { - "version": "v3.6.1" - }, "phar-io/manifest": { "version": "2.0.3" }, diff --git a/ux.symfony.com/templates/components/Icon/IconModal.html.twig b/ux.symfony.com/templates/components/Icon/IconModal.html.twig index c89794d3165..b8542831980 100644 --- a/ux.symfony.com/templates/components/Icon/IconModal.html.twig +++ b/ux.symfony.com/templates/components/Icon/IconModal.html.twig @@ -1,7 +1,7 @@ diff --git a/ux.symfony.com/templates/components/PrevNextDemo.html.twig b/ux.symfony.com/templates/components/PrevNextDemo.html.twig index 69fef1e7cb4..204a15991ea 100644 --- a/ux.symfony.com/templates/components/PrevNextDemo.html.twig +++ b/ux.symfony.com/templates/components/PrevNextDemo.html.twig @@ -3,13 +3,13 @@
{% set previous = this.previous(true) %} {% if previous %} -
+
{% endif %} {% set next = this.next(true) %} {% if next %} -
+
{% endif %} diff --git a/ux.symfony.com/templates/icons/index.html.twig b/ux.symfony.com/templates/icons/index.html.twig index d23baec96f6..e6fa9aea191 100644 --- a/ux.symfony.com/templates/icons/index.html.twig +++ b/ux.symfony.com/templates/icons/index.html.twig @@ -44,7 +44,7 @@ {% for iconSet in iconSets %} {% endfor %}
diff --git a/ux.symfony.com/templates/liveDemoBase.html.twig b/ux.symfony.com/templates/liveDemoBase.html.twig index 0bb48851c29..7d712ffcf88 100644 --- a/ux.symfony.com/templates/liveDemoBase.html.twig +++ b/ux.symfony.com/templates/liveDemoBase.html.twig @@ -7,32 +7,20 @@ canonical: url(demo.route), } %} -{% block header %} -
-
-
- - - Back to all demos - - -
-
-
-{% endblock %} - {% block content %} {% block demo_header %} -
-
-

- DEMO / - LiveComponent -

-

{{ demo.name }}

-
- {{ demo.longDescription|markdown_to_html }} +
+
+
+

+ DEMOS / + LiveComponent +

+

{{ demo.name }}

+
+ {{ demo.longDescription|markdown_to_html }} +
diff --git a/ux.symfony.com/templates/ux_packages/swup.html.twig b/ux.symfony.com/templates/ux_packages/swup.html.twig index eba9c937d0a..3dc307d3457 100644 --- a/ux.symfony.com/templates/ux_packages/swup.html.twig +++ b/ux.symfony.com/templates/ux_packages/swup.html.twig @@ -32,18 +32,25 @@ {% block swup_specific_demo_content %}
- {% for package in pager %} - {{ include('main/_package_in_list.html.twig') }} + {% for package in results %} + {{ include('main/_package_in_list.html.twig', {package}) }} {% endfor %}
- {{ pagerfanta(pager, 'twitter_bootstrap5') }} +
{% endblock %} -
+
Ajax-powered page navigation
URL in address bar changes
diff --git a/ux.symfony.com/tests/Functional/LiveComponentDemosTest.php b/ux.symfony.com/tests/Functional/LiveComponentDemosTest.php index 473dfe9da27..727906703e8 100644 --- a/ux.symfony.com/tests/Functional/LiveComponentDemosTest.php +++ b/ux.symfony.com/tests/Functional/LiveComponentDemosTest.php @@ -50,7 +50,7 @@ public function testDemoPagesAllLoad(LiveDemo $liveDemo): void ; } - public function getSmokeTests(): \Generator + public static function getSmokeTests(): \Generator { $demoRepository = new LiveDemoRepository(); foreach ($demoRepository->findAll() as $demo) { diff --git a/ux.symfony.com/tests/Functional/UxPackagesTest.php b/ux.symfony.com/tests/Functional/UxPackagesTest.php index ce81630140b..6dbb53855b6 100644 --- a/ux.symfony.com/tests/Functional/UxPackagesTest.php +++ b/ux.symfony.com/tests/Functional/UxPackagesTest.php @@ -43,7 +43,7 @@ public function testPackagePagesAllLoad(UxPackage $package, string $expectedText ; } - public function getSmokeTests(): \Generator + public static function getSmokeTests(): \Generator { $repository = new UxPackageRepository(); foreach ($repository->findAll() as $package) {