✨ Add support for (hybrid) FSE

src/Roots/Acorn/Sage/Concerns/FiltersTemplates.php

@@ -12,9 +12,39 @@ trait FiltersTemplates
      * @param  array  $files
      * @return string[] List of possible views
      */
-    public function filterTemplateHierarchy($files)
+    public function filterTemplateHierarchy($files): array
     {
-        return $this->sageFinder->locate($files);
+        $hierarchy = $this->sageFinder->locate($files);
+
+        // If the theme does not support FSE, return the original hierarchy.
+        if (
+            ! function_exists('wp_is_block_theme')
+             || ! \wp_is_block_theme()
+             || ! \current_theme_supports('block-templates')
+        ) {
+            return $hierarchy;
+        }
+
+        // Extract all entries, which point to an official FSE path (e.g. templates/...)
+        $fse_paths = array_filter(
+            $hierarchy,
+            static fn ($file) => str_starts_with($file, 'templates/') || str_contains($file, 'templates/')
+        );
+        $hierarchy = array_diff($hierarchy, $fse_paths);
+
+        // Extract all entries, which point to a custom blade template (e.g. template-foo.blade.php)
+        $custom_template = \get_page_template_slug();
+        $custom_template_paths = [];
+        if ($custom_template) {
+            $custom_template_paths = array_filter(
+                $hierarchy,
+                static fn ($file) => str_contains($file, $custom_template)
+            );
+            $hierarchy = array_diff($hierarchy, $custom_template_paths);
+        }
+
+        // Rebuild hierarchy with original $files and FSE paths on top.
+        return array_merge($custom_template_paths, $files, $fse_paths, $hierarchy);
     }
 
     /**
@@ -27,6 +57,15 @@ public function filterTemplateHierarchy($files)
      */
     public function filterTemplateInclude($file)
     {
+        // Prevent duplication of markup
+        // @ https://github.com/roots/acorn/pull/141#issuecomment-1343162742
+        if (
+            @file_exists($file)
+            && ! str_contains($file, '.blade.php')
+        ) {
+            return $file;
+        }
+
         $view = $this->fileFinder
             ->getPossibleViewNameFromPath($file = realpath($file));
 

src/Roots/helpers.php

@@ -89,6 +89,16 @@ function view($view = null, $data = [], $mergeData = [])
         : $factory->file($view, $data, $mergeData);
 }
 
+/**
+ * Check if the current theme supports FSE.
+ */
+function use_fse(): bool
+{
+    return \function_exists('wp_is_block_theme')
+           && \wp_is_block_theme()
+           && \current_theme_supports('block-templates');
+}
+
 /**
  * @deprecated
  */