avo 4.0.0.beta.10 → 4.0.0.beta.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 835a34843ba78fc0df7e4c55d9cb5f4dc752695284fae2159cd2f2a986862666
-  data.tar.gz: 478c40506ae5d29a8854e485e6d5aadb4d110f300cdcdb87f6356b145ef0792e
+  metadata.gz: '01000813767705fb54b1c2f153307ed34c57d868b1dda2584b54232e803214fe'
+  data.tar.gz: 57c69067ea0028edc7bfccc2818273a85fe984303e22088a7c5bb4f909232fd8
 SHA512:
-  metadata.gz: c993f63fa8afb0264faa1410af2c24ae79a78b7a18e521823f54f3d7453a3f8dae2e8525a9e425f18aac5ba23ee0491c122109efd1c6ac0257a85989618b4505
-  data.tar.gz: 220a7b7ec120ca5bce545444af18e4f9ed0d5708d3c4a052e33bd8f7054a5e8aa99f78b3028c50316c849e146f3ae04551037c32b1933c2ea4e6a803a01ff63c
+  metadata.gz: a57bf48232fc5bd63e5b2438fc1b95f49063f69b29afe139e1455390516e07a2dff07cf42954ccbdfbba7ca4d61b8feb1343e73e74f0cdd27b6b448614247be4
+  data.tar.gz: f2d4cde61824ce1693361009129f6b96984f443408693400a81ca1b0406236b8792f1b539e0528cb0191cf03aa1e9317f3d75324c5ee5f9314e5b080ed846feb

data/Gemfile.lock

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

data/app/assets/stylesheets/application.css

@@ -1,16 +1,6 @@
 /* @layer base, components, utilities; */
 @import "tailwindcss";
 
-/* TODO: Figure out a way to add those dynamically */
-@source "../../../tmp/avo/packages/avo-advanced";
-@source "../../../tmp/avo/packages/avo-dashboards";
-@source "../../../tmp/avo/packages/avo-dynamic_filters";
-@source "../../../tmp/avo/packages/avo-kanban";
-@source "../../../tmp/avo/packages/avo-menu";
-@source "../../../tmp/avo/packages/avo-pro";
-@source "../../../tmp/avo/packages/avo-forms";
-
-/* @config "../../../tailwind.config.js"; */
 
 /* We couldn't find a way to implement blocklist in the CSS config */
 /* blocklist: ['bg-[#{chart_color(index)}]', 'bg-[${color}]'] */

data/app/controllers/avo/base_application_controller.rb

@@ -296,8 +296,11 @@ module Avo
     end
 
     def set_stylesheet_assets_path
-      @stylesheet_assets_path = "avo/application"
-      @custom_stylesheet_path = "avo.tailwind" if Avo::TailwindBuilder.custom_build_exists?
+      @stylesheet_assets_path = if Avo::TailwindBuilder.custom_build_exists?
+        "avo.tailwind"
+      else
+        "avo/application"
+      end
     end
 
     def choose_layout

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

@@ -18,9 +18,6 @@
     <%= 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

@@ -55,10 +55,6 @@ module Avo
         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
 

data/lib/avo/tailwind_builder.rb

@@ -1,4 +1,5 @@
 require "fileutils"
+require "pathname"
 
 module Avo
   class TailwindBuilder
@@ -23,16 +24,11 @@ module Avo
       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?
 
+      ensure_node_modules
+      run_engine_css_prebuilds
       generate_input_file
       success = run_tailwindcss("--minify")
       log_build_failure unless success
@@ -40,33 +36,44 @@ module Avo
     end
 
     def watch
-      return unless self.class.tailwindcss_available?
+      return true unless self.class.tailwindcss_available?
 
+      ensure_node_modules
+      run_engine_css_prebuilds
       generate_input_file
-      signature = host_avo_stylesheets_signature
+      run_tailwindcss("--watch")
+    end
 
-      pid = spawn_tailwindcss("--minify", "--watch")
+    private
+
+    def run_engine_css_prebuilds
+      roots = [Avo::Engine.root] + Avo.plugin_manager.engines.map { |e| e[:klass]&.root }.compact
 
-      begin
-        loop do
-          _, status = Process.waitpid2(pid, Process::WNOHANG)
-          break if status
+      roots.uniq.each do |root|
+        next unless root.directory?
 
-          new_signature = host_avo_stylesheets_signature
-          if new_signature != signature
-            signature = new_signature
-            generate_input_file
-          end
+        prebuild = root.join("bin", "prebuild_css")
+        next unless prebuild.exist?
 
-          sleep 1
+        Dir.chdir(root) do
+          Kernel.system("ruby", prebuild.to_s)
         end
-      rescue Interrupt
-        Process.kill("TERM", pid)
-        raise
       end
     end
 
