Support webpacker-but-not-sprockets

rmosolgo · rmosolgo · commit b9923c4a9885 · 2017-04-07T14:33:19.000-04:00
diff --git a/Appraisals b/Appraisals
@@ -49,9 +49,8 @@ appraise "rails-4.2-sprockets_4" do
   gem "mini_racer"
 end
 
-appraise "rails-5" do
+appraise "rails-5_no_sprockets_webpacker" do
   gem 'rails', '~> 5.0.0'
-  gem "turbolinks", "~> 5.0.0"
   gem "webpacker", github: "rails/webpacker"
   # This ExecJS backend provides stateful context
   # which the default nodejs backend does not
diff --git a/gemfiles/rails_3.2.gemfile b/gemfiles/rails_3.2.gemfile
@@ -2,8 +2,8 @@
 
 source "http://rubygems.org"
 
+gem "turbolinks", "~> 2.0"
 gem "rails", "~> 3.2.21"
 gem "rack-cache", "~> 1.6.1"
-gem "turbolinks", "~> 2.0"
 
 gemspec :path => "../"
diff --git a/gemfiles/rails_4.0.5.gemfile b/gemfiles/rails_4.0.5.gemfile
@@ -2,7 +2,7 @@
 
 source "http://rubygems.org"
 
-gem "rails", "4.0.5"
 gem "turbolinks"
+gem "rails", "4.0.5"
 
 gemspec :path => "../"
diff --git a/gemfiles/rails_4.0_with_therubyracer.gemfile b/gemfiles/rails_4.0_with_therubyracer.gemfile
@@ -2,8 +2,8 @@
 
 source "http://rubygems.org"
 
+gem "turbolinks"
 gem "rails", "~> 4.0.13"
 gem "therubyracer", "0.12.0", :platform => :mri
-gem "turbolinks"
 
 gemspec :path => "../"
diff --git a/gemfiles/rails_4.1.gemfile b/gemfiles/rails_4.1.gemfile
@@ -2,7 +2,7 @@
 
 source "http://rubygems.org"
 
-gem "rails", "~> 4.1.10"
 gem "turbolinks", "~> 2.3.0"
+gem "rails", "~> 4.1.10"
 
 gemspec :path => "../"
diff --git a/gemfiles/rails_4.2_sprockets_2.gemfile b/gemfiles/rails_4.2_sprockets_2.gemfile
@@ -2,8 +2,8 @@
 
 source "http://rubygems.org"
 
+gem "turbolinks"
 gem "rails", "~> 4.2.1"
 gem "sprockets", "~> 2.12"
-gem "turbolinks"
 
 gemspec :path => "../"
diff --git a/gemfiles/rails_4.2_sprockets_3.gemfile b/gemfiles/rails_4.2_sprockets_3.gemfile
@@ -2,8 +2,8 @@
 
 source "http://rubygems.org"
 
+gem "turbolinks", "~> 2.5.0"
 gem "rails", "~> 4.2.1"
 gem "sprockets", "~> 3.5"
-gem "turbolinks", "~> 2.5.0"
 
 gemspec :path => "../"
diff --git a/gemfiles/rails_4.2_sprockets_4.gemfile b/gemfiles/rails_4.2_sprockets_4.gemfile
@@ -2,9 +2,9 @@
 
 source "http://rubygems.org"
 
+gem "turbolinks", "~> 2.5.0"
 gem "rails", "~> 4.2.1"
 gem "sprockets", "~> 4.0.x"
-gem "turbolinks", "~> 2.5.0"
 gem "webpacker", :github => "rails/webpacker"
 gem "mini_racer"
 
diff --git a/gemfiles/rails_5_no_sprockets_webpacker.gemfile b/gemfiles/rails_5_no_sprockets_webpacker.gemfile
@@ -1,9 +1,9 @@
 # This file was generated by Appraisal
+# This file shouldn't have turbolinks or sprockets in it
 
 source "http://rubygems.org"
 
 gem "rails", "~> 5.0.0"
-gem "turbolinks", "~> 5.0.0"
 gem "webpacker", :github => "rails/webpacker"
 gem "therubyracer"
 
diff --git a/gemfiles/rails_5_sprockets_4.gemfile b/gemfiles/rails_5_sprockets_4.gemfile
@@ -2,8 +2,8 @@
 
 source "http://rubygems.org"
 
+gem "turbolinks", "~> 5.0.0"
 gem "rails", "~> 5.0.0"
 gem "sprockets", "~> 4.0.x"
-gem "turbolinks", "~> 5.0.0"
 
 gemspec :path => "../"
diff --git a/react_ujs/src/events/detect.js b/react_ujs/src/events/detect.js
@@ -28,7 +28,7 @@ module.exports = function(ujs) {
     } else {
       turbolinksClassicDeprecatedEvents.setup(ujs);
     }
-  } else if ($ && typeof $.pjax === 'function') {
+  } else if (typeof $ !== "undefined" && typeof $.pjax === 'function') {
     pjaxEvents.setup(ujs);
   } else {
     nativeEvents.setup(ujs);
diff --git a/test/dummy/app/controllers/pages_controller.rb b/test/dummy/app/controllers/pages_controller.rb
@@ -1,5 +1,5 @@
 class PagesController < ApplicationController
-  if !SKIP_SPROCKETS
+  if WebpackerHelpers.available? || !SKIP_SPROCKETS
     per_request_react_rails_prerenderer
   end
 
diff --git a/test/dummy/app/javascript/components/named_export_component.js b/test/dummy/app/javascript/components/named_export_component.js
@@ -1,3 +1,5 @@
+var React = require("react")
+
 module.exports = {
   Component: function(props) { return <h2>Named Export</h2> }
 }
diff --git a/test/dummy/app/javascript/components/subfolder/exports_component.js b/test/dummy/app/javascript/components/subfolder/exports_component.js
@@ -1,3 +1,5 @@
+var React = require("react")
+
 module.exports = function(props) {
   return <h2>Exports</h2>
 }
diff --git a/test/dummy/app/views/layouts/application.html.erb b/test/dummy/app/views/layouts/application.html.erb
@@ -2,8 +2,9 @@
 <html>
 <head>
   <title>Dummy</title>
-  <%= stylesheet_link_tag    "application", media: "all", "data-turbolinks-track" => true %>
-  <%= javascript_include_tag "application", "data-turbolinks-track" => true %>
+  <% if !SKIP_SPROCKETS %>
+    <%= javascript_include_tag "application", "data-turbolinks-track" => true %>
+  <% end %>
   <%= csrf_meta_tags %>
 </head>
 <body>
