Update from upstream repo laravel-frontend-presets/tailwindcss

.gitignore

@@ -0,0 +1,3 @@
+/.idea
+/vendor
+composer.lock

README.md

@@ -1,23 +1,46 @@
-# Laravel 5.5.x/5.6.x Frontend preset for Tailwind CSS
+# Laravel 7.0+ Frontend preset for Tailwind CSS
 
 A Laravel front-end scaffolding preset for [Tailwind CSS](https://tailwindcss.com) - a Utility-First CSS Framework for Rapid UI Development.
 
-*Current version:* **Tailwind CSS 0.5.2**
-
 ## Usage
 
-1. Fresh install Laravel 5.5.x or 5.6.x and cd to your app.
-2. Install this preset via `composer require laravel-frontend-presets/tailwindcss`. Laravel >= 5.5.0 will automatically discover this package. No need to register the service provider.
-3. Use `php artisan preset tailwindcss` for the basic Tailwind CSS preset OR use `php artisan preset tailwindcss-auth` for the basic preset, auth route entry and Tailwind CSS 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. `npm install`
-5. `npm run dev`
-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.
+1. Fresh install Laravel >= 7.0 and `cd` to your app.
+2. Install this preset via `composer require laravel-frontend-presets/tailwindcss --dev`. Laravel will automatically discover this package. No need to register the service provider.
+
+### a. For Presets without Authentication
+
+1. Use `php artisan ui tailwindcss` for the basic Tailwind CSS preset
+2. `npm install && npm run dev`
+3. `php artisan serve` (or equivalent) to run server and test preset.
+
+### b. For Presets with Authentication
+
+1. Use `php artisan ui tailwindcss --auth` for the basic preset, auth route entry, and Tailwind CSS 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. `npm install && npm run dev`
+5. Configure your favorite database (mysql, sqlite etc.)
+6. `php artisan migrate` to create basic user tables.
+7. `php artisan serve` (or equivalent) to run server and test preset.
 
-### Changing colours
+### Config
 
-If you want to change the default orange colour being used, update the `brand-{modifier}` values in your `tailwind.js` file. You are of course free to modify this file as you see fit, and even remove and replace the brand configuration in the scaffolded views entirely.
+The default `tailwind.config.js` configuration file included by this package simply uses the config from the Tailwind vendor files. Should you wish to make changes, you should remove the file and run `node_modules/.bin/tailwind init`, which will generate a fresh configuration file for you, which you are free to change to suit your needs.
+
+Add a new i18n string in the `resources/lang/XX/pagination.php` file for each language that your app uses:
+```php
+'previous' => '« Previous',
+'next' => 'Next »',
+'goto_page' => 'Goto page #:page', // Add this line
+```
+This should help with accessibility
+```html
+<li>
+    <a href="URL?page=2" class="..." 
+       aria-label="Goto page #2"
+    >
+        2
+    </a>
+</li>
+```
 
 ### Screenshots
 
@@ -27,8 +50,11 @@ If you want to change the default orange colour being used, update the `brand-{m
 
 ![Login](/screenshots/login.png)
 
-![Send Password Reset](/screenshots/send-password-reset.png)
-
 ![Reset Password](/screenshots/reset-password.png)
 
 ![Dashboard](/screenshots/dashboard.png)
+
+![Verify](/screenshots/verify.png)
+
+![Pagination](/screenshots/pagination-links.png)
+![Simple Pagination](/screenshots/simple-pagination-links.png)

composer.json

@@ -4,7 +4,8 @@
   "keywords": ["laravel", "preset", "tailwindcss"],
   "license": "MIT",
   "require": {
-    "laravel/framework": "^5.5"
+    "laravel/framework": "^7.0",
+    "laravel/ui": "^2.0"
   },
   "autoload": {
     "psr-4": {

src/TailwindCssPreset.php

@@ -3,9 +3,11 @@
 namespace LaravelFrontendPresets\TailwindCssPreset;
 
 use Illuminate\Support\Arr;
+use Illuminate\Support\Str;
 use Illuminate\Container\Container;
 use Illuminate\Filesystem\Filesystem;
-use Illuminate\Foundation\Console\Presets\Preset;
+use Laravel\Ui\Presets\Preset;
+use Symfony\Component\Finder\SplFileInfo;
 
 class TailwindCssPreset extends Preset
 {
@@ -15,48 +17,61 @@ public static function install()
         static::updateStyles();
         static::updateBootstrapping();
         static::updateWelcomePage();
+        static::updatePagination();
         static::removeNodeModules();
     }
 
     public static function installAuth()
     {
-        static::install();
+        static::scaffoldController();
         static::scaffoldAuth();
     }
 
     protected static function updatePackageArray(array $packages)
     {
         return array_merge([
-            'laravel-mix-purgecss' => '^2.0',
-            'tailwindcss' => '>=0.5.2',
+            'laravel-mix' => '^5.0.1',
+            'laravel-mix-tailwind' => '^0.1.0',
+            'tailwindcss' => '^1.4',
+            '@tailwindcss/custom-forms' => '^0.2',
         ], Arr::except($packages, [
             'bootstrap',
             'bootstrap-sass',
-            'jquery',
             'popper.js',
+            'laravel-mix',
+            'jquery',
         ]));
     }
 
     protected static function updateStyles()
     {
         tap(new Filesystem, function ($filesystem) {
-            $filesystem->deleteDirectory(resource_path('assets/sass'));
+            $filesystem->deleteDirectory(resource_path('sass'));
             $filesystem->delete(public_path('js/app.js'));
             $filesystem->delete(public_path('css/app.css'));
 
-            if (! $filesystem->isDirectory($directory = resource_path('assets/css'))) {
+            if (! $filesystem->isDirectory($directory = resource_path('css'))) {
                 $filesystem->makeDirectory($directory, 0755, true);
             }
         });
 
-        copy(__DIR__.'/tailwindcss-stubs/resources/assets/css/main.css', resource_path('assets/css/main.css'));
+        copy(__DIR__.'/tailwindcss-stubs/resources/css/app.css', resource_path('css/app.css'));
     }
 
     protected static function updateBootstrapping()
     {
-        copy(__DIR__.'/tailwindcss-stubs/tailwind.js', base_path('tailwind.js'));
+        copy(__DIR__.'/tailwindcss-stubs/tailwind.config.js', base_path('tailwind.config.js'));
+
         copy(__DIR__.'/tailwindcss-stubs/webpack.mix.js', base_path('webpack.mix.js'));
-        copy(__DIR__.'/tailwindcss-stubs/resources/assets/js/bootstrap.js', resource_path('assets/js/bootstrap.js'));
+
+        copy(__DIR__.'/tailwindcss-stubs/resources/js/bootstrap.js', resource_path('js/bootstrap.js'));
+    }
+
+    protected static function updatePagination()
+    {
+        (new Filesystem)->delete(resource_path('views/vendor/paginate'));
+
+        (new Filesystem)->copyDirectory(__DIR__.'/tailwindcss-stubs/resources/views/vendor/pagination', resource_path('views/vendor/pagination'));
     }
 
     protected static function updateWelcomePage()
@@ -66,6 +81,23 @@ protected static function updateWelcomePage()
         copy(__DIR__.'/tailwindcss-stubs/resources/views/welcome.blade.php', resource_path('views/welcome.blade.php'));
     }
 
+    protected static function scaffoldController()
+    {
+        if (! is_dir($directory = app_path('Http/Controllers/Auth'))) {
+            mkdir($directory, 0755, true);
+        }
+
+        $filesystem = new Filesystem;
+
+        collect($filesystem->allFiles(base_path('vendor/laravel/ui/stubs/Auth')))
+            ->each(function (SplFileInfo $file) use ($filesystem) {
+                $filesystem->copy(
+                    $file->getPathname(),
+                    app_path('Http/Controllers/Auth/'.Str::replaceLast('.stub', '.php', $file->getFilename()))
+                );
+            });
+    }
+
     protected static function scaffoldAuth()
     {
         file_put_contents(app_path('Http/Controllers/HomeController.php'), static::compileControllerStub());
@@ -76,7 +108,17 @@ protected static function scaffoldAuth()
             FILE_APPEND
         );
 
-        (new Filesystem)->copyDirectory(__DIR__.'/tailwindcss-stubs/resources/views', resource_path('views'));
+        tap(new Filesystem, function ($filesystem) {
+            $filesystem->copyDirectory(__DIR__.'/tailwindcss-stubs/resources/views', resource_path('views'));
+
+            collect($filesystem->allFiles(base_path('vendor/laravel/ui/stubs/migrations')))
+                ->each(function (SplFileInfo $file) use ($filesystem) {
+                    $filesystem->copy(
+                        $file->getPathname(),
+                        database_path('migrations/'.$file->getFilename())
+                    );
+                });
+        });
     }
 
     protected static function compileControllerStub()

src/TailwindCssPresetServiceProvider.php

@@ -2,25 +2,31 @@
 
 namespace LaravelFrontendPresets\TailwindCssPreset;
 
+use Illuminate\Pagination\Paginator;
 use Illuminate\Support\ServiceProvider;
-use Illuminate\Foundation\Console\PresetCommand;
+use Laravel\Ui\UiCommand;
+use Laravel\Ui\AuthCommand;
 
 class TailwindCssPresetServiceProvider extends ServiceProvider
 {
     public function boot()
     {
-        PresetCommand::macro('tailwindcss', function ($command) {
+        UiCommand::macro('tailwindcss', function ($command) {
             TailwindCssPreset::install();
 
             $command->info('Tailwind CSS scaffolding installed successfully.');
-            $command->info('Please run "npm install && npm run dev" to compile your fresh scaffolding.');
-        });
 
-        PresetCommand::macro('tailwindcss-auth', function ($command) {
-            TailwindCssPreset::installAuth();
+            if ($command->option('auth')) {
+                TailwindCssPreset::installAuth();
+
+                $command->info('Tailwind CSS auth scaffolding installed successfully.');
+            }
 
-            $command->info('Tailwind CSS scaffolding with auth views installed successfully.');
-            $command->info('Please run "npm install && npm run dev" to compile your fresh scaffolding.');
+            $command->comment('Please run "npm install && npm run dev" to compile your fresh scaffolding.');
         });
+
+        Paginator::defaultView('pagination::default');
+
+        Paginator::defaultSimpleView('pagination::simple-default');
     }
 }

src/tailwindcss-stubs/resources/css/app.css

@@ -0,0 +1,5 @@
+@tailwind base;
+
+@tailwind components;
+
+@tailwind utilities;