🧑‍💻 Group templates by name for block themes (#390)

roots · Aug 12, 2024 · c1c2f57 · c1c2f57
1 parent 8a2f798
commit c1c2f57
Showing 1 changed file with 8 additions and 7 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
 {
     /**
@@ -35,13 +37,12 @@ public function filterTemplateHierarchy($files)
             $templates = array_diff($templates, $pages);
         }
 
-        if (($index = array_search('index.php', $files)) !== false) {
-            unset($files[$index]);
-
-            $templates[] = 'index.php';
-        }
-
-        return [...$pages, ...$files, ...$templates];
+        return collect([...$pages, ...$files, ...$templates])
+            ->groupBy(function ($item) {
+                return Str::of($item)->afterLast('/')->before('.');
+            })
+            ->flatten()
+            ->toArray();
     }
 
     /**