shakapacker 9.3.0.beta.5 → 9.3.0.beta.7

data/lib/shakapacker/doctor.rb

@@ -879,49 +879,81 @@ module Shakapacker
 
           def print_verbose_checks
             puts "\nVerbose diagnostics:"
+            print_environment_info
+            print_version_info
+            print_path_info
+            print_config_values
+          end
 
-            # Show environment info
+          def print_environment_info
             rails_env = defined?(Rails) ? Rails.env : ENV["RAILS_ENV"]
             node_env = ENV["NODE_ENV"]
             puts "  • Rails environment: #{rails_env || 'not set'}"
             puts "  • Node environment: #{node_env || 'not set'}"
+          end
 
-            # Show gem/npm versions
-            if doctor.send(:package_json_exists?)
-              package_json = doctor.send(:read_package_json)
-              npm_version = package_json.dig("dependencies", "shakapacker") ||
-                           package_json.dig("devDependencies", "shakapacker")
-              puts "  • Shakapacker gem version: #{Shakapacker::VERSION}"
-              puts "  • Shakapacker npm version: #{npm_version || 'not installed'}"
-            end
+          def print_version_info
+            return unless doctor.send(:package_json_exists?)
 
-            # Show paths
+            package_json = doctor.send(:read_package_json)
+            npm_version = package_json.dig("dependencies", "shakapacker") ||
+                          package_json.dig("devDependencies", "shakapacker")
+            puts "  • Shakapacker gem version: #{Shakapacker::VERSION}"
+            puts "  • Shakapacker npm version: #{npm_version || 'not installed'}"
+          end
+
+          def print_path_info
             puts "  • Root path: #{doctor.root_path}"
-            if doctor.config.config_path.exist?
-              puts "  • Cache path: #{doctor.config.cache_path}"
-              puts "  • Manifest path: #{doctor.config.manifest_path}"
+            return unless doctor.config.config_path.exist?
+
+            puts "  • Cache path: #{doctor.config.cache_path}"
+            puts "  • Manifest path: #{doctor.config.manifest_path}"
+          end
+
+          def print_config_values
+            return unless doctor.config.config_path.exist?
+
+            puts "\nConfiguration values for '#{doctor.config.env}' environment:"
+            config_data = doctor.config.send(:data)
+
+            if config_data.any?
+              print_config_data(config_data)
+            else
+              puts "  (using bundled defaults - no environment-specific config found)"
             end
+          end
 
-            # Show environment-specific shakapacker.yml configuration values
-            if doctor.config.config_path.exist?
-              puts "\nConfiguration values for '#{doctor.config.env}' environment:"
-              config_data = doctor.config.send(:data)
-              if config_data.any?
-                config_data.each do |key, value|
-                  # Format the value nicely - truncate long arrays/hashes
-                  formatted_value = case value
-                                    when Array
-                                      value.length > 3 ? "#{value.first(3).inspect}... (#{value.length} items)" : value.inspect
-                                    when Hash
-                                      value.length > 3 ? "{...} (#{value.length} keys)" : value.inspect
-                                   else
-                                      value.inspect
-                  end
-                  puts "  • #{key}: #{formatted_value}"
-                end
-              else
-                puts "  (using bundled defaults - no environment-specific config found)"
-              end
+          def print_config_data(config_data)
+            config_data.each do |key, value|
+              formatted_value = format_config_value(value)
+              puts "  • #{key}: #{formatted_value}"
+            end
+          end
+
+          def format_config_value(value)
+            case value
+            when Array
+              format_array_value(value)
+            when Hash
+              format_hash_value(value)
+            else
+              value.inspect
+            end
+          end
+
+          def format_array_value(array)
+            if array.length > 3
+              "#{array.first(3).inspect}... (#{array.length} items)"
+            else
+              array.inspect
+            end
+          end
+
+          def format_hash_value(hash)
+            if hash.length > 3
+              "{...} (#{hash.length} keys)"
+            else
+              hash.inspect
             end
           end
 
@@ -1033,49 +1065,61 @@ module Shakapacker
 
             item_number = 0
             doctor.warnings.each do |warning|
-              category_prefix = case warning[:category]
-                                when :action_required then "[REQUIRED]"
-                                when :info then "[INFO]"
-                                when :recommended then "[RECOMMENDED]"
-                               else ""
-              end
-
-              # Sub-items start with whitespace (indented fix instructions)
-              is_subitem = warning[:message].start_with?("  ")
-
-              if is_subitem
-                # Fix instructions align at column 16 (length of "N. [RECOMMENDED]  ")
-                # This ensures all Fix lines align vertically regardless of category
-                subitem_prefix = " " * 15
-                wrapped = wrap_text(warning[:message], 100, subitem_prefix)
-                puts wrapped
+              if subitem?(warning[:message])
+                print_subitem(warning[:message])
               else
                 item_number += 1
-                # Format: N. [CATEGORY]  Message
-                prefix = "#{item_number}. #{category_prefix}  "
-                wrapped = wrap_text(warning[:message], 100, prefix)
-                puts wrapped
+                print_main_item(item_number, warning)
               end
             end
             puts ""
           end
 
+          def subitem?(message)
+            message.start_with?("  ")
+          end
+
+          def print_subitem(message)
+            # Fix instructions align at column 16 (length of "N. [RECOMMENDED]  ")
+            # This ensures all Fix lines align vertically regardless of category
+            subitem_prefix = " " * 15
+            wrapped = wrap_text(message, 100, subitem_prefix)
+            puts wrapped
+          end
+
+          def print_main_item(item_number, warning)
+            category_prefix = case warning[:category]
+                              when :action_required then "[REQUIRED]"
+                              when :info then "[INFO]"
+                              when :recommended then "[RECOMMENDED]"
+                              else
+                                ""
+            end
+
+            # Format: N. [CATEGORY]  Message
+            prefix = "#{item_number}. #{category_prefix}  "
+            wrapped = wrap_text(warning[:message], 100, prefix)
+            puts wrapped
+          end
+
           def wrap_text(text, max_width, prefix)
