- Livewire layout updates using flux for Laravel12

- issue #52
- issue #56

Author: awais-vteams

composer.json

@@ -16,11 +16,12 @@
         "laravel package",
         "bootstrap css",
         "tailwind css",
-        "alpine js"
+        "alpine js",
+        "livewire"
     ],
     "require": {
         "php": "^8.2",
-        "laravel/framework": "^10.30|^11.0|^12.0"
+        "laravel/framework": "^10.30|^11.44|^12.2"
     },
     "autoload": {
         "psr-4": {

composer.lock

@@ -278,8 +278,13 @@ protected function buildViews(): static
         $this->buildLayout();
 
         foreach (['index', 'create', 'edit', 'form', 'show'] as $view) {
+            $path = match ($this->options['stack']) {
+                'livewire' => $this->isLaravel12() ? "views/{$this->options['stack']}/12/$view" : "views/{$this->options['stack']}/default/$view",
+                default => "views/{$this->options['stack']}/$view"
+            };
+
             $viewTemplate = str_replace(
-                array_keys($replace), array_values($replace), $this->getStub("views/{$this->options['stack']}/$view")
+                array_keys($replace), array_values($replace), $this->getStub($path)
             );
 
             $this->write($this->_getViewPath($view), $viewTemplate);

src/Commands/CrudGenerator.php

@@ -88,6 +88,14 @@ public function __construct(Filesystem $files)
         $this->layout = config('crud.layout', $this->layout);
     }
 
+    /**
+     * @return bool
+     */
+    public function isLaravel12(): bool
+    {
+        return str_starts_with(app()->version(), '12');
+    }
+
     /**
      * Generate the controller.
      *
@@ -128,10 +136,10 @@ protected function makeDirectory(string $path): string
     /**
      * Write the file/Class.
      *
-     * @param $path
-     * @param $content
+     * @param  string  $path
+     * @param  string  $content
      */
-    protected function write($path, $content): void
+    protected function write(string $path, string $content): void
     {
         $this->makeDirectory($path);
 
@@ -175,73 +183,73 @@ private function _getSpace(int $no = 1): string
     }
 
     /**
-     * @param $name
+     * @param  string  $name
      *
      * @return string
      */
-    protected function _getControllerPath($name): string
+    protected function _getControllerPath(string $name): string
     {
         return app_path($this->_getNamespacePath($this->controllerNamespace)."{$name}Controller.php");
     }
 
     /**
-     * @param $name
+     * @param  string  $name
      *
      * @return string
      */
-    protected function _getApiControllerPath($name): string
+    protected function _getApiControllerPath(string $name): string
     {
         return app_path($this->_getNamespacePath($this->apiControllerNamespace)."{$name}Controller.php");
     }
 
     /**
-     * @param $name
+     * @param  string  $name
      *
      * @return string
      */
-    protected function _getResourcePath($name): string
+    protected function _getResourcePath(string $name): string
     {
         return app_path($this->_getNamespacePath($this->resourceNamespace)."{$name}Resource.php");
     }
 
     /**
-     * @param $name
+     * @param  string  $name
      *
      * @return string
      */
-    protected function _getLivewirePath($name): string
+    protected function _getLivewirePath(string $name): string
     {
         return app_path($this->_getNamespacePath($this->livewireNamespace)."{$name}.php");
     }
 
     /**
-     * @param $name
+     * @param  string  $name
      *
      * @return string
      */
-    protected function _getRequestPath($name): string
+    protected function _getRequestPath(string $name): string
     {
         return app_path($this->_getNamespacePath($this->requestNamespace)."{$name}Request.php");
     }
 
     /**
-     * @param $name
+     * @param  string  $name
      *
      * @return string
      */
-    protected function _getModelPath($name): string
+    protected function _getModelPath(string $name): string
     {
         return $this->makeDirectory(app_path($this->_getNamespacePath($this->modelNamespace)."$name.php"));
     }
 
     /**
      * Get the path from namespace.
      *
-     * @param $namespace
+     * @param  string  $namespace
      *
      * @return string
      */
-    private function _getNamespacePath($namespace): string
+    private function _getNamespacePath(string $namespace): string
     {
         $str = Str::start(Str::finish(Str::after($namespace, 'App'), '\\'), '\\');
 
@@ -259,11 +267,11 @@ private function _getLayoutPath(): string
     }
 
     /**
-     * @param $view
+     * @param  string  $view
      *
      * @return string
      */
-    protected function _getViewPath($view): string
+    protected function _getViewPath(string $view): string
     {
         $name = Str::kebab($this->name);
         $path = match ($this->options['stack']) {
@@ -300,41 +308,45 @@ protected function buildReplacements(): array
         ];
     }
 
-    protected function _getRoute()
+    protected function _getRoute(): string
     {
         return $this->options['route'] ?? Str::kebab(Str::plural($this->name));
     }
 
     /**
      * Build the form fields for form.
      *
-     * @param $title
-     * @param $column
+     * @param  string  $title
+     * @param  string  $column
      * @param  string  $type
      *
      * @return string
      * @throws FileNotFoundException
-     *
      */
-    protected function getField($title, $column, string $type = 'form-field'): string
+    protected function getField(string $title, string $column, string $type = 'form-field'): string
     {
         $replace = array_merge($this->buildReplacements(), [
             '{{title}}' => $title,
             '{{column}}' => $column,
             '{{column_snake}}' => Str::snake($column),
         ]);
 
+        $path = match ($this->options['stack']) {
+            'livewire' => $this->isLaravel12() ?  "views/{$this->options['stack']}/12/$type" :  "views/{$this->options['stack']}/default/$type",
+            default => "views/{$this->options['stack']}/$type"
+        };
+
         return str_replace(
-            array_keys($replace), array_values($replace), $this->getStub("views/{$this->options['stack']}/$type")
+            array_keys($replace), array_values($replace), $this->getStub($path)
         );
     }
 
     /**
-     * @param $title
+     * @param  string  $title
      *
      * @return string
      */
-    protected function getHead($title): string
+    protected function getHead(string $title): string
     {
         $replace = array_merge($this->buildReplacements(), [
             '{{title}}' => $title,
@@ -382,18 +394,19 @@ protected function getBody($column): string
      */
     protected function buildLayout(): void
     {
-        if ($this->layout === false || $this->layout === null) {
+        if ($this->layout === false) {
             return;
         }
 
-        if (view()->exists($this->layout)) {
+        if (view()->exists($this->layout) || view()->exists('components.'.$this->layout)) {
             return;
         }
 
         $this->info('Creating Layout ...');
 
         $uiPackage = match ($this->options['stack']) {
-            'tailwind', 'livewire', 'react', 'vue' => 'laravel/breeze',
+            'tailwind', 'react', 'vue' => 'laravel/breeze',
+            'livewire' => $this->isLaravel12() ? 'laravel/livewire-starter-kit' : 'laravel/breeze',
             default => 'laravel/ui'
         };
 
@@ -409,6 +422,11 @@ protected function buildLayout(): void
             default => 'php artisan ui bootstrap --auth'
         };
 
+        // Do not run command for v12.*
+        if ($this->isLaravel12()) {
+            return;
+        }
+
         $this->runCommands([$uiCommand]);
     }
 

src/Commands/GeneratorCommand.php

@@ -36,19 +36,19 @@ public function __construct(string $table, string $properties, string $modelName
      *
      * @return array
      */
-    public function getEloquentRelations()
+    public function getEloquentRelations(): array
     {
         return [$this->functions, $this->properties];
     }
 
-    private function _init()
+    private function _init(): void
     {
         foreach ($this->_getTableRelations() as $relation) {
             $this->functions .= $this->_getFunction($relation);
         }
     }
 
-    private function _getFunction(array $relation)
+    private function _getFunction(array $relation): string
     {
         switch ($relation['name']) {
             case 'hasOne':
@@ -76,7 +76,7 @@ public function '.$relation['relation_name'].'()
      *
      * @return array
      */
-    private function _getTableRelations()
+    private function _getTableRelations(): array
     {
         return [
             ...$this->getBelongsTo(),
@@ -86,19 +86,21 @@ private function _getTableRelations()
 
     /**
      * Extract the table name from a fully qualified table name (e.g., database.table).
-     * @param string $foreignTable
+     * @param  string  $foreignTable
      * @return string
      */
-    protected function extractTableName($foreignTable)
+    protected function extractTableName(string $foreignTable): string
     {
         $dotPosition = strpos($foreignTable, '.');
+
         if ($dotPosition !== false) {
             return substr($foreignTable, $dotPosition + 1); // Extract table name only
         }
+
         return $foreignTable; // No dot found, return the original name
     }
 
-    protected function getBelongsTo()
+    protected function getBelongsTo(): array
     {
         $relations = Schema::getForeignKeys($this->table);
 
@@ -123,7 +125,7 @@ protected function getBelongsTo()
         return $eloquent;
     }
 
-    protected function getOtherRelations()
+    protected function getOtherRelations(): array
     {
         $tables = Schema::getTableListing();
         $eloquent = [];
@@ -132,7 +134,6 @@ protected function getOtherRelations()
             $relations = Schema::getForeignKeys($table);
             $indexes = collect(Schema::getIndexes($table));
 
-
             foreach ($relations as $relation) {
                 if ($relation['foreign_table'] != $this->table) {
                     continue;
@@ -158,7 +159,7 @@ protected function getOtherRelations()
         return $eloquent;
     }
 
-    private function getUniqueIndex($indexes, $column)
+    private function getUniqueIndex($indexes, $column): bool
     {
         $isUnique = false;
 

src/ModelGenerator.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace {{requestNamespace}};
 
 use Illuminate\Foundation\Http\FormRequest;
 

src/stubs/Request.stub

@@ -4,7 +4,6 @@ namespace {{livewireNamespace}}\{{modelNamePluralUpperCase}};
 
 use {{livewireNamespace}}\Forms\{{modelName}}Form;
 use {{modelNamespace}}\{{modelName}};
-use Livewire\Attributes\Layout;
 use Livewire\Component;
 
 class Create extends Component
@@ -23,7 +22,6 @@ class Create extends Component
         return $this->redirectRoute('{{modelRoute}}.index', navigate: true);
     }
 
-    #[Layout('{{layout}}')]
     public function render()
     {
         return view('livewire.{{modelView}}.create');

src/stubs/livewire/Create.stub

@@ -4,7 +4,6 @@ namespace {{livewireNamespace}}\{{modelNamePluralUpperCase}};
 
 use {{livewireNamespace}}\Forms\{{modelName}}Form;
 use {{modelNamespace}}\{{modelName}};
-use Livewire\Attributes\Layout;
 use Livewire\Component;
 
 class Edit extends Component
@@ -23,7 +22,6 @@ class Edit extends Component
         return $this->redirectRoute('{{modelRoute}}.index', navigate: true);
     }
 
-    #[Layout('{{layout}}')]
     public function render()
     {
         return view('livewire.{{modelView}}.edit');

src/stubs/livewire/Edit.stub

@@ -4,15 +4,13 @@ namespace {{livewireNamespace}}\{{modelNamePluralUpperCase}};
 
 use {{modelNamespace}}\{{modelName}};
 use Illuminate\View\View;
-use Livewire\Attributes\Layout;
 use Livewire\Component;
 use Livewire\WithPagination;
 
 class Index extends Component
 {
     use WithPagination;
 
-    #[Layout('{{layout}}')]
     public function render(): View
     {
         ${{modelNamePluralLowerCase}} = {{modelName}}::paginate();