Merge branch 'rokde/master'

Author: michaeldyrynda

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,7 +37,7 @@ 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);
     }
 
@@ -97,8 +94,7 @@ 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]);

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 ($command) {
             InertiaJsPreset::install();
 
             $command->info('Inertia.js scaffolding installed successfully.');