Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
WiP
  • Loading branch information
bopm committed Apr 7, 2025
commit 0bd65bc8eb79a81baa493b1d354bbe3b759566de
25 changes: 13 additions & 12 deletions lib/tailwindcss/commands.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,18 @@ def rails_root
end

def remove_tempfile!
@@tempfile.unlink if @@tempfile
if @@tempfile
@@tempfile.unlink
@@tempfile = nil
end
end

def compile_command(input: application_css, debug: false, **kwargs)
debug = ENV["TAILWINDCSS_DEBUG"].present? if ENV.key?("TAILWINDCSS_DEBUG")

command = [
Tailwindcss::Ruby.executable(**kwargs),
"-i", application_css,
"-i", application_css.to_s,
"-o", rails_root.join("app/assets/builds/tailwind.css").to_s,
]

Expand All @@ -29,18 +32,16 @@ def compile_command(input: application_css, debug: false, **kwargs)
end

def application_css
if engines_roots.any?
@@tempfile = Tempfile.new("tailwind.application.css")
engines_roots.each do |root|
@@tempfile.puts "@import \"#{root}\";"
end
@@tempfile.puts "\n@import \"#{rails_root.join('app/assets/tailwind/application.css')}\";"
@@tempfile.close
return rails_root.join("app/assets/tailwind/application.css").to_s if engines_roots.empty?

@@tempfile.path
else
rails_root.join("app/assets/tailwind/application.css").to_s
@@tempfile = Tempfile.new("tailwind.application.css")
engines_roots.each do |root|
@@tempfile.puts "@import \"#{root}\";"
end
@@tempfile.puts "\n@import \"#{rails_root.join('app/assets/tailwind/application.css')}\";"
@@tempfile.close

@@tempfile.path
end

def watch_command(always: false, poll: false, **kwargs)
Expand Down
6 changes: 2 additions & 4 deletions test/lib/tailwindcss/commands_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,8 @@ def setup

def teardown
super
if Tailwindcss::Commands.class_variable_defined?(:@@application_css)
if Tailwindcss::Commands.class_variable_defined?(:@@tempfile)
Tailwindcss::Commands.remove_tempfile!
Tailwindcss::Commands.remove_class_variable(:@@application_css)
end
end

Expand Down Expand Up @@ -230,7 +229,7 @@ def teardown
Rails.stub(:root, root) do
Tailwindcss::Commands.stub(:engines_roots, [engine_css.to_s]) do
css_path = Tailwindcss::Commands.application_css
assert Tailwindcss::Commands.tempfile_path?(css_path)
assert_equal css_path, Tailwindcss::Commands.class_variable_get(:@@tempfile).path

content = File.read(css_path)
assert_match "@import \"#{engine_css}\";", content
Expand Down Expand Up @@ -266,7 +265,6 @@ def teardown
css_path = Tailwindcss::Commands.application_css
assert File.exist?(css_path)

debugger
Tailwindcss::Commands.remove_tempfile!
refute File.exist?(css_path)
end
Expand Down