tailwindcss-rails 2.0.24 → 2.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cc5f29de93eeb3395f77afbbe7ad5d869b27f34e78cd4ec0a134c98ab93ae2d
-  data.tar.gz: 2ea2a7fdab7755cddc55a9a3b1cce290c53997bae1ef9c3ebcf326230b92db6e
+  metadata.gz: eb9d8f1440e51b0b218998c75371cdecbe507b3c9094d052fa6d5d8145f8a8c6
+  data.tar.gz: 9dd8ce840b9a81501eda3167fc2d730c5d8330b9a38227cc63101fd1e39e1d9d
 SHA512:
-  metadata.gz: 7d653d5ad33ca2e1baabb5810cb64e9a92e95ada2b8f194fbaf1d3feac688792ab6d730c726d665918b4b5f33809d6a166bc7052c5f68f0b862beea2d0bd0f72
-  data.tar.gz: 3ff8b9308f3abb7740660d72be0491e6cf1438105d97945b8a026f611a38e1742efbf4dcc13a15fa51506118fd65d1b088cd5c9b976f217c2b8b742afa32079e
+  metadata.gz: 006b91990412847a8a4795ae5e74a286c5418c4cb13c18bcdcd5de33891951a62767c699b55f306c3f0dcec72d98b965be008abe5c764160f2066c2a41935504
+  data.tar.gz: 19ddfac65eaebdfe5f206666bad2bcbe836f100a1fc0e22dbc04b7b43910fb287fc44e11c89aade63700dcebe4035ea0dcd18241b7abb6c06fdda4cc1a2c9e8c

data/README.md

@@ -9,7 +9,34 @@ With Rails 7 you can generate a new application preconfigured with Tailwind by u
 1. Run `./bin/bundle add tailwindcss-rails`
 2. Run `./bin/rails tailwindcss:install`
 
