Update wording (shakacode#396)

* Update wording
* Update to 8.0.0 of React on Rails

Author: justin808

Gemfile

@@ -38,7 +38,7 @@ gem "sdoc", group: :doc
 # Use Rails Html Sanitizer for HTML sanitization
 gem "rails-html-sanitizer"
 
-gem "react_on_rails", "8.0.0.beta.3"
+gem "react_on_rails", "8.0.0"
 
 gem "webpacker_lite", "2.0.4"
 

Gemfile.lock

@@ -200,7 +200,7 @@ GEM
     rb-inotify (0.9.8)
       ffi (>= 0.5.0)
     rdoc (4.3.0)
-    react_on_rails (8.0.0.beta.3)
+    react_on_rails (8.0.0)
       addressable
       connection_pool
       execjs (~> 2.5)
@@ -334,7 +334,7 @@ DEPENDENCIES
   rails (= 5.0.3)
   rails-html-sanitizer
   rainbow
-  react_on_rails (= 8.0.0.beta.3)
+  react_on_rails (= 8.0.0)
   redis
   rspec-rails (~> 3)
   rspec-retry

Procfile.dev

@@ -1,16 +1,17 @@
+app: echo "Use Procfile.static or uncomment this file and help us get Hot Reloading to work again"
 # Basic procfile for dev work.
 # Development is faster if you pick one of the other Procfiles if you don't need
 # the processes to create the test files. Thus, run the `Procfile.hot` one instead
 
 # Development rails requires both rails and rails-assets
 # (and rails-server-assets if server rendering)
-rails: REACT_ON_RAILS_ENV=HOT rails s -b 0.0.0.0
+# rails: REACT_ON_RAILS_ENV=HOT rails s -b 0.0.0.0
 
 # Run the hot reload server for client development
-hot-assets: sh -c 'rm -rf public/webpack/development || true && bundle exec rake react_on_rails:locale && HOT_RAILS_PORT=3500 yarn run hot-assets'
+# hot-assets: sh -c 'rm -rf public/webpack/development || true && bundle exec rake react_on_rails:locale && HOT_RAILS_PORT=3500 yarn run hot-assets'
 
 # Render static client assets
-rails-static-client-assets: sh -c 'yarn run build:dev:client'
+# rails-static-client-assets: sh -c 'yarn run build:dev:client'
 
 # Render static client assets. Remove if not server rendering
-rails-static-server-assets: sh -c 'yarn run build:dev:server'
+# rails-static-server-assets: sh -c 'yarn run build:dev:server'

README.md

@@ -41,6 +41,7 @@ For more testimonials, see [Live Projects](https://github.com/shakacode/react_on
 
 ## NEWS
 
+* Project migrated to [webpacker_lite](https://github.com/shakacode/react-webpack-rails-tutorial/pull/395) and React on Rails 8.0.0.
 * Action Cable was recently added in [PR #355](https://github.com/shakacode/react-webpack-rails-tutorial/pull/355). See [PR#360](https://github.com/shakacode/react-webpack-rails-tutorial/pull/360) for additional steps to make this work on Heroku. Note, you need to be running redis. We installed the free Heroku redis add-on.
 * We made a react-native client: [shakacode/reactrails-react-native-client](https://github.com/shakacode/reactrails-react-native-client/). If you want to hack on this with us, [email [email protected]](mailto:[email protected]).
 * We have [some other open PRs](https://github.com/shakacode/react-webpack-rails-tutorial/pulls) of things we may soon be incorporating, including localization and action cable! Stay tuned! If you have opinions of what should or should not get merged, get in touch with [[email protected]](mailto:[email protected]).
@@ -270,7 +271,7 @@ We're looking for great developers that want to work with Rails + React (and rea
 
 ---
 
-Aloha from Justin Gordon ([bio](http://www.railsonmaui.com/about)) and the [ShakaCode](http://www.shakacode.com) Team! We're actively looking for new projects involving React, React-Native, and Rails. Please contact me at [[email protected]](mailto:[email protected]) if we could potentially help you in any way. Besides consulting on bigger projects, [ShakaCode](http://www.shakacode.com) is doing Skype plus Slack/Github based coaching for React on Rails. See our blog post [Can ShakaCode Help You?](https://blog.shakacode.com/can-shakacode-help-you-4a5b1e5a8a63#.jex6tg9w9) for more information.
+Aloha from Justin Gordon ([bio](http://www.railsonmaui.com/about)) and the [ShakaCode](http://www.shakacode.com) Team! We're actively looking for new projects involving React, React-Native, and Rails. Please contact me at [[email protected]](mailto:[email protected]) if we could potentially help you in any way. Besides consulting on bigger projects, [ShakaCode](http://www.shakacode.com) is doing Zoom.us plus Slack/Github based coaching for React on Rails. See our blog post [Can ShakaCode Help You?](https://blog.shakacode.com/can-shakacode-help-you-4a5b1e5a8a63#.jex6tg9w9) for more information.
 
 We're offering a free half-hour project consultation, on anything from React on Rails to any aspect of web application development for both consumer and enterprise products. In addition to React.js and Rails, we're doing React-Native iOS and Android apps!
 

app/views/pages/_header.html.erb

@@ -33,7 +33,7 @@
   </li>
   <li>
     <%= link_to "ShakaCode", "http://www.shakacode.com"%>
-    is doing Skype plus Slack/Github based coaching for React on Rails.
+    is doing support for React on Rails, including a private Slack channel, source code reviews, and pair programming sessions.
     <b><%= link_to "Click here", "http://www.shakacode.com/work/index.html" %></b> for more information.
   </li>
 </ul>

app/views/pages/index.html.erb

@@ -3,10 +3,11 @@
               "https://github.com/shakacode/react-webpack-rails-tutorial/" %> of using the <%= link_to "React on Rails gem", "https://github.com/shakacode/react_on_rails" %>
 </h2>
 <h3>Using <%= link_to "Ruby on Rails", "http://rubyonrails.org/" %> with
+  <%= link_to "webpacker_lite", "https://github.com/shakacode/webpacker_lite" %> +
+  <%= link_to "Action Cable", "http://guides.rubyonrails.org/action_cable_overview.html" %> +
   <%= link_to "React", "http://facebook.github.io/react/" %> (Server rendering) +
   <%= link_to "Redux", "https://github.com/reactjs/redux" %> +
-  <%= link_to "React Router", "https://github.com/reactjs/react-router" %> +
-  <%= link_to "react-router-redux" , "https://github.com/reactjs/react-router-redux" %>
+  <%= link_to "React Router", "https://github.com/reactjs/react-router" %>
 </h3>
 <%= render "header" %>
 

client/package.json

@@ -82,7 +82,7 @@
     "react-bootstrap": "^0.30.8",
     "react-dom": "^15.4.1",
     "react-intl": "^2.2.2",
-    "react-on-rails": "^8.0.0-beta.3",
+    "react-on-rails": "8.0.0",
     "react-redux": "^4.4.6",
     "react-router": "^3.0.0",
     "react-router-redux": "^4.0.7",

client/yarn.lock

@@ -4642,9 +4642,9 @@ react-intl@^2.2.2:
     intl-relativeformat "^1.3.0"
     invariant "^2.1.1"
 
-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"
+[email protected]:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/react-on-rails/-/react-on-rails-8.0.0.tgz#97fda265cdc5e4cd4334ae7a7f2bacd85346161e"
 
 react-overlays@^0.6.12:
   version "0.6.12"