isomorfeus-preact 23.9.0.rc8 → 23.9.0.rc10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ee612350269b6b9f4010cd90e0663ba14d4db803936db613891732f826641e9
-  data.tar.gz: 7a87897f5d468e213e0c06b2d4077c6293a6bdd8ea04125f754eca2a2f1fc41c
+  metadata.gz: e11d06cc37c522f3950c5dc8c03c72ad856c597180bec57e2d0bfea892a6aef5
+  data.tar.gz: 4f8ec478471f0b619cd842f08f52f2c4e1575fc4171058bfbfc73134b9802e46
 SHA512:
-  metadata.gz: e2a9266c8529c0300e7b40b411e564efe6a8cabb914483297c278e094eb23a8166429219d6ee11a71526f7d9619786889f316eccb81330dfb7e2857c245803dc
-  data.tar.gz: db97df5c37d9177e0214fb7bfa317648a6944274f6a8324561fa2e646d80ac471a35860062cf204378380b44c451fb04bb2d87afb2fc986da7fa1f7cbd2202bf
+  metadata.gz: aff68e7e72f35d2277afb7d2220cf9c48fd6b3ee28e9645849f067f1342483540ee153aacdf733aa1014e62e5bc9c0790886447300d376382f8051419609aa3a
+  data.tar.gz: fcdc23ceac7f3eed1ee51a49127507f6c7eab2f1bbbd46297422aa711783f36091fcbb9b359fa85b634a7d113d0a26d96bcaa20fce905b8b4e3a09bea831181e

data/lib/isomorfeus/preact/ssr.rb

@@ -7,14 +7,16 @@ module Isomorfeus
       @locale = locale
     end
 
-    def render(skip_ssr)
+    def render(skip_ssr, keep_state)
       Isomorfeus.browser_location = Browser::Location.new(@location)
       Isomorfeus.current_locale = @locale if @locale
       Isomorfeus.ssr_response_status = 200
       NanoCSS.instance = NanoCSS.new(given_renderer: NanoCSS.global_instance.renderer.deep_dup)
-      Isomorfeus.init_store
-      Isomorfeus.store.clear!
-      Isomorfeus.store.dispatch(type: 'I18N_MERGE', data: { locale: @locale, domain: Isomorfeus.i18n_domain })
+      unless keep_state
+        Isomorfeus.init_store
+        Isomorfeus.store.clear!
+        Isomorfeus.store.dispatch(type: 'I18N_INIT', data: { locale: @locale, domain: Isomorfeus.i18n_domain })
+      end
       return '' if skip_ssr
       c = Isomorfeus.current_user
       if c.respond_to?(:reload)

data/lib/isomorfeus/preact/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Preact
-    VERSION = '23.9.0.rc8'
+    VERSION = '23.9.0.rc10'
   end
 end

data/lib/isomorfeus/preact/view_helper.rb

@@ -17,27 +17,19 @@ module Preact
       render_result
     end
 
-    def mount_component(component_name, props = {}, skip_ssr: false)
-      ssr_start_time = Time.now if Isomorfeus.development?
+    def mount_component(component_name, props = {}, skip_ssr: false, keep_state: false)
       locale = props.delete(:locale)
       location_host = props[:location_host] ? props[:location_host] : 'localhost'
       location = "#{props[:location_scheme] || 'http:'}//#{location_host}#{props[:location]}"
 
-      rendered_tree, application_state, @_ssr_styles = Isomorfeus::TopLevel.mount_component(component_name, props, location, locale, skip_ssr)
+      rendered_tree, @_ssr_application_state, @_ssr_styles = Isomorfeus::TopLevel.mount_component(component_name, props, location, locale, skip_ssr, keep_state)
       component_name = component_name.to_s unless component_name.is_a?(String)
       usids = if Isomorfeus.respond_to?(:current_user) && Isomorfeus.current_user && !Isomorfeus.current_user.anonymous?
                 Isomorfeus.current_user.sid.to_s
               else
                 nil
               end
-
-      @_ssr_data = <<~HTML
-      <script type='application/javascript'>
-        ServerSideRenderingStateJSON = #{Oj.dump(application_state, mode: :strict)}
-        ServerSideRenderingProps = #{Oj.dump({ env: Isomorfeus.env, component_name: component_name, props: props, hydrated: !skip_ssr, usids: usids }, mode: :strict)}
-      </script>
-      HTML
-      puts "Preact::ViewHelper Server Side Rendering took ~#{((Time.now - ssr_start_time)*1000).to_i}ms" if Isomorfeus.development?
+      @_ssr_props = { env: Isomorfeus.env, component_name: component_name, props: props, hydrated: !skip_ssr, usids: usids }
       rendered_tree ? rendered_tree : "SSR didn't work"
     end
 
@@ -46,7 +38,7 @@ module Preact
     end
 
     def ssr_data
-      @_ssr_data
+      @_ssr_data ||= render_ssr_data
     end
 
     def ssr_styles
@@ -55,6 +47,15 @@ module Preact
 
     private
 
+    def render_ssr_data
+      <<~HTML
+      <script type='application/javascript'>
+        ServerSideRenderingStateJSON = #{Oj.dump(@_ssr_application_state, mode: :strict)}
+        ServerSideRenderingProps = #{Oj.dump(@_ssr_props, mode: :strict)}
+      </script>
+      HTML
+    end
+
     def component_cache
       @_component_cache ||= Isomorfeus.component_cache_init_block.call
     end

data/lib/isomorfeus/top_level.rb

@@ -116,8 +116,8 @@ module Isomorfeus
           Isomorfeus.top_component = top
         end
       else
-        def mount_component(component, props, location, locale, skip_ssr = false)
-          rendered_tree = Isomorfeus::PreactSSR.new(component, props, location, locale).render(skip_ssr)
+        def mount_component(component, props, location, locale, skip_ssr = false, keep_state = false)
+          rendered_tree = Isomorfeus::PreactSSR.new(component, props, location, locale).render(skip_ssr, keep_state)
           [rendered_tree, Isomorfeus.store.get_state, NanoCSS.instance.renderer[:raw]]
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-preact
 version: !ruby/object:Gem::Version
-  version: 23.9.0.rc8
+  version: 23.9.0.rc10
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-20 00:00:00.000000000 Z
+date: 2023-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -78,28 +78,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.9.0.rc8
+        version: 23.9.0.rc10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.9.0.rc8
+        version: 23.9.0.rc10
 - !ruby/object:Gem::Dependency
   name: isomorfeus-redux
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.9.0.rc8
+        version: 23.9.0.rc10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.9.0.rc8
+        version: 23.9.0.rc10
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
   requirement: !ruby/object:Gem::Requirement