react_on_rails 3.0.0.rc.1 → 3.0.0.rc.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10f4dd139d7cf764647c72c9bcd900026c58d6ed
-  data.tar.gz: dfc33f3ddc2d2605e1b80e8a90c16c9e347a1fde
+  metadata.gz: 1882e63cd3c443aa67f2d9a1880f6be2a7d9d263
+  data.tar.gz: 792845e5aebe6c4e54a7527668c9af31ce5de665
 SHA512:
-  metadata.gz: dd7da92b93452f7c1874c7a3ff3f5bb0374b3d579f1e353493642224024d0ca97ac25efd0f735392efdcdb742104c390c26397e0d60c7b2754059ee3fd3ecc00
-  data.tar.gz: df45b1a12cdce336c0d07c06fff2b84626d9a928c0c518a4e99b501aa52a1519095ace355099867dea10bd88c3d203ed90a56194f7c99b3ce5c526c0c919346b
+  metadata.gz: 0d2414f70dc6ca4a019e5f5133ea1ab18b6d56d5165061afe5ed312640572c592cc5b1529bdd2db1e5b2b139a5f712013a26376a0f0adff859b2daec1be13e95
+  data.tar.gz: d245de4737799b8cbb1a0177926ee15379e1a76241c3c875ae62b6a685dd37929342276152667d9ee3b029da099385c59cbe28c3fb4bfbd977f77ca5a7084de5

data/.travis.yml

@@ -3,7 +3,7 @@ sudo: required
 language: ruby
 
 rvm:
-  - 2.2.3
+  - 2.2.4
 
 services:
   - docker
@@ -22,10 +22,12 @@ before_install:
   - sudo apt-get install -y xvfb
 
 install:
-  - rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install 4.2.0
+  - rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install 5.5.0
   - npm install -g npm
   - npm install -g poltergeist
+  - gem install bundler
   - bundle install
+  - ENABLE_TURBOLINKS_5=TRUE bundle install
   - npm install
   - rake dummy_apps
   - rake examples

data/CHANGELOG.md

