avo 4.0.0.beta.18 → 4.0.0.beta.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3968dcf2a4263c55531d121f603cdef27ce7ae2e33909df50cca81403e7165d
-  data.tar.gz: c5deb043f07fff711ca862926a8f2e839cf9f879c2f347316c9e698cc8fe03a9
+  metadata.gz: 2ca1db2674bbca70a939c3af07ce3cefe320ff55ac639b3254225ceac0fcc0c4
+  data.tar.gz: bf08ba7edd4239b31fcb246d5996f4d9fefbe30ec8c0c61a398c9c997f4a5ce0
 SHA512:
-  metadata.gz: aa3e5173d9d6115bf7350422450c2c6b77b742a3c1d5bd3e5344df0815ef25372940d9962900dce7255ad3675a94b92be2e298576a9de2777a105c825c59bd84
-  data.tar.gz: ba6c7427ffd7cd8b72dfa7dcc23cdf5bc78230fbafcfa64ea3bbdc4b5d80b18f4535ca945f880d6dbca24391a0c242d3ba4369e209325a97c7926498bc08a41d
+  metadata.gz: 7f092659e7772e6e5eebec47023ce4a0c0832c8a68046ba6ac881c2b97776dca2b92e49008cec30a0058ad35919f061a56bccda288efbdb54bb0e8c61d34f9f7
+  data.tar.gz: 72e1fb3218086c85cadd96b79658288b16958bf030e2b7bd46f48b93185e24e38900f736e6909015b102b422cf9190a29c849ec3c80f16f7f8833839c38a1176

data/Gemfile.lock

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

data/app/assets/builds/avo/application.css

@@ -4080,29 +4080,26 @@
     font-family: 'Inter';
     font-style: normal;
     font-weight: 400;
