avo 4.0.0.beta.8 → 4.0.0.beta.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1948f12db4331c8c5d26b0e3530e612f327612747f71b34dd57b9462c44bd8a5
-  data.tar.gz: 5a808757824d134aa507c59b0b704a59f391b3cf030b91b16f95fd9fb5f7c2f4
+  metadata.gz: d7bb9ffa2cd3c5a806ae93744aabedf20ed7bfbfc7c09b734e1973057c4c300a
+  data.tar.gz: 273595927329c2794204091e46ca6a27a567f43b3108cecad8daee853312a16e
 SHA512:
-  metadata.gz: 437a8176795c24f5173118886a4c1d2d94afd8ad7c76d911879d8c8f1fd63c220ad2845b5388c3dbe1e0da6f377605353589d2d263fdd64e5eef845b06a8f5ca
-  data.tar.gz: e4adc4d4475a6a9604a01377cad9fa5163a68bcf3ac6704d88f6d98590ed2142555db5d0def4faee8c6b8c9713af8ee278a1dccd076ed6fd7e5c53487c642db1
+  metadata.gz: 856ad33301d2f0856386fff262098011987bdb20ff48be5c94a887b3d11617eb23cb0d8678ce5f2c90126c2a040be804c38b8143cdd4fcfe21a022caf0d59f55
+  data.tar.gz: 3c03d9f202c4cfc0e77521fb29de67e3b21cd36040b2ea9c01b169b475a0a5f2b23551d22b8e7d840c0ee5722bdff4b67cad93b6101c87b2a579987c8e8bf7fd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (4.0.0.beta.8)
+    avo (4.0.0.beta.9)
       actionview (>= 6.1)
       active_link_to
       activerecord (>= 6.1)

data/app/controllers/avo/base_application_controller.rb

@@ -296,14 +296,8 @@ module Avo
     end
 
     def set_stylesheet_assets_path
-      # TODO: handle this differently maybe?
-      # We'll definitely have to change it on TW4
-      # Prefer the user's tailwind config if it exists, otherwise use the default one from Avo
-      @stylesheet_assets_path = if Rails.root.join("config", "avo", "tailwind.config.js").exist?
-        "avo.tailwind"
-      else
-        "avo/application"
-      end
+      @stylesheet_assets_path = "avo/application"
+      @custom_stylesheet_path = "avo.tailwind" if Avo::TailwindBuilder.custom_build_exists?
     end
 
     def choose_layout

data/app/views/layouts/avo/application.html.erb

@@ -18,6 +18,9 @@
     <%= render partial: "avo/partials/pre_head" %>
     <%= render Avo::AssetManager::StylesheetComponent.new asset_manager: Avo.asset_manager %>
     <%= stylesheet_link_tag @stylesheet_assets_path, "data-turbo-track": "reload", as: "style" %>
+    <% if @custom_stylesheet_path %>
+      <%= stylesheet_link_tag @custom_stylesheet_path, "data-turbo-track": "reload", as: "style" %>
+    <% end %>
 
     <%= javascript_include_tag "avo/application", "data-turbo-track": "reload", defer: true %>
 

data/lib/avo/engine.rb

@@ -29,7 +29,6 @@ module Avo
     isolate_namespace Avo
 
     rake_tasks do
-      # Ensure Avo tasks are loaded
       load File.expand_path("../tasks/avo_tasks.rake", __dir__)
 
       if ENV["BUILD_AVO_ASSETS"] == "true"
@@ -37,6 +36,30 @@ module Avo
           Rake::Task["assets:precompile"].enhance(["avo:build"])
         end
       end
+
+      if Avo::TailwindBuilder.tailwindcss_available? && Rake::Task.task_defined?("assets:precompile")
+        Rake::Task["assets:precompile"].enhance(["avo:tailwindcss:build"])
+      end
+    end
+
+    initializer "avo.tailwindcss", after: :load_config_initializers do
+      next unless Rails.env.development?
+
+      Rails.application.config.after_initialize do
+        next unless Avo::TailwindBuilder.tailwindcss_available?
+
+        begin
+          unless Avo::TailwindBuilder.build
+            Rails.logger.warn "Avo: Custom Tailwind CSS auto-build failed (run bin/rails avo:tailwindcss:build for details)."
+          end
+        rescue StandardError => e
+          Rails.logger.warn "Avo: Failed to auto-build Tailwind CSS: #{e.message}"
+        end
+
+        unless Avo::TailwindBuilder.procfile_has_avo_tailwind_watcher?
+          Rails.logger.info "Avo: For live Tailwind CSS reload in development, add to Procfile.dev: avo_css: bin/rails avo:tailwindcss:watch"
+        end
+      end
     end
 
     config.after_initialize do

data/lib/avo/tailwind_builder.rb

@@ -0,0 +1,147 @@
+require "fileutils"
+
+module Avo
+  class TailwindBuilder
+    def self.build
+      new.build
+    end
+
+    def self.watch
+      new.watch
+    end
+
+    def self.tailwindcss_available?
+      require "tailwindcss/ruby"
+      true
+    rescue LoadError
+      false
+    end
+
+    def self.custom_build_exists?
+      return false unless defined?(Rails)
+
+      Rails.root.join("app", "assets", "builds", "avo.tailwind.css").exist?
+    end
+
+    def self.procfile_has_avo_tailwind_watcher?
+      path = Rails.root.join("Procfile.dev")
+      return false unless path.exist?
+
+      File.read(path).include?("avo:tailwindcss")
+    end
+
+    def build
+      return true unless self.class.tailwindcss_available?
+
+      generate_input_file
+      success = run_tailwindcss("--minify")
+      log_build_failure unless success
+      success
+    end
+
+    def watch
+      return unless self.class.tailwindcss_available?
+
+      generate_input_file
+      signature = host_avo_stylesheets_signature
+
+      pid = spawn_tailwindcss("--minify", "--watch")
+
+      begin
+        loop do
+          _, status = Process.waitpid2(pid, Process::WNOHANG)
+          break if status
+
+          new_signature = host_avo_stylesheets_signature
+          if new_signature != signature
+            signature = new_signature
+            generate_input_file
+          end
+
+          sleep 1
+        end
+      rescue Interrupt
+        Process.kill("TERM", pid)
+        raise
+      end
+    end
+
+    private
+
+    def tmp_input_dir
+      Rails.root.join("tmp", "avo")
+    end
+
+    def input_path
+      tmp_input_dir.join("avo.tailwind.input.css")
+    end
+
+    def output_path
+      Rails.root.join("app", "assets", "builds", "avo.tailwind.css")
+    end
+
+    def generate_input_file
+      FileUtils.mkdir_p(tmp_input_dir)
+
+      lines = []
+      # Input lives under tmp/avo/; without `source("../../")` Tailwind v4 only scans near this file, so
+      # classes in app/views/**/*.erb (and the rest of the app) are never detected.
+      lines << %(@import "tailwindcss" source("../../");)
+      collect_host_avo_stylesheets.each do |path|
+        lines << %(@import "#{path}";)
+      end
+
+      File.write(input_path, lines.join("\n") + "\n")
+    end
+
+    def collect_host_avo_stylesheets
+      base = Rails.root.join("app", "assets", "stylesheets", "avo")
+      return [] unless Dir.exist?(base)
+
+      Dir
+        .glob(base.join("**", "*.css"))
+        .select { |path| File.file?(path) }
+        .sort
+        .map { |path| Pathname.new(path).relative_path_from(tmp_input_dir).to_s.tr("\\", "/") }
+    end
+
+    def host_avo_stylesheets_signature
+      collect_host_avo_stylesheets.join("\n")
+    end
+
+    def run_tailwindcss(*args)
+      require "tailwindcss/ruby"
+
+      FileUtils.mkdir_p(output_path.dirname)
+
+      Dir.chdir(Rails.root) do
+        Kernel.system(
+          Tailwindcss::Ruby.executable,
+          "-i", input_path.to_s,
+          "-o", output_path.to_s,
+          *args
+        )
+      end
+    end
+
+    def spawn_tailwindcss(*args)
+      require "tailwindcss/ruby"
+
+      FileUtils.mkdir_p(output_path.dirname)
+
+      Process.spawn(
+        Tailwindcss::Ruby.executable,
+        "-i", input_path.to_s,
+        "-o", output_path.to_s,
+        *args,
+        chdir: Rails.root.to_s
+      )
+    end
+
+    def log_build_failure
+      message = "[Avo] avo:tailwindcss build failed."
+      Rails.logger.warn(message) if defined?(Rails) && Rails.logger
+      warn message
+    end
+  end
+end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "4.0.0.beta.8" unless const_defined?(:VERSION)
+  VERSION = "4.0.0.beta.9" unless const_defined?(:VERSION)
 end

