check both root & client packages

Author: Judahmeek

CHANGELOG.md

@@ -18,7 +18,11 @@ Please follow the recommendations outlined at [keepachangelog.com](http://keepac
 ### [Unreleased]
 Changes since the last non-beta release.
 
-#### Added(https://github.com/AbanoubGhadban).
+#### Fixed
+
+- Changed the ReactOnRails' version checker to check package.jsons in both root and client directories. [PR 1657](https://github.com/shakacode/react_on_rails/pull/1657) by [judahmeek](https://github.com/judahmeek).
+
+#### Added
 - Added streaming server rendering support:
   - [PR #1633](https://github.com/shakacode/react_on_rails/pull/1633) by [AbanoubGhadban](https://github.com/AbanoubGhadban).
     - New `stream_react_component` helper for adding streamed components to views

lib/react_on_rails/engine.rb

@@ -5,8 +5,9 @@
 module ReactOnRails
   class Engine < ::Rails::Engine
     config.to_prepare do
-      if File.exist?(VersionChecker::NodePackageVersion.package_json_path)
-        VersionChecker.build.raise_if_gem_and_node_package_versions_differ
+      if VersionChecker.new("package.json").raise_if_gem_and_node_package_versions_differ &&
+         VersionChecker.new("client/package.json").raise_if_gem_and_node_package_versions_differ
+        Rails.logger.warn("No 'react-on-rails' entry found in 'dependencies' in package.json or client/package.json.")
       end
       ReactOnRails::ServerRenderingPool.reset_pool
     end

lib/react_on_rails/version_checker.rb

@@ -20,17 +20,19 @@ def initialize(node_package_version)
     # unless the user really knows what they're doing. So we will give a
     # warning if they do not.
     def raise_if_gem_and_node_package_versions_differ
+      return true unless node_package_version.raw
       return if node_package_version.relative_path?
 
+      raise_node_semver_version_warning if node_package_version.semver_wildcard?
+
       node_major_minor_patch = node_package_version.major_minor_patch
       gem_major_minor_patch = gem_major_minor_patch_version
       versions_match = node_major_minor_patch[0] == gem_major_minor_patch[0] &&
                        node_major_minor_patch[1] == gem_major_minor_patch[1] &&
                        node_major_minor_patch[2] == gem_major_minor_patch[2]
 
       raise_differing_versions_warning unless versions_match
-
-      raise_node_semver_version_warning if node_package_version.semver_wildcard?
+      false
     end
 
     private
@@ -43,18 +45,19 @@ def common_error_msg
          your installed node package. Do not use >= or ~> in your Gemfile for react_on_rails.
          Do not use ^ or ~ in your package.json for react-on-rails.
          Run `yarn add react-on-rails --exact` in the directory containing folder node_modules.
+         ***This warning will become a fatal error in ReactOnRails v15***
       MSG
     end
 
     def raise_differing_versions_warning
-      msg = "**ERROR** ReactOnRails: ReactOnRails gem and node package versions do not match\n#{common_error_msg}"
-      raise ReactOnRails::Error, msg
+      msg = "**WARNING** ReactOnRails: ReactOnRails gem and node package versions do not match\n#{common_error_msg}"
+      Rails.logger.warn(msg)
     end
 
     def raise_node_semver_version_warning
-      msg = "**ERROR** ReactOnRails: Your node package version for react-on-rails contains a " \
+      msg = "**WARNING** ReactOnRails: Your node package version for react-on-rails contains a " \
             "^ or ~\n#{common_error_msg}"
-      raise ReactOnRails::Error, msg
+      Rails.logger.warn(msg)
     end
 
     def gem_version
@@ -73,21 +76,21 @@ def self.build
         new(package_json_path)
       end
 
-      def self.package_json_path
-        Rails.root.join("client", "package.json")
+      def self.package_json_path(relative_path = "package.json")
+        Rails.root.join(relative_path)
       end
 
       def initialize(package_json)
         @package_json = package_json
       end
 
       def raw
+        return nil unless File.exist?(@package_json)
+
         parsed_package_contents = JSON.parse(package_json_contents)
         if parsed_package_contents.key?("dependencies") &&
            parsed_package_contents["dependencies"].key?("react-on-rails")
           parsed_package_contents["dependencies"]["react-on-rails"]
-        else
-          raise ReactOnRails::Error, "No 'react-on-rails' entry in package.json dependencies"
         end
       end
 
@@ -96,7 +99,7 @@ def semver_wildcard?
       end
 
       def relative_path?
-        raw.match(%r{(\.\.|\Afile:///)}).present?
+        raw.match(/(\.\.|\Afile:)/).present?
       end
 
       def major_minor_patch
@@ -113,7 +116,7 @@ def major_minor_patch
       private
 
       def package_json_contents
-        @package_json_contents ||= File.read(package_json)
+        @package_json_contents ||= File.read(@package_json)
       end
     end
   end