Merge branch 'master' into fix-848

Author: BookOfGreg

.rubocop.yml

@@ -1,10 +1,10 @@
 AllCops:
-  TargetRubyVersion: 2.1
+  TargetRubyVersion: 2.3
   DisplayCopNames: true
   Exclude:
     - test/dummy_sprockets/**/*
     - test/dummy_webpacker1/**/*
     - test/dummy_webpacker2/**/*
     - test/dummy_webpacker3/**/*
     - node_modules/**/*
-    - react_ujs/**/*
+    - react_ujs/**/*

.travis.yml

@@ -9,7 +9,6 @@ cache:
 rvm:
   - 2.5.0
   - 2.3.0
-  - 2.1
   - jruby-9.1.9.0
 
 gemfile:
@@ -20,10 +19,6 @@ gemfile:
   - gemfiles/rails_5_no_sprockets_webpacker_2.gemfile
   - gemfiles/rails_5_no_sprockets_webpacker_3.gemfile
   # These don't have webpacker:
-  - gemfiles/rails_3.2.gemfile
-  - gemfiles/rails_4.0.5.gemfile
-  - gemfiles/rails_4.0_with_mini_racer.gemfile
-  - gemfiles/rails_4.1.gemfile
   - gemfiles/rails_4.2_sprockets_2.gemfile
   - gemfiles/rails_4.2_sprockets_3.gemfile
   - gemfiles/rails_5_no_sprockets.gemfile
@@ -32,40 +27,8 @@ gemfile:
 matrix:
   fast_finish: true
   exclude:
-    - rvm: 2.5.0
-      gemfile: gemfiles/rails_3.2.gemfile
-    - rvm: 2.5.0
-      gemfile: gemfiles/rails_4.0_with_mini_racer.gemfile
-    - rvm: 2.5.0
-      gemfile: gemfiles/rails_4.0.5.gemfile
-    - rvm: 2.5.0
-      gemfile: gemfiles/rails_4.1.gemfile
-    # all except rails_4.1 skipped on 2.1
-    - rvm: 2.1
-      gemfile: gemfiles/rails_3.2.gemfile
-    - rvm: 2.1
-      gemfile: gemfiles/rails_4.0.5.gemfile
-    - rvm: 2.1
-      gemfile: gemfiles/rails_4.0_with_mini_racer.gemfile
-    - rvm: 2.1
-      gemfile: gemfiles/rails_4.2_sprockets_2.gemfile
-    - rvm: 2.1
-      gemfile: gemfiles/rails_4.2_sprockets_3.gemfile
-    - rvm: 2.1
-      gemfile: gemfiles/rails_4.2_sprockets_4.gemfile
-    - rvm: 2.1
-      gemfile: gemfiles/rails_5_no_sprockets_webpacker_1_1.gemfile
-    - rvm: 2.1
-      gemfile: gemfiles/rails_5_no_sprockets_webpacker_1_x.gemfile
-    - rvm: 2.1
-      gemfile: gemfiles/rails_5_no_sprockets_webpacker_2.gemfile
-    - rvm: 2.1
-      gemfile: gemfiles/rails_5_no_sprockets_webpacker_3.gemfile
-    - rvm: 2.1
-      gemfile: gemfiles/rails_5_no_sprockets.gemfile
-    - rvm: 2.1
-      gemfile: gemfiles/rails_5.1_sprockets_4.gemfile
-    # all except 5.1_sprockets_4, 5.1_webpacker_3, 4.2_sprockets_3, and 3.2 skipped on jruby
+
+    # all except 5.1_sprockets_4, 5.1_webpacker_3, 4.2_sprockets_3
     - rvm: jruby-9.1.9.0
       gemfile: gemfiles/rails_4.2_sprockets_4.gemfile
     - rvm: jruby-9.1.9.0
