From 8159bd8652bb8f545f3ad7397d59b6e4deb1c89c Mon Sep 17 00:00:00 2001
From: Mike Dalessio <mike.dalessio@gmail.com>
Date: Thu, 2 Mar 2023 08:54:26 -0500
Subject: [PATCH] feat: tailwind will not minify when Rails CSS compression is
 on

to avoid double-compression which breaks styles.

Fixes #243

See https://github.com/rails/rails/issues/47553
---
 lib/tailwindcss/commands.rb           |  6 +++++-
 lib/tasks/build.rake                  |  4 ++--
 test/lib/tailwindcss/commands_test.rb | 18 ++++++++++++++++++
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/lib/tailwindcss/commands.rb b/lib/tailwindcss/commands.rb
index e7f34cb..4c91428 100644
--- a/lib/tailwindcss/commands.rb
+++ b/lib/tailwindcss/commands.rb
@@ -62,7 +62,7 @@ def compile_command(debug: false, **kwargs)
           "-o", Rails.root.join("app/assets/builds/tailwind.css").to_s,
           "-c", Rails.root.join("config/tailwind.config.js").to_s,
         ].tap do |command|
-          command << "--minify" unless debug
+          command << "--minify" unless (debug || rails_css_compressor?)
         end
       end
 
@@ -72,6 +72,10 @@ def watch_command(poll: false, **kwargs)
           command << "-p" if poll
         end
       end
+
+      def rails_css_compressor?
+        defined?(Rails) && Rails&.application&.config&.assets&.css_compressor.present?
+      end
     end
   end
 end
diff --git a/lib/tasks/build.rake b/lib/tasks/build.rake
index bd40721..2765381 100644
--- a/lib/tasks/build.rake
+++ b/lib/tasks/build.rake
@@ -1,6 +1,6 @@
 namespace :tailwindcss do
   desc "Build your Tailwind CSS"
-  task :build do |_, args|
+  task build: :environment do |_, args|
     debug = args.extras.include?("debug")
     command = Tailwindcss::Commands.compile_command(debug: debug)
     puts command.inspect if args.extras.include?("verbose")
@@ -8,7 +8,7 @@ namespace :tailwindcss do
   end
 
   desc "Watch and build your Tailwind CSS on file changes"
-  task :watch do |_, args|
+  task watch: :environment do |_, args|
     debug = args.extras.include?("debug")
     poll = args.extras.include?("poll")
     command = Tailwindcss::Commands.watch_command(debug: debug, poll: poll)
diff --git a/test/lib/tailwindcss/commands_test.rb b/test/lib/tailwindcss/commands_test.rb
index 7ff0c5c..ac8f9d0 100644
--- a/test/lib/tailwindcss/commands_test.rb
+++ b/test/lib/tailwindcss/commands_test.rb
@@ -58,6 +58,24 @@ def mock_exe_directory(platform)
     end
   end
 
+  test ".compile_command when Rails compression is on" do
+    mock_exe_directory("sparc-solaris2.8") do |dir, executable|
+      Rails.stub(:root, File) do # Rails.root won't work in this test suite
+        Tailwindcss::Commands.stub(:rails_css_compressor?, true) do
+          actual = Tailwindcss::Commands.compile_command(exe_path: dir)
+          assert_kind_of(Array, actual)
+          refute_includes(actual, "--minify")
+        end
+
+        Tailwindcss::Commands.stub(:rails_css_compressor?, false) do
+          actual = Tailwindcss::Commands.compile_command(exe_path: dir)
+          assert_kind_of(Array, actual)
+          assert_includes(actual, "--minify")
+        end
+      end
+    end
+  end
+
   test ".watch_command" do
     mock_exe_directory("sparc-solaris2.8") do |dir, executable|
       Rails.stub(:root, File) do # Rails.root won't work in this test suite