tailwindcss-rails 2.7.6 → 3.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a157d6841bfb30c1b315cd8d6813e11593b375c00f7e10ce17fb41e9ab722554
-  data.tar.gz: 0cb80ed07a9a82d75513142adf5b7b93448c253dc9c68a69ec07c0aa71b481f9
+  metadata.gz: 19d356e69cfad32729dca7d84903a96c0a08a472c56ad8d378964d2bf4fad437
+  data.tar.gz: 749be2aa984e18315877bc09ce9f1c1e8df5c2b3928ed015d0de4d14555fabdf
 SHA512:
-  metadata.gz: 41ba1c2fe8231537403bf155fd9bcc4b8550c0ee221991db9442196dcbf42604ab67811c40e7a86e0b337586bafc6e5a5827de5baea349fd1cdb724bebd28802
-  data.tar.gz: 503566ec51c9bdee4e4ed2573c2c7a8717f5e25895005c2eb0b3399c90a7c887241ba29034fb4e4dc955216e374e5c771845acb06afa459bb09ece59274a697a
+  metadata.gz: 6d45b7493d63aa3977eeb579ba4268fd807c9a7ed2321302d9433353808d464248b8b2d611afb46a74fdfc020762e389cfeb74b679502f5f38b43b466e093210
+  data.tar.gz: b0985425b30bcbf90b79c87db6dcdc67b2fb95232b1389a831557dfa21b84d0a93c2f3ae6ebc959006c3cb06614a794fa19b1d260807303871d6694724c4048f

data/README.md

@@ -7,6 +7,7 @@
 <!-- toc -->
 
 - [Installation](#installation)
+  * [Choosing a specific version of `tailwindcss`](#choosing-a-specific-version-of-tailwindcss)
   * [Using a local installation of `tailwindcss`](#using-a-local-installation-of-tailwindcss)
 - [Developing with Tailwindcss](#developing-with-tailwindcss)
   * [Configuration and commands](#configuration-and-commands)
@@ -17,7 +18,7 @@
   * [Using with PostCSS](#using-with-postcss)
   * [Custom inputs or outputs](#custom-inputs-or-outputs)
 - [Troubleshooting](#troubleshooting)
-  * [Lost keystrokes or hanging when using `ruby/debug` with the Puma plugin](#lost-keystrokes-or-hanging-when-using-rubydebug-with-the-puma-plugin)
+  * [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)
   * [Running in a docker container exits prematurely](#running-in-a-docker-container-exits-prematurely)
   * [Conflict with sassc-rails](#conflict-with-sassc-rails)
   * [Class names must be spelled out](#class-names-must-be-spelled-out)
@@ -35,34 +36,23 @@ 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.
+This gem depends on the `tailwindcss-ruby` gem to install a working tailwind executable.
 
-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)
+### Choosing a specific version of `tailwindcss`
 
+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 by pinning that gem to the analogous version in your application's `Gemfile`. For example,
 
-### 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 path containing the executable.
-
-For example, if you've installed `tailwindcss` so that the executable is found at `/path/to/node_modules/bin/tailwindcss`, then you should set your environment variable like so:
+``` ruby
+gem "tailwindcss-rails"
 
-``` sh
-TAILWINDCSS_INSTALL_DIR=/path/to/node_modules/bin
+# pin to tailwindcss version 3.4.13
+gem "tailwindcss-ruby", "3.4.13"
 ```
 
-or, for relative paths like `./node_modules/.bin/tailwindcss`:
+### Using a local installation of `tailwindcss`
 
-``` sh
-TAILWINDCSS_INSTALL_DIR=node_modules/.bin
-```
+You can also use a local (npm-based) installation if you prefer, please go to https://github.com/flavorjones/tailwindcss-ruby for more information.
 
 
 ## Developing with Tailwindcss
@@ -206,41 +196,7 @@ For Tailwind to work, your class names need to be spelled out. If you need to ma
 
 ### `ERROR: Cannot find the tailwindcss executable` for supported platform
 
-Some users are reporting this error even when running on one of the supported native platforms:
-
-- arm64-darwin
-- x64-mingw32
-- x64-mingw-ucrt
-- x86_64-darwin
-- x86_64-linux
-- aarch64-linux
-
-#### Check Bundler PLATFORMS
-
-A possible cause of this is that Bundler has not been told to include native gems for your current platform. Please check your `Gemfile.lock` file to see whether your native platform is included in the `PLATFORMS` section. If necessary, run:
-
-``` sh
-bundle lock --add-platform <platform-name>
-```
-
-and re-bundle.
-
-
-#### Check BUNDLE_FORCE_RUBY_PLATFORM
-
-Another common cause of this is that bundler is configured to always use the "ruby" platform via the
-`BUNDLE_FORCE_RUBY_PLATFORM` config parameter being set to `true`. Please remove this configuration:
-
-``` sh
-bundle config unset force_ruby_platform
-# or
-bundle config set --local force_ruby_platform false
-```
-
-and re-bundle.
-
-See https://bundler.io/man/bundle-config.1.html for more information.
-
+See https://github.com/flavorjones/tailwindcss-ruby for help.
 
 ### Using asset-pipeline assets
 
@@ -280,5 +236,4 @@ Or, if you do want to keep using the asset pipeline in parallel, make sure to re
 ## License
 
 Tailwind for Rails is released under the [MIT License](https://opensource.org/licenses/MIT).
-Tailwind CSS is released under the [MIT License](https://opensource.org/licenses/MIT).
 The Inter font is released under the [SIL Open Font License, Version 1.1](https://github.com/rsms/inter/blob/master/LICENSE.txt).

data/lib/generators/tailwindcss/authentication/templates/app/views/passwords/edit.html.erb

@@ -0,0 +1,21 @@
+<div class="mx-auto md:w-2/3 w-full">
+  <%% if alert = flash[:alert] %>
+    <p class="py-2 px-3 bg-red-50 mb-5 text-red-500 font-medium rounded-lg inline-block" id="alert"><%%= alert %></p>
+  <%% end %>
+
+  <h1 class="font-bold text-4xl">Update your password</h1>
+
+  <%%= form_with url: password_path(params[:token]), method: :put, class: "contents" do |form| %>
+    <div class="my-5">
+      <%%= form.password_field :password, required: true, autocomplete: "new-password", placeholder: "Enter new password", maxlength: 72, class: "block shadow rounded-md border border-gray-400 outline-none px-3 py-2 mt-2 w-full" %>
+    </div>
+
+    <div class="my-5">
+      <%%= form.password_field :password_confirmation, required: true, autocomplete: "new-password", placeholder: "Repeat new password", maxlength: 72, class: "block shadow rounded-md border border-gray-400 outline-none px-3 py-2 mt-2 w-full" %>
+    </div>
+
+    <div class="inline">
+      <%%= form.submit "Save", class: "rounded-lg py-3 px-5 bg-blue-600 text-white inline-block font-medium cursor-pointer" %>
+    </div>
+  <%% end %>
+</div>

data/lib/generators/tailwindcss/authentication/templates/app/views/passwords/new.html.erb

@@ -0,0 +1,17 @@
+<div class="mx-auto md:w-2/3 w-full">
+  <%% if alert = flash[:alert] %>
+    <p class="py-2 px-3 bg-red-50 mb-5 text-red-500 font-medium rounded-lg inline-block" id="alert"><%%= alert %></p>
+  <%% end %>
+
+  <h1 class="font-bold text-4xl">Forgot your password?</h1>
+
+  <%%= form_with url: passwords_path, class: "contents" do |form| %>
+    <div class="my-5">
+      <%%= form.email_field :email_address, required: true, autofocus: true, autocomplete: "username", placeholder: "Enter your email address", value: params[:email_address], class: "block shadow rounded-md border border-gray-400 outline-none px-3 py-2 mt-2 w-full" %>
+    </div>
+
+    <div class="inline">
+      <%%= form.submit "Email reset instructions", class: "rounded-lg py-3 px-5 bg-blue-600 text-white inline-block font-medium cursor-pointer" %>
+    </div>
+  <%% end %>
+</div>

data/lib/generators/tailwindcss/authentication/templates/app/views/sessions/new.html.erb

@@ -0,0 +1,31 @@
+<div class="mx-auto md:w-2/3 w-full">
+  <%% if alert = flash[:alert] %>
+    <p class="py-2 px-3 bg-red-50 mb-5 text-red-500 font-medium rounded-lg inline-block" id="alert"><%%= alert %></p>
+  <%% end %>
+
+  <%% if notice = flash[:notice] %>
+    <p class="py-2 px-3 bg-green-50 mb-5 text-green-500 font-medium rounded-lg inline-block" id="notice"><%%= notice %></p>
+  <%% end %>
+
+  <h1 class="font-bold text-4xl">Sign in</h1>
+
+  <%%= form_with url: session_url, class: "contents" do |form| %>
+    <div class="my-5">
+      <%%= form.email_field :email_address, required: true, autofocus: true, autocomplete: "username", placeholder: "Enter your email address", value: params[:email_address], class: "block shadow rounded-md border border-gray-400 outline-none px-3 py-2 mt-2 w-full" %>
+    </div>
+
+    <div class="my-5">
+      <%%= form.password_field :password, required: true, autocomplete: "current-password", placeholder: "Enter your password", maxlength: 72, class: "block shadow rounded-md border border-gray-400 outline-none px-3 py-2 mt-2 w-full" %>
+    </div>
+
+    <div class="col-span-6 sm:flex sm:items-center sm:gap-4">
+      <div class="inline">
+        <%%= form.submit "Sign in", class: "rounded-lg py-3 px-5 bg-blue-600 text-white inline-block font-medium cursor-pointer" %>
+      </div>
+
+      <div class="mt-4 text-sm text-gray-500 sm:mt-0">
+        <%%= link_to "Forgot password?", new_password_path, class: "text-gray-700 underline" %>
+      </div>
+    </div>
+  <%% end %>
+</div>

data/lib/tailwindcss/commands.rb

@@ -1,81 +1,11 @@
-require_relative "upstream"
+require "tailwindcss/ruby"
 
 module Tailwindcss
   module Commands
-    DEFAULT_DIR = File.expand_path(File.join(__dir__, "..", "..", "exe"))
-    GEM_NAME = "tailwindcss-rails"
-
-    # raised when the host platform is not supported by upstream tailwindcss's binary releases
-    class UnsupportedPlatformException < StandardError
-    end
-
-    # raised when the tailwindcss executable could not be found where we expected it to be
-    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: 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?(Gem::Platform.new(p), GEM_NAME) }
-            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?(Gem::Platform.new(File.basename(File.dirname(f))), GEM_NAME)
-          end
-        end
-
-        if exe_file.nil? || !File.exist?(exe_file)
-          raise ExecutableNotFoundException, <<~MESSAGE
-            Cannot find the tailwindcss executable for #{platform} in #{exe_path}
-
-            If you're using bundler, please make sure you're on the latest bundler version:
-
-                gem install bundler
-                bundle update --bundler
-
-            Then make sure your lock file includes this platform by running:
-
-                bundle lock --add-platform #{platform}
-                bundle install
-
-            See `bundle lock --help` output for details.
-
-            If you're still seeing this message after taking those steps, try running
-            `bundle config` and ensure `force_ruby_platform` isn't set to `true`. See
-            https://github.com/rails/tailwindcss-rails#check-bundle_force_ruby_platform
-            for more details.
-          MESSAGE
-        end
-
-        exe_file
-      end
-
       def compile_command(debug: false, **kwargs)
         command = [
-          executable(**kwargs),
+          Tailwindcss::Ruby.executable(**kwargs),
           "-i", Rails.root.join("app/assets/stylesheets/application.tailwind.css").to_s,
           "-o", Rails.root.join("app/assets/builds/tailwind.css").to_s,
           "-c", Rails.root.join("config/tailwind.config.js").to_s,

data/lib/tailwindcss/upstream.rb

@@ -1,17 +1,6 @@
 module Tailwindcss
-  # constants describing the upstream tailwindcss project
   module Upstream
-    VERSION = "v3.4.13"
-
-    # rubygems platform name => upstream release filename
-    NATIVE_PLATFORMS = {
-      "arm64-darwin" => "tailwindcss-macos-arm64",
-      "x64-mingw32" => "tailwindcss-windows-x64.exe",
-      "x64-mingw-ucrt" => "tailwindcss-windows-x64.exe",
-      "x86_64-darwin" => "tailwindcss-macos-x64",
-      "x86_64-linux" => "tailwindcss-linux-x64",
-      "aarch64-linux" => "tailwindcss-linux-arm64",
-      "arm-linux" => "tailwindcss-linux-armv7",
-    }
+    VERSION = Tailwindcss::Ruby::Upstream::VERSION
+    deprecate_constant :VERSION
   end
 end

data/lib/tailwindcss/version.rb

@@ -1,3 +1,3 @@
 module Tailwindcss
-  VERSION = "2.7.6"
+  VERSION = "3.0.0.rc1"
 end

data/lib/tailwindcss-rails.rb

@@ -1,7 +1,6 @@
 module Tailwindcss
 end
 
-require_relative "tailwindcss/upstream"
 require_relative "tailwindcss/version"
 require_relative "tailwindcss/engine"
 require_relative "tailwindcss/commands"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tailwindcss-rails
 version: !ruby/object:Gem::Version
-  version: 2.7.6
+  version: 3.0.0.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire:
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2024-09-23 00:00:00.000000000 Z
+date: 2024-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -24,11 +24,23 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 7.0.0
-  force_ruby_platform: false
+- !ruby/object:Gem::Dependency
+  name: tailwindcss-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description:
 email: david@loudthinking.com
-executables:
-- tailwindcss
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
@@ -52,8 +64,10 @@ files:
 - app/assets/fonts/Inter-roman.symbols.var.woff2
 - app/assets/fonts/Inter-roman.vietnamese.var.woff2
 - app/assets/stylesheets/inter-font.css
-- exe/tailwindcss
 - lib/generators/tailwindcss/authentication/authentication_generator.rb
+- lib/generators/tailwindcss/authentication/templates/app/views/passwords/edit.html.erb
+- lib/generators/tailwindcss/authentication/templates/app/views/passwords/new.html.erb
+- lib/generators/tailwindcss/authentication/templates/app/views/sessions/new.html.erb
 - lib/generators/tailwindcss/authentication/templates/views/passwords/edit.html.erb
 - lib/generators/tailwindcss/authentication/templates/views/passwords/new.html.erb
 - lib/generators/tailwindcss/authentication/templates/views/sessions/new.html.erb

data/exe/tailwindcss

@@ -1,19 +0,0 @@
-#! /usr/bin/env ruby
-# because rubygems shims assume a gem's executables are Ruby
-
-require "tailwindcss/commands"
-
-begin
-  command = [Tailwindcss::Commands.executable, *ARGV]
-  puts command.inspect
-  if Gem.win_platform?
-    # use system rather than exec as exec inexplicably fails to find the executable on Windows
-    # see related https://github.com/rubys/sprockets-esbuild/pull/4
-    system(*command, exception: true)
-  else
-    exec(*command)
-  end
-rescue Tailwindcss::Commands::UnsupportedPlatformException, Tailwindcss::Commands::ExecutableNotFoundException => e
-  STDERR.puts("ERROR: " + e.message)
-  exit 1
-end