From 574c8194b1932a1aaf142def87ec800e1782b2f9 Mon Sep 17 00:00:00 2001
From: Marty Phee <martyphee@gmail.com>
Date: Thu, 14 Jan 2016 10:33:04 -0600
Subject: [PATCH 1/2] Update package.json.tt

Removed the additional version info at the end.
---
 .../react_on_rails/templates/base/base/client/package.json.tt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/generators/react_on_rails/templates/base/base/client/package.json.tt b/lib/generators/react_on_rails/templates/base/base/client/package.json.tt
index 43ee9146f..4cb694fb1 100644
--- a/lib/generators/react_on_rails/templates/base/base/client/package.json.tt
+++ b/lib/generators/react_on_rails/templates/base/base/client/package.json.tt
@@ -64,7 +64,7 @@
     "react-bootstrap": "^0.28.1",
     <%- end -%>
     "react-dom": "^0.14.3",
-    "react-on-rails": "<%= x = ReactOnRails::VERSION.match(/(\d+\.\d+\.\d+)[.\-](.*)/); "#{x[1]}-#{x[2]}" %>",
+    "react-on-rails": "<%= x = ReactOnRails::VERSION.match(/(\d+\.\d+\.\d+)[.\-](.*)/); "#{x[1]}" %>",
     <%- if options.redux? -%>
     "react-redux": "^4.0.5",
     "redux": "^3.0.5",

From ec2e83cb160197c7fbcf68b5ea03574be686def8 Mon Sep 17 00:00:00 2001
From: martinphee <martyphee@gmail.com>
Date: Mon, 13 Jun 2016 06:47:49 -0500
Subject: [PATCH 2/2] Added clearTimeout to the exec.rb polyfil.

---
 CHANGELOG.md                                     | 7 ++++++-
 lib/react_on_rails/server_rendering_pool/exec.rb | 4 ++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ebcf0caab..8aa25fe3b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,10 @@ Contributors: please follow the recommendations outlined at [keepachangelog.com]
 
 ## [Unreleased]
 
+## [6.0.4]
+##### Fixed
+- Added polyfill for clearTimeout which is used by babel-polyfill.
+
 ## [6.0.3]
 ##### Fixed
 - Added assets symlinking support on Heroku [#446](https://github.com/shakacode/react_on_rails/pull/446) by [Alexey Karasev](https://github.com/alleycat-at-git).
@@ -345,7 +349,8 @@ Best done with Object destructing:
 ##### Fixed
 - Fix several generator related issues.
 
-[Unreleased]: https://github.com/shakacode/react_on_rails/compare/6.0.3...master
+[Unreleased]: https://github.com/shakacode/react_on_rails/compare/6.0.4...master
+[6.0.4]: https://github.com/shakacode/react_on_rails/compare/6.0.3...6.0.4
 [6.0.3]: https://github.com/shakacode/react_on_rails/compare/6.0.2...6.0.3
 [6.0.2]: https://github.com/shakacode/react_on_rails/compare/6.0.1...6.0.2
 [6.0.1]: https://github.com/shakacode/react_on_rails/compare/6.0.0...6.0.1
diff --git a/lib/react_on_rails/server_rendering_pool/exec.rb b/lib/react_on_rails/server_rendering_pool/exec.rb
index 28b15f18a..f121116d4 100644
--- a/lib/react_on_rails/server_rendering_pool/exec.rb
+++ b/lib/react_on_rails/server_rendering_pool/exec.rb
@@ -132,6 +132,10 @@ def execjs_timer_polyfills
 function setTimeout() {
   #{undefined_for_exec_js_logging('setTimeout')}
 }
+
+function clearTimeout() {
+  #{undefined_for_exec_js_logging('clearTimeout')}
+}
           JS
         end