react_on_rails 4.0.0.beta.1 → 4.0.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbaf8ec483e9950e41d61c2e22b62b325113b00a
-  data.tar.gz: 6e2da43df3e19adaffa7ff8a386fd39faa55c4b9
+  metadata.gz: 7201a4cf1cd742f3daa732436004d85ca67b8703
+  data.tar.gz: 02719ebb4f5feb84506f83b10417e864ca5ca6ff
 SHA512:
-  metadata.gz: 9f716fc038e89ab1f26049d01bc9cfce53717cd40f0705c94a92906aee8f1f340b1b9e1eeb6adddfcf9bb4cc889de3b2638645b7fb78990b543fda4933c80b3c
-  data.tar.gz: 6befd861e58a261de37c42eb332156bd67b125dbbe0823e6d2a42a59b02c0cd8fe4ed5ea49ded2e97d438829d48a206ffe73bd4d03048d6fc595d19fd2d5649d
+  metadata.gz: 41cfaad0da66d9771852126d6f64cb3615d080a827ec8a5a3be328f0f69f4d7a135d15b26a0cf5e4d79900a8634bcfbd6dae9b1ffc1d103e9633ffd4d57e8981
+  data.tar.gz: 8ecb0b33b5b958408917eee8ca024756448c00553b0d863163ee4ffbf371f66c22cf282fbee526d925810e07dac42db7a46ee06798c3dc6a153bbefa53f39a69

data/.eslintignore

@@ -6,6 +6,7 @@ node_package/lib/
 node_package/tests/node_modules
 node_package/webpack.config.js
 **/node_modules/**
+**/assets/webpack/**
 **/generated/**
 **/app/assets/javascripts/application.js
 **/coverage/**

data/.gitignore

@@ -10,8 +10,9 @@
 *.gem
 /vendor/
 
+/spec/examples.txt
 /spec/dummy/client/node_modules
-/spec/dummy/app/assets/javascripts/generated/
+/spec/dummy/app/assets/webpack/
 /spec/dummy/coverage/
 /spec/react_on_rails/dummy-for-generators/
 

data/.jscsrc

@@ -7,6 +7,7 @@
   "excludeFiles": [
     "**/build/**",
     "**/node_modules/**",
+    "**/assets/webpack/**",
     "**/generated/**",
     "**/docs/**",
     "**/tmp/**",

data/.rubocop.yml

@@ -2,9 +2,12 @@
 # Check out: https://github.com/bbatsov/rubocop
 
 AllCops:
+  TargetRubyVersion: 2.1
+
   Include:
     - '**/Rakefile'
     - '**/config.ru'
+
   Exclude:
     - 'vendor/**/*'
     - 'spec/fixtures/**/*'

data/.travis.yml

@@ -12,7 +12,7 @@ gemfile:
   - spec/dummy/Gemfile
 
 env:
-  - export RAILS_ENV=test DRIVER=selenium
+  - export RAILS_ENV=test DRIVER=selenium_chrome
 
 before_install:
   - sudo apt-get update

data/CHANGELOG.md

@@ -7,18 +7,26 @@ Contributors: please follow the recommendations outlined at [keepachangelog.com]
 ## [4.0.0.rc.1] - 2016-03-06
 ##### Added
 - Added controller `module ReactOnRails::Controller`. Adds method `redux_store` to setup redux stores in the view.
+- Added option `defer: true` for view helper `redux_store`. This allows the view helper to specify the props for store hydration, yet still render the props at the bottom of the view.
 - Added view helper `redux_store_hydration_data` to render the props on the application's layout, near the bottom. This allows for the client hydration data to be parsed after the server rendering, which may result in a faster load time.
 - Added helpers `env_stylesheet_link_tag` and `env_javascript_include_tag` to support hot reloading Rails. See the [README.md](./README.md) for more details and see the example application in `spec/dummy`.
 - The checker for outdated bundles before running tests will default to including the directory with `server_bundle_js_file`.
