Show exception messages in built output

statamic · Jan 27, 2024 · 3420345 · 3420345
1 parent 4412cd7
commit 3420345
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/Generator.php b/src/Generator.php
@@ -202,8 +202,8 @@ protected function createContentFiles($urls = '*')
 
         $results = $this->tasks->run(...$closures);
 
-        if ($this->anyTasksFailed($results)) {
-            throw GenerationFailedException::withConsoleMessage("\x1B[1A\x1B[2K");
+        if ($message = $this->firstFailedTask($results)) {
+            throw GenerationFailedException::withConsoleMessage("\x1B[1A\x1B[2K".$message);
         }
 
         $this->taskResults = $this->compileTasksResults($results);
@@ -213,9 +213,9 @@ protected function createContentFiles($urls = '*')
         return $this;
     }
 
-    protected function anyTasksFailed($results)
+    protected function firstFailedTask($results)
     {
-        return collect($results)->contains('');
+        return collect($results)->first(fn ($result) => is_string($result));
     }
 
     protected function compileTasksResults(array $results)
@@ -288,7 +288,7 @@ protected function makeContentGenerationClosures($pages, $request)
                         $generated = $page->generate($request);
                     } catch (NotGeneratedException $e) {
                         if ($this->shouldFail($e)) {
-                            throw GenerationFailedException::withConsoleMessage("\x1B[1A\x1B[2K".$e->consoleMessage());
+                            return $e->consoleMessage();
                         }
 
                         $errors[] = $e->consoleMessage();
@@ -300,7 +300,7 @@ protected function makeContentGenerationClosures($pages, $request)
 
                     if ($generated->hasWarning()) {
                         if ($this->shouldFail($generated)) {
-                            throw GenerationFailedException::withConsoleMessage($generated->consoleMessage());
+                            return $generated->consoleMessage();
                         }
 
                         $warnings[] = $generated->consoleMessage();