activeadmin-rails 1.7.1 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34770b5aac9a2079cd8c360765e1b0f1ca09b5fac462ca586b97a9f55ff66915
-  data.tar.gz: 79f6e989087820f88e3724c061344e7b70f233f56b76af378512a6d3ef697c05
+  metadata.gz: db35daadd78e228b2d6a52d48ca15b3daaf143d079a96e697bca22a781535c31
+  data.tar.gz: 740c4e6b623fa8b9fcb49784a171ff569510d3858aa38bc8ed1477f5a840a757
 SHA512:
-  metadata.gz: 3909daf70b9cd60b09bc38891f74cd3d3102cb2946936c35f69ee73156cdb9827bd2a0d1af4baa36ecb9936c2634d117044676bb1f0ce7d8b5241f51c4ab2e31
-  data.tar.gz: 38982c2eaa887c737ea0ea09e4a9f609930601a561b181a02a70c5b6ad750dda2c9f33a7c882331185bc6566d3952608445e19d9785d008052eab14e018e98d0
+  metadata.gz: f000b569105c403974d50ccb9c0c982fa6423b5a0024ce1fc955e2225408b623d5490afa159faac2d8febe796b99d4dab2b6ef59e1e6bfeebb98082ae29da1bd
+  data.tar.gz: d50e024eed6afe0988459d18d24653b1fda634a2ba01888ef2d408d857387b99a5493796a75598ebcd743db0c3cfb0a26dd69c12cb2bbf2ca8242723dc1e8c76

data/.babelrc

@@ -0,0 +1,5 @@
+{
+  "presets": [
+    ["@babel/env", { "modules": false, "loose": true } ]
+  ]
+}

data/.github/workflows/ci.yaml

@@ -14,6 +14,12 @@ jobs:
     strategy:
       matrix:
         include:
+          - ruby: { name: 3.4, value: 3.4.8 }
+            deps: rails_81
+            os: ubuntu-24.04
+          - ruby: { name: 3.3, value: 3.3.6 }
+            deps: rails_80
+            os: ubuntu-24.04
           - ruby: { name: 3.3, value: 3.3.6 }
             deps: rails_72
             os: ubuntu-24.04
@@ -23,24 +29,6 @@ jobs:
           - ruby: { name: 3.2, value: 3.2.2 }
             deps: rails_71
             os: ubuntu-22.04
-          - ruby: { name: 3.2, value: 3.2.2 }
-            deps: rails_70
-            os: ubuntu-22.04
-          - ruby: { name: 3.2, value: 3.2.2 }
-            deps: rails_70_hotwire
-            os: ubuntu-22.04
-          - ruby: { name: 3.1, value: 3.1.6 }
-            deps: rails_70
-            os: ubuntu-22.04
-          - ruby: { name: 3.1, value: 3.1.6 }
-            deps: rails_70_hotwire
-            os: ubuntu-22.04
-          - ruby: { name: 3.1, value: 3.1.2 }
-            deps: rails_61
-            os: ubuntu-22.04
-          - ruby: { name: 3.1, value: 3.1.2 }
-            deps: rails_61_turbolinks
-            os: ubuntu-22.04
       fail-fast: false
 
     env:

data/.github/workflows/daily.yaml

@@ -14,30 +14,21 @@ jobs:
     strategy:
       matrix:
         include:
+          - ruby: { name: 3.4, value: 3.4.8 }
+            deps: rails_81
+            os: ubuntu-24.04
+          - ruby: { name: 3.3, value: 3.3.6 }
+            deps: rails_80
+            os: ubuntu-24.04
+          - ruby: { name: 3.3, value: 3.3.6 }
+            deps: rails_72
+            os: ubuntu-24.04
           - ruby: { name: 3.3, value: 3.3.6 }
             deps: rails_71
             os: ubuntu-24.04
           - ruby: { name: 3.2, value: 3.2.2 }
             deps: rails_71
             os: ubuntu-22.04
