Merge branch 'patch-1'

michaeldyrynda · michaeldyrynda · commit b3886e671f9b · 2020-04-04T12:59:54.000+10:30
diff --git a/src/TailwindCssPreset.php b/src/TailwindCssPreset.php
@@ -30,7 +30,7 @@ public static function installAuth()
     protected static function updatePackageArray(array $packages)
     {
         return array_merge([
-            'laravel-mix' => '^4.0.14',
+            'laravel-mix' => '^5.0.1',
             'laravel-mix-purgecss' => '^4.1',
             'laravel-mix-tailwind' => '^0.1.0',
             'tailwindcss' => '^1.0',
diff --git a/src/tailwindcss-stubs/resources/views/layouts/app.blade.php b/src/tailwindcss-stubs/resources/views/layouts/app.blade.php
@@ -1,5 +1,5 @@
 <!doctype html>
-<html lang="{{ app()->getLocale() }}">
+<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -9,6 +9,9 @@
 
     <title>{{ config('app.name', 'Laravel') }}</title>
 
+    <!-- Scripts -->
+    <script src="{{ asset('js/app.js') }}" defer></script>
+    
     <!-- Styles -->
     <link href="{{ mix('css/app.css') }}" rel="stylesheet">
 </head>
@@ -46,8 +49,5 @@ class="no-underline hover:underline text-gray-300 text-sm p-3"
 
         @yield('content')
     </div>
-
-    <!-- Scripts -->
-    <script src="{{ mix('js/app.js') }}"></script>
 </body>
 </html>
diff --git a/src/tailwindcss-stubs/resources/views/welcome.blade.php b/src/tailwindcss-stubs/resources/views/welcome.blade.php
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="{{ app()->getLocale() }}">
+<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
 <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -50,9 +50,15 @@
                     <li class="inline pr-8">
                         <a href="https://forge.laravel.com" class="no-underline hover:underline text-sm font-normal text-teal-800 uppercase" title="Forge">Forge</a>
                     </li>
+                    <li class="inline pr-8">
+                        <a href="https://vapor.laravel.com" class="no-underline hover:underline text-sm font-normal text-teal-800 uppercase" title="Vapor">Vapor</a>
+                    </li>
                     <li class="inline pr-8">
                         <a href="https://github.com/laravel/laravel" class="no-underline hover:underline text-sm font-normal text-teal-800 uppercase" title="GitHub">GitHub</a>
                     </li>
+                    <li class="inline pr-8">
+                        <a href="https://tailwindcss.com" class="no-underline hover:underline text-sm font-normal text-teal-800 uppercase" title="Tailwind Css">Tailwind CSS</a>
+                    </li>
                 </ul>
             </div>
         </div>

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public static function installAuth()`
`30`	`30`	`protected static function updatePackageArray(array $packages)`
`31`	`31`	`{`
`32`	`32`	`return array_merge([`
`33`		`- 'laravel-mix' => '^4.0.14',`
	`33`	`+ 'laravel-mix' => '^5.0.1',`
`34`	`34`	`'laravel-mix-purgecss' => '^4.1',`
`35`	`35`	`'laravel-mix-tailwind' => '^0.1.0',`
`36`	`36`	`'tailwindcss' => '^1.0',`