avo 2.15.1 → 2.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7b63867fca5d2dc4791630386b28bd0ee3639e42f7c78cbaad121a7426adfde
-  data.tar.gz: 200949e561a9db7b6ecb94cddf380d3b4535eca34791309c57a15c5a69af62da
+  metadata.gz: afff2c325122eaf769499aac7aec03ba806717a5d17666765c2ce063536bf665
+  data.tar.gz: 56f28ef14b94dc3636481a96494632c0b3d2362e9158fe94d91af0b3972f40cf
 SHA512:
-  metadata.gz: 35b9ea6f6b6a5ef17f2d7499e1c699c89b12fc51c916be38042a8baff0f47445eb13e9b8a805f96233e9c8c8a8f36629d86a04aec65de994582e5ed2319cb068
-  data.tar.gz: d0a9aa4e603acfd3c81f552a7e3ea306b3f68806cb0005596654c8c875d948e10c760a3127f0980faabb03882285f6a49fbab07e7bc97e4db61bc5b07477b7c2
+  metadata.gz: e6091db813153b5cd5a16a13da7c4ca3fe033967f4c78c39e81c027d99848d6d6cc81b5d57f2ad07c914cce6ec960e57918f7ba711f22e0e4ac3acaa35557c8f
+  data.tar.gz: 000e61a2068531bf1ace9deeecdf9b58f300ad26453d7b86996cb610d0bcebb79c92b9707aec0f9a54612c9d98a4ff8556a2ac28649980d5a8b265823e566f7e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.15.1)
+    avo (2.15.2)
       active_link_to
       addressable
       breadcrumbs_on_rails

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

@@ -7,6 +7,7 @@
     <%= csp_meta_tag %>
     <%= render partial: 'avo/partials/javascript' %>
     <%= render partial: 'avo/partials/branding' %>
+    <%= render partial: 'avo/partials/pre_head' %>
     <% if Avo::PACKED %>
       <%= javascript_include_tag "/avo-assets/avo.base", "data-turbo-track": "reload", defer: true %>
       <%= stylesheet_link_tag "/avo-assets/avo.base", "data-turbo-track": "reload", defer: true %>

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.15.1" unless const_defined?(:VERSION)
+  VERSION = "2.15.2" unless const_defined?(:VERSION)
 end

data/lib/generators/avo/base_generator.rb

@@ -9,7 +9,7 @@ module Generators
         super(*args)
 
         # Don't output the version if requested so
-        unless args.include?(["--no-avo-version"])
+        unless args.include?(["--skip-avo-version"])
           invoke "avo:version", *args
         end
       end

data/lib/generators/avo/eject_generator.rb

@@ -14,6 +14,7 @@ module Generators
         head: "app/views/avo/partials/_head.html.erb",
         header: "app/views/avo/partials/_header.html.erb",
         footer: "app/views/avo/partials/_footer.html.erb",
+        pre_head: "app/views/avo/partials/_pre_head.html.erb",
         scripts: "app/views/avo/partials/_scripts.html.erb",
         sidebar_extra: "app/views/avo/partials/_sidebar_extra.html.erb",
       }

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

@@ -31,7 +31,7 @@ module Generators
             end
 
             say "Ejecting the _head.html.erb partial"
-            Rails::Generators.invoke("avo:eject", [":head", "--no-avo-version"], {destination_root: Rails.root})
+            Rails::Generators.invoke("avo:eject", [":head", "--skip-avo-version"], {destination_root: Rails.root})
 
             say "Adding the JS asset to the partial"
             append_to_file Rails.root.join("app", "views", "avo", "partials", "_head.html.erb"), "<%= javascript_importmap_tags \"avo.custom\" %>"
@@ -48,7 +48,7 @@ module Generators
             end
 
             say "Ejecting the _head.html.erb partial"
-            Rails::Generators.invoke("avo:eject", [":head", "--no-avo-version"], {destination_root: Rails.root})
+            Rails::Generators.invoke("avo:eject", [":head", "--skip-avo-version"], {destination_root: Rails.root})
 
             say "Adding the JS asset to the partial"
             append_to_file Rails.root.join("app", "views", "avo", "partials", "_head.html.erb"), "<%= javascript_include_tag \"avo.custom\", \"data-turbo-track\": \"reload\", defer: true %>"

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

@@ -30,11 +30,14 @@ module Generators
             run "gem install foreman"
           end
 
-          say "Ejecting the _head.html.erb partial"
-          Rails::Generators.invoke("avo:eject", [":head", "--no-avo-version"], {destination_root: Rails.root})
+          # Ensure that the _pre_head.html.erb template is available
+          unless Rails.root.join("app", "views", "avo", "partials", "_pre_head.html.erb").exist?
+            say "Ejecting the _pre_head.html.erb partial"
+            Rails::Generators.invoke("avo:eject", [":pre_head", "--skip-avo-version"], {destination_root: Rails.root})
+          end
 
           say "Adding the CSS asset to the partial"
-          prepend_to_file Rails.root.join("app", "views", "avo", "partials", "_head.html.erb"), "<%= stylesheet_link_tag \"avo.tailwind.css\", media: \"all\" %>"
+          prepend_to_file Rails.root.join("app", "views", "avo", "partials", "_pre_head.html.erb"), "<%= stylesheet_link_tag \"avo.tailwind.css\", media: \"all\" %>"
         end
 
         no_tasks do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 2.15.1
+  version: 2.15.2
 platform: ruby
 authors:
 - Adrian Marin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-13 00:00:00.000000000 Z
+date: 2022-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1719,6 +1719,7 @@ files:
 - app/views/avo/partials/_javascript.html.erb
 - app/views/avo/partials/_logo.html.erb
 - app/views/avo/partials/_navbar.html.erb
+- app/views/avo/partials/_pre_head.html.erb
 - app/views/avo/partials/_resource_search.html.erb
 - app/views/avo/partials/_scripts.html.erb
 - app/views/avo/partials/_sidebar_extra.html.erb