-    private
+    def ensure_node_modules
+      engine_root = Avo::Engine.root
+      package_json = engine_root.join("package.json")
+      node_modules = engine_root.join("node_modules")
+
+      return unless package_json.exist?
+      return if node_modules.directory?
+
+      # Avo's stylesheet imports include CSS from npm packages. When running from source (or in some
+      # packaging setups), `node_modules/` may not exist yet, so Tailwind's CSS resolver fails.
+      success = Dir.chdir(engine_root) { Kernel.system("yarn", "install", "--frozen-lockfile") }
+      warn "[Avo] `yarn install` failed; Tailwind build may fail." unless success
+    end
 
     def tmp_input_dir
       Rails.root.join("tmp", "avo")
@@ -84,14 +91,12 @@ module Avo
       FileUtils.mkdir_p(tmp_input_dir)
 
       lines = []
-      # Input lives under tmp/avo/; without `source("../../")` Tailwind v4 only scans near this file, so
+      # 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 << %(@layer theme, base, components, utilities;)
-
-      lines << %(@import "tailwindcss/theme.css" layer(theme);)
-      lines << %(@import "tailwindcss/utilities.css" layer(utilities);)
+      lines << %(@import "tailwindcss";)
       lines << %(@source "../../";)
-      
+
+      append_plugin_engine_tailwind_sources(lines)
       collect_host_avo_stylesheets.each do |path|
         lines << %(@import "#{path}";)
       end
@@ -99,6 +104,41 @@ module Avo
       File.write(input_path, lines.join("\n") + "\n")
     end
 
+    def append_plugin_engine_tailwind_sources(lines)
+      # Include Avo itself (the core engine) in Tailwind's scan paths.
+      lines << %(@source "#{relative_to_tmp(Avo::Engine.root)}";)
+      append_engine_stylesheets(lines, Avo::Engine.root)
+
+      Avo.plugin_manager.engines.each do |entry|
+        root = entry[:klass].root
+        next unless root&.directory?
+
+        lines << %(@source "#{relative_to_tmp(root)}";)
+        append_engine_stylesheets(lines, root)
+      end
+    end
+
+    def append_engine_stylesheets(lines, engine_root)
+      stylesheets_root = engine_root.join("app", "assets", "stylesheets")
+      return unless stylesheets_root.directory?
+
+      # Some engines ship `app/assets/stylesheets/application.css` directly (no namespace folder).
+      root_application = stylesheets_root.join("application.css")
+      lines << %(@import "#{relative_to_tmp(root_application)}";) if root_application.exist?
+
+      # Most engines namespace their assets under `app/assets/stylesheets/<namespace>/application.css`.
+      Dir.children(stylesheets_root).sort.each do |entry|
+        next if entry.start_with?(".")
+
+        namespaced_application = stylesheets_root.join(entry, "application.css")
+        lines << %(@import "#{relative_to_tmp(namespaced_application)}";) if namespaced_application.exist?
+      end
+    end
+
+    def relative_to_tmp(absolute)
+      Pathname.new(absolute).expand_path.relative_path_from(tmp_input_dir.expand_path).to_s.tr("\\", "/")
+    end
+
     def collect_host_avo_stylesheets
       base = Rails.root.join("app", "assets", "stylesheets", "avo")
       return [] unless Dir.exist?(base)
@@ -107,11 +147,7 @@ module Avo
         .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")
+        .map { |path| relative_to_tmp(path) }
     end
 
     def run_tailwindcss(*args)
@@ -129,20 +165,6 @@ module Avo
       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

data/lib/avo/version.rb

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

data/lib/tasks/avo_tasks.rake

@@ -98,10 +98,10 @@ task "avo:yarn_install" do
   `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"
+desc "Build Avo custom Tailwind CSS (requires tailwindcss-ruby gem; outputs app/assets/builds/avo.tailwind.css)"
 task "avo:tailwindcss:build" => :environment do
   unless Avo::TailwindBuilder.tailwindcss_available?
-    puts "[Avo->] tailwindcss-rails not found; skipping avo:tailwindcss:build"
+    puts "[Avo->] tailwindcss-ruby not found; skipping avo:tailwindcss:build"
     next
   end
 
@@ -111,12 +111,15 @@ task "avo:tailwindcss:build" => :environment do
   end
 end
 
-desc "Watch and rebuild Avo custom Tailwind CSS on changes"
+desc "Watch Avo custom Tailwind CSS (requires tailwindcss-ruby gem; outputs app/assets/builds/avo.tailwind.css)"
 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"
+    puts "[Avo->] tailwindcss-ruby not found; skipping avo:tailwindcss:watch"
+    next
   end
 
-  puts "[Avo->] Watching Avo Tailwind CSS extension..."
-  Avo::TailwindBuilder.watch
+  puts "[Avo->] Watching Avo Tailwind CSS extension (avo.tailwind)..."
+  unless Avo::TailwindBuilder.watch
+    abort "[Avo->] avo:tailwindcss:watch failed"
+  end
 end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta.10
+  version: 4.0.0.beta.11
 platform: ruby
 authors:
 - Adrian Marin
 - Mihai Marin
 - Paul Bob
+autorequire:
 bindir: bin
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2026-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -1158,7 +1159,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: Admin panel framework and Content Management System for Ruby on Rails.
 test_files: []