update assets to work with rails 7 assets pipeline, and fix install g…

…enerator
activescaffold · Dec 11, 2024 · 68f69cc · 68f69cc
1 parent 385c593
commit 68f69cc
Show file tree

Hide file tree

Showing 26 changed files with 186 additions and 43 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -11,6 +11,7 @@ PATH
       ice_nine (~> 0.11)
       rails (>= 5.2.0)
       request_store (~> 1.3)
+      sassc-rails (~> 2.0)
 
 GEM
   remote: https://rubygems.org/
@@ -112,6 +113,7 @@ GEM
     domain_name (0.6.20240107)
     drb (2.2.1)
     erubi (1.13.0)
+    ffi (1.17.0-x86_64-linux-gnu)
     gli (2.22.0)
     globalid (1.2.1)
       activesupport (>= 6.1)
@@ -268,6 +270,14 @@ GEM
     ruby-prof (1.7.1)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
+    sassc (2.4.0)
+      ffi (~> 1.9)
+    sassc-rails (2.1.2)
+      railties (>= 4.0.0)
+      sassc (>= 2.0)
+      sprockets (> 3.0)
+      sprockets-rails
+      tilt
     securerandom (0.3.2)
     shoulda (4.0.0)
       shoulda-context (~> 2.0)
@@ -282,11 +292,19 @@ GEM
     simplecov-html (0.13.1)
     simplecov_json_formatter (0.1.4)
     smart_properties (1.17.0)
+    sprockets (4.2.1)
+      concurrent-ruby (~> 1.0)
+      rack (>= 2.2.4, < 4)
+    sprockets-rails (3.5.2)
+      actionpack (>= 6.1)
+      activesupport (>= 6.1)
+      sprockets (>= 3.0.0)
     sqlite3 (2.2.0-x86_64-linux-gnu)
     stringio (3.1.2)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     thor (1.3.2)
+    tilt (2.4.0)
     timeout (0.4.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)

diff --git a/active_scaffold.gemspec b/active_scaffold.gemspec
@@ -27,5 +27,6 @@ Gem::Specification.new do |s|
   # Deep Freeze Ruby Objects
   s.add_dependency('ice_nine', '~> 0.11')
   s.add_dependency('request_store', '~> 1.3')
+  s.add_dependency('sassc-rails', '~> 2.0')
   s.metadata['rubygems_mfa_required'] = 'true'
 end
diff --git a/app/assets/config/active_scaffold/manifest.js b/app/assets/config/active_scaffold/manifest.js
@@ -0,0 +1,3 @@
+//= link_tree ../../images
+//= link_directory ../../javascripts .js
+//= link_directory ../../stylesheets .css
diff --git a/app/assets/config/active_scaffold_manifest.js b/app/assets/config/active_scaffold_manifest.js
diff --git a/app/assets/stylesheets/active_scaffold.scss b/app/assets/stylesheets/active_scaffold.scss
@@ -6,9 +6,9 @@
 
  For details, see the ActiveScaffold web site: https://github.com/activescaffold/active_scaffold
 */
+//= require "active_scaffold_jquery_ui"
+//= require "active_scaffold_extensions"
 
 @import 'active_scaffold_layout';
 @import 'active_scaffold_images';
-@import 'active_scaffold_jquery_ui';
-@import 'active_scaffold_extensions';
 @import 'active_scaffold_colors';
diff --git a/gemfiles/Gemfile.rails-6.1.x.lock b/gemfiles/Gemfile.rails-6.1.x.lock
@@ -5,6 +5,7 @@ PATH
       ice_nine (~> 0.11)
       rails (>= 5.2.0)
       request_store (~> 1.3)
+      sassc-rails (~> 2.0)
 
 GEM
   remote: https://rubygems.org/
@@ -88,6 +89,8 @@ GEM
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     erubi (1.13.0)
+    ffi (1.17.0)
+    ffi (1.17.0-java)
     gli (2.21.0)
     globalid (1.2.1)
       activesupport (>= 6.1)
@@ -220,6 +223,14 @@ GEM
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
+    sassc (2.4.0)
+      ffi (~> 1.9)
+    sassc-rails (2.1.2)
+      railties (>= 4.0.0)
+      sassc (>= 2.0)
+      sprockets (> 3.0)
+      sprockets-rails
+      tilt
     shoulda (3.6.0)
       shoulda-context (~> 1.0, >= 1.0.1)
       shoulda-matchers (~> 3.0)
