Merge 7976e47 into d9d47e1

.github/workflows/test.yml

@@ -12,35 +12,48 @@ jobs:
         gemfile: [gemfiles/rails_6.1.gemfile]
         orm: [active_record]
         adapter: [sqlite3]
+        asset: [sprockets]
         include:
           - ruby: 2.5
             gemfile: gemfiles/rails_6.0.gemfile
             orm: active_record
             adapter: sqlite3
+            asset: sprockets
           - ruby: 3.0
             gemfile: gemfiles/rails_6.1.gemfile
             orm: active_record
             adapter: mysql2
+            asset: sprockets
           - ruby: 3.0
             gemfile: gemfiles/rails_6.1.gemfile
             orm: active_record
             adapter: postgresql
+            asset: webpacker
           - ruby: 3.0
             gemfile: gemfiles/rails_7.0.gemfile
             orm: active_record
             adapter: sqlite3
+            asset: webpacker
+          - ruby: 3.0
+            gemfile: gemfiles/rails_7.0.gemfile
+            orm: active_record
+            adapter: sqlite3
+            asset: sprockets
           - ruby: 2.7
             gemfile: gemfiles/rails_6.0.gemfile
             orm: mongoid
             adapter: sqlite3
+            asset: sprockets
           - ruby: 3.0
             gemfile: gemfiles/rails_6.1.gemfile
             orm: mongoid
             adapter: sqlite3
+            asset: sprockets
           - ruby: jruby
             gemfile: gemfiles/rails_6.1.gemfile
             orm: mongoid
             adapter: sqlite3
+            asset: sprockets
     runs-on: ubuntu-latest
     services:
       mysql:
@@ -64,6 +77,7 @@ jobs:
     env:
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}
       CI_ORM: ${{ matrix.orm }}
+      CI_ASSET: ${{ matrix.asset }}
       JRUBY_OPTS: --debug
     steps:
       - uses: actions/checkout@v2
@@ -76,17 +90,23 @@ jobs:
         env:
           MAKE: make --jobs 4
           BUNDLE_WITHOUT: development
+      - name: Set up Node
+        uses: actions/setup-node@v2
+        with:
+          node-version: "14"
       - name: Setup application
         env:
           BUNDLE_GEMFILE: ../../${{ matrix.gemfile }}
           CI_DB_ADAPTER: ${{ matrix.adapter }}
           RAILS_ENV: test
         run: |
+          yarn install
           cd spec/dummy_app
           bundle exec rake rails_admin:prepare_ci_env db:create db:migrate
+          yarn install
           cd ../../
       - name: Run tests
-        run: bundle exec rake spec
+        run: bundle exec rspec
       - name: Coveralls Parallel
         if: ${{ github.repository_owner == 'railsadminteam' }}
         uses: coverallsapp/github-action@master
@@ -116,9 +136,9 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v2
       - name: Install dependencies
-        run: npm ci
+        run: yarn install
       - name: Run check
-        run: npx prettier --check .
+        run: yarn run prettier --check .
 
   rubocop:
     name: RuboCop

.gitignore

@@ -5,14 +5,16 @@
 .bundle
 .idea/
 .rvmrc
+.sass-cache
 .yardoc
 /.emacs.desktop
 /gemfiles/*.lock
+/node_modules/*
 /rails_admin.gems
 /spec/generators/tmp
 /spec/lib/tmp
+/yarn.lock
 Gemfile.lock
-Gemfile31.lock
 coverage/*
 db/*.sqlite3
 db/*.sqlite3-journal
@@ -26,7 +28,4 @@ spec/dummy_app/log/*.log
 spec/dummy_app/public/uploads
 spec/dummy_app/Gemfile.lock
 tmp/**/*
-/.emacs.desktop
-.idea/*.xml
-.sass-cache
 nbproject

.prettierignore

@@ -1,4 +1,6 @@
-app/assets/stylesheets/rails_admin/aristo
-app/assets/stylesheets/rails_admin/themes/cerulean
+coverage
+lib/generators/rails_admin/templates
+spec/dummy_app/public
+spec/dummy_app/tmp
 spec/support/jquery.simulate.drag-sortable.js
 vendor

.rspec

@@ -1,3 +1,4 @@
 --color
 --order=random
 --profile
+--exclude-pattern 'dummy_app/node_modules/rails_admin/**/*_spec.rb'

.rubocop.yml

@@ -6,11 +6,13 @@ require:
 AllCops:
   Exclude:
     - "gemfiles/*"
+    - "node_modules/**/*"
     - "spec/dummy_app/bin/**/*"
     - "spec/dummy_app/db/schema.rb"
     - "spec/dummy_app/tmp/**/*"
     - "vendor/bundle/**/*"
   NewCops: disable
+  SuggestExtensions: false
   TargetRubyVersion: 2.5
 
 Gemspec/DateAssignment:
@@ -116,7 +118,7 @@ Metrics/MethodLength:
   Max: 29 # TODO: Lower to 15
 
 Metrics/ModuleLength:
