Skip to content

Commit d50dae4

Browse files
committed
Implement Engines Support
1 parent 9d2127a commit d50dae4

File tree

7 files changed

+307
-46
lines changed

7 files changed

+307
-46
lines changed

Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: .
33
specs:
4-
tailwindcss-rails (4.2.2)
4+
tailwindcss-rails (4.2.3)
55
railties (>= 7.0.0)
66
tailwindcss-ruby (~> 4.0)
77

README.md

Lines changed: 32 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@
2222
* [Live rebuild](#live-rebuild)
2323
* [Using Tailwind plugins](#using-tailwind-plugins)
2424
* [Using with PostCSS](#using-with-postcss)
25+
* [Rails Engines support](#rails-engines-support)
2526
* [Custom inputs or outputs](#custom-inputs-or-outputs)
2627
- [Troubleshooting](#troubleshooting)
28+
* [The `watch` command is hanging](#the-watch-command-is-hanging)
2729
* [Lost keystrokes or hanging when using terminal-based debugging tools (e.g. IRB, Pry, `ruby/debug`...etc.) with the Puma plugin](#lost-keystrokes-or-hanging-when-using-terminal-based-debugging-tools-eg-irb-pry-rubydebugetc-with-the-puma-plugin)
2830
* [Running in a docker container exits prematurely](#running-in-a-docker-container-exits-prematurely)
2931
* [Conflict with sassc-rails](#conflict-with-sassc-rails)
@@ -43,12 +45,11 @@ With Rails 7 you can generate a new application preconfigured with Tailwind CSS
4345

4446
This gem depends on the `tailwindcss-ruby` gem to install a working Tailwind CLI executable.
4547

46-
4748
### Choosing a specific version of `tailwindcss`
4849

4950
The `tailwindcss-ruby` gem is declared as a floating dependency of this gem, so by default you will get the most recent stable version. However, you can select a specific version of Tailwind CSS by pinning that gem to the analogous version in your application's `Gemfile`. For example,
5051

51-
``` ruby
52+
```ruby
5253
gem "tailwindcss-rails"
5354

5455
# pin to tailwindcss version 3.4.13
@@ -59,7 +60,6 @@ gem "tailwindcss-ruby", "3.4.13"
5960

6061
You can also use a local (npm-based) installation if you prefer, please go to https://github.com/flavorjones/tailwindcss-ruby for more information.
6162

62-
6363
## Upgrading your application from Tailwind v3 to v4
6464

6565
v4.x of this gem has been updated to work with Tailwind v4, including providing some help with upgrading your application.
@@ -72,27 +72,25 @@ This gem will help with some of the mechanics of the upgrade:
7272
- update some local project files to meet some Tailwind CSS v4 conventions,
7373
- attempt to run the [upstream v4 upgrade tool](https://tailwindcss.com/docs/upgrade-guide#using-the-upgrade-tool).
7474

75-
7675
### You don't _have_ to upgrade
7776

7877
Keep in mind that you don't _need_ to upgrade. You can stay on Tailwind CSS v3 for the foreseeable future if you prefer not to migrate now, or if your migration runs into problems.
7978

8079
If you don't want to upgrade, then pin your application to v3.3.1 of this gem:
8180

82-
``` ruby
81+
```ruby
8382
# Gemfile
8483
gem "tailwindcss-rails", "~> 3.3.1" # which transitively pins tailwindcss-ruby to v3
8584
```
8685

8786
If you're on an earlier version of this gem, `<= 3.3.0`, then make sure you're pinning the version of **both** `tailwindcss-rails` and `tailwindcss-ruby`:
8887

89-
``` ruby
88+
```ruby
9089
# Gemfile
9190
gem "tailwindcss-rails", "~> 3.3"
9291
gem "tailwindcss-ruby", "~> 3.4" # only necessary with tailwindcss-rails <= 3.3.0
9392
```
9493

95-
9694
### Upgrade steps
9795

9896
> [!WARNING]
@@ -101,8 +99,8 @@ gem "tailwindcss-ruby", "~> 3.4" # only necessary with tailwindcss-rails <= 3.3.
10199
First, update to `tailwindcss-rails` v4.0.0 or higher. This will also ensure you're transitively depending on `tailwindcss-ruby` v4.
102100

103101
```html
104-
# Gemfile
105-
gem "tailwindcss-rails", "~> 4.0" # which transitively pins tailwindcss-ruby to v4
102+
# Gemfile gem "tailwindcss-rails", "~> 4.0" # which transitively pins
103+
tailwindcss-ruby to v4
106104
```
107105

108106
**Update** path references to any existing css files imported in `app/assets/stylesheets/application.tailwind.css` so that they will resolve when the file is moved to `app/assets/tailwind/application.css`.
@@ -114,7 +112,7 @@ gem "tailwindcss-rails", "~> 4.0" # which transitively pins tailwindcss-ruby to
114112

115113
If you want to migrate CSS class names for v4 (this is an optional step!), jump to [Updating CSS class names for v4](#updating-css-class-names-for-v4) before continuing.
116114

117-
Then, run `bin/rails tailwindcss:upgrade`. Among other things, this will try to run the official Tailwind upgrade utility. It requires `npx` in order to run, but it's a one-time operation and is *highly recommended* for a successful upgrade.
115+
Then, run `bin/rails tailwindcss:upgrade`. Among other things, this will try to run the official Tailwind upgrade utility. It requires `npx` in order to run, but it's a one-time operation and is _highly recommended_ for a successful upgrade.
118116

119117
<details>
120118
<summary>Here's a detailed list of what the upgrade task does.</summary>
@@ -131,7 +129,7 @@ Then, run `bin/rails tailwindcss:upgrade`. Among other things, this will try to
131129
<details>
132130
<summary>Here's what that upgrade looks like on a vanilla Rails app.</summary>
133131

134-
``` sh
132+
```sh
135133
$ bin/rails tailwindcss:upgrade
136134
apply /path/to/tailwindcss-rails/lib/install/upgrade_tailwindcss.rb
137135
Removing references to 'defaultTheme' from /home/user/myapp/config/tailwind.config.js
@@ -166,12 +164,11 @@ $ bin/rails tailwindcss:upgrade
166164
Done in 56ms
167165
run bundle install --quiet
168166
```
169-
</details>
170167
168+
</details>
171169
172170
If this doesn't succeed, it's likely that you've customized your Tailwind configuration and you'll need to do some work to make sure your application upgrades. Please read the [official upgrade guide](https://tailwindcss.com/docs/upgrade-guide) and try following the additional steps in [Updating CSS class names for v4](#updating-css-class-names-for-v4).
173171
174-
175172
### Troubleshooting a v4 upgrade
176173
177174
You may want to check out [TailwindCSS v4 - upgrade experience report · rails/tailwindcss-rails · Discussion #450](https://github.com/rails/tailwindcss-rails/discussions/450) if you're having trouble upgrading.
@@ -182,7 +179,6 @@ We know there are some cases we haven't addressed with the upgrade task:
182179
183180
We'll try to improve the upgrade process over time, but for now you may need to do some manual work to upgrade.
184181
185-
186182
### Updating CSS class names for v4
187183
188184
> [!NOTE]
@@ -208,9 +204,9 @@ With some additional manual work the upstream upgrade tool will update your appl
208204
"@tailwindcss/aspect-ratio": "^0.4.2",
209205
"@tailwindcss/container-queries": "^0.1.1",
210206
"@tailwindcss/forms": "^0.5.10",
211-
"@tailwindcss/typography": "^0.5.16"
207+
"@tailwindcss/typography": "^0.5.16",
212208
// And so on...
213-
}
209+
},
214210
}
215211
```
216212
@@ -280,12 +276,10 @@ This gem also generates a `Procfile.dev` file which will run both the rails serv
280276
281277
The `tailwindcss:build` is automatically attached to `assets:precompile`, so before the asset pipeline digests the files, the Tailwind output will be generated.
282278
283-
284279
### Building for testing
285280
286281
The `tailwindcss:build` task is automatically attached to the `test:prepare` Rake task. This task runs before test commands. If you run `bin/rails test` in your CI environment, your Tailwind output will be generated before tests run.
287282
288-
289283
### Building unminified assets
290284
291285
If you want unminified assets, you can:
@@ -303,7 +297,6 @@ While you're developing your application, you want to run Tailwind in "watch" mo
303297
- or run `rails tailwindcss:watch` as a separate process,
304298
- or run `bin/dev` which uses [Foreman](https://github.com/ddollar/foreman)
305299
306-
307300
#### Puma plugin
308301
309302
This gem ships with a Puma plugin. To use it, add this line to your `puma.rb` configuration:
@@ -314,7 +307,6 @@ plugin :tailwindcss if ENV.fetch("RAILS_ENV", "development") == "development"
314307
315308
and then running `rails server` (or just `puma`) will run the Tailwind watch process in the background.
316309
317-
318310
#### Run `rails tailwindcss:watch`
319311
320312
This is a flexible command, which can be run with a few different options.
@@ -331,38 +323,35 @@ If you are running `rails tailwindcss:watch` as a process in a Docker container,
331323
332324
If you are running `rails tailwindcss:watch` in a docker container without a tty, pass the `always` argument to the task to instruct tailwindcss to keep the watcher alive even when `stdin` is closed: `rails tailwindcss:watch[always]`. If you use `bin/dev` then you should modify your `Procfile.dev`.
333325
334-
335326
#### Foreman
336327
337328
Running `bin/dev` invokes Foreman to start both the Tailwind watch process and the rails server in development mode based on your `Procfile.dev` file.
338329
339-
340330
### Using Tailwind plugins
341331
342332
If you want to use Tailwind plugins, they can be installed using `package.json`.
343333
344334
Using Yarn:
345335
346-
``` sh
336+
```sh
347337
[ ! -f package.json ] && yarn init
348338
yarn add daisyui # example
349339
```
350340
351341
Using npm:
352342
353-
``` sh
343+
```sh
354344
npm init
355345
npm add daisyui # example
356346
```
357347
358348
Than use `@plugin` annotation in `app/assets/tailwind/application.css`:
359349
360-
``` css
350+
```css
361351
@import "tailwindcss";
362352
@plugin "daisyui";
363353
```
364354
365-
366355
### Using with PostCSS
367356
368357
If you want to use PostCSS as a preprocessor, create a custom `postcss.config.js` in your project root directory, and that file will be loaded by Tailwind automatically.
@@ -374,8 +363,8 @@ For example, to enable nesting:
374363
export default {
375364
plugins: {
376365
"@tailwindcss/postcss": {},
377-
}
378-
}
366+
},
367+
};
379368
```
380369
381370
⚠ Note that PostCSS is a JavaScript tool with its own prerequisites! By default `tailwindcss-rails` does not require any JavaScript tooling, so in order to use PostCSS, a `package.json` with dependencies for your plugins and a package manager like `yarn` or `npm` is required, for example:
@@ -395,12 +384,14 @@ export default {
395384
396385
Then you can use yarn or npm to install the dependencies.
397386
387+
### Rails Engines support
388+
389+
If you have Rails Engines in your application that use Tailwind CSS and provide an `app/assets/tailwind/<engine_name>/application.css` file, entry point files will be created for each of them in `app/assets/builds/tailwind/<engine_name>.css` so they can be included in your host application's Tailwind CSS by adding `@import "../../assets/builds/tailwind/<engine_name>"` to your `app/assets/tailwind/application.css` file.
398390
399391
### Custom inputs or outputs
400392
401393
If you need to use a custom input or output file, you can run `bundle exec tailwindcss` to access the platform-specific executable, and give it your own build options.
402394
403-
404395
## Troubleshooting
405396
406397
When having trouble with `tailwindcss:build` or `tailwindcss:watch`, the first thing you should do is collect some diagnostic information by setting the "verbose" flag, which will emit:
@@ -410,7 +401,7 @@ When having trouble with `tailwindcss:build` or `tailwindcss:watch`, the first t
410401
411402
Here's what that looks like:
412403
413-
``` sh
404+
```sh
414405
$ bin/rails tailwindcss:build[verbose]
415406
416407
Running: /path/to/tailwindcss-ruby-4.0.17-x86_64-linux-gnu/exe/x86_64-linux-gnu/tailwindcss -i /home/flavorjones/code/oss/tailwindcss-rails/My Workspace/test-install/app/assets/tailwind/application.css -o /home/flavorjones/code/oss/tailwindcss-rails/My Workspace/test-install/app/assets/builds/tailwind.css --minify
@@ -432,34 +423,28 @@ There is a [known issue](https://github.com/tailwindlabs/tailwindcss/issues/1724
432423
433424
Please try uninstalling `watchman` and try running the watch task again.
434425
435-
436426
### Lost keystrokes or hanging when using terminal-based debugging tools (e.g. IRB, Pry, `ruby/debug`...etc.) with the Puma plugin
437427
438428
We've addressed the issue and you can avoid the problem by upgrading `tailwindcss-rails` to [v2.4.1](https://github.com/rails/tailwindcss-rails/releases/tag/v2.4.1) or later versions.
439429
440-
441430
### Running in a docker container exits prematurely
442431
443432
If you are running `rails tailwindcss:watch` as a process in a Docker container, set `tty: true` in `docker-compose.yml` for the appropriate container to keep the watch process running.
444433
445434
If you are running `rails tailwindcss:watch` in a docker container without a tty, pass the `always` argument to the task to instruct tailwindcss to keep the watcher alive even when `stdin` is closed: `rails tailwindcss:watch[always]`. If you use `bin/dev` then you should modify your `Procfile.dev`.
446435
447-
448436
### Conflict with sassc-rails
449437
450438
Tailwind uses modern CSS features that are not recognized by the `sassc-rails` extension that was included by default in the Gemfile for Rails 6. In order to avoid any errors like `SassC::SyntaxError`, you must remove that gem from your Gemfile.
451439
452-
453440
### Class names must be spelled out
454441
455442
For Tailwind to work, your class names need to be spelled out. If you need to make sure Tailwind generates class names that don't exist in your content files or that are programmatically composed, use the [safelist option](https://tailwindcss.com/docs/content-configuration#safelisting-classes).
456443
457-
458444
### `ERROR: Cannot find the tailwindcss executable` for supported platform
459445
460446
See https://github.com/flavorjones/tailwindcss-ruby for help.
461447
462-
463448
### Using asset-pipeline assets
464449
465450
In Rails, you want to use [assets from the asset pipeline to get fingerprinting](https://guides.rubyonrails.org/asset_pipeline.html#fingerprinting-versioning-with-digest-based-urls). However, Tailwind isn't aware of those assets.
@@ -468,20 +453,22 @@ To use assets from the pipeline, use `url(image.svg)`. [Since Sprockets v3.3.0](
468453
469454
```js
470455
module.exports = {
471-
theme: {
472-
extend: {
473-
backgroundImage: {
474-
'image': "url('image.svg')"
475-
}
476-
}
477-
}
478-
}
456+
theme: {
457+
extend: {
458+
backgroundImage: {
459+
image: "url('image.svg')",
460+
},
461+
},
462+
},
463+
};
479464
```
480465
481466
The inline version also works:
482467
483468
```html
484-
<section class="bg-[url('image.svg')]">Has the image as it's background</section>
469+
<section class="bg-[url('image.svg')]">
470+
Has the image as it's background
471+
</section>
485472
```
486473
487474
## License

lib/tailwindcss-rails.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@ module Tailwindcss
22
end
33

44
require_relative "tailwindcss/version"
5+
require_relative "tailwindcss/engines"
56
require_relative "tailwindcss/engine"
67
require_relative "tailwindcss/commands"

lib/tailwindcss/engine.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,9 @@ class Engine < ::Rails::Engine
1515
config.app_generators do |g|
1616
g.template_engine :tailwindcss
1717
end
18+
19+
config.after_initialize do
20+
Tailwindcss::Engines.bundle
21+
end
1822
end
1923
end

lib/tailwindcss/engines.rb

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
module Tailwindcss
2+
module Engines
3+
class << self
4+
def bundle
5+
FileUtils.mkdir_p(Rails.root.join("app/assets/builds/tailwind"))
6+
Rails::Engine.subclasses.select do |engine|
7+
engine.root.join("app/assets/tailwind/#{engine.engine_name}/application.css").exist?
8+
end.each do |engine|
9+
file_path = Rails.root.join("app/assets/builds/tailwind/#{engine.engine_name}.css")
10+
FileUtils.rm(file_path) if File.exist?(file_path)
11+
template = <<~TEMPLATE
12+
/* DO NOT MODIFY THIS FILE, it was auto-generated by tailwindcss-rails */
13+
14+
@import "#{engine.root.join("app/assets/tailwind/#{engine.engine_name}/application.css")}";
15+
TEMPLATE
16+
File.open(file_path, 'w') do |file|
17+
file.puts template
18+
end
19+
end
20+
end
21+
end
22+
end
23+
end

test/lib/tailwindcss/engine_test.rb

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
require "test_helper"
2+
require "minitest/mock"
3+
4+
class Tailwindcss::EngineTest < ActiveSupport::TestCase
5+
def setup
6+
super
7+
# Store original Rails state
8+
@original_rails_root = Rails.root
9+
@original_application = Rails.application
10+
end
11+
12+
def teardown
13+
super
14+
# Restore original Rails state
15+
Rails.application = @original_application if @original_application
16+
end
17+
18+
test "after_initialize calls Tailwindcss::Engines.bundle" do
19+
called = false
20+
21+
# Replace bundle method with our spy
22+
Tailwindcss::Engines.stub(:bundle, ->{ called = true }) do
23+
# Execute the after_initialize block
24+
Rails.stub(:root, File) do
25+
engine_file = File.join(File.dirname(__FILE__), "../../../lib/tailwindcss/engine.rb")
26+
engine_code = File.read(engine_file)
27+
28+
# Verify that the after_initialize block calls Engines.bundle
29+
assert_match(/config\.after_initialize do.*?Tailwindcss::Engines\.bundle.*?end/m, engine_code,
30+
"Expected after_initialize block to call Tailwindcss::Engines.bundle")
31+
32+
# Call bundle to verify our spy works
33+
Tailwindcss::Engines.bundle
34+
assert called, "Expected Tailwindcss::Engines.bundle to be called"
35+
end
36+
end
37+
end
38+
end

0 commit comments

Comments
 (0)