data/lib/avo.rb

@@ -2,6 +2,7 @@ require "zeitwerk"
 require "net/http"
 require "active_support/inflector"
 require_relative "avo/version"
+require_relative "avo/tailwind_builder"
 require_relative "avo/engine" if defined?(Rails)
 
 loader = Zeitwerk::Loader.for_gem

data/lib/tasks/avo_tasks.rake

@@ -141,3 +141,26 @@ task "avo:yarn_install" do
   puts "[Avo->] Adding yarn dependencies"
   `yarn add tailwindcss@^4.0.0 @tailwindcss/typography@^0.5.16 @tailwindcss/container-queries@^0.1.1 --cwd #{Avo::Engine.root}`
 end
+
+desc "Build Avo custom Tailwind CSS"
+task "avo:tailwindcss:build" => :environment do
+  unless Avo::TailwindBuilder.tailwindcss_available?
+    puts "[Avo->] tailwindcss-rails not found; skipping avo:tailwindcss:build"
+    next
+  end
+
+  puts "[Avo->] Building Avo Tailwind CSS extension (avo.tailwind)..."
+  unless Avo::TailwindBuilder.build
+    abort "[Avo->] avo:tailwindcss:build failed"
+  end
+end
+
+desc "Watch and rebuild Avo custom Tailwind CSS on changes"
+task "avo:tailwindcss:watch" => :environment do
+  unless Avo::TailwindBuilder.tailwindcss_available?
+    abort "[Avo->] tailwindcss-rails not found; add tailwindcss-rails to your Gemfile to use avo:tailwindcss:watch"
+  end
+
+  puts "[Avo->] Watching Avo Tailwind CSS extension..."
+  Avo::TailwindBuilder.watch
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta.8
+  version: 4.0.0.beta.9
 platform: ruby
 authors:
 - Adrian Marin
@@ -1044,6 +1044,7 @@ files:
 - lib/avo/services/hq_reporter.rb
 - lib/avo/services/telemetry_service.rb
 - lib/avo/services/uri_service.rb
+- lib/avo/tailwind_builder.rb
 - lib/avo/test_helpers.rb
 - lib/avo/tools/tool_manager.rb
 - lib/avo/u_i_instance.rb
@@ -1069,7 +1070,6 @@ files:
 - lib/generators/avo/resource_generator.rb
 - lib/generators/avo/resource_tool_generator.rb
 - lib/generators/avo/scope_generator.rb
-- lib/generators/avo/tailwindcss/install_generator.rb
 - lib/generators/avo/templates/action.tt
 - lib/generators/avo/templates/cards/chartkick_card.tt
 - lib/generators/avo/templates/cards/chartkick_card_sample.tt
@@ -1119,9 +1119,6 @@ files:
 - lib/generators/avo/templates/resource_tools/partial.tt
 - lib/generators/avo/templates/resource_tools/resource_tool.tt
 - lib/generators/avo/templates/scope.tt
-- lib/generators/avo/templates/tailwindcss/Procfile.dev
-- lib/generators/avo/templates/tailwindcss/avo.tailwind.css
-- lib/generators/avo/templates/tailwindcss/tailwind.config.js
 - lib/generators/avo/templates/tool/controller.tt
 - lib/generators/avo/templates/tool/sidebar_item.tt
 - lib/generators/avo/templates/tool/view.tt
@@ -1130,7 +1127,6 @@ files:
 - lib/generators/model_generator.rb
 - lib/generators/rails/avo_resource_generator.rb
 - lib/tasks/avo_tasks.rake
-- lib/tasks/tailwindcss_rails.rake
 - public/avo-assets/avo.base.css
 - public/avo-assets/avo.base.js
 - public/avo-assets/avo.base.js.map

data/lib/generators/avo/tailwindcss/install_generator.rb

@@ -1,110 +0,0 @@
-require_relative "../base_generator"
-
-module Generators
-  module Avo
-    module Tailwindcss
-      class InstallGenerator < BaseGenerator
-        source_root File.expand_path("../templates", __dir__)
-
-        namespace "avo:tailwindcss:install"
-        desc "Add Tailwindcss to your Avo project."
-
-        def create_files
-          unless tailwindcss_installed?
-            say "Installing Tailwindcss"
-            system "./bin/bundle add tailwindcss-rails"
-            system "./bin/rails tailwindcss:install"
-          end
-
-          unless (path = Rails.root.join("config", "avo", "tailwind.config.js")).exist?
-            say "Generating the Avo config file."
-            copy_file template_path("tailwind.config.js"), path
-          end
-
-          unless (path = Rails.root.join("app", "assets", "stylesheets", "avo" ,"avo.tailwind.css")).exist?
-            say "Add default tailwind.css"
-            copy_file template_path("avo.tailwind.css"), path
-          end
-
-          script_name = "avo:tailwindcss"
-          if Rails.root.join("Procfile.dev").exist?
-            say "Add #{cmd = "avo_css: yarn #{script_name} --watch"} to Procfile.dev"
-            append_to_file "Procfile.dev", "\n#{cmd}\n"
-          else
-            say "Add default Procfile.dev"
-            copy_file template_path("Procfile.dev"), "Procfile.dev"
-
-            say "Ensure foreman is installed"
-            run "gem install foreman"
-          end
-
-          script_command = "tailwindcss -i ./app/assets/stylesheets/avo/avo.tailwind.css -o ./app/assets/builds/avo.tailwind.css -c ./config/avo/tailwind.config.js --minify"
-          pretty_script_command = "\"#{script_name}\": \"#{script_command}\""
-
-          if (path = Rails.root.join("package.json")).exist?
-            say "Add #{pretty_script_command} to package.json"
-            json_data = JSON.parse(File.read(path))
-            json_data["scripts"] ||= {}
-            json_data["scripts"][script_name] = script_command
-
-            File.open(path, 'w') do |file|
-              file.write(JSON.pretty_generate(json_data) + "\n")
-            end
-          else
-            say "package.json not found.", :yellow
-            say "Ensure you have the following script in your package.json file.", :yellow
-            say "\"scripts\": {\n" \
-              "  #{pretty_script_command}\n" \
-            "}", :green
-          end
-
-          rake_enhance = <<~RUBY
-
-            # When running `rake assets:precompile` this is the order of events:
-            # 1 - Task `avo:yarn_install`
-            # 2 - Task `avo:sym_link`
-            # 3 - Cmd  `yarn avo:tailwindcss`
-            # 4 - Task `assets:precompile`
-            Rake::Task["assets:precompile"].enhance(["avo:sym_link"])
-            Rake::Task["avo:sym_link"].enhance(["avo:yarn_install"])
-            Rake::Task["avo:sym_link"].enhance do
-              `yarn avo:tailwindcss`
-            end
-
-          RUBY
-
-          if (path = Rails.root.join("Rakefile")).exist?
-            say "Add #{rake_enhance.strip} to Rakefile"
-            append_to_file path, rake_enhance
-          else
-            say "Rakefile not found.", :yellow
-            say "Ensure you have the following code in your Rakefile file.", :yellow
-            say rake_enhance, :green
-          end
-
-          say "Make sure you run \"bundle exec rake avo:sym_link\" and \"bundle exec rake avo:yarn_install\" before compiling the assets with the \"#{script_name}\" task.", :green
-          if (path = Rails.root.join("bin", "dev")).exist?
-            lines = File.read(path).lines
-
-            # Insert the task after the shebang line (the first line)
-            shebang = lines.first
-            lines[0] = "#{shebang}\nbundle exec rake avo:sym_link\nbundle exec rake avo:yarn_install\n"
-
-
-            File.write(path, lines.join)
-          end
-        end
-
-        no_tasks do
-          def template_path(filename)
-            Pathname.new(__dir__).join("..", "templates", "tailwindcss", filename).to_s
-          end
-
-          def tailwindcss_installed?
-            Rails.root.join("config", "tailwind.config.js").exist? || Rails.root.join("tailwind.config.js").exist?
-          end
-        end
-      end
-    end
-  end
-end

