react_on_rails 6.5.0 → 6.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e72d8d450abc3b2aa072d0dd347910a0b44f6b77
-  data.tar.gz: 1cde3eeb6aef6b151a1b3cfdc1a42c1361bf4575
+  metadata.gz: a37b2fda991f6134211a91c1aca89ce539a9dddd
+  data.tar.gz: f0927633df2726414e86ba931c323d6fd25038d6
 SHA512:
-  metadata.gz: 6107837818ab9652f7f7ec15b4ca8a4d7ccb5f3361b00d9b706e168122db2410c6a252f43298ec0aed7d21981983f33365df0153800257e1aa3314aa541a7ed1
-  data.tar.gz: a261cd0ed7f4c5898270dd7d79605991ab198a85133d18e317a6ab35cdb95e195d5acf85bdb6f37deb1fa3d4ef329c918ced27cc53e0cdcf25dd35b701979bce
+  metadata.gz: 84ff0c3e94a1fff7b5893d0c03fdc8cba3efd40cbbbe09ea288b825534d52020fd65ff80be2e040d9eead3d0f5d2eab48847b61d2a99ce73b98d38587ba3c715
+  data.tar.gz: dbe4bd42c1109d45fbde205e20fa11d2e173d6ef23c95506b080a8ba028eb6e5389e80cb61d39f05f7ac76a00873907174f3dd7805871f46c2f86800d2dfca66

data/CHANGELOG.md

@@ -6,6 +6,12 @@ Contributors: please follow the recommendations outlined at [keepachangelog.com]
 ## [Unreleased]
 *Please add entries here for your pull requests.*
 
+## [6.5.1] - 2017-02-11
+### Fixed
+- Allow using gem without sprockets. [#671](https://github.com/shakacode/react_on_rails/pull/671) by [fc-arny](https://github.com/fc-arny).
+- Fixed issue [#706](https://github.com/shakacode/react_on_rails/issues/706) with "flickering" components when they are unmounted too early [#709](https://github.com/shakacode/react_on_rails/pull/709) by [szyablitsky](https://github.com/szyablitsky).
+- Small formatting fix for errors [#703](https://github.com/shakacode/react_on_rails/pull/703) by [justin808](https://github.com/justin808).
+
 ## [6.5.0] - 2017-01-31
 ### Added
 - Allow generator function to return Object with property `renderedHtml` (already could return Object with props `redirectLocation, error`) rather than a React component or a function that returns a React component. One reason to use a generator function is that sometimes in server rendering, specifically with React Router v4, you need to return the result of calling ReactDOMServer.renderToString(element). [#689](https://github.com/shakacode/react_on_rails/issues/689) by [justin808](https://github.com/justin808).
@@ -442,7 +448,8 @@ Best done with Object destructing:
 ##### Fixed
 - Fix several generator related issues.
 
-[Unreleased]: https://github.com/shakacode/react_on_rails/compare/6.5.0...master
+[Unreleased]: https://github.com/shakacode/react_on_rails/compare/6.5.1...master
+[6.5.1]: https://github.com/shakacode/react_on_rails/compare/6.5.0...6.5.1
 [6.5.0]: https://github.com/shakacode/react_on_rails/compare/6.4.2...6.5.0
 [6.4.2]: https://github.com/shakacode/react_on_rails/compare/6.4.1...6.4.2
 [6.4.1]: https://github.com/shakacode/react_on_rails/compare/6.4.0...6.4.1

data/README.md

@@ -113,7 +113,7 @@ We're definitely not doing that. With react_on_rails, webpack is mainly generati
   gem "react_on_rails", "~> 6"
   ```
 
-2. Commit this to git (you cannot run the generator unless you do this).
+2. Commit this to git (you cannot run the generator unless you do this or pass the option `--ignore-warnings`).
 
 3. See help for the generator:
 

data/docs/additional-reading/turbolinks.md

@@ -94,7 +94,7 @@ TURBO: reactOnRailsPageLoaded
 
 Turbolinks 5:
 ```
-TURBO: WITH TURBOLINKS 5: document turbolinks:before-cache and turbolinks:load handlers installed. (program)
+TURBO: WITH TURBOLINKS 5: document turbolinks:before-render and turbolinks:load handlers installed. (program)
 TURBO: reactOnRailsPageLoaded
 ```
 

data/docs/api/javascript-api.md

@@ -6,7 +6,7 @@ The best source of docs is the main [ReactOnRails.js](../../node_package/src/Rea
    * Main entry point to using the react-on-rails npm package. This is how Rails will be able to
    * find you components for rendering. Components get called with props, or you may use a
    * "generator function" to return a React component or an object with the following shape:
-   * { renderedHtml, redirectLocation, error }. 
+   * { renderedHtml, redirectLocation, error }.
    * @param components (key is component name, value is component)
    */
   register(components)

data/docs/basics/generator.md

@@ -1,7 +1,6 @@
 - [Generator](#generator)
   - [Understanding the Organization of the Generated Client Code](#understanding-the-organization-of-the-generated-client-code)
   - [Redux](#redux)
-    - [Multiple React Components on a Page with One Store](#multiple-react-components-on-a-page-with-one-store)
   - [Using Images and Fonts](#using-images-and-fonts)
 
 The `react_on_rails:install` generator combined with the example pull requests of generator runs will get you up and running efficiently. There's a fair bit of setup with integrating Webpack with Rails. Defaults for options are such that the default is for the flag to be off. For example, the default for `-R` is that `redux` is off, and the default of `-b` is that `skip-bootstrap` is off.
@@ -13,7 +12,9 @@ Usage:
   rails generate react_on_rails:install [options]
 
 Options:
-  -R, [--redux], [--no-redux]                          # Install Redux gems and Redux version of Hello World Example
+  -R, [--redux], [--no-redux]                      # Install Redux gems and Redux version of Hello World Example. Default: false
+  -N, [--node], [--no-node]                        # Sets up node as a server rendering option. Default: false
+      [--ignore-warnings], [--no-ignore-warnings]  # Skip warnings. Default: false
 
 Runtime options:
   -f, [--force]                    # Overwrite files that already exist
@@ -22,10 +23,36 @@ Runtime options:
   -s, [--skip], [--no-skip]        # Skip files that already exist
 
 Description:
-    Create react on rails files for install generator.
+
+The react_on_rails:install generator integrates webpack with rails with ease. You
+can pass the redux option if you'd like to have redux setup for you automatically.
+
+* Redux
+
+    Passing the --redux generator option causes the generated Hello World example
+    to integrate the Redux state container framework. The necessary node modules
+    will be automatically included for you.
+
+* Node
+
+    Passing the --node generator option sets up the necessary files for node to render the react_components.
+
+*******************************************************************************
+
+After running the generator, you will want to:
+
+    bundle && npm i
+
+Then you may run
+
+    foreman start -f Procfile.dev
+
+More Details:
+
+    `https://github.com/shakacode/react_on_rails/blob/master/docs/basics/generator.md`
 ```
 
-For a clear example of what each generator option will do, see our generator results repo: [Generator Results](https://github.com/shakacode/react_on_rails-generator-results/blob/master/README.md). Each pull request shows a git "diff" that highlights the changes that the generator has made. Another good option is to create a simple test app per the [Tutorial](docs/tutorial.md).
+Another good option is to create a simple test app per the [Tutorial](docs/tutorial.md).
 
 ### Understanding the Organization of the Generated Client Code
 The generated client code follows our organization scheme. Each unique set of functionality, is given its own folder inside of `client/app/bundles`. This encourages for modularity of *domains*.

data/docs/basics/i18n.md

@@ -2,7 +2,7 @@
 
 Here's a summary of adding the I18n functionality.
 
-You can refer to [react-webpack-rails-tutorial](https://github.com/shakacode/react-webpack-rails-tutorial) for a complete example.
+You can refer to [react-webpack-rails-tutorial](https://github.com/shakacode/react-webpack-rails-tutorial) and [PR #340](https://github.com/shakacode/react-webpack-rails-tutorial/pull/340) for a complete example.
 
 1. Add `react-intl` & `intl` to `client/package.json`, and remember to `bundle && npm install`.
 

data/lib/react_on_rails/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ReactOnRails
-  VERSION = "6.5.0".freeze
+  VERSION = "6.5.1".freeze
 end

data/lib/tasks/assets.rake

@@ -1,28 +1,50 @@
 require "react_on_rails/assets_precompile"
 
-namespace :react_on_rails do
-  namespace :assets do
-    desc "Creates non-digested symlinks for the assets in the public asset dir"
-    task symlink_non_digested_assets: :"assets:environment" do
-      ReactOnRails::AssetsPrecompile.new.symlink_non_digested_assets
-    end
+if defined?(Sprockets)
+  namespace :react_on_rails do
+    namespace :assets do
+      desc "Creates non-digested symlinks for the assets in the public asset dir"
+      task symlink_non_digested_assets: :"assets:environment" do
+        ReactOnRails::AssetsPrecompile.new.symlink_non_digested_assets
+      end
 
-    desc "Cleans all broken symlinks for the assets in the public asset dir"
-    task delete_broken_symlinks: :"assets:environment" do
-      ReactOnRails::AssetsPrecompile.new.delete_broken_symlinks
-    end
+      desc "Cleans all broken symlinks for the assets in the public asset dir"
+      task delete_broken_symlinks: :"assets:environment" do
+        ReactOnRails::AssetsPrecompile.new.delete_broken_symlinks
+      end
 
-    # In this task, set prerequisites for the assets:precompile task
-    desc <<-DESC
+      # In this task, set prerequisites for the assets:precompile task
+      desc <<-DESC
 Create webpack assets before calling assets:environment
 The webpack task must run before assets:environment task.
 Otherwise Sprockets cannot find the files that webpack produces.
 This is the secret sauce for how a Heroku deployment knows to create the webpack generated JavaScript files.
-    DESC
-    task compile_environment: :webpack do
-      Rake::Task["assets:environment"].invoke
+      DESC
+      task compile_environment: :webpack do
+        Rake::Task["assets:environment"].invoke
+      end
+
+      desc "Delete assets created with webpack, in the generated assetst directory (/app/assets/webpack)"
+      task clobber: :environment do
+        ReactOnRails::AssetsPrecompile.new.clobber
+      end
     end
+  end
+
+  # These tasks run as pre-requisites of assets:precompile.
+  # Note, it's not possible to refer to ReactOnRails configuration values at this point.
+  Rake::Task["assets:precompile"]
+    .clear_prerequisites
+    .enhance([:environment, "react_on_rails:assets:compile_environment"])
+    .enhance do
+      Rake::Task["react_on_rails:assets:symlink_non_digested_assets"].invoke
+      Rake::Task["react_on_rails:assets:delete_broken_symlinks"].invoke
+    end
+end
 
+# Sprockets independent tasks
+namespace :react_on_rails do
+  namespace :assets do
     desc <<-DESC
 Compile assets with webpack
 Uses command defined with ReactOnRails.configuration.npm_build_production_command
@@ -33,21 +55,5 @@ sh "cd client && `ReactOnRails.configuration.npm_build_production_command`"
         sh "cd client && #{ReactOnRails.configuration.npm_build_production_command}"
       end
     end
-
-    desc "Delete assets created with webpack, in the generated assetst directory (/app/assets/webpack)"
-    task clobber: :environment do
-      ReactOnRails::AssetsPrecompile.new.clobber
-    end
   end
 end
-
-# These tasks run as pre-requisites of assets:precompile.
-# Note, it's not possible to refer to ReactOnRails configuration values at this point.
-Rake::Task["assets:precompile"]
-  .clear_prerequisites
-  .enhance([:environment, "react_on_rails:assets:compile_environment"])
-  .enhance do
-    Rake::Task["react_on_rails:assets:symlink_non_digested_assets"].invoke
-    Rake::Task["react_on_rails:assets:delete_broken_symlinks"].invoke
-  end
-

data/package.json

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: react_on_rails
 version: !ruby/object:Gem::Version
-  version: 6.5.0
+  version: 6.5.1
 platform: ruby
 authors:
 - Justin Gordon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-01 00:00:00.000000000 Z
+date: 2017-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool