isomorfeus-react 16.12.8 → 16.12.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5d90a7865eb93c6d4fe0355e0dbaf8e03cae4bb2ebaabf33f78adecd9203f26
-  data.tar.gz: bbd20f3e1025ae402846b5688677922ba23c54802d9ed87ea36b670282bb1244
+  metadata.gz: 7ef15798090505fea9a8a626a0a6b17553a7b09757b61c2ad0c416ad1f4454f2
+  data.tar.gz: 9cd4286f75cc58bc7506c14433207f667d8af539588520186b7c4ce7dca89cbe
 SHA512:
-  metadata.gz: 3a50131debc40514af9eb558afe63137679d4b16a1b0b08baefa303c27a20ac3d9cc2a669eca9ca5900d1125712eb10bd5d465d6fd716a687aefdf19c8e0e0d6
-  data.tar.gz: 0ad176660638690cecf5eb8d36152ea567dc3b61af5e193f3fe6f0538830b02cec831d352a3aa69d3fd05984867c06fbe935ec81b252ffb70b14828113d9d7e5
+  metadata.gz: afb9834547c4a8cf33a819d0b188d568abfe7a2fbc0373c1eb0c319d5658fb986d3487b01a8a60d28c2f7119e9dcdb49326b83c1b5567441f61de2ae428a6bd3
+  data.tar.gz: 1dae5154593d5edc5f04e622994e9d8201230ac47efc46ef7e9da3dc27a6c22e420cb39039b48ec60d14d87a6002a7c9d94a215b7ae2d87f044a54f4eb7a20d3

data/lib/isomorfeus-react.rb

@@ -131,6 +131,7 @@ else
   require 'opal'
   require 'opal-activesupport'
   require 'opal-zeitwerk'
+  require 'opal-webpack-loader'
   require 'isomorfeus-redux'
   require 'isomorfeus-speednode'
   require 'react/version'
@@ -150,8 +151,12 @@ else
 
   Isomorfeus.server_side_rendering = true
 
+  # cache
+  require 'isomorfeus/thread_local_cache'
   require 'isomorfeus/react_view_helper'
 
+  Isomorfeus.component_cache_class = Isomorfeus::ThreadLocalCache
+
   Opal.append_path(__dir__.untaint)
 
   require 'concurrent'

data/lib/isomorfeus/config.rb

@@ -111,6 +111,7 @@ module Isomorfeus
     self.add_client_option(:client_init_after_store_class_names, [])
   else
     class << self
+      attr_accessor :component_cache_class
       attr_accessor :server_side_rendering
       attr_accessor :ssr_hot_asset_url
       attr_reader :env

data/lib/isomorfeus/react_view_helper.rb

@@ -193,7 +193,7 @@ module Isomorfeus
     private
 
     def component_cache
-      Thread.current[:component_cache] ||= {}
+      @_component_cache ||= Isomorfeus.component_cache_class.new
     end
   end
 end

data/lib/isomorfeus/thread_local_cache.rb

@@ -0,0 +1,21 @@
+module Isomorfeus
+  class ThreadLocalCache
+    def initialize
+      Thread.current[:local_cache] = {}
+    end
+
+    def [](key)
+      Thread.current[:local_cache][key]
+    end
+    alias fetch []
+
+    def []=(key, value)
+      Thread.current[:local_cache][key] = value
+    end
+    alias store []=
+
+    def key?(key)
+      Thread.current[:local_cache].key?(key)
+    end
+  end
+end

data/lib/isomorfeus_react/lucid_app/native_lucid_component_constructor.rb

@@ -76,10 +76,8 @@ module LucidApp
             oper.active_redux_components.pop();
             oper.active_components.pop();
             let children = oper.render_buffer.pop();
-            if (children.length === 1) { children = children[0]; }
-            else if (children.length === 0) { children = null; }
             // console.log("lucid app popping", oper.render_buffer, oper.render_buffer.toString());
-            return Opal.global.React.createElement(Opal.global.LucidApplicationContext.Provider, { value: this.state.isomorfeus_store_state }, children);
+            return Opal.global.React.createElement.apply(this, [Opal.global.LucidApplicationContext.Provider, { value: this.state.isomorfeus_store_state }].concat(children));
           }
           data_access() {
             this.state.isomorfeus_store_state;

data/lib/react.rb

@@ -78,7 +78,7 @@ module React
       let children;
       let native_props = null;
       if (string_child) {
-        children = string_child;
+        children = [string_child];
       } else if (block && block !== nil) {
         operabu.push([]);
         // console.log("internal_render pushed", Opal.React.render_buffer, Opal.React.render_buffer.toString());
@@ -88,11 +88,9 @@ module React
         }
         // console.log("internal_render popping", Opal.React.render_buffer, Opal.React.render_buffer.toString());
         children = operabu.pop();
-        if (children.length === 1) { children = children[0]; }
-        else if (children.length === 0) { children = null; }
       }
       if (props && props !== nil) { native_props = Opal.React.to_native_react_props(props); }
-      operabu[operabu.length - 1].push(Opal.global.React.createElement(component, native_props, children));
+      operabu[operabu.length - 1].push(Opal.global.React.createElement.apply(this, [component, native_props].concat(children)));
     };
 
     self.active_components = [];
@@ -147,11 +145,10 @@ module React
         }
         // console.log("create_element popping", Opal.React.render_buffer, Opal.React.render_buffer.toString());
         children = operabu.pop();
-        if (children.length == 1) { children = children[0]; }
-        else if (children.length == 0) { children = null; }
-      } else if (children === nil) { children = null; }
+      } else if (children === nil) { children = []; }
+      else if (typeof children === 'string') { children = [children]; }
       if (props && props !== nil) { native_props = Opal.React.to_native_react_props(props); }
-      return Opal.global.React.createElement(component, native_props, children);
+      return Opal.global.React.createElement.apply(this, [component, native_props].concat(children));
     }
   end
 

data/lib/react/version.rb

@@ -1,3 +1,3 @@
 module React
-  VERSION = '16.12.8'
+  VERSION = '16.12.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-react
 version: !ruby/object:Gem::Version
-  version: 16.12.8
+  version: 16.12.9
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-17 00:00:00.000000000 Z
+date: 2020-01-19 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.0.16
+        version: 4.0.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.16
+        version: 4.0.17
 - !ruby/object:Gem::Dependency
   name: isomorfeus-speednode
   requirement: !ruby/object:Gem::Requirement
@@ -128,28 +128,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: isomorfeus-puppetmaster
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -200,6 +200,7 @@ files:
 - lib/isomorfeus/props/validate_hash_proxy.rb
 - lib/isomorfeus/props/validator.rb
 - lib/isomorfeus/react_view_helper.rb
+- lib/isomorfeus/thread_local_cache.rb
 - lib/isomorfeus/top_level.rb
 - lib/isomorfeus/top_level_ssr.rb
 - lib/isomorfeus/vivify_module.rb