feat: refactor Grunt task execution and integrate into theme builder

Author: dermatz

src/Service/GruntTaskRunner.php

@@ -23,16 +23,26 @@ public function runTasks(
         bool $isVerbose
     ): bool {
         try {
-            foreach (['clean', 'less'] as $task) {
-                $shellOutput = $this->shell->execute(self::GRUNT_PATH . ' ' . $task . ' --quiet');
-                if ($isVerbose) {
-                    $output->writeln($shellOutput);
-                    $io->success("'grunt $task' has been successfully executed.");
-                }
+            if ($isVerbose) {
+                $io->text('Running grunt clean...');
+                $this->shell->execute(self::GRUNT_PATH . ' clean');
+            } else {
+                $this->shell->execute(self::GRUNT_PATH . ' clean --quiet');
+            }
+
+            if ($isVerbose) {
+                $io->text('Running grunt less...');
+                $this->shell->execute(self::GRUNT_PATH . ' less');
+            } else {
+                $this->shell->execute(self::GRUNT_PATH . ' less --quiet');
+            }
+
+            if ($isVerbose) {
+                $io->success('Grunt tasks completed successfully.');
             }
             return true;
         } catch (\Exception $e) {
-            $io->error($e->getMessage());
+            $io->error('Failed to run grunt tasks: ' . $e->getMessage());
             return false;
         }
     }

src/Service/ThemeBuilder/MagentoStandard/Builder.php

@@ -7,6 +7,7 @@
 use Magento\Framework\Filesystem\Driver\File;
 use Magento\Framework\Shell;
 use OpenForgeProject\MageForge\Service\CacheCleaner;
+use OpenForgeProject\MageForge\Service\GruntTaskRunner;
 use OpenForgeProject\MageForge\Service\NodePackageManager;
 use OpenForgeProject\MageForge\Service\StaticContentCleaner;
 use OpenForgeProject\MageForge\Service\StaticContentDeployer;
@@ -26,7 +27,8 @@ public function __construct(
         private readonly StaticContentCleaner $staticContentCleaner,
         private readonly CacheCleaner $cacheCleaner,
         private readonly SymlinkCleaner $symlinkCleaner,
-        private readonly NodePackageManager $nodePackageManager
+        private readonly NodePackageManager $nodePackageManager,
+        private readonly GruntTaskRunner $gruntTaskRunner
     ) {
     }
 
@@ -56,37 +58,7 @@ public function build(string $themeCode, string $themePath, SymfonyStyle $io, Ou
         if ($this->isVendorTheme($themePath)) {
             $io->warning('Vendor theme detected. Skipping Grunt steps.');
         } elseif ($this->hasNodeSetup()) {
-            // Check if Node/Grunt setup exists
-            if (!$this->autoRepair($themePath, $io, $output, $isVerbose)) {
-                return false;
-            }
-
-            // Clean symlinks in web/css/ directory before build
-            if (!$this->symlinkCleaner->cleanSymlinks($themePath, $io, $isVerbose)) {
-                return false;
-            }
-
-            // Run grunt tasks
-            try {
-                if ($isVerbose) {
-                    $io->text('Running grunt clean...');
-                    $this->shell->execute('node_modules/.bin/grunt clean');
-                } else {
-                    $this->shell->execute('node_modules/.bin/grunt clean --quiet');
-                }
-
-                if ($isVerbose) {
-                    $io->text('Running grunt less...');
-                    $this->shell->execute('node_modules/.bin/grunt less');
-                } else {
-                    $this->shell->execute('node_modules/.bin/grunt less --quiet');
-                }
-
-                if ($isVerbose) {
-                    $io->success('Grunt tasks completed successfully.');
-                }
-            } catch (\Exception $e) {
-                $io->error('Failed to run grunt tasks: ' . $e->getMessage());
+            if (!$this->processNodeSetup($themePath, $io, $output, $isVerbose)) {
                 return false;
             }
         } else {
@@ -108,6 +80,29 @@ public function build(string $themeCode, string $themePath, SymfonyStyle $io, Ou
         return true;
     }
 
+    /**
+     * Process Node.js and Grunt setup
+     */
+    private function processNodeSetup(
+        string $themePath,
+        SymfonyStyle $io,
+        OutputInterface $output,
+        bool $isVerbose
+    ): bool {
+        // Check if Node/Grunt setup exists
+        if (!$this->autoRepair($themePath, $io, $output, $isVerbose)) {
+            return false;
+        }
+
+        // Clean symlinks in web/css/ directory before build
+        if (!$this->symlinkCleaner->cleanSymlinks($themePath, $io, $isVerbose)) {
+            return false;
+        }
+
+        // Run grunt tasks
+        return $this->gruntTaskRunner->runTasks($io, $output, $isVerbose);
+    }
+
     public function autoRepair(string $themePath, SymfonyStyle $io, OutputInterface $output, bool $isVerbose): bool
     {
         $rootPath = '.';