Merge pull request #259 from shakacode/turbolinks-from-npm

Add turbolinks 5 from npm

Gemfile

@@ -25,7 +25,8 @@ gem "coffee-rails"
 
 # Turbolinks makes following links in your web application faster.
 # Read more: https://github.com/turbolinks/turbolinks
-gem 'turbolinks', '>= 5.0.0.beta2'
+# Get turbolinks from npm!
+# gem 'turbolinks', '>= 5.0.0.beta2'
 
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 gem "jbuilder"

Gemfile.lock

@@ -296,9 +296,6 @@ GEM
     thread_safe (0.3.5)
     tilt (2.0.2)
     tins (1.6.0)
-    turbolinks (5.0.0.beta2)
-      turbolinks-source
-    turbolinks-source (5.0.0.beta2)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     uglifier (2.7.2)
@@ -363,7 +360,6 @@ DEPENDENCIES
   spring-commands-rspec
   sqlite3
   therubyracer
-  turbolinks (>= 5.0.0.beta2)
   uglifier
   web-console
 

app/assets/javascripts/application_non_webpack.js

@@ -1,7 +1,5 @@
 // All webpack assets in development will be loaded via webpack dev server
-// It's important to include them in layout view above this asset
-// b/c it exposes jQuery for turbolinks and another non-webpack JS (if any)
 
-//= require turbolinks
+// turbolinks comes from npm and is listed in webpack.client.base.config.js
 
 //= require rails_startup

client/package.json

@@ -73,14 +73,15 @@
     "react-on-rails": "^4.0.0",
     "react-redux": "^4.4.0",
     "react-router": "^2.0.0",
-    "redux": "^3.3.1",
     "react-router-redux": "^4.0.0",
+    "redux": "^3.3.1",
     "redux-promise": "^0.5.1",
     "redux-thunk": "^1.0.3",
     "resolve-url-loader": "^1.4.3",
     "sass-loader": "^3.1.2",
     "sass-resources-loader": "1.0.2",
     "style-loader": "^0.13.0",
+    "turbolinks": "0.0.2",
     "url-loader": "^0.5.7",
     "webpack": "^1.12.14"
   },
@@ -92,6 +93,7 @@
     "eslint": "^2.3.0",
     "eslint-config-shakacode": "^3.0.0",
     "eslint-plugin-react": "^4.2.0",
+    "estraverse-fb": "^1.3.1",
     "express": "^4.13.4",
     "jade": "^1.11.0",
     "jscs": "^2.11.0",

client/webpack.client.base.config.js

@@ -19,6 +19,7 @@ module.exports = {
       'es5-shim/es5-shim',
       'es5-shim/es5-sham',
       'jquery',
+      'turbolinks',
     ],
 
     // This will contain the app entry points defined by webpack.hot.config and webpack.rails.config
@@ -65,6 +66,7 @@ module.exports = {
 
       { test: require.resolve('jquery'), loader: 'expose?jQuery' },
       { test: require.resolve('jquery'), loader: 'expose?$' },
+      { test: require.resolve('turbolinks'), loader: 'imports?this=>window' },
 
       // Use one of these to serve jQuery for Bootstrap scripts: