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.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Fixed auto-discovery of Spree gem admin views by Admin Tailwind CSS build process
Damian Legawiec34c810bb2748
diff --git a/admin/app/assets/tailwind/spree/admin/index.css b/admin/app/assets/tailwind/spree/admin/index.cssindex 752e3f28b8..c9fe974f2f 100644--- a/admin/app/assets/tailwind/spree/admin/index.css+++ b/admin/app/assets/tailwind/spree/admin/index.css@@ -19,10 +19,6 @@@source "../../../../javascript/**/*.js";@source "./**/*.css";-/* Page Builder sources (optional - no matches if page_builder gem not present) */-@source "../../../../../../page_builder/app/views/**/*.erb";-@source "../../../../../../page_builder/app/helpers/**/*.rb";-@source "../../../../../../page_builder/app/javascript/**/*.js";/* Base */@import "./base/_theme.css";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.ttindex 76cd18b8ca..d613eb179b 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@@ -11,6 +11,9 @@/* Import Spree Admin base styles from the gem */@import "$SPREE_ADMIN_PATH/app/assets/tailwind/spree/admin/index.css";+/* Auto-generated sources for all Spree engines (page_builder, etc.) */+/* $SPREE_ENGINE_SOURCES */+/* Scan host app's custom admin code for Tailwind classes */@source "../../views/spree/admin/**/*.erb";@source "../../helpers/spree/admin/**/*.rb";diff --git a/admin/lib/spree/admin/tailwind_helper.rb b/admin/lib/spree/admin/tailwind_helper.rbindex b8804a5495..9be68aec65 100644--- a/admin/lib/spree/admin/tailwind_helper.rb+++ b/admin/lib/spree/admin/tailwind_helper.rb@@ -19,7 +19,36 @@ module Spreeenddef resolved_input_css- File.read(input_path).gsub("$SPREE_ADMIN_PATH", Spree::Admin::Engine.root.to_s)+ css = File.read(input_path)+ css = css.gsub("$SPREE_ADMIN_PATH", Spree::Admin::Engine.root.to_s)+ css = css.gsub("/* $SPREE_ENGINE_SOURCES */", spree_engine_sources)+ css+ end++ def spree_engine_sources+ spree_engines.flat_map do |engine|+ engine_sources(engine)+ end.join("\n")+ end++ def spree_engines+ Rails::Engine.subclasses.select do |engine|+ engine.name&.start_with?("Spree::") && engine != Spree::Admin::Engine+ end+ end++ def engine_sources(engine)+ root = engine.root.to_s+ source_paths = [+ ["app/views/spree/admin", "**/*.erb"],+ ["app/helpers/spree/admin", "**/*.rb"],+ ["app/javascript/spree/admin", "**/*.js"]+ ]++ source_paths.filter_map do |dir, pattern|+ full_dir = File.join(root, dir)+ %(@source "#{full_dir}/#{pattern}";) if File.directory?(full_dir)+ endenddef write_resolved_cssdiff --git a/admin/spec/lib/spree/admin/tailwind_helper_spec.rb b/admin/spec/lib/spree/admin/tailwind_helper_spec.rbindex cfbcf31287..0e5aa5bc30 100644--- a/admin/spec/lib/spree/admin/tailwind_helper_spec.rb+++ b/admin/spec/lib/spree/admin/tailwind_helper_spec.rb@@ -33,6 +33,46 @@ RSpec.describe Spree::Admin::TailwindHelper doexpect(result).to include(Spree::Admin::Engine.root.to_s)expect(result).not_to include('$SPREE_ADMIN_PATH')end++ it 'replaces $SPREE_ENGINE_SOURCES placeholder with generated sources' do+ result = described_class.resolved_input_css++ expect(result).not_to include('$SPREE_ENGINE_SOURCES')+ end+ end++ describe '.spree_engines' do+ it 'returns Spree engines excluding Admin engine' do+ engines = described_class.spree_engines++ expect(engines).not_to include(Spree::Admin::Engine)+ engines.each do |engine|+ expect(engine.name).to start_with('Spree::')+ end+ end+ end++ describe '.spree_engine_sources' do+ it 'generates @source directives for spree/admin paths' do+ sources = described_class.spree_engine_sources++ sources.lines.each do |line|+ next if line.strip.empty?++ expect(line).to match(/@source.*spree\/admin/)+ end+ end++ it 'only includes directories that exist' do+ sources = described_class.spree_engine_sources++ sources.lines.each do |line|+ next if line.strip.empty?++ path = line.match(/"([^"]+)\/\*\*/)[1]+ expect(File.directory?(path)).to be(true), "Expected directory to exist: #{path}"+ end+ endenddescribe '.write_resolved_css' do