feat(ServerRendering) remove previous Renderer

Author: rmosolgo

lib/react-rails.rb

@@ -1,6 +1,4 @@
 require 'react/jsx'
-require 'react/renderer'
 require 'react/rails'
-require 'react/console'
 require 'react/server_rendering'
 

lib/react/console.rb

@@ -49,24 +49,13 @@ class Railtie < ::Rails::Railtie
           "react-#{variant}",
         ].compact.join('-')
 
-        # Server Rendering
-        # Concat component_filenames together for server rendering
-        app.config.react.components_js = lambda {
-          app.config.react.component_filenames.map do |filename|
-            app.assets[filename].to_s
-          end.join(";")
-        }
-
-        do_setup = lambda do
-          cfg = app.config.react
-          React::Renderer.setup!( cfg.react_js, cfg.components_js, cfg.replay_console,
-                                {:size => cfg.max_renderers, :timeout => cfg.timeout})
-        end
-
-        do_setup.call
-
-        # Reload the JS VMs in dev when files change
-        ActionDispatch::Reloader.to_prepare(&do_setup)
+        app.config.react.server_renderer_options  ||= {}
+        app.config.react.server_renderer          ||= React::ServerRendering::SprocketsRenderer
+        React::ServerRendering.renderer_options   = app.config.react.server_renderer_options
+        React::ServerRendering.renderer           = app.config.react.server_renderer
+        React::ServerRendering.reset_pool
+        # Reload renderers in dev when files change
+        ActionDispatch::Reloader.to_prepare { React::ServerRendering.reset_pool }
       end
     end
   end

lib/react/rails/railtie.rb

@@ -1,28 +1,28 @@
 module React
   module Rails
     module ViewHelper
-
       # Render a UJS-type HTML tag annotated with data attributes, which
       # are used by react_ujs to actually instantiate the React component
       # on the client.
-      #
-      def react_component(name, args = {}, options = {}, &block)
+      def react_component(name, props = {}, options = {}, &block)
         options = {:tag => options} if options.is_a?(Symbol)
-        block = Proc.new{concat React::Renderer.render(name, args)} if options[:prerender]
+
+        if options[:prerender]
+          block = Proc.new{ concat React::ServerRendering.render(name, props) }
+        end
 
         html_options = options.reverse_merge(:data => {})
         html_options[:data].tap do |data|
           data[:react_class] = name
-          data[:react_props] = React::Renderer.react_props(args) unless args.empty?
+          data[:react_props] = (props.is_a?(String) ? props : props.to_json)
         end
         html_tag = html_options[:tag] || :div
-        
+
         # remove internally used properties so they aren't rendered to DOM
         html_options.except!(:tag, :prerender)
-        
+
         content_tag(html_tag, '', html_options, &block)
       end
-
     end
   end
 end

lib/react/rails/view_helper.rb

@@ -4,21 +4,14 @@ def show
   end
 
   def console_example
-    hack_replay_console_config true
+    React::ServerRendering.renderer_options = {replay_console:  true}
+    React::ServerRendering.reset_pool
     @todos = %w{todo1 todo2 todo3}
   end
 
   def console_example_suppressed
-    hack_replay_console_config false
+    React::ServerRendering.renderer_options = {replay_console:  false}
+    React::ServerRendering.reset_pool
     @todos = %w{todo1 todo2 todo3}
   end
-
-  private
-  def hack_replay_console_config(value)
-    # Don't do this in your app; just set it how you want it in config/application.rb
-    cfg = ::Rails.application.config.react
-    cfg.replay_console = value
-    React::Renderer.setup!( cfg.react_js, cfg.components_js, cfg.replay_console,
-                        {:size => cfg.max_renderers, :timeout => cfg.timeout})
-  end
 end

lib/react/renderer.rb

@@ -13,11 +13,18 @@ def render(component_name, props)
 
 class ReactServerRenderingTest < ActiveSupport::TestCase
   setup do
+    @previous_renderer = React::ServerRendering.renderer
+    @previous_options = React::ServerRendering.renderer_options
     React::ServerRendering.renderer_options = "TEST"
     React::ServerRendering.renderer = NullRenderer
     React::ServerRendering.reset_pool
   end
 
+  teardown do
+    React::ServerRendering.renderer = @previous_renderer
+    React::ServerRendering.renderer_options = @previous_options
+  end
+
   test '.create_renderer makes a renderer with initialization options' do
     mock_renderer = MiniTest::Mock.new
     mock_renderer.expect(:new, :fake_renderer, [{mock: true}])