From f4f2a4a78589162b8a330063e5dbca9872e2cb93 Mon Sep 17 00:00:00 2001 From: Hugo Alliaume Date: Thu, 27 Nov 2025 00:35:36 +0100 Subject: [PATCH] [Toolkit] Pin `tales-from-a-dev/twig-tailwind-extra` to `^1.0.0` --- src/Toolkit/composer.json | 2 +- src/Toolkit/kits/shadcn/alert-dialog/manifest.json | 2 +- src/Toolkit/kits/shadcn/alert/manifest.json | 2 +- src/Toolkit/kits/shadcn/avatar/manifest.json | 2 +- src/Toolkit/kits/shadcn/badge/manifest.json | 2 +- src/Toolkit/kits/shadcn/breadcrumb/manifest.json | 2 +- src/Toolkit/kits/shadcn/button/manifest.json | 2 +- src/Toolkit/kits/shadcn/card/manifest.json | 2 +- src/Toolkit/kits/shadcn/checkbox/manifest.json | 2 +- src/Toolkit/kits/shadcn/dialog/manifest.json | 2 +- src/Toolkit/kits/shadcn/input/manifest.json | 2 +- src/Toolkit/kits/shadcn/item/manifest.json | 2 +- src/Toolkit/kits/shadcn/label/manifest.json | 2 +- src/Toolkit/kits/shadcn/pagination/manifest.json | 2 +- src/Toolkit/kits/shadcn/progress/manifest.json | 2 +- src/Toolkit/kits/shadcn/select/manifest.json | 2 +- src/Toolkit/kits/shadcn/separator/manifest.json | 2 +- src/Toolkit/kits/shadcn/skeleton/manifest.json | 2 +- src/Toolkit/kits/shadcn/spinner/manifest.json | 2 +- src/Toolkit/kits/shadcn/switch/manifest.json | 2 +- src/Toolkit/kits/shadcn/table/manifest.json | 2 +- src/Toolkit/kits/shadcn/textarea/manifest.json | 2 +- src/Toolkit/src/Command/CreateKitCommand.php | 2 +- src/Toolkit/tests/Command/CreateKitCommandTest.php | 2 +- src/Toolkit/tests/Command/DebugKitCommandTest.php | 6 +++--- .../kits/with-many-dependencies/alert/manifest.json | 2 +- src/Toolkit/tests/Installer/PoolResolverTest.php | 4 ++-- src/Toolkit/tests/Kit/KitSynchronizerTest.php | 2 +- src/Toolkit/tests/Recipe/RecipeManifestTest.php | 4 ++-- 29 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/Toolkit/composer.json b/src/Toolkit/composer.json index 1348624625f..e230493b908 100644 --- a/src/Toolkit/composer.json +++ b/src/Toolkit/composer.json @@ -51,7 +51,7 @@ "spatie/phpunit-snapshot-assertions": "^4.2.17|^5.2.3", "phpunit/phpunit": "^9.6.22", "symfony/ux-icons": "^2.18", - "tales-from-a-dev/twig-tailwind-extra": "^0.4.0" + "tales-from-a-dev/twig-tailwind-extra": "^1.0.0" }, "bin": [ "bin/ux-toolkit-kit-create", diff --git a/src/Toolkit/kits/shadcn/alert-dialog/manifest.json b/src/Toolkit/kits/shadcn/alert-dialog/manifest.json index bffc95ea4a6..0a6cc671fac 100644 --- a/src/Toolkit/kits/shadcn/alert-dialog/manifest.json +++ b/src/Toolkit/kits/shadcn/alert-dialog/manifest.json @@ -9,6 +9,6 @@ }, "dependencies": { "recipe": ["button"], - "composer": ["twig/extra-bundle", "twig/html-extra:^3.12.0", "tales-from-a-dev/twig-tailwind-extra"] + "composer": ["twig/extra-bundle", "twig/html-extra:^3.12.0", "tales-from-a-dev/twig-tailwind-extra:^1.0.0"] } } diff --git a/src/Toolkit/kits/shadcn/alert/manifest.json b/src/Toolkit/kits/shadcn/alert/manifest.json index 876b4c06230..8e67405242a 100644 --- a/src/Toolkit/kits/shadcn/alert/manifest.json +++ b/src/Toolkit/kits/shadcn/alert/manifest.json @@ -7,6 +7,6 @@ "templates/": "templates/" }, "dependencies": { - "composer": ["twig/extra-bundle", "twig/html-extra:^3.12.0", "tales-from-a-dev/twig-tailwind-extra"] + "composer": ["twig/extra-bundle", "twig/html-extra:^3.12.0", "tales-from-a-dev/twig-tailwind-extra:^1.0.0"] } } diff --git a/src/Toolkit/kits/shadcn/avatar/manifest.json b/src/Toolkit/kits/shadcn/avatar/manifest.json index b387f862861..f92e3e4ad6b 100644 --- a/src/Toolkit/kits/shadcn/avatar/manifest.json +++ b/src/Toolkit/kits/shadcn/avatar/manifest.json @@ -7,6 +7,6 @@ "templates/": "templates/" }, "dependencies": { - "composer": ["tales-from-a-dev/twig-tailwind-extra"] + "composer": ["tales-from-a-dev/twig-tailwind-extra:^1.0.0"] } } diff --git a/src/Toolkit/kits/shadcn/badge/manifest.json b/src/Toolkit/kits/shadcn/badge/manifest.json index 4777970ac73..9635c84b6a4 100644 --- a/src/Toolkit/kits/shadcn/badge/manifest.json +++ b/src/Toolkit/kits/shadcn/badge/manifest.json @@ -7,6 +7,6 @@ "templates/": "templates/" }, "dependencies": { - "composer": ["twig/extra-bundle", "twig/html-extra:^3.12.0", "tales-from-a-dev/twig-tailwind-extra"] + "composer": ["twig/extra-bundle", "twig/html-extra:^3.12.0", "tales-from-a-dev/twig-tailwind-extra:^1.0.0"] } } diff --git a/src/Toolkit/kits/shadcn/breadcrumb/manifest.json b/src/Toolkit/kits/shadcn/breadcrumb/manifest.json index 422266ca9fa..509e5335b85 100644 --- a/src/Toolkit/kits/shadcn/breadcrumb/manifest.json +++ b/src/Toolkit/kits/shadcn/breadcrumb/manifest.json @@ -7,6 +7,6 @@ "templates/": "templates/" }, "dependencies": { - "composer": ["symfony/ux-icons", "tales-from-a-dev/twig-tailwind-extra"] + "composer": ["symfony/ux-icons", "tales-from-a-dev/twig-tailwind-extra:^1.0.0"] } } diff --git a/src/Toolkit/kits/shadcn/button/manifest.json b/src/Toolkit/kits/shadcn/button/manifest.json index 52c9f9f26fe..8f2ee7cb31e 100644 --- a/src/Toolkit/kits/shadcn/button/manifest.json +++ b/src/Toolkit/kits/shadcn/button/manifest.json @@ -7,6 +7,6 @@ "templates/": "templates/" }, "dependencies": { - "composer": ["twig/extra-bundle", "twig/html-extra:^3.12.0", "tales-from-a-dev/twig-tailwind-extra"] + "composer": ["twig/extra-bundle", "twig/html-extra:^3.12.0", "tales-from-a-dev/twig-tailwind-extra:^1.0.0"] } } diff --git a/src/Toolkit/kits/shadcn/card/manifest.json b/src/Toolkit/kits/shadcn/card/manifest.json index f9b0864ff86..156427ac96a 100644 --- a/src/Toolkit/kits/shadcn/card/manifest.json +++ b/src/Toolkit/kits/shadcn/card/manifest.json @@ -7,6 +7,6 @@ "templates/": "templates/" }, "dependencies": { - "composer": ["tales-from-a-dev/twig-tailwind-extra"] + "composer": ["tales-from-a-dev/twig-tailwind-extra:^1.0.0"] } } diff --git a/src/Toolkit/kits/shadcn/checkbox/manifest.json b/src/Toolkit/kits/shadcn/checkbox/manifest.json index 06431609f31..e46db9dbc34 100644 --- a/src/Toolkit/kits/shadcn/checkbox/manifest.json +++ b/src/Toolkit/kits/shadcn/checkbox/manifest.json @@ -7,6 +7,6 @@ "templates/": "templates/" }, "dependencies": { - "composer": ["tales-from-a-dev/twig-tailwind-extra"] + "composer": ["tales-from-a-dev/twig-tailwind-extra:^1.0.0"] } } diff --git a/src/Toolkit/kits/shadcn/dialog/manifest.json b/src/Toolkit/kits/shadcn/dialog/manifest.json index ca9fed15540..914f9930ff1 100644 --- a/src/Toolkit/kits/shadcn/dialog/manifest.json +++ b/src/Toolkit/kits/shadcn/dialog/manifest.json @@ -12,7 +12,7 @@ "symfony/ux-icons", "twig/extra-bundle", "twig/html-extra:^3.12.0", - "tales-from-a-dev/twig-tailwind-extra" + "tales-from-a-dev/twig-tailwind-extra:^1.0.0" ] } } diff --git a/src/Toolkit/kits/shadcn/input/manifest.json b/src/Toolkit/kits/shadcn/input/manifest.json index 318e9f8d1ff..c11a90bbed1 100644 --- a/src/Toolkit/kits/shadcn/input/manifest.json +++ b/src/Toolkit/kits/shadcn/input/manifest.json @@ -7,6 +7,6 @@ "templates/": "templates/" }, "dependencies": { - "composer": ["tales-from-a-dev/twig-tailwind-extra"] + "composer": ["tales-from-a-dev/twig-tailwind-extra:^1.0.0"] } } diff --git a/src/Toolkit/kits/shadcn/item/manifest.json b/src/Toolkit/kits/shadcn/item/manifest.json index ed49d6efa2b..d3d1b292736 100644 --- a/src/Toolkit/kits/shadcn/item/manifest.json +++ b/src/Toolkit/kits/shadcn/item/manifest.json @@ -7,7 +7,7 @@ "templates/": "templates/" }, "dependencies": { - "composer": ["twig/extra-bundle", "twig/html-extra:^3.12.0", "tales-from-a-dev/twig-tailwind-extra"], + "composer": ["twig/extra-bundle", "twig/html-extra:^3.12.0", "tales-from-a-dev/twig-tailwind-extra:^1.0.0"], "recipe": ["separator"] } } diff --git a/src/Toolkit/kits/shadcn/label/manifest.json b/src/Toolkit/kits/shadcn/label/manifest.json index c254c2d786f..bda0ceecaea 100644 --- a/src/Toolkit/kits/shadcn/label/manifest.json +++ b/src/Toolkit/kits/shadcn/label/manifest.json @@ -7,6 +7,6 @@ "templates/": "templates/" }, "dependencies": { - "composer": ["tales-from-a-dev/twig-tailwind-extra"] + "composer": ["tales-from-a-dev/twig-tailwind-extra:^1.0.0"] } } diff --git a/src/Toolkit/kits/shadcn/pagination/manifest.json b/src/Toolkit/kits/shadcn/pagination/manifest.json index 6850aed6c45..cb0cf8d19dd 100644 --- a/src/Toolkit/kits/shadcn/pagination/manifest.json +++ b/src/Toolkit/kits/shadcn/pagination/manifest.json @@ -7,6 +7,6 @@ "templates/": "templates/" }, "dependencies": { - "composer": ["symfony/ux-icons", "tales-from-a-dev/twig-tailwind-extra"] + "composer": ["symfony/ux-icons", "tales-from-a-dev/twig-tailwind-extra:^1.0.0"] } } diff --git a/src/Toolkit/kits/shadcn/progress/manifest.json b/src/Toolkit/kits/shadcn/progress/manifest.json index 25972065ea6..9b5df85e4a0 100644 --- a/src/Toolkit/kits/shadcn/progress/manifest.json +++ b/src/Toolkit/kits/shadcn/progress/manifest.json @@ -7,6 +7,6 @@ "templates/": "templates/" }, "dependencies": { - "composer": ["tales-from-a-dev/twig-tailwind-extra"] + "composer": ["tales-from-a-dev/twig-tailwind-extra:^1.0.0"] } } diff --git a/src/Toolkit/kits/shadcn/select/manifest.json b/src/Toolkit/kits/shadcn/select/manifest.json index 74c302921e0..3755815e479 100644 --- a/src/Toolkit/kits/shadcn/select/manifest.json +++ b/src/Toolkit/kits/shadcn/select/manifest.json @@ -7,6 +7,6 @@ "templates/": "templates/" }, "dependencies": { - "composer": ["tales-from-a-dev/twig-tailwind-extra"] + "composer": ["tales-from-a-dev/twig-tailwind-extra:^1.0.0"] } } diff --git a/src/Toolkit/kits/shadcn/separator/manifest.json b/src/Toolkit/kits/shadcn/separator/manifest.json index 4891eb75456..8aba0e98c80 100644 --- a/src/Toolkit/kits/shadcn/separator/manifest.json +++ b/src/Toolkit/kits/shadcn/separator/manifest.json @@ -7,6 +7,6 @@ "templates/": "templates/" }, "dependencies": { - "composer": ["twig/extra-bundle", "twig/html-extra:^3.12.0", "tales-from-a-dev/twig-tailwind-extra"] + "composer": ["twig/extra-bundle", "twig/html-extra:^3.12.0", "tales-from-a-dev/twig-tailwind-extra:^1.0.0"] } } diff --git a/src/Toolkit/kits/shadcn/skeleton/manifest.json b/src/Toolkit/kits/shadcn/skeleton/manifest.json index 7f2779ccb97..fc6660a7c74 100644 --- a/src/Toolkit/kits/shadcn/skeleton/manifest.json +++ b/src/Toolkit/kits/shadcn/skeleton/manifest.json @@ -7,6 +7,6 @@ "templates/": "templates/" }, "dependencies": { - "composer": ["tales-from-a-dev/twig-tailwind-extra"] + "composer": ["tales-from-a-dev/twig-tailwind-extra:^1.0.0"] } } diff --git a/src/Toolkit/kits/shadcn/spinner/manifest.json b/src/Toolkit/kits/shadcn/spinner/manifest.json index f271630d517..bd88525411e 100644 --- a/src/Toolkit/kits/shadcn/spinner/manifest.json +++ b/src/Toolkit/kits/shadcn/spinner/manifest.json @@ -7,6 +7,6 @@ "templates/": "templates/" }, "dependencies": { - "composer": ["symfony/ux-icons", "tales-from-a-dev/twig-tailwind-extra"] + "composer": ["symfony/ux-icons", "tales-from-a-dev/twig-tailwind-extra:^1.0.0"] } } diff --git a/src/Toolkit/kits/shadcn/switch/manifest.json b/src/Toolkit/kits/shadcn/switch/manifest.json index 5e9925afe17..5f0c18c52ed 100644 --- a/src/Toolkit/kits/shadcn/switch/manifest.json +++ b/src/Toolkit/kits/shadcn/switch/manifest.json @@ -7,6 +7,6 @@ "templates/": "templates/" }, "dependencies": { - "composer": ["tales-from-a-dev/twig-tailwind-extra"] + "composer": ["tales-from-a-dev/twig-tailwind-extra:^1.0.0"] } } diff --git a/src/Toolkit/kits/shadcn/table/manifest.json b/src/Toolkit/kits/shadcn/table/manifest.json index be4252f32bb..e637c38760f 100644 --- a/src/Toolkit/kits/shadcn/table/manifest.json +++ b/src/Toolkit/kits/shadcn/table/manifest.json @@ -7,6 +7,6 @@ "templates/": "templates/" }, "dependencies": { - "composer": ["tales-from-a-dev/twig-tailwind-extra"] + "composer": ["tales-from-a-dev/twig-tailwind-extra:^1.0.0"] } } diff --git a/src/Toolkit/kits/shadcn/textarea/manifest.json b/src/Toolkit/kits/shadcn/textarea/manifest.json index 498d84841c5..5904362efca 100644 --- a/src/Toolkit/kits/shadcn/textarea/manifest.json +++ b/src/Toolkit/kits/shadcn/textarea/manifest.json @@ -7,6 +7,6 @@ "templates/": "templates/" }, "dependencies": { - "composer": ["tales-from-a-dev/twig-tailwind-extra"] + "composer": ["tales-from-a-dev/twig-tailwind-extra:^1.0.0"] } } diff --git a/src/Toolkit/src/Command/CreateKitCommand.php b/src/Toolkit/src/Command/CreateKitCommand.php index c57eb2aa8cb..25c1315dff2 100644 --- a/src/Toolkit/src/Command/CreateKitCommand.php +++ b/src/Toolkit/src/Command/CreateKitCommand.php @@ -120,7 +120,7 @@ class="{{ style.apply({ variant }, attributes.render('class'))|tailwind_merge }} 'composer' => [ 'twig/extra-bundle', 'twig/html-extra:^3.12.0', - 'tales-from-a-dev/twig-tailwind-extra', + 'tales-from-a-dev/twig-tailwind-extra:^1.0.0', ], ], ], \JSON_PRETTY_PRINT | \JSON_UNESCAPED_SLASHES)); diff --git a/src/Toolkit/tests/Command/CreateKitCommandTest.php b/src/Toolkit/tests/Command/CreateKitCommandTest.php index 27371c3f695..5610fe3c454 100644 --- a/src/Toolkit/tests/Command/CreateKitCommandTest.php +++ b/src/Toolkit/tests/Command/CreateKitCommandTest.php @@ -79,7 +79,7 @@ public function testShouldBeAbleToCreateAKit() "composer": [ "twig/extra-bundle", "twig/html-extra:^3.12.0", - "tales-from-a-dev/twig-tailwind-extra" + "tales-from-a-dev/twig-tailwind-extra:^1.0.0" ] } } diff --git a/src/Toolkit/tests/Command/DebugKitCommandTest.php b/src/Toolkit/tests/Command/DebugKitCommandTest.php index 5d42ca1197b..11b46fd729a 100644 --- a/src/Toolkit/tests/Command/DebugKitCommandTest.php +++ b/src/Toolkit/tests/Command/DebugKitCommandTest.php @@ -36,7 +36,7 @@ public function testShouldBeAbleToDebugShadcnKit() '| File(s) | templates/components/Avatar.html.twig |', '| | templates/components/Avatar/Image.html.twig |', '| | templates/components/Avatar/Text.html.twig |', - '| Dependencies | tales-from-a-dev/twig-tailwind-extra |', + '| Dependencies | tales-from-a-dev/twig-tailwind-extra:^1.0.0 |', '+--------------+----------------------------------------------------------------------------------+', ])) ->assertOutputContains(implode(\PHP_EOL, [ @@ -49,7 +49,7 @@ public function testShouldBeAbleToDebugShadcnKit() '| | templates/components/Table/Head.html.twig |', '| | templates/components/Table/Header.html.twig |', '| | templates/components/Table/Row.html.twig |', - '| Dependencies | tales-from-a-dev/twig-tailwind-extra |', + '| Dependencies | tales-from-a-dev/twig-tailwind-extra:^1.0.0 |', '+--------------+----------------------------------------------------------------------------------+', ])); } @@ -70,7 +70,7 @@ public function testShouldBeAbleToDebugFixtureKitWithManyDependencies() '| File(s) | N/A |', '| Dependencies | button |', '| | twig/html-extra:^3.12.0 |', - '| | tales-from-a-dev/twig-tailwind-extra |', + '| | tales-from-a-dev/twig-tailwind-extra:^1.0.0 |', '| | tailwindcss:^4.0.0 |', '| | @tailwindplus/elements:1 |', '| | @hotwired/stimulus |', diff --git a/src/Toolkit/tests/Fixtures/kits/with-many-dependencies/alert/manifest.json b/src/Toolkit/tests/Fixtures/kits/with-many-dependencies/alert/manifest.json index f158671114f..2f4ff1e3160 100644 --- a/src/Toolkit/tests/Fixtures/kits/with-many-dependencies/alert/manifest.json +++ b/src/Toolkit/tests/Fixtures/kits/with-many-dependencies/alert/manifest.json @@ -5,7 +5,7 @@ "description": "Component Alert", "dependencies": { "recipe": ["button"], - "composer": ["twig/html-extra:^3.12.0", "tales-from-a-dev/twig-tailwind-extra"], + "composer": ["twig/html-extra:^3.12.0", "tales-from-a-dev/twig-tailwind-extra:^1.0.0"], "npm": ["tailwindcss@^4.0.0", "@tailwindplus/elements@1"], "importmap": ["@hotwired/stimulus"] } diff --git a/src/Toolkit/tests/Installer/PoolResolverTest.php b/src/Toolkit/tests/Installer/PoolResolverTest.php index 8f304842dc0..438764c8587 100644 --- a/src/Toolkit/tests/Installer/PoolResolverTest.php +++ b/src/Toolkit/tests/Installer/PoolResolverTest.php @@ -98,7 +98,7 @@ public function testCanHandleAllPossibleDependencies() $this->assertEquals([ new RecipeDependency('button'), new PhpPackageDependency('twig/html-extra', new ConstraintVersion('^3.12.0')), - new PhpPackageDependency('tales-from-a-dev/twig-tailwind-extra'), + new PhpPackageDependency('tales-from-a-dev/twig-tailwind-extra', new ConstraintVersion('^1.0.0')), new NpmPackageDependency('tailwindcss', new ConstraintVersion('^4.0.0')), new NpmPackageDependency('@tailwindplus/elements', new ConstraintVersion('1')), new ImportmapPackageDependency('@hotwired/stimulus'), @@ -117,7 +117,7 @@ public function testCanHandleAllPossibleDependencies() $this->assertEquals([ 'twig/html-extra' => new PhpPackageDependency('twig/html-extra', new ConstraintVersion('^3.12.0')), - 'tales-from-a-dev/twig-tailwind-extra' => new PhpPackageDependency('tales-from-a-dev/twig-tailwind-extra'), + 'tales-from-a-dev/twig-tailwind-extra' => new PhpPackageDependency('tales-from-a-dev/twig-tailwind-extra', new ConstraintVersion('^1.0.0')), 'another/php-package' => new PhpPackageDependency('another/php-package', new ConstraintVersion('^2.0')), ], $pool->getPhpPackageDependencies()); diff --git a/src/Toolkit/tests/Kit/KitSynchronizerTest.php b/src/Toolkit/tests/Kit/KitSynchronizerTest.php index be1605c704b..90e0dedd529 100644 --- a/src/Toolkit/tests/Kit/KitSynchronizerTest.php +++ b/src/Toolkit/tests/Kit/KitSynchronizerTest.php @@ -40,7 +40,7 @@ public function testCanResolveDependencies() $this->assertEquals([ new PhpPackageDependency('twig/extra-bundle'), new PhpPackageDependency('twig/html-extra', new ConstraintVersion('^3.12.0')), - new PhpPackageDependency('tales-from-a-dev/twig-tailwind-extra'), + new PhpPackageDependency('tales-from-a-dev/twig-tailwind-extra', new ConstraintVersion('^1.0.0')), ], $kit->getRecipe('button')->manifest->dependencies); } } diff --git a/src/Toolkit/tests/Recipe/RecipeManifestTest.php b/src/Toolkit/tests/Recipe/RecipeManifestTest.php index f38c72cd281..deb39530616 100644 --- a/src/Toolkit/tests/Recipe/RecipeManifestTest.php +++ b/src/Toolkit/tests/Recipe/RecipeManifestTest.php @@ -213,7 +213,7 @@ public function testFromJsonWithValidData() }, "dependencies": { "composer": [ - "tales-from-a-dev/twig-tailwind-extra", + "tales-from-a-dev/twig-tailwind-extra:^1.0.0", "symfony/ux-twig-component:^2.29" ], "npm": [ @@ -236,7 +236,7 @@ public function testFromJsonWithValidData() $this->assertSame(['templates/' => 'templates/'], $manifest->copyFiles); $this->assertEquals([ new RecipeDependency('OtherComponent'), - new PhpPackageDependency('tales-from-a-dev/twig-tailwind-extra', null), + new PhpPackageDependency('tales-from-a-dev/twig-tailwind-extra', new ConstraintVersion('^1.0.0')), new PhpPackageDependency('symfony/ux-twig-component', new ConstraintVersion('^2.29')), new NpmPackageDependency('tailwindcss', new ConstraintVersion('^4.0.0')), new NpmPackageDependency('@tailwindplus/elements', new ConstraintVersion('1')),