react-rails 3.2.1 → 3.3.1

data/lib/react/rails/railtie.rb

@@ -66,7 +66,7 @@ module React
         ActionController::Renderers.add :component do |component_name, options|
           renderer = ::React::Rails::ControllerRenderer.new(controller: self)
           html = renderer.call(component_name, options)
-          render_options = options.merge(inline: html)
+          render_options = Railtie.component_render_options(options, html)
           render(render_options)
         end
       end
@@ -76,10 +76,8 @@ module React
                                                          variant: app.config.react.variant
                                                        })
 
-        sprockets_env = app.assets || app.config.try(:assets) # sprockets-rails 3.x attaches this at a different config
-        unless sprockets_env.nil?
-          sprockets_env.version = [sprockets_env.version, "react-#{asset_variant.react_build}"].compact.join("-")
-        end
+        assets = app.assets || app.config.try(:assets) # sprockets-rails 3.x attaches this at a different config
+        Railtie.append_react_build_to_assets_version!(assets, asset_variant.react_build)
       end
 
       initializer "react_rails.set_variant", after: :engines_blank_point, group: :all do |app|
@@ -114,6 +112,37 @@ module React
           React::JSX::SprocketsStrategy.attach_with_strategy(sprockets_env, app.config.react.sprockets_strategy)
         end
       end
+
+      # :nodoc:
+      def self.append_react_build_to_assets_version!(assets, react_build)
+        versioned_assets = versioned_assets_for(assets)
+        return if versioned_assets.nil?
+
+        versioned_assets.version = [versioned_assets.version, "react-#{react_build}"].compact.join("-")
+      end
+
+      # :nodoc:
+      def self.component_render_options(options, html)
+        render_options = options.merge(inline: html)
+        return render_options if render_options.key?(:layout)
+
+        render_options.merge(layout: true)
+      end
+
+      def self.versioned_assets_for(assets)
+        return assets if versioned_assets?(assets)
+
+        config = assets.config if assets.respond_to?(:config)
+        return config if versioned_assets?(config)
+
+        nil
+      end
+
+      def self.versioned_assets?(assets)
+        assets.respond_to?(:version) && assets.respond_to?(:version=)
+      end
+
+      private_class_method :versioned_assets_for, :versioned_assets?
     end
   end
 end

data/lib/react/rails/version.rb

@@ -4,6 +4,6 @@ module React
   module Rails
     # If you change this, make sure to update VERSIONS.md
     # and republish the UJS by updating package.json and `bundle exec rake ujs:publish`
-    VERSION = "3.2.1"
+    VERSION = "3.3.1"
   end
 end

data/lib/react/server_rendering/bundle_renderer.rb

@@ -4,6 +4,7 @@ require "react/server_rendering/environment_container"
 require "react/server_rendering/manifest_container"
 require "react/server_rendering/yaml_manifest_container"
 require "react/server_rendering/separate_server_bundle_container"
+require "react/server_rendering/propshaft_container"
 
 module React
   module ServerRendering
@@ -103,6 +104,7 @@ module React
       def asset_container_class
         return self.class.asset_container_class if self.class.asset_container_class.present?
         return SeparateServerBundleContainer if SeparateServerBundleContainer.compatible?
+        return PropshaftContainer if PropshaftContainer.compatible?
 
         return EnvironmentContainer unless assets_precompiled?
 

data/lib/react/server_rendering/propshaft_container.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module React
+  module ServerRendering
+    # Return asset contents by getting them from a Propshaft::Assembly instance.
+    class PropshaftContainer
+      class << self
+        def assembly
+          ::Rails.application.assets
+        end
+
+        def compatible?
+          !!defined?(Propshaft) && assembly.is_a?(Propshaft::Assembly)
+        end
+      end
+
+      def find_asset(path)
+        self.class.assembly.load_path.find(path).content.force_encoding("utf-8")
+      end
+    end
+  end
+end

data/lib/react/server_rendering.rb

@@ -16,7 +16,7 @@ module React
     # @return [void]
     def self.reset_pool
       options = { size: pool_size, timeout: pool_timeout }
-      @pool = ConnectionPool.new(options) { renderer.new(renderer_options) }
+      @pool = ConnectionPool.new(**options) { renderer.new(renderer_options) }
     end
 
     # Check a renderer out of the pool and use it to render the component.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: react-rails
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.3.1
 platform: ruby
 authors:
 - Paul O’Shannessy
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-17 00:00:00.000000000 Z
+date: 2026-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -199,16 +199,16 @@ dependencies:
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.8.0
 - !ruby/object:Gem::Dependency
   name: package_json
   requirement: !ruby/object:Gem::Requirement
@@ -397,6 +397,7 @@ files:
 - lib/react/server_rendering/environment_container.rb
 - lib/react/server_rendering/exec_js_renderer.rb
 - lib/react/server_rendering/manifest_container.rb
+- lib/react/server_rendering/propshaft_container.rb
 - lib/react/server_rendering/separate_server_bundle_container.rb
 - lib/react/server_rendering/yaml_manifest_container.rb
 homepage: https://github.com/reactjs/react-rails
@@ -418,7 +419,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: React integration for Ruby on Rails