diff --git a/packages/panels/src/Commands/MakeClusterCommand.php b/packages/panels/src/Commands/MakeClusterCommand.php index ba605f2e79..3e8891945f 100644 --- a/packages/panels/src/Commands/MakeClusterCommand.php +++ b/packages/panels/src/Commands/MakeClusterCommand.php @@ -65,6 +65,13 @@ class MakeClusterCommand extends Command $clusterDirectories = $panel->getClusterDirectories(); $clusterNamespaces = $panel->getClusterNamespaces(); + foreach ($clusterDirectories as $clusterIndex => $clusterDirectory) { + if (str($clusterDirectory)->startsWith(base_path('vendor'))) { + unset($clusterDirectories[$clusterIndex]); + unset($clusterNamespaces[$clusterIndex]); + } + } + $namespace = (count($clusterNamespaces) > 1) ? select( label: 'Which namespace would you like to create this in?', diff --git a/packages/panels/src/Commands/MakePageCommand.php b/packages/panels/src/Commands/MakePageCommand.php index e907e2dacd..88d8ce1c95 100644 --- a/packages/panels/src/Commands/MakePageCommand.php +++ b/packages/panels/src/Commands/MakePageCommand.php @@ -70,10 +70,20 @@ class MakePageCommand extends Command )] : Arr::first($panels); } + $resourceDirectories = $panel->getResourceDirectories(); + $resourceNamespaces = $panel->getResourceNamespaces(); + + foreach ($resourceDirectories as $resourceIndex => $resourceDirectory) { + if (str($resourceDirectory)->startsWith(base_path('vendor'))) { + unset($resourceDirectories[$resourceIndex]); + unset($resourceNamespaces[$resourceIndex]); + } + } + $resourceInput = $this->option('resource') ?? suggest( label: 'Which resource would you like to create this in?', options: collect($panel->getResources()) - ->filter(fn (string $namespace): bool => str($namespace)->contains('\\Resources\\')) + ->filter(fn (string $namespace): bool => str($namespace)->contains('\\Resources\\') && str($namespace)->startsWith($resourceNamespaces)) ->map( fn (string $namespace): string => (string) str($namespace) ->afterLast('\\Resources\\') @@ -195,6 +205,13 @@ class MakePageCommand extends Command $pageDirectories = $panel->getPageDirectories(); $pageNamespaces = $panel->getPageNamespaces(); + foreach ($pageDirectories as $pageIndex => $pageDirectory) { + if (str($pageDirectory)->startsWith(base_path('vendor'))) { + unset($pageDirectories[$pageIndex]); + unset($pageNamespaces[$pageIndex]); + } + } + $namespace = (count($pageNamespaces) > 1) ? select( label: 'Which namespace would you like to create this in?', diff --git a/packages/spatie-laravel-settings-plugin/src/Commands/MakeSettingsPageCommand.php b/packages/spatie-laravel-settings-plugin/src/Commands/MakeSettingsPageCommand.php index a4a6f15494..c482b384de 100644 --- a/packages/spatie-laravel-settings-plugin/src/Commands/MakeSettingsPageCommand.php +++ b/packages/spatie-laravel-settings-plugin/src/Commands/MakeSettingsPageCommand.php @@ -70,6 +70,13 @@ class MakeSettingsPageCommand extends Command $pageDirectories = $panel->getPageDirectories(); $pageNamespaces = $panel->getPageNamespaces(); + foreach ($pageDirectories as $pageIndex => $pageDirectory) { + if (str($pageDirectory)->startsWith(base_path('vendor'))) { + unset($pageDirectories[$pageIndex]); + unset($pageNamespaces[$pageIndex]); + } + } + $namespace = (count($pageNamespaces) > 1) ? select( label: 'Which namespace would you like to create this in?', diff --git a/packages/widgets/src/Commands/MakeWidgetCommand.php b/packages/widgets/src/Commands/MakeWidgetCommand.php index 1fcaa408ff..677abf62ae 100644 --- a/packages/widgets/src/Commands/MakeWidgetCommand.php +++ b/packages/widgets/src/Commands/MakeWidgetCommand.php @@ -114,6 +114,13 @@ class MakeWidgetCommand extends Command $widgetDirectories = $panel->getWidgetDirectories(); $widgetNamespaces = $panel->getWidgetNamespaces(); + foreach ($widgetDirectories as $widgetIndex => $widgetDirectory) { + if (str($widgetDirectory)->startsWith(base_path('vendor'))) { + unset($widgetDirectories[$widgetIndex]); + unset($widgetNamespaces[$widgetIndex]); + } + } + $namespace = (count($widgetNamespaces) > 1) ? select( label: 'Which namespace would you like to create this in?',