From 737bcda9a7916c1e9c9479386c941b42a122f120 Mon Sep 17 00:00:00 2001 From: Ben Villiere Date: Wed, 18 Mar 2020 22:56:00 +0000 Subject: [PATCH 1/2] Upgraded tailwindcss to ^1.2 and laravel mix to ^5.0 --- src/TailwindCssPreset.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/TailwindCssPreset.php b/src/TailwindCssPreset.php index b7b48ab7..e22812d5 100644 --- a/src/TailwindCssPreset.php +++ b/src/TailwindCssPreset.php @@ -30,10 +30,10 @@ public static function installAuth() protected static function updatePackageArray(array $packages) { return array_merge([ - 'laravel-mix' => '^4.0.14', + 'laravel-mix' => '^5.0', 'laravel-mix-purgecss' => '^4.1', 'laravel-mix-tailwind' => '^0.1.0', - 'tailwindcss' => '^1.0', + 'tailwindcss' => '^1.2', '@tailwindcss/custom-forms' => '^0.2', ], Arr::except($packages, [ 'bootstrap', From 218a42923a10d71203dbce74779968c4517f2eae Mon Sep 17 00:00:00 2001 From: Ben Villiere Date: Wed, 18 Mar 2020 23:46:24 +0000 Subject: [PATCH 2/2] Revert unnecessary tailwindcss version bump and changed laravel-mix to be the same as in L7 package.json --- src/TailwindCssPreset.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/TailwindCssPreset.php b/src/TailwindCssPreset.php index e22812d5..61272f5e 100644 --- a/src/TailwindCssPreset.php +++ b/src/TailwindCssPreset.php @@ -30,10 +30,10 @@ public static function installAuth() protected static function updatePackageArray(array $packages) { return array_merge([ - 'laravel-mix' => '^5.0', + 'laravel-mix' => '^5.0.1', 'laravel-mix-purgecss' => '^4.1', 'laravel-mix-tailwind' => '^0.1.0', - 'tailwindcss' => '^1.2', + 'tailwindcss' => '^1.0', '@tailwindcss/custom-forms' => '^0.2', ], Arr::except($packages, [ 'bootstrap',