react_on_rails 9.0.0 → 9.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 726ec46ad50d1fe90c1362e3b500edc55c9c7061
-  data.tar.gz: '0882d017eeafe5a267fced472d736e248ef53294'
+  metadata.gz: 22b05c194abe4ce3e30fe5b6bb4d99aac182b97b
+  data.tar.gz: 2d1506bdd2916fccae557e80c832dc5ffd7431b4
 SHA512:
-  metadata.gz: 869d84250e0b3e582100bb91bcd0e038746fad8d1badbeec51a05ac202a48c5f36bfca545db2453820bb591d7aeb9a23fcb38c30d3864d30403c2e526971184e
-  data.tar.gz: 6f2e9bf6b123f2f6cd86fee23f8482d303e56565f23b0c86fd5de1033a6942a25bc78bca4ef677f036ec7e540e3706926f0071496bcaac66e142f287b1ec78de
+  metadata.gz: 489037474e139d7438204792df316967d3c454a72c8df0062f403fbbfb64b8cee9558570395b9b615144f3d9081e90b1ee1fb27eac4af69bdda16c3afd28d0be
+  data.tar.gz: 213cd4baddb2044a154dbb1021b2be647e433d6273f2a91b25936f59a99d6b48317d0b4d957391e6143c9e453e7628475fd36691630e4f807c3aadd840d1838b

data/CHANGELOG.md

@@ -8,11 +8,16 @@ Changes since last non-beta release.
 
 *Please add entries here for your pull requests.*
 
-- Fix regression where `react_component(... prerender: true)` wouldn't find the generated asset bundle, because it wasn't looking for the hashed path.
+### [9.0.1]
 
