Fix bug where SSR is dispatched twice when errors exist (#489)

inertiajs · Jan 14, 2023 · c07625d · c07625d
1 parent dfa8425
commit c07625d
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/src/Directive.php b/src/Directive.php
@@ -14,12 +14,13 @@ public static function compile($expression = ''): string
         $id = trim(trim($expression), "\'\"") ?: 'app';
 
         $template = '<?php
-            if (!isset($__inertiaSsr)) {
-                $__inertiaSsr = app(\Inertia\Ssr\Gateway::class)->dispatch($page);
+            if (!isset($__inertiaSsrDispatched)) {
+                $__inertiaSsrDispatched = true;
+                $__inertiaSsrResponse = app(\Inertia\Ssr\Gateway::class)->dispatch($page);
             }
 
-            if ($__inertiaSsr instanceof \Inertia\Ssr\Response) {
-                echo $__inertiaSsr->body;
+            if ($__inertiaSsrResponse) {
+                echo $__inertiaSsrResponse->body;
             } else {
                 ?><div id="'.$id.'" data-page="{{ json_encode($page) }}"></div><?php
             }
@@ -36,12 +37,13 @@ public static function compile($expression = ''): string
     public static function compileHead($expression = ''): string
     {
         $template = '<?php
-            if (!isset($__inertiaSsr)) {
-                $__inertiaSsr = app(\Inertia\Ssr\Gateway::class)->dispatch($page);
+            if (!isset($__inertiaSsrDispatched)) {
+                $__inertiaSsrDispatched = true;
+                $__inertiaSsrResponse = app(\Inertia\Ssr\Gateway::class)->dispatch($page);
             }
 
-            if ($__inertiaSsr instanceof \Inertia\Ssr\Response) {
-                echo $__inertiaSsr->head;
+            if ($__inertiaSsrResponse) {
+                echo $__inertiaSsrResponse->head;
             }
         ?>';