Merge pull request #8 from open-southeners/main

fix with filament v3
humaidem · Nov 17, 2023 · 0ec639d · 0ec639d
2 parents 3dc2bcc + bbc9923
commit 0ec639d
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 36 deletions.
diff --git a/composer.json b/composer.json
@@ -8,8 +8,10 @@
     "issues": "https://github.com/humaidem/filament-map-picker/issues",
     "source": "https://github.com/humaidem/filament-map-picker"
   },
-  "require-dev": {
-    "filament/filament": "^2.0"
+  "require": {
+    "php": "^8.1",
+    "filament/filament": "^3.0",
+    "spatie/laravel-package-tools": "^1.16"
   },
   "autoload": {
     "psr-4": {
@@ -26,4 +28,4 @@
       }
     }
   }
-}
+}
diff --git a/src/Controllers/MapPickerAssets.php b/src/Controllers/MapPickerAssets.php
@@ -2,25 +2,20 @@
 
 namespace Humaidem\FilamentMapPicker\Controllers;
 
-use Livewire\Controllers\CanPretendToBeAFile;
+use Livewire\Drawer\Utils;
 
 class MapPickerAssets
 {
-    use CanPretendToBeAFile;
-
     public function __invoke($file)
     {
-        switch ($file) {
-            case 'map-picker.css':
-                return $this->pretendResponseIsFile(__DIR__ . '/../../dist/humaidem/map-picker/map-picker.css', 'text/css; charset=utf-8');
-            case 'map-picker.css.map':
-                return $this->pretendResponseIsFile(__DIR__ . '/../../dist/humaidem/map-picker/map-picker.css.map', 'application/json; charset=utf-8');
-            case 'map-picker.js':
-                return $this->pretendResponseIsFile(__DIR__ . '/../../dist/humaidem/map-picker/map-picker.js', 'application/javascript; charset=utf-8');
-            case 'map-picker.js.map':
-                return $this->pretendResponseIsFile(__DIR__ . '/../../dist/humaidem/map-picker/map-picker.js.map', 'application/json; charset=utf-8');
-            default:
-                abort(404);
-        }
+        $basePath = __DIR__.'/../../dist/humaidem/map-picker/';
+
+        return match ($file) {
+            'map-picker.css' => Utils::pretendResponseIsFile("{$basePath}/map-picker.css", 'text/css; charset=utf-8'),
+            'map-picker.css.map' => Utils::pretendResponseIsFile("{$basePath}/map-picker.css.map", 'application/json; charset=utf-8'),
+            'map-picker.js' => Utils::pretendResponseIsFile("{$basePath}/map-picker.js", 'application/javascript; charset=utf-8'),
+            'map-picker.js.map' => Utils::pretendResponseIsFile("{$basePath}/map-picker.js.map", 'application/json; charset=utf-8'),
+            default => abort(404),
+        };
     }
 }
diff --git a/src/FilamentMapPickerServiceProvider.php b/src/FilamentMapPickerServiceProvider.php
@@ -2,18 +2,13 @@
 
 namespace Humaidem\FilamentMapPicker;
 
-use Filament\PluginServiceProvider;
 use Humaidem\FilamentMapPicker\Controllers\MapPickerAssets;
 use Illuminate\Support\Facades\Route;
 use Spatie\LaravelPackageTools\Package;
+use Spatie\LaravelPackageTools\PackageServiceProvider;
 
-
-class FilamentMapPickerServiceProvider extends PluginServiceProvider
+class FilamentMapPickerServiceProvider extends PackageServiceProvider
 {
-
-    public static string $name = 'filament-map-picker';
-
-
     public function boot()
     {
         $this->bootLoaders();
@@ -25,30 +20,23 @@ public function boot()
 
     protected function bootLoaders()
     {
-        $this->loadViewsFrom(__DIR__ . '/../resources/views', 'filament-map-picker');
+        $this->loadViewsFrom(__DIR__.'/../resources/views', 'filament-map-picker');
     }
 
     protected function bootPublishing()
     {
-        if (!$this->app->runningInConsole()) {
+        if (! $this->app->runningInConsole()) {
             return;
         }
 
         $this->publishes([
-            __DIR__ . '/../resources/views' => resource_path('views/vendor/filament-map-picker'),
+            __DIR__.'/../resources/views' => resource_path('views/vendor/filament-map-picker'),
         ], 'filament-map-picker-views');
 
     }
 
     public function configurePackage(Package $package): void
     {
-        $package
-            ->name(static::$name)
-            ->hasCommands($this->getCommands());
-
-        if (file_exists($this->package->basePath('/../resources/views'))) {
-            $package->hasViews();
-        }
+        $package->name('filament-map-picker')->hasViews();
     }
-
 }