Using laravel/ui to meet the laravel 7 dependencies.

Updated base class reference to ui command and preset including type hints.

Author: Robert Kummer

composer.json

@@ -11,8 +11,8 @@
     }
   ],
   "require": {
-    "laravel/framework": "^5.8|^6.0",
-    "inertiajs/inertia-laravel": "^0.1"
+    "laravel/ui": "^2.0",
+    "inertiajs/inertia-laravel": "^0.2"
   },
   "require-dev": {
     "orchestra/testbench": "^3.8"

src/InertiaJsPreset.php

@@ -4,11 +4,8 @@
 
 use Illuminate\Container\Container;
 use Illuminate\Filesystem\Filesystem;
-use Illuminate\Foundation\Console\Presets\Preset;
-use Illuminate\Support\Arr;
-use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Str;
-use Symfony\Component\Process\Process;
+use Laravel\Ui\Presets\Preset;
 
 class InertiaJsPreset extends Preset
 {
@@ -40,55 +37,55 @@ protected static function updatePackageArray(array $packages)
     protected static function updateComposerArray(array $packages)
     {
         return array_merge([
-            'inertiajs/inertia-laravel' => '^0.1',
+            'inertiajs/inertia-laravel' => '^0.2',
         ], $packages);
     }
 
     protected static function updateBootstrapping()
     {
-        copy(__DIR__.'/inertiajs-stubs/webpack.mix.js', base_path('webpack.mix.js'));
+        copy(__DIR__ . '/inertiajs-stubs/webpack.mix.js', base_path('webpack.mix.js'));
 
-        copy(__DIR__.'/inertiajs-stubs/resources/js/app.js', resource_path('js/app.js'));
+        copy(__DIR__ . '/inertiajs-stubs/resources/js/app.js', resource_path('js/app.js'));
 
-        copy(__DIR__.'/inertiajs-stubs/resources/sass/app.scss', resource_path('sass/app.scss'));
-        copy(__DIR__.'/inertiajs-stubs/resources/sass/_nprogress.scss', resource_path('sass/_nprogress.scss'));
+        copy(__DIR__ . '/inertiajs-stubs/resources/sass/app.scss', resource_path('sass/app.scss'));
+        copy(__DIR__ . '/inertiajs-stubs/resources/sass/_nprogress.scss', resource_path('sass/_nprogress.scss'));
     }
 
     protected static function updateWelcomePage()
     {
         (new Filesystem)->delete(resource_path('views/welcome.blade.php'));
 
-        copy(__DIR__.'/inertiajs-stubs/resources/views/app.blade.php', resource_path('views/app.blade.php'));
+        copy(__DIR__ . '/inertiajs-stubs/resources/views/app.blade.php', resource_path('views/app.blade.php'));
     }
 
     protected static function updateGitignore()
     {
         file_put_contents(
             base_path('.gitignore'),
-            file_get_contents(__DIR__.'/inertiajs-stubs/gitignore'),
+            file_get_contents(__DIR__ . '/inertiajs-stubs/gitignore'),
             FILE_APPEND
         );
     }
 
     protected static function scaffoldComponents()
     {
-        tap(new Filesystem, function ($fs) {
+        tap(new Filesystem, function (Filesystem $fs) {
             $fs->deleteDirectory(resource_path('js/components'));
 
-            $fs->copyDirectory(__DIR__.'/inertiajs-stubs/resources/js/Shared', resource_path('js/Shared'));
+            $fs->copyDirectory(__DIR__ . '/inertiajs-stubs/resources/js/Shared', resource_path('js/Shared'));
 
-            $fs->copyDirectory(__DIR__.'/inertiajs-stubs/resources/js/Pages', resource_path('js/Pages'));
+            $fs->copyDirectory(__DIR__ . '/inertiajs-stubs/resources/js/Pages', resource_path('js/Pages'));
         });
     }
 
     protected static function scaffoldRoutes()
     {
-        copy(__DIR__.'/inertiajs-stubs/routes/web.php', base_path('routes/web.php'));
+        copy(__DIR__ . '/inertiajs-stubs/routes/web.php', base_path('routes/web.php'));
     }
 
     protected static function updateComposer($dev = true)
     {
-        if (! file_exists(base_path('composer.json'))) {
+        if (!file_exists(base_path('composer.json'))) {
             return;
         }
 
@@ -97,22 +94,21 @@ protected static function updateComposer($dev = true)
         $packages = json_decode(file_get_contents(base_path('composer.json')), true);
 
         $packages[$configurationKey] = static::updateComposerArray(
-            array_key_exists($configurationKey, $packages) ? $packages[$configurationKey] : [],
-            $configurationKey
+            array_key_exists($configurationKey, $packages) ? $packages[$configurationKey] : []
         );
 
         ksort($packages[$configurationKey]);
 
         file_put_contents(
             base_path('composer.json'),
-            json_encode($packages, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT).PHP_EOL
+            json_encode($packages, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT) . PHP_EOL
         );
     }
 
     public static function publishInertiaServiceProvider()
     {
         copy(
-            __DIR__.'/inertiajs-stubs/providers/InertiaJsServiceProvider.stub',
+            __DIR__ . '/inertiajs-stubs/providers/InertiaJsServiceProvider.stub',
             app_path('Providers/InertiaJsServiceProvider.php')
         );
     }
@@ -123,7 +119,7 @@ public static function registerInertiaServiceProvider()
 
         $appConfig = file_get_contents(config_path('app.php'));
 
-        if (Str::contains($appConfig, $namespace.'\\Providers\\InertiaJsServiceProvider::class')) {
+        if (Str::contains($appConfig, $namespace . '\\Providers\\InertiaJsServiceProvider::class')) {
             return;
         }
 
@@ -136,8 +132,8 @@ public static function registerInertiaServiceProvider()
         $eol = array_keys($lineEndingCount, max($lineEndingCount))[0];
 
         file_put_contents(config_path('app.php'), str_replace(
-            "{$namespace}\\Providers\\RouteServiceProvider::class,".$eol,
-            "{$namespace}\\Providers\\RouteServiceProvider::class,".$eol."        {$namespace}\Providers\InertiaJsServiceProvider::class,".$eol,
+            "{$namespace}\\Providers\\RouteServiceProvider::class," . $eol,
+            "{$namespace}\\Providers\\RouteServiceProvider::class," . $eol . "        {$namespace}\Providers\InertiaJsServiceProvider::class," . $eol,
             $appConfig
         ));
 

src/InertiaJsPresetServiceProvider.php

@@ -2,14 +2,14 @@
 
 namespace LaravelFrontendPresets\InertiaJsPreset;
 
-use Illuminate\Foundation\Console\PresetCommand;
 use Illuminate\Support\ServiceProvider;
+use Laravel\Ui\UiCommand;
 
 class InertiaJsPresetServiceProvider extends ServiceProvider
 {
     public function boot()
     {
-        PresetCommand::macro('inertiajs', function ($command) {
+        UiCommand::macro('inertiajs', function (UiCommand $command) {
             InertiaJsPreset::install();
 
             $command->info('Inertia.js scaffolding installed successfully.');