Swap handrolled dynamic spinner component for Prompts task component

app/Commands/CommandRun.php

@@ -19,6 +19,7 @@
 use function Laravel\Prompts\autocomplete;
 use function Laravel\Prompts\intro;
 use function Laravel\Prompts\select;
+use function Laravel\Prompts\task;
 
 class CommandRun extends BaseCommand
 {
@@ -122,14 +123,14 @@ protected function runCommandOnEnvironment(Environment $environment): Command
             'cmd',
         );
 
-        return dynamicSpinner(
-            fn () => $this->client->commands()->run(
+        return task(
+            label: 'Running command...',
+            callback: fn () => $this->client->commands()->run(
                 new RunCommandRequestData(
                     environmentId: $environment->id,
                     command: $this->form()->get('command'),
                 ),
             ),
-            'Running command...',
         );
     }
 
@@ -252,15 +253,15 @@ protected function localArtisanCommands(?Application $application): ?array
 
     protected function selectFromHistory(string $environmentId): ?string
     {
-        $recentCommands = dynamicSpinner(
-            fn () => $this->client->commands()->list($environmentId)
+        $recentCommands = task(
+            label: 'Loading command history...',
+            callback: fn () => $this->client->commands()->list($environmentId)
                 ->collect()
                 ->map(fn ($cmd) => $cmd->command)
                 ->unique()
                 ->take(10)
                 ->values()
                 ->collect(),
-            'Loading command history...',
         );
 
         if ($recentCommands->isEmpty()) {

app/Commands/Deploy.php

@@ -11,11 +11,13 @@
 use Carbon\CarbonInterval;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Sleep;
+use Laravel\Prompts\Support\Logger;
 
 use function Laravel\Prompts\confirm;
 use function Laravel\Prompts\error;
 use function Laravel\Prompts\intro;
 use function Laravel\Prompts\outro;
+use function Laravel\Prompts\task;
 use function Laravel\Prompts\warning;
 
 class Deploy extends BaseCommand
@@ -87,9 +89,9 @@ public function handle()
             return self::SUCCESS;
         }
 
-        dynamicSpinner(
-            fn (callable $updateMessage) => $this->updateDeploymentStatus($deployment, $updateMessage),
-            $this->getDeploymentMessage($deployment),
+        task(
+            label: $this->getDeploymentMessage($deployment),
+            callback: fn (Logger $log) => $this->updateDeploymentStatus($deployment, $log),
         );
 
         $deployment = $this->client->deployments()->get($deployment->id);
@@ -140,7 +142,7 @@ public function handle()
         outro($environment->url);
     }
 
-    protected function updateDeploymentStatus(Deployment $deployment, callable $updateMessage): void
+    protected function updateDeploymentStatus(Deployment $deployment, Logger $log): void
     {
         $checkApi = true;
         $count = 0;
@@ -164,7 +166,7 @@ protected function updateDeploymentStatus(Deployment $deployment, callable $upda
                 ]));
             }
 
-            $updateMessage($newMessage, $lastMessage !== $deploymentStatus->status->monitorLabel());
+            $log->label($newMessage);
 
             $lastMessage = $deploymentStatus->status->monitorLabel();
 

app/Commands/Ship.php

@@ -42,6 +42,7 @@
 use function Laravel\Prompts\outro;
 use function Laravel\Prompts\select;
 use function Laravel\Prompts\spin;
+use function Laravel\Prompts\task;
 use function Laravel\Prompts\text;
 use function Laravel\Prompts\warning;
 
@@ -296,15 +297,15 @@ protected function createApplication(string $defaultRegion, string $repository):
             }),
         );
 
-        return dynamicSpinner(
-            fn () => $this->client->applications()->create(
+        return task(
+            label: 'Creating application',
+            callback: fn () => $this->client->applications()->create(
                 new CreateApplicationRequestData(
                     repository: $repository,
                     name: $this->form()->get('name'),
                     region: $this->form()->get('region'),
                 ),
             ),
-            'Creating application',
         );
     }
 
@@ -813,8 +814,9 @@ protected function pushCustomEnvironmentVariables(Application $application): voi
 
         $varsToAdd = collect($varsToAdd)->map(fn ($key) => ['key' => $key, 'value' => $variables[$key]]);
 
-        dynamicSpinner(
-            function () use ($application, $varsToAdd) {
+        task(
+            label: 'Adding selected variables to Cloud environment',
+            callback: function () use ($application, $varsToAdd) {
                 while (count($application->environmentIds) === 0) {
                     $application = $this->client->applications()->withDefaultIncludes()->get($application->id);
                     Sleep::for(CarbonInterval::seconds(1));
@@ -827,7 +829,6 @@ function () use ($application, $varsToAdd) {
                     ),
                 );
             },
-            'Adding selected variables to Cloud environment',
         );
     }
 }

app/Concerns/UpdatesBuildDeployCommands.php

@@ -5,6 +5,7 @@
 use App\Client\Requests\UpdateEnvironmentRequestData;
 use App\Dto\Environment;
 
+use function Laravel\Prompts\task;
 use function Laravel\Prompts\textarea;
 
 trait UpdatesBuildDeployCommands
@@ -25,13 +26,13 @@ protected function updateCommands(Environment $environment): void
 
         $this->loopUntilValid(
             function () use ($environment, $buildCommand, $deployCommand) {
-                return dynamicSpinner(
-                    fn () => $this->client->environments()->update(new UpdateEnvironmentRequestData(
+                return task(
+                    label: 'Updating commands',
+                    callback: fn () => $this->client->environments()->update(new UpdateEnvironmentRequestData(
                         environmentId: $environment->id,
                         buildCommand: $buildCommand,
                         deployCommand: $deployCommand,
                     )),
-                    'Updating commands',
                 );
             },
         );