react_on_rails 6.6.0 → 6.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9df3146f1b1852d86faa068f5d22dc82ac0a29d5
-  data.tar.gz: e3850f41f59ac558263173e8407088b2c18f0c5b
+  metadata.gz: 0c58c7ed04a4a64f4e0215a9d409f8628a66a988
+  data.tar.gz: a12a656c9a33e5f6c3fbdb71e4f0811a60b99ad5
 SHA512:
-  metadata.gz: c36020f6688cc06c004eba51a42b543c0d206e0b9664e544b04c3b5f0542af65ed875baf78923e905b7b5fc08999687cdb4c35506b7009c366588e9ec953d2f6
-  data.tar.gz: 101064964aa15e85d333dba3c6ebfd053834e3770b7f14569249fc20f67ba639df80fbf81d66954a8eda445227ea30e95d4ae06477009b973f87262d5beee5c9
+  metadata.gz: ac418a4fc783db738ced2316c41e8f4031dcfd01eb50bf3afe0cce47470362ac0d212384a93be4a6d566cd110d2027205e7bd4fc840ee8c9b5952366fc26b749
+  data.tar.gz: a26293687d1ff59f02287ff5fb469b907f5eff5325d62833e2df1899d4bff6a2bf2d781826ffd4dda8b7ef6d1dd95f7207633bc9f069a4964283fefe72442b27

data/.travis.yml

@@ -3,11 +3,11 @@ sudo: required
 language: ruby
 
 rvm:
-  - 2.0.0
+  # Ruby 2.0.0 fails due to newer Nokogir
+  # nokogiri-1.7.0.1 requires ruby version >= 2.1.0, which is incompatible with the current version, ruby 2.0.0p648
   - 2.1.10
   - 2.2.6
   - 2.3.1
-
 services:
   - docker
 

data/CHANGELOG.md

@@ -6,6 +6,15 @@ Contributors: please follow the recommendations outlined at [keepachangelog.com]
 ## [Unreleased]
 *Please add entries here for your pull requests.*
 
