isomorfeus-preact 10.6.45 → 10.6.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3363983634e71069a60fa277a03d0394993690dcf7cab706fb8a28fc22367072
-  data.tar.gz: d8a9855c74eb31e3de87dba1c5bd5c5362a6f2cda93d7bbcb42e8b1ceec6d7ea
+  metadata.gz: c6aa16242ab93d05f360dd9c8b3455dd2e4b4084835116cd8973356edde20d4c
+  data.tar.gz: b230de356c9524d886f9cbfed54edc39c5531d7531b205301358c19acb800809
 SHA512:
-  metadata.gz: 8a2e5544a14afdb95e1ca54a679285fffffacb9d25b8c8ab7971acd70d71221fde8b4c28733ee0aa4ca8900226653db6273de1d1d14552214a7c8458e6f51b88
-  data.tar.gz: 2cf4331a001fce697899ebaacb409a50a8d1873efad53f52ebf4612cac50f02f8616eac13b9ab62518417f78503c7077750f8fc5a361ff53e3c4d36a865f4bce
+  metadata.gz: f0c8247ff444a7f045eb80e6a6d575f957869f87b559df2dba16520ebfe92e2a46d15aee505e9dd908fd4ce061139ff8285a9a9cef7afb6cb75f43d2fd728f50
+  data.tar.gz: acd073c0cb7c199228efa51ed17c1b11612f20670a4cea63b2c382bce7bf1dfef37d43180332de482907b6778fb15cf2d347a5f4a5aa15cdb94e90b02d913635

data/lib/isomorfeus/preact/config.rb

@@ -17,10 +17,7 @@ module Isomorfeus
       end
 
       def force_init!
-        unless Isomorfeus.initial_state_fetched
-          Isomorfeus.initial_state_fetched = true
-          Redux::Store.preloaded_state = Isomorfeus.store.get_state
-        end
+        @initialized = true
         Isomorfeus.force_init_store!
         execute_init_classes
       end
@@ -38,17 +35,6 @@ module Isomorfeus
         self.send("#{key}=", value)
       end
 
-      # only used for SSR
-      def cached_component_classes
-        @cached_component_classes ||= {}
-      end
-
-      # only used for SSR
-      def cached_component_class(class_name)
-        return cached_component_classes[class_name] if cached_component_classes.key?(class_name)
-        cached_component_classes[class_name] = "::#{class_name}".constantize
-      end
-
       def execute_init_classes
         client_init_class_names.each do |constant|
           constant.constantize.send(:init)

data/lib/isomorfeus/preact_view_helper.rb

@@ -58,7 +58,7 @@ module Isomorfeus
         # execute first render pass
         begin
           pass += 1
-          has_transport, has_store, need_further_pass, exception = ctx.exec(javascript)
+          has_transport, need_further_pass, exception = ctx.exec(javascript)
           Isomorfeus.raise_error(message: "Server Side Rendering: #{exception['message']}", stack: exception['stack']) if exception
         rescue Exception => e
           Isomorfeus.raise_error(error: e)
@@ -95,14 +95,10 @@ module Isomorfeus
           Isomorfeus.raise_error(message: "Server Side Rendering: #{exception['message']}", stack: exception['stack']) if exception
         else
           start_time = Time.now
-          script_key = if has_transport && has_store
+          script_key = if has_transport
                          :still_busy
-                       elsif has_transport
-                         :transport_busy
-                       elsif has_store
-                         :store_busy
                        else
-                         nil
+                         :store_busy
                        end
           while need_further_pass
             # execute further render passes

data/lib/isomorfeus/ssr.rb

@@ -11,7 +11,6 @@ module Isomorfeus
         global.Exception = false;
         global.IsomorfeusSessionId = session_id;
         global.HasTransport = (typeof global.Opal.Isomorfeus.Transport !== 'undefined') && (api_ws_path !== '');
