From cb0aebd64a5ff7acadf7a9f354315cbab902757c Mon Sep 17 00:00:00 2001 From: N1ebieski Date: Fri, 4 Apr 2025 11:34:48 +0000 Subject: [PATCH 1/5] Fix a bug with overrides vendor blade components Fixes N1ebieski/vs-code-extension#33 --- php-templates/blade-components.php | 27 ++++++++++++++------------- src/templates/blade-components.ts | 27 ++++++++++++++------------- 2 files changed, 28 insertions(+), 26 deletions(-) diff --git a/php-templates/blade-components.php b/php-templates/blade-components.php index b1b5f19c..cf6fe253 100644 --- a/php-templates/blade-components.php +++ b/php-templates/blade-components.php @@ -209,21 +209,22 @@ protected function getVendorComponents(): array $views = $finder->getHints(); foreach ($views as $key => $paths) { - // First is always optional override in the resources/views folder - $path = $paths[0] . '/components'; + foreach ($paths as $path) { + $path .= '/components'; - if (!is_dir($path)) { - continue; - } + if (!is_dir($path)) { + continue; + } - array_push( - $components, - ...$this->findFiles( - $path, - 'blade.php', - fn (\Illuminate\Support\Stringable $k) => $k->kebab()->prepend($key.'::'), - ) - ); + array_push( + $components, + ...$this->findFiles( + $path, + 'blade.php', + fn (\Illuminate\Support\Stringable $k) => $k->kebab()->prepend($key.'::'), + ) + ); + } } return $components; diff --git a/src/templates/blade-components.ts b/src/templates/blade-components.ts index a369e586..d706dad6 100644 --- a/src/templates/blade-components.ts +++ b/src/templates/blade-components.ts @@ -209,21 +209,22 @@ $components = new class { $views = $finder->getHints(); foreach ($views as $key => $paths) { - // First is always optional override in the resources/views folder - $path = $paths[0] . '/components'; + foreach ($paths as $path) { + $path .= '/components'; - if (!is_dir($path)) { - continue; - } + if (!is_dir($path)) { + continue; + } - array_push( - $components, - ...$this->findFiles( - $path, - 'blade.php', - fn (\\Illuminate\\Support\\Stringable $k) => $k->kebab()->prepend($key.'::'), - ) - ); + array_push( + $components, + ...$this->findFiles( + $path, + 'blade.php', + fn (\\Illuminate\\Support\\Stringable $k) => $k->kebab()->prepend($key.'::'), + ) + ); + } } return $components; From 8bbd54b60a5f79033b9b62000d882930f5a7bd11 Mon Sep 17 00:00:00 2001 From: N1ebieski Date: Sun, 13 Apr 2025 11:35:19 +0000 Subject: [PATCH 2/5] fix for flux components --- php-templates/blade-components.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/php-templates/blade-components.php b/php-templates/blade-components.php index cf6fe253..d7e0c989 100644 --- a/php-templates/blade-components.php +++ b/php-templates/blade-components.php @@ -210,10 +210,12 @@ protected function getVendorComponents(): array foreach ($views as $key => $paths) { foreach ($paths as $path) { - $path .= '/components'; - - if (!is_dir($path)) { - continue; + // Flux components are directly in the components directory and have hashed key + if (str($path)->endsWith('flux')) { + $key = 'flux:'; + } else { + $key .= '::'; + $path .= '/components'; } array_push( From 7a026f193f28723a39c0430ce031189c25098c4a Mon Sep 17 00:00:00 2001 From: N1ebieski Date: Sun, 13 Apr 2025 11:42:11 +0000 Subject: [PATCH 3/5] Fix a bug with overrides vendor blade components Fixes N1ebieski/vs-code-extension#33 --- php-templates/blade-components.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php-templates/blade-components.php b/php-templates/blade-components.php index d7e0c989..928de52c 100644 --- a/php-templates/blade-components.php +++ b/php-templates/blade-components.php @@ -223,7 +223,7 @@ protected function getVendorComponents(): array ...$this->findFiles( $path, 'blade.php', - fn (\Illuminate\Support\Stringable $k) => $k->kebab()->prepend($key.'::'), + fn (\Illuminate\Support\Stringable $k) => $k->kebab()->prepend($key), ) ); } From ef5cf3690bd9d865d8c6978ce5d63642996faa7c Mon Sep 17 00:00:00 2001 From: N1ebieski Date: Sun, 13 Apr 2025 12:03:48 +0000 Subject: [PATCH 4/5] Revert "fix for flux components" This reverts commit 8bbd54b60a5f79033b9b62000d882930f5a7bd11. --- php-templates/blade-components.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/php-templates/blade-components.php b/php-templates/blade-components.php index 928de52c..cfad19e8 100644 --- a/php-templates/blade-components.php +++ b/php-templates/blade-components.php @@ -210,12 +210,10 @@ protected function getVendorComponents(): array foreach ($views as $key => $paths) { foreach ($paths as $path) { - // Flux components are directly in the components directory and have hashed key - if (str($path)->endsWith('flux')) { - $key = 'flux:'; - } else { - $key .= '::'; - $path .= '/components'; + $path .= '/components'; + + if (!is_dir($path)) { + continue; } array_push( From 35f31db958fdd4831afd4c9c9606bd5135110708 Mon Sep 17 00:00:00 2001 From: N1ebieski Date: Sun, 13 Apr 2025 12:04:36 +0000 Subject: [PATCH 5/5] revert --- php-templates/blade-components.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php-templates/blade-components.php b/php-templates/blade-components.php index cfad19e8..cf6fe253 100644 --- a/php-templates/blade-components.php +++ b/php-templates/blade-components.php @@ -221,7 +221,7 @@ protected function getVendorComponents(): array ...$this->findFiles( $path, 'blade.php', - fn (\Illuminate\Support\Stringable $k) => $k->kebab()->prepend($key), + fn (\Illuminate\Support\Stringable $k) => $k->kebab()->prepend($key.'::'), ) ); }