From ee824abe6d58598515a282f368d84bd176397ff6 Mon Sep 17 00:00:00 2001 From: Bruce Krysiak Date: Thu, 7 Apr 2016 21:24:27 -0700 Subject: [PATCH 1/2] Updating to react 15 --- .../react_on_rails/templates/base/base/client/package.json.tt | 4 ++-- package.json | 4 ++-- spec/dummy/Gemfile | 2 +- spec/dummy/client/package.json | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) 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 e1c9f7a25..d6a411dc0 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 @@ -71,11 +71,11 @@ <%- if options.redux? -%> "mirror-creator": "1.1.0", <%- end -%> - "react": "^0.14.8", + "react": "^15.0.0", <%- unless options.skip_bootstrap? -%> "react-bootstrap": "^0.28.5", <%- end -%> - "react-dom": "^0.14.8", + "react-dom": "^15.0.0", "react-on-rails": "<%= VersionSyntaxConverter.new.rubygem_to_npm %>", <%- if options.redux? -%> "react-redux": "^4.4.1", diff --git a/package.json b/package.json index 970fa4b29..9e97caa1d 100644 --- a/package.json +++ b/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", diff --git a/spec/dummy/Gemfile b/spec/dummy/Gemfile index 634731f2c..3e214fdc2 100644 --- a/spec/dummy/Gemfile +++ b/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 diff --git a/spec/dummy/client/package.json b/spec/dummy/client/package.json index 62262d58a..07b721926 100644 --- a/spec/dummy/client/package.json +++ b/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", From 8ce89358075e3d0167c734864a786038b53432d8 Mon Sep 17 00:00:00 2001 From: Bruce Krysiak Date: Fri, 8 Apr 2016 00:58:03 -0700 Subject: [PATCH 2/2] Support react 0.14 or 15 --- .../react_on_rails/templates/base/base/client/package.json.tt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 d6a411dc0..44f58ef3b 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 @@ -71,11 +71,11 @@ <%- if options.redux? -%> "mirror-creator": "1.1.0", <%- end -%> - "react": "^15.0.0", + "react": "^0.14.8 || ^15.0.0", <%- unless options.skip_bootstrap? -%> "react-bootstrap": "^0.28.5", <%- end -%> - "react-dom": "^15.0.0", + "react-dom": "^0.14.8 || ^15.0.0", "react-on-rails": "<%= VersionSyntaxConverter.new.rubygem_to_npm %>", <%- if options.redux? -%> "react-redux": "^4.4.1",