+## [6.7.0] - 2017-02-28
+
+### Added
+- Allow using rake task to generate javascript locale files. The test helper automatically creates the localization files when needed. [#717](https://github.com/shakacode/react_on_rails/pull/717) by [JasonYCHuang](https://github.com/JasonYCHuang).
+
+### Fixed
+- Upgrade Rails to 4.2.8 to fix security vulnerabilities in 4.2.5. [#735](https://github.com/shakacode/react_on_rails/pull/735) by [hrishimittal](https://github.com/hrishimittal).
+- Fix spec failing due to duplicate component. [#734](https://github.com/shakacode/react_on_rails/pull/734) by [hrishimittal](https://github.com/hrishimittal).
+
 ## [6.6.0] - 2017-02-18
 ### Added
 - Switched to yarn! [#715](https://github.com/shakacode/react_on_rails/pull/715) by [squadette](https://github.com/squadette).
@@ -452,7 +461,8 @@ Best done with Object destructing:
 ##### Fixed
 - Fix several generator related issues.
 
-[Unreleased]: https://github.com/shakacode/react_on_rails/compare/6.6.0...master
+[Unreleased]: https://github.com/shakacode/react_on_rails/compare/6.7.0...master
+[6.7.0]: https://github.com/shakacode/react_on_rails/compare/6.6.0...6.7.0
 [6.6.0]: https://github.com/shakacode/react_on_rails/compare/6.5.1...6.6.0
 [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

data/Gemfile

@@ -12,7 +12,7 @@ gem "coffee-rails", "~> 4.1.0"
 gem "jbuilder", "~> 2.0"
 gem "jquery-rails"
 gem "puma"
-gem "rails", "4.2.5"
+gem "rails", "4.2.8"
 gem "rails_12factor"
 gem "rubocop", require: false
 gem "ruby-lint", require: false

data/KUDOS.md

@@ -44,3 +44,9 @@ https://github.com/shakacode/react_on_rails/pull/591#issuecomment-258685925
 
 ### December 20, 2016
 ![2016-12-25_10-02-17](https://cloud.githubusercontent.com/assets/1118459/21472700/70242a1e-ca89-11e6-9522-fb45f7835bbb.png)
+
+### February 24, 2017
+"I ❤️ React on Rails because it's easy to drop into a Rails project and still get all the power of native JavaScript tooling. The generators are great and the community is so awesome and welcoming. In fact, I love it so much I made a [course for learning React with Rails](https://goo.gl/uzu36X) using the react_on_rails gem!"
+![The Complete React on Rails course](https://raw.githubusercontent.com/learnetto/calreact/whyror/public/why_react_on_rails_gem.png)
+
+

data/PROJECTS.md

@@ -18,6 +18,7 @@
 * **[Undeveloped](https://undeveloped.com/)**: Buy and sell domain names. ![image](https://cloud.githubusercontent.com/assets/1118459/19623703/7c6d63d0-9870-11e6-83f2-8b83ca49daa9.png)
 * **[Foxford.ru](http://foxford.ru/)**: Online School ![2016-12-17_13-23-21](https://cloud.githubusercontent.com/assets/1118459/21290377/1adacdf2-c45c-11e6-97c1-f726ab749b2d.png)
 * **[CareerBuilder for Employers](https://hiring.careerbuilder.com/)**: CareerBuilder's marketing/ecommerce website. We've integrated React on Rails and have deployed the application via Cloud 66, and are busy integrating this into other projects!
+* **[Josephine](https://www.josephine.com)**: The private network for home cooked meals.
 
 ## Open Source Projects Live
 * [github.com/empirical-org/Empirical-Core](https://github.com/empirical-org/Empirical-Core): [Quill.org](https://quill.org/) Provides free tools to make your students better writers.
@@ -25,6 +26,7 @@
 ## Demos and Tutorials
 * [reactrails.com](http://www.reactrails.com), source code [github.com/shakacode/react-webpack-rails-tutorial](https://github.com/shakacode/react-webpack-rails-tutorial/)
 * [Relay Rails Blog](https://github.com/gauravtiwari/relay-rails-blog): Tutorial to learn Relay with Rails.
+* [Hot Module Replacement with react_on_rails](https://medium.com/@hrishio/lesson-5-hot-module-replacement-for-react-in-rails-using-the-react-on-rails-gem-643c5b01f3d7#.ehevxok16) : Step-by-step tutorial for a quick basic set up of hot asset reloading with HMR in a Rails 5 app. [Code on Github](https://github.com/learnetto/calreact-hmr)
 
 --------
 

data/README.md

@@ -2,7 +2,7 @@
 
 **For a complete example of this gem, see our live demo at [www.reactrails.com](http://www.reactrails.com). ([Source Code](https://github.com/shakacode/react-webpack-rails-tutorial))**
 
-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](mailto:justin@shakacode.com) if we could potentially help you in any way. Besides consulting on bigger projects, [ShakaCode](http://www.shakacode.com) is doing ScreenHero 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, including conversion of AngularJs to React. Please [contact me](mailto:justin@shakacode.com) if we could potentially help you in any way. Besides consulting on bigger projects, [ShakaCode](http://www.shakacode.com) is doing ScreenHero 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.
 
 I'm 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!
 
@@ -47,6 +47,8 @@ For more testimonials, see [Live Projects](PROJECTS.md) and [Kudos](./KUDOS.md).
 * [284 Ruby Rogues: React on Rails with Justin Gordon and Rob Wise](https://devchat.tv/ruby-rogues/284-rr-react-on-rails-with-justin-gordon-and-rob-wise)
 
 # NEWS
+* 2017-02-28: See [discussions here on Webpacker](https://github.com/rails/webpacker/issues/139) regarding how Webpacker will allow React on Rails to avoid using the asset pipeline in the near future.
+* 2017-02-28: Upgrade to Webpack v2 or use the `--bail` option in your webpack script for test and production builds. See the discussion on [PR #730](https://github.com/shakacode/react_on_rails/pull/730).
 * 2016-11-03: Spoke at [LA Ruby: "React on Rails: Why, What, and How?"](http://www.meetup.com/laruby/events/234825187/). [Video and pictures in this article](https://blog.shakacode.com/my-react-on-rails-talk-at-the-la-ruby-rails-meetup-november-10-2016-eaaa83aff800#.ej6h4eglp).
 * *See [NEWS.md](NEWS.md) for more notes over time.*
 
@@ -226,7 +228,7 @@ In the following screenshot you can see the 3 parts of React on Rails rendering:
 ### Building the Bundles
 Each time you change your client code, you will need to re-generate the bundles (the webpack-created JavaScript files included in application.js). The included Foreman `Procfile.dev` will take care of this for you by watching your JavaScript code files for changes. Simply run `foreman start -f Procfile.dev`.
 
-On production deployments that use asset precompilation, such as Heroku deployments, React on Rails, by default, will automatically run webpack to build your JavaScript bundles. You can see the source code for what gets added to your precompilation [here](https://github.com/shakacode/react_on_rails/tree/master/lib/tasks/assets.rake). For more information on this topic, see [the doc on Heroku deployment](https://github.com/shakacode/react_on_rails/tree/master/docs/additional-reading/heroku-deployment.md#more-details-on-precompilation-using-webpack-to-create-javascript-assets).
+On production deployments that use asset precompilation, such as Heroku deployments, React on Rails, by default, will automatically run webpack to build your JavaScript bundles. You can see the source code for what gets added to your precompilation [here](https://github.com/shakacode/react_on_rails/tree/master/lib/tasks/assets.rake). For more information on this topic, see [the doc on Heroku deployment](./docs/additional-reading/heroku-deployment.md#more-details-on-precompilation-using-webpack-to-create-javascript-assets).
 
 If you have used the provided generator, these bundles will automatically be added to your `.gitignore` to prevent extraneous noise from re-generated code in your pull requests. You will want to do this manually if you do not use the provided generator.
 
@@ -335,7 +337,7 @@ Why would you create a function that returns a React component? For example, you
 Another reason to user a generator function is that sometimes in server rendering, specifically with React Router, you need to return the result of calling ReactDOMServer.renderToString(element). You can do this by returning an object with the following shape: { renderedHtml, redirectLocation, error }.
 
 #### Renderer Functions
-A renderer function is a generator function that accepts three arguments: `(props, railsContext, domNodeId) => { ... }`. Instead of returning a React component, a renderer is responsible for calling `ReactDOM.render` to manually render a React component into the dom. Why would you want to call `ReactDOM.render` yourself? One possible use case is [code splitting](docs/additional-reading/code-splitting.md).
+A renderer function is a generator function that accepts three arguments: `(props, railsContext, domNodeId) => { ... }`. Instead of returning a React component, a renderer is responsible for calling `ReactDOM.render` to manually render a React component into the dom. Why would you want to call `ReactDOM.render` yourself? One possible use case is [code splitting](./docs/additional-reading/code-splitting.md).
 
 Renderer functions are not meant to be used on the server, since there's no DOM on the server. Instead, use a generator function. Attempting to server render with a renderer function will cause an error.
 
@@ -480,69 +482,70 @@ If you are using [jquery-ujs](https://github.com/rails/jquery-ujs) for AJAX call
 ## React Router
 [React Router](https://github.com/reactjs/react-router) is supported, including server side rendering! See:
 
-1. [React on Rails docs for react-router](docs/additional-reading/react-router.md)
+1. [React on Rails docs for react-router](./docs/additional-reading/react-router.md)
 1. Examples in [spec/dummy/app/views/react_router](https://github.com/shakacode/react_on_rails/tree/master/spec/dummy/app/views/react_router) and follow to the JavaScript code in the [spec/dummy/client/app/startup/ServerRouterApp.jsx](https://github.com/shakacode/react_on_rails/tree/master/spec/dummy/client/app/startup/ServerRouterApp.jsx).
-1. [Code Splitting docs](docs/additional-reading/code-splitting.md) for information about how to set up code splitting for server rendered routes.
+1. [Code Splitting docs](./docs/additional-reading/code-splitting.md) for information about how to set up code splitting for server rendered routes.
 
 ## Deployment
 * Version 6.0 puts the necessary precompile steps automatically in the rake precompile step. You can, however, disable this by setting certain values to nil in the [config/initializers/react_on_rails.rb](https://github.com/shakacode/react_on_rails/tree/master/spec/dummy/config/initializers/react_on_rails.rb).
   * `config.symlink_non_digested_assets_regex`: Set to nil to turn off the setup of non-js assets.
   * `npm_build_production_command`: Set to nil to turn off the precompilation of the js assets.
-* See the [Heroku Deployment](docs/additional-reading/heroku-deployment.md) doc for specifics regarding Heroku.
-* If you're using the node server for server rendering, you may want to do your own AWS install. We'll have more docs on this in the future.
+* See the [Heroku Deployment](./docs/additional-reading/heroku-deployment.md) doc for specifics regarding Heroku. The information here should apply to other deployments.
+* If you're using the node server for server rendering, you may want to do your own AWS install. We'll have more docs on this in the future. [Get in touch](mailto:justin@shakacode.com) if you're keenly interested in this feature.
 
 ## Integration with Node
-Node.js can be used as the backend for server-side rendering instead of [execJS](https://github.com/rails/execjs). Before you try this, consider the tradeoff of extra complexity with your deployments versus *potential* performance gains. We've found that using ExecJS with [mini_racer](https://github.com/discourse/mini_racer) to be "fast enough" so far. That being said, we've heard of other large websites using Node.js for better server rendering performance. See [Node.js for Server Rendering](docs/additional-reading/node-server-rendering.md) for more information.
+Node.js can be used as the backend for server-side rendering instead of [execJS](https://github.com/rails/execjs). Before you try this, consider the tradeoff of extra complexity with your deployments versus *potential* performance gains. We've found that using ExecJS with [mini_racer](https://github.com/discourse/mini_racer) to be "fast enough" so far. That being said, we've heard of other large websites using Node.js for better server rendering performance. See [Node.js for Server Rendering](./docs/additional-reading/node-server-rendering.md) for more information.
 
 ## Additional Documentation
 **Try out our new [Documentation Gitbook](https://shakacode.gitbooks.io/react-on-rails/content/) for improved readability & reference!**
 + **Rails**
-  + [Rails Assets](docs/additional-reading/rails-assets.md)
-  + [Rails Engine Integration](docs/additional-reading/rails-engine-integration.md)
-  + [Rails View Rendering from Inline JavaScript](docs/additional-reading/rails_view_rendering_from_inline_javascript.md)
-  + [RSpec Configuration](docs/additional-reading/rspec-configuration.md)
-  + [Turbolinks](docs/additional-reading/turbolinks.md)
+  + [Rails Assets](./docs/additional-reading/rails-assets.md)
+  + [Rails Engine Integration](./docs/additional-reading/rails-engine-integration.md)
+  + [Rails View Rendering from Inline JavaScript](./docs/additional-reading/rails_view_rendering_from_inline_javascript.md)
+  + [RSpec Configuration](./docs/additional-reading/rspec-configuration.md)
+  + [Turbolinks](./docs/additional-reading/turbolinks.md)
 
 + **Javascript**
-  + [Node Dependencies, NPM, and Yarn](docs/additional-reading/node-dependencies-and-npm.md)
-  + [Babel](docs/additional-reading/babel.md)
-  + [React Router](docs/additional-reading/react-router.md)
-  + [React & Redux](docs/additional-reading/react-and-redux.md)
-  + [Webpack](docs/additional-reading/webpack.md)
-  + [Webpack Configuration](docs/additional-reading/webpack.md)
+  + [Node Dependencies, NPM, and Yarn](./docs/additional-reading/node-dependencies-and-npm.md)
+  + [Babel](./docs/additional-reading/babel.md)
+  + [React Router](./docs/additional-reading/react-router.md)
+  + [React & Redux](./docs/additional-reading/react-and-redux.md)
+  + [Webpack](./docs/additional-reading/webpack.md)
+  + [Webpack Configuration](./docs/additional-reading/webpack.md)
   + [Webpack Cookbook](https://christianalfoni.github.io/react-webpack-cookbook/index.html)
   + [Developing with the Webpack Dev Server](docs/additional-reading/webpack-dev-server.md)
-  + [Node Server Rendering](docs/additional-reading/node-server-rendering.md)
-  + [Server Rendering Tips](docs/additional-reading/server-rendering-tips.md)
-  + [Code Splitting](docs/additional-reading/code-splitting.md)
+  + [Node Server Rendering](./docs/additional-reading/node-server-rendering.md)
+  + [Server Rendering Tips](./docs/additional-reading/server-rendering-tips.md)
+  + [Code Splitting](./docs/additional-reading/code-splitting.md)
+  + [AngularJS Integration and Migration to React on Rails](./docs/additional-reading/angular-js-integration-migration.md)
 
 + **Development**
-  + [React on Rails Basic Installation Tutorial](docs/tutorial.md) ([live demo](https://hello-react-on-rails.herokuapp.com))
-  + [Installation Overview](docs/basics/installation-overview.md)
-  + [Migration from react-rails](docs/basics/migrating-from-react-rails.md)
-  + [Recommended Project Structure](docs/additional-reading/recommended-project-structure.md)
-  + [Generator Tips](docs/basics/generator.md)
-  + [Hot Reloading of Assets For Rails Development](docs/additional-reading/hot-reloading-rails-development.md)
-  + [Heroku Deployment](docs/additional-reading/heroku-deployment.md)
-  + [Updating Dependencies](docs/additional-reading/updating-dependencies.md)
+  + [React on Rails Basic Installation Tutorial](./docs/tutorial.md) ([live demo](https://hello-react-on-rails.herokuapp.com))
+  + [Installation Overview](./docs/basics/installation-overview.md)
+  + [Migration from react-rails](./docs/basics/migrating-from-react-rails.md)
+  + [Recommended Project Structure](./docs/additional-reading/recommended-project-structure.md)
+  + [Generator Tips](./docs/basics/generator.md)
+  + [Hot Reloading of Assets For Rails Development](./docs/additional-reading/hot-reloading-rails-development.md)
+  + [Heroku Deployment](./docs/additional-reading/heroku-deployment.md)
+  + [Updating Dependencies](./docs/additional-reading/updating-dependencies.md)
 
 + **API**
-  + [JavaScript API](docs/api/javascript-api.md)
-  + [Ruby API](docs/api/ruby-api.md)
-  + [Setting up Hot Reloading during Rails Development, API docs](docs/api/ruby-api-hot-reload-view-helpers.md)
+  + [JavaScript API](./docs/api/javascript-api.md)
+  + [Ruby API](./docs/api/ruby-api.md)
+  + [Setting up Hot Reloading during Rails Development, API docs](./docs/api/ruby-api-hot-reload-view-helpers.md)
 
 + **[CONTRIBUTING](CONTRIBUTING.md)**
-  + [Generator Testing](docs/contributor-info/generator-testing.md)
-  + [Linting](docs/contributor-info/linters.md)
-  + [Releasing](docs/contributor-info/releasing.md)
+  + [Generator Testing](./docs/contributor-info/generator-testing.md)
+  + [Linting](./docs/contributor-info/linters.md)
+  + [Releasing](./docs/contributor-info/releasing.md)
 
 + **Misc**
-  + [Tips](docs/additional-reading/tips.md)
-  + [Changelog](CHANGELOG.md)
-  + [Projects](PROJECTS.md)
-  + [Shaka Code Style](docs/coding-style/style.md)
+  + [Tips](./docs/additional-reading/tips.md)
+  + [Changelog](./CHANGELOG.md)
+  + [Projects](./PROJECTS.md)
+  + [Shaka Code Style](./docs/coding-style/style.md)
   + [React on Rails, Slides](http://www.slideshare.net/justingordon/react-on-rails-v61)
-  + [Code of Conduct](docs/misc/code_of_conduct.md)
+  + [Code of Conduct](./docs/misc/code_of_conduct.md)
   + [The React on Rails Doctrine](https://medium.com/@railsonmaui/the-react-on-rails-doctrine-3c59a778c724)
   + [React on Rails, 2000+ 🌟 Stars](https://medium.com/shakacode/react-on-rails-2000-stars-32ff5cfacfbf#.6gmfb2gpy)
 
@@ -566,7 +569,7 @@ Bug reports and pull requests are welcome. This project is intended to be a safe
 See [Contributing](CONTRIBUTING.md) to get started.
 
 ## License
-The gem is available as open source under the terms of the [MIT License](docs/LICENSE).
+The gem is available as open source under the terms of the [MIT License](./docs/LICENSE.md).
 
 ## Authors
 [The Shaka Code team!](http://www.shakacode.com/about/)
@@ -577,6 +580,12 @@ The gem project started with [Justin Gordon](https://github.com/justin808/) pair
 
 We owe much gratitude to the work of the [react-rails gem](https://github.com/reactjs/react-rails).
 
+# Thanks!
+The following companies support open source, and ShakaCode uses their products!
+
+* [JetBrains](https://www.jetbrains.com/)
+* [![2017-02-21_22-35-32](https://cloud.githubusercontent.com/assets/1118459/23203304/1261e468-f886-11e6-819e-93b1a3f17da4.png)](https://www.browserstack.com)
+
 # FINAL NOTES
 * See [Projects](PROJECTS.md) using and [KUDOS](./KUDOS.md) for React on Rails. Please submit yours! Please edit either page or [email us](mailto:contact@shakacode.com) and we'll add your info. We also **love stars** as it helps us attract new users and contributors.
 * Follow [@railsonmaui](https://twitter.com/railsonmaui) and [@shakacode](https://twitter.com/shakacode) on Twitter for updates on releases. We've also got a forum category dedicated to [react_on_rails](https://forum.shakacode.com/c/rails/reactonrails).

data/SUMMARY.md

@@ -1,49 +1,52 @@
 # Table of Content
 
 ### **Rails**
- * [Rails Assets](docs/additional-reading/rails-assets.md)
- * [Rails View Rendering from Inline JavaScript](docs/additional-reading/rails_view_rendering_from_inline_javascript.md)
- * [RSpec Configuration](docs/additional-reading/rspec-configuration.md)
- * [Turbolinks](docs/additional-reading/turbolinks.md)
+  + [Rails Assets](./docs/additional-reading/rails-assets.md)
+  + [Rails Engine Integration](./docs/additional-reading/rails-engine-integration.md)
+  + [Rails View Rendering from Inline JavaScript](./docs/additional-reading/rails_view_rendering_from_inline_javascript.md)
+  + [RSpec Configuration](./docs/additional-reading/rspec-configuration.md)
+  + [Turbolinks](./docs/additional-reading/turbolinks.md)
 
 ### **Javascript**
- * [Node Dependencies, NPM, and Yarn](docs/additional-reading/node-dependencies-and-npm.md)
- * [Babel](docs/additional-reading/babel.md)
- * [React Router](docs/additional-reading/react-router.md)
- * [React & Redux](docs/additional-reading/react-and-redux.md)
- * [Webpack](docs/additional-reading/webpack.md)
- * [Webpack Configuration](docs/additional-reading/webpack.md)
- * [Webpack Cookbook](https://christianalfoni.github.io/react-webpack-cookbook/index.html)
- * [Developing with the Webpack Dev Server](docs/additional-reading/webpack-dev-server.md)
- * [Node Server Rendering](docs/additional-reading/node-server-rendering.md)
- * [Server Rendering Tips](docs/additional-reading/server-rendering-tips.md)
+  + [Node Dependencies, NPM, and Yarn](./docs/additional-reading/node-dependencies-and-npm.md)
+  + [Babel](./docs/additional-reading/babel.md)
+  + [React Router](./docs/additional-reading/react-router.md)
+  + [React & Redux](./docs/additional-reading/react-and-redux.md)
+  + [Webpack](./docs/additional-reading/webpack.md)
+  + [Webpack Configuration](./docs/additional-reading/webpack.md)
+  + [Webpack Cookbook](https://christianalfoni.github.io/react-webpack-cookbook/index.html)
+  + [Developing with the Webpack Dev Server](docs/additional-reading/webpack-dev-server.md)
+  + [Node Server Rendering](./docs/additional-reading/node-server-rendering.md)
+  + [Server Rendering Tips](./docs/additional-reading/server-rendering-tips.md)
+  + [Code Splitting](./docs/additional-reading/code-splitting.md)
+  + [AngularJS Integration and Migration to React on Rails](./docs/additional-reading/angular-js-integration-migration.md)
 
 ### **Development**
- * [React on Rails Basic Installation Tutorial](docs/tutorial.md) ([live demo](https://hello-react-on-rails.herokuapp.com))
- * [Installation Overview](docs/basics/installation-overview.md)
- * [Migration from react-rails](docs/basics/migrating-from-react-rails.md)
- * [Recommended Project Structure](docs/additional-reading/recommended-project-structure.md)
- * [Generator Tips](docs/basics/generator.md)
- * [Hot Reloading of Assets For Rails Development](docs/additional-reading/hot-reloading-rails-development.md)
- * [Heroku Deployment](docs/additional-reading/heroku-deployment.md)
- * [Updating Dependencies](docs/additional-reading/updating-dependencies.md)
+  + [React on Rails Basic Installation Tutorial](./docs/tutorial.md)
+  + [Installation Overview](./docs/basics/installation-overview.md)
+  + [Migration from react-rails](./docs/basics/migrating-from-react-rails.md)
+  + [Recommended Project Structure](./docs/additional-reading/recommended-project-structure.md)
+  + [Generator Tips](./docs/basics/generator.md)
+  + [Hot Reloading of Assets For Rails Development](./docs/additional-reading/hot-reloading-rails-development.md)
+  + [Heroku Deployment](./docs/additional-reading/heroku-deployment.md)
+  + [Updating Dependencies](./docs/additional-reading/updating-dependencies.md)
 
 ### **API**
- * [JavaScript API](docs/api/javascript-api.md)
- * [Ruby API](docs/api/ruby-api.md)
- * [Setting up Hot Reloading during Rails Development, API docs](docs/api/ruby-api-hot-reload-view-helpers.md)
+  + [JavaScript API](./docs/api/javascript-api.md)
+  + [Ruby API](./docs/api/ruby-api.md)
+  + [Setting up Hot Reloading during Rails Development, API docs](./docs/api/ruby-api-hot-reload-view-helpers.md)
 
-### **CONTRIBUTING**
- * [Contributing](CONTRIBUTING.MD)
- * [Generator Testing](docs/contributor-info/generator-testing.md)
- * [Linting](docs/contributor-info/linters.md)
- * [Releasing](docs/contributor-info/releasing.md)
+### **[CONTRIBUTING](CONTRIBUTING.md)**
+  + [Generator Testing](./docs/contributor-info/generator-testing.md)
+  + [Linting](./docs/contributor-info/linters.md)
+  + [Releasing](./docs/contributor-info/releasing.md)
 
 ### **Misc**
- * [Tips](docs/additional-reading/tips.md)
- * [Changelog](CHANGELOG.md)
- * [Projects](PROJECTS.md)
- * [Shaka Code Style](docs/coding-style/style.md)
- * [React on Rails, Slides](http://www.slideshare.net/justingordon/react-on-rails-v4032)
- * [Code of Conduct](docs/misc/code_of_conduct.md)
- * [The React on Rails Doctrine](https://medium.com/@railsonmaui/the-react-on-rails-doctrine-3c59a778c724)
+  + [Tips](./docs/additional-reading/tips.md)
+  + [Changelog](./CHANGELOG.md)
+  + [Projects](./PROJECTS.md)
+  + [Shaka Code Style](./docs/coding-style/style.md)
+  + [React on Rails, Slides](http://www.slideshare.net/justingordon/react-on-rails-v61)
+  + [Code of Conduct](./docs/misc/code_of_conduct.md)
+  + [The React on Rails Doctrine](https://medium.com/@railsonmaui/the-react-on-rails-doctrine-3c59a778c724)
+  + [React on Rails, 2000+ 🌟 Stars](https://medium.com/shakacode/react-on-rails-2000-stars-32ff5cfacfbf#.6gmfb2gpy)

data/docs/{LICENSE → LICENSE.md}

@@ -1,6 +1,6 @@
-The MIT License (MIT)
+# The MIT License (MIT)
 
-Copyright (c) 2015 Justin Gordon
+Copyright (c) 2017 Justin Gordon and ShakaCode, http://www.shakacode.com
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/docs/additional-reading/angular-js-integration-migration.md

@@ -0,0 +1,28 @@
+# AngularJS Integration and Migration to React on Rails
+
+[React on Rails](https://github.com/shakacode/react_on_rails) offers a smooth transition to migrating your existing [AngularJS](https://angularjs.org/) + Rails application to use React with Webpack on top of Rails. Here are a few highlights and tips.
+
+## Assets Handling
+Ideally, you should have your JavaScript libraries packaged by `webpack` and gathered by `yarn`. If you have not already done this, then you can setup the `ReactOnRails` default JS code directory of `/client` to load the JS libraries related to AngularJS, etc. You can configure Webpack to globally export these libraries, so inclusion this way will be no different than using the Rails asset pipeline. However, so long as you *understand* how your JavaScript will eventually make its way onto your main layout, you will be OK.
+
+## Styling and CSS Modules
+Once you move to Webpack, you can start using CSS modules. However, you'll need to carefully consider if your styling needs to apply to legacy AngularJS components in your app.
+
+## ngReact Package
+
+Check out the [ngReact](https://github.com/ngReact/ngReact) package. This package allows your AngularJS components to contain React components, including support for passing props from AngularJS to React. The [ShakaCode team](http://www.shakacode.com/about/) is using this library on a commercial project. However, we're doing this with some limitations:
+
+1. We're only having the data flow in one direction, from AngularJS to React and never back up to the Angular components.
+2. When we get to a case where the React components will affect the Angular layout, we try to convert the components up the tree to React.
+3. Thus, the React components within AngularJS components will tend to be React "dumb" components, or totally self-contained chunks of React that have no side effects on the Angular code.
+
+## StoryBook
+
+We love using [StoryBook](https://getstorybook.io/) to create a simple testing and inspection area of new React components as we migrate them over from AngularJS Components.
+
+## Overall Approach?
+
+The big question when doing the migration from AngularJS to React is whether you should replace leaf level components first, to minimize the changes before you can deploy your hybrid AngularJS and React app. The alternative is to try to replace larger chunks at once. Both approaches have pros and cons. 
+
+1. Frequent deploys with incremental parts of AngularJS replaced by React allows smaller incremental deploys and easier regression analysis should something break. On the negative side, any ping-pong of data between AngularJS and React can result in a complicated and convoluted architecture.
+2. Larger deploys of a full screen can yield efficiencies such as converting the whole screen to use one Redux store. However, this can be a large chunk of code to test and deploy.

data/docs/additional-reading/recommended-project-structure.md

@@ -10,7 +10,7 @@ The best way to understand these standards is to follow this example: [github.co
 1. `/client/app/bundles`: Top level of different app domains. Use a name within this directory for you app domains. For example, if you had a domain called `widget-editing`, then you would have: `/client/app/bundles/widget-editing`
 1. `/client/app/lib`: Common code for bundles
 1. Within each bundle directory (or the lib directory), such as a domain named "comments"
-`/client/app/bundle/comments`, use following directory structure:
+`/client/app/bundles/comments`, use following directory structure:
 
   * `/actions`: Redux actions.
   * `/components`: "dumb" components (no connections to Redux or Ajax). These get props and can render themselves and children.

data/docs/additional-reading/webpack.md

@@ -1,10 +1,22 @@
-# Entry Points and Globally Exposing Objects
+# Webpack Tips
 
-You should ensure you configure the entry points correctly for webpack.
+## Where do I learn about advanced Webpack setups, such as with "CSS Modules", "Code Splitting", etc
+You can try out example app, [shakacode/react-webpack-rails-tutorial](https://github.com/shakacode/react-webpack-rails-tutorial). We're building comprehensive production examples in our new, premium product, [**React on Rails Pro**](https://forum.shakacode.com/t/introducing-react-on-rails-pro-subscriptions/785). If you're interested, please see the details in [this forum post](https://forum.shakacode.com/t/introducing-react-on-rails-pro-subscriptions/785).
 
-## When using React 0.14 and greater
+## Webpack v1 or v2?
+We recommend using Webpack version 2.2.1 or greater.
 
-You need both include `react-dom/server` and `react` as values for `entry`, like this:
+## Use the `--bail` Option When Running Webpack for CI or Deployments
+For your scripts that statically build your Webpack bundles, use the `--bail` option. This will ensure that CI and your product deployment **halt** if Webpack cannot complete! For more details, see the documentation for [Webpack's `--bail` option](https://webpack.js.org/configuration/other-options/#bail). Note, you might not want to use the `--bail` option if you just want to depend on Webpack returning a non-zero error code and you want to see all the errors, rather than only the first error.
+
+## yarn or npm?
+Yarn is the current recommendation!
+
+## Entry Points
+
+You should ensure you configure the entry points correctly for webpack if you want to break out libraries into a "vendor" bundle where your libraries are packaged separately from your app's code. If you send web clients your vendor bundle separately from your app bundles, then web clients might have the vendor bundle cached while they receive updates for your app.
+
+You need both include `react-dom` and `react` as values for `entry`, like this:
 
 ```
   entry: {
@@ -16,21 +28,3 @@ You need both include `react-dom/server` and `react` as values for `entry`, like
       'react-dom',
     ],
 ```
-
-and you need to expose them:
-
-```
-      // React is necessary for the client rendering:
-      {test: require.resolve('react'), loader: 'expose?React'},
-      {test: require.resolve('react-dom'), loader: 'expose?ReactDOM'},
-```
-
-and use this line rather than `{test: require.resolve('react-dom'), loader: 'expose?ReactDOM'},`:
-
-```
-   {test: require.resolve('react-dom/server'), loader: 'expose?ReactDOMServer'},
-```
-
-## When you use React 0.13
-
-You don't need to put in react-dom.

data/docs/basics/i18n.md

@@ -4,7 +4,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) 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`.
+1. Add `react-intl` & `intl` to `client/package.json`, and remember to `bundle && yarn install`.
 
   ```js
   "dependencies": {
@@ -44,18 +44,11 @@ You can refer to [react-webpack-rails-tutorial](https://github.com/shakacode/rea
   config.i18n_dir = Rails.root.join("PATH_TO", "YOUR_JS_I18N_FOLDER")
   ```
 
-  Add following lines to `config/application.rb`, this will help you to generate `translations.js` & `default.js` automatically when you starts the server.
+4. Javascript locale files must be generated before `yarn build`. 
+  
+  Once you setup `config.i18n_dir` as in the previous step, react_on_rails will help you to do this for testing and for production deployments. For development, you should adjust your Procfiles so that they run `bundle exec rake react_on_rails:locale` before running the `yarn run build:development` (webpack watch process)
 
-  ```js
-  module YourModule
-    class Application < Rails::Application
-      ...
-      config.after_initialize do
-        ReactOnRails::LocalesToJs.new
-      end
-    end
-  end
-  ```
+  If you create your own Procfile files, you must add `bundle exec rake react_on_rails:locale` before `yarn build`.
 
 5. In React, you need to initialize `react-intl`, and set parameters for it.
 

data/docs/tutorial.md

@@ -23,13 +23,15 @@ _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 5+. I recommend `rvm` and `nvm` to install Ruby and Node. Rails can be installed as ordinary gem.
+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 ordinary gem.
 
 ```
 nvm install node                # download and install latest stable Node
 nvm alias default node          # make it default version
 nvm list                        # check
 
+brew install yarn               # you can use other installer if desired
+
 rvm install 2.3.1               # download and install latest stable Ruby (update to exact version)
 rvm use 2.3.1 --default         # use it and make it default
 rvm list                        # check

data/lib/generators/react_on_rails/install_generator.rb

@@ -60,10 +60,10 @@ module ReactOnRails
       # js(.coffee) are not checked by this method, but instead produce warning messages
       # and allow the build to continue
       def installation_prerequisites_met?
-        !(missing_node? || missing_npm? || ReactOnRails::GitUtils.uncommitted_changes?(GeneratorMessages))
+        !(missing_node? || missing_yarn? || ReactOnRails::GitUtils.uncommitted_changes?(GeneratorMessages))
       end
 
-      def missing_npm?
+      def missing_yarn?
         return false unless ReactOnRails::Utils.running_on_windows? ? `where yarn`.blank? : `which yarn`.blank?
         error = "yarn is required. Please install it before continuing. "
         error << "https://yarnpkg.com/en/docs/install"

data/lib/generators/react_on_rails/templates/base/base/Procfile.dev.tt

@@ -1,2 +1,2 @@
 web: rails s -p 3000
-client: sh -c 'rm app/assets/webpack/* || true && cd client && yarn run build:development'
+client: sh -c 'rm app/assets/webpack/* || true && cd client && bundle exec rake react_on_rails:locale && yarn run build:development'

data/lib/generators/react_on_rails/templates/base/base/config/initializers/react_on_rails.rb.tt

@@ -63,7 +63,7 @@ ReactOnRails.configure do |config|
   # I18N OPTIONS
   ################################################################################
   # Replace the following line to the location where you keep translation.js & default.js.
-  config.i18n_dir = Rails.root.join("client", "app", "libs", "i18n")
+  # config.i18n_dir = Rails.root.join("client", "app", "libs", "i18n")
 
   ################################################################################
   # MISCELLANEOUS OPTIONS

data/lib/react_on_rails/test_helper/ensure_assets_compiled.rb

@@ -27,6 +27,10 @@ module ReactOnRails
         # Be sure we don't do this again.
         self.class.has_been_run = true
 
+        if ReactOnRails.configuration.i18n_dir.present? && Rails.application.present?
+          ReactOnRails::LocalesToJs.new
+        end
+
         stale_gen_files = webpack_assets_status_checker.stale_generated_webpack_files
 
         # All done if no stale files!

data/lib/react_on_rails/version.rb

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

data/lib/tasks/assets.rake

@@ -50,7 +50,7 @@ Compile assets with webpack
 Uses command defined with ReactOnRails.configuration.npm_build_production_command
 sh "cd client && `ReactOnRails.configuration.npm_build_production_command`"
     DESC
-    task webpack: :environment do
+    task webpack: :locale do
       if ReactOnRails.configuration.npm_build_production_command.present?
         sh "cd client && #{ReactOnRails.configuration.npm_build_production_command}"
       end

data/lib/tasks/locale.rake

@@ -0,0 +1,14 @@
+require "react_on_rails/locales_to_js"
+
+namespace :react_on_rails do
+  desc <<-DESC
+Generate i18n javascript files
+This task generates javascript locale files: `translations.js` & `default.js` and places them in
+the "ReactOnRails.configuration.i18n_dir".
+  DESC
+  task locale: :environment do
+    if ReactOnRails.configuration.i18n_dir.present?
+      ReactOnRails::LocalesToJs.new
+    end
+  end
+end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-on-rails",
-  "version": "6.6.0",
+  "version": "6.7.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.6.0
+  version: 6.7.1
 platform: ruby
 authors:
 - Justin Gordon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-18 00:00:00.000000000 Z
+date: 2017-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool
@@ -319,7 +319,8 @@ files:
 - SUMMARY.md
 - app/helpers/react_on_rails_helper.rb
 - book.json
-- docs/LICENSE
+- docs/LICENSE.md
+- docs/additional-reading/angular-js-integration-migration.md
 - docs/additional-reading/babel.md
 - docs/additional-reading/code-splitting.md
 - docs/additional-reading/foreman-issues.md
@@ -411,6 +412,7 @@ files:
 - lib/react_on_rails/version_checker.rb
 - lib/react_on_rails/version_syntax_converter.rb
 - lib/tasks/assets.rake
+- lib/tasks/locale.rake
 - package.json
 - rakelib/docker.rake
 - rakelib/dummy_apps.rake