Merge pull request #113 from alexmanase/use-livewire-3

Update to Livewire 3

.github/workflows/run-tests.yml

@@ -8,23 +8,12 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.1, 8.0, 7.4]
-        laravel: [8.*, 9.*, 10.*]
+        php: [8.1, 8.2]
+        laravel: [10.*]
         dependency-version: [prefer-lowest, prefer-stable]
-        exclude:
-          - laravel: 10.*
-            php: 8.0
-          - laravel: 10.*
-            php: 7.4
-          - laravel: 9.*
-            php: 7.4
         include:
           - laravel: 10.*
             testbench: ^8.0
-          - laravel: 8.*
-            testbench: ^6.23
-          - laravel: 9.*
-            testbench: ^7.0
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
 

composer.json

@@ -19,7 +19,7 @@
         "php": "^7.4|^8.0",
         "illuminate/database": "^8.0|^9.0|^10.0",
         "illuminate/view": "^8.0|^9.0|^10.0",
-        "livewire/livewire": "^2.0",
+        "livewire/livewire": "^3.0",
         "spatie/sun": "^1.1.1"
     },
     "require-dev": {
@@ -57,4 +57,4 @@
     },
     "minimum-stability": "dev",
     "prefer-stable": true
-}
+}

config/dashboard.php

@@ -33,4 +33,4 @@
     'stylesheets' => [
         'inter' => 'https://rsms.me/inter/inter.css',
     ],
-];
+];

src/Http/Components/DashboardComponent.php → src/Components/DashboardComponent.php

@@ -1,20 +1,20 @@
 <?php
 
-namespace Spatie\Dashboard\Http\Components;
+namespace Spatie\Dashboard\Components;
 
 use Illuminate\Support\HtmlString;
 use Illuminate\View\Component;
 use Spatie\Dashboard\Dashboard;
 
 class DashboardComponent extends Component
 {
-    public string $theme;
+    public string $theme = '';
 
-    public string $initialMode;
+    public string $initialMode = '';
 
-    public HtmlString $assets;
+    public ?HtmlString $assets  = null;
 
-    public function __construct(Dashboard $dashboard)
+    public function mount(Dashboard $dashboard)
     {
         $this->theme = $dashboard->getTheme();
 
@@ -27,4 +27,4 @@ public function render()
     {
         return view('dashboard::dashboard');
     }
-}
+}

src/Http/Components/DashboardTileComponent.php → src/Components/DashboardTileComponent.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Spatie\Dashboard\Http\Components;
+namespace Spatie\Dashboard\Components;
 
 use Illuminate\View\Component;
 
@@ -72,4 +72,4 @@ private function indexInAlphabet(string $character): int
 
         return $index + 1;
     }
-}
+}

src/Http/Components/UpdateModeComponent.php → src/Components/UpdateModeComponent.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Spatie\Dashboard\Http\Components;
+namespace Spatie\Dashboard\Components;
 
 use Livewire\Component;
 use Spatie\Dashboard\Dashboard;
@@ -12,8 +12,8 @@ public function render()
         /** @var \Spatie\Dashboard\Dashboard $dashboard */
         $dashboard = app(Dashboard::class);
 
-        $this->emit('updateMode', $dashboard->getMode());
+        $this->dispatch('updateMode', $dashboard->getMode());
 
         return view('dashboard::components.updateMode');
     }
-}
+}

src/Dashboard.php

@@ -54,15 +54,15 @@ public function assets(): HtmlString
         }
 
         foreach ($this->inlineScripts as $inlineScript) {
-            $assets[] = "<script>{$inlineScript}</script>";
+            $assets[] = "<script>$inlineScript</script>";
         }
 
         foreach ($this->stylesheets as $stylesheet) {
-            $assets[] = "<link rel=\"stylesheet\" href=\"{$stylesheet}\">";
+            $assets[] = "<link rel=\"stylesheet\" href=\"$stylesheet\">";
         }
 
         foreach ($this->inlineStylesheets as $inlineStylesheet) {
-            $assets[] = "<style>{$inlineStylesheet}</style>";
+            $assets[] = "<style>$inlineStylesheet</style>";
         }
 
         return new HtmlString(implode('', $assets));
@@ -98,4 +98,4 @@ protected function isValidTheme(string $theme): bool
     {
         return in_array($theme, self::THEMES);
     }
-}
+}

src/DashboardServiceProvider.php

@@ -5,9 +5,9 @@
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\ServiceProvider;
 use Livewire\Livewire;
-use Spatie\Dashboard\Http\Components\DashboardComponent;
-use Spatie\Dashboard\Http\Components\DashboardTileComponent;
-use Spatie\Dashboard\Http\Components\UpdateModeComponent;
+use Spatie\Dashboard\Components\DashboardComponent;
+use Spatie\Dashboard\Components\DashboardTileComponent;
+use Spatie\Dashboard\Components\UpdateModeComponent;
 use Spatie\Sun\Sun;
 
 class DashboardServiceProvider extends ServiceProvider
@@ -86,4 +86,4 @@ protected function registerLivewireComponents(): self
 
         return $this;
     }
-}
+}