react_on_rails 11.0.3 → 11.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5616765e73089b791e60e49c47a99c4217ae4e47
-  data.tar.gz: d6895eb29b7b04697c80f07a28ea47b716a6b1ea
+  metadata.gz: 55cdca62eaf8c15553635f8255d102728e030761
+  data.tar.gz: c72e8903805accdf9cf3964162dfdfe4254380ca
 SHA512:
-  metadata.gz: 7a03e79ec545f01d2cf7568f9cf403b1e53f88d9a3d6697d47b84005235f5c3d374c122264d7b8572d2b4da8c9a73a1f0955bdd4dae61adf6b7133b1861a5c5e
-  data.tar.gz: 0f210aa98d8eef9c46f31d406006f959925eb5ce0ceb09a5853088137db99d9eaa5a2dfa7d82e7fcbdab31d66d09f5c697981b0b719a5a586ca1abb9ed9521c3
+  metadata.gz: 74f8c628d2e4ef60422d383483d2828fc70e773ab85a88f2d44a8a43a357cfd61b3213e9016aefe3963371d965b70fbca3f2599f29037d09f2d3218c08cc9d06
+  data.tar.gz: 8f34bcfa66613559f97ffaa766e676bdd6df69484eb21d1e1f1d34eeaba972910eee058e7347c84e252bee8f87b44e5282d9ae896d467d05c92ddba03a00e3cd

data/.travis.yml

@@ -37,7 +37,7 @@ before_install:
 
 install:
   - travis_retry gem install bundler
-  - travis_retry nvm install node 8.0.0
+  - travis_retry nvm install 9.11.1
   - node -v
   - travis_retry npm i -g yarn@0.27.5
   - travis_retry yarn global add babel-cli

data/CHANGELOG.md

@@ -10,6 +10,15 @@ Changes since last non-beta release.
 
 *Please add entries here for your pull requests that are not yet released.*
 
