Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Template hierarchy filter: Preserve existing paths #141

Merged
merged 9 commits into from
Mar 18, 2024
Merged

Template hierarchy filter: Preserve existing paths #141

Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
74b8c3d
Template hierarchy filter: Preserve existing paths
strarsis Nov 20, 2021
01279f4
Update FiltersTemplates.php
strarsis Dec 8, 2022
2cbb2a3
Merge branch 'roots:main' into patch-1
strarsis Mar 14, 2023
b7b8ccc
Fix lint errors.
strarsis Mar 16, 2023
95c5f0b
Merge branch 'roots:main' into patch-1
strarsis Oct 12, 2023
639155e
🩹 Do not return blade files
Log1x Mar 18, 2024
c60978f
🎨 Move the `file_exists` check to the end of the `filterTemplateInclu…
Log1x Mar 18, 2024
39a26c3
🎨 Remove unnecessary conditional
Log1x Mar 18, 2024
6b70551
🚨 Run Pint
Log1x Mar 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/Roots/Acorn/Sage/Concerns/FiltersTemplates.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

namespace Roots\Acorn\Sage\Concerns;

use Illuminate\Support\Str;

trait FiltersTemplates
{
/**
Expand All @@ -14,7 +16,7 @@ trait FiltersTemplates
*/
public function filterTemplateHierarchy($files)
{
return $this->sageFinder->locate($files);
return [...$this->sageFinder->locate($files), ...$files];
}

/**
Expand All @@ -27,6 +29,10 @@ public function filterTemplateHierarchy($files)
*/
public function filterTemplateInclude($file)
{
if (@file_exists($file) && ! Str::endsWith($file, '.blade.php')) {
return $file;
}

$view = $this->fileFinder
->getPossibleViewNameFromPath($file = realpath($file));

Expand Down
Loading