tailwindcss-rails 2.0.33 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c12710eed224e002d5f43d21f7552a669f813e5ee0cdac9cf9d4c8ae42bef58
-  data.tar.gz: ad08cca0129265f25664a270d8e6cf5bd290859b136761cb98f57574bcde6ebe
+  metadata.gz: de196b39f177a23353fe1b2264233a5dc43135997dbe64d977a023f4284ee895
+  data.tar.gz: 8e4a38a8f018572466852d7c3a7179f07b44715aa2618b7eddf509e2826e21a9
 SHA512:
-  metadata.gz: 19812f41526d3fb6de5ea2411a384f30713336cf230cfd4f1173a8cb7462cab07ce0ac221ec146e25bb206c36b309bc2b540d9bcd30cb9274b28596d68c47a30
-  data.tar.gz: 42e7b00711430abad90bb2dcfe3df922f21c62b141f85da48f85bfb62d57000b5de075c3aa00d693678dc73e3abd31e149aa52057d8268c0c7881d6f4ce68e5c
+  metadata.gz: efeb15889ec6cd234f64d2c2561833d0f3876bbf97c25070577e09be1ee499b1db11b0243f258f6bb3659ebc8e97cf93fe53c150a2b119372c7f1239567bfdf3
+  data.tar.gz: 51ec5b33d3e065b1c7c2d1f330c5b8b2d654bf6413e072ae3524557e87a2c01ddc8b7638c6d2c0b6144d77c5e30837b781c65f7953c3446f0b7061591b191d0e

data/README.md

@@ -60,10 +60,26 @@ The `tailwindcss:build` task is automatically attached to the `test:prepare` Rak
 
 ### Update assets automatically
 
-While you're developing your application, you want to run Tailwind in "watch" mode, so changes are automatically reflected in the generated CSS output. You can do this by:
+While you're developing your application, you want to run Tailwind in "watch" mode, so changes are automatically reflected in the generated CSS output. You can do this in a few different ways:
 
-- running `rails tailwindcss:watch` as a separate process,
-- or by running `./bin/dev` which uses [foreman](https://github.com/ddollar/foreman) to start both the Tailwind watch process and the rails server in development mode.
+- use the [Puma](https://puma.io/) plugin to integrate "watch" with `rails server`, or
+- run `rails tailwindcss:watch` as a separate process, or
+- run `bin/dev` which uses [Foreman](https://github.com/ddollar/foreman)
+
+#### Puma plugin
+
+The Puma plugin requires you to add this line to your `puma.rb` configuration:
+
+```ruby
+plugin :tailwindcss if ENV.fetch("RAILS_ENV", "development") == "development"
+```
+
+and then running `rails server` will run the Tailwind watch process in the background
+
+
+#### Run `rails tailwindcss:watch`
+
+This is a flexible command, which can be run with a few different options.
 
 If you are running `rails tailwindcss:watch` on a system that doesn't fully support file system events, pass a `poll` argument to the task to instruct tailwindcss to instead use polling: `rails tailwindcss:watch[poll]`. If you use `bin/dev` then you should modify your `Procfile.dev`.
 
@@ -72,6 +88,11 @@ If you are running `rails tailwindcss:watch` as a process in a Docker container,
 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`.
 
 
+#### Foreman
+
+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.
+
+
 ### Debugging with unminified assets
 
 If you want unminified assets, you can pass a `debug` argument to the rake task, i.e. `rails tailwindcss:build[debug]` or `rails tailwindcss:watch[debug]`.

data/lib/install/Procfile.dev

@@ -1,2 +1,2 @@
-web: env RUBY_DEBUG_OPEN=true bin/rails server -p 3000
+web: bin/rails server
 css: bin/rails tailwindcss:watch

data/lib/install/dev

@@ -5,4 +5,12 @@ if ! gem list foreman -i --silent; then
   gem install foreman
 fi
 
+# Default to port 3000 if not specified
+export PORT="${PORT:-3000}"
+
+# Let the debug gem allow remote connections,
+# but avoid loading until `debugger` is called
+export RUBY_DEBUG_OPEN="true"
+export RUBY_DEBUG_LAZY="true"
+
 exec foreman start -f Procfile.dev "$@"

data/lib/puma/plugin/tailwindcss.rb

@@ -0,0 +1,63 @@
+require "puma/plugin"
+
+Puma::Plugin.create do
+  attr_reader :puma_pid, :tailwind_pid, :log_writer
+
+  def start(launcher)
+    @log_writer = launcher.log_writer
+    @puma_pid = $$
+    @tailwind_pid = fork do
+      Thread.new { monitor_puma }
+      system(*Tailwindcss::Commands.watch_command)
+    end
+
+    launcher.events.on_stopped { stop_tailwind }
+
+    in_background do
+      monitor_tailwind
+    end
+  end
+
+  private
+    def stop_tailwind
+      Process.waitpid(tailwind_pid, Process::WNOHANG)
+      log "Stopping tailwind..."
+      Process.kill(:INT, tailwind_pid) if tailwind_pid
+      Process.wait(tailwind_pid)
+    rescue Errno::ECHILD, Errno::ESRCH
+    end
+
+    def monitor_puma
+      monitor(:puma_dead?, "Detected Puma has gone away, stopping tailwind...")
+    end
+
+    def monitor_tailwind
+      monitor(:tailwind_dead?, "Detected tailwind has gone away, stopping Puma...")
+    end
+
+    def monitor(process_dead, message)
+      loop do
+        if send(process_dead)
+          log message
+          Process.kill(:INT, $$)
+          break
+        end
+        sleep 2
+      end
+    end
+
+    def tailwind_dead?
+      Process.waitpid(tailwind_pid, Process::WNOHANG)
+      false
+    rescue Errno::ECHILD, Errno::ESRCH
+      true
+    end
+
+    def puma_dead?
+      Process.ppid != puma_pid
+    end
+
+    def log(...)
+      log_writer.log(...)
+    end
+end

data/lib/tailwindcss/upstream.rb

@@ -1,7 +1,7 @@
 module Tailwindcss
   # constants describing the upstream tailwindcss project
   module Upstream
-    VERSION = "v3.3.6"
+    VERSION = "v3.4.0"
 
     # rubygems platform name => upstream release filename
     NATIVE_PLATFORMS = {

data/lib/tailwindcss/version.rb

@@ -1,3 +1,3 @@
 module Tailwindcss
-  VERSION = "2.0.33"
+  VERSION = "2.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tailwindcss-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.33
+  version: 2.2.0
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-12-09 00:00:00.000000000 Z
+date: 2024-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -70,6 +70,7 @@ files:
 - lib/install/dev
 - lib/install/tailwind.config.js
 - lib/install/tailwindcss.rb
+- lib/puma/plugin/tailwindcss.rb
 - lib/tailwindcss-rails.rb
 - lib/tailwindcss/commands.rb
 - lib/tailwindcss/engine.rb