Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Fixes admin tailwind build with proper spree admin gem root path (#13387)

Damian Legawiec64ab36557e62
diff --git a/admin/lib/generators/spree/admin/install/templates/app/assets/tailwind/spree_admin.css.tt b/admin/lib/generators/spree/admin/install/templates/app/assets/tailwind/spree_admin.css.tt
index 20fd2f48ae..4d93ea21eb 100644
--- a/admin/lib/generators/spree/admin/install/templates/app/assets/tailwind/spree_admin.css.tt
+++ b/admin/lib/generators/spree/admin/install/templates/app/assets/tailwind/spree_admin.css.tt
@@ -5,12 +5,11 @@
* It imports the base styles from the Spree Admin gem and allows
* you to add custom admin styles.
*
- * The import path below is automatically set during installation.
- * If you need to reinstall or update, run: rails g spree:admin:install
+ * The $SPREE_ADMIN_PATH variable is automatically resolved at build time.
*/
/* Import Spree Admin base styles from the gem */
-@import "<%= Spree::Admin::Engine.root.join('app/assets/tailwind/spree/admin/index.css') %>";
+@import "$SPREE_ADMIN_PATH/app/assets/tailwind/spree/admin/index.css";
/* Scan host app's custom admin code for Tailwind classes */
@source "../../views/spree/admin/**/*.erb";
diff --git a/admin/lib/tasks/tailwind.rake b/admin/lib/tasks/tailwind.rake
index 7109adb893..21fcb10f29 100644
--- a/admin/lib/tasks/tailwind.rake
+++ b/admin/lib/tasks/tailwind.rake
@@ -2,8 +2,6 @@ module Spree
module Admin
module TailwindHelper
class << self
- # Returns the input CSS path from the host app
- # Created by the install generator (rails g spree:admin:install)
def input_path
Rails.root.join("app/assets/tailwind/spree_admin.css")
end
@@ -11,6 +9,10 @@ module Spree
def output_path
Rails.root.join("app/assets/builds/spree/admin/application.css")
end
+
+ def resolved_input_css
+ File.read(input_path).gsub("$SPREE_ADMIN_PATH", Spree::Admin::Engine.root.to_s)
+ end
end
end
end
@@ -23,23 +25,20 @@ namespace :spree do
task build: :environment do
require "tailwindcss/ruby"
- input_path = Spree::Admin::TailwindHelper.input_path
output_path = Spree::Admin::TailwindHelper.output_path
-
- # Ensure output directory exists
FileUtils.mkdir_p(output_path.dirname)
- command = [
- Tailwindcss::Ruby.executable,
- "-i", input_path.to_s,
- "-o", output_path.to_s
- ]
-
+ command = [Tailwindcss::Ruby.executable, "-i", "-", "-o", output_path.to_s]
command << "--minify" unless Rails.env.development? || Rails.env.test?
puts "Building Spree Admin Tailwind CSS..."
- puts " Input: #{input_path}"
- system(*command) || raise("Spree Admin Tailwind build failed")
+ puts " Input: #{Spree::Admin::TailwindHelper.input_path}"
+
+ IO.popen(command, "w") do |io|
+ io.write(Spree::Admin::TailwindHelper.resolved_input_css)
+ end
+
+ raise("Spree Admin Tailwind build failed") unless $?.success?
puts "Done! Output: #{output_path}"
end
@@ -47,22 +46,17 @@ namespace :spree do
task watch: :environment do
require "tailwindcss/ruby"
- input_path = Spree::Admin::TailwindHelper.input_path
output_path = Spree::Admin::TailwindHelper.output_path
-
- # Ensure output directory exists
FileUtils.mkdir_p(output_path.dirname)
- command = [
- Tailwindcss::Ruby.executable,
- "-i", input_path.to_s,
- "-o", output_path.to_s,
- "--watch"
- ]
+ command = [Tailwindcss::Ruby.executable, "-i", "-", "-o", output_path.to_s, "--watch"]
puts "Watching Spree Admin Tailwind CSS for changes..."
- puts " Input: #{input_path}"
- system(*command)
+ puts " Input: #{Spree::Admin::TailwindHelper.input_path}"
+
+ IO.popen(command, "w") do |io|
+ io.write(Spree::Admin::TailwindHelper.resolved_input_css)
+ end
end
end
end