-
+- Better support for Turbolinks 5!
+-	Fixed generator check of uncommitted code for foreign languages. See [#303](https://github.com/shakacode/react_on_rails/pull/303) by [nmatyukov](https://github.com/nmatyukov).
+- Added several parameters used for ensuring webpack assets are built for running tests:
+  - `config.generated_assets_dir`: Directory where your generated webpack assets go. You can have only **one** directory for this.
+  - `config.webpack_generated_files`: List of files that will get created in the `generated_assets_dir`. The test runner helper will ensure these generated files are newer than any of the files in the client directory.
+##### Changed
+ - Generator default for webpack generated assets is now `app/assets/webpack` as we use this for both JavaScript and CSS generated assets.
 ##### Fixed
-- The test runner assets up to date checker might see only the server rendering file, and assume that all assets are up to date.
+- The test runner assets up to date checker is greatly improved.
 - Lots of doc updates!
 - Improved the **spec/dummy** sample app so that it supports CSS modules, hot reloading, etc, and it can server as a template for a new ReactOnRails installation.
 
 ##### Breaking Changes
-- Deprecated `redux_store` called from views. Call this method from your controller actions and place `redux_store_hydration_data` on your layout, near the bottom. 
-- Removed the config default of the `config.server_bundle_js_file`. The default is blank, meaning no server rendering.
+- Deprecated calling `redux_store(store_name, props)`. The API has changed. Use `redux_store(store_name, props: props, defer: false)` A new option called `defer` allows the rendering of store hydration at the bottom of the your layout.  Place `redux_store_hydration_data` on your layout. 
+- `config.server_bundle_js_file` has changed. The default value is now blank, meaning no server rendering. Addtionally, if you specify the file name, you should not include the path, as that should be specified in the `config.generated_assets_dir`.
+- `config.generated_assets_dirs` has been renamed to `config.generated_assets_dir` (singular) and it only takes one directory.
 
 
 ## [3.0.6] - 2016-03-01

data/Gemfile

@@ -8,12 +8,9 @@ gemspec
 # bundle install from a single Gemfile. Therefore, all gems that we will need for any dummy/example
 # app have to be manually added to this file.
 gem "bootstrap-sass"
-gem "chromedriver-helper"
 gem "coffee-rails", "~> 4.1.0"
 gem "jbuilder", "~> 2.0"
 gem "jquery-rails"
-gem "launchy"
-gem "poltergeist"
 gem "puma"
 gem "rails", "4.2.5"
 gem "rails_12factor"
@@ -35,12 +32,10 @@ gem "web-console", "~> 2.0", group: :development
 
 # below are copied from spec/dummy/Gemfile
 gem "rspec-rails"
-gem "coveralls", require: false
 gem "capybara"
 gem "capybara-screenshot"
 gem "capybara-webkit"
 gem "chromedriver-helper"
-gem "generator_spec"
 gem "launchy"
 gem "poltergeist"
 gem "selenium-webdriver"

data/README.md

@@ -1,7 +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
-
+* 4.0.0 Highlights
+  * Better support for Turbolinks 5.
+  * Controller rendering of shared redux stores.
 * 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. [jbhatab](https://github.com/jbhatab) is leading an effort to ease the onboarding process for newbies with simpler project generators. See [#245](https://github.com/shakacode/react_on_rails/issues/245).
 * 3.0.6 shipped on Tuesday, 2016-03-01. 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/)
@@ -171,7 +173,7 @@ cd client && npm i --saveDev react-on-rails
 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.
+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/webpack`, 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 bet is to scan the code inside of the [/spec/dummy](spec/dummy) sample app.
 
@@ -222,7 +224,7 @@ Place your JavaScript code inside of the provided `client/app` folder. Use modul
   In general, you may want different initialization for your server rendered components.
 
 ## ReactOnRails View Helpers API
-Once the bundled files have been generated in your `app/assets/javascripts/generated` folder and you have exposed your components globally, you will want to run your code in your Rails views using the included helper method.
+Once the bundled files have been generated in your `app/assets/webpack` folder and you have exposed your components globally, you will want to run your code in your Rails views using the included helper method.
 
 This is how you actually render the React components you exposed to `window` inside of `clientRegistration` (and `global` inside of `serverRegistration` if you are server rendering).
 
@@ -574,6 +576,11 @@ Note: If you have components from react-rails you want to use, then you will nee
   foreman start
   ```
 
+## Dependencies
++ Ruby 2.1 or greater
++ Rails 3.2 or greater
++ Node 5.5 or great
+
 ## Contributing
 Bug reports and pull requests are welcome. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to our version of the [Contributor Covenant Code of Conduct](docs/code_of_conduct.md)).
 

data/Rakefile

@@ -5,3 +5,6 @@ Coveralls::RakeTask.new
 
 desc "Run all tests and linting"
 task default: ["run_rspec", "lint", "coveralls:push"]
+
+desc "All actions but no examples. Good for local developer run."
+task all_but_examples: ["run_rspec:all_but_examples", "lint"]

data/app/helpers/react_on_rails_helper.rb

@@ -19,7 +19,7 @@ module ReactOnRailsHelper
   #   <%= env_stylesheet_link_tag(static: 'application_static',
   #                               hot: 'application_non_webpack',
   #                               media: 'all',
-  #                               'data-turbolinks-track' => true)  %>
+  #                               'data-turbolinks-track' => "reload")  %>
   #
   #   <!-- These do not use turbolinks, so no data-turbolinks-track -->
   #   <!-- This is to load the hot assets. -->
@@ -29,7 +29,9 @@ module ReactOnRailsHelper
   #   <!-- These do use turbolinks -->
   #   <%= env_javascript_include_tag(static: 'application_static',
   #                                  hot: 'application_non_webpack',
-  #                                  'data-turbolinks-track' => true) %>
+  #                                  'data-turbolinks-track' => "reload") %>
+  #
+  # NOTE: for Turbolinks 2.x, use 'data-turbolinks-track' => true
   # See application.html.erb for usage example
   # https://github.com/shakacode/react-webpack-rails-tutorial/blob/master/app%2Fviews%2Flayouts%2Fapplication.html.erb
   def env_javascript_include_tag(args = {})
@@ -104,7 +106,6 @@ module ReactOnRailsHelper
 
     # Setup the page_loaded_js, which is the same regardless of prerendering or not!
     # The reason is that React is smart about not doing extra work if the server rendering did its job.
-    turbolinks_loaded = Object.const_defined?(:Turbolinks)
 
     props = {} if props.nil?
 
@@ -112,7 +113,6 @@ module ReactOnRailsHelper
       component_name: react_component_name,
       props: props,
       trace: trace(options),
-      expect_turbolinks: turbolinks_loaded,
       dom_id: dom_id
     }
 
@@ -146,24 +146,27 @@ module ReactOnRailsHelper
     HTML
   end
 
-  # Deprecated: Use `redux_store` via including ReactOnRails::Controller in your controller and calling
-  # redux_store.
-  #
   # Separate initialization of store from react_component allows multiple react_component calls to
   # use the same Redux store.
   #
   # store_name: name of the store, corresponding to your call to ReactOnRails.registerStores in your
   #             JavaScript code.
   # props: Ruby Hash or JSON string which contains the properties to pass to the redux store.
-  def redux_store(store_name, props = {})
-    warn "[DEPRECATION] `redux_store` within a view is deprecated. Please move to call "\
-      "to redux store to your controller action."
+  # Options
+  #    defer: false -- pass as true if you wish to render this below your component.
+  def redux_store(store_name, props: {}, defer: false)
     redux_store_data = { store_name: store_name,
                          props: props }
-    @registered_stores ||= []
-    @registered_stores << redux_store_data
-
-    render_redux_store_data(redux_store_data)
+    if defer
+      @registered_stores_defer_render ||= []
+      @registered_stores_defer_render << redux_store_data
+      "YOU SHOULD NOT SEE THIS ON YOUR VIEW -- Uses as a code block, like <% redux_store %> "\
+        "and not <%= redux store %>"
+    else
+      @registered_stores ||= []
+      @registered_stores << redux_store_data
+      render_redux_store_data(redux_store_data)
+    end
   end
 
   # Place this view helper (no parameters) at the end of your shared layout. This tell
