Merge pull request #16 from envor/main

dont take over volt cli

.github/workflows/dependabot-auto-merge.yml

@@ -14,7 +14,7 @@ jobs:
 
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v1.6.0
+        uses: dependabot/fetch-metadata@v2.0.0
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
 

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to `laravel-datastore` will be documented in this file.
 
+## v1.2.10 - 2024-03-11
+
+### What's Changed
+
+* migrate path by @inmanturbo in https://github.com/envor/laravel-datastore/pull/14
+
+**Full Changelog**: https://github.com/envor/laravel-datastore/compare/v1.2.9...v1.2.10
+
 ## v1.2.9 - 2024-03-11
 
 ### What's Changed

src/Concerns/HasDatastoreDriver.php

@@ -9,11 +9,6 @@ trait HasDatastoreDriver
 {
     public const DEFAULT_DRIVER = Driver::SQLite;
 
-    public function owner()
-    {
-        return $this->morphTo();
-    }
-
     protected static function bootHasDatastoreDriver()
     {
         static::creating(function (self $model) {

src/Datastore.php

@@ -323,19 +323,11 @@ abstract protected static function makeAdminConfig(Datastore $datastore): array;
 
     protected static function makeAdminConnection(string $name): string
     {
-        if (static::faking()) {
-            config('database.connections.'.config('database.default'));
-        }
-
         return 'datastore_admin_'.$name;
     }
 
     protected static function makeConnection(string $name): string
     {
-        if (static::faking()) {
-            config('database.connections.'.config('database.default'));
-        }
-
         return $name;
     }
 

src/DatastoreServiceProvider.php

@@ -37,17 +37,11 @@ public function packageBooted()
             $router->pushMiddlewareToGroup('web', DatastoreContextMiddleware::class);
             $router->aliasMiddleware('datastore.context', DatastoreContextMiddleware::class);
 
-            if (class_exists('\Livewire\Volt\Volt')) {
-
-                $voltPaths = collect(\Livewire\Volt\Volt::paths())->map(function ($path) {
-                    return $path->path;
-                })->toArray();
-
-                $paths = array_merge($voltPaths, [
+            if (class_exists('\Livewire\Volt\Volt') && (! $this->app->runningInConsole() || $this->app->runningUnitTests())) {
+                $paths = [
                     __DIR__.'/../resources/views/livewire',
                     __DIR__.'/../resources/views/pages',
-                ]);
-
+                ];
                 \Livewire\Volt\Volt::mount($paths);
             }
         });

src/Models/Datastore.php

@@ -22,4 +22,9 @@ class Datastore extends Model implements ConfiguresDatastore
     protected $casts = [
         'driver' => Driver::class,
     ];
+
+    public function owner()
+    {
+        return $this->morphTo();
+    }
 }