Merge pull request #423 from rails/flavorjones-unbreak-v4

Unbreak support for tailwind v4.

Author: flavorjones

CHANGELOG.md

@@ -1,6 +1,6 @@
 ## next / unreleased
 
-* Add experimental support for Tailwind CSS v4. (#420) @flavorjones
+* Add experimental support for Tailwind CSS v4. (#420, #423) @flavorjones
 
 
 ## v3.0.0

lib/tailwindcss/commands.rb

@@ -3,23 +3,14 @@
 module Tailwindcss
   module Commands
     class << self
-      def tailwindcss_version
-        Tailwindcss::Ruby::VERSION
-      end
-
       def compile_command(debug: false, **kwargs)
         command = [
           Tailwindcss::Ruby.executable(**kwargs),
-          "-o", Rails.root.join("app/assets/builds/tailwind.css").to_s
+          "-i", Rails.root.join("app/assets/stylesheets/application.tailwind.css").to_s,
+          "-o", Rails.root.join("app/assets/builds/tailwind.css").to_s,
+          "-c", Rails.root.join("config/tailwind.config.js").to_s,
         ]
 
-        unless tailwindcss_version >= "4.0"
-          command += [
-            "-i", Rails.root.join("app/assets/stylesheets/application.tailwind.css").to_s,
-            "-c", Rails.root.join("config/tailwind.config.js").to_s,
-          ]
-        end
-
         command << "--minify" unless (debug || rails_css_compressor?)
 
         postcss_path = Rails.root.join("config/postcss.config.js")

test/integration/user_journey_test.sh

@@ -32,6 +32,12 @@ bundle install
 bundle show --paths
 bundle binstubs --all
 
+if bundle show | fgrep tailwindcss-ruby | fgrep -q "(4." ; then
+  TAILWIND4=1
+else
+  TAILWIND4=0
+fi
+
 # install tailwindcss
 bin/rails tailwindcss:install
 
@@ -45,6 +51,13 @@ task :still_here do
 end
 EOF
 
+if [[ $TAILWIND4 = 1 ]] ; then
+  cat > app/assets/stylesheets/application.tailwind.css <<EOF
+@import "tailwindcss";
+@theme { --color-special: #abc12399; }
+EOF
+fi
+
 bin/rails tailwindcss:build still_here | grep "Rake process did not exit early"
 
 if [[ $(rails -v) > "Rails 8.0.0.beta" ]] ; then
@@ -61,4 +74,9 @@ grep -q "Show this post" app/views/posts/index.html.erb
 bin/rails tailwindcss:build[verbose]
 grep -q "py-2" app/assets/builds/tailwind.css
 
+if [[ $TAILWIND4 = 1 ]] ; then
+  # TEST: contents include application.tailwind.css
+  grep -q "#abc12399" app/assets/builds/tailwind.css
+fi
+
 echo "OK"

test/lib/tailwindcss/commands_test.rb

@@ -9,29 +9,14 @@ def setup
     @executable = Tailwindcss::Ruby.executable
   end
 
-  test ".compile_command with tailwindcss v3" do
+  test ".compile_command" do
     Rails.stub(:root, File) do # Rails.root won't work in this test suite
-      Tailwindcss::Commands.stub(:tailwindcss_version, "3.4.13") do
-        actual = Tailwindcss::Commands.compile_command
-        assert_kind_of(Array, actual)
-        assert_equal(executable, actual.first)
-        assert_includes(actual, "-i")
-        assert_includes(actual, "-c")
-        assert_includes(actual, "-o")
-      end
-    end
-  end
-
-  test ".compile_command with tailwindcss v4" do
-    Rails.stub(:root, File) do # Rails.root won't work in this test suite
-      Tailwindcss::Commands.stub(:tailwindcss_version, "4.0.0") do
-        actual = Tailwindcss::Commands.compile_command
-        assert_kind_of(Array, actual)
-        assert_equal(executable, actual.first)
-        refute_includes(actual, "-i")
-        refute_includes(actual, "-c")
-        assert_includes(actual, "-o")
-      end
+      actual = Tailwindcss::Commands.compile_command
+      assert_kind_of(Array, actual)
+      assert_equal(executable, actual.first)
+      assert_includes(actual, "-i")
+      assert_includes(actual, "-c")
+      assert_includes(actual, "-o")
     end
   end