Use a more standard assets configuration

We namespace all our assets under `solidus_admin` to avoid conflicts. We use an `application.css` manifest. From it, we require the compiled tailwind css, which lives within `app/assets/builds` and is named `tailwind.css`, just like tailwindcss-rails does with host apps.
solidusio · Jul 11, 2023 · 790470c · 790470c
1 parent 759190d
commit 790470c
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 6 deletions.
diff --git a/admin/Rakefile b/admin/Rakefile
@@ -23,9 +23,9 @@ namespace :solidus_admin do
       require "solidus_admin/engine"
       root = SolidusAdmin::Engine.root
       system "#{Tailwindcss::Engine.root.join("exe/tailwindcss")} \
-         -i #{root.join("app/assets/stylesheets/application.tailwind.css")} \
-         -o #{root.join("app/assets/builds/solidus_admin.css")} \
-         -c #{root.join("config/tailwind.config.js")} \
+         -i #{root.join("app/assets/stylesheets/solidus_admin/application.tailwind.css")} \
+         -o #{root.join("app/assets/builds/solidus_admin/tailwind.css")} \
+         -c #{root.join("config/solidus_admin/tailwind.config.js")} \
          --minify -w"
     end
   end

diff --git a/admin/app/assets/builds/solidus_admin.css → .../assets/builds/solidus_admin/tailwind.css b/admin/app/assets/builds/solidus_admin.css → .../assets/builds/solidus_admin/tailwind.css
diff --git a/admin/app/assets/config/solidus_admin_manifest.js b/admin/app/assets/config/solidus_admin_manifest.js
diff --git a/admin/app/assets/stylesheets/solidus_admin/application.css b/admin/app/assets/stylesheets/solidus_admin/application.css
@@ -0,0 +1,3 @@
+/*
+ * = require solidus_admin/tailwind.css
+*/
diff --git a/...sets/stylesheets/application.tailwind.css → ...ts/solidus_admin/application.tailwind.css b/...sets/stylesheets/application.tailwind.css → ...ts/solidus_admin/application.tailwind.css
diff --git a/admin/app/views/layouts/solidus_admin/application.html.erb b/admin/app/views/layouts/solidus_admin/application.html.erb
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <%= stylesheet_link_tag "solidus_admin", "data-turbo-track": "reload" %>
+    <%= stylesheet_link_tag "solidus_admin/application.css", "data-turbo-track": "reload" %>
   </head>
   <body>
     <h1 class="text-4xl">Layout is rendered</h1>

diff --git a/admin/config/tailwind.config.js → ...n/config/solidus_admin/tailwind.config.js b/admin/config/tailwind.config.js → ...n/config/solidus_admin/tailwind.config.js
diff --git a/admin/lib/solidus_admin/engine.rb b/admin/lib/solidus_admin/engine.rb
@@ -5,7 +5,7 @@ class Engine < ::Rails::Engine
     isolate_namespace SolidusAdmin
 
     initializer "solidus_admin.assets" do |app|
-      app.config.assets.precompile += %w[solidus_admin_manifest]
+      app.config.assets.precompile += %w[solidus_admin/application.css]
     end
   end
 end