-          - ruby: { name: 3.2, value: 3.2.2 }
-            deps: rails_70
-            os: ubuntu-22.04
-          - ruby: { name: 3.2, value: 3.2.2 }
-            deps: rails_70_hotwire
-            os: ubuntu-22.04
-          - ruby: { name: 3.1, value: 3.1.6 }
-            deps: rails_70
-            os: ubuntu-22.04
-          - ruby: { name: 3.1, value: 3.1.6 }
-            deps: rails_70_hotwire
-            os: ubuntu-22.04
-          - ruby: { name: 3.1, value: 3.1.2 }
-            deps: rails_61
-            os: ubuntu-22.04
-          - ruby: { name: 3.1, value: 3.1.2 }
-            deps: rails_61_turbolinks
-            os: ubuntu-22.04
       fail-fast: false
 
     env:

data/.github/workflows/pages.yml

@@ -55,7 +55,7 @@ jobs:
           JEKYLL_ENV: production
       - name: Upload artifact
         # Automatically uploads an artifact from the './_site' directory by default
-        uses: actions/upload-pages-artifact@v1
+        uses: actions/upload-pages-artifact@v3
         with:
           path: "docs/_site/"
 

data/.gitignore

@@ -14,6 +14,8 @@ docs/_site
 spec/rails
 Gemfile.lock
 gemfiles/rails_*.gemfile.lock
+node_modules
+yarn.lock
 .test-rails-apps
 public
 .rspec

data/CHANGELOG.md

@@ -1,8 +1,27 @@
 # Changelog
 
+## 1.8.0 [☰](https://github.com/varyonic/activeadmin-rails/compare/v1.7.2...v1.8.0)
+
+This release supports both Sprockets and Propshaft. CSS has been modernized and updated to Dart Sass.
+
+### Enhancements
+
+* Rails 8.1 support. [#64] by [@varyonic]
+* Support applications using either Propshaft or Sprockets. [#62] by [@varyonic]
+* Replace jquery-rails and jquery-ui-rails gems with CDN assets. [#60] by [@varyonic]
+* Configure Rollup to bundle JavaScript outside of Sprockets. [#58] by [@varyonic] (from [#5868], [#5888] and [@5956] by [@sgara])
+* Modernize CSS. [#57] by [@varyonic]
+* Replace SassC (EOL) with Dart Sass. [#55] by [@varyonic]
+
+## 1.7.2 [☰](https://github.com/varyonic/activeadmin-rails/compare/v1.7.1...v1.7.2)
+
+### Enhancements
+
+* Rails 8.0 support. [#54] by [@varyonic]
+
 ## 1.7.1 [☰](https://github.com/varyonic/activeadmin-rails/compare/v1.7.0...v1.7.1)
 
-#### Minor
+### Enhancements
 
 * Rails 7.2 support. [#53] by [@varyonic]
 * Verify Ruby 3.3 support. [#50] by [@varyonic]
@@ -426,10 +445,13 @@ Please check [0-6-stable] for previous changes.
 [#5501]: https://github.com/activeadmin/activeadmin/pull/5501
 [#5516]: https://github.com/activeadmin/activeadmin/pull/5516
 [#5583]: https://github.com/activeadmin/activeadmin/pull/5583
-[#5842]: https://github.com/activeadmin/activeadmin/pull/5842
 [#5650]: https://github.com/activeadmin/activeadmin/pull/5650
 [#5702]: https://github.com/activeadmin/activeadmin/pull/5702
 [#5800]: https://github.com/activeadmin/activeadmin/pull/5800
+[#5842]: https://github.com/activeadmin/activeadmin/pull/5842
+[#5842]: https://github.com/activeadmin/activeadmin/pull/5868
+[#5842]: https://github.com/activeadmin/activeadmin/pull/5888
+[#5842]: https://github.com/activeadmin/activeadmin/pull/5956
 [#6000]: https://github.com/activeadmin/activeadmin/pull/6000
 [#6237]: https://github.com/activeadmin/activeadmin/pull/6237
 [#7235]: https://github.com/activeadmin/activeadmin/pull/7235
@@ -462,6 +484,17 @@ Please check [0-6-stable] for previous changes.
 [#42]: https://github.com/varyonic/activeadmin-rails/pull/42
 [#43]: https://github.com/varyonic/activeadmin-rails/pull/43
 [#45]: https://github.com/varyonic/activeadmin-rails/pull/45
+[#49]: https://github.com/varyonic/activeadmin-rails/pull/49
+[#50]: https://github.com/varyonic/activeadmin-rails/pull/50
+[#52]: https://github.com/varyonic/activeadmin-rails/pull/52
+[#53]: https://github.com/varyonic/activeadmin-rails/pull/53
+[#54]: https://github.com/varyonic/activeadmin-rails/pull/54
+[#54]: https://github.com/varyonic/activeadmin-rails/pull/55
+[#54]: https://github.com/varyonic/activeadmin-rails/pull/57
+[#54]: https://github.com/varyonic/activeadmin-rails/pull/58
+[#54]: https://github.com/varyonic/activeadmin-rails/pull/60
+[#54]: https://github.com/varyonic/activeadmin-rails/pull/62
+[#54]: https://github.com/varyonic/activeadmin-rails/pull/64
 
 [@5t111111]: https://github.com/5t111111
 [@aarek]: https://github.com/aarek

data/CONTRIBUTING.md

@@ -36,7 +36,7 @@ Make sure you're using a recent ruby and have the `bundler` gem installed.
 Select the Gemfile for your preferred Rails version, preferably the latest:
 
 ```sh
-export BUNDLE_GEMFILE=gemfiles/rails_72.gemfile
+export BUNDLE_GEMFILE=gemfiles/rails_81.gemfile
 ```
 
 Now install the development dependencies:

data/Gemfile

@@ -1,11 +1,11 @@
 source 'https://rubygems.org'
 
 gem 'arbo'
+gem 'jquery-ui-rails', '< 8.x' # Pending release of fixed version, see jquery/jquery-ui#2344
 
 # Optional dependencies
 gem 'cancan'
 gem 'pundit'
-gem 'sqlite3', '~> 1.x'
 gem 'jruby-openssl', '~> 0.10.1', platforms: :jruby
 
 # Utility gems used in both development & test environments
@@ -43,7 +43,7 @@ group :test do
   gem 'simplecov', require: false # Test coverage generator. Go to /coverage/ after running tests
   gem 'codecov', require: false # Test coverage website. Go to https://codecov.io
   gem 'cucumber-rails', require: false
-  gem 'cucumber'
+  gem 'cucumber', '< 10'
   gem 'database_cleaner'
   gem 'jasmine'
   gem 'launchy'

data/Rakefile

@@ -21,6 +21,7 @@ task :setup, [:parallel, :dir, :template] do |_t, opts|
     )
     args << "--skip-turbolinks" unless ENV['BUNDLE_GEMFILE'] =~ /turbolinks/
     args << "--skip-hotwire" unless ENV['BUNDLE_GEMFILE'] =~ /hotwire/
+    args << "--javascript=rollup"
 
     command = ['bundle', 'exec', 'rails', 'new', app_dir, *args].join(' ')
 

data/activeadmin-rails.gemspec

@@ -25,15 +25,12 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.5'
 
   s.add_dependency 'arbo'
+  s.add_dependency 'csv'
   s.add_dependency 'formtastic'
   s.add_dependency 'formtastic_i18n'
   s.add_dependency 'inherited_resources', '>= 1.13.1'
-  s.add_dependency 'jquery-rails', '>= 4.2.0'
-  s.add_dependency 'jquery-ui-rails', '>= 6.0'
   s.add_dependency 'kaminari', '>= 1.0.1'
   s.add_dependency 'railties', '>= 5.0'
   s.add_dependency 'ransack', '>= 1.8.7'
-  s.add_dependency 'sass-rails'
-  s.add_dependency 'sprockets'
-  s.add_dependency 'sprockets-es6', '>= 0.9.2'
+  s.add_dependency 'dartsass-rails'
 end