react_on_rails 5.0.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec359c1e0f84518176fe7da146462db339840dab
-  data.tar.gz: 6c7254b25df83c0901bfbf6d6191ae30d4a5aaf8
+  metadata.gz: 00b4b6cdd792eae2f8a892620e99371ae33eb716
+  data.tar.gz: 2c8831e6abb2b480cfa3802d2f6abf5d9357c706
 SHA512:
-  metadata.gz: 107de36a62e7465ddaf93a1b60a0a79da9550b68fe02de5d61b98cc8b140451fbc9d6401fde524d65d74e7162baa10a25644d27d55df91417ea7a4fd4e9c7ee3
-  data.tar.gz: 345f0a9e9617c7235e5f15db7144d192c51a49c9f5786b2cb33e6103eb75731518a4e74f98dc59edce783a776a47b333ce8c2b0314fb83c80c432b697b4ef082
+  metadata.gz: 939994ec889500aeff448c4a8b6d6c22464879e751fabf17c7b2d710922eaf4c440197c1c03938f6e5e70e80d5ead3e8c4e5f0dbc21313d8e432f8c8eefce594
+  data.tar.gz: 488947af98af5ec1c274fa332fbd2a301562a1db35ee79f2e9d4a1073c6129d3314c3f2076c320325e7aa4d43e827a8aef6ef364bf0d918ba793db9e73439e81

data/.rubocop.yml

@@ -57,7 +57,7 @@ Metrics/PerceivedComplexity:
   Max: 10
 
 Metrics/ClassLength:
-  Max: 114
+  Max: 140
 
 Metrics/ParameterLists:
   Max: 5

data/.travis.yml

@@ -22,7 +22,7 @@ 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 5.5.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.10.0
   - npm install -g npm
   - npm install -g poltergeist
   - gem install bundler

data/CHANGELOG.md

@@ -4,7 +4,22 @@ 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.
 ## [Unreleased]
 
