Merge b383d35 into cb1ac73

.github/workflows/test.yml

@@ -12,35 +12,43 @@ jobs:
         gemfile: [ gemfiles/rails_6.1.gemfile ]
         orm: [ active_record ]
         adapter: [ sqlite3 ]
+        asset: [ webpacker ]
         include:
           - ruby: 2.5
             gemfile: gemfiles/rails_6.0.gemfile
             orm: active_record
             adapter: sqlite3
+            asset: webpacker
           - ruby: 3.0
             gemfile: gemfiles/rails_6.1.gemfile
             orm: active_record
             adapter: mysql2
+            asset: webpacker
           - 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: 2.7
             gemfile: gemfiles/rails_6.0.gemfile
             orm: mongoid
             adapter: sqlite3
+            asset: webpacker
           - ruby: 3.0
             gemfile: gemfiles/rails_6.1.gemfile
             orm: mongoid
             adapter: sqlite3
+            asset: webpacker
           - ruby: jruby
             gemfile: gemfiles/rails_6.1.gemfile
             orm: mongoid
             adapter: sqlite3
+            asset: webpacker
     runs-on: ubuntu-latest
     services:
       mysql:
@@ -64,6 +72,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 +85,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

.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

.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,6 +1,5 @@
 //=  require 'jquery3'
 //=  require 'rails-ujs'
-//=  require 'jquery.remotipart'
 //=  require 'rails_admin/jquery-ui'
 //=  require 'rails_admin/moment-with-locales'
 //=  require 'rails_admin/bootstrap-datetimepicker'

app/views/layouts/rails_admin/_head.html.haml

@@ -3,5 +3,9 @@
 %meta{content: "width=device-width, initial-scale=1", name: "viewport; charset=utf-8"}
 %meta{content: "NONE,NOARCHIVE", name: "robots"}
 = csrf_meta_tag
-= stylesheet_link_tag "rails_admin/rails_admin.css", media: :all
-= javascript_include_tag "rails_admin/rails_admin.js"
+- if RailsAdmin::config.asset_source == :webpacker
+  = javascript_pack_tag "rails_admin"
+  = stylesheet_pack_tag "rails_admin"
+- else
+  = stylesheet_link_tag "rails_admin/rails_admin.css", media: :all
+  = javascript_include_tag "rails_admin/rails_admin.js"

gemfiles/rails_6.0.gemfile

@@ -7,6 +7,7 @@ gem "rails", "~> 6.0.0"
 gem "haml"
 gem "devise", "~> 4.7"
 gem "webrick", "~> 1.7"
+gem "webpacker", require: false
 gem "sassc-rails", "~> 2.1"
 
 group :active_record do

gemfiles/rails_6.1.gemfile

@@ -7,6 +7,7 @@ gem "rails", "~> 6.1.0"
 gem "haml"
 gem "devise", "~> 4.7"
 gem "webrick", "~> 1.7"
+gem "webpacker", require: false
 gem "sassc-rails", "~> 2.1"
 
 group :active_record do

gemfiles/rails_7.0.gemfile

@@ -7,6 +7,7 @@ gem "rails", "~> 7.0.0.alpha2"
 gem "haml"
 gem "devise", "~> 4.7", github: "strobilomyces/devise", branch: "patch-1"
 gem "webrick", "~> 1.7"
+gem "webpacker", require: false
 gem "sassc-rails", "~> 2.1"
 
 group :active_record do

lib/rails_admin.rb

@@ -55,5 +55,3 @@ def self.yaml_dump(object)
     YAML.dump(object)
   end
 end
-
-require 'rails_admin/bootstrap-sass' unless defined? Bootstrap

lib/rails_admin/config.rb

@@ -86,6 +86,9 @@ class << self
       attr_accessor :navigation_static_links
       attr_accessor :navigation_static_label
 
+      # Set where RailsAdmin fetches JS/CSS from, defaults to :sprockets
+      attr_accessor :asset_source
+
       # Finish initialization by executing deferred configuration blocks
       def initialize!
         @deferred_blocks.each { |block| block.call(self) }
@@ -317,6 +320,7 @@ def reset
         @show_gravatar = true
         @navigation_static_links = {}
         @navigation_static_label = nil
+        @asset_source = (defined?(Webpacker) ? :webpacker : :sprockets)
         @parent_controller = '::ActionController::Base'
         @forgery_protection_settings = {with: :exception}
         RailsAdmin::Config::Actions.reset