Merge branch 'master' into add-image-handling-example

Author: cheremukhin23

CHANGELOG.md

@@ -10,6 +10,10 @@ Contributors: please follow the recommendations outlined at [keepachangelog.com]
 - Locked Webpack version in generators to 2.2.1
 - Added style-loaders to webpack config
 
+## [6.8.1] - 2017-03-21
+### Fixed
+- Fixed error "The node you're attempting to unmount was rendered by another copy of React." [#706](https://github.com/shakacode/react_on_rails/issues/706) when navigating to cached page using Turbolinks  [#763](https://github.com/shakacode/react_on_rails/pull/763) by [szyablitsky](https://github.com/szyablitsky).
+
 ## [6.8.0] - 2017-03-06
 ## Added
 - Converted to Webpack v2 for generators, tests, and all example code. [#742](https://github.com/shakacode/react_on_rails/pull/742) by [justin808](https://github.com/justin808).
@@ -34,7 +38,7 @@ Commenting out this line addresses the issue:
 
 ```
 config.i18n_dir = Rails.root.join("client", "app", "libs", "i18n")
-``` 
+```
 
 ### Added
 - Allow using rake task to generate javascript locale files. The test helper automatically creates the localization files when needed. [#717](https://github.com/shakacode/react_on_rails/pull/717) by [JasonYCHuang](https://github.com/JasonYCHuang).
@@ -489,7 +493,8 @@ Best done with Object destructing:
 ##### Fixed
 - Fix several generator related issues.
 
-[Unreleased]: https://github.com/shakacode/react_on_rails/compare/6.8.0...master
+[Unreleased]: https://github.com/shakacode/react_on_rails/compare/6.8.1...master
+[6.8.1]: https://github.com/shakacode/react_on_rails/compare/6.8.0...6.8.1
 [6.8.0]: https://github.com/shakacode/react_on_rails/compare/6.7.2...6.8.0
 [6.7.2]: https://github.com/shakacode/react_on_rails/compare/6.7.1...6.7.2
 [6.7.1]: https://github.com/shakacode/react_on_rails/compare/6.7.0...6.7.1

PROJECTS.md

@@ -1,9 +1,10 @@
-#Projects using React on Rails
+# Projects using React on Rails
 
 *Please add your project to this list.*
 
 ## Commercial Products Live
 * **[Friends and Guests](https://www.friendsandguests.com/)**, the signature product of [ShakaCode](http://www.shakacode.com), which is a "Network Connecting Hosts and Guests".
+* **[KissKissBankBank](https://www.kisskissbankbank.com/)**, large French crowdfunding platform.
 * **[Nootrobox](https://nootrobox.com)**: Web ecommerce site for "biohacking" products.
 * **[GuavaPass](https://guavapass.com/)**: Coaching client of [ShakaCode](http://www.shakacode.com) and React on Rails fan!
 * **[Pivotal Tracker](http://www.pivotaltracker.com/)**: The first (and most-loved) agile project management tool built on Rails.  React on Rails has greatly simplified integration and workflow for our React components in Rails!
@@ -38,3 +39,4 @@
 
 * [github.com/Limenius/symfony-react-sandbox](https://github.com/Limenius/symfony-react-sandbox)
 * [github.com/tswayne/react-helper](https://github.com/tswayne/react-helper)
+* [github.com/KissKissBankBank/kitten](https://github.com/KissKissBankBank/kitten)

docs/additional-reading/turbolinks.md

@@ -94,7 +94,7 @@ TURBO: reactOnRailsPageLoaded
 
 Turbolinks 5:
 ```
-TURBO: WITH TURBOLINKS 5: document turbolinks:before-render and turbolinks:load handlers installed. (program)
+TURBO: WITH TURBOLINKS 5: document turbolinks:before-render and turbolinks:render handlers installed. (program)
 TURBO: reactOnRailsPageLoaded
 ```
 

lib/react_on_rails/version.rb

@@ -1,3 +1,3 @@
 module ReactOnRails
-  VERSION = "6.8.0".freeze
+  VERSION = "6.8.1".freeze
 end

node_package/src/clientStartup.js

@@ -183,9 +183,10 @@ export function clientStartup(context) {
       if (turbolinksVersion5()) {
         debugTurbolinks(
           'USING TURBOLINKS 5: document added event listeners ' +
-          'turbolinks:before-render and turbolinks:load.');
+          'turbolinks:before-render and turbolinks:render.');
         document.addEventListener('turbolinks:before-render', reactOnRailsPageUnloaded);
-        document.addEventListener('turbolinks:load', reactOnRailsPageLoaded);
+        document.addEventListener('turbolinks:render', reactOnRailsPageLoaded);
+        reactOnRailsPageLoaded();
       } else {
         debugTurbolinks(
           'USING TURBOLINKS 2: document added event listeners page:before-unload and ' +

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-on-rails",
-  "version": "6.8.0",
+  "version": "6.8.1",
   "description": "react-on-rails JavaScript for react_on_rails Ruby gem",
   "main": "node_package/lib/ReactOnRails.js",
   "directories": {

react_on_rails.gemspec

@@ -42,17 +42,4 @@ Gem::Specification.new do |s|
   s.add_development_dependency "binding_of_caller"
   s.add_development_dependency "awesome_print"
   s.add_development_dependency "gem-release"
-
-  s.post_install_message = %(
-    React on Rails installed! See https://github.com/shakacode/react_on_rails for documentation
-    and source code.
-
-    You can email [email protected] for support questions or access to our public slack room.
-
-    For custom application development work or coaching on integrating React with Rails,
-    visit http://www.shakacode.com
-
-    For more information on the generators, run:
-      rails generate react_on_rails:install --help
-  )
 end

spec/dummy/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    react_on_rails (6.8.0)
+    react_on_rails (6.8.1)
       addressable
       connection_pool
       execjs (~> 2.5)

spec/dummy/Procfile

@@ -1,7 +1 @@
-rails: REACT_ON_RAILS_ENV=HOT rails s -b 0.0.0.0
-
-# Build client assets, watching for changes.
-rails-client-assets: rm app/assets/webpack/* || true && npm run build:dev:client
-
-# Build server assets, watching for changes. Remove if not server rendering.
-rails-server-assets: npm run build:dev:server
+web: bundle exec puma -C config/puma.rb