+### [11.0.4] - 2018-05-3
+
+#### Changed
+- Throw if configuration.generated_assets_dir specified, and using webpacker, and if that doesn't match the public_output_path. Otherwise, warn if generated_assets_dir is specified
+- Fix the setup for tests for spec/dummy so they automatically rebuild by correctly setting the source_path in the webpacker.yml
+- Updated documentation for the testing setup.
+- Above in [PR 1072](https://github.com/shakacode/react_on_rails/pull/1072) by [justin808](https://github.com/justin808).
+- `react_component_hash` has implicit `prerender: true` because it makes no sense to have react_component_hash not use prerrender. Improved docs on `react_component_hash`. Also, fixed issue where checking gem existence. [PR 1077](https://github.com/shakacode/react_on_rails/pull/1077) by [justin808](https://github.com/justin808).
+
 ### [11.0.3] - 2018-04-24
 
 #### Fixed
@@ -744,7 +753,8 @@ Best done with Object destructing:
 ##### Fixed
 - Fix several generator related issues.
 
-[Unreleased]: https://github.com/shakacode/react_on_rails/compare/11.0.3...master
+[Unreleased]: https://github.com/shakacode/react_on_rails/compare/11.0.4...master
+[11.0.4]: https://github.com/shakacode/react_on_rails/compare/11.0.3...11.0.4
 [11.0.3]: https://github.com/shakacode/react_on_rails/compare/11.0.2...11.0.3
 [11.0.2]: https://github.com/shakacode/react_on_rails/compare/11.0.1...11.0.2
 [11.0.1]: https://github.com/shakacode/react_on_rails/compare/11.0.0...11.0.1

data/CONTRIBUTING.md

@@ -75,7 +75,7 @@ It's critical to configure your IDE/editor to ignore certain directories. Otherw
 # Configuring your test app to use your local fork
 You can test the `react-on-rails` gem using your own external test app or the gem's internal `spec/dummy` app. The `spec/dummy` app is an example of the various setup techniques you can use with the gem.
 ```
-├── test
+├── test_app
 |    └── client
 └── react_on_rails
     └── spec
@@ -98,21 +98,20 @@ In addition to testing the Ruby parts out, you can also test the node package pa
 cd react_on_rails/
 yarn
 yarn run build
+yarn install-react-on-rails
 ```
 
-Install the local package by using a relative path in your test/client app's `package.json`, like this:
+Install the local package by using yarn link, like this:
 ```sh
-cd test/client
-rm -rf node_modules/react-on-rails && npm i 'file:../path-to-react-on-rails-top-package.json'
+cd spec/dummy
+yarn
 ```
-_Note: You must use npm here till yarn stops preferring cached packages over local. see [issue #2649](https://github.com/yarnpkg/yarn/issues/2649)_
 
-When you use a relative path, be sure to run the above `yarn` command whenever you change the node package for react-on-rails.
+Note, yarn will run the `postinstall` script of `spec/dummy/client` which runs `yarn link` to setup a sym link to the parent package.
 
 #### Example: Testing NPM changes with the dummy app
 1. Add `console.log('Hello!')` [here](https://github.com/shakacode/react_on_rails/blob/master/node_package/src/clientStartup.js#L181) in `react_on_rails/node_package/src/clientStartup.js` to confirm we're getting an update to the node package.
-2. The "postinstall" script of "spec/dummy/client" calls "yarn link react-on-rails" to setup a sym link to the parent package.
-3. Refresh the browser if the server is already running or start the server using `foreman start` from `react_on_rails/spec/dummy` and navigate to `http://localhost:5000/`. You will now see the `Hello!` message printed in the browser's console.
+2. Refresh the browser if the server is already running or start the server using `foreman start` from `react_on_rails/spec/dummy` and navigate to `http://localhost:5000/`. You will now see the `Hello!` message printed in the browser's console.
 
 _Note: running `npm i` automatically builds the npm package before installing. However, when using yarn you will need to run `yarn run build` in the root directory before the install script. This will be updated when [yarn issue #2649](https://github.com/yarnpkg/yarn/issues/2649) (above) is resolved._
 

data/PROJECTS.md

@@ -11,6 +11,13 @@ April 11, 2018: 2138
 
 ## Commercial Products Live
 * **[Hawaii Chee](https://www.hawaiichee.com/)**, the signature product of [ShakaCode](http://www.shakacode.com), which is a vacation rental site focusing on Hawaii.
+* **[RedFlagDeals](https://www.redflagdeals.com/)**, Canadian shopping site.
+* **[YourMechanic](https://www.yourmechanic.com/)**, home calls for mechanics.
+* **[Suntransfers](https://www.suntransfers.com/)**, airport car rides site.
+* **[Decanter](http://www.decanter.com/)**, wine site.
+* **[LocalWise](https://www.localwise.com/)**, local job site.
+* **[Ellevest](https://www.ellevest.com/)**, investments for women.
+* **[OppenheimerFunds](https://www.oppenheimerfunds.com/)**, investment site.
 * **[KissKissBankBank](https://www.kisskissbankbank.com/)**, large French crowdfunding platform.
 * **[HVMN](https://hvmn.com)**: Web ecommerce site for "biohacking" products.
 * **[GuavaPass](https://guavapass.com/)**: Coaching client of [ShakaCode](http://www.shakacode.com) and React on Rails fan!
@@ -27,7 +34,6 @@ April 11, 2018: 2138
 * **[Undeveloped](https://undeveloped.com/)**: Buy and sell domain names. ![image](https://cloud.githubusercontent.com/assets/1118459/19623703/7c6d63d0-9870-11e6-83f2-8b83ca49daa9.png)
 * **[Foxford.ru](http://foxford.ru/)**: Online School ![2016-12-17_13-23-21](https://cloud.githubusercontent.com/assets/1118459/21290377/1adacdf2-c45c-11e6-97c1-f726ab749b2d.png)
 * **[CareerBuilder for Employers](https://hiring.careerbuilder.com/)**: CareerBuilder's marketing/ecommerce website. We've integrated React on Rails and have deployed the application via Cloud 66, and are busy integrating this into other projects!
-* **[Josephine](https://www.josephine.com)**: The private network for home cooked meals.
 * **[first](https://first.io/)**: Data-driven Relational Marketing for Real Estate.
 
 ## Open Source Projects Live

data/README.md

@@ -357,10 +357,16 @@ You have 2 ways to specify your React components. You can either register the Re
 
 ReactOnRails will automatically detect a registered generator function. Thus, there is no difference between registering a React Component versus a "generator function."
 
+#### react_component_hash for Generator Functions
 Another reason to use a generator function is that sometimes in server rendering, specifically with React Router, you need to return the result of calling ReactDOMServer.renderToString(element). You can do this by returning an object with the following shape: { renderedHtml, redirectLocation, error }. Make sure you use this function with `react_component_hash`. 
 
 For server rendering, if you wish to return multiple HTML strings from a generator function, you may return an Object from your generator function with a single top level property of `renderedHtml`. Inside this Object, place a key called `componentHtml`, along with any other needed keys. An example scenario of this is when you are using side effects libraries like [React Helmet](https://github.com/nfl/react-helmet). Your Ruby code will get this Object as a Hash containing keys componentHtml and any other custom keys that you added:
+
+```js
 { renderedHtml: { componentHtml, customKey1, customKey2} }
+```
+
+For details on using react_component_hash with react-helmet, see the docs below for the helper API and [docs/additional-reading/react-helmet.md](../docs/additional-reading/react-helmet.md).
 
 ### Rails Context and Generator Functions
 When you use a "generator function" to create react components (or renderedHtml on the server), or you used shared redux stores, you get two params passed to your function that creates a React component:
@@ -535,7 +541,44 @@ All options except `props, id, html_options` will inherit from your `react_on_ra
   + **replay_console:** Default is true. False will disable echoing server-rendering logs to the browser. While this can make troubleshooting server rendering difficult, so long as you have the configuration of `logging_on_server` set to true, you'll still see the errors on the server.
   + **logging_on_server:** Default is true. True will log JS console messages and errors to the server.
   + **raise_on_prerender_error:** Default is false. True will throw an error on the server side rendering. Your controller will have to handle the error.
+  
+### react_component_hash
+`react_component_hash` is used to return multiple HTML strings for server rendering, such as for
+adding meta-tags to a page. It is exactly like react_component except for the following:
+
+1. `prerender: true` is automatically added to options, as this method doesn't make sense for 
+  client only rendering.
+2. Your JavaScript for server rendering must return an Object for the key `server_rendered_html`.
+3. Your view code must expect an object and not a string.
+
+Here is an example of ERB view code:
+
+```erb
+  <% react_helmet_app = react_component_hash("ReactHelmetApp", prerender: true,
+                                             props: { helloWorldData: { name: "Mr. Server Side Rendering"}},
+                                             id: "react-helmet-0", trace: true) %>
+  <% content_for :title do %>
+    <%= react_helmet_app['title'] %>
+  <% end %>
+  <%= react_helmet_app["componentHtml"] %>
+```
 
+And here is the JavaScript code:
+
+```js
+export default (props, _railsContext) => {
+  const componentHtml = renderToString(<ReactHelmet {...props} />);
+  const helmet = Helmet.renderStatic();
+
+  const renderedHtml = {
+    componentHtml,
+    title: helmet.title.toString(),
+  };
+  return { renderedHtml };
+};
+
+```
+  
 ### redux_store
 #### Controller Extension
 Include the module `ReactOnRails::Controller` in your controller, probably in ApplicationController. This will provide the following controller method, which you can call in your controller actions:

data/Rakefile

@@ -2,6 +2,9 @@
 
 # Rake will automatically load any *.rake files inside of the "rakelib" folder
 # See rakelib/
+
+require_relative "./spec/react_on_rails/support/rails32_helper"
+
 tasks = %w[run_rspec lint]
 prepare_for_ci = %w[node_package dummy_apps]
 
@@ -11,7 +14,7 @@ if ENV["USE_COVERALLS"] == "TRUE"
   tasks << "coveralls:push"
 end
 
-if File.basename(ENV["BUNDLE_GEMFILE"] || "") == "Gemfile.rails32"
+if using_rails32?
   tasks = %w[run_rspec:gem_rails32 run_rspec:dummy_no_webpacker]
   prepare_for_ci = %w[node_package dummy_apps:dummy_no_webpacker]
 end

data/docs/additional-reading/rspec-configuration.md

@@ -8,25 +8,25 @@ RSpec.configure do |config|
   ReactOnRails::TestHelper.configure_rspec_to_compile_assets(config)
 ```
 
-You can pass one or more RSpec metatags as an optional second parameter to this helper method if you want this helper to run on examples other than where `:js` or `:server_rendering` (those are the defaults). The helper will compile webpack files at most once per test run. The helper will not compile the webpack files unless they are out of date (stale). The helper is configurable in terms of what command is used to prepare the files.
+You can pass one or more RSpec metatags as an optional second parameter to this helper method if you want this helper to run on examples other than where `:js`, `:server_rendering`, or `:controller` (those are the defaults). The helper will compile webpack files at most once per test run. The helper will not compile the webpack files unless they are out of date (stale). The helper is configurable in terms of what command is used to prepare the files. If you don't specify these metatags for your relevant JavaScript tests, then you'll need to do the following.
 
 If you are using Webpack to build CSS assets, you should do something like this to ensure that you assets are built for any specs under `specs/requests` or `specs/features`:
 
 ```ruby
   ReactOnRails::TestHelper.configure_rspec_to_compile_assets(config, :requires_webpack_assets)
-
-  # Because we're using some CSS Webpack files, we need to ensure the webpack files are generated
-  # for all feature specs. https://github.com/shakacode/react_on_rails/issues/792
   config.define_derived_metadata(file_path: %r{spec/(features|requests)}) do |metadata|
     metadata[:requires_webpack_assets] = true
   end
 ```
 
 Please take note of the following:
+- If you are using Webpacker, be **SURE** to configure the `source_path` in your `config/webpacker.yml` unless you are using the defaults for webpacker. If you are not using webpacker, all files in the node_modules_location are used for your test sources.
+
 - This utility uses your `build_test_command` to build the static generated files. This command **must not** include the `--watch` option. If you have different server and client bundle files, this command **must** create all the bundles. If you are using webpacker, the default value will come from the `config/webpacker.yml` value for the `public_output_path` and the `source_path`
+
 - If you add an older file to your source files, that is already older than the produced output files, no new recompilation is done. The solution to this issue is to clear out your directory of webpack generated files when adding new source files that may have older dates. This is actually a common occurrence when you've built your test generated files and then you sync up your repository files.
 
-- By default, the webpack processes look for the `app/assets/webpack` folders (configured as setting `webpack_generated_files` in the `config/react_on_rails.rb`. If this folder is missing, is empty, or contains files in the `config.webpack_generated_files` list with `mtime`s older than any of the files in your `client` folder, the helper will recompile your assets. You can override the location of these files 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.
+- By default, the webpack processes look for the `config.generated_assets_dir` folder for generated files, configured via setting `webpack_generated_files`, in the `config/react_on_rails.rb`. If the `config.generated_assets_dir` folder is missing, is empty, or contains files in the `config.webpack_generated_files` list with `mtime`s older than any of the files in your `client` folder, the helper will recompile your assets. You can override the location of these files 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.
 
 The following `config/react_on_rails.rb` settings **must** match your setup:
 ```ruby

data/docs/basics/configuration.md

@@ -47,7 +47,8 @@ ReactOnRails.configure do |config|
   # Alternately, you may configure this. It is relative to your Rails root directory.
   # A custom, non-webpacker, config might use something like:
   #
-  config.generated_assets_dir = File.join(%w[public webpack], Rails.env)
+  # config.generated_assets_dir = File.join(%w[public webpack], Rails.env)
+  # This setting should not be used if using webpacker. 
 
   # The test helper needs to know where your JavaScript files exist. The default is configured
   # by your config/webpacker.yml soure_path:

data/lib/react_on_rails/configuration.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-# NOTE: ReactOnRails::Utils.using_webpacker? always will return false when called here.
-
 module ReactOnRails
   def self.configure
     yield(configuration)
@@ -21,6 +19,29 @@ module ReactOnRails
     check_i18n_directory_exists
     check_i18n_yml_directory_exists
     check_server_render_method_is_only_execjs
+    error_if_using_webpacker_and_generated_assets_dir_not_match_public_output_path
+  end
+
+  def self.error_if_using_webpacker_and_generated_assets_dir_not_match_public_output_path
+    return unless ReactOnRails::WebpackerUtils.using_webpacker?
+
+    return if @configuration.generated_assets_dir.blank?
+
+    webpacker_public_output_path = ReactOnRails::WebpackerUtils.webpacker_public_output_path
+
+    if File.expand_path(@configuration.generated_assets_dir) == webpacker_public_output_path.to_s
+      Rails.logger.warn("You specified /config/initializers/react_on_rails.rb generated_assets_dir "\
+        "with Webpacker. Remove this line from your configuration file.")
+    else
+      msg = <<-MSG.strip_heredoc
+        Error configuring /config/initializers/react_on_rails.rb: You are using webpacker
+        and your specified value for generated_assets_dir = #{@configuration.generated_assets_dir}
+        that does not match the value for public_output_path specified in
+        webpacker.yml = #{webpacker_public_output_path}. You should remove the configuration
+        value for "generated_assets_dir" from your config/initializers/react_on_rails.rb file.
+      MSG
+      raise ReactOnRails::Error, msg
+    end
   end
 
   def self.check_server_render_method_is_only_execjs
@@ -28,7 +49,7 @@ module ReactOnRails
               @configuration.server_render_method == "ExecJS"
 
     msg = <<-MSG.strip_heredoc
-      Error configuring /config/react_on_rails.rb: invalid value for `config.server_render_method`.
+      Error configuring /config/initializers/react_on_rails.rb: invalid value for `config.server_render_method`.
       If you wish to use a server render method other than ExecJS, contact justin@shakacode.com
       for details.
     MSG
@@ -40,7 +61,7 @@ module ReactOnRails
     return if Dir.exist?(@configuration.i18n_dir)
 
     msg = <<-MSG.strip_heredoc
-      Error configuring /config/react_on_rails.rb: invalid value for `config.i18n_dir`.
+      Error configuring /config/initializers/react_on_rails.rb: invalid value for `config.i18n_dir`.
       Directory does not exist: #{@configuration.i18n_dir}. Set to value to nil or comment it
       out if not using the React on Rails i18n feature.
     MSG
@@ -52,7 +73,7 @@ module ReactOnRails
     return if Dir.exist?(@configuration.i18n_yml_dir)
 
     msg = <<-MSG.strip_heredoc
-      Error configuring /config/react_on_rails.rb: invalid value for `config.i18n_yml_dir`.
+      Error configuring /config/initializers/react_on_rails.rb: invalid value for `config.i18n_yml_dir`.
       Directory does not exist: #{@configuration.i18n_yml_dir}. Set to value to nil or comment it
       out if not using this i18n with React on Rails, or if you want to use all translation files.
     MSG
@@ -60,22 +81,31 @@ module ReactOnRails
   end
 
   def self.ensure_generated_assets_dir_present
-    return if @configuration.generated_assets_dir.present?
+    return if @configuration.generated_assets_dir.present? || ReactOnRails::WebpackerUtils.using_webpacker?
 
     @configuration.generated_assets_dir = DEFAULT_GENERATED_ASSETS_DIR
-    puts "ReactOnRails: Set generated_assets_dir to default: #{DEFAULT_GENERATED_ASSETS_DIR}"
+    Rails.logger.warn "ReactOnRails: Set generated_assets_dir to default: #{DEFAULT_GENERATED_ASSETS_DIR}"
   end
 
   def self.configure_generated_assets_dirs_deprecation
     return if @configuration.generated_assets_dirs.blank?
 
-    puts "[DEPRECATION] ReactOnRails: Use config.generated_assets_dir rather than "\
+    if ReactOnRails::WebpackerUtils.using_webpacker?
+      webpacker_public_output_path = ReactOnRails::WebpackerUtils.webpacker_public_output_path
+      Rails.logger.warn "Error configuring config/initializers/react_on_rails. Define neither the "\
+        "generated_assets_dirs no the generated_assets_dir when using Webpacker. This is defined by "\
+        "public_output_path specified in webpacker.yml = #{webpacker_public_output_path}."
+      return
+    end
+
+    Rails.logger.warn "[DEPRECATION] ReactOnRails: Use config.generated_assets_dir rather than "\
         "generated_assets_dirs"
     if @configuration.generated_assets_dir.blank?
       @configuration.generated_assets_dir = @configuration.generated_assets_dirs
     else
-      puts "[DEPRECATION] ReactOnRails. You have both generated_assets_dirs and "\
-          "generated_assets_dir defined. Define ONLY generated_assets_dir"
+      Rails.logger.warn "[DEPRECATION] ReactOnRails. You have both generated_assets_dirs and "\
+          "generated_assets_dir defined. Define ONLY generated_assets_dir if NOT using Webpacker"\
+          " and define neither if using Webpacker"
     end
   end
 
@@ -91,14 +121,18 @@ module ReactOnRails
   def self.ensure_server_bundle_js_file_has_no_path
     return unless @configuration.server_bundle_js_file.include?(File::SEPARATOR)
 
-    puts "[DEPRECATION] ReactOnRails: remove path from server_bundle_js_file in configuration. "\
-        "All generated files must go in #{@configuration.generated_assets_dir}"
+    assets_dir = ReactOnRails::Utils.generated_assets_full_path
     @configuration.server_bundle_js_file = File.basename(@configuration.server_bundle_js_file)
+
+    Rails.logger_warn do
+      "[DEPRECATION] ReactOnRails: remove path from server_bundle_js_file in configuration. "\
+      "All generated files must go in #{assets_dir}. Using file basename #{@configuration.server_bundle_js_file}"
+    end
   end
 
   def self.configure_skip_display_none_deprecation
     return if @configuration.skip_display_none.nil?
-    puts "[DEPRECATION] ReactOnRails: remove skip_display_none from configuration."
+    Rails.logger.warn "[DEPRECATION] ReactOnRails: remove skip_display_none from configuration."
   end
 
   def self.configuration

data/lib/react_on_rails/react_on_rails_helper.rb

@@ -120,17 +120,35 @@ module ReactOnRails
 
       else
         msg = <<-MSG.strip_heredoc
-        ReactOnRails: server_rendered_html is expected to be a String. If you're trying to
-        use a generator function to return a Hash to your ruby view code, then use
+        ReactOnRails: server_rendered_html is expected to be a String for #{component_name}. If you're
+        trying to use a generator function to return a Hash to your ruby view code, then use
         react_component_hash instead of react_component and see
         https://github.com/shakacode/react_on_rails/blob/master/spec/dummy/client/app/startup/ReactHelmetServerApp.jsx
-        for an example of the necessary javascript configuration."
+        for an example of the JavaScript code."
         MSG
         raise ReactOnRails::Error, msg
       end
     end
 
+    # react_component_hash is used to return multiple HTML strings for server rendering, such as for
+    # adding meta-tags to a page.
+    # It is exactly like react_component except for the following:
+    # 1. prerender: true is automatically added, as this method doesn't make sense for client only
+    #    rendering.
+    # 2. Your JavaScript for server rendering must return an Object for the key server_rendered_html.
+    # 3. Your view code must expect an object and not a string.
+    #
+    # Here is an example of the view code:
+    #    <% react_helmet_app = react_component_hash("ReactHelmetApp", prerender: true,
+    #                                               props: { helloWorldData: { name: "Mr. Server Side Rendering"}},
+    #                                               id: "react-helmet-0", trace: true) %>
+    #    <% content_for :title do %>
+    #      <%= react_helmet_app['title'] %>
+    #    <% end %>
+    #    <%= react_helmet_app["componentHtml"] %>
+    #
     def react_component_hash(component_name, options = {})
+      options[:prerender] = true
       internal_result = internal_react_component(component_name, options)
       server_rendered_html = internal_result[:result]["html"]
       console_script = internal_result[:result]["consoleReplayScript"]
@@ -148,9 +166,9 @@ module ReactOnRails
         )
       else
         msg = <<-MSG.strip_heredoc
-        Generator function used by react_component_hash is expected to return an Object. See
-        https://github.com/shakacode/react_on_rails/blob/master/spec/dummy/client/app/startup/ReactHelmetServerApp.jsx
-        for an example of the necessary javascript configuration.
+          Generator function used by react_component_hash for #{component_name} is expected to return
+          an Object. See https://github.com/shakacode/react_on_rails/blob/master/spec/dummy/client/app/startup/ReactHelmetServerApp.jsx
+          for an example of the JavaScript code."
         MSG
         raise ReactOnRails::Error, msg
       end
@@ -485,7 +503,9 @@ module ReactOnRails
           inMailer: in_mailer?,
           # Locale settings
           i18nLocale: I18n.locale,
-          i18nDefaultLocale: I18n.default_locale
+          i18nDefaultLocale: I18n.default_locale,
+          rorVersion: ReactOnRails::VERSION,
+          rorPro: ReactOnRails::Utils.react_on_rails_pro?
         }
         if defined?(request) && request.present?
           # Check for encoding of the request's original_url and try to force-encoding the

data/lib/react_on_rails/server_rendering_pool.rb

@@ -9,12 +9,8 @@ require_relative "server_rendering_pool/ruby_embedded_java_script"
 module ReactOnRails
   module ServerRenderingPool
     class << self
-      def react_on_rails_pro?
-        @react_on_rails_pro ||= gem_available?("react_on_rails_pro")
-      end
-
       def pool
-        @pool ||= if react_on_rails_pro?
+        @pool ||= if ReactOnRails::Utils.react_on_rails_pro?
                     ReactOnRailsPro::ServerRenderingPool::ProRendering
                   else
                     ReactOnRails::ServerRenderingPool::RubyEmbeddedJavaScript
@@ -26,16 +22,6 @@ module ReactOnRails
       def server_render_js_with_console_logging(js_code, render_options)
         pool.exec_server_render_js(js_code, render_options)
       end
-
-      private
-
-      def gem_available?(name)
-        Gem::Specification.find_by_name(name)
-      rescue Gem::LoadError
-        false
-      rescue StandardError
-        Gem.available?(name)
-      end
     end
   end
 end

data/lib/react_on_rails/test_helper.rb

@@ -31,7 +31,7 @@ module ReactOnRails
     # Params:
     # config - config for rspec
     # metatags - metatags to add the ensure_assets_compiled check.
-    #            Default is :js, :server_rendering
+    #            Default is :js, :server_rendering, :controller
     def self.configure_rspec_to_compile_assets(config, *metatags)
       metatags = %i[js server_rendering controller] if metatags.empty?
 
@@ -48,30 +48,31 @@ module ReactOnRails
     #                         defaults to ReactOnRails::TestHelper::WebpackAssetsStatusChecker
     # webpack_assets_compiler: provide one method: `def compile`
     #                         defaults to ReactOnRails::TestHelper::WebpackAssetsCompiler
-    # source_path and generated_assets_dir are passed into the default webpack_assets_status_checker if you
+    # source_path and generated_assets_full_path are passed into the default webpack_assets_status_checker if you
     #                        don't provide one.
     # webpack_generated_files List of files to check for up-to-date-status, defaulting to
     #                        webpack_generated_files in your configuration
     def self.ensure_assets_compiled(webpack_assets_status_checker: nil,
                                     webpack_assets_compiler: nil,
                                     source_path: nil,
-                                    generated_assets_dir: nil,
+                                    generated_assets_full_path: nil,
                                     webpack_generated_files: nil)
       ReactOnRails::WebpackerUtils.check_manifest_not_cached
       if webpack_assets_status_checker.nil?
         source_path ||= ReactOnRails::Utils.source_path
-        generated_assets_dir ||= ReactOnRails::Utils.generated_assets_dir
+        generated_assets_full_path ||= ReactOnRails::Utils.generated_assets_full_path
         webpack_generated_files ||= ReactOnRails.configuration.webpack_generated_files
 
         webpack_assets_status_checker ||=
           WebpackAssetsStatusChecker.new(source_path: source_path,
-                                         generated_assets_dir: generated_assets_dir,
+                                         generated_assets_full_path: generated_assets_full_path,
                                          webpack_generated_files: webpack_generated_files)
 
         unless @printed_once
           puts
-          puts "====> React On Rails: Checking #{webpack_assets_status_checker.generated_assets_dir} for "\
-          "outdated/missing bundles"
+          puts "====> React On Rails: Checking files in "\
+            "#{webpack_assets_status_checker.generated_assets_full_path} for "\
+            "outdated/missing bundles based on source_path #{source_path}"
           puts
           @printed_once = true
         end

data/lib/react_on_rails/test_helper/webpack_assets_status_checker.rb

@@ -13,14 +13,14 @@ module ReactOnRails
       # source_path is typically configured in the webpacker.yml file
       # for `source_path`
       # or for legacy React on Rails, it's /client, where all client files go
-      attr_reader :source_path, :generated_assets_dir
+      attr_reader :source_path, :generated_assets_full_path
 
       def initialize(
-        generated_assets_dir: required("generated_assets_dir"),
+        generated_assets_full_path: required("generated_assets_full_path"),
         source_path: required("source_path"),
         webpack_generated_files: required("webpack_generated_files")
       )
-        @generated_assets_dir = generated_assets_dir
+        @generated_assets_full_path = generated_assets_full_path
         @source_path = source_path
         @webpack_generated_files = webpack_generated_files
       end
@@ -59,13 +59,13 @@ module ReactOnRails
           if webpack_generated_files.present?
             webpack_generated_files
           else
-            file_list = make_file_list(make_globs(generated_assets_dir)).to_ary
+            file_list = make_file_list(make_globs(generated_assets_full_path)).to_ary
             puts "V" * 80
             puts "Please define config.webpack_generated_files (array) so the test helper knows "\
             "which files are required. If you are using webpacker, you typically need to only "\
             "include 'manifest.json'."
             puts "Detected the possible following files to check for webpack compilation in "\
-              "#{generated_assets_dir}"
+              "#{generated_assets_full_path}"
             puts file_list.join("\n")
             puts "^" * 80
             file_list

data/lib/react_on_rails/utils.rb

@@ -76,8 +76,8 @@ exitstatus: #{status.exitstatus}#{stdout_msg}#{stderr_msg}
                               begin
                                 bundle_js_file_path(bundle_name)
                               rescue Webpacker::Manifest::MissingEntryError
-                                Rails.root.join(File.join(Webpacker.config.public_output_path,
-                                                          bundle_name)).to_s
+                                File.join(ReactOnRails::WebpackerUtils.webpacker_public_output_path,
+                                          bundle_name)
                               end
                             else
                               bundle_js_file_path(bundle_name)
@@ -90,7 +90,8 @@ exitstatus: #{status.exitstatus}#{stdout_msg}#{stderr_msg}
       else
         # Default to the non-hashed name in the specified output directory, which, for legacy
         # React on Rails, this is the output directory picked up by the asset pipeline.
-        File.join(ReactOnRails.configuration.generated_assets_dir, bundle_name)
+        # For Webpacker, this is the public output path defined in the webpacker.yml file.
+        File.join(generated_assets_full_path, bundle_name)
       end
     end
 
@@ -130,12 +131,24 @@ exitstatus: #{status.exitstatus}#{stdout_msg}#{stderr_msg}
       end
     end
 
-    def self.generated_assets_dir
+    def self.generated_assets_full_path
       if ReactOnRails::WebpackerUtils.using_webpacker?
         ReactOnRails::WebpackerUtils.webpacker_public_output_path
       else
-        ReactOnRails.configuration.generated_assets_dir
+        File.expand_path(ReactOnRails.configuration.generated_assets_dir)
       end
     end
+
+    def self.gem_available?(name)
+      Gem::Specification.find_by_name(name).present?
+    rescue Gem::LoadError
+      false
+    rescue StandardError
+      Gem.available?(name).present?
+    end
+
+    def self.react_on_rails_pro?
+      @react_on_rails_pro ||= gem_available?("react_on_rails_pro")
+    end
   end
 end

data/lib/react_on_rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ReactOnRails
-  VERSION = "11.0.3".freeze
+  VERSION = "11.0.4".freeze
 end

data/lib/react_on_rails/webpacker_utils.rb

@@ -1,18 +1,20 @@
 module ReactOnRails
   module WebpackerUtils
     def self.using_webpacker?
-      ActionController::Base.helpers.respond_to?(:asset_pack_path)
+      ReactOnRails::Utils.gem_available?("webpacker")
     end
 
     def self.bundle_js_file_path_from_webpacker(bundle_name)
-      possible_result = Webpacker.manifest.lookup(bundle_name)
-      hashed_bundle_name = possible_result.nil? ? Webpacker.manifest.lookup!(bundle_name) : possible_result
+      # Note Webpacker 3.4.3 manifest lookup is inside of the public_output_path
+      # [2] (pry) ReactOnRails::WebpackerUtils: 0> Webpacker.manifest.lookup("app-bundle.js")
+      # "/webpack/development/app-bundle-c1d2b6ab73dffa7d9c0e.js"
+      hashed_bundle_name = Webpacker.manifest.lookup!(bundle_name)
+
       if Webpacker.dev_server.running?
-        result = "#{Webpacker.dev_server.protocol}://#{Webpacker.dev_server.host_with_port}#{hashed_bundle_name}"
-        result
+        "#{Webpacker.dev_server.protocol}://#{Webpacker.dev_server.host_with_port}#{hashed_bundle_name}"
       else
         # Next line will throw if the file or manifest does not exist
-        Rails.root.join(File.join("public", hashed_bundle_name)).to_s
+        File.expand_path(File.join("public", hashed_bundle_name)).to_s
       end
     end
 
@@ -21,7 +23,8 @@ module ReactOnRails
     end
 
     def self.webpacker_public_output_path
-      Webpacker.config.public_output_path
+      # Webpacker has the full absolute path of webpacker output files in a pathname
+      Webpacker.config.public_output_path.to_s
     end
 
     def self.manifest_exists?

data/package.json

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

data/react_on_rails.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   s.add_dependency "connection_pool"
   s.add_dependency "execjs", "~> 2.5"
   s.add_dependency "rails", ">= 3.2"
-  s.add_dependency "rainbow", "~> 2.2"
+  s.add_dependency "rainbow", "~> 3.0"
 
   s.add_development_dependency "awesome_print"
   s.add_development_dependency "bundler", "~> 1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: react_on_rails
 version: !ruby/object:Gem::Version
-  version: 11.0.3
+  version: 11.0.4
 platform: ruby
 authors:
 - Justin Gordon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-24 00:00:00.000000000 Z
+date: 2018-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement