react_on_rails 16.3.0.rc.1 → 16.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1eeac1830a6d09ce4ac9fbaeeadc3fcdcdcaa18742ca780346a08ead846bb51a
-  data.tar.gz: 0b946d3c72239b0745cadb7a3961a74a73177e9a307ed21f2d1add1006e64fbb
+  metadata.gz: 0ace0aef17c3665d3f573612c0fb1298834237fab6c25c67dc609fcd844efacf
+  data.tar.gz: 9768eec151936531996266b8635cfa9431014a98219b76c6a501ccba63a42ab2
 SHA512:
-  metadata.gz: 4c8e8ed2bb0bcf39955c2b8adffa9503160c4f47aa8395d3798f97fd89dfd376588a2356db7673ec69dfe97605b043714923385fda0f92b6b7ce7d30b4e19d7d
-  data.tar.gz: 7580e935af6eca381be3f7150c3927740a1e33971bcafc00a5d50d1cd17f2d8934172cc80bd67a69b1ec41ef6b1280aec733e59de84632996e584381f17c5228
+  metadata.gz: c1f027af8612019f38ab829a9b99ca50f869112f9b6f0f47fd0af27aa4bf6cabfb1ab45121ce7c4607d12f364292cecc21e8aba863b791f52d6fa557231e9fa2
+  data.tar.gz: 4d6549c75f9615433be29f67d7ea68963e2f7480ad4468f86a9da2f50d1d490f5311ce188ddac3fb422e52cf20aaffa1d24b175214cd4321574fe616b21f42bc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    react_on_rails (16.3.0.rc.1)
+    react_on_rails (16.3.0)
       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,45 @@ 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 regex replacement to preserve file structure (comments, anchors, aliases)
+        # This replaces ALL occurrences of assets_bundler, not just in default section
+        # Using gsub_file (Thor method) for consistency with Rails generator patterns
+        gsub_file(
+          shakapacker_config_path,
+          /^(\s*assets_bundler:\s*)["']?webpack["']?(\s*(?:#.*)?)$/,
+          '\1rspack\2'
+        )
+
+        # Update javascript_transpiler to swc (rspack works best with SWC)
+        gsub_file(
+          shakapacker_config_path,
+          /^(\s*javascript_transpiler:\s*)["']?babel["']?(\s*(?:#.*)?)$/,
+          '\1swc\2'
+        )
 
-        # 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/generators/react_on_rails/templates/base/base/bin/switch-bundler

@@ -2,7 +2,6 @@
 # frozen_string_literal: true
 
 require "fileutils"
-require "yaml"
 require "json"
 
 # Script to switch between webpack and rspack bundlers
@@ -48,16 +47,25 @@ class BundlerSwitcher
     abort "❌ #{@shakapacker_config} not found" unless File.exist?(@shakapacker_config)
 
     puts "📝 Updating #{@shakapacker_config}..."
-    config = YAML.load_file(@shakapacker_config)
-
-    config["default"] ||= {}
-    config["default"]["assets_bundler"] = @target_bundler
-
-    # Update webpack_loader based on bundler
-    # Rspack works best with SWC, webpack typically uses babel
-    config["default"]["webpack_loader"] = @target_bundler == "rspack" ? "swc" : "babel"
-
-    File.write(@shakapacker_config, YAML.dump(config))
+    content = File.read(@shakapacker_config)
+
+    # Use regex replacement to preserve file structure (comments, anchors, aliases)
+    # This replaces ALL occurrences of assets_bundler, not just in default section
+    old_bundler = @target_bundler == "rspack" ? "webpack" : "rspack"
+    new_content = content.gsub(
+      /^(\s*assets_bundler:\s*)["']?#{old_bundler}["']?(\s*(?:#.*)?)$/,
+      "\\1#{@target_bundler}\\2"
+    )
+
+    # Update javascript_transpiler based on bundler (rspack works best with SWC)
+    new_loader = @target_bundler == "rspack" ? "swc" : "babel"
+    old_loader = @target_bundler == "rspack" ? "babel" : "swc"
+    new_content = new_content.gsub(
+      /^(\s*javascript_transpiler:\s*)["']?#{old_loader}["']?(\s*(?:#.*)?)$/,
+      "\\1#{new_loader}\\2"
+    )
+
+    File.write(@shakapacker_config, new_content)
     puts "✅ Updated assets_bundler to '#{@target_bundler}'"
   end
 
@@ -135,6 +143,7 @@ if ARGV.empty?
   puts "\nExamples:"
   puts "  bin/switch-bundler rspack   # Switch to Rspack"
   puts "  bin/switch-bundler webpack  # Switch to Webpack"
+  puts "\nNote: This also updates javascript_transpiler (rspack uses swc, webpack uses babel)"
   exit 1
 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"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: react_on_rails
 version: !ruby/object:Gem::Version
-  version: 16.3.0.rc.1
+  version: 16.3.0
 platform: ruby
 authors:
 - Justin Gordon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-02-04 00:00:00.000000000 Z
+date: 2026-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable