Separated processing for Tailwind 4 for future setup

README.md

@@ -38,6 +38,9 @@ With each class, replace the colour with the string `[colour]` to inject the dif
 This is intended to make working with colours easier by generating the different classes to a HTML file for the 
 Tailwind process to pick up and include in the site's CSS.
 
+You can also pass a `version` of either `3` or `4` - this is separating generation logic for different Tailwind 
+versions. If omitted, will default to v3.
+
 ## Listeners
 
 ### Prevent Deleting Mounts

src/Console/Commands/GenerateTailwindCommand.php

@@ -4,6 +4,7 @@
 
 use Exception;
 use Illuminate\Console\Command;
+use Illuminate\Support\Arr;
 use Statamic\Facades\YAML;
 
 class GenerateTailwindCommand extends Command
@@ -43,9 +44,34 @@ public function handle(): void
             $this->error('YAML is missing "classes" property.');
         }
 
+        // get the tailwind version
+        $tailwind = Arr::get($yaml, 'version', 3);
+
         // store the html here
         $html = [];
 
+        if ($tailwind === 3) {
+            $html = $this->generateV3($yaml);
+        } elseif ($tailwind === 4) {
+            $html = $this->generateV4($yaml);
+        } else {
+            $this->error('Unknown Tailwind version');
+        }
+
+        $contents = '<!-- THIS FILE IS GENERATED BY THE COMMAND php artisan fuse:generate-tailwind -->'."\r\n";
+        $contents .= '<!-- Make changes to your config.yaml file, then re-run the command to update this file -->'."\r\n";
+        $contents .= implode("\r\n", $html);
+
+        // save the output
+        file_put_contents($target, $contents);
+
+        $this->info('Huzzah! Your config has been generated auto-magically!');
+    }
+
+    protected function generateV3($yaml)
+    {
+        $html = [];
+
         // start the loop
         foreach ($yaml['colours'] as $colour) {
             $classes = [];
@@ -58,13 +84,29 @@ public function handle(): void
             $html[] = '<div class="'.implode(' ', $classes).'"></div>';
         }
 
-        $contents = '<!-- THIS FILE IS GENERATED BY THE COMMAND php artisan fuse:generate-tailwind -->'."\r\n";
-        $contents .= '<!-- Make changes to your config.yaml file, then re-run the command to update this file -->'."\r\n";
-        $contents .= implode("\r\n", $html);
+        $html[] = '<div class="'.implode(' ', Arr::get($yaml, 'standard', [])).'"></div>';
 
-        // save the output
-        file_put_contents($target, $contents);
+        return $html;
+    }
 
-        $this->info('Huzzah! Your config has been generated auto-magically!');
+    protected function generateV4($yaml)
+    {
+        $html = [];
+
+        // start the loop
+        foreach ($yaml['colours'] as $colour) {
+            $classes = [];
+            foreach ($yaml['classes'] as $class) {
+                // merge the colour to the class
+                $classes[] = str_replace('[colour]', $colour, strtolower($class));
+            }
+
+            // add to the html
+            $html[] = '<div class="'.implode(' ', $classes).'"></div>';
+        }
+
+        $html[] = '<div class="'.implode(' ', Arr::get($yaml, 'standard', [])).'"></div>';
+
+        return $html;
     }
 }

src/Listeners/ImagesWithoutAltListener.php

@@ -13,31 +13,32 @@ class ImagesWithoutAltListener
 {
     public function handleSaving(AssetSaving $event)
     {
-        if (!$this->hasImagesWithoutAltWidget()) {
+        if (! $this->hasImagesWithoutAltWidget()) {
             return;
         }
-        
+
         if ($event->asset->isDirty('alt')) {
             Cache::forget(FuseUtilities::getImagesMissingAltCache());
         }
     }
 
     public function handleChange(AssetDeleted|AssetUploaded $event)
     {
-        if (!$this->hasImagesWithoutAltWidget()) {
+        if (! $this->hasImagesWithoutAltWidget()) {
             return;
         }
 
         Cache::forget(FuseUtilities::getImagesMissingAltCache());
     }
 
-    protected function hasImagesWithoutAltWidget() {
+    protected function hasImagesWithoutAltWidget()
+    {
         return collect(config('statamic.cp.widgets', []))->contains('type', 'images_without_alt');
     }
 
     public function subscribe(Dispatcher $events)
     {
-        if (!$this->hasImagesWithoutAltWidget()) {
+        if (! $this->hasImagesWithoutAltWidget()) {
             return;
         }
 

src/Support/FuseUtilities.php

@@ -13,7 +13,7 @@ public function getImagesMissingAltCache(): string
         return 'fuse-utilities::widgets.images-without-alt';
     }
 
-    public function isCaptchaEnabled(?string $site = null, ?string $environment = null, Form|string $form = null): bool
+    public function isCaptchaEnabled(?string $site = null, ?string $environment = null, Form|string|null $form = null): bool
     {
         $forms = GlobalSet::findByHandle('forms')
             ->in($site ?? Site::current()->handle);

src/Tags/Concerns/Form.php

@@ -136,7 +136,7 @@ public function getFormLang()
         }
 
         if (is_array($message)) {
-            $bard = (new Bard())->setField($global->blueprint()->field($fieldHandle));
+            $bard = (new Bard)->setField($global->blueprint()->field($fieldHandle));
 
             $content = (new Augmentor($bard))
                 ->augment($message);