-    src: url('fonts/inter-v7-latin-regular.eot');
-    src: local(''), url('fonts/inter-v7-latin-regular.eot?#iefix') format('embedded-opentype'),  url('fonts/inter-v7-latin-regular.woff2') format('woff2'),  url('fonts/inter-v7-latin-regular.woff') format('woff'),  url('fonts/inter-v7-latin-regular.ttf') format('truetype'),  url('fonts/inter-v7-latin-regular.svg#Inter') format('svg');
+    src: local(''), url('fonts/inter-v7-latin-regular.woff2') format('woff2'),  url('fonts/inter-v7-latin-regular.woff') format('woff'),  url('fonts/inter-v7-latin-regular.ttf') format('truetype');
   }
   @font-face {
     font-family: 'Inter';
     font-style: normal;
     font-weight: 500;
     src: url('fonts/inter-v7-latin-500.eot');
-    src: local(''), url('fonts/inter-v7-latin-500.eot?#iefix') format('embedded-opentype'),  url('fonts/inter-v7-latin-500.woff2') format('woff2'),  url('fonts/inter-v7-latin-500.woff') format('woff'),  url('fonts/inter-v7-latin-500.ttf') format('truetype'),  url('fonts/inter-v7-latin-500.svg#Inter') format('svg');
+    src: local(''), url('fonts/inter-v7-latin-500.eot?#iefix') format('embedded-opentype'),  url('fonts/inter-v7-latin-500.woff2') format('woff2'),  url('fonts/inter-v7-latin-500.woff') format('woff'),  url('fonts/inter-v7-latin-500.ttf') format('truetype');
   }
   @font-face {
     font-family: 'Inter';
     font-style: normal;
     font-weight: 600;
-    src: url('fonts/inter-v7-latin-600.eot');
-    src: local(''), url('fonts/inter-v7-latin-600.eot?#iefix') format('embedded-opentype'),  url('fonts/inter-v7-latin-600.woff2') format('woff2'),  url('fonts/inter-v7-latin-600.woff') format('woff'),  url('fonts/inter-v7-latin-600.ttf') format('truetype'),  url('fonts/inter-v7-latin-600.svg#Inter') format('svg');
+    src: local(''), url('fonts/inter-v7-latin-600.woff2') format('woff2'),  url('fonts/inter-v7-latin-600.woff') format('woff'),  url('fonts/inter-v7-latin-600.ttf') format('truetype');
   }
   @font-face {
     font-family: 'Inter';
     font-style: normal;
     font-weight: 700;
-    src: url('fonts/inter-v7-latin-700.eot');
-    src: local(''), url('fonts/inter-v7-latin-700.eot?#iefix') format('embedded-opentype'),  url('fonts/inter-v7-latin-700.woff2') format('woff2'),  url('fonts/inter-v7-latin-700.woff') format('woff'),  url('fonts/inter-v7-latin-700.ttf') format('truetype'),  url('fonts/inter-v7-latin-700.svg#Inter') format('svg');
+    src: local(''), url('fonts/inter-v7-latin-700.woff2') format('woff2'),  url('fonts/inter-v7-latin-700.woff') format('woff'),  url('fonts/inter-v7-latin-700.ttf') format('truetype');
   }
   .button-group {
     display: flex;

data/app/assets/stylesheets/css/fonts.css

@@ -3,13 +3,10 @@
   font-family: 'Inter';
   font-style: normal;
   font-weight: 400;
-  src: url('fonts/inter-v7-latin-regular.eot'); /* IE9 Compat Modes */
   src: local(''),
-       url('fonts/inter-v7-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
        url('fonts/inter-v7-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
        url('fonts/inter-v7-latin-regular.woff') format('woff'), /* Modern Browsers */
-       url('fonts/inter-v7-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
-       url('fonts/inter-v7-latin-regular.svg#Inter') format('svg'); /* Legacy iOS */
+       url('fonts/inter-v7-latin-regular.ttf') format('truetype'); /* Safari, Android, iOS */
 }
 /* inter-500 - latin */
 @font-face {
@@ -21,32 +18,25 @@
        url('fonts/inter-v7-latin-500.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
        url('fonts/inter-v7-latin-500.woff2') format('woff2'), /* Super Modern Browsers */
        url('fonts/inter-v7-latin-500.woff') format('woff'), /* Modern Browsers */
-       url('fonts/inter-v7-latin-500.ttf') format('truetype'), /* Safari, Android, iOS */
-       url('fonts/inter-v7-latin-500.svg#Inter') format('svg'); /* Legacy iOS */
+       url('fonts/inter-v7-latin-500.ttf') format('truetype'); /* Safari, Android, iOS */
 }
 /* inter-600 - latin */
 @font-face {
   font-family: 'Inter';
   font-style: normal;
   font-weight: 600;
-  src: url('fonts/inter-v7-latin-600.eot'); /* IE9 Compat Modes */
   src: local(''),
-       url('fonts/inter-v7-latin-600.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
        url('fonts/inter-v7-latin-600.woff2') format('woff2'), /* Super Modern Browsers */
        url('fonts/inter-v7-latin-600.woff') format('woff'), /* Modern Browsers */
-       url('fonts/inter-v7-latin-600.ttf') format('truetype'), /* Safari, Android, iOS */
-       url('fonts/inter-v7-latin-600.svg#Inter') format('svg'); /* Legacy iOS */
+       url('fonts/inter-v7-latin-600.ttf') format('truetype'); /* Safari, Android, iOS */
 }
 /* inter-700 - latin */
 @font-face {
   font-family: 'Inter';
   font-style: normal;
   font-weight: 700;
-  src: url('fonts/inter-v7-latin-700.eot'); /* IE9 Compat Modes */
   src: local(''),
-       url('fonts/inter-v7-latin-700.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
        url('fonts/inter-v7-latin-700.woff2') format('woff2'), /* Super Modern Browsers */
        url('fonts/inter-v7-latin-700.woff') format('woff'), /* Modern Browsers */
-       url('fonts/inter-v7-latin-700.ttf') format('truetype'), /* Safari, Android, iOS */
-       url('fonts/inter-v7-latin-700.svg#Inter') format('svg'); /* Legacy iOS */
+       url('fonts/inter-v7-latin-700.ttf') format('truetype'); /* Safari, Android, iOS */
 }

data/app/controllers/avo/base_application_controller.rb

@@ -25,7 +25,6 @@ module Avo
     before_action :add_initial_breadcrumbs
     before_action :set_view
     before_action :set_sidebar_open
-    before_action :set_stylesheet_assets_path
 
     rescue_from Avo::NotAuthorizedError, with: :render_unauthorized
     rescue_from ActiveRecord::RecordInvalid, with: :exception_logger
@@ -295,14 +294,6 @@ module Avo
       Avo.logger.debug "Failed to set ActiveStorage::Current.url_options, #{exception.inspect}"
     end
 
-    def set_stylesheet_assets_path
-      @stylesheet_assets_path = if Avo::TailwindBuilder.custom_build_exists?
-        "avo.tailwind"
-      else
-        "avo/application"
-      end
-    end
-
     def choose_layout
       if turbo_frame_request?
         "avo/blank"

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

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

data/lib/avo/tailwind_builder.rb

@@ -22,12 +22,6 @@ module Avo
       Avo.configuration.tailwindcss_integration_enabled && tailwindcss_available?
     end
 
-    def self.custom_build_exists?
-      return false unless defined?(Rails)
-
-      Rails.root.join("app", "assets", "builds", "avo.tailwind.css").exist?
-    end
-
     def build
       return true unless self.class.enabled?
 
@@ -88,7 +82,7 @@ module Avo
     end
 
     def output_path
-      Rails.root.join("app", "assets", "builds", "avo.tailwind.css")
+      Rails.root.join("app", "assets", "builds", "avo", "application.css")
     end
 
     def generate_input_file

data/lib/avo/version.rb

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

data/lib/tasks/avo_tasks.rake

@@ -138,27 +138,27 @@ 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 (requires tailwindcss-ruby gem; outputs app/assets/builds/avo.tailwind.css)"
+desc "Build Avo custom Tailwind CSS (requires tailwindcss-ruby gem; outputs app/assets/builds/avo/application.css)"
 task "avo:tailwindcss:build" => :environment do
   unless Avo::TailwindBuilder.enabled?
     puts "[Avo->] tailwindcss integration disabled or tailwindcss-ruby not found; skipping avo:tailwindcss:build"
     next
   end
 
-  puts "[Avo->] Building Avo Tailwind CSS extension (avo.tailwind)..."
+  puts "[Avo->] Building Avo Tailwind CSS extension (avo/application)..."
   unless Avo::TailwindBuilder.build
     abort "[Avo->] avo:tailwindcss:build failed"
   end
 end
 
-desc "Watch Avo custom Tailwind CSS (requires tailwindcss-ruby gem; outputs app/assets/builds/avo.tailwind.css)"
+desc "Watch Avo custom Tailwind CSS (requires tailwindcss-ruby gem; outputs app/assets/builds/avo/application.css)"
 task "avo:tailwindcss:watch" => :environment do
   unless Avo::TailwindBuilder.enabled?
     puts "[Avo->] tailwindcss integration disabled or tailwindcss-ruby not found; skipping avo:tailwindcss:watch"
     next
   end
 
-  puts "[Avo->] Watching Avo Tailwind CSS extension (avo.tailwind)..."
+  puts "[Avo->] Watching Avo Tailwind CSS extension (avo/application)..."
   unless Avo::TailwindBuilder.watch
     abort "[Avo->] avo:tailwindcss:watch failed"
   end

metadata

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