From ede407b58dfc7537a3bd091143a0ade8e8d6fcda Mon Sep 17 00:00:00 2001
From: QWp6t <hi@qwp6t.me>
Date: Wed, 6 Nov 2024 14:22:55 -0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20Group=20tem?=
 =?UTF-8?q?plates=20by=20name=20for=20block=20themes=20(#390)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Roots/Acorn/Sage/Concerns/FiltersTemplates.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/Roots/Acorn/Sage/Concerns/FiltersTemplates.php b/src/Roots/Acorn/Sage/Concerns/FiltersTemplates.php
index f5055562..5cf425a5 100644
--- 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,7 +37,12 @@ public function filterTemplateHierarchy($files)
             $templates = array_diff($templates, $pages);
         }
 
-        return [...$pages, ...$files, ...$templates];
+        return collect([...$pages, ...$files, ...$templates])
+            ->groupBy(function ($item) {
+                return Str::of($item)->afterLast('/')->before('.');
+            })
+            ->flatten()
+            ->toArray();
     }
 
     /**