Merge pull request #319 from platanus/webpacker

Webpacker

Author: gmq

.gitignore

@@ -12,3 +12,5 @@ spec/dummy/public/system
 .tags
 .tags_sorted_by_file
 vendor/bundle
+node_modules
+src

.travis.yml

@@ -5,11 +5,11 @@ rvm:
   - 2.6.5
   - 2.7.0
 script:
-  - cd spec/dummy && RAILS_ENV=test bundle exec rake db:create db:migrate
-  - cd ../.. && bundle exec rspec spec
+  - bundle exec rake tests
 addons:
   chrome: stable
 before_install:
+  - nvm install --lts
   - gem install bundler:1.17.2
   - google-chrome-stable --headless --disable-gpu --no-sandbox --remote-debugging-port=9222 http://localhost &
 env:

CHANGELOG.md

@@ -8,6 +8,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 * Added filters option in nested selects [#301](https://github.com/platanus/activeadmin_addons/pull/301)
 * Date range filters and date picker inputs now has `autocomplete: 'off'` by default [#320](https://github.com/platanus/activeadmin_addons/pull/320)
 * Added `tags` option to default select2 inputs [#322](https://github.com/platanus/activeadmin_addons/pull/322)
+* Added Webpacker compatibility, if ActiveAdmin has been installed using that mode. [#319](https://github.com/platanus/activeadmin_addons/pull/319)
 
 ##### Fixed
 * Added CSRF header for interactive select tag [#262](https://github.com/platanus/activeadmin_addons/pull/262)

Gemfile

@@ -13,4 +13,3 @@ gemspec
 # To use debugger
 # gem "debugger"
 gem "activeadmin"
-gem "devise"

Gemfile.lock

@@ -73,7 +73,6 @@ GEM
       activesupport (>= 3.0.0)
     arel (9.0.0)
     ast (2.4.0)
-    bcrypt (3.1.13)
     builder (3.2.4)
     capybara (3.31.0)
       addressable
@@ -92,12 +91,6 @@ GEM
     concurrent-ruby (1.1.6)
     crass (1.0.6)
     database_cleaner (1.8.2)
-    devise (4.7.1)
-      bcrypt (~> 3.0)
-      orm_adapter (~> 0.1)
-      railties (>= 4.1.0)
-      responders
-      warden (~> 1.2.3)
     diff-lcs (1.3)
     enumerize (2.3.1)
       activesupport (>= 3.2)
@@ -181,7 +174,6 @@ GEM
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    orm_adapter (0.5.0)
     paperclip (6.1.0)
       activemodel (>= 4.2.0)
       activesupport (>= 4.2.0)
@@ -307,8 +299,6 @@ GEM
     tzinfo (1.2.6)
       thread_safe (~> 0.1)
     unicode-display_width (1.4.1)
-    warden (1.2.8)
-      rack (>= 2.0.6)
     webdrivers (4.2.0)
       nokogiri (~> 1.6)
       rubyzip (>= 1.3.0)
@@ -331,7 +321,6 @@ DEPENDENCIES
   activeadmin_addons!
   capybara-selenium
   database_cleaner
-  devise
   enumerize (~> 2.0)
   factory_bot_rails
   guard

README.md

@@ -228,6 +228,8 @@ filter :category_id, as: :search_select_filter
 Use default active_admin theme.
 
 #### Material Theme
+##### Not compatible when Active Admin has been installed in webpack mode
+
 Show material design theme using [active_material](https://github.com/vigetlabs/active_material). If you want to use it, you should run the generator using the flag `theme` as follow:
 
 ```ruby
@@ -251,9 +253,10 @@ For material documentation you should go to [gem documentation](http://code.vige
 
 1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+3. If you changed the javascript/scss files, run `yarn build`.
+4. Commit your changes (`git commit -am 'Add some feature'`)
+5. Push to the branch (`git push origin my-new-feature`)
+6. Create new Pull Request
 
 If you want to collaborate, please check [the rules](docs/CONTRIBUTING.md) first.
 

Rakefile

@@ -14,5 +14,11 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-Bundler::GemHelper.install_tasks
+task :tests do
+  sh "bin/setup"
+  sh "rspec"
+  sh "bin/setup --use_webpacker"
+  sh "rspec"
+end
 
+Bundler::GemHelper.install_tasks