Merge pull request #16 from Stillat/improve-volt-compatibility

Improves compatibility with Volt
Stillat · Jan 28, 2025 · d7875cb · d7875cb
2 parents 4b0961a + 4536d31
commit d7875cb
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/src/Compiler/TemplateCompiler.php b/src/Compiler/TemplateCompiler.php
@@ -564,7 +564,8 @@ protected function compileNodes(array $nodes): string
             $compiledComponentTemplate = Str::swap($swapVars, $compiledComponentTemplate);
             $compiledComponentTemplate = $this->compileExceptions($compiledComponentTemplate);
 
-            $compiled .= $compiledComponentTemplate;
+            $compiled .= $this->storeComponentBlock($compiledComponentTemplate);
+
             $this->stopCompilingComponent();
         }
 

diff --git a/src/Runtime/ViewManifest.php b/src/Runtime/ViewManifest.php
@@ -3,6 +3,7 @@
 namespace Stillat\Dagger\Runtime;
 
 use Illuminate\Contracts\View\View;
+use Illuminate\Support\Str;
 
 class ViewManifest
 {
@@ -121,6 +122,10 @@ public function getRootStoragePaths(): array
 
     public function getStoragePath(string $rootView): string
     {
+        $rootView = Str::swap([
+            ':' => '_',
+        ], $rootView);
+
         return $this->cachePath."_compiler_manifest_{$rootView}.json";
     }
 

diff --git a/tests/Compiler/AttributeForwardingTest.php b/tests/Compiler/AttributeForwardingTest.php
@@ -64,14 +64,12 @@
 
 
 
-
 The First Button
 
 The Second Button
 
 The Third Button
 
-
 No Title
 
 Component B Button Two

diff --git a/tests/Compiler/DynamicComponentsTest.php b/tests/Compiler/DynamicComponentsTest.php
@@ -139,14 +139,12 @@
 
 
 
-
 The First Button
 
 The Second Button
 
 The Third Button
 
-
 No Title
 
 Component B Button Two