isomorfeus-preact 10.6.34 → 10.6.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94d90b7804579f6dd573ec4878ad1d0f4579a7541eefb6b8a7874ca115b36951
-  data.tar.gz: 835a4f9d89c1f0cdd2bc3e7f909481ed182fb4cbd8d5aaf545744280645c16aa
+  metadata.gz: 06de7c22eb8524e87e402efb9580b29571de8605c2277e7055e2e60d2f64b901
+  data.tar.gz: 29c9ee7246ef0a4e0a15433990ff00dd0e5295c6f1ed7a4d10ef7d0dc33f84c9
 SHA512:
-  metadata.gz: 2ec9097e4dfae922a7d665831a90ded698c549f1ac1cbde91912bce844b7124c7de6a4eaaade509624e4a44e56f265fe0c1625daec89375313a91f8d2cae9a29
-  data.tar.gz: b4219dd2ad74032549c276a29d4388058175ea4baf161dfee8c2f5ad7d4181314895289917b2db4e898375130940ab8fd6a244b062c153891cb4586d8c548cb8
+  metadata.gz: 25c7696c2f613a637a452ea4ccb4e3c471de1a2f471f79de667a47a6fb5c26c419124e25b145a3214327866f02819bbdb940d341e7bce60e3399a36edcb6a7af
+  data.tar.gz: 0a4e8945291167adf81552877fc01aa41b41d7aeb639f1a17be3822cc6b43e9a39a07a0b001311d456ba4dfbfbb5f7f4a59fc498ac2fbf5d8505ee37bafbf106

data/lib/isomorfeus/preact_view_helper.rb

@@ -86,13 +86,13 @@ module Isomorfeus
         JAVASCRIPT
         # execute first render pass
         begin
-          pass += 1
           first_pass_skipped = Isomorfeus.ssr_contexts[thread_id_asset].exec(javascript)
         rescue Exception => e
           Isomorfeus.raise_error(error: e)
         end
         # wait for first pass to finish
         unless first_pass_skipped
+          pass += 1
           first_pass_finished, exception = Isomorfeus.ssr_contexts[thread_id_asset].exec('return [global.FirstPassFinished, global.Exception ? { message: global.Exception.message, stack: global.Exception.stack } : false ]')
           Isomorfeus.raise_error(message: "Server Side Rendering: #{exception['message']}", stack: exception['stack']) if exception
           unless first_pass_finished
@@ -132,24 +132,24 @@ module Isomorfeus
             global.Exception = e;
           }
           let application_state = global.Opal.Isomorfeus.store.native.getState();
-          let transport_busy = false;
-          if (typeof global.Opal.Isomorfeus.Transport !== 'undefined' && global.Opal.Isomorfeus.Transport["$busy?"]()) { transport_busy = true; }
+          let still_busy = (#{pass}<2) ? global.Opal.Isomorfeus.store['$recently_dispatched?']() : false;
+          if (typeof global.Opal.Isomorfeus.Transport !== 'undefined' && global.Opal.Isomorfeus.Transport["$busy?"]()) { still_busy = true; }
           if (typeof global.NanoCSSInstance !== 'undefined') { ssr_styles = global.NanoCSSInstance.raw }
-          return [rendered_tree, application_state, ssr_styles, global.Opal.Isomorfeus['$ssr_response_status'](), transport_busy, global.Exception ? { message: global.Exception.message, stack: global.Exception.stack } : false];
+          return [rendered_tree, application_state, ssr_styles, global.Opal.Isomorfeus['$ssr_response_status'](), still_busy, global.Exception ? { message: global.Exception.message, stack: global.Exception.stack } : false];
         JAVASCRIPT
         # execute further render passes
         pass += 1
-        rendered_tree, application_state, @ssr_styles, @ssr_response_status, transport_busy, exception = Isomorfeus.ssr_contexts[thread_id_asset].exec(javascript)
+        rendered_tree, application_state, @ssr_styles, @ssr_response_status, still_busy, exception = Isomorfeus.ssr_contexts[thread_id_asset].exec(javascript)
         start_time = Time.now
-        while transport_busy
+        while still_busy
           break if (Time.now - start_time) > 5
-          while transport_busy
+          while still_busy
             break if (Time.now - start_time) > 4
             sleep 0.01
-            transport_busy = Isomorfeus.ssr_contexts[thread_id_asset].exec('return global.Opal.Isomorfeus.Transport["$busy?"]()')
+            still_busy = Isomorfeus.ssr_contexts[thread_id_asset].exec('return (typeof global.Opal.Isomorfeus.Transport !== "undefined") ? global.Opal.Isomorfeus.Transport["$busy?"]() : false')
           end
           pass += 1
-          rendered_tree, application_state, @ssr_styles, @ssr_response_status, transport_busy, exception = Isomorfeus.ssr_contexts[thread_id_asset].exec(javascript)
+          rendered_tree, application_state, @ssr_styles, @ssr_response_status, still_busy, exception = Isomorfeus.ssr_contexts[thread_id_asset].exec(javascript)
           break if pass >= max_passes
         end
         javascript = <<~JAVASCRIPT

data/lib/isomorfeus_preact/lucid_component/api.rb

@@ -4,7 +4,6 @@ module LucidComponent::Api
       # stores
       attr_accessor :app_store
       attr_accessor :class_store
-      attr_accessor :store
 
       def class_store
         @class_store ||= ::LucidComponent::ClassStoreProxy.new(self.to_s)

data/lib/isomorfeus_preact/lucid_component/initializer.rb

@@ -3,7 +3,6 @@ module LucidComponent::Initializer
     @native = native_component
     @app_store = LucidComponent::AppStoreProxy.new(self)
     @class_store = LucidComponent::ClassStoreProxy.new(self.class.to_s, self, @native)
-    @store = LucidComponent::InstanceStoreProxy.new(self)
     @props = `Opal.Preact.Props.$new(#@native)`
     @state = `Opal.Preact.State.$new(#@native)`
   end

data/lib/isomorfeus_preact/lucid_func/initializer.rb

@@ -4,6 +4,5 @@ module LucidFunc::Initializer
     @native_props = `Opal.Preact.Props.$new(#{self})`
     @app_store = LucidComponent::AppStoreProxy.new(self)
     @class_store = LucidComponent::ClassStoreProxy.new(self.class.to_s, self, self)
-    @store = LucidComponent::InstanceStoreProxy.new(self)
   end
 end

data/lib/lucid_app/context.rb

@@ -5,7 +5,7 @@ module LucidApp
       css_server = `null`
       css_server = `document.getElementById('css-server-side')` unless on_ssr?
       %x{
-        n = Opal.NanoCSS;
+        let n = Opal.NanoCSS;
         nano_css = (css_server) ? n.create({ sh: css_server }) : n.create();
         n.rule(nano_css);
         n.sheet(nano_css);

data/lib/nano_css.rb

@@ -1,22 +1,22 @@
 module NanoCSS
   %x{
     var KEBAB_REGEX = /[A-Z]/g;
+    var on_browser = #{on_browser?};
+    var in_dev = #{Isomorfeus.development?};
 
     function hash(str) {
       var h = 5381, i = str.length;
       while (i) h = (h * 33) ^ str.charCodeAt(--i);
       return '_' + (h >>> 0).toString(36);
     };
-  }
 
-  %x{
     self.create = function (config) {
       config = config || {};
       var assign = config.assign || Object.assign;
       var client = typeof window === 'object';
 
       // Check if we are really in browser environment.
-      if (process.env.NODE_ENV !== 'production') {
+      if (on_browser && in_dev) {
         if (client) {
           if ((typeof document !== 'object') || !document.getElementsByTagName('HTML')) {
             console.error('nano-css detected browser environment because of "window" global, but "document" global seems to be defective.');
@@ -47,7 +47,7 @@ module NanoCSS
       if (renderer.client) {
         if (!renderer.sh) { document.head.appendChild(renderer.sh = document.createElement('style')); }
 
-        if (process.env.NODE_ENV !== 'production') {
+        if (in_dev) {
           renderer.sh.setAttribute('data-nano-css-dev', '');
 
           // Test style sheet used in DEV mode to test if .insetRule() would throw.
@@ -60,7 +60,7 @@ module NanoCSS
           // .insertRule() is faster than .appendChild(), that's why we use it in PROD.
           // But CSS injected using .insertRule() is not displayed in Chrome Devtools
           var sheet = renderer.sh.sheet;
-          if (process.env.NODE_ENV === 'production') {
+          if (!in_dev) {
             // Unknown pseudo-selectors will throw, this try/catch swallows all errors.
             try { sheet.insertRule(rawCssRule, sheet.cssRules.length); }
             catch (error) {}
@@ -91,7 +91,7 @@ module NanoCSS
           if ((value instanceof Object) && !(value instanceof Array)) {
             postponed.push(prop);
           } else {
-            if ((process.env.NODE_ENV !== 'production') && !renderer.sourcemaps) {
+            if (in_dev && !renderer.sourcemaps) {
               str += '    ' + renderer.decl(prop, value, selector, atrule) + '\n';
             } else {
               str += renderer.decl(prop, value, selector, atrule);
@@ -100,7 +100,7 @@ module NanoCSS
         }
 
         if (str) {
-          if ((process.env.NODE_ENV !== 'production') && !renderer.sourcemaps) {
+          if (in_dev && !renderer.sourcemaps) {
             str = '\n' + selector + ' {\n' + str + '}\n';
           } else {
             str = selector + '{' + str + '}';
@@ -129,7 +129,7 @@ module NanoCSS
 
   %x{
     self.rule = function (renderer) {
-      if (process.env.NODE_ENV !== 'production') {
+      if (in_dev) {
         renderer.rule_blocks = {};
       }
 
@@ -142,7 +142,7 @@ module NanoCSS
 
       renderer.rule = function (css, block) {
           // Warn user if CSS selectors clash.
-          if (process.env.NODE_ENV !== 'production') {
+          if (in_dev) {
               if (block) {
                   if (typeof block !== 'string') {
                       throw new TypeError(
@@ -194,7 +194,7 @@ module NanoCSS
         var onElementModifier = function (elementModifier) {
           var styles = map[elementModifier];
 
-          if ((process.env.NODE_ENV !== 'production') && renderer.sourcemaps) {
+          if (in_dev && renderer.sourcemaps) {
             // In dev mode emit CSS immediately to generate sourcemaps.
             result[elementModifier] = renderer.rule(styles, block + '-' + elementModifier);
           } else {

data/lib/preact/version.rb

@@ -1,3 +1,3 @@
 module Preact
-  VERSION = '10.6.34'
+  VERSION = '10.6.35'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-preact
 version: !ruby/object:Gem::Version
-  version: 10.6.34
+  version: 10.6.35
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-14 00:00:00.000000000 Z
+date: 2022-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.15
+        version: 4.1.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.15
+        version: 4.1.16
 - !ruby/object:Gem::Dependency
   name: isomorfeus-speednode
   requirement: !ruby/object:Gem::Requirement
@@ -242,7 +242,6 @@ files:
 - lib/isomorfeus_preact/lucid_component/base.rb
 - lib/isomorfeus_preact/lucid_component/class_store_proxy.rb
 - lib/isomorfeus_preact/lucid_component/initializer.rb
-- lib/isomorfeus_preact/lucid_component/instance_store_proxy.rb
 - lib/isomorfeus_preact/lucid_component/mixin.rb
 - lib/isomorfeus_preact/lucid_component/native_component_constructor.rb
 - lib/isomorfeus_preact/lucid_component/styles_wrapper.rb

data/lib/isomorfeus_preact/lucid_component/instance_store_proxy.rb

@@ -1,44 +0,0 @@
-module LucidComponent
-  class InstanceStoreProxy
-    def initialize(component_instance)
-      @native = component_instance.to_n
-      @component_instance = component_instance
-      @component_object_id = component_instance.object_id.to_s
-    end
-
-    def [](key)
-      method_missing(key)
-    end
-
-    def []=(key, value)
-      method_missing(key, value)
-    end
-
-    def method_missing(key, *args, &block)
-      if `args.length > 0`
-        # set instance state, simply a dispatch
-
-        action = { type: 'INSTANCE_STATE', object_id: @component_object_id, name: (`key.endsWith('=')` ? key.chop : key), value: args[0] }
-        Isomorfeus.store.collect_and_defer_dispatch(action)
-
-      else
-        # get instance state
-        if @native.JS[:props].JS[:iso_store]
-          if @native.JS[:props].JS[:iso_store].JS[:instance_state] &&
-              @native.JS[:props].JS[:iso_store].JS[:instance_state].JS[@component_object_id] &&
-              @native.JS[:props].JS[:iso_store].JS[:instance_state].JS[@component_object_id].JS.hasOwnProperty(key)
-            # check if we have a component local state value
-            return @native.JS[:props].JS[:iso_store].JS[:instance_state].JS[@component_object_id].JS[key]
-          end
-        else
-          a_state = Isomorfeus.store.get_state
-          if a_state.key?(:instance_state) && a_state[:instance_state].key?(key)
-            return a_state[:instance_state][key]
-          end
-        end
-        # otherwise return nil
-        return nil
-      end
-    end
-  end
-end