data/lib/generators/avo/templates/tailwindcss/Procfile.dev

@@ -1,2 +0,0 @@
-web: bin/rails server -p 3000
-avo_css: yarn avo:tailwindcss --watch

data/lib/generators/avo/templates/tailwindcss/avo.tailwind.css

@@ -1,13 +0,0 @@
-@import 'tailwindcss';
-/* Have all of Avo's custom and plugins styles available. */
-@import '../../../../tmp/avo/avo.base.css';
-
-/*
-
-@layer components {
-  .btn-primary {
-    @apply py-2 px-4 bg-blue-200;
-  }
-}
-
-*/

data/lib/generators/avo/templates/tailwindcss/tailwind.config.js

@@ -1,5 +0,0 @@
-const avoPreset = require('../../tmp/avo/tailwind.preset.js')
-
-module.exports = {
-  presets: [avoPreset],
-}

data/lib/tasks/tailwindcss_rails.rake

@@ -1,24 +0,0 @@
-# Use the user provided asset or use the default
-ASSET_FILE = ARGV[0] || "app/assets/builds/avo.tailwind.css" unless defined?(ASSET_FILE)
-# Se the tailwindcss-rails package name
-TAILWINDCSS_RAILS = "tailwindcss-rails"  unless defined?(TAILWINDCSS_RAILS)
-
-# Check if tailwindcss-rails is being used
-if Gem.loaded_specs.key? TAILWINDCSS_RAILS
-  # Get the path
-  GEM_PATH = Gem.loaded_specs[TAILWINDCSS_RAILS].full_gem_path
-  # Compose the compile command
-  AVO_TAILWIND_COMPILE_COMMAND = "#{RbConfig.ruby} #{Pathname.new(GEM_PATH)}/exe/tailwindcss -i '#{Rails.root.join("app/assets/stylesheets/avo.tailwind.css")}' -o '#{Rails.root.join(ASSET_FILE)}' -c '#{Rails.root.join("config/tailwind.config.js")}' --minify"
-
-  namespace "avo:tailwindcss" do
-    desc "Build your Tailwind CSS"
-    task :build do
-      system(AVO_TAILWIND_COMPILE_COMMAND, exception: true)
-    end
-
-    desc "Watch and build your Tailwind CSS on file changes"
-    task :watch do
-      system "#{AVO_TAILWIND_COMPILE_COMMAND} -w"
-    end
-  end
-end