@@ -74,12 +37,6 @@ matrix:
       gemfile: gemfiles/rails_5_no_sprockets_webpacker_1_x.gemfile
     - rvm: jruby-9.1.9.0
       gemfile: gemfiles/rails_5_no_sprockets_webpacker_2.gemfile
-    - rvm: jruby-9.1.9.0
-      gemfile: gemfiles/rails_4.0.5.gemfile
-    - rvm: jruby-9.1.9.0
-      gemfile: gemfiles/rails_4.0_with_mini_racer.gemfile
-    - rvm: jruby-9.1.9.0
-      gemfile: gemfiles/rails_4.1.gemfile
     - rvm: jruby-9.1.9.0
       gemfile: gemfiles/rails_4.2_sprockets_2.gemfile
     - rvm: jruby-9.1.9.0

Appraisals

@@ -70,34 +70,3 @@ appraise 'rails-4.2-sprockets_2' do
   gem 'sprockets', '~> 2.12'
   gem 'turbolinks'
 end
-
-appraise 'rails-4.1' do
-  gem 'rails', '~> 4.1.10'
-  # Just to make sure we support old Turbolinks:
-  gem 'turbolinks', '~> 2.3.0'
-end
-
-appraise 'rails-4.0-with-mini_racer' do
-  gem 'rails', '~> 4.0.13'
-  gem 'mini_racer', :platforms => :mri
-  gem 'therubyrhino', :platforms => :jruby
-  gem 'turbolinks'
-end
-
-appraise 'rails-4.0.5' do
-  # Depends on sprockets-rails ~> 2.0.0. Support for
-  # `Rails.application.assets_manifest` which is used by
-  # `ServerRendering::ManifestContainer` has only been added in
-  # sprockets-rails 2.2.2. Ensure that server rendering falls back to
-  # `ServerRendering::EnvironmentContainer`.`
-  gem 'rails', '4.0.5'
-  gem 'turbolinks'
-end
-
-appraise 'rails-3.2' do
-  gem 'rails', '~> 3.2.21'
-  gem 'rack-cache', '~> 1.6.1'
-  # Modern turbolinks depends on `Rails.application.assets` which no-worky
-  gem 'turbolinks', '~> 2.0'
-end
-

gemfiles/.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_RETRY: "1"

gemfiles/rails_3.2.gemfile

@@ -128,14 +128,7 @@ module.exports = function(ujs) {
     nativeEvents.teardown(ujs);
   }
 
-  if (ujs.jQuery) {
-    ujs.handleEvent = function(eventName, callback) {
-      ujs.jQuery(document).on(eventName, callback);
-    };
-    ujs.removeEvent = function(eventName, callback) {
-      ujs.jQuery(document).off(eventName, callback);
-    }
-  } else if ('addEventListener' in window) {
+  if ('addEventListener' in window) {
     ujs.handleEvent = function(eventName, callback) {
       document.addEventListener(eventName, callback);
     };
@@ -387,10 +380,7 @@ module.exports = {
   // Attach handlers to browser events to mount
   // (There are no unmount handlers since the page is destroyed on navigation)
   setup: function(ujs) {
-    if (ujs.jQuery) {
-      // Use jQuery if it's present:
-      ujs.handleEvent("ready", ujs.handleMount);
-    } else if ('addEventListener' in window) {
+    if ('addEventListener' in window) {
       ujs.handleEvent('DOMContentLoaded', ujs.handleMount);
     } else {
       // add support to IE8 without jQuery
@@ -399,7 +389,6 @@ module.exports = {
   },
 
   teardown: function(ujs) {
-    ujs.removeEvent("ready", ujs.handleMount);
     ujs.removeEvent('DOMContentLoaded', ujs.handleMount);
     ujs.removeEvent('onload', ujs.handleMount);
   }

gemfiles/rails_4.0.5.gemfile

@@ -14,6 +14,6 @@
     "webpack": "^2.3.3"
   },
   "dependencies": {
-    "react_ujs": "^2.4.2"
+    "react_ujs": "^2.4.3"
   }
 }