Skip to content

Commit b198435

Browse files
Upgrade tailwindcss-rails from 3.3.2 to 4.4.0 (Tailwind CSS v4)
Migrate from JS config to CSS-based configuration. Move input CSS from app/assets/stylesheets/application.tailwind.css to app/assets/tailwind/application.css with @import syntax. Remove tailwind.config.js and inter-font stylesheet reference.
1 parent 422acf0 commit b198435

8 files changed

Lines changed: 23 additions & 49 deletions

File tree

apps/rails_application/Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ gem "puma"
88
gem "bootsnap", ">= 1.9.2", require: false
99
gem "honeybadger"
1010
gem "skylight"
11-
gem "tailwindcss-rails", "~> 3.0"
11+
gem "tailwindcss-rails", "~> 4.0"
1212
gem "kaminari"
1313
gem "sprockets-rails"
1414
gem "turbo-rails"

apps/rails_application/Gemfile.lock

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -343,14 +343,16 @@ GEM
343343
stimulus-rails (1.3.4)
344344
railties (>= 6.0.0)
345345
stringio (3.2.0)
346-
tailwindcss-rails (3.3.2)
346+
tailwindcss-rails (4.4.0)
347347
railties (>= 7.0.0)
348-
tailwindcss-ruby (~> 3.0)
349-
tailwindcss-ruby (3.4.19-aarch64-linux)
350-
tailwindcss-ruby (3.4.19-arm-linux)
351-
tailwindcss-ruby (3.4.19-arm64-darwin)
352-
tailwindcss-ruby (3.4.19-x86_64-darwin)
353-
tailwindcss-ruby (3.4.19-x86_64-linux)
348+
tailwindcss-ruby (~> 4.0)
349+
tailwindcss-ruby (4.2.1)
350+
tailwindcss-ruby (4.2.1-aarch64-linux-gnu)
351+
tailwindcss-ruby (4.2.1-aarch64-linux-musl)
352+
tailwindcss-ruby (4.2.1-arm64-darwin)
353+
tailwindcss-ruby (4.2.1-x86_64-darwin)
354+
tailwindcss-ruby (4.2.1-x86_64-linux-gnu)
355+
tailwindcss-ruby (4.2.1-x86_64-linux-musl)
354356
thor (1.5.0)
355357
timeout (0.6.1)
356358
tsort (0.2.0)
@@ -407,7 +409,7 @@ DEPENDENCIES
407409
skylight
408410
sprockets-rails
409411
stimulus-rails
410-
tailwindcss-rails (~> 3.0)
412+
tailwindcss-rails (~> 4.0)
411413
turbo-rails
412414
tzinfo-data
413415

apps/rails_application/Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,11 @@ install: ## Installs dependencies, runs migrations, creates db & seeds if necess
44
dev: ## Start development environment with web server and CSS watcher
55
@$(MAKE) -j 2 web css
66

7-
TAILWIND_SRC := app/assets/stylesheets/application.tailwind.css
8-
TAILWIND_CONFIG := config/tailwind.config.js
7+
TAILWIND_SRC := app/assets/tailwind/application.css
98
TAILWIND_BUILD := app/assets/builds
109
TAILWIND_OUT := $(TAILWIND_BUILD)/tailwind.css
1110

12-
$(TAILWIND_OUT): $(TAILWIND_SRC) $(TAILWIND_CONFIG) | $(TAILWIND_BUILD)
11+
$(TAILWIND_OUT): $(TAILWIND_SRC) | $(TAILWIND_BUILD)
1312
@echo "Building Tailwind CSS…"
1413
@bin/rails tailwindcss:build
1514

apps/rails_application/app/assets/stylesheets/application.tailwind.css

Lines changed: 0 additions & 13 deletions
This file was deleted.
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
@import "tailwindcss";
2+
3+
@source "../../../app/helpers";
4+
@source "../../../app/views";
5+
@source "../../../app/read_models";
6+
@source "../../../public/*.html";
7+
8+
@plugin "@tailwindcss/forms";
9+
@plugin "@tailwindcss/aspect-ratio";
10+
@plugin "@tailwindcss/typography";

apps/rails_application/app/views/layouts/application.html.erb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
</title>
77
<%= csrf_meta_tags %>
88
<%= csp_meta_tag %>
9-
<%= stylesheet_link_tag "inter-font", "data-turbo-track": "reload" %>
109
<%= stylesheet_link_tag "tailwind", "data-turbo-track": "reload" %>
1110
<%= stylesheet_link_tag "application", media: "all", "data-turbo-track": "reload" %>
1211
<%= render 'tracking' %>

apps/rails_application/app/views/layouts/client_panel.erb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
</title>
77
<%= csrf_meta_tags %>
88
<%= csp_meta_tag %>
9-
<%= stylesheet_link_tag "inter-font", "data-turbo-track": "reload" %>
109
<%= stylesheet_link_tag "tailwind", "data-turbo-track": "reload" %>
1110
<%= stylesheet_link_tag "application", media: "all", "data-turbo-track": "reload" %>
1211
<%= render 'tracking' %>

apps/rails_application/config/tailwind.config.js

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)