Merge branch 'main' of github.com:backstagephp/users

Author: mhortulanus

src/Models/User.php

@@ -18,7 +18,7 @@
 use Laravel\Sanctum\HasApiTokens;
 use Spatie\Permission\Traits\HasRoles;
 
-class User extends BaseUser implements CanResetPassword, HasApiTokensContract, FilamentUser, MustVerifyEmail
+class User extends BaseUser implements CanResetPassword, FilamentUser, HasApiTokensContract, MustVerifyEmail
 {
     use CanResetPasswordTrait;
     use Concerns\Conditionals\HasConditionals;

src/UserManagementServiceProvider.php

@@ -79,21 +79,22 @@ public function configurePackage(Package $package): void
 
         if (file_exists($package->basePath("/../config/backstage/users.php"))) {
             $package->hasConfigFile('backstage/users');
-        }
 
-        if (file_exists($package->basePath('/../database/migrations'))) {
-            $package->hasMigrations($this->getMigrations());
-        }
 
-        if (file_exists($package->basePath('/../resources/lang'))) {
-            $package->hasTranslations();
-        }
+            if (file_exists($package->basePath('/../database/migrations'))) {
+                $package->hasMigrations($this->getMigrations());
+            }
 
-        if (file_exists($package->basePath('/../resources/views'))) {
-            $package->hasViews(static::$viewNamespace);
+            if (file_exists($package->basePath('/../resources/lang'))) {
+                $package->hasTranslations();
+            }
+
+            if (file_exists($package->basePath('/../resources/views'))) {
+                $package->hasViews(static::$viewNamespace);
+            }
         }
     }
-
+    
     public function packageRegistered(): void {}
 
     public function packageBooted(): void