feat: Laravel 9 Support added (#11)

* feat: Laravel 9 support added * fix: minor fixes in packages
InfyOmLabs · Feb 21, 2022 · aae3c48 · aae3c48
1 parent 2cd523e
commit aae3c48
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git 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
@@ -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
@@ -1,4 +1,4 @@
-<li class="side-menus {{ Request::is('*') ? 'active' : '' }}">
+<li class="side-menus {{ Request::is('home') ? 'active' : '' }}">
     <a class="nav-link" href="/">
         <i class=" fas fa-building"></i><span>Dashboard</span>
     </a>