feat: update commands to latest version

Author: mychidarko

bin/leaf

@@ -21,18 +21,14 @@ $app = sprout()->createApp([
 ]);
 
 // $app->register(Leaf\Console\CreateCommand::class);
-// $app->register(Leaf\Console\UpdateCommand::class);
-// $app->register(Leaf\Console\TestCommand::class);
-// $app->register(Leaf\Console\TestSetupCommand::class);
-// $app->register(Leaf\Console\InstallCommand::class);
-// $app->register(Leaf\Console\UninstallCommand::class);
-// $app->register(Leaf\Console\ServeCommand::class);
-// $app->register(Leaf\Console\DeployCommand::class);
+$app->register(Leaf\Console\UpdateCommand::class);
+$app->register(Leaf\Console\InstallCommand::class);
+$app->register(Leaf\Console\UninstallCommand::class);
+$app->register(Leaf\Console\ServeCommand::class);
 $app->register(Leaf\Console\InteractCommand::class);
-// $app->register(Leaf\Console\RunCommand::class);
-// $app->register(Leaf\Console\UICommand::class);
-// $app->register(Leaf\Console\ViewBuildCommand::class);
-// $app->register(Leaf\Console\ViewDevCommand::class);
+$app->register(Leaf\Console\RunCommand::class);
+$app->register(Leaf\Console\UICommand::class);
+$app->register(Leaf\Console\ViewBuildCommand::class);
 // $app->register(Leaf\Console\ViewInstallCommand::class);
 
 $app->run();

src/ServeCommand.php

@@ -11,7 +11,7 @@ class ServeCommand extends Command
     protected $signature = 'serve
         {filename? : The PHP script to run}
         {--p|port=5500 : Port to run app on}
-        {--nc|no-concurrent : Run PHP server without Vite server}';
+        {--nc|no-concurrent? : Run PHP server without Vite server}';
 
     protected $description = 'Run a server to serve your Leaf app';
 
@@ -37,12 +37,13 @@ protected function handle(): int
 
         $port = $this->option('port');
         $isDockerProject = file_exists(getcwd() . '/docker-compose.yml');
-        $useConcurrent = !$this->option('no-concurrent') && file_exists(getcwd() . '/vite.config.js');
+        $useConcurrent = !$this->option('no-concurrent') && (file_exists(getcwd() . '/vite.config.js') && file_exists(getcwd() . '/package.json'));
         $serveCommand = !$useConcurrent ? "php -S localhost:$port" : "npx concurrently -c \"#3eaf7c,#bd34fe\" \"php -S localhost:$port\" \"npm run dev\" --names=server,vite --colors";
 
-        return sprout()->process(
-            $isDockerProject ? 'docker compose up' : $serveCommand
-        )->run();
+        return sprout()
+            ->process($isDockerProject ? 'docker compose up' : $serveCommand)
+            ->setTimeout(null)
+            ->run();
     }
 
     protected function isMVCApp()

src/UICommand.php

@@ -8,13 +8,14 @@
 
 class UICommand extends Command
 {
-    protected $signature = 'ui {--port=3001}';
+    protected $signature = 'ui {--p|port=3001}';
 
     protected $description = 'Open up the Leaf CLI GUI';
 
     protected function execute(): int
     {
         $port = $this->option('port');
+
         $uiDirectory = __DIR__ . '/ui/dist';
         $serveCommand = "cd $uiDirectory && php -S localhost:$port";
 

src/UpdateCommand.php

@@ -14,10 +14,10 @@ class UpdateCommand extends Command
 
     protected function handle(): int
     {
-        if (sprout()->composer(true)->remove('cli --no-update --no-install')->isSuccessful()) {
+        if (sprout()->composer(true)->remove('leafs/cli --no-update --no-install --ansi')->isSuccessful()) {
             sleep(1);
 
-            if (sprout()->composer(true)->install('cli')->isSuccessful()) {
+            if (sprout()->composer(true)->install('leafs/cli --ansi')->isSuccessful()) {
                 $this->writeln('<info>Leaf CLI installed successfully!</info>');
                 return 0;
             }

src/ViewBuildCommand.php

@@ -12,14 +12,14 @@ class ViewBuildCommand extends Command
 
     protected $description = 'Build your frontend assets';
 
-    protected function execute(): int
+    protected function handle(): int
     {
-        if (!sprout()->npm($this->option('pm'))->json()) {
+        if (!sprout()->npm()->json()) {
             $this->writeln('<error>No package.json found in the current directory.</error>');
             return 1;
         }
 
-        if (!sprout()->npm($this->option('pm'))->hasDependencies()) {
+        if (!sprout()->npm()->hasDependencies()) {
             $this->writeln('<info>Installing dependencies...</info>');
 
             if (!sprout()->npm($this->option('pm'))->install()->isSuccessful()) {