isomorfeus-react 16.10.13 → 16.10.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89d11f7a3996ea44b089e50e65bd9e473edeb12cb877599054790db2705caa8a
-  data.tar.gz: 90ce6397b467688228cce66dcc0f3b1cd59a0aa15c83dd8ce3f15a3997017750
+  metadata.gz: d117c74e849bc16c8e1bd1d1fec0984cbd11b997da4cde97ce47b5fbe68a49b1
+  data.tar.gz: 9bfd39d25d93d9549e6fec23a5f8026ff95891b39fd5939cf32100201d089582
 SHA512:
-  metadata.gz: e3bf6b9a9029f53ad7ccdbc674bc166e09b863d7ab088cfcd68c732e1592d2986b514faf6c33e0aa13fa9f12b820f87c11570f46a55fe10130cc87757c423bef
-  data.tar.gz: 84450d0bff23041bcadb040107e72f8086c9631f7849a1b889a9a8e903274acb008f185a1dacb1aef7fe5dafef39863293cbad9c89e5dae9545839b7be39cbe0
+  metadata.gz: 1aa9a952a7fccc0a35b4a82c1f7edc0359419a6257a2ccf6c6846690b421d925274b9eeca3d2871755eaf2245949b70772350a7c811b2618ec0c562eae59d995
+  data.tar.gz: b78c932a297a7c6768ed63d9664ab8ea224b35111eb24f552df49e6d2fc573f58a2779e2019cfa3d32c903e37b66b7f73787ae88a474186e8c77a2216deb64e6

data/lib/isomorfeus/react_view_helper.rb

@@ -16,8 +16,12 @@ module Isomorfeus
             runtime.vm.delete_context(uuid)
           end
           asset_path = "#{OpalWebpackLoader.client_asset_path}#{asset}"
-          asset = Net::HTTP.get(URI(asset_path))
-          Isomorfeus.ssr_contexts[thread_id_asset] = ExecJS.permissive_compile(asset)
+          begin
+            asset = Net::HTTP.get(URI(asset_path))
+            Isomorfeus.ssr_contexts[thread_id_asset] = ExecJS.permissive_compile(asset)
+          rescue
+            STDERR.puts "SSR: Failed loading assets from webpack dev server."
+          end
         else
           # initialize speednode context
           unless Isomorfeus.ssr_contexts.key?(thread_id_asset)
@@ -143,6 +147,7 @@ module Isomorfeus
         rendered_tree, application_state, @ssr_styles, @ssr_response_status = Isomorfeus.ssr_contexts[thread_id_asset].exec(javascript)
 
         # build result
+        render_result << " data-iso-hydrated='true'" if rendered_tree
         render_result << " data-iso-nloc='#{props[:locale]}' data-iso-state='#{Oj.dump(application_state, mode: :strict)}'>"
         render_result << (rendered_tree ? rendered_tree : "SSR didn't work")
       else

data/lib/lucid_app/mixin.rb

@@ -5,7 +5,6 @@ module LucidApp
       base.extend(::LucidApp::NativeComponentConstructor)
       base.extend(::LucidPropDeclaration::Mixin)
       base.extend(::React::Component::EventHandler)
-      base.include(::LucidComponent::PreloadingSupport)
       base.extend(::LucidComponent::EnvironmentSupport)
       base.include(::LucidComponent::EnvironmentSupport)
       base.include(::React::Component::Elements)

data/lib/lucid_app/native_component_constructor.rb

@@ -70,8 +70,7 @@ module LucidApp
             Opal.React.active_redux_components.pop();
             Opal.React.active_components.pop();
             // console.log("lucid app popping", Opal.React.render_buffer, Opal.React.render_buffer.toString());