+#### Fixed
+- Fixes Rails 3.2 compatability issues. [PR 926](https://github.com/shakacode/react_on_rails/pull/926) by [morozovm](https://github.com/morozovm ) 
 
-## 9.0 from 8.x. Upgrade Instructions
-All 9.0.0 beta versions can be viewed in [PR 908](https://github.com/shakacode/react_on_rails/pull/908)
+### [9.0.0]
+Updated React on Rails to depend on [rails/webpacker](https://github.com/rails/webpacker). [PR 908](https://github.com/shakacode/react_on_rails/pull/908) by [justin808](https://github.com/justin808).
+
+
+#### 9.0 from 8.x. Upgrade Instructions
 
 For an example of upgrading, see [react-webpack-rails-tutorial/pull/416](https://github.com/shakacode/react-webpack-rails-tutorial/pull/416).
 
@@ -96,62 +101,12 @@ gem "webpacker"
     - Set the `hmr` key in your `webpacker.yml` to `true`.
     
     
-#### Troubleshooting
-   
-    
-  
-### [9.0.0]
-*Diffs for the beta to master*
-
-### [9.0.0-beta.12]
-- Updated for latest rails/webpacker using the official gem
-- hot reloading working in generator
-
-### [9.0.0-beta.11]
-- Updated for latest rails_webpacker.
-- hot reloading working in spec/dummy
-
-### [9.0.0-beta.10]
-- Updated for the latest rails/webpacker. Added the cache_manifest setting.
-
-### [9.0.0-beta.9]
-- Fixes precompile task going to Webpacker's. You need to set `custom_compile: true` in your `webpacker.yml`.
-- Changed webpack-bundle.js name to hello-world-bundle.js
-- Update for latest from rails/webpacker
-gem "webpacker", git: "https://github.com/shakacode/webpacker.git",
-    branch: "issue-464-merge-webpacker-lite-into-webpacker-v3"
-
-### [9.0.0-beta.8]
-- bugfix for server rendering
-
-### [9.0.0-beta.7]
-- Depend on updated rails/webpacker in branch 
-
-gem "webpacker", git: "https://github.com/shakacode/webpacker.git",
-    branch: "issue-464-merge-webpacker-lite-into-webpacker-v2"
-
-
-### [9.0.0-beta.6]
-- Change "hot" to "hmr".
-
-### [9.0.0-beta.3]
-- Fix typo on webpackConfigLoader.js
-
-### [9.0.0-beta.3]
-- Fix typo on webpackConfigLoader.js
- 
-### [9.0.0-beta.2]
-- Fixed problems when running in development mode for both the generator and spec/dummy. 
-
-### [9.0.0-beta.1]
-- First version of depending on Webpacker rather than Webpacker Lite  
-
 ### [8.0.7]
-#### fixed
+#### Fixed
 - Fixes generator bug by keeping blank line at top in case existing .gitignore does not end in a newline. [#916](https://github.com/shakacode/react_on_rails/pull/916) by [justin808](https://github.com/justin808).
 
 ### [8.0.6]
-#### fixed
+#### Fixed
 - Fixes server rendering when using a CDN. Server rendering would try to fetch a file with the "asset_host". This change updates the webpacker_lite dependency to 2.1.0 which has a new helper `pack_path`. [#901](https://github.com/shakacode/react_on_rails/pull/901) by [justin808](https://github.com/justin808). Be sure to update webpacker_lite to 2.1.0.
 - The package.json file created by the generator now creates minified javascript production builds by default. This was done by adding the -p flag to webpack on the build:production script. [#895](https://github.com/shakacode/react_on_rails/pull/895) by [serodriguez68 ](https://github.com/serodriguez68)
 - Fixes GitUtils.uncommitted_changes? throwing an error when called in an environment without Git, and allows install generator to be run successfully with `--ignore-warnings` [#878](https://github.com/shakacode/react_on_rails/pull/878) by [jasonblalock](https://github.com/jasonblalock).
@@ -768,20 +723,9 @@ Best done with Object destructing:
 ##### Fixed
 - Fix several generator related issues.
 
-[Unreleased]: https://github.com/shakacode/react_on_rails/compare/rails-webpacker...9.0.0-beta.11
-[9.0.0]: https://github.com/shakacode/react_on_rails/compare/master...9.0.0-beta.11
-[9.0.0-beta.12]: https://github.com/shakacode/react_on_rails/compare/9.0.0-beta.11...9.0.0-beta.12
-[9.0.0-beta.11]: https://github.com/shakacode/react_on_rails/compare/9.0.0-beta.10...9.0.0-beta.11
-[9.0.0-beta.10]: https://github.com/shakacode/react_on_rails/compare/9.0.0-beta.9...9.0.0-beta.10
-[9.0.0-beta.9]: https://github.com/shakacode/react_on_rails/compare/9.0.0-beta.8...9.0.0-beta.9
-[9.0.0-beta.8]: https://github.com/shakacode/react_on_rails/compare/9.0.0-beta.7...9.0.0-beta.8
-[9.0.0-beta.7]: https://github.com/shakacode/react_on_rails/compare/9.0.0-beta.6...9.0.0-beta.7
-[9.0.0-beta.6]: https://github.com/shakacode/react_on_rails/compare/9.0.0-beta.5...9.0.0-beta.6
-[9.0.0-beta.5]: https://github.com/shakacode/react_on_rails/compare/9.0.0-beta.4...9.0.0-beta.5
-[9.0.0-beta.4]: https://github.com/shakacode/react_on_rails/compare/9.0.0-beta.3...9.0.0-beta.4
-[9.0.0-beta.3]: https://github.com/shakacode/react_on_rails/compare/9.0.0-beta.2...9.0.0-beta.3
-[9.0.0-beta.2]: https://github.com/shakacode/react_on_rails/compare/9.0.0-beta.1...9.0.0-beta.2
-[9.0.0-beta.1]: https://github.com/shakacode/react_on_rails/compare/master...9.0.0-beta.1
+[Unreleased]: https://github.com/shakacode/react_on_rails/compare/9.0.1...master
+[9.0.1]: https://github.com/shakacode/react_on_rails/compare/9.0.0...9.0.1
+[9.0.0]: https://github.com/shakacode/react_on_rails/compare/8.0.7...9.0.0
 [8.0.7]: https://github.com/shakacode/react_on_rails/compare/8.0.6...8.0.7
 [8.0.6]: https://github.com/shakacode/react_on_rails/compare/8.0.5...8.0.6
 [8.0.5]: https://github.com/shakacode/react_on_rails/compare/8.0.3...8.0.5

data/README.md

@@ -3,25 +3,55 @@
 *If this projects helps you, please give us a star!*
 
 [rails/webpacker](https://github.com/rails/webpacker) just shipped 3.0. This now enables me to ship version 9.0. See [PR #908](https://github.com/shakacode/react_on_rails/pull/908) for more details.
-
 # React on Rails v9 is based on Webpacker 3.0!
 
-* See the updated [Tutorial](https://github.com/shakacode/react_on_rails/blob/rails-webpacker/docs/tutorial.md).
-* See the [CHANGELOG.md](https://github.com/shakacode/react_on_rails/blob/rails-webpacker/CHANGELOG.md) for migration instructions. 
+* See the article React on Rails plus Webpacker, Peanut Butter and Jelly for an overview of the integration of React on Rails with Webpacker (article coming soon).
+* See the updated [Tutorial](https://github.com/shakacode/react_on_rails/blob/master/docs/tutorial.md).
+* See the [CHANGELOG.md](https://github.com/shakacode/react_on_rails/blob/master/CHANGELOG.md) for migration instructions.
+
+----
+
+Given that Webpacker already provides React integration, why would you add React on Rails? Additional features of React on Rails include:
+
+1. Server rendering, often for SEO optimization.
+2. Easy passing of props directly from your Rails view to your React components rather than having your Rails view load and then make a separate request to your API.
+3. Redux and React-Router integration
+4. Localization support
+5. Rspec test helpers to ensure your Webpack bundles are ready for tests
+
+---- 
+
+## Steps to a New App with rails/webpacker v3 plus React on Rails v9:
+First be sure to run `rails -v` and check that you are using Rails 5.1.3 or above. If you are using an older version of Rails, you'll need to install webpacker with React per the instructions [here](https://github.com/rails/webpacker).
+
+### Basic installation
 
-## Steps to a New App with rails/webpacker v3 plus React on Rails v9.beta:
 1. New Rails app: `rails new my-app --webpack=react`. `cd` into the directory.
-2. Add beta gem version: `gem 'react_on_rails', '~> 9.0.0.beta.12'`
+2. Add gem version: `gem 'react_on_rails', '~> 9.0.1'`
 3. Run the generator: `rails generate react_on_rails:install`
 4. Start the app: `foreman start -f Procfile.dev`
 5. Visit http://localhost:3000/hello_world
 
-Turn on HMR (Hot reloading)
+### Turn on HMR (Hot reloading)
+
 1. Edit `config/webpacker.yml` and set `hmr: true`
 2. Start the app: `foreman start -f Procfile.dev-server`
 3. Visit http://localhost:3000/hello_world
 4. Edit `app/javascript/bundles/HelloWorld/components/HelloWorld.jsx`, hit save, and see the screen update.
 
+### Turn on server rendering
+
+*Does not work with hot reloading, yet, per [Webpacker issue #732](https://github.com/rails/webpacker/issues/732)*
+
+1. Edit `app/views/hello_world/index.html.erb` and set `prerender` to `true`.
+2. Refresh the page.
+
+This is the line where you turn server rendering on by setting prerender to true:
+
+```
+<%%= react_component("HelloWorld", props: @hello_world_props, prerender: false) %>
+```
+
 ---------------
 
 ## Thank you from Justin Gordon and [ShakaCode](http://www.shakacode.com)
@@ -95,9 +125,9 @@ For more testimonials, see [Live Projects](PROJECTS.md) and [Kudos](./KUDOS.md).
 ------
 
 # NEWS
-* **[VERSION 9.0.0.beta (branch)](https://github.com/shakacode/react_on_rails/tree/rails-webpacker) shipped!** This version depends on Webpacker directly. See the [CHANGELOG.md](https://github.com/shakacode/react_on_rails/blob/rails-webpacker/CHANGELOG.md) for migration instructions.
+* 2017-09-06: **VERSION 9.0.0 shipped!** This version depends on Webpacker directly. See the [CHANGELOG.md](https://github.com/shakacode/react_on_rails/blob/master/CHANGELOG.md) for migration instructions.
 * [VERSION 8.1.0](https://rubygems.org/gems/react_on_rails/) shipped with [webpacker_lite](https://github.com/shakacode/webpacker_lite) (soon [**webpacker**](https://github.com/rails/webpacker/issues/464#issuecomment-310986140) support! [react-webpack-rails-tutorial PR #395](https://github.com/shakacode/react-webpack-rails-tutorial/pull/395) shows the changes needed to migrate from the Asset Pipeline to Webpacker Lite. For more information, see my article: [Webpacker Lite: Why Fork Webpacker?](https://blog.shakacode.com/webpacker-lite-why-fork-webpacker-f0a7707fac92). Per recent discussions, we [will merge Webpacker Lite changes back into Webpacker](https://github.com/rails/webpacker/issues/464#issuecomment-310986140). There's no reason to wait for this. The upgrade will eventually be trivial.
-* The Docs here on `master` refer to 8.1.0 including support for [webpacker_lite](https://github.com/shakacode/webpacker_lite). The docs on [on the 9.0.0 beta branch](https://github.com/shakacode/react_on_rails/tree/rails-webpacker) refer to using Webpacker rather than Webpacker Lite.
+* The Docs here on `master` refer to 9.x including support for [rails/webpacker](https://github.com/rails/webpacker).
 *Use the [7.0.4 docs](https://github.com/shakacode/react_on_rails/tree/7.0.4) to refer to the older asset pipeline way.*
 * *See [NEWS.md](NEWS.md) for more notes over time.*
 
@@ -252,10 +282,10 @@ React on Rails provides an option for automatic conversions of Rails `*.yml` loc
 See the [How to add I18n](docs/basics/i18n.md) for a summary of adding I18n.
 
 ## NPM
-All JavaScript in React On Rails is loaded from npm: [react-on-rails](https://www.npmjs.com/package/react-on-rails). To manually install this (you did not use the generator), assuming you have a standard configuration, run this command:
+All JavaScript in React On Rails is loaded from npm: [react-on-rails](https://www.npmjs.com/package/react-on-rails). To manually install this (you did not use the generator), assuming you have a standard configuration, run this command (assuming you are in the directory where you have your `node_modules`):
 
 ```bash
-cd client && yarn add react-on-rails
+yarn add react-on-rails
 ```
 
 That will install the latest version and update your package.json.
@@ -606,8 +636,6 @@ If you want to use a node server for server rendering, [get in touch](mailto:jus
 
 ## Additional Documentation
 **Try out our new [Documentation Gitbook](https://shakacode.gitbooks.io/react-on-rails/content/) for improved readability & reference!**
-+ **Webpacker Lite**
-  + [Webpacker Lite: Why Fork Webpacker?](https://blog.shakacode.com/webpacker-lite-why-fork-webpacker-f0a7707fac92)
 
 + **Rails**
   + [Rails Assets](./docs/additional-reading/rails-assets.md)

data/docs/tutorial.md

@@ -22,7 +22,7 @@ _Note: some of the screen images below show the "npm" command. react_on_rails 6.
 
 ## Setting up the environment
 
-Trying out **React on Rails** is super easy, so long as you have the basic prerequisites. This includes the basics for Rails 4.x and node version 6+. I recommend `rvm` and `nvm` to install Ruby and Node, and [brew](https://brew.sh/) to install [yarn](https://yarnpkg.com/en/docs/install#mac-tab). Rails can be installed as an ordinary gem.
+Trying out **React on Rails** is super easy, so long as you have the basic prerequisites. This includes the basics for Rails 5.x and node version 6+. I recommend `rvm` and `nvm` to install Ruby and Node, and [brew](https://brew.sh/) to install [yarn](https://yarnpkg.com/en/docs/install#mac-tab). Rails can be installed as an ordinary gem.
 
 ```
 nvm install node                # download and install latest stable Node
@@ -39,7 +39,9 @@ gem install rails               # download and install latest stable Rails
 gem install foreman             # download and install Foreman
 ```
 
-Then we need to create a fresh Rails application with webpacker react support as following:
+Then we need to create a fresh Rails application with webpacker react support as following. Be sure that 
+
+First be sure to run `rails -v` and check you are using Rails 5.1.3 or above. If you are using an older version of Rails, you'll need to install webpacker with react per the instructions [here](https://github.com/rails/webpacker).
 
 ```
 cd <directory where you want to create your new Rails app>
@@ -50,7 +52,7 @@ rails new test-react-on-rails --webpack=react
 cd test-react-on-rails
 ```
 
-Note: you can do the following two commands in an existing Rails app:
+Note: you can do the following two commands in an existing Rails app or pre Rails 5.1.3:
 
 ```
 bundle exec rails webpacker:install

data/lib/react_on_rails/server_rendering_pool/exec.rb

@@ -19,7 +19,7 @@ module ReactOnRails
 
         server_bundle_js_file_path = ReactOnRails::Utils.server_bundle_js_file_path
 
-        if Webpacker.dev_server.running?
+        if Utils.using_webpacker? && Webpacker.dev_server.running?
           return if @last_loaded_server_bundle == server_bundle_js_file_path
           @last_loaded_server_bundle = server_bundle_js_file_path
         else

data/lib/react_on_rails/utils.rb

@@ -72,11 +72,16 @@ exitstatus: #{status.exitstatus}#{stdout_msg}#{stderr_msg}
       return @server_bundle_path if @server_bundle_path && !Rails.env.development?
 
       bundle_name = ReactOnRails.configuration.server_bundle_js_file
-      @server_bundle_path = begin
-        bundle_js_file_path(bundle_name)
-      rescue Webpacker::Manifest::MissingEntryError
-        Rails.root.join(File.join(Webpacker.config.public_output_path, bundle_name)).to_s
-      end
+      @server_bundle_path = if using_webpacker?
+                              begin
+                                bundle_js_file_path(bundle_name)
+                              rescue Webpacker::Manifest::MissingEntryError
+                                Rails.root.join(File.join(Webpacker.config.public_output_path,
+                                                          bundle_name)).to_s
+                              end
+                            else
+                              bundle_js_file_path(bundle_name)
+                            end
     end
 
     def self.bundle_js_file_path(bundle_name)

data/lib/react_on_rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ReactOnRails
-  VERSION = "9.0.0"
+  VERSION = "9.0.1"
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-on-rails",
-  "version": "9.0.0",
+  "version": "9.0.1",
   "description": "react-on-rails JavaScript for react_on_rails Ruby gem",
   "main": "node_package/lib/ReactOnRails.js",
   "directories": {

data/rakelib/run_rspec.rake

@@ -20,9 +20,9 @@ namespace :run_rspec do
 
   desc "Run RSpec with rails32 gemfile"
   task :gem_rails32 do
-    rspec_args = "spec/react_on_rails --exclude-pattern "\
-                 "\"**/generators/*_spec.rb,**/utils_spec.rb,"\
-                 "**/webpack_assets_status_checker_spec.rb,**/test_helper/*_spec.rb\""
+    rspec_args = "spec/react_on_rails --tag ~webpacker --exclude-pattern "\
+                 "\"**/generators/*_spec.rb,"\
+                 "**/test_helper/webpack_*_spec.rb\""
     run_tests_in("",
                  rspec_args: rspec_args,
                  env_vars: "BUNDLE_GEMFILE=spec/dummy_no_webpacker/Gemfile.rails32")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: react_on_rails
 version: !ruby/object:Gem::Version
-  version: 9.0.0
+  version: 9.0.1
 platform: ruby
 authors:
 - Justin Gordon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-07 00:00:00.000000000 Z
+date: 2017-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow