react_on_rails 10.0.0 → 10.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c3ced829061ca6995dd0f55349112955883e87b
-  data.tar.gz: be160b38edcaa90ae64ce0ea69a029f48505968b
+  metadata.gz: f77778a2d3e3388aa655c1f8906194318eec9203
+  data.tar.gz: 9b6d46e1d7a5cff954ad3cec4c3bb5aa3255cadb
 SHA512:
-  metadata.gz: 69f0ea0f49b5a2e5eab554656ffe8b82b18cad3475ea963a5fced718d2af7498f5aaf23e4a0a9554382f32a6a24f1fa154b1d4e27d208286b54d757ac5032e48
-  data.tar.gz: 7442ea55fa1d838d8c8f75dbfdb83c6db36bce40b5be5e3f10a9d38f8455d91930e7aa2bdfdd55ab3546f5c38a96bef1eef9f18f5b15f325c344c7492767dbc4
+  metadata.gz: 0be5ab13362813d72c3674dd67df1df1d22069a665df7cde5ad7bc52c572ef45d213dd14bdc862d8b8471b1995e93c19297644dd233978131bfde8b6932357da
+  data.tar.gz: dc5c2c1c68fc9913a3e7c5305ad907a739e530a8f190e9695c7e37dc5a28f9a846abd90c6b6066cd9a71307690135a820e45ef37736069802e6a5f421577f81c

data/CHANGELOG.md

@@ -6,7 +6,15 @@ Contributors: please follow the recommendations outlined at [keepachangelog.com]
 ## [Unreleased]
 Changes since last non-beta release.
 
-*Please add entries here for your pull requests.*
+*Please add entries here for your pull requests that are not yet released.*
+
+### [10.0.1] - 2017-10-28
+#### Fixed
+- Fixed `react_component_hash` functionality in cases of prerendering errors: [PR 960](https://github.com/shakacode/react_on_rails/pull/960) by [Judahmeek](https://github.com/Judahmeek).
+- Fix to add missing dependency to run generator spec individually: [PR 962](https://github.com/shakacode/react_on_rails/pull/962) by [tricknotes](https://github.com/tricknotes).
+- Fixes check for i18n_dir in LocalesToJs returning false when i18n_dir was set. [PR 899](https://github.com/shakacode/react_on_rails/pull/899) by [hakongit](https://github.com/hakongit).
+- Fixed mistake in rubocop comments that led to errors when handling exceptions in ReactOnRails::ServerRendering::Exec [PR 963](https://github.com/shakacode/react_on_rails/pull/963) by [railsme](https://github.com/railsme).
+- Fixed and improved I18n directories checks: [PR 967](https://github.com/shakacode/react_on_rails/pull/967) by [railsme](https://github.com/railsme)
 
 ### [10.0.0] - 2017-10-08
 #### Created
@@ -14,108 +22,27 @@ Changes since last non-beta release.
 #### Deprecated
 - Deprecated `react_component` functionality for react_helmet support.
 To clarify, the method itself is not deprecated, only certain functionality which has been moved to `react_component_hash`
-[PR 951](https://github.com/shakacode/react_on_rails/pull/951) by [Judahmeek](https://github.com/Judahmeek)
+[PR 951](https://github.com/shakacode/react_on_rails/pull/951) by [Judahmeek](https://github.com/Judahmeek).
 
 ### [9.0.3] - 2017-09-20
 #### Improved
-- Improved comments in generated Procfile.dev-server. [PR 940](https://github.com/shakacode/react_on_rails/pull/940) by [justin808](https://github.com/justin808 )
+- Improved comments in generated Procfile.dev-server. [PR 940](https://github.com/shakacode/react_on_rails/pull/940) by [justin808](https://github.com/justin808).
 
 ### [9.0.2] - 2017-09-10
 #### Fixed
-- Improved post install doc comments for generator. [PR 933](https://github.com/shakacode/react_on_rails/pull/933) by [justin808](https://github.com/justin808 )
+- Improved post install doc comments for generator. [PR 933](https://github.com/shakacode/react_on_rails/pull/933) by [justin808](https://github.com/justin808).
 
 ### [9.0.1] - 2017-09-10
 
 #### Fixed
-- Fixes Rails 3.2 compatability issues. [PR 926](https://github.com/shakacode/react_on_rails/pull/926) by [morozovm](https://github.com/morozovm )
+- 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.0] - 2017-09-06
 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).
-
-- Breaking Configuration Changes
-  1. Added `config.node_modules_location` which defaults to `""` if Webpacker is installed. You may want to set this to 'client'` to `config/initializers/react_on_rails.rb` to keep your node_modules inside of `/client`
-  2. Renamed
-   * config.npm_build_test_command ==> config.build_test_command
-   * config.npm_build_production_command ==> config.build_production_command
-
-- Update the gemfile. Switch over to using the webpacker gem.
-
-```rb
-gem "webpacker"
-```
-
-- Update for the renaming in the `WebpackConfigLoader` in your webpack configuration.
-  You will need to rename the following object properties:
-  - webpackOutputPath      ==> output.path
-  - webpackPublicOutputDir ==> output.publicPath
-  - hotReloadingUrl        ==> output.publicPathWithHost
-  - hotReloadingHostname   ==> settings.dev_server.host
-  - hotReloadingPort       ==> settings.dev_server.port
-  - hmr                    ==> settings.dev_server.hmr
-  - manifest               ==> Remove this one. We use the default for Webpack of manifest.json
-  - env                    ==> Use `const { env } = require('process');`
-  - devBuild               ==> Use `const devBuild = process.env.NODE_ENV !== 'production';`
-
-- Edit your Webpack.config files:
-  - Change your Webpack output to be like this. **Be sure to have the hash or chunkhash in the filename,** unless the bundle is server side.:
-    ```
-    const webpackConfigLoader = require('react-on-rails/webpackConfigLoader');
-    const configPath = resolve('..', 'config');
-    const { output, settings } = webpackConfigLoader(configPath);
-    const hmr = settings.dev_server.hmr;
-    const devBuild = process.env.NODE_ENV !== 'production';
-
-    output: {
-      filename: isHMR ? '[name]-[hash].js' : '[name]-[chunkhash].js',
-      chunkFilename: '[name]-[chunkhash].chunk.js',
-
-      publicPath: output.publicPath,
-      path: output.path,
-    },
-    ```
-  - Change your ManifestPlugin definition to something like the following
-    ```
-    new ManifestPlugin({
-        publicPath: output.publicPath,
-        writeToFileEmit: true
-      }),
-
-    ```
-
-- Find your `webpacker_lite.yml` and rename it to `webpacker.yml`
-  - Consider copying a default webpacker.yml setup such as https://github.com/shakacode/react-on-rails-v9-rc-generator/blob/master/config/webpacker.yml
-  - If you are not using the webpacker webpacker setup, be sure to put in `compile: false` in the `default` section.
-  - Alternately, if you are updating from webpacker_lite, you can manually change these:
-  - Add a default setting
-    ```
-    cache_manifest: false
-    ```
-  - For production, set:  
-    ```
-    cache_manifest: true
-    ```
-  - Add a section like this under your development env:
-    ```
-    dev_server:
-      host: localhost
-      port: 3035
-      hmr: false
-    ```
-    Set hmr to your preference.
-  - See the example `spec/dummy/config/webpacker.yml`.
-  - Remove keys `hot_reloading_host` and `hot_reloading_enabled_by_default`. These are replaced by the `dev_server` key.
-  - Rename `webpack_public_output_dir` to `public_output_path`.
-
-- Edit your Procfile.dev
-  - Remove the env value WEBPACKER_DEV_SERVER as it's not used
-  - For hot loading:
-    - Set the `hmr` key in your `webpacker.yml` to `true`.
-
+Moved to [our additional reading documentation](https://github.com/shakacode/react_on_rails/blob/master/docs/additional-reading/upgrading-react-on-rails#from-version-8).
 
 ### [8.0.7] - 2017-08-16
 #### Fixed
@@ -739,7 +666,9 @@ Best done with Object destructing:
 ##### Fixed
 - Fix several generator related issues.
 
-[Unreleased]: https://github.com/shakacode/react_on_rails/compare/9.0.3...master
+[Unreleased]: https://github.com/shakacode/react_on_rails/compare/10.0.1...master
+[10.0.1]: https://github.com/shakacode/react_on_rails/compare/10.0.0...10.0.1
+[10.0.0]: https://github.com/shakacode/react_on_rails/compare/9.0.3...10.0.0
 [9.0.3]: https://github.com/shakacode/react_on_rails/compare/9.0.2...9.0.3
 [9.0.2]: https://github.com/shakacode/react_on_rails/compare/9.0.1...9.0.2
 [9.0.1]: https://github.com/shakacode/react_on_rails/compare/9.0.0...9.0.1

data/README.md

@@ -4,7 +4,7 @@
 
 [ShakaCode is hiring team members](http://www.shakacode.com/about/#work-with-us) for our own app, [Friends and Guests](https://www.friendsandguests.com).
 
-# React on Rails v9 is based on Webpacker 3.0!
+# React on Rails v10 is based on Webpacker 3.0!
 
 * See the article [Introducing React on Rails v9 with Webpacker Support](https://blog.shakacode.com/introducing-react-on-rails-v9-with-webpacker-support-f2584c6c8fa4) for an overview of the integration of React on Rails with Webpacker.
 * [Video of running the v9 installer with Webpacker v3](https://youtu.be/M0WUM_XPaII).
@@ -190,7 +190,7 @@ To upgrade existing apps to React on Rails 8 see the [Installation Overview](doc
 1. Add the following to your Gemfile and `bundle install`. We recommend fixing the version of React on Rails, as you will need to keep the exact version in sync with the version in your `client/package.json` file.
 
   ```ruby
-  gem "react_on_rails", "9.0.0"
+  gem "react_on_rails", "10.0.0"
   gem "webpacker", "~> 3.0"
   ```
 

data/app/helpers/react_on_rails_helper.rb

@@ -129,6 +129,10 @@ module ReactOnRailsHelper
     server_rendered_html = internal_result["result"]["html"]
     console_script = internal_result["result"]["consoleReplayScript"]
 
+    if server_rendered_html.is_a?(String) && internal_result["result"]["hasErrors"]
+      server_rendered_html = { COMPONENT_HTML_KEY => internal_result["result"]["html"] }
+    end
+
     if server_rendered_html.is_a?(Hash)
       build_react_component_result_for_server_rendered_hash(
         server_rendered_html: server_rendered_html,

data/docs/basics/upgrading-react-on-rails.md

@@ -0,0 +1,175 @@
+# Upgrading React on Rails
+
+## Upgrading to version 10
+
+Pretty simple:
+* Follow the steps to migrate to version 9 (except installing 10.x instead of 9.x)
+* If you have `react_component` returning hashes, then switch to `react_component_hash` instead
+
+## Upgrading to version 9
+
+### Why Webpacker?
+Webpacker provides areas of value:
+* View helpers that support bypassing the asset pipeline, which allows you to avoid double minification and enable source maps in production. This is 100% a best practice as source maps in production greatly increases the value of services such as HoneyBadger or Sentry.
+* A default Webpack config so that you only need to do minimal modifications and customizations. However, if you're doing server rendering, you may not want to give up control. Since Webpacker's default webpack config is changing often, we at Shakacode can give you definitive advice on webpack configuration best practices. In general, if you're happy with doing your own Webpack configuration, then we suggest using the `client` strategy discussed below. Most corporate projects will prefer having more control than direct dependence on webpacker easily allows.
+
+### Integrating Webpacker
+Reason for doing this: This enables your webpack bundles to bypass the Rails asset pipeline and it's extra minification, enabling you to use source-maps in production, while still maintaining total control over everything in the client directory
+
+#### From version 7 or lower
+
+##### ...while keeping your `client` directory
+Unfortunately, this requires quite a few steps:
+*   `.gitignore`: add `/public/webpack/*`
+*   `Gemfile`: bump `react_on_rails` and add `webpacker`
+*   layout views: anything bundled by webpack will need to be requested by a `javascript_pack_tag` or `stylesheet_pack_tag`
+*   `config/initializers/assets.rb`: we no longer need to modify `Rails.application.config.assets.paths` or append anything to `Rails.application.config.assets.precompile`.
+*   `config/initializers/react_on_rails.rb`:
+    *   Delete `config.generated_assets_dir`. Webpacker's config now supplies this information
+    *   Replace `config.npm_build_(test|production)_command` with `config.build_(test|production)_command`
+*   `config/webpacker.yml`: start with our [example config](https://github.com/shakacode/react-webpack-rails-tutorial/blob/master/config/webpacker.yml) (feel free to modify it as needed). I recommend setting dev_server.hmr to false however since HMR is currently broken.
+*   `client/package.json`: bump `react_on_rails` (I recommend bumping `webpack` as well). You'll also need `js-yaml` if you're not already using `eslint` and `webpack-manifest-plugin` regardless.
+
+######  Client Webpack config:
+  *   You'll need the following code to read data from the webpacker config:
+
+```
+const path = require('path');
+const ManifestPlugin = require('webpack-manifest-plugin'); // we'll use this later
+
+const webpackConfigLoader = require('react-on-rails/webpackConfigLoader');
+const configPath = path.resolve('..', 'config');
+const { output } = webpackConfigLoader(configPath);
+```
+
+  *   That output variable will be used for webpack's `output` rules:
+
+```
+  output: {
+    filename: '[name]-[chunkhash].js', // [chunkhash] because we've got to do our own cache-busting now
+    path: output.path,
+    publicPath: output.publicPath,
+  },
+```
+
+  *   ...as well as for the output of plugins like `webpack-manifest-plugin`:
+
+```
+
+      new ManifestPlugin({
+        publicPath: output.publicPath,
+        writeToFileEmit: true
+      }),
+```
+
+  *   If you're using referencing files or images with `url-loader` & `file-loader`, their publicpaths will have to change as well: `publicPath: '/webpack/',`
+  *   If you're using `css-loader`, `webpack.optimize.CommonsChunkPlugin`, or `extract-text-webpack-plugin`, they will also need cache-busting!
+
+...and you're finally done!
+
+##### ...while replacing your `client` directory
+* Make the same changes to `config/initializers/react_on_rails.rb as described above`
+* Upgrade RoR & add Webpacker in the Gemfile
+* Upgrade RoR in the `client/package.json`
+* Run `bundle`
+* Run `rails webpacker:install`
+* Run `rails webpacker:install:react`
+* Run `rails g react_on_rails:install`
+* Move your entry point files to `app/javascript/packs`
+* Either:
+    * Move all your source code to `app/javascript/bundles`, move your linter configs to the root directory, and then delete the `client` directory
+    * or just delete the webpack config and remove webpack, its loaders, and plugins from your `client/package.json`.
+
+...and you're done.
+
+#### From version 8
+
+For an example of upgrading, see [react-webpack-rails-tutorial/pull/416](https://github.com/shakacode/react-webpack-rails-tutorial/pull/416).
+
+- Breaking Configuration Changes
+  1. Added `config.node_modules_location` which defaults to `""` if Webpacker is installed. You may want to set this to 'client'` to `config/initializers/react_on_rails.rb` to keep your node_modules inside of `/client`
+  2. Renamed
+   * config.npm_build_test_command ==> config.build_test_command
+   * config.npm_build_production_command ==> config.build_production_command
+
+- Update the gemfile. Switch over to using the webpacker gem.
+
+```rb
+gem "webpacker"
+```
+
+- Update for the renaming in the `WebpackConfigLoader` in your webpack configuration.
+  You will need to rename the following object properties:
+  - webpackOutputPath      ==> output.path
+  - webpackPublicOutputDir ==> output.publicPath
+  - hotReloadingUrl        ==> output.publicPathWithHost
+  - hotReloadingHostname   ==> settings.dev_server.host
+  - hotReloadingPort       ==> settings.dev_server.port
+  - hmr                    ==> settings.dev_server.hmr
+  - manifest               ==> Remove this one. We use the default for Webpack of manifest.json
+  - env                    ==> Use `const { env } = require('process');`
+  - devBuild               ==> Use `const devBuild = process.env.NODE_ENV !== 'production';`
+
+- Edit your Webpack.config files:
+  - Change your Webpack output to be like this. **Be sure to have the hash or chunkhash in the filename,** unless the bundle is server side.:
+    ```
+    const webpackConfigLoader = require('react-on-rails/webpackConfigLoader');
+    const configPath = resolve('..', 'config');
+    const { output, settings } = webpackConfigLoader(configPath);
+    const hmr = settings.dev_server.hmr;
+    const devBuild = process.env.NODE_ENV !== 'production';
+
+    output: {
+      filename: isHMR ? '[name]-[hash].js' : '[name]-[chunkhash].js',
+      chunkFilename: '[name]-[chunkhash].chunk.js',
+
+      publicPath: output.publicPath,
+      path: output.path,
+    },
+    ```
+  - Change your ManifestPlugin definition to something like the following
+    ```
+    new ManifestPlugin({
+        publicPath: output.publicPath,
+        writeToFileEmit: true
+      }),
+
+    ```
+
+- Find your `webpacker_lite.yml` and rename it to `webpacker.yml`
+  - Consider copying a default webpacker.yml setup such as https://github.com/shakacode/react-on-rails-v9-rc-generator/blob/master/config/webpacker.yml
+  - If you are not using the webpacker webpacker setup, be sure to put in `compile: false` in the `default` section.
+  - Alternately, if you are updating from webpacker_lite, you can manually change these:
+  - Add a default setting
+    ```
+    cache_manifest: false
+    ```
+  - For production, set:  
+    ```
+    cache_manifest: true
+    ```
+  - Add a section like this under your development env:
+    ```
+    dev_server:
+      host: localhost
+      port: 3035
+      hmr: false
+    ```
+    Set hmr to your preference.
+  - See the example `spec/dummy/config/webpacker.yml`.
+  - Remove keys `hot_reloading_host` and `hot_reloading_enabled_by_default`. These are replaced by the `dev_server` key.
+  - Rename `webpack_public_output_dir` to `public_output_path`.
+
+- Edit your Procfile.dev
+  - Remove the env value WEBPACKER_DEV_SERVER as it's not used
+  - For hot loading:
+    - Set the `hmr` key in your `webpacker.yml` to `true`.
+
+### Without integrating webpacker
+* Bump your ReactOnRails versions in `Gemfile` & `package.json`
+* In `/config/initializers/react_on_rails.rb`:
+    *  Rename `config.npm_build_test_command` ==> `config.build_test_command`
+    *  Rename `config.npm_build_production_command` ==> `config.build_production_command`
+    *  Add `config.node_modules_location = "client"`
+
+...and you're done.

data/lib/react_on_rails/configuration.rb

@@ -21,7 +21,7 @@ module ReactOnRails
   end
 
   def self.check_i18n_directory_exists
-    return if @configuration.i18n_dir.blank?
+    return if @configuration.i18n_dir.nil?
     return if Dir.exist?(@configuration.i18n_dir)
 
     raise "Error configuring /config/react_on_rails.rb: invalid value for `config.i18n_dir`. "\
@@ -30,7 +30,7 @@ module ReactOnRails
   end
 
   def self.check_i18n_yml_directory_exists
-    return if @configuration.i18n_yml_dir.blank?
+    return if @configuration.i18n_yml_dir.nil?
     return if Dir.exist?(@configuration.i18n_yml_dir)
 
     raise "Error configuring /config/react_on_rails.rb: invalid value for `config.i18n_yml_dir`. "\
@@ -83,7 +83,7 @@ module ReactOnRails
 
   def self.configuration
     @configuration ||= Configuration.new(
-      node_modules_location: "",
+      node_modules_location: nil,
       generated_assets_dirs: nil,
 
       # generated_assets_dirs is deprecated
@@ -105,8 +105,6 @@ module ReactOnRails
       server_render_method: "ExecJS",
       symlink_non_digested_assets_regex: nil,
       build_test_command: "",
-      i18n_dir: "",
-      i18n_yml_dir: "",
       build_production_command: ""
     )
   end
@@ -122,7 +120,7 @@ module ReactOnRails
                   :i18n_dir, :i18n_yml_dir,
                   :server_render_method, :symlink_non_digested_assets_regex
 
-    def initialize(node_modules_location: "", server_bundle_js_file: nil, prerender: nil,
+    def initialize(node_modules_location: nil, server_bundle_js_file: nil, prerender: nil,
                    replay_console: nil,
                    trace: nil, development_mode: nil,
                    logging_on_server: nil, server_renderer_pool_size: nil,
@@ -133,7 +131,7 @@ module ReactOnRails
                    build_production_command: nil,
                    i18n_dir: nil, i18n_yml_dir: nil,
                    server_render_method: "ExecJS", symlink_non_digested_assets_regex: nil)
-      self.node_modules_location = node_modules_location
+      self.node_modules_location = node_modules_location.present? ? node_modules_location : Rails.root
       self.server_bundle_js_file = server_bundle_js_file
       self.generated_assets_dirs = generated_assets_dirs
       self.generated_assets_dir = generated_assets_dir

data/lib/react_on_rails/locales_to_js.rb

@@ -5,7 +5,7 @@ require "erb"
 module ReactOnRails
   class LocalesToJs
     def initialize
-      return if i18n_dir.blank?
+      return if i18n_dir.nil?
       return unless obsolete?
       @translations, @defaults = generate_translations
       convert

data/lib/react_on_rails/server_rendering_pool/exec.rb

@@ -98,7 +98,7 @@ module ReactOnRails
           # bundle_js_code = File.read(server_js_file)
           begin
             bundle_js_code = open(server_js_file, &:read)
-          rescue # rubocop:disable Lint/RescueWithoutErrorClass => e
+          rescue => e # rubocop:disable Lint/RescueWithoutErrorClass
             msg = "You specified server rendering JS file: #{server_js_file}, but it cannot be "\
                 "read. You may set the server_bundle_js_file in your configuration to be \"\" to "\
                 "avoid this warning.\nError is: #{e}"
@@ -115,7 +115,7 @@ module ReactOnRails
           begin
             trace_messsage(base_js_code, file_name)
             ExecJS.compile(base_js_code)
-          rescue # rubocop:disable Lint/RescueWithoutErrorClass => e
+          rescue => e # rubocop:disable Lint/RescueWithoutErrorClass
             msg = "ERROR when compiling base_js_code! "\
               "See file #{file_name} to "\
               "correlate line numbers of error. Error is\n\n#{e.message}"\

data/lib/react_on_rails/utils.rb

@@ -122,7 +122,6 @@ exitstatus: #{status.exitstatus}#{stdout_msg}#{stderr_msg}
     end
 
     def self.prepend_cd_node_modules_directory(cmd)
-      return cmd if ReactOnRails.configuration.node_modules_location.blank?
       "cd #{ReactOnRails.configuration.node_modules_location} && #{cmd}"
     end
 

data/lib/react_on_rails/version.rb

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

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-on-rails",
-  "version": "10.0.0",
+  "version": "10.0.1",
   "description": "react-on-rails JavaScript for react_on_rails Ruby gem",
   "main": "node_package/lib/ReactOnRails.js",
   "directories": {
@@ -88,7 +88,7 @@
   },
   "homepage": "https://github.com/shakacode/react_on_rails#readme",
   "dependencies": {
-    "react-on-rails": "^9.0.3",
+    "react-on-rails": "^10.0.0",
     "react-redux": "^5.0.6"
   }
 }

data/react_on_rails.gemspec

@@ -25,26 +25,26 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = ">= 2.0.0"
 
-  s.add_dependency "rainbow", "~> 2.2"
+  s.add_dependency "addressable"
   s.add_dependency "connection_pool"
   s.add_dependency "execjs", "~> 2.5"
   s.add_dependency "rails", ">= 3.2"
-  s.add_dependency "addressable"
+  s.add_dependency "rainbow", "~> 2.2"
 
-  s.add_development_dependency "rails", "~> 5.1.2"
+  s.add_development_dependency "awesome_print"
   s.add_development_dependency "bundler", "~> 1.10"
-  s.add_development_dependency "rake", "~> 10.0"
-  s.add_development_dependency "listen"
-  s.add_development_dependency "rspec"
   s.add_development_dependency "coveralls"
+  s.add_development_dependency "gem-release"
   s.add_development_dependency "generator_spec"
+  s.add_development_dependency "listen"
   s.add_development_dependency "pry"
   s.add_development_dependency "pry-byebug"
-  s.add_development_dependency "pry-stack_explorer"
   s.add_development_dependency "pry-doc"
+  s.add_development_dependency "pry-rescue"
+  s.add_development_dependency "pry-stack_explorer"
   s.add_development_dependency "pry-state"
   s.add_development_dependency "pry-toys"
-  s.add_development_dependency "pry-rescue"
-  s.add_development_dependency "awesome_print"
-  s.add_development_dependency "gem-release"
+  s.add_development_dependency "rails", "~> 5.1.2"
+  s.add_development_dependency "rake", "~> 10.0"
+  s.add_development_dependency "rspec"
 end

data/yarn.lock

@@ -2449,13 +2449,6 @@ js-tokens@^3.0.0, js-tokens@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
 
-js-yaml@^3.10.0:
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.10.0.tgz#2e78441646bd4682e963f22b6e92823c309c62dc"
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
 js-yaml@^3.5.1:
   version "3.9.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.9.1.tgz#08775cebdfdd359209f0d2acd383c8f86a6904a0"
@@ -3248,6 +3241,13 @@ react-dom@^15.6.1:
     object-assign "^4.1.0"
     prop-types "^15.5.10"
 
+react-on-rails@^10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/react-on-rails/-/react-on-rails-10.0.0.tgz#afc658bf23f5dfe3fd836adc178eb4672727a89d"
+  dependencies:
+    react-on-rails "^9.0.3"
+    react-redux "^5.0.6"
+
 react-on-rails@^9.0.0-beta.12:
   version "9.0.1"
   resolved "https://registry.yarnpkg.com/react-on-rails/-/react-on-rails-9.0.1.tgz#49bf7520866214e410e6f88b298e889183d93786"

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: react_on_rails
 version: !ruby/object:Gem::Version
-  version: 10.0.0
+  version: 10.0.1
 platform: ruby
 authors:
 - Justin Gordon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-17 00:00:00.000000000 Z
+date: 2017-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rainbow
+  name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: connection_pool
   requirement: !ruby/object:Gem::Requirement
@@ -67,33 +67,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: addressable
+  name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -109,21 +109,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.10'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: listen
+  name: gem-release
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: generator_spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: generator_spec
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -179,7 +179,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -193,7 +193,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: pry-doc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -207,7 +207,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-stack_explorer
+  name: pry-rescue
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -221,7 +221,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-doc
+  name: pry-stack_explorer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -263,35 +263,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-rescue
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.1.2
 - !ruby/object:Gem::Dependency
-  name: awesome_print
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: gem-release
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -370,6 +370,7 @@ files:
 - docs/basics/i18n.md
 - docs/basics/installation-overview.md
 - docs/basics/migrating-from-react-rails.md
+- docs/basics/upgrading-react-on-rails.md
 - docs/coding-style/style.md
 - docs/contributor-info/generator-testing.md
 - docs/contributor-info/linters.md