@@ -172,8 +175,8 @@ module ReactOnRailsHelper
   # client side rendering of this hydration data, which is a hidden div with a matching class
   # that contains a data props.
   def redux_store_hydration_data
-    return if @registered_stores_via_controller.blank?
-    @registered_stores_via_controller.reduce("") do |accum, redux_store_data|
+    return if @registered_stores_defer_render.blank?
+    @registered_stores_defer_render.reduce("") do |accum, redux_store_data|
       accum << render_redux_store_data(redux_store_data)
     end.html_safe
   end
@@ -300,10 +303,10 @@ module ReactOnRailsHelper
   end
 
   def initialize_redux_stores
-    return "" unless @registered_stores.present? || @registered_stores_via_controller.present?
+    return "" unless @registered_stores.present? || @registered_stores_defer_render.present?
     declarations = "var reduxProps, store, storeGenerator;\n"
 
-    all_stores = (@registered_stores || []) + (@registered_stores_via_controller || [])
+    all_stores = (@registered_stores || []) + (@registered_stores_defer_render || [])
 
     result = all_stores.each_with_object(declarations) do |redux_store_data, memo|
       store_name = redux_store_data[:store_name]

data/docs/additional_reading/manual_installation.md

@@ -43,7 +43,7 @@ See the next section for a sample webpack.server.rails.config.js.
   ```javascript
   entry: ['./app/startup/serverRegistration'],
   ```
