react_on_rails 12.0.0.pre.beta.0 → 12.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc9ebaba5554490a60cfc19fff82996c17e4e7854523baa33f5936be99086a66
-  data.tar.gz: 901f5cbfd43d3c74a707ed3c3d195da94d828c48a085abd9452c45dc8247e7d5
+  metadata.gz: 2c578e181f0adc62b6f89f1e258bf21dd515bf2f86b57034467f6026ba2bf63c
+  data.tar.gz: e3a8a7076f7c73871178114a077ec29850e6639340e8ff331d046fb491ac10e8
 SHA512:
-  metadata.gz: 7a4fd0a61ca25319a8e87227448f6a6c69e6606f98ac6168afaa39a10e2c0a9f052c437d4082e882286082580bc48e79a50555ac2eae32983f99c56f31b326e5
-  data.tar.gz: ec3dd976591147b747f9ec7ac9455684ee8cb126e89872566dfce148fe9f53ac3723c77152ffdce23794b2d2ec1a8088c6f3c2defb2ee8fcf31892adb5681b26
+  metadata.gz: 19cebcb75b776a5f08936cc39aef164089a6ccc3ea36d792cc6fb7f0e53805e535eeb71f295826e371f74b75312d326172d26e1dc97cc640651914c5b222cfa1
+  data.tar.gz: 67dec37920284002de78660438c0f38f463a5317bbd7c7a17d2896fa4d4d7ff0044e11705ad247a7f1d3f2eb2abf90f8fd3115dc0ac496926701beb74236043c

data/CHANGELOG.md