-## [5.0.0] - 2016-03-27
+## [5.1.0] - 2016-04-03
+##### Added
+All 5.1.0 changes can be found in [#362](https://github.com/shakacode/react_on_rails/pull/362) by [justin808](https://github.com/justin808).
+- Generator enhancements
+  - Generator adds line to spec/rails_helper.rb so that running specs will ensure assets are compiled.
+  - Other small changes to the generator including adding necessary npm scripts to allow React on Rails to build assets.
+  - Npm modules updated for generator.
+  - Added babel-runtime in to the client/package.json created.
+- Server rendering
+  - Added more diagnostics for server rendering.
+  - Calls to setTimeout and setInterval are not logged for server rendering unless env TRACE_REACT_ON_RAILS is set to YES.
+- Updated all project npm dependencies to latest.
+- Update to node 5.10.0 for CI.
+- Added babel-runtime as a peer dependency for the npm module.
+
+## [5.0.0] - 2016-04-01
 
 ##### Added
 - Added `railsContext`, an object which gets passed always as the second parameter to both react component and redux store generator functions, both for server and client rendering. This provides data like the current locale, the pathname, etc. The data values are customizable by a new configuration called `rendering_extension` where you can create a module with a method called `rendering_extension`. This allows you to add additional values to the Rails Context. Implement one static method called `custom_context(view_context)` and return a Hash. See [#345](https://github.com/shakacode/react_on_rails/pull/345) by [justin808](https://github.com/justin808)
@@ -96,12 +111,12 @@ Contributors: please follow the recommendations outlined at [keepachangelog.com]
 - 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  
+##### Breaking Change
 - Calls to `react_component` should use a named argument of props. For example, change this:
   ```ruby
   <%= react_component("ReduxSharedStoreApp", {}, prerender: false, trace: true) %>
   ```
- 
+
   to
   ```ruby
   <%= react_component("ReduxSharedStoreApp", props: {}, prerender: false, trace: true) %>
@@ -109,7 +124,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`:
 ```ruby
@@ -247,7 +262,8 @@ Best done with Object destructing:
 
 ##### Fixed
 - Fix several generator related issues.
-[Unreleased]: https://github.com/shakacode/react_on_rails/compare/5.0.0...master
+[Unreleased]: https://github.com/shakacode/react_on_rails/compare/5.1.0...master
+[5.1.0]: https://github.com/shakacode/react_on_rails/compare/5.0.0...5.1.0
 [5.0.0]: https://github.com/shakacode/react_on_rails/compare/4.0.3...5.0.0
 [4.0.3]: https://github.com/shakacode/react_on_rails/compare/4.0.2...4.0.3
 [4.0.2]: https://github.com/shakacode/react_on_rails/compare/4.0.1...4.0.2

data/README.md

@@ -1,10 +1,9 @@
 [![Build Status](https://travis-ci.org/shakacode/react_on_rails.svg?branch=master)](https://travis-ci.org/shakacode/react_on_rails)  [![Dependency Status](https://gemnasium.com/shakacode/react_on_rails.svg)](https://gemnasium.com/shakacode/react_on_rails) [![Gem Version](https://badge.fury.io/rb/react_on_rails.svg)](https://badge.fury.io/rb/react_on_rails) [![npm version](https://badge.fury.io/js/react-on-rails.svg)](https://badge.fury.io/js/react-on-rails) [![Code Climate](https://codeclimate.com/github/shakacode/react_on_rails/badges/gpa.svg)](https://codeclimate.com/github/shakacode/react_on_rails) [![Coverage Status](https://coveralls.io/repos/shakacode/react_on_rails/badge.svg?branch=master&service=github)](https://coveralls.io/github/shakacode/react_on_rails?branch=master)
 
 # NEWS
-* 5.0.0.rc.1 has shipped! Please let me know if you're tried it and if you like the changes. 
-* Please see the [CHANGELOG.md](./CHANGELOG.md) for details on the latest release and any breaking changes.
+* 5.1.0 has shipped!Please see the [CHANGELOG.md](./CHANGELOG.md) for details on the latest release and any breaking changes.
 * [New slides on React on Rails](http://www.slideshare.net/justingordon/react-on-rails-v4032).
-* 2016-02-28: We added a [Projects page](PROJECTS.md). Please edit the page your project or [email us](mailto:contact@shakacode.com) and we'll add you. We also love stars as it helps us attract new users and contributors.
+* 2016-02-28: We added a [Projects page](./PROJECTS.md) and a [Kudos page](./KUDOS.md). Please edit the page your project or [email us](mailto:contact@shakacode.com) and we'll add you. We also love stars as it helps us attract new users and contributors.
 * *See [NEWS.md](NEWS.md) for the full news history.*
 
 # NOTES
@@ -67,7 +66,7 @@ Please see [Getting Started](#getting-started) for how to set up your Rails proj
 + [Why Webpack?](#why-webpack)
 + [Getting Started](#getting-started)
     - [Installation Summary](#installation-summary)
-    - [Initializer Configuration: config/initializers/react_on_rails.rb](#initializer-configuration) 
+    - [Initializer Configuration: config/initializers/react_on_rails.rb](#initializer-configuration)
 + [How it Works](#how-it-works)
     - [Client-Side Rendering vs. Server-Side Rendering](#client-side-rendering-vs-server-side-rendering)
     - [Building the Bundles](#building-the-bundles)
@@ -261,7 +260,7 @@ Set the config value for the `rendering_extension`:
   config.rendering_extension = RenderingExtension
 ```
 
-Implement it like this above in the same file. Create a class method on the module called `custom_context` that takes the `view_context` for a param. 
+Implement it like this above in the same file. Create a class method on the module called `custom_context` that takes the `view_context` for a param.
 
 See [spec/dummy/config/initializers/react_on_rails.rb](spec/dummy/config/initializers/react_on_rails.rb) for a detailed example.
 
@@ -387,11 +386,11 @@ The best source of docs is the main [ReactOnRails.js](node_package/src/ReactOnRa
   registerStore(stores)
 
   /**
-   * Allows retrieval of the store by name. This store will be hydrated by any Rails form props. 
+   * Allows retrieval of the store by name. This store will be hydrated by any Rails form props.
    * Pass optional param throwIfMissing = false if you want to use this call to get back null if the
    * store with name is not registered.
    * @param name
-   * @param throwIfMissing Defaults to true. Set to false to have this call return undefined if 
+   * @param throwIfMissing Defaults to true. Set to false to have this call return undefined if
    *        there is no store with the given name.
    * @returns Redux Store, possibly hydrated
    */
@@ -428,7 +427,7 @@ static vs. hot is picked based on whether `ENV["REACT_ON_RAILS_ENV"] == "HOT"`
                                 hot: 'application_non_webpack',
                                 'data-turbolinks-track' => true) %>
 ```
-                                
+
 See application.html.erb for usage example and [application.html.erb](https://github.com/shakacode/react-webpack-rails-tutorial/blob/master/app%2Fviews%2Flayouts%2Fapplication.html.erb)
 
 **env_javascript_include_tag(args = {})**
@@ -564,7 +563,7 @@ You will need to make a function that can create the store you will be using for
 
 ```
 function appStore(props, railsContext) {
-  // Create a hydrated redux store, using props and the railsContext (object with 
+  // Create a hydrated redux store, using props and the railsContext (object with
   // Rails contextual information).
   return myAppStore;
 }
@@ -613,9 +612,9 @@ Components are created as [stateless function(al) components](https://facebook.g
 
 ## 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. Examples in [spec/dummy/app/views/react_router](spec/dummy/app/views/react_router) and follow to the JavaScript code in the [spec/dummy/client/app/startup/ServerRouterApp.jsx](spec/dummy/client/app/startup/ServerRouterApp.jsx). 
+1. Examples in [spec/dummy/app/views/react_router](spec/dummy/app/views/react_router) and follow to the JavaScript code in the [spec/dummy/client/app/startup/ServerRouterApp.jsx](spec/dummy/client/app/startup/ServerRouterApp.jsx).
 
 ## Developing with the Webpack Dev Server
 One of the benefits of using webpack is access to [webpack's dev server](https://webpack.github.io/docs/webpack-dev-server.html) and its [hot module replacement](https://webpack.github.io/docs/hot-module-replacement-with-webpack.html) functionality.
@@ -653,7 +652,7 @@ Note: If you have components from react-rails you want to use, then you will nee
 ## Additional Reading
 + [React on Rails, Slides](http://www.slideshare.net/justingordon/react-on-rails-v4032)
 + [The React on Rails Doctrine](https://medium.com/@railsonmaui/the-react-on-rails-doctrine-3c59a778c724)
-+ [Installation Overview](docs/additional-reading/installation-overview.md) 
++ [Installation Overview](docs/additional-reading/installation-overview.md)
 + [Babel](docs/additional-reading/babel.md)
 + [Heroku Deployment](docs/additional-reading/heroku-deployment.md)
 + [Manual Installation](docs/additional-reading/manual-installation.md)

data/docs/additional-reading/server-rendering-tips.md

@@ -1,5 +1,6 @@
 # Server Rendering Tips
 
+## General Tips
 - Your code can't reference `document`. Server side JS execution does not have access to `document`, so jQuery and some
   other libs won't work in this environment. You can debug this by putting in `console.log`
   statements in your code.
@@ -8,4 +9,41 @@
   do this is to use a generator function.
 - If you're serious about server rendering, it's worth the effort to have different entry points for client and server rendering. It's worth the extra complexity.
 
-The point is that you have separate files for top level client or server side, and you pass some extra option indicating that rendering is happening server sie.
+The point is that you have separate files for top level client or server side, and you pass some extra option indicating that rendering is happening server side.
+
+## Troubleshooting Server Rendering
+
+1. First be sure your code works with server rendering disabled (`prerender: false`)
+2. `export TRACE_REACT_ON_RAILS=YES` Turn this on to get both the invocation code for you component, as well as the whole file used to setup the JavaScript context.
+
+## setTimeout and setInterval
+
+These methods are polyfilled for server rendering to be no-ops. We don't log calls to these by default as some libraries, namely babel-polyfill, will call setTimout. If you wish to log calls to setTimeout and setInterval, set the ENV value: `export TRACE_REACT_ON_RAILS=YES`.
+
+Here's an example of this which shows the line numbers that end up calling setTimeout:
+```
+➜  ~/shakacode/react_on_rails/gen-examples/examples/basic-server-rendering (add-rails-helper-to-generator u=) ✗ export TRACE_REACT_ON_RAILS=YES
+➜  ~/shakacode/react_on_rails/gen-examples/examples/basic-server-rendering (add-rails-helper-to-generator u=) ✗ rspec 
+Hello World
+Building Webpack client-rendering assets...
+Completed building Webpack client-rendering assets.
+ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
+react_renderer.rb: 92
+wrote file tmp/server-generated.js
+ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
+ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
+react_renderer.rb: 92
+wrote file tmp/base_js_code.js
+ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
+[SERVER] setTimeout is not defined for execJS. See https://github.com/sstephenson/execjs#faq. Note babel-polyfill will call this.
+[SERVER] at setTimeout (<eval>:31:17)
+at defer (<eval>:4422:8)
+at setImmediate (<eval>:4387:6)
+at notify (<eval>:4481:16)
+at module.exports (<eval>:4490:6)
+at notify (<eval>:4081:4)
+at Promise.$resolve (<eval>:4189:8)
+at <eval>:793:18
+at Function.resolve (<eval>:4265:6)
+  the hello world example works
+```

data/lib/generators/react_on_rails/base_generator.rb

@@ -110,15 +110,15 @@ module ReactOnRails
 
       def copy_base_files
         base_path = "base/base/"
-        %w(app/controllers/hello_world_controller.rb
-           client/.babelrc
-           client/index.jade
-           client/server.js
-           client/webpack.client.base.config.js
-           client/webpack.client.rails.config.js
-           REACT_ON_RAILS.md
-           client/REACT_ON_RAILS_CLIENT_README.md
-           package.json).each { |file| copy_file(base_path + file, file) }
+        base_files = %w(app/controllers/hello_world_controller.rb
+                        client/.babelrc
+                        client/index.jade
+                        client/server.js
+                        client/webpack.client.base.config.js
+                        client/webpack.client.rails.config.js
+                        REACT_ON_RAILS.md
+                        client/REACT_ON_RAILS_CLIENT_README.md)
+        base_files.each { |file| copy_file(base_path + file, file) }
       end
 
       def template_base_files
@@ -127,6 +127,7 @@ module ReactOnRails
            Procfile.dev
            Procfile.dev-hot
            app/views/hello_world/index.html.erb
+           package.json
            client/app/bundles/HelloWorld/components/HelloWorldWidget.jsx
            client/webpack.client.hot.config.js
            client/package.json).each { |file| template(base_path + file + ".tt", file) }
@@ -184,6 +185,32 @@ Rails.application.config.assets.paths << Rails.root.join("app", "assets", "webpa
         end
       end
 
+      def append_to_spec_rails_helper
+        rails_helper = File.join(destination_root, "spec/rails_helper.rb")
+        if File.exist?(rails_helper)
+          add_configure_rspec_to_compile_assets(rails_helper)
+        else
+          spec_helper = File.join(destination_root, "spec/spec_helper.rb")
+          if File.exist?(spec_helper)
+            add_configure_rspec_to_compile_assets(spec_helper)
+          else
+            GeneratorMessages.add_info(
+              <<-MSG.strip_heredoc
+              Did not find spec/rails_helper.rb or spec/spec_helper.rb to add line
+              config.example_status_persistence_file_path = "spec/examples.txt"
+              MSG
+            )
+          end
+        end
+      end
+
+      CONFIGURE_RSPEC_TO_COMPILE_ASSETS = <<-STR.strip_heredoc
+        RSpec.configure do |config|
+          # Ensure that if we are running js tests, we are using latest webpack assets
+          # This will use the defaults of :js and :server_rendering meta tags
+          ReactOnRails::TestHelper.configure_rspec_to_compile_assets(config)
+      STR
+
       # rename to application.scss from application.css or application.css.scss
       def force_application_scss_naming_if_necessary
         base_path = "app/assets/stylesheets/"
@@ -220,6 +247,13 @@ Rails.application.config.assets.paths << Rails.root.join("app", "assets", "webpa
         MSG
         GeneratorMessages.add_info(message)
       end
+
+      private
+
+      def add_configure_rspec_to_compile_assets(helper_file)
+        search_str = "RSpec.configure do |config|"
+        gsub_file(helper_file, search_str, CONFIGURE_RSPEC_TO_COMPILE_ASSETS)
+      end
     end
   end
 end

data/lib/generators/react_on_rails/templates/base/base/client/app/bundles/HelloWorld/components/HelloWorldWidget.jsx.tt

@@ -38,7 +38,7 @@ export default class HelloWorldWidget extends React.Component {
         <h3>
           Hello, {name}!
         </h3>
-        <hr/>
+        <hr />
         <form className="form-horizontal">
             <%- if options.skip_bootstrap? -%>
             <label>

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

@@ -25,82 +25,90 @@
   },
   "homepage": "https://github.com/shakacode/react-webpack-rails-tutorial",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
     "start": "node server.js",
     "build:client": "NODE_ENV=production webpack --config webpack.client.rails.config.js",
+    <%- if options.server_rendering? -%>
     "build:server": "NODE_ENV=production webpack --config webpack.server.rails.config.js",
+    <%- end -%>
     "build:dev:client": "webpack -w --config webpack.client.rails.config.js",
-    "build:dev:server": "webpack -w --config webpack.server.rails.config.js"<% unless options.skip_js_linters? -%>,
+    <%- if options.server_rendering? -%>
+    "build:dev:server": "webpack -w --config webpack.server.rails.config.js",
+    <%- end -%>
+    "build:production:client": "NODE_ENV=production webpack --config webpack.client.rails.build.config.js",
+    <%- if options.server_rendering? -%>
+    "build:production:server": "NODE_ENV=production webpack --config webpack.server.rails.build.config.js",
+    <%- end -%>
+    <%- unless options.skip_js_linters? -%>
     "lint": "npm run eslint && npm run jscs",
     "eslint": "eslint --ext .js,.jsx .",
-    "jscs": "jscs --verbose ."
+    "jscs": "jscs --verbose .",
     <%- end -%>
+    "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "autoprefixer": "^6.3.2",
+    "autoprefixer": "^6.3.5",
     "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": "^6.5.2",
+    "babel-cli": "^6.6.5",
+    "babel-core": "^6.7.4",
+    "babel-loader": "^6.2.4",
+    "babel-runtime": "^6.6.1",
+    "babel-polyfill": "^6.7.4",
+    "babel-preset-es2015": "^6.6.0",
     "babel-preset-react": "^6.5.0",
     "babel-preset-stage-0": "^6.5.0",
     "css-loader": "^0.23.1",
-    "es5-shim": "^4.5.2",
+    "es5-shim": "^4.5.7",
     "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.2.0",
-    "loader-utils": "^0.2.12",
-    "lodash": "^4.3.0",
+    "jquery": "^2.2.2",
+    "jquery-ujs": "^1.2.1",
+    "loader-utils": "^0.2.13",
+    "lodash": "^4.7.0",
     <%- if options.redux? -%>
-    "mirror-creator": "1.0.0",
+    "mirror-creator": "1.1.0",
     <%- end -%>
-    "react": "^0.14.7",
+    "react": "^0.14.8",
     <%- unless options.skip_bootstrap? -%>
-    "react-bootstrap": "^0.28.3",
+    "react-bootstrap": "^0.28.5",
     <%- end -%>
-    "react-dom": "^0.14.7",
+    "react-dom": "^0.14.8",
     "react-on-rails": "<%= VersionSyntaxConverter.new.rubygem_to_npm %>",
     <%- if options.redux? -%>
-    "react-redux": "^4.4.0",
+    "react-redux": "^4.4.1",
     "redux": "^3.3.1",
-    "redux-promise": "^0.5.1",
-    "redux-thunk": "^1.0.3",
+    "redux-promise": "^0.5.3",
+    "redux-thunk": "^2.0.1",
     <%- end -%>
-    "webpack": "^1.12.13"
+    "webpack": "^1.12.14"
   },
   "devDependencies": {
-    <%- unless options.skip_js_linters? -%>
-    "babel-eslint": "^5.0.0-beta8",
-    <%- end -%>
-    "babel-plugin-react-transform": "^2.0.0",
+    "babel-plugin-react-transform": "^2.0.2",
     <%- unless options.skip_bootstrap? -%>
     "bootstrap-sass": "^3.3.6",
     "bootstrap-sass-loader": "^1.0.10",
     <%- end -%>
     "css-loader": "^0.23.1",
     <%- unless options.skip_js_linters? -%>
-    "eslint": "^1.10.3",
-    "eslint-config-airbnb": "^5.0.0",
-    "eslint-config-shakacode": "^1.0.0",
-    "eslint-plugin-react": "^3.16.1",
+    "eslint": "^2.6.0",
+    <%- unless options.skip_js_linters? -%>
+    "eslint-config-shakacode": "^4.0.0",
+    <%- end -%>
+    "eslint-plugin-react": "^4.2.3",
     <%- end -%>
     "express": "^4.13.4",
     "file-loader": "^0.8.5",
     "jade": "^1.11.0",
     <%- unless options.skip_js_linters? -%>
-    "jscs": "^2.9.0",
+    "jscs": "^2.11.0",
     <%- end -%>
     "node-sass": "^3.4.2",
-    "react-transform-hmr": "^1.0.2",
-    "sass-loader": "^3.1.2",
-    "style-loader": "^0.13.0",
+    "react-transform-hmr": "^1.0.4",
+    "sass-loader": "^3.2.0",
+    "style-loader": "^0.13.1",
     "url-loader": "^0.5.7",
     "webpack-dev-server": "^1.14.1"
   }

data/lib/generators/react_on_rails/templates/base/base/{package.json → package.json.tt}

@@ -9,9 +9,21 @@
   },
   "scripts": {
     "postinstall": "cd client && npm install",
-    "test": "rspec && (cd client && npm run lint)",
     "express-server": "echo 'visit http://localhost:4000' && cd client && npm start",
-    "rails-server": "echo 'visit http://localhost:3000/hello_world' && foreman start -f Procfile.dev"
+    "rails-server": "echo 'visit http://localhost:3000/hello_world' && foreman start -f Procfile.dev",
+    "build:production:client": "(cd client && npm run build:production:client --silent)",
+    <%- if options.server_rendering? -%>
+    "build:production:server": "(cd client && npm run build:production:server --silent)",
+    <%- end -%>
+    "build:client": "(cd client && npm run build:client --silent",
+    <%- if options.server_rendering? -%>
+    "build:server": "(cd client && npm run build:server --silent)",
+    <%- end -%>
+    "build:dev:client": "(cd client && npm run build:dev:client --silent)",
+    <%- if options.server_rendering? -%>
+    "build:dev:server": "(cd client && npm run build:dev:server --silent)",
+    <%- end -%>
+    "test": "rspec && (cd client && npm run lint)"
   },
   "repository": {
     "type": "git",

data/lib/generators/react_on_rails/templates/dev_tests/spec/rails_helper.rb

@@ -34,6 +34,10 @@ Capybara.javascript_driver = :poltergeist
 # ActiveRecord::Migration.maintain_test_schema!
 
 RSpec.configure do |config|
+  # Ensure that if we are running js tests, we are using latest webpack assets
+  # This will use the defaults of :js and :server_rendering meta tags
+  ReactOnRails::TestHelper.configure_rspec_to_compile_assets(config)
+
   # Remove this line if you"re not using ActiveRecord or ActiveRecord fixtures
   config.fixture_path = "#{::Rails.root}/spec/fixtures"
 

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

@@ -12,35 +12,29 @@ function select(state) {
 }
 
 // Simple example of a React "smart" component
-class HelloWorld extends React.Component {
-  static propTypes = {
-    dispatch: PropTypes.func.isRequired,
+const HelloWorld = (props) => {
+  const { dispatch, $$helloWorldStore } = props;
+  const actions = bindActionCreators(helloWorldActionCreators, dispatch);
+  const { updateName } = actions;
+  const name = $$helloWorldStore.get('name');
 
-    // This corresponds to the value used in function select above.
-    // We prefix all property and variable names pointing to Immutable.js objects with '$$'.
-    // This allows us to immediately know we don't call $$helloWorldStore['someProperty'], but
-    // instead use the Immutable.js `get` API for Immutable.Map
-    $$helloWorldStore: PropTypes.instanceOf(Immutable.Map).isRequired,
-  };
+  // This uses the ES2015 spread operator to pass properties as it is more DRY
+  // This is equivalent to:
+  // <HelloWorldWidget $$helloWorldStore={$$helloWorldStore} actions={actions} />
+  return (
+    <HelloWorldWidget {...{ updateName, name }} />
+  );
+};
 
-  constructor(props, context) {
-    super(props, context);
-  }
+HelloWorld.propTypes = {
+  dispatch: PropTypes.func.isRequired,
 
-  render() {
-    const { dispatch, $$helloWorldStore } = this.props;
-    const actions = bindActionCreators(helloWorldActionCreators, dispatch);
-    const { updateName } = actions;
-    const name = $$helloWorldStore.get('name');
-
-    // This uses the ES2015 spread operator to pass properties as it is more DRY
-    // This is equivalent to:
-    // <HelloWorldWidget $$helloWorldStore={$$helloWorldStore} actions={actions} />
-    return (
-      <HelloWorldWidget {...{ updateName, name }} />
-    );
-  }
-}
+  // This corresponds to the value used in function select above.
+  // We prefix all property and variable names pointing to Immutable.js objects with '$$'.
+  // This allows us to immediately know we don't call $$helloWorldStore['someProperty'], but
+  // instead use the Immutable.js `get` API for Immutable.Map
+  $$helloWorldStore: PropTypes.instanceOf(Immutable.Map).isRequired,
+};
 
 // Don't forget to actually use connect!
 // Note that we don't export HelloWorld, but the redux "connected" version of it.

data/lib/react_on_rails/server_rendering_pool.rb

@@ -29,7 +29,11 @@ module ReactOnRails
     # js_code MUST RETURN json stringify Object
     # Calling code will probably call 'html_safe' on return value before rendering to the view.
     def self.server_render_js_with_console_logging(js_code)
-      trace_messsage(js_code)
+      if trace_react_on_rails?
+        @file_index ||= 1
+        trace_messsage(js_code, "tmp/server-generated-#{@file_index % 10}.js")
+        @file_index += 1
+      end
       json_string = eval_js(js_code)
       result = JSON.parse(json_string)
 
@@ -51,8 +55,8 @@ module ReactOnRails
     class << self
       private
 
-      def trace_messsage(js_code, file_name = "tmp/server-generated.js")
-        return unless ENV["TRACE_REACT_ON_RAILS"].present?
+      def trace_messsage(js_code, file_name = "tmp/server-generated.js", force = false)
+        return unless trace_react_on_rails? || force
         # Set to anything to print generated code.
         puts "Z" * 80
         puts "react_renderer.rb: 92"
@@ -61,6 +65,10 @@ module ReactOnRails
         puts "Z" * 80
       end
 
+      def trace_react_on_rails?
+        ENV["TRACE_REACT_ON_RAILS"].present?
+      end
+
       def eval_js(js_code)
         @js_context_pool.with do |js_context|
           result = js_context.eval(js_code)
@@ -78,17 +86,18 @@ module ReactOnRails
 #{execjs_timer_polyfills}
           #{bundle_js_code};
           JS
+          file_name = "tmp/base_js_code.js"
           begin
+            trace_messsage(base_js_code, file_name)
             ExecJS.compile(base_js_code)
           rescue => e
-            file_name = "tmp/base_js_code.js"
-            msg = "ERROR when compiling base_js_code! See #{file_name} to "\
-              "ERROR when compiling base_js_code! See #{file_name} to "\
+            msg = "ERROR when compiling base_js_code! "\
+              "See file #{file_name} to "\
               "correlate line numbers of error. Error is\n\n#{e.message}"\
               "\n\n#{e.backtrace.join("\n")}"
             puts msg
             Rails.logger.error(msg)
-            trace_messsage(base_js_code, file_name)
+            trace_messsage(base_js_code, file_name, true)
             raise e
           end
         else
@@ -105,16 +114,38 @@ module ReactOnRails
 
       def execjs_timer_polyfills
         <<-JS
+function getStackTrace () {
+  var stack;
+  try {
+    throw new Error('');
+  }
+  catch (error) {
+    stack = error.stack || '';
+  }
+  stack = stack.split('\\n').map(function (line) { return line.trim(); });
+  return stack.splice(stack[0] == 'Error' ? 2 : 1);
+}
+
 function setInterval() {
- console.error('setInterval is not defined for execJS. See https://github.com/sstephenson/execjs#faq');
+  #{undefined_for_exec_js_logging('setInterval')}
 }
 
 function setTimeout() {
- console.error('setTimeout is not defined for execJS. See https://github.com/sstephenson/execjs#faq');
+  #{undefined_for_exec_js_logging('setTimeout')}
 }
         JS
       end
 
+      def undefined_for_exec_js_logging(function_name)
+        if trace_react_on_rails?
+          "console.error('#{function_name} is not defined for execJS. See "\
+          "https://github.com/sstephenson/execjs#faq. Note babel-polyfill may call this.');\n"\
+          "  console.error(getStackTrace().join('\\n'));"
+        else
+          ""
+        end
+      end
+
       # Reimplement console methods for replaying on the client
       def console_polyfill
         <<-JS

data/lib/react_on_rails/version.rb

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

data/package.json

@@ -1,44 +1,42 @@
 {
   "name": "react-on-rails",
-  "version": "5.0.0",
+  "version": "5.1.0",
   "description": "react-on-rails JavaScript for react_on_rails Ruby gem",
   "main": "node_package/lib/ReactOnRails.js",
   "directories": {
     "doc": "docs"
   },
   "devDependencies": {
-    "babel-cli": "^6.4.5",
-    "babel-core": "^6.4.5",
-    "babel-eslint": "^5.0.0-beta8",
-    "babel-loader": "^6.2.1",
-    "babel-plugin-transform-runtime": "^6.4.3",
-    "babel-preset-es2015": "^6.3.13",
-    "babel-preset-react": "^6.3.13",
-    "babel-preset-stage-0": "^6.3.13",
-    "babel-runtime": "^6.3.19",
-    "babel-tape-runner": "^2.0.0",
-    "babel-types": "^6.4.5",
+    "babel-cli": "^6.6.5",
+    "babel-core": "^6.7.4",
+    "babel-loader": "^6.2.4",
+    "babel-plugin-react-transform": "^2.0.2",
+    "babel-plugin-transform-runtime": "^6.6.0",
+    "babel-preset-es2015": "^6.6.0",
+    "babel-preset-react": "^6.5.0",
+    "babel-preset-stage-0": "^6.5.0",
+    "babel-tape-runner": "^2.0.1",
+    "babel-types": "^6.7.2",
     "babelify": "^7.2.0",
-    "blue-tape": "^0.1.11",
-    "eslint": "^1.10.3",
-    "eslint-config-airbnb": "^4.0.0",
-    "eslint-config-shakacode": "1.0.0",
-    "eslint-plugin-babel": "^3.0.0",
-    "eslint-plugin-react": "^3.16.1",
-    "jscs": "^2.9.0",
-    "jsdom": "^8.0.2",
-    "react": "^0.14.7",
-    "react-dom": "^0.14.7",
-    "react-transform-hmr": "^1.0.1",
+    "blue-tape": "^0.2.0",
+    "eslint": "^2.6.0",
+    "eslint-config-shakacode": "4.0.0",
+    "eslint-plugin-react": "^4.2.3",
+    "jscs": "^2.11.0",
+    "jsdom": "^8.2.0",
+    "react": "^0.14.8",
+    "react-dom": "^0.14.8",
+    "react-transform-hmr": "^1.0.4",
     "redux": "^3.3.1",
     "release-it": "^2.3.1",
     "tap-spec": "^4.1.1",
-    "tape": "^4.4.0",
-    "webpack": "^1.12.12"
+    "tape": "^4.5.1",
+    "webpack": "^1.12.14"
   },
   "peerDependencies": {
     "react": ">= 0.14",
-    "react-dom": ">= 0.14"
+    "react-dom": ">= 0.14",
+    "babel-runtime": ">= 6"
   },
   "files": [
     "node_package/lib"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: react_on_rails
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.1.0
 platform: ruby
 authors:
 - Justin Gordon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-01 00:00:00.000000000 Z
+date: 2016-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool
@@ -373,7 +373,7 @@ files:
 - lib/generators/react_on_rails/templates/base/base/config/initializers/react_on_rails.rb.tt
 - lib/generators/react_on_rails/templates/base/base/lib/tasks/assets.rake.tt
 - lib/generators/react_on_rails/templates/base/base/lib/tasks/linters.rake.tt
-- lib/generators/react_on_rails/templates/base/base/package.json
+- lib/generators/react_on_rails/templates/base/base/package.json.tt
 - lib/generators/react_on_rails/templates/base/server_rendering/client/app/bundles/HelloWorld/startup/serverRegistration.jsx
 - lib/generators/react_on_rails/templates/base/server_rendering/client/webpack.server.rails.config.js
 - lib/generators/react_on_rails/templates/bootstrap/app/assets/stylesheets/_bootstrap-custom.scss