spree_admin 5.5.1 → 5.5.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/tailwind/spree/admin/components/_dialogs.css +1 -1
  3. data/lib/spree/admin/tailwind_helper.rb +28 -6
  4. data/lib/tasks/tailwind.rake +41 -38
  5. metadata +6 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 0b2daaf42ad117ec7377bcfd5684929ae2da1bee4ba6f4d32e0ca655f64826f6
4
- data.tar.gz: 98ddac1a70dccb283238508018a9593c5ee38ffc22ee4d424fd5fb6a70d4a2c8
3
+ metadata.gz: fe7bbf921b79a573c2d091927442a90d3f7305fa2c8024b34c3a75ee9a0d3b26
4
+ data.tar.gz: 72fd353cee9a2dfba89b70cbeb09e1e2260b4876d468d7d34c0435aeeca2ec3a
5
5
  SHA512:
6
- metadata.gz: 25d43aac8cb0f5fd92c4e4f3d22faa905296c966f364ad4cd60a1a864d93fa282c967a306aa9bfc6ebc522440a7128698629a80ca9c475c318e1816cade6d8d0
7
- data.tar.gz: d7a579d0a8c23f9e9bd7401dfcffccba2775c631f23226ca54b21e2370c4c157b61ae12e1560e26ff4cc42071925f2845e2c10b2bf421101b0eddc2452bdcb28
6
+ metadata.gz: d5c8f4935b961a62800280b15ea76248e9f3c132ca7aa02ef33952953bbe65efec1595f87f028aa4d41ea5446b7feb841029e9b761ac9b093e1af4cda4e26fd0
7
+ data.tar.gz: a26a759b7ed7f13c37eaf09aa9a18e5edacc46d0b6fc4fd23bc8c88a5782f8ae4a02ad19c391e90f5d474157c7f21a716376f249aa3c9bd402377b23caa1326e
data/app/assets/tailwind/spree/admin/components/_dialogs.css CHANGED
@@ -168,7 +168,7 @@
168
168
  }
169
169
 
170
170
  .dialog-footer {
171
- @apply sticky bottom-0 p-4 flex gap-2 items-center justify-between border-t border-gray-100 bg-gray-25;
171
+ @apply shrink-0 p-4 flex gap-2 items-center justify-between border-t border-gray-100 bg-gray-25;
172
172
  border-radius: 0 0 calc(var(--radius-2xl) - 1px) calc(var(--radius-2xl) - 1px);
173
173
  }
174
174
 
data/lib/spree/admin/tailwind_helper.rb CHANGED
@@ -47,20 +47,42 @@ module Spree
47
47
  end
48
48
  end
49
49
 
50
+ # [relative dir, glob] pairs Tailwind scans for utility classes.
51
+ SOURCE_PATHS = [
52
+ ["app/views/spree/admin", "**/*.erb"],
53
+ ["app/helpers/spree/admin", "**/*.rb"],
54
+ ["app/javascript/spree/admin", "**/*.js"]
55
+ ].freeze
56
+
50
57
  def engine_sources(engine)
51
58
  root = engine.root.to_s
52
- source_paths = [
53
- ["app/views/spree/admin", "**/*.erb"],
54
- ["app/helpers/spree/admin", "**/*.rb"],
55
- ["app/javascript/spree/admin", "**/*.js"]
56
- ]
57
59
 
58
- source_paths.filter_map do |dir, pattern|
60
+ SOURCE_PATHS.filter_map do |dir, pattern|
59
61
  full_dir = File.join(root, dir)
60
62
  %(@source "#{full_dir}/#{pattern}";) if File.directory?(full_dir)
61
63
  end
62
64
  end
63
65
 
66
+ # Every template/CSS glob that affects the compiled admin CSS, across all
67
+ # Spree engines plus the host app. Used by watch mode to poll for changes
68
+ # (OS file-system events don't cross a Docker bind mount from a macOS host).
69
+ #
70
+ # @return [Array<String>] absolute Dir.glob patterns
71
+ def source_globs
72
+ roots = spree_engines.map { |engine| engine.root.to_s }
73
+ roots << Rails.root.to_s
74
+
75
+ template_globs = roots.product(SOURCE_PATHS).map do |root, (dir, pattern)|
76
+ File.join(root, dir, pattern)
77
+ end
78
+
79
+ css_globs = [engine_css_path.to_s, input_path.dirname.to_s].map do |dir|
80
+ File.join(dir, "**", "*.css")
81
+ end
82
+
83
+ (template_globs + css_globs).uniq
84
+ end
85
+
64
86
  def write_resolved_css
65
87
  FileUtils.mkdir_p(resolved_input_path.dirname)
66
88
  File.write(resolved_input_path, resolved_input_css)
data/lib/tasks/tailwind.rake CHANGED
@@ -29,54 +29,57 @@ namespace :spree do
29
29
  task watch: :environment do
30
30
  require "tailwindcss/ruby"
31
31
 
32
- begin
33
- require "listen"
34
- rescue LoadError
35
- puts "ERROR: The 'listen' gem is required for watch mode."
36
- puts "Add it to your Gemfile in the development group:"
37
- puts ""
38
- puts " group :development do"
39
- puts " gem 'listen', '>= 3.0'"
40
- puts " end"
41
- puts ""
42
- exit 1
43
- end
44
-
45
32
  output_path = Spree::Admin::TailwindHelper.output_path
46
33
  FileUtils.mkdir_p(output_path.dirname)
47
34
 
48
- # Initial write of resolved CSS
49
- resolved_path = Spree::Admin::TailwindHelper.write_resolved_css
35
+ resolved_path = Spree::Admin::TailwindHelper.resolved_input_path
36
+
37
+ # One-shot Tailwind build. Polling drives recompilation instead of
38
+ # Tailwind's own --watch: its file watching (like the `listen` gem's)
39
+ # relies on OS file-system events, which don't cross a Docker bind mount
40
+ # from a macOS host, so a host-side template edit would never rebuild.
41
+ build = lambda do
42
+ Spree::Admin::TailwindHelper.write_resolved_css
43
+ system(Tailwindcss::Ruby.executable, "-i", resolved_path.to_s, "-o", output_path.to_s)
44
+ # system doesn't raise on a non-zero exit, so surface build failures
45
+ # (invalid CSS, missing binary) — otherwise a broken rebuild is silent.
46
+ warn "[tailwind watch] build failed (exit #{$?.exitstatus})" unless $?.success?
47
+ end
48
+
49
+ source_mtimes = lambda do
50
+ Spree::Admin::TailwindHelper.source_globs.each_with_object({}) do |glob, acc|
51
+ Dir.glob(glob).each do |file|
52
+ acc[file] = File.mtime(file) rescue next
53
+ end
54
+ end
55
+ end
56
+
50
57
  puts "Watching Spree Admin Tailwind CSS for changes..."
51
58
  puts " Host input: #{Spree::Admin::TailwindHelper.input_path}"
52
59
  puts " Engine CSS: #{Spree::Admin::TailwindHelper.engine_css_path}"
53
60
  puts " Resolved: #{resolved_path}"
54
61
  puts " Output: #{output_path}"
55
62
 
56
- # Watch paths for CSS source changes
57
- watch_paths = [
58
- Spree::Admin::TailwindHelper.engine_css_path.to_s, # Engine CSS files
59
- Spree::Admin::TailwindHelper.input_path.dirname.to_s # Host app CSS files
60
- ].select { |p| File.directory?(p) }
61
-
62
- # Set up listener to regenerate resolved CSS when source files change
63
- listener = Listen.to(*watch_paths, only: /\.css$/) do |modified, added, removed|
64
- changed = (modified + added + removed).map { |f| File.basename(f) }.join(", ")
65
- puts "\n[#{Time.now.strftime('%H:%M:%S')}] CSS changed: #{changed}"
66
- puts " Regenerating resolved CSS..."
67
- Spree::Admin::TailwindHelper.write_resolved_css
63
+ build.call
64
+ previous = source_mtimes.call
65
+
66
+ loop do
67
+ sleep 1
68
+ begin
69
+ current = source_mtimes.call
70
+ next if current == previous
71
+
72
+ changed = (current.keys | previous.keys).select { |f| current[f] != previous[f] }
73
+ .map { |f| File.basename(f) }.uniq.first(5).join(", ")
74
+ previous = current
75
+ puts "\n[#{Time.now.strftime('%H:%M:%S')}] Sources changed: #{changed} — rebuilding..."
76
+ build.call
77
+ rescue => e
78
+ # A transient read/build error (e.g. a source file caught mid-save)
79
+ # must not kill the watch loop — log and keep polling.
80
+ warn "[tailwind watch] rebuild failed: #{e.class}: #{e.message}"
81
+ end
68
82
  end
69
- listener.start
70
-
71
- # Run Tailwind in watch mode (this blocks)
72
- command = [
73
- Tailwindcss::Ruby.executable,
74
- "-i", resolved_path.to_s,
75
- "-o", output_path.to_s,
76
- "--watch"
77
- ]
78
-
79
- system(*command)
80
83
  end
81
84
  end
82
85
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spree_admin
3
3
  version: !ruby/object:Gem::Version
4
- version: 5.5.1
4
+ version: 5.5.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Vendo Connect Inc.
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2026-06-29 00:00:00.000000000 Z
11
+ date: 2026-07-06 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: spree
@@ -16,14 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - ">="
18
18
  - !ruby/object:Gem::Version
19
- version: 5.5.1
19
+ version: 5.5.2
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - ">="
25
25
  - !ruby/object:Gem::Version
26
- version: 5.5.1
26
+ version: 5.5.2
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: active_link_to
29
29
  requirement: !ruby/object:Gem::Requirement
@@ -1173,9 +1173,9 @@ licenses:
1173
1173
  - BSD-3-Clause
1174
1174
  metadata:
1175
1175
  bug_tracker_uri: https://github.com/spree/spree/issues
1176
- changelog_uri: https://github.com/spree/spree/releases/tag/v5.5.1
1176
+ changelog_uri: https://github.com/spree/spree/releases/tag/v5.5.2
1177
1177
  documentation_uri: https://docs.spreecommerce.org/
1178
- source_code_uri: https://github.com/spree/spree/tree/v5.5.1
1178
+ source_code_uri: https://github.com/spree/spree/tree/v5.5.2
1179
1179
  post_install_message:
1180
1180
  rdoc_options: []
1181
1181
  require_paths: