From 0a68fb16f5a15a42884d94649fb13c84e068cfcf Mon Sep 17 00:00:00 2001 From: Justin Gordon Date: Sat, 27 May 2017 22:59:17 -1000 Subject: [PATCH 1/2] Update to 8.0.0.beta.3 --- Gemfile | 2 +- Gemfile.lock | 6 +++--- client/package.json | 6 ++++-- client/yarn.lock | 6 +++--- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Gemfile b/Gemfile index 16cb97d8..88f4f660 100644 --- a/Gemfile +++ b/Gemfile @@ -38,7 +38,7 @@ gem "sdoc", group: :doc # Use Rails Html Sanitizer for HTML sanitization gem "rails-html-sanitizer" -gem "react_on_rails", "7.0.0" +gem "react_on_rails", "8.0.0.beta.3" # See https://github.com/sstephenson/execjs#readme for more supported runtimes # mini_racer is probably faster than therubyracer diff --git a/Gemfile.lock b/Gemfile.lock index 96184b75..07fef1e0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -200,7 +200,7 @@ GEM rb-inotify (0.9.8) ffi (>= 0.5.0) rdoc (4.3.0) - react_on_rails (7.0.0) + react_on_rails (8.0.0.beta.3) addressable connection_pool execjs (~> 2.5) @@ -330,7 +330,7 @@ DEPENDENCIES rails rails-html-sanitizer rainbow - react_on_rails (= 7.0.0) + react_on_rails (= 8.0.0.beta.3) redis rspec-rails (~> 3) rspec-retry @@ -349,4 +349,4 @@ RUBY VERSION ruby 2.4.1p111 BUNDLED WITH - 1.14.6 + 1.15.0 diff --git a/client/package.json b/client/package.json index d4cb57a4..b87db0b0 100644 --- a/client/package.json +++ b/client/package.json @@ -25,7 +25,9 @@ }, "homepage": "https://github.com/shakacode/react-webpack-rails-tutorial", "scripts": { - "postinstall": "npm rebuild node-sass", + "postinstall": "npm rebuild node-sass && yarn run install-react-on-rails", + "install-react-on-rails": "rm -rf node_modules/react-on-rails && npm i 'file:../../react_on_rails'", + "test": "NODE_PATH=./app mocha --compilers js:babel-core/register --require ./app/libs/testHelper.js --require ./app/libs/testNullCompiler.js 'app/**/*.spec.@(js|jsx)'", "test:debug": "yarn run test -- --debug-brk", "start": "babel-node server-express.js", @@ -79,7 +81,7 @@ "react-bootstrap": "^0.30.8", "react-dom": "^15.4.1", "react-intl": "^2.2.2", - "react-on-rails": "^7.0.0", + "react-on-rails": "^8.0.0-beta.3", "react-redux": "^4.4.6", "react-router": "^3.0.0", "react-router-redux": "^4.0.7", diff --git a/client/yarn.lock b/client/yarn.lock index 123d15dd..ac40fe5c 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -4653,9 +4653,9 @@ react-intl@^2.2.2: intl-relativeformat "^1.3.0" invariant "^2.1.1" -react-on-rails@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/react-on-rails/-/react-on-rails-7.0.0.tgz#ff7f12fb918b14ef932f77a71532b0f9eceb7955" +react-on-rails@^8.0.0-beta.3: + version "8.0.0-beta.3" + resolved "https://registry.yarnpkg.com/react-on-rails/-/react-on-rails-8.0.0-beta.3.tgz#6f173283654c186b28883e4f4bcf8ed7b34e12b8" react-overlays@^0.6.12: version "0.6.12" From 671cf5d371835b16222f6fd4a299b300cfe02171 Mon Sep 17 00:00:00 2001 From: Justin Gordon Date: Sun, 28 May 2017 09:18:00 -1000 Subject: [PATCH 2/2] Fix bug with local install instructions --- Gemfile | 2 +- Gemfile.lock | 84 ++++++++++++++++++++++----------------------- client/package.json | 4 +-- 3 files changed, 44 insertions(+), 46 deletions(-) diff --git a/Gemfile b/Gemfile index 88f4f660..3bb3caf3 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ ruby "2.4.1" # # Bundle edge Rails instead: gem "rails", github: "rails/rails" gem "listen" -gem "rails" +gem "rails", "5.0.3" # Note: We're using sqllite3 for development and testing # gem "sqlite3", group: [:development, :test] diff --git a/Gemfile.lock b/Gemfile.lock index 07fef1e0..f16a73b9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,39 +1,39 @@ GEM remote: https://rubygems.org/ specs: - actioncable (5.0.2) - actionpack (= 5.0.2) + actioncable (5.0.3) + actionpack (= 5.0.3) nio4r (>= 1.2, < 3.0) websocket-driver (~> 0.6.1) - actionmailer (5.0.2) - actionpack (= 5.0.2) - actionview (= 5.0.2) - activejob (= 5.0.2) + actionmailer (5.0.3) + actionpack (= 5.0.3) + actionview (= 5.0.3) + activejob (= 5.0.3) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.0.2) - actionview (= 5.0.2) - activesupport (= 5.0.2) + actionpack (5.0.3) + actionview (= 5.0.3) + activesupport (= 5.0.3) rack (~> 2.0) rack-test (~> 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.0.2) - activesupport (= 5.0.2) + actionview (5.0.3) + activesupport (= 5.0.3) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.0.2) - activesupport (= 5.0.2) + activejob (5.0.3) + activesupport (= 5.0.3) globalid (>= 0.3.6) - activemodel (5.0.2) - activesupport (= 5.0.2) - activerecord (5.0.2) - activemodel (= 5.0.2) - activesupport (= 5.0.2) + activemodel (5.0.3) + activesupport (= 5.0.3) + activerecord (5.0.3) + activemodel (= 5.0.3) + activesupport (= 5.0.3) arel (~> 7.0) - activesupport (5.0.2) + activesupport (5.0.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (~> 0.7) minitest (~> 5.1) @@ -108,8 +108,8 @@ GEM generator_spec (0.9.3) activesupport (>= 3.0.0) railties (>= 3.0.0) - globalid (0.3.7) - activesupport (>= 4.1.0) + globalid (0.4.0) + activesupport (>= 4.2.0) i18n (0.8.1) interception (0.5) io-like (0.3.0) @@ -126,7 +126,7 @@ GEM ruby_dep (~> 1.2) loofah (2.0.3) nokogiri (>= 1.5.9) - mail (2.6.4) + mail (2.6.5) mime-types (>= 1.16, < 4) method_source (0.8.2) mime-types (3.1) @@ -135,10 +135,10 @@ GEM mini_portile2 (2.1.0) mini_racer (0.1.9) libv8 (~> 5.3) - minitest (5.10.1) + minitest (5.10.2) multi_json (1.12.1) nio4r (2.0.0) - nokogiri (1.7.1) + nokogiri (1.7.2) mini_portile2 (~> 2.1.0) parser (2.4.0.0) ast (~> 2.2) @@ -168,29 +168,29 @@ GEM pry (>= 0.9.11) public_suffix (2.0.5) puma (3.8.2) - rack (2.0.1) + rack (2.0.3) rack-test (0.6.3) rack (>= 1.0) - rails (5.0.2) - actioncable (= 5.0.2) - actionmailer (= 5.0.2) - actionpack (= 5.0.2) - actionview (= 5.0.2) - activejob (= 5.0.2) - activemodel (= 5.0.2) - activerecord (= 5.0.2) - activesupport (= 5.0.2) + rails (5.0.3) + actioncable (= 5.0.3) + actionmailer (= 5.0.3) + actionpack (= 5.0.3) + actionview (= 5.0.3) + activejob (= 5.0.3) + activemodel (= 5.0.3) + activerecord (= 5.0.3) + activesupport (= 5.0.3) bundler (>= 1.3.0, < 2.0) - railties (= 5.0.2) + railties (= 5.0.3) sprockets-rails (>= 2.0.0) - rails-dom-testing (2.0.2) - activesupport (>= 4.2.0, < 6.0) - nokogiri (~> 1.6) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) rails-html-sanitizer (1.0.3) loofah (~> 2.0) - railties (5.0.2) - actionpack (= 5.0.2) - activesupport (= 5.0.2) + railties (5.0.3) + actionpack (= 5.0.3) + activesupport (= 5.0.3) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) @@ -327,7 +327,7 @@ DEPENDENCIES pry-rescue pry-stack_explorer puma - rails + rails (= 5.0.3) rails-html-sanitizer rainbow react_on_rails (= 8.0.0.beta.3) diff --git a/client/package.json b/client/package.json index b87db0b0..e7c23774 100644 --- a/client/package.json +++ b/client/package.json @@ -25,9 +25,7 @@ }, "homepage": "https://github.com/shakacode/react-webpack-rails-tutorial", "scripts": { - "postinstall": "npm rebuild node-sass && yarn run install-react-on-rails", - "install-react-on-rails": "rm -rf node_modules/react-on-rails && npm i 'file:../../react_on_rails'", - + "postinstall": "npm rebuild node-sass", "test": "NODE_PATH=./app mocha --compilers js:babel-core/register --require ./app/libs/testHelper.js --require ./app/libs/testNullCompiler.js 'app/**/*.spec.@(js|jsx)'", "test:debug": "yarn run test -- --debug-brk", "start": "babel-node server-express.js",