-  Max: 202 # TODO: Lower to 100
+  Max: 204 # TODO: Lower to 100
 
 Metrics/ParameterLists:
   Max: 8 # TODO: Lower to 4

Gemfile

@@ -3,6 +3,7 @@ source 'https://rubygems.org'
 gem 'appraisal', '>= 2.0'
 gem 'devise'
 gem 'rails'
+gem 'webpacker', require: false
 gem 'webrick', '~> 1.7'
 
 group :active_record do

app/assets/javascripts/rails_admin.js

@@ -0,0 +1,21 @@
+//=  require 'rails-ujs'
+//=  require 'rails_admin/jquery3'
+//=  require 'rails_admin/jquery.pjax'
+//=  require 'jquery_nested_form'
+//=  require 'rails_admin/jquery-ui/effect'
+//=  require 'rails_admin/jquery-ui/widgets/sortable'
+//=  require 'rails_admin/jquery-ui/widgets/autocomplete'
+//=  require 'rails_admin/moment-with-locales'
+//=  require 'rails_admin/bootstrap-datetimepicker'
+//=  require 'rails_admin/bootstrap/bootstrap'
+
+//=  require 'rails_admin/filter-box'
+//=  require 'rails_admin/filtering-multiselect'
+//=  require 'rails_admin/filtering-select'
+//=  require 'rails_admin/remote-form'
+//=  require 'rails_admin/nested-form-hooks'
+//=  require 'rails_admin/i18n'
+//=  require 'rails_admin/widgets'
+//=  require 'rails_admin/sidescroll'
+//=  require 'rails_admin/ui'
+//=  require 'rails_admin/custom/ui'

app/assets/stylesheets/rails_admin/rails_admin.scss.erb → app/assets/stylesheets/rails_admin.scss.erb

@@ -1,19 +1,3 @@
-// Issue 1956 (https://github.com/railsadminteam/rails_admin/issues/1956)
-//= depend_on_asset "rails_admin/bootstrap/glyphicons-halflings.png"
-//= depend_on_asset "rails_admin/bootstrap/glyphicons-halflings-white.png"
-//= depend_on_asset "rails_admin/aristo/images/bg_fallback.png"
-//= depend_on_asset "rails_admin/aristo/images/ui-icons_222222_256x240.png"
-//= depend_on_asset "rails_admin/aristo/images/ui-icons_454545_256x240.png"
-//= depend_on_asset "rails_admin/aristo/images/icon_sprite.png"
-//= depend_on_asset "rails_admin/aristo/images/slider_handles.png"
-//= depend_on_asset "rails_admin/aristo/images/progress_bar.gif"
-//= depend_on_asset "rails_admin/multiselect/icon_sprite.png"
-//= depend_on_asset "rails_admin/multiselect/ui-icon-circle-triangle-n-light.png"
-//= depend_on_asset "rails_admin/multiselect/ui-icon-circle-triangle-n-dark.png"
-//= depend_on_asset "rails_admin/multiselect/ui-icon-circle-triangle-s-light.png"
-//= depend_on_asset "rails_admin/multiselect/ui-icon-circle-triangle-s-dark.png"
-
-
 @charset "UTF-8";
 
 <%
@@ -24,25 +8,23 @@
 
 @import "rails_admin/custom/variables";
 @import "rails_admin/bootstrap/variables";
-@import "rails_admin/base/variables";
-@import "rails_admin/themes/<%= theme %>/variables";
+@import "rails_admin/styles/base/variables";
+@import "rails_admin/styles/themes/<%= theme %>/variables";
 
 /***  Mixins  ***/
 
 @import "rails_admin/bootstrap/mixins";
-@import "rails_admin/base/mixins";
-@import "rails_admin/themes/<%= theme %>/mixins";
+@import "rails_admin/styles/base/mixins";
+@import "rails_admin/styles/themes/<%= theme %>/mixins";
 @import "rails_admin/custom/mixins";
 
-/*** Reset ***/
-<%# @import "rails_admin/bootstrap/reset"; %>
 /***  Libraries  ***/
 
-@import "rails_admin/aristo/jquery-ui-1.8.7.custom";
 @import "rails_admin/bootstrap-datetimepicker-build";
-@import "rails_admin/ra.filtering-multiselect";
-@import "rails_admin/ra.widgets";
-@import "rails_admin/ra.sidescroll";
+@import "rails_admin/styles/filtering-select";
+@import "rails_admin/styles/filtering-multiselect";
+@import "rails_admin/styles/widgets";
+@import "rails_admin/styles/sidescroll";
 
 
 /*** Font-awesome ***/
@@ -87,8 +69,8 @@
 
 /***  RailsAdmin Theming  ***/
 
-@import "rails_admin/base/theming";
-@import "rails_admin/themes/<%= theme %>/theming";
+@import "rails_admin/styles/base/theming";
+@import "rails_admin/styles/themes/<%= theme %>/theming";
 @import "rails_admin/custom/theming";