diff --git a/composer.json b/composer.json index 075290b2..3056bfc1 100644 --- a/composer.json +++ b/composer.json @@ -37,13 +37,14 @@ "symfony/twig-bundle": "^6.4 || ^7.0", "symfony/ux-autocomplete": "^2.17", "symfony/ux-icons": "^2.20", - "symfony/ux-live-component": "^2.17", + "symfony/ux-live-component": "^2.17 <2.26 || ^2.30", "symfony/ux-twig-component": "^2.17", "twig/twig": "^2.15 || ^3.0", "webmozart/assert": "^1.9" }, "require-dev": { "doctrine/doctrine-fixtures-bundle": "^3.6", + "slevomat/coding-standard": "<8.23", "matthiasnoback/symfony-config-test": "^5.1", "matthiasnoback/symfony-dependency-injection-test": "^5.1", "phpstan/phpstan": "^1.10", @@ -67,6 +68,9 @@ "vich/uploader-bundle": "^2.4", "zenstruck/foundry": "^2.0" }, + "conflict": { + "gedmo/doctrine-extensions": "3.21.*" + }, "autoload": { "psr-4": { "Sylius\\AdminUi\\": "src/AdminUi/src/", diff --git a/importmap.php b/importmap.php index 3b49af09..ea1cce89 100644 --- a/importmap.php +++ b/importmap.php @@ -45,4 +45,12 @@ '@symfony/ux-live-component' => [ 'path' => './vendor/symfony/ux-live-component/assets/dist/live_controller.js', ], + 'tom-select/dist/css/tom-select.bootstrap4.css' => [ + 'version' => '2.4.3', + 'type' => 'css', + ], + 'tom-select/dist/css/tom-select.bootstrap5.css' => [ + 'version' => '2.4.3', + 'type' => 'css', + ], ]; diff --git a/src/AdminUi/composer.json b/src/AdminUi/composer.json index 09daa071..5822d9f8 100644 --- a/src/AdminUi/composer.json +++ b/src/AdminUi/composer.json @@ -28,6 +28,9 @@ "symfony/runtime": "^6.4 || ^7.0", "symfony/yaml": "^6.4 || ^7.0" }, + "conflict": { + "gedmo/doctrine-extensions": "3.21.*" + }, "suggest": { "sylius/bootstrap-admin-ui": "^0.5" }, diff --git a/src/BootstrapAdminUi/composer.json b/src/BootstrapAdminUi/composer.json index 0d35139e..889f4cde 100644 --- a/src/BootstrapAdminUi/composer.json +++ b/src/BootstrapAdminUi/composer.json @@ -16,7 +16,7 @@ "symfony/security-bundle": "^6.4 || ^7.0", "symfony/ux-autocomplete": "^2.17", "symfony/ux-icons": "^2.20", - "symfony/ux-live-component": "^2.17" + "symfony/ux-live-component": "^2.17 <2.26 || ^2.30" }, "require-dev": { "doctrine/doctrine-bundle": "^2.12", diff --git a/src/TwigHooks/composer.json b/src/TwigHooks/composer.json index 157a262b..7b1715cd 100644 --- a/src/TwigHooks/composer.json +++ b/src/TwigHooks/composer.json @@ -21,7 +21,7 @@ "symfony/expression-language": "^6.4 || ^7.0", "symfony/http-kernel": "^6.4 || ^7.0", "symfony/stopwatch": "^6.4 || ^7.0", - "symfony/ux-live-component": "^2.17", + "symfony/ux-live-component": "^2.17 <2.26 || ^2.30", "symfony/ux-twig-component": "^2.17", "symfony/twig-bundle": "^6.4 || ^7.0", "twig/twig": "^2.15 || ^3.0", diff --git a/symfony.lock b/symfony.lock index 5ecd19b4..d2e787fa 100644 --- a/symfony.lock +++ b/symfony.lock @@ -11,6 +11,15 @@ "ref": "64d8583af5ea57b7afa4aba4b159907f3a148b05" } }, + "doctrine/deprecations": { + "version": "1.1", + "recipe": { + "repo": "github.com/symfony/recipes", + "branch": "main", + "version": "1.0", + "ref": "87424683adc81d7dc305eefec1fced883084aab9" + } + }, "doctrine/doctrine-bundle": { "version": "2.12", "recipe": {