isomorfeus-preact 22.9.0.rc2 → 22.9.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1941d58313b84f914e1a02af158c082f7db2ff2dc807326937b2278ada18fe26
-  data.tar.gz: c8201b7ee9f43842e5a08cafe1342444d351effc2e14607c8d40b809fee1db7d
+  metadata.gz: d21e147a89cb2cf3634e110df0fe606184d6b87d4069bdd1c20a6b8242cf11d7
+  data.tar.gz: e6bc52cb3de1d9058c5a7c260c103f1d09552fefa8508424cf04d4a9721a2227
 SHA512:
-  metadata.gz: eaa0e1d7b8a55ddf4a2df7f1c84b042b5abe5d4be8eb88425fe58accebdea661d877dc7ad4c39d66419ade311951658b99670ba71d271bc5dd00f4f86a90250c
-  data.tar.gz: dc7ec144d1c841d1a95a23b45458bbda2f0ae1ca12e6f516a40024a526be72a5e7b50a18aa0c700808caea085c8399ae1d87e8e1f0c4536fa8ba065830f0ea93
+  metadata.gz: fcfd20cd641399287821454d0d09c600ed51a660dd0efc949a5d585166c3c9a29794a4fb7e88271fb03d48aabb33109144e7c6912526b7bf49f302e5aa6b63a6
+  data.tar.gz: a4f55aae16d757584903b3114b77092b8509d759887596681c5935e178f2d1fa2bda97c1ecb8b719adde179bc3a3bebf27916381dce51e85f4b26a0837a10ce1

data/lib/isomorfeus/preact/config.rb

@@ -41,7 +41,6 @@ module Isomorfeus
   else # RUBY_ENGINE
     class << self
       attr_reader :component_cache_init_block
-      attr_accessor :server_side_rendering
       attr_accessor :ssr_hot_asset_url
 
       def ssr_response_status

data/lib/isomorfeus/preact/ssr.rb

@@ -1,11 +1,6 @@
 module Isomorfeus
   class PreactSSR
-    def self.mount_component(component_name, props, session_id, location, locale = nil)
-      rendered_tree = new(component_name, props, session_id, location, locale).render
-      [rendered_tree, Isomorfeus.store.get_state, NanoCSS.instance.renderer[:raw]]
-    end
-
-    def initialize(component_name, props, session_id, location, locale = nil)
+    def initialize(component_name, props, session_id, location, locale)
       @session_id = session_id
       @component_name = component_name
       @props = props
@@ -13,12 +8,14 @@ module Isomorfeus
       @locale = locale
     end
 
-    def render
+    def render(skip_ssr)
       Isomorfeus.browser_location = Browser::Location.new(@location)
       Isomorfeus.current_locale = @locale
       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 })
+      return '' if skip_ssr
       c = Isomorfeus.current_user
       if c.respond_to?(:reload)
         Thread.current[:isomorfeus_user] = LocalSystem.new
@@ -28,7 +25,13 @@ module Isomorfeus
           Thread.current[:isomorfeus_user] = c
         end
       end
-      Isomorfeus::TopLevel.render_component_to_string(@component_name, @props)
+      render_component_to_string(@component_name, @props)
+    end
+
+    def render_component_to_string(component_name, props)
+      component = component_name.is_a?(String) ? self.class.const_get(component_name) : component_name
+      ::Preact._vnode_id = 0
+      ::Preact.render_to_string(::Preact.create_element(component, props))
     end
   end
 end

data/lib/isomorfeus/preact/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Preact
-    VERSION = '22.9.0.rc2'
+    VERSION = '22.9.0.rc3'
   end
 end

data/lib/isomorfeus/preact/view_helper.rb

@@ -4,46 +4,38 @@ module Preact
       base.include Isomorfeus::AssetManager::ViewHelper
     end
 
-    def cached_mount_component(component_name, props = {}, skip_ssr: false, use_ssr: false, refresh: false)
+    def cached_mount_component(component_name, props = {}, skip_ssr: false, refresh: false)
       key = "#{Isomorfeus.current_user}#{component_name}#{props}"
       if !Isomorfeus.development? && !refresh
         render_result, @_ssr_styles, status = component_cache.fetch(key)
         Isomorfeus.ssr_response_status = status
         return render_result if render_result
       end
-      render_result = mount_component(component_name, props, asset_key, skip_ssr: skip_ssr, use_ssr: use_ssr)
+      render_result = mount_component(component_name, props, asset_key, skip_ssr: skip_ssr)
       status = ssr_response_status
       component_cache.store(key, render_result, ssr_styles, status) if status >= 200 && status < 300
       render_result
     end
 
-    def mount_component(component_name, props = {}, skip_ssr: false, use_ssr: false)
+    def mount_component(component_name, props = {}, skip_ssr: false)
       ssr_start_time = Time.now if Isomorfeus.development?
       @ssr_styles = nil
