Update to 0.5.1 (#21)

* update Tailwind to 0.5.1
* minor refactoring of preset code
* improve responsiveness of login, register forms, and app nav
* consolidate directory structure

Author: michaeldyrynda

composer.json

@@ -1,10 +1,10 @@
 {
   "name": "laravel-frontend-presets/tailwindcss",
-  "description": "Laravel 5.5 frontend preset for Tailwind CSS",
+  "description": "Laravel frontend preset for Tailwind CSS",
   "keywords": ["laravel", "preset", "tailwindcss"],
   "license": "MIT",
   "require": {
-    "laravel/framework": "5.5.*|5.6.*"
+    "laravel/framework": "^5.5"
   },
   "autoload": {
     "psr-4": {

src/TailwindCssPreset.php

@@ -26,22 +26,28 @@ public static function installAuth()
 
     protected static function updatePackageArray(array $packages)
     {
-        return [
-            'tailwindcss' => '^0.4.0',
-            'glob-all' => '*',
-            'purgecss-webpack-plugin' => '*'
-        ] + Arr::except($packages, ['bootstrap', 'bootstrap-sass', 'jquery']);
+        return array_merge([
+            'laravel-mix-purgecss' => '^1.0',
+            'tailwindcss' => '>=0.5.1',
+        ], Arr::except($packages, [
+            'bootstrap',
+            'bootstrap-sass',
+            'jquery',
+            'popper.js',
+        ]));
     }
 
     protected static function updateStyles()
     {
-        (new Filesystem)->deleteDirectory(resource_path('assets/sass'));
-        (new Filesystem)->delete(public_path('js/app.js'));
-        (new Filesystem)->delete(public_path('css/app.css'));
+        tap(new Filesystem, function ($filesystem) {
+            $filesystem->deleteDirectory(resource_path('assets/sass'));
+            $filesystem->delete(public_path('js/app.js'));
+            $filesystem->delete(public_path('css/app.css'));
 
-        if (! file_exists(resource_path('assets/css'))) {
-            mkdir(resource_path('assets/css'));
-        }
+            if (! $filesystem->isDirectory($directory = resource_path('assets/css'))) {
+                $filesystem->makeDirectory($directory, 0755, true);
+            }
+        });
 
         copy(__DIR__.'/tailwindcss-stubs/resources/assets/css/main.css', resource_path('assets/css/main.css'));
     }
@@ -50,14 +56,14 @@ protected static function updateBootstrapping()
     {
         copy(__DIR__.'/tailwindcss-stubs/tailwind.js', base_path('tailwind.js'));
         copy(__DIR__.'/tailwindcss-stubs/webpack.mix.js', base_path('webpack.mix.js'));
-        copy(__DIR__.'/tailwindcss-stubs/bootstrap.js', resource_path('assets/js/bootstrap.js'));
+        copy(__DIR__.'/tailwindcss-stubs/resources/assets/js/bootstrap.js', resource_path('assets/js/bootstrap.js'));
     }
 
     protected static function updateWelcomePage()
     {
         (new Filesystem)->delete(resource_path('views/welcome.blade.php'));
 
-        copy(__DIR__.'/tailwindcss-stubs/views/welcome.blade.php', resource_path('views/welcome.blade.php'));
+        copy(__DIR__.'/tailwindcss-stubs/resources/views/welcome.blade.php', resource_path('views/welcome.blade.php'));
     }
 
     protected static function scaffoldAuth()
@@ -70,7 +76,7 @@ protected static function scaffoldAuth()
             FILE_APPEND
         );
 
-        (new Filesystem)->copyDirectory(__DIR__.'/tailwindcss-stubs/views', resource_path('views'));
+        (new Filesystem)->copyDirectory(__DIR__.'/tailwindcss-stubs/resources/views', resource_path('views'));
     }
 
     protected static function compileControllerStub()

src/tailwindcss-stubs/resources/assets/css/main.css

@@ -7,6 +7,15 @@
  */
 @tailwind preflight;
 
+/**
+ * This injects any component classes registered by plugins.
+ *
+ * If using `postcss-import`, use this import instead:
+ *
+ * @import "tailwindcss/components";
+ */
+@tailwind components;
+
 /**
  * Here you would add any of your custom component classes; stuff that you'd
  * want loaded *before* the utilities so that the utilities could still
@@ -26,6 +35,10 @@
 /**
  * This injects all of Tailwind's utility classes, generated based on your
  * config file.
+ *
+ * If using `postcss-import`, use this import instead:
+ *
+ * @import "tailwindcss/utilities";
  */
 @tailwind utilities;
 
@@ -38,7 +51,7 @@
  * .bg-pattern-graph-paper { ... }
  * .skew-45 { ... }
  *
- * Or if using a preprocessor..
+ * Or if using a preprocessor or `postcss-import`:
  *
  * @import "utilities/background-patterns";
  * @import "utilities/skew-transforms";

src/tailwindcss-stubs/bootstrap.js renamed to src/tailwindcss-stubs/resources/js/bootstrap.js

@@ -1,8 +1,8 @@
 @extends('layouts.app')
 
 @section('content')
-<div class="flex items-center">
-    <div class="md:w-1/2 md:mx-auto">
+<div class="flex items-center px-6 md:px-0">
+    <div class="w-full max-w-md md:mx-auto">
         <div class="rounded shadow">
             <div class="font-medium text-lg text-brand-darker bg-brand-lighter p-3 rounded-t">
                 Login

src/tailwindcss-stubs/views/auth/login.blade.php renamed to src/tailwindcss-stubs/resources/views/auth/login.blade.php

@@ -1,8 +1,8 @@
 @extends('layouts.app')
 
 @section('content')
-<div class="flex items-center">
-    <div class="md:w-1/2 md:mx-auto">
+<div class="flex items-center px-6 md:px-0">
+    <div class="w-full max-w-md md:mx-auto">
         <div class="rounded shadow">
             <div class="font-medium text-lg text-brand-darker bg-brand-lighter p-3 rounded-t">
                 Register

src/tailwindcss-stubs/views/auth/passwords/email.blade.php renamed to src/tailwindcss-stubs/resources/views/auth/passwords/email.blade.php

@@ -15,7 +15,7 @@
 </head>
 <body class="bg-brand-lightest h-screen">
     <div id="app">
-        <nav class="bg-white h-12 shadow mb-8">
+        <nav class="bg-white h-12 shadow mb-8 px-6 md:px-0">
             <div class="container mx-auto h-full">
                 <div class="flex items-center justify-center h-12">
                     <div class="mr-6">