avo 4.0.0.beta.28 → 4.0.0.beta.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abf5e94956b35c41aff661c8e0a8e8014fda3543f6606722f1f6af9e926f54e2
-  data.tar.gz: ccf3bbee484bb670f56b76b2bd33aff94b926fdbf57b8cf7b7d04df502e7fa42
+  metadata.gz: 8a1a5c19c70ef8b77daa3b3637c476ac93503afa04b76b1dbda103fe92e13124
+  data.tar.gz: d0013add4d995da4df46810876314782006c5a078e6c55c8650f9d144960d97a
 SHA512:
-  metadata.gz: 0be66defb73417fe37f84464172e3e7c1d96ad97ccc2a2107acb97fa1e8a108f1389b4166d174dccc1a137186f5daca08a53671b69f167c6e397ed0a5eeb1dba
-  data.tar.gz: e960021cb67e4df7d1013903de67835ecd6835cc25d7a1512f6742f2e2fc68137d6b6f76c85b19742ac06be7f13fba851048a80c3354ec3314171310c4057834
+  metadata.gz: f9e856c1e1d37d95bc956000dc0754150753c020d942bfb9bf9c6f5352cbc3581fb0e6dd60367f87ee86bcb5e8aed28b2d759c12013b735a859f4faa46a710a3
+  data.tar.gz: 5a4c2f9ba469285a911174228444123bf32e65da9f3c58f1b00e5a406a818e26eef033e86231d52611a1bee3aa0e1765206321d9687ac0782aa573a8c247f4ae

data/Gemfile.lock

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

data/lib/avo/tailwind_builder.rb

@@ -75,7 +75,7 @@ module Avo
       lines = []
 
       # Include Avo itself (the core engine) in Tailwind's scan paths.
-      lines << %(@source "#{relative_to_tmp(Avo::Engine.root)}";)
+      lines << %(@source "#{tailwind_path(Avo::Engine.root)}";)
       append_engine_stylesheets(lines, Avo::Engine.root)
 
       append_plugin_engine_tailwind_sources(lines)
@@ -90,7 +90,7 @@ module Avo
 
     def append_host_tailwind_sources(lines)
       resolved_host_content_source_paths.each do |path|
-        lines << %(@source "#{relative_to_tmp(path)}";)
+        lines << %(@source "#{tailwind_path(path)}";)
       end
     end
 
@@ -110,7 +110,7 @@ module Avo
         root = entry[:klass].root
         next unless root&.directory?
 
-        lines << %(@source "#{relative_to_tmp(root)}";)
+        lines << %(@source "#{tailwind_path(root)}";)
         append_engine_stylesheets(lines, root)
       end
     end
@@ -121,19 +121,22 @@ module Avo
 
       # 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?
+      lines << %(@import "#{tailwind_path(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?
+        lines << %(@import "#{tailwind_path(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("\\", "/")
+    # Always emit absolute paths for @source / @import. Relative paths from tmp/avo are wrong on
+    # Capistrano-style deploys: Rails.root may be releases/... while the input file is opened via
+    # current/... symlinks, so ".." counts differ and resolvers miss gem trees under shared/bundle.
+    def tailwind_path(absolute)
+      Pathname.new(absolute).expand_path.to_s.tr("\\", "/")
     end
 
     def collect_host_avo_stylesheets
@@ -144,7 +147,7 @@ module Avo
         .glob(base.join("**", "*.css"))
         .select { |path| File.file?(path) }
         .sort
-        .map { |path| relative_to_tmp(path) }
+        .map { |path| tailwind_path(path) }
     end
 
     def run_tailwindcss(*tailwind_args)

data/lib/avo/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta.28
+  version: 4.0.0.beta.29
 platform: ruby
 authors:
 - Adrian Marin