Always clear hydrated stores inside the server-side rendering worker

squadette · justin808 · commit 91ef0f960b7f · 2018-07-22T14:57:53.000-10:00
diff --git a/lib/react_on_rails/helper.rb b/lib/react_on_rails/helper.rb
@@ -472,14 +472,14 @@ def server_rendered_react_component(render_options)
     end
 
     def initialize_redux_stores
-      return "" unless @registered_stores.present? || @registered_stores_defer_render.present?
-      declarations = "var reduxProps, store, storeGenerator;\n".dup
-      all_stores = (@registered_stores || []) + (@registered_stores_defer_render || [])
-
       result = <<-JS.dup
       ReactOnRails.clearHydratedStores();
       JS
 
+      return result unless @registered_stores.present? || @registered_stores_defer_render.present?
+      declarations = "var reduxProps, store, storeGenerator;\n".dup
+      all_stores = (@registered_stores || []) + (@registered_stores_defer_render || [])
+
       result << all_stores.each_with_object(declarations) do |redux_store_data, memo|
         store_name = redux_store_data[:store_name]
         props = props_string(redux_store_data[:props])
