Merge branch 'main' into hotfix-dynamic-module-paths

Author: coolsam726

src/Commands/ModuleMakeFilamentWidgetCommand.php

@@ -107,7 +107,8 @@ public function handle(): int
 
         if (! $panel) {
             $namespace = $module->appNamespace('Livewire');
-            $path = $module->appPath((string) str($namespace)->after('App\\')->replace('\\', '/'));
+            $prefix = str(config('modules.paths.app_folder', 'app'))->ltrim(DIRECTORY_SEPARATOR, '\\')->studly();
+            $path = $module->appPath((string) str($namespace)->after("{$prefix}\\")->replace('\\', '/'));
         } elseif ($resource === null) {
             $widgetDirectories = collect($panel->getWidgetDirectories())->filter(fn ($dir) => str($dir)->contains($module->appPath()))->values()->all();
             $widgetNamespaces = collect($panel->getWidgetNamespaces())->filter(fn ($dir) => str($dir)->contains($module->appNamespace()))->values()->all();

src/ModulesPlugin.php

@@ -103,7 +103,8 @@ protected function getModulePanels(): array
     {
         // get a glob of all Filament panels
         $basePath = str(config('modules.paths.modules', 'Modules'));
-        $pattern = $basePath . DIRECTORY_SEPARATOR . '*' . DIRECTORY_SEPARATOR . 'app' . DIRECTORY_SEPARATOR . 'Providers' . DIRECTORY_SEPARATOR . 'Filament' . DIRECTORY_SEPARATOR . '*.php';
+        $appFolder = str(config('modules.paths.app_folder', 'app'));
+        $pattern = $basePath . DIRECTORY_SEPARATOR . '*' . DIRECTORY_SEPARATOR . $appFolder . DIRECTORY_SEPARATOR . 'Providers' . DIRECTORY_SEPARATOR . 'Filament' . DIRECTORY_SEPARATOR . '*.php';
         $panelPaths = glob($pattern);
 
         $panelIds = collect($panelPaths)->map(fn ($path) => FilamentModules::convertPathToNamespace($path))->map(function ($class) {

src/ModulesServiceProvider.php

@@ -223,11 +223,10 @@ protected function registerModuleMacros(): void
         Module::macro('appNamespace', function (string $relativeNamespace = '') {
             $prefix = str(config('modules.paths.app_folder', 'app'))->ltrim(DIRECTORY_SEPARATOR, '\\')->studly()->toString();
             $relativeNamespace = trim($relativeNamespace, '\\');
-            if (strlen($prefix) > 0) {
+            if (filled($prefix)) {
                 $relativeNamespace = str_replace($prefix . '\\', '', $relativeNamespace);
                 $relativeNamespace = str_replace($prefix, '', $relativeNamespace);
             }
-
             return $this->namespace($relativeNamespace);
         });
         Module::macro('appPath', function (string $relativePath = '') {