tailwindcss-rails 0.2.1 → 0.4.0

data/lib/tailwindcss/engine.rb

@@ -10,6 +10,10 @@ module Tailwindcss
       Rails.application.config.assets.precompile += %w( tailwind.css inter-font.css )
     end
 
+    initializer "tailwindcss.disable_generator_stylesheets" do
+      Rails.application.config.generators.stylesheets = false
+    end
+
     initializer "tailwindcss.disable_assets_cache" do
       Rails.application.config.assets.configure do |env|
         env.cache = ActiveSupport::Cache.lookup_store(:null_store)

data/lib/tailwindcss/purger.rb

@@ -1,8 +1,25 @@
+# frozen_string_literal: true
+
 class Tailwindcss::Purger
-  CLASS_NAME_PATTERN       = /([:A-Za-z0-9_-]+[\.]*[\\\/:A-Za-z0-9_-]*)/
-  OPENING_SELECTOR_PATTERN = /\..*\{/
-  CLOSING_SELECTOR_PATTERN = /\s*\}/
-  NEWLINE = "\n"
+  CLASS_NAME_PATTERN = /[:A-Za-z0-9_-]+[\.]*[\\\/:A-Za-z0-9_-]*/
+
+  CLASS_BREAK = /(?![-_a-z0-9\\])/i # `\b` for class selectors
+
+  COMMENT = /#{Regexp.escape "/*"}.*?#{Regexp.escape "*/"}/m
+  COMMENTS_AND_BLANK_LINES = /\A(?:^#{COMMENT}?[ \t]*(?:\n|\z)|[ \t]*#{COMMENT})+/
+
+  AT_RULE = /@[^{]+/
+  CLASSLESS_SELECTOR_GROUP = /[^.{]+/
+  CLASSLESS_BEGINNING_OF_BLOCK = /\A\s*(?:#{AT_RULE}|#{CLASSLESS_SELECTOR_GROUP})\{\n?/
+
+  SELECTOR_GROUP = /[^{]+/
+  BEGINNING_OF_BLOCK = /\A#{SELECTOR_GROUP}\{\n?/
+
+  PROPERTY_NAME = /[-_a-z0-9]+/i
+  PROPERTY_VALUE = /(?:[^;]|;\S)+/
+  PROPERTIES = /\A(?:\s*#{PROPERTY_NAME}:#{PROPERTY_VALUE};\n?)+/
+
+  END_OF_BLOCK = /\A\s*\}\n?/
 
   attr_reader :keep_these_class_names
 
@@ -12,11 +29,15 @@ class Tailwindcss::Purger
     end
 
     def extract_class_names(string)
-      string.scan(CLASS_NAME_PATTERN).flatten.uniq.sort
+      string.scan(CLASS_NAME_PATTERN).uniq.sort!
     end
 
     def extract_class_names_from(files)
-      Array(files).flat_map { |file| extract_class_names(file.read) }.uniq.sort
+      Array(files).flat_map { |file| extract_class_names(file.read) }.uniq.sort!
+    end
+
+    def escape_class_selector(class_name)
+      class_name.gsub(/\A\d|[^-_a-z0-9]/, '\\\\\0')
     end
   end
 
@@ -25,40 +46,79 @@ class Tailwindcss::Purger
   end
 
   def purge(input)
-    inside_kept_selector = inside_ignored_selector = false
-    output = []
-
-    input.split(NEWLINE).each do |line|
-      case
-      when inside_kept_selector
-        output << line
-        inside_kept_selector = false if line =~ CLOSING_SELECTOR_PATTERN
-      when inside_ignored_selector
-        inside_ignored_selector = false if line =~ CLOSING_SELECTOR_PATTERN
-      when line =~ OPENING_SELECTOR_PATTERN
-        if keep_these_class_names.include? class_name_in(line)
-          output << line
-          inside_kept_selector = true
-        else
-          inside_ignored_selector = true
-        end
-      else
-        output << line
-      end
+    conveyor = Conveyor.new(input)
+
+    until conveyor.done?
+      conveyor.discard(COMMENTS_AND_BLANK_LINES) \
+      or conveyor.conditionally_keep(PROPERTIES) { conveyor.staged_output.last != "" } \
+      or conveyor.conditionally_keep(END_OF_BLOCK) { not conveyor.staged_output.pop } \
+      or conveyor.stage_output(CLASSLESS_BEGINNING_OF_BLOCK) \
+      or conveyor.stage_output(BEGINNING_OF_BLOCK) { |match| purge_beginning_of_block(match.to_s) } \
+      or raise "infinite loop"
     end
 
-    separated_without_empty_lines(output)
+    conveyor.output
   end
 
   private
-    def class_name_in(line)
-      CLASS_NAME_PATTERN.match(line)[1]
-        .remove("\\")
-        .remove(/:(focus|hover)(-within)?/)
-        .remove("::placeholder").remove("::-moz-placeholder").remove(":-ms-input-placeholder")
+    def keep_these_selectors_pattern
+      @keep_these_selectors_pattern ||= begin
+        escaped_classes = @keep_these_class_names.map { |name| Regexp.escape self.class.escape_class_selector(name) }
+        /(?:\A|,)[^.,{]*(?:[.](?:#{escaped_classes.join("|")})#{CLASS_BREAK}[^.,{]*)*(?=[,{])/
+      end
+    end
+
+    def purge_beginning_of_block(string)
+      purged = string.scan(keep_these_selectors_pattern).join
+      unless purged.empty?
+        purged.sub!(/\A,\s*/, "")
+        purged.rstrip!
+        purged << " {\n"
+      end
+      purged
     end
 
-    def separated_without_empty_lines(output)
-      output.reject { |line| line.strip.empty? }.join(NEWLINE)
+    class Conveyor
+      attr_reader :output, :staged_output
+
+      def initialize(input, output = +"")
+        @input = input
+        @output = output
+        @staged_output = []
+      end
+
+      def consume(pattern)
+        match = pattern.match(@input)
+        @input = match.post_match if match
+        match
+      end
+      alias :discard :consume
+
+      def stage_output(pattern)
+        if match = consume(pattern)
+          string = block_given? ? (yield match) : match.to_s
+          @staged_output << string
+          string
+        end
+      end
+
+      def keep(pattern)
+        if match = consume(pattern)
+          string = block_given? ? (yield match) : match.to_s
+          @output << @staged_output.shift until @staged_output.empty?
+          @output << string
+          string
+        end
+      end
+
+      def conditionally_keep(pattern)
+        keep(pattern) do |match|
+          (yield match) ? match.to_s : (break "")
+        end
+      end
+
+      def done?
+        @input.empty?
+      end
     end
 end

data/lib/tailwindcss/version.rb

@@ -1,3 +1,3 @@
 module Tailwindcss
-  VERSION = "0.2.1"
+  VERSION = "0.4.0"
 end

data/lib/tasks/tailwindcss_tasks.rake

@@ -6,13 +6,20 @@ namespace :tailwindcss do
 
   desc "Show the list of class names being kept in Tailwind CSS"
   task :keeping_class_names do
-    puts Tailwindcss::Purger.extract_class_names_from(Rails.root.glob("app/views/**/*.*") + Rails.root.glob("app/helpers/**/*.rb"))
+    puts Tailwindcss::Purger.extract_class_names_from(default_files_with_class_names)
   end
 
   desc "Show Tailwind CSS styles that are left after purging unused class names"
   task :preview_purge do
-    puts Tailwindcss::Purger.purge \
-      Pathname.new(__FILE__).join("../../../app/assets/stylesheets/tailwind.css").read,
-      keeping_class_names_from_files: Rails.root.glob("app/views/**/*.*") + Rails.root.glob("app/helpers/**/*.rb")
+    puts Tailwindcss::Purger.purge tailwind_css, keeping_class_names_from_files: default_files_with_class_names
   end
 end
+
+def default_files_with_class_names
+  Rails.root.glob("app/views/**/*.*") + Rails.root.glob("app/helpers/**/*.rb")
+end
+
+def tailwind_css
+  Pathname.new(__FILE__).join("../../../app/assets/stylesheets/tailwind.css").read
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tailwindcss-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.4.0
 platform: ruby
 authors:
 - David Heinemeier Hansson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-18 00:00:00.000000000 Z
+date: 2021-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,7 +24,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.0.0
-description: 
+description:
 email: david@loudthinking.com
 executables: []
 extensions: []
@@ -63,7 +63,7 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/rails/tailwindcss-rails
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -78,8 +78,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Integrate Tailwind CSS with the asset pipeline in Rails.
 test_files: []