runner.rb in shakapacker-8.0.1

- old
+ new

@@ -1,6 +1,8 @@
 require "shakapacker/utils/misc"
+require "shakapacker/utils/manager"
+require "package_json"
 
 module Shakapacker
   class Runner
     def self.run(argv)
       $stdout.sync = true
@@ -11,36 +13,20 @@
     def initialize(argv)
       @argv = argv
 
       @app_path              = File.expand_path(".", Dir.pwd)
       @webpack_config        = File.join(@app_path, "config/webpack/webpack.config.js")
-
-      Shakapacker.set_shakapacker_env_variables_for_backward_compatibility
-
-      @node_modules_bin_path = fetch_node_modules_bin_path
       @shakapacker_config    = ENV["SHAKAPACKER_CONFIG"] || File.join(@app_path, "config/shakapacker.yml")
 
-      @shakapacker_config = Shakapacker.get_config_file_path_with_backward_compatibility(@shakapacker_config)
-
       unless File.exist?(@webpack_config)
         $stderr.puts "webpack config #{@webpack_config} not found, please run 'bundle exec rails shakapacker:install' to install Shakapacker with default configs or add the missing config file for your custom environment."
         exit!
       end
-    end
 
-    def fetch_node_modules_bin_path
-      return nil if Shakapacker::Utils::Misc.use_package_json_gem
-
-      ENV["SHAKAPACKER_NODE_MODULES_BIN_PATH"] || `yarn bin`.chomp
+      Shakapacker::Utils::Manager.error_unless_package_manager_is_obvious!
     end
 
     def package_json
-      if @package_json.nil?
-        Shakapacker::Utils::Misc.require_package_json_gem
-
-        @package_json = PackageJson.read(@app_path)
-      end
-
-      @package_json
+      @package_json ||= PackageJson.read(@app_path)
     end
   end
 end