-        global.HasStore = typeof global.Opal.Isomorfeus.store !== 'undefined';
         global.Opal.Isomorfeus['$env='](env);
         if (typeof global.Opal.Isomorfeus["$current_locale="] === 'function') { global.Opal.Isomorfeus["$current_locale="](locale); }
         global.Opal.Isomorfeus['$force_init!']();
@@ -22,8 +21,7 @@ module Isomorfeus
           global.Opal.send(global.Opal.Isomorfeus.Transport.$promise_connect(global.IsomorfeusSessionId), 'then', [], ($$1 = function(){
             try {
               global.RenderedTree = global.Opal.Isomorfeus.TopLevel.$render_component_to_string(component_name, props);
-              let nfp = global.Opal.Isomorfeus.Transport["$busy?"]() || global.Opal.Isomorfeus.store['$recently_dispatched?']();
-              global.NeedFurtherPass = (nfp == nil) ? false : nfp;
+              global.NeedFurtherPass = self.still_busy();
               global.FirstPassFinished = true;
             } catch (e) {
               global.Exception = e;
@@ -33,16 +31,13 @@ module Isomorfeus
         } else {
           try {
             global.RenderedTree = global.Opal.Isomorfeus.TopLevel.$render_component_to_string(component_name, props);
-            if (global.HasStore) {
-              let nfp = global.Opal.Isomorfeus.store['$recently_dispatched?']();
-              global.NeedFurtherPass = (nfp == nil) ? false : nfp;
-            }
+            global.NeedFurtherPass = self.store_busy();
           } catch (e) {
             global.Exception = e;
             global.NeedFurtherPass = false;
           }
         };
-        return [global.HasTransport, global.HasStore, global.NeedFurtherPass, global.Exception ? { message: global.Exception.message, stack: global.Exception.stack } : false];
+        return [global.HasTransport, global.NeedFurtherPass, global.Exception ? { message: global.Exception.message, stack: global.Exception.stack } : false];
       }
 
       self.first_pass_result = function() {
@@ -66,8 +61,7 @@ module Isomorfeus
         }
         let application_state = global.Opal.Isomorfeus.store.native.getState();
         if (typeof global.NanoCSSInstance !== 'undefined') { ssr_styles = global.NanoCSSInstance.raw }
-        let nfp = (global.HasTransport && global.Opal.Isomorfeus.Transport["$busy?"]()) || (global.HasStore && global.Opal.Isomorfeus.store["$recently_dispatched?"]());
-        global.NeedFurtherPass = (nfp == nil) ? false : nfp;
+        global.NeedFurtherPass = ((global.HasTransport && global.Opal.Isomorfeus.Transport["$busy?"]()) || self.store_busy());
         return [rendered_tree, application_state, ssr_styles, global.Opal.Isomorfeus['$ssr_response_status'](), global.NeedFurtherPass, global.Exception ? { message: global.Exception.message, stack: global.Exception.stack } : false];
       }
 

data/lib/isomorfeus/top_level_ssr.rb

@@ -21,9 +21,18 @@ module Isomorfeus
             component = component_name;
           }
         }
-        component = Isomorfeus.cached_component_class(component_name) unless component
+        component = cached_component_class(component_name) unless component
         Preact.render_to_string(Preact.create_element(component, `Opal.Hash.$new(props)`))
       end
+
+      def cached_component_classes
+        @cached_component_classes ||= {}
+      end
+
+      def cached_component_class(class_name)
+        return cached_component_classes[class_name] if cached_component_classes.key?(class_name)
+        cached_component_classes[class_name] = "::#{class_name}".constantize
+      end
     end
   end
 end

data/lib/preact/version.rb

@@ -1,3 +1,3 @@
 module Preact
-  VERSION = '10.6.45'
+  VERSION = '10.6.46'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-preact
 version: !ruby/object:Gem::Version
-  version: 10.6.45
+  version: 10.6.46
 platform: ruby
 authors:
 - Jan Biedermann