Merge pull request shakacode#213 from shakacode/update-to-2-1-0

Update to 2.1.0

Author: justin808

Gemfile

@@ -37,7 +37,7 @@ gem "sdoc", group: :doc
 # Use Rails Html Sanitizer for HTML sanitization
 gem "rails-html-sanitizer"
 
-gem "react_on_rails", "2.0.0"
+gem "react_on_rails"
 
 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
 gem "therubyracer"

Gemfile.lock

@@ -1,36 +1,36 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.5)
-      actionpack (= 4.2.5)
-      actionview (= 4.2.5)
-      activejob (= 4.2.5)
+    actionmailer (4.2.5.1)
+      actionpack (= 4.2.5.1)
+      actionview (= 4.2.5.1)
+      activejob (= 4.2.5.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.5)
-      actionview (= 4.2.5)
-      activesupport (= 4.2.5)
+    actionpack (4.2.5.1)
+      actionview (= 4.2.5.1)
+      activesupport (= 4.2.5.1)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.5)
-      activesupport (= 4.2.5)
+    actionview (4.2.5.1)
+      activesupport (= 4.2.5.1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.5)
-      activesupport (= 4.2.5)
+    activejob (4.2.5.1)
+      activesupport (= 4.2.5.1)
       globalid (>= 0.3.0)
-    activemodel (4.2.5)
-      activesupport (= 4.2.5)
+    activemodel (4.2.5.1)
+      activesupport (= 4.2.5.1)
       builder (~> 3.1)
-    activerecord (4.2.5)
-      activemodel (= 4.2.5)
-      activesupport (= 4.2.5)
+    activerecord (4.2.5.1)
+      activemodel (= 4.2.5.1)
+      activesupport (= 4.2.5.1)
       arel (~> 6.0)
-    activesupport (4.2.5)
+    activesupport (4.2.5.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -40,16 +40,14 @@ GEM
     archive-zip (0.7.0)
       io-like (~> 0.3.0)
     arel (6.0.3)
-    ast (2.1.0)
-    astrolabe (1.3.1)
-      parser (~> 2.2)
-    autoprefixer-rails (6.1.2)
+    ast (2.2.0)
+    autoprefixer-rails (6.3.1)
       execjs
       json
     awesome_print (1.6.1)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    brakeman (3.1.3)
+    brakeman (3.1.4)
       erubis (~> 2.6)
       fastercsv (~> 1.5)
       haml (>= 3.0, < 5.0)
@@ -66,7 +64,8 @@ GEM
       bundler (~> 1.2)
       thor (~> 0.18)
     byebug (8.2.1)
-    capybara (2.5.0)
+    capybara (2.6.0)
+      addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
@@ -75,15 +74,15 @@ GEM
     capybara-screenshot (1.0.11)
       capybara (>= 1.0, < 3)
       launchy
-    childprocess (0.5.8)
+    childprocess (0.5.9)
       ffi (~> 1.0, >= 1.0.11)
     chromedriver-helper (1.0.0)
       archive-zip (~> 0.7.0)
       nokogiri (~> 1.6)
     coderay (1.1.0)
-    coffee-rails (4.1.0)
+    coffee-rails (4.1.1)
       coffee-script (>= 2.2.0)
-      railties (>= 4.0.0, < 5.0)
+      railties (>= 4.0.0, < 5.1.x)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
@@ -124,8 +123,8 @@ GEM
     i18n (0.7.0)
     interception (0.5)
     io-like (0.3.0)
-    jbuilder (2.3.2)
-      activesupport (>= 3.0.0, < 5)
+    jbuilder (2.4.0)
+      activesupport (>= 3.0.0, < 5.1)
       multi_json (~> 1.2)
     json (1.8.3)
     launchy (2.4.3)
@@ -138,13 +137,13 @@ GEM
     method_source (0.8.2)
     mime-types (2.99)
     mini_portile2 (2.0.0)
-    minitest (5.8.3)
+    minitest (5.8.4)
     multi_json (1.11.2)
     netrc (0.11.0)
-    nokogiri (1.6.7)
+    nokogiri (1.6.7.2)
       mini_portile2 (~> 2.0.0.rc2)
-    parser (2.2.3.0)
-      ast (>= 1.1, < 3.0)
+    parser (2.3.0.2)
+      ast (~> 2.2)
     pg (0.18.4)
     powerpack (0.1.1)
     pry (0.10.3)
@@ -169,57 +168,58 @@ GEM
     rack (1.6.4)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.5)