-This gem wraps [the standalone executable version](https://tailwindcss.com/blog/standalone-cli) of the Tailwind CSS v3 framework. These executables are platform specific, so there are actually separate underlying gems per platform, but the correct gem will automatically be picked for your platform. Supported platforms are Linux x64, macOS arm64, macOS x64, and Windows x64. (Note that due to this setup, you must install the actual gems – you can't pin your gem to the github repo.)
+This gem wraps [the standalone executable version](https://tailwindcss.com/blog/standalone-cli) of the Tailwind CSS v3 framework. These executables are platform specific, so there are actually separate underlying gems per platform, but the correct gem will automatically be picked for your platform.
+
+Supported platforms are:
+
+- arm64-darwin (macos-arm64)
+- x64-mingw32 (windows-x64)
+- x64-mingw-ucr (windows-x64)
+- x86_64-darwin (macos-x64)
+- x86_64-linux (linux-x64)
+- aarch64-linux (linux-arm64)
+- arm-linux (linux-armv7)
+
+
+### Using a local installation of `tailwindcss`
+
+If you are not able to use the vendored standalone executables (for example, if you're on an unsupported platform), you can use a local installation of the `tailwindcss` executable by setting an environment variable named `TAILWINDCSS_INSTALL_DIR` to the directory containing the executable.
+
+For example, if you've installed `tailwindcss` so that the executable is found at `/node_modules/bin/tailwindcss`, then you should set your environment variable like so:
+
+``` sh
+TAILWINDCSS_INSTALL_DIR=/path/to/node_modules/bin
+```
+
+This also works with relative paths. If you've installed into your app's directory at `./node_modules/.bin/tailwindcss`:
+
+``` sh
+TAILWINDCSS_INSTALL_DIR=node_modules/.bin
+```
 
 
 ## Developing with Tailwindcss
@@ -43,9 +70,11 @@ While you're developing your application, you want to run Tailwind in "watch" mo
 - 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.
 
+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`.
+
 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.
 
-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`.
+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`.
 
 
 ### Debugging with unminified assets

data/lib/install/tailwind.config.js

@@ -18,5 +18,6 @@ module.exports = {
     require('@tailwindcss/forms'),
     require('@tailwindcss/aspect-ratio'),
     require('@tailwindcss/typography'),
+    require('@tailwindcss/container-queries'),
   ]
 }

data/lib/tailwindcss/commands.rb

@@ -2,6 +2,8 @@ require_relative "upstream"
 
 module Tailwindcss
   module Commands
+    DEFAULT_DIR = File.expand_path(File.join(__dir__, "..", "..", "exe"))
+
     # raised when the host platform is not supported by upstream tailwindcss's binary releases
     class UnsupportedPlatformException < StandardError
     end
@@ -10,26 +12,41 @@ module Tailwindcss
     class ExecutableNotFoundException < StandardError
     end
 
+    # raised when TAILWINDCSS_INSTALL_DIR does not exist
+    class DirectoryNotFoundException < StandardError
+    end
+
     class << self
       def platform
         [:cpu, :os].map { |m| Gem::Platform.local.send(m) }.join("-")
       end
 
-      def executable(
-        exe_path: File.expand_path(File.join(__dir__, "..", "..", "exe"))
-      )
-        if Tailwindcss::Upstream::NATIVE_PLATFORMS.keys.none? { |p| Gem::Platform.match(Gem::Platform.new(p)) }
-          raise UnsupportedPlatformException, <<~MESSAGE
-            tailwindcss-rails does not support the #{platform} platform
-            Please install tailwindcss following instructions at https://tailwindcss.com/docs/installation
-          MESSAGE
-        end
-
-        exe_path = Dir.glob(File.expand_path(File.join(exe_path, "*", "tailwindcss"))).find do |f|
-          Gem::Platform.match(Gem::Platform.new(File.basename(File.dirname(f))))
+      def executable(exe_path: DEFAULT_DIR)
+        tailwindcss_install_dir = ENV["TAILWINDCSS_INSTALL_DIR"]
+        if tailwindcss_install_dir
+          if File.directory?(tailwindcss_install_dir)
+            warn "NOTE: using TAILWINDCSS_INSTALL_DIR to find tailwindcss executable: #{tailwindcss_install_dir}"
+            exe_path = tailwindcss_install_dir
+            exe_file = File.expand_path(File.join(tailwindcss_install_dir, "tailwindcss"))
+          else
+            raise DirectoryNotFoundException, <<~MESSAGE
+              TAILWINDCSS_INSTALL_DIR is set to #{tailwindcss_install_dir}, but that directory does not exist.
+            MESSAGE
+          end
+        else
+          if Tailwindcss::Upstream::NATIVE_PLATFORMS.keys.none? { |p| Gem::Platform.match(Gem::Platform.new(p)) }
+            raise UnsupportedPlatformException, <<~MESSAGE
+              tailwindcss-rails does not support the #{platform} platform
+              Please install tailwindcss following instructions at https://tailwindcss.com/docs/installation
+            MESSAGE
+          end
+
+          exe_file = Dir.glob(File.expand_path(File.join(exe_path, "*", "tailwindcss"))).find do |f|
+            Gem::Platform.match(Gem::Platform.new(File.basename(File.dirname(f))))
+          end
         end
 
-        if exe_path.nil?
+        if exe_file.nil? || !File.exist?(exe_file)
           raise ExecutableNotFoundException, <<~MESSAGE
             Cannot find the tailwindcss executable for #{platform} in #{exe_path}
 
@@ -52,7 +69,7 @@ module Tailwindcss
           MESSAGE
         end
 
-        exe_path
+        exe_file
       end
 
       def compile_command(debug: false, **kwargs)
@@ -66,9 +83,10 @@ module Tailwindcss
         end
       end
 
-      def watch_command(poll: false, **kwargs)
+      def watch_command(always: false, poll: false, **kwargs)
         compile_command(**kwargs).tap do |command|
           command << "-w"
+          command << "always" if always
           command << "-p" if poll
         end
       end

data/lib/tailwindcss/upstream.rb

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

data/lib/tailwindcss/version.rb

@@ -1,3 +1,3 @@
 module Tailwindcss
-  VERSION = "2.0.24"
+  VERSION = "2.0.29"
 end

data/lib/tasks/build.rake

@@ -11,7 +11,8 @@ namespace :tailwindcss do
   task watch: :environment do |_, args|
     debug = args.extras.include?("debug")
     poll = args.extras.include?("poll")
-    command = Tailwindcss::Commands.watch_command(debug: debug, poll: poll)
+    always = args.extras.include?("always")
+    command = Tailwindcss::Commands.watch_command(always: always, debug: debug, poll: poll)
     puts command.inspect if args.extras.include?("verbose")
     system(*command)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tailwindcss-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.24
+  version: 2.0.29
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-05 00:00:00.000000000 Z
+date: 2023-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -24,6 +24,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.0.0
+  force_ruby_platform: false
 description: 
 email: david@loudthinking.com
 executables:
@@ -98,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: Integrate Tailwind CSS with the asset pipeline in Rails.