@@ -3,14 +3,16 @@ All notable changes to this project will be documented in this file. Items under
 
 Contributors: please follow the recommendations outlined at [keepachangelog.com](http://keepachangelog.com/). Please use the existing headings and styling as a guide, and add a link for the version diff at the bottom of the file. Also, please update the `Unreleased` link to compare to the latest release version.
 
-## [3.0.0-beta.1]
+## [3.0.0-rc.2] - 2016-02-09
 ##### Fixed
 - Fix Bootstrap Sass Append to Gemfile, missing new line. [#262](https://github.com/shakacode/react_on_rails/pull/262).
 
 ##### Added
 - Added helper `redux_store` and associated JavaScript APIs that allow multiple React components to use the same store. Thus, you initialize the store, with props, separately from the components.
-- Added forman to gemspec in case new dev does not have it globally installed. [#248](https://github.com/shakacode/react_on_rails/pull/248)
-  
+- Added forman to gemspec in case new dev does not have it globally installed. [#248](https://github.com/shakacode/react_on_rails/pull/248).
+- Support for Turbolinks 5! [#270](https://github.com/shakacode/react_on_rails/pull/270).
+- Added better error messages for `ReactOnRails.register()`. [#273](https://github.com/shakacode/react_on_rails/pull/273).
+
 ##### Breaking Change  
 - Calls to `react_component` should use a named argument of props. For example, change this:
   ```ruby
@@ -23,6 +25,7 @@ Contributors: please follow the recommendations outlined at [keepachangelog.com]
   ```
   You'll get a deprecation message to change this.
 - Renamed `ReactOnRails.configure_rspec_to_compile_assets` to `ReactOnRails::TestHelper.configure_rspec_to_compile_assets`. The code has also been optimized to check for whether or not the compiled webpack bundles are up to date or not and will not run if not necessary. If you are using non-standard directories for your generated webpack assets (`app/assets/javascripts/generated` and `app/assets/stylesheets/generated`) or have additional directories you wish the helper to check, you need to update your ReactOnRails configuration accordingly. See [documentation](https://github.com/shakacode/react_on_rails/blob/master/docs/additional_reading/rspec_configuration.md) for how to do this.  [#253](https://github.com/shakacode/react_on_rails/pull/253).
+- You have to call `ReactOnRails.register` to register react components. This was deprecated in v2. [#273](https://github.com/shakacode/react_on_rails/pull/273).
   
 ##### Migration Steps v2 to v3
 - [spec/dummy/spec/rails_helper.rb](https://github.com/shakacode/react_on_rails/blob/master/spec%2Fdummy%2Fspec%2Frails_helper.rb#L36..38) for an example. Add this line to your `rails_helper.rb`:
@@ -162,7 +165,7 @@ Best done with Object destructing:
 ##### Fixed
 - Fix several generator related issues.
 
-[3.0.0-beta.1]: https://github.com/shakacode/react_on_rails/compare/2.3.0...3.0.0-beta.1
+[3.0.0-rc.1]: https://github.com/shakacode/react_on_rails/compare/2.3.0...3.0.0-rc.1
 [2.3.0]: https://github.com/shakacode/react_on_rails/compare/2.2.0...2.3.0
 [2.2.0]: https://github.com/shakacode/react_on_rails/compare/2.1.1...2.2.0
 [2.1.1]: https://github.com/shakacode/react_on_rails/compare/v2.1.0...2.1.1

data/Gemfile

@@ -29,6 +29,10 @@ gem "selenium-webdriver"
 gem "spring"
 gem "sqlite3"
 gem "therubyracer"
-gem "turbolinks"
+if ENV["ENABLE_TURBOLINKS_5"].nil? || ENV["ENABLE_TURBOLINKS_5"].strip.empty?
+  gem "turbolinks", "2.5.3"
+else
+  gem "turbolinks", "~> 5.0.0.beta"
+end
 gem "uglifier", ">= 2.7.2"
 gem "web-console", "~> 2.0"

data/README.md

@@ -2,11 +2,15 @@
 
 # NEWS
 
-* 3.0.0.beta.1 has shipped on Monday, 2/8/2016. Please see the [Changelog](CHANGELOG.md) for details, and let us know if you see any issues! [Migration steps from 1.x](https://github.com/shakacode/react_on_rails/blob/master/CHANGELOG.md#migration-steps-v1-to-v2). [Migration steps from 2.x](https://github.com/shakacode/react_on_rails/blob/master/CHANGELOG.md#migration-steps-v2-to-v3).
+* 3.0.0.rc.2 shipped on Sunday, 2/14/2016. Please see the [Changelog](CHANGELOG.md) for details, and let us know if you see any issues! [Migration steps from 1.x](https://github.com/shakacode/react_on_rails/blob/master/CHANGELOG.md#migration-steps-v1-to-v2). [Migration steps from 2.x](https://github.com/shakacode/react_on_rails/blob/master/CHANGELOG.md#migration-steps-v2-to-v3).
+  * [RubyGems](https://rubygems.org/gems/react_on_rails/versions/3.0.0.rc.2), `gem "react_on_rails", "~> 3.0.0-rc.2"`
+  * [NPM](https://www.npmjs.com/package/react-on-rails), `npm i --save react-on-rails@3.0.0-rc.2`
+* 3.0.0.rc.1 shipped on Monday, 2/8/2016.
 * 3.0.0 Highlights:
   1. Support for ensuring JavaScript is current when running tests.
   2. Support for multiple React components with one Redux store. So you can have a header React component and different body React components talking to the same Redux store!
-* There was a fatal error when using the lastest version of Redux for server rendering. See [Redux #1335](https://github.com/rackt/redux/issues/1335). See [diff 3.1.6...3.1.4](https://github.com/rackt/redux/commit/e2e14d26f09ca729ae0555442f50fcfc45bfb423#diff-1fdf421c05c1140f6d71444ea2b27638). Workaround for server rendering: Use Redux 3.1.7 or upgrade to React On Rails v2.3.0. [this commit](https://github.com/shakacode/react_on_rails/commit/59f1e68d3d233775e6abc63bff180ea59ac2d79e) on [PR #244](https://github.com/shakacode/react_on_rails/pull/244/).
+  3. Support for Turbolinks 5!
+* There was a fatal error when using the lastest version of Redux for server rendering. See [Redux #1335](https://github.com/reactjs/redux/issues/1335). See [diff 3.1.6...3.1.4](https://github.com/reactjs/redux/commit/e2e14d26f09ca729ae0555442f50fcfc45bfb423#diff-1fdf421c05c1140f6d71444ea2b27638). Workaround for server rendering: Use Redux 3.1.7 or upgrade to React On Rails v2.3.0. [this commit](https://github.com/shakacode/react_on_rails/commit/59f1e68d3d233775e6abc63bff180ea59ac2d79e) on [PR #244](https://github.com/shakacode/react_on_rails/pull/244/).
 * 2.x Highlights:
   1. Fixed a **critical** problem with TurboLinks. Be sure to see [turbolinks docs](docs/additional_reading/turbolinks.md) for more information on how to debug TurboLinks issues.
   2. Provides a convenient helper to ensure that JavaScript assets are compiled before running tests.
@@ -16,9 +20,9 @@
 
 # React on Rails
 
-**Project Objective**: To provide an opinionated and optimal framework for integrating **Ruby on Rails** with modern JavaScript tooling and libraries, including [**Webpack**](http://webpack.github.io/), [**Babel**](https://babeljs.io/), [**React**](https://github.com/rackt/react-router), [**Redux**](https://github.com/rackt/redux), [**React-Router**](https://github.com/rackt/react-router). This differs significantly from typical Rails. When considering what goes into **react_on_rails**, we ask ourselves, is the functionality related to the intersection of using Rails and with modern JavaScript? If so, then the functionality belongs right here. In other cases, we're releasing separate npm packages or Ruby gems. If you are interested in implementing React using traditional Rails architecture, see [react-rails](https://github.com/reactjs/react-rails).
+**Project Objective**: To provide an opinionated and optimal framework for integrating **Ruby on Rails** with modern JavaScript tooling and libraries, including [**Webpack**](http://webpack.github.io/), [**Babel**](https://babeljs.io/), [**React**](https://github.com/reactjs/react-router), [**Redux**](https://github.com/reactjs/redux), [**React-Router**](https://github.com/reactjs/react-router). This differs significantly from typical Rails. When considering what goes into **react_on_rails**, we ask ourselves, is the functionality related to the intersection of using Rails and with modern JavaScript? If so, then the functionality belongs right here. In other cases, we're releasing separate npm packages or Ruby gems. If you are interested in implementing React using traditional Rails architecture, see [react-rails](https://github.com/reactjs/react-rails).
 
-React on Rails integrates Facebook's [React](https://github.com/facebook/react) front-end framework with Rails. React v0.14.x is supported, with server rendering. [Redux](https://github.com/rackt/redux) and [React-Router](https://github.com/rackt/react-redux) are supported as well. See the Rails on Maui [blog post](http://www.railsonmaui.com/blog/2014/10/03/integrating-webpack-and-the-es6-transpiler-into-an-existing-rails-project/) that started it all!
+React on Rails integrates Facebook's [React](https://github.com/facebook/react) front-end framework with Rails. React v0.14.x is supported, with server rendering. [Redux](https://github.com/reactjs/redux) and [React-Router](https://github.com/reactjs/react-redux) are supported as well. See the Rails on Maui [blog post](http://www.railsonmaui.com/blog/2014/10/03/integrating-webpack-and-the-es6-transpiler-into-an-existing-rails-project/) that started it all!
 
 Be sure to see:
 
@@ -101,10 +105,10 @@ Please see [Getting Started](#getting-started) for how to set up your Rails proj
 ## Features
 Like the [react-rails](https://github.com/reactjs/react-rails) gem, React on Rails is capable of server-side rendering with fragment caching and is compatible with [turbolinks](https://github.com/rails/turbolinks). Unlike react-rails, which depends heavily on sprockets and jquery-ujs, React on Rails uses [webpack](http://webpack.github.io/) and does not depend on jQuery. While the initial setup is slightly more involved, it allows for advanced functionality such as:
 
-+ [Redux](https://github.com/rackt/redux)
++ [Redux](https://github.com/reactjs/redux)
 + [Webpack dev server](https://webpack.github.io/docs/webpack-dev-server.html) with [hot module replacement](https://webpack.github.io/docs/hot-module-replacement-with-webpack.html)
 + [Webpack optimization functionality](https://github.com/webpack/docs/wiki/optimization)
-+ [React Router](https://github.com/rackt/react-router)
++ [React Router](https://github.com/reactjs/react-router)
 
 See the [react-webpack-rails-tutorial](https://github.com/shakacode/react-webpack-rails-tutorial) for an example of a live implementation and code.
 
@@ -167,7 +171,7 @@ That will install the latest version and update your package.json.
 ## How it Works
 The generator installs your webpack files in the `client` folder. Foreman uses webpack to compile your code and output the bundled results to `app/assets/javascripts/generated`, which are then loaded by sprockets. These generated bundle files have been added to your `.gitignore` for your convenience.
 
-Inside your Rails views, you can now use the `react_component` helper method provided by React on Rails. You can pass props directly to the react component helper. You can also initialize a Redux store with view helper `redux_store` so that the store can be shared amongst multiple React components. Your best best is to scan the code inside of the [/spec/dummy](spec/dummy) sample app.
+Inside your Rails views, you can now use the `react_component` helper method provided by React on Rails. You can pass props directly to the react component helper. You can also initialize a Redux store with view helper `redux_store` so that the store can be shared amongst multiple React components. Your best bet is to scan the code inside of the [/spec/dummy](spec/dummy) sample app.
 
 ### Client-Side Rendering vs. Server-Side Rendering
 In most cases, you should use the `prerender: false` (default behavior) with the provided helper method to render the React component from your Rails views. In some cases, such as when SEO is vital or many users will not have JavaScript enabled, you can enable server-rendering by passing `prerender: true` to your helper, or you can simply change the default in `config/initializers/react_on_rails`.
@@ -327,8 +331,8 @@ From your Rails view, you can use the provided helper `redux_store(store_name, p
 **app/views/layouts/application.html.erb**
 ```erb
 ...
-<% redux_store("appStore", @react_props) %>;
-<%= render_component("NavbarApp") %>
+<%= redux_store("appStore", @react_props) %>;
+<%= react_component("NavbarApp") %>
 yield
 ...
 ```
@@ -337,12 +341,12 @@ Components are created as [stateless function(al) components](https://facebook.g
 
 **_comments.html.erb**
 ```erb
-<%= render_component("CommentsApp") %>
+<%= react_component("CommentsApp") %>
 ```
 
 **_blogs.html.erb**
 ```erb
-<%= render_component("BlogsApp") %>
+<%= react_component("BlogsApp") %>
 ```
 
 *Note:* You will not be doing any partial updates to the Redux store when loading a new page. When the page content loads, React on Rails will rehydrate a new version of the store with whatever props are placed on the page.
@@ -362,7 +366,7 @@ In the former case, the Rails server loads `bootstrap-sprockets`, provided by th
 
 This allows for using Bootstrap in your regular Rails stylesheets. If you wish to customize any of the Bootstrap variables, you can do so via the `client/assets/stylesheets/_pre-bootstrap.scss` partial.
 
-#### Bootstrap via Webpack Dev Server
+#### Bootstrap via Webpack HMR Dev Server
 When using the webpack dev server, which does not go through Rails, bootstrap is loaded via the [bootstrap-sass-loader](https://github.com/shakacode/bootstrap-sass-loader) which uses the `client/bootstrap-sass-config.js` file.
 
 #### Keeping Custom Bootstrap Configurations Synced
@@ -440,7 +444,7 @@ If you are using [react-rails](https://github.com/reactjs/react-rails) in your p
 Note: If you have components from react-rails you want to use, then you will need to port them into react_on_rails which uses webpack instead of the asset pipeline.
 
 ## Additional Reading
-+ [The React on Rails Doctrine](http://www.shakacode.com/2016/01/26/the-react-on-rails-doctrine.html)
++ [The React on Rails Doctrine](http://www.shakacode.com/2016/01/27/the-react-on-rails-doctrine.html)
 + [Babel](docs/additional_reading/babel.md)
 + [Generated Client Code](docs/additional_reading/generated_client_code.md)
 + [Heroku Deployment](docs/additional_reading/heroku_deployment.md)

data/docs/additional_reading/react-and-redux.md

@@ -27,7 +27,7 @@ export default {
   // ...
 };
 
-export const initalStates = {
+export const initialStates = {
   $$usersState,
   $$blogPostsState,
   $$commentsState,

data/docs/additional_reading/react_router.md

@@ -13,7 +13,7 @@ const RouterApp = (props, location) => {
   let redirectLocation;
   let routeProps;
 
-  // See https://github.com/rackt/react-router/blob/master/docs/guides/advanced/ServerRendering.md
+  // See https://github.com/reactjs/react-router/blob/master/docs/guides/advanced/ServerRendering.md
   match({ routes, location }, (_error, _redirectLocation, _routeProps) => {
     error = _error;
     redirectLocation = _redirectLocation;

data/docs/additional_reading/turbolinks.md

@@ -1,7 +1,7 @@
 # Turbolinks
 
 * See [Turbolinks on Github](https://github.com/rails/turbolinks)
-* Currently support 2.5.x of Turbolinks. We plan to update to Turbolinks 5 soon.
+* Currently support 2.5.x of Turbolinks and 5.0.0.beta1 of Turbolinks 5.
 * Turbolinks is currently included only via the Rails gem and the Rails manifest file rather than NPM. [Turbolinks Issue #658 ](https://github.com/rails/turbolinks/issues/658) discusses this.
 
 ## Why Turbolinks?
@@ -22,8 +22,13 @@ the JavaScript and stylesheets are cached by the browser, as they will still req
    ```
 Note, in the future, we might change to installing this via npm.
 
+## Turbolinks 5
+Turbolinks 5 is now being supported. React on Rails will automatically detect which version of Turbolinks you are using and use the correct event handlers.
+
+For more information on Turbolinks 5: [https://github.com/turbolinks/turbolinks](https://github.com/turbolinks/turbolinks)
+
 ## Troubleshooting
-To turn on tracing of Turbolinks events, put this in your registration file, where you register your components. 
+To turn on tracing of Turbolinks events, put this in your registration file, where you register your components.
 
 ```js
    ReactOnRails.setOptions({
@@ -50,11 +55,18 @@ At Webpack compile time, the value of devBuild is inserted into your file.
 
 Once you do that, you'll see messages prefixed with **TURBO:** like this in the browser console:
 
+Turbolinks Classic:
 ```
 TURBO: WITH TURBOLINKS: document page:before-unload and page:change handlers installed. (program)
 TURBO: reactOnRailsPageLoaded
 ```
 
+Turbolinks 5:
+```
+TURBO: WITH TURBOLINKS 5: document turbolinks:before-cache and turbolinks:load handlers installed. (program)
+TURBO: reactOnRailsPageLoaded
+```
+
 We've noticed that Turbolinks doesn't work if you use the ruby gem version of jQuery and jQuery ujs. Therefore we recommend using the node packages instead. See the [tutorial app](https://github.com/shakacode/react-webpack-rails-tutorial) for how to accomplish this.
 
 ![2016-02-02_10-38-07](https://cloud.githubusercontent.com/assets/1118459/12760060/6546e254-c999-11e5-828b-a8aaa473e5bd.png)

data/docs/contributing.md

@@ -156,6 +156,8 @@ If you run `rspec` at the top level, you'll see this message: `require': cannot
 
 After running a test, you can view the coverage results SimpleCov reports by opening `coverage/index.html`.
 
+To test `spec/dummy` against Turbolinks 5, install the gem by running `ENABLE_TURBOLINKS_5=TRUE bundle install` in the `spec/dummy` directory before running `rake`.
+
 ### Debugging
 Start the sample app like this for some debug printing:
 
@@ -184,7 +186,7 @@ All linting is performed from the docker container for CI. You will need docker
 Once you have docker and docker-compose running locally, run `docker-compose build lint`. This will build the `reactonrails_lint` docker image and docker-compose `lint` container. The initial build is slow, but after the install, startup is very quick.
 
 ### Linting Commands
-Run `rake lint`. 
+Run `rake lint`.
 
 Alternately with Docker:
 

data/docs/doctrine.md

@@ -39,8 +39,8 @@ Here's the chef's selection from the React on Rails community:
 * [Bootstrap](http://getbootstrap.com/), loaded from [bootstrap-loader](https://github.com/shakacode/bootstrap-loader/). Common UI styles.
 * [Lodash](https://lodash.com/): Swiss army knife of utilities.
 * [React](https://facebook.github.io/react/): UI components.
-* [React-Router](https://github.com/rackt/react-router): Provider of deep links for client-side application.
-* [Redux](https://github.com/rackt/redux): Flux implementation (aka "state container").
+* [React-Router](https://github.com/reactjs/react-router): Provider of deep links for client-side application.
+* [Redux](https://github.com/reactjs/redux): Flux implementation (aka "state container").
 
 ### JavaScript Tooling
 * [Babel](https://babeljs.io/): Transpiler for ES6 into ES5 and much more.

data/docs/recommended-project-structure.md

@@ -15,7 +15,7 @@ While React On Rails does not *enforce* a specific project structure, we do *rec
   * `/containers`: "smart" components. These components are bound to Redux.
   * `/reducers`: Reducers for redux.
   * `/routes`: Routes for React Router.
-  * `/store`: Store, which might be [configured differently for dev vs. production](https://github.com/rackt/redux/tree/master/examples/real-world/store).
+  * `/store`: Store, which might be [configured differently for dev vs. production](https://github.com/reactjs/redux/tree/master/examples/real-world/store).
   * `/startup`: Component bindings to stores, with registration of components and stores.
   * `/schemas`: Schemas for AJAX JSON requests and responses, as used by the [Normalizr](https://github.com/gaearon/normalizr) package.
 1. `/client/app/assets`: Assets for CSS for client app.

data/lib/generators/react_on_rails/templates/base/base/app/views/hello_world/index.html.erb.tt

@@ -1,4 +1,4 @@
 <h1 class="alert alert-info this-works"><%= options.server_rendering? ? "Server Rendering" : "Client Rendering" %></h1>
 <%%= react_component("HelloWorldApp",
-                     @hello_world_props,
+                     props: @hello_world_props,
                      prerender: <%= options.server_rendering? %>) %>

data/lib/generators/react_on_rails/templates/base/base/client/package.json.tt

@@ -37,46 +37,47 @@
     <%- end -%>
   },
   "dependencies": {
-    "babel": "^6.3.26",
-    "babel-cli": "^6.4.5",
-    "babel-core": "^6.4.5",
-    "babel-loader": "^6.2.1",
-    "babel-plugin-syntax-decorators": "^6.3.13",
-    "babel-polyfill": "^6.3.14",
-    "babel-preset-es2015": "^6.3.13",
-    "babel-preset-react": "^6.3.13",
-    "babel-preset-stage-0": "^6.3.13",
-    "babel-types": "^6.4.5",
-    "es5-shim": "^4.5.0",
+    "autoprefixer": "^6.3.2",
+    "axios": "^0.9.1",
+    "babel": "^6.5.1",
+    "babel-cli": "^6.5.1",
+    "babel-core": "^6.5.1",
+    "babel-loader": "^6.2.2",
+    "babel-polyfill": "^6.5.0",
+    "babel-preset-es2015": "^6.5.0",
+    "babel-preset-react": "^6.5.0",
+    "babel-preset-stage-0": "^6.5.0",
+    "css-loader": "^0.23.1",
+    "es5-shim": "^4.5.2",
     "expose-loader": "^0.7.1",
     <%- if options.redux? -%>
     "immutable": "^3.7.6",
     <%- end -%>
     "imports-loader": "^0.6.5",
     "jquery": "^2.2.0",
-    "jquery-ujs": "^1.1.0-1",
+    "jquery-ujs": "^1.2.0",
     "loader-utils": "^0.2.12",
-    "lodash": "^4.0.0",
+    "lodash": "^4.3.0",
     <%- if options.redux? -%>
     "mirror-creator": "1.0.0",
     <%- end -%>
-    "react": "^0.14.6",
+    "react": "^0.14.7",
     <%- unless options.skip_bootstrap? -%>
-    "react-bootstrap": "^0.28.2",
+    "react-bootstrap": "^0.28.3",
     <%- end -%>
-    "react-dom": "^0.14.6",
+    "react-dom": "^0.14.7",
     "react-on-rails": "<%= VersionSyntaxConverter.new.rubygem_to_npm %>",
     <%- if options.redux? -%>
-    "react-redux": "^4.0.6",
-    "redux": "^3.0.6",
+    "react-redux": "^4.4.0",
+    "redux": "^3.3.1",
     "redux-promise": "^0.5.1",
     "redux-thunk": "^1.0.3",
     <%- end -%>
-    "webpack": "^1.12.12"
+    "webpack": "^1.12.13"
   },
   "devDependencies": {
     <%- unless options.skip_js_linters? -%>
-    "babel-eslint": "^5.0.0-beta6",
+    "babel-eslint": "^5.0.0-beta8",
     <%- end -%>
     "babel-plugin-react-transform": "^2.0.0",
     <%- unless options.skip_bootstrap? -%>
@@ -86,7 +87,7 @@
     "css-loader": "^0.23.1",
     <%- unless options.skip_js_linters? -%>
     "eslint": "^1.10.3",
-    "eslint-config-airbnb": "^4.0.0",
+    "eslint-config-airbnb": "^5.0.0",
     "eslint-config-shakacode": "^1.0.0",
     "eslint-plugin-react": "^3.16.1",
     <%- end -%>
@@ -94,10 +95,10 @@
     "file-loader": "^0.8.5",
     "jade": "^1.11.0",
     <%- unless options.skip_js_linters? -%>
-    "jscs": "^2.8.0",
+    "jscs": "^2.9.0",
     <%- end -%>
     "node-sass": "^3.4.2",
-    "react-transform-hmr": "^1.0.1",
+    "react-transform-hmr": "^1.0.2",
     "sass-loader": "^3.1.2",
     "style-loader": "^0.13.0",
     "url-loader": "^0.5.7",

data/lib/generators/react_on_rails/templates/redux/base/client/app/bundles/HelloWorld/containers/HelloWorld.jsx

@@ -44,5 +44,5 @@ class HelloWorld extends React.Component {
 
 // Don't forget to actually use connect!
 // Note that we don't export HelloWorld, but the redux "connected" version of it.
-// See https://github.com/rackt/react-redux/blob/master/docs/api.md#examples
+// See https://github.com/reactjs/react-redux/blob/master/docs/api.md#examples
 export default connect(select)(HelloWorld);

data/lib/generators/react_on_rails/templates/redux/base/client/app/bundles/HelloWorld/reducers/index.jsx

@@ -9,6 +9,6 @@ export default {
   $$helloWorldStore: helloWorldReducer,
 };
 
-export const initalStates = {
+export const initialStates = {
   $$helloWorldState,
 };

data/lib/generators/react_on_rails/templates/redux/base/client/app/bundles/HelloWorld/startup/HelloWorldAppClient.jsx.tt

@@ -4,7 +4,7 @@ import { Provider } from 'react-redux';
 import createStore from '../store/helloWorldStore';
 import HelloWorld from '../containers/HelloWorld';
 
-// See documentation for https://github.com/rackt/react-redux.
+// See documentation for https://github.com/reactjs/react-redux.
 // This is how you get props from the Rails view into the redux store.
 // This code here binds your smart component to the redux store.
 export default (props) => {

data/lib/generators/react_on_rails/templates/redux/base/client/app/bundles/HelloWorld/store/helloWorldStore.jsx

@@ -11,12 +11,12 @@ import thunkMiddleware from 'redux-thunk';
 import loggerMiddleware from 'lib/middlewares/loggerMiddleware';
 
 import reducers from '../reducers';
-import { initalStates } from '../reducers';
+import { initialStates } from '../reducers';
 
 export default props => {
   // This is how we get initial props Rails into redux.
   const { name } = props;
-  const { $$helloWorldState } = initalStates;
+  const { $$helloWorldState } = initialStates;
 
   // Redux expects to initialize the store using an Object, not an Immutable.Map
   const initialState = {

data/lib/generators/react_on_rails/templates/redux/server_rendering/client/app/bundles/HelloWorld/startup/HelloWorldAppServer.jsx

@@ -4,7 +4,7 @@ import { Provider } from 'react-redux';
 import createStore from '../store/helloWorldStore';
 import HelloWorld from '../containers/HelloWorld';
 
-// See documentation for https://github.com/rackt/react-redux.
+// See documentation for https://github.com/reactjs/react-redux.
 // This is how you get props from the Rails view into the redux store.
 // This code here binds your smart component to the redux store.
 // This is how the server redux gets hydrated with data.

data/lib/react_on_rails/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ReactOnRails
-  VERSION = "3.0.0.rc.1".freeze
+  VERSION = "3.0.0.rc.2".freeze
 end

data/package.json

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

data/rakelib/dummy_apps.rake

@@ -8,6 +8,12 @@ namespace :dummy_apps do
     sh_in_dir(dummy_app_dir, "npm install")
   end
 
+  task :dummy_app_with_turbolinks_5 do
+    dummy_app_dir = File.join(gem_root, "spec/dummy")
+    bundle_install_with_turbolinks_5_in(dummy_app_dir)
+    sh_in_dir(dummy_app_dir, "npm install")
+  end
+
   task dummy_apps: [:dummy_app, :node_package] do
     puts "Prepared all Dummy Apps"
   end

data/rakelib/run_rspec.rake

@@ -25,6 +25,12 @@ namespace :run_rspec do
     bundle_install_in(dummy_app_dir)
   end
 
+  desc "Runs dummy respec with turbolinks 5"
+  task dummy_turbolinks_5: ["dummy_apps:dummy_app_with_turbolinks_5"] do
+    run_tests_in(File.join("spec", "dummy"), env_vars:
+      "ENABLE_TURBOLINKS_5=TRUE BUNDLE_GEMFILE=#{dummy_app_dir}/Gemfile")
+  end
+
   # Dynamically define Rake tasks for each example app found in the examples directory
   ExampleType.all.each do |example_type|
     desc "Runs RSpec for #{example_type.name_pretty} only"
@@ -46,7 +52,7 @@ namespace :run_rspec do
   Coveralls::RakeTask.new
 
   desc "run all tests"
-  task run_rspec: [:gem, :dummy, :dummy_no_turbolinks, :examples, :empty, :js_tests] do
+  task run_rspec: [:gem, :dummy, :dummy_no_turbolinks, :dummy_turbolinks_5, :examples, :empty, :js_tests] do
     puts "Completed all RSpec tests"
   end
 end

data/rakelib/task_helpers.rb

@@ -28,6 +28,10 @@ module ReactOnRails
       sh_in_dir(dir, "DISABLE_TURBOLINKS=TRUE bundle install")
     end
 
+    def bundle_install_with_turbolinks_5_in(dir)
+      sh_in_dir(dir, "ENABLE_TURBOLINKS_5=TRUE BUNDLE_GEMFILE=#{dir}/Gemfile bundle install")
+    end
+
     # Runs bundle exec using that directory's Gemfile
     def bundle_exec(dir: nil, args: nil, env_vars: "")
       sh_in_dir(dir, "#{env_vars} #{args}")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: react_on_rails
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc.1
+  version: 3.0.0.rc.2
 platform: ruby
 authors:
 - Justin Gordon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-09 00:00:00.000000000 Z
+date: 2016-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool
@@ -445,7 +445,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Rails with react server rendering with webpack.