diff --git a/composer.json b/composer.json index 5d8428a..5e02aa3 100644 --- a/composer.json +++ b/composer.json @@ -15,9 +15,9 @@ } ], "require": { - "php": "^7.3|^8.0", - "illuminate/support": "^8.0", - "infyomlabs/laravel-generator-helpers": "^3.1", + "php": "^8.0", + "illuminate/support": "^9.0", + "infyomlabs/laravel-generator-helpers": "4.x-dev", "laravel/ui": "^3.0" }, "autoload": { diff --git a/src/StislaPreset.php b/src/StislaPreset.php index 8a8e78c..72f1c99 100644 --- a/src/StislaPreset.php +++ b/src/StislaPreset.php @@ -31,14 +31,13 @@ public function __construct(Command $command, $isFortify = false) * * @return array */ - protected static function updatePackageArray(array $packages) + protected static function updatePackageArray(array $packages, $configurationKey) { - return [ + $stislaPackages = [ + 'dependencies' => [ "bootstrap" => "^4.0.0", "jquery" => "^3.2", "popper.js" => "^1.12", - "sass" => "^1.15.2", - "sass-loader" => "^7.1.0", "@fortawesome/fontawesome-free" => "^5.13.1", "jquery.nicescroll" => "^3.7.6", "vue-template-compiler" => "^2.6.12", @@ -48,11 +47,18 @@ protected static function updatePackageArray(array $packages) "sweetalert" => "^1.1.3", "select2" => "^4.0.13", "izitoast" => "^1.4.0", - ] + $packages; + ], + 'devDependencies' => [ + "webpack" => "^5.23.0", + ] + ]; + + return $stislaPackages[$configurationKey] + $packages; } public function install() { + static::updatePackages(false); static::updatePackages(false); static::updateWebpackConfiguration(); static::removeNodeModules(); diff --git a/stisla-stubs/views/layouts/menu.blade.php b/stisla-stubs/views/layouts/menu.blade.php index 7d2a68f..dc5de77 100644 --- a/stisla-stubs/views/layouts/menu.blade.php +++ b/stisla-stubs/views/layouts/menu.blade.php @@ -1,4 +1,4 @@ -
  • +
  • Dashboard