-            let children = Opal.React.render_buffer.pop();
-            return Opal.global.React.createElement(Opal.global.LucidApplicationContext.Provider, { value: this.state.isomorfeus_store_state }, children);
+            return Opal.global.React.createElement(Opal.global.LucidApplicationContext.Provider, { value: this.state.isomorfeus_store_state }, Opal.React.render_buffer.pop());
           }
           data_access() {
             return this.context;

data/lib/lucid_component/native_component_constructor.rb

@@ -57,6 +57,10 @@ module LucidComponent
             Opal.React.active_redux_components.pop();
             Opal.React.active_components.pop();
             // console.log("lucid component popping", Opal.React.render_buffer, Opal.React.render_buffer.toString());
+            if (base.except_ssr) {
+              if (typeof block_result === "object" && block_result.danger) { return Opal.global.React.createElement('div', {'data-ssrhelper': this.__ruby_instance.$class().$to_s(), dangerouslySetInnerHTML: { __html: block_result.html}});}
+              else { return Opal.global.React.createElement('div', {'data-ssrhelper': this.__ruby_instance.$class().$to_s()}, Opal.React.render_buffer.pop()); }
+            }
             return Opal.React.render_buffer.pop();
           }
           data_access() {

data/lib/lucid_component/preloading_support.rb

@@ -11,7 +11,24 @@ module LucidComponent
           end
         end
 
-        def while_loading(&block)
+        def while_loading(option = nil, &block)
+          if option == :except_ssr
+            `base.except_ssr = true;`
+            block = if on_ssr?
+                      proc { instance_exec(&`base.render_block`) }
+                    else
+                      given_block = block
+                      proc do
+                        %x{
+                          let query = "[data-ssrhelper='" + #{self.class.to_s} + "']";
+                          let el = document.querySelector(query);
+                          if (el) { return { danger: true, html: el.innerHTML }; }
+                          else { return #{instance_exec(&given_block)};
+                          }
+                        }
+                      end
+                    end
+          end
           `base.while_loading_block = block`
         end
       end

data/lib/lucid_material/app/mixin.rb

@@ -6,7 +6,6 @@ module LucidMaterial
         base.extend(::LucidMaterial::App::NativeComponentConstructor)
         base.extend(::LucidPropDeclaration::Mixin)
         base.extend(::React::Component::EventHandler)
-        base.include(::LucidComponent::PreloadingSupport)
         base.extend(::LucidComponent::EnvironmentSupport)
         base.include(::LucidComponent::EnvironmentSupport)
         base.include(::React::Component::Elements)

data/lib/lucid_material/app/native_component_constructor.rb

@@ -71,8 +71,7 @@ module LucidMaterial
               Opal.React.active_redux_components.pop();
               Opal.React.active_components.pop();
               // console.log("material app popping", Opal.React.render_buffer, Opal.React.render_buffer.toString());
-              var children = Opal.React.render_buffer.pop();
-              return Opal.global.React.createElement(Opal.global.LucidApplicationContext.Provider, { value: this.state.isomorfeus_store_state }, children);
+              return Opal.global.React.createElement(Opal.global.LucidApplicationContext.Provider, { value: this.state.isomorfeus_store_state }, Opal.React.render_buffer.pop());
             }
             data_access() {
               return this.context;

data/lib/lucid_material/component/native_component_constructor.rb

@@ -58,6 +58,10 @@ module LucidMaterial
               Opal.React.active_redux_components.pop();
               Opal.React.active_components.pop();
               // console.log("material component popping", Opal.React.render_buffer, Opal.React.render_buffer.toString());
+              if (base.except_ssr) {
+                if (typeof block_result === "object" && block_result.danger) { return Opal.global.React.createElement('div', {'data-ssrhelper': this.__ruby_instance.$class().$to_s(), dangerouslySetInnerHTML: { __html: block_result.html}});}
+                else { return Opal.global.React.createElement('div', {'data-ssrhelper': this.__ruby_instance.$class().$to_s()}, Opal.React.render_buffer.pop()); }
+              }
               return Opal.React.render_buffer.pop();
             }
             data_access() {

data/lib/react/version.rb

@@ -1,3 +1,3 @@
 module React
-  VERSION = '16.10.13'
+  VERSION = '16.10.14'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-react
 version: !ruby/object:Gem::Version
-  version: 16.10.13
+  version: 16.10.14
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-19 00:00:00.000000000 Z
+date: 2019-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -241,14 +241,7 @@ homepage: http://isomorfeus.com
 licenses:
 - MIT
 metadata: {}
-post_install_message: |2+
-
-  isomorfeus-react 16.10.12:
-  Breaking changes:
-  Server Side Rendering is on by default in the development environment.
-  Please enable SSR asset builds in the webpack config of your app or turn SSR off with:
-  Isomorfeus.server_side_rendering = false
-
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib