tailwindcss-rails 0.4.2 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f354ae7802c5744ba28ece4ee53ca032f49b0b38fa97376f6ab910a3ba33744
-  data.tar.gz: e69831fa1b30f18c1eb11758966dbe52c057e745e8d47b82c890afe62f628535
+  metadata.gz: 19280c4f676908c3a3819db3bcdb348b1d89e9dd68f564e86c99919d9ca89bb1
+  data.tar.gz: 2d75756def5ae852f39aa0c4a071e4f2ff8ba13551eec23061e47a18ccdd9767
 SHA512:
-  metadata.gz: 33fdc4ca096f78935fc9ba17a884971fbf51e3e45ff439dfd09eb50c2c8b78e49a39fb55aae1d1fe7124817ce69f1fd9651b458616ddc08bda3a1ac12e8aec62
-  data.tar.gz: a2052365bc20ef8fae2017cce0f9a4c6fa7ab94b95ca087e62b8d7051cee3632d51815e8db71fac0a2f9278130f72d3fbc8e6cf8b3ba2c75224eb1b758d02451
+  metadata.gz: 3d1a3120bff3b14c7542afd84cab974c78b3b001080ff32c283c15c6cb587815e5c4b300a2fb444bee2842811f98d02974baa5f5de88848e1f8fbe5b39798198
+  data.tar.gz: c1b35bc72938e1e344566b7f89af998fdb1dd7df74e9f911888ce87b0fcaec79ffb5ce39a2e423d9000ef3599f272a6ff027e49015bb8aafefede11bdf9a95fd

data/README.md

@@ -2,7 +2,9 @@
 
 [Tailwind CSS](https://tailwindcss.com) is a utility-first CSS framework packed with classes like flex, pt-4, text-center and rotate-90 that can be composed to build any design, directly in your markup.
 
-This gem gives access to the standard Tailwind CSS framework configured for dark mode, forms, aspect-ratio, typography, and the Inter font via the asset pipeline using Sprockets. If you need to customize Tailwind, you will need to install it the traditional way using [Webpacker](https://github.com/rails/webpacker) instead or use webpacker port of this gem [tailwindcss-rails-webpacker](https://github.com/WizardComputer/tailwindcss-rails-webpacker).
+This gem gives access to the standard Tailwind CSS framework configured for dark mode, forms, aspect-ratio, typography, and the Inter font via the asset pipeline using Sprockets (and soon [Propshaft](https://github.com/rails/propshaft)). 
+
+If you need to customize Tailwind, you will need to install it under a full JavaScript bundling setup, such as [cssbundling-rails](https://github.com/rails/cssbundling-rails). This gem was specifically designed not to require a Node.js environment. If you're already using such an environment, you won't need this gem.
 
 Production-mode purging of unused css class names is provided by a Sprockets compressor built into this gem. This compressor ensures that only the css classes used by files in `app/views` and `app/helpers` are included. In development mode, the full 7mb+ Tailwind stylesheet is loaded.
 
@@ -53,7 +55,7 @@ The Tailwind CSS main file that's being used before purging consists of these ve
 * @tailwindcss/forms 0.3.3
 * @tailwindcss/typography 0.4.1
 * autoprefixer 10.3.1
-* tailwindcss 2.2.7
+* tailwindcss 2.2.15
 
 
 ## License

data/app/assets/stylesheets/tailwind.css

@@ -1,4 +1,4 @@
-/*! tailwindcss v2.2.7 | MIT License | https://tailwindcss.com */
+/*! tailwindcss v2.2.19 | MIT License | https://tailwindcss.com */
 
 /*! modern-normalize v1.1.0 | MIT License | https://github.com/sindresorhus/modern-normalize */
 
@@ -475,6 +475,18 @@ button,
   cursor: pointer;
 }
 
+/**
+ * Override legacy focus reset from Normalize with modern Firefox focus styles.
+ *
+ * This is actually an improvement over the new defaults in Firefox in our testing,
+ * as it triggers the better focus styles even for links, which still use a dotted
+ * outline in Firefox by default.
+ */
+
+:-moz-focusring {
+  outline: auto;
+}
+
 table {
   border-collapse: collapse;
 }

data/lib/generators/tailwindcss/controller/controller_generator.rb

@@ -0,0 +1,9 @@
+require "rails/generators/erb/controller/controller_generator"
+
+module Tailwindcss
+  module Generators
+    class ControllerGenerator < Erb::Generators::ControllerGenerator
+      source_root File.expand_path("../templates", __FILE__)
+    end
+  end
+end

data/lib/generators/tailwindcss/controller/templates/view.html.erb.tt

@@ -0,0 +1,4 @@
+<div>
+  <h1 class="text-lg font-bold text-4xl"><%= class_name %>#<%= @action %></h1>
+  <p>Find me in <%= @path %></p>
+</div>

data/lib/generators/tailwindcss/mailer/mailer_generator.rb

@@ -0,0 +1,9 @@
+require "rails/generators/erb/mailer/mailer_generator"
+
+module Tailwindcss
+  module Generators
+    class MailerGenerator < Erb::Generators::MailerGenerator
+      source_root File.expand_path("../templates", __FILE__)
+    end
+  end
+end

data/lib/generators/tailwindcss/mailer/templates/view.html.erb.tt

@@ -0,0 +1,5 @@
+<h1><%= class_name %>#<%= @action %></h1>
+
+<p>
+  <%%= @greeting %>, find me in <%= @path %>
+</p>

data/lib/generators/tailwindcss/mailer/templates/view.text.erb.tt

@@ -0,0 +1,3 @@
+<%= class_name %>#<%= @action %>
+
+<%%= @greeting %>, find me in <%= @path %>

data/lib/generators/tailwindcss/scaffold/scaffold_generator.rb

@@ -0,0 +1,34 @@
+require 'rails/generators/erb/scaffold/scaffold_generator'
+require "rails/generators/resource_helpers"
+
+module Tailwindcss
+  module Generators
+    class ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
+      include Rails::Generators::ResourceHelpers
+
+      source_root File.expand_path("../templates", __FILE__)
+
+      argument :attributes, type: :array, default: [], banner: "field:type field:type"
+
+      def create_root_folder
+        empty_directory File.join("app/views", controller_file_path)
+      end
+
+      def copy_view_files
+        available_views.each do |view|
+          formats.each do |format|
+            filename = filename_with_extensions(view, format)
+            template filename, File.join("app/views", controller_file_path, filename)
+          end
+        end
+
+        template "partial.html.erb", File.join("app/views", controller_file_path, "_#{singular_table_name}.html.erb")
+      end
+
+      private
+        def available_views
+          %w(index edit show new _form)
+        end
+    end
+  end
+end

data/lib/generators/tailwindcss/scaffold/templates/_form.html.erb.tt

@@ -0,0 +1,43 @@
+<%%= form_with(model: <%= model_resource_name %>, class: "contents") do |form| %>
+  <%% if <%= singular_table_name %>.errors.any? %>
+    <div id="error_explanation" class="bg-red-50 text-red-500 px-3 py-2 font-medium rounded-lg mt-3">
+      <h2><%%= pluralize(<%= singular_table_name %>.errors.count, "error") %> prohibited this <%= singular_table_name %> from being saved:</h2>
+
+      <ul>
+        <%% <%= singular_table_name %>.errors.each do |error| %>
+          <li><%%= error.full_message %></li>
+        <%% end %>
+      </ul>
+    </div>
+  <%% end %>
+
+<% attributes.each do |attribute| -%>
+  <div class="my-5">
+<% if attribute.password_digest? -%>
+    <%%= form.label :password %>
+    <%%= form.password_field :password %>
+</div>
+
+<div class="my-5">
+    <%%= form.label :password_confirmation %>
+    <%%= form.password_field :password_confirmation, class: "block shadow rounded-md border border-gray-200 outline-none px-3 py-2 mt-2 w-full" %>
+<% elsif attribute.attachments? -%>
+    <%%= form.label :<%= attribute.column_name %> %>
+    <%%= form.<%= attribute.field_type %> :<%= attribute.column_name %>, multiple: true, class: "block shadow rounded-md border border-gray-200 outline-none px-3 py-2 mt-2 w-full" %>
+<% else -%>
+    <%%= form.label :<%= attribute.column_name %> %>
+<% if attribute.field_type == :text_area -%>
+    <%%= form.<%= attribute.field_type %> :<%= attribute.column_name %>, rows: 4, class: "block shadow rounded-md border border-gray-200 outline-none px-3 py-2 mt-2 w-full" %>
+<% elsif attribute.field_type == :check_box -%>
+    <%%= form.<%= attribute.field_type %> :<%= attribute.column_name %>, class: "block mt-2 h-5 w-5" %>
+<% else -%>
+    <%%= form.<%= attribute.field_type %> :<%= attribute.column_name %>, class: "block shadow rounded-md border border-gray-200 outline-none px-3 py-2 mt-2 w-full" %>
+<% end -%>
+<% end -%>
+  </div>
+
+<% end -%>
+  <div class="inline">
+    <%%= form.submit class: "rounded-lg py-3 px-5 bg-blue-600 text-white inline-block font-medium cursor-pointer" %>
+  </div>
+<%% end %>

data/lib/generators/tailwindcss/scaffold/templates/edit.html.erb.tt

@@ -0,0 +1,8 @@
+<div class="mx-auto md:w-2/3 w-full">
+  <h1 class="font-bold text-4xl">Editing <%= human_name.downcase %></h1>
+
+  <%%= render "form", <%= singular_table_name %>: @<%= singular_table_name %> %>
+
+  <%%= link_to "Show this <%= human_name.downcase %>", @<%= singular_table_name %>, class: "ml-2 rounded-lg py-3 px-5 bg-gray-100 inline-block font-medium" %>
+  <%%= link_to "Back to <%= human_name.pluralize.downcase %>", <%= index_helper %>_path, class: "ml-2 rounded-lg py-3 px-5 bg-gray-100 inline-block font-medium" %>
+</div>

data/lib/generators/tailwindcss/scaffold/templates/index.html.erb.tt

@@ -0,0 +1,14 @@
+<div class="w-full">
+  <%% if notice.present? %>
+    <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 %>
+
+  <div class="flex justify-between items-center">
+    <h1 class="text-lg font-bold text-4xl"><%= human_name.pluralize %></h1>
+    <%%= link_to 'New <%= human_name.downcase %>', new_<%= singular_route_name %>_path, class: "rounded-lg py-3 px-5 bg-blue-600 text-white block font-medium" %>
+  </div>
+
+  <div id="<%= plural_table_name %>" class="min-w-full">
+    <%%= render @<%= plural_table_name %> %>
+  </div>
+</div>

data/lib/generators/tailwindcss/scaffold/templates/new.html.erb.tt

@@ -0,0 +1,7 @@
+<div class="mx-auto md:w-2/3 w-full">
+  <h1 class="text-lg font-bold text-4xl">New <%= human_name.downcase %></h1>
+
+  <%%= render "form", <%= singular_table_name %>: @<%= singular_table_name %> %>
+
+  <%%= link_to 'Back to <%= human_name.pluralize.downcase %>', <%= index_helper %>_path, class: "ml-2 rounded-lg py-3 px-5 bg-gray-100 inline-block font-medium" %>
+</div>

data/lib/generators/tailwindcss/scaffold/templates/partial.html.erb.tt

@@ -0,0 +1,22 @@
+<div id="<%%= dom_id <%= singular_table_name %> %>">
+<% attributes.reject(&:password_digest?).each do |attribute| -%>
+  <p class="my-5">
+    <strong class="block font-medium mb-1"><%= attribute.human_name %>:</strong>
+<% if attribute.attachment? -%>
+    <%%= link_to <%= singular_table_name %>.<%= attribute.column_name %>.filename, <%= singular_table_name %>.<%= attribute.column_name %> if <%= singular_table_name %>.<%= attribute.column_name %>.attached? %>
+<% elsif attribute.attachments? -%>
+    <%% <%= singular_table_name %>.<%= attribute.column_name %>.each do |<%= attribute.singular_name %>| %>
+      <div><%%= link_to <%= attribute.singular_name %>.filename, <%= attribute.singular_name %> %></div>
+    <%% end %>
+<% else -%>
+    <%%= <%= singular_table_name %>.<%= attribute.column_name %> %>
+<% end -%>
+  </p>
+
+<% end -%>
+  <%% if action_name != "show" %>
+    <%%= link_to "Show this <%= human_name.downcase %>", <%= singular_table_name %>, class: "rounded-lg py-3 px-5 bg-gray-100 inline-block font-medium" %>
+    <%%= link_to 'Edit this <%= human_name.downcase %>', edit_<%= singular_table_name %>_path(<%= singular_table_name %>), class: "rounded-lg py-3 ml-2 px-5 bg-gray-100 inline-block font-medium" %>
+    <hr class="mt-6">
+  <%% end %>
+</div>

data/lib/generators/tailwindcss/scaffold/templates/show.html.erb.tt

@@ -0,0 +1,15 @@
+<div class="mx-auto md:w-2/3 w-full flex">
+  <div class="mx-auto">
+    <%% if notice.present? %>
+      <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 %>
+
+    <%%= render @<%= singular_table_name %> %>
+
+    <%%= link_to 'Edit this <%= singular_table_name %>', edit_<%= singular_table_name %>_path(@<%= singular_table_name %>), class: "mt-2 rounded-lg py-3 px-5 bg-gray-100 inline-block font-medium" %>
+    <div class="inline-block ml-2">
+      <%%= button_to 'Delete this <%= singular_table_name %>', <%= singular_table_name %>_path(@<%= singular_table_name %>), method: :delete, data: { confirm: "Are you sure you want to delete this <%= singular_table_name %>?" }, class: "mt-2 rounded-lg py-3 px-5 bg-gray-100 font-medium" %>
+    </div>
+    <%%= link_to 'Back to <%= plural_table_name %>', <%= index_helper %>_path, class: "ml-2 rounded-lg py-3 px-5 bg-gray-100 inline-block font-medium" %>
+  </div>
+</div>

data/lib/install/tailwindcss.rb

@@ -1,15 +1,22 @@
 APPLICATION_LAYOUT_PATH = Rails.root.join("app/views/layouts/application.html.erb")
 
 if APPLICATION_LAYOUT_PATH.exist?
-  say "Add Tailwindcss include tags in application layout"
-  insert_into_file Rails.root.join("app/views/layouts/application.html.erb").to_s, %(\n    <%= stylesheet_link_tag "inter-font" %>\n    <%= stylesheet_link_tag "tailwind" %>), before: /^\s*<%= stylesheet_link_tag/
+  say "Add Tailwindcss include tags and container element in application layout"
+  insert_into_file APPLICATION_LAYOUT_PATH.to_s, <<~ERB.indent(4), before: /^\s*<%= stylesheet_link_tag/
+    <%= stylesheet_link_tag "inter-font", "data-turbo-track": "reload" %>
+    <%= stylesheet_link_tag "tailwind", "data-turbo-track": "reload" %>
+  ERB
+  insert_into_file APPLICATION_LAYOUT_PATH.to_s, %(    <main class="container mx-auto mt-28 px-5 flex">\n  ), before: /^\s*<%= yield/
+  insert_into_file APPLICATION_LAYOUT_PATH.to_s, %(\n    </main>),  after: /^\s*<%= yield %>/
 else
   say "Default application.html.erb is missing!", :red
-  say %(        Add <%= stylesheet_link_tag "inter-font" %> and <%= stylesheet_link_tag "tailwind" %> within the <head> tag in your custom layout.)
+  say %(        Add <%= stylesheet_link_tag "inter-font", "data-turbo-track": "reload" %> and <%= stylesheet_link_tag "tailwind", "data-turbo-track": "reload" %> within the <head> tag in your custom layout.)
 end
 
-say "Removing scaffold styles"
-remove_file Rails.root.join("app/assets/stylesheets/scaffolds.scss")
+# No longer included by default in Rails 7, but for earlier versions of Rails
+if (scaffolds_css_path = Rails.root.join("app/assets/stylesheets/scaffolds.scss")).exist?
+  remove_file scaffolds_css_path
+end
 
 say "Turn on purging of unused css classes in production"
 gsub_file Rails.root.join("config/environments/production.rb"), /^\s+#?\s+config.assets.css_compressor =.*$/, %(  config.assets.css_compressor = :purger)

data/lib/tailwindcss/compressor.rb

@@ -10,8 +10,8 @@ class Tailwindcss::Compressor
   end
 
   def initialize(options = {})
-    @options = { 
-      files_with_class_names: Rails.root.glob("app/views/**/*.*") + Rails.root.glob("app/helpers/**/*.rb"),
+    @options = {
+      files_with_class_names: files_with_class_names,
       only_purge: %w[ tailwind ]
     }.merge(options).freeze
   end
@@ -23,4 +23,11 @@ class Tailwindcss::Compressor
       input[:data]
     end
   end
+
+  private
+    def files_with_class_names
+      Rails.root.glob("app/views/**/*.*") +
+        Rails.root.glob("app/helpers/**/*.rb") +
+        Rails.root.glob("app/javascript/**/*.js")
+    end
 end

data/lib/tailwindcss/engine.rb

@@ -19,5 +19,9 @@ module Tailwindcss
         env.cache = ActiveSupport::Cache.lookup_store(:null_store)
       end if Rails.env.production?
     end
+
+     config.app_generators do |g|
+       g.template_engine :tailwindcss
+     end
   end
 end

data/lib/tailwindcss/version.rb

@@ -1,3 +1,3 @@
 module Tailwindcss
-  VERSION = "0.4.2"
+  VERSION = "0.5.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tailwindcss-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.2
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-23 00:00:00.000000000 Z
+date: 2021-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -51,6 +51,18 @@ files:
 - app/assets/fonts/Inter-roman.vietnamese.var.woff2
 - app/assets/stylesheets/inter-font.css.erb
 - app/assets/stylesheets/tailwind.css
+- lib/generators/tailwindcss/controller/controller_generator.rb
+- lib/generators/tailwindcss/controller/templates/view.html.erb.tt
+- lib/generators/tailwindcss/mailer/mailer_generator.rb
+- lib/generators/tailwindcss/mailer/templates/view.html.erb.tt
+- lib/generators/tailwindcss/mailer/templates/view.text.erb.tt
+- lib/generators/tailwindcss/scaffold/scaffold_generator.rb
+- lib/generators/tailwindcss/scaffold/templates/_form.html.erb.tt
+- lib/generators/tailwindcss/scaffold/templates/edit.html.erb.tt
+- lib/generators/tailwindcss/scaffold/templates/index.html.erb.tt
+- lib/generators/tailwindcss/scaffold/templates/new.html.erb.tt
+- lib/generators/tailwindcss/scaffold/templates/partial.html.erb.tt
+- lib/generators/tailwindcss/scaffold/templates/show.html.erb.tt
 - lib/install/tailwindcss.rb
 - lib/tailwindcss-rails.rb
 - lib/tailwindcss/compressor.rb
@@ -78,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Integrate Tailwind CSS with the asset pipeline in Rails.