-3. Ensure the name of your ouput file (shown [here](https://github.com/shakacode/react-webpack-rails-tutorial/blob/537c985dc82faee333d80509343ca32a3965f9dd/client/webpack.server.rails.config.js#L9)) of your server bundle corresponds to the configuration of the gem. The default path is `app/assets/javascripts/generated`. See below for customization of configuration variables.
+3. Ensure the name of your ouput file (shown [here](https://github.com/shakacode/react-webpack-rails-tutorial/blob/537c985dc82faee333d80509343ca32a3965f9dd/client/webpack.server.rails.config.js#L9)) of your server bundle corresponds to the configuration of the gem. The default path is `app/assets/webpack`. See below for customization of configuration variables.
 4. Expose `React` in your webpack config, like [this](https://github.com/shakacode/react-webpack-rails-tutorial/blob/master/client/webpack.server.rails.build.config.js#L54-L55)
 
 ```javascript
@@ -65,7 +65,7 @@ module.exports = {
   entry: ['./app/startup/serverRegistration'],
   output: {
     filename: 'server-bundle.js',
-    path: '../app/assets/javascripts/generated',
+    path: '../app/assets/webpack',
 
     // CRITICAL to set libraryTarget: 'this' for enabling Rails to find the exposed modules IF you
     //   use the "expose" webpackfunctionality. See startup/serverRegistration.jsx.

data/docs/additional_reading/optional_configuration.md

@@ -10,7 +10,7 @@ ReactOnRails.configure do |config|
   # Client bundles are configured in application.js
   # Server bundle is a single file for all server rendering of components.
   # Set the server_bundle_js_file to "" if you know that you will not be server rendering.
-  config.server_bundle_js_file = "app/assets/javascripts/generated/server.js" # This is the default
+  config.server_bundle_js_file = "server-bundle.js" # This is the default
 
   # Below options can be overriden by passing to the helper method.
   config.prerender = false # default is false

data/docs/additional_reading/rspec_configuration.md

@@ -13,10 +13,12 @@ You can pass an RSpec metatag as an optional second parameter to this helper met
 
 Please take note of the following:
 - This utility assumes your build tasks for the static generated files are `npm run build:client` and `npm run build:server` and do not have the `--watch` option enabled.
-- By default, the webpack processes look for the `app/assets/javascripts/generated` and `app/assets/stylesheets/generated` folders. If these folders are missing, are empty, or contain files with `mtime`s older than any of the files in your `client` folder, the helper will recompile your assets. You can override this inside of `config/initializers/react_on_rails.rb` by passing an array of filepaths (relative to the root of the app) to the `generated_assets_dirs` configuration option.
+- By default, the webpack processes look for the `app/assets/webpack` folders. If this folder is missing, is empty, or contains files with `mtime`s older than any of the files in your `client` folder, the helper will recompile your assets. You can override this inside of `config/initializers/react_on_rails.rb` by passing a filepath (relative to the root of the app) to the `generated_assets_dir` configuration option.
 
 If you want to speed up the re-compiling process, you can call `npm run build:dev:client` (and `npm run build:dev:server` if doing server rendering) to have webpack run in "watch" mode and recompile these files in the background, which will be much faster when making incremental changes than compiling from scratch.
 
+[spec/dummy](../../spec/dummy) contains examples of how to set the proc files for this purpose.
+
 If you want to use a testing framework other than RSpec, please submit let us know on the changes you need to do and we'll update the docs.
 
 ![2016-01-27_02-36-43](https://cloud.githubusercontent.com/assets/1118459/12611951/7c56d070-c4a4-11e5-8a80-9615f99960d9.png)

data/docs/additional_reading/turbolinks.md

@@ -13,14 +13,15 @@ the JavaScript and stylesheets are cached by the browser, as they will still req
 1. Include the gem "turbolinks".
 1. Included the proper "track" tags when you include the javascript and stylesheet:
   ```erb
-    <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %>
-    <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
+    <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => 'reload' %>
+    <%= javascript_include_tag 'application', 'data-turbolinks-track' => 'reload' %>
   ```
+  NOTE: for Turbolinks 2.x, use 'data-turbolinks-track' => true
 1. Add turbolinks to your `application.js` file:
    ```javascript
    //= require turbolinks
    ```
-Note, in the future, we might change to installing this via npm.
+Note, in the future, we will 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.

data/docs/contributing.md

@@ -16,7 +16,7 @@ It's critical to configure your IDE/editor to ignore certain directories. Otherw
 * /gen-examples
 * /node_package/lib
 * /node_modules
-* /spec/dummy/app/assets/javascripts/generated
+* /spec/dummy/app/assets/webpack
 * /spec/dummy/log
 * /spec/dummy/node_modules
 * /spec/dummy/tmp

data/docs/tutorial-v2.md

@@ -127,7 +127,7 @@ Completed all linting
 
 It's super important to exclude certain directories from RubyMine or else it will slow to a crawl as it tries to parse all the npm files.
 
-* `app/assets/javascripts/generated`
+* `app/assets/webpack`
 * `client/node_modules`
 
 <img src="http://forum.shakacode.com/uploads/default/original/1X/a1b3e1146d86915f7d5d1c89548e81ec208458cc.png" width="338" height="500">

data/lib/generators/react_on_rails/base_generator.rb

@@ -59,7 +59,7 @@ module ReactOnRails
           node_modules
 
           # Generated js bundles
-          /app/assets/javascripts/generated/*
+          /app/assets/webpack/*
         DATA
 
         if dest_file_exists?(".gitignore")
@@ -74,11 +74,11 @@ module ReactOnRails
           // DO NOT REQUIRE jQuery or jQuery-ujs in this file!
           // DO NOT REQUIRE TREE!
 
-          // CRITICAL that generated/vendor-bundle must be BEFORE bootstrap-sprockets and turbolinks
+          // CRITICAL that vendor-bundle must be BEFORE bootstrap-sprockets and turbolinks
           // since it is exposing jQuery and jQuery-ujs
 
-          //= require generated/vendor-bundle
-          //= require generated/app-bundle
+          //= require vendor-bundle
+          //= require app-bundle
 
         DATA
 
@@ -161,22 +161,26 @@ module ReactOnRails
         template("base/base/lib/tasks/assets.rake.tt", "lib/tasks/assets.rake")
       end
 
+      ASSETS_RB_APPEND = <<-DATA.strip_heredoc
+# Add client/assets/ folders to asset pipeline's search path.
+# If you do not want to move existing images and fonts from your Rails app
+# you could also consider creating symlinks there that point to the original
+# rails directories. In that case, you would not add these paths here.
+Rails.application.config.assets.paths << Rails.root.join("client", "assets", "stylesheets")
+Rails.application.config.assets.paths << Rails.root.join("client", "assets", "images")
+Rails.application.config.assets.paths << Rails.root.join("client", "assets", "fonts")
+Rails.application.config.assets.precompile += %w( server-bundle.js )
+
+# Add folder with webpack generated assets to assets.paths
+Rails.application.config.assets.paths << Rails.root.join("app", "assets", "webpack")
+      DATA
+
       def append_to_assets_initializer
-        data = <<-DATA.strip_heredoc
-          # Add client/assets/ folders to asset pipeline's search path.
-          # If you do not want to move existing images and fonts from your Rails app
-          # you could also consider creating symlinks there that point to the original
-          # rails directories. In that case, you would not add these paths here.
-          Rails.application.config.assets.paths << Rails.root.join("client", "assets", "stylesheets")
-          Rails.application.config.assets.paths << Rails.root.join("client", "assets", "images")
-          Rails.application.config.assets.paths << Rails.root.join("client", "assets", "fonts")
-          Rails.application.config.assets.precompile += %w( generated/server-bundle.js )
-        DATA
         assets_intializer = File.join(destination_root, "config/initializers/assets.rb")
         if File.exist?(assets_intializer)
-          append_to_file(assets_intializer, data)
+          append_to_file(assets_intializer, ASSETS_RB_APPEND)
         else
-          create_file(assets_intializer, data)
+          create_file(assets_intializer, ASSETS_RB_APPEND)
         end
       end
 

data/lib/generators/react_on_rails/bootstrap_generator.rb

@@ -68,7 +68,7 @@ module ReactOnRails
       def add_bootstrap_sprockets_to_application_js
         data = <<-DATA.strip_heredoc
 
-          // bootstrap-sprockets depends on generated/vendor-bundle for jQuery.
+          // bootstrap-sprockets depends on vendor-bundle for jQuery.
           //= require bootstrap-sprockets
 
         DATA

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

@@ -1,4 +1,4 @@
 web: rails s
 # TODO: MIGRATE from tutorial
-client: sh -c 'rm app/assets/javascripts/generated/* || true && cd client && npm run build:dev:client'
+client: sh -c 'rm app/assets/webpack/* || true && cd client && npm run build:dev:client'
 <%- if options.server_rendering? %>server: sh -c 'cd client && npm run build:dev:server'<%- end %>

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

@@ -1,3 +1,3 @@
 web: rails s
-client: sh -c 'rm app/assets/javascripts/generated/* || true && cd client && npm run build:dev:client'
+client: sh -c 'rm app/assets/webpack/* || true && cd client && npm run build:dev:client'
 <%- if options.server_rendering? %>server: sh -c 'cd client && npm run build:dev:server'<%- end %>

data/lib/generators/react_on_rails/templates/base/base/client/webpack.client.rails.config.js

@@ -10,7 +10,7 @@ const devBuild = process.env.NODE_ENV !== 'production';
 
 config.output = {
   filename: '[name]-bundle.js',
-  path: '../app/assets/javascripts/generated',
+  path: '../app/assets/webpack',
 };
 
 // You can add entry points specific to rails here

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

@@ -2,11 +2,21 @@
 ReactOnRails.configure do |config|
   # Client bundles are configured in application.js
 
+  # Directory where your generated assets go
+  config.generated_assets_dir = File.join(%w(app assets webpack))
+
+  # Define the files for we need to check for webpack compilation when running tests
+  <%- if options.server_rendering? %>
+  config.webpack_generated_files = %w( client-bundle.js server-bundle.js )
+  <% else %>
+  config.webpack_generated_files = %w( client-bundle.js )
+  <%- end %>
+
   # Server rendering:
   # Server bundle is a single file for all server rendering of components.
   # Set the server_bundle_js_file to "" if you know that you will not be server rendering.
   <%- if options.server_rendering? %>
-  config.server_bundle_js_file = "app/assets/javascripts/generated/server-bundle.js"
+  config.server_bundle_js_file = "server-bundle.js"
   <% else %>
   config.server_bundle_js_file = ""
   <%- end %>