react_on_rails 16.3.0.rc.1 → 16.3.0.rc.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1eeac1830a6d09ce4ac9fbaeeadc3fcdcdcaa18742ca780346a08ead846bb51a
-  data.tar.gz: 0b946d3c72239b0745cadb7a3961a74a73177e9a307ed21f2d1add1006e64fbb
+  metadata.gz: 628677c167f906b22c7997308ed630a4c6b93f9b53b4a81cfcfd2960fd6b2d8e
+  data.tar.gz: fc1bd8c3939152cf92f48fa2f2053c8a0a30c4d5503d9468165e08d32f209e50
 SHA512:
-  metadata.gz: 4c8e8ed2bb0bcf39955c2b8adffa9503160c4f47aa8395d3798f97fd89dfd376588a2356db7673ec69dfe97605b043714923385fda0f92b6b7ce7d30b4e19d7d
-  data.tar.gz: 7580e935af6eca381be3f7150c3927740a1e33971bcafc00a5d50d1cd17f2d8934172cc80bd67a69b1ec41ef6b1280aec733e59de84632996e584381f17c5228
+  metadata.gz: a895060d8fdae1dbc7f96e43aaabbe97cd62fa9ace58bcf06e151cdd7055245b2d68c45873d5c628faff49f0f3ad53dffe6c9bcf4d314d79a21bdc2eadd28e2d
+  data.tar.gz: e66ccf6a13d26760349dfa591125b28e311ef2e28b6c5cde4a3ce10139bf2886719db25c0576b9d5a59d792fb831f2c549a1f4981b7eed27cd3dbe95260759cf

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    react_on_rails (16.3.0.rc.1)
+    react_on_rails (16.3.0.rc.2)
       addressable
       connection_pool
       execjs (~> 2.5)

data/lib/generators/react_on_rails/base_generator.rb

@@ -95,16 +95,20 @@ module ReactOnRails
         if File.exist?(".shakapacker_just_installed")
           puts "Skipping Shakapacker config copy (already installed by Shakapacker installer)"
           File.delete(".shakapacker_just_installed") # Clean up marker
-          configure_rspack_in_shakapacker if options.rspack?
-          return
+        else
+          puts "Adding Shakapacker #{ReactOnRails::PackerUtils.shakapacker_version} config"
+          base_path = "base/base/"
+          config = "config/shakapacker.yml"
+          # Use template to enable version-aware configuration
+          template("#{base_path}#{config}.tt", config)
         end
 
-        puts "Adding Shakapacker #{ReactOnRails::PackerUtils.shakapacker_version} config"
-        base_path = "base/base/"
-        config = "config/shakapacker.yml"
-        # Use template to enable version-aware configuration
-        template("#{base_path}#{config}.tt", config)
+        # Configure bundler-specific settings
         configure_rspack_in_shakapacker if options.rspack?
+
+        # Always ensure precompile_hook is configured (Shakapacker 9.0+ only)
+        # This handles all scenarios: fresh install, pre-installed Shakapacker, or user declined overwrite
+        configure_precompile_hook_in_shakapacker
       end
 
       def add_base_gems_to_gemfile
@@ -298,23 +302,35 @@ module ReactOnRails
 
         puts Rainbow("🔧 Configuring Shakapacker for Rspack...").yellow
 
-        # Parse YAML config properly to avoid fragile regex manipulation
-        # Support both old and new Psych versions
-        config = begin
-          YAML.load_file(shakapacker_config_path, aliases: true)
-        rescue ArgumentError
-          # Older Psych versions don't support the aliases parameter
-          YAML.load_file(shakapacker_config_path)
-        end
-        # Update default section
-        config["default"] ||= {}
-        config["default"]["assets_bundler"] = "rspack"
-        config["default"]["webpack_loader"] = "swc"
+        # Use gsub_file to preserve comments and file structure
+        # Replace assets_bundler: "webpack" with assets_bundler: "rspack"
+        gsub_file shakapacker_config_path,
+                  /^(\s*)assets_bundler:\s*["']?webpack["']?\s*$/,
+                  "\\1assets_bundler: \"rspack\""
 
-        # Write back as YAML
-        File.write(shakapacker_config_path, YAML.dump(config))
         puts Rainbow("✅ Updated shakapacker.yml for Rspack").green
       end
+
+      def configure_precompile_hook_in_shakapacker
+        # precompile_hook is only supported in Shakapacker 9.0+
+        return unless ReactOnRails::PackerUtils.shakapacker_version_requirement_met?("9.0.0")
+
+        shakapacker_config_path = "config/shakapacker.yml"
+        return unless File.exist?(shakapacker_config_path)
+
+        content = File.read(shakapacker_config_path)
+
+        # Already has an active (non-commented) precompile_hook configured? Don't overwrite.
+        return if content.match?(/^\s+precompile_hook:\s*['"][^'"]+['"]/)
+
+        # Replace the commented placeholder with the actual value
+        # Shakapacker 9.x default config has: # precompile_hook: ~
+        gsub_file shakapacker_config_path,
+                  /^(\s*)#\s*precompile_hook:\s*~\s*$/,
+                  "\\1precompile_hook: 'bin/shakapacker-precompile-hook'"
+
+        puts Rainbow("✅ Configured precompile_hook in shakapacker.yml").green
+      end
     end
   end
 end

data/lib/react_on_rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ReactOnRails
-  VERSION = "16.3.0.rc.1"
+  VERSION = "16.3.0.rc.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: react_on_rails
 version: !ruby/object:Gem::Version
-  version: 16.3.0.rc.1
+  version: 16.3.0.rc.2
 platform: ruby
 authors:
 - Justin Gordon