+      locale = props.delete(:locale)
       render_result = "<div data-iso-env=\"#{Isomorfeus.env}\" data-iso-root=\"#{component_name}\" data-iso-props='#{Oj.dump(props, mode: :strict)}'"
-      if !skip_ssr && (Isomorfeus.server_side_rendering || use_ssr)
-        location_host = props[:location_host] ? props[:location_host] : 'localhost'
-        location = "#{props[:location_scheme] || 'http:'}//#{location_host}#{props[:location]}"
+      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::PreactSSR.mount_component(component_name, props, Thread.current[:isomorfeus_session_id], location, props[:locale])
+      rendered_tree, application_state, @_ssr_styles = Isomorfeus::TopLevel.mount_component(component_name, props, Thread.current[:isomorfeus_session_id], location, locale, skip_ssr)
 
-        render_result << " data-iso-hydrated='true'" if rendered_tree
-        if Isomorfeus.respond_to?(:current_user) && Isomorfeus.current_user && !Isomorfeus.current_user.anonymous?
-          render_result << " data-iso-usids=#{Oj.dump(Isomorfeus.current_user.sid.to_s, mode: :strict)}"
-        end
-        render_result << " data-iso-nloc='#{props[:locale]}'>"
-        render_result << (rendered_tree ? rendered_tree : "SSR didn't work")
-      else
-        if Isomorfeus.respond_to?(:current_user) && Isomorfeus.current_user && !Isomorfeus.current_user.anonymous?
-          render_result << " data-iso-usids=#{Oj.dump(Isomorfeus.current_user.sid.to_s, mode: :strict)}"
-        end
-        render_result << " data-iso-nloc='#{props[:locale]}'>"
+      render_result << " data-iso-hydrated='true'" unless skip_ssr
+      if Isomorfeus.respond_to?(:current_user) && Isomorfeus.current_user && !Isomorfeus.current_user.anonymous?
+        render_result << " data-iso-usids=#{Oj.dump(Isomorfeus.current_user.sid.to_s, mode: :strict)}"
       end
+      render_result << '>'
+      render_result << (rendered_tree ? rendered_tree : "SSR didn't work")
       render_result << '</div>'
-      if Isomorfeus.server_side_rendering && !skip_ssr
-        render_result = "<script type='application/javascript'>\nServerSideRenderingStateJSON = #{Oj.dump(application_state, mode: :strict)}\n</script>\n" << render_result
-        puts "Preact::ViewHelper Server Side Rendering took ~#{((Time.now - ssr_start_time)*1000).to_i}ms" if Isomorfeus.development?
-      end
+      render_result = "<script type='application/javascript'>\nServerSideRenderingStateJSON = #{Oj.dump(application_state, mode: :strict)}\n</script>\n" << render_result
+      puts "Preact::ViewHelper Server Side Rendering took ~#{((Time.now - ssr_start_time)*1000).to_i}ms" if Isomorfeus.development?
       render_result
     end
 

data/lib/isomorfeus/top_level.rb

@@ -117,10 +117,9 @@ module Isomorfeus
           Isomorfeus.top_component = top
         end
       else
-        def render_component_to_string(component_name, props)
-          component = component_name.is_a?(String) ? const_get(component_name) : component_name
-          ::Preact._vnode_id = 0
-          ::Preact.render_to_string(::Preact.create_element(component, props))
+        def mount_component(component, props, session_id, location, locale, skip_ssr = false)
+          rendered_tree = Isomorfeus::PreactSSR.new(component, props, session_id, location, locale).render(skip_ssr)
+          [rendered_tree, Isomorfeus.store.get_state, NanoCSS.instance.renderer[:raw]]
         end
       end
     end

data/lib/isomorfeus-preact.rb

@@ -81,7 +81,6 @@ else
     Isomorfeus.ssr_hot_asset_url = 'http://localhost:3036/assets/'
   end
 
-  Isomorfeus.server_side_rendering = true
   NanoCSS.instance = NanoCSS.new(nil)
 
   # cache

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-preact
 version: !ruby/object:Gem::Version
-  version: 22.9.0.rc2
+  version: 22.9.0.rc3
 platform: ruby
 authors:
 - Jan Biedermann
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 22.9.0.rc2
+        version: 22.9.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 22.9.0.rc2
+        version: 22.9.0.rc3
 - !ruby/object:Gem::Dependency
   name: isomorfeus-redux
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 22.9.0.rc2
+        version: 22.9.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 22.9.0.rc2
+        version: 22.9.0.rc3
 - !ruby/object:Gem::Dependency
   name: isomorfeus-puppetmaster
   requirement: !ruby/object:Gem::Requirement