test commit

Author: vaukalak

lib/generators/react_on_rails/base_generator.rb

@@ -79,37 +79,34 @@ def add_base_gems_to_gemfile
       def add_yarn_dependencies
         major_minor_patch_only = /\A\d+\.\d+\.\d+\z/
         if ReactOnRails::VERSION.match?(major_minor_patch_only)
+          # run "yarn add react-on-rails@#{ReactOnRails::VERSION} --exact"
           package_json.manager.add(["react-on-rails@#{ReactOnRails::VERSION}"])
         else
           # otherwise add latest
+          puts "Adding the lastest react-on-rails NPM module. Double check this is correct in package.json"
+          # run "yarn add react-on-rails --exact"
           puts "Adding the latest react-on-rails NPM module. Double check this is correct in package.json"
           package_json.manager.add(["react-on-rails"])
         end
 
         puts "Adding React dependencies"
-        package_json.manager.add([
-          "react",
-          "react-dom",
-          "@babel/preset-react",
-          "prop-types",
-          "babel-plugin-transform-react-remove-prop-types",
-          "babel-plugin-macros"
-        ])
+        run "yarn add react react-dom @babel/preset-react prop-types babel-plugin-transform-react-remove-prop-types \
+            babel-plugin-macros"
+        # package_json.manager.add([
+        #   "react",
+        #   "react-dom",
+        #   "@babel/preset-react",
+        #   "prop-types",
+        #   "babel-plugin-transform-react-remove-prop-types",
+        #   "babel-plugin-macros"
+        # ])
 
         puts "Adding CSS handlers"
 
-        package_json.manager.add([
-          "css-loader",
-          "css-minimizer-webpack-plugin",
-          "mini-css-extract-plugin",
-          "style-loader"
-        ])
+        run "yarn add css-loader css-minimizer-webpack-plugin mini-css-extract-plugin style-loader"
 
         puts "Adding dev dependencies"
-        package_json.manager.add([
-          "@pmmmwh/react-refresh-webpack-plugin",
-          "react-refresh"
-        ], type: :dev)
+        run "yarn add -D @pmmmwh/react-refresh-webpack-plugin react-refresh"
       end
 
       def append_to_spec_rails_helper

lib/generators/react_on_rails/generator_helper.rb

@@ -15,7 +15,7 @@ def package_json
     if @package_json.nil?
       require_package_json_gem
 
-      @package_json = PackageJson.read(@app_path)
+      @package_json = PackageJson.read(Rails.root.to_s)
     end
 
     @package_json

lib/generators/react_on_rails/install_generator.rb

@@ -3,6 +3,7 @@
 require "rails/generators"
 require_relative "generator_helper"
 require_relative "generator_messages"
+require 'shakapacker'
 
 module ReactOnRails
   module Generators
@@ -104,7 +105,24 @@ def add_post_install_message
       end
 
       def using_shakapacker_7_or_above?
+        # require 'shakapacker'
+        Gem.activate('shakapacker')
+        # true
+        puts ">>> detect version"
+        puts Gem.loaded_specs.keys
+        puts ">>> VERSION: #{Shakapacker::VERSION}"
+        # puts ">>> Gem.path: #{Gem.path}"
+        # puts ">>> $LOAD_PATH: #{$LOAD_PATH}"
+        puts ">>> actived: #{Gem.loaded_specs['shakapacker'].activated?}"
+        puts ">>> dependencies:: #{Gem.loaded_specs['shakapacker'].dependencies}"
+
+        shakapacker_spec = Gem::Specification.find_all_by_name("shakapacker").first
+        # puts "SP: #{shakapacker_spec.version}" if shakapacker_spec
+        puts Gem::Specification.map(&:name)
         shakapacker_gem = Gem::Specification.find_by_name("shakapacker")
+        puts ">>> PASS"
+        puts ">>> VERSION: #{shakapacker_gem.version.segments.first}"
+        puts ">>> IS NEW: #{shakapacker_gem.version.segments.first >= 7}"
         shakapacker_gem.version.segments.first >= 7
       rescue Gem::MissingSpecError
         # In case using Webpacker