Skip to content

Commit 86ba5fe

Browse files
committed
wip: try to get CI green
1 parent d08ca11 commit 86ba5fe

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

lib/install/upgrade_tailwindcss.rb

+7
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,14 @@
4545
end
4646

4747
if system("npx --version")
48+
run("npm --version")
49+
50+
say "Removing any existing npm versions of tailwindcss"
51+
run("npm uninstall tailwindcss", abort_on_failure: false)
52+
4853
say "Running the upstream Tailwind CSS upgrader"
54+
puts "DEBUG: #{TAILWIND_CONFIG_PATH} contents:"
55+
puts File.read(TAILWIND_CONFIG_PATH)
4956
command = Shellwords.join(["npx", "@tailwindcss/upgrade@next", "--force", "--config", TAILWIND_CONFIG_PATH.to_s])
5057
success = run(command, abort_on_failure: false)
5158
unless success

test/integration/user_upgrade_test.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ bundle remove tailwindcss-rails --skip-install
5252
bundle remove tailwindcss-ruby --skip-install
5353

5454
bundle add tailwindcss-rails --skip-install --path="../.."
55-
bundle add tailwindcss-ruby --skip-install ${TAILWINDCSSOPTS:---version 4.0.0}
55+
bundle add tailwindcss-ruby --skip-install ${TAILWINDCSSOPTS:---version 4.0.17}
5656

5757
bundle install --prefer-local
5858
bundle show --paths | fgrep tailwind

0 commit comments

Comments
 (0)