@@ -4,7 +4,7 @@ All notable changes to this project's source code will be documented in this fil
 Migration instructions for the major updates can be found [here](docs/basics/upgrading-react-on-rails.md#upgrading-to-version-9.md). Some smaller migration information can be found here.
 
 ## Need Help Migrating?
-If you would like help in migrating between React on Rails versions or help with implementing server rendering, please contact [justin@shakacode.com](mailto:justin@shakacode.com) for information about our [ShakaCode Pro Support](https://www.shakacode.com/work/shakacode-pro-support.pdf).
+If you would like help in migrating between React on Rails versions or help with implementing server rendering, please contact [justin@shakacode.com](mailto:justin@shakacode.com) for information about our [React on Rails Pro Support Options](https://www.shakacode.com/react-on-rails-pro).
 
 We specialize in helping companies to quickly and efficiently move from versions before 9 to current. The older versions use the Rails asset pipeline to package client assets. The current and recommended way is to use Webpack 4 for asset preparation. You may also need help migrating from the `rails/webpacker`'s Webpack configuration to a better setup ready for Server Side Rendering.
 
@@ -17,7 +17,17 @@ Changes since last non-beta release.
 *Please add entries here for your pull requests that are not yet released.*
 
 ## UPCOMING 12.0 RELEASE
-### [12.0.0]
+See [docs/basics/upgrading-react-on-rails.md](./docs/basics/upgrading-react-on-rails.md).
+
+### [12.0.0.pre.beta.2]
+* Changed the precompile task to use the rails/webpacker one by default
+
+### [12.0.0.pre.beta.1]
+* Updated generators to use React hooks
+
+### [12.0.0.pre.beta.0]
+Gem version: 12.0.0.pre.beta.0 and npm version 12.0.0-beta.0 released! Please try this out!
+
 #### BREAKING CHANGE
 In order to solve the issues regarding React Hooks compatibility, the number of parameters
 for functions is used to determine if you have a generator function that will get invoked to
@@ -26,10 +36,13 @@ set JavaScript property `renderFunction` on the function for which you want to r
 invoked to return the React component. In that case, you won't need to pass any unused params.
 [PR 1268](https://github.com/shakacode/react_on_rails/pull/1268) by [justin808](https://github.com/justin808)
 
-See [docs/basics/upgrading-react-on-rails](./docs/basics/upgrading-react-on-rails#upgrading-to-v12)
+See [docs/basics/upgrading-react-on-rails](./docs/basics/upgrading-react-on-rails.md#upgrading-to-v12)
 for details.         
 
 * Requires the use of rails/webpacker helpers
+* If the webpacker webpack config files exist, then React on Rails will not override the default
+  assets:precompile setup by rails/webpacker. The fix is to remove the JS files inside of config/webpack,
+  like config/webpack/production.js.
 * Removed **env_javascript_include_tag** and **env_stylesheet_link_tag** as these are replaced by view helpers
   from rails/webpacker
 * Removal of support for old Rubies and Rails.
@@ -913,7 +926,11 @@ Best done with Object destructing:
 ##### Fixed
 - Fix several generator related issues.
 
-[Unreleased]: https://github.com/shakacode/react_on_rails/compare/11.3.0...master
+[Unreleased]: https://github.com/shakacode/react_on_rails/compare/12.0.0-beta.3...master
+[12.0.0.pre.beta.3]: https://github.com/shakacode/react_on_rails/compare/12.0.0-beta.2...12.0.0-beta.3
+[12.0.0.pre.beta.2]: https://github.com/shakacode/react_on_rails/compare/12.0.0-beta.1...12.0.0-beta.2
+[12.0.0.pre.beta.1]: https://github.com/shakacode/react_on_rails/compare/12.0.0-beta.0...12.0.0-beta.1
+[12.0.0.pre.beta.0]: https://github.com/shakacode/react_on_rails/compare/11.3.0...12.0.0-beta.0
 [11.3.0]: https://github.com/shakacode/react_on_rails/compare/11.2.2...11.3.0
 [11.2.2]: https://github.com/shakacode/react_on_rails/compare/11.2.1...11.2.2
 [11.2.1]: https://github.com/shakacode/react_on_rails/compare/11.1.8...11.2.1

data/README.md

@@ -14,6 +14,19 @@
 *These are the docs for React on Rails 12, coming soon. To see the version 11 docs, [click here](https://github.com/shakacode/react_on_rails/tree/11.3.0).*
 
 #### News
+**June 24, 2020**:
+1. Gem version: 12.0.0.pre.beta.3 and npm version 12.0.0-beta.3 released! Please try this out!
+   Major enhancements:
+   1. Proper support for React Hooks
+   2. Typescript bindings
+   3. i18n support for generating a JSON file rather than a JS file.
+   4. Tighter rails/webpacker integration
+   
+   Be sure to see the [CHANGELOG.md](./CHANGELOG.md) and read the upgrade instructions:
+   [docs/basics/upgrading-react-on-rails](./docs/basics/upgrading-react-on-rails.md#upgrading-to-v12).
+   
+2. See Justin's RailsConf talk: [Webpacker, It-Just-Works, But How?](http://railsconf.com/2020/video/justin-gordon-webpacker-it-just-works-but-how).
+
 **April 2, 2020**:
 * Are you interested in support for React on Rails? If so check out [React on Rails Pro](https://www.shakacode.com/react-on-rails-pro).
 * HMR is working with [Loadable Components](https://loadable-components.com) for a both amazing hot-reloading developer experience and great runtime performance. Please [email me](mailto:justin@shakacode.com) if you'd like to use [Loadable Components Code Splitting](https://loadable-components.com/docs/code-splitting/) to speed up your app by reducing your bundle sizes and lazily loading the code that's needed.
@@ -36,21 +49,20 @@ Feel free to contact Justin Gordon, [justin@shakacode.com](mailto:justin@shakaco
 
 ## Project Objective
 
-To provide an opinionated and optimal framework for integrating Ruby on Rails with React via the [**Webpacker**](https://github.com/rails/webpacker) gem especially in regards to React Server Rendering.
+To provide a high performance framework for integrating Ruby on Rails with React via the [**Webpacker**](https://github.com/rails/webpacker) gem especially in regards to React Server Rendering.
 
 ## Features and Why React on Rails?
 
 Given that rails/webpacker gem already provides basic React integration, why would you use "React on Rails"? 
 
-1. Server rendering, often used for SEO crawler indexing and UX performance, is not offered by rails/webpacker.
 1. The easy passing of props directly from your Rails view to your React components rather than having your Rails view load and then make a separate request to your API.
+1. Tight integration with [rails/webpacker](https://github.com/rails/webpacker).
+1. Server rendering, often used for SEO crawler indexing and UX performance, is not offered by rails/webpacker.
 1. [Redux](https://github.com/reactjs/redux) and [React Router](https://github.com/reactjs/react-router) integration with server-side-rendering.
 1. [Internationalization (I18n) and (localization)](https://github.com/shakacode/react_on_rails/blob/master/docs/basics/i18n.md)
-1. [RSpec Test Helpers Configuration](docs/basics/rspec-configuration.md) to ensure your Webpack bundles are ready for tests. _(and for [Minitest](docs/basics/minitest-configuration.md))._
 1. A supportive community. This [web search shows how live public sites are using React on Rails](https://publicwww.com/websites/%22react-on-rails%22++-undeveloped.com/).
 1. [Reason ML Support](https://github.com/shakacode/reason-react-on-rails-example).
 
-
 See the [react-webpack-rails-tutorial](https://github.com/shakacode/react-webpack-rails-tutorial) for an example of a live implementation and code.
 
 ## ShakaCode Forum Premium Content
@@ -66,7 +78,7 @@ _Requires creating a free account._
 
 ## Prerequisites
 
-React on Rails supports older versions of Rails back to 3.x. Rails/webpacker requires version 4.2+.
+Ruby on Rails >=5 and rails/webpacker 4.2+.
 
 ## Getting Started
 
@@ -81,23 +93,10 @@ Note, the best way to understand how to use ReactOnRails is to study a few simpl
 
 *See also [the instructions for installing into an existing Rails app](docs/basics/installation-into-an-existing-rails-app.md).*
 
-1. Create a new Rails app:
-
-   ``````bash
-   $ rails new my-app --webpack=react
-   $ cd my-app
-   ``````
-
 2. Add the `react_on_rails` gem to Gemfile:
 
-   ```ruby
-   gem 'react_on_rails', '11.1.4' # Use the exact gem version to match npm version
-   ```
-
-3. Install the `react_on_rails` gem:
-
    ```bash
-   $ bundle install
+   bundle add react_on_rails --strict
    ```
 
 4. Commit this to git (or else you cannot run the generator unless you pass the option `--ignore-warnings`).
@@ -105,13 +104,13 @@ Note, the best way to understand how to use ReactOnRails is to study a few simpl
 5. Run the generator:
 
    ```bash
-   $ rails generate react_on_rails:install
+   rails generate react_on_rails:install
    ```
 
 6. Start the app:
 
    ```bash
-   $ rails s
+   rails s
    ```
 
 7. Visit http://localhost:3000/hello_world.
@@ -130,13 +129,18 @@ Below is the line where you turn server rendering on by setting `prerender` to t
 <%= react_component("HelloWorld", props: @hello_world_props, prerender: false) %>
 ```
 
+Note, if you got an error in your console regarding "ReferenceError: window is not defined",
+then you need to edit `config/webpacker.yml` and set `hmr: false` and `inline: false`.
+See [rails/webpacker PR 2644](https://github.com/rails/webpacker/pull/2644) for a fix for this
+issue.
+
 ## Basic Usage
 
 ### Configuration
 
 * Configure `config/initializers/react_on_rails.rb`. You can adjust some necessary settings and defaults. See file [docs/basics/configuration.md](docs/basics/configuration.md) for documentation of all configuration options.
-* Configure `config/webpacker.yml`. If you used the generator and the default webpacker setup, you don't need to touch this file. If you are customizing your setup, then consult the [spec/dummy/config/webpacker.yml](./spec/dummy/config/webpacker.yml) example
-  * Set `compile: false` for all envs
+* Configure `config/webpacker.yml`. If you used the generator and the default webpacker setup, you don't need to touch this file. If you are customizing your setup, then consult the [spec/dummy/config/webpacker.yml](./spec/dummy/config/webpacker.yml) example or the official default [webpacker.yml](https://github.com/rails/webpacker/blob/master/lib/install/config/webpacker.yml).
+  * Tip: set `compile: false` for development if you know that you'll always be compiling with a watch process. Otherwise, every request will check if compilation is needed.
   * Your `public_output_path` must match your Webpack configuration for `output` of your bundles.
   * Only set `cache_manifest` to `true` in your production env.
 

data/SUMMARY.md

@@ -45,7 +45,7 @@
   + [AngularJS Integration and Migration to React on Rails](./docs/additional-reading/angular-js-integration-migration.md)
 
 ## **Deployment**
-  + [Heroku Deployment](docs/outdated/heroku-deployment.md)
+  + [Heroku Deployment](docs/basics/heroku-deployment.md)
   + [Elastic Beanstalk Deployment](./docs/additional-reading/elastic-beanstalk.md)
 
 ## Outdated Non-Webpack Docs

data/docs/basics/configuration.md

@@ -12,21 +12,27 @@ default: &default
   # public_output_path folder
   manifest: manifest.json
   cache_manifest: false
+  
+  # Source path is used to check if webpack compilation needs to be run for `compile: true`
   source_path: client/app
 
 development:
   <<: *default
-  # generated files for development, in /public/webpack/dev
+  # Generated files for development, in /public/webpack/dev
   public_output_path: webpack/dev
 
 test:
   <<: *default
-  # generated files for tests, in /public/webpack/test
+  # Ensure that webpacker invokes webpack to build files for tests if not using the
+  #   ReactOnRails rspec helper. 
+  compile: true
+
+  # Generated files for tests, in /public/webpack/test
   public_output_path: webpack/test
 
 production:
   <<: *default
-  # generated files for tests, in /public/webpack/production
+  # Generated files for production, in /public/webpack/production
   public_output_path: webpack/production
   cache_manifest: true
 ```
@@ -45,7 +51,7 @@ ReactOnRails.configure do |config|
   # The default is true for development, off otherwise.
   # With true, you get detailed logs of rendering and stack traces if you call setTimout, 
   # setInterval, clearTimout when server rendering.
-  config.trace = Rails.env.development?
+  config.trace = Rails.env.development? # default
 
   # Configure if default DOM IDs have a random value or are fixed.
   # false ==> Sets the dom id to "#{react_component_name}-react-component"
@@ -54,15 +60,17 @@ ReactOnRails.configure do |config|
   # it is convenient to set this to true or else you have to either manually set the ids to 
   # avoid collisions. Most newer apps will have only one instance of a component on a page,
   # so this should be false in most cases.
-  # This value can be overrident for a given call to react_component
-  config.random_dom_id = false # default is true
-
-  # defaults to "" (top level)
-  #
-  config.node_modules_location = "client" # If using webpacker you should use "".
+  # This value can be overridden for a given call to react_component
+  config.random_dom_id = true # default
 
-  # This configures the script to run to build the production assets by webpack. Set this to nil
-  # if you don't want react_on_rails building this file for you.
+  # defaults to "" (top level)	
+  config.node_modules_location = "client" # If using webpacker you should use "".	
+  
+  # This configures the script to run to build the production assets by webpack . Set this to nil	
+  # if you don't want react_on_rails building this file for you.	
+  # Note, if you want to use this command then you should remove the file	
+  # config/webpack/production.js	
+  # If that file exists, React on Rails thinks that you'll use the rails/webpacker bin/webpack compiler.	
   config.build_production_command = "RAILS_ENV=production bin/webpack"
 
   ################################################################################
@@ -89,7 +97,9 @@ ReactOnRails.configure do |config|
   # Normally, you have different bundles for client and server, thus, the default is false.
   # Furthermore, if you are not hashing the server bundle (not in the manifest.json), then React on Rails
   # will only look for the server bundle to be created in the typical file location, typically by
-  # a `webpack --watch` process. 
+  # a `webpack --watch` process.
+  # If true, ensure that in config/webpacker.yml that you have both dev_server.hmr and
+  # dev_server.inline set to false.
   config.same_bundle_for_client_and_server = false
   
   # If set to true, this forces Rails to reload the server bundle if it is modified
@@ -134,6 +144,7 @@ ReactOnRails.configure do |config|
   # Replace the following line to the location where you keep translation.js & default.js for use
   # by the npm packages react-intl. Be sure this directory exists!
   # config.i18n_dir = Rails.root.join("client", "app", "libs", "i18n")
+  #
   # If not using the i18n feature, then leave this section commented out or set the value
   # of config.i18n_dir to nil.
   #
@@ -141,11 +152,11 @@ ReactOnRails.configure do |config|
   # that will source for automatic generation on translations.js & default.js
   # By default(without this option) all yaml files from Rails.root.join("config", "locales")
   # and installed gems are loaded
-  config.i18n_yml_dir = Rails.root.join("config", "locales", "client")
+  config.i18n_yml_dir = Rails.root.join("config", "locales")
   
   # Possible output formats are js and json
   # The default format is json
-  config.i18n_output_format = 'js'
+  config.i18n_output_format = 'json'
 
   ################################################################################
   ################################################################################
@@ -186,7 +197,7 @@ ReactOnRails.configure do |config|
   # CONFIGURE YOUR SOURCE FILES 
   # The test helper needs to know where your JavaScript files exist. The value is configured
   # by your config/webpacker.yml source_path:
-  # source_path: client/app/javascript # if using recommended /client directory
+  # source_path: client/app # if using recommended /client directory
   #
   # Define the files we need to check for webpack compilation when running tests.
   # The default is `%w( manifest.json )` as will be sufficient for most webpacker builds.

data/docs/basics/deployment.md

@@ -1,5 +1,4 @@
 # Deployment
 
-- React on Rails puts the necessary precompile steps automatically in the rake precompile step. You can, however, disable this by setting certain values to nil in the [config/initializers/react_on_rails.rb](./configuration.md).
-  - `build_production_command`: Set to nil to turn off the precompilation of the js assets.
-- See the [Heroku Deployment](docs/outdated/heroku-deployment.md) doc for specifics regarding Heroku. The information for Heroku may apply to other deployments.
+- `rails/webpacker` puts the necessary precompile steps automatically in the rake precompile step. 
+- See the [Heroku Deployment](docs/basics/heroku-deployment.md) doc for specifics regarding Heroku. The information for Heroku may apply to other deployments.

data/docs/basics/heroku-deployment.md

@@ -0,0 +1,24 @@
+# Heroku Deployment
+## Heroku buildpacks
+
+React on Rails requires both a ruby environment (for Rails) and a Node environment (for Webpack), so you will need to have Heroku use multiple buildpacks.
+
+Assuming you have downloaded and installed the Heroku command-line utility and have initialized the app, you will need to tell Heroku to use both buildpacks via the command-line:
+
+```
+heroku buildpacks:set heroku/ruby
+heroku buildpacks:add --index 1 heroku/nodejs
+```
+
+For more information, see [Using Multiple Buildpacks for an App](https://devcenter.heroku.com/articles/using-multiple-buildpacks-for-an-app)
+
+## assets:precompile
+
+### rails/webpacker webpack configuration
+If you're using the standard rails/webpacker configuration of webpack, then rails/webpacker
+will automatically modify or create an assets:precompile task to build your assets.
+
+### custom webpack configuration
+If you're a custom webpack configuration, and you **do not have the default
+`config/webpack/production.js`** file, then the `config/initializers/react_on_rails.rb`
+configuration `config.build_production_command` will be used.

data/docs/basics/hmr-and-hot-reloading-with-the-webpack-dev-server.md

@@ -0,0 +1,49 @@
+# HMR and Hot Reloading with the webpack-dev-server
+
+The webpack-dev-server provides:
+
+1. Speedy compilation of client side assets
+2. Optional HMR which means that the page will reload automatically when after
+   compilation completes. Note, some developers do not like this, as you'll
+   abruptly lose any tweaks within the Chrome development tools.
+3. Optional hot-reloading. The older react-hot-loader has been deprecated in 
+   favor of [fast-refresh](https://reactnative.dev/docs/fast-refresh).
+   For use with webpack, see [react-refresh-webpack-plugin](https://github.com/pmmmwh/react-refresh-webpack-plugin).
+
+If you are ***not*** using server-side rendering (***not*** using `prerender: true`),
+then you can follow all the regular docs for using the `bin/webpack-dev-server` 
+during development.
+
+
+# Server Side Rendering with the Default rails/webpacker bin/webpack-dev-server
+
+If you are using server-side rendering, then you have a couple options. The
+recommended technique is to have a different webpack configuration for server
+rendering.  
+
+
+
+
+## If you use the same Webpack setup for your server and client bundles 
+If you do use the webpack-dev-server for prerendering, be sure to set the
+`config/initializers/react_on_rails.rb` setting of 
+
+```
+  config.same_bundle_for_client_and_server = true
+```
+
+`dev_server.hmr` maps to [devServer.hot](https://webpack.js.org/configuration/dev-server/#devserverhot).
+This must be false if you're using the webpack-dev-server for client and server bundles.
+ 
+`dev_server.inline` maps to [devServer.inline](https://webpack.js.org/configuration/dev-server/#devserverinline).
+This must also be false.
+
+If you don't configure these two to false, you'll see errors like:
+
+* "ReferenceError: window is not defined" (if hmr is true)
+* "TypeError: Cannot read property 'prototype' of undefined" (if inline is true)
+
+
+
+
+

data/docs/basics/i18n.md

@@ -25,7 +25,7 @@ Here's a summary of adding the I18n functionality.
 
 3. Javascript locale files must be generated before `yarn build`.
 
-  Once you setup `config.i18n_dir` as in the previous step, react_on_rails will automatically do this for testing (if using the `ReactOnRails::TestHelper.configure_rspec_to_compile_assets` and for production deployments if using the [default precompile rake hook](docs/outdated/heroku-deployment.md). 
+  Once you setup `config.i18n_dir` as in the previous step, you will need to make sure `rake react_on_rails:locale` runs before webpack. 
   
   For development, you should adjust your startup scripts (Procfiles) so that they run **`bundle exec rake react_on_rails:locale`** before running any webpack watch process (`yarn run build:development`). 
   
@@ -48,6 +48,7 @@ with `react-intl` supported via js files:
   ```
 
 2. Add `react-intl` & `intl` to `client/package.json`, and remember to `bundle && yarn install`.
+   Versions should be newer than these:
 
   ```js
   "dependencies": {
@@ -93,7 +94,6 @@ with `react-intl` supported via js files:
   ```
   
   # Notes
-  
   * See why using JSON could be better compare to JS if amount of data is hure [ https://v8.dev/blog/cost-of-javascript-2019#json]( https://v8.dev/blog/cost-of-javascript-2019#json).
   * See [Support for Rails' i18n pluralization #1000](https://github.com/shakacode/react_on_rails/issues/1000) for a discussion of issues around pluralization.
-  * [Outdated] You can refer to [react-webpack-rails-tutorial](https://github.com/shakacode/react-webpack-rails-tutorial) and [PR #340](https://github.com/shakacode/react-webpack-rails-tutorial/pull/340), [commmited](https://github.com/shakacode/react-webpack-rails-tutorial/commit/ef369ed9d922aea5116ca7e50208169fd7831389) for a complete example.
+  * *Outdated:* You can refer to [react-webpack-rails-tutorial](https://github.com/shakacode/react-webpack-rails-tutorial) and [PR #340](https://github.com/shakacode/react-webpack-rails-tutorial/pull/340), [commmited](https://github.com/shakacode/react-webpack-rails-tutorial/commit/ef369ed9d922aea5116ca7e50208169fd7831389) for a complete example.

data/docs/basics/installation-into-an-existing-rails-app.md

@@ -7,8 +7,8 @@
 1. Add the following to your Gemfile and `bundle install`. We recommend fixing the version of React on Rails, as you will need to keep the exact version in sync with the version in your `client/package.json` file.
 
    ```ruby
-   gem "react_on_rails", "11.1.4" # Update to the current version
-   gem "webpacker", "~> 3" # Newer versions might be supported
+   gem "react_on_rails", "12.0.0" # Update to the current version
+   gem "webpacker", "~> 5"
    ```
 
 2. Run the following 2 commands to install Webpacker with React. Note, if you are using an older version of Rails than 5.1, you'll need to install webpacker with React per the instructions [here](https://github.com/rails/webpacker).
@@ -57,8 +57,3 @@ $ yarn add react-on-rails --exact
 ```
 
 That will install the latest version and update your package.json. **NOTE:** the `--exact` flag will ensure that you do not have a "~" or "^" for your react-on-rails version in your package.json.
-
-## Webpacker Configuration
-
-React on Rails users should set configuration value `compile` to false, as React on Rails handles compilation for test and production environments.
-

data/docs/basics/recommended-project-structure.md

@@ -1,7 +1,5 @@
 # Recommended Project structure
 
-While React On Rails does not *enforce* a specific project structure, we do *recommend* a standard organization. The more we follow standards as a community, the easier it will be for all of us to move between various Rails projects that include React On Rails.
-
 The React on Rails generator uses the standard `rails/webpacker` convention of this structure:
 
 ```yml
@@ -14,21 +12,9 @@ app/javascript:
   │   └── hello-world-bundle.js
 ```
 
-The problems with this structure and using rails/webpacker to configure Webpack for you:
-
-1. No support for different entry points for server rendering.
-2. Webpacker adds an extra layer of abstraction over Webpack, which you probably don't want.
-
-This default rails/webpacker configuration is used for the generator because:
-
-1. Minimizes the amount of generated code to get up and running with React on Rails.
-2. Good enough for very simple projects.
-3. Configuration of Webpack is not the goal of this library, React on Rails.
+However, you may wish to move all your client side files to a single directory called something like `/client`.
 
-
-Thus, the generator structure and using rails/webpacker for Webpack configuration **is not recommended** for any commercial projects, especially those that will use server rendering. Instead, the recommended structure is shown in this example app: [github.com/shakacode/react-webpack-rails-tutorial](https://github.com/shakacode/react-webpack-rails-tutorial) and described below.
-
-## Steps to convert from the generator defaults to use the recommended `/client` directory structure.
+## Steps to convert from the generator defaults to use a `/client` directory structure.
 
 1. Move the directory:
 
@@ -44,7 +30,7 @@ mv app/javascript client
 
 ## Moving node_modules from `/` to `/client` with a custom webpack setup.
 
-`rails/webpacker` probably doesn't support having your main node_modules directory under `/client`, so only follow these steps if you want to use your own webpack configuration (which is highly recommended!).
+`rails/webpacker` probably doesn't support having your main node_modules directory under `/client`, so only follow these steps if you want to use your own webpack configuration.
 
 1. Move the `/package.json` to `/client/package.json`
 2. Create a `/package.json` that delegates to `/client/package.json`. See the example in [spec/dummy/package.json](../../spec/dummy/package.json).
@@ -57,7 +43,7 @@ mv app/javascript client
 1. `/client/app/bundles`: Top level of different app domains. Use a name within this directory for you app domains. For example, if you had a domain called `widget-editing`, then you would have: `/client/app/bundles/widget-editing`
 1. `/client/app/lib`: Common code for bundles
 1. Within each bundle directory (or the lib directory), such as a domain named "comments"
-`/client/app/bundles/comments`, use following directory structure:
+`/client/app/bundles/comments`, use following directory structure, if you're using redux. However, with React hooks, this will probably be a bit different:
 
   * `/actions`: Redux actions.
   * `/components`: "dumb" components (no connections to Redux or Ajax). These get props and can render themselves and children.
@@ -79,7 +65,7 @@ This isn't really any technique, as you keep handling all your styling assets us
 1. Much simpler! There's no changes really from your current processes.
 
 ### Using Webpack to Manage Styling Assets
-This technique involves customization of the webpack config files to generate CSS, image, and font assets. See [webpack.client.rails.build.config.js](https://github.com/shakacode/react_on_rails/blob/master/spec%2Fdummy%2Fclient%2Fwebpack.client.rails.build.config.js) for an example how to set the webpack part.
+This technique involves customization of the webpack config files to generate CSS, image, and font assets. 
 
 #### Directory structure
 1. `/client/app/assets`: Assets for CSS for client app.
@@ -89,6 +75,3 @@ This technique involves customization of the webpack config files to generate CS
 1. You can use [CSS modules](https://github.com/css-modules/css-modules), which is super compelling once you seen the benefits.
 1. You can do hot reloading of your assets. Thus, you do not have to refresh your web page to see asset change, including changing styles.
 1. You can run your client code on a mocked out express server for super fast prototyping. In other words, your client application can somewhat more easily be move to a different application server.
-
-#### Updates 2017-03-04 Regarding CSS handled by Webpack
-* See article [Best practices for CSS and CSS Modules using Webpack](https://forum.shakacode.com/t/best-practices-for-css-and-css-modules-using-webpack/799).