-            # Strip leading whitespace from sub-items
             text = text.strip
-
-            # Calculate available width for text
             available_width = max_width - prefix.length
+
             return prefix + text if text.length <= available_width
 
-            # Wrap long lines
+            lines = build_wrapped_lines(text, available_width)
+            format_wrapped_output(lines, prefix)
+          end
+
+          def build_wrapped_lines(text, available_width)
             words = text.split(" ")
             lines = []
             current_line = []
             current_length = 0
 
             words.each do |word|
-              word_length = word.length + (current_line.empty? ? 0 : 1) # +1 for space
+              word_length = word.length + (current_line.empty? ? 0 : 1)
 
               if current_length + word_length <= available_width
                 current_line << word
@@ -1086,26 +1130,39 @@ module Shakapacker
                 current_length = word.length
               end
             end
+
             lines << current_line.join(" ") unless current_line.empty?
+            lines
+          end
 
-            # Format output
+          def format_wrapped_output(lines, prefix)
             result = prefix + lines[0]
+            indent = " " * prefix.length
+
             lines[1..].each do |line|
-              result += "\n" + (" " * prefix.length) + line
+              result += "\n#{indent}#{line}"
             end
+
             result
           end
 
           def has_dependency_issues?
-            # Check if any issues or warnings are about missing npm/package dependencies
-            # Exclude optional dependencies - only show install instructions for required dependencies
             all_messages = doctor.issues + doctor.warnings.map { |w| w[:message] }
-            all_messages.any? do |msg|
-              next if msg.include?("Optional")
-              (msg.include?("Missing") && msg.include?("dependency")) ||
-              msg.include?("not installed") ||
-              msg.include?("is not installed")
-            end
+            all_messages.any? { |msg| dependency_issue?(msg) }
+          end
+
+          def dependency_issue?(message)
+            return false if message.include?("Optional")
+
+            missing_dependency?(message) || not_installed?(message)
+          end
+
+          def missing_dependency?(message)
+            message.include?("Missing") && message.include?("dependency")
+          end
+
+          def not_installed?(message)
+            message.include?("not installed") || message.include?("is not installed")
           end
 
           def print_fix_instructions

data/lib/shakapacker/runner.rb

@@ -29,8 +29,10 @@ module Shakapacker
       $stdout.sync = true
 
       # Show Shakapacker help and exit (don't call bundler)
-      if argv.include?("--help") || argv.include?("-h")
-        print_help
+      # Support --help, -h, and --help=verbose formats
+      help_verbose = argv.any? { |arg| arg == "--help=verbose" }
+      if argv.include?("--help") || argv.include?("-h") || help_verbose
+        print_help(verbose: help_verbose)
         exit(0)
       elsif argv.include?("--version") || argv.include?("-v")
         print_version
@@ -310,7 +312,7 @@ module Shakapacker
         $stderr.puts "Current configured path: #{config_dir}"
       end
 
-      def self.print_help
+      def self.print_help(verbose: false)
         puts <<~HELP
         ================================================================================
         SHAKAPACKER - Rails Webpack/Rspack Integration
@@ -320,6 +322,7 @@ module Shakapacker
 
         Shakapacker-specific options:
           -h, --help                Show this help message
+              --help=verbose        Show verbose help including all bundler options
           -v, --version             Show Shakapacker version
           --debug-shakapacker       Enable Node.js debugging (--inspect-brk)
           --trace-deprecation       Show stack traces for deprecations
@@ -347,7 +350,7 @@ module Shakapacker
 
         HELP
 
-        print_bundler_help
+        print_bundler_help(verbose: verbose)
 
         puts <<~HELP
 
@@ -366,8 +369,9 @@ module Shakapacker
         HELP
       end
 
-      def self.print_bundler_help
-        bundler_type, bundler_help = get_bundler_help
+      def self.print_bundler_help(verbose: false)
+        help_flag = verbose ? "--help=verbose" : "--help"
+        bundler_type, bundler_help = get_bundler_help(help_flag)
 
         if bundler_help
           bundler_name = bundler_type == :rspack ? "RSPACK" : "WEBPACK"
@@ -390,8 +394,8 @@ module Shakapacker
         end
       end
 
-      def self.get_bundler_help
-        execute_bundler_command("--help") { |stdout| stdout }
+      def self.get_bundler_help(help_flag = "--help")
+        execute_bundler_command(help_flag) { |stdout| stdout }
       end
 
       # Filter bundler help output to remove Shakapacker-managed options

data/lib/shakapacker/swc_migrator.rb

@@ -61,13 +61,13 @@ module Shakapacker
             keepClassNames: true,
             transform: {
               react: {
-                runtime: "automatic",
-                refresh: env.isDevelopment && env.runningWebpackDevServer
-              }
-            }
-          }
-        }
-      }
+                runtime: 'automatic',
+                refresh: env.isDevelopment && env.runningWebpackDevServer,
+              },
+            },
+          },
+        },
+      };
     JS
 
     def initialize(root_path, logger: nil)

data/lib/shakapacker/version.rb

@@ -1,4 +1,4 @@
 module Shakapacker
   # Change the version in package.json too, please!
-  VERSION = "9.3.0.beta.5".freeze
+  VERSION = "9.3.0.beta.7".freeze
 end