opal_hot_reloader 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e792c243fe2539e1fcfbb417073237b3cf5cc0b4
-  data.tar.gz: 7e0b1b2057dac2d743cf89156d1f73216048f96c
+SHA256:
+  metadata.gz: '09bbe977d7b5a66683d1fe4d39faa2cb3a3c53b29891a9a608ddb03a347a216a'
+  data.tar.gz: 2bed6bbdc69e7f298334766e2fe6ebc5419c7f77dec283d86e6096564a118414
 SHA512:
-  metadata.gz: a1a81423ad3b3f0b0bc45f0a9ee040f198fcae8014837cb8c2c10cffbb164845a1edab3294e24cd68c5a6af724783297da73560e5464cf8e37c5ecd475f37501
-  data.tar.gz: 1b5509579c380e9ed8c9294085ceaffc9e5f59e0b1f759cebf5642cd88062e833fdedaf31b19f352e27b7b5399d08e70b1c6aabfedf6d231e351943469dfedfd
+  metadata.gz: 80fe8d1702a510883747e678b2f31dc2dc366efd847c87e11565c8e41673c7468c8be3801d64677f51ced211bab66ddc4523df678c131c8c274efc69b1d3113b
+  data.tar.gz: 1ea4ef4082ede515e1be657e5dd0220abb91c247113caa812b0450debfc4876b9e8ed52e3543cd5f9bb65983a4ac176f5427a6e3c8936bf9d3970b4f24463206

data/Changelog.org

@@ -1,3 +1,6 @@
+* 0.1.7
+- update to be compatible with latest hyperloop
+- made compatible w/react error boundaries
 * 0.1.6
 - hyperloop ping tweaks
 - UTF8 encoding

data/lib/opal_hot_reloader/version.rb

@@ -1,3 +1,3 @@
 module OpalHotReloader
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/opal/opal_hot_reloader/reactrb_patches.rb

@@ -1,5 +1,6 @@
 # patches to support reloading react.rb
 module ReactrbPatchModules
+  # add global force_update! method
   module ReactComponent
     def add_to_global_component_list(instance)
       (@global_component_list ||= Set.new).add instance
@@ -10,22 +11,72 @@ module ReactrbPatchModules
     end
 
     def force_update!
-      @global_component_list && @global_component_list.each(&:force_update!)
+      # components may be unmounted as a result of doing force_updates
+      # so copy the list, and then check before updating each component
+      return unless @global_component_list
+      components = @global_component_list.to_a
+      components.each do |comp|
+        next unless @global_component_list.include? comp
+        comp.force_update!
+      end
+    end
+  end
+
+  module AddForceUpdate
+    # latest hyperloop already has a force_update! method, but legacy hot
+    # reloader expects it to be defined in React::Component.
+    # Once older versions of Hyperloop are deprecated this can be removed.
+    def force_update!
+      Hyperloop::Component.force_update!
+    end
+  end
+  module AddErrBoundry
+    def self.included(base)
+      base.after_error do |*err|
+        @err = err
+        Hyperloop::Component.force_update!
+      end
+      base.define_method :render do
+        @err ? parse_display_and_clear_error : top_level_render
+      end
+    end
+
+    def parse_display_and_clear_error
+      e = @err[0]
+      component_stack = @err[1]['componentStack'].split("\n ")
+      @err = nil
+      display_error(e, component_stack)
+    end
+
+    def display_error(e, component_stack)
+      DIV do
+        DIV { "Uncaught error: #{e}" }
+        component_stack.each do |line|
+          DIV { line }
+        end
+      end
     end
   end
 end
 
+# React.rb needs to be patched so the we don't keep adding callbacks
 class ReactrbPatches
-  # React.rb needs to be patched so the we don't keep adding callbacks
   def self.patch!
-    ::React::Component.extend ReactrbPatchModules::ReactComponent # works
-
-    ::React::Callbacks.alias_method :original_run_callback, :run_callback # works
-    # Easiest place to hook into all components lifecycles
-    ::React::Callbacks.define_method(:run_callback) do |name, *args| # works
-      React::Component.add_to_global_component_list self if name == :before_mount
-      original_run_callback name, *args
-      React::Component.remove_from_global_component_list self if name == :before_unmount
+    if defined?(::React::TopLevelRailsComponent) && ::React::TopLevelRailsComponent.respond_to?(:after_error)
+      # new style:  Just add the error handler to the top level component
+      ::React::TopLevelRailsComponent.include ReactrbPatchModules::AddErrBoundry
+      # for compatibility with current opal-hot-reloader AddForceUpdate renames force_update!
+      ::React::Component.extend ReactrbPatchModules::AddForceUpdate
+    else
+      # old style (pre lap28 / 0.99 legacy release)
+      ::React::Component.extend ReactrbPatchModules::ReactComponent # works
+      ::React::Callbacks.alias_method :original_run_callback, :run_callback # works
+      # Easiest place to hook into all components lifecycles
+      ::React::Callbacks.define_method(:run_callback) do |name, *args| # works
+        React::Component.add_to_global_component_list self if name == :before_mount
+        original_run_callback name, *args
+        React::Component.remove_from_global_component_list self if name == :before_unmount
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opal_hot_reloader
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Forrest Chang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-07 00:00:00.000000000 Z
+date: 2018-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -147,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Opal Hot reloader