🩹 Do not return blade files

🧑‍💻 Allow blade views to override FSE templates
roots · Mar 18, 2024 · 639155e · 639155e
1 parent 95c5f0b
commit 639155e
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/Roots/Acorn/Sage/Concerns/FiltersTemplates.php b/src/Roots/Acorn/Sage/Concerns/FiltersTemplates.php
@@ -2,6 +2,8 @@
 
 namespace Roots\Acorn\Sage\Concerns;
 
+use Illuminate\Support\Str;
+
 trait FiltersTemplates
 {
     /**
@@ -14,7 +16,7 @@ trait FiltersTemplates
      */
     public function filterTemplateHierarchy($files)
     {
-        return $files + [$this->sageFinder->locate($files)];
+        return [...$this->sageFinder->locate($files), ...$files];
     }
 
     /**
@@ -27,8 +29,7 @@ public function filterTemplateHierarchy($files)
      */
     public function filterTemplateInclude($file)
     {
-
-        if (@file_exists($file)) {
+        if (@file_exists($file) && ! Str::endsWith($file, '.blade.php')) {
             return $file;
         }