From b4ce95a60daa1bc6874d4c85f6d0815a3777978c Mon Sep 17 00:00:00 2001 From: Ryan Chandler Date: Fri, 12 Mar 2021 14:30:44 +0000 Subject: [PATCH] fix: use booted for safe facade usage --- src/PluginServiceProvider.php | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/src/PluginServiceProvider.php b/src/PluginServiceProvider.php index 8faf4e9349..232c1f13e3 100644 --- a/src/PluginServiceProvider.php +++ b/src/PluginServiceProvider.php @@ -3,15 +3,10 @@ namespace Filament; use Illuminate\Support\ServiceProvider; -use Illuminate\Filesystem\Filesystem; -use Livewire\LiveWire; -use ReflectionClass; -use Str; -use Symfony\Component\Finder\SplFileInfo; +use Livewire\Livewire; abstract class PluginServiceProvider extends ServiceProvider { - protected $pages = []; protected $resources = []; @@ -37,16 +32,6 @@ abstract class PluginServiceProvider extends ServiceProvider Filament::registerResource($resource); } - foreach ($this->resources() as $resource) { - foreach ($resource::relations() as $relation) { - Livewire::component($relation::getName(), $relation); - } - - foreach ($resource::routes() as $route) { - Livewire::component($route->page::getName(), $route->page); - } - } - foreach ($this->roles() as $role) { Filament::registerRole($role); } @@ -68,6 +53,22 @@ abstract class PluginServiceProvider extends ServiceProvider }); }); + $this->app->booted(function () { + foreach ($this->pages() as $page) { + Livewire::component($page::getName(), $page); + } + + foreach ($this->resources() as $resource) { + foreach ($resource::relations() as $relation) { + Livewire::component($relation::getName(), $relation); + } + + foreach ($resource::routes() as $route) { + Livewire::component($route->page::getName(), $route->page); + } + } + }); + $this->pluginRegistered(); }