Merge pull request #379 from brucek/react_15

Updating to react 15

lib/generators/react_on_rails/templates/base/base/client/package.json.tt

@@ -71,11 +71,11 @@
     <%- if options.redux? -%>
     "mirror-creator": "1.1.0",
     <%- end -%>
-    "react": "^0.14.8",
+    "react": "^0.14.8 || ^15.0.0",
     <%- unless options.skip_bootstrap? -%>
     "react-bootstrap": "^0.28.5",
     <%- end -%>
-    "react-dom": "^0.14.8",
+    "react-dom": "^0.14.8 || ^15.0.0",
     "react-on-rails": "<%= VersionSyntaxConverter.new.rubygem_to_npm %>",
     <%- if options.redux? -%>
     "react-redux": "^4.4.1",

package.json

@@ -24,8 +24,8 @@
     "eslint-plugin-react": "^4.2.3",
     "jscs": "^2.11.0",
     "jsdom": "^8.2.0",
-    "react": "^0.14.8",
-    "react-dom": "^0.14.8",
+    "react": "^15.0.0",
+    "react-dom": "^15.0.0",
     "react-transform-hmr": "^1.0.4",
     "redux": "^3.3.1",
     "release-it": "^2.3.1",

spec/dummy/Gemfile

@@ -23,7 +23,7 @@ if ENV["DISABLE_TURBOLINKS"].nil? || ENV["DISABLE_TURBOLINKS"].strip.empty?
   if ENV["ENABLE_TURBOLINKS_5"].nil? || ENV["ENABLE_TURBOLINKS_5"].strip.empty?
     gem 'turbolinks', '2.5.3'
   else
-    gem 'turbolinks', '~> 5.0.0.beta'
+    gem 'turbolinks', '~> 5.0.0.beta2'
   end
 end
 

spec/dummy/client/package.json

@@ -32,8 +32,8 @@
     "node-libs-browser": "^1.0.0",
     "node-sass": "^3.4.2",
     "postcss-loader": "^0.8.2",
-    "react": "^0.14.8",
-    "react-dom": "^0.14.8",
+    "react": "^15.0.0",
+    "react-dom": "^15.0.0",
     "react-on-rails": "../../..",
     "react-redux": "^4.4.1",
     "react-router": "^2.0.1",