Merge ee102ce into d79d49e

.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
         uses: coverallsapp/github-action@master
         continue-on-error: true
@@ -114,9 +134,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: ./node_modules/.bin/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,7 @@
-app/assets/stylesheets/rails_admin/aristo
-app/assets/stylesheets/rails_admin/themes/cerulean
+coverage
+spec/dummy_app/public
+spec/dummy_app/tmp
 spec/support/jquery.simulate.drag-sortable.js
+src/rails_admin/styles/aristo
+src/rails_admin/styles/themes/cerulean
 vendor

.rspec

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

.rubocop.yml

@@ -3,11 +3,13 @@ inherit_from: .rubocop_todo.yml
 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:
@@ -109,7 +111,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

@@ -5,6 +5,7 @@ gem 'rails'
 gem 'haml'
 gem 'devise'
 gem 'webrick', '~> 1.7'
+gem 'webpacker', require: false
 
 group :active_record do
   gem 'paper_trail'

app/assets/javascripts/rails_admin/rails_admin.js

@@ -1,19 +1,21 @@
 //=  require 'jquery3'
 //=  require 'rails-ujs'
-//=  require 'jquery.remotipart'
-//=  require 'rails_admin/jquery-ui'
-//=  require 'rails_admin/moment-with-locales'
-//=  require 'rails_admin/bootstrap-datetimepicker'
-//=  require 'rails_admin/ra.filter-box'
-//=  require 'rails_admin/ra.filtering-multiselect'
-//=  require 'rails_admin/ra.filtering-select'
-//=  require 'rails_admin/ra.remote-form'
 //=  require 'rails_admin/jquery.pjax'
 //=  require 'jquery_nested_form'
-//=  require 'rails_admin/ra.nested-form-hooks'
-//=  require 'rails_admin/ra.i18n'
+//=  require 'jquery-ui/effect'
+//=  require 'jquery-ui/widgets/sortable'
+//=  require 'jquery-ui/widgets/autocomplete'
+//=  require 'rails_admin/moment-with-locales'
+//=  require 'rails_admin/bootstrap-datetimepicker'
 //=  require 'rails_admin/bootstrap/bootstrap'
-//=  require 'rails_admin/ra.widgets'
-//=  require 'rails_admin/ra.sidescroll'
+
+//=  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'