Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Toolkit/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/Toolkit/kits/shadcn/alert-dialog/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
}
}
2 changes: 1 addition & 1 deletion src/Toolkit/kits/shadcn/alert/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
}
}
2 changes: 1 addition & 1 deletion src/Toolkit/kits/shadcn/avatar/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
}
}
2 changes: 1 addition & 1 deletion src/Toolkit/kits/shadcn/badge/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
}
}
2 changes: 1 addition & 1 deletion src/Toolkit/kits/shadcn/breadcrumb/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
}
}
2 changes: 1 addition & 1 deletion src/Toolkit/kits/shadcn/button/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
}
}
2 changes: 1 addition & 1 deletion src/Toolkit/kits/shadcn/card/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
}
}
2 changes: 1 addition & 1 deletion src/Toolkit/kits/shadcn/checkbox/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
}
}
2 changes: 1 addition & 1 deletion src/Toolkit/kits/shadcn/dialog/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
}
}
2 changes: 1 addition & 1 deletion src/Toolkit/kits/shadcn/input/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
}
}
2 changes: 1 addition & 1 deletion src/Toolkit/kits/shadcn/item/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
}
}
2 changes: 1 addition & 1 deletion src/Toolkit/kits/shadcn/label/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
}
}
2 changes: 1 addition & 1 deletion src/Toolkit/kits/shadcn/pagination/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
}
}
2 changes: 1 addition & 1 deletion src/Toolkit/kits/shadcn/progress/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
}
}
2 changes: 1 addition & 1 deletion src/Toolkit/kits/shadcn/select/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
}
}
2 changes: 1 addition & 1 deletion src/Toolkit/kits/shadcn/separator/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
}
}
2 changes: 1 addition & 1 deletion src/Toolkit/kits/shadcn/skeleton/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
}
}
2 changes: 1 addition & 1 deletion src/Toolkit/kits/shadcn/spinner/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
}
}
2 changes: 1 addition & 1 deletion src/Toolkit/kits/shadcn/switch/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
}
}
2 changes: 1 addition & 1 deletion src/Toolkit/kits/shadcn/table/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
}
}
2 changes: 1 addition & 1 deletion src/Toolkit/kits/shadcn/textarea/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
}
}
2 changes: 1 addition & 1 deletion src/Toolkit/src/Command/CreateKitCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
2 changes: 1 addition & 1 deletion src/Toolkit/tests/Command/CreateKitCommandTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/Toolkit/tests/Command/DebugKitCommandTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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, [
Expand All @@ -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 |',
'+--------------+----------------------------------------------------------------------------------+',
]));
}
Expand All @@ -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 |',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
}
Expand Down
4 changes: 2 additions & 2 deletions src/Toolkit/tests/Installer/PoolResolverTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
Expand All @@ -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());

Expand Down
2 changes: 1 addition & 1 deletion src/Toolkit/tests/Kit/KitSynchronizerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
4 changes: 2 additions & 2 deletions src/Toolkit/tests/Recipe/RecipeManifestTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand All @@ -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')),
Expand Down
Loading