-      actionmailer (= 4.2.5)
-      actionpack (= 4.2.5)
-      actionview (= 4.2.5)
-      activejob (= 4.2.5)
-      activemodel (= 4.2.5)
-      activerecord (= 4.2.5)
-      activesupport (= 4.2.5)
+    rails (4.2.5.1)
+      actionmailer (= 4.2.5.1)
+      actionpack (= 4.2.5.1)
+      actionview (= 4.2.5.1)
+      activejob (= 4.2.5.1)
+      activemodel (= 4.2.5.1)
+      activerecord (= 4.2.5.1)
+      activesupport (= 4.2.5.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.5)
+      railties (= 4.2.5.1)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
     rails-dom-testing (1.0.7)
       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.2)
+    rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
     rails_12factor (0.0.3)
       rails_serve_static_assets
       rails_stdout_logging
     rails_serve_static_assets (0.0.4)
     rails_stdout_logging (0.0.4)
-    railties (4.2.5)
-      actionpack (= 4.2.5)
-      activesupport (= 4.2.5)
+    railties (4.2.5.1)
+      actionpack (= 4.2.5.1)
+      activesupport (= 4.2.5.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rainbow (2.0.0)
-    rake (10.4.2)
-    rdoc (4.2.0)
-    react_on_rails (2.0.0)
+    rainbow (2.1.0)
+    rake (10.5.0)
+    rdoc (4.2.1)
+      json (~> 1.4)
+    react_on_rails (2.1.0)
       connection_pool
       execjs (~> 2.5)
       rails (>= 3.2)
-      rainbow (~> 2.0)
+      rainbow (~> 2.1)
     ref (2.0.0)
     rest-client (1.8.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
-    rspec-core (3.4.1)
+    rspec-core (3.4.2)
       rspec-support (~> 3.4.0)
     rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.0)
+    rspec-mocks (3.4.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
-    rspec-rails (3.4.0)
+    rspec-rails (3.4.1)
       actionpack (>= 3.0, < 4.3)
       activesupport (>= 3.0, < 4.3)
       railties (>= 3.0, < 4.3)
@@ -230,43 +230,41 @@ GEM
     rspec-retry (0.4.5)
       rspec-core
     rspec-support (3.4.1)
-    rubocop (0.35.1)
-      astrolabe (~> 1.3)
-      parser (>= 2.2.3.0, < 3.0)
+    rubocop (0.36.0)
+      parser (>= 2.3.0.0, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
-      tins (<= 1.6.0)
-    ruby-lint (2.0.5)
+    ruby-lint (2.1.0)
       parser (~> 2.2)
       slop (~> 3.4, >= 3.4.7)
     ruby-progressbar (1.7.5)
     ruby2ruby (2.2.0)
       ruby_parser (~> 3.1)
       sexp_processor (~> 4.0)
-    ruby_parser (3.7.2)
+    ruby_parser (3.7.3)
       sexp_processor (~> 4.1)
     rubyzip (1.1.7)
     safe_yaml (1.0.4)
-    sass (3.4.20)
+    sass (3.4.21)
     sass-rails (5.0.4)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    scss_lint (0.43.2)
-      rainbow (~> 2.0)
+    scss_lint (0.44.0)
+      rake (~> 10.0)
       sass (~> 3.4.15)
     sdoc (0.4.1)
       json (~> 1.7, >= 1.7.7)
       rdoc (~> 4.0)
-    selenium-webdriver (2.48.1)
+    selenium-webdriver (2.49.0)
       childprocess (~> 0.5)
       multi_json (~> 1.0)
       rubyzip (~> 1.0)
       websocket (~> 1.0)
-    sexp_processor (4.6.0)
+    sexp_processor (4.6.1)
     simplecov (0.11.1)
       docile (~> 1.1.0)
       json (~> 1.8)
@@ -276,16 +274,16 @@ GEM
       temple (~> 0.7.3)
       tilt (>= 1.3.3, < 2.1)
     slop (3.6.0)
-    spring (1.5.0)
+    spring (1.6.2)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
     sprockets (3.5.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (2.3.3)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
+    sprockets-rails (3.0.0)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
     sqlite3 (1.3.11)
     temple (0.7.6)
     term-ansicolor (1.3.2)
@@ -296,7 +294,7 @@ GEM
       ref
     thor (0.19.1)
     thread_safe (0.3.5)
-    tilt (2.0.1)
+    tilt (2.0.2)
     tins (1.6.0)
     turbolinks (2.5.3)
       coffee-rails
@@ -347,7 +345,7 @@ DEPENDENCIES
   rails-html-sanitizer
   rails_12factor
   rainbow
-  react_on_rails (= 2.0.0)
+  react_on_rails
   rspec-rails
   rspec-retry
   rubocop

README.md

@@ -10,7 +10,8 @@
 By Justin Gordon and the Shaka Code Team, [www.shakacode.com](http://www.shakacode.com)
 
 - If this work interests you and you are looking for full or part-time remote work, please [click here](http://forum.shakacode.com/t/railsonmaui-is-hiring-and-partnering-part-time-remote-is-ok/156).
-- Please email us at [justin@shakacode.com](mailto:justin@shakacode.com) if you have a ReactJs + Rails project and are interested in help from our experienced team.
+- [ShakaCode](http://www.shakacode.com) is doing Skype plus Slack/Github based coaching for "React on Rails". [Click here](http://www.shakacode.com/work/index.html) for more information.
+- Please email us at [contact@shakacode.com](mailto:contact@shakacode.com) if you have a ReactJs + Rails project and are interested in help from our experienced team.
 - Please file issues for problems and feature requests.
 - Pull requests are welcome! (and a great way to get on the ShakaCode team)
 - Feel free to open discussions at [forum.shakacode.com](http://forum.shakacode.com). We love to help!
@@ -21,12 +22,12 @@ By Justin Gordon and the Shaka Code Team, [www.shakacode.com](http://www.shakaco
 A Full tutorial article can be found at: [Fast Rich Client Rails Development With Webpack and the ES6 Transpiler](http://www.railsonmaui.com/blog/2014/10/03/integrating-webpack-and-the-es6-transpiler-into-an-existing-rails-project/). Note, this source code repository is way ahead of the tutorial. We plan to update the tutorial article as soon as we can catch our breath!
 
 # NEWS
-We have not yet updated the react_on_rails gem generators for the following tasks. We're looking for help to migrate this, if you're interested in contributing to the project. *The tutorial* refers to this repo. The following changes have resulted in lots of differences for the webpack files and visual assets:
+We have not yet updated the `react_on_rails` gem generators for the following tasks. We're looking for help to migrate this, if you're interested in contributing to the project. *The tutorial* refers to this repo. The following changes have resulted in lots of differences for the webpack files and visual assets:
 
 1. **Handling of Sass and Bootstrap**: The tutorial uses CSS modules via Webpack. This is totally different than the older way of having Rails handle Sass/Bootstrap, and having NPM/Webpack handle the Webpack Dev Server. The tutorial now has NPM handle all visual assets. We are using this technique on a new app, and it's awesome!
 2. **Hot Reloading with Rails**: The tutorial has different startup scripts than the generators. The dev mode has the WebapackDev server providing the JS and CSS assets to the tutorial. This means you get **HOT RELOADING** of your JS and CSS within your Rails app.
 
-If you did generate a fresh app from react_on_rails and want to move to CSS Modules, then see [PR 175: Babel 6 / CSS Modules / Rails hot reloading](https://github.com/shakacode/react-webpack-rails-tutorial/pull/175). Note, while there are probably fixes after this PR was accepted, this has the majority of the changes.
+If you did generate a fresh app from React On Rails and want to move to CSS Modules, then see [PR 175: Babel 6 / CSS Modules / Rails hot reloading](https://github.com/shakacode/react-webpack-rails-tutorial/pull/175). Note, while there are probably fixes after this PR was accepted, this has the majority of the changes.
 
 
 # Example Application

app/views/pages/_header.html.erb

@@ -4,6 +4,12 @@
               id: "git-commit-sha" %>
 </p>
 <ul>
+  <li>
+    <%= link_to "ShakaCode", "http://www.shakacode.com"%>
+    is doing Skype plus Slack/Github based coaching for
+    <%= link_to "React on Rails", "https://github.com/shakacode/react_on_rails" %>.
+    <b><%= link_to "Click here", "http://www.shakacode.com/work/index.html" %></b> for more information.
+  </li>
   <li>
     If this work interests you and you're a developer or designer looking for full or part-time remote work: please
     visit <%= link_to "ShakaCode.com", "http://www.shakacode.com" %>,
@@ -19,5 +25,10 @@
                 "https://github.com/shakacode/react-webpack-rails-tutorial/blob/master/README.md" %>
     for details of how this example site was built.
   </li>
+  <li>
+    Be sure to read our new article
+    <%= link_to "The React on Rails Doctrine",
+                "http://www.shakacode.com/2016/01/26/the-react-on-rails-doctrine.html" %>.
+  </li>
 </ul>
 <hr/>

client/app/bundles/comments/components/CommentBox/CommentList/CommentList.jsx

@@ -33,18 +33,17 @@ export default class CommentList extends BaseComponent {
 
   render() {
     const { $$comments, cssTransitionGroupClassNames } = this.props;
-    const commentNodes = $$comments.map($$comment => {
+    const commentNodes = $$comments.map($$comment =>
+
       // `key` is a React-specific concept and is not mandatory for the
       // purpose of this tutorial. if you're curious, see more here:
       // http://facebook.github.io/react/docs/multiple-components.html#dynamic-children
-      return (
-        <Comment
-          key={$$comment.get('id')}
-          author={$$comment.get('author')}
-          text={$$comment.get('text')}
-        />
-      );
-    });
+      <Comment
+        key={$$comment.get('id')}
+        author={$$comment.get('author')}
+        text={$$comment.get('text')}
+      />
+    );
 
     return (
       <div>

client/npm-shrinkwrap.json

@@ -37,68 +37,68 @@
     "jscs": "jscs --verbose ."
   },
   "dependencies": {
-    "autoprefixer": "^6.1.2",
-    "axios": "^0.8.1",
-    "babel": "^6.3.13",
-    "babel-cli": "^6.3.17",
-    "babel-core": "^6.3.17",
-    "babel-loader": "^6.2.0",
+    "autoprefixer": "^6.3.1",
+    "axios": "^0.9.1",
+    "babel": "^6.3.26",
+    "babel-cli": "^6.4.5",
+    "babel-core": "^6.4.5",
+    "babel-loader": "^6.2.1",
     "babel-polyfill": "^6.3.14",
     "babel-preset-es2015": "^6.3.13",
     "babel-preset-react": "^6.3.13",
     "babel-preset-stage-0": "^6.3.13",
-    "bootstrap-loader": "^1.0.0-rc",
-    "bootstrap-sass": "^3.3.5",
-    "css-loader": "^0.23.0",
-    "es5-shim": "^4.3.1",
+    "bootstrap-loader": "^1.0.7",
+    "bootstrap-sass": "^3.3.6",
+    "css-loader": "^0.23.1",
+    "es5-shim": "^4.5.2",
     "expose-loader": "^0.7.1",
     "extract-text-webpack-plugin": "^1.0.1",
-    "file-loader": "^0.8.4",
+    "file-loader": "^0.8.5",
     "history": "^2.0.0-rc2",
-    "immutable": "^3.7.5",
+    "immutable": "^3.7.6",
     "imports-loader": "^0.6.5",
-    "jquery": "^2.1.4",
+    "jquery": "^2.2.0",
     "jquery-ujs": "^1.1.0-1",
-    "loader-utils": "^0.2.11",
-    "lodash": "^4.0.0",
+    "loader-utils": "^0.2.12",
+    "lodash": "^4.0.1",
     "marked": "^0.3.5",
     "node-sass": "^3.4.2",
     "node-uuid": "^1.4.7",
     "postcss-loader": "^0.8.0",
-    "react": "^0.14.3",
-    "react-addons-pure-render-mixin": "^0.14.3",
-    "react-bootstrap": "^0.28.1",
-    "react-dom": "^0.14.3",
-    "react-on-rails": "^2.0.0",
-    "react-redux": "^4.0.0",
-    "react-router": "^2.0.0-rc4",
-    "redux": "^3.0.4",
-    "redux-promise": "^0.5.0",
-    "redux-thunk": "^1.0.0",
+    "react": "^0.14.6",
+    "react-addons-pure-render-mixin": "^0.14.6",
+    "react-bootstrap": "^0.28.2",
+    "react-dom": "^0.14.6",
+    "react-on-rails": "^2.1.0",
+    "react-redux": "^4.0.6",
+    "react-router": "^2.0.0-rc5",
+    "redux": "^3.0.6",
+    "redux-promise": "^0.5.1",
+    "redux-thunk": "^1.0.3",
     "resolve-url-loader": "^1.4.3",
-    "sass-loader": "^3.1.1",
-    "sass-resources-loader": "1.0.1",
+    "sass-loader": "^3.1.2",
+    "sass-resources-loader": "1.0.2",
     "style-loader": "^0.13.0",
-    "url-loader": "^0.5.6",
-    "webpack": "^1.12.8"
+    "url-loader": "^0.5.7",
+    "webpack": "^1.12.11"
   },
   "devDependencies": {
     "babel-eslint": "^5.0.0-beta6",
-    "babel-plugin-react-transform": "^2.0.0-beta1",
-    "body-parser": "^1.14.1",
+    "babel-plugin-react-transform": "^2.0.0",
+    "body-parser": "^1.14.2",
     "chai": "^3.4.1",
     "chai-immutable": "^1.5.3",
     "eslint": "^1.10.3",
-    "eslint-config-airbnb": "^3.0.2",
-    "eslint-plugin-react": "^3.11.3",
-    "express": "^4.13.3",
+    "eslint-config-airbnb": "^4.0.0",
+    "eslint-plugin-react": "^3.16.1",
+    "express": "^4.13.4",
     "jade": "^1.11.0",
-    "jscs": "^2.7.0",
-    "jsdom": "^7.0.2",
-    "mocha": "^2.3.4",
-    "react-addons-test-utils": "^0.14.3",
+    "jscs": "^2.9.0",
+    "jsdom": "^7.2.2",
+    "mocha": "^2.4.2",
+    "react-addons-test-utils": "^0.14.6",
     "react-transform-hmr": "^1.0.1",
     "sleep": "^3.0.0",
-    "webpack-dev-server": "^1.12.1"
+    "webpack-dev-server": "^1.14.1"
   }
 }

client/package.json

@@ -28,13 +28,13 @@ var server = new WebpackDevServer(webpack(config), {
 server.app.use(bodyParser.json(null));
 server.app.use(bodyParser.urlencoded({ extended: true }));
 
-server.app.get('/comments.json', function(req, res) {
+server.app.get('/comments.json', (req, res) => {
   sleep.sleep(1);
   res.setHeader('Content-Type', 'application/json');
   res.send(JSON.stringify(comments));
 });
 
-server.app.post('/comments.json', function(req, res) {
+server.app.post('/comments.json', (req, res) => {
   const comment = req.body.comment;
   comment.id = uuid.v4();
 
@@ -47,16 +47,16 @@ server.app.post('/comments.json', function(req, res) {
   res.send(JSON.stringify(comment));
 });
 
-server.app.use('/', function(req, res) {
+server.app.use('/', (req, res) => {
   var locals = {
     props: JSON.stringify(comments),
   };
-  var layout = process.cwd() + '/index.jade';
+  var layout = `${process.cwd()}/index.jade`;
   var html = jade.compileFile(layout, { pretty: true })(locals);
   res.send(html);
 });
 
-server.listen(4000, 'localhost', function(err) {
+server.listen(4000, 'localhost', (err) => {
   if (err) console.log(err);
   console.log('Listening at localhost:4000...');
 });

client/server-express.js

@@ -10,7 +10,7 @@ const hotRailsPort = process.env.HOT_RAILS_PORT || 3500;
 const compiler = webpack(webpackConfig);
 
 const devServer = new WebpackDevServer(compiler, {
-  contentBase: 'http://lvh.me:' + hotRailsPort,
+  contentBase: `http://lvh.me:${hotRailsPort}`,
   publicPath: webpackConfig.output.publicPath,
   hot: true,
   inline: true,
@@ -30,6 +30,6 @@ const devServer = new WebpackDevServer(compiler, {
 devServer.listen(3500, 'localhost', err => {
   if (err) console.error(err);
   console.log(
-    '=> 🔥  Webpack development server is running on port ' + hotRailsPort
+    `=> 🔥  Webpack development server is running on port ${hotRailsPort}`
   );
 });

client/server-rails-hot.js

@@ -11,7 +11,7 @@ config.entry.vendor.push('bootstrap-loader');
 config.entry.app.push(
 
   // Webpack dev server
-  'webpack-dev-server/client?http://localhost:' + hotPort,
+  `webpack-dev-server/client?http://localhost:${hotPort}`,
   'webpack/hot/dev-server'
 );
 

client/webpack.client.express.config.js

@@ -11,7 +11,7 @@ const config = require('./webpack.client.base.config');
 const hotRailsPort = process.env.HOT_RAILS_PORT || 3500;
 
 config.entry.app.push(
-  'webpack-dev-server/client?http://localhost:' + hotRailsPort,
+  `webpack-dev-server/client?http://localhost:${hotRailsPort}`,
   'webpack/hot/only-dev-server'
 );
 

client/webpack.client.rails.hot.config.js

@@ -23,4 +23,3 @@
   5. [scss-lint](https://github.com/brigade/scss-lint)
   6. [brakeman](http://brakemanscanner.org/)
   7. [bundle-audit](https://github.com/rubysec/bundler-audit)
-

docs/linters.md

@@ -40,7 +40,7 @@
 
 RSpec.configure do |config|
   # Next line will ensure that assets are built if webpack -w is not running
-  config.include ReactOnRails::EnsureAssetsCompiled, type: :feature
+  ReactOnRails.configure_rspec_to_compile_assets(config)
 
   # config taken directly from RSpec example in the DatabaseCleaner README
   config.before(:suite) do