@@ -245,6 +256,7 @@ GEM
     terminal-table (3.0.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thor (1.3.2)
+    tilt (2.4.0)
     timeout (0.4.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)

diff --git a/gemfiles/Gemfile.rails-7.0.x.lock b/gemfiles/Gemfile.rails-7.0.x.lock
@@ -5,6 +5,7 @@ PATH
       ice_nine (~> 0.11)
       rails (>= 5.2.0)
       request_store (~> 1.3)
+      sassc-rails (~> 2.0)
 
 GEM
   remote: https://rubygems.org/
@@ -101,6 +102,8 @@ GEM
     docile (1.4.1)
     domain_name (0.6.20240107)
     erubi (1.13.0)
+    ffi (1.17.0)
+    ffi (1.17.0-x86_64-linux-gnu)
     gli (2.22.0)
     globalid (1.2.1)
       activesupport (>= 6.1)
@@ -240,6 +243,14 @@ GEM
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
+    sassc (2.4.0)
+      ffi (~> 1.9)
+    sassc-rails (2.1.2)
+      railties (>= 4.0.0)
+      sassc (>= 2.0)
+      sprockets (> 3.0)
+      sprockets-rails
+      tilt
     shoulda (4.0.0)
       shoulda-context (~> 2.0)
       shoulda-matchers (~> 4.0)
@@ -253,11 +264,19 @@ GEM
     simplecov-html (0.13.1)
     simplecov_json_formatter (0.1.4)
     smart_properties (1.17.0)
+    sprockets (4.2.1)
+      concurrent-ruby (~> 1.0)
+      rack (>= 2.2.4, < 4)
+    sprockets-rails (3.5.2)
+      actionpack (>= 6.1)
+      activesupport (>= 6.1)
+      sprockets (>= 3.0.0)
     sqlite3 (1.7.3-x86_64-linux)
     stringio (3.1.2)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     thor (1.3.2)
+    tilt (2.4.0)
     timeout (0.4.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)

diff --git a/gemfiles/Gemfile.rails-7.1.x.lock b/gemfiles/Gemfile.rails-7.1.x.lock
@@ -5,6 +5,7 @@ PATH
       ice_nine (~> 0.11)
       rails (>= 5.2.0)
       request_store (~> 1.3)
+      sassc-rails (~> 2.0)
 
 GEM
   remote: https://rubygems.org/
@@ -112,6 +113,7 @@ GEM
     domain_name (0.6.20240107)
     drb (2.2.1)
     erubi (1.13.0)
+    ffi (1.17.0-x86_64-linux-gnu)
     gli (2.22.0)
     globalid (1.2.1)
       activesupport (>= 6.1)
@@ -250,6 +252,14 @@ GEM
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
+    sassc (2.4.0)
+      ffi (~> 1.9)
+    sassc-rails (2.1.2)
+      railties (>= 4.0.0)
+      sassc (>= 2.0)
+      sprockets (> 3.0)
+      sprockets-rails
+      tilt
     securerandom (0.3.2)
     shoulda (4.0.0)
       shoulda-context (~> 2.0)
@@ -264,11 +274,19 @@ GEM
     simplecov-html (0.13.1)
     simplecov_json_formatter (0.1.4)
     smart_properties (1.17.0)
+    sprockets (4.2.1)
+      concurrent-ruby (~> 1.0)
+      rack (>= 2.2.4, < 4)
+    sprockets-rails (3.5.2)
+      actionpack (>= 6.1)
+      activesupport (>= 6.1)
+      sprockets (>= 3.0.0)
     sqlite3 (2.3.0-x86_64-linux-gnu)
     stringio (3.1.2)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     thor (1.3.2)
+    tilt (2.4.0)
     timeout (0.4.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)

diff --git a/gemfiles/Gemfile.rails-7.2.x.lock b/gemfiles/Gemfile.rails-7.2.x.lock
@@ -5,6 +5,7 @@ PATH
       ice_nine (~> 0.11)
       rails (>= 5.2.0)
       request_store (~> 1.3)
+      sassc-rails (~> 2.0)
 
 GEM
   remote: https://rubygems.org/
@@ -113,6 +114,8 @@ GEM
     domain_name (0.6.20240107)
     drb (2.2.1)
     erubi (1.13.0)
+    ffi (1.17.0-java)
+    ffi (1.17.0-x86_64-linux-gnu)
     gli (2.22.0)
     globalid (1.2.1)
       activesupport (>= 6.1)
@@ -259,6 +262,14 @@ GEM
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
+    sassc (2.4.0)
+      ffi (~> 1.9)
+    sassc-rails (2.1.2)
+      railties (>= 4.0.0)
+      sassc (>= 2.0)
+      sprockets (> 3.0)
+      sprockets-rails
+      tilt
     securerandom (0.3.2)
     shoulda (4.0.0)
       shoulda-context (~> 2.0)
@@ -273,11 +284,19 @@ GEM
     simplecov-html (0.13.1)
     simplecov_json_formatter (0.1.4)
     smart_properties (1.17.0)
+    sprockets (4.2.1)
+      concurrent-ruby (~> 1.0)
+      rack (>= 2.2.4, < 4)
+    sprockets-rails (3.5.2)
+      actionpack (>= 6.1)
+      activesupport (>= 6.1)
+      sprockets (>= 3.0.0)
     sqlite3 (2.2.0-x86_64-linux-gnu)
     stringio (3.1.2)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     thor (1.3.2)
+    tilt (2.4.0)
     timeout (0.4.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)