Merge pull request #18 from neilherbertuk/master

Laravel 5.7 support

Author: cesaramirez

README.md

@@ -1,16 +1,16 @@
-# Laravel 5.5/5.6 Front-end Preset For Tabler Dashboard UI Kit
+# Laravel 5.5+ Front-end Preset For Tabler Dashboard UI Kit
 
 [![Latest Stable Version](https://poser.pugx.org/cesaramirez/laravel-tabler/v/stable)](https://packagist.org/packages/cesaramirez/laravel-tabler)
 
-Preset for [Tabler](https://tabler.github.io/) scaffolding on new Laravel 5.5/5.6 project.
+Preset for [Tabler](https://tabler.github.io/) scaffolding on a new Laravel 5.5 or above project.
 
 ## Usage
 
-1.  Fresh install Laravel 5.5/5.6 and `cd` to your app.
-2.  Install this preset via `composer require cesaramirez/laravel-tabler`. Laravel 5.5/5.6 will automatically discover this package. No need to register the service provider.
+1.  Fresh install Laravel 5.5 or above and `cd` to your app.
+2.  Install this preset via `composer require cesaramirez/laravel-tabler`. Laravel 5.5+ will automatically discover this package. No need to register the service provider.
 3.  Use `php artisan preset tabler` for basic Tabler preset. **OR** Use `php artisan preset tabler-auth` for basic preset, Auth route entry and Tabler Auth views in one go. (**NOTE**: If you run this command several times, be sure to clean up the duplicate Auth entries in `routes/web.php`)
 4.  `yarn`
 5.  `yarn dev` or `yarn watch`
 6.  Configure your favorite database (mysql, sqlite, etc.)
 7.  `php artisan migrate` to create basic user tables.
-8.  `php artisan serve` (or equivalent) to run server and test preset.
+8.  `php artisan serve` (or equivalent) to run server and test preset.

src/TablerPreset.php

@@ -48,10 +48,10 @@ protected static function updatePackageArray(array $packages)
      */
     protected static function updateAssets()
     {
-        copy(__DIR__.'/tabler-stubs/sass/app.scss', resource_path('assets/sass/app.scss'));
-        copy(__DIR__.'/tabler-stubs/sass/_variables.scss', resource_path('assets/sass/_variables.scss'));
-        (new Filesystem())->copyDirectory(__DIR__.'/tabler-stubs/sass/tabler', resource_path('assets/sass/tabler'));
-        (new Filesystem())->copyDirectory(__DIR__.'/tabler-stubs/fonts', resource_path('assets/fonts'));
+        copy(__DIR__.'/tabler-stubs/sass/app.scss', static::getResourcePath('sass/app.scss'));
+        copy(__DIR__.'/tabler-stubs/sass/_variables.scss', static::getResourcePath('sass/_variables.scss'));
+        (new Filesystem())->copyDirectory(__DIR__.'/tabler-stubs/sass/tabler', static::getResourcePath('sass/tabler'));
+        (new Filesystem())->copyDirectory(__DIR__.'/tabler-stubs/fonts', static::getResourcePath('fonts'));
     }
 
     /**
@@ -60,7 +60,18 @@ protected static function updateAssets()
     protected static function updateBootstrapping()
     {
         copy(__DIR__.'/tabler-stubs/webpack.mix.js', base_path('webpack.mix.js'));
-        copy(__DIR__.'/tabler-stubs/bootstrap.js', resource_path('assets/js/bootstrap.js'));
+
+        if (!self::expectsAssetsFolder()) {
+            file_put_contents(base_path('webpack.mix.js'),
+                str_replace(
+                    'assets/',
+                    '',
+                    file_get_contents(base_path('webpack.mix.js'))
+                )
+            );
+        }
+
+        copy(__DIR__.'/tabler-stubs/bootstrap.js', static::getResourcePath('js/bootstrap.js'));
     }
 
     /**
@@ -90,4 +101,30 @@ protected static function compileControllerStub()
             file_get_contents(__DIR__.'/tabler-stubs/controllers/HomeController.stub')
         );
     }
+
+    /**
+     * Gets resource path depending on version of Laravel.
+     *
+     * @param string $path
+     *
+     * @return string
+     */
+    protected static function getResourcePath($path = '')
+    {
+        if (self::expectsAssetsFolder()) {
+            return resource_path('assets/'.$path);
+        }
+
+        return resource_path($path);
+    }
+
+    /**
+     * Should we expect to see an assets folder within this version of Laravel?
+     *
+     * @return bool
+     */
+    protected static function expectsAssetsFolder()
+    {
+        return (int) str_replace('.